emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

#65 Skip esc'd esc, and only for script containers

Browse source
This commit is contained in:
Geoff McLane 2015-09-21 12:33:53 +02:00
parent b2118fa09a
commit 96589c6f57
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lexer.c
View file

@ -1990,6 +1990,10 @@ static Bool IsInQuotesorComment( Lexer * lexer )
} }
else else
{ {
if (( c == '\\' ) && ( prev == '\\' )) {
prev = 0; /* use up the escape */
continue; /* 5.1.12 #65 (1642186): Ign 'escaped' escape ;=)) eg "+\\" */
}
if (( prev != '\\' ) && (( c == '"' ) || ( c == '\'')) ) if (( prev != '\\' ) && (( c == '"' ) || ( c == '\'')) )
{ {
/* deal with 'unescaped' quote chars " or ' */ /* deal with 'unescaped' quote chars " or ' */
@ -2040,8 +2044,9 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
Bool isEmpty = yes; Bool isEmpty = yes;
Bool matches = no; Bool matches = no;
uint c; uint c;
Bool hasSrc = TY_(AttrGetById)(container, TidyAttr_SRC) != NULL; Bool hasSrc = (TY_(AttrGetById)(container, TidyAttr_SRC) != NULL) ? yes : no;
Bool skipquotes = cfgBool(doc, TidySkipQuotes); /* #65 - get CONFIG option */ Bool skipquotes = (nodeIsSCRIPT(container) &&
cfgBool(doc, TidySkipQuotes)) ? yes : no; /* #65 (1642186) - is script, and on */
SetLexerLocus( doc, lexer ); SetLexerLocus( doc, lexer );
lexer->waswhite = no; lexer->waswhite = no;