From d52e0b353e3d385886991532c305d948cd44a8df Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Fri, 30 Oct 2015 10:19:47 +0800 Subject: [PATCH 1/4] Update documentation to address #288. --- src/localize.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/localize.c b/src/localize.c index 447ef71..d0d7951 100755 --- a/src/localize.c +++ b/src/localize.c @@ -410,16 +410,17 @@ static const TidyOptionDoc option_docs[] = }, {TidyMakeClean, "This option specifies if Tidy " - "should strip out surplus presentational tags and attributes replacing " - "them by style rules and structural markup as appropriate. It works well " - "on the HTML saved by Microsoft Office products. " - , TidyMakeCleanTagsLinks + "should perform cleaning of some legacy presentational tags (currently " + "<i>, <b>, <center> when enclosed within appropriate " + "inline tags, and <font>). If set then legacy tags will be replaced " + "with CSS <style> tags and structural markup as appropriate. " + , }, {TidyGDocClean, "This option specifies if Tidy " "should enable specific behavior for cleaning up HTML exported from " "Google Docs. " - , TidyMakeCleanTagsLinks + , }, {TidyDoctype, "This option specifies the DOCTYPE declaration generated by Tidy.
" @@ -452,9 +453,14 @@ static const TidyOptionDoc option_docs[] = "This option specifies if Tidy should discard empty paragraphs. " }, {TidyDropFontTags, - "This option specifies if Tidy should discard <FONT> and " - "<CENTER> tags without creating the corresponding style rules. This " - "option can be set independently of the clean option. " + "Deprecated; DO NOT USE. This option is destructive to <font> tags, " + "and it will be removed from future versions of Tidy. Use the clean option " + "instead. If you do set this option despite the warning it will perform " + "as clean except styles will be inline instead of put into a CSS class. " + "<font> tags will be dropped completely and their styles will not be " + "preserved. If both clean and this option are enabled, <font> tags " + "will still be dropped completely, and other styles will be preserved in a " + "CSS class instead of inline. See clean for more information. " , TidyDropFontTagsLinks }, {TidyDropPropAttrs, From 0be66cb00bc09f4ed780e1907b746fdfa28b58d4 Mon Sep 17 00:00:00 2001 From: "Geoff R. McLane" Date: Sat, 31 Oct 2015 17:08:53 +0100 Subject: [PATCH 2/4] Issue #266 - delete in_676205.html. Use XHTML file --- test/input/in_676205.html | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 test/input/in_676205.html diff --git a/test/input/in_676205.html b/test/input/in_676205.html deleted file mode 100644 index 77b87b5..0000000 --- a/test/input/in_676205.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - [676205] <img src="> crashes Tidy - - - Date: Sat, 31 Oct 2015 17:10:03 +0100 Subject: [PATCH 3/4] Select XHTML first, else HTML --- test/t1.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/t1.sh b/test/t1.sh index b17d61c..4f7769f 100755 --- a/test/t1.sh +++ b/test/t1.sh @@ -67,7 +67,10 @@ if [ -z "$TMPEXIT" ]; then exit 1 fi +TMPFIL="input/in_$TMPCASE.xhtml" +if [ ! -f "$TMPFIL" ]; then TMPFIL="input/in_$TMPCASE.html" +fi TMPCFG="input/cfg_$TMPCASE.txt" if [ ! -f "$TMPCFG" ]; then TMPCFG="input/cfg_default.txt" From 06b19527a43a74dfc345de341e0ab59a8b3dec6b Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Sat, 31 Oct 2015 17:16:52 +0100 Subject: [PATCH 4/4] Select XHMTL, else HTML --- test/t1.bat | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/t1.bat b/test/t1.bat index 041e850..3d92244 100644 --- a/test/t1.bat +++ b/test/t1.bat @@ -31,7 +31,10 @@ @if "%~1x" == "x" goto HELP @if "%~2x" == "x" goto HELP -@set TMPFIL=input\in_%1.html +@set TMPFIL=input\in_%1.xhtml +@if NOT EXIST %TMPFIL% ( +@set TMPFIL==input\in_%1.html +) @set TMPCFG=input\cfg_%1.txt @if NOT EXIST %TMPCFG% ( @set TMPCFG=input\cfg_default.txt @@ -163,6 +166,8 @@ @echo - %0 1642186 1 @if "%~1x" == "x" goto HELP2 @echo - Missing expected value. See testcases.txt for list available... +@echo Checking testcases.txt for test %1 +@fa4 "%~1" testcases.txt :HELP2 @echo.