Deleted multiple equal id attributes.

2015-11-02 15:31:47 +08:00 · 2015-11-02 15:31:47 +08:00 · dec6356a6f
parent d0ac990636
commit dec6356a6f
2 changed files with 138 additions and 85 deletions
--- a/documentation/quickref.xsl
+++ b/documentation/quickref.xsl
@ -31,7 +31,7 @@
  <body>
    <h1 id="top">HTML Tidy <xsl:value-of select="config/@version" /> Options Quick Reference</h1>

-    <h2 id="top">Option Groups</h2>
+    <h2>Option Groups</h2>
    <ul class="option_groups">
        <li><a href="#MarkupHeader">HTML, XHTML, XML</a></li>
        <li><a href="#DiagnosticsHeader">Diagnostics</a></li>
@ -40,10 +40,10 @@
        <li><a href="#MiscellaneousHeader">Miscellaneous</a></li>
    </ul>

-    <h2 id="top">Option Index</h2>
+    <h2>Option Index</h2>
    <xsl:call-template name="link-section" />

-    <h2 id="top">Option Details</h2>
+    <h2>Option Details</h2>
    <xsl:call-template name="detail-section" />

  </body>
--- a/src/localize.c
+++ b/src/localize.c
@ -392,15 +392,15 @@ static const TidyOptionDoc option_docs[] =
  {TidyXmlSpace,
   "This option specifies if Tidy should add "
   "<code>xml:space=\"preserve\"</code> to elements such as "
-   "<code>&lt;PRE&gt;</code>, <code>&lt;STYLE&gt;</code> and "
-   "<code>&lt;SCRIPT&gt;</code> when generating XML. "
+   "<code>&lt;pre&gt;</code>, <code>&lt;style&gt;</code> and "
+   "<code>&lt;script&gt;</code> when generating XML. "
   "<br/>"
   "This is needed if the whitespace in such elements is to "
   "be parsed appropriately without having access to the DTD. "
  },
  {TidyAltText,
   "This option specifies the default <code>alt=</code> text Tidy uses for "
-   "<code>&lt;IMG&gt;</code> attributes. "
+   "<code>&lt;img&gt;</code> attributes. "
   "<br/>"
   "Use with care, as this feature suppresses further accessibility warnings. "
  },
@ -438,9 +438,12 @@ static const TidyOptionDoc option_docs[] =
  {TidyDoctype,
   "This option specifies the DOCTYPE declaration generated by Tidy. "
   "<br/>"
-   "If set to <code>omit</code> the output won't contain a DOCTYPE declaration. "
+   "If set to <code>omit</code> the output won't contain a DOCTYPE "
+   "declaration. Note this this also implies <code>numeric-entities</code> is "
+   "set to <code>yes</code>"
   "<br/>"
-   "If set to <code>html5</code> the DOCTYPE is set to <code>&lt;!DOCTYPE html&gt;</code>."
+   "If set to <code>html5</code> the DOCTYPE is set to "
+   "<code>&lt;!DOCTYPE html&gt;</code>."
   "<br/>"
   "If set to <code>auto</code> (the default) Tidy will use an educated guess "
   "based upon the contents of the document."
@ -462,9 +465,9 @@ static const TidyOptionDoc option_docs[] =
   "system identifier to an empty string. For an HTML document, Tidy adds a "
   "system identifier only if one was already present in order to preserve "
   "the processing mode of some browsers. Tidy leaves the DOCTYPE for "
-   "generic XML documents unchanged. <code>--doctype omit</code> implies "
-   "<code>--numeric-entities yes</code>. This option does not offer a "
-   "validation of the document conformance. "
+   "generic XML documents unchanged. "
+   "<br/>"
+   "This option does not offer a validation of document conformance. "
  },
  {TidyDropEmptyElems,
   "This option specifies if Tidy should discard empty elements. "
@ -494,13 +497,13 @@ static const TidyOptionDoc option_docs[] =
   "such as Microsoft data binding attributes. "
  },
  {TidyEncloseBlockText,
-   "This option specifies if Tidy should insert a <code>&lt;P&gt;</code> "
+   "This option specifies if Tidy should insert a <code>&lt;p&gt;</code> "
   "element to enclose any text it finds in any element that allows mixed "
   "content for HTML transitional but not HTML strict. "
  },
  {TidyEncloseBodyText,
   "This option specifies if Tidy should enclose any text it finds in the "
-   "body element within a <code>&lt;P&gt;</code> element."
+   "body element within a <code>&lt;p&gt;</code> element."
   "<br/>"
   "This is useful when you want to take existing HTML and use it with a "
   "style sheet. "
@ -552,7 +555,7 @@ static const TidyOptionDoc option_docs[] =
   "This option is ignored for XML output. "
  },
  {TidyHideEndTags,
-   "This option is an alias for omit-optional-tags. "
+   "This option is an alias for <code>omit-optional-tags</code>. "
  },
  {TidyIndentCdata,
   "This option specifies if Tidy should indent "
@ -564,12 +567,12 @@ static const TidyOptionDoc option_docs[] =
  },
  {TidyJoinClasses,
   "This option specifies if Tidy should combine class names to generate "
-   "a single new class name if multiple class assignments are detected on "
+   "a single, new class name if multiple class assignments are detected on "
   "an element. "
   , TidyJoinClassesLinks
  },
  {TidyJoinStyles,
-   "This option specifies if Tidy should combine styles to generate a single "
+   "This option specifies if Tidy should combine styles to generate a single, "
   "new style if multiple style values are detected on an element. "
   , TidyJoinStylesLinks
  },
