emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
tidy-html5/src/pprint.c

2564 lines
77 KiB
C
Raw Normal View History

new
2011-11-17 02:44:16 +00:00
/*
pprint.c -- pretty print parse tree
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "pprint.h"
#include "tidy-int.h"
#include "parser.h"
#include "entities.h"
#include "tmbstr.h"
#include "utf8.h"
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
/* *** FOR DEBUG ONLY *** */
#if !defined(NDEBUG) && defined(_MSC_VER)
/* #define DEBUG_PPRINT */
/* #define DEBUG_INDENT */
#ifdef DEBUG_PPRINT
extern void dbg_show_node( TidyDocImpl* doc, Node *node, int caller, int indent );
#endif
#ifdef DEBUG_INDENT
#include "sprtf.h"
#endif
#endif
new
2011-11-17 02:44:16 +00:00
/*
Block-level and unknown elements are printed on
new lines and their contents indented 2 spaces
Inline elements are printed inline.
Inline content is wrapped on spaces (except in
attribute values or preformatted text, after
start tags and before end tags
*/
static void PPrintAsp( TidyDocImpl* doc, uint indent, Node* node );
static void PPrintJste( TidyDocImpl* doc, uint indent, Node* node );
static void PPrintPhp( TidyDocImpl* doc, uint indent, Node* node );
static int TextEndsWithNewline( Lexer *lexer, Node *node, uint mode );
static int TextStartsWithWhitespace( Lexer *lexer, Node *node, uint start, uint mode );
static Bool InsideHead( TidyDocImpl* doc, Node *node );
static Bool ShouldIndent( TidyDocImpl* doc, Node *node );
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
/*\
* Issue #228 20150715 - macros to access --vertical-space tri state configuration parameter
\*/
#define TidyClassicVS ((cfgAutoBool( doc, TidyVertSpace ) == TidyYesState) ? yes : no)
#define TidyAddVS ((cfgAutoBool( doc, TidyVertSpace ) == TidyAutoState) ? no : yes )
Issue #108 - first cut new option --indent-with-tabs yes.
2015-05-15 13:06:52 +00:00
/*\
* 20150515 - support using tabs instead of spaces - Issue #108
* GH: https://github.com/htacg/tidy-html5/issues/108 - Keep indent with tabs #108
* SF: https://sourceforge.net/p/tidy/feature-requests/3/ - #3 tabs in place of spaces
\*/
static uint indent_char = ' ';
void TY_(PPrintTabs)(void)
{
indent_char = '\t';
}
void TY_(PPrintSpaces)(void)
{
indent_char = ' ';
}
new
2011-11-17 02:44:16 +00:00
#if SUPPORT_ASIAN_ENCODINGS
/* #431953 - start RJ Wraplen adjusted for smooth international ride */
typedef enum
{
UC00, /* None */
UCPC, /* Punctuation, Connector */
UCPD, /* Punctuation, Dash */
UCPE, /* Punctuation, Close */
UCPS, /* Punctuation, Open */
UCPI, /* Punctuation, Initial quote */
UCPF, /* Punctuation, Final quote */
UCPO, /* Punctuation, Other */
UCZS, /* Separator, Space */
UCZL, /* Separator, Line */
UCZP /* Separator, Paragraph */
} UnicodeCategory;
/*
From the original code, the following characters are removed:
U+2011 (non-breaking hyphen)
U+202F (narrow non-break space)
U+2044 (fraction slash)
U+200B (zero width space)
...... (bidi formatting control characters)
U+2011 and U+202F are non-breaking, U+2044 is a Sm character,
U+200B is a non-visible space, wrapping after it would make
this space visible, bidi should be done using HTML features
and the characters are neither Px or Zx.
The following Unicode 3.0 punctuation characters are added:
U+2048 (question exclamation mark)
U+2049 (exclamation question mark)
U+204A (tironian sign et)
U+204B (reversed pilcrow sign)
U+204C (black leftwards bullet)
U+204D (black rightwards bullet)
U+3030 (wavy dash)
U+30FB (katakana middle dot)
U+FE63 (small hyphen-minus)
U+FE68 (small reverse solidus)
U+FF3F (fullwidth low line)
U+FF5B (fullwidth left curly bracket)
U+FF5D (fullwidth right curly bracket)
Other additional characters were not included in Unicode 3.0.
The table is based on Unicode 4.0. It must include only those
characters marking a wrapping point, "before" if the general
category is UCPS or UCPI, otherwise "after".
*/
static struct _unicode4cat
{
unsigned long code;
UnicodeCategory category;
} const unicode4cat[] =
{
#if 0
{ 0x037E, UCPO }, { 0x0387, UCPO }, { 0x055A, UCPO }, { 0x055B, UCPO },
{ 0x055C, UCPO }, { 0x055D, UCPO }, { 0x055E, UCPO }, { 0x055F, UCPO },
{ 0x0589, UCPO }, { 0x058A, UCPD }, { 0x05BE, UCPO }, { 0x05C0, UCPO },
{ 0x05C3, UCPO }, { 0x05F3, UCPO }, { 0x05F4, UCPO }, { 0x060C, UCPO },
{ 0x060D, UCPO }, { 0x061B, UCPO }, { 0x061F, UCPO }, { 0x066A, UCPO },
{ 0x066B, UCPO }, { 0x066C, UCPO }, { 0x066D, UCPO }, { 0x06D4, UCPO },
{ 0x0700, UCPO }, { 0x0701, UCPO }, { 0x0702, UCPO }, { 0x0703, UCPO },
{ 0x0704, UCPO }, { 0x0705, UCPO }, { 0x0706, UCPO }, { 0x0707, UCPO },
{ 0x0708, UCPO }, { 0x0709, UCPO }, { 0x070A, UCPO }, { 0x070B, UCPO },
{ 0x070C, UCPO }, { 0x070D, UCPO }, { 0x0964, UCPO }, { 0x0965, UCPO },
{ 0x0970, UCPO }, { 0x0DF4, UCPO }, { 0x0E4F, UCPO }, { 0x0E5A, UCPO },
{ 0x0E5B, UCPO }, { 0x0F04, UCPO }, { 0x0F05, UCPO }, { 0x0F06, UCPO },
{ 0x0F07, UCPO }, { 0x0F08, UCPO }, { 0x0F09, UCPO }, { 0x0F0A, UCPO },
{ 0x0F0B, UCPO }, { 0x0F0D, UCPO }, { 0x0F0E, UCPO }, { 0x0F0F, UCPO },
{ 0x0F10, UCPO }, { 0x0F11, UCPO }, { 0x0F12, UCPO }, { 0x0F3A, UCPS },
{ 0x0F3B, UCPE }, { 0x0F3C, UCPS }, { 0x0F3D, UCPE }, { 0x0F85, UCPO },
{ 0x104A, UCPO }, { 0x104B, UCPO }, { 0x104C, UCPO }, { 0x104D, UCPO },
{ 0x104E, UCPO }, { 0x104F, UCPO }, { 0x10FB, UCPO }, { 0x1361, UCPO },
{ 0x1362, UCPO }, { 0x1363, UCPO }, { 0x1364, UCPO }, { 0x1365, UCPO },
{ 0x1366, UCPO }, { 0x1367, UCPO }, { 0x1368, UCPO }, { 0x166D, UCPO },
{ 0x166E, UCPO }, { 0x1680, UCZS }, { 0x169B, UCPS }, { 0x169C, UCPE },
{ 0x16EB, UCPO }, { 0x16EC, UCPO }, { 0x16ED, UCPO }, { 0x1735, UCPO },
{ 0x1736, UCPO }, { 0x17D4, UCPO }, { 0x17D5, UCPO }, { 0x17D6, UCPO },
{ 0x17D8, UCPO }, { 0x17D9, UCPO }, { 0x17DA, UCPO }, { 0x1800, UCPO },
{ 0x1801, UCPO }, { 0x1802, UCPO }, { 0x1803, UCPO }, { 0x1804, UCPO },
{ 0x1805, UCPO }, { 0x1806, UCPD }, { 0x1807, UCPO }, { 0x1808, UCPO },
{ 0x1809, UCPO }, { 0x180A, UCPO }, { 0x180E, UCZS }, { 0x1944, UCPO },
{ 0x1945, UCPO },
#endif
{ 0x2000, UCZS }, { 0x2001, UCZS }, { 0x2002, UCZS }, { 0x2003, UCZS },
{ 0x2004, UCZS }, { 0x2005, UCZS }, { 0x2006, UCZS }, { 0x2008, UCZS },
{ 0x2009, UCZS }, { 0x200A, UCZS }, { 0x2010, UCPD }, { 0x2012, UCPD },
{ 0x2013, UCPD }, { 0x2014, UCPD }, { 0x2015, UCPD }, { 0x2016, UCPO },
{ 0x2017, UCPO }, { 0x2018, UCPI }, { 0x2019, UCPF }, { 0x201A, UCPS },
{ 0x201B, UCPI }, { 0x201C, UCPI }, { 0x201D, UCPF }, { 0x201E, UCPS },
{ 0x201F, UCPI }, { 0x2020, UCPO }, { 0x2021, UCPO }, { 0x2022, UCPO },
{ 0x2023, UCPO }, { 0x2024, UCPO }, { 0x2025, UCPO }, { 0x2026, UCPO },
{ 0x2027, UCPO }, { 0x2028, UCZL }, { 0x2029, UCZP }, { 0x2030, UCPO },
{ 0x2031, UCPO }, { 0x2032, UCPO }, { 0x2033, UCPO }, { 0x2034, UCPO },
{ 0x2035, UCPO }, { 0x2036, UCPO }, { 0x2037, UCPO }, { 0x2038, UCPO },
{ 0x2039, UCPI }, { 0x203A, UCPF }, { 0x203B, UCPO }, { 0x203C, UCPO },
{ 0x203D, UCPO }, { 0x203E, UCPO }, { 0x203F, UCPC }, { 0x2040, UCPC },
{ 0x2041, UCPO }, { 0x2042, UCPO }, { 0x2043, UCPO }, { 0x2045, UCPS },
{ 0x2046, UCPE }, { 0x2047, UCPO }, { 0x2048, UCPO }, { 0x2049, UCPO },
{ 0x204A, UCPO }, { 0x204B, UCPO }, { 0x204C, UCPO }, { 0x204D, UCPO },
{ 0x204E, UCPO }, { 0x204F, UCPO }, { 0x2050, UCPO }, { 0x2051, UCPO },
{ 0x2053, UCPO }, { 0x2054, UCPC }, { 0x2057, UCPO }, { 0x205F, UCZS },
{ 0x207D, UCPS }, { 0x207E, UCPE }, { 0x208D, UCPS }, { 0x208E, UCPE },
{ 0x2329, UCPS }, { 0x232A, UCPE }, { 0x23B4, UCPS }, { 0x23B5, UCPE },
{ 0x23B6, UCPO }, { 0x2768, UCPS }, { 0x2769, UCPE }, { 0x276A, UCPS },
{ 0x276B, UCPE }, { 0x276C, UCPS }, { 0x276D, UCPE }, { 0x276E, UCPS },
{ 0x276F, UCPE }, { 0x2770, UCPS }, { 0x2771, UCPE }, { 0x2772, UCPS },
{ 0x2773, UCPE }, { 0x2774, UCPS }, { 0x2775, UCPE }, { 0x27E6, UCPS },
{ 0x27E7, UCPE }, { 0x27E8, UCPS }, { 0x27E9, UCPE }, { 0x27EA, UCPS },
{ 0x27EB, UCPE }, { 0x2983, UCPS }, { 0x2984, UCPE }, { 0x2985, UCPS },
{ 0x2986, UCPE }, { 0x2987, UCPS }, { 0x2988, UCPE }, { 0x2989, UCPS },
{ 0x298A, UCPE }, { 0x298B, UCPS }, { 0x298C, UCPE }, { 0x298D, UCPS },
{ 0x298E, UCPE }, { 0x298F, UCPS }, { 0x2990, UCPE }, { 0x2991, UCPS },
{ 0x2992, UCPE }, { 0x2993, UCPS }, { 0x2994, UCPE }, { 0x2995, UCPS },
{ 0x2996, UCPE }, { 0x2997, UCPS }, { 0x2998, UCPE }, { 0x29D8, UCPS },
{ 0x29D9, UCPE }, { 0x29DA, UCPS }, { 0x29DB, UCPE }, { 0x29FC, UCPS },
{ 0x29FD, UCPE }, { 0x3001, UCPO }, { 0x3002, UCPO }, { 0x3003, UCPO },
{ 0x3008, UCPS }, { 0x3009, UCPE }, { 0x300A, UCPS }, { 0x300B, UCPE },
{ 0x300C, UCPS }, { 0x300D, UCPE }, { 0x300E, UCPS }, { 0x300F, UCPE },
{ 0x3010, UCPS }, { 0x3011, UCPE }, { 0x3014, UCPS }, { 0x3015, UCPE },
{ 0x3016, UCPS }, { 0x3017, UCPE }, { 0x3018, UCPS }, { 0x3019, UCPE },
{ 0x301A, UCPS }, { 0x301B, UCPE }, { 0x301C, UCPD }, { 0x301D, UCPS },
{ 0x301E, UCPE }, { 0x301F, UCPE }, { 0x3030, UCPD }, { 0x303D, UCPO },
{ 0x30A0, UCPD }, { 0x30FB, UCPC }, { 0xFD3E, UCPS }, { 0xFD3F, UCPE },
{ 0xFE30, UCPO }, { 0xFE31, UCPD }, { 0xFE32, UCPD }, { 0xFE33, UCPC },
{ 0xFE34, UCPC }, { 0xFE35, UCPS }, { 0xFE36, UCPE }, { 0xFE37, UCPS },
{ 0xFE38, UCPE }, { 0xFE39, UCPS }, { 0xFE3A, UCPE }, { 0xFE3B, UCPS },
{ 0xFE3C, UCPE }, { 0xFE3D, UCPS }, { 0xFE3E, UCPE }, { 0xFE3F, UCPS },
{ 0xFE40, UCPE }, { 0xFE41, UCPS }, { 0xFE42, UCPE }, { 0xFE43, UCPS },
{ 0xFE44, UCPE }, { 0xFE45, UCPO }, { 0xFE46, UCPO }, { 0xFE47, UCPS },
{ 0xFE48, UCPE }, { 0xFE49, UCPO }, { 0xFE4A, UCPO }, { 0xFE4B, UCPO },
{ 0xFE4C, UCPO }, { 0xFE4D, UCPC }, { 0xFE4E, UCPC }, { 0xFE4F, UCPC },
{ 0xFE50, UCPO }, { 0xFE51, UCPO }, { 0xFE52, UCPO }, { 0xFE54, UCPO },
{ 0xFE55, UCPO }, { 0xFE56, UCPO }, { 0xFE57, UCPO }, { 0xFE58, UCPD },
{ 0xFE59, UCPS }, { 0xFE5A, UCPE }, { 0xFE5B, UCPS }, { 0xFE5C, UCPE },
{ 0xFE5D, UCPS }, { 0xFE5E, UCPE }, { 0xFE5F, UCPO }, { 0xFE60, UCPO },
{ 0xFE61, UCPO }, { 0xFE63, UCPD }, { 0xFE68, UCPO }, { 0xFE6A, UCPO },
{ 0xFE6B, UCPO }, { 0xFF01, UCPO }, { 0xFF02, UCPO }, { 0xFF03, UCPO },
{ 0xFF05, UCPO }, { 0xFF06, UCPO }, { 0xFF07, UCPO }, { 0xFF08, UCPS },
{ 0xFF09, UCPE }, { 0xFF0A, UCPO }, { 0xFF0C, UCPO }, { 0xFF0D, UCPD },
{ 0xFF0E, UCPO }, { 0xFF0F, UCPO }, { 0xFF1A, UCPO }, { 0xFF1B, UCPO },
{ 0xFF1F, UCPO }, { 0xFF20, UCPO }, { 0xFF3B, UCPS }, { 0xFF3C, UCPO },
{ 0xFF3D, UCPE }, { 0xFF3F, UCPC }, { 0xFF5B, UCPS }, { 0xFF5D, UCPE },
{ 0xFF5F, UCPS }, { 0xFF60, UCPE }, { 0xFF61, UCPO }, { 0xFF62, UCPS },
{ 0xFF63, UCPE }, { 0xFF64, UCPO }, { 0xFF65, UCPC }, { 0x10100,UCPO },
{ 0x10101,UCPO }, { 0x1039F,UCPO },
/* final entry */
{ 0x0000, UC00 }
};
typedef enum
{
NoWrapPoint,
WrapBefore,
WrapAfter
} WrapPoint;
/*
If long lines of text have no white space as defined in HTML 4
(U+0009, U+000A, U+000D, U+000C, U+0020) other characters could
be used to determine a wrap point. Since user agents would
normalize the inserted newline character to a space character,
this wrapping behaviour would insert visual whitespace into the
document.
Characters of the General Category Pi and Ps in the Unicode
character database (opening punctuation and intial quote
characters) mark a wrapping point before the character, other
punctuation characters (Pc, Pd, Pe, Pf, and Po), breakable
space characters (Zs), and paragraph and line separators
(Zl, Zp) mark a wrap point after the character. Using this
function Tidy can for example pretty print
<p>....................&ldquo;...quote...&rdquo;...</p>
as
<p>....................\n&ldquo;...quote...&rdquo;...</p>
or
<p>....................&ldquo;...quote...&rdquo;\n...</p>
if the next normal wrapping point would exceed the user
chosen wrapping column.
*/
static WrapPoint CharacterWrapPoint(tchar c)
{
int i;
for (i = 0; unicode4cat[i].code && unicode4cat[i].code <= c; ++i)
if (unicode4cat[i].code == c)
{
/* wrapping before opening punctuation and initial quotes */
if (unicode4cat[i].category == UCPS ||
unicode4cat[i].category == UCPI)
return WrapBefore;
/* else wrapping after this character */
else
return WrapAfter;
}
/* character has no effect on line wrapping */
return NoWrapPoint;
}
static WrapPoint Big5WrapPoint(tchar c)
{
if ((c & 0xFF00) == 0xA100)
{
/* opening brackets have odd codes: break before them */
if ( c > 0xA15C && c < 0xA1AD && (c & 1) == 1 )
return WrapBefore;
return WrapAfter;
}
return NoWrapPoint;
}
#endif /* SUPPORT_ASIAN_ENCODINGS */
static void InitIndent( TidyIndent* ind )
{
ind->spaces = -1;
ind->attrValStart = -1;
ind->attrStringStart = -1;
}
void TY_(InitPrintBuf)( TidyDocImpl* doc )
{
TidyClearMemory( &doc->pprint, sizeof(TidyPrintImpl) );
InitIndent( &doc->pprint.indent[0] );
InitIndent( &doc->pprint.indent[1] );
doc->pprint.allocator = doc->allocator;
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
doc->pprint.line = 0;
new
2011-11-17 02:44:16 +00:00
}
void TY_(FreePrintBuf)( TidyDocImpl* doc )
{
TidyDocFree( doc, doc->pprint.linebuf );
TY_(InitPrintBuf)( doc );
}
static void expand( TidyPrintImpl* pprint, uint len )
{
uint* ip;
uint buflen = pprint->lbufsize;
if ( buflen == 0 )
buflen = 256;
while ( len >= buflen )
buflen *= 2;
ip = (uint*) TidyRealloc( pprint->allocator, pprint->linebuf, buflen*sizeof(uint) );
if ( ip )
{
TidyClearMemory( ip+pprint->lbufsize,
(buflen-pprint->lbufsize)*sizeof(uint) );
pprint->lbufsize = buflen;
pprint->linebuf = ip;
}
}
static uint GetSpaces( TidyPrintImpl* pprint )
{
int spaces = pprint->indent[ 0 ].spaces;
return ( spaces < 0 ? 0U : (uint) spaces );
}
static int ClearInString( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + pprint->ixInd;
return ind->attrStringStart = -1;
}
static int ToggleInString( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + pprint->ixInd;
Bool inString = ( ind->attrStringStart >= 0 );
return ind->attrStringStart = ( inString ? -1 : (int) pprint->linelen );
}
static Bool IsInString( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + 0; /* Always 1st */
return ( ind->attrStringStart >= 0 &&
ind->attrStringStart < (int) pprint->linelen );
}
static Bool IsWrapInString( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + 0; /* Always 1st */
int wrap = (int) pprint->wraphere;
return ( ind->attrStringStart == 0 ||
(ind->attrStringStart > 0 && ind->attrStringStart < wrap) );
}
static Bool HasMixedContent (Node *element)
{
Node * node;
if (!element)
return no;
for (node = element->content; node; node = node->next)
if ( TY_(nodeIsText)(node) )
return yes;
return no;
}
static void ClearInAttrVal( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + pprint->ixInd;
ind->attrValStart = -1;
}
static int SetInAttrVal( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + pprint->ixInd;
return ind->attrValStart = (int) pprint->linelen;
}
static Bool IsWrapInAttrVal( TidyPrintImpl* pprint )
{
TidyIndent *ind = pprint->indent + 0; /* Always 1st */
int wrap = (int) pprint->wraphere;
return ( ind->attrValStart == 0 ||
(ind->attrValStart > 0 && ind->attrValStart < wrap) );
}
static Bool WantIndent( TidyDocImpl* doc )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool wantIt = GetSpaces(pprint) > 0;
if ( wantIt )
{
Bool indentAttrs = cfgBool( doc, TidyIndentAttributes );
wantIt = ( ( !IsWrapInAttrVal(pprint) || indentAttrs ) &&
!IsWrapInString(pprint) );
}
return wantIt;
}
static uint WrapOff( TidyDocImpl* doc )
{
uint saveWrap = cfg( doc, TidyWrapLen );
TY_(SetOptionInt)( doc, TidyWrapLen, 0xFFFFFFFF ); /* very large number */
return saveWrap;
}
static void WrapOn( TidyDocImpl* doc, uint saveWrap )
{
TY_(SetOptionInt)( doc, TidyWrapLen, saveWrap );
}
static uint WrapOffCond( TidyDocImpl* doc, Bool onoff )
{
if ( onoff )
return WrapOff( doc );
return cfg( doc, TidyWrapLen );
}
static void AddC( TidyPrintImpl* pprint, uint c, uint string_index)
{
if ( string_index + 1 >= pprint->lbufsize )
expand( pprint, string_index + 1 );
pprint->linebuf[string_index] = c;
}
static uint AddChar( TidyPrintImpl* pprint, uint c )
{
AddC( pprint, c, pprint->linelen );
return ++pprint->linelen;
}
static uint AddAsciiString( TidyPrintImpl* pprint, ctmbstr str, uint string_index )
{
uint ix, len = TY_(tmbstrlen)( str );
if ( string_index + len >= pprint->lbufsize )
expand( pprint, string_index + len );
for ( ix=0; ix<len; ++ix )
pprint->linebuf[string_index + ix] = str[ ix ];
return string_index + len;
}
static uint AddString( TidyPrintImpl* pprint, ctmbstr str )
{
return pprint->linelen = AddAsciiString( pprint, str, pprint->linelen );
}
/* Saves current output point as the wrap point,
** but only if indentation would NOT overflow
** the current line. Otherwise keep previous wrap point.
*/
static Bool SetWrap( TidyDocImpl* doc, uint indent )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool wrap = ( indent + pprint->linelen < cfg(doc, TidyWrapLen) );
if ( wrap )
{
if ( pprint->indent[0].spaces < 0 )
pprint->indent[0].spaces = indent;
pprint->wraphere = pprint->linelen;
}
else if ( pprint->ixInd == 0 )
{
/* Save indent 1st time we pass the the wrap line */
pprint->indent[ 1 ].spaces = indent;
pprint->ixInd = 1;
}
return wrap;
}
static void CarryOver( int* valTo, int* valFrom, uint wrapPoint )
{
if ( *valFrom > (int) wrapPoint )
{
*valTo = *valFrom - wrapPoint;
*valFrom = -1;
}
}
static Bool SetWrapAttr( TidyDocImpl* doc,
uint indent, int attrStart, int strStart )
{
TidyPrintImpl* pprint = &doc->pprint;
TidyIndent *ind = pprint->indent + 0;
Bool wrap = ( indent + pprint->linelen < cfg(doc, TidyWrapLen) );
if ( wrap )
{
if ( ind[0].spaces < 0 )
ind[0].spaces = indent;
pprint->wraphere = pprint->linelen;
}
else if ( pprint->ixInd == 0 )
{
/* Save indent 1st time we pass the the wrap line */
pprint->indent[ 1 ].spaces = indent;
pprint->ixInd = 1;
/* Carry over string state */
CarryOver( &ind[1].attrStringStart, &ind[0].attrStringStart, pprint->wraphere );
CarryOver( &ind[1].attrValStart, &ind[0].attrValStart, pprint->wraphere );
}
ind += doc->pprint.ixInd;
ind->attrValStart = attrStart;
ind->attrStringStart = strStart;
return wrap;
}
/* Reset indent state after flushing a new line
*/
static void ResetLine( TidyPrintImpl* pprint )
{
TidyIndent* ind = pprint->indent + 0;
if ( pprint->ixInd > 0 )
{
ind[0] = ind[1];
InitIndent( &ind[1] );
}
if ( pprint->wraphere > 0 )
{
int wrap = (int) pprint->wraphere;
if ( ind[0].attrStringStart > wrap )
ind[0].attrStringStart -= wrap;
if ( ind[0].attrValStart > wrap )
ind[0].attrValStart -= wrap;
}
else
{
if ( ind[0].attrStringStart > 0 )
ind[0].attrStringStart = 0;
if ( ind[0].attrValStart > 0 )
ind[0].attrValStart = 0;
}
pprint->wraphere = pprint->ixInd = 0;
}
/* Shift text after wrap point to
** beginning of next line.
*/
static void ResetLineAfterWrap( TidyPrintImpl* pprint )
{
if ( pprint->linelen > pprint->wraphere )
{
uint *p = pprint->linebuf;
uint *q = p + pprint->wraphere;
uint *end = p + pprint->linelen;
if ( ! IsWrapInAttrVal(pprint) )
{
while ( q < end && *q == ' ' )
++q, ++pprint->wraphere;
}
while ( q < end )
*p++ = *q++;
pprint->linelen -= pprint->wraphere;
}
else
{
pprint->linelen = 0;
}
ResetLine( pprint );
}
Issue #335, maybe #333, to output indent char, reduce if tab
2017-03-20 17:40:59 +00:00
/*\
* Write the 'indent' char to output
* Issue #335 - The GetSpaces() returns the number of spaces to be
* used for the indent. This is fine if ouputting spaces.
* However, if outputting 'tab' chars, then the number of tabs
* output should euivalent to spaces divided by 'tab-size'
\*/
static void WriteIndentChar(TidyDocImpl* doc )
{
TidyPrintImpl* pprint = &doc->pprint;
uint i;
uint spaces = GetSpaces(pprint);
uint tabsize = cfg(doc, TidyTabSize);
if (spaces && (indent_char == '\t') && tabsize)
{
spaces /= tabsize; // set number of tabs to output
if (spaces == 0) // with a minimum of one
spaces = 1;
}
for (i = 0; i < spaces; i++)
TY_(WriteChar)(indent_char, doc->docOut); /* 20150515 - Issue #108 */
}
new
2011-11-17 02:44:16 +00:00
/* Goes ahead with writing current line up to
** previously saved wrap point. Shifts unwritten
** text in output buffer to beginning of next line.
*/
static void WrapLine( TidyDocImpl* doc )
{
TidyPrintImpl* pprint = &doc->pprint;
uint i;
if ( pprint->wraphere == 0 )
return;
if ( WantIndent(doc) )
Issue #335, maybe #333, to output indent char, reduce if tab
2017-03-20 17:40:59 +00:00
WriteIndentChar(doc);
new
2011-11-17 02:44:16 +00:00
for ( i = 0; i < pprint->wraphere; ++i )
TY_(WriteChar)( pprint->linebuf[i], doc->docOut );
if ( IsWrapInString(pprint) )
TY_(WriteChar)( '\\', doc->docOut );
TY_(WriteChar)( '\n', doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
pprint->line++;
new
2011-11-17 02:44:16 +00:00
ResetLineAfterWrap( pprint );
}
/* Checks current output line length along with current indent.
** If combined they overflow output line length, go ahead
** and flush output up to the current wrap point.
*/
static Bool CheckWrapLine( TidyDocImpl* doc )
{
TidyPrintImpl* pprint = &doc->pprint;
if ( GetSpaces(pprint) + pprint->linelen >= cfg(doc, TidyWrapLen) )
{
WrapLine( doc );
return yes;
}
return no;
}
static Bool CheckWrapIndent( TidyDocImpl* doc, uint indent )
{
TidyPrintImpl* pprint = &doc->pprint;
if ( GetSpaces(pprint) + pprint->linelen >= cfg(doc, TidyWrapLen) )
{
WrapLine( doc );
if ( pprint->indent[ 0 ].spaces < 0 )
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
{
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
new
2011-11-17 02:44:16 +00:00
pprint->indent[ 0 ].spaces = indent;
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
}
new
2011-11-17 02:44:16 +00:00
return yes;
}
return no;
}
static void WrapAttrVal( TidyDocImpl* doc )
{
TidyPrintImpl* pprint = &doc->pprint;
uint i;
/* assert( IsWrapInAttrVal(pprint) ); */
if ( WantIndent(doc) )
Issue #335, maybe #333, to output indent char, reduce if tab
2017-03-20 17:40:59 +00:00
WriteIndentChar(doc);
new
2011-11-17 02:44:16 +00:00
for ( i = 0; i < pprint->wraphere; ++i )
TY_(WriteChar)( pprint->linebuf[i], doc->docOut );
if ( IsWrapInString(pprint) )
TY_(WriteChar)( '\\', doc->docOut );
else
TY_(WriteChar)( ' ', doc->docOut );
TY_(WriteChar)( '\n', doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
pprint->line++;
new
2011-11-17 02:44:16 +00:00
ResetLineAfterWrap( pprint );
}
static void PFlushLineImpl( TidyDocImpl* doc )
{
TidyPrintImpl* pprint = &doc->pprint;
Revert "Issue #133 - ever increasing indent!" This reverts commit 0f80c083559265a99c24d1f7833fb4fafb0a84ab. This commit had other BAD consequences
2015-02-12 13:56:51 +00:00
uint i;
new
2011-11-17 02:44:16 +00:00
CheckWrapLine( doc );
if ( WantIndent(doc) )
Issue #335, maybe #333, to output indent char, reduce if tab
2017-03-20 17:40:59 +00:00
WriteIndentChar(doc);
new
2011-11-17 02:44:16 +00:00
Revert "Issue #133 - ever increasing indent!" This reverts commit 0f80c083559265a99c24d1f7833fb4fafb0a84ab. This commit had other BAD consequences
2015-02-12 13:56:51 +00:00
for ( i = 0; i < pprint->linelen; ++i )
TY_(WriteChar)( pprint->linebuf[i], doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
new
2011-11-17 02:44:16 +00:00
if ( IsInString(pprint) )
TY_(WriteChar)( '\\', doc->docOut );
ResetLine( pprint );
pprint->linelen = 0;
}
void TY_(PFlushLine)( TidyDocImpl* doc, uint indent )
{
TidyPrintImpl* pprint = &doc->pprint;
if ( pprint->linelen > 0 )
PFlushLineImpl( doc );
TY_(WriteChar)( '\n', doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
pprint->line++;
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
if (pprint->indent[ 0 ].spaces != (int)indent )
{
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
pprint->indent[ 0 ].spaces = indent;
}
new
2011-11-17 02:44:16 +00:00
}
static void PCondFlushLine( TidyDocImpl* doc, uint indent )
{
TidyPrintImpl* pprint = &doc->pprint;
if ( pprint->linelen > 0 )
{
PFlushLineImpl( doc );
TY_(WriteChar)( '\n', doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
pprint->line++;
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
}
/* Issue #390 - Whether chars to flush or not, set new indent */
if ( pprint->indent[ 0 ].spaces != (int)indent )
{
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
new
2011-11-17 02:44:16 +00:00
pprint->indent[ 0 ].spaces = indent;
}
}
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
/**
* Two additional "smart" flush line functions which only
* write a newline if `vertical-space no`. See issues #163 and #227.
* These need to be used in the right place. In same cases `PFlushLine`
* and `PCondFlushLine` should still be used.
*/
void TY_(PFlushLineSmart)( TidyDocImpl* doc, uint indent )
{
TidyPrintImpl* pprint = &doc->pprint;
if ( pprint->linelen > 0 )
PFlushLineImpl( doc );
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
/* Issue #228 - cfgBool( doc, TidyVertSpace ); */
if(TidyAddVS) {
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(WriteChar)( '\n', doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
pprint->line++;
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
}
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
if ( pprint->indent[ 0 ].spaces != (int)indent )
{
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
pprint->indent[ 0 ].spaces = indent;
}
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
}
static void PCondFlushLineSmart( TidyDocImpl* doc, uint indent )
{
TidyPrintImpl* pprint = &doc->pprint;
if ( pprint->linelen > 0 )
{
PFlushLineImpl( doc );
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
/* Issue #228 - cfgBool( doc, TidyVertSpace ); */
if(TidyAddVS) {
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(WriteChar)( '\n', doc->docOut );
Make pretty printer keep track of line numbers as it prints.
2015-11-28 06:16:17 +00:00
pprint->line++;
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
}
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
}
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
/*\
* Issue #390 - Must still deal with fixing indent!
WIP
2017-05-03 22:16:03 +00:00
* If TidyOmitOptionalTags, then in cerain circumstances no PrintEndTag
* will be done, so linelen will be 0...
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
\*/
if (pprint->indent[ 0 ].spaces != (int)indent)
{
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
pprint->indent[ 0 ].spaces = indent;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
}
}
new
2011-11-17 02:44:16 +00:00
static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
{
tmbchar entity[128];
ctmbstr p;
TidyPrintImpl* pprint = &doc->pprint;
uint outenc = cfg( doc, TidyOutCharEncoding );
Bool qmark = cfgBool( doc, TidyQuoteMarks );
if ( c == ' ' && !(mode & (PREFORMATTED | COMMENT | ATTRIBVALUE | CDATA)))
{
/* coerce a space character to a non-breaking space */
if (mode & NOWRAP)
{
ctmbstr ent = "&nbsp;";
/* by default XML doesn't define &nbsp; */
if ( cfgBool(doc, TidyNumEntities) || cfgBool(doc, TidyXmlTags) )
ent = "&#160;";
AddString( pprint, ent );
return;
}
else
pprint->wraphere = pprint->linelen;
}
/* comment characters are passed raw */
if ( mode & (COMMENT | CDATA) )
{
AddChar( pprint, c );
return;
}
/* except in CDATA map < to &lt; etc. */
if ( !(mode & CDATA) )
{
if ( c == '<')
{
AddString( pprint, "&lt;" );
return;
}
if ( c == '>')
{
AddString( pprint, "&gt;" );
return;
}
/*
naked '&' chars can be left alone or
quoted as &amp; The latter is required
for XML where naked '&' are illegal.
*/
if ( c == '&' && cfgBool(doc, TidyQuoteAmpersand)
Issue #130 - MathML attr and entity fix! This is a set of kludgy fixes for MathML attribute and entities support. It is intended that a full HTML5 entity table be added at some time, but at present ALL entities are accepted as written when within the math element. Likewise all attributes are accepted on MathML elements without any check of their name or value, even if they match attributes outside MathML. And in the pprinter such entities are written as is from the lexer, using a new PPrintMathML service added, using the new mode OtherNameSpace. It is hoped all these fixes will NOT effect tidy outside the math element. ALL fixes in the set a clearly marked '#130 - MathML attr and entity fix!' for easy searching, and improving if possible.
2015-02-22 17:44:14 +00:00
&& !cfgBool(doc, TidyPreserveEntities)
&& ( mode != OtherNamespace) ) /* #130 MathML attr and entity fix! */
new
2011-11-17 02:44:16 +00:00
{
AddString( pprint, "&amp;" );
return;
}
if ( c == '"' && qmark )
{
AddString( pprint, "&quot;" );
return;
}
if ( c == '\'' && qmark )
{
AddString( pprint, "&#39;" );
return;
}
if ( c == 160 && outenc != RAW )
{
if ( cfgBool(doc, TidyQuoteNbsp) )
{
if ( cfgBool(doc, TidyNumEntities) ||
cfgBool(doc, TidyXmlTags) )
AddString( pprint, "&#160;" );
else
AddString( pprint, "&nbsp;" );
}
else
AddChar( pprint, c );
return;
}
}
#if SUPPORT_ASIAN_ENCODINGS
/* #431953 - start RJ */
/* Handle encoding-specific issues */
switch ( outenc )
{
case UTF8:
#if SUPPORT_UTF16_ENCODINGS
case UTF16:
case UTF16LE:
case UTF16BE:
#endif
if (!(mode & PREFORMATTED) && cfg(doc, TidyPunctWrap))
{
WrapPoint wp = CharacterWrapPoint(c);
if (wp == WrapBefore)
pprint->wraphere = pprint->linelen;
else if (wp == WrapAfter)
pprint->wraphere = pprint->linelen + 1;
}
break;
case BIG5:
/* Allow linebreak at Chinese punctuation characters */
/* There are not many spaces in Chinese */
AddChar( pprint, c );
if (!(mode & PREFORMATTED) && cfg(doc, TidyPunctWrap))
{
WrapPoint wp = Big5WrapPoint(c);
if (wp == WrapBefore)
pprint->wraphere = pprint->linelen;
else if (wp == WrapAfter)
pprint->wraphere = pprint->linelen + 1;
}
return;
case SHIFTJIS:
#ifndef NO_NATIVE_ISO2022_SUPPORT
case ISO2022: /* ISO 2022 characters are passed raw */
#endif
case RAW:
AddChar( pprint, c );
return;
}
/* #431953 - end RJ */
#else /* SUPPORT_ASIAN_ENCODINGS */
/* otherwise ISO 2022 characters are passed raw */
if (
#ifndef NO_NATIVE_ISO2022_SUPPORT
outenc == ISO2022 ||
#endif
outenc == RAW )
{
AddChar( pprint, c );
return;
}
#endif /* SUPPORT_ASIAN_ENCODINGS */
/* don't map latin-1 chars to entities */
if ( outenc == LATIN1 )
{
if (c > 255) /* multi byte chars */
{
uint vers = TY_(HTMLVersion)( doc );
if ( !cfgBool(doc, TidyNumEntities) && (p = TY_(EntityName)(c, vers)) )
TY_(tmbsnprintf)(entity, sizeof(entity), "&%s;", p);
else
TY_(tmbsnprintf)(entity, sizeof(entity), "&#%u;", c);
AddString( pprint, entity );
return;
}
if (c > 126 && c < 160)
{
TY_(tmbsnprintf)(entity, sizeof(entity), "&#%u;", c);
AddString( pprint, entity );
return;
}
AddChar( pprint, c );
return;
}
/* don't map UTF-8 chars to entities */
if ( outenc == UTF8 )
{
AddChar( pprint, c );
return;
}
#if SUPPORT_UTF16_ENCODINGS
/* don't map UTF-16 chars to entities */
if ( outenc == UTF16 || outenc == UTF16LE || outenc == UTF16BE )
{
AddChar( pprint, c );
return;
}
#endif
/* use numeric entities only for XML */
if ( cfgBool(doc, TidyXmlTags) )
{
/* if ASCII use numeric entities for chars > 127 */
if ( c > 127 && outenc == ASCII )
{
TY_(tmbsnprintf)(entity, sizeof(entity), "&#%u;", c);
AddString( pprint, entity );
return;
}
/* otherwise output char raw */
AddChar( pprint, c );
return;
}
/* default treatment for ASCII */
if ( outenc == ASCII && (c > 126 || (c < ' ' && c != '\t')) )
{
uint vers = TY_(HTMLVersion)( doc );
if (!cfgBool(doc, TidyNumEntities) && (p = TY_(EntityName)(c, vers)) )
TY_(tmbsnprintf)(entity, sizeof(entity), "&%s;", p);
else
TY_(tmbsnprintf)(entity, sizeof(entity), "&#%u;", c);
AddString( pprint, entity );
return;
}
AddChar( pprint, c );
}
static uint IncrWS( uint start, uint end, uint indent, int ixWS )
{
if ( ixWS > 0 )
{
uint st = start + MIN( (uint)ixWS, indent );
start = MIN( st, end );
}
return start;
}
/*
The line buffer is uint not char so we can
hold Unicode values unencoded. The translation
to UTF-8 is deferred to the TY_(WriteChar)() routine called
to flush the line buffer.
*/
static void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
Node* node )
{
uint start = node->start;
uint end = node->end;
uint ix, c = 0;
int ixNL = TextEndsWithNewline( doc->lexer, node, mode );
int ixWS = TextStartsWithWhitespace( doc->lexer, node, start, mode );
if ( ixNL > 0 )
end -= ixNL;
start = IncrWS( start, end, indent, ixWS );
for ( ix = start; ix < end; ++ix )
{
CheckWrapIndent( doc, indent );
/*
if ( CheckWrapIndent(doc, indent) )
{
ixWS = TextStartsWithWhitespace( doc->lexer, node, ix );
ix = IncrWS( ix, end, indent, ixWS );
}
*/
c = (byte) doc->lexer->lexbuf[ix];
/* look for UTF-8 multibyte character */
if ( c > 0x7F )
ix += TY_(GetUTF8)( doc->lexer->lexbuf + ix, &c );
if ( c == '\n' )
{
TY_(PFlushLine)( doc, indent );
ixWS = TextStartsWithWhitespace( doc->lexer, node, ix+1, mode );
ix = IncrWS( ix, end, indent, ixWS );
}
Issue #207 - deal with 2 cases of an unambiguous ampersand. html5 allows a naked ampersand unquoted, and now tidy will not issue a warning. This only deals with a & b, and P&<li>O</li> More may need to be done for other cases.
2015-06-24 11:05:06 +00:00
else if (( c == '&' ) && (TY_(HTMLVersion)(doc) == HT50) &&
Issue #379 - Care about 'ix' going negative. How this lasted so long in the code is a mystery! But of course it will only be a read out-of-bounds if testing the first character in the lexer, and it is a spacey char. A big thanks to @gaa-cifasis for running ASAN tests on Tidy.
2016-03-06 16:31:00 +00:00
(((ix + 1) == end) || (((ix + 1) < end) && (isspace(doc->lexer->lexbuf[ix+1] & 0xff)))) )
Issue #207 - deal with 2 cases of an unambiguous ampersand. html5 allows a naked ampersand unquoted, and now tidy will not issue a warning. This only deals with a & b, and P&<li>O</li> More may need to be done for other cases.
2015-06-24 11:05:06 +00:00
{
/*\
* Issue #207 - This is an unambiguous ampersand need not be 'quoted' in HTML5
Issue #379 - Care about 'ix' going negative. How this lasted so long in the code is a mystery! But of course it will only be a read out-of-bounds if testing the first character in the lexer, and it is a spacey char. A big thanks to @gaa-cifasis for running ASAN tests on Tidy.
2016-03-06 16:31:00 +00:00
* Issue #379 - Ensure only 0 to 255 passed to 'isspace' to avoid debug assert
Issue #207 - deal with 2 cases of an unambiguous ampersand. html5 allows a naked ampersand unquoted, and now tidy will not issue a warning. This only deals with a & b, and P&<li>O</li> More may need to be done for other cases.
2015-06-24 11:05:06 +00:00
\*/
PPrintChar( doc, c, (mode | CDATA) );
}
new
2011-11-17 02:44:16 +00:00
else
{
PPrintChar( doc, c, mode );
}
}
}
#if 0
static void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
{
while ( *str != '\0' )
AddChar( &doc->pprint, *str++ );
}
#endif /* 0 */
static void PPrintAttrValue( TidyDocImpl* doc, uint indent,
ctmbstr value, uint delim, Bool wrappable, Bool scriptAttr )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool scriptlets = cfgBool(doc, TidyWrapScriptlets);
uint mode = PREFORMATTED | ATTRIBVALUE;
if ( wrappable )
mode = NORMAL | ATTRIBVALUE;
/* look for ASP, Tango or PHP instructions for computed attribute value */
if ( value && value[0] == '<' )
{
if ( value[1] == '%' || value[1] == '@'||
TY_(tmbstrncmp)(value, "<?php", 5) == 0 )
mode |= CDATA;
}
if ( delim == 0 )
delim = '"';
AddChar( pprint, '=' );
/* don't wrap after "=" for xml documents */
if ( !cfgBool(doc, TidyXmlOut) || cfgBool(doc, TidyXhtmlOut) )
{
SetWrap( doc, indent );
CheckWrapIndent( doc, indent );
/*
if ( !SetWrap(doc, indent) )
PCondFlushLine( doc, indent );
*/
}
AddChar( pprint, delim );
if ( value )
{
uint wraplen = cfg( doc, TidyWrapLen );
int attrStart = SetInAttrVal( pprint );
int strStart = ClearInString( pprint );
while (*value != '\0')
{
uint c = *value;
if ( wrappable && c == ' ' )
SetWrapAttr( doc, indent, attrStart, strStart );
if ( wrappable && pprint->wraphere > 0 &&
GetSpaces(pprint) + pprint->linelen >= wraplen )
WrapAttrVal( doc );
if ( c == delim )
{
ctmbstr entity = (c == '"' ? "&quot;" : "&#39;");
AddString( pprint, entity );
++value;
continue;
}
else if (c == '"')
{
if ( cfgBool(doc, TidyQuoteMarks) )
AddString( pprint, "&quot;" );
else
AddChar( pprint, c );
if ( delim == '\'' && scriptAttr && scriptlets )
strStart = ToggleInString( pprint );
++value;
continue;
}
else if ( c == '\'' )
{
if ( cfgBool(doc, TidyQuoteMarks) )
AddString( pprint, "&#39;" );
else
AddChar( pprint, c );
if ( delim == '"' && scriptAttr && scriptlets )
strStart = ToggleInString( pprint );
++value;
continue;
}
/* look for UTF-8 multibyte character */
if ( c > 0x7F )
value += TY_(GetUTF8)( value, &c );
++value;
if ( c == '\n' )
{
/* No indent inside Javascript literals */
TY_(PFlushLine)( doc, (strStart < 0
&& !cfgBool(doc, TidyLiteralAttribs) ?
indent : 0) );
continue;
}
PPrintChar( doc, c, mode );
}
ClearInAttrVal( pprint );
ClearInString( pprint );
}
AddChar( pprint, delim );
}
static uint AttrIndent( TidyDocImpl* doc, Node* node, AttVal* ARG_UNUSED(attr) )
{
uint spaces = cfg( doc, TidyIndentSpaces );
uint xtra = 2; /* 1 for the '<', another for the ' ' */
if ( node->element == NULL )
return spaces;
if ( !TY_(nodeHasCM)(node, CM_INLINE) ||
!ShouldIndent(doc, node->parent ? node->parent: node) )
return xtra + TY_(tmbstrlen)( node->element );
if ( NULL != (node = TY_(FindContainer)(node)) )
return xtra + TY_(tmbstrlen)( node->element );
return spaces;
}
static Bool AttrNoIndentFirst( /*TidyDocImpl* doc,*/ Node* node, AttVal* attr )
{
return ( attr==node->attributes );
/*&&
( InsideHead(doc, node) ||
!TY_(nodeHasCM)(node, CM_INLINE) ) );
*/
}
static void PPrintAttribute( TidyDocImpl* doc, uint indent,
Node *node, AttVal *attr )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool xmlOut = cfgBool( doc, TidyXmlOut );
Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut );
Bool wrapAttrs = cfgBool( doc, TidyWrapAttVals );
Fixed cause of assertions -- funny, these don't pop up in XCode.
2017-05-12 11:30:20 +00:00
uint ucAttrs = cfg( doc, TidyUpperCaseAttrs );
new
2011-11-17 02:44:16 +00:00
Bool indAttrs = cfgBool( doc, TidyIndentAttributes );
uint xtra = AttrIndent( doc, node, attr );
Bool first = AttrNoIndentFirst( /*doc,*/ node, attr );
tmbstr name = attr->attribute;
Bool wrappable = no;
tchar c;
/* fix for odd attribute indentation bug triggered by long values */
if (!indAttrs)
xtra = 0;
if ( indAttrs )
{
if ( TY_(nodeIsElement)(node) && !first )
{
indent += xtra;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
else
indAttrs = no;
}
CheckWrapIndent( doc, indent );
if ( !xmlOut && !xhtmlOut && attr->dict )
{
if ( TY_(IsScript)(doc, name) )
wrappable = cfgBool( doc, TidyWrapScriptlets );
Don't line-wrap title attr. Thx Oliver Prygotzki. Fixes #28.
2012-04-07 06:58:28 +00:00
else if (!(attrIsCONTENT(attr) || attrIsVALUE(attr) || attrIsALT(attr) || attrIsTITLE(attr)) && wrapAttrs )
new
2011-11-17 02:44:16 +00:00
wrappable = yes;
}
if ( !first && !SetWrap(doc, indent) )
{
TY_(PFlushLine)( doc, indent+xtra ); /* Put it on next line */
}
else if ( pprint->linelen > 0 )
{
AddChar( pprint, ' ' );
}
/* Attribute name */
while (*name)
{
c = (unsigned char)*name;
if (c > 0x7F)
name += TY_(GetUTF8)(name, &c);
Initial take on issue 365. This is based off of the simplification of the parser and picklist system. Console application needs to be updated to fix the description, as it shows autobool, and for some reason on the current system I'm not getting assertion failures.
2017-05-11 22:12:56 +00:00
else if (ucAttrs == TidyUppercaseYes)
new
2011-11-17 02:44:16 +00:00
c = TY_(ToUpper)(c);
AddChar(pprint, c);
++name;
}
/* fix for bug 732038 */
#if 0
/* If not indenting attributes, bump up indent for
** value after putting out name.
*/
if ( !indAttrs )
indent += xtra;
#endif
CheckWrapIndent( doc, indent );
if ( attr->value == NULL )
{
Bool isB = TY_(IsBoolAttribute)(attr);
Bool scriptAttr = TY_(attrIsEvent)(attr);
if ( xmlOut )
PPrintAttrValue( doc, indent, isB ? attr->attribute : NULLSTR,
attr->delim, no, scriptAttr );
else if ( !isB && !TY_(IsNewNode)(node) )
PPrintAttrValue( doc, indent, "", attr->delim, yes, scriptAttr );
else
SetWrap( doc, indent );
}
else
PPrintAttrValue( doc, indent, attr->value, attr->delim, wrappable, no );
}
static void PPrintAttrs( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
AttVal* av;
/* add xml:space attribute to pre and other elements */
if ( cfgBool(doc, TidyXmlOut) && cfgBool(doc, TidyXmlSpace) &&
!TY_(GetAttrByName)(node, "xml:space") &&
TY_(XMLPreserveWhiteSpace)(doc, node) )
{
TY_(AddAttribute)( doc, node, "xml:space", "preserve" );
}
for ( av = node->attributes; av; av = av->next )
{
if ( av->attribute != NULL )
{
PPrintAttribute( doc, indent, node, av );
}
else if ( av->asp != NULL )
{
AddChar( pprint, ' ' );
PPrintAsp( doc, indent, av->asp );
}
else if ( av->php != NULL )
{
AddChar( pprint, ' ' );
PPrintPhp( doc, indent, av->php );
}
}
}
Bool TY_(TextNodeEndWithSpace)( Lexer *lexer, Node *node )
{
if (TY_(nodeIsText)(node) && node->end > node->start)
{
uint i, c = '\0'; /* initialised to avoid warnings */
for (i = node->start; i < node->end; ++i)
{
c = (byte) lexer->lexbuf[i];
if ( c > 0x7F )
i += TY_(GetUTF8)( lexer->lexbuf + i, &c );
}
if ( c == ' ' || c == '\n' )
return yes;
}
return no;
}
/*
Line can be wrapped immediately after inline start tag provided
if follows a text node ending in a space, or it follows a <br>,
or its parent is an inline element that that rule applies to.
This behaviour was reverse engineered from Netscape 3.0.
Line wrapping can occur if an element is not empty and before a block
level. For instance:
<p><span>
x</span>y</p>
will display properly. Whereas
<p><img />
x</p> won't.
*/
static Bool AfterSpaceImp(Lexer *lexer, Node *node, Bool isEmpty)
{
Node *prev;
if ( !TY_(nodeCMIsInline)(node) )
return yes;
prev = node->prev;
if (prev)
{
if (TY_(nodeIsText)(prev))
return TY_(TextNodeEndWithSpace)( lexer, prev );
else if (nodeIsBR(prev))
return yes;
return no;
}
if ( isEmpty && !TY_(nodeCMIsInline)(node->parent) )
return no;
return AfterSpaceImp(lexer, node->parent, isEmpty);
}
static Bool AfterSpace(Lexer *lexer, Node *node)
{
return AfterSpaceImp(lexer, node, TY_(nodeCMIsEmpty)(node));
}
Print end tag for self-closing tag When we output HTML5 and we encounter a self-closing tag we have to output an end tag to be standard conform. This fixes issue #111.
2014-01-09 16:38:41 +00:00
static void PPrintEndTag( TidyDocImpl* doc, uint ARG_UNUSED(mode),
uint ARG_UNUSED(indent), Node *node );
Issue #162 - fix for this while hopefully maintaining #111 fix. The fix for #111 added an end tag for all StartEnd tags, when outputting HTML5, but there should be some exceptions to this. Added a new service, isVoidElement(node) for the void elements. Perhaps this service could be further optimised.
2015-02-24 16:47:09 +00:00
/*\
* See Issue #162 - void elements also get a closing tag, like img, br, ...
*
* from : http://www.w3.org/TR/html-markup/syntax.html#syntax-elements
* A complete list of the void elements in HTML:
* area, base, br, col, command, embed, hr, img, input, keygen, link, meta, param, source, track, wbr
*
* This could be sped up by NOT using the macro nodeIsXXXX, since this repeatedly checks the node,
* and then the node->tag, which here are checked at the beginning...
*
* Some have already been done... at least where no macro yet exists.
*
* And maybe a switch(id) case would be faster.
\*/
static Bool TY_(isVoidElement)( Node *node )
{
TidyTagId id;
if ( !node )
return no;
if ( !node->tag )
return no;
id = node->tag->id;
if (nodeIsAREA(node))
return yes;
if (nodeIsBASE(node))
return yes;
if (nodeIsBR(node))
return yes;
if (nodeIsCOL(node))
return yes;
/* if (nodeIsCOMMAND(node)) */
if (id == TidyTag_COMMAND)
return yes;
if (nodeIsEMBED(node))
return yes;
if (nodeIsHR(node))
return yes;
if (nodeIsIMG(node))
return yes;
if (nodeIsINPUT(node))
return yes;
/* if (nodeIsKEYGEN(node)) */
if (id == TidyTag_KEYGEN )
return yes;
if (nodeIsLINK(node))
return yes;
if (nodeIsMETA(node))
return yes;
if (nodeIsPARAM(node))
return yes;
/* if (nodeIsSOURCE(node)) */
if (id == TidyTag_SOURCE )
return yes;
/* if (nodeIsTRACK(node)) */
if (id == TidyTag_TRACK )
return yes;
if (nodeIsWBR(node))
return yes;
return no;
}
new
2011-11-17 02:44:16 +00:00
static void PPrintTag( TidyDocImpl* doc,
uint mode, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool uc = cfgBool( doc, TidyUpperCaseTags );
Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut );
Bool xmlOut = cfgBool( doc, TidyXmlOut );
tchar c;
tmbstr s = node->element;
AddChar( pprint, '<' );
if ( node->type == EndTag )
AddChar( pprint, '/' );
if (s)
{
while (*s)
{
c = (unsigned char)*s;
if (c > 0x7F)
s += TY_(GetUTF8)(s, &c);
else if (uc)
c = TY_(ToUpper)(c);
AddChar(pprint, c);
++s;
}
}
PPrintAttrs( doc, indent, node );
if ( (xmlOut || xhtmlOut) &&
(node->type == StartEndTag || TY_(nodeCMIsEmpty)(node)) )
{
AddChar( pprint, ' ' ); /* Space is NS compatibility hack <br /> */
AddChar( pprint, '/' ); /* Required end tag marker */
}
AddChar( pprint, '>' );
Issue #162 - fix for this while hopefully maintaining #111 fix. The fix for #111 added an end tag for all StartEnd tags, when outputting HTML5, but there should be some exceptions to this. Added a new service, isVoidElement(node) for the void elements. Perhaps this service could be further optimised.
2015-02-24 16:47:09 +00:00
/*\
* Appears this was added for Issue #111, #112, #113, but will now add an end tag
* for elements like <img ...> which do NOT have an EndTag, even in html5
* See Issue #162 - void elements also get a closing tag, like img, br, ...
* A complete list of the void elements in HTML:
* area, base, br, col, command, embed, hr, img, input, keygen, link, meta, param, source, track, wbr
\*/
if ((node->type == StartEndTag && TY_(HTMLVersion)(doc) == HT50) && !TY_(isVoidElement)(node) )
Print end tag for self-closing tag When we output HTML5 and we encounter a self-closing tag we have to output an end tag to be standard conform. This fixes issue #111.
2014-01-09 16:38:41 +00:00
{
PPrintEndTag( doc, mode, indent, node );
}
if ( (node->type != StartEndTag || xhtmlOut || (node->type == StartEndTag && TY_(HTMLVersion)(doc) == HT50)) && !(mode & PREFORMATTED) )
new
2011-11-17 02:44:16 +00:00
{
uint wraplen = cfg( doc, TidyWrapLen );
CheckWrapIndent( doc, indent );
if ( indent + pprint->linelen < wraplen )
{
/* wrap after start tag if is <br/> or if it's not inline.
Technically, it would be safe to call only AfterSpace.
However, it would disrupt the existing algorithm. So let's
leave as is. Note that AfterSpace returns true for non inline
elements but can still be false for some <br>. So it has to
stay as well. */
if (!(mode & NOWRAP)
&& (!TY_(nodeCMIsInline)(node) || nodeIsBR(node))
&& AfterSpace(doc->lexer, node))
{
pprint->wraphere = pprint->linelen;
}
}
/* flush the current buffer only if it is known to be safe,
i.e. it will not introduce some spurious white spaces.
See bug #996484 */
else if ( mode & NOWRAP ||
nodeIsBR(node) || AfterSpace(doc->lexer, node))
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
}
static void PPrintEndTag( TidyDocImpl* doc, uint ARG_UNUSED(mode),
uint ARG_UNUSED(indent), Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool uc = cfgBool( doc, TidyUpperCaseTags );
tmbstr s = node->element;
tchar c;
/*
Netscape ignores SGML standard by not ignoring a
line break before </A> or </U> etc. To avoid rendering
this as an underlined space, I disable line wrapping
before inline end tags by the #if 0 ... #endif
*/
#if 0
if ( !(mode & NOWRAP) )
SetWrap( doc, indent );
#endif
AddString( pprint, "</" );
if (s)
{
while (*s)
{
c = (unsigned char)*s;
if (c > 0x7F)
s += TY_(GetUTF8)(s, &c);
else if (uc)
c = TY_(ToUpper)(c);
AddChar(pprint, c);
++s;
}
}
AddChar( pprint, '>' );
}
static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
{
TidyPrintImpl* pprint = &doc->pprint;
SetWrap( doc, indent );
AddString( pprint, "<!--" );
#if 0
SetWrap( doc, indent );
#endif
PPrintText(doc, COMMENT, 0, node);
#if 0
SetWrap( doc, indent );
AddString( pprint, "--" );
#endif
AddString(pprint, "--");
AddChar( pprint, '>' );
if ( node->linebreak && node->next )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
static void PPrintDocType( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
uint wraplen = cfg( doc, TidyWrapLen );
uint spaces = cfg( doc, TidyIndentSpaces );
AttVal* fpi = TY_(GetAttrByName)(node, "PUBLIC");
AttVal* sys = TY_(GetAttrByName)(node, "SYSTEM");
/* todo: handle non-ASCII characters in FPI / SI / node->element */
SetWrap( doc, indent );
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
AddString( pprint, "<!DOCTYPE " );
SetWrap( doc, indent );
if (node->element)
{
AddString(pprint, node->element);
}
if (fpi && fpi->value)
{
AddString(pprint, " PUBLIC ");
AddChar(pprint, fpi->delim);
AddString(pprint, fpi->value);
AddChar(pprint, fpi->delim);
}
if (fpi && fpi->value && sys && sys->value)
{
uint i = pprint->linelen - (TY_(tmbstrlen)(sys->value) + 2) - 1;
if (!(i>0&&TY_(tmbstrlen)(sys->value)+2+i<wraplen&&i<=(spaces?spaces:2)*2))
i = 0;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart(doc, i);
new
2011-11-17 02:44:16 +00:00
if (pprint->linelen)
AddChar(pprint, ' ');
}
else if (sys && sys->value)
{
AddString(pprint, " SYSTEM ");
}
if (sys && sys->value)
{
AddChar(pprint, sys->delim);
AddString(pprint, sys->value);
AddChar(pprint, sys->delim);
}
if (node->content)
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart(doc, indent);
new
2011-11-17 02:44:16 +00:00
AddChar(pprint, '[');
PPrintText(doc, CDATA, 0, node->content);
AddChar(pprint, ']');
}
SetWrap( doc, 0 );
AddChar( pprint, '>' );
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
static void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
tchar c;
tmbstr s;
SetWrap( doc, indent );
AddString( pprint, "<?" );
s = node->element;
while (s && *s)
{
c = (unsigned char)*s;
if (c > 0x7F)
s += TY_(GetUTF8)(s, &c);
AddChar(pprint, c);
++s;
}
/* set CDATA to pass < and > unescaped */
PPrintText( doc, CDATA, indent, node );
if (cfgBool(doc, TidyXmlOut) ||
cfgBool(doc, TidyXhtmlOut) || node->closed)
AddChar( pprint, '?' );
AddChar( pprint, '>' );
PCondFlushLine( doc, indent );
}
static void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
{
AttVal* att;
uint saveWrap;
TidyPrintImpl* pprint = &doc->pprint;
Bool ucAttrs;
SetWrap( doc, indent );
saveWrap = WrapOff( doc );
/* no case translation for XML declaration pseudo attributes */
Initial take on issue 365. This is based off of the simplification of the parser and picklist system. Console application needs to be updated to fix the description, as it shows autobool, and for some reason on the current system I'm not getting assertion failures.
2017-05-11 22:12:56 +00:00
ucAttrs = cfg(doc, TidyUpperCaseAttrs);
TY_(SetOptionInt)(doc, TidyUpperCaseAttrs, no);
new
2011-11-17 02:44:16 +00:00
AddString( pprint, "<?xml" );
/* Force order of XML declaration attributes */
/* PPrintAttrs( doc, indent, node ); */
if ( NULL != (att = TY_(AttrGetById)(node, TidyAttr_VERSION)) )
PPrintAttribute( doc, indent, node, att );
if ( NULL != (att = TY_(AttrGetById)(node, TidyAttr_ENCODING)) )
PPrintAttribute( doc, indent, node, att );
if ( NULL != (att = TY_(GetAttrByName)(node, "standalone")) )
PPrintAttribute( doc, indent, node, att );
/* restore old config value */
Initial take on issue 365. This is based off of the simplification of the parser and picklist system. Console application needs to be updated to fix the description, as it shows autobool, and for some reason on the current system I'm not getting assertion failures.
2017-05-11 22:12:56 +00:00
TY_(SetOptionInt)(doc, TidyUpperCaseAttrs, ucAttrs);
new
2011-11-17 02:44:16 +00:00
if ( node->end <= 0 || doc->lexer->lexbuf[node->end - 1] != '?' )
AddChar( pprint, '?' );
AddChar( pprint, '>' );
WrapOn( doc, saveWrap );
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
/* note ASP and JSTE share <% ... %> syntax */
static void PPrintAsp( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool wrapAsp = cfgBool( doc, TidyWrapAsp );
Bool wrapJste = cfgBool( doc, TidyWrapJste );
uint saveWrap = WrapOffCond( doc, !wrapAsp || !wrapJste );
#if 0
SetWrap( doc, indent );
#endif
AddString( pprint, "<%" );
PPrintText( doc, (wrapAsp ? CDATA : COMMENT), indent, node );
AddString( pprint, "%>" );
/* PCondFlushLine( doc, indent ); */
WrapOn( doc, saveWrap );
}
/* JSTE also supports <# ... #> syntax */
static void PPrintJste( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool wrapAsp = cfgBool( doc, TidyWrapAsp );
uint saveWrap = WrapOffCond( doc, !wrapAsp );
AddString( pprint, "<#" );
PPrintText( doc, (cfgBool(doc, TidyWrapJste) ? CDATA : COMMENT),
indent, node );
AddString( pprint, "#>" );
/* PCondFlushLine( doc, indent ); */
WrapOn( doc, saveWrap );
}
/* PHP is based on XML processing instructions */
static void PPrintPhp( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool wrapPhp = cfgBool( doc, TidyWrapPhp );
uint saveWrap = WrapOffCond( doc, !wrapPhp );
#if 0
SetWrap( doc, indent );
#endif
AddString( pprint, "<?" );
PPrintText( doc, (wrapPhp ? CDATA : COMMENT),
indent, node );
AddString( pprint, "?>" );
/* PCondFlushLine( doc, indent ); */
WrapOn( doc, saveWrap );
}
static void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
{
uint saveWrap;
TidyPrintImpl* pprint = &doc->pprint;
Bool indentCData = cfgBool( doc, TidyIndentCdata );
if ( !indentCData )
indent = 0;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
saveWrap = WrapOff( doc ); /* disable wrapping */
AddString( pprint, "<![CDATA[" );
PPrintText( doc, COMMENT, indent, node );
AddString( pprint, "]]>" );
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
WrapOn( doc, saveWrap ); /* restore wrapping */
}
static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Bool wrapSect = cfgBool( doc, TidyWrapSection );
uint saveWrap = WrapOffCond( doc, !wrapSect );
#if 0
SetWrap( doc, indent );
#endif
AddString( pprint, "<![" );
PPrintText( doc, (wrapSect ? CDATA : COMMENT),
indent, node );
AddString( pprint, "]>" );
/* PCondFlushLine( doc, indent ); */
WrapOn( doc, saveWrap );
}
#if 0
/*
** Print script and style elements. For XHTML, wrap the content as follows:
**
** JavaScript:
** //<![CDATA[
** content
** //]]>
** VBScript:
** '<![CDATA[
** content
** ']]>
** CSS:
** / *<![CDATA[* / Extra spaces to keep compiler happy
** content
** / *]]>* /
** other:
** <![CDATA[
** content
** ]]>
*/
#endif
static ctmbstr CDATA_START = "<![CDATA[";
static ctmbstr CDATA_END = "]]>";
static ctmbstr JS_COMMENT_START = "//";
static ctmbstr JS_COMMENT_END = "";
static ctmbstr VB_COMMENT_START = "\'";
static ctmbstr VB_COMMENT_END = "";
static ctmbstr CSS_COMMENT_START = "/*";
static ctmbstr CSS_COMMENT_END = "*/";
static ctmbstr DEFAULT_COMMENT_START = "";
static ctmbstr DEFAULT_COMMENT_END = "";
static Bool InsideHead( TidyDocImpl* doc, Node *node )
{
if ( nodeIsHEAD(node) )
return yes;
if ( node->parent != NULL )
return InsideHead( doc, node->parent );
return no;
}
/* Is text node and already ends w/ a newline?
Used to pretty print CDATA/PRE text content.
If it already ends on a newline, it is not
necessary to print another before printing end tag.
*/
static int TextEndsWithNewline(Lexer *lexer, Node *node, uint mode )
{
if ( (mode & (CDATA|COMMENT)) && TY_(nodeIsText)(node) && node->end > node->start )
{
uint ch, ix = node->end - 1;
Issue #379 - Care about 'ix' going negative. How this lasted so long in the code is a mystery! But of course it will only be a read out-of-bounds if testing the first character in the lexer, and it is a spacey char. A big thanks to @gaa-cifasis for running ASAN tests on Tidy.
2016-03-06 16:31:00 +00:00
/*\
* Skip non-newline whitespace.
* Issue #379 - Only if ix is GT start can it be decremented!
\*/
while ( ix > node->start && (ch = (lexer->lexbuf[ix] & 0xff))
&& ( ch == ' ' || ch == '\t' || ch == '\r' ) )
new
2011-11-17 02:44:16 +00:00
--ix;
if ( lexer->lexbuf[ ix ] == '\n' )
return node->end - ix - 1; /* #543262 tidy eats all memory */
}
return -1;
}
Issue #133 - hopefully a better fix. As predicted the previous fix had adverse consequences on say script text, which then lost the indent, and was reverted. This introduces a new service, nodeIsTextLike, which naturally returns yes if it is text, but also is an AspTag. Maybe other text like nodes need to be added.
2015-02-12 14:20:16 +00:00
/*\
* Issue #133 - creeping indent - a very OLD bug - 2nd tidy run increases the indent!
* If the node is text, then remove any white space equal to the indent,
* but this also applies to the AspTag, which is text like...
* And may apply to other text like nodes as well.
*
* Here the total white space is returned, and then a sister service, IncrWS()
* will advance the start of the lexer output by the amount of the indent.
\*/
static Bool TY_(nodeIsTextLike)( Node *node )
{
if ( TY_(nodeIsText)(node) )
return yes;
if ( node->type == AspTag )
return yes;
Issue #392 - a simple fix, but maybe incomplete
2017-05-20 22:18:43 +00:00
if (node->type == PhpTag)
return yes; /* Issue #392 */
Issue #133 - hopefully a better fix. As predicted the previous fix had adverse consequences on say script text, which then lost the indent, and was reverted. This introduces a new service, nodeIsTextLike, which naturally returns yes if it is text, but also is an AspTag. Maybe other text like nodes need to be added.
2015-02-12 14:20:16 +00:00
/* add other text like nodes... */
return no;
}
new
2011-11-17 02:44:16 +00:00
static int TextStartsWithWhitespace( Lexer *lexer, Node *node, uint start, uint mode )
{
assert( node != NULL );
Issue #133 - hopefully a better fix. As predicted the previous fix had adverse consequences on say script text, which then lost the indent, and was reverted. This introduces a new service, nodeIsTextLike, which naturally returns yes if it is text, but also is an AspTag. Maybe other text like nodes need to be added.
2015-02-12 14:20:16 +00:00
if ( (mode & (CDATA|COMMENT)) && TY_(nodeIsTextLike)(node) && node->end > node->start && start >= node->start )
new
2011-11-17 02:44:16 +00:00
{
uint ch, ix = start;
/* Skip whitespace. */
while ( ix < node->end && (ch = (lexer->lexbuf[ix] & 0xff))
&& ( ch==' ' || ch=='\t' || ch=='\r' ) )
++ix;
if ( ix > start )
return ix - start;
}
return -1;
}
static Bool HasCDATA( Lexer* lexer, Node* node )
{
/* Scan forward through the textarray. Since the characters we're
** looking for are < 0x7f, we don't have to do any UTF-8 decoding.
*/
ctmbstr start = lexer->lexbuf + node->start;
int len = node->end - node->start + 1;
if ( node->type != TextNode )
return no;
return ( NULL != TY_(tmbsubstrn)( start, len, CDATA_START ));
}
static
void PPrintScriptStyle( TidyDocImpl* doc, uint mode, uint indent, Node *node )
{
TidyPrintImpl* pprint = &doc->pprint;
Node* content;
ctmbstr commentStart = DEFAULT_COMMENT_START;
ctmbstr commentEnd = DEFAULT_COMMENT_END;
Bool hasCData = no;
int contentIndent = -1;
Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut );
if ( InsideHead(doc, node) )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent ); /* Issue #56 - long oustanding bug - flush any existing closing tag */
Oops, that fix should be after a potential new line in head
2015-01-26 11:23:41 +00:00
new
2011-11-17 02:44:16 +00:00
PPrintTag( doc, mode, indent, node );
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.
2017-02-08 18:53:37 +00:00
/* 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);
new
2011-11-17 02:44:16 +00:00
if ( xhtmlOut && node->content != NULL )
{
AttVal* type = attrGetTYPE(node);
if (AttrValueIs(type, "text/javascript"))
{
commentStart = JS_COMMENT_START;
commentEnd = JS_COMMENT_END;
}
else if (AttrValueIs(type, "text/css"))
{
commentStart = CSS_COMMENT_START;
commentEnd = CSS_COMMENT_END;
}
else if (AttrValueIs(type, "text/vbscript"))
{
commentStart = VB_COMMENT_START;
commentEnd = VB_COMMENT_END;
}
hasCData = HasCDATA(doc->lexer, node->content);
if (!hasCData)
{
uint saveWrap = WrapOff( doc );
AddString( pprint, commentStart );
AddString( pprint, CDATA_START );
AddString( pprint, commentEnd );
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
WrapOn( doc, saveWrap );
}
}
for ( content = node->content;
content != NULL;
content = content->next )
{
/*
This is a bit odd, with the current code there can only
be one child and the only caller of this function defines
all these modes already...
*/
TY_(PPrintTree)( doc, (mode | PREFORMATTED | NOWRAP | CDATA),
indent, content );
if ( content == node->last )
contentIndent = TextEndsWithNewline( doc->lexer, content, CDATA );
}
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.
2017-02-08 18:53:37 +00:00
/* 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 )
new
2011-11-17 02:44:16 +00:00
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
contentIndent = 0;
}
if ( xhtmlOut && node->content != NULL )
{
if ( ! hasCData )
{
uint saveWrap = WrapOff( doc );
AddString( pprint, commentStart );
AddString( pprint, CDATA_END );
AddString( pprint, commentEnd );
WrapOn( doc, saveWrap );
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
}
if ( node->content && pprint->indent[ 0 ].spaces != (int)indent )
{
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
new
2011-11-17 02:44:16 +00:00
pprint->indent[ 0 ].spaces = indent;
}
PPrintEndTag( doc, mode, indent, node );
if ( cfgAutoBool(doc, TidyIndentContent) == TidyNoState
&& node->next != NULL &&
!( TY_(nodeHasCM)(node, CM_INLINE) || TY_(nodeIsText)(node) ) )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
static Bool ShouldIndent( TidyDocImpl* doc, Node *node )
{
TidyTriState indentContent = cfgAutoBool( doc, TidyIndentContent );
if ( indentContent == TidyNoState )
return no;
if ( nodeIsTEXTAREA(node) )
return no;
if ( indentContent == TidyAutoState )
{
if ( node->content && TY_(nodeHasCM)(node, CM_NO_INDENT) )
{
for ( node = node->content; node; node = node->next )
if ( TY_(nodeHasCM)(node, CM_BLOCK) )
return yes;
return no;
}
if ( TY_(nodeHasCM)(node, CM_HEADING) )
return no;
if ( nodeIsHTML(node) )
return no;
if ( nodeIsP(node) )
return no;
if ( nodeIsTITLE(node) )
return no;
/* http://tidy.sf.net/issue/1610888
Indenting <div><img /></div> produces spurious lines with IE 6.x */
if ( nodeIsDIV(node) && node->last && nodeIsIMG(node->last) )
return no;
}
if ( TY_(nodeHasCM)(node, CM_FIELD | CM_OBJECT) )
return yes;
if ( nodeIsMAP(node) )
return yes;
return ( !TY_(nodeHasCM)( node, CM_INLINE ) && node->content );
}
/*
Feature request #434940 - fix by Dave Raggett/Ignacio Vazquez-Abrams 21 Jun 01
print just the content of the body element.
useful when you want to reuse material from
other documents.
-- Sebastiano Vigna <vigna@dsi.unimi.it>
*/
void TY_(PrintBody)( TidyDocImpl* doc )
{
Node *node = TY_(FindBody)( doc );
if ( node )
{
for ( node = node->content; node != NULL; node = node->next )
TY_(PPrintTree)( doc, NORMAL, 0, node );
}
}
Issue #130 - MathML attr and entity fix! This is a set of kludgy fixes for MathML attribute and entities support. It is intended that a full HTML5 entity table be added at some time, but at present ALL entities are accepted as written when within the math element. Likewise all attributes are accepted on MathML elements without any check of their name or value, even if they match attributes outside MathML. And in the pprinter such entities are written as is from the lexer, using a new PPrintMathML service added, using the new mode OtherNameSpace. It is hoped all these fixes will NOT effect tidy outside the math element. ALL fixes in the set a clearly marked '#130 - MathML attr and entity fix!' for easy searching, and improving if possible.
2015-02-22 17:44:14 +00:00
/* #130 MathML attr and entity fix!
Support MathML namepsace */
static void PPrintMathML( TidyDocImpl* doc, uint indent, Node *node )
{
Node *content;
uint mode = OtherNamespace;
PPrintTag( doc, mode, indent, node );
for ( content = node->content; content; content = content->next )
TY_(PPrintTree)( doc, mode, indent, content );
PPrintEndTag( doc, mode, indent, node );
}
new
2011-11-17 02:44:16 +00:00
void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
{
Node *content, *last;
uint spaces = cfg( doc, TidyIndentSpaces );
Bool xhtml = cfgBool( doc, TidyXhtmlOut );
if ( node == NULL )
return;
Tidying progress callback implemented.
2015-11-28 07:34:23 +00:00
if (doc->progressCallback)
{
Callback added to XML printer, too; fixed off-by-one error.
2015-11-28 23:39:33 +00:00
doc->progressCallback( tidyImplToDoc(doc), node->line, node->column, doc->pprint.line + 1 );
Tidying progress callback implemented.
2015-11-28 07:34:23 +00:00
}
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_PPRINT)
dbg_show_node( doc, node, 4, GetSpaces( &doc->pprint ) );
#endif
new
2011-11-17 02:44:16 +00:00
if (node->type == TextNode)
{
PPrintText( doc, mode, indent, node );
}
else if ( node->type == CommentTag )
{
PPrintComment( doc, indent, node );
}
else if ( node->type == RootNode )
{
for ( content = node->content; content; content = content->next )
TY_(PPrintTree)( doc, mode, indent, content );
}
else if ( node->type == DocTypeTag )
PPrintDocType( doc, indent, node );
else if ( node->type == ProcInsTag)
PPrintPI( doc, indent, node );
else if ( node->type == XmlDecl)
PPrintXmlDecl( doc, indent, node );
else if ( node->type == CDATATag)
PPrintCDATA( doc, indent, node );
else if ( node->type == SectionTag)
PPrintSection( doc, indent, node );
else if ( node->type == AspTag)
PPrintAsp( doc, indent, node );
else if ( node->type == JsteTag)
PPrintJste( doc, indent, node );
else if ( node->type == PhpTag)
PPrintPhp( doc, indent, node );
Issue #130 - MathML attr and entity fix! This is a set of kludgy fixes for MathML attribute and entities support. It is intended that a full HTML5 entity table be added at some time, but at present ALL entities are accepted as written when within the math element. Likewise all attributes are accepted on MathML elements without any check of their name or value, even if they match attributes outside MathML. And in the pprinter such entities are written as is from the lexer, using a new PPrintMathML service added, using the new mode OtherNameSpace. It is hoped all these fixes will NOT effect tidy outside the math element. ALL fixes in the set a clearly marked '#130 - MathML attr and entity fix!' for easy searching, and improving if possible.
2015-02-22 17:44:14 +00:00
else if ( nodeIsMATHML(node) )
PPrintMathML( doc, indent, node ); /* #130 MathML attr and entity fix! */
new
2011-11-17 02:44:16 +00:00
else if ( TY_(nodeCMIsEmpty)(node) ||
(node->type == StartEndTag && !xhtml) )
{
add comment only for potential fix of Issue #8
2015-02-10 14:32:05 +00:00
/* Issue #8 - flush to new line?
maybe use if ( TY_(nodeHasCM)(node, CM_BLOCK) ) instead
or remove the CM_INLINE from the tag
*/
new
2011-11-17 02:44:16 +00:00
if ( ! TY_(nodeHasCM)(node, CM_INLINE) )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
if ( nodeIsBR(node) && node->prev &&
!(nodeIsBR(node->prev) || (mode & PREFORMATTED)) &&
cfgBool(doc, TidyBreakBeforeBR) )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
if ( nodeIsHR(node) )
{
/* insert extra newline for classic formatting */
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
Bool classic = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
new
2011-11-17 02:44:16 +00:00
if (classic && node->parent && node->parent->content != node)
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
}
PPrintTag( doc, mode, indent, node );
if (node->next)
{
if (nodeIsPARAM(node) || nodeIsAREA(node))
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart(doc, indent);
new
2011-11-17 02:44:16 +00:00
else if ((nodeIsBR(node) && !(mode & PREFORMATTED))
|| nodeIsHR(node))
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)(doc, indent);
new
2011-11-17 02:44:16 +00:00
}
}
else /* some kind of container element */
{
if ( node->type == StartEndTag )
node->type = StartTag;
if ( node->tag &&
(node->tag->parser == TY_(ParsePre) || nodeIsTEXTAREA(node)) )
{
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
Bool classic = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
new
2011-11-17 02:44:16 +00:00
uint indprev = indent;
merge @camoy fix #158 to this branch
2015-07-17 17:00:16 +00:00
PCondFlushLineSmart( doc, indent ); /* about to add <pre> tag - clear any previous */
new
2011-11-17 02:44:16 +00:00
/* insert extra newline for classic formatting */
if (classic && node->parent && node->parent->content != node)
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
merge @camoy fix #158 to this branch
2015-07-17 17:00:16 +00:00
PPrintTag( doc, mode, indent, node ); /* add <pre> or <textarea> tag */
new
2011-11-17 02:44:16 +00:00
indent = 0;
merge @camoy fix #158 to this branch
2015-07-17 17:00:16 +00:00
/* @camoy Fix #158 - remove inserted newlines in pre - TY_(PFlushLineSmart)( doc, indent ); */
new
2011-11-17 02:44:16 +00:00
for ( content = node->content; content; content = content->next )
{
TY_(PPrintTree)( doc, (mode | PREFORMATTED | NOWRAP),
indent, content );
}
merge @camoy fix #158 to this branch
2015-07-17 17:00:16 +00:00
/* @camoy Fix #158 - remove inserted newlines in pre - PCondFlushLineSmart( doc, indent ); */
new
2011-11-17 02:44:16 +00:00
indent = indprev;
PPrintEndTag( doc, mode, indent, node );
if ( cfgAutoBool(doc, TidyIndentContent) == TidyNoState
&& node->next != NULL )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
else if ( nodeIsSTYLE(node) || nodeIsSCRIPT(node) )
{
PPrintScriptStyle( doc, (mode | PREFORMATTED | NOWRAP | CDATA),
indent, node );
}
else if ( TY_(nodeCMIsInline)(node) )
{
if ( cfgBool(doc, TidyMakeClean) )
{
/* replace <nobr>...</nobr> by &nbsp; or &#160; etc. */
if ( nodeIsNOBR(node) )
{
for ( content = node->content;
content != NULL;
content = content->next)
TY_(PPrintTree)( doc, mode|NOWRAP, indent, content );
return;
}
}
/* otherwise a normal inline element */
PPrintTag( doc, mode, indent, node );
/* indent content for SELECT, TEXTAREA, MAP, OBJECT and APPLET */
if ( ShouldIndent(doc, node) )
{
indent += spaces;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
for ( content = node->content;
content != NULL;
content = content->next )
TY_(PPrintTree)( doc, mode, indent, content );
indent -= spaces;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
/* PCondFlushLine( doc, indent ); */
}
else
{
for ( content = node->content;
content != NULL;
content = content->next )
TY_(PPrintTree)( doc, mode, indent, content );
}
PPrintEndTag( doc, mode, indent, node );
}
else /* other tags */
{
Bool indcont = ( cfgAutoBool(doc, TidyIndentContent) != TidyNoState );
Issue #582 - Remove extra new line in 'classic' mode
2017-08-04 12:23:14 +00:00
/* Issue #582 - Seems this is no longer used
Bool indsmart = ( cfgAutoBool(doc, TidyIndentContent) == TidyAutoState ); */
WIP
2017-05-03 22:16:03 +00:00
Bool hideend = cfgBool( doc, TidyOmitOptionalTags );
Add macros to get TidyVertSpace config, and implement
2015-07-15 18:58:00 +00:00
Bool classic = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
new
2011-11-17 02:44:16 +00:00
uint contentIndent = indent;
/* insert extra newline for classic formatting */
if (classic && node->parent && node->parent->content != node && !nodeIsHTML(node))
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
if ( ShouldIndent(doc, node) )
contentIndent += spaces;
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
related to issue #180 - remove additional line unless 'classic'
2015-03-10 11:27:29 +00:00
/*\
* Issue #180 - with the above PCondFlushLine,
* this adds an uneccessary additional line!
* Maybe only if 'classic' ie --vertical-space yes
Issue #582 - Remove extra new line in 'classic' mode
2017-08-04 12:23:14 +00:00
* 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 );
related to issue #180 - remove additional line unless 'classic'
2015-03-10 11:27:29 +00:00
\*/
new
2011-11-17 02:44:16 +00:00
/* do not omit elements with attributes */
if ( !hideend || !TY_(nodeHasCM)(node, CM_OMITST) ||
node->attributes != NULL )
{
PPrintTag( doc, mode, indent, node );
if ( ShouldIndent(doc, node) )
{
/* fix for bug 530791, don't wrap after */
/* <li> if first child is text node */
if (!(nodeIsLI(node) && TY_(nodeIsText)(node->content)))
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, contentIndent );
new
2011-11-17 02:44:16 +00:00
}
else if ( TY_(nodeHasCM)(node, CM_HTML) || nodeIsNOFRAMES(node) ||
(TY_(nodeHasCM)(node, CM_HEAD) && !nodeIsTITLE(node)) )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, contentIndent );
new
2011-11-17 02:44:16 +00:00
}
Issue #180 - fix indenting when -omit used
2015-09-10 13:01:48 +00:00
else if ( ShouldIndent(doc, node) )
{
/*\
* Issue #180 - If the tag was NOT printed due to the -omit option,
* then reduce the bumped indent under the same ShouldIndent(doc, node)
* conditions that caused the indent to be bumped.
\*/
contentIndent -= spaces;
}
new
2011-11-17 02:44:16 +00:00
last = NULL;
for ( content = node->content; content; content = content->next )
{
/* kludge for naked text before block level tag */
if ( last && !indcont && TY_(nodeIsText)(last) &&
content->tag && !TY_(nodeHasCM)(content, CM_INLINE) )
{
/* TY_(PFlushLine)(fout, indent); */
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, contentIndent );
new
2011-11-17 02:44:16 +00:00
}
TY_(PPrintTree)( doc, mode, contentIndent, content );
last = content;
}
/* don't flush line for td and th */
if ( ShouldIndent(doc, node) ||
( !hideend &&
( TY_(nodeHasCM)(node, CM_HTML) ||
nodeIsNOFRAMES(node) ||
(TY_(nodeHasCM)(node, CM_HEAD) && !nodeIsTITLE(node))
)
)
)
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
if ( !hideend || !TY_(nodeHasCM)(node, CM_OPT) )
{
PPrintEndTag( doc, mode, indent, node );
/* TY_(PFlushLine)( doc, indent ); */
}
}
else
{
if ( !hideend || !TY_(nodeHasCM)(node, CM_OPT) )
{
/* newline before endtag for classic formatting */
if ( classic && !HasMixedContent(node) )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
PPrintEndTag( doc, mode, indent, node );
}
Issue #390 - fix indent with --hide-endtags yes. The problem was, with --hide-endtags yes, a conditional pprint buffer flush had nothing to flush, thus the indent was not adjusted. To track down this bug added a lot of MSVC Debug code, but is only existing if some additional items defined, so has no effect on the release code. This, what feels like a good fix, was first reported about 12 years ago by @OlafvdSpek in SF Bugs 563. Hopefully finally closed.
2016-04-04 16:02:26 +00:00
else if (hideend)
{
/* Issue #390 - must still deal with adjusting indent */
TidyPrintImpl* pprint = &doc->pprint;
if (pprint->indent[ 0 ].spaces != (int)indent)
{
#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
#endif
pprint->indent[ 0 ].spaces = indent;
}
}
new
2011-11-17 02:44:16 +00:00
}
if (!indcont && !hideend && !nodeIsHTML(node) && !classic)
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
else if (classic && node->next != NULL && TY_(nodeHasCM)(node, CM_LIST|CM_DEFLIST|CM_TABLE|CM_BLOCK/*|CM_HEADING*/))
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, indent );
new
2011-11-17 02:44:16 +00:00
}
}
}
void TY_(PPrintXMLTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
{
Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut );
if (node == NULL)
return;
Callback added to XML printer, too; fixed off-by-one error.
2015-11-28 23:39:33 +00:00
if (doc->progressCallback)
{
doc->progressCallback( tidyImplToDoc(doc), node->line, node->column, doc->pprint.line + 1 );
}
new
2011-11-17 02:44:16 +00:00
if ( node->type == TextNode)
{
PPrintText( doc, mode, indent, node );
}
else if ( node->type == CommentTag )
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
PPrintComment( doc, indent, node);
/* PCondFlushLine( doc, 0 ); */
}
else if ( node->type == RootNode )
{
Node *content;
for ( content = node->content;
content != NULL;
content = content->next )
TY_(PPrintXMLTree)( doc, mode, indent, content );
}
else if ( node->type == DocTypeTag )
PPrintDocType( doc, indent, node );
else if ( node->type == ProcInsTag )
PPrintPI( doc, indent, node );
else if ( node->type == XmlDecl )
PPrintXmlDecl( doc, indent, node );
else if ( node->type == CDATATag )
PPrintCDATA( doc, indent, node );
else if ( node->type == SectionTag )
PPrintSection( doc, indent, node );
else if ( node->type == AspTag )
PPrintAsp( doc, indent, node );
else if ( node->type == JsteTag)
PPrintJste( doc, indent, node );
else if ( node->type == PhpTag)
PPrintPhp( doc, indent, node );
else if ( TY_(nodeHasCM)(node, CM_EMPTY) ||
(node->type == StartEndTag && !xhtmlOut) )
{
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
PPrintTag( doc, mode, indent, node );
/* TY_(PFlushLine)( doc, indent ); */
}
else /* some kind of container element */
{
uint spaces = cfg( doc, TidyIndentSpaces );
Node *content;
Bool mixed = no;
uint cindent;
for ( content = node->content; content; content = content->next )
{
if ( TY_(nodeIsText)(content) )
{
mixed = yes;
break;
}
}
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
if ( TY_(XMLPreserveWhiteSpace)(doc, node) )
{
indent = 0;
mixed = no;
cindent = 0;
}
else if (mixed)
cindent = indent;
else
cindent = indent + spaces;
PPrintTag( doc, mode, indent, node );
if ( !mixed && node->content )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
TY_(PFlushLineSmart)( doc, cindent );
new
2011-11-17 02:44:16 +00:00
for ( content = node->content; content; content = content->next )
TY_(PPrintXMLTree)( doc, mode, cindent, content );
if ( !mixed && node->content )
Adds "smart" line flushing functions. See in-code comments for more details
2015-07-13 03:40:59 +00:00
PCondFlushLineSmart( doc, indent );
new
2011-11-17 02:44:16 +00:00
PPrintEndTag( doc, mode, indent, node );
/* PCondFlushLine( doc, indent ); */
}
}
/*
* local variables:
* mode: c
* indent-tabs-mode: nil
* c-basic-offset: 4
* eval: (c-set-offset 'substatement-open 0)
* end:
*/
Reference in a new issue Copy permalink