From 4dc8a2cf9ac34c6774b5dad8ee4c41f50259f6e7 Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Fri, 10 Mar 2017 08:24:23 -0500
Subject: [PATCH] Bump version to 5.5.5 for this fiasco, and fix poor planning
 and unfortunate merge.   - Sort all of the existing options and re-indent per
 Tidy standards. This is     simply for cosmetic effect.   - Allow the
 iterator to return all options again, even "internal" options.     Things are
 too embedded with N_TIDY_OPTIONS, etc., to try to hide them.   - Instead,
 simply add documentation to LibTidy users that they shouldn't use    
 internal options.   - Also added `TidyInternalCategory` to
 `TidyConfigCategory` without adding a     new field to the struct. API users
 should check for this category before     use.   - Defined a two character
 macro for `TidyInternalCategory` for use in     `option_defs[]`.   - Changed
 struct `option_defs[]` to reflect the new category for affected     options. 
  - Removed string indicating * refers to internal options, since it no longer
     applies.   - Regen'd all strings for previous point.   - `tidy.c` now
 checks for `TidyInternalCategory` everywhere in order to     suppress output.

---
 console/tidy.c                          |  32 ++--
 include/tidy.h                          |   4 +-
 include/tidyenum.h                      | 222 +++++++++++-------------
 localize/translations/language_en_gb.po |  11 +-
 localize/translations/language_es.po    |  11 +-
 localize/translations/language_es_mx.po |  11 +-
 localize/translations/language_fr.po    |  11 +-
 localize/translations/language_zh_cn.po |  11 +-
 localize/translations/tidy.pot          |  11 +-
 src/config.c                            | 202 ++++++++++-----------
 src/language_en.h                       |   4 +-
 src/language_en_gb.h                    |   2 +-
 src/language_es.h                       |   2 +-
 src/language_es_mx.h                    |   2 +-
 src/language_fr.h                       |   2 +-
 src/language_zh_cn.h                    |   2 +-
 version.txt                             |   4 +-
 17 files changed, 260 insertions(+), 284 deletions(-)

