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

Merge branch 'master' of https://github.com/w3c/tidy-html5

Browse source
This commit is contained in:
John Weldon 2012-07-12 10:18:55 -07:00
parent ca623c9116 79439b0b9e
commit 379a54c49d
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/gnuauto/src/Makefile.am
View file

@ -65,7 +65,7 @@ libtidy_la_SOURCES = \
clean.c localize.c config.c alloc.c \ clean.c localize.c config.c alloc.c \
attrask.c attrdict.c attrget.c buffio.c \ attrask.c attrdict.c attrget.c buffio.c \
fileio.c streamio.c tagask.c tmbstr.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 = \ libtidy_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@ -76,6 +76,6 @@ HFILES = \
config.h entities.h fileio.h forward.h \ config.h entities.h fileio.h forward.h \
lexer.h mappedio.h message.h parser.h \ lexer.h mappedio.h message.h parser.h \
pprint.h streamio.h tags.h tmbstr.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) EXTRA_DIST = $(HFILES)

4
quickref.html
View file

@ -8,7 +8,7 @@
<body> <body>
<h1 id="top">Quick Reference</h1> <h1 id="top">Quick Reference</h1>
<h2>HTML Tidy Configuration Options</h2> <h2>HTML Tidy Configuration Options</h2>
<p>Version: <a href="https://github.com/w3c/tidy-html5/tree/a772bbb">https://github.com/w3c/tidy-html5/tree/a772bbb</a></p> <p>Version: <a href="https://github.com/w3c/tidy-html5/tree/68a9e74">https://github.com/w3c/tidy-html5/tree/68a9e74</a></p>
<p> <p>
<a class="h3" href="#MarkupHeader">HTML, XHTML, XML</a> <a class="h3" href="#MarkupHeader">HTML, XHTML, XML</a>
<br /> <br />
@ -1354,7 +1354,7 @@
<td align="right" valign="top"></td> <td align="right" valign="top"></td>
</tr> </tr>
<tr> <tr>
<td colspan="2">This option specifies if Tidy should merge nested &lt;b&gt; and &lt;i&gt; elements; for example, for the case &lt;b class="rtop-2"&gt;foo &lt;b class="r2-2"&gt;bar&lt;/b&gt; baz&lt;/b&gt;, Tidy will output &lt;b class="rtop-2"&gt;foo bar baz&lt;/b&gt;. Note that if you set this option to "no" Tidy will by default still attempt to correct some cases of nested &lt;b&gt; and &lt;i&gt; elements; for example, given &lt;span&gt;foo &lt;b&gt;bar &lt;b&gt;baz&lt;/b&gt;&lt;/b&gt; &lt;/span&gt;, Tidy will output &lt;span&gt;foo &lt;b&gt;bar baz&lt;/b&gt;&lt;/span&gt;. To suppress that behavior, set the coerce-endtags option to "no". </td> <td colspan="2">This option specifies if Tidy should merge nested &lt;b&gt; and &lt;i&gt; elements; for example, for the case &lt;b class="rtop-2"&gt;foo &lt;b class="r2-2"&gt;bar&lt;/b&gt; baz&lt;/b&gt;, Tidy will output &lt;b class="rtop-2"&gt;foo bar baz&lt;/b&gt;. </td>
</tr> </tr>
<tr> <tr>
<td>&#160;</td> <td>&#160;</td>

6
src/localize.c
View file

@ -532,12 +532,6 @@ static const TidyOptionDoc option_docs[] =
"elements; for example, for the case " "elements; for example, for the case "
"&lt;b class=\"rtop-2\"&gt;foo &lt;b class=\"r2-2\"&gt;bar&lt;/b&gt; baz&lt;/b&gt;, " "&lt;b class=\"rtop-2\"&gt;foo &lt;b class=\"r2-2\"&gt;bar&lt;/b&gt; baz&lt;/b&gt;, "
"Tidy will output &lt;b class=\"rtop-2\"&gt;foo bar baz&lt;/b&gt;. " "Tidy will output &lt;b class=\"rtop-2\"&gt;foo bar baz&lt;/b&gt;. "
"Note that if you set this option to \"no\" Tidy will by default still "
"attempt to correct some cases of nested &lt;b&gt; and &lt;i&gt; elements; "
"for example, given "
"&lt;span&gt;foo &lt;b&gt;bar &lt;b&gt;baz&lt;/b&gt;&lt;/b&gt; &lt;/span&gt;, "
"Tidy will output &lt;span&gt;foo &lt;b&gt;bar baz&lt;/b&gt;&lt;/span&gt;. "
"To suppress that behavior, set the coerce-endtags option to \"no\". "
}, },
{TidyMergeDivs, {TidyMergeDivs,
"Can be used to modify behavior of -c (--clean yes) option. " "Can be used to modify behavior of -c (--clean yes) option. "