Issue #329 - lexer.c - do not discard this newline here

geoffmcl · geoffmcl · commit 569ae4b4350e · 2017-02-23T15:27:03.000+01:00
diff --git a/src/lexer.c b/src/lexer.c
@@ -2986,7 +2986,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 {
                     c = TY_(ReadChar)(doc->docIn);
 
-                    if (c != '\n' && c != '\f')
+                    if ((c == '\n') && (mode != IgnoreWhitespace)) /* Issue #329 - Can NOT afford to lose this newline */
+                        TY_(UngetChar)(c, doc->docIn);  /* Issue #329 - make sure the newline is maintained for now */
+                    else if (c != '\n' && c != '\f')
                         TY_(UngetChar)(c, doc->docIn);
 
                     lexer->waswhite = yes;  /* to swallow leading whitespace */

Original file line number	Diff line number	Diff line change
`@@ -2986,7 +2986,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )`
`2986`	`2986`	`{`
`2987`	`2987`	`c = TY_(ReadChar)(doc->docIn);`
`2988`	`2988`
`2989`		`- if (c != '\n' && c != '\f')`
	`2989`	`+ if ((c == '\n') && (mode != IgnoreWhitespace)) /* Issue #329 - Can NOT afford to lose this newline */`
	`2990`	`+ TY_(UngetChar)(c, doc->docIn); /* Issue #329 - make sure the newline is maintained for now */`
	`2991`	`+ else if (c != '\n' && c != '\f')`
`2990`	`2992`	`TY_(UngetChar)(c, doc->docIn);`
`2991`	`2993`
`2992`	`2994`	`lexer->waswhite = yes; /* to swallow leading whitespace */`