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

Merge branch 'deprecations' into next

Browse source
This commit is contained in:
Jim Derry 2017-05-07 15:01:49 -04:00
parent fe451eaa7d 09d1802298
commit 8244052cd1
7 changed files with 5 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
console/tidy.c
View file

@ -2261,12 +2261,6 @@ int main( int argc, char** argv )
tidyOptResetToDefault( tdoc, TidyIndentSpaces );
break;
/* Usurp -o for output file. Anyone hiding end tags?
case 'o':
tidyOptSetBool( tdoc, TidyHideEndTags, yes );
break;
*/
case 'u':
tidyOptSetBool( tdoc, TidyUpperCaseTags, yes );
break;

2
include/tidyenum.h
View file

@ -553,7 +553,6 @@ typedef enum
#endif
TidyDropEmptyElems, /**< Discard empty elements */
TidyDropEmptyParas, /**< Discard empty p elements */
TidyDropFontTags, /**< Discard presentation tags */
TidyDropPropAttrs, /**< Discard proprietary attributes */
TidyDuplicateAttrs, /**< Keep first or last duplicate attribute */
TidyEmacs, /**< If true, format error output for GNU Emacs */
@ -572,7 +571,6 @@ typedef enum
TidyForceOutput, /**< Output document even if errors were found */
TidyGDocClean, /**< Clean up HTML exported from Google Docs */
TidyHideComments, /**< Hides all (real) comments in output */
TidyHideEndTags, /**< Legacy name for TidyOmitOptionalTags */
TidyHtmlOut, /**< Output plain HTML, even for XHTML input.*/
TidyInCharEncoding, /**< Input character encoding (if different) */
TidyIndentAttributes, /**< Newline+indent before each attribute */

35
src/clean.c
View file