@ -671,7 +674,7 @@ static const TidyOptionDoc option_docs[] =
    "Unless you declare new tags, Tidy will refuse to generate a tidied file if "
    "the input includes previously unknown tags. "
    "<br/>"
-    "Note you can not as yet add new CDATA elements. "
+    "Note you cannot as yet add new CDATA elements. "
    "<br/>"
    "This option is ignored in XML mode. "
    ,TidyPreTagsLinks
@ -738,7 +741,7 @@ static const TidyOptionDoc option_docs[] =
   , TidyDuplicateAttrsLinks
  },
  {TidySortAttributes,
-   "This option specifies that tidy should sort attributes within an element "
+   "This option specifies that Tidy should sort attributes within an element "
   "using the specified sort algorithm. If set to <code>alpha</code>, the "
   "algorithm is an ascending alphabetic sort. "
  },
@ -815,14 +818,22 @@ static const TidyOptionDoc option_docs[] =
   "<br/>"
   "Setting <code>indent</code> to <code>yes</code> can expose layout bugs in "
   "some browsers. "
+   "<br/>"
+   "Use the option <code>indent-spaces</code> to control the number of spaces "
+   "or tabs output per level of indent, and <code>indent-with-tabs</code> to "
+   "specify whether spaces or tabs are used. "
+ 
   ,TidyIndentContentLinks
  },
  {TidyIndentAttributes,
   "This option specifies if Tidy should begin each attribute on a new line. "
  },
  {TidyIndentSpaces,
-   "This option specifies the number of spaces Tidy uses to indent content, "
-   "when indentation is enabled. "
+   "This option specifies the number of spaces or tabs that Tidy uses to "
+   "indent content when <code>indent</code> is enabled. "
+   "<br/>"
+   "Note that the default value for this option is dependent upon the value of "
+   "<code>indent-with-tabs</code> (see also). "
   ,TidyIndentSpacesLinks
  },
  {TidyLiteralAttribs,
@ -855,8 +866,6 @@ static const TidyOptionDoc option_docs[] =
   "This option specifies the number of columns that Tidy uses between "
   "successive tab stops. It is used to map tabs to spaces when reading the "
   "input. "
-   "<br/>"
-   "Tidy never outputs tabs."
  },
  {TidyVertSpace,   /* Issue #228 - changed to tri-state */
   "This option specifies if Tidy should add some extra empty lines for "
@ -864,7 +873,7 @@ static const TidyOptionDoc option_docs[] =
   "<br/>"
   "The default is <code>no</code>. "
   "<br/>"
-   "If set to <code>auto</code>' Tidy will eliminate nearly all newline "
+   "If set to <code>auto</code> Tidy will eliminate nearly all newline "
   "characters."
  },
  {TidyWrapLen,
@ -898,89 +907,116 @@ static const TidyOptionDoc option_docs[] =
  },
  {TidyWrapJste,
   "This option specifies if Tidy should line wrap text contained within "
-   "JSTE pseudo elements, which look like: &lt;# ... #&gt;. "
+   "JSTE pseudo elements, which look like: <code>&lt;# ... #&gt;</code>. "
  },
  {TidyWrapPhp,
   "This option specifies if Tidy should line wrap text contained within PHP "
-   "pseudo elements, which look like: &lt;?php ... ?&gt;. "
+   "pseudo elements, which look like: <code>&lt;?php ... ?&gt;</code>. "
  },
  {TidyWrapScriptlets,
   "This option specifies if Tidy should line wrap string literals that "
-   "appear in script attributes. Tidy wraps long script string literals by "
-   "inserting a backslash character before the line break. "
+   "appear in script attributes. "
+   "<br/>"
+   "Tidy wraps long script string literals by inserting a backslash character "
+   "before the line break. "
   ,TidyWrapScriptletsLinks
  },
  {TidyWrapSection,
   "This option specifies if Tidy should line wrap text contained within "
-   "&lt;![ ... ]&gt; section tags. "
+   "<code>&lt;![ ... ]&gt;</code> section tags. "
  },
  {TidyAsciiChars,
-   "Can be used to modify behavior of -c (--clean yes) option.  If set "
-   "to \"yes\" when using -c, &amp;emdash;, &amp;rdquo;, and other named "
-   "character entities are downgraded to their closest ascii equivalents. "
+   "Can be used to modify behavior of the <code>clean</code> option when set "
+   "to <code>yes</code>. "
+   "<br/>"
+   "If set to <code>yes</code> when <code>clean</code>, "
+   "<code>&amp;emdash;</code>, <code>&amp;rdquo;</code>, and other named "
+   "character entities are downgraded to their closest ASCII equivalents. "
   ,TidyAsciiCharsLinks
  },
  {TidyCharEncoding,
   "This option specifies the character encoding Tidy uses for both the input "
-   "and output. For ascii, Tidy will accept Latin-1 (ISO-8859-1) character "
-   "values, but will use entities for all characters whose value &gt; 127. "
-   "For raw, Tidy will output values above 127 without translating them into "
-   "entities. For latin1, characters above 255 will be written as entities. "
-   "For utf8, Tidy assumes that both input and output is encoded as UTF-8. "
-   "You can use iso2022 for files encoded using the ISO-2022 family of "
-   "encodings e.g. ISO-2022-JP. For mac and win1252, Tidy will accept vendor "
+   "and output. "
+   "<br/>"
+   "For <code>ascii</code> Tidy will accept Latin-1 (ISO-8859-1) character "
+   "values, but will use entities for all characters whose value &gt;127. "
+   "<br/>"
+   "For <code>raw</code>, Tidy will output values above 127 without "
+   "translating them into entities. "
+   "<br/>"
+   "For <code>latin1</code>, characters above 255 will be written as entities. "
+   "<br/>"
+   "For <code>utf8</code>, Tidy assumes that both input and output are encoded "
+   "as UTF-8. "
+   "<br/>"
+   "You can use <code>iso2022</code> for files encoded using the ISO-2022 "
+   "family of encodings e.g. ISO-2022-JP. "
+   "<br/>"
+   "For <code>mac</code> and <code>win1252</code>, Tidy will accept vendor "
   "specific character values, but will use entities for all characters whose "
-   "value &gt; 127. "
+   "value &gt;127. "
+   "<br/>"
   "For unsupported encodings, use an external utility to convert to and from "
   "UTF-8. "
   ,TidyCharEncodingLinks
  },
  {TidyInCharEncoding,
   "This option specifies the character encoding Tidy uses for the input. See "
-   "char-encoding for more info. "
+   "<code>char-encoding</code> for more info. "
   ,TidyInCharEncodingLinks
  },
 #if SUPPORT_ASIAN_ENCODINGS
  {TidyLanguage,
-   "Currently not used, but this option specifies the language Tidy uses "
-   "(for instance \"en\"). "
+   "Currently not used, but this option specifies the language Tidy would use "
+   "if it were properly localized. For example: <code>en</code>. "
  },
 #endif
 #if SUPPORT_UTF16_ENCODINGS
  {TidyOutputBOM,
   "This option specifies if Tidy should write a Unicode Byte Order Mark "
   "character (BOM; also known as Zero Width No-Break Space; has value of "
-   "U+FEFF) to the beginning of the output; only for UTF-8 and UTF-16 output "
-   "encodings. If set to \"auto\", this option causes Tidy to write a BOM to "
-   "the output only if a BOM was present at the beginning of the input. A BOM "
-   "is always written for XML/XHTML output using UTF-16 output encodings. "
+   "U+FEFF) to the beginning of the output, and only applies to UTF-8 and "
+   "UTF-16 output encodings. "
+   "<br/>"
+   "If set to <code>auto</code> this option causes Tidy to write a BOM to "
+   "the output only if a BOM was present at the beginning of the input. "
+   "<br/>"
+   "A BOM is always written for XML/XHTML output using UTF-16 output "
+   "encodings. "
  },
 #endif
  {TidyOutCharEncoding,
   "This option specifies the character encoding Tidy uses for the output. "
-   "See char-encoding for more info. May only be different from "
-   "input-encoding for Latin encodings (ascii, latin0, latin1, mac, win1252, "
-   "ibm858). "
+   "<br/>"
+   "Note that this may only be different from <code>input-encoding</code> for "
+   "Latin encodings (<code>ascii</code>, <code>latin0</code>, "
+   "<code>latin1</code>, <code>mac</code>, <code>win1252</code>, "
+   "<code>ibm858</code>)."
+   "<br/>"
+   "See <code>char-encoding</code> for more information"
   ,TidyOutCharEncodingLinks
  },
  {TidyNewline,
-   "The default is appropriate to the current platform: CRLF on PC-DOS, "
-   "MS-Windows and OS/2, CR on Classic Mac OS, and LF everywhere else "
-   "(Unix and Linux). "
+   "The default is appropriate to the current platform. "
+   "<br/>"
+   "Genrally CRLF on PC-DOS, Windows and OS/2; CR on Classic Mac OS; and LF "
+   "everywhere else (Linux, Mac OS X, and Unix). "
  },
  {TidyErrFile,
   "This option specifies the error file Tidy uses for errors and warnings. "
-   "Normally errors and warnings are output to \"stderr\". "
+   "Normally errors and warnings are output to <code>stderr</code>. "
   ,TidyErrFileLinks
  },
  {TidyFixBackslash,
   "This option specifies if Tidy should replace backslash characters "
-   "\"<code>\\</code>\" in URLs by forward slashes \"<code>/</code>\". "
+   "<code>\\</code> in URLs with forward slashes <code>/</code>. "
  },
  {TidyForceOutput,
   "This option specifies if Tidy should produce output even if errors are "
-   "encountered. Use this option with care - if Tidy reports an error, this "
-   "means Tidy was not able to, or is not sure how to, fix the error, so the "
+   "encountered. "
+   "<br/>"
+   "Use this option with care; if Tidy reports an error, this "
+   "means Tidy was not able to (or is not sure how to) fix the error, so the "
   "resulting output may not reflect your intention. "
  },
  {TidyEmacs,
@ -992,14 +1028,18 @@ static const TidyOptionDoc option_docs[] =
  },
  {TidyKeepFileTimes,
   "This option specifies if Tidy should keep the original modification time "
-   "of files that Tidy modifies in place. The default is no. Setting the "
-   "option to yes allows you to tidy files without causing these files to be "
-   "uploaded to a web server when using a tool such as SiteCopy. Note this "
-   "feature is not supported on some platforms. "
+   "of files that Tidy modifies in place. "
+   "<br/>"
+   "Setting the option to <code>yes</code> allows you to tidy files without "
+   "changing the file modification date, which may be useful with certain "
+   "tools that use the modification date for things such as automatic server "
+   "deployment."
+   "<br/>"
+   "Note this feature is not supported on some platforms. "
  },
  {TidyOutFile,
   "This option specifies the output file Tidy uses for markup. Normally "
-   "markup is written to \"stdout\". "
+   "markup is written to <code>stdout</code>. "
   ,TidyOutFileLinks
  },
  {TidyQuiet,
@ -1007,46 +1047,59 @@ static const TidyOptionDoc option_docs[] =
   "of errors and warnings, or the welcome or informational messages. "
  },
  {TidySlideStyle,
-   "Currently not used.  Tidy Classic only. "
+   "This option has no function and is deprecated. "
  },
  {TidyMark,
-   "This option specifies if Tidy should add a meta element to the document "
-   "head to indicate that the document has been tidied. Tidy won't add a meta "
-   "element if one is already present. "
+   "This option specifies if Tidy should add a <code>meta</code> element to "
+   "the document head to indicate that the document has been tidied. "
+   "<br/>"
+   "Tidy won't add a meta element if one is already present. "
  },
  {TidyWriteBack,
   "This option specifies if Tidy should write back the tidied markup to the "
-   "same file it read from. You are advised to keep copies of important files "
-   "before tidying them, as on rare occasions the result may not be what you "
-   "expect. "
+   "same file it read from. "
+   "<br/>"
+   "You are advised to keep copies of important files before tidying them, as "
+   "on rare occasions the result may not be what you expect. "
  },
  {TidyDecorateInferredUL,
-   "This option specifies if Tidy should decorate inferred UL elements with "
-   "some CSS markup to avoid indentation to the right. "
+   "This option specifies if Tidy should decorate inferred "
+   "<code>&lt;ul&gt;</code> elements with some CSS markup to avoid indentation "
+   "to the right. "
  },
  {TidyPreserveEntities,
-   "This option specifies if Tidy should preserve the well-formed entities "
+   "This option specifies if Tidy should preserve well-formed entities "
   "as found in the input. "
  },
  {TidyAnchorAsName,
-   "This option controls the deletion or addition of the name attribute "
-   "in elements where it can serve as anchor. "
-   "If set to \"yes\", a name attribute, if not already existing, "
-   "is added along an existing id attribute if the DTD allows it. "
-   "If set to \"no\", any existing name attribute is removed "
-   "if an id attribute exists or has been added. "
+   "This option controls the deletion or addition of the <code>name</code> "
+   "attribute in elements where it can serve as anchor. "
+   "<br/>"
+   "If set to <code>yes</code> a <code>name</code> attribute, if not already "
+   "existing, is added along an existing <code>id</code> attribute if the DTD "
+   "allows it. "
+   "<br/>"
+   "If set to <code>no</code> any existing name attribute is removed if an"
+   "<code>id</code> attribute exists or has been added. "
  },
   {TidyPPrintTabs,
-   "Set this option \"on\" to indent using tabs instead of the default "
-   "spaces. The option TidyIndentSpaces controls the number of tabs output "
-   "per level of indent, which is reset to 1, when this option is set on. "
-   "And of course, indent must be enabled for this to have any effect. "
-   "Note TidyTabSize controls converting input tabs to spaces. Set to zero "
-   "to retain input tabs. "
+   "This option specifies if Tidy should indent with tabs instead of spaces, "
+   "assuming <code>indent</code> is <code>yes</code>. "
+   "<br/>"
+   "Set it to <code>yes</code> to indent using tabs instead of the default "
+   "spaces. "
+   "<br/>"
+   "Use the option <code>indent-spaces</code> to control the number of tabs "
+   "output per level of indent. Note that when <code>indent-with-tabs</code> "
+   "is enabled the default value of <code>indent-spaces</code> is reset to "
+   "<code>1</code>. "
+   "<br/>"
+   "Note <code>tab-size</code> controls converting input tabs to spaces. Set "
+   "it to zero to retain input tabs. "
  },
  {TidySkipQuotes,
-   "This option specifies that Tidy should skip quotes, and comments "
-   "when parsing script data. "
+   "This option specifies that Tidy should skip nested tags when parsing "
+   "script and style data. "
  },
  {N_TIDY_OPTIONS,
   NULL