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

Merge branch 'empretty_script'

Browse source
This commit is contained in:
Jim Derry 2017-02-13 08:49:13 -05:00
parent b7c84b1b57 1ac50fccb3
commit e1f066fe14
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pprint.c
View file

@ -2000,6 +2000,10 @@ void PPrintScriptStyle( TidyDocImpl* doc, uint mode, uint indent, Node *node )
PPrintTag( doc, mode, indent, node ); PPrintTag( doc, mode, indent, node );
/* SCRIPT may have no content such as when loading code via its SRC attribute.
In this case we don't want to flush the line, preferring to keep the required
closing SCRIPT tag on the same line. */
if ( node->content != NULL )
TY_(PFlushLineSmart)(doc, indent); TY_(PFlushLineSmart)(doc, indent);
if ( xhtmlOut && node->content != NULL ) if ( xhtmlOut && node->content != NULL )
@ -2053,7 +2057,9 @@ void PPrintScriptStyle( TidyDocImpl* doc, uint mode, uint indent, Node *node )
contentIndent = TextEndsWithNewline( doc->lexer, content, CDATA ); contentIndent = TextEndsWithNewline( doc->lexer, content, CDATA );
} }
if ( contentIndent < 0 ) /* Only flush the line if these was content present so that the closing
SCRIPT tag will stay on the same line. */
if ( contentIndent < 0 && node->content != NULL )
{ {
PCondFlushLineSmart( doc, indent ); PCondFlushLineSmart( doc, indent );
contentIndent = 0; contentIndent = 0;