@ -1007,35 +1007,6 @@ static Bool Center2Div( TidyDocImpl* doc, Node *node, Node **pnode)
{
if ( nodeIsCENTER(node) )
{
#if 0 /* 00000000 what is this doing inside an nodeIsCENTER(node)??? 0000000 */
if ( cfgBool(doc, TidyDropFontTags) )
{
if (node->content)
{
Node *last = node->last;
DiscardContainer( doc, node, pnode );
node = TY_(InferredTag)(doc, TidyTag_BR);
TY_(InsertNodeAfterElement)(last, node);
}
else
{
Node *prev = node->prev, *next = node->next,
*parent = node->parent;
DiscardContainer( doc, node, pnode );
node = TY_(InferredTag)(doc, TidyTag_BR);
if (next)
TY_(InsertNodeBeforeElement)(next, node);
else if (prev)
TY_(InsertNodeAfterElement)(prev, node);
else
TY_(InsertNodeAtStart)(parent, node);
}
return yes;
}
#endif /* 00000000 what is this doing inside an nodeIsCENTER(node)??? 0000000 */
RenameElem( doc, node, TidyTag_DIV );
TY_(AddStyleProperty)( doc, node, "text-align: center" );
return yes;
@ -1394,12 +1365,6 @@ static Bool Font2Span( TidyDocImpl* doc, Node *node, Node **pnode )
if ( nodeIsFONT(node) )
{
if ( cfgBool(doc, TidyDropFontTags) )
{
DiscardContainer( doc, node, pnode );
return yes;
}
/* if node is the only child of parent element then leave alone
Do so only if BlockStyle may be succesful. */
if ( node->parent->content == node && node->next == NULL &&

4
src/config.c
View file

@ -249,7 +249,6 @@ static const TidyOptionImpl option_defs[] =
#endif
{ TidyDropEmptyElems, MU, "drop-empty-elements", BL, yes, ParseBool, boolPicks },
{ TidyDropEmptyParas, MU, "drop-empty-paras", BL, yes, ParseBool, boolPicks },
{ TidyDropFontTags, MU, "drop-font-tags", BL, no, ParseBool, boolPicks },
{ TidyDropPropAttrs, MU, "drop-proprietary-attributes", BL, no, ParseBool, boolPicks },
{ TidyDuplicateAttrs, MU, "repeated-attributes", IN, TidyKeepLast, ParseRepeatAttr, repeatAttrPicks },
{ TidyEmacs, MS, "gnu-emacs", BL, no, ParseBool, boolPicks },
@ -268,7 +267,6 @@ static const TidyOptionImpl option_defs[] =
{ TidyForceOutput, MS, "force-output", BL, no, ParseBool, boolPicks },
{ TidyGDocClean, MU, "gdoc", BL, no, ParseBool, boolPicks },
{ TidyHideComments, MU, "hide-comments", BL, no, ParseBool, boolPicks },
{ TidyHideEndTags, MU, "hide-endtags", BL, no, ParseBool, boolPicks },
{ TidyHtmlOut, MU, "output-html", BL, no, ParseBool, boolPicks },
{ TidyInCharEncoding, CE, "input-encoding", IN, UTF8, ParseCharEnc, charEncPicks },
{ TidyIndentAttributes, PP, "indent-attributes", BL, no, ParseBool, boolPicks },
@ -1097,7 +1095,7 @@ void AdjustConfig( TidyDocImpl* doc )
TY_(SetOptionInt)( doc, TidyOutputBOM, yes );
#endif
TY_(SetOptionBool)( doc, TidyQuoteAmpersand, yes );
TY_(SetOptionBool)( doc, TidyHideEndTags, no );
TY_(SetOptionBool)( doc, TidyOmitOptionalTags, no );
}
}

35
src/language_en.h
View file

@ -330,30 +330,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
TidyDropEmptyParas, 0,
"This option specifies if Tidy should discard empty paragraphs. "
},
{/* Important notes for translators:
- Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
<br/>.
- Entities, tags, attributes, etc., should be enclosed in <code></code>.
- Option values should be enclosed in <var></var>.
- It's very important that <br/> be self-closing!
- The strings "Tidy" and "HTML Tidy" are the program name and must not
be translated. */
TidyDropFontTags, 0,
"Deprecated; <em>do not use</em>. This option is destructive to "
"<code>&lt;font&gt;</code> tags, and it will be removed from future "
"versions of Tidy. Use the <code>clean</code> option instead. "
"<br/>"
"If you do set this option despite the warning it will perform "
"as <code>clean</code> except styles will be inline instead of put into "
"a CSS class. <code>&lt;font&gt;</code> tags will be dropped completely "
"and their styles will not be preserved. "
"<br/>"
"If both <code>clean</code> and this option are enabled, "
"<code>&lt;font&gt;</code> tags will still be dropped completely, and "
"other styles will be preserved in a CSS class instead of inline. "
"<br/>"
"See <code>clean</code> for more information. "
},
{/* Important notes for translators:
- Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
<br/>.
@ -557,17 +533,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
TidyHideComments, 0,
"This option specifies if Tidy should print out comments. "
},
{/* Important notes for translators:
- Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
<br/>.
- Entities, tags, attributes, etc., should be enclosed in <code></code>.
- Option values should be enclosed in <var></var>.
- It's very important that <br/> be self-closing!
- The strings "Tidy" and "HTML Tidy" are the program name and must not
be translated. */
TidyHideEndTags, 0,
"This option is an alias for <code>omit-optional-tags</code>. "
},
{/* Important notes for translators:
- Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
<br/>.

8
src/pprint.c
View file

@ -789,9 +789,8 @@ static void PCondFlushLineSmart( TidyDocImpl* doc, uint indent )
/*\
* Issue #390 - Must still deal with fixing indent!
* If TidyHideEndTags or TidyOmitOptionalTags, then
* in certain circumstance no PrintEndTag will be done,
* so linelen will be 0...
* If TidyOmitOptionalTags, then in cerain circumstances no PrintEndTag
* will be done, so linelen will be 0...
\*/
if (pprint->indent[ 0 ].spaces != (int)indent)
{
@ -2340,8 +2339,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
{
Bool indcont = ( cfgAutoBool(doc, TidyIndentContent) != TidyNoState );
Bool indsmart = ( cfgAutoBool(doc, TidyIndentContent) == TidyAutoState );
Bool hideend = cfgBool( doc, TidyHideEndTags ) ||
cfgBool( doc, TidyOmitOptionalTags );
Bool hideend = cfgBool( doc, TidyOmitOptionalTags );
Bool classic = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
uint contentIndent = indent;

3
src/tidylib.c
View file

@ -1976,7 +1976,6 @@ int tidyDocCleanAndRepair( TidyDocImpl* doc )
Bool logical = cfgBool( doc, TidyLogicalEmphasis );
Bool clean = cfgBool( doc, TidyMakeClean );
Bool gdoc = cfgBool( doc, TidyGDocClean );
Bool dropFont = cfgBool( doc, TidyDropFontTags );
Bool htmlOut = cfgBool( doc, TidyHtmlOut );
Bool xmlOut = cfgBool( doc, TidyXmlOut );
Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut );
@ -2017,7 +2016,7 @@ int tidyDocCleanAndRepair( TidyDocImpl* doc )
}
/* replaces presentational markup by style rules */
if ( clean || dropFont )
if ( clean )
TY_(CleanDocument)( doc );
/* clean up html exported by Google Docs */