Pretty up output of empty script tags.

- No longer break script tags up on two lines if there is content. However
    output is still subject to the `--wrap` behavior.
  - Previous behavior intact if there is content.

Todo.

  - Associate this with a new Tidy option.
This commit is contained in:
Jim Derry 2017-02-08 13:53:37 -05:00
parent 6a83918d33
commit 1ac50fccb3

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;