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

Merge pull request #583 from htacg/issue-582

Browse source 
Issue #582 - Remove extra new line in 'classic' mode
This commit is contained in:
Jim Derry 2017-08-28 14:24:26 -04:00 committed by GitHub
parent e8e83dbe9f f7658b2c89
commit 6533181edf
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/pprint.c
View file

@ -2340,7 +2340,8 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
else /* other tags */ else /* other tags */
{ {
Bool indcont = ( cfgAutoBool(doc, TidyIndentContent) != TidyNoState ); Bool indcont = ( cfgAutoBool(doc, TidyIndentContent) != TidyNoState );
Bool indsmart = ( cfgAutoBool(doc, TidyIndentContent) == TidyAutoState ); /* Issue #582 - Seems this is no longer used
Bool indsmart = ( cfgAutoBool(doc, TidyIndentContent) == TidyAutoState ); */
Bool hideend = cfgBool( doc, TidyOmitOptionalTags ); Bool hideend = cfgBool( doc, TidyOmitOptionalTags );
Bool classic = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */ Bool classic = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
uint contentIndent = indent; uint contentIndent = indent;
@ -2360,9 +2361,11 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
* Issue #180 - with the above PCondFlushLine, * Issue #180 - with the above PCondFlushLine,
* this adds an uneccessary additional line! * this adds an uneccessary additional line!
* Maybe only if 'classic' ie --vertical-space yes * Maybe only if 'classic' ie --vertical-space yes
* Issue #582 - maybe this is no longer needed!
* It adds a 3rd newline if indent: auto...
* if ( indsmart && node->prev != NULL && classic)
* TY_(PFlushLineSmart)( doc, indent );
\*/ \*/
if ( indsmart && node->prev != NULL && classic)
TY_(PFlushLineSmart)( doc, indent );
/* do not omit elements with attributes */ /* do not omit elements with attributes */
if ( !hideend || !TY_(nodeHasCM)(node, CM_OMITST) || if ( !hideend || !TY_(nodeHasCM)(node, CM_OMITST) ||