diff --git a/console/tidy.c b/console/tidy.c
index caeb7e9..3ca4dfc 100644
--- a/console/tidy.c
+++ b/console/tidy.c
@@ -185,7 +185,7 @@ static void print3Columns( const char* fmt, uint l1, uint l2, uint l3,
 static const char helpfmt[] = " %-25.25s %-52.52s\n";
 static const char helpul[]  = "-----------------------------------------------------------------";
 static const char fmt[]     = "%-27.27s %-9.9s  %-40.40s\n";
-static const char valfmt[]  = "%-27.27s %-9.9s %-1.1s%-39.39s\n";
+static const char valfmt[]  = "%-27.27s %-9.9s  %-39.39s\n";
 static const char ul[]      = "=================================================================";
 
 /**
@@ -558,7 +558,7 @@ static Bool isAutoBool( TidyOption topt )
  */
 static ctmbstr ConfigCategoryName( TidyConfigCategory id )
 {
-    if (id >= TidyMarkup && id <= TidyMiscellaneous)
+    if (id >= TidyMarkup && id <= TidyInternalCategory)
         return tidyLocalizedString(id);
 
     fprintf(stderr, tidyLocalizedString(TC_STRING_FATAL_ERROR), (int)id);
@@ -575,6 +575,7 @@ static ctmbstr ConfigCategoryName( TidyConfigCategory id )
 typedef struct {
     ctmbstr name;  /**< Name */
     ctmbstr cat;   /**< Category */
+    uint    catid; /**< Category ID */
     ctmbstr type;  /**< "String, ... */
     ctmbstr vals;  /**< Potential values. If NULL, use an external function */
     ctmbstr def;   /**< default */
@@ -596,6 +597,7 @@ void GetOption( TidyDoc tdoc, TidyOption topt, OptionDesc *d )
 
     d->name = tidyOptGetName( topt );
     d->cat = ConfigCategoryName( tidyOptGetCategory( topt ) );
+    d->catid = tidyOptGetCategory( topt );
     d->vals = NULL;
     d->def = NULL;
     d->haveVals = yes;
@@ -693,10 +695,6 @@ void GetOption( TidyDoc tdoc, TidyOption topt, OptionDesc *d )
  ** Array holding all options. Contains a trailing sentinel.
  */
 typedef struct {
-    /* Some options aren't exposed in the API although they're available
-       in the enum. This struct is guaranteed to hold *all* Tidy options,
-       but be sure to use the public API iterators to access them!
-     */
     TidyOption topt[N_TIDY_OPTIONS];
 } AllOption_t;
 
@@ -873,7 +871,7 @@ static void printXMLCrossRefEqConsole( TidyDoc tdoc, TidyOption topt )
  **/
 static void printXMLOption( TidyDoc tdoc, TidyOption topt, OptionDesc *d )
 {
-    if ( tidyOptIsReadOnly(topt) )
+    if ( tidyOptGetCategory(topt) == TidyInternalCategory )
         return;
 
     printf( " <option class=\"%s\">\n", d->cat );
@@ -1014,7 +1012,7 @@ static tmbstr GetAllowedValues( TidyOption topt, const OptionDesc *d )
 static void printOption( TidyDoc ARG_UNUSED(tdoc), TidyOption topt,
                         OptionDesc *d )
 {
-    if ( tidyOptIsReadOnly(topt) )
+    if (tidyOptGetCategory( topt ) == TidyInternalCategory )
         return;
 
     if ( *d->name || *d->type )
@@ -1322,12 +1320,10 @@ static void optionDescribe( TidyDoc tdoc, char *tag )
 {
     tmbstr result = NULL;
     Bool allocated = no;
+    TidyOptionId topt = tidyOptGetIdForName( tag );
+    uint tcat = tidyOptGetCategory( tidyGetOption(tdoc, topt));
 
-    TidyOptionId topt;
-
-    topt = tidyOptGetIdForName( tag );
-
-    if (topt < N_TIDY_OPTIONS && ( tidyOptGetCategory( tidyGetOption(tdoc, topt)) != TidyInternalCategory ) )
+    if (topt < N_TIDY_OPTIONS && tcat != TidyInternalCategory )
     {
         result = cleanup_description( tidyOptGetDoc( tdoc, tidyGetOption( tdoc, topt ) ) );
         allocated = yes;
@@ -1353,7 +1349,9 @@ static void printOptionValues( TidyDoc ARG_UNUSED(tdoc), TidyOption topt,
                               OptionDesc *d )
 {
     TidyOptionId optId = tidyOptGetId( topt );
-    ctmbstr ro = tidyOptIsReadOnly( topt ) ? "*" : "" ;
+
+    if ( tidyOptGetCategory(topt) == TidyInternalCategory )
+        return;
 
     switch ( optId )
     {
@@ -1369,7 +1367,7 @@ static void printOptionValues( TidyDoc ARG_UNUSED(tdoc), TidyOption topt,
                 if ( pos )
                 {
                     if ( *d->name )
-                        printf( valfmt, d->name, d->type, ro, d->def );
+                        printf( valfmt, d->name, d->type, d->def );
                     else
                         printf( fmt, d->name, d->type, d->def );
                     d->name = "";
@@ -1391,7 +1389,7 @@ static void printOptionValues( TidyDoc ARG_UNUSED(tdoc), TidyOption topt,
         if ( ! d->def )
             d->def = "";
         if ( *d->name )
-            printf( valfmt, d->name, d->type, ro, d->def );
+            printf( valfmt, d->name, d->type, d->def );
         else
             printf( fmt, d->name, d->type, d->def );
     }
@@ -1409,8 +1407,6 @@ static void optionvalues( TidyDoc tdoc )
     printf( fmt, ul, ul, ul );
 
     ForEachSortedOption( tdoc, printOptionValues );
-
-    printf( "\n\n%s\n\n", tidyLocalizedString(TC_STRING_CONF_NOTE) );
 }
 
 /**
diff --git a/include/tidy.h b/include/tidy.h
index 3cbff55..ea18a74 100644
--- a/include/tidy.h
+++ b/include/tidy.h
@@ -372,7 +372,9 @@ while ( itOpt )
 */
 
 TIDY_EXPORT TidyIterator TIDY_CALL  tidyGetOptionList( TidyDoc tdoc );
-/** Get next Option */
+/** Get next Option. Note that this function will return option types
+    including `TidyInternalCategory`; you should *never* use these!
+*/
 TIDY_EXPORT TidyOption TIDY_CALL    tidyGetNextOption( TidyDoc tdoc, TidyIterator* pos );
 
 /** Lookup option by ID */
diff --git a/include/tidyenum.h b/include/tidyenum.h
index 82c7848..3564044 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -58,132 +58,119 @@ typedef enum
 */
 typedef enum
 {
-  TidyUnknownOption = 0,   /**< Unknown option! */
+    TidyUnknownOption = 0,   /**< Unknown option! */
     
+    TidyAccessibilityCheckLevel, /**< Accessibility check level */
+    TidyAltText,                 /**< Default text for alt attribute */
+    TidyAnchorAsName,            /**< Define anchors as name attributes */
+    TidyAsciiChars,              /**< Convert quotes and dashes to nearest ASCII char */
+    TidyBlockTags,               /**< Declared block tags */
+    TidyBodyOnly,                /**< Output BODY content only */
+    TidyBreakBeforeBR,           /**< Output newline before <br> or not? */
+    TidyCharEncoding,            /**< In/out character encoding */
+    TidyCoerceEndTags,           /**< Coerce end tags from start tags where probably intended */
+    TidyCSSPrefix,               /**< CSS class naming for clean option */
+    TidyDecorateInferredUL,      /**< Mark inferred UL elements with no indent CSS */
+    TidyDoctype,                 /**< User specified doctype */
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-  TidyDoctypeMode,         /**< Internal use ONLY */
-  TidyEmacsFile,           /**< Internal use ONLY */
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
-  TidyIndentSpaces,        /**< Indentation n spaces/tabs */
-  TidyWrapLen,             /**< Wrap margin */
-  TidyTabSize,             /**< Expand tabs to n spaces */
-
-  TidyCharEncoding,        /**< In/out character encoding */
-  TidyInCharEncoding,      /**< Input character encoding (if different) */
-  TidyOutCharEncoding,     /**< Output character encoding (if different) */
-  TidyNewline,             /**< Output line ending (default to platform) */
-
-  TidyDoctype,             /**< User specified doctype */
-
-  TidyDuplicateAttrs,      /**< Keep first or last duplicate attribute */
-  TidyAltText,             /**< Default text for alt attribute */
-
-  TidyErrFile,             /**< File name to write errors to */
-  TidyOutFile,             /**< File name to write markup to */
-  TidyWriteBack,           /**< If true then output tidied markup */
-  TidyShowMarkup,          /**< If false, normal output is suppressed */
-  TidyShowInfo,            /**< If true, info-level messages are shown */
-  TidyShowWarnings,        /**< However errors are always shown */
-  TidyQuiet,               /**< No 'Parsing X', guessed DTD or summary */
-  TidyIndentContent,       /**< Indent content of appropriate tags */
-                           /**< "auto" does text/block level content indentation */
-  TidyCoerceEndTags,       /**< Coerce end tags from start tags where probably intended */
-  TidyOmitOptionalTags,    /**< Suppress optional start tags and end tags */
-  TidyHideEndTags,         /**< Legacy name for TidyOmitOptionalTags */
-  TidyXmlTags,             /**< Treat input as XML */
-  TidyXmlOut,              /**< Create output as XML */
-  TidyXhtmlOut,            /**< Output extensible HTML */
-  TidyHtmlOut,             /**< Output plain HTML, even for XHTML input.
-                               Yes means set explicitly. */
-  TidyXmlDecl,             /**< Add <?xml?> for XML docs */
-  TidyUpperCaseTags,       /**< Output tags in upper not lower case */
-  TidyUpperCaseAttrs,      /**< Output attributes in upper not lower case */
-  TidyMakeBare,            /**< Make bare HTML: remove Microsoft cruft */
-  TidyMakeClean,           /**< Replace presentational clutter by style rules */
-  TidyGDocClean,           /**< Clean up HTML exported from Google Docs */
-  TidyLogicalEmphasis,     /**< Replace i by em and b by strong */
-  TidyDropPropAttrs,       /**< Discard proprietary attributes */
-  TidyDropFontTags,        /**< Discard presentation tags */
-  TidyDropEmptyElems,      /**< Discard empty elements */
-  TidyDropEmptyParas,      /**< Discard empty p elements */
-  TidyFixComments,         /**< Fix comments with adjacent hyphens */
-  TidyBreakBeforeBR,       /**< Output newline before <br> or not? */
-
-  TidyNumEntities,         /**< Use numeric entities */
-  TidyQuoteMarks,          /**< Output " marks as &quot; */
-  TidyQuoteNbsp,           /**< Output non-breaking space as entity */
-  TidyQuoteAmpersand,      /**< Output naked ampersand as &amp; */
-  TidyWrapAttVals,         /**< Wrap within attribute values */
-  TidyWrapScriptlets,      /**< Wrap within JavaScript string literals */
-  TidyWrapSection,         /**< Wrap within <![ ... ]> section tags */
-  TidyWrapAsp,             /**< Wrap within ASP pseudo elements */
-  TidyWrapJste,            /**< Wrap within JSTE pseudo elements */
-  TidyWrapPhp,             /**< Wrap within PHP pseudo elements */
-  TidyFixBackslash,        /**< Fix URLs by replacing \ with / */
-  TidyIndentAttributes,    /**< Newline+indent before each attribute */
-  TidyXmlPIs,              /**< If set to yes PIs must end with ?> */
-  TidyXmlSpace,            /**< If set to yes adds xml:space attr as needed */
-  TidyEncloseBodyText,     /**< If yes text at body is wrapped in P's */
-  TidyEncloseBlockText,    /**< If yes text in blocks is wrapped in P's */
-  TidyKeepFileTimes,       /**< If yes last modied time is preserved */
-  TidyWord2000,            /**< Draconian cleaning for Word2000 */
-  TidyMark,                /**< Add meta element indicating tidied doc */
-  TidyEmacs,               /**< If true format error output for GNU Emacs */
-  TidyLiteralAttribs,      /**< If true attributes may use newlines */
-  TidyBodyOnly,            /**< Output BODY content only */
-  TidyFixUri,              /**< Applies URI encoding if necessary */
-  TidyLowerLiterals,       /**< Folds known attribute values to lower case */
-  TidyHideComments,        /**< Hides all (real) comments in output */
-  TidyIndentCdata,         /**< Indent <!CDATA[ ... ]]> section */
-  TidyForceOutput,         /**< Output document even if errors were found */
-  TidyShowErrors,          /**< Number of errors to put out */
-  TidyAsciiChars,          /**< Convert quotes and dashes to nearest ASCII char */
-  TidyJoinClasses,         /**< Join multiple class attributes */
-  TidyJoinStyles,          /**< Join multiple style attributes */
-  TidyEscapeCdata,         /**< Replace <![CDATA[]]> sections with escaped text */
-
-#if SUPPORT_ASIAN_ENCODINGS
-  TidyNCR,                 /**< Allow numeric character references */
-#else
-  TidyNCRNotUsed,
+    TidyDoctypeMode,             /**< Internal use ONLY */
 #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 */
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+    TidyEmacsFile,               /**< Internal use ONLY */
+#endif
+    TidyEmptyTags,               /**< Declared empty tags */
+    TidyEncloseBlockText,        /**< If yes text in blocks is wrapped in P's */
+    TidyEncloseBodyText,         /**< If yes text at body is wrapped in P's */
+    TidyErrFile,                 /**< File name to write errors to */
+    TidyEscapeCdata,             /**< Replace <![CDATA[]]> sections with escaped text */
+    TidyEscapeScripts,           /**< Escape items that look like closing tags in script tags */
+    TidyFixBackslash,            /**< Fix URLs by replacing \ with / */
+    TidyFixComments,             /**< Fix comments with adjacent hyphens */
+    TidyFixUri,                  /**< Applies URI encoding if necessary */
+    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 */
+    TidyIndentCdata,             /**< Indent <!CDATA[ ... ]]> section */
+    TidyIndentContent,           /**< Indent content of appropriate tags */
+    TidyIndentSpaces,            /**< Indentation n spaces/tabs */
+    TidyInlineTags,              /**< Declared inline tags */
+    TidyJoinClasses,             /**< Join multiple class attributes */
+    TidyJoinStyles,              /**< Join multiple style attributes */
+    TidyKeepFileTimes,           /**< If yes last modied time is preserved */
+    TidyLiteralAttribs,          /**< If true attributes may use newlines */
+    TidyLogicalEmphasis,         /**< Replace i by em and b by strong */
+    TidyLowerLiterals,           /**< Folds known attribute values to lower case */
+    TidyMakeBare,                /**< Make bare HTML: remove Microsoft cruft */
+    TidyMakeClean,               /**< Replace presentational clutter by style rules */
+    TidyMark,                    /**< Add meta element indicating tidied doc */
+    TidyMergeDivs,               /**< Merge multiple DIVs */
+    TidyMergeEmphasis,           /**< Merge nested B and I elements */
+    TidyMergeSpans,              /**< Merge multiple SPANs */
+#if SUPPORT_ASIAN_ENCODINGS
+    TidyNCR,                     /**< Allow numeric character references */
+#else
+    TidyNCRNotUsed,              /**< This option is not compiled in */
+#endif
+    TidyNewline,                 /**< Output line ending (default to platform) */
+    TidyNumEntities,             /**< Use numeric entities */
+    TidyOmitOptionalTags,        /**< Suppress optional start tags and end tags */
+    TidyOutCharEncoding,         /**< Output character encoding (if different) */
+    TidyOutFile,                 /**< File name to write markup to */
 #if SUPPORT_UTF16_ENCODINGS
-  TidyOutputBOM,           /**< Output a Byte Order Mark (BOM) for UTF-16 encodings */
-                           /**< auto: if input stream has BOM, we output a BOM */
+    TidyOutputBOM,               /**< Output a Byte Order Mark (BOM) for UTF-16 encodings */
 #else
-  TidyOutputBOMNotUsed,
+    TidyOutputBOMNotUsed,        /**< This option is not compiled in */
 #endif
-
-  TidyReplaceColor,        /**< Replace hex color attribute values with names */
-  TidyCSSPrefix,           /**< CSS class naming for -clean option */
-
-  TidyInlineTags,          /**< Declared inline tags */
-  TidyBlockTags,           /**< Declared block tags */
-  TidyEmptyTags,           /**< Declared empty tags */
-  TidyPreTags,             /**< Declared pre tags */
-
-  TidyAccessibilityCheckLevel, /**< Accessibility check level
-                                   0 (old style), or 1, 2, 3 */
-
-  TidyVertSpace,           /**< degree to which markup is spread out vertically */
+    TidyPPrintTabs,              /**< Indent using tabs istead of spaces */
+    TidyPreserveEntities,        /**< Preserve entities */
+    TidyPreTags,                 /**< Declared pre tags */
 #if SUPPORT_ASIAN_ENCODINGS
-  TidyPunctWrap,           /**< consider punctuation and breaking spaces for wrapping */
+    TidyPunctWrap,               /**< consider punctuation and breaking spaces for wrapping */
 #else
-  TidyPunctWrapNotUsed,
+    TidyPunctWrapNotUsed,        /**< This option is not compiled in */
 #endif
-  TidyMergeEmphasis,       /**< Merge nested B and I elements */
-  TidyMergeDivs,           /**< Merge multiple DIVs */
-  TidyDecorateInferredUL,  /**< Mark inferred UL elements with no indent CSS */
-  TidyPreserveEntities,    /**< Preserve entities */
-  TidySortAttributes,      /**< Sort attributes */
-  TidyMergeSpans,          /**< Merge multiple SPANs */
-  TidyAnchorAsName,        /**< Define anchors as name attributes */
-  TidyPPrintTabs,          /**< Indent using tabs istead of spaces */
-  TidySkipNested,          /**< Skip nested tags in script and style CDATA */
-  TidyStrictTagsAttr,      /**< Ensure tags and attributes match output HTML version */
-  TidyEscapeScripts,       /**< Escape items that look like closing tags in script tags */
-  N_TIDY_OPTIONS           /**< Must be last */
+    TidyQuiet,                   /**< No 'Parsing X', guessed DTD or summary */
+    TidyQuoteAmpersand,          /**< Output naked ampersand as &amp; */
+    TidyQuoteMarks,              /**< Output " marks as &quot; */
+    TidyQuoteNbsp,               /**< Output non-breaking space as entity */
+    TidyReplaceColor,            /**< Replace hex color attribute values with names */
+    TidyShowErrors,              /**< Number of errors to put out */
+    TidyShowInfo,                /**< If true, info-level messages are shown */
+    TidyShowMarkup,              /**< If false, normal output is suppressed */
+    TidyShowWarnings,            /**< However errors are always shown */
+    TidySkipNested,              /**< Skip nested tags in script and style CDATA */
+    TidySortAttributes,          /**< Sort attributes */
+    TidyStrictTagsAttr,          /**< Ensure tags and attributes match output HTML version */
+    TidyTabSize,                 /**< Expand tabs to n spaces */
+    TidyUpperCaseAttrs,          /**< Output attributes in upper not lower case */
+    TidyUpperCaseTags,           /**< Output tags in upper not lower case */
+    TidyVertSpace,               /**< degree to which markup is spread out vertically */
+    TidyWord2000,                /**< Draconian cleaning for Word2000 */
+    TidyWrapAsp,                 /**< Wrap within ASP pseudo elements */
+    TidyWrapAttVals,             /**< Wrap within attribute values */
+    TidyWrapJste,                /**< Wrap within JSTE pseudo elements */
+    TidyWrapLen,                 /**< Wrap margin */
+    TidyWrapPhp,                 /**< Wrap within PHP pseudo elements */
+    TidyWrapScriptlets,          /**< Wrap within JavaScript string literals */
+    TidyWrapSection,             /**< Wrap within <![ ... ]> section tags */
+    TidyWriteBack,               /**< If true then output tidied markup */
+    TidyXhtmlOut,                /**< Output extensible HTML */
+    TidyXmlDecl,                 /**< Add <?xml?> for XML docs */
+    TidyXmlOut,                  /**< Create output as XML */
+    TidyXmlPIs,                  /**< If set to yes PIs must end with ?> */
+    TidyXmlSpace,                /**< If set to yes adds xml:space attr as needed */
+    TidyXmlTags,                 /**< Treat input as XML */
+    N_TIDY_OPTIONS               /**< Must be last */
 } TidyOptionId;
 
     
@@ -1252,7 +1239,6 @@ typedef enum
     TC_STRING_CONF_NAME,
     TC_STRING_CONF_TYPE,
     TC_STRING_CONF_VALUE,
-    TC_STRING_CONF_NOTE,
     TC_STRING_OPT_NOT_DOCUMENTED,
     TC_STRING_OUT_OF_MEMORY,
     TC_STRING_FATAL_ERROR,
diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po
index 34bf525..55f1c9d 100644
--- a/localize/translations/language_en_gb.po
+++ b/localize/translations/language_en_gb.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-03-07 20:09:19\n"
+"PO-Revision-Date: 2017-03-10 09:04:23\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2988,6 +2988,10 @@ msgctxt "TidyEncoding"
 msgid "encoding"
 msgstr ""
 
+msgctxt "TidyInternalCategory"
+msgid "internal (private)"
+msgstr ""
+
 msgctxt "TidyMarkup"
 msgid "markup"
 msgstr ""
@@ -3227,11 +3231,6 @@ msgctxt "TC_STRING_CONF_VALUE"
 msgid "Current Value"
 msgstr ""
 
-#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
-msgctxt "TC_STRING_CONF_NOTE"
-msgid "Values marked with an *asterisk are calculated internally by HTML Tidy"
-msgstr ""
-
 #, c-format
 msgctxt "TC_STRING_OPT_NOT_DOCUMENTED"
 msgid "Warning: option `%s' is not documented."
diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po
index 928aff7..0de027c 100644
--- a/localize/translations/language_es.po
+++ b/localize/translations/language_es.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-03-07 20:09:19\n"
+"PO-Revision-Date: 2017-03-10 09:04:23\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2965,6 +2965,10 @@ msgctxt "TidyEncoding"
 msgid "encoding"
 msgstr ""
 
+msgctxt "TidyInternalCategory"
+msgid "internal (private)"
+msgstr ""
+
 msgctxt "TidyMarkup"
 msgid "markup"
 msgstr ""
@@ -3204,11 +3208,6 @@ msgctxt "TC_STRING_CONF_VALUE"
 msgid "Current Value"
 msgstr ""
 
-#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
-msgctxt "TC_STRING_CONF_NOTE"
-msgid "Values marked with an *asterisk are calculated internally by HTML Tidy"
-msgstr ""
-
 #, c-format
 msgctxt "TC_STRING_OPT_NOT_DOCUMENTED"
 msgid "Warning: option `%s' is not documented."
diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po
index b940c44..24c2c29 100644
--- a/localize/translations/language_es_mx.po
+++ b/localize/translations/language_es_mx.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-03-07 20:09:19\n"
+"PO-Revision-Date: 2017-03-10 09:04:23\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2960,6 +2960,10 @@ msgctxt "TidyEncoding"
 msgid "encoding"
 msgstr ""
 
+msgctxt "TidyInternalCategory"
+msgid "internal (private)"
+msgstr ""
+
 msgctxt "TidyMarkup"
 msgid "markup"
 msgstr ""
@@ -3199,11 +3203,6 @@ msgctxt "TC_STRING_CONF_VALUE"
 msgid "Current Value"
 msgstr ""
 
-#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
-msgctxt "TC_STRING_CONF_NOTE"
-msgid "Values marked with an *asterisk are calculated internally by HTML Tidy"
-msgstr ""
-
 #, c-format
 msgctxt "TC_STRING_OPT_NOT_DOCUMENTED"
 msgid "Warning: option `%s' is not documented."
diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po
index d53835e..91ff180 100644
--- a/localize/translations/language_fr.po
+++ b/localize/translations/language_fr.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-03-07 20:09:19\n"
+"PO-Revision-Date: 2017-03-10 09:04:23\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -3155,6 +3155,10 @@ msgctxt "TidyEncoding"
 msgid "encoding"
 msgstr "encoding"
 
+msgctxt "TidyInternalCategory"
+msgid "internal (private)"
+msgstr ""
+
 msgctxt "TidyMarkup"
 msgid "markup"
 msgstr "markup"
@@ -3396,11 +3400,6 @@ msgctxt "TC_STRING_CONF_VALUE"
 msgid "Current Value"
 msgstr ""
 
-#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
-msgctxt "TC_STRING_CONF_NOTE"
-msgid "Values marked with an *asterisk are calculated internally by HTML Tidy"
-msgstr ""
-
 #, c-format
 msgctxt "TC_STRING_OPT_NOT_DOCUMENTED"
 msgid "Warning: option `%s' is not documented."
diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po
index dff98b4..925e9b7 100644
--- a/localize/translations/language_zh_cn.po
+++ b/localize/translations/language_zh_cn.po
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-03-07 20:09:19\n"
+"PO-Revision-Date: 2017-03-10 09:04:23\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2954,6 +2954,10 @@ msgctxt "TidyEncoding"
 msgid "encoding"
 msgstr ""
 
+msgctxt "TidyInternalCategory"
+msgid "internal (private)"
+msgstr ""
+
 msgctxt "TidyMarkup"
 msgid "markup"
 msgstr ""
@@ -3193,11 +3197,6 @@ msgctxt "TC_STRING_CONF_VALUE"
 msgid "Current Value"
 msgstr ""
 
-#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
-msgctxt "TC_STRING_CONF_NOTE"
-msgid "Values marked with an *asterisk are calculated internally by HTML Tidy"
-msgstr ""
-
 #, c-format
 msgctxt "TC_STRING_OPT_NOT_DOCUMENTED"
 msgid "Warning: option `%s' is not documented."
diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot
index a68fe33..34e2040 100644
--- a/localize/translations/tidy.pot
+++ b/localize/translations/tidy.pot
@@ -5,7 +5,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: HTML Tidy poconvert.rb\n"
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-03-07 20:09:19\n"
+"POT-Creation-Date: 2017-03-10 09:04:23\n"
 "Last-Translator: jderry\n"
 "Language-Team: \n"
 
@@ -2956,6 +2956,10 @@ msgctxt "TidyEncoding"
 msgid "encoding"
 msgstr ""
 
+msgctxt "TidyInternalCategory"
+msgid "internal (private)"
+msgstr ""
+
 msgctxt "TidyMarkup"
 msgid "markup"
 msgstr ""
@@ -3195,11 +3199,6 @@ msgctxt "TC_STRING_CONF_VALUE"
 msgid "Current Value"
 msgstr ""
 
-#. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
-msgctxt "TC_STRING_CONF_NOTE"
-msgid "Values marked with an *asterisk are calculated internally by HTML Tidy"
-msgstr ""
-
 #, c-format
 msgctxt "TC_STRING_OPT_NOT_DOCUMENTED"
 msgid "Warning: option `%s' is not documented."
diff --git a/src/config.c b/src/config.c
index 6401050..2a43601 100644
--- a/src/config.c
+++ b/src/config.c
@@ -216,108 +216,112 @@ static ParseProperty ParseTabs;
 /* Ensure struct order is same order as tidyenum.h:TidyOptionId! */
 static const TidyOptionImpl option_defs[] =
 {
-  { TidyUnknownOption,           MS, "unknown!",                    IN, 0,               NULL,              NULL            },
-  { TidyDoctypeMode,             IR, "doctype-mode",                IN, TidyDoctypeAuto, NULL,              doctypePicks    },
-  { TidyEmacsFile,               IR, "gnu-emacs-file",              ST, 0,               ParseString,       NULL            },
-  { TidyIndentSpaces,            PP, "indent-spaces",               IN, 2,               ParseInt,          NULL            },
-  { TidyWrapLen,                 PP, "wrap",                        IN, 68,              ParseInt,          NULL            },
-  { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL            },
-  { TidyCharEncoding,            CE, "char-encoding",               IN, UTF8,            ParseCharEnc,      charEncPicks    },
-  { TidyInCharEncoding,          CE, "input-encoding",              IN, UTF8,            ParseCharEnc,      charEncPicks    },
-  { TidyOutCharEncoding,         CE, "output-encoding",             IN, UTF8,            ParseCharEnc,      charEncPicks    },
-  { TidyNewline,                 CE, "newline",                     IN, DLF,             ParseNewline,      newlinePicks    },
-  { TidyDoctype,                 MU, "doctype",                     ST, 0,               ParseDocType,      doctypePicks    },
-  { TidyDuplicateAttrs,          MU, "repeated-attributes",         IN, TidyKeepLast,    ParseRepeatAttr,   repeatAttrPicks },
-  { TidyAltText,                 MU, "alt-text",                    ST, 0,               ParseString,       NULL            },
-  { TidyErrFile,                 MS, "error-file",                  ST, 0,               ParseString,       NULL            },
-  { TidyOutFile,                 MS, "output-file",                 ST, 0,               ParseString,       NULL            },
-  { TidyWriteBack,               MS, "write-back",                  BL, no,              ParseBool,         boolPicks       },
-  { TidyShowMarkup,              PP, "markup",                      BL, yes,             ParseBool,         boolPicks       },
-  { TidyShowInfo,                DG, "show-info",                   BL, yes,             ParseBool,         boolPicks       },
-  { TidyShowWarnings,            DG, "show-warnings",               BL, yes,             ParseBool,         boolPicks       },
-  { TidyQuiet,                   MS, "quiet",                       BL, no,              ParseBool,         boolPicks       },
-  { TidyIndentContent,           PP, "indent",                      IN, TidyNoState,     ParseAutoBool,     autoBoolPicks   },
-  { TidyCoerceEndTags,           MU, "coerce-endtags",              BL, yes,             ParseBool,         boolPicks       },
-  { TidyOmitOptionalTags,        MU, "omit-optional-tags",          BL, no,              ParseBool,         boolPicks       },
-  { TidyHideEndTags,             MU, "hide-endtags",                BL, no,              ParseBool,         boolPicks       },
-  { TidyXmlTags,                 MU, "input-xml",                   BL, no,              ParseBool,         boolPicks       },
-  { TidyXmlOut,                  MU, "output-xml",                  BL, no,              ParseBool,         boolPicks       },
-  { TidyXhtmlOut,                MU, "output-xhtml",                BL, no,              ParseBool,         boolPicks       },
-  { TidyHtmlOut,                 MU, "output-html",                 BL, no,              ParseBool,         boolPicks       },
-  { TidyXmlDecl,                 MU, "add-xml-decl",                BL, no,              ParseBool,         boolPicks       },
-  { TidyUpperCaseTags,           MU, "uppercase-tags",              BL, no,              ParseBool,         boolPicks       },
-  { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        BL, no,              ParseBool,         boolPicks       },
-  { TidyMakeBare,                MU, "bare",                        BL, no,              ParseBool,         boolPicks       },
-  { TidyMakeClean,               MU, "clean",                       BL, no,              ParseBool,         boolPicks       },
-  { TidyGDocClean,               MU, "gdoc",                        BL, no,              ParseBool,         boolPicks       },
-  { TidyLogicalEmphasis,         MU, "logical-emphasis",            BL, no,              ParseBool,         boolPicks       },
-  { TidyDropPropAttrs,           MU, "drop-proprietary-attributes", BL, no,              ParseBool,         boolPicks       },
-  { TidyDropFontTags,            MU, "drop-font-tags",              BL, no,              ParseBool,         boolPicks       },
-  { TidyDropEmptyElems,          MU, "drop-empty-elements",         BL, yes,             ParseBool,         boolPicks       },
-  { TidyDropEmptyParas,          MU, "drop-empty-paras",            BL, yes,             ParseBool,         boolPicks       },
-  { TidyFixComments,             MU, "fix-bad-comments",            BL, yes,             ParseBool,         boolPicks       },
-  { TidyBreakBeforeBR,           PP, "break-before-br",             BL, no,              ParseBool,         boolPicks       },
-  { TidyNumEntities,             MU, "numeric-entities",            BL, no,              ParseBool,         boolPicks       },
-  { TidyQuoteMarks,              MU, "quote-marks",                 BL, no,              ParseBool,         boolPicks       },
-  { TidyQuoteNbsp,               MU, "quote-nbsp",                  BL, yes,             ParseBool,         boolPicks       },
-  { TidyQuoteAmpersand,          MU, "quote-ampersand",             BL, yes,             ParseBool,         boolPicks       },
-  { TidyWrapAttVals,             PP, "wrap-attributes",             BL, no,              ParseBool,         boolPicks       },
-  { TidyWrapScriptlets,          PP, "wrap-script-literals",        BL, no,              ParseBool,         boolPicks       },
-  { TidyWrapSection,             PP, "wrap-sections",               BL, yes,             ParseBool,         boolPicks       },
-  { TidyWrapAsp,                 PP, "wrap-asp",                    BL, yes,             ParseBool,         boolPicks       },
-  { TidyWrapJste,                PP, "wrap-jste",                   BL, yes,             ParseBool,         boolPicks       },
-  { TidyWrapPhp,                 PP, "wrap-php",                    BL, yes,             ParseBool,         boolPicks       },
-  { TidyFixBackslash,            MU, "fix-backslash",               BL, yes,             ParseBool,         boolPicks       },
-  { TidyIndentAttributes,        PP, "indent-attributes",           BL, no,              ParseBool,         boolPicks       },
-  { TidyXmlPIs,                  MU, "assume-xml-procins",          BL, no,              ParseBool,         boolPicks       },
-  { TidyXmlSpace,                MU, "add-xml-space",               BL, no,              ParseBool,         boolPicks       },
-  { TidyEncloseBodyText,         MU, "enclose-text",                BL, no,              ParseBool,         boolPicks       },
-  { TidyEncloseBlockText,        MU, "enclose-block-text",          BL, no,              ParseBool,         boolPicks       },
-  { TidyKeepFileTimes,           MS, "keep-time",                   BL, no,              ParseBool,         boolPicks       },
-  { TidyWord2000,                MU, "word-2000",                   BL, no,              ParseBool,         boolPicks       },
-  { TidyMark,                    MS, "tidy-mark",                   BL, yes,             ParseBool,         boolPicks       },
-  { TidyEmacs,                   MS, "gnu-emacs",                   BL, no,              ParseBool,         boolPicks       },
-  { TidyLiteralAttribs,          MU, "literal-attributes",          BL, no,              ParseBool,         boolPicks       },
-  { TidyBodyOnly,                MU, "show-body-only",              IN, no,              ParseAutoBool,     autoBoolPicks   },
-  { TidyFixUri,                  MU, "fix-uri",                     BL, yes,             ParseBool,         boolPicks       },
-  { TidyLowerLiterals,           MU, "lower-literals",              BL, yes,             ParseBool,         boolPicks       },
-  { TidyHideComments,            MU, "hide-comments",               BL, no,              ParseBool,         boolPicks       },
-  { TidyIndentCdata,             MU, "indent-cdata",                BL, no,              ParseBool,         boolPicks       },
-  { TidyForceOutput,             MS, "force-output",                BL, no,              ParseBool,         boolPicks       },
-  { TidyShowErrors,              DG, "show-errors",                 IN, 6,               ParseInt,          NULL            },
-  { TidyAsciiChars,              CE, "ascii-chars",                 BL, no,              ParseBool,         boolPicks       },
-  { TidyJoinClasses,             MU, "join-classes",                BL, no,              ParseBool,         boolPicks       },
-  { TidyJoinStyles,              MU, "join-styles",                 BL, yes,             ParseBool,         boolPicks       },
-  { TidyEscapeCdata,             MU, "escape-cdata",                BL, no,              ParseBool,         boolPicks       },
-#if SUPPORT_ASIAN_ENCODINGS
-  { TidyNCR,                     MU, "ncr",                         BL, yes,             ParseBool,         boolPicks       },
+    { TidyUnknownOption,           MS, "unknown!",                    IN, 0,               NULL,              NULL            },
+    { TidyAccessibilityCheckLevel, DG, "accessibility-check",         IN, 0,               ParseAcc,          accessPicks     },
+    { TidyAltText,                 MU, "alt-text",                    ST, 0,               ParseString,       NULL            },
+    { TidyAnchorAsName,            MU, "anchor-as-name",              BL, yes,             ParseBool,         boolPicks       },
+    { TidyAsciiChars,              CE, "ascii-chars",                 BL, no,              ParseBool,         boolPicks       },
+    { TidyBlockTags,               MU, "new-blocklevel-tags",         ST, 0,               ParseTagNames,     NULL            },
+    { TidyBodyOnly,                MU, "show-body-only",              IN, no,              ParseAutoBool,     autoBoolPicks   },
+    { TidyBreakBeforeBR,           PP, "break-before-br",             BL, no,              ParseBool,         boolPicks       },
+    { TidyCharEncoding,            CE, "char-encoding",               IN, UTF8,            ParseCharEnc,      charEncPicks    },
+    { TidyCoerceEndTags,           MU, "coerce-endtags",              BL, yes,             ParseBool,         boolPicks       },
+    { TidyCSSPrefix,               MU, "css-prefix",                  ST, 0,               ParseCSS1Selector, NULL            },
+    { TidyDecorateInferredUL,      MU, "decorate-inferred-ul",        BL, no,              ParseBool,         boolPicks       },
+    { TidyDoctype,                 MU, "doctype",                     ST, 0,               ParseDocType,      doctypePicks    },
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+    { TidyDoctypeMode,             IR, "doctype-mode",                IN, TidyDoctypeAuto, NULL,              doctypePicks    },
 #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       },
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+    { TidyEmacsFile,               IR, "gnu-emacs-file",              ST, 0,               ParseString,       NULL            },
+#endif
+    { TidyEmptyTags,               MU, "new-empty-tags",              ST, 0,               ParseTagNames,     NULL            },
+    { TidyEncloseBlockText,        MU, "enclose-block-text",          BL, no,              ParseBool,         boolPicks       },
+    { TidyEncloseBodyText,         MU, "enclose-text",                BL, no,              ParseBool,         boolPicks       },
+    { TidyErrFile,                 MS, "error-file",                  ST, 0,               ParseString,       NULL            },
+    { TidyEscapeCdata,             MU, "escape-cdata",                BL, no,              ParseBool,         boolPicks       },
+    { TidyEscapeScripts,           PP, "escape-scripts",              BL, yes,             ParseBool,         boolPicks       }, /* 20160227 - Issue #348 */
+    { TidyFixBackslash,            MU, "fix-backslash",               BL, yes,             ParseBool,         boolPicks       },
+    { TidyFixComments,             MU, "fix-bad-comments",            BL, yes,             ParseBool,         boolPicks       },
+    { TidyFixUri,                  MU, "fix-uri",                     BL, yes,             ParseBool,         boolPicks       },
+    { 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       },
+    { TidyIndentCdata,             MU, "indent-cdata",                BL, no,              ParseBool,         boolPicks       },
+    { TidyIndentContent,           PP, "indent",                      IN, TidyNoState,     ParseAutoBool,     autoBoolPicks   },
+    { TidyIndentSpaces,            PP, "indent-spaces",               IN, 2,               ParseInt,          NULL            },
+    { TidyInlineTags,              MU, "new-inline-tags",             ST, 0,               ParseTagNames,     NULL            },
+    { TidyJoinClasses,             MU, "join-classes",                BL, no,              ParseBool,         boolPicks       },
+    { TidyJoinStyles,              MU, "join-styles",                 BL, yes,             ParseBool,         boolPicks       },
+    { TidyKeepFileTimes,           MS, "keep-time",                   BL, no,              ParseBool,         boolPicks       },
+    { TidyLiteralAttribs,          MU, "literal-attributes",          BL, no,              ParseBool,         boolPicks       },
+    { TidyLogicalEmphasis,         MU, "logical-emphasis",            BL, no,              ParseBool,         boolPicks       },
+    { TidyLowerLiterals,           MU, "lower-literals",              BL, yes,             ParseBool,         boolPicks       },
+    { TidyMakeBare,                MU, "bare",                        BL, no,              ParseBool,         boolPicks       },
+    { TidyMakeClean,               MU, "clean",                       BL, no,              ParseBool,         boolPicks       },
+    { TidyMark,                    MS, "tidy-mark",                   BL, yes,             ParseBool,         boolPicks       },
+    { TidyMergeDivs,               MU, "merge-divs",                  IN, TidyAutoState,   ParseAutoBool,     autoBoolPicks   },
+    { TidyMergeEmphasis,           MU, "merge-emphasis",              BL, yes,             ParseBool,         boolPicks       },
+    { TidyMergeSpans,              MU, "merge-spans",                 IN, TidyAutoState,   ParseAutoBool,     autoBoolPicks   },
+#if SUPPORT_ASIAN_ENCODINGS
+    { TidyNCR,                     MU, "ncr",                         BL, yes,             ParseBool,         boolPicks       },
+#endif
+    { TidyNewline,                 CE, "newline",                     IN, DLF,             ParseNewline,      newlinePicks    },
+    { TidyNumEntities,             MU, "numeric-entities",            BL, no,              ParseBool,         boolPicks       },
+    { TidyOmitOptionalTags,        MU, "omit-optional-tags",          BL, no,              ParseBool,         boolPicks       },
+    { TidyOutCharEncoding,         CE, "output-encoding",             IN, UTF8,            ParseCharEnc,      charEncPicks    },
+    { TidyOutFile,                 MS, "output-file",                 ST, 0,               ParseString,       NULL            },
 #if SUPPORT_UTF16_ENCODINGS
-  { TidyOutputBOM,               CE, "output-bom",                  IN, TidyAutoState,   ParseAutoBool,     autoBoolPicks   },
+    { TidyOutputBOM,               CE, "output-bom",                  IN, TidyAutoState,   ParseAutoBool,     autoBoolPicks   },
 #endif
-  { TidyReplaceColor,            MU, "replace-color",               BL, no,              ParseBool,         boolPicks       },
-  { TidyCSSPrefix,               MU, "css-prefix",                  ST, 0,               ParseCSS1Selector, NULL            },
-  { TidyInlineTags,              MU, "new-inline-tags",             ST, 0,               ParseTagNames,     NULL            },
-  { TidyBlockTags,               MU, "new-blocklevel-tags",         ST, 0,               ParseTagNames,     NULL            },
-  { TidyEmptyTags,               MU, "new-empty-tags",              ST, 0,               ParseTagNames,     NULL            },
-  { TidyPreTags,                 MU, "new-pre-tags",                ST, 0,               ParseTagNames,     NULL            },
-  { TidyAccessibilityCheckLevel, DG, "accessibility-check",         IN, 0,               ParseAcc,          accessPicks     },
-  { TidyVertSpace,               PP, "vertical-space",              IN, no,              ParseAutoBool,     autoBoolPicks   }, /* #228 - tri option */
+    { TidyPPrintTabs,              PP, "indent-with-tabs",            BL, no,              ParseTabs,         boolPicks       }, /* 20150515 - Issue #108 */
+    { TidyPreserveEntities,        MU, "preserve-entities",           BL, no,              ParseBool,         boolPicks       },
+    { TidyPreTags,                 MU, "new-pre-tags",                ST, 0,               ParseTagNames,     NULL            },
 #if SUPPORT_ASIAN_ENCODINGS
-  { TidyPunctWrap,               PP, "punctuation-wrap",            BL, no,              ParseBool,         boolPicks       },
+    { TidyPunctWrap,               PP, "punctuation-wrap",            BL, no,              ParseBool,         boolPicks       },
 #endif
-  { TidyMergeEmphasis,           MU, "merge-emphasis",              BL, yes,             ParseBool,         boolPicks       },
-  { TidyMergeDivs,               MU, "merge-divs",                  IN, TidyAutoState,   ParseAutoBool,     autoBoolPicks   },
-  { TidyDecorateInferredUL,      MU, "decorate-inferred-ul",        BL, no,              ParseBool,         boolPicks       },
-  { TidyPreserveEntities,        MU, "preserve-entities",           BL, no,              ParseBool,         boolPicks       },
-  { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParseSorter,       sorterPicks     },
-  { TidyMergeSpans,              MU, "merge-spans",                 IN, TidyAutoState,   ParseAutoBool,     autoBoolPicks   },
-  { TidyAnchorAsName,            MU, "anchor-as-name",              BL, yes,             ParseBool,         boolPicks       },
-  { TidyPPrintTabs,              PP, "indent-with-tabs",            BL, no,              ParseTabs,         boolPicks       }, /* 20150515 - Issue #108 */
-  { TidySkipNested,              MU, "skip-nested",                 BL, yes,             ParseBool,         boolPicks       }, /* 1642186 - Issue #65 */
-  { TidyStrictTagsAttr,          MU, "strict-tags-attributes",      BL, no,              ParseBool,         boolPicks       }, /* 20160209 - Issue #350 */
-  { TidyEscapeScripts,           PP, "escape-scripts",              BL, yes,             ParseBool,         boolPicks       }, /* 20160227 - Issue #348 */
-  { N_TIDY_OPTIONS,              XX, NULL,                          XY, 0,               NULL,              NULL            }
+    { TidyQuiet,                   MS, "quiet",                       BL, no,              ParseBool,         boolPicks       },
+    { TidyQuoteAmpersand,          MU, "quote-ampersand",             BL, yes,             ParseBool,         boolPicks       },
+    { TidyQuoteMarks,              MU, "quote-marks",                 BL, no,              ParseBool,         boolPicks       },
+    { TidyQuoteNbsp,               MU, "quote-nbsp",                  BL, yes,             ParseBool,         boolPicks       },
+    { TidyReplaceColor,            MU, "replace-color",               BL, no,              ParseBool,         boolPicks       },
+    { TidyShowErrors,              DG, "show-errors",                 IN, 6,               ParseInt,          NULL            },
+    { TidyShowInfo,                DG, "show-info",                   BL, yes,             ParseBool,         boolPicks       },
+    { TidyShowMarkup,              PP, "markup",                      BL, yes,             ParseBool,         boolPicks       },
+    { TidyShowWarnings,            DG, "show-warnings",               BL, yes,             ParseBool,         boolPicks       },
+    { TidySkipNested,              MU, "skip-nested",                 BL, yes,             ParseBool,         boolPicks       }, /* 1642186 - Issue #65 */
+    { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParseSorter,       sorterPicks     },
+    { TidyStrictTagsAttr,          MU, "strict-tags-attributes",      BL, no,              ParseBool,         boolPicks       }, /* 20160209 - Issue #350 */
+    { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL            },
+    { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        BL, no,              ParseBool,         boolPicks       },
+    { TidyUpperCaseTags,           MU, "uppercase-tags",              BL, no,              ParseBool,         boolPicks       },
+    { TidyVertSpace,               PP, "vertical-space",              IN, no,              ParseAutoBool,     autoBoolPicks   }, /* #228 - tri option */
+    { TidyWord2000,                MU, "word-2000",                   BL, no,              ParseBool,         boolPicks       },
+    { TidyWrapAsp,                 PP, "wrap-asp",                    BL, yes,             ParseBool,         boolPicks       },
+    { TidyWrapAttVals,             PP, "wrap-attributes",             BL, no,              ParseBool,         boolPicks       },
+    { TidyWrapJste,                PP, "wrap-jste",                   BL, yes,             ParseBool,         boolPicks       },
+    { TidyWrapLen,                 PP, "wrap",                        IN, 68,              ParseInt,          NULL            },
+    { TidyWrapPhp,                 PP, "wrap-php",                    BL, yes,             ParseBool,         boolPicks       },
+    { TidyWrapScriptlets,          PP, "wrap-script-literals",        BL, no,              ParseBool,         boolPicks       },
+    { TidyWrapSection,             PP, "wrap-sections",               BL, yes,             ParseBool,         boolPicks       },
+    { TidyWriteBack,               MS, "write-back",                  BL, no,              ParseBool,         boolPicks       },
+    { TidyXhtmlOut,                MU, "output-xhtml",                BL, no,              ParseBool,         boolPicks       },
+    { TidyXmlDecl,                 MU, "add-xml-decl",                BL, no,              ParseBool,         boolPicks       },
+    { TidyXmlOut,                  MU, "output-xml",                  BL, no,              ParseBool,         boolPicks       },
+    { TidyXmlPIs,                  MU, "assume-xml-procins",          BL, no,              ParseBool,         boolPicks       },
+    { TidyXmlSpace,                MU, "add-xml-space",               BL, no,              ParseBool,         boolPicks       },
+    { TidyXmlTags,                 MU, "input-xml",                   BL, no,              ParseBool,         boolPicks       },
+    { N_TIDY_OPTIONS,              XX, NULL,                          XY, 0,               NULL,              NULL            }
 };
 
 /* Should only be called by options set by name
@@ -1602,10 +1606,6 @@ const TidyOptionImpl*  TY_(getNextOption)( TidyDocImpl* ARG_UNUSED(doc),
     optId = (size_t) *iter;
     if ( optId > TidyUnknownOption && optId < N_TIDY_OPTIONS )
     {
-        /* Hide these internal options from the API entirely. */
-        while ( tidyOptGetCategory( tidyGetOption(NULL, optId) ) == TidyInternalCategory )
-            optId++;
-
         option = &option_defs[ optId ];
         optId++;
     }
diff --git a/src/language_en.h b/src/language_en.h
index 5bcd5d8..5b1ba29 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -2041,6 +2041,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
      ********************************************************/
     { TidyDiagnostics,              0,   "diagnostics"                                                             },
     { TidyEncoding,                 0,   "encoding"                                                                },
+    { TidyInternalCategory,         0,   "internal (private)"                                                      },
     { TidyMarkup,                   0,   "markup"                                                                  },
     { TidyMiscellaneous,            0,   "misc"                                                                    },
     { TidyPrettyPrint,              0,   "print"                                                                   },
@@ -2128,9 +2129,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     {/* Must be 40 characters or fewer. */
       TC_STRING_CONF_VALUE,         0,   "Current Value"
     },
-    {/* The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
-      TC_STRING_CONF_NOTE,          0,   "Values marked with an *asterisk are calculated internally by HTML Tidy"
-    },
 
     { TC_STRING_OPT_NOT_DOCUMENTED, 0,   "Warning: option `%s' is not documented."                                 },
     { TC_STRING_OUT_OF_MEMORY,      0,   "Out of memory. Bailing out."                                             },
diff --git a/src/language_en_gb.h b/src/language_en_gb.h
index 2ce9c92..76773c3 100644
--- a/src/language_en_gb.h
+++ b/src/language_en_gb.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-03-07 20:09:19
+ *   PO_REVISION_DATE=2017-03-10 09:04:23
  */
 
 #ifdef _MSC_VER
diff --git a/src/language_es.h b/src/language_es.h
index 227e8fa..ac17ba2 100644
--- a/src/language_es.h
+++ b/src/language_es.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-03-07 20:09:19
+ *   PO_REVISION_DATE=2017-03-10 09:04:23
  */
 
 #ifdef _MSC_VER
diff --git a/src/language_es_mx.h b/src/language_es_mx.h
index 6ae653e..0ee4d5a 100644
--- a/src/language_es_mx.h
+++ b/src/language_es_mx.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-03-07 20:09:19
+ *   PO_REVISION_DATE=2017-03-10 09:04:23
  */
 
 #ifdef _MSC_VER
diff --git a/src/language_fr.h b/src/language_fr.h
index ed64416..0398c61 100644
--- a/src/language_fr.h
+++ b/src/language_fr.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-03-07 20:09:19
+ *   PO_REVISION_DATE=2017-03-10 09:04:23
  */
 
 #ifdef _MSC_VER
diff --git a/src/language_zh_cn.h b/src/language_zh_cn.h
index 7982bfe..0ebfa90 100644
--- a/src/language_zh_cn.h
+++ b/src/language_zh_cn.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-03-07 20:09:19
+ *   PO_REVISION_DATE=2017-03-10 09:04:23
  */
 
 #ifdef _MSC_VER
diff --git a/version.txt b/version.txt
index 396cb11..eb70a06 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-5.5.4
-2017.03.09
+5.5.5
+2017.03.10