From 6ef8d92b0f00cfe80c789d023049ced77343d23a Mon Sep 17 00:00:00 2001 From: "Michael[tm] Smith" Date: Wed, 4 Jul 2012 16:35:34 +0900 Subject: [PATCH 1/5] Bring docs up to date with code. Fixes #41. Thanks ralfjunker. --- src/localize.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/localize.c b/src/localize.c index 24dbba5..5a33be2 100644 --- a/src/localize.c +++ b/src/localize.c @@ -532,12 +532,6 @@ static const TidyOptionDoc option_docs[] = "elements; for example, for the case " "<b class=\"rtop-2\">foo <b class=\"r2-2\">bar</b> baz</b>, " "Tidy will output <b class=\"rtop-2\">foo bar baz</b>. " - "Note that if you set this option to \"no\" Tidy will by default still " - "attempt to correct some cases of nested <b> and <i> elements; " - "for example, given " - "<span>foo <b>bar <b>baz</b></b> </span>, " - "Tidy will output <span>foo <b>bar baz</b></span>. " - "To suppress that behavior, set the coerce-endtags option to \"no\". " }, {TidyMergeDivs, "Can be used to modify behavior of -c (--clean yes) option. " From d3440ed9f79938ed327016f324d27ecb6684c039 Mon Sep 17 00:00:00 2001 From: "Michael[tm] Smith" Date: Wed, 4 Jul 2012 16:38:17 +0900 Subject: [PATCH 2/5] Regenerated quickref. --- quickref.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickref.html b/quickref.html index e589ffb..d50fadb 100644 --- a/quickref.html +++ b/quickref.html @@ -8,7 +8,7 @@

Quick Reference

HTML Tidy Configuration Options

-

Version: https://github.com/w3c/tidy-html5/tree/a772bbb

+

Version: https://github.com/w3c/tidy-html5/tree/68a9e74

HTML, XHTML, XML
@@ -1354,7 +1354,7 @@ - This option specifies if Tidy should merge nested <b> and <i> elements; for example, for the case <b class="rtop-2">foo <b class="r2-2">bar</b> baz</b>, Tidy will output <b class="rtop-2">foo bar baz</b>. Note that if you set this option to "no" Tidy will by default still attempt to correct some cases of nested <b> and <i> elements; for example, given <span>foo <b>bar <b>baz</b></b> </span>, Tidy will output <span>foo <b>bar baz</b></span>. To suppress that behavior, set the coerce-endtags option to "no". + This option specifies if Tidy should merge nested <b> and <i> elements; for example, for the case <b class="rtop-2">foo <b class="r2-2">bar</b> baz</b>, Tidy will output <b class="rtop-2">foo bar baz</b>.   From 7311bbef48feff96ba14052699beb7c31e49df4f Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Fri, 6 Jul 2012 03:05:46 +0100 Subject: [PATCH 3/5] Fix autotools build --- build/gnuauto/src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/gnuauto/src/Makefile.am b/build/gnuauto/src/Makefile.am index 76bdf56..4f44d9d 100644 --- a/build/gnuauto/src/Makefile.am +++ b/build/gnuauto/src/Makefile.am @@ -65,7 +65,7 @@ libtidy_la_SOURCES = \ clean.c localize.c config.c alloc.c \ attrask.c attrdict.c attrget.c buffio.c \ fileio.c streamio.c tagask.c tmbstr.c \ - utf8.c tidylib.c mappedio.c + utf8.c tidylib.c mappedio.c gdoc.c libtidy_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ @@ -76,6 +76,6 @@ HFILES = \ config.h entities.h fileio.h forward.h \ lexer.h mappedio.h message.h parser.h \ pprint.h streamio.h tags.h tmbstr.h \ - utf8.h tidy-int.h version.h + utf8.h tidy-int.h version.h gdoc.h EXTRA_DIST = $(HFILES) From 0d41d4247ec10b7373b5060a0062518607d9021f Mon Sep 17 00:00:00 2001 From: John Weldon Date: Tue, 3 Jul 2012 12:10:53 -0700 Subject: [PATCH 4/5] Fix tidylib.obj : error LNK2019: unresolved external symbol _prvTidyCleanGoogleDocument referenced in function _tidyDocCleanAndRepair Signed-off-by: Michael[tm] Smith --- src/tidylib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tidylib.c b/src/tidylib.c index 5756d19..c9af802 100644 --- a/src/tidylib.c +++ b/src/tidylib.c @@ -1281,8 +1281,10 @@ int tidyDocCleanAndRepair( TidyDocImpl* doc ) TY_(CleanDocument)( doc ); /* clean up html exported by Google Focs */ +#if 0 if ( gdoc ) TY_(CleanGoogleDocument)( doc ); +#endif /* Move terminating
tags from out of paragraphs */ /*! Do we want to do this for all block-level elements? */ From 79439b0b9ea25ef387fc5e8408fd4ad6f70a9920 Mon Sep 17 00:00:00 2001 From: John Weldon Date: Tue, 3 Jul 2012 12:11:26 -0700 Subject: [PATCH 5/5] more msvc ignores Signed-off-by: Michael[tm] Smith --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 83177cb..8f086cb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ /build/msvc2010/Releasetidydll/ /build/msvc2010/Releasetidylib/ /build/msvc2010/Release/ +/build/msvc2010/ipch/ +/build/msvc2010/tidy.opensdf /htmldoc/tidy-config.xml /htmldoc/tidy-help.xml /htmldoc/tidy.1