From eecd0cf4e684d99f94a8b67757e497a3931e7539 Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Wed, 20 Sep 2017 08:13:06 -0400
Subject: [PATCH] Balthisar Tidy 3.7.0   - _Balthisar Tidy_ and _Balthisar Tidy
 for Work_:     - Update to HTML Tidy 5.7.0.     - New Tidy options such as
 `add-meta-charset`, `priority-attributes`,       `show-meta-change`,
 `keep-tabs`.     - You can now double-click into a Tidy Option with a text
 field, and the text       field will activate.     - You can triple click a
 text field that uses lists, and the list editor will       pop up. This can
 be much nicer than managing long lists in a single string.     - Tidy Option
 text fields that are lists now reflect the proper formatting for       lists.
     - Adopted all of the new Tidy Option categories offered by the latest
 **HTML       Tidy**.     - We now issue advice to turn on `force-output` if a
 loaded document produced       no content.     - Removed the `markup` Tidy
 option, because **Balthisar Tidy** handles this       automatically.     -
 Updated the Help book to include updates to Tidy options.   - Developer
 changes:     - Internal changes to make future maintenance of **Balthisar
 Tidy** better.     - I've removed all of the different, redundant targets,
 and now different       versions are built via the xcconfig files.     -
 Built versions of **Balthisar Tidy** are now a smaller. The Tidy Extensions  
     and Tidy Service Helper now rely on **Balthisar Tidy**'s frameworks where
       possible rather than including their own, duplicate copies.

---
 Balthisar Common Headers/CommonHeaders.h      |    2 +-
 Balthisar Tidy Extension/Info-Body.plist      |   49 -
 Balthisar Tidy Extension/Info.plist           |    8 +-
 .../010_docwin-chooseoptions.html.md.erb      |    5 +
 .../040_tidyopts/010_tidyoptions.html.md.erb  |   38 +-
 .../020_missingoptions.html.md.erb            |   21 +-
 Balthisar Tidy Help Project/build_help.sh     |   18 +
 Balthisar Tidy Help Project/config.rb         |   18 +-
 Balthisar Tidy Service Helper/Info.plist      |   24 +-
 Balthisar Tidy.xcodeproj/project.pbxproj      | 3429 ++++-------------
 .../xcschemes/Balthisar Tidy (app).xcscheme   |   95 +
 .../xcschemes/Balthisar Tidy (pro).xcscheme   |   94 +
 .../xcschemes/Balthisar Tidy (web).xcscheme   |   95 +
 .../Balthisar Tidy Help Project.xcscheme      |   82 +
 .../Balthisar Tidy Service Helper.xcscheme    |   93 +
 .../JSDTidyFramework Documentation.xcscheme   |   82 +
 .../xcschemes/JSDTidyFramework.xcscheme       |   82 +
 .../xcschemes/Tidy Extension.xcscheme         |  110 +
 .../xcschemes/TidyBody Extension.xcscheme     |  110 +
 .../xcschemes/tidy-balthisar.xcscheme         |   82 +
 .../Classes/App Pieces/AppController.m        |    2 +-
 .../Classes/App Pieces/OptionPaneController.m |    1 -
 .../TidyDocumentWindowController.m            |   18 +-
 .../JSDListEditorController.h                 |   55 +
 .../JSDListEditorController.m                 |  152 +
 .../RSRTVArrayController.h                    |   55 +
 .../RSRTVArrayController.m                    |  226 ++
 .../PreferencesWindow/PreferenceController.m  |    3 +
 .../Classes/Support Pieces/JSDTableCellView.h |   21 +-
 .../Classes/Support Pieces/JSDTableCellView.m |   75 +
 .../Classes/Support Pieces/JSDTableView.m     |   86 +-
 .../{ => Base.lproj}/DCOAboutWindow.xib       |    0
 .../{ => Base.lproj}/MASPreferencesWindow.xib |    0
 .../{Balthisar Tidy-Info.plist => Info.plist} |   13 +-
 .../{Credits.rtf => Credits (web).rtf}        |    0
 .../Base.lproj/JSDListEditorController.xib    |  158 +
 .../Resources/Base.lproj/Localizable.strings  |    6 +-
 .../Resources/Base.lproj/OptionPane.xib       |   16 +-
 .../Base.lproj/TDFTableViewController.xib     |   14 +-
 .../UpdaterOptionsViewController.xib          |   29 +-
 Config/Balthisar Tidy Help Project.xcconfig   |   11 +
 .../JSDTidyFramework Documentation.xcconfig   |   10 +
 Config/JSDTidyFramework.xcconfig              |   29 +
 Config/balthisar-base.xcconfig                |   81 +
 Config/balthisar-debug.xcconfig               |   23 +
 Config/balthisar-release.xcconfig             |   21 +
 Config/balthisar-tidy-id.xcconfig             |   84 +
 Config/balthisar-tidy.xcconfig                |   69 +
 Config/extension-tidy.xcconfig                |   39 +
 Config/extension-tidybody.xcconfig            |   39 +
 Config/libtidy-balthisar.dylib.xcconfig       |   28 +
 Config/service-helper.xcconfig                |   53 +
 HTMLTidy/vendor/tidy-html5/include/tidy.h     |  176 +-
 .../vendor/tidy-html5/include/tidybuffio.h    |   28 +-
 HTMLTidy/vendor/tidy-html5/include/tidyenum.h |  325 +-
 .../vendor/tidy-html5/include/tidyplatform.h  |  796 ++--
 HTMLTidy/vendor/tidy-html5/src/access.c       |  172 +-
 HTMLTidy/vendor/tidy-html5/src/access.h       |    8 -
 HTMLTidy/vendor/tidy-html5/src/alloc.c        |   24 +-
 HTMLTidy/vendor/tidy-html5/src/attrapi.c      |   31 -
 HTMLTidy/vendor/tidy-html5/src/attrdict.c     |    1 +
 HTMLTidy/vendor/tidy-html5/src/attrs.c        |  347 +-
 HTMLTidy/vendor/tidy-html5/src/attrs.h        |   33 +-
 HTMLTidy/vendor/tidy-html5/src/clean.c        |  345 +-
 HTMLTidy/vendor/tidy-html5/src/clean.h        |    9 +-
 HTMLTidy/vendor/tidy-html5/src/config.c       | 1013 +++--
 HTMLTidy/vendor/tidy-html5/src/config.h       |  308 +-
 HTMLTidy/vendor/tidy-html5/src/entities.c     | 2389 ++++++++++--
 HTMLTidy/vendor/tidy-html5/src/fileio.c       |   10 +-
 HTMLTidy/vendor/tidy-html5/src/forward.h      |    1 +
 HTMLTidy/vendor/tidy-html5/src/iconvtc.c      |  104 -
 HTMLTidy/vendor/tidy-html5/src/iconvtc.h      |   14 -
 HTMLTidy/vendor/tidy-html5/src/istack.c       |    5 +-
 HTMLTidy/vendor/tidy-html5/src/language.c     |   65 +-
 HTMLTidy/vendor/tidy-html5/src/language.h     |   28 +-
 HTMLTidy/vendor/tidy-html5/src/language_en.h  |  658 ++--
 .../vendor/tidy-html5/src/language_en_gb.h    |   95 +-
 HTMLTidy/vendor/tidy-html5/src/language_es.h  |    6 +-
 .../vendor/tidy-html5/src/language_es_mx.h    |    2 +-
 HTMLTidy/vendor/tidy-html5/src/language_fr.h  |  190 +-
 .../vendor/tidy-html5/src/language_pt_br.h    | 1296 +++++++
 .../vendor/tidy-html5/src/language_zh_cn.h    |    4 +-
 HTMLTidy/vendor/tidy-html5/src/lexer.c        |  294 +-
 HTMLTidy/vendor/tidy-html5/src/lexer.h        |   24 +-
 HTMLTidy/vendor/tidy-html5/src/mappedio.c     |   58 +-
 HTMLTidy/vendor/tidy-html5/src/message.c      | 1597 +++++---
 HTMLTidy/vendor/tidy-html5/src/message.h      |  220 +-
 HTMLTidy/vendor/tidy-html5/src/messageobj.c   |   45 +-
 HTMLTidy/vendor/tidy-html5/src/messageobj.h   |    3 +
 HTMLTidy/vendor/tidy-html5/src/parser.c       |  753 ++--
 HTMLTidy/vendor/tidy-html5/src/parser.h       |  191 +-
 HTMLTidy/vendor/tidy-html5/src/pprint.c       |  155 +-
 HTMLTidy/vendor/tidy-html5/src/pprint.h       |    5 -
 HTMLTidy/vendor/tidy-html5/src/sprtf.c        |   61 +-
 HTMLTidy/vendor/tidy-html5/src/sprtf.h        |   76 +-
 HTMLTidy/vendor/tidy-html5/src/streamio.c     |  259 +-
 HTMLTidy/vendor/tidy-html5/src/streamio.h     |   44 +-
 HTMLTidy/vendor/tidy-html5/src/tags.c         |  120 +-
 HTMLTidy/vendor/tidy-html5/src/tags.h         |  347 +-
 HTMLTidy/vendor/tidy-html5/src/tidy-int.h     |   55 +-
 HTMLTidy/vendor/tidy-html5/src/tidylib.c      |  420 +-
 HTMLTidy/vendor/tidy-html5/src/tmbstr.c       |   54 +-
 HTMLTidy/vendor/tidy-html5/src/utf8.c         |   11 -
 HTMLTidy/vendor/tidy-html5/src/win32tc.c      |  794 ----
 HTMLTidy/vendor/tidy-html5/src/win32tc.h      |   18 -
 HTMLTidy/vendor/tidy-html5/version.txt        |    4 +-
 JSDTidyFramework/Info.plist                   |    6 +-
 JSDTidyFramework/JSDTidyModel/JSDTidyModel.m  |   13 +-
 JSDTidyFramework/JSDTidyModel/JSDTidyOption.h |    9 +
 JSDTidyFramework/JSDTidyModel/JSDTidyOption.m |   54 +-
 .../Resources/Base.lproj/Localizable.strings  |  521 +--
 111 files changed, 12196 insertions(+), 8452 deletions(-)
 delete mode 100644 Balthisar Tidy Extension/Info-Body.plist
 create mode 100755 Balthisar Tidy Help Project/build_help.sh
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (app).xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (pro).xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (web).xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Help Project.xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Service Helper.xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework Documentation.xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework.xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Tidy Extension.xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/TidyBody Extension.xcscheme
 create mode 100644 Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/tidy-balthisar.xcscheme
 create mode 100644 Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.h
 create mode 100644 Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.m
 create mode 100755 Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.h
 create mode 100755 Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.m
 rename Balthisar Tidy/Classes/vendor/DCOAboutWindow/DCOAboutWindow/{ => Base.lproj}/DCOAboutWindow.xib (100%)
 rename Balthisar Tidy/Classes/vendor/MASPreferences/{ => Base.lproj}/MASPreferencesWindow.xib (100%)
 rename Balthisar Tidy/{Balthisar Tidy-Info.plist => Info.plist} (93%)
 rename Balthisar Tidy/Resources/Base.lproj/{Credits.rtf => Credits (web).rtf} (100%)
 create mode 100644 Balthisar Tidy/Resources/Base.lproj/JSDListEditorController.xib
 create mode 100644 Config/Balthisar Tidy Help Project.xcconfig
 create mode 100644 Config/JSDTidyFramework Documentation.xcconfig
 create mode 100644 Config/JSDTidyFramework.xcconfig
 create mode 100644 Config/balthisar-base.xcconfig
 create mode 100644 Config/balthisar-debug.xcconfig
 create mode 100644 Config/balthisar-release.xcconfig
 create mode 100644 Config/balthisar-tidy-id.xcconfig
 create mode 100644 Config/balthisar-tidy.xcconfig
 create mode 100644 Config/extension-tidy.xcconfig
 create mode 100644 Config/extension-tidybody.xcconfig
 create mode 100644 Config/libtidy-balthisar.dylib.xcconfig
 create mode 100644 Config/service-helper.xcconfig
 delete mode 100644 HTMLTidy/vendor/tidy-html5/src/attrapi.c
 delete mode 100644 HTMLTidy/vendor/tidy-html5/src/iconvtc.c
 delete mode 100644 HTMLTidy/vendor/tidy-html5/src/iconvtc.h
 create mode 100644 HTMLTidy/vendor/tidy-html5/src/language_pt_br.h
 mode change 100755 => 100644 HTMLTidy/vendor/tidy-html5/src/message.c
 mode change 100755 => 100644 HTMLTidy/vendor/tidy-html5/src/tidy-int.h
 mode change 100755 => 100644 HTMLTidy/vendor/tidy-html5/src/tidylib.c
 delete mode 100644 HTMLTidy/vendor/tidy-html5/src/win32tc.c
 delete mode 100644 HTMLTidy/vendor/tidy-html5/src/win32tc.h

diff --git a/Balthisar Common Headers/CommonHeaders.h b/Balthisar Common Headers/CommonHeaders.h
index 0e43662c..007334b0 100644
--- a/Balthisar Common Headers/CommonHeaders.h	
+++ b/Balthisar Common Headers/CommonHeaders.h	
@@ -21,7 +21,7 @@
  *=======================================================*/
 #pragma mark - LibTidy version checking
 
-	#define LIBTIDY_V_WANT @"5.5.32"
+	#define LIBTIDY_V_WANT @"5.6.0"
 
 
 /*=======================================================*
diff --git a/Balthisar Tidy Extension/Info-Body.plist b/Balthisar Tidy Extension/Info-Body.plist
deleted file mode 100644
index 2495e4ea..00000000
--- a/Balthisar Tidy Extension/Info-Body.plist	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Tidy with Balthisar Tidy (body only)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.6.3</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>3.6.3</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-			<key>NSExtensionActivationRule</key>
-			<dict>
-				<key>NSExtensionActivationSupportsText</key>
-				<true/>
-			</dict>
-			<key>NSExtensionServiceRoleType</key>
-			<string>NSExtensionServiceRoleTypeEditor</string>
-		</dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.ui-services</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>ActionRequestHandler</string>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Jim Derry. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/Balthisar Tidy Extension/Info.plist b/Balthisar Tidy Extension/Info.plist
index 6e3a9208..ad80551e 100644
--- a/Balthisar Tidy Extension/Info.plist	
+++ b/Balthisar Tidy Extension/Info.plist	
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>Tidy with Balthisar Tidy</string>
+	<string>$(TIDY_EXT_CFBundleDisplayName)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconFile</key>
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleShortVersionString}</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleVersion}</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
@@ -44,6 +44,6 @@
 		<string>ActionRequestHandler</string>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Jim Derry. All rights reserved.</string>
+	<string>${TIDY_NSHumanReadableCopyright}</string>
 </dict>
 </plist>
diff --git a/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/040_howto/020_docwin/010_docwin-chooseoptions.html.md.erb b/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/040_howto/020_docwin/010_docwin-chooseoptions.html.md.erb
index 804ba044..a720806e 100644
--- a/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/040_howto/020_docwin/010_docwin-chooseoptions.html.md.erb	
+++ b/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/040_howto/020_docwin/010_docwin-chooseoptions.html.md.erb	
@@ -43,6 +43,11 @@ they control the output options such as formatting.
 4. You can also use the left- and right-arrow keyboard keys to select option
    values for most of <em>Balthisar Tidy</em>’s settings. And of course you
    will see the results in the **Tidy HTML** view immediately!
+   
+5. Some of the text options, such as `new-blocklevel-tags`, accept multiple 
+   values as a comma-separated list. To make managing these options simpler,
+   you can activate a list editor to manage lists by triple-clicking the row
+   of the option you wish to manage.
 </div>
 
 </div>
diff --git a/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/010_tidyoptions.html.md.erb b/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/010_tidyoptions.html.md.erb
index b688ec16..d9dd1305 100644
--- a/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/010_tidyoptions.html.md.erb	
+++ b/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/010_tidyoptions.html.md.erb	
@@ -13,10 +13,21 @@ layout: template-logo-medium
 This section contains a reference to all of <%= pne %>’s Tidy
 options.
 
+Note that these are accurate as of version 5.5.76 of HTML Tidy. Sometimes we
+forget to update this help book, but be assured that <%= pne %> always contains
+updated descriptions in the Tidy Option panel.
+{: .note}
+
 
 `accessibility-check`
 : This option specifies what level of accessibility checking, if any, that Tidy
   should do.
+  
+  
+`add-meta-charset`
+ : This option, when enabled, adds a `meta` element sets the `charset`
+   attribute to the encoding of the document. Set this option to **yes** to
+   enable it.
 
 
 `add-xml-decl`
@@ -84,6 +95,7 @@ options.
   appropriate inline tags, and `<font>`). If set to **YES** then legacy tags
   will be replaced with CSS `<style>` tags and structural markup as appropriate.
 
+
 `coerce-endtags`
 : This option specifies if Tidy should coerce a start tag into an end tag in
   cases where it looks like an end tag was probably intended. For example, given \\
@@ -97,6 +109,7 @@ options.
 
   By default, **c** will be used.
 
+
 `custom-tags`
 : This option enables the use of tags for autonomous custom elements, e.g. 
   `<flag-icon>`} with Tidy. Custom tags are disabled if this value is **no**.
@@ -112,6 +125,7 @@ options.
   using opening tags; matching closing tags will be recognized accordingly, and
   unknown closing tags will be discarded.
 
+
 `decorate-inferred-ul`
 : This option specifies if Tidy should decorate inferred `<ul>` elements
   with some CSS markup to avoid indentation to the right.
@@ -165,6 +179,7 @@ options.
 : This option specifies if Tidy should convert `<![CDATA[]]>` sections to
   normal text.
   
+  
 `escape-scripts`
 : This option causes items that look like closing tags in scripts to be escaped.
   For example **</g** will be escaped to **<\/g**. Set this option to **no** to
@@ -186,6 +201,11 @@ options.
   syntax `<!--- --->`.
 
 
+`fix-style-tags`
+ : This option specifies if Tidy should move all style tags to the head of the
+   document.
+
+
 `fix-uri`
 : This option specifies if Tidy should check attribute values that carry URIs
   for illegal characters and if such are found, escape them as HTML4 recommends.
@@ -288,6 +308,7 @@ options.
 
   This option can be set independently of the `clean` option.
 
+
 `lower-literals`
 : This option specifies if Tidy should convert the value of an attribute that
   takes a list of predefined values to lower case.
@@ -295,12 +316,6 @@ options.
   This is required for XHTML documents.
 
 
-`markup`
-: This option specifies if Tidy should generate a pretty-printed version of the
-  markup. Note that Tidy won’t generate a pretty-printed version if it finds
-  significant errors (see `force-output`).
-
-
 `merge-divs`
 : Can be used to modify behavior of `clean` when set to **yes**.
 
@@ -454,6 +469,15 @@ options.
   found in the input.
 
 
+`priority-attributes`
+ : This option allows prioritizing the writing of attributes in tidied 
+   documents, allowing them to written before the other attributes of an
+   element. For example, you might specify that **id** and **name** are written
+   before every other attribute.
+   
+   This option takes a space or comma separated list of attribute names.
+
+
 `punctuation-wrap`
 : This option specifies if Tidy should line wrap after some Unicode or Chinese
   punctuation characters.
@@ -509,6 +533,7 @@ options.
   the specified sort algorithm. If set to **alpha** the algorithm is an
   ascending alphabetic sort.
 
+
 `strict-tags-attributes`
 : This options ensures that tags and attributes are applicable for the version
   of HTML that Tidy outputs. When set to **yes** and the output document
@@ -520,6 +545,7 @@ options.
   
   When set to **no**, these checks are not performed.
 
+
 `tab-size`
 : 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.
diff --git a/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/020_missingoptions.html.md.erb b/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/020_missingoptions.html.md.erb
index 33fbb642..2cbfe369 100644
--- a/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/020_missingoptions.html.md.erb	
+++ b/Balthisar Tidy Help Project/Contents/Resources/Base.lproj/060_reference/040_tidyopts/020_missingoptions.html.md.erb	
@@ -28,28 +28,23 @@ options and <%= pne %>’s options.
   of <%= mac_os %>’s vast array of file encoding options compared to the limited options
   offered by Tidy proper.
 
-`language`
- : <%= pne %> provides superior localization to traditional Tidy, and
-   no Tidy output is used directly, anyway, making this option literally useless.
+`markup`
+ : This option is used with command line Tidy to hide or show the Tidy’d
+   document on the command line. Because <%= pne %> always shows the Tidy’d
+   document, this option isn’t available.
 
 `doctype-mode`
  : Although sometimes command line Tidy will accept setting this option, it’s
    officially defined as “read-only” by Tidy’s application programming interface.
    <%= pne %> supports `doctype` as it should.
 
+`drop-font-tags`
 `hide-endtags`
- : This option is a synonym for `omit-optional-tags`, and so
-   <%= pne %> hides this option.
-
+`language`
 `slide-style`
 `split`
- : These two options are marked as obsolete in Tidy’s source code, and so they
-   will not be supported by <%= pne %>.
-
-`drop-font-tags`
- : This option is marked as obsolete in Tidy’s source code, and it’s dangerous
-   to use besides. As such it will not be supported by <%= pne %>.
-
+ : These options have been deprecated by Tidy, and have been removed entirely
+   in recent versions of Tidy, and so there's no reason to support them.
 
 `error-file`
 `gnu-emacs`
diff --git a/Balthisar Tidy Help Project/build_help.sh b/Balthisar Tidy Help Project/build_help.sh
new file mode 100755
index 00000000..8728a7e1
--- /dev/null
+++ b/Balthisar Tidy Help Project/build_help.sh	
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+#####################################################################
+# Used to build from Xcode or another build system.
+#####################################################################
+
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+  source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+  source "/usr/local/rvm/scripts/rvm"
+else
+  printf "ERROR: An RVM installation was not found.\n"
+  exit 128
+fi
+
+cd "$PROJECT_DIR/Balthisar Tidy Help Project/"
+rvm use default
+bundle exec middleman all
diff --git a/Balthisar Tidy Help Project/config.rb b/Balthisar Tidy Help Project/config.rb
index b1b729a4..4734e9f2 100644
--- a/Balthisar Tidy Help Project/config.rb	
+++ b/Balthisar Tidy Help Project/config.rb	
@@ -4,6 +4,16 @@
 #    targets.
 ################################################################################
 
+
+##########################################################################
+# Build System Integration
+#  If built from Xcode (or another build system you create), then setup
+#  some of our variables automatically from the environment variables
+#  that the build system sets for us.
+##########################################################################
+version_app = ENV.has_key?('TIDY_CFBundleShortVersionString') ? ENV['TIDY_CFBundleShortVersionString'] : '3.7.0'
+
+
 ##########################################################################
 # Targets Configuration
 #  Middlemac is capable of building multiple targets for variants of your
@@ -79,7 +89,7 @@
                 :HPDBookIconPath => nil,
                 :CFBundleName    => 'Balthisar Tidy',
                 :ProductName     => 'Balthisar Tidy',
-                :ProductVersion  => '3.6.3',
+                :ProductVersion  => version_app,
                 :ProductURI      => 'http://www.balthisar.com/',
                 :features =>
                     {
@@ -104,7 +114,7 @@
                 :HPDBookIconPath => nil,
                 :CFBundleName    => 'Balthisar Tidy',
                 :ProductName     => 'Balthisar Tidy',
-                :ProductVersion  => '3.6.3',
+                :ProductVersion  => version_app,
                 :ProductURI      => 'http://www.balthisar.com/',
                 :features =>
                     {
@@ -129,7 +139,7 @@
                 :HPDBookIconPath => nil,
                 :CFBundleName    => 'Balthisar Tidy',
                 :ProductName     => 'Balthisar Tidy for Work',
-                :ProductVersion  => '3.6.3',
+                :ProductVersion  => version_app,
                 :ProductURI      => 'http://www.balthisar.com/',
                 :features =>
                     {
@@ -232,7 +242,7 @@
   # named in the form `#{CFBundleName} (target).help`. You might want to target
   # the `Resources` directory of your XCode project so that your XCode project
   # is always up to date.
-  options.Help_Output_Location = '../Balthisar Tidy/Resources/'
+  options.Help_Output_Location = '../Balthisar Tidy/Resources/Base.lproj'
 
   # Indicates the name of the breadcrumbs helper to use for breadcrumbs.
   # Built-in breadcrumbs are "nav_breadcrumbs" and "nav_breadcrumbs_alt".
diff --git a/Balthisar Tidy Service Helper/Info.plist b/Balthisar Tidy Service Helper/Info.plist
index 62b1bbe2..2ffe218f 100644
--- a/Balthisar Tidy Service Helper/Info.plist	
+++ b/Balthisar Tidy Service Helper/Info.plist	
@@ -17,17 +17,17 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleShortVersionString}</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleVersion}</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Jim Derry. All rights reserved.</string>
+	<string>${TIDY_NSHumanReadableCopyright}</string>
 	<key>NSMainNibFile</key>
 	<string>HelperMainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -35,6 +35,8 @@
 	<key>NSServices</key>
 	<array>
 		<dict>
+			<key>NSServiceDescription</key>
+			<string>Tidy the selection in place using Balthisar Tidy and its Preferences settings. The result is a complete HTML document.</string>
 			<key>NSKeyEquivalent</key>
 			<dict>
 				<key>default</key>
@@ -43,7 +45,7 @@
 			<key>NSMenuItem</key>
 			<dict>
 				<key>default</key>
-				<string>Tidy selection with Balthisar Tidy</string>
+				<string>$(TIDY_SERVICE_MENU_NAME)</string>
 			</dict>
 			<key>NSMessage</key>
 			<string>tidySelection</string>
@@ -57,8 +59,15 @@
 			<array>
 				<string>NSStringPboardType</string>
 			</array>
+            <key>NSRequiredContext</key>
+            <dict>
+                <key>NSServiceCategory</key>
+                <string>Internet</string>
+            </dict>
 		</dict>
 		<dict>
+			<key>NSServiceDescription</key>
+			<string>Tidy the selection in place using Balthisar Tidy and its Preferences settings. The result is an HTML fragment.</string>
 			<key>NSKeyEquivalent</key>
 			<dict>
 				<key>default</key>
@@ -67,7 +76,7 @@
 			<key>NSMenuItem</key>
 			<dict>
 				<key>default</key>
-				<string>Tidy selection with Balthisar Tidy (body only)</string>
+				<string>$(TIDY_SERVICE_MENU_NAME_FRAGMENT)</string>
 			</dict>
 			<key>NSMessage</key>
 			<string>tidySelectionBodyOnly</string>
@@ -81,6 +90,11 @@
 			<array>
 				<string>NSStringPboardType</string>
 			</array>
+            <key>NSRequiredContext</key>
+            <dict>
+                <key>NSServiceCategory</key>
+                <string>Internet</string>
+            </dict>
 		</dict>
 	</array>
 	<key>OSAScriptingDefinition</key>
diff --git a/Balthisar Tidy.xcodeproj/project.pbxproj b/Balthisar Tidy.xcodeproj/project.pbxproj
index 6cc8cf34..f701ceee 100644
--- a/Balthisar Tidy.xcodeproj/project.pbxproj	
+++ b/Balthisar Tidy.xcodeproj/project.pbxproj	
@@ -7,6 +7,17 @@
 	objects = {
 
 /* Begin PBXAggregateTarget section */
+		D036D5F51FB36E2000916128 /* Balthisar Tidy Help Project */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = D036D5F71FB36E2000916128 /* Build configuration list for PBXAggregateTarget "Balthisar Tidy Help Project" */;
+			buildPhases = (
+				D036D5F61FB36E2000916128 /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "Balthisar Tidy Help Project";
+			productName = Doc;
+		};
 		D0F4A50A1BDA2C520051327D /* JSDTidyFramework Documentation */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = D0F4A50B1BDA2C520051327D /* Build configuration list for PBXAggregateTarget "JSDTidyFramework Documentation" */;
@@ -22,7 +33,6 @@
 
 /* Begin PBXBuildFile section */
 		D002EFD61A57AC3C00530D2F /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D002EFD91A57AC6500530D2F /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D002EFDA1A57AC9000530D2F /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
 		D002EFDB1A57AC9000530D2F /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D002EFE21A57B82500530D2F /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = D002EFE01A57B80100530D2F /* README.md */; };
@@ -34,228 +44,95 @@
 		D00661391A579DF300F73F85 /* JSDTidyOption.m in Sources */ = {isa = PBXBuildFile; fileRef = D00661331A579DF300F73F85 /* JSDTidyOption.m */; };
 		D00661B41A579EA100F73F85 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D00661B01A579EA100F73F85 /* Localizable.strings */; };
 		D008F0191930D9D700559F3B /* JSDAllCapsValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D008F0181930D9D700559F3B /* JSDAllCapsValueTransformer.m */; };
-		D008F01A1930D9D700559F3B /* JSDAllCapsValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D008F0181930D9D700559F3B /* JSDAllCapsValueTransformer.m */; };
-		D0097B0B19712F68001CCF94 /* Balthisar Tidy (pro).help in Resources */ = {isa = PBXBuildFile; fileRef = D04E8FAD195D964F00D1CEDC /* Balthisar Tidy (pro).help */; };
 		D00AC8241E7F287B0059D5AB /* messageobj.c in Sources */ = {isa = PBXBuildFile; fileRef = D00AC81E1E7F280E0059D5AB /* messageobj.c */; };
-		D00AC8251E7F28890059D5AB /* attrapi.c in Sources */ = {isa = PBXBuildFile; fileRef = D00AC81D1E7F280E0059D5AB /* attrapi.c */; };
 		D00AC8261E7F28C00059D5AB /* messageobj.h in Headers */ = {isa = PBXBuildFile; fileRef = D00AC81F1E7F280E0059D5AB /* messageobj.h */; };
-		D01316611A5D881400AB1456 /* Balthisar Tidy Service Helper.app in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D04BC9681A5AC5CB009AC43A /* Balthisar Tidy Service Helper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D01316621A5D881C00AB1456 /* Balthisar Tidy Service Helper.app in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D04BC9681A5AC5CB009AC43A /* Balthisar Tidy Service Helper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D01316631A5D884100AB1456 /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D01316641A5D885100AB1456 /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D013166A1A5D888300AB1456 /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D013166C1A5D88A600AB1456 /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D016A92A182FD80700712C60 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
 		D016A936182FD80700712C60 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D016A935182FD80700712C60 /* main.m */; };
-		D01AACB8193DE56000C4E5B2 /* HideDescriptionTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE16190C9FAC00B49779 /* HideDescriptionTemplate.pdf */; };
-		D01AACB9193DE56000C4E5B2 /* ShowDescriptionTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE17190C9FAC00B49779 /* ShowDescriptionTemplate.pdf */; };
-		D01AACBA193DE58200C4E5B2 /* PaneBottomShadow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE1F190CB34500B49779 /* PaneBottomShadow.tiff */; };
+		D01816721FB7430D000B9F77 /* JSDListEditorController.m in Sources */ = {isa = PBXBuildFile; fileRef = D01816701FB7430D000B9F77 /* JSDListEditorController.m */; };
+		D01816751FB8A897000B9F77 /* RSRTVArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = D01816741FB8A897000B9F77 /* RSRTVArrayController.m */; };
 		D01AE4891C740EA1008E7199 /* language_en.h in Headers */ = {isa = PBXBuildFile; fileRef = D01AE4851C740EA1008E7199 /* language_en.h */; };
 		D01AE48A1C740EA1008E7199 /* language.c in Sources */ = {isa = PBXBuildFile; fileRef = D01AE4861C740EA1008E7199 /* language.c */; };
 		D01AE48B1C740EA1008E7199 /* language.h in Headers */ = {isa = PBXBuildFile; fileRef = D01AE4871C740EA1008E7199 /* language.h */; };
 		D01AE48C1C740EA1008E7199 /* message.c in Sources */ = {isa = PBXBuildFile; fileRef = D01AE4881C740EA1008E7199 /* message.c */; };
-		D01BA7BD1967DD3700843C69 /* TidyScripting.sdef in Resources */ = {isa = PBXBuildFile; fileRef = D036E21718F3D81E0009A9D4 /* TidyScripting.sdef */; };
 		D01C70BB1A55850D00CC5038 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
 		D01C70C01A55850D00CC5038 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D01C70BF1A55850D00CC5038 /* icon.icns */; };
 		D01C70C41A55850D00CC5038 /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
-		D01C70D51A558E1C00CC5038 /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
-		D01C70D71A558E1C00CC5038 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
-		D01C70D91A558E1C00CC5038 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D01C70BF1A55850D00CC5038 /* icon.icns */; };
-		D01C70E11A5591A500CC5038 /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
-		D01C70E31A5591A500CC5038 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
-		D01C70E51A5591A500CC5038 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D01C70BF1A55850D00CC5038 /* icon.icns */; };
 		D025BD5E195856B6006D7356 /* Acknowledgments.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D025BD5C195856B6006D7356 /* Acknowledgments.rtf */; };
-		D025BD5F195856C0006D7356 /* Acknowledgments.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D025BD5C195856B6006D7356 /* Acknowledgments.rtf */; };
-		D025BD60195856C1006D7356 /* Acknowledgments.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D025BD5C195856B6006D7356 /* Acknowledgments.rtf */; };
-		D02DBCEB1A5950B8009C84CF /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D02DBCEC1A5950BE009C84CF /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D02DBCEE1A595104009C84CF /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D02DBCF01A59512E009C84CF /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D034D8131A621E5300821FE5 /* helper-icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D04BC98D1A5AC714009AC43A /* helper-icon.icns */; };
-		D036E1E818F3D25E0009A9D4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D036E1D818F3D25E0009A9D4 /* Credits.rtf */; };
+		D036D63D1FB3861F00916128 /* Credits (app).rtf in Resources */ = {isa = PBXBuildFile; fileRef = D05F71D11BEA2DE300F584C4 /* Credits (app).rtf */; };
+		D036D63E1FB3862300916128 /* Credits (pro).rtf in Resources */ = {isa = PBXBuildFile; fileRef = D05F71D31BEA2DE300F584C4 /* Credits (pro).rtf */; };
+		D036D63F1FB3864F00916128 /* TidyScripting.sdef in Resources */ = {isa = PBXBuildFile; fileRef = D036E21718F3D81E0009A9D4 /* TidyScripting.sdef */; };
+		D036D6401FB3865D00916128 /* AppleScriptsforTidy.dmg in Resources */ = {isa = PBXBuildFile; fileRef = D0A143CA1BFCC2500006C533 /* AppleScriptsforTidy.dmg */; };
+		D036D6451FB3991E00916128 /* OptionListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D6471FB3991E00916128 /* OptionListViewController.xib */; };
+		D036D6481FB3992500916128 /* OptionListAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D64A1FB3992500916128 /* OptionListAppearanceViewController.xib */; };
+		D036D64B1FB3992B00916128 /* DocumentAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D64D1FB3992B00916128 /* DocumentAppearanceViewController.xib */; };
+		D036D64E1FB3992F00916128 /* SavingOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D6501FB3992F00916128 /* SavingOptionsViewController.xib */; };
+		D036D6511FB3993300916128 /* MiscOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D6531FB3993300916128 /* MiscOptionsViewController.xib */; };
+		D036D6541FB3993700916128 /* UpdaterOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D6561FB3993700916128 /* UpdaterOptionsViewController.xib */; };
+		D036D6571FB3997300916128 /* DCOAboutWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D6591FB3997300916128 /* DCOAboutWindow.xib */; };
+		D036D65A1FB3997A00916128 /* MASPreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036D65C1FB3997A00916128 /* MASPreferencesWindow.xib */; };
+		D036D65D1FB399D700916128 /* Balthisar Tidy (web).help in Resources */ = {isa = PBXBuildFile; fileRef = D036D65F1FB399D700916128 /* Balthisar Tidy (web).help */; };
+		D036D6601FB399DC00916128 /* Balthisar Tidy (app).help in Resources */ = {isa = PBXBuildFile; fileRef = D036D6621FB399DC00916128 /* Balthisar Tidy (app).help */; };
+		D036D6631FB399E000916128 /* Balthisar Tidy (pro).help in Resources */ = {isa = PBXBuildFile; fileRef = D036D6651FB399E000916128 /* Balthisar Tidy (pro).help */; };
+		D036E1E818F3D25E0009A9D4 /* Credits (web).rtf in Resources */ = {isa = PBXBuildFile; fileRef = D036E1D818F3D25E0009A9D4 /* Credits (web).rtf */; };
 		D036E1EA18F3D25E0009A9D4 /* FirstRunController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DA18F3D25E0009A9D4 /* FirstRunController.xib */; };
-		D036E1EB18F3D25E0009A9D4 /* FirstRunController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DA18F3D25E0009A9D4 /* FirstRunController.xib */; };
 		D036E1EC18F3D25E0009A9D4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DC18F3D25E0009A9D4 /* InfoPlist.strings */; };
-		D036E1ED18F3D25E0009A9D4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DC18F3D25E0009A9D4 /* InfoPlist.strings */; };
 		D036E1EE18F3D25E0009A9D4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DE18F3D25E0009A9D4 /* Localizable.strings */; };
-		D036E1EF18F3D25E0009A9D4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DE18F3D25E0009A9D4 /* Localizable.strings */; };
 		D036E1F018F3D25E0009A9D4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E018F3D25E0009A9D4 /* MainMenu.xib */; };
-		D036E1F118F3D25E0009A9D4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E018F3D25E0009A9D4 /* MainMenu.xib */; };
 		D036E1F218F3D25E0009A9D4 /* OptionPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E218F3D25E0009A9D4 /* OptionPane.xib */; };
-		D036E1F318F3D25E0009A9D4 /* OptionPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E218F3D25E0009A9D4 /* OptionPane.xib */; };
 		D036E1F618F3D25E0009A9D4 /* TidyDocumentWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E618F3D25E0009A9D4 /* TidyDocumentWindow.xib */; };
-		D036E1F718F3D25E0009A9D4 /* TidyDocumentWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E618F3D25E0009A9D4 /* TidyDocumentWindow.xib */; };
 		D036E20D18F3D2F20009A9D4 /* Application.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20818F3D2F20009A9D4 /* Application.icns */; };
-		D036E20E18F3D2F20009A9D4 /* Application.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20818F3D2F20009A9D4 /* Application.icns */; };
 		D036E20F18F3D2F20009A9D4 /* HTML.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20918F3D2F20009A9D4 /* HTML.icns */; };
-		D036E21018F3D2F20009A9D4 /* HTML.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20918F3D2F20009A9D4 /* HTML.icns */; };
 		D036E21118F3D2F20009A9D4 /* PHP.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20A18F3D2F20009A9D4 /* PHP.icns */; };
-		D036E21218F3D2F20009A9D4 /* PHP.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20A18F3D2F20009A9D4 /* PHP.icns */; };
 		D036E21318F3D2F20009A9D4 /* Tidy.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20B18F3D2F20009A9D4 /* Tidy.icns */; };
-		D036E21418F3D2F20009A9D4 /* Tidy.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20B18F3D2F20009A9D4 /* Tidy.icns */; };
 		D036E21518F3D2F20009A9D4 /* XML.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20C18F3D2F20009A9D4 /* XML.icns */; };
-		D036E21618F3D2F20009A9D4 /* XML.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20C18F3D2F20009A9D4 /* XML.icns */; };
 		D03B89D419553E5D00E9B4D5 /* DiffsTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D319553E5D00E9B4D5 /* DiffsTemplate.png */; };
 		D03B89D81955457500E9B4D5 /* ScrollLockTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D71955457500E9B4D5 /* ScrollLockTemplate.png */; };
 		D03B89DA1955474700E9B4D5 /* DiffViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D91955474700E9B4D5 /* DiffViewTemplate.png */; };
 		D04753B71938A19D00BB7163 /* JSDBoolToStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D04753B61938A19D00BB7163 /* JSDBoolToStringValueTransformer.m */; };
-		D04753B81938A19D00BB7163 /* JSDBoolToStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D04753B61938A19D00BB7163 /* JSDBoolToStringValueTransformer.m */; };
 		D047C72F1915FBF100B70A94 /* JSDTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = D047C72E1915FBF100B70A94 /* JSDTableCellView.m */; };
-		D047C7301915FBF100B70A94 /* JSDTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = D047C72E1915FBF100B70A94 /* JSDTableCellView.m */; };
-		D04BC96E1A5AC5CB009AC43A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D04BC96D1A5AC5CB009AC43A /* AppDelegate.m */; };
-		D04BC9701A5AC5CB009AC43A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D04BC96F1A5AC5CB009AC43A /* main.m */; };
-		D04BC9901A5AC7A2009AC43A /* TidyService.m in Sources */ = {isa = PBXBuildFile; fileRef = D04BC98F1A5AC7A2009AC43A /* TidyService.m */; };
-		D04BC9B91A5ACB7D009AC43A /* HelperMainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9B71A5ACB7D009AC43A /* HelperMainMenu.xib */; };
-		D04BC9BC1A5ACCC1009AC43A /* Balthisar Tidy Service Helper.app in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D04BC9681A5AC5CB009AC43A /* Balthisar Tidy Service Helper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D04BC9C31A5BF973009AC43A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9BE1A5BF47E009AC43A /* Localizable.strings */; };
-		D04BC9C41A5BF974009AC43A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9BE1A5BF47E009AC43A /* Localizable.strings */; };
-		D04BC9C51A5BF974009AC43A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9BE1A5BF47E009AC43A /* Localizable.strings */; };
-		D04BC9C61A5BFB0D009AC43A /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D04BC9CB1A5C0991009AC43A /* JSDTidyFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D04BC9CE1A5C2A22009AC43A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9CC1A5C2A22009AC43A /* Localizable.strings */; };
 		D04C27551C017F170074DF78 /* TidyDocumentFeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04C27531C017F170074DF78 /* TidyDocumentFeedbackViewController.m */; };
-		D04C27561C017F170074DF78 /* TidyDocumentFeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04C27531C017F170074DF78 /* TidyDocumentFeedbackViewController.m */; };
-		D04C27571C017F170074DF78 /* TidyDocumentFeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04C27531C017F170074DF78 /* TidyDocumentFeedbackViewController.m */; };
 		D04C275D1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D04C275B1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib */; };
-		D04C275E1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D04C275B1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib */; };
-		D04C275F1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D04C275B1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib */; };
 		D04D5F991902459500F77901 /* NSApplication+TidyApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D04D5F981902459500F77901 /* NSApplication+TidyApplication.m */; };
-		D04D5F9A1902459500F77901 /* NSApplication+TidyApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D04D5F981902459500F77901 /* NSApplication+TidyApplication.m */; };
-		D04E8FB0195D964F00D1CEDC /* Balthisar Tidy (app).help in Resources */ = {isa = PBXBuildFile; fileRef = D04E8FAC195D964F00D1CEDC /* Balthisar Tidy (app).help */; };
-		D04E8FB5195D964F00D1CEDC /* Balthisar Tidy (web).help in Resources */ = {isa = PBXBuildFile; fileRef = D04E8FAE195D964F00D1CEDC /* Balthisar Tidy (web).help */; };
-		D04E8FB8195DAA9400D1CEDC /* DiffViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D91955474700E9B4D5 /* DiffViewTemplate.png */; };
-		D04E8FB9195DAA9400D1CEDC /* DiffsTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D319553E5D00E9B4D5 /* DiffsTemplate.png */; };
-		D04E8FBA195DAA9400D1CEDC /* ScrollLockTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D71955457500E9B4D5 /* ScrollLockTemplate.png */; };
-		D04E8FBB195DAA9500D1CEDC /* DiffViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D91955474700E9B4D5 /* DiffViewTemplate.png */; };
-		D04E8FBC195DAA9500D1CEDC /* DiffsTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D319553E5D00E9B4D5 /* DiffsTemplate.png */; };
-		D04E8FBD195DAA9500D1CEDC /* ScrollLockTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D03B89D71955457500E9B4D5 /* ScrollLockTemplate.png */; };
-		D05F71D51BEA2DE300F584C4 /* Credits (app).rtf in Resources */ = {isa = PBXBuildFile; fileRef = D05F71D11BEA2DE300F584C4 /* Credits (app).rtf */; };
-		D05F71D81BEA2DE300F584C4 /* Credits (pro).rtf in Resources */ = {isa = PBXBuildFile; fileRef = D05F71D31BEA2DE300F584C4 /* Credits (pro).rtf */; };
+		D058A2B91FB60A9600567353 /* JSDListEditorController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D058A2B71FB60A9600567353 /* JSDListEditorController.xib */; };
 		D06045FB1BF07DF000D69673 /* JSDTidyModel+Developer.h in Headers */ = {isa = PBXBuildFile; fileRef = D06045F91BF07DF000D69673 /* JSDTidyModel+Developer.h */; };
 		D06045FC1BF07DF000D69673 /* JSDTidyModel+Developer.m in Sources */ = {isa = PBXBuildFile; fileRef = D06045FA1BF07DF000D69673 /* JSDTidyModel+Developer.m */; };
 		D06046011BF0BDB400D69673 /* FragariaEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06045FE1BF0BD9F00D69673 /* FragariaEditorViewController.m */; };
-		D06046021BF0BDB500D69673 /* FragariaEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06045FE1BF0BD9F00D69673 /* FragariaEditorViewController.m */; };
-		D06046031BF0BDB600D69673 /* FragariaEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06045FE1BF0BD9F00D69673 /* FragariaEditorViewController.m */; };
 		D06046071BF0BFC000D69673 /* FragariaEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06046041BF0BE0100D69673 /* FragariaEditorViewController.xib */; };
-		D06046081BF0BFC100D69673 /* FragariaEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06046041BF0BE0100D69673 /* FragariaEditorViewController.xib */; };
-		D06046091BF0BFC200D69673 /* FragariaEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06046041BF0BE0100D69673 /* FragariaEditorViewController.xib */; };
 		D060460E1BF0DAAB00D69673 /* FragariaBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D060460B1BF0DA8D00D69673 /* FragariaBaseViewController.m */; };
-		D060460F1BF0DAAC00D69673 /* FragariaBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D060460B1BF0DA8D00D69673 /* FragariaBaseViewController.m */; };
-		D06046101BF0DAAD00D69673 /* FragariaBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D060460B1BF0DA8D00D69673 /* FragariaBaseViewController.m */; };
 		D06046141BF0DDCA00D69673 /* FragariaColorsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06046111BF0DDB400D69673 /* FragariaColorsViewController.xib */; };
-		D06046151BF0DDCB00D69673 /* FragariaColorsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06046111BF0DDB400D69673 /* FragariaColorsViewController.xib */; };
-		D06046161BF0DDCC00D69673 /* FragariaColorsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06046111BF0DDB400D69673 /* FragariaColorsViewController.xib */; };
 		D060461B1BF0DDF000D69673 /* FragariaColorsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06046181BF0DDDD00D69673 /* FragariaColorsViewController.m */; };
-		D060461C1BF0DDF100D69673 /* FragariaColorsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06046181BF0DDDD00D69673 /* FragariaColorsViewController.m */; };
-		D060461D1BF0DDF200D69673 /* FragariaColorsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06046181BF0DDDD00D69673 /* FragariaColorsViewController.m */; };
-		D06C9A43195FB4A4004D6C27 /* MASPreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A40195FB4A4004D6C27 /* MASPreferencesWindow.xib */; };
-		D06C9A44195FB4A4004D6C27 /* MASPreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A40195FB4A4004D6C27 /* MASPreferencesWindow.xib */; };
-		D06C9A45195FB4A4004D6C27 /* MASPreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A40195FB4A4004D6C27 /* MASPreferencesWindow.xib */; };
 		D06C9A46195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A42195FB4A4004D6C27 /* MASPreferencesWindowController.m */; };
-		D06C9A47195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A42195FB4A4004D6C27 /* MASPreferencesWindowController.m */; };
-		D06C9A48195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A42195FB4A4004D6C27 /* MASPreferencesWindowController.m */; };
 		D06C9A4F195FB955004D6C27 /* OptionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A4D195FB955004D6C27 /* OptionListViewController.m */; };
-		D06C9A50195FB955004D6C27 /* OptionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A4D195FB955004D6C27 /* OptionListViewController.m */; };
-		D06C9A51195FB955004D6C27 /* OptionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A4D195FB955004D6C27 /* OptionListViewController.m */; };
-		D06C9A52195FB955004D6C27 /* OptionListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A4E195FB955004D6C27 /* OptionListViewController.xib */; };
-		D06C9A53195FB955004D6C27 /* OptionListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A4E195FB955004D6C27 /* OptionListViewController.xib */; };
-		D06C9A54195FB955004D6C27 /* OptionListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A4E195FB955004D6C27 /* OptionListViewController.xib */; };
 		D06C9A58195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A56195FB997004D6C27 /* OptionListAppearanceViewController.m */; };
-		D06C9A59195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A56195FB997004D6C27 /* OptionListAppearanceViewController.m */; };
-		D06C9A5A195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A56195FB997004D6C27 /* OptionListAppearanceViewController.m */; };
-		D06C9A5B195FB997004D6C27 /* OptionListAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A57195FB997004D6C27 /* OptionListAppearanceViewController.xib */; };
-		D06C9A5C195FB997004D6C27 /* OptionListAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A57195FB997004D6C27 /* OptionListAppearanceViewController.xib */; };
-		D06C9A5D195FB997004D6C27 /* OptionListAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A57195FB997004D6C27 /* OptionListAppearanceViewController.xib */; };
 		D06C9A61195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A5F195FB9D0004D6C27 /* DocumentAppearanceViewController.m */; };
-		D06C9A62195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A5F195FB9D0004D6C27 /* DocumentAppearanceViewController.m */; };
-		D06C9A63195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A5F195FB9D0004D6C27 /* DocumentAppearanceViewController.m */; };
-		D06C9A64195FB9D0004D6C27 /* DocumentAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A60195FB9D0004D6C27 /* DocumentAppearanceViewController.xib */; };
-		D06C9A65195FB9D0004D6C27 /* DocumentAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A60195FB9D0004D6C27 /* DocumentAppearanceViewController.xib */; };
-		D06C9A66195FB9D0004D6C27 /* DocumentAppearanceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A60195FB9D0004D6C27 /* DocumentAppearanceViewController.xib */; };
 		D06C9A6A195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A68195FB9F2004D6C27 /* SavingOptionsViewController.m */; };
-		D06C9A6B195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A68195FB9F2004D6C27 /* SavingOptionsViewController.m */; };
-		D06C9A6C195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A68195FB9F2004D6C27 /* SavingOptionsViewController.m */; };
-		D06C9A6D195FB9F2004D6C27 /* SavingOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A69195FB9F2004D6C27 /* SavingOptionsViewController.xib */; };
-		D06C9A6E195FB9F2004D6C27 /* SavingOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A69195FB9F2004D6C27 /* SavingOptionsViewController.xib */; };
-		D06C9A6F195FB9F2004D6C27 /* SavingOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A69195FB9F2004D6C27 /* SavingOptionsViewController.xib */; };
 		D06C9A73195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A71195FBA0F004D6C27 /* MiscOptionsViewController.m */; };
-		D06C9A74195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A71195FBA0F004D6C27 /* MiscOptionsViewController.m */; };
-		D06C9A75195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A71195FBA0F004D6C27 /* MiscOptionsViewController.m */; };
-		D06C9A76195FBA0F004D6C27 /* MiscOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A72195FBA0F004D6C27 /* MiscOptionsViewController.xib */; };
-		D06C9A77195FBA0F004D6C27 /* MiscOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A72195FBA0F004D6C27 /* MiscOptionsViewController.xib */; };
-		D06C9A78195FBA0F004D6C27 /* MiscOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A72195FBA0F004D6C27 /* MiscOptionsViewController.xib */; };
 		D06C9A7C195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A7A195FBA3F004D6C27 /* UpdaterOptionsViewController.m */; };
-		D06C9A7D195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A7A195FBA3F004D6C27 /* UpdaterOptionsViewController.m */; };
-		D06C9A7E195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D06C9A7A195FBA3F004D6C27 /* UpdaterOptionsViewController.m */; };
-		D06C9A7F195FBA3F004D6C27 /* UpdaterOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A7B195FBA3F004D6C27 /* UpdaterOptionsViewController.xib */; };
-		D06C9A80195FBA3F004D6C27 /* UpdaterOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A7B195FBA3F004D6C27 /* UpdaterOptionsViewController.xib */; };
-		D06C9A81195FBA3F004D6C27 /* UpdaterOptionsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A7B195FBA3F004D6C27 /* UpdaterOptionsViewController.xib */; };
 		D06C9A8C195FE854004D6C27 /* prefsSave.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A84195FE854004D6C27 /* prefsSave.png */; };
-		D06C9A8D195FE854004D6C27 /* prefsSave.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A84195FE854004D6C27 /* prefsSave.png */; };
-		D06C9A8E195FE854004D6C27 /* prefsSave.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A84195FE854004D6C27 /* prefsSave.png */; };
 		D06C9A8F195FE854004D6C27 /* prefsSave@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A85195FE854004D6C27 /* prefsSave@2x.png */; };
-		D06C9A90195FE854004D6C27 /* prefsSave@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A85195FE854004D6C27 /* prefsSave@2x.png */; };
-		D06C9A91195FE854004D6C27 /* prefsSave@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A85195FE854004D6C27 /* prefsSave@2x.png */; };
 		D06C9A92195FE854004D6C27 /* prefsTidy.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A86195FE854004D6C27 /* prefsTidy.png */; };
-		D06C9A93195FE854004D6C27 /* prefsTidy.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A86195FE854004D6C27 /* prefsTidy.png */; };
-		D06C9A94195FE854004D6C27 /* prefsTidy.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A86195FE854004D6C27 /* prefsTidy.png */; };
 		D06C9A95195FE854004D6C27 /* prefsTidy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A87195FE854004D6C27 /* prefsTidy@2x.png */; };
-		D06C9A96195FE854004D6C27 /* prefsTidy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A87195FE854004D6C27 /* prefsTidy@2x.png */; };
-		D06C9A97195FE854004D6C27 /* prefsTidy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A87195FE854004D6C27 /* prefsTidy@2x.png */; };
 		D06C9A98195FE854004D6C27 /* prefsTidyAppearance.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A88195FE854004D6C27 /* prefsTidyAppearance.png */; };
-		D06C9A99195FE854004D6C27 /* prefsTidyAppearance.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A88195FE854004D6C27 /* prefsTidyAppearance.png */; };
-		D06C9A9A195FE854004D6C27 /* prefsTidyAppearance.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A88195FE854004D6C27 /* prefsTidyAppearance.png */; };
 		D06C9A9B195FE854004D6C27 /* prefsTidyAppearance@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A89195FE854004D6C27 /* prefsTidyAppearance@2x.png */; };
-		D06C9A9C195FE854004D6C27 /* prefsTidyAppearance@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A89195FE854004D6C27 /* prefsTidyAppearance@2x.png */; };
-		D06C9A9D195FE854004D6C27 /* prefsTidyAppearance@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A89195FE854004D6C27 /* prefsTidyAppearance@2x.png */; };
 		D06C9A9E195FE854004D6C27 /* prefsUpdate.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A8A195FE854004D6C27 /* prefsUpdate.png */; };
-		D06C9A9F195FE854004D6C27 /* prefsUpdate.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A8A195FE854004D6C27 /* prefsUpdate.png */; };
-		D06C9AA0195FE854004D6C27 /* prefsUpdate.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A8A195FE854004D6C27 /* prefsUpdate.png */; };
 		D06C9AA1195FE854004D6C27 /* prefsUpdate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A8B195FE854004D6C27 /* prefsUpdate@2x.png */; };
-		D06C9AA2195FE854004D6C27 /* prefsUpdate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A8B195FE854004D6C27 /* prefsUpdate@2x.png */; };
-		D06C9AA3195FE854004D6C27 /* prefsUpdate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9A8B195FE854004D6C27 /* prefsUpdate@2x.png */; };
 		D06C9AA6195FEC11004D6C27 /* prefsDoc.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AA4195FEC11004D6C27 /* prefsDoc.png */; };
-		D06C9AA7195FEC11004D6C27 /* prefsDoc.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AA4195FEC11004D6C27 /* prefsDoc.png */; };
-		D06C9AA8195FEC11004D6C27 /* prefsDoc.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AA4195FEC11004D6C27 /* prefsDoc.png */; };
 		D06C9AA9195FEC11004D6C27 /* prefsDoc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AA5195FEC11004D6C27 /* prefsDoc@2x.png */; };
-		D06C9AAA195FEC11004D6C27 /* prefsDoc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AA5195FEC11004D6C27 /* prefsDoc@2x.png */; };
-		D06C9AAB195FEC11004D6C27 /* prefsDoc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AA5195FEC11004D6C27 /* prefsDoc@2x.png */; };
 		D06C9AB119600550004D6C27 /* PaneTopShadow.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AB019600550004D6C27 /* PaneTopShadow.png */; };
-		D06C9AB219600550004D6C27 /* PaneTopShadow.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AB019600550004D6C27 /* PaneTopShadow.png */; };
-		D06C9AB319600550004D6C27 /* PaneTopShadow.png in Resources */ = {isa = PBXBuildFile; fileRef = D06C9AB019600550004D6C27 /* PaneTopShadow.png */; };
 		D074B78B1942BEE200F2E6F1 /* TidyEncodingHelperController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D074B7891942BEE200F2E6F1 /* TidyEncodingHelperController.xib */; };
-		D074B78C1942BEE200F2E6F1 /* TidyEncodingHelperController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D074B7891942BEE200F2E6F1 /* TidyEncodingHelperController.xib */; };
-		D074B78D1942BEE200F2E6F1 /* TidyEncodingHelperController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D074B7891942BEE200F2E6F1 /* TidyEncodingHelperController.xib */; };
 		D074B79B1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7941942CF0300F2E6F1 /* EncodingHelperController.m */; };
-		D074B79C1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7941942CF0300F2E6F1 /* EncodingHelperController.m */; };
-		D074B79D1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7941942CF0300F2E6F1 /* EncodingHelperController.m */; };
 		D074B79E1942CF0300F2E6F1 /* FirstRunController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7961942CF0300F2E6F1 /* FirstRunController.m */; };
-		D074B79F1942CF0300F2E6F1 /* FirstRunController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7961942CF0300F2E6F1 /* FirstRunController.m */; };
-		D074B7A01942CF0300F2E6F1 /* FirstRunController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7961942CF0300F2E6F1 /* FirstRunController.m */; };
 		D074B7A11942CF0300F2E6F1 /* TidyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7981942CF0300F2E6F1 /* TidyDocument.m */; };
-		D074B7A21942CF0300F2E6F1 /* TidyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7981942CF0300F2E6F1 /* TidyDocument.m */; };
-		D074B7A31942CF0300F2E6F1 /* TidyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7981942CF0300F2E6F1 /* TidyDocument.m */; };
 		D074B7A41942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B79A1942CF0300F2E6F1 /* TidyDocumentWindowController.m */; };
-		D074B7A51942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B79A1942CF0300F2E6F1 /* TidyDocumentWindowController.m */; };
-		D074B7A61942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B79A1942CF0300F2E6F1 /* TidyDocumentWindowController.m */; };
 		D074B7AA1944035800F2E6F1 /* TDFTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D074B7A81944035800F2E6F1 /* TDFTableViewController.xib */; };
-		D074B7AB1944035800F2E6F1 /* TDFTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D074B7A81944035800F2E6F1 /* TDFTableViewController.xib */; };
-		D074B7AC1944035800F2E6F1 /* TDFTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D074B7A81944035800F2E6F1 /* TDFTableViewController.xib */; };
 		D074B7B41947D93800F2E6F1 /* TDFTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7B31947D93800F2E6F1 /* TDFTableViewController.m */; };
-		D074B7B51947D93800F2E6F1 /* TDFTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7B31947D93800F2E6F1 /* TDFTableViewController.m */; };
-		D074B7B61947D93800F2E6F1 /* TDFTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D074B7B31947D93800F2E6F1 /* TDFTableViewController.m */; };
 		D074D43D19CEF94C00FC6340 /* Sparkle.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D06626CE18B09B330091CBD8 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D074D43E19CEF99B00FC6340 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D06626CE18B09B330091CBD8 /* Sparkle.framework */; };
+		D07B8F7F1FB3E2D60043E24D /* Balthisar Tidy Service Helper.app in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D0F3987B1BFB03790050A9B8 /* Balthisar Tidy Service Helper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D081CBDB1917C1510041B2C5 /* JSDIntegerValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D081CBDA1917C1510041B2C5 /* JSDIntegerValueTransformer.m */; };
-		D081CBDC1917C1510041B2C5 /* JSDIntegerValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D081CBDA1917C1510041B2C5 /* JSDIntegerValueTransformer.m */; };
 		D0868930194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D086892F194842A400BDAD72 /* TidyDocumentSourceViewController.m */; };
-		D0868931194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D086892F194842A400BDAD72 /* TidyDocumentSourceViewController.m */; };
-		D0868932194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D086892F194842A400BDAD72 /* TidyDocumentSourceViewController.m */; };
 		D08689371948439700BDAD72 /* TidyDocumentSourceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D08689331948439700BDAD72 /* TidyDocumentSourceViewController.xib */; };
-		D08689381948439700BDAD72 /* TidyDocumentSourceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D08689331948439700BDAD72 /* TidyDocumentSourceViewController.xib */; };
-		D08689391948439700BDAD72 /* TidyDocumentSourceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D08689331948439700BDAD72 /* TidyDocumentSourceViewController.xib */; };
-		D0913CAF18B0AC06005DB2E4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D016A935182FD80700712C60 /* main.m */; };
-		D0913CC918B0AC06005DB2E4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
 		D0979D8A1BE9E488002ACD04 /* SWFSemanticVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = D0979D881BE9E488002ACD04 /* SWFSemanticVersion.h */; };
 		D0979D8B1BE9E488002ACD04 /* SWFSemanticVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = D0979D891BE9E488002ACD04 /* SWFSemanticVersion.m */; };
 		D09ED1421BD73933002AED94 /* libtidy-balthisar.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = D0A482AF1BCF9BD000E0646F /* libtidy-balthisar.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -266,13 +143,8 @@
 		D09ED14E1BD757C3002AED94 /* messagesInfo.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D09ED1471BD757C3002AED94 /* messagesInfo.pdf */; };
 		D09ED14F1BD757C3002AED94 /* messagesPanic.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D09ED1481BD757C3002AED94 /* messagesPanic.pdf */; };
 		D09ED1501BD757C3002AED94 /* messagesWarning.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D09ED1491BD757C3002AED94 /* messagesWarning.pdf */; };
-		D0A143CC1BFCC2580006C533 /* AppleScriptsforTidy.dmg in Resources */ = {isa = PBXBuildFile; fileRef = D0A143CA1BFCC2500006C533 /* AppleScriptsforTidy.dmg */; };
 		D0A2E1F8197548D20015F667 /* ToolbarAdvanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0A2E1F6197548D20015F667 /* ToolbarAdvanced.tiff */; };
-		D0A2E1F9197548D20015F667 /* ToolbarAdvanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0A2E1F6197548D20015F667 /* ToolbarAdvanced.tiff */; };
-		D0A2E1FA197548D20015F667 /* ToolbarAdvanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0A2E1F6197548D20015F667 /* ToolbarAdvanced.tiff */; };
 		D0A2E1FB197548D20015F667 /* ToolbarInfo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0A2E1F7197548D20015F667 /* ToolbarInfo.tiff */; };
-		D0A2E1FC197548D20015F667 /* ToolbarInfo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0A2E1F7197548D20015F667 /* ToolbarInfo.tiff */; };
-		D0A2E1FD197548D20015F667 /* ToolbarInfo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0A2E1F7197548D20015F667 /* ToolbarInfo.tiff */; };
 		D0A482721BCF9BD000E0646F /* version.txt in Sources */ = {isa = PBXBuildFile; fileRef = D0323B071A7DE48400A0A9FC /* version.txt */; };
 		D0A482731BCF9BD000E0646F /* istack.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AB11A7DE25000A0A9FC /* istack.c */; };
 		D0A482741BCF9BD000E0646F /* tagask.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AC01A7DE25000A0A9FC /* tagask.c */; };
@@ -284,10 +156,8 @@
 		D0A4827A1BCF9BD000E0646F /* tidylib.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AC41A7DE25000A0A9FC /* tidylib.c */; };
 		D0A4827B1BCF9BD000E0646F /* parser.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AB81A7DE25000A0A9FC /* parser.c */; };
 		D0A4827E1BCF9BD000E0646F /* fileio.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AAA1A7DE25000A0A9FC /* fileio.c */; };
-		D0A4827F1BCF9BD000E0646F /* win32tc.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323ACA1A7DE25000A0A9FC /* win32tc.c */; };
 		D0A482801BCF9BD000E0646F /* lexer.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AB21A7DE25000A0A9FC /* lexer.c */; };
 		D0A482811BCF9BD000E0646F /* buffio.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AA11A7DE25000A0A9FC /* buffio.c */; };
-		D0A482821BCF9BD000E0646F /* iconvtc.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AAF1A7DE25000A0A9FC /* iconvtc.c */; };
 		D0A482831BCF9BD000E0646F /* tags.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AC11A7DE25000A0A9FC /* tags.c */; };
 		D0A482841BCF9BD000E0646F /* clean.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AA41A7DE25000A0A9FC /* clean.c */; };
 		D0A482851BCF9BD000E0646F /* entities.c in Sources */ = {isa = PBXBuildFile; fileRef = D0323AA81A7DE25000A0A9FC /* entities.c */; };
@@ -310,7 +180,6 @@
 		D0A4829A1BCF9BD000E0646F /* fileio.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AAB1A7DE25000A0A9FC /* fileio.h */; };
 		D0A4829B1BCF9BD000E0646F /* forward.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AAC1A7DE25000A0A9FC /* forward.h */; };
 		D0A4829C1BCF9BD000E0646F /* gdoc.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AAE1A7DE25000A0A9FC /* gdoc.h */; };
-		D0A4829D1BCF9BD000E0646F /* iconvtc.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AB01A7DE25000A0A9FC /* iconvtc.h */; };
 		D0A4829E1BCF9BD000E0646F /* lexer.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AB31A7DE25000A0A9FC /* lexer.h */; };
 		D0A4829F1BCF9BD000E0646F /* mappedio.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AB61A7DE25000A0A9FC /* mappedio.h */; };
 		D0A482A01BCF9BD000E0646F /* message.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AB71A7DE25000A0A9FC /* message.h */; };
@@ -322,175 +191,57 @@
 		D0A482A71BCF9BD000E0646F /* tmbstr.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AC61A7DE25000A0A9FC /* tmbstr.h */; };
 		D0A482A81BCF9BD000E0646F /* utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AC81A7DE25000A0A9FC /* utf8.h */; };
 		D0A482A91BCF9BD000E0646F /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323AC91A7DE25000A0A9FC /* version.h */; };
-		D0A482AA1BCF9BD000E0646F /* win32tc.h in Headers */ = {isa = PBXBuildFile; fileRef = D0323ACB1A7DE25000A0A9FC /* win32tc.h */; };
 		D0A482B21BCF9D0C00E0646F /* libtidy-balthisar.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D0A482AF1BCF9BD000E0646F /* libtidy-balthisar.dylib */; };
 		D0B7D0B01BEAFC500040694B /* Fragaria.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B7D0AF1BEAFC500040694B /* Fragaria.framework */; };
-		D0B7D0B11BEAFC500040694B /* Fragaria.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B7D0AF1BEAFC500040694B /* Fragaria.framework */; };
-		D0B7D0B21BEAFC500040694B /* Fragaria.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B7D0AF1BEAFC500040694B /* Fragaria.framework */; };
 		D0B7D0B31BEAFC740040694B /* Fragaria.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D0B7D0AF1BEAFC500040694B /* Fragaria.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0B7D0B41BEAFC7F0040694B /* Fragaria.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D0B7D0AF1BEAFC500040694B /* Fragaria.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0B7D0B51BEAFC8A0040694B /* Fragaria.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D0B7D0AF1BEAFC500040694B /* Fragaria.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0B9F0F119585010008864D6 /* DCOAboutWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0B9F0EE19585010008864D6 /* DCOAboutWindow.xib */; };
-		D0B9F0F219585010008864D6 /* DCOAboutWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0B9F0EE19585010008864D6 /* DCOAboutWindow.xib */; };
-		D0B9F0F319585010008864D6 /* DCOAboutWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0B9F0EE19585010008864D6 /* DCOAboutWindow.xib */; };
 		D0B9F0F419585010008864D6 /* DCOAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0F019585010008864D6 /* DCOAboutWindowController.m */; };
-		D0B9F0F519585010008864D6 /* DCOAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0F019585010008864D6 /* DCOAboutWindowController.m */; };
-		D0B9F0F619585010008864D6 /* DCOAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0F019585010008864D6 /* DCOAboutWindowController.m */; };
 		D0B9F0FC19585060008864D6 /* DCOTransparentScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0F919585060008864D6 /* DCOTransparentScroller.m */; };
-		D0B9F0FD19585060008864D6 /* DCOTransparentScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0F919585060008864D6 /* DCOTransparentScroller.m */; };
-		D0B9F0FE19585060008864D6 /* DCOTransparentScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0F919585060008864D6 /* DCOTransparentScroller.m */; };
 		D0B9F0FF19585060008864D6 /* DCOTransparentScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0FB19585060008864D6 /* DCOTransparentScrollView.m */; };
-		D0B9F10019585060008864D6 /* DCOTransparentScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0FB19585060008864D6 /* DCOTransparentScrollView.m */; };
-		D0B9F10119585060008864D6 /* DCOTransparentScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0B9F0FB19585060008864D6 /* DCOTransparentScrollView.m */; };
 		D0B9F10419585474008864D6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B9F10319585474008864D6 /* QuartzCore.framework */; };
-		D0B9F1051958547A008864D6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B9F10319585474008864D6 /* QuartzCore.framework */; };
-		D0B9F1061958547B008864D6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B9F10319585474008864D6 /* QuartzCore.framework */; };
-		D0BB67C4193C820A007A3EB0 /* JSDTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = D047C72E1915FBF100B70A94 /* JSDTableCellView.m */; };
-		D0BB67C5193C820A007A3EB0 /* JSDIntegerValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D081CBDA1917C1510041B2C5 /* JSDIntegerValueTransformer.m */; };
-		D0BB67C9193C820A007A3EB0 /* JSDTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAD118E6680F008A55D5 /* JSDTextField.m */; };
-		D0BB67CF193C820A007A3EB0 /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC618E6680F008A55D5 /* PreferenceController.m */; };
-		D0BB67D0193C820A007A3EB0 /* OptionPaneController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC418E6680F008A55D5 /* OptionPaneController.m */; };
-		D0BB67D2193C820A007A3EB0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D016A935182FD80700712C60 /* main.m */; };
-		D0BB67D5193C820A007A3EB0 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC218E6680F008A55D5 /* AppController.m */; };
-		D0BB67D7193C820A007A3EB0 /* JSDBoolToStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D04753B61938A19D00BB7163 /* JSDBoolToStringValueTransformer.m */; };
-		D0BB67DA193C820A007A3EB0 /* JSDAllCapsValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = D008F0181930D9D700559F3B /* JSDAllCapsValueTransformer.m */; };
-		D0BB67E1193C820A007A3EB0 /* JSDTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9F1A218E6BF8D008A55D5 /* JSDTableView.m */; };
-		D0BB67E4193C820A007A3EB0 /* NSApplication+TidyApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D04D5F981902459500F77901 /* NSApplication+TidyApplication.m */; };
-		D0BB67E6193C820A007A3EB0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
-		D0BB67EB193C820A007A3EB0 /* FirstRunController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DA18F3D25E0009A9D4 /* FirstRunController.xib */; };
-		D0BB67ED193C820A007A3EB0 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DE18F3D25E0009A9D4 /* Localizable.strings */; };
-		D0BB67EF193C820A007A3EB0 /* PHP.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20A18F3D2F20009A9D4 /* PHP.icns */; };
-		D0BB67F0193C820A007A3EB0 /* XML.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20C18F3D2F20009A9D4 /* XML.icns */; };
-		D0BB67F3193C820A007A3EB0 /* Application.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20818F3D2F20009A9D4 /* Application.icns */; };
-		D0BB67F4193C820A007A3EB0 /* OptionPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E218F3D25E0009A9D4 /* OptionPane.xib */; };
-		D0BB67F6193C820A007A3EB0 /* TidyDocumentWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E618F3D25E0009A9D4 /* TidyDocumentWindow.xib */; };
-		D0BB67F7193C820A007A3EB0 /* Tidy.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20B18F3D2F20009A9D4 /* Tidy.icns */; };
-		D0BB67F8193C820A007A3EB0 /* HTML.icns in Resources */ = {isa = PBXBuildFile; fileRef = D036E20918F3D2F20009A9D4 /* HTML.icns */; };
-		D0BB67F9193C820A007A3EB0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D036E1DC18F3D25E0009A9D4 /* InfoPlist.strings */; };
-		D0BB67FA193C820A007A3EB0 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D036E1E018F3D25E0009A9D4 /* MainMenu.xib */; };
 		D0BF29E11A7347580062B01A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
-		D0BF29E21A7347580062B01A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
-		D0BF29E31A7347580062B01A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
 		D0C9C1251BD85FEA004C545A /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
 		D0C9C1271BD85FEA004C545A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
 		D0C9C1281BD85FEA004C545A /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
 		D0C9C12A1BD85FEA004C545A /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D01C70BF1A55850D00CC5038 /* icon.icns */; };
 		D0C9C12B1BD85FEA004C545A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
 		D0C9C12C1BD85FEA004C545A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9BE1A5BF47E009AC43A /* Localizable.strings */; };
-		D0C9C12E1BD85FEA004C545A /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0C9C1381BD85FF4004C545A /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
-		D0C9C13A1BD85FF4004C545A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
-		D0C9C13B1BD85FF4004C545A /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D0C9C13D1BD85FF4004C545A /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D01C70BF1A55850D00CC5038 /* icon.icns */; };
-		D0C9C13E1BD85FF4004C545A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
-		D0C9C13F1BD85FF4004C545A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9BE1A5BF47E009AC43A /* Localizable.strings */; };
-		D0C9C1411BD85FF4004C545A /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0C9C14B1BD85FFB004C545A /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
-		D0C9C14D1BD85FFB004C545A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
-		D0C9C14E1BD85FFB004C545A /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
-		D0C9C1501BD85FFB004C545A /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D01C70BF1A55850D00CC5038 /* icon.icns */; };
-		D0C9C1511BD85FFB004C545A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
-		D0C9C1521BD85FFB004C545A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9BE1A5BF47E009AC43A /* Localizable.strings */; };
-		D0C9C1541BD85FFB004C545A /* JSDTidyFramework.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0C9C1611BD865F9004C545A /* Tidy Extension (web).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D01C70BA1A55850D00CC5038 /* Tidy Extension (web).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D0C9C1621BD865F9004C545A /* TidyBody Extension (web).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D0C9C1321BD85FEA004C545A /* TidyBody Extension (web).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D0C9C1631BD8661B004C545A /* Tidy Extension (app).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D01C70DD1A558E1C00CC5038 /* Tidy Extension (app).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D0C9C1641BD8661B004C545A /* TidyBody Extension (app).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D0C9C1451BD85FF4004C545A /* TidyBody Extension (app).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D0C9C1651BD8662E004C545A /* Tidy Extension (pro).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D01C70E91A5591A500CC5038 /* Tidy Extension (pro).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D0C9C1661BD8662E004C545A /* TidyBody Extension (pro).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D0C9C1581BD85FFB004C545A /* TidyBody Extension (pro).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		D0C9C1611BD865F9004C545A /* Tidy Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D01C70BA1A55850D00CC5038 /* Tidy Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		D0C9C1621BD865F9004C545A /* TidyBody Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D0C9C1321BD85FEA004C545A /* TidyBody Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D0C9C1681BD8CB55004C545A /* balthisar_tidy-id_dsa.pub in Resources */ = {isa = PBXBuildFile; fileRef = D0C9C1671BD8CB55004C545A /* balthisar_tidy-id_dsa.pub */; };
 		D0CA8F6E1953280700BBD54C /* LayoutBottomPaneTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F521953280700BBD54C /* LayoutBottomPaneTemplate.png */; };
-		D0CA8F6F1953280700BBD54C /* LayoutBottomPaneTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F521953280700BBD54C /* LayoutBottomPaneTemplate.png */; };
-		D0CA8F701953280700BBD54C /* LayoutBottomPaneTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F521953280700BBD54C /* LayoutBottomPaneTemplate.png */; };
 		D0CA8F711953280700BBD54C /* LayoutLeftPaneTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F531953280700BBD54C /* LayoutLeftPaneTemplate.png */; };
-		D0CA8F721953280700BBD54C /* LayoutLeftPaneTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F531953280700BBD54C /* LayoutLeftPaneTemplate.png */; };
-		D0CA8F731953280700BBD54C /* LayoutLeftPaneTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F531953280700BBD54C /* LayoutLeftPaneTemplate.png */; };
 		D0CA8F741953280700BBD54C /* LayoutSourceHTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F541953280700BBD54C /* LayoutSourceHTemplate.png */; };
-		D0CA8F751953280700BBD54C /* LayoutSourceHTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F541953280700BBD54C /* LayoutSourceHTemplate.png */; };
-		D0CA8F761953280700BBD54C /* LayoutSourceHTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F541953280700BBD54C /* LayoutSourceHTemplate.png */; };
 		D0CA8F771953280700BBD54C /* LayoutSourceVTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F551953280700BBD54C /* LayoutSourceVTemplate.png */; };
-		D0CA8F781953280700BBD54C /* LayoutSourceVTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F551953280700BBD54C /* LayoutSourceVTemplate.png */; };
-		D0CA8F791953280700BBD54C /* LayoutSourceVTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CA8F551953280700BBD54C /* LayoutSourceVTemplate.png */; };
 		D0CDB2391BF191B900735EE4 /* prefsColor.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2371BF191B900735EE4 /* prefsColor.png */; };
 		D0CDB23A1BF191B900735EE4 /* prefsColor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2381BF191B900735EE4 /* prefsColor@2x.png */; };
-		D0CDB23B1BF191C500735EE4 /* prefsColor.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2371BF191B900735EE4 /* prefsColor.png */; };
-		D0CDB23C1BF191C600735EE4 /* prefsColor.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2371BF191B900735EE4 /* prefsColor.png */; };
-		D0CDB23D1BF191CB00735EE4 /* prefsColor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2381BF191B900735EE4 /* prefsColor@2x.png */; };
-		D0CDB23E1BF191CC00735EE4 /* prefsColor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2381BF191B900735EE4 /* prefsColor@2x.png */; };
 		D0CDB2411BF1979C00735EE4 /* prefsEditor.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB23F1BF1979C00735EE4 /* prefsEditor.png */; };
 		D0CDB2421BF1979C00735EE4 /* prefsEditor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2401BF1979C00735EE4 /* prefsEditor@2x.png */; };
-		D0CDB2431BF197A300735EE4 /* prefsEditor.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB23F1BF1979C00735EE4 /* prefsEditor.png */; };
-		D0CDB2441BF197A300735EE4 /* prefsEditor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2401BF1979C00735EE4 /* prefsEditor@2x.png */; };
-		D0CDB2451BF197A300735EE4 /* prefsEditor.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB23F1BF1979C00735EE4 /* prefsEditor.png */; };
-		D0CDB2461BF197A300735EE4 /* prefsEditor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2401BF1979C00735EE4 /* prefsEditor@2x.png */; };
 		D0CDB24C1BF1DE1C00735EE4 /* JSDTidyMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = D0CDB2471BF1CD4A00735EE4 /* JSDTidyMessage.m */; };
 		D0CDB24F1BF3304B00735EE4 /* GutterTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB24D1BF3304B00735EE4 /* GutterTemplate.png */; };
-		D0CDB2501BF3304B00735EE4 /* GutterTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB24D1BF3304B00735EE4 /* GutterTemplate.png */; };
-		D0CDB2511BF3304B00735EE4 /* GutterTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB24D1BF3304B00735EE4 /* GutterTemplate.png */; };
 		D0CDB2561BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2551BF335FE00735EE4 /* ErrorsInlineTemplate.png */; };
-		D0CDB2571BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2551BF335FE00735EE4 /* ErrorsInlineTemplate.png */; };
-		D0CDB2581BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2551BF335FE00735EE4 /* ErrorsInlineTemplate.png */; };
 		D0CDB25B1BF3394300735EE4 /* HighlightingTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2591BF3394300735EE4 /* HighlightingTemplate.png */; };
-		D0CDB25C1BF3394300735EE4 /* HighlightingTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2591BF3394300735EE4 /* HighlightingTemplate.png */; };
-		D0CDB25D1BF3394300735EE4 /* HighlightingTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB2591BF3394300735EE4 /* HighlightingTemplate.png */; };
 		D0CDB25E1BF3394300735EE4 /* InvisiblesTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB25A1BF3394300735EE4 /* InvisiblesTemplate.png */; };
-		D0CDB25F1BF3394300735EE4 /* InvisiblesTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB25A1BF3394300735EE4 /* InvisiblesTemplate.png */; };
-		D0CDB2601BF3394300735EE4 /* InvisiblesTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CDB25A1BF3394300735EE4 /* InvisiblesTemplate.png */; };
 		D0D9ED2B18E66810008A55D5 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC218E6680F008A55D5 /* AppController.m */; };
-		D0D9ED2C18E66810008A55D5 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC218E6680F008A55D5 /* AppController.m */; };
 		D0D9ED2D18E66810008A55D5 /* OptionPaneController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC418E6680F008A55D5 /* OptionPaneController.m */; };
-		D0D9ED2E18E66810008A55D5 /* OptionPaneController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC418E6680F008A55D5 /* OptionPaneController.m */; };
 		D0D9ED2F18E66810008A55D5 /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC618E6680F008A55D5 /* PreferenceController.m */; };
-		D0D9ED3018E66810008A55D5 /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAC618E6680F008A55D5 /* PreferenceController.m */; };
 		D0D9ED3918E66810008A55D5 /* JSDTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAD118E6680F008A55D5 /* JSDTextField.m */; };
-		D0D9ED3A18E66810008A55D5 /* JSDTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9EAD118E6680F008A55D5 /* JSDTextField.m */; };
 		D0D9F1A318E6BF8D008A55D5 /* JSDTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9F1A218E6BF8D008A55D5 /* JSDTableView.m */; };
-		D0D9F1A418E6BF8D008A55D5 /* JSDTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0D9F1A218E6BF8D008A55D5 /* JSDTableView.m */; };
 		D0DCEFB21A5FC40100E8A2AE /* TidyDocumentService.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DCEFB11A5FC40100E8A2AE /* TidyDocumentService.m */; };
-		D0DCEFB31A5FC40100E8A2AE /* TidyDocumentService.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DCEFB11A5FC40100E8A2AE /* TidyDocumentService.m */; };
-		D0DCEFB41A5FC40100E8A2AE /* TidyDocumentService.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DCEFB11A5FC40100E8A2AE /* TidyDocumentService.m */; };
 		D0E0EBA41CFD3B3700B1CF4E /* messages-browser.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E0EBA21CFD3B3700B1CF4E /* messages-browser.pdf */; };
-		D0E0EBA51CFD3B3700B1CF4E /* messages-browser.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E0EBA21CFD3B3700B1CF4E /* messages-browser.pdf */; };
-		D0E0EBA61CFD3B3700B1CF4E /* messages-browser.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E0EBA21CFD3B3700B1CF4E /* messages-browser.pdf */; };
 		D0E0EBA71CFD3B3700B1CF4E /* messages-messages.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E0EBA31CFD3B3700B1CF4E /* messages-messages.pdf */; };
-		D0E0EBA81CFD3B3700B1CF4E /* messages-messages.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E0EBA31CFD3B3700B1CF4E /* messages-messages.pdf */; };
-		D0E0EBA91CFD3B3700B1CF4E /* messages-messages.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E0EBA31CFD3B3700B1CF4E /* messages-messages.pdf */; };
 		D0E483341CFD1638003DC4A7 /* MMTabBarView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */; };
-		D0E483351CFD1645003DC4A7 /* MMTabBarView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */; };
-		D0E483361CFD1646003DC4A7 /* MMTabBarView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */; };
 		D0E483371CFD165F003DC4A7 /* MMTabBarView.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0E483381CFD1669003DC4A7 /* MMTabBarView.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D0E483391CFD1671003DC4A7 /* MMTabBarView.framework in Add Frameworks */ = {isa = PBXBuildFile; fileRef = D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D0E483481CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0E483461CFD36FB003DC4A7 /* TDFWebViewController.xib */; };
-		D0E483491CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0E483461CFD36FB003DC4A7 /* TDFWebViewController.xib */; };
-		D0E4834A1CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0E483461CFD36FB003DC4A7 /* TDFWebViewController.xib */; };
 		D0E6AE18190C9FAC00B49779 /* HideDescriptionTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE16190C9FAC00B49779 /* HideDescriptionTemplate.pdf */; };
-		D0E6AE19190C9FAC00B49779 /* HideDescriptionTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE16190C9FAC00B49779 /* HideDescriptionTemplate.pdf */; };
 		D0E6AE1A190C9FAC00B49779 /* ShowDescriptionTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE17190C9FAC00B49779 /* ShowDescriptionTemplate.pdf */; };
-		D0E6AE1B190C9FAC00B49779 /* ShowDescriptionTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE17190C9FAC00B49779 /* ShowDescriptionTemplate.pdf */; };
 		D0E6AE20190CB34500B49779 /* PaneBottomShadow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE1F190CB34500B49779 /* PaneBottomShadow.tiff */; };
-		D0E6AE21190CB34500B49779 /* PaneBottomShadow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D0E6AE1F190CB34500B49779 /* PaneBottomShadow.tiff */; };
-		D0E904D91CF991B500E85FEB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E904D81CF991B500E85FEB /* WebKit.framework */; };
-		D0E904DA1CF991C100E85FEB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E904D81CF991B500E85FEB /* WebKit.framework */; };
 		D0E904DB1CF991C900E85FEB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E904D81CF991B500E85FEB /* WebKit.framework */; };
 		D0E904DE1CF996C300E85FEB /* TDFWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E904DD1CF996C300E85FEB /* TDFWebViewController.m */; };
-		D0E904DF1CF996C300E85FEB /* TDFWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E904DD1CF996C300E85FEB /* TDFWebViewController.m */; };
-		D0E904E01CF996C300E85FEB /* TDFWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E904DD1CF996C300E85FEB /* TDFWebViewController.m */; };
 		D0E9052F1CFDB29700E85FEB /* messages-browser-light.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E9052D1CFDB29700E85FEB /* messages-browser-light.pdf */; };
-		D0E905301CFDB29700E85FEB /* messages-browser-light.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E9052D1CFDB29700E85FEB /* messages-browser-light.pdf */; };
-		D0E905311CFDB29700E85FEB /* messages-browser-light.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E9052D1CFDB29700E85FEB /* messages-browser-light.pdf */; };
 		D0E905321CFDB29700E85FEB /* messages-messages-light.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E9052E1CFDB29700E85FEB /* messages-messages-light.pdf */; };
-		D0E905331CFDB29700E85FEB /* messages-messages-light.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E9052E1CFDB29700E85FEB /* messages-messages-light.pdf */; };
-		D0E905341CFDB29700E85FEB /* messages-messages-light.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D0E9052E1CFDB29700E85FEB /* messages-messages-light.pdf */; };
 		D0ED0CC51CFEC2EE00FC408D /* TDFPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ED0CC41CFEC2EE00FC408D /* TDFPreviewController.m */; };
-		D0ED0CC61CFEC2EE00FC408D /* TDFPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ED0CC41CFEC2EE00FC408D /* TDFPreviewController.m */; };
-		D0ED0CC71CFEC2EE00FC408D /* TDFPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ED0CC41CFEC2EE00FC408D /* TDFPreviewController.m */; };
 		D0ED0CCA1CFEC35300FC408D /* TDFPreviewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0ED0CC81CFEC35300FC408D /* TDFPreviewController.xib */; };
-		D0ED0CCB1CFEC35300FC408D /* TDFPreviewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0ED0CC81CFEC35300FC408D /* TDFPreviewController.xib */; };
-		D0ED0CCC1CFEC35300FC408D /* TDFPreviewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0ED0CC81CFEC35300FC408D /* TDFPreviewController.xib */; };
 		D0ED0CD91D0029D300FC408D /* JSDTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ED0CD81D0029D300FC408D /* JSDTextFieldCell.m */; };
-		D0ED0CDA1D0029D300FC408D /* JSDTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ED0CD81D0029D300FC408D /* JSDTextFieldCell.m */; };
-		D0ED0CDB1D0029D300FC408D /* JSDTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ED0CD81D0029D300FC408D /* JSDTextFieldCell.m */; };
 		D0F3986D1BFB03790050A9B8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D04BC96F1A5AC5CB009AC43A /* main.m */; };
 		D0F3986E1BFB03790050A9B8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D04BC96D1A5AC5CB009AC43A /* AppDelegate.m */; };
 		D0F3986F1BFB03790050A9B8 /* TidyService.m in Sources */ = {isa = PBXBuildFile; fileRef = D04BC98F1A5AC7A2009AC43A /* TidyService.m */; };
@@ -498,7 +249,6 @@
 		D0F398731BFB03790050A9B8 /* HelperMainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9B71A5ACB7D009AC43A /* HelperMainMenu.xib */; };
 		D0F398741BFB03790050A9B8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BC9CC1A5C2A22009AC43A /* Localizable.strings */; };
 		D0F398751BFB03790050A9B8 /* helper-icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D04BC98D1A5AC714009AC43A /* helper-icon.icns */; };
-		D0F398771BFB03790050A9B8 /* JSDTidyFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D0F398801BFB05480050A9B8 /* TidyService.sdef in Resources */ = {isa = PBXBuildFile; fileRef = D0F3987F1BFB05480050A9B8 /* TidyService.sdef */; };
 		D0F398831BFB0BF60050A9B8 /* NSApplication+ServiceApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F398821BFB0BF60050A9B8 /* NSApplication+ServiceApplication.m */; };
 		D0F4A5041BDA0ADC0051327D /* JSDStringEncodingTools.h in Headers */ = {isa = PBXBuildFile; fileRef = D0F4A5021BDA0ADC0051327D /* JSDStringEncodingTools.h */; };
@@ -515,7 +265,7 @@
 			outputFiles = (
 				"$(SRCROOT)/HTMLTidy/xcode-version.h",
 			);
-			script = "echo \"Processing the date and version file to build a dynamic header.\"\nHEADER=\"${SRCROOT}/HTMLTidy/xcode-version.h\"\ncd ${SRCROOT}\necho \"// This file is generated automatically. Do not edit. Edit version.txt instead.\" > $HEADER\necho \"// The libtidy-balthisar.dylib target Build Rules for *.txt files has produced this file.\" >> $HEADER\necho \"// Make sure you include this file as the libtidy-balthisar.dylib target prefix header.\" >> $HEADER\n\nIFS=$'\\n' read -d '' -r -a LINES < \"${INPUT_FILE_PATH}\"\n\ncat << EOF >> $HEADER\n#ifdef LIBTIDY_VERSION\n#undef LIBTIDY_VERSION\n#endif\n#ifdef RELEASE_DATE\n#undef RELEASE_DATE\n#endif\n#ifdef PLATFORM_NAME\n#undef PLATFORM_NAME\n#endif\nEOF\n\necho \"#define LIBTIDY_VERSION \\\"${LINES[0]}\\\"\" >> $HEADER\necho \"#define RELEASE_DATE \\\"${LINES[1]}\\\"\" >> $HEADER\necho \"#define PLATFORM_NAME \\\"Balthisar Tidy,\\\"\" >> $HEADER\n\necho \"// Updated on \"`date` >> $HEADER\n";
+			script = "echo \"Processing the date and version file to build a dynamic header.\"\nHEADER=\"${SRCROOT}/HTMLTidy/xcode-version.h\"\ncd ${SRCROOT}\necho \"// This file is generated automatically. Do not edit. Edit version.txt instead.\" > $HEADER\necho \"// The libtidy-balthisar.dylib target Build Rules for *.txt files has produced this file.\" >> $HEADER\necho \"// Make sure you include this file as the libtidy-balthisar.dylib target prefix header.\" >> $HEADER\n\nIFS=$'\\n' read -d '' -r -a LINES < \"${INPUT_FILE_PATH}\"\n\ncat << EOF >> $HEADER\n#ifdef LIBTIDY_VERSION\n#undef LIBTIDY_VERSION\n#endif\n#ifdef RELEASE_DATE\n#undef RELEASE_DATE\n#endif\n#ifdef PLATFORM_NAME\n#undef PLATFORM_NAME\n#endif\nEOF\n\necho \"#define LIBTIDY_VERSION \\\"${LINES[0]}\\\"\" >> $HEADER\necho \"#define RELEASE_DATE \\\"${LINES[1]}\\\"\" >> $HEADER\necho \"#define PLATFORM_NAME \\\"Balthisar Tidy on macOS,\\\"\" >> $HEADER\n\necho \"// Updated on \"`date` >> $HEADER\n";
 		};
 /* End PBXBuildRule section */
 
@@ -534,34 +284,6 @@
 			remoteGlobalIDString = D00661071A579BE700F73F85;
 			remoteInfo = JSDTidyFramework;
 		};
-		D013165B1A5D871500AB1456 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D04BC9671A5AC5CB009AC43A;
-			remoteInfo = "Balthisar Tidy Service Helper";
-		};
-		D01316651A5D885F00AB1456 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
-		D01316671A5D886300AB1456 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
-		D017A13C1A56D1E5003DDE6C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D01C70DF1A5591A500CC5038;
-			remoteInfo = "Balthisar Tidy Extension (pro)";
-		};
 		D01C70F71A5592FC00CC5038 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D016A91E182FD80700712C60 /* Project object */;
@@ -569,41 +291,13 @@
 			remoteGlobalIDString = D01C70B91A55850D00CC5038;
 			remoteInfo = "Balthisar Tidy Extension (web)";
 		};
-		D01C70F91A55930300CC5038 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D01C70D31A558E1C00CC5038;
-			remoteInfo = "Balthisar Tidy Extension (app)";
-		};
-		D02DBCF11A5951AB009C84CF /* PBXContainerItemProxy */ = {
+		D07B8F801FB3E8470043E24D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D016A91E182FD80700712C60 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
-		D02DBCF31A5951B1009C84CF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
-		D04BC9BA1A5ACCB1009AC43A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D04BC9671A5AC5CB009AC43A;
+			remoteGlobalIDString = D0F398691BFB03790050A9B8;
 			remoteInfo = "Balthisar Tidy Service Helper";
 		};
-		D04BC9C81A5BFB0D009AC43A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
 		D0A482B01BCF9C6200E0646F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D016A91E182FD80700712C60 /* Project object */;
@@ -618,20 +312,6 @@
 			remoteGlobalIDString = D00661071A579BE700F73F85;
 			remoteInfo = JSDTidyFramework;
 		};
-		D0C9C1361BD85FF4004C545A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
-		D0C9C1491BD85FFB004C545A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D00661071A579BE700F73F85;
-			remoteInfo = JSDTidyFramework;
-		};
 		D0C9C15B1BD862AA004C545A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D016A91E182FD80700712C60 /* Project object */;
@@ -639,20 +319,6 @@
 			remoteGlobalIDString = D0C9C1211BD85FEA004C545A;
 			remoteInfo = "TidyBody Extension (web)";
 		};
-		D0C9C15D1BD862B3004C545A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0C9C1341BD85FF4004C545A;
-			remoteInfo = "TidyBody Extension (app)";
-		};
-		D0C9C15F1BD862BE004C545A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0C9C1471BD85FFB004C545A;
-			remoteInfo = "TidyBody Extension (pro)";
-		};
 		D0F3986B1BFB03790050A9B8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D016A91E182FD80700712C60 /* Project object */;
@@ -660,125 +326,22 @@
 			remoteGlobalIDString = D00661071A579BE700F73F85;
 			remoteInfo = JSDTidyFramework;
 		};
-		D0F3987D1BFB03BD0050A9B8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D016A91E182FD80700712C60 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D0F398691BFB03790050A9B8;
-			remoteInfo = "Balthisar Tidy Service Helper (pro)";
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		D00661C91A57A8F700F73F85 /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D002EFD91A57AC6500530D2F /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D01316691A5D887400AB1456 /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D013166A1A5D888300AB1456 /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D013166B1A5D889500AB1456 /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D013166C1A5D88A600AB1456 /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D01C70CB1A55850D00CC5038 /* Embed App Extensions */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 13;
-			files = (
-				D0C9C1651BD8662E004C545A /* Tidy Extension (pro).appex in Embed App Extensions */,
-				D0C9C1661BD8662E004C545A /* TidyBody Extension (pro).appex in Embed App Extensions */,
-				D01316621A5D881C00AB1456 /* Balthisar Tidy Service Helper.app in Embed App Extensions */,
-			);
-			name = "Embed App Extensions";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D01C70CC1A55872600CC5038 /* Embed App Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				D0C9C1611BD865F9004C545A /* Tidy Extension (web).appex in Embed App Extensions */,
-				D0C9C1621BD865F9004C545A /* TidyBody Extension (web).appex in Embed App Extensions */,
-				D04BC9BC1A5ACCC1009AC43A /* Balthisar Tidy Service Helper.app in Embed App Extensions */,
+				D07B8F7F1FB3E2D60043E24D /* Balthisar Tidy Service Helper.app in Embed App Extensions */,
+				D0C9C1611BD865F9004C545A /* Tidy Extension.appex in Embed App Extensions */,
+				D0C9C1621BD865F9004C545A /* TidyBody Extension.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D01C70CE1A55882900CC5038 /* Embed App Extensions */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 13;
-			files = (
-				D0C9C1631BD8661B004C545A /* Tidy Extension (app).appex in Embed App Extensions */,
-				D0C9C1641BD8661B004C545A /* TidyBody Extension (app).appex in Embed App Extensions */,
-				D01316611A5D881400AB1456 /* Balthisar Tidy Service Helper.app in Embed App Extensions */,
-			);
-			name = "Embed App Extensions";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D02DBCED1A5950E7009C84CF /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0E483381CFD1669003DC4A7 /* MMTabBarView.framework in Add Frameworks */,
-				D0B7D0B41BEAFC7F0040694B /* Fragaria.framework in Add Frameworks */,
-				D02DBCEE1A595104009C84CF /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D02DBCEF1A595118009C84CF /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0E483391CFD1671003DC4A7 /* MMTabBarView.framework in Add Frameworks */,
-				D0B7D0B51BEAFC8A0040694B /* Fragaria.framework in Add Frameworks */,
-				D02DBCF01A59512E009C84CF /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D04BC9CA1A5BFB0D009AC43A /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D04BC9CB1A5C0991009AC43A /* JSDTidyFramework.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D06626D018B09BD00091CBD8 /* Add Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -803,50 +366,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D0C9C12D1BD85FEA004C545A /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0C9C12E1BD85FEA004C545A /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0C9C1401BD85FF4004C545A /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0C9C1411BD85FF4004C545A /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0C9C1531BD85FFB004C545A /* Add Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0C9C1541BD85FFB004C545A /* JSDTidyFramework.framework in Add Frameworks */,
-			);
-			name = "Add Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0F398761BFB03790050A9B8 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				D0F398771BFB03790050A9B8 /* JSDTidyFramework.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -862,27 +381,28 @@
 		D00661C41A57A06600F73F85 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D008F0171930D9D700559F3B /* JSDAllCapsValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSDAllCapsValueTransformer.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D008F0181930D9D700559F3B /* JSDAllCapsValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = JSDAllCapsValueTransformer.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D00AC81D1E7F280E0059D5AB /* attrapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = attrapi.c; sourceTree = "<group>"; };
 		D00AC81E1E7F280E0059D5AB /* messageobj.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = messageobj.c; sourceTree = "<group>"; };
 		D00AC81F1E7F280E0059D5AB /* messageobj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = messageobj.h; sourceTree = "<group>"; };
-		D016A926182FD80700712C60 /* Balthisar Tidy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Balthisar Tidy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		D016A926182FD80700712C60 /* Balthisar Tidy (debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Balthisar Tidy (debug).app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D016A929182FD80700712C60 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		D016A92C182FD80700712C60 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		D016A92D182FD80700712C60 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		D016A92E182FD80700712C60 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		D016A931182FD80700712C60 /* Balthisar Tidy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Balthisar Tidy-Info.plist"; path = "Balthisar Tidy/Balthisar Tidy-Info.plist"; sourceTree = "<group>"; };
+		D016A931182FD80700712C60 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Balthisar Tidy/Info.plist"; sourceTree = "<group>"; };
 		D016A935182FD80700712C60 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = "Balthisar Tidy/main.m"; sourceTree = "<group>"; };
+		D01816701FB7430D000B9F77 /* JSDListEditorController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDListEditorController.m; sourceTree = "<group>"; };
+		D01816711FB7430D000B9F77 /* JSDListEditorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDListEditorController.h; sourceTree = "<group>"; };
+		D01816731FB8A896000B9F77 /* RSRTVArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSRTVArrayController.h; sourceTree = "<group>"; };
+		D01816741FB8A897000B9F77 /* RSRTVArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSRTVArrayController.m; sourceTree = "<group>"; };
 		D01AE4851C740EA1008E7199 /* language_en.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = language_en.h; sourceTree = "<group>"; };
 		D01AE4861C740EA1008E7199 /* language.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = language.c; sourceTree = "<group>"; };
 		D01AE4871C740EA1008E7199 /* language.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = language.h; sourceTree = "<group>"; };
 		D01AE4881C740EA1008E7199 /* message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = message.c; sourceTree = "<group>"; };
-		D01C70BA1A55850D00CC5038 /* Tidy Extension (web).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Tidy Extension (web).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
+		D01C70BA1A55850D00CC5038 /* Tidy Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Tidy Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D01C70BE1A55850D00CC5038 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D01C70BF1A55850D00CC5038 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
 		D01C70C21A55850D00CC5038 /* ActionRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ActionRequestHandler.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ActionRequestHandler.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D01C70DD1A558E1C00CC5038 /* Tidy Extension (app).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Tidy Extension (app).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
-		D01C70E91A5591A500CC5038 /* Tidy Extension (pro).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Tidy Extension (pro).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D025BD5D195856B6006D7356 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Acknowledgments.rtf; sourceTree = "<group>"; };
 		D028E8881A5670FB00C39852 /* Balthisar Tidy Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Balthisar Tidy Extension.entitlements"; sourceTree = "<group>"; };
 		D028E88C1A56721200C39852 /* Balthisar Tidy.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "Balthisar Tidy.entitlements"; path = "Balthisar Tidy/Balthisar Tidy.entitlements"; sourceTree = "<group>"; };
@@ -909,8 +429,6 @@
 		D0323AAC1A7DE25000A0A9FC /* forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = forward.h; sourceTree = "<group>"; };
 		D0323AAD1A7DE25000A0A9FC /* gdoc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gdoc.c; sourceTree = "<group>"; };
 		D0323AAE1A7DE25000A0A9FC /* gdoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gdoc.h; sourceTree = "<group>"; };
-		D0323AAF1A7DE25000A0A9FC /* iconvtc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iconvtc.c; sourceTree = "<group>"; };
-		D0323AB01A7DE25000A0A9FC /* iconvtc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iconvtc.h; sourceTree = "<group>"; };
 		D0323AB11A7DE25000A0A9FC /* istack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = istack.c; sourceTree = "<group>"; };
 		D0323AB21A7DE25000A0A9FC /* lexer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lexer.c; sourceTree = "<group>"; };
 		D0323AB31A7DE25000A0A9FC /* lexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lexer.h; sourceTree = "<group>"; };
@@ -935,10 +453,27 @@
 		D0323AC71A7DE25000A0A9FC /* utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf8.c; sourceTree = "<group>"; };
 		D0323AC81A7DE25000A0A9FC /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
 		D0323AC91A7DE25000A0A9FC /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		D0323ACA1A7DE25000A0A9FC /* win32tc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = win32tc.c; sourceTree = "<group>"; };
-		D0323ACB1A7DE25000A0A9FC /* win32tc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = win32tc.h; sourceTree = "<group>"; };
 		D0323B071A7DE48400A0A9FC /* version.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = version.txt; path = "HTMLTidy/vendor/tidy-html5/version.txt"; sourceTree = SOURCE_ROOT; };
-		D036E1D918F3D25E0009A9D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Credits.rtf; sourceTree = "<group>"; };
+		D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JSDTidyFramework.xcconfig; sourceTree = "<group>"; };
+		D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "libtidy-balthisar.dylib.xcconfig"; sourceTree = "<group>"; };
+		D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "JSDTidyFramework Documentation.xcconfig"; sourceTree = "<group>"; };
+		D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Balthisar Tidy Help Project.xcconfig"; sourceTree = "<group>"; };
+		D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "balthisar-tidy.xcconfig"; sourceTree = "<group>"; };
+		D036D6461FB3991E00916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OptionListViewController.xib; sourceTree = "<group>"; };
+		D036D6491FB3992500916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OptionListAppearanceViewController.xib; sourceTree = "<group>"; };
+		D036D64C1FB3992B00916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DocumentAppearanceViewController.xib; sourceTree = "<group>"; };
+		D036D64F1FB3992F00916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SavingOptionsViewController.xib; sourceTree = "<group>"; };
+		D036D6521FB3993300916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MiscOptionsViewController.xib; sourceTree = "<group>"; };
+		D036D6551FB3993700916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UpdaterOptionsViewController.xib; sourceTree = "<group>"; };
+		D036D6581FB3997300916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DCOAboutWindow.xib; sourceTree = "<group>"; };
+		D036D65B1FB3997A00916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MASPreferencesWindow.xib; sourceTree = "<group>"; };
+		D036D65E1FB399D700916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Base; path = "Base.lproj/Balthisar Tidy (web).help"; sourceTree = "<group>"; };
+		D036D6611FB399DC00916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Base; path = "Base.lproj/Balthisar Tidy (app).help"; sourceTree = "<group>"; };
+		D036D6641FB399E000916128 /* Base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Base; path = "Base.lproj/Balthisar Tidy (pro).help"; sourceTree = "<group>"; };
+		D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "extension-tidy.xcconfig"; sourceTree = "<group>"; };
+		D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "extension-tidybody.xcconfig"; sourceTree = "<group>"; };
+		D036D66A1FB3AD5500916128 /* balthisar-tidy-id.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "balthisar-tidy-id.xcconfig"; sourceTree = "<group>"; };
+		D036E1D918F3D25E0009A9D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = "Base.lproj/Credits (web).rtf"; sourceTree = "<group>"; };
 		D036E1DB18F3D25E0009A9D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FirstRunController.xib; sourceTree = "<group>"; };
 		D036E1DD18F3D25E0009A9D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
 		D036E1DF18F3D25E0009A9D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -951,14 +486,13 @@
 		D036E20B18F3D2F20009A9D4 /* Tidy.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Tidy.icns; sourceTree = "<group>"; };
 		D036E20C18F3D2F20009A9D4 /* XML.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = XML.icns; sourceTree = "<group>"; };
 		D036E21718F3D81E0009A9D4 /* TidyScripting.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = TidyScripting.sdef; sourceTree = "<group>"; };
-		D03B89D319553E5D00E9B4D5 /* DiffsTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DiffsTemplate.png; path = "Images for Toolbar/DiffsTemplate.png"; sourceTree = "<group>"; };
-		D03B89D71955457500E9B4D5 /* ScrollLockTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ScrollLockTemplate.png; path = "Images for Toolbar/ScrollLockTemplate.png"; sourceTree = "<group>"; };
-		D03B89D91955474700E9B4D5 /* DiffViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DiffViewTemplate.png; path = "Images for Toolbar/DiffViewTemplate.png"; sourceTree = "<group>"; };
+		D03B89D319553E5D00E9B4D5 /* DiffsTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DiffsTemplate.png; sourceTree = "<group>"; };
+		D03B89D71955457500E9B4D5 /* ScrollLockTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ScrollLockTemplate.png; sourceTree = "<group>"; };
+		D03B89D91955474700E9B4D5 /* DiffViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DiffViewTemplate.png; sourceTree = "<group>"; };
 		D04753B51938A19D00BB7163 /* JSDBoolToStringValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSDBoolToStringValueTransformer.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D04753B61938A19D00BB7163 /* JSDBoolToStringValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = JSDBoolToStringValueTransformer.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		D047C72D1915FBF100B70A94 /* JSDTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSDTableCellView.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D047C72E1915FBF100B70A94 /* JSDTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = JSDTableCellView.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D04BC9681A5AC5CB009AC43A /* Balthisar Tidy Service Helper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Balthisar Tidy Service Helper.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D04BC96B1A5AC5CB009AC43A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D04BC96C1A5AC5CB009AC43A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AppDelegate.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D04BC96D1A5AC5CB009AC43A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AppDelegate.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@@ -975,9 +509,7 @@
 		D04C275C1C017FCC0074DF78 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TidyDocumentFeedbackViewController.xib; sourceTree = "<group>"; };
 		D04D5F971902459500F77901 /* NSApplication+TidyApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSApplication+TidyApplication.h"; sourceTree = "<group>"; };
 		D04D5F981902459500F77901 /* NSApplication+TidyApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSApplication+TidyApplication.m"; sourceTree = "<group>"; };
-		D04E8FAC195D964F00D1CEDC /* Balthisar Tidy (app).help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Balthisar Tidy (app).help"; sourceTree = "<group>"; };
-		D04E8FAD195D964F00D1CEDC /* Balthisar Tidy (pro).help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Balthisar Tidy (pro).help"; sourceTree = "<group>"; };
-		D04E8FAE195D964F00D1CEDC /* Balthisar Tidy (web).help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Balthisar Tidy (web).help"; sourceTree = "<group>"; };
+		D058A2B81FB60A9600567353 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Balthisar Tidy/Resources/Base.lproj/JSDListEditorController.xib"; sourceTree = SOURCE_ROOT; };
 		D05F71D21BEA2DE300F584C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = "Base.lproj/Credits (app).rtf"; sourceTree = "<group>"; };
 		D05F71D41BEA2DE300F584C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = "Base.lproj/Credits (pro).rtf"; sourceTree = "<group>"; };
 		D06045F91BF07DF000D69673 /* JSDTidyModel+Developer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = "JSDTidyModel+Developer.h"; path = "JSDTidyModel/JSDTidyModel+Developer.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -992,58 +524,54 @@
 		D06046181BF0DDDD00D69673 /* FragariaColorsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = FragariaColorsViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/FragariaColorsViewController.m"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		D06626CE18B09B330091CBD8 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = "Balthisar Tidy/Frameworks/Sparkle.framework"; sourceTree = "<group>"; };
 		D06657C01A5D8BDB002DCD2F /* CommonHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = CommonHeaders.h; path = "Balthisar Common Headers/CommonHeaders.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		D06C9A3F195FB4A4004D6C27 /* MASPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MASPreferencesViewController.h; path = MASPreferences/MASPreferencesViewController.h; sourceTree = "<group>"; };
-		D06C9A40195FB4A4004D6C27 /* MASPreferencesWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MASPreferencesWindow.xib; path = MASPreferences/MASPreferencesWindow.xib; sourceTree = "<group>"; };
-		D06C9A41195FB4A4004D6C27 /* MASPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MASPreferencesWindowController.h; path = MASPreferences/MASPreferencesWindowController.h; sourceTree = "<group>"; };
-		D06C9A42195FB4A4004D6C27 /* MASPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MASPreferencesWindowController.m; path = MASPreferences/MASPreferencesWindowController.m; sourceTree = "<group>"; };
+		D06C9A3F195FB4A4004D6C27 /* MASPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASPreferencesViewController.h; sourceTree = "<group>"; };
+		D06C9A41195FB4A4004D6C27 /* MASPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASPreferencesWindowController.h; sourceTree = "<group>"; };
+		D06C9A42195FB4A4004D6C27 /* MASPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASPreferencesWindowController.m; sourceTree = "<group>"; };
 		D06C9A4C195FB955004D6C27 /* OptionListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OptionListViewController.h; path = "Balthisar Tidy/Classes/PreferencesWindow/OptionListViewController.h"; sourceTree = SOURCE_ROOT; };
 		D06C9A4D195FB955004D6C27 /* OptionListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OptionListViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/OptionListViewController.m"; sourceTree = SOURCE_ROOT; };
-		D06C9A4E195FB955004D6C27 /* OptionListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = OptionListViewController.xib; path = "Balthisar Tidy/Resources/Base.lproj/OptionListViewController.xib"; sourceTree = SOURCE_ROOT; };
 		D06C9A55195FB997004D6C27 /* OptionListAppearanceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = OptionListAppearanceViewController.h; path = "Balthisar Tidy/Classes/PreferencesWindow/OptionListAppearanceViewController.h"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D06C9A56195FB997004D6C27 /* OptionListAppearanceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = OptionListAppearanceViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/OptionListAppearanceViewController.m"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D06C9A57195FB997004D6C27 /* OptionListAppearanceViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = OptionListAppearanceViewController.xib; path = "Balthisar Tidy/Resources/Base.lproj/OptionListAppearanceViewController.xib"; sourceTree = SOURCE_ROOT; };
 		D06C9A5E195FB9D0004D6C27 /* DocumentAppearanceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = DocumentAppearanceViewController.h; path = "Balthisar Tidy/Classes/PreferencesWindow/DocumentAppearanceViewController.h"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D06C9A5F195FB9D0004D6C27 /* DocumentAppearanceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = DocumentAppearanceViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/DocumentAppearanceViewController.m"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D06C9A60195FB9D0004D6C27 /* DocumentAppearanceViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DocumentAppearanceViewController.xib; path = "Balthisar Tidy/Resources/Base.lproj/DocumentAppearanceViewController.xib"; sourceTree = SOURCE_ROOT; };
 		D06C9A67195FB9F2004D6C27 /* SavingOptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = SavingOptionsViewController.h; path = "Balthisar Tidy/Classes/PreferencesWindow/SavingOptionsViewController.h"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D06C9A68195FB9F2004D6C27 /* SavingOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = SavingOptionsViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/SavingOptionsViewController.m"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D06C9A69195FB9F2004D6C27 /* SavingOptionsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SavingOptionsViewController.xib; path = "Balthisar Tidy/Resources/Base.lproj/SavingOptionsViewController.xib"; sourceTree = SOURCE_ROOT; };
 		D06C9A70195FBA0F004D6C27 /* MiscOptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = MiscOptionsViewController.h; path = "Balthisar Tidy/Classes/PreferencesWindow/MiscOptionsViewController.h"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D06C9A71195FBA0F004D6C27 /* MiscOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = MiscOptionsViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/MiscOptionsViewController.m"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D06C9A72195FBA0F004D6C27 /* MiscOptionsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MiscOptionsViewController.xib; path = "Balthisar Tidy/Resources/Base.lproj/MiscOptionsViewController.xib"; sourceTree = SOURCE_ROOT; };
 		D06C9A79195FBA3F004D6C27 /* UpdaterOptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = UpdaterOptionsViewController.h; path = "Balthisar Tidy/Classes/PreferencesWindow/UpdaterOptionsViewController.h"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D06C9A7A195FBA3F004D6C27 /* UpdaterOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = UpdaterOptionsViewController.m; path = "Balthisar Tidy/Classes/PreferencesWindow/UpdaterOptionsViewController.m"; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D06C9A7B195FBA3F004D6C27 /* UpdaterOptionsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdaterOptionsViewController.xib; path = "Balthisar Tidy/Resources/Base.lproj/UpdaterOptionsViewController.xib"; sourceTree = SOURCE_ROOT; };
-		D06C9A84195FE854004D6C27 /* prefsSave.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsSave.png; path = "Images for Prefs/prefsSave.png"; sourceTree = "<group>"; };
-		D06C9A85195FE854004D6C27 /* prefsSave@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsSave@2x.png"; path = "Images for Prefs/prefsSave@2x.png"; sourceTree = "<group>"; };
-		D06C9A86195FE854004D6C27 /* prefsTidy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsTidy.png; path = "Images for Prefs/prefsTidy.png"; sourceTree = "<group>"; };
-		D06C9A87195FE854004D6C27 /* prefsTidy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsTidy@2x.png"; path = "Images for Prefs/prefsTidy@2x.png"; sourceTree = "<group>"; };
-		D06C9A88195FE854004D6C27 /* prefsTidyAppearance.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsTidyAppearance.png; path = "Images for Prefs/prefsTidyAppearance.png"; sourceTree = "<group>"; };
-		D06C9A89195FE854004D6C27 /* prefsTidyAppearance@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsTidyAppearance@2x.png"; path = "Images for Prefs/prefsTidyAppearance@2x.png"; sourceTree = "<group>"; };
-		D06C9A8A195FE854004D6C27 /* prefsUpdate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsUpdate.png; path = "Images for Prefs/prefsUpdate.png"; sourceTree = "<group>"; };
-		D06C9A8B195FE854004D6C27 /* prefsUpdate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsUpdate@2x.png"; path = "Images for Prefs/prefsUpdate@2x.png"; sourceTree = "<group>"; };
-		D06C9AA4195FEC11004D6C27 /* prefsDoc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsDoc.png; path = "Images for Prefs/prefsDoc.png"; sourceTree = "<group>"; };
-		D06C9AA5195FEC11004D6C27 /* prefsDoc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsDoc@2x.png"; path = "Images for Prefs/prefsDoc@2x.png"; sourceTree = "<group>"; };
-		D06C9AB019600550004D6C27 /* PaneTopShadow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PaneTopShadow.png; path = "Images for UI/PaneTopShadow.png"; sourceTree = "<group>"; };
+		D06C9A84195FE854004D6C27 /* prefsSave.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsSave.png; sourceTree = "<group>"; };
+		D06C9A85195FE854004D6C27 /* prefsSave@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsSave@2x.png"; sourceTree = "<group>"; };
+		D06C9A86195FE854004D6C27 /* prefsTidy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsTidy.png; sourceTree = "<group>"; };
+		D06C9A87195FE854004D6C27 /* prefsTidy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsTidy@2x.png"; sourceTree = "<group>"; };
+		D06C9A88195FE854004D6C27 /* prefsTidyAppearance.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsTidyAppearance.png; sourceTree = "<group>"; };
+		D06C9A89195FE854004D6C27 /* prefsTidyAppearance@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsTidyAppearance@2x.png"; sourceTree = "<group>"; };
+		D06C9A8A195FE854004D6C27 /* prefsUpdate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsUpdate.png; sourceTree = "<group>"; };
+		D06C9A8B195FE854004D6C27 /* prefsUpdate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsUpdate@2x.png"; sourceTree = "<group>"; };
+		D06C9AA4195FEC11004D6C27 /* prefsDoc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsDoc.png; sourceTree = "<group>"; };
+		D06C9AA5195FEC11004D6C27 /* prefsDoc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsDoc@2x.png"; sourceTree = "<group>"; };
+		D06C9AB019600550004D6C27 /* PaneTopShadow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PaneTopShadow.png; sourceTree = "<group>"; };
 		D074B78A1942BEE200F2E6F1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TidyEncodingHelperController.xib; sourceTree = "<group>"; };
-		D074B7931942CF0300F2E6F1 /* EncodingHelperController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = EncodingHelperController.h; path = DocumentWindow/EncodingHelperController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		D074B7941942CF0300F2E6F1 /* EncodingHelperController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = EncodingHelperController.m; path = DocumentWindow/EncodingHelperController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D074B7951942CF0300F2E6F1 /* FirstRunController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = FirstRunController.h; path = DocumentWindow/FirstRunController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		D074B7961942CF0300F2E6F1 /* FirstRunController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = FirstRunController.m; path = DocumentWindow/FirstRunController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D074B7971942CF0300F2E6F1 /* TidyDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TidyDocument.h; path = DocumentWindow/TidyDocument.h; sourceTree = "<group>"; };
-		D074B7981942CF0300F2E6F1 /* TidyDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TidyDocument.m; path = DocumentWindow/TidyDocument.m; sourceTree = "<group>"; };
-		D074B7991942CF0300F2E6F1 /* TidyDocumentWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TidyDocumentWindowController.h; path = DocumentWindow/TidyDocumentWindowController.h; sourceTree = "<group>"; };
-		D074B79A1942CF0300F2E6F1 /* TidyDocumentWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TidyDocumentWindowController.m; path = DocumentWindow/TidyDocumentWindowController.m; sourceTree = "<group>"; };
+		D074B7931942CF0300F2E6F1 /* EncodingHelperController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = EncodingHelperController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		D074B7941942CF0300F2E6F1 /* EncodingHelperController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = EncodingHelperController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		D074B7951942CF0300F2E6F1 /* FirstRunController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = FirstRunController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		D074B7961942CF0300F2E6F1 /* FirstRunController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = FirstRunController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		D074B7971942CF0300F2E6F1 /* TidyDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TidyDocument.h; sourceTree = "<group>"; };
+		D074B7981942CF0300F2E6F1 /* TidyDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TidyDocument.m; sourceTree = "<group>"; };
+		D074B7991942CF0300F2E6F1 /* TidyDocumentWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TidyDocumentWindowController.h; sourceTree = "<group>"; };
+		D074B79A1942CF0300F2E6F1 /* TidyDocumentWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TidyDocumentWindowController.m; sourceTree = "<group>"; };
 		D074B7A91944035800F2E6F1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TDFTableViewController.xib; sourceTree = "<group>"; };
 		D074B7B21947D93800F2E6F1 /* TDFTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = TDFTableViewController.h; path = ../FeedbackView/TDFTableViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D074B7B31947D93800F2E6F1 /* TDFTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = TDFTableViewController.m; path = ../FeedbackView/TDFTableViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "service-helper.xcconfig"; sourceTree = "<group>"; };
 		D07DD0E91A5E7AFC008130D0 /* JSDTidyCommonHeaders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSDTidyCommonHeaders.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D081CBD91917C1510041B2C5 /* JSDIntegerValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSDIntegerValueTransformer.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D081CBDA1917C1510041B2C5 /* JSDIntegerValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = JSDIntegerValueTransformer.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		D086892E194842A400BDAD72 /* TidyDocumentSourceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TidyDocumentSourceViewController.h; path = DocumentWindow/TidyDocumentSourceViewController.h; sourceTree = "<group>"; };
-		D086892F194842A400BDAD72 /* TidyDocumentSourceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TidyDocumentSourceViewController.m; path = DocumentWindow/TidyDocumentSourceViewController.m; sourceTree = "<group>"; };
+		D08363391FB287A400A9D534 /* balthisar-base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "balthisar-base.xcconfig"; sourceTree = "<group>"; };
+		D083633A1FB287A400A9D534 /* balthisar-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "balthisar-release.xcconfig"; sourceTree = "<group>"; };
+		D083633B1FB287A400A9D534 /* balthisar-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "balthisar-debug.xcconfig"; sourceTree = "<group>"; };
+		D086892E194842A400BDAD72 /* TidyDocumentSourceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TidyDocumentSourceViewController.h; sourceTree = "<group>"; };
+		D086892F194842A400BDAD72 /* TidyDocumentSourceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TidyDocumentSourceViewController.m; sourceTree = "<group>"; };
 		D08689341948439700BDAD72 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TidyDocumentSourceViewController.xib; sourceTree = "<group>"; };
-		D0913CDE18B0AC06005DB2E4 /* Balthisar Tidy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Balthisar Tidy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0979D881BE9E488002ACD04 /* SWFSemanticVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SWFSemanticVersion.h; path = JSDTidyModel/vendor/SWFSemanticVersion.h; sourceTree = "<group>"; };
 		D0979D891BE9E488002ACD04 /* SWFSemanticVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SWFSemanticVersion.m; path = JSDTidyModel/vendor/SWFSemanticVersion.m; sourceTree = "<group>"; };
 		D09ED1431BD757C3002AED94 /* messagesAccess.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = messagesAccess.pdf; path = Resources/common/messagesAccess.pdf; sourceTree = "<group>"; };
@@ -1054,42 +582,37 @@
 		D09ED1481BD757C3002AED94 /* messagesPanic.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = messagesPanic.pdf; path = Resources/common/messagesPanic.pdf; sourceTree = "<group>"; };
 		D09ED1491BD757C3002AED94 /* messagesWarning.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = messagesWarning.pdf; path = Resources/common/messagesWarning.pdf; sourceTree = "<group>"; };
 		D0A143CA1BFCC2500006C533 /* AppleScriptsforTidy.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = AppleScriptsforTidy.dmg; sourceTree = "<group>"; };
-		D0A2E1F6197548D20015F667 /* ToolbarAdvanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarAdvanced.tiff; path = "Images for Toolbar/ToolbarAdvanced.tiff"; sourceTree = "<group>"; };
-		D0A2E1F7197548D20015F667 /* ToolbarInfo.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarInfo.tiff; path = "Images for Toolbar/ToolbarInfo.tiff"; sourceTree = "<group>"; };
+		D0A2E1F6197548D20015F667 /* ToolbarAdvanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ToolbarAdvanced.tiff; sourceTree = "<group>"; };
+		D0A2E1F7197548D20015F667 /* ToolbarInfo.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ToolbarInfo.tiff; sourceTree = "<group>"; };
 		D0A4826E1BCF8E2900E0646F /* tidybuffio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tidybuffio.h; sourceTree = "<group>"; };
 		D0A4826F1BCF8E2900E0646F /* tidyplatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tidyplatform.h; sourceTree = "<group>"; };
 		D0A482AF1BCF9BD000E0646F /* libtidy-balthisar.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libtidy-balthisar.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0B7D0AF1BEAFC500040694B /* Fragaria.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Fragaria.framework; path = "Balthisar Tidy/Frameworks/Fragaria.framework"; sourceTree = "<group>"; };
-		D0B9F0EE19585010008864D6 /* DCOAboutWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DCOAboutWindow.xib; path = DCOAboutWindow/DCOAboutWindow/DCOAboutWindow.xib; sourceTree = "<group>"; };
-		D0B9F0EF19585010008864D6 /* DCOAboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DCOAboutWindowController.h; path = DCOAboutWindow/DCOAboutWindow/DCOAboutWindowController.h; sourceTree = "<group>"; };
-		D0B9F0F019585010008864D6 /* DCOAboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DCOAboutWindowController.m; path = DCOAboutWindow/DCOAboutWindow/DCOAboutWindowController.m; sourceTree = "<group>"; };
-		D0B9F0F819585060008864D6 /* DCOTransparentScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DCOTransparentScroller.h; path = DCOTransparentScroller/DCOTransparentScroller/DCOTransparentScroller.h; sourceTree = "<group>"; };
-		D0B9F0F919585060008864D6 /* DCOTransparentScroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DCOTransparentScroller.m; path = DCOTransparentScroller/DCOTransparentScroller/DCOTransparentScroller.m; sourceTree = "<group>"; };
-		D0B9F0FA19585060008864D6 /* DCOTransparentScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DCOTransparentScrollView.h; path = DCOTransparentScroller/DCOTransparentScroller/DCOTransparentScrollView.h; sourceTree = "<group>"; };
-		D0B9F0FB19585060008864D6 /* DCOTransparentScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DCOTransparentScrollView.m; path = DCOTransparentScroller/DCOTransparentScroller/DCOTransparentScrollView.m; sourceTree = "<group>"; };
+		D0B9F0EF19585010008864D6 /* DCOAboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DCOAboutWindowController.h; path = DCOAboutWindow/DCOAboutWindowController.h; sourceTree = "<group>"; };
+		D0B9F0F019585010008864D6 /* DCOAboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DCOAboutWindowController.m; path = DCOAboutWindow/DCOAboutWindowController.m; sourceTree = "<group>"; };
+		D0B9F0F819585060008864D6 /* DCOTransparentScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DCOTransparentScroller.h; path = DCOTransparentScroller/DCOTransparentScroller.h; sourceTree = "<group>"; };
+		D0B9F0F919585060008864D6 /* DCOTransparentScroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DCOTransparentScroller.m; path = DCOTransparentScroller/DCOTransparentScroller.m; sourceTree = "<group>"; };
+		D0B9F0FA19585060008864D6 /* DCOTransparentScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DCOTransparentScrollView.h; path = DCOTransparentScroller/DCOTransparentScrollView.h; sourceTree = "<group>"; };
+		D0B9F0FB19585060008864D6 /* DCOTransparentScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DCOTransparentScrollView.m; path = DCOTransparentScroller/DCOTransparentScrollView.m; sourceTree = "<group>"; };
 		D0B9F10319585474008864D6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		D0BB67B1193AB45A007A3EB0 /* JSDTableViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JSDTableViewDelegate.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		D0BB67FF193C820A007A3EB0 /* Balthisar Tidy for Work.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Balthisar Tidy for Work.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0BF29E01A7347580062B01A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = ActionRequestHandler.xib; sourceTree = "<group>"; };
-		D0C9C1321BD85FEA004C545A /* TidyBody Extension (web).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "TidyBody Extension (web).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0C9C1451BD85FF4004C545A /* TidyBody Extension (app).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "TidyBody Extension (app).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0C9C1581BD85FFB004C545A /* TidyBody Extension (pro).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "TidyBody Extension (pro).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
-		D0C9C15A1BD860C5004C545A /* Info-Body.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Body.plist"; sourceTree = "<group>"; };
+		D0C9C1321BD85FEA004C545A /* TidyBody Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "TidyBody Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0C9C1671BD8CB55004C545A /* balthisar_tidy-id_dsa.pub */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "balthisar_tidy-id_dsa.pub"; sourceTree = "<group>"; };
-		D0CA8F521953280700BBD54C /* LayoutBottomPaneTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LayoutBottomPaneTemplate.png; path = "Images for Toolbar/LayoutBottomPaneTemplate.png"; sourceTree = "<group>"; };
-		D0CA8F531953280700BBD54C /* LayoutLeftPaneTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LayoutLeftPaneTemplate.png; path = "Images for Toolbar/LayoutLeftPaneTemplate.png"; sourceTree = "<group>"; };
-		D0CA8F541953280700BBD54C /* LayoutSourceHTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LayoutSourceHTemplate.png; path = "Images for Toolbar/LayoutSourceHTemplate.png"; sourceTree = "<group>"; };
-		D0CA8F551953280700BBD54C /* LayoutSourceVTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LayoutSourceVTemplate.png; path = "Images for Toolbar/LayoutSourceVTemplate.png"; sourceTree = "<group>"; };
-		D0CDB2371BF191B900735EE4 /* prefsColor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsColor.png; path = "Images for Prefs/prefsColor.png"; sourceTree = "<group>"; };
-		D0CDB2381BF191B900735EE4 /* prefsColor@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsColor@2x.png"; path = "Images for Prefs/prefsColor@2x.png"; sourceTree = "<group>"; };
-		D0CDB23F1BF1979C00735EE4 /* prefsEditor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = prefsEditor.png; path = "Images for Prefs/prefsEditor.png"; sourceTree = "<group>"; };
-		D0CDB2401BF1979C00735EE4 /* prefsEditor@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "prefsEditor@2x.png"; path = "Images for Prefs/prefsEditor@2x.png"; sourceTree = "<group>"; };
+		D0CA8F521953280700BBD54C /* LayoutBottomPaneTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LayoutBottomPaneTemplate.png; sourceTree = "<group>"; };
+		D0CA8F531953280700BBD54C /* LayoutLeftPaneTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LayoutLeftPaneTemplate.png; sourceTree = "<group>"; };
+		D0CA8F541953280700BBD54C /* LayoutSourceHTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LayoutSourceHTemplate.png; sourceTree = "<group>"; };
+		D0CA8F551953280700BBD54C /* LayoutSourceVTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LayoutSourceVTemplate.png; sourceTree = "<group>"; };
+		D0CDB2371BF191B900735EE4 /* prefsColor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsColor.png; sourceTree = "<group>"; };
+		D0CDB2381BF191B900735EE4 /* prefsColor@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsColor@2x.png"; sourceTree = "<group>"; };
+		D0CDB23F1BF1979C00735EE4 /* prefsEditor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = prefsEditor.png; sourceTree = "<group>"; };
+		D0CDB2401BF1979C00735EE4 /* prefsEditor@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "prefsEditor@2x.png"; sourceTree = "<group>"; };
 		D0CDB2471BF1CD4A00735EE4 /* JSDTidyMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = JSDTidyMessage.m; path = JSDTidyModel/JSDTidyMessage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		D0CDB24B1BF1CD7C00735EE4 /* JSDTidyMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = JSDTidyMessage.h; path = JSDTidyModel/JSDTidyMessage.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		D0CDB24D1BF3304B00735EE4 /* GutterTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GutterTemplate.png; path = "Images for Toolbar/GutterTemplate.png"; sourceTree = "<group>"; };
-		D0CDB2551BF335FE00735EE4 /* ErrorsInlineTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ErrorsInlineTemplate.png; path = "Images for Toolbar/ErrorsInlineTemplate.png"; sourceTree = "<group>"; };
-		D0CDB2591BF3394300735EE4 /* HighlightingTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HighlightingTemplate.png; path = "Images for Toolbar/HighlightingTemplate.png"; sourceTree = "<group>"; };
-		D0CDB25A1BF3394300735EE4 /* InvisiblesTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InvisiblesTemplate.png; path = "Images for Toolbar/InvisiblesTemplate.png"; sourceTree = "<group>"; };
+		D0CDB24D1BF3304B00735EE4 /* GutterTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = GutterTemplate.png; sourceTree = "<group>"; };
+		D0CDB2551BF335FE00735EE4 /* ErrorsInlineTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ErrorsInlineTemplate.png; sourceTree = "<group>"; };
+		D0CDB2591BF3394300735EE4 /* HighlightingTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HighlightingTemplate.png; sourceTree = "<group>"; };
+		D0CDB25A1BF3394300735EE4 /* InvisiblesTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = InvisiblesTemplate.png; sourceTree = "<group>"; };
 		D0D9EAC118E6680F008A55D5 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AppController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		D0D9EAC218E6680F008A55D5 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AppController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		D0D9EAC318E6680F008A55D5 /* OptionPaneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionPaneController.h; sourceTree = "<group>"; };
@@ -1102,8 +625,8 @@
 		D0D9F1A218E6BF8D008A55D5 /* JSDTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = JSDTableView.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		D0DCEFB01A5FC40100E8A2AE /* TidyDocumentService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TidyDocumentService.h; sourceTree = "<group>"; };
 		D0DCEFB11A5FC40100E8A2AE /* TidyDocumentService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TidyDocumentService.m; sourceTree = "<group>"; };
-		D0E0EBA21CFD3B3700B1CF4E /* messages-browser.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "messages-browser.pdf"; path = "Images for UI/messages-browser.pdf"; sourceTree = "<group>"; };
-		D0E0EBA31CFD3B3700B1CF4E /* messages-messages.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "messages-messages.pdf"; path = "Images for UI/messages-messages.pdf"; sourceTree = "<group>"; };
+		D0E0EBA21CFD3B3700B1CF4E /* messages-browser.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "messages-browser.pdf"; sourceTree = "<group>"; };
+		D0E0EBA31CFD3B3700B1CF4E /* messages-messages.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "messages-messages.pdf"; sourceTree = "<group>"; };
 		D0E483331CFD1638003DC4A7 /* MMTabBarView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MMTabBarView.framework; path = "Balthisar Tidy/Frameworks/MMTabBarView.framework"; sourceTree = "<group>"; };
 		D0E483471CFD36FB003DC4A7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TDFWebViewController.xib; sourceTree = "<group>"; };
 		D0E6AE16190C9FAC00B49779 /* HideDescriptionTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = HideDescriptionTemplate.pdf; path = "Balthisar Tidy/Resources/Images for UI/HideDescriptionTemplate.pdf"; sourceTree = SOURCE_ROOT; };
@@ -1112,14 +635,14 @@
 		D0E904D81CF991B500E85FEB /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		D0E904DC1CF996C300E85FEB /* TDFWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TDFWebViewController.h; path = ../FeedbackView/TDFWebViewController.h; sourceTree = "<group>"; };
 		D0E904DD1CF996C300E85FEB /* TDFWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TDFWebViewController.m; path = ../FeedbackView/TDFWebViewController.m; sourceTree = "<group>"; };
-		D0E9052D1CFDB29700E85FEB /* messages-browser-light.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "messages-browser-light.pdf"; path = "Images for UI/messages-browser-light.pdf"; sourceTree = "<group>"; };
-		D0E9052E1CFDB29700E85FEB /* messages-messages-light.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "messages-messages-light.pdf"; path = "Images for UI/messages-messages-light.pdf"; sourceTree = "<group>"; };
+		D0E9052D1CFDB29700E85FEB /* messages-browser-light.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "messages-browser-light.pdf"; sourceTree = "<group>"; };
+		D0E9052E1CFDB29700E85FEB /* messages-messages-light.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "messages-messages-light.pdf"; sourceTree = "<group>"; };
 		D0ED0CC31CFEC2EE00FC408D /* TDFPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TDFPreviewController.h; path = "Balthisar Tidy/Classes/FeedbackView/TDFPreviewController.h"; sourceTree = SOURCE_ROOT; };
 		D0ED0CC41CFEC2EE00FC408D /* TDFPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TDFPreviewController.m; path = "Balthisar Tidy/Classes/FeedbackView/TDFPreviewController.m"; sourceTree = SOURCE_ROOT; };
 		D0ED0CC91CFEC35300FC408D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TDFPreviewController.xib; sourceTree = "<group>"; };
 		D0ED0CD71D0029D300FC408D /* JSDTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDTextFieldCell.h; sourceTree = "<group>"; };
 		D0ED0CD81D0029D300FC408D /* JSDTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDTextFieldCell.m; sourceTree = "<group>"; };
-		D0F398681BF9CDCB0050A9B8 /* AuxilliaryViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuxilliaryViewDelegate.h; path = DocumentWindow/AuxilliaryViewDelegate.h; sourceTree = "<group>"; };
+		D0F398681BF9CDCB0050A9B8 /* AuxilliaryViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuxilliaryViewDelegate.h; sourceTree = "<group>"; };
 		D0F3987B1BFB03790050A9B8 /* Balthisar Tidy Service Helper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Balthisar Tidy Service Helper.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0F3987F1BFB05480050A9B8 /* TidyService.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = TidyService.sdef; sourceTree = "<group>"; };
 		D0F398811BFB0BF60050A9B8 /* NSApplication+ServiceApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "NSApplication+ServiceApplication.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -1160,45 +683,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D01C70D61A558E1C00CC5038 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D01C70D71A558E1C00CC5038 /* Cocoa.framework in Frameworks */,
-				D01316631A5D884100AB1456 /* JSDTidyFramework.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D01C70E21A5591A500CC5038 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D01C70E31A5591A500CC5038 /* Cocoa.framework in Frameworks */,
-				D01316641A5D885100AB1456 /* JSDTidyFramework.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D04BC9651A5AC5CB009AC43A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D04BC9C61A5BFB0D009AC43A /* JSDTidyFramework.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0913CC818B0AC06005DB2E4 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0E904DA1CF991C100E85FEB /* WebKit.framework in Frameworks */,
-				D0E483351CFD1645003DC4A7 /* MMTabBarView.framework in Frameworks */,
-				D0913CC918B0AC06005DB2E4 /* Cocoa.framework in Frameworks */,
-				D0B9F1051958547A008864D6 /* QuartzCore.framework in Frameworks */,
-				D02DBCEB1A5950B8009C84CF /* JSDTidyFramework.framework in Frameworks */,
-				D0B7D0B11BEAFC500040694B /* Fragaria.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0A4828F1BCF9BD000E0646F /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1206,19 +690,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D0BB67E5193C820A007A3EB0 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0E904D91CF991B500E85FEB /* WebKit.framework in Frameworks */,
-				D0E483361CFD1646003DC4A7 /* MMTabBarView.framework in Frameworks */,
-				D0BB67E6193C820A007A3EB0 /* Cocoa.framework in Frameworks */,
-				D0B9F1061958547B008864D6 /* QuartzCore.framework in Frameworks */,
-				D02DBCEC1A5950BE009C84CF /* JSDTidyFramework.framework in Frameworks */,
-				D0B7D0B21BEAFC500040694B /* Fragaria.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0C9C1261BD85FEA004C545A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1228,24 +699,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D0C9C1391BD85FF4004C545A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0C9C13A1BD85FF4004C545A /* Cocoa.framework in Frameworks */,
-				D0C9C13B1BD85FF4004C545A /* JSDTidyFramework.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0C9C14C1BD85FFB004C545A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0C9C14D1BD85FFB004C545A /* Cocoa.framework in Frameworks */,
-				D0C9C14E1BD85FFB004C545A /* JSDTidyFramework.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0F398701BFB03790050A9B8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1349,13 +802,14 @@
 		D016A91D182FD80700712C60 = {
 			isa = PBXGroup;
 			children = (
+				D0186C0B1FB11C6D0022D91C /* Config */,
 				D06657C01A5D8BDB002DCD2F /* CommonHeaders.h */,
 				D016A92F182FD80700712C60 /* Balthisar Tidy */,
 				D01C70BC1A55850D00CC5038 /* Balthisar Tidy Extension */,
 				D04BC9691A5AC5CB009AC43A /* Balthisar Tidy Service Helper */,
-				D016A928182FD80700712C60 /* Frameworks */,
 				D002EFE31A57BFF200530D2F /* HTMLTidy */,
 				D00661091A579BE700F73F85 /* JSDTidyFramework */,
+				D016A928182FD80700712C60 /* Frameworks */,
 				D016A927182FD80700712C60 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -1363,18 +817,11 @@
 		D016A927182FD80700712C60 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D016A926182FD80700712C60 /* Balthisar Tidy.app */,
-				D0913CDE18B0AC06005DB2E4 /* Balthisar Tidy.app */,
-				D0BB67FF193C820A007A3EB0 /* Balthisar Tidy for Work.app */,
-				D01C70BA1A55850D00CC5038 /* Tidy Extension (web).appex */,
-				D01C70DD1A558E1C00CC5038 /* Tidy Extension (app).appex */,
-				D01C70E91A5591A500CC5038 /* Tidy Extension (pro).appex */,
+				D016A926182FD80700712C60 /* Balthisar Tidy (debug).app */,
+				D01C70BA1A55850D00CC5038 /* Tidy Extension.appex */,
 				D00661081A579BE700F73F85 /* JSDTidyFramework.framework */,
-				D04BC9681A5AC5CB009AC43A /* Balthisar Tidy Service Helper.app */,
 				D0A482AF1BCF9BD000E0646F /* libtidy-balthisar.dylib */,
-				D0C9C1321BD85FEA004C545A /* TidyBody Extension (web).appex */,
-				D0C9C1451BD85FF4004C545A /* TidyBody Extension (app).appex */,
-				D0C9C1581BD85FFB004C545A /* TidyBody Extension (pro).appex */,
+				D0C9C1321BD85FEA004C545A /* TidyBody Extension.appex */,
 				D0F3987B1BFB03790050A9B8 /* Balthisar Tidy Service Helper.app */,
 			);
 			name = Products;
@@ -1414,6 +861,36 @@
 			path = "Balthisar Tidy";
 			sourceTree = SOURCE_ROOT;
 		};
+		D01816761FB8AD59000B9F77 /* JSDListEditorController */ = {
+			isa = PBXGroup;
+			children = (
+				D01816711FB7430D000B9F77 /* JSDListEditorController.h */,
+				D01816701FB7430D000B9F77 /* JSDListEditorController.m */,
+				D01816731FB8A896000B9F77 /* RSRTVArrayController.h */,
+				D01816741FB8A897000B9F77 /* RSRTVArrayController.m */,
+			);
+			path = JSDListEditorController;
+			sourceTree = "<group>";
+		};
+		D0186C0B1FB11C6D0022D91C /* Config */ = {
+			isa = PBXGroup;
+			children = (
+				D08363391FB287A400A9D534 /* balthisar-base.xcconfig */,
+				D083633B1FB287A400A9D534 /* balthisar-debug.xcconfig */,
+				D083633A1FB287A400A9D534 /* balthisar-release.xcconfig */,
+				D036D66A1FB3AD5500916128 /* balthisar-tidy-id.xcconfig */,
+				D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */,
+				D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */,
+				D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */,
+				D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */,
+				D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */,
+				D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */,
+				D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */,
+				D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */,
+			);
+			path = Config;
+			sourceTree = "<group>";
+		};
 		D01AACBC193DEA4900C4E5B2 /* Images for UI */ = {
 			isa = PBXGroup;
 			children = (
@@ -1426,7 +903,7 @@
 				D0E0EBA31CFD3B3700B1CF4E /* messages-messages.pdf */,
 				D0E9052E1CFDB29700E85FEB /* messages-messages-light.pdf */,
 			);
-			name = "Images for UI";
+			path = "Images for UI";
 			sourceTree = "<group>";
 		};
 		D01C70BC1A55850D00CC5038 /* Balthisar Tidy Extension */ = {
@@ -1445,7 +922,6 @@
 				D04BC9BD1A5BF47E009AC43A /* Base.lproj */,
 				D028E8881A5670FB00C39852 /* Balthisar Tidy Extension.entitlements */,
 				D01C70BE1A55850D00CC5038 /* Info.plist */,
-				D0C9C15A1BD860C5004C545A /* Info-Body.plist */,
 				D01C70BF1A55850D00CC5038 /* icon.icns */,
 			);
 			name = "Supporting Files";
@@ -1469,7 +945,6 @@
 				D0323A981A7DE25000A0A9FC /* access.c */,
 				D0323A991A7DE25000A0A9FC /* access.h */,
 				D0323A9A1A7DE25000A0A9FC /* alloc.c */,
-				D00AC81D1E7F280E0059D5AB /* attrapi.c */,
 				D0323A9C1A7DE25000A0A9FC /* attrdict.c */,
 				D0323A9D1A7DE25000A0A9FC /* attrdict.h */,
 				D0323A9F1A7DE25000A0A9FC /* attrs.c */,
@@ -1488,8 +963,6 @@
 				D0323AAC1A7DE25000A0A9FC /* forward.h */,
 				D0323AAD1A7DE25000A0A9FC /* gdoc.c */,
 				D0323AAE1A7DE25000A0A9FC /* gdoc.h */,
-				D0323AAF1A7DE25000A0A9FC /* iconvtc.c */,
-				D0323AB01A7DE25000A0A9FC /* iconvtc.h */,
 				D0323AB11A7DE25000A0A9FC /* istack.c */,
 				D01AE4871C740EA1008E7199 /* language.h */,
 				D01AE4861C740EA1008E7199 /* language.c */,
@@ -1520,8 +993,6 @@
 				D0323AC71A7DE25000A0A9FC /* utf8.c */,
 				D0323AC81A7DE25000A0A9FC /* utf8.h */,
 				D0323AC91A7DE25000A0A9FC /* version.h */,
-				D0323ACA1A7DE25000A0A9FC /* win32tc.c */,
-				D0323ACB1A7DE25000A0A9FC /* win32tc.h */,
 			);
 			name = src;
 			path = "HTMLTidy/vendor/tidy-html5/src";
@@ -1589,11 +1060,11 @@
 			isa = PBXGroup;
 			children = (
 				D06C9A3F195FB4A4004D6C27 /* MASPreferencesViewController.h */,
-				D06C9A40195FB4A4004D6C27 /* MASPreferencesWindow.xib */,
+				D036D65C1FB3997A00916128 /* MASPreferencesWindow.xib */,
 				D06C9A41195FB4A4004D6C27 /* MASPreferencesWindowController.h */,
 				D06C9A42195FB4A4004D6C27 /* MASPreferencesWindowController.m */,
 			);
-			name = MASPreferences;
+			path = MASPreferences;
 			sourceTree = "<group>";
 		};
 		D06C9A4A195FB889004D6C27 /* PreferencesWindow */ = {
@@ -1621,7 +1092,7 @@
 				D06046181BF0DDDD00D69673 /* FragariaColorsViewController.m */,
 			);
 			name = PreferencesWindow;
-			path = "App Pieces";
+			path = FeedbackView;
 			sourceTree = "<group>";
 		};
 		D06C9A4B195FB8B4004D6C27 /* DocumentWindow */ = {
@@ -1642,17 +1113,16 @@
 		D06C9A82195FBAA9004D6C27 /* PreferencesWindow */ = {
 			isa = PBXGroup;
 			children = (
-				D06C9A4E195FB955004D6C27 /* OptionListViewController.xib */,
-				D06C9A57195FB997004D6C27 /* OptionListAppearanceViewController.xib */,
-				D06C9A60195FB9D0004D6C27 /* DocumentAppearanceViewController.xib */,
-				D06C9A69195FB9F2004D6C27 /* SavingOptionsViewController.xib */,
-				D06C9A72195FBA0F004D6C27 /* MiscOptionsViewController.xib */,
-				D06C9A7B195FBA3F004D6C27 /* UpdaterOptionsViewController.xib */,
+				D036D6471FB3991E00916128 /* OptionListViewController.xib */,
+				D036D64A1FB3992500916128 /* OptionListAppearanceViewController.xib */,
+				D036D64D1FB3992B00916128 /* DocumentAppearanceViewController.xib */,
+				D036D6501FB3992F00916128 /* SavingOptionsViewController.xib */,
+				D036D6531FB3993300916128 /* MiscOptionsViewController.xib */,
+				D036D6561FB3993700916128 /* UpdaterOptionsViewController.xib */,
 				D06046041BF0BE0100D69673 /* FragariaEditorViewController.xib */,
 				D06046111BF0DDB400D69673 /* FragariaColorsViewController.xib */,
 			);
 			name = PreferencesWindow;
-			path = "../Classes/App Pieces";
 			sourceTree = "<group>";
 		};
 		D06C9A83195FE82D004D6C27 /* Images for Prefs */ = {
@@ -1673,7 +1143,7 @@
 				D0CDB2371BF191B900735EE4 /* prefsColor.png */,
 				D0CDB2381BF191B900735EE4 /* prefsColor@2x.png */,
 			);
-			name = "Images for Prefs";
+			path = "Images for Prefs";
 			sourceTree = "<group>";
 		};
 		D074B7A71942CF0900F2E6F1 /* DocumentWindow */ = {
@@ -1691,7 +1161,7 @@
 				D074B7951942CF0300F2E6F1 /* FirstRunController.h */,
 				D074B7961942CF0300F2E6F1 /* FirstRunController.m */,
 			);
-			name = DocumentWindow;
+			path = DocumentWindow;
 			sourceTree = "<group>";
 		};
 		D079D8DA1A17EF36009CDF8B /* Supporting Files */ = {
@@ -1699,7 +1169,7 @@
 			children = (
 				D028E88C1A56721200C39852 /* Balthisar Tidy.entitlements */,
 				D016A935182FD80700712C60 /* main.m */,
-				D016A931182FD80700712C60 /* Balthisar Tidy-Info.plist */,
+				D016A931182FD80700712C60 /* Info.plist */,
 			);
 			name = "Supporting Files";
 			path = ..;
@@ -1712,23 +1182,24 @@
 				D06C9A82195FBAA9004D6C27 /* PreferencesWindow */,
 				D036E1E018F3D25E0009A9D4 /* MainMenu.xib */,
 				D036E1E218F3D25E0009A9D4 /* OptionPane.xib */,
+				D058A2B71FB60A9600567353 /* JSDListEditorController.xib */,
 				D025BD5C195856B6006D7356 /* Acknowledgments.rtf */,
-				D036E1D818F3D25E0009A9D4 /* Credits.rtf */,
+				D036E1D818F3D25E0009A9D4 /* Credits (web).rtf */,
 				D05F71D11BEA2DE300F584C4 /* Credits (app).rtf */,
 				D05F71D31BEA2DE300F584C4 /* Credits (pro).rtf */,
 				D036E1DC18F3D25E0009A9D4 /* InfoPlist.strings */,
 				D036E1DE18F3D25E0009A9D4 /* Localizable.strings */,
 			);
-			name = Base.lproj;
+			path = Base.lproj;
 			sourceTree = "<group>";
 		};
 		D08A7C9118D442AD00341DCB /* Resources */ = {
 			isa = PBXGroup;
 			children = (
 				D0A143CA1BFCC2500006C533 /* AppleScriptsforTidy.dmg */,
-				D04E8FAE195D964F00D1CEDC /* Balthisar Tidy (web).help */,
-				D04E8FAC195D964F00D1CEDC /* Balthisar Tidy (app).help */,
-				D04E8FAD195D964F00D1CEDC /* Balthisar Tidy (pro).help */,
+				D036D65F1FB399D700916128 /* Balthisar Tidy (web).help */,
+				D036D6621FB399DC00916128 /* Balthisar Tidy (app).help */,
+				D036D6651FB399E000916128 /* Balthisar Tidy (pro).help */,
 				D036E21718F3D81E0009A9D4 /* TidyScripting.sdef */,
 				D0C9C1671BD8CB55004C545A /* balthisar_tidy-id_dsa.pub */,
 				D036E20718F3D2F20009A9D4 /* File Icons */,
@@ -1752,11 +1223,11 @@
 		D0B9F0F719585018008864D6 /* DCOAboutWindow */ = {
 			isa = PBXGroup;
 			children = (
-				D0B9F0EE19585010008864D6 /* DCOAboutWindow.xib */,
+				D036D6591FB3997300916128 /* DCOAboutWindow.xib */,
 				D0B9F0EF19585010008864D6 /* DCOAboutWindowController.h */,
 				D0B9F0F019585010008864D6 /* DCOAboutWindowController.m */,
 			);
-			name = DCOAboutWindow;
+			path = DCOAboutWindow;
 			sourceTree = "<group>";
 		};
 		D0B9F1021958506B008864D6 /* DCOTransparentScroller */ = {
@@ -1767,7 +1238,7 @@
 				D0B9F0FA19585060008864D6 /* DCOTransparentScrollView.h */,
 				D0B9F0FB19585060008864D6 /* DCOTransparentScrollView.m */,
 			);
-			name = DCOTransparentScroller;
+			path = DCOTransparentScroller;
 			sourceTree = "<group>";
 		};
 		D0CA8F091953168500BBD54C /* Images for Toolbar */ = {
@@ -1787,7 +1258,7 @@
 				D0CA8F541953280700BBD54C /* LayoutSourceHTemplate.png */,
 				D0CA8F551953280700BBD54C /* LayoutSourceVTemplate.png */,
 			);
-			name = "Images for Toolbar";
+			path = "Images for Toolbar";
 			sourceTree = "<group>";
 		};
 		D0D9EABF18E6680F008A55D5 /* Classes */ = {
@@ -1797,6 +1268,7 @@
 				D074B7A71942CF0900F2E6F1 /* DocumentWindow */,
 				D0E905201CFA9F2500E85FEB /* FeedbackView */,
 				D06C9A4A195FB889004D6C27 /* PreferencesWindow */,
+				D01816761FB8AD59000B9F77 /* JSDListEditorController */,
 				D0D9EACF18E6680F008A55D5 /* Support Pieces */,
 				D0D9EAD818E6680F008A55D5 /* vendor */,
 			);
@@ -1827,11 +1299,11 @@
 				D04753B61938A19D00BB7163 /* JSDBoolToStringValueTransformer.m */,
 				D081CBD91917C1510041B2C5 /* JSDIntegerValueTransformer.h */,
 				D081CBDA1917C1510041B2C5 /* JSDIntegerValueTransformer.m */,
-				D047C72D1915FBF100B70A94 /* JSDTableCellView.h */,
-				D047C72E1915FBF100B70A94 /* JSDTableCellView.m */,
 				D0BB67B1193AB45A007A3EB0 /* JSDTableViewDelegate.h */,
 				D0D9F1A118E6BF8D008A55D5 /* JSDTableView.h */,
 				D0D9F1A218E6BF8D008A55D5 /* JSDTableView.m */,
+				D047C72D1915FBF100B70A94 /* JSDTableCellView.h */,
+				D047C72E1915FBF100B70A94 /* JSDTableCellView.m */,
 				D0D9EAD018E6680F008A55D5 /* JSDTextField.h */,
 				D0D9EAD118E6680F008A55D5 /* JSDTextField.m */,
 				D0ED0CD71D0029D300FC408D /* JSDTextFieldCell.h */,
@@ -1862,8 +1334,7 @@
 				D0E904DC1CF996C300E85FEB /* TDFWebViewController.h */,
 				D0E904DD1CF996C300E85FEB /* TDFWebViewController.m */,
 			);
-			name = FeedbackView;
-			path = "Support Pieces";
+			path = FeedbackView;
 			sourceTree = "<group>";
 		};
 		D0F4A5011BDA0AA50051327D /* Support Pieces */ = {
@@ -1910,7 +1381,6 @@
 				D0A4829B1BCF9BD000E0646F /* forward.h in Headers */,
 				D00AC8261E7F28C00059D5AB /* messageobj.h in Headers */,
 				D0A4829C1BCF9BD000E0646F /* gdoc.h in Headers */,
-				D0A4829D1BCF9BD000E0646F /* iconvtc.h in Headers */,
 				D0A4829E1BCF9BD000E0646F /* lexer.h in Headers */,
 				D0A4829F1BCF9BD000E0646F /* mappedio.h in Headers */,
 				D0A482A01BCF9BD000E0646F /* message.h in Headers */,
@@ -1923,7 +1393,6 @@
 				D0A482A81BCF9BD000E0646F /* utf8.h in Headers */,
 				D0A482A91BCF9BD000E0646F /* version.h in Headers */,
 				D01AE4891C740EA1008E7199 /* language_en.h in Headers */,
-				D0A482AA1BCF9BD000E0646F /* win32tc.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1950,9 +1419,9 @@
 			productReference = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		D016A925182FD80700712C60 /* Balthisar Tidy (web) */ = {
+		D016A925182FD80700712C60 /* Balthisar Tidy */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D016A95A182FD80700712C60 /* Build configuration list for PBXNativeTarget "Balthisar Tidy (web)" */;
+			buildConfigurationList = D016A95A182FD80700712C60 /* Build configuration list for PBXNativeTarget "Balthisar Tidy" */;
 			buildPhases = (
 				D016A922182FD80700712C60 /* Sources */,
 				D016A923182FD80700712C60 /* Frameworks */,
@@ -1964,227 +1433,83 @@
 			);
 			dependencies = (
 				D002EFDD1A57AC9000530D2F /* PBXTargetDependency */,
-				D04BC9BB1A5ACCB1009AC43A /* PBXTargetDependency */,
 				D01C70F81A5592FC00CC5038 /* PBXTargetDependency */,
 				D0C9C15C1BD862AA004C545A /* PBXTargetDependency */,
+				D07B8F811FB3E8470043E24D /* PBXTargetDependency */,
 			);
-			name = "Balthisar Tidy (web)";
+			name = "Balthisar Tidy";
 			productName = "Balthisar Tidy";
-			productReference = D016A926182FD80700712C60 /* Balthisar Tidy.app */;
+			productReference = D016A926182FD80700712C60 /* Balthisar Tidy (debug).app */;
 			productType = "com.apple.product-type.application";
 		};
-		D01C70B91A55850D00CC5038 /* Tidy Extension (web) */ = {
+		D01C70B91A55850D00CC5038 /* Tidy Extension */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D01C70C81A55850D00CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension (web)" */;
+			buildConfigurationList = D01C70C81A55850D00CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension" */;
 			buildPhases = (
 				D01C70B61A55850D00CC5038 /* Sources */,
 				D01C70B71A55850D00CC5038 /* Frameworks */,
 				D01C70B81A55850D00CC5038 /* Resources */,
-				D00661C91A57A8F700F73F85 /* Add Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				D002EFD81A57AC5100530D2F /* PBXTargetDependency */,
 			);
-			name = "Tidy Extension (web)";
+			name = "Tidy Extension";
 			productName = "Balthisar Tidy Extension";
-			productReference = D01C70BA1A55850D00CC5038 /* Tidy Extension (web).appex */;
+			productReference = D01C70BA1A55850D00CC5038 /* Tidy Extension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
-		D01C70D31A558E1C00CC5038 /* Tidy Extension (app) */ = {
+		D0A482701BCF9BD000E0646F /* tidy-balthisar */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D01C70DA1A558E1C00CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension (app)" */;
+			buildConfigurationList = D0A482AC1BCF9BD000E0646F /* Build configuration list for PBXNativeTarget "tidy-balthisar" */;
 			buildPhases = (
-				D01C70D41A558E1C00CC5038 /* Sources */,
-				D01C70D61A558E1C00CC5038 /* Frameworks */,
-				D01C70D81A558E1C00CC5038 /* Resources */,
-				D01316691A5D887400AB1456 /* Add Frameworks */,
+				D0A482711BCF9BD000E0646F /* Sources */,
+				D0A4828F1BCF9BD000E0646F /* Frameworks */,
+				D0A482901BCF9BD000E0646F /* Headers */,
 			);
 			buildRules = (
+				D0A482AB1BCF9BD000E0646F /* PBXBuildRule */,
 			);
 			dependencies = (
-				D01316661A5D885F00AB1456 /* PBXTargetDependency */,
 			);
-			name = "Tidy Extension (app)";
-			productName = "Balthisar Tidy Extension";
-			productReference = D01C70DD1A558E1C00CC5038 /* Tidy Extension (app).appex */;
-			productType = "com.apple.product-type.app-extension";
+			name = "tidy-balthisar";
+			productName = "lib-tidy";
+			productReference = D0A482AF1BCF9BD000E0646F /* libtidy-balthisar.dylib */;
+			productType = "com.apple.product-type.library.static";
 		};
-		D01C70DF1A5591A500CC5038 /* Tidy Extension (pro) */ = {
+		D0C9C1211BD85FEA004C545A /* TidyBody Extension */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D01C70E61A5591A500CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension (pro)" */;
+			buildConfigurationList = D0C9C12F1BD85FEA004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension" */;
 			buildPhases = (
-				D01C70E01A5591A500CC5038 /* Sources */,
-				D01C70E21A5591A500CC5038 /* Frameworks */,
-				D01C70E41A5591A500CC5038 /* Resources */,
-				D013166B1A5D889500AB1456 /* Add Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D01316681A5D886300AB1456 /* PBXTargetDependency */,
-			);
-			name = "Tidy Extension (pro)";
-			productName = "Balthisar Tidy Extension";
-			productReference = D01C70E91A5591A500CC5038 /* Tidy Extension (pro).appex */;
-			productType = "com.apple.product-type.app-extension";
-		};
-		D04BC9671A5AC5CB009AC43A /* Balthisar Tidy Service Helper */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D04BC9821A5AC5CB009AC43A /* Build configuration list for PBXNativeTarget "Balthisar Tidy Service Helper" */;
-			buildPhases = (
-				D04BC9641A5AC5CB009AC43A /* Sources */,
-				D04BC9651A5AC5CB009AC43A /* Frameworks */,
-				D04BC9661A5AC5CB009AC43A /* Resources */,
-				D04BC9CA1A5BFB0D009AC43A /* Embed Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D04BC9C91A5BFB0D009AC43A /* PBXTargetDependency */,
-			);
-			name = "Balthisar Tidy Service Helper";
-			productName = "Balthisar Tidy Service Helper";
-			productReference = D04BC9681A5AC5CB009AC43A /* Balthisar Tidy Service Helper.app */;
-			productType = "com.apple.product-type.application";
-		};
-		D0913CA118B0AC06005DB2E4 /* Balthisar Tidy (app) */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0913CDB18B0AC06005DB2E4 /* Build configuration list for PBXNativeTarget "Balthisar Tidy (app)" */;
-			buildPhases = (
-				D0913CA218B0AC06005DB2E4 /* Sources */,
-				D0913CC818B0AC06005DB2E4 /* Frameworks */,
-				D0913CCB18B0AC06005DB2E4 /* Resources */,
-				D02DBCED1A5950E7009C84CF /* Add Frameworks */,
-				D01C70CE1A55882900CC5038 /* Embed App Extensions */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D02DBCF21A5951AB009C84CF /* PBXTargetDependency */,
-				D013165C1A5D871500AB1456 /* PBXTargetDependency */,
-				D01C70FA1A55930300CC5038 /* PBXTargetDependency */,
-				D0C9C15E1BD862B3004C545A /* PBXTargetDependency */,
-			);
-			name = "Balthisar Tidy (app)";
-			productName = "Balthisar Tidy";
-			productReference = D0913CDE18B0AC06005DB2E4 /* Balthisar Tidy.app */;
-			productType = "com.apple.product-type.application";
-		};
-		D0A482701BCF9BD000E0646F /* libtidy-balthisar.dylib */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0A482AC1BCF9BD000E0646F /* Build configuration list for PBXNativeTarget "libtidy-balthisar.dylib" */;
-			buildPhases = (
-				D0A482711BCF9BD000E0646F /* Sources */,
-				D0A4828F1BCF9BD000E0646F /* Frameworks */,
-				D0A482901BCF9BD000E0646F /* Headers */,
-			);
-			buildRules = (
-				D0A482AB1BCF9BD000E0646F /* PBXBuildRule */,
-			);
-			dependencies = (
-			);
-			name = "libtidy-balthisar.dylib";
-			productName = "lib-tidy";
-			productReference = D0A482AF1BCF9BD000E0646F /* libtidy-balthisar.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		D0BB67B6193C820A007A3EB0 /* Balthisar Tidy (pro) */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0BB67FC193C820A007A3EB0 /* Build configuration list for PBXNativeTarget "Balthisar Tidy (pro)" */;
-			buildPhases = (
-				D0BB67B7193C820A007A3EB0 /* Sources */,
-				D0BB67E5193C820A007A3EB0 /* Frameworks */,
-				D0BB67E7193C820A007A3EB0 /* Resources */,
-				D02DBCEF1A595118009C84CF /* Add Frameworks */,
-				D01C70CB1A55850D00CC5038 /* Embed App Extensions */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D0F3987E1BFB03BD0050A9B8 /* PBXTargetDependency */,
-				D02DBCF41A5951B1009C84CF /* PBXTargetDependency */,
-				D017A13D1A56D1E5003DDE6C /* PBXTargetDependency */,
-				D0C9C1601BD862BE004C545A /* PBXTargetDependency */,
-			);
-			name = "Balthisar Tidy (pro)";
-			productName = "Balthisar Tidy";
-			productReference = D0BB67FF193C820A007A3EB0 /* Balthisar Tidy for Work.app */;
-			productType = "com.apple.product-type.application";
-		};
-		D0C9C1211BD85FEA004C545A /* TidyBody Extension (web) */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0C9C12F1BD85FEA004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension (web)" */;
-			buildPhases = (
-				D0C9C1241BD85FEA004C545A /* Sources */,
-				D0C9C1261BD85FEA004C545A /* Frameworks */,
-				D0C9C1291BD85FEA004C545A /* Resources */,
-				D0C9C12D1BD85FEA004C545A /* Add Frameworks */,
+				D0C9C1241BD85FEA004C545A /* Sources */,
+				D0C9C1261BD85FEA004C545A /* Frameworks */,
+				D0C9C1291BD85FEA004C545A /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				D0C9C1221BD85FEA004C545A /* PBXTargetDependency */,
 			);
-			name = "TidyBody Extension (web)";
+			name = "TidyBody Extension";
 			productName = "Balthisar Tidy Extension";
-			productReference = D0C9C1321BD85FEA004C545A /* TidyBody Extension (web).appex */;
+			productReference = D0C9C1321BD85FEA004C545A /* TidyBody Extension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
-		D0C9C1341BD85FF4004C545A /* TidyBody Extension (app) */ = {
+		D0F398691BFB03790050A9B8 /* Balthisar Tidy Service Helper */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D0C9C1421BD85FF4004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension (app)" */;
-			buildPhases = (
-				D0C9C1371BD85FF4004C545A /* Sources */,
-				D0C9C1391BD85FF4004C545A /* Frameworks */,
-				D0C9C13C1BD85FF4004C545A /* Resources */,
-				D0C9C1401BD85FF4004C545A /* Add Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D0C9C1351BD85FF4004C545A /* PBXTargetDependency */,
-			);
-			name = "TidyBody Extension (app)";
-			productName = "Balthisar Tidy Extension";
-			productReference = D0C9C1451BD85FF4004C545A /* TidyBody Extension (app).appex */;
-			productType = "com.apple.product-type.app-extension";
-		};
-		D0C9C1471BD85FFB004C545A /* TidyBody Extension (pro) */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0C9C1551BD85FFB004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension (pro)" */;
-			buildPhases = (
-				D0C9C14A1BD85FFB004C545A /* Sources */,
-				D0C9C14C1BD85FFB004C545A /* Frameworks */,
-				D0C9C14F1BD85FFB004C545A /* Resources */,
-				D0C9C1531BD85FFB004C545A /* Add Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				D0C9C1481BD85FFB004C545A /* PBXTargetDependency */,
-			);
-			name = "TidyBody Extension (pro)";
-			productName = "Balthisar Tidy Extension";
-			productReference = D0C9C1581BD85FFB004C545A /* TidyBody Extension (pro).appex */;
-			productType = "com.apple.product-type.app-extension";
-		};
-		D0F398691BFB03790050A9B8 /* Balthisar Tidy Service Helper (pro) */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D0F398781BFB03790050A9B8 /* Build configuration list for PBXNativeTarget "Balthisar Tidy Service Helper (pro)" */;
+			buildConfigurationList = D0F398781BFB03790050A9B8 /* Build configuration list for PBXNativeTarget "Balthisar Tidy Service Helper" */;
 			buildPhases = (
 				D0F3986C1BFB03790050A9B8 /* Sources */,
 				D0F398701BFB03790050A9B8 /* Frameworks */,
 				D0F398721BFB03790050A9B8 /* Resources */,
-				D0F398761BFB03790050A9B8 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				D0F3986A1BFB03790050A9B8 /* PBXTargetDependency */,
 			);
-			name = "Balthisar Tidy Service Helper (pro)";
+			name = "Balthisar Tidy Service Helper";
 			productName = "Balthisar Tidy Service Helper";
 			productReference = D0F3987B1BFB03790050A9B8 /* Balthisar Tidy Service Helper.app */;
 			productType = "com.apple.product-type.application";
@@ -2195,7 +1520,7 @@
 		D016A91E182FD80700712C60 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "Jim Derry";
 				TargetAttributes = {
 					D00661071A579BE700F73F85 = {
@@ -2225,60 +1550,9 @@
 							};
 						};
 					};
-					D01C70D31A558E1C00CC5038 = {
-						DevelopmentTeam = 9PN2JXXG7Y;
-						SystemCapabilities = {
-							com.apple.ApplicationGroups.Mac = {
-								enabled = 1;
-							};
-							com.apple.Sandbox = {
-								enabled = 1;
-							};
-						};
-					};
-					D01C70DF1A5591A500CC5038 = {
-						DevelopmentTeam = 9PN2JXXG7Y;
-						SystemCapabilities = {
-							com.apple.ApplicationGroups.Mac = {
-								enabled = 1;
-							};
-						};
-					};
-					D04BC9671A5AC5CB009AC43A = {
-						CreatedOnToolsVersion = 6.1.1;
-						DevelopmentTeam = 9PN2JXXG7Y;
-					};
-					D0913CA118B0AC06005DB2E4 = {
-						DevelopmentTeam = 9PN2JXXG7Y;
-						SystemCapabilities = {
-							com.apple.ApplicationGroups.Mac = {
-								enabled = 1;
-							};
-							com.apple.Sandbox = {
-								enabled = 1;
-							};
-						};
-					};
-					D0BB67B6193C820A007A3EB0 = {
-						DevelopmentTeam = 9PN2JXXG7Y;
-						SystemCapabilities = {
-							com.apple.ApplicationGroups.Mac = {
-								enabled = 1;
-							};
-							com.apple.Sandbox = {
-								enabled = 1;
-							};
-						};
-					};
 					D0C9C1211BD85FEA004C545A = {
 						DevelopmentTeam = 9PN2JXXG7Y;
 					};
-					D0C9C1341BD85FF4004C545A = {
-						DevelopmentTeam = 9PN2JXXG7Y;
-					};
-					D0C9C1471BD85FFB004C545A = {
-						DevelopmentTeam = 9PN2JXXG7Y;
-					};
 					D0F398691BFB03790050A9B8 = {
 						DevelopmentTeam = 9PN2JXXG7Y;
 					};
@@ -2300,20 +1574,14 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				D016A925182FD80700712C60 /* Balthisar Tidy (web) */,
-				D0913CA118B0AC06005DB2E4 /* Balthisar Tidy (app) */,
-				D0BB67B6193C820A007A3EB0 /* Balthisar Tidy (pro) */,
-				D01C70B91A55850D00CC5038 /* Tidy Extension (web) */,
-				D01C70D31A558E1C00CC5038 /* Tidy Extension (app) */,
-				D01C70DF1A5591A500CC5038 /* Tidy Extension (pro) */,
-				D0C9C1211BD85FEA004C545A /* TidyBody Extension (web) */,
-				D0C9C1341BD85FF4004C545A /* TidyBody Extension (app) */,
-				D0C9C1471BD85FFB004C545A /* TidyBody Extension (pro) */,
-				D04BC9671A5AC5CB009AC43A /* Balthisar Tidy Service Helper */,
-				D0F398691BFB03790050A9B8 /* Balthisar Tidy Service Helper (pro) */,
+				D016A925182FD80700712C60 /* Balthisar Tidy */,
+				D01C70B91A55850D00CC5038 /* Tidy Extension */,
+				D0C9C1211BD85FEA004C545A /* TidyBody Extension */,
+				D0F398691BFB03790050A9B8 /* Balthisar Tidy Service Helper */,
 				D00661071A579BE700F73F85 /* JSDTidyFramework */,
-				D0A482701BCF9BD000E0646F /* libtidy-balthisar.dylib */,
+				D0A482701BCF9BD000E0646F /* tidy-balthisar */,
 				D0F4A50A1BDA2C520051327D /* JSDTidyFramework Documentation */,
+				D036D5F51FB36E2000916128 /* Balthisar Tidy Help Project */,
 			);
 		};
 /* End PBXProject section */
@@ -2339,71 +1607,78 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D0C9C1681BD8CB55004C545A /* balthisar_tidy-id_dsa.pub in Resources */,
+				D036D6401FB3865D00916128 /* AppleScriptsforTidy.dmg in Resources */,
+				D036D6601FB399DC00916128 /* Balthisar Tidy (app).help in Resources */,
+				D036D6631FB399E000916128 /* Balthisar Tidy (pro).help in Resources */,
+				D036D65D1FB399D700916128 /* Balthisar Tidy (web).help in Resources */,
+				D036D63F1FB3864F00916128 /* TidyScripting.sdef in Resources */,
+				D058A2B91FB60A9600567353 /* JSDListEditorController.xib in Resources */,
 				D025BD5E195856B6006D7356 /* Acknowledgments.rtf in Resources */,
 				D036E20D18F3D2F20009A9D4 /* Application.icns in Resources */,
-				D04E8FB5195D964F00D1CEDC /* Balthisar Tidy (web).help in Resources */,
-				D036E1E818F3D25E0009A9D4 /* Credits.rtf in Resources */,
-				D0B9F0F119585010008864D6 /* DCOAboutWindow.xib in Resources */,
+				D036D63D1FB3861F00916128 /* Credits (app).rtf in Resources */,
+				D036E1E818F3D25E0009A9D4 /* Credits (web).rtf in Resources */,
+				D036D63E1FB3862300916128 /* Credits (pro).rtf in Resources */,
+				D036D6571FB3997300916128 /* DCOAboutWindow.xib in Resources */,
 				D03B89D419553E5D00E9B4D5 /* DiffsTemplate.png in Resources */,
 				D03B89DA1955474700E9B4D5 /* DiffViewTemplate.png in Resources */,
-				D06C9A64195FB9D0004D6C27 /* DocumentAppearanceViewController.xib in Resources */,
-				D0CDB25E1BF3394300735EE4 /* InvisiblesTemplate.png in Resources */,
-				D06046071BF0BFC000D69673 /* FragariaEditorViewController.xib in Resources */,
+				D036D64B1FB3992B00916128 /* DocumentAppearanceViewController.xib in Resources */,
+				D0CDB2561BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */,
 				D036E1EA18F3D25E0009A9D4 /* FirstRunController.xib in Resources */,
+				D06046141BF0DDCA00D69673 /* FragariaColorsViewController.xib in Resources */,
+				D06046071BF0BFC000D69673 /* FragariaEditorViewController.xib in Resources */,
+				D0CDB24F1BF3304B00735EE4 /* GutterTemplate.png in Resources */,
 				D0E6AE18190C9FAC00B49779 /* HideDescriptionTemplate.pdf in Resources */,
+				D0CDB25B1BF3394300735EE4 /* HighlightingTemplate.png in Resources */,
 				D036E20F18F3D2F20009A9D4 /* HTML.icns in Resources */,
 				D036E1EC18F3D25E0009A9D4 /* InfoPlist.strings in Resources */,
+				D0CDB25E1BF3394300735EE4 /* InvisiblesTemplate.png in Resources */,
 				D0CA8F6E1953280700BBD54C /* LayoutBottomPaneTemplate.png in Resources */,
-				D0ED0CCA1CFEC35300FC408D /* TDFPreviewController.xib in Resources */,
 				D0CA8F711953280700BBD54C /* LayoutLeftPaneTemplate.png in Resources */,
-				D0E9052F1CFDB29700E85FEB /* messages-browser-light.pdf in Resources */,
-				D0C9C1681BD8CB55004C545A /* balthisar_tidy-id_dsa.pub in Resources */,
-				D0CDB2411BF1979C00735EE4 /* prefsEditor.png in Resources */,
 				D0CA8F741953280700BBD54C /* LayoutSourceHTemplate.png in Resources */,
-				D0CDB2561BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */,
 				D0CA8F771953280700BBD54C /* LayoutSourceVTemplate.png in Resources */,
 				D036E1EE18F3D25E0009A9D4 /* Localizable.strings in Resources */,
 				D036E1F018F3D25E0009A9D4 /* MainMenu.xib in Resources */,
-				D0CDB24F1BF3304B00735EE4 /* GutterTemplate.png in Resources */,
-				D06C9A43195FB4A4004D6C27 /* MASPreferencesWindow.xib in Resources */,
-				D06C9A76195FBA0F004D6C27 /* MiscOptionsViewController.xib in Resources */,
-				D06C9A5B195FB997004D6C27 /* OptionListAppearanceViewController.xib in Resources */,
-				D06C9A52195FB955004D6C27 /* OptionListViewController.xib in Resources */,
+				D036D65A1FB3997A00916128 /* MASPreferencesWindow.xib in Resources */,
+				D0E9052F1CFDB29700E85FEB /* messages-browser-light.pdf in Resources */,
+				D0E0EBA41CFD3B3700B1CF4E /* messages-browser.pdf in Resources */,
+				D0E905321CFDB29700E85FEB /* messages-messages-light.pdf in Resources */,
+				D0E0EBA71CFD3B3700B1CF4E /* messages-messages.pdf in Resources */,
+				D036D6511FB3993300916128 /* MiscOptionsViewController.xib in Resources */,
+				D036D6481FB3992500916128 /* OptionListAppearanceViewController.xib in Resources */,
+				D036D6451FB3991E00916128 /* OptionListViewController.xib in Resources */,
 				D036E1F218F3D25E0009A9D4 /* OptionPane.xib in Resources */,
 				D0E6AE20190CB34500B49779 /* PaneBottomShadow.tiff in Resources */,
 				D06C9AB119600550004D6C27 /* PaneTopShadow.png in Resources */,
 				D036E21118F3D2F20009A9D4 /* PHP.icns in Resources */,
-				D0CDB2421BF1979C00735EE4 /* prefsEditor@2x.png in Resources */,
+				D0CDB2391BF191B900735EE4 /* prefsColor.png in Resources */,
+				D0CDB23A1BF191B900735EE4 /* prefsColor@2x.png in Resources */,
 				D06C9AA6195FEC11004D6C27 /* prefsDoc.png in Resources */,
 				D06C9AA9195FEC11004D6C27 /* prefsDoc@2x.png in Resources */,
+				D0CDB2411BF1979C00735EE4 /* prefsEditor.png in Resources */,
+				D0CDB2421BF1979C00735EE4 /* prefsEditor@2x.png in Resources */,
 				D06C9A8C195FE854004D6C27 /* prefsSave.png in Resources */,
 				D06C9A8F195FE854004D6C27 /* prefsSave@2x.png in Resources */,
 				D06C9A92195FE854004D6C27 /* prefsTidy.png in Resources */,
 				D06C9A95195FE854004D6C27 /* prefsTidy@2x.png in Resources */,
 				D06C9A98195FE854004D6C27 /* prefsTidyAppearance.png in Resources */,
-				D0CDB2391BF191B900735EE4 /* prefsColor.png in Resources */,
-				D0E0EBA41CFD3B3700B1CF4E /* messages-browser.pdf in Resources */,
 				D06C9A9B195FE854004D6C27 /* prefsTidyAppearance@2x.png in Resources */,
-				D0E0EBA71CFD3B3700B1CF4E /* messages-messages.pdf in Resources */,
 				D06C9A9E195FE854004D6C27 /* prefsUpdate.png in Resources */,
 				D06C9AA1195FE854004D6C27 /* prefsUpdate@2x.png in Resources */,
-				D06C9A6D195FB9F2004D6C27 /* SavingOptionsViewController.xib in Resources */,
+				D036D64E1FB3992F00916128 /* SavingOptionsViewController.xib in Resources */,
 				D03B89D81955457500E9B4D5 /* ScrollLockTemplate.png in Resources */,
-				D04C275D1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */,
 				D0E6AE1A190C9FAC00B49779 /* ShowDescriptionTemplate.pdf in Resources */,
-				D036E21318F3D2F20009A9D4 /* Tidy.icns in Resources */,
-				D0E905321CFDB29700E85FEB /* messages-messages-light.pdf in Resources */,
-				D06046141BF0DDCA00D69673 /* FragariaColorsViewController.xib in Resources */,
+				D0ED0CCA1CFEC35300FC408D /* TDFPreviewController.xib in Resources */,
 				D074B7AA1944035800F2E6F1 /* TDFTableViewController.xib in Resources */,
-				D0CDB23A1BF191B900735EE4 /* prefsColor@2x.png in Resources */,
+				D0E483481CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */,
+				D036E21318F3D2F20009A9D4 /* Tidy.icns in Resources */,
+				D04C275D1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */,
 				D08689371948439700BDAD72 /* TidyDocumentSourceViewController.xib in Resources */,
-				D0CDB25B1BF3394300735EE4 /* HighlightingTemplate.png in Resources */,
 				D036E1F618F3D25E0009A9D4 /* TidyDocumentWindow.xib in Resources */,
 				D074B78B1942BEE200F2E6F1 /* TidyEncodingHelperController.xib in Resources */,
 				D0A2E1F8197548D20015F667 /* ToolbarAdvanced.tiff in Resources */,
 				D0A2E1FB197548D20015F667 /* ToolbarInfo.tiff in Resources */,
-				D0E483481CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */,
-				D06C9A7F195FBA3F004D6C27 /* UpdaterOptionsViewController.xib in Resources */,
+				D036D6541FB3993700916128 /* UpdaterOptionsViewController.xib in Resources */,
 				D036E21518F3D2F20009A9D4 /* XML.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2418,182 +1693,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D01C70D81A558E1C00CC5038 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D01C70D91A558E1C00CC5038 /* icon.icns in Resources */,
-				D0BF29E21A7347580062B01A /* ActionRequestHandler.xib in Resources */,
-				D04BC9C41A5BF974009AC43A /* Localizable.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D01C70E41A5591A500CC5038 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D01C70E51A5591A500CC5038 /* icon.icns in Resources */,
-				D0BF29E31A7347580062B01A /* ActionRequestHandler.xib in Resources */,
-				D04BC9C51A5BF974009AC43A /* Localizable.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D04BC9661A5AC5CB009AC43A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D04BC9B91A5ACB7D009AC43A /* HelperMainMenu.xib in Resources */,
-				D04BC9CE1A5C2A22009AC43A /* Localizable.strings in Resources */,
-				D034D8131A621E5300821FE5 /* helper-icon.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0913CCB18B0AC06005DB2E4 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0E905301CFDB29700E85FEB /* messages-browser-light.pdf in Resources */,
-				D025BD5F195856C0006D7356 /* Acknowledgments.rtf in Resources */,
-				D036E20E18F3D2F20009A9D4 /* Application.icns in Resources */,
-				D04E8FB0195D964F00D1CEDC /* Balthisar Tidy (app).help in Resources */,
-				D0B9F0F219585010008864D6 /* DCOAboutWindow.xib in Resources */,
-				D0E0EBA51CFD3B3700B1CF4E /* messages-browser.pdf in Resources */,
-				D04E8FB9195DAA9400D1CEDC /* DiffsTemplate.png in Resources */,
-				D0CDB2571BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */,
-				D04E8FB8195DAA9400D1CEDC /* DiffViewTemplate.png in Resources */,
-				D0CDB25C1BF3394300735EE4 /* HighlightingTemplate.png in Resources */,
-				D06C9A65195FB9D0004D6C27 /* DocumentAppearanceViewController.xib in Resources */,
-				D036E1EB18F3D25E0009A9D4 /* FirstRunController.xib in Resources */,
-				D0E6AE19190C9FAC00B49779 /* HideDescriptionTemplate.pdf in Resources */,
-				D0CDB25F1BF3394300735EE4 /* InvisiblesTemplate.png in Resources */,
-				D036E21018F3D2F20009A9D4 /* HTML.icns in Resources */,
-				D036E1ED18F3D25E0009A9D4 /* InfoPlist.strings in Resources */,
-				D0CA8F6F1953280700BBD54C /* LayoutBottomPaneTemplate.png in Resources */,
-				D0CA8F721953280700BBD54C /* LayoutLeftPaneTemplate.png in Resources */,
-				D0CA8F751953280700BBD54C /* LayoutSourceHTemplate.png in Resources */,
-				D04C275E1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */,
-				D0CA8F781953280700BBD54C /* LayoutSourceVTemplate.png in Resources */,
-				D036E1EF18F3D25E0009A9D4 /* Localizable.strings in Resources */,
-				D036E1F118F3D25E0009A9D4 /* MainMenu.xib in Resources */,
-				D06C9A44195FB4A4004D6C27 /* MASPreferencesWindow.xib in Resources */,
-				D06C9A77195FBA0F004D6C27 /* MiscOptionsViewController.xib in Resources */,
-				D06C9A5C195FB997004D6C27 /* OptionListAppearanceViewController.xib in Resources */,
-				D0CDB2501BF3304B00735EE4 /* GutterTemplate.png in Resources */,
-				D0CDB23B1BF191C500735EE4 /* prefsColor.png in Resources */,
-				D0CDB2441BF197A300735EE4 /* prefsEditor@2x.png in Resources */,
-				D06C9A53195FB955004D6C27 /* OptionListViewController.xib in Resources */,
-				D036E1F318F3D25E0009A9D4 /* OptionPane.xib in Resources */,
-				D0E6AE21190CB34500B49779 /* PaneBottomShadow.tiff in Resources */,
-				D0E483491CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */,
-				D06C9AB219600550004D6C27 /* PaneTopShadow.png in Resources */,
-				D036E21218F3D2F20009A9D4 /* PHP.icns in Resources */,
-				D06C9AA7195FEC11004D6C27 /* prefsDoc.png in Resources */,
-				D06C9AAA195FEC11004D6C27 /* prefsDoc@2x.png in Resources */,
-				D0E905331CFDB29700E85FEB /* messages-messages-light.pdf in Resources */,
-				D0CDB23D1BF191CB00735EE4 /* prefsColor@2x.png in Resources */,
-				D06C9A8D195FE854004D6C27 /* prefsSave.png in Resources */,
-				D06C9A90195FE854004D6C27 /* prefsSave@2x.png in Resources */,
-				D06C9A93195FE854004D6C27 /* prefsTidy.png in Resources */,
-				D06C9A96195FE854004D6C27 /* prefsTidy@2x.png in Resources */,
-				D06C9A99195FE854004D6C27 /* prefsTidyAppearance.png in Resources */,
-				D06C9A9C195FE854004D6C27 /* prefsTidyAppearance@2x.png in Resources */,
-				D06C9A9F195FE854004D6C27 /* prefsUpdate.png in Resources */,
-				D06C9AA2195FE854004D6C27 /* prefsUpdate@2x.png in Resources */,
-				D06C9A6E195FB9F2004D6C27 /* SavingOptionsViewController.xib in Resources */,
-				D0E0EBA81CFD3B3700B1CF4E /* messages-messages.pdf in Resources */,
-				D04E8FBA195DAA9400D1CEDC /* ScrollLockTemplate.png in Resources */,
-				D0CDB2431BF197A300735EE4 /* prefsEditor.png in Resources */,
-				D0E6AE1B190C9FAC00B49779 /* ShowDescriptionTemplate.pdf in Resources */,
-				D036E21418F3D2F20009A9D4 /* Tidy.icns in Resources */,
-				D0ED0CCB1CFEC35300FC408D /* TDFPreviewController.xib in Resources */,
-				D074B7AB1944035800F2E6F1 /* TDFTableViewController.xib in Resources */,
-				D06046151BF0DDCB00D69673 /* FragariaColorsViewController.xib in Resources */,
-				D06046081BF0BFC100D69673 /* FragariaEditorViewController.xib in Resources */,
-				D08689381948439700BDAD72 /* TidyDocumentSourceViewController.xib in Resources */,
-				D036E1F718F3D25E0009A9D4 /* TidyDocumentWindow.xib in Resources */,
-				D074B78C1942BEE200F2E6F1 /* TidyEncodingHelperController.xib in Resources */,
-				D0A2E1F9197548D20015F667 /* ToolbarAdvanced.tiff in Resources */,
-				D0A2E1FC197548D20015F667 /* ToolbarInfo.tiff in Resources */,
-				D05F71D51BEA2DE300F584C4 /* Credits (app).rtf in Resources */,
-				D06C9A80195FBA3F004D6C27 /* UpdaterOptionsViewController.xib in Resources */,
-				D036E21618F3D2F20009A9D4 /* XML.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0BB67E7193C820A007A3EB0 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D025BD60195856C1006D7356 /* Acknowledgments.rtf in Resources */,
-				D0BB67F3193C820A007A3EB0 /* Application.icns in Resources */,
-				D0A143CC1BFCC2580006C533 /* AppleScriptsforTidy.dmg in Resources */,
-				D0097B0B19712F68001CCF94 /* Balthisar Tidy (pro).help in Resources */,
-				D0E4834A1CFD36FB003DC4A7 /* TDFWebViewController.xib in Resources */,
-				D0B9F0F319585010008864D6 /* DCOAboutWindow.xib in Resources */,
-				D04E8FBC195DAA9500D1CEDC /* DiffsTemplate.png in Resources */,
-				D04E8FBB195DAA9500D1CEDC /* DiffViewTemplate.png in Resources */,
-				D0CDB2461BF197A300735EE4 /* prefsEditor@2x.png in Resources */,
-				D06C9A66195FB9D0004D6C27 /* DocumentAppearanceViewController.xib in Resources */,
-				D0BB67EB193C820A007A3EB0 /* FirstRunController.xib in Resources */,
-				D0CDB2601BF3394300735EE4 /* InvisiblesTemplate.png in Resources */,
-				D06046091BF0BFC200D69673 /* FragariaEditorViewController.xib in Resources */,
-				D01AACB8193DE56000C4E5B2 /* HideDescriptionTemplate.pdf in Resources */,
-				D0BB67F8193C820A007A3EB0 /* HTML.icns in Resources */,
-				D0BB67F9193C820A007A3EB0 /* InfoPlist.strings in Resources */,
-				D0CA8F701953280700BBD54C /* LayoutBottomPaneTemplate.png in Resources */,
-				D0CA8F731953280700BBD54C /* LayoutLeftPaneTemplate.png in Resources */,
-				D0CA8F761953280700BBD54C /* LayoutSourceHTemplate.png in Resources */,
-				D0E905341CFDB29700E85FEB /* messages-messages-light.pdf in Resources */,
-				D0CA8F791953280700BBD54C /* LayoutSourceVTemplate.png in Resources */,
-				D0CDB2451BF197A300735EE4 /* prefsEditor.png in Resources */,
-				D0BB67ED193C820A007A3EB0 /* Localizable.strings in Resources */,
-				D0CDB2581BF335FE00735EE4 /* ErrorsInlineTemplate.png in Resources */,
-				D0BB67FA193C820A007A3EB0 /* MainMenu.xib in Resources */,
-				D0E0EBA61CFD3B3700B1CF4E /* messages-browser.pdf in Resources */,
-				D06C9A45195FB4A4004D6C27 /* MASPreferencesWindow.xib in Resources */,
-				D0E0EBA91CFD3B3700B1CF4E /* messages-messages.pdf in Resources */,
-				D06C9A78195FBA0F004D6C27 /* MiscOptionsViewController.xib in Resources */,
-				D0CDB2511BF3304B00735EE4 /* GutterTemplate.png in Resources */,
-				D06C9A5D195FB997004D6C27 /* OptionListAppearanceViewController.xib in Resources */,
-				D06C9A54195FB955004D6C27 /* OptionListViewController.xib in Resources */,
-				D0BB67F4193C820A007A3EB0 /* OptionPane.xib in Resources */,
-				D01AACBA193DE58200C4E5B2 /* PaneBottomShadow.tiff in Resources */,
-				D06C9AB319600550004D6C27 /* PaneTopShadow.png in Resources */,
-				D0BB67EF193C820A007A3EB0 /* PHP.icns in Resources */,
-				D06C9AA8195FEC11004D6C27 /* prefsDoc.png in Resources */,
-				D06C9AAB195FEC11004D6C27 /* prefsDoc@2x.png in Resources */,
-				D04C275F1C017FCC0074DF78 /* TidyDocumentFeedbackViewController.xib in Resources */,
-				D06C9A8E195FE854004D6C27 /* prefsSave.png in Resources */,
-				D06C9A91195FE854004D6C27 /* prefsSave@2x.png in Resources */,
-				D06C9A94195FE854004D6C27 /* prefsTidy.png in Resources */,
-				D06C9A97195FE854004D6C27 /* prefsTidy@2x.png in Resources */,
-				D06C9A9A195FE854004D6C27 /* prefsTidyAppearance.png in Resources */,
-				D06C9A9D195FE854004D6C27 /* prefsTidyAppearance@2x.png in Resources */,
-				D0E905311CFDB29700E85FEB /* messages-browser-light.pdf in Resources */,
-				D06C9AA0195FE854004D6C27 /* prefsUpdate.png in Resources */,
-				D0CDB23C1BF191C600735EE4 /* prefsColor.png in Resources */,
-				D06C9AA3195FE854004D6C27 /* prefsUpdate@2x.png in Resources */,
-				D06C9A6F195FB9F2004D6C27 /* SavingOptionsViewController.xib in Resources */,
-				D04E8FBD195DAA9500D1CEDC /* ScrollLockTemplate.png in Resources */,
-				D05F71D81BEA2DE300F584C4 /* Credits (pro).rtf in Resources */,
-				D01AACB9193DE56000C4E5B2 /* ShowDescriptionTemplate.pdf in Resources */,
-				D0BB67F7193C820A007A3EB0 /* Tidy.icns in Resources */,
-				D074B7AC1944035800F2E6F1 /* TDFTableViewController.xib in Resources */,
-				D06046161BF0DDCC00D69673 /* FragariaColorsViewController.xib in Resources */,
-				D08689391948439700BDAD72 /* TidyDocumentSourceViewController.xib in Resources */,
-				D0CDB23E1BF191CC00735EE4 /* prefsColor@2x.png in Resources */,
-				D0BB67F6193C820A007A3EB0 /* TidyDocumentWindow.xib in Resources */,
-				D0CDB25D1BF3394300735EE4 /* HighlightingTemplate.png in Resources */,
-				D074B78D1942BEE200F2E6F1 /* TidyEncodingHelperController.xib in Resources */,
-				D01BA7BD1967DD3700843C69 /* TidyScripting.sdef in Resources */,
-				D0A2E1FA197548D20015F667 /* ToolbarAdvanced.tiff in Resources */,
-				D0A2E1FD197548D20015F667 /* ToolbarInfo.tiff in Resources */,
-				D06C9A81195FBA3F004D6C27 /* UpdaterOptionsViewController.xib in Resources */,
-				D0ED0CCC1CFEC35300FC408D /* TDFPreviewController.xib in Resources */,
-				D0BB67F0193C820A007A3EB0 /* XML.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0C9C1291BD85FEA004C545A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2604,26 +1703,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D0C9C13C1BD85FF4004C545A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0C9C13D1BD85FF4004C545A /* icon.icns in Resources */,
-				D0C9C13E1BD85FF4004C545A /* ActionRequestHandler.xib in Resources */,
-				D0C9C13F1BD85FF4004C545A /* Localizable.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0C9C14F1BD85FFB004C545A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0C9C1501BD85FFB004C545A /* icon.icns in Resources */,
-				D0C9C1511BD85FFB004C545A /* ActionRequestHandler.xib in Resources */,
-				D0C9C1521BD85FFB004C545A /* Localizable.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0F398721BFB03790050A9B8 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2638,6 +1717,19 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		D036D5F61FB36E2000916128 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$PROJECT_DIR/Balthisar Tidy Help Project/build_help.sh\"\n";
+		};
 		D0F4A50E1BDA2C970051327D /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -2659,11 +1751,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				D0F4A5051BDA0ADC0051327D /* JSDStringEncodingTools.m in Sources */,
-				D0979D8B1BE9E488002ACD04 /* SWFSemanticVersion.m in Sources */,
+				D0CDB24C1BF1DE1C00735EE4 /* JSDTidyMessage.m in Sources */,
 				D00661351A579DF300F73F85 /* JSDTidyModel.m in Sources */,
 				D06045FC1BF07DF000D69673 /* JSDTidyModel+Developer.m in Sources */,
 				D00661391A579DF300F73F85 /* JSDTidyOption.m in Sources */,
-				D0CDB24C1BF1DE1C00735EE4 /* JSDTidyMessage.m in Sources */,
+				D0979D8B1BE9E488002ACD04 /* SWFSemanticVersion.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2671,41 +1763,43 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D060460E1BF0DAAB00D69673 /* FragariaBaseViewController.m in Sources */,
-				D06C9A58195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */,
-				D074B7A11942CF0300F2E6F1 /* TidyDocument.m in Sources */,
-				D0B9F0FC19585060008864D6 /* DCOTransparentScroller.m in Sources */,
-				D06C9A61195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */,
-				D0868930194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */,
-				D047C72F1915FBF100B70A94 /* JSDTableCellView.m in Sources */,
-				D081CBDB1917C1510041B2C5 /* JSDIntegerValueTransformer.m in Sources */,
-				D0D9ED3918E66810008A55D5 /* JSDTextField.m in Sources */,
-				D074B7A41942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */,
-				D0D9ED2F18E66810008A55D5 /* PreferenceController.m in Sources */,
-				D0D9ED2D18E66810008A55D5 /* OptionPaneController.m in Sources */,
-				D074B7B41947D93800F2E6F1 /* TDFTableViewController.m in Sources */,
-				D0B9F0FF19585060008864D6 /* DCOTransparentScrollView.m in Sources */,
-				D016A936182FD80700712C60 /* main.m in Sources */,
-				D06046011BF0BDB400D69673 /* FragariaEditorViewController.m in Sources */,
-				D06C9A4F195FB955004D6C27 /* OptionListViewController.m in Sources */,
 				D0D9ED2B18E66810008A55D5 /* AppController.m in Sources */,
 				D0B9F0F419585010008864D6 /* DCOAboutWindowController.m in Sources */,
-				D06C9A46195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */,
-				D04753B71938A19D00BB7163 /* JSDBoolToStringValueTransformer.m in Sources */,
-				D06C9A6A195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */,
-				D06C9A73195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */,
+				D0B9F0FC19585060008864D6 /* DCOTransparentScroller.m in Sources */,
+				D0B9F0FF19585060008864D6 /* DCOTransparentScrollView.m in Sources */,
+				D01816721FB7430D000B9F77 /* JSDListEditorController.m in Sources */,
+				D06C9A61195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */,
+				D074B79B1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */,
 				D074B79E1942CF0300F2E6F1 /* FirstRunController.m in Sources */,
-				D0E904DE1CF996C300E85FEB /* TDFWebViewController.m in Sources */,
-				D06C9A7C195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */,
-				D0DCEFB21A5FC40100E8A2AE /* TidyDocumentService.m in Sources */,
+				D060460E1BF0DAAB00D69673 /* FragariaBaseViewController.m in Sources */,
 				D060461B1BF0DDF000D69673 /* FragariaColorsViewController.m in Sources */,
-				D074B79B1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */,
+				D06046011BF0BDB400D69673 /* FragariaEditorViewController.m in Sources */,
 				D008F0191930D9D700559F3B /* JSDAllCapsValueTransformer.m in Sources */,
+				D04753B71938A19D00BB7163 /* JSDBoolToStringValueTransformer.m in Sources */,
+				D081CBDB1917C1510041B2C5 /* JSDIntegerValueTransformer.m in Sources */,
+				D047C72F1915FBF100B70A94 /* JSDTableCellView.m in Sources */,
 				D0D9F1A318E6BF8D008A55D5 /* JSDTableView.m in Sources */,
+				D0D9ED3918E66810008A55D5 /* JSDTextField.m in Sources */,
 				D0ED0CD91D0029D300FC408D /* JSDTextFieldCell.m in Sources */,
+				D01816751FB8A897000B9F77 /* RSRTVArrayController.m in Sources */,
+				D016A936182FD80700712C60 /* main.m in Sources */,
+				D06C9A46195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */,
+				D06C9A73195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */,
+				D04D5F991902459500F77901 /* NSApplication+TidyApplication.m in Sources */,
+				D06C9A58195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */,
+				D06C9A4F195FB955004D6C27 /* OptionListViewController.m in Sources */,
+				D0D9ED2D18E66810008A55D5 /* OptionPaneController.m in Sources */,
+				D0D9ED2F18E66810008A55D5 /* PreferenceController.m in Sources */,
+				D06C9A6A195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */,
 				D0ED0CC51CFEC2EE00FC408D /* TDFPreviewController.m in Sources */,
+				D074B7B41947D93800F2E6F1 /* TDFTableViewController.m in Sources */,
+				D0E904DE1CF996C300E85FEB /* TDFWebViewController.m in Sources */,
+				D074B7A11942CF0300F2E6F1 /* TidyDocument.m in Sources */,
 				D04C27551C017F170074DF78 /* TidyDocumentFeedbackViewController.m in Sources */,
-				D04D5F991902459500F77901 /* NSApplication+TidyApplication.m in Sources */,
+				D0DCEFB21A5FC40100E8A2AE /* TidyDocumentService.m in Sources */,
+				D0868930194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */,
+				D074B7A41942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */,
+				D06C9A7C195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2717,149 +1811,36 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D01C70D41A558E1C00CC5038 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D01C70D51A558E1C00CC5038 /* ActionRequestHandler.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D01C70E01A5591A500CC5038 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D01C70E11A5591A500CC5038 /* ActionRequestHandler.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D04BC9641A5AC5CB009AC43A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D04BC9701A5AC5CB009AC43A /* main.m in Sources */,
-				D04BC96E1A5AC5CB009AC43A /* AppDelegate.m in Sources */,
-				D04BC9901A5AC7A2009AC43A /* TidyService.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0913CA218B0AC06005DB2E4 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D060460F1BF0DAAC00D69673 /* FragariaBaseViewController.m in Sources */,
-				D06C9A59195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */,
-				D074B7A21942CF0300F2E6F1 /* TidyDocument.m in Sources */,
-				D0B9F0FD19585060008864D6 /* DCOTransparentScroller.m in Sources */,
-				D06C9A62195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */,
-				D0868931194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */,
-				D047C7301915FBF100B70A94 /* JSDTableCellView.m in Sources */,
-				D081CBDC1917C1510041B2C5 /* JSDIntegerValueTransformer.m in Sources */,
-				D0D9ED3A18E66810008A55D5 /* JSDTextField.m in Sources */,
-				D074B7A51942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */,
-				D0D9ED3018E66810008A55D5 /* PreferenceController.m in Sources */,
-				D0D9ED2E18E66810008A55D5 /* OptionPaneController.m in Sources */,
-				D074B7B51947D93800F2E6F1 /* TDFTableViewController.m in Sources */,
-				D0913CAF18B0AC06005DB2E4 /* main.m in Sources */,
-				D0B9F10019585060008864D6 /* DCOTransparentScrollView.m in Sources */,
-				D06046021BF0BDB500D69673 /* FragariaEditorViewController.m in Sources */,
-				D0D9ED2C18E66810008A55D5 /* AppController.m in Sources */,
-				D06C9A50195FB955004D6C27 /* OptionListViewController.m in Sources */,
-				D0B9F0F519585010008864D6 /* DCOAboutWindowController.m in Sources */,
-				D06C9A47195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */,
-				D04753B81938A19D00BB7163 /* JSDBoolToStringValueTransformer.m in Sources */,
-				D06C9A6B195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */,
-				D06C9A74195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */,
-				D074B79F1942CF0300F2E6F1 /* FirstRunController.m in Sources */,
-				D0E904DF1CF996C300E85FEB /* TDFWebViewController.m in Sources */,
-				D06C9A7D195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */,
-				D0DCEFB31A5FC40100E8A2AE /* TidyDocumentService.m in Sources */,
-				D060461C1BF0DDF100D69673 /* FragariaColorsViewController.m in Sources */,
-				D074B79C1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */,
-				D008F01A1930D9D700559F3B /* JSDAllCapsValueTransformer.m in Sources */,
-				D0D9F1A418E6BF8D008A55D5 /* JSDTableView.m in Sources */,
-				D0ED0CDA1D0029D300FC408D /* JSDTextFieldCell.m in Sources */,
-				D0ED0CC61CFEC2EE00FC408D /* TDFPreviewController.m in Sources */,
-				D04C27561C017F170074DF78 /* TidyDocumentFeedbackViewController.m in Sources */,
-				D04D5F9A1902459500F77901 /* NSApplication+TidyApplication.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0A482711BCF9BD000E0646F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				D0A482721BCF9BD000E0646F /* version.txt in Sources */,
-				D00AC8251E7F28890059D5AB /* attrapi.c in Sources */,
-				D00AC8241E7F287B0059D5AB /* messageobj.c in Sources */,
-				D0A482731BCF9BD000E0646F /* istack.c in Sources */,
-				D0A482741BCF9BD000E0646F /* tagask.c in Sources */,
-				D0A482751BCF9BD000E0646F /* gdoc.c in Sources */,
-				D0A482761BCF9BD000E0646F /* charsets.c in Sources */,
-				D0A482771BCF9BD000E0646F /* attrs.c in Sources */,
-				D0A482781BCF9BD000E0646F /* mappedio.c in Sources */,
-				D01AE48C1C740EA1008E7199 /* message.c in Sources */,
 				D0A482791BCF9BD000E0646F /* access.c in Sources */,
-				D0A4827A1BCF9BD000E0646F /* tidylib.c in Sources */,
-				D0A4827B1BCF9BD000E0646F /* parser.c in Sources */,
-				D0A4827E1BCF9BD000E0646F /* fileio.c in Sources */,
-				D0A4827F1BCF9BD000E0646F /* win32tc.c in Sources */,
-				D0A482801BCF9BD000E0646F /* lexer.c in Sources */,
+				D0A482891BCF9BD000E0646F /* alloc.c in Sources */,
+				D0A482871BCF9BD000E0646F /* attrdict.c in Sources */,
+				D0A482771BCF9BD000E0646F /* attrs.c in Sources */,
 				D0A482811BCF9BD000E0646F /* buffio.c in Sources */,
-				D0A482821BCF9BD000E0646F /* iconvtc.c in Sources */,
-				D0A482831BCF9BD000E0646F /* tags.c in Sources */,
+				D0A482761BCF9BD000E0646F /* charsets.c in Sources */,
 				D0A482841BCF9BD000E0646F /* clean.c in Sources */,
+				D0A4828B1BCF9BD000E0646F /* config.c in Sources */,
 				D0A482851BCF9BD000E0646F /* entities.c in Sources */,
+				D0A4827E1BCF9BD000E0646F /* fileio.c in Sources */,
+				D0A482751BCF9BD000E0646F /* gdoc.c in Sources */,
+				D0A482731BCF9BD000E0646F /* istack.c in Sources */,
 				D01AE48A1C740EA1008E7199 /* language.c in Sources */,
-				D0A482871BCF9BD000E0646F /* attrdict.c in Sources */,
-				D0A482891BCF9BD000E0646F /* alloc.c in Sources */,
+				D0A482801BCF9BD000E0646F /* lexer.c in Sources */,
+				D0A482781BCF9BD000E0646F /* mappedio.c in Sources */,
+				D01AE48C1C740EA1008E7199 /* message.c in Sources */,
+				D00AC8241E7F287B0059D5AB /* messageobj.c in Sources */,
+				D0A4827B1BCF9BD000E0646F /* parser.c in Sources */,
 				D0A4828A1BCF9BD000E0646F /* pprint.c in Sources */,
-				D0A4828B1BCF9BD000E0646F /* config.c in Sources */,
-				D0A4828C1BCF9BD000E0646F /* utf8.c in Sources */,
 				D0A4828D1BCF9BD000E0646F /* streamio.c in Sources */,
+				D0A482741BCF9BD000E0646F /* tagask.c in Sources */,
+				D0A482831BCF9BD000E0646F /* tags.c in Sources */,
+				D0A4827A1BCF9BD000E0646F /* tidylib.c in Sources */,
 				D0A4828E1BCF9BD000E0646F /* tmbstr.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0BB67B7193C820A007A3EB0 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D06046101BF0DAAD00D69673 /* FragariaBaseViewController.m in Sources */,
-				D06C9A5A195FB997004D6C27 /* OptionListAppearanceViewController.m in Sources */,
-				D074B7A31942CF0300F2E6F1 /* TidyDocument.m in Sources */,
-				D0B9F0FE19585060008864D6 /* DCOTransparentScroller.m in Sources */,
-				D06C9A63195FB9D0004D6C27 /* DocumentAppearanceViewController.m in Sources */,
-				D0868932194842A400BDAD72 /* TidyDocumentSourceViewController.m in Sources */,
-				D0BB67C4193C820A007A3EB0 /* JSDTableCellView.m in Sources */,
-				D0BB67C5193C820A007A3EB0 /* JSDIntegerValueTransformer.m in Sources */,
-				D0BB67C9193C820A007A3EB0 /* JSDTextField.m in Sources */,
-				D074B7A61942CF0300F2E6F1 /* TidyDocumentWindowController.m in Sources */,
-				D0BB67CF193C820A007A3EB0 /* PreferenceController.m in Sources */,
-				D0BB67D0193C820A007A3EB0 /* OptionPaneController.m in Sources */,
-				D074B7B61947D93800F2E6F1 /* TDFTableViewController.m in Sources */,
-				D0BB67D2193C820A007A3EB0 /* main.m in Sources */,
-				D0B9F10119585060008864D6 /* DCOTransparentScrollView.m in Sources */,
-				D06046031BF0BDB600D69673 /* FragariaEditorViewController.m in Sources */,
-				D0BB67D5193C820A007A3EB0 /* AppController.m in Sources */,
-				D06C9A51195FB955004D6C27 /* OptionListViewController.m in Sources */,
-				D0B9F0F619585010008864D6 /* DCOAboutWindowController.m in Sources */,
-				D06C9A48195FB4A4004D6C27 /* MASPreferencesWindowController.m in Sources */,
-				D0BB67D7193C820A007A3EB0 /* JSDBoolToStringValueTransformer.m in Sources */,
-				D06C9A6C195FB9F2004D6C27 /* SavingOptionsViewController.m in Sources */,
-				D06C9A75195FBA0F004D6C27 /* MiscOptionsViewController.m in Sources */,
-				D074B7A01942CF0300F2E6F1 /* FirstRunController.m in Sources */,
-				D0E904E01CF996C300E85FEB /* TDFWebViewController.m in Sources */,
-				D06C9A7E195FBA3F004D6C27 /* UpdaterOptionsViewController.m in Sources */,
-				D0DCEFB41A5FC40100E8A2AE /* TidyDocumentService.m in Sources */,
-				D060461D1BF0DDF200D69673 /* FragariaColorsViewController.m in Sources */,
-				D074B79D1942CF0300F2E6F1 /* EncodingHelperController.m in Sources */,
-				D0BB67DA193C820A007A3EB0 /* JSDAllCapsValueTransformer.m in Sources */,
-				D0BB67E1193C820A007A3EB0 /* JSDTableView.m in Sources */,
-				D0ED0CDB1D0029D300FC408D /* JSDTextFieldCell.m in Sources */,
-				D0ED0CC71CFEC2EE00FC408D /* TDFPreviewController.m in Sources */,
-				D04C27571C017F170074DF78 /* TidyDocumentFeedbackViewController.m in Sources */,
-				D0BB67E4193C820A007A3EB0 /* NSApplication+TidyApplication.m in Sources */,
+				D0A4828C1BCF9BD000E0646F /* utf8.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2871,22 +1852,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D0C9C1371BD85FF4004C545A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0C9C1381BD85FF4004C545A /* ActionRequestHandler.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D0C9C14A1BD85FFB004C545A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D0C9C14B1BD85FFB004C545A /* ActionRequestHandler.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		D0F3986C1BFB03790050A9B8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2911,59 +1876,19 @@
 			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
 			targetProxy = D002EFDC1A57AC9000530D2F /* PBXContainerItemProxy */;
 		};
-		D013165C1A5D871500AB1456 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D04BC9671A5AC5CB009AC43A /* Balthisar Tidy Service Helper */;
-			targetProxy = D013165B1A5D871500AB1456 /* PBXContainerItemProxy */;
-		};
-		D01316661A5D885F00AB1456 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D01316651A5D885F00AB1456 /* PBXContainerItemProxy */;
-		};
-		D01316681A5D886300AB1456 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D01316671A5D886300AB1456 /* PBXContainerItemProxy */;
-		};
-		D017A13D1A56D1E5003DDE6C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D01C70DF1A5591A500CC5038 /* Tidy Extension (pro) */;
-			targetProxy = D017A13C1A56D1E5003DDE6C /* PBXContainerItemProxy */;
-		};
 		D01C70F81A5592FC00CC5038 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D01C70B91A55850D00CC5038 /* Tidy Extension (web) */;
+			target = D01C70B91A55850D00CC5038 /* Tidy Extension */;
 			targetProxy = D01C70F71A5592FC00CC5038 /* PBXContainerItemProxy */;
 		};
-		D01C70FA1A55930300CC5038 /* PBXTargetDependency */ = {
+		D07B8F811FB3E8470043E24D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D01C70D31A558E1C00CC5038 /* Tidy Extension (app) */;
-			targetProxy = D01C70F91A55930300CC5038 /* PBXContainerItemProxy */;
-		};
-		D02DBCF21A5951AB009C84CF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D02DBCF11A5951AB009C84CF /* PBXContainerItemProxy */;
-		};
-		D02DBCF41A5951B1009C84CF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D02DBCF31A5951B1009C84CF /* PBXContainerItemProxy */;
-		};
-		D04BC9BB1A5ACCB1009AC43A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D04BC9671A5AC5CB009AC43A /* Balthisar Tidy Service Helper */;
-			targetProxy = D04BC9BA1A5ACCB1009AC43A /* PBXContainerItemProxy */;
-		};
-		D04BC9C91A5BFB0D009AC43A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D04BC9C81A5BFB0D009AC43A /* PBXContainerItemProxy */;
+			target = D0F398691BFB03790050A9B8 /* Balthisar Tidy Service Helper */;
+			targetProxy = D07B8F801FB3E8470043E24D /* PBXContainerItemProxy */;
 		};
 		D0A482B11BCF9C6200E0646F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D0A482701BCF9BD000E0646F /* libtidy-balthisar.dylib */;
+			target = D0A482701BCF9BD000E0646F /* tidy-balthisar */;
 			targetProxy = D0A482B01BCF9C6200E0646F /* PBXContainerItemProxy */;
 		};
 		D0C9C1221BD85FEA004C545A /* PBXTargetDependency */ = {
@@ -2971,41 +1896,16 @@
 			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
 			targetProxy = D0C9C1231BD85FEA004C545A /* PBXContainerItemProxy */;
 		};
-		D0C9C1351BD85FF4004C545A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D0C9C1361BD85FF4004C545A /* PBXContainerItemProxy */;
-		};
-		D0C9C1481BD85FFB004C545A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
-			targetProxy = D0C9C1491BD85FFB004C545A /* PBXContainerItemProxy */;
-		};
 		D0C9C15C1BD862AA004C545A /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D0C9C1211BD85FEA004C545A /* TidyBody Extension (web) */;
+			target = D0C9C1211BD85FEA004C545A /* TidyBody Extension */;
 			targetProxy = D0C9C15B1BD862AA004C545A /* PBXContainerItemProxy */;
 		};
-		D0C9C15E1BD862B3004C545A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0C9C1341BD85FF4004C545A /* TidyBody Extension (app) */;
-			targetProxy = D0C9C15D1BD862B3004C545A /* PBXContainerItemProxy */;
-		};
-		D0C9C1601BD862BE004C545A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0C9C1471BD85FFB004C545A /* TidyBody Extension (pro) */;
-			targetProxy = D0C9C15F1BD862BE004C545A /* PBXContainerItemProxy */;
-		};
 		D0F3986A1BFB03790050A9B8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = D00661071A579BE700F73F85 /* JSDTidyFramework */;
 			targetProxy = D0F3986B1BFB03790050A9B8 /* PBXContainerItemProxy */;
 		};
-		D0F3987E1BFB03BD0050A9B8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D0F398691BFB03790050A9B8 /* Balthisar Tidy Service Helper (pro) */;
-			targetProxy = D0F3987D1BFB03BD0050A9B8 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -3023,14 +1923,111 @@
 				D025BD5D195856B6006D7356 /* Base */,
 			);
 			name = Acknowledgments.rtf;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		D036D6471FB3991E00916128 /* OptionListViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6461FB3991E00916128 /* Base */,
+			);
+			name = OptionListViewController.xib;
+			path = "Balthisar Tidy/Resources";
+			sourceTree = SOURCE_ROOT;
+		};
+		D036D64A1FB3992500916128 /* OptionListAppearanceViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6491FB3992500916128 /* Base */,
+			);
+			name = OptionListAppearanceViewController.xib;
+			path = "Balthisar Tidy/Resources";
+			sourceTree = SOURCE_ROOT;
+		};
+		D036D64D1FB3992B00916128 /* DocumentAppearanceViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D64C1FB3992B00916128 /* Base */,
+			);
+			name = DocumentAppearanceViewController.xib;
+			path = "Balthisar Tidy/Resources";
+			sourceTree = SOURCE_ROOT;
+		};
+		D036D6501FB3992F00916128 /* SavingOptionsViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D64F1FB3992F00916128 /* Base */,
+			);
+			name = SavingOptionsViewController.xib;
+			path = "Balthisar Tidy/Resources";
+			sourceTree = SOURCE_ROOT;
+		};
+		D036D6531FB3993300916128 /* MiscOptionsViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6521FB3993300916128 /* Base */,
+			);
+			name = MiscOptionsViewController.xib;
+			path = "Balthisar Tidy/Resources";
+			sourceTree = SOURCE_ROOT;
+		};
+		D036D6561FB3993700916128 /* UpdaterOptionsViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6551FB3993700916128 /* Base */,
+			);
+			name = UpdaterOptionsViewController.xib;
+			path = "Balthisar Tidy/Resources";
+			sourceTree = SOURCE_ROOT;
+		};
+		D036D6591FB3997300916128 /* DCOAboutWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6581FB3997300916128 /* Base */,
+			);
+			name = DCOAboutWindow.xib;
+			path = DCOAboutWindow;
+			sourceTree = "<group>";
+		};
+		D036D65C1FB3997A00916128 /* MASPreferencesWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D65B1FB3997A00916128 /* Base */,
+			);
+			name = MASPreferencesWindow.xib;
 			sourceTree = "<group>";
 		};
-		D036E1D818F3D25E0009A9D4 /* Credits.rtf */ = {
+		D036D65F1FB399D700916128 /* Balthisar Tidy (web).help */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D65E1FB399D700916128 /* Base */,
+			);
+			name = "Balthisar Tidy (web).help";
+			sourceTree = "<group>";
+		};
+		D036D6621FB399DC00916128 /* Balthisar Tidy (app).help */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6611FB399DC00916128 /* Base */,
+			);
+			name = "Balthisar Tidy (app).help";
+			sourceTree = "<group>";
+		};
+		D036D6651FB399E000916128 /* Balthisar Tidy (pro).help */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D036D6641FB399E000916128 /* Base */,
+			);
+			name = "Balthisar Tidy (pro).help";
+			sourceTree = "<group>";
+		};
+		D036E1D818F3D25E0009A9D4 /* Credits (web).rtf */ = {
 			isa = PBXVariantGroup;
 			children = (
 				D036E1D918F3D25E0009A9D4 /* Base */,
 			);
-			name = Credits.rtf;
+			name = "Credits (web).rtf";
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D036E1DA18F3D25E0009A9D4 /* FirstRunController.xib */ = {
@@ -3039,6 +2036,7 @@
 				D036E1DB18F3D25E0009A9D4 /* Base */,
 			);
 			name = FirstRunController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D036E1DC18F3D25E0009A9D4 /* InfoPlist.strings */ = {
@@ -3047,6 +2045,7 @@
 				D036E1DD18F3D25E0009A9D4 /* Base */,
 			);
 			name = InfoPlist.strings;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D036E1DE18F3D25E0009A9D4 /* Localizable.strings */ = {
@@ -3055,6 +2054,7 @@
 				D036E1DF18F3D25E0009A9D4 /* Base */,
 			);
 			name = Localizable.strings;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D036E1E018F3D25E0009A9D4 /* MainMenu.xib */ = {
@@ -3063,6 +2063,7 @@
 				D036E1E118F3D25E0009A9D4 /* Base */,
 			);
 			name = MainMenu.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D036E1E218F3D25E0009A9D4 /* OptionPane.xib */ = {
@@ -3071,6 +2072,7 @@
 				D036E1E318F3D25E0009A9D4 /* Base */,
 			);
 			name = OptionPane.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D036E1E618F3D25E0009A9D4 /* TidyDocumentWindow.xib */ = {
@@ -3079,6 +2081,7 @@
 				D036E1E718F3D25E0009A9D4 /* Base */,
 			);
 			name = TidyDocumentWindow.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D04BC9B71A5ACB7D009AC43A /* HelperMainMenu.xib */ = {
@@ -3111,6 +2114,16 @@
 				D04C275C1C017FCC0074DF78 /* Base */,
 			);
 			name = TidyDocumentFeedbackViewController.xib;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		D058A2B71FB60A9600567353 /* JSDListEditorController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D058A2B81FB60A9600567353 /* Base */,
+			);
+			name = JSDListEditorController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D05F71D11BEA2DE300F584C4 /* Credits (app).rtf */ = {
@@ -3119,6 +2132,7 @@
 				D05F71D21BEA2DE300F584C4 /* Base */,
 			);
 			name = "Credits (app).rtf";
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D05F71D31BEA2DE300F584C4 /* Credits (pro).rtf */ = {
@@ -3127,6 +2141,7 @@
 				D05F71D41BEA2DE300F584C4 /* Base */,
 			);
 			name = "Credits (pro).rtf";
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D06046041BF0BE0100D69673 /* FragariaEditorViewController.xib */ = {
@@ -3152,6 +2167,7 @@
 				D074B78A1942BEE200F2E6F1 /* Base */,
 			);
 			name = TidyEncodingHelperController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D074B7A81944035800F2E6F1 /* TDFTableViewController.xib */ = {
@@ -3160,6 +2176,7 @@
 				D074B7A91944035800F2E6F1 /* Base */,
 			);
 			name = TDFTableViewController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D08689331948439700BDAD72 /* TidyDocumentSourceViewController.xib */ = {
@@ -3168,6 +2185,7 @@
 				D08689341948439700BDAD72 /* Base */,
 			);
 			name = TidyDocumentSourceViewController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */ = {
@@ -3184,6 +2202,7 @@
 				D0E483471CFD36FB003DC4A7 /* Base */,
 			);
 			name = TDFWebViewController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		D0ED0CC81CFEC35300FC408D /* TDFPreviewController.xib */ = {
@@ -3192,1407 +2211,515 @@
 				D0ED0CC91CFEC35300FC408D /* Base */,
 			);
 			name = TDFPreviewController.xib;
+			path = ..;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		D00661211A579BE700F73F85 /* Debug */ = {
+		D00661211A579BE700F73F85 /* app_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				FRAMEWORK_VERSION = A;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = JSDTidyFramework/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) /usr/local/lib @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.balthisar.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
 			};
-			name = Debug;
+			name = app_debug;
 		};
-		D00661221A579BE700F73F85 /* Release */ = {
+		D00661221A579BE700F73F85 /* app_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				FRAMEWORK_VERSION = A;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = JSDTidyFramework/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) /usr/local/lib @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.balthisar.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
 			};
-			name = Release;
+			name = app_release;
 		};
-		D016A958182FD80700712C60 /* Debug */ = {
+		D016A958182FD80700712C60 /* app_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D083633B1FB287A400A9D534 /* balthisar-debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_OBJC_ARC = NO;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_TESTABILITY = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/**";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "";
-				SDKROOT = macosx;
 			};
-			name = Debug;
+			name = app_debug;
 		};
-		D016A959182FD80700712C60 /* Release */ = {
+		D016A959182FD80700712C60 /* app_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D083633A1FB287A400A9D534 /* balthisar-release.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_OBJC_ARC = NO;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/**";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_NAME = "";
-				SDKROOT = macosx;
 			};
-			name = Release;
+			name = app_release;
 		};
-		D016A95B182FD80700712C60 /* Debug */ = {
+		D016A95B182FD80700712C60 /* app_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_FILES = YES;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy/Balthisar Tidy.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/**",
-					"\"$(PROJECT_DIR)/Balthisar Tidy/Frameworks\"",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					TARGET_WEB,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy/Balthisar Tidy-Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = no;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "${TIDY_APP_BUNDLE_ID}";
-				PRODUCT_NAME = "Balthisar Tidy";
-				TIDY_APP_BUNDLE_ID = "com.balthisar.web.free.balthisar-tidy";
-				TIDY_HELP_BOOK_FOLDER = "Balthisar Tidy (web).help";
-				TIDY_HELP_BOOK_KEY = "com.balthisar.Balthisar-Tidy.web.help";
-				TIDY_SDEF = "";
-				TIDY_UPDATE_URL = "http://localhost:4567/softwareupdates/updatecheck/tidy/index.xml";
+				ON_DEMAND_RESOURCES_PREFETCH_ORDER = "";
 			};
-			name = Debug;
+			name = app_debug;
 		};
-		D016A95C182FD80700712C60 /* Release */ = {
+		D016A95C182FD80700712C60 /* app_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_FILES = YES;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy/Balthisar Tidy.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/**",
-					"\"$(PROJECT_DIR)/Balthisar Tidy/Frameworks\"",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = TARGET_WEB;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy/Balthisar Tidy-Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = no;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "${TIDY_APP_BUNDLE_ID}";
-				PRODUCT_NAME = "Balthisar Tidy";
-				TIDY_APP_BUNDLE_ID = "com.balthisar.web.free.balthisar-tidy";
-				TIDY_HELP_BOOK_FOLDER = "Balthisar Tidy (web).help";
-				TIDY_HELP_BOOK_KEY = "com.balthisar.Balthisar-Tidy.web.help";
-				TIDY_SDEF = "";
-				TIDY_UPDATE_URL = "http://www.balthisar.com/softwareupdates/updatecheck/tidy/index.xml";
+				ON_DEMAND_RESOURCES_PREFETCH_ORDER = "";
 			};
-			name = Release;
+			name = app_release;
 		};
-		D01C70C91A55850D00CC5038 /* Debug */ = {
+		D01C70C91A55850D00CC5038 /* app_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=0",
-					TARGET_WEB,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.web.free.balthisar-tidy";
 			};
-			name = Debug;
+			name = app_debug;
 		};
-		D01C70CA1A55850D00CC5038 /* Release */ = {
+		D01C70CA1A55850D00CC5038 /* app_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=0",
-					TARGET_WEB,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.web.free.balthisar-tidy";
 			};
-			name = Release;
+			name = app_release;
 		};
-		D01C70DB1A558E1C00CC5038 /* Debug */ = {
+		D036D5F81FB36E2000916128 /* app_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=0",
-					TARGET_APP,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy";
 			};
-			name = Debug;
+			name = app_debug;
 		};
-		D01C70DC1A558E1C00CC5038 /* Release */ = {
+		D036D5F91FB36E2000916128 /* app_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=0",
-					TARGET_APP,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy";
 			};
-			name = Release;
+			name = app_release;
 		};
-		D01C70E71A5591A500CC5038 /* Debug */ = {
+		D036D5FB1FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D083633B1FB287A400A9D534 /* balthisar-debug.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=0",
-					TARGET_PRO,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy.pro";
 			};
-			name = Debug;
+			name = web_debug;
 		};
-		D01C70E81A5591A500CC5038 /* Release */ = {
+		D036D5FC1FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=0",
-					TARGET_PRO,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy.pro";
+				ON_DEMAND_RESOURCES_PREFETCH_ORDER = "";
 			};
-			name = Release;
+			name = web_debug;
 		};
-		D04BC9831A5AC5CB009AC43A /* Debug */ = {
+		D036D5FF1FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Service Helper/Balthisar Tidy Service Helper.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"TARGET_PRO=0",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Service Helper/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = NO;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.balthisar.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_SDEF = "";
 			};
-			name = Debug;
+			name = web_debug;
 		};
-		D04BC9841A5AC5CB009AC43A /* Release */ = {
+		D036D6021FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Service Helper/Balthisar Tidy Service Helper.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"TARGET_PRO=0",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Service Helper/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = NO;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.balthisar.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_SDEF = "";
 			};
-			name = Release;
+			name = web_debug;
 		};
-		D0913CDC18B0AC06005DB2E4 /* Debug */ = {
+		D036D6061FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_FILES = YES;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy/Balthisar Tidy.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/**",
-					"\"$(PROJECT_DIR)/Balthisar Tidy/Frameworks\"",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					TARGET_APP,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy/Balthisar Tidy-Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = no;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "${TIDY_APP_BUNDLE_ID}";
-				PRODUCT_NAME = "Balthisar Tidy";
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy";
-				TIDY_HELP_BOOK_FOLDER = "Balthisar Tidy (app).help";
-				TIDY_HELP_BOOK_KEY = "com.balthisar.Balthisar-Tidy.help";
-				TIDY_SDEF = "";
-				TIDY_UPDATE_URL = "";
 			};
-			name = Debug;
+			name = web_debug;
 		};
-		D0913CDD18B0AC06005DB2E4 /* Release */ = {
+		D036D6071FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_FILES = YES;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy/Balthisar Tidy.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/**",
-					"\"$(PROJECT_DIR)/Balthisar Tidy/Frameworks\"",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = TARGET_APP;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy/Balthisar Tidy-Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = no;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "${TIDY_APP_BUNDLE_ID}";
-				PRODUCT_NAME = "Balthisar Tidy";
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy";
-				TIDY_HELP_BOOK_FOLDER = "Balthisar Tidy (app).help";
-				TIDY_HELP_BOOK_KEY = "com.balthisar.Balthisar-Tidy.help";
-				TIDY_SDEF = "";
-				TIDY_UPDATE_URL = "";
 			};
-			name = Release;
+			name = web_debug;
 		};
-		D0A482AD1BCF9BD000E0646F /* Debug */ = {
+		D036D6081FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = "";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_PREFIX_HEADER = "HTMLTidy/xcode-version.h";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"SUPPORT_UTF16_ENCODINGS=1",
-					"SUPPORT_ACCESSIBILITY_CHECKS=1",
-					"SUPPORT_ASIAN_ENCODINGS=1",
-					"'LIBTIDY_VERSION=\"4.9.3\"'",
-					"DEBUG=1",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				LD_DYLIB_INSTALL_NAME = "@rpath/libtidy-balthisar.dylib";
-				MACH_O_TYPE = mh_dylib;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_NAME = "libtidy-balthisar";
-				SKIP_INSTALL = YES;
 			};
-			name = Debug;
+			name = web_debug;
 		};
-		D0A482AE1BCF9BD000E0646F /* Release */ = {
+		D036D6091FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = "";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_PREFIX_HEADER = "HTMLTidy/xcode-version.h";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"SUPPORT_UTF16_ENCODINGS=1",
-					"SUPPORT_ACCESSIBILITY_CHECKS=1",
-					"SUPPORT_ASIAN_ENCODINGS=1",
-					"'LIBTIDY_VERSION=\"4.9.3\"'",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				LD_DYLIB_INSTALL_NAME = "@rpath/libtidy-balthisar.dylib";
-				MACH_O_TYPE = mh_dylib;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = "libtidy-balthisar";
-				SKIP_INSTALL = YES;
 			};
-			name = Release;
+			name = web_debug;
 		};
-		D0BB67FD193C820A007A3EB0 /* Debug */ = {
+		D036D60A1FB3832700916128 /* web_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_FILES = YES;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy/Balthisar Tidy.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/**",
-					"\"$(PROJECT_DIR)/Balthisar Tidy/Frameworks\"",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					TARGET_PRO,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy/Balthisar Tidy-Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = yes;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "${TIDY_APP_BUNDLE_ID}";
-				PRODUCT_NAME = "Balthisar Tidy for Work";
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy.pro";
-				TIDY_HELP_BOOK_FOLDER = "Balthisar Tidy (pro).help";
-				TIDY_HELP_BOOK_KEY = "com.balthisar.Balthisar-Tidy.pro.help";
-				TIDY_SDEF = TidyScripting.sdef;
-				TIDY_UPDATE_URL = "";
 			};
-			name = Debug;
+			name = web_debug;
 		};
-		D0BB67FE193C820A007A3EB0 /* Release */ = {
+		D036D60B1FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D083633B1FB287A400A9D534 /* balthisar-debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_FILES = YES;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy/Balthisar Tidy.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/**",
-					"\"$(PROJECT_DIR)/Balthisar Tidy/Frameworks\"",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = TARGET_PRO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy/Balthisar Tidy-Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = yes;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "${TIDY_APP_BUNDLE_ID}";
-				PRODUCT_NAME = "Balthisar Tidy for Work";
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy.pro";
-				TIDY_HELP_BOOK_FOLDER = "Balthisar Tidy (pro).help";
-				TIDY_HELP_BOOK_KEY = "com.balthisar.Balthisar-Tidy.pro.help";
-				TIDY_SDEF = TidyScripting.sdef;
-				TIDY_UPDATE_URL = "";
 			};
-			name = Release;
+			name = pro_debug;
 		};
-		D0C9C1301BD85FEA004C545A /* Debug */ = {
+		D036D60C1FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=1",
-					TARGET_WEB,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info-Body.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.web.free.balthisar-tidy";
+				ON_DEMAND_RESOURCES_PREFETCH_ORDER = "";
 			};
-			name = Debug;
+			name = pro_debug;
 		};
-		D0C9C1311BD85FEA004C545A /* Release */ = {
+		D036D60F1FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=1",
-					TARGET_WEB,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info-Body.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.web.free.balthisar-tidy";
 			};
-			name = Release;
+			name = pro_debug;
 		};
-		D0C9C1431BD85FF4004C545A /* Debug */ = {
+		D036D6121FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=1",
-					TARGET_APP,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info-Body.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy";
 			};
-			name = Debug;
+			name = pro_debug;
 		};
-		D0C9C1441BD85FF4004C545A /* Release */ = {
+		D036D6161FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=1",
-					TARGET_APP,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info-Body.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy";
 			};
-			name = Release;
+			name = pro_debug;
 		};
-		D0C9C1561BD85FFB004C545A /* Debug */ = {
+		D036D6171FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=1",
-					TARGET_PRO,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info-Body.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy.pro";
 			};
-			name = Debug;
+			name = pro_debug;
 		};
-		D0C9C1571BD85FFB004C545A /* Release */ = {
+		D036D6181FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"BODY_ONLY=1",
-					TARGET_PRO,
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Extension/Info-Body.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(TIDY_APP_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TIDY_APP_BUNDLE_ID = "com.balthisar.Balthisar-Tidy.pro";
 			};
-			name = Release;
+			name = pro_debug;
 		};
-		D0F398791BFB03790050A9B8 /* Debug */ = {
+		D036D6191FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Service Helper/Balthisar Tidy Service Helper.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"TARGET_PRO=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Service Helper/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = YES;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.balthisar.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "Balthisar Tidy Service Helper";
-				SKIP_INSTALL = YES;
-				TIDY_SDEF = TidyService.sdef;
 			};
-			name = Debug;
+			name = pro_debug;
 		};
-		D0F3987A1BFB03790050A9B8 /* Release */ = {
+		D036D61A1FB3833E00916128 /* pro_debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Balthisar Tidy Service Helper/Balthisar Tidy Service Helper.entitlements";
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 9PN2JXXG7Y;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"TARGET_PRO=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				INFOPLIST_FILE = "Balthisar Tidy Service Helper/Info.plist";
-				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				JSD_APPLESCRIPT_VALUE = YES;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.balthisar.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "Balthisar Tidy Service Helper";
-				SKIP_INSTALL = YES;
-				TIDY_SDEF = TidyService.sdef;
 			};
-			name = Release;
+			name = pro_debug;
 		};
-		D0F4A50C1BDA2C520051327D /* Debug */ = {
+		D036D61B1FB3837700916128 /* pro_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D083633A1FB287A400A9D534 /* balthisar-release.xcconfig */;
 			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
-			name = Debug;
+			name = pro_release;
 		};
-		D0F4A50D1BDA2C520051327D /* Release */ = {
+		D036D61C1FB3837700916128 /* pro_release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
 			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				ON_DEMAND_RESOURCES_PREFETCH_ORDER = "";
 			};
-			name = Release;
+			name = pro_release;
 		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		D00661251A579BE700F73F85 /* Build configuration list for PBXNativeTarget "JSDTidyFramework" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D00661211A579BE700F73F85 /* Debug */,
-				D00661221A579BE700F73F85 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+		D036D61F1FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
 		};
-		D016A921182FD80700712C60 /* Build configuration list for PBXProject "Balthisar Tidy" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D016A958182FD80700712C60 /* Debug */,
-				D016A959182FD80700712C60 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+		D036D6221FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
 		};
-		D016A95A182FD80700712C60 /* Build configuration list for PBXNativeTarget "Balthisar Tidy (web)" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D016A95B182FD80700712C60 /* Debug */,
-				D016A95C182FD80700712C60 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+		D036D6261FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
 		};
-		D01C70C81A55850D00CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension (web)" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D01C70C91A55850D00CC5038 /* Debug */,
-				D01C70CA1A55850D00CC5038 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+		D036D6271FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
 		};
-		D01C70DA1A558E1C00CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension (app)" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D01C70DB1A558E1C00CC5038 /* Debug */,
-				D01C70DC1A558E1C00CC5038 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+		D036D6281FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
 		};
-		D01C70E61A5591A500CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension (pro)" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D01C70E71A5591A500CC5038 /* Debug */,
-				D01C70E81A5591A500CC5038 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+		D036D6291FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
+		};
+		D036D62A1FB3837700916128 /* pro_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */;
+			buildSettings = {
+			};
+			name = pro_release;
+		};
+		D036D62B1FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D083633A1FB287A400A9D534 /* balthisar-release.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D62C1FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
+			buildSettings = {
+				ON_DEMAND_RESOURCES_PREFETCH_ORDER = "";
+			};
+			name = web_release;
+		};
+		D036D62F1FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6661FB3A94A00916128 /* extension-tidy.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D6321FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D6361FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D6371FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F21FB36A3200916128 /* JSDTidyFramework.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D6381FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D6391FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D036D63A1FB3838000916128 /* web_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5FA1FB36F2B00916128 /* Balthisar Tidy Help Project.xcconfig */;
+			buildSettings = {
+			};
+			name = web_release;
+		};
+		D0A482AD1BCF9BD000E0646F /* app_debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */;
+			buildSettings = {
+			};
+			name = app_debug;
+		};
+		D0A482AE1BCF9BD000E0646F /* app_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F31FB36A3300916128 /* libtidy-balthisar.dylib.xcconfig */;
+			buildSettings = {
+			};
+			name = app_release;
+		};
+		D0C9C1301BD85FEA004C545A /* app_debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */;
+			buildSettings = {
+			};
+			name = app_debug;
+		};
+		D0C9C1311BD85FEA004C545A /* app_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D6671FB3A94A00916128 /* extension-tidybody.xcconfig */;
+			buildSettings = {
+			};
+			name = app_release;
+		};
+		D0F398791BFB03790050A9B8 /* app_debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */;
+			buildSettings = {
+			};
+			name = app_debug;
+		};
+		D0F3987A1BFB03790050A9B8 /* app_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D07B8F7E1FB3DD890043E24D /* service-helper.xcconfig */;
+			buildSettings = {
+			};
+			name = app_release;
+		};
+		D0F4A50C1BDA2C520051327D /* app_debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */;
+			buildSettings = {
+			};
+			name = app_debug;
+		};
+		D0F4A50D1BDA2C520051327D /* app_release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D036D5F41FB36A3300916128 /* JSDTidyFramework Documentation.xcconfig */;
+			buildSettings = {
+			};
+			name = app_release;
 		};
-		D04BC9821A5AC5CB009AC43A /* Build configuration list for PBXNativeTarget "Balthisar Tidy Service Helper" */ = {
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		D00661251A579BE700F73F85 /* Build configuration list for PBXNativeTarget "JSDTidyFramework" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D04BC9831A5AC5CB009AC43A /* Debug */,
-				D04BC9841A5AC5CB009AC43A /* Release */,
+				D00661211A579BE700F73F85 /* app_debug */,
+				D036D6171FB3833E00916128 /* pro_debug */,
+				D036D6071FB3832700916128 /* web_debug */,
+				D00661221A579BE700F73F85 /* app_release */,
+				D036D6271FB3837700916128 /* pro_release */,
+				D036D6371FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0913CDB18B0AC06005DB2E4 /* Build configuration list for PBXNativeTarget "Balthisar Tidy (app)" */ = {
+		D016A921182FD80700712C60 /* Build configuration list for PBXProject "Balthisar Tidy" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0913CDC18B0AC06005DB2E4 /* Debug */,
-				D0913CDD18B0AC06005DB2E4 /* Release */,
+				D016A958182FD80700712C60 /* app_debug */,
+				D036D60B1FB3833E00916128 /* pro_debug */,
+				D036D5FB1FB3832700916128 /* web_debug */,
+				D016A959182FD80700712C60 /* app_release */,
+				D036D61B1FB3837700916128 /* pro_release */,
+				D036D62B1FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0A482AC1BCF9BD000E0646F /* Build configuration list for PBXNativeTarget "libtidy-balthisar.dylib" */ = {
+		D016A95A182FD80700712C60 /* Build configuration list for PBXNativeTarget "Balthisar Tidy" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0A482AD1BCF9BD000E0646F /* Debug */,
-				D0A482AE1BCF9BD000E0646F /* Release */,
+				D016A95B182FD80700712C60 /* app_debug */,
+				D036D60C1FB3833E00916128 /* pro_debug */,
+				D036D5FC1FB3832700916128 /* web_debug */,
+				D016A95C182FD80700712C60 /* app_release */,
+				D036D61C1FB3837700916128 /* pro_release */,
+				D036D62C1FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0BB67FC193C820A007A3EB0 /* Build configuration list for PBXNativeTarget "Balthisar Tidy (pro)" */ = {
+		D01C70C81A55850D00CC5038 /* Build configuration list for PBXNativeTarget "Tidy Extension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0BB67FD193C820A007A3EB0 /* Debug */,
-				D0BB67FE193C820A007A3EB0 /* Release */,
+				D01C70C91A55850D00CC5038 /* app_debug */,
+				D036D60F1FB3833E00916128 /* pro_debug */,
+				D036D5FF1FB3832700916128 /* web_debug */,
+				D01C70CA1A55850D00CC5038 /* app_release */,
+				D036D61F1FB3837700916128 /* pro_release */,
+				D036D62F1FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0C9C12F1BD85FEA004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension (web)" */ = {
+		D036D5F71FB36E2000916128 /* Build configuration list for PBXAggregateTarget "Balthisar Tidy Help Project" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0C9C1301BD85FEA004C545A /* Debug */,
-				D0C9C1311BD85FEA004C545A /* Release */,
+				D036D5F81FB36E2000916128 /* app_debug */,
+				D036D61A1FB3833E00916128 /* pro_debug */,
+				D036D60A1FB3832700916128 /* web_debug */,
+				D036D5F91FB36E2000916128 /* app_release */,
+				D036D62A1FB3837700916128 /* pro_release */,
+				D036D63A1FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0C9C1421BD85FF4004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension (app)" */ = {
+		D0A482AC1BCF9BD000E0646F /* Build configuration list for PBXNativeTarget "tidy-balthisar" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0C9C1431BD85FF4004C545A /* Debug */,
-				D0C9C1441BD85FF4004C545A /* Release */,
+				D0A482AD1BCF9BD000E0646F /* app_debug */,
+				D036D6181FB3833E00916128 /* pro_debug */,
+				D036D6081FB3832700916128 /* web_debug */,
+				D0A482AE1BCF9BD000E0646F /* app_release */,
+				D036D6281FB3837700916128 /* pro_release */,
+				D036D6381FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0C9C1551BD85FFB004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension (pro)" */ = {
+		D0C9C12F1BD85FEA004C545A /* Build configuration list for PBXNativeTarget "TidyBody Extension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0C9C1561BD85FFB004C545A /* Debug */,
-				D0C9C1571BD85FFB004C545A /* Release */,
+				D0C9C1301BD85FEA004C545A /* app_debug */,
+				D036D6121FB3833E00916128 /* pro_debug */,
+				D036D6021FB3832700916128 /* web_debug */,
+				D0C9C1311BD85FEA004C545A /* app_release */,
+				D036D6221FB3837700916128 /* pro_release */,
+				D036D6321FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
-		D0F398781BFB03790050A9B8 /* Build configuration list for PBXNativeTarget "Balthisar Tidy Service Helper (pro)" */ = {
+		D0F398781BFB03790050A9B8 /* Build configuration list for PBXNativeTarget "Balthisar Tidy Service Helper" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0F398791BFB03790050A9B8 /* Debug */,
-				D0F3987A1BFB03790050A9B8 /* Release */,
+				D0F398791BFB03790050A9B8 /* app_debug */,
+				D036D6161FB3833E00916128 /* pro_debug */,
+				D036D6061FB3832700916128 /* web_debug */,
+				D0F3987A1BFB03790050A9B8 /* app_release */,
+				D036D6261FB3837700916128 /* pro_release */,
+				D036D6361FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
 		D0F4A50B1BDA2C520051327D /* Build configuration list for PBXAggregateTarget "JSDTidyFramework Documentation" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D0F4A50C1BDA2C520051327D /* Debug */,
-				D0F4A50D1BDA2C520051327D /* Release */,
+				D0F4A50C1BDA2C520051327D /* app_debug */,
+				D036D6191FB3833E00916128 /* pro_debug */,
+				D036D6091FB3832700916128 /* web_debug */,
+				D0F4A50D1BDA2C520051327D /* app_release */,
+				D036D6291FB3837700916128 /* pro_release */,
+				D036D6391FB3838000916128 /* web_release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = app_release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (app).xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (app).xcscheme
new file mode 100644
index 00000000..aad442ab
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (app).xcscheme	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D016A925182FD80700712C60"
+               BuildableName = "Balthisar Tidy.app"
+               BlueprintName = "Balthisar Tidy"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "app_debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0913CA118B0AC06005DB2E4"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy (app)"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "app_debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      enableGPUFrameCaptureMode = "3"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "app_release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "app_debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "app_release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (pro).xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (pro).xcscheme
new file mode 100644
index 00000000..7d7e65ea
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (pro).xcscheme	
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D016A925182FD80700712C60"
+               BuildableName = "Balthisar Tidy.app"
+               BlueprintName = "Balthisar Tidy"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "pro_debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "pro_debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      enableGPUFrameCaptureMode = "3"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "pro_release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "pro_debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "pro_release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (web).xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (web).xcscheme
new file mode 100644
index 00000000..8fda3fbd
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy (web).xcscheme	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D016A925182FD80700712C60"
+               BuildableName = "Balthisar Tidy.app"
+               BlueprintName = "Balthisar Tidy"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "web_debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "web_debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      enableGPUFrameCaptureMode = "3"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "web_release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "web_debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "web_release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Help Project.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Help Project.xcscheme
new file mode 100644
index 00000000..9a519c41
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Help Project.xcscheme	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D036D5F51FB36E2000916128"
+               BuildableName = "Balthisar Tidy Help Project"
+               BlueprintName = "Balthisar Tidy Help Project"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D036D5F51FB36E2000916128"
+            BuildableName = "Balthisar Tidy Help Project"
+            BlueprintName = "Balthisar Tidy Help Project"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D036D5F51FB36E2000916128"
+            BuildableName = "Balthisar Tidy Help Project"
+            BlueprintName = "Balthisar Tidy Help Project"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Service Helper.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Service Helper.xcscheme
new file mode 100644
index 00000000..a0c27733
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Balthisar Tidy Service Helper.xcscheme	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D0F398691BFB03790050A9B8"
+               BuildableName = "Balthisar Tidy Service Helper.app"
+               BlueprintName = "Balthisar Tidy Service Helper"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "app_release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0F398691BFB03790050A9B8"
+            BuildableName = "Balthisar Tidy Service Helper.app"
+            BlueprintName = "Balthisar Tidy Service Helper"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "app_release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0F398691BFB03790050A9B8"
+            BuildableName = "Balthisar Tidy Service Helper.app"
+            BlueprintName = "Balthisar Tidy Service Helper"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "app_release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0F398691BFB03790050A9B8"
+            BuildableName = "Balthisar Tidy Service Helper.app"
+            BlueprintName = "Balthisar Tidy Service Helper"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "app_release">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "app_release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework Documentation.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework Documentation.xcscheme
new file mode 100644
index 00000000..9d92ee0e
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework Documentation.xcscheme	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D0F4A50A1BDA2C520051327D"
+               BuildableName = "JSDTidyFramework Documentation"
+               BlueprintName = "JSDTidyFramework Documentation"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0F4A50A1BDA2C520051327D"
+            BuildableName = "JSDTidyFramework Documentation"
+            BlueprintName = "JSDTidyFramework Documentation"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0F4A50A1BDA2C520051327D"
+            BuildableName = "JSDTidyFramework Documentation"
+            BlueprintName = "JSDTidyFramework Documentation"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework.xcscheme
new file mode 100644
index 00000000..1097a631
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/JSDTidyFramework.xcscheme	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D00661071A579BE700F73F85"
+               BuildableName = "JSDTidyFramework.framework"
+               BlueprintName = "JSDTidyFramework"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D00661071A579BE700F73F85"
+            BuildableName = "JSDTidyFramework.framework"
+            BlueprintName = "JSDTidyFramework"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D00661071A579BE700F73F85"
+            BuildableName = "JSDTidyFramework.framework"
+            BlueprintName = "JSDTidyFramework"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Tidy Extension.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Tidy Extension.xcscheme
new file mode 100644
index 00000000..4b65cfa5
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/Tidy Extension.xcscheme	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D01C70B91A55850D00CC5038"
+               BuildableName = "Tidy Extension.appex"
+               BlueprintName = "Tidy Extension"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D016A925182FD80700712C60"
+               BuildableName = "Balthisar Tidy.app"
+               BlueprintName = "Balthisar Tidy"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "app_release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D01C70B91A55850D00CC5038"
+            BuildableName = "Tidy Extension.appex"
+            BlueprintName = "Tidy Extension"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "app_debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "app_release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "app_release">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "app_release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/TidyBody Extension.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/TidyBody Extension.xcscheme
new file mode 100644
index 00000000..b3e2264b
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/TidyBody Extension.xcscheme	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D0C9C1211BD85FEA004C545A"
+               BuildableName = "TidyBody Extension.appex"
+               BlueprintName = "TidyBody Extension"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D016A925182FD80700712C60"
+               BuildableName = "Balthisar Tidy.app"
+               BlueprintName = "Balthisar Tidy"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "app_release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0C9C1211BD85FEA004C545A"
+            BuildableName = "TidyBody Extension.appex"
+            BlueprintName = "TidyBody Extension"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "app_release"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "app_release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D016A925182FD80700712C60"
+            BuildableName = "Balthisar Tidy.app"
+            BlueprintName = "Balthisar Tidy"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "app_release">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "app_release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/tidy-balthisar.xcscheme b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/tidy-balthisar.xcscheme
new file mode 100644
index 00000000..c16296b0
--- /dev/null
+++ b/Balthisar Tidy.xcodeproj/xcshareddata/xcschemes/tidy-balthisar.xcscheme	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0910"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D0A482701BCF9BD000E0646F"
+               BuildableName = "libtidy-balthisar.dylib"
+               BlueprintName = "tidy-balthisar"
+               ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "app-debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "app-debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0A482701BCF9BD000E0646F"
+            BuildableName = "libtidy-balthisar.dylib"
+            BlueprintName = "tidy-balthisar"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "app-release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0A482701BCF9BD000E0646F"
+            BuildableName = "libtidy-balthisar.dylib"
+            BlueprintName = "tidy-balthisar"
+            ReferencedContainer = "container:Balthisar Tidy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "app-debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "app-release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Balthisar Tidy/Classes/App Pieces/AppController.m b/Balthisar Tidy/Classes/App Pieces/AppController.m
index 9cc435eb..ee8216dd 100644
--- a/Balthisar Tidy/Classes/App Pieces/AppController.m	
+++ b/Balthisar Tidy/Classes/App Pieces/AppController.m	
@@ -235,7 +235,7 @@ - (DCOAboutWindowController *)aboutWindowController
         _aboutWindowController = [[DCOAboutWindowController alloc] init];
 
 #if defined(TARGET_WEB)
-        NSString *creditsFile = @"Credits";
+        NSString *creditsFile = @"Credits (web)";
 #elif defined(TARGET_APP)
         NSString *creditsFile = @"Credits (app)";
 #elif defined(TARGET_PRO)
diff --git a/Balthisar Tidy/Classes/App Pieces/OptionPaneController.m b/Balthisar Tidy/Classes/App Pieces/OptionPaneController.m
index 5f811863..963c8a15 100755
--- a/Balthisar Tidy/Classes/App Pieces/OptionPaneController.m	
+++ b/Balthisar Tidy/Classes/App Pieces/OptionPaneController.m	
@@ -421,5 +421,4 @@ - (IBAction)handleLoadOptionsFromUnixConfigFile:(id)sender
 }
 
 
-
 @end
diff --git a/Balthisar Tidy/Classes/DocumentWindow/TidyDocumentWindowController.m b/Balthisar Tidy/Classes/DocumentWindow/TidyDocumentWindowController.m
index 841810a8..9424a323 100644
--- a/Balthisar Tidy/Classes/DocumentWindow/TidyDocumentWindowController.m	
+++ b/Balthisar Tidy/Classes/DocumentWindow/TidyDocumentWindowController.m	
@@ -227,8 +227,24 @@ - (void)windowDidLoad
 	 * notification before the nibs are all done loading, so we
 	 * will do this here.
 	 */
-	[((TidyDocument*)self.document).tidyProcess setSourceTextWithData:((TidyDocument*)self.document).documentOpenedData];
+    NSData *docOpenedData = ((TidyDocument*)self.document).documentOpenedData;
+    TidyDocument *tidyDoc = self.document;
+	[tidyDoc.tidyProcess setSourceTextWithData:docOpenedData];
 
+    
+    /* If we have docOpenedData but no output, then suggest that the user
+     * try `force-output`.
+     */
+    JSDTidyOption *opt = tidyDoc.tidyProcess.tidyOptions[@"force-output"];
+    BOOL force = [opt.optionValue isEqualToString:@"yes"];
+    if ( docOpenedData && [tidyDoc.tidyText isEqualToString:@""] && !force )
+   {
+       NSAlert *alert = [[NSAlert alloc] init];
+       [alert setMessageText:JSDLocalizedString(@"WarnTryForceOutput", nil)];
+       [alert setInformativeText:JSDLocalizedString(@"WarnTryForceOutputExplain", nil)];
+       [alert addButtonWithTitle:JSDLocalizedString(@"WarnTryForceOutputButton", nil)];
+       [alert runModal];
+   }
 
 	/* Run through the new user helper if appropriate */
 
diff --git a/Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.h b/Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.h
new file mode 100644
index 00000000..2753e739
--- /dev/null
+++ b/Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.h	
@@ -0,0 +1,55 @@
+/**************************************************************************************************
+
+	JSDListEditorController
+
+	Copyright © 2017 by Jim Derry. All rights reserved.
+
+ **************************************************************************************************/
+
+@import Cocoa;
+@import Foundation;
+
+
+/** 
+ *  An NSViewController that handles a simple list editor similar to Xcode's
+ *  configuration editor.
+ */
+@interface JSDListEditorController : NSViewController
+
+
+#pragma mark - Initializers
+/** @name Initializers */
+
+
+/**
+ * Initializes with a comma separated string.
+ */
+- (instancetype)initWithString:(NSString *)string;
+
+/**
+ * Initializes with an array of strings.
+ */
+- (instancetype)initWithArray:(NSArray<NSString*> *)array;
+
+
+#pragma mark - Main Properties
+/** @name Main Properties */
+
+
+/**
+ * The array of NSStrings to be represented in the list.
+ */
+@property (readwrite, assign) NSArray<NSString*> *items;
+
+/**
+ * The array of strings represented as a comma-separated list.
+ */
+@property (readwrite, assign) NSString *itemsText;
+
+
+
+#pragma mark - Public Methods
+/** @name Public Methods */
+
+
+@end
diff --git a/Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.m b/Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.m
new file mode 100644
index 00000000..fd256375
--- /dev/null
+++ b/Balthisar Tidy/Classes/JSDListEditorController/JSDListEditorController.m	
@@ -0,0 +1,152 @@
+/**************************************************************************************************
+
+	JSDListEditorController
+
+	Copyright © 2017 by Jim Derry. All rights reserved.
+
+ **************************************************************************************************/
+
+#import "JSDListEditorController.h"
+#import "CommonHeaders.h"
+
+#import "JSDTidyModel.h"
+#import "TidyDocument.h"
+
+#import "RSRTVArrayController.h"
+
+
+@interface JSDListEditorController ()
+
+/* UI references. */
+@property (nonatomic, weak) IBOutlet NSButton *buttonAdd;
+@property (nonatomic, weak) IBOutlet NSButton *buttonRemove;
+@property (nonatomic, strong) IBOutlet RSRTVArrayController *theArrayController;
+@property (nonatomic, weak) IBOutlet NSTableView *theTable;
+
+/* Internal properties. */
+@property (nonatomic, strong) NSMutableArray *pitems;
+
+
+@end
+
+
+@implementation JSDListEditorController
+
+
+#pragma mark - Intialization and Deallocation
+
+
+/*———————————————————————————————————————————————————————————————————*
+ * - init
+ *———————————————————————————————————————————————————————————————————*/
+- (instancetype)init
+{
+    if ((self = [super init]))
+    {
+        self.items = nil;
+    }
+
+    return self;
+}
+
+- (instancetype)initWithString:(NSString *)string
+{
+    if ( (self = self.init) )
+    {
+        self.itemsText = string;
+    }
+
+    return self;
+}
+
+- (instancetype)initWithArray:(NSArray<NSString*> *)array
+{
+    if ( (self = self.init) )
+    {
+        self.items = array;
+    }
+
+    return self;
+}
+
+/*———————————————————————————————————————————————————————————————————*
+ * - dealloc
+ *———————————————————————————————————————————————————————————————————*/
+- (void)dealloc
+{
+
+}
+
+
+/*———————————————————————————————————————————————————————————————————*
+ * - awakeFromNib
+ *———————————————————————————————————————————————————————————————————*/
+- (void)awakeFromNib
+{
+    self.theArrayController.rearrange = YES;
+}
+
+
+#pragma mark - Property Accessors (Public)
+
+
+/*———————————————————————————————————————————————————————————————————*
+ * @property items
+ *———————————————————————————————————————————————————————————————————*/
+- (NSArray<NSString*>*)items
+{
+    NSMutableArray *result = [[NSMutableArray alloc] init];
+    for ( id string in [self.pitems valueForKey:@"string"])
+    {
+        if ( string != [NSNull null] )
+        {
+            [result addObject:string];
+        }
+    }
+
+    return result;
+}
+
+- (void)setItems:(NSArray<NSString *> *)items
+{
+    self.pitems = [[NSMutableArray alloc] init];
+
+    for (NSString* item in items)
+    {
+        NSMutableDictionary *record = [NSMutableDictionary dictionaryWithObject:item forKey:@"string"];
+        [self.pitems addObject:record];
+    }
+    [self.theTable reloadData];
+}
+
+
+/*———————————————————————————————————————————————————————————————————*
+ * @property itemsText
+ *———————————————————————————————————————————————————————————————————*/
+- (NSString *)itemsText
+{
+    NSString *result = [self.items componentsJoinedByString:@", "];
+    return [result isEqualToString:@""] ? nil : result;
+}
+
+- (void)setItemsText:(NSString *)itemsText
+{
+    if ( !itemsText || [itemsText isEqualToString:@""] )
+    {
+        self.items = nil;
+        return;
+    }
+    NSArray *array = [[NSMutableArray alloc] initWithArray:[itemsText componentsSeparatedByString:@","]];
+    NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:[array count]];
+    for (NSString *item in array)
+    {
+        [trimmed addObject:[item stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
+    }
+    self.items = trimmed;
+}
+
+
+#pragma mark - Property Accessors (Category)
+
+
+@end
diff --git a/Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.h b/Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.h
new file mode 100755
index 00000000..96d23685
--- /dev/null
+++ b/Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.h	
@@ -0,0 +1,55 @@
+// RSRTVArrayController.h
+//
+// RSRTV stands for Red Sweater Reordering Table View Controller.
+//
+// A simple array controller subclass designed to manage row reordering in a table
+// view.
+//
+// Based on code from Apple's DragNDropOutlineView example, which granted
+// unlimited modification and redistribution rights, provided Apple not be held legally liable.
+//
+// Differences between this file and the original are © 2006 Red Sweater Software.
+//
+// You are granted a non-exclusive, unlimited license to use, reproduce, modify and
+// redistribute this source code in any form provided that you agree to NOT hold liable
+// Red Sweater Software or Daniel Jalkut for any damages caused by such use.
+//
+
+// CLIENT NOTES: To make good use of this class you need to make the following connections
+// in Interface Builder:
+//
+// From RSRTVArrayController -> oTableView
+// From oTableView -> dataSource (array controller)
+// From oTableview -> delegate (array controller)
+//
+
+// Modified by Yannis Chatzikonstantinou on:
+// 25-03-2014 for inclusion in the YCHarness framework
+// 06-07-2015 for compatibility with Dragndrop messages, through introducing a secondary delegate.
+// 10-01-2016 for tidying up the -rearrange (was draggingEnabled) property.
+// Modified by Jim Derry on:
+// 11/12/2017 for not selecting entire table after dragging a row.
+
+#import <Cocoa/Cocoa.h>
+
+@interface RSRTVArrayController : NSArrayController
+{
+    IBOutlet NSTableView* oTableView;
+}
+
+// Table view drag and drop support
+- (BOOL)tableView:(NSTableView *)tv writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard;
+- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)op;
+- (BOOL)tableView:(NSTableView*)tv acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)op;
+
+// Utility methods
+-(void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)index;
+-(void)copyObjectsInArrangedObjectsFromIndexes:(NSIndexSet*)indexSet toIndex:(NSUInteger)insertIndex;
+- (NSIndexSet *)indexSetFromRows:(NSArray *)rows;
+- (NSUInteger)rowsAboveRow:(NSUInteger)row inIndexSet:(NSIndexSet *)indexSet;
+
+@property IBOutlet id dragndropDelegate;
+
+@property IBInspectable BOOL rearrange;
+
+@end
diff --git a/Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.m b/Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.m
new file mode 100755
index 00000000..176596cf
--- /dev/null
+++ b/Balthisar Tidy/Classes/JSDListEditorController/RSRTVArrayController.m	
@@ -0,0 +1,226 @@
+// RSRTVArrayController.m
+//
+// RSRTV stands for Red Sweater Reordering Table View Controller.
+//
+// Based on code from Apple's DragNDropOutlineView example, which granted
+// unlimited modification and redistribution rights, provided Apple not be held legally liable.
+//
+// Differences between this file and the original are © 2006 Red Sweater Software.
+//
+// You are granted a non-exclusive, unlimited license to use, reproduce, modify and
+// redistribute this source code in any form provided that you agree to NOT hold liable
+// Red Sweater Software or Daniel Jalkut for any damages caused by such use.
+//
+
+#import "RSRTVArrayController.h"
+
+NSString *kRSRTVMovedRowsType = @"com.red-sweater.RSRTVArrayController";
+
+@implementation RSRTVArrayController
+
+- (void) awakeFromNib
+{
+    [oTableView registerForDraggedTypes:[NSArray arrayWithObjects:kRSRTVMovedRowsType, nil]];
+}
+
+- (BOOL)tableView:(NSTableView *)tv writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
+{
+    if (self.rearrange)
+    {
+        // Declare our "moved rows" drag type
+        [pboard declareTypes:[NSArray arrayWithObjects:kRSRTVMovedRowsType, nil] owner:self];
+
+        // Just add the rows themselves to the pasteboard
+        [pboard setPropertyList:rows forType:kRSRTVMovedRowsType];
+
+        return YES;
+    }
+
+    return NO;
+}
+
+- (BOOL) tableObjectsSupportCopying
+{
+    return [[[self arrangedObjects] objectAtIndex:0] conformsToProtocol:@protocol(NSCopying)];
+}
+
+- (NSDragOperation)tableView:(NSTableView*)tv
+                validateDrop:(id <NSDraggingInfo>)info
+                 proposedRow:(NSInteger)row
+       proposedDropOperation:(NSTableViewDropOperation)op
+{
+    NSDragOperation dragOp = NSDragOperationNone;
+
+    // if drag source is our own table view, it's a move or a copy
+    if ([info draggingSource] == tv)
+    {
+        // At a minimum, allow move
+        dragOp =  NSDragOperationMove;
+
+        // Only expose the copy method if objects in this table appear to support copying...
+        if (([info draggingSourceOperationMask] == NSDragOperationCopy) && ([self tableObjectsSupportCopying] == YES))
+        {
+            dragOp = NSDragOperationCopy;
+        }
+
+        // we want to put the object at, not over,
+        // the current row (contrast NSTableViewDropOn)
+        [tv setDropRow:row dropOperation:NSTableViewDropAbove];
+    }
+    else if (self.dragndropDelegate)
+    {
+        dragOp = [self.dragndropDelegate tableView:tv
+                                      validateDrop:info
+                                       proposedRow:row
+                             proposedDropOperation:op];
+    }
+
+    return dragOp;
+}
+
+- (BOOL)tableView:(NSTableView*)tv acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)op
+{
+    if (row < 0)
+    {
+        row = 0;
+    }
+
+    // if drag source is self, it's a move or copy
+    if ([info draggingSource] == tv)
+    {
+        NSArray *rows = [[info draggingPasteboard] propertyListForType:kRSRTVMovedRowsType];
+        NSIndexSet *indexSet = [self indexSetFromRows:rows];
+        //NSInteger rowsAbove = 0;
+
+        if (([info draggingSourceOperationMask] == NSDragOperationCopy) && [self tableObjectsSupportCopying])
+        {
+            [self copyObjectsInArrangedObjectsFromIndexes:indexSet toIndex:row];
+        }
+        else
+        {
+            [self moveObjectsInArrangedObjectsFromIndexes:indexSet toIndex:row];
+
+            // set selected rows to those that were just moved
+            // Need to work out what moved where to determine proper selection...
+            //rowsAbove = [self rowsAboveRow:row inIndexSet:indexSet];
+            [tv deselectAll:self];
+        }
+
+        return YES;
+    }
+    else if (self.dragndropDelegate)
+    {
+        return [self.dragndropDelegate tableView:tv acceptDrop:info row:row dropOperation:op];
+    }
+
+    return NO;
+}
+
+-(void) copyObjectsInArrangedObjectsFromIndexes:(NSIndexSet*)indexSet toIndex:(NSUInteger)insertIndex
+{
+    NSArray    *objects = [self arrangedObjects];
+    NSUInteger copyFromIndex = [indexSet lastIndex];
+
+    NSInteger            aboveInsertIndexCount = 0;
+    id            object;
+    NSInteger            copyIndex;
+
+    while (NSNotFound != copyFromIndex)
+    {
+        if (copyFromIndex >= insertIndex)
+        {
+            copyIndex = copyFromIndex + aboveInsertIndexCount;
+            aboveInsertIndexCount += 1;
+        }
+        else
+        {
+            copyIndex = copyFromIndex;
+        }
+        object = [objects objectAtIndex:copyIndex];
+        [self insertObject:[object copy] atArrangedObjectIndex:insertIndex];
+
+        copyFromIndex = [indexSet indexLessThanIndex:copyFromIndex];
+    }
+}
+
+-(void) moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet*)indexSet toIndex:(NSUInteger)insertIndex
+{
+
+    NSArray *objects = [self arrangedObjects];
+    NSUInteger thisIndex = [indexSet lastIndex];
+
+    NSInteger aboveInsertIndexCount = 0;
+    NSInteger removeIndex;
+
+    [self willChangeValueForKey: @"content"];
+    while (NSNotFound != thisIndex)
+    {
+        if (thisIndex >= insertIndex)
+        {
+            removeIndex = thisIndex + aboveInsertIndexCount;
+            aboveInsertIndexCount += 1;
+        }
+        else
+        {
+            removeIndex = thisIndex;
+            insertIndex -= 1;
+        }
+
+        // Get the object we're moving
+        id object = [objects objectAtIndex:removeIndex];
+
+        [_content removeObject: [objects objectAtIndex: removeIndex]];
+        //[_content insertObject:object atIndex:insertIndex];
+        [self insertObject:object atArrangedObjectIndex:insertIndex];
+
+        thisIndex = [indexSet indexLessThanIndex:thisIndex];
+    }
+    [self didChangeValueForKey: @"content"];
+
+    if ([self selectsInsertedObjects]) {
+        [self addSelectedObjects: objects];
+    }
+
+    if ([self automaticallyRearrangesObjects]) {
+        [self rearrangeObjects];
+    }
+}
+
+
+- (NSIndexSet *)indexSetFromRows:(NSArray *)rows
+{
+    NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet];
+    NSEnumerator *rowEnumerator = [rows objectEnumerator];
+    NSNumber *idx;
+    while (idx = [rowEnumerator nextObject])
+    {
+        [indexSet addIndex:[idx intValue]];
+    }
+    return indexSet;
+}
+
+
+- (NSUInteger)rowsAboveRow:(NSUInteger)row inIndexSet:(NSIndexSet *)indexSet
+{
+    NSUInteger currentIndex = [indexSet firstIndex];
+    NSInteger i = 0;
+    while (currentIndex != NSNotFound)
+    {
+        if (currentIndex < row) { i++; }
+        currentIndex = [indexSet indexGreaterThanIndex:currentIndex];
+    }
+    return i;
+}
+
+// WORK AROUND an NSTableView or something bug where the collapsed column leaves its contents drawn
+// in the cornerView area when resized... by aggressively redrawing the cornerview whenever the
+// columns resize, we can assure a clean slate.
+
+- (void)tableViewColumnDidResize:(NSNotification *)notification
+{
+    // Pay attention to column resizes and aggressively force the tableview's
+    // cornerview to redraw.
+    [[oTableView cornerView] setNeedsDisplay:YES];
+}
+
+@end
diff --git a/Balthisar Tidy/Classes/PreferencesWindow/PreferenceController.m b/Balthisar Tidy/Classes/PreferencesWindow/PreferenceController.m
index 4c4c562d..70c1c462 100755
--- a/Balthisar Tidy/Classes/PreferencesWindow/PreferenceController.m	
+++ b/Balthisar Tidy/Classes/PreferencesWindow/PreferenceController.m	
@@ -154,6 +154,9 @@ + (NSArray*)optionsInEffect
 						   @"hide-endtags",                 // Is a dupe of `omit-optional-tags`
 						   @"keep-time",                    // Balthisar Tidy handles this directly.
 						   @"language",                     // Not currently used; Mac OS X supports localization natively.
+                           @"markup",                       // Of course we always show markup! We're not a command line tool!
+                           @"mute",                         // Balthisar Tidy handles message muting directly.
+                           @"mute-id",                      // Balthisar Tidy handles message muting directly.
 						   @"output-bom",                   // Balthisar Tidy handles this directly.
 						   @"output-file",                  // Balthisar Tidy handles this directly.
 						   @"quiet",                        // Balthisar Tidy handles this directly.
diff --git a/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.h b/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.h
index 9905cc58..e0e3e14c 100644
--- a/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.h	
+++ b/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.h	
@@ -22,11 +22,18 @@
  *  - PopUps are only visible when hovered.
  *  - Steppers are only visible when hovered.
  *
- *  Finally it observes NSUserDefaults in order to change its hover effect.
+ *  It observes NSUserDefaults in order to change its hover effect.
+ *
+ *  Finally, it handles the NSPopover for its contents.
  */
-@interface JSDTableCellView : NSTableCellView
+@interface JSDTableCellView : NSTableCellView <NSPopoverDelegate>
 
 
+/**
+ *  Invokes the list editor for the text field.
+ */
+- (void)invokeListEditorForTextField;
+
 /**
  *  Specifies whether or not controls in the cell are always drawn, or if
  *  they're only drawn when the mouse cursor hovers over them.
@@ -38,10 +45,20 @@
  */
 @property (nonatomic, weak) IBOutlet NSStepper *stepperControl;
 
+/**
+ *  An outlet to the cell's NSTextField used with the stepper.
+ */
+@property (nonatomic, weak) IBOutlet NSTextField *stepperTextFieldControl;
+
 /**
  *  An outlet to the cell's NSPopUpButton.
  */
 @property (nonatomic, weak) IBOutlet NSPopUpButton *popupButtonControl;
 
+/**
+ *  An outlet to the cell's NSTextField for strings.
+ */
+@property (nonatomic, weak) IBOutlet NSTextField *textFieldControl;
+
 
 @end
diff --git a/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.m b/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.m
index 2358f3b8..9ad2bf84 100644
--- a/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.m	
+++ b/Balthisar Tidy/Classes/Support Pieces/JSDTableCellView.m	
@@ -7,9 +7,19 @@
  **************************************************************************************************/
 
 #import "JSDTableCellView.h"
+#import "JSDTidyOption.h"
+#import "JSDListEditorController.h"
 #import "CommonHeaders.h"
 
 
+@interface JSDTableCellView ()
+
+@property (nonatomic, strong) NSPopover *sharedPopover;
+@property (nonatomic, strong) JSDListEditorController *sharedListController;
+
+@end
+
+
 @implementation JSDTableCellView
 {
 @private
@@ -129,4 +139,69 @@ -(void)updateTrackingAreas
 	[self addTrackingArea:trackingArea];
 }
 
+
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  - setValue:forKeyPath
+    Validate the value with an instance of Tidy before applying.
+    @note This is a hacky solution; I need to rethink the architecture
+    a bit here.
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (void)setValue:(id)value forKeyPath:(NSString *)keyPath
+{
+    JSDTidyOption *option = self.objectValue;
+    value = [option normalizedOptionValue:value];
+    [super setValue:value forKeyPath:keyPath];
+}
+
+
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  - controlTextDidEndEditing
+    Update the text label after setting.
+    @note This is a hacky solution; I need to rethink the architecture
+    a bit here.
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (void)controlTextDidEndEditing:(NSNotification *)obj
+{
+    NSTextField *textField = obj.object;
+    JSDTidyOption *option = self.objectValue;
+    [textField setStringValue:option.optionUIValue];
+}
+
+
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  - configureListEditor:
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (void)configureListEditor
+{
+    self.sharedPopover = [[NSPopover alloc] init];
+    self.sharedListController = [[JSDListEditorController alloc] init];
+    [self.sharedPopover setContentViewController:self.sharedListController];
+    [self.sharedPopover setBehavior:NSPopoverBehaviorSemitransient];
+    [self.sharedPopover setDelegate:self];
+}
+
+
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  - invokeListEditorForTextField:
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (void)invokeListEditorForTextField
+{
+    JSDTidyOption *option = self.objectValue;
+    [self configureListEditor];
+    self.sharedListController.itemsText = option.optionUIValue;
+    [self.sharedPopover showRelativeToRect:self.textFieldControl.bounds ofView:self.textFieldControl preferredEdge:NSMaxYEdge];
+}
+
+
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  - popoverDidClose:
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (void)popoverDidClose:(NSNotification *)notification
+{
+    [self.objectValue setValue:self.sharedListController.itemsText forKey:@"optionUIValue"];
+    self.sharedListController = nil;
+    self.sharedPopover = nil;
+}
+
+
 @end
diff --git a/Balthisar Tidy/Classes/Support Pieces/JSDTableView.m b/Balthisar Tidy/Classes/Support Pieces/JSDTableView.m
index 49ecd3ff..023446cc 100644
--- a/Balthisar Tidy/Classes/Support Pieces/JSDTableView.m	
+++ b/Balthisar Tidy/Classes/Support Pieces/JSDTableView.m	
@@ -7,6 +7,9 @@
  **************************************************************************************************/
 
 #import "JSDTableView.h"
+#import "JSDTableCellView.h"
+#import "JSDTextField.h"
+#import "JSDTidyOption.h"
 #import "CommonHeaders.h"
 
 
@@ -35,6 +38,7 @@ - (void)awakeFromNib
 											   context:NULL];
 }
 
+
 /*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
   - observeValueForKeyPath:ofObject:change:context:
  *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
@@ -57,7 +61,6 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
 }
 
 
-
 /*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
   - keyDown:
     Calls the delegate's tableViewKeyWasPressed:row:keyCode
@@ -89,34 +92,91 @@ - (void)keyDown:(NSEvent *)theEvent
 }
 
 
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  - mouseDown:
+    If there's an NSTextField and the user double-clicks a row,
+    then we want to activate the NSTextField without making the
+    user wait. If the NSTextField has a list editor, then we want
+    to activate that with a triple click.
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    [super mouseDown:theEvent];
+
+    if (theEvent.clickCount < 2)
+    {
+        return;
+    }
+
+    /* Which row was clicked on? */
+    NSInteger row = [self rowAtPoint:[self convertPoint:theEvent.locationInWindow fromView:nil]];
+
+    if (row < 0)
+    {
+        return;
+    }
+
+    JSDTableCellView *view = [self viewAtColumn:0 row:row makeIfNecessary:NO];
+
+    /*
+        If the textFieldControl is visible, activate it on a double-click,
+        but don't activate it on more than a double-click, so that we can
+        show the list editor instead. We will delay activation by the system's
+        programmed doubleClickInterval, so that we can cancel it if a third
+        click comes in.
+     */
+    if ( view.textFieldControl.window != nil )
+    {
+        JSDTidyOption *opt = view.objectValue;
+
+        if ( theEvent.clickCount == 2 )
+        {
+            [self.window performSelector:@selector(makeFirstResponder:) withObject:view.textFieldControl  afterDelay:[NSEvent doubleClickInterval]];
+        } else if (opt.optionIsList) {
+            [NSObject cancelPreviousPerformRequestsWithTarget:self.window];
+            [view invokeListEditorForTextField];
+        }
+    }
+
+    /*
+        If the stepperTextFieldControl is visible, activate it when clicked
+        multiple times. We'll use the same delayed activation for consistent
+        behavior.
+     */
+    if ( view.stepperTextFieldControl.window != nil )
+    {
+        [self.window performSelector:@selector(makeFirstResponder:) withObject:view.stepperTextFieldControl  afterDelay:[NSEvent doubleClickInterval]];
+    }
+}
+
+
 /*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
   - validateProposedFirstResponder:forEvent:
     Allows a control in a table to become first responder
-    but first selecting the row. Also allow some controls
+    by first selecting the row. Also allow some controls
     to be first responder that generally aren't ever enabled
     (such as NSStepper).
  *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
 - (BOOL)validateProposedFirstResponder:(NSResponder *)responder
 							  forEvent:(NSEvent *)event
 {
-	/*
-		We want defaults behaviors for everything except
+    NSView *theResponder = (NSView*)responder;
+    BOOL isMouseDown = ( event.type == NSLeftMouseDown);
+    BOOL isSpecial = ( responder.class == NSStepper.class) || (responder.class == NSPopUpButton.class );
+
+    /*
+		We want default behaviors for everything except
 		mouseDown on NSStepper and NSPopupButton.
 	 */
-	 
-	BOOL isMouseDown = ([event type] == NSLeftMouseDown);
-	BOOL isSpecial = ([responder class] == [NSStepper class]) || ([responder class] == [NSPopUpButton class]);
 
-	if ( (!isSpecial) | (isSpecial && !isMouseDown) )
+	if ( !(isSpecial && isMouseDown) )
 	{
 		return [super validateProposedFirstResponder:responder forEvent:event];
 	}
 
-	NSView *theResponder = (NSView*)responder;
-
 	/* We're already on the currrently selected row. */
 	
-	if ([self rowForView:theResponder] == [self selectedRow])
+	if ([self rowForView:theResponder] == self.selectedRow)
 	{
 		return YES;
 	}
@@ -126,7 +186,7 @@ - (BOOL)validateProposedFirstResponder:(NSResponder *)responder
 	
     NSView *searchView = theResponder.superview;
 	
-    while ( (![searchView isKindOfClass:[NSTableRowView class]]) && (searchView != nil) )
+    while ( (![searchView isKindOfClass:NSTableRowView.class] ) && (searchView != nil) )
 	{
         if (searchView.superview)
 		{
@@ -134,7 +194,7 @@ - (BOOL)validateProposedFirstResponder:(NSResponder *)responder
         }
 	}
 
-	if (searchView)
+	if ( searchView )
 	{
 		NSTableRowView *targetedRow = (NSTableRowView*)searchView;
 		
diff --git a/Balthisar Tidy/Classes/vendor/DCOAboutWindow/DCOAboutWindow/DCOAboutWindow.xib b/Balthisar Tidy/Classes/vendor/DCOAboutWindow/DCOAboutWindow/Base.lproj/DCOAboutWindow.xib
similarity index 100%
rename from Balthisar Tidy/Classes/vendor/DCOAboutWindow/DCOAboutWindow/DCOAboutWindow.xib
rename to Balthisar Tidy/Classes/vendor/DCOAboutWindow/DCOAboutWindow/Base.lproj/DCOAboutWindow.xib
diff --git a/Balthisar Tidy/Classes/vendor/MASPreferences/MASPreferencesWindow.xib b/Balthisar Tidy/Classes/vendor/MASPreferences/Base.lproj/MASPreferencesWindow.xib
similarity index 100%
rename from Balthisar Tidy/Classes/vendor/MASPreferences/MASPreferencesWindow.xib
rename to Balthisar Tidy/Classes/vendor/MASPreferences/Base.lproj/MASPreferencesWindow.xib
diff --git a/Balthisar Tidy/Balthisar Tidy-Info.plist b/Balthisar Tidy/Info.plist
similarity index 93%
rename from Balthisar Tidy/Balthisar Tidy-Info.plist
rename to Balthisar Tidy/Info.plist
index c626f910..0f33ec69 100644
--- a/Balthisar Tidy/Balthisar Tidy-Info.plist	
+++ b/Balthisar Tidy/Info.plist	
@@ -105,11 +105,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleShortVersionString}</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleVersion}</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
@@ -145,7 +145,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>${JSD_APPLESCRIPT_VALUE}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright ©2017 Jim Derry. All rights reserved.</string>
+	<string>${TIDY_NSHumanReadableCopyright}</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -153,6 +153,11 @@
 	<key>NSServices</key>
 	<array>
 		<dict>
+			<key>NSRequiredContext</key>
+			<dict>
+				<key>NSServiceCategory</key>
+				<string>Internet</string>
+			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
 				<key>default</key>
@@ -161,7 +166,7 @@
 			<key>NSMenuItem</key>
 			<dict>
 				<key>default</key>
-				<string>Tidy selection in new Balthisar Tidy document</string>
+				<string>${TIDY_SERVICE_MENU_NAME}</string>
 			</dict>
 			<key>NSMessage</key>
 			<string>newDocumentWithSelection</string>
diff --git a/Balthisar Tidy/Resources/Base.lproj/Credits.rtf b/Balthisar Tidy/Resources/Base.lproj/Credits (web).rtf
similarity index 100%
rename from Balthisar Tidy/Resources/Base.lproj/Credits.rtf
rename to Balthisar Tidy/Resources/Base.lproj/Credits (web).rtf
diff --git a/Balthisar Tidy/Resources/Base.lproj/JSDListEditorController.xib b/Balthisar Tidy/Resources/Base.lproj/JSDListEditorController.xib
new file mode 100644
index 00000000..bbb17c4d
--- /dev/null
+++ b/Balthisar Tidy/Resources/Base.lproj/JSDListEditorController.xib	
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
+        <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="JSDListEditorController">
+            <connections>
+                <outlet property="buttonAdd" destination="pmF-QG-ULo" id="6lp-YN-ztx"/>
+                <outlet property="buttonRemove" destination="VSL-BC-EMT" id="0ZR-cP-mHQ"/>
+                <outlet property="theArrayController" destination="dTh-J6-zeg" id="H4A-DK-k4Y"/>
+                <outlet property="theTable" destination="tuL-U2-0kS" id="ZEI-dE-X9x"/>
+                <outlet property="view" destination="c22-O7-iKe" id="S50-5t-m3Q"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe" userLabel="ListEditorView">
+            <rect key="frame" x="0.0" y="0.0" width="380" height="216"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <box boxType="custom" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="qLD-fO-5qg">
+                    <rect key="frame" x="10" y="10" width="360" height="196"/>
+                    <view key="contentView" id="nVf-kT-JFC">
+                        <rect key="frame" x="1" y="1" width="358" height="194"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bnf-Bf-tEC" userLabel="Strings List">
+                                <rect key="frame" x="0.0" y="19" width="358" height="175"/>
+                                <clipView key="contentView" copiesOnScroll="NO" id="jp3-Sy-noi">
+                                    <rect key="frame" x="0.0" y="0.0" width="358" height="175"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" id="tuL-U2-0kS">
+                                            <rect key="frame" x="0.0" y="0.0" width="358" height="175"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <size key="intercellSpacing" width="3" height="2"/>
+                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                            <tableColumns>
+                                                <tableColumn identifier="" width="355" minWidth="40" maxWidth="1000" id="QTK-M6-zcE">
+                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
+                                                        <font key="font" metaFont="smallSystem"/>
+                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                    </tableHeaderCell>
+                                                    <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="4fv-Zc-MB4">
+                                                        <font key="font" metaFont="smallSystem"/>
+                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                    <connections>
+                                                        <binding destination="dTh-J6-zeg" name="value" keyPath="arrangedObjects.string" id="4DE-qG-y3Y">
+                                                            <dictionary key="options">
+                                                                <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/>
+                                                            </dictionary>
+                                                        </binding>
+                                                    </connections>
+                                                </tableColumn>
+                                            </tableColumns>
+                                            <connections>
+                                                <binding destination="dTh-J6-zeg" name="content" keyPath="arrangedObjects" id="In1-Zc-ih4"/>
+                                                <binding destination="dTh-J6-zeg" name="selectionIndexes" keyPath="selectionIndexes" previousBinding="In1-Zc-ih4" id="H8f-q0-65e"/>
+                                                <outlet property="dataSource" destination="dTh-J6-zeg" id="r0Q-s5-O9J"/>
+                                                <outlet property="delegate" destination="dTh-J6-zeg" id="mw8-MU-6s4"/>
+                                            </connections>
+                                        </tableView>
+                                    </subviews>
+                                </clipView>
+                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="heS-72-9cb">
+                                    <rect key="frame" x="1" y="8" width="0.0" height="15"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                                <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="PUm-xr-Jaw">
+                                    <rect key="frame" x="224" y="17" width="15" height="102"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                            </scrollView>
+                            <box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="ofe-gy-A6I">
+                                <rect key="frame" x="-1" y="-1" width="360" height="20"/>
+                                <view key="contentView" id="x8B-Ng-IsC">
+                                    <rect key="frame" x="0.0" y="0.0" width="360" height="20"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pmF-QG-ULo" userLabel="buttonAdd">
+                                            <rect key="frame" x="10" y="2" width="11" height="15"/>
+                                            <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="overlaps" alignment="center" controlSize="mini" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" id="jgR-sc-myf">
+                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="miniSystem"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <action selector="add:" target="dTh-J6-zeg" id="r8D-Gu-213"/>
+                                            </connections>
+                                        </button>
+                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VSL-BC-EMT" userLabel="buttonRemove">
+                                            <rect key="frame" x="31" y="2" width="11" height="15"/>
+                                            <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" controlSize="mini" lineBreakMode="truncatingTail" enabled="NO" state="on" imageScaling="proportionallyDown" inset="2" id="Xcr-Pp-GYw">
+                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="miniSystem"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <action selector="remove:" target="dTh-J6-zeg" id="ik3-hd-i7F"/>
+                                                <binding destination="dTh-J6-zeg" name="enabled" keyPath="canRemove" id="OA9-5t-kNL"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="pmF-QG-ULo" firstAttribute="leading" secondItem="x8B-Ng-IsC" secondAttribute="leading" constant="10" id="34k-fS-v9t"/>
+                                        <constraint firstItem="VSL-BC-EMT" firstAttribute="leading" secondItem="pmF-QG-ULo" secondAttribute="trailing" constant="10" id="EUP-QH-XkH"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="VSL-BC-EMT" secondAttribute="trailing" constant="20" symbolic="YES" id="zRb-i1-d2J"/>
+                                    </constraints>
+                                </view>
+                                <constraints>
+                                    <constraint firstItem="VSL-BC-EMT" firstAttribute="centerY" secondItem="ofe-gy-A6I" secondAttribute="centerY" id="BvF-og-8nN"/>
+                                    <constraint firstItem="pmF-QG-ULo" firstAttribute="centerY" secondItem="ofe-gy-A6I" secondAttribute="centerY" id="bC1-E2-yQF"/>
+                                    <constraint firstAttribute="height" constant="20" id="sFY-bN-KY4"/>
+                                </constraints>
+                            </box>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="Bnf-Bf-tEC" secondAttribute="trailing" id="SDb-an-Caz"/>
+                            <constraint firstItem="Bnf-Bf-tEC" firstAttribute="top" secondItem="nVf-kT-JFC" secondAttribute="top" id="pOA-4W-5xh"/>
+                            <constraint firstItem="Bnf-Bf-tEC" firstAttribute="leading" secondItem="nVf-kT-JFC" secondAttribute="leading" id="pOr-gu-mFF"/>
+                            <constraint firstItem="ofe-gy-A6I" firstAttribute="top" secondItem="Bnf-Bf-tEC" secondAttribute="bottom" id="y4M-US-Mef"/>
+                        </constraints>
+                    </view>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="ofe-gy-A6I" secondAttribute="bottom" id="F8K-68-jhE"/>
+                        <constraint firstAttribute="trailing" secondItem="ofe-gy-A6I" secondAttribute="trailing" id="GIW-NK-k1I"/>
+                        <constraint firstItem="ofe-gy-A6I" firstAttribute="leading" secondItem="qLD-fO-5qg" secondAttribute="leading" id="Kei-LK-2sV"/>
+                    </constraints>
+                    <color key="borderColor" name="controlShadowColor" catalog="System" colorSpace="catalog"/>
+                </box>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="qLD-fO-5qg" secondAttribute="trailing" constant="10" id="DaD-xG-YVt"/>
+                <constraint firstItem="qLD-fO-5qg" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="10" id="WxN-Sl-bN6"/>
+                <constraint firstAttribute="bottom" secondItem="qLD-fO-5qg" secondAttribute="bottom" constant="10" id="XXk-Wq-g8S"/>
+                <constraint firstItem="qLD-fO-5qg" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="10" id="ihn-cH-OH0"/>
+            </constraints>
+            <point key="canvasLocation" x="74" y="141"/>
+        </customView>
+        <arrayController avoidsEmptySelection="NO" id="dTh-J6-zeg" customClass="RSRTVArrayController">
+            <connections>
+                <binding destination="-2" name="contentArray" keyPath="self.pitems" id="gd4-iR-Yjj"/>
+                <outlet property="oTableView" destination="tuL-U2-0kS" id="0sA-My-6ml"/>
+            </connections>
+        </arrayController>
+    </objects>
+    <resources>
+        <image name="NSAddTemplate" width="11" height="11"/>
+        <image name="NSRemoveTemplate" width="11" height="11"/>
+    </resources>
+</document>
diff --git a/Balthisar Tidy/Resources/Base.lproj/Localizable.strings b/Balthisar Tidy/Resources/Base.lproj/Localizable.strings
index 3467a141..c733b564 100755
--- a/Balthisar Tidy/Resources/Base.lproj/Localizable.strings	
+++ b/Balthisar Tidy/Resources/Base.lproj/Localizable.strings	
@@ -1,4 +1,4 @@
-/* File Saving */
+/* File Saving and Opening */
 
 "WarnSaveDisabled"			= "You must use “Save As…” to save this document.";
 "WarnSaveDisabledExplain"	= "Direct saving of documents is currently disabled in Preferences in order to prevent inadvertent overwriting of original documents. After you have performed “Save As…,” this warning will no longer appear, since it will no longer apply.";
@@ -6,6 +6,10 @@
 "WarnSaveOverwrite"			= "The original document will be replaced with the Tidy’d document.";
 "WarnSaveOverwriteExplain"	= "You are seeing this message because you’ve set the option in Preferences. Once you have performed “Save” or “Save As…” one time, this warning will no longer appear, since it will no longer apply.";
 
+"WarnTryForceOutput"        = "No Document was Generated";
+"WarnTryForceOutputExplain" = "You have loaded a document, but it produced no output. If it had substantial errors, you can attempt to force output with the “force-output” option in the Tidy Options panel.";
+"WarnTryForceOutputButton"  = "OK";
+
 "continue save"	= "Save";
 "do not save"	= "Don’t Save";
 "cancel"		= "Cancel";
diff --git a/Balthisar Tidy/Resources/Base.lproj/OptionPane.xib b/Balthisar Tidy/Resources/Base.lproj/OptionPane.xib
index 5c335cd1..8c760610 100755
--- a/Balthisar Tidy/Resources/Base.lproj/OptionPane.xib	
+++ b/Balthisar Tidy/Resources/Base.lproj/OptionPane.xib	
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="OptionPaneController">
@@ -29,7 +31,7 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <tableView identifier="optionsTable" focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" autosaveName="" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="rLn-af-rHD" customClass="JSDTableView">
-                                        <rect key="frame" x="0.0" y="0.0" width="300" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="300" height="337"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <size key="intercellSpacing" width="0.0" height="2"/>
                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -168,7 +170,7 @@
                                                                                                 <rect key="frame" x="0.0" y="0.0" width="130" height="24"/>
                                                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                                 <subviews>
-                                                                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Wv5-Uh-AKN">
+                                                                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Wv5-Uh-AKN" customClass="JSDTextField">
                                                                                                         <rect key="frame" x="10" y="3" width="117" height="17"/>
                                                                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="option value" id="ASw-zL-5Ib">
                                                                                                             <font key="font" metaFont="system"/>
@@ -177,6 +179,7 @@
                                                                                                         </textFieldCell>
                                                                                                         <connections>
                                                                                                             <binding destination="Jz7-gz-B3D" name="value" keyPath="objectValue.optionUIValue" id="9Cv-FB-0l9"/>
+                                                                                                            <outlet property="delegate" destination="Jz7-gz-B3D" id="as0-xg-Zbj"/>
                                                                                                         </connections>
                                                                                                     </textField>
                                                                                                 </subviews>
@@ -297,6 +300,8 @@
                                                         <connections>
                                                             <outlet property="popupButtonControl" destination="yho-dg-Xfd" id="0Vr-ZG-Xo3"/>
                                                             <outlet property="stepperControl" destination="9gy-cc-TJU" id="i5t-ZS-LLi"/>
+                                                            <outlet property="stepperTextFieldControl" destination="35g-HY-3xn" id="iyk-4b-FUO"/>
+                                                            <outlet property="textFieldControl" destination="Wv5-Uh-AKN" id="GWY-gx-0bk"/>
                                                         </connections>
                                                     </tableCellView>
                                                 </prototypeCellViews>
@@ -450,6 +455,7 @@
                 <constraint firstAttribute="bottom" secondItem="Jr5-JD-RhE" secondAttribute="bottom" constant="30" id="3ay-9q-FzI"/>
                 <constraint firstItem="Jr5-JD-RhE" firstAttribute="top" secondItem="rPU-Tz-0O3" secondAttribute="bottom" constant="8" id="DF9-VA-g28"/>
                 <constraint firstAttribute="trailing" secondItem="rPU-Tz-0O3" secondAttribute="trailing" id="HWw-4N-1sy"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ASB-I3-wPl" secondAttribute="trailing" constant="20" symbolic="YES" id="LT7-hn-VQI"/>
                 <constraint firstItem="XaC-w5-Lwz" firstAttribute="leading" secondItem="21" secondAttribute="leading" id="N7F-Fz-bwf"/>
                 <constraint firstItem="rPU-Tz-0O3" firstAttribute="leading" secondItem="21" secondAttribute="leading" id="U2k-ff-8lx"/>
                 <constraint firstAttribute="bottom" secondItem="ASB-I3-wPl" secondAttribute="bottom" constant="5" id="YZV-sF-Xyi"/>
diff --git a/Balthisar Tidy/Resources/Base.lproj/TDFTableViewController.xib b/Balthisar Tidy/Resources/Base.lproj/TDFTableViewController.xib
index aef36ded..e7019bf7 100644
--- a/Balthisar Tidy/Resources/Base.lproj/TDFTableViewController.xib	
+++ b/Balthisar Tidy/Resources/Base.lproj/TDFTableViewController.xib	
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="TDFTableViewController">
@@ -49,6 +51,7 @@
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="r7Y-DK-H8S">
                                                         <rect key="frame" x="3" y="0.0" width="17" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSActionTemplate" id="bM7-Im-4Ve"/>
                                                         <connections>
                                                             <binding destination="Jk1-fH-1IH" name="value" keyPath="objectValue.levelImage" id="d4s-1o-uFW">
@@ -61,6 +64,7 @@
                                                     </imageView>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ayR-7t-O2l">
                                                         <rect key="frame" x="25" y="-2" width="136" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Severity" id="nNh-uu-9GB">
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -109,6 +113,7 @@
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hjt-2g-spz">
                                                         <rect key="frame" x="0.0" y="-2" width="150" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Location" id="6IP-W7-JiJ">
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -198,7 +203,6 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
                     <scroller key="horizontalScroller" focusRingType="none" verticalHuggingPriority="750" horizontal="YES" id="giK-mE-uWf">
                         <rect key="frame" x="0.0" y="210" width="464" height="15"/>
@@ -219,7 +223,6 @@
                         <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="v04-o5-cGR" userLabel="Action Menu">
                             <rect key="frame" x="0.0" y="5" width="38" height="19"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="38" id="GCp-FH-nKG"/>
                                 <constraint firstAttribute="height" constant="19" id="iJz-lY-sxx"/>
                             </constraints>
                             <popUpButtonCell key="cell" type="smallSquare" bezelStyle="smallSquare" alignment="center" controlSize="small" lineBreakMode="truncatingTail" state="on" inset="2" pullsDown="YES" id="9Y0-nG-Bod">
@@ -310,6 +313,7 @@
                                 </button>
                             </subviews>
                             <constraints>
+                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="xqe-7i-5Fk" secondAttribute="trailing" constant="20" symbolic="YES" id="0D5-Un-U4A"/>
                                 <constraint firstItem="I6z-eh-slj" firstAttribute="leading" secondItem="kGk-mL-RM1" secondAttribute="trailing" constant="8" symbolic="YES" id="4Ek-Ah-s5M"/>
                                 <constraint firstItem="I6z-eh-slj" firstAttribute="centerY" secondItem="7AF-aC-U5W" secondAttribute="centerY" id="Bgd-Ke-6bI"/>
                                 <constraint firstItem="xqe-7i-5Fk" firstAttribute="centerY" secondItem="7AF-aC-U5W" secondAttribute="centerY" id="BjO-zH-4Q3"/>
diff --git a/Balthisar Tidy/Resources/Base.lproj/UpdaterOptionsViewController.xib b/Balthisar Tidy/Resources/Base.lproj/UpdaterOptionsViewController.xib
index 09e41a00..1f76a9a3 100644
--- a/Balthisar Tidy/Resources/Base.lproj/UpdaterOptionsViewController.xib	
+++ b/Balthisar Tidy/Resources/Base.lproj/UpdaterOptionsViewController.xib	
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="UpdaterOptionsViewController">
@@ -21,7 +22,6 @@
             <subviews>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOv-LA-86n" userLabel="Panel Description" customClass="JSDTextField">
                     <rect key="frame" x="18" y="217" width="354" height="28"/>
-                    <animations/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="These preferences affect Balthisar Tidy’s automatic software updating behaviors, including anonymous system profiling." id="ItN-wx-tq3">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -30,15 +30,13 @@
                 </textField>
                 <button horizontalHuggingPriority="100" verticalHuggingPriority="750" horizontalCompressionResistancePriority="100" translatesAutoresizingMaskIntoConstraints="NO" id="yo8-mK-nbv">
                     <rect key="frame" x="18" y="181" width="354" height="18"/>
-                    <animations/>
                     <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="199-Jd-w5t">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <textField horizontalHuggingPriority="100" verticalHuggingPriority="750" horizontalCompressionResistancePriority="100" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vbG-SS-TIn">
-                    <rect key="frame" x="33" y="147" width="339" height="28"/>
-                    <animations/>
+                    <rect key="frame" x="34" y="147" width="338" height="28"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="If selected, Balthisar Tidy will check for newer versions of itself at the interval that you select." id="NjB-ZN-IaO">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -46,11 +44,10 @@
                     </textFieldCell>
                 </textField>
                 <popUpButton horizontalHuggingPriority="100" verticalHuggingPriority="750" horizontalCompressionResistancePriority="100" translatesAutoresizingMaskIntoConstraints="NO" id="1io-hf-BZR">
-                    <rect key="frame" x="48" y="115" width="205" height="26"/>
+                    <rect key="frame" x="48" y="115" width="105" height="26"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="200" id="BWR-2v-3sb"/>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="re0-Go-hoI"/>
                     </constraints>
-                    <animations/>
                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="Dmu-Rs-uf3">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
@@ -65,15 +62,13 @@
                 </popUpButton>
                 <button horizontalHuggingPriority="100" verticalHuggingPriority="750" horizontalCompressionResistancePriority="100" translatesAutoresizingMaskIntoConstraints="NO" id="101-ny-HpV">
                     <rect key="frame" x="18" y="82" width="354" height="18"/>
-                    <animations/>
                     <buttonCell key="cell" type="check" title="Send anonymous system profile during checks" bezelStyle="regularSquare" imagePosition="left" inset="2" id="iga-2N-Szj">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <textField horizontalHuggingPriority="100" verticalHuggingPriority="750" horizontalCompressionResistancePriority="100" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GvP-BF-zXH">
-                    <rect key="frame" x="33" y="20" width="339" height="56"/>
-                    <animations/>
+                    <rect key="frame" x="42" y="20" width="330" height="56"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="paF-bX-x7p">
                         <font key="font" metaFont="smallSystem"/>
                         <string key="title">If selected, Balthisar Tidy will send basic information about your computer to balthisar.com (and no one else) during software update checks. This information is used only to help us improve Balthisar Tidy.</string>
@@ -83,26 +78,26 @@
                 </textField>
             </subviews>
             <constraints>
-                <constraint firstItem="vbG-SS-TIn" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="35" id="7wk-gd-V71"/>
+                <constraint firstItem="vbG-SS-TIn" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="7wk-gd-V71"/>
                 <constraint firstAttribute="bottom" secondItem="GvP-BF-zXH" secondAttribute="bottom" constant="20" symbolic="YES" id="Bsb-3D-VB7"/>
                 <constraint firstItem="yo8-mK-nbv" firstAttribute="top" secondItem="kOv-LA-86n" secondAttribute="bottom" constant="20" id="DXe-sn-opg"/>
                 <constraint firstAttribute="trailing" secondItem="kOv-LA-86n" secondAttribute="trailing" constant="20" symbolic="YES" id="GKy-bp-nos"/>
+                <constraint firstItem="1io-hf-BZR" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="Hz6-mo-xeY" secondAttribute="trailing" constant="20" symbolic="YES" id="GpA-Wj-lYD"/>
                 <constraint firstItem="vbG-SS-TIn" firstAttribute="top" secondItem="yo8-mK-nbv" secondAttribute="bottom" constant="8" symbolic="YES" id="KaV-4a-qh3"/>
                 <constraint firstItem="101-ny-HpV" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="LCy-SX-b9H"/>
-                <constraint firstItem="1io-hf-BZR" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="50" id="PLL-OL-v8m"/>
                 <constraint firstItem="101-ny-HpV" firstAttribute="top" secondItem="1io-hf-BZR" secondAttribute="bottom" constant="20" id="RI0-NJ-QSs"/>
                 <constraint firstAttribute="trailing" secondItem="vbG-SS-TIn" secondAttribute="trailing" constant="20" symbolic="YES" id="Tzh-nm-VHS"/>
                 <constraint firstItem="kOv-LA-86n" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="VLe-4K-if4"/>
                 <constraint firstItem="1io-hf-BZR" firstAttribute="top" secondItem="vbG-SS-TIn" secondAttribute="bottom" constant="8" symbolic="YES" id="WBS-Jo-OuW"/>
-                <constraint firstItem="GvP-BF-zXH" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="35" id="YRX-CG-BMT"/>
+                <constraint firstItem="GvP-BF-zXH" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="YRX-CG-BMT"/>
                 <constraint firstAttribute="trailing" secondItem="yo8-mK-nbv" secondAttribute="trailing" constant="20" symbolic="YES" id="dgp-xY-7mp"/>
                 <constraint firstItem="GvP-BF-zXH" firstAttribute="top" secondItem="101-ny-HpV" secondAttribute="bottom" constant="8" symbolic="YES" id="gnW-06-wgL"/>
+                <constraint firstAttribute="leading" secondItem="1io-hf-BZR" secondAttribute="leading" constant="-50" id="kYe-9e-DJV"/>
                 <constraint firstItem="yo8-mK-nbv" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="kah-bg-ZCf"/>
                 <constraint firstAttribute="trailing" secondItem="101-ny-HpV" secondAttribute="trailing" constant="20" symbolic="YES" id="lFf-6N-0ZA"/>
                 <constraint firstAttribute="trailing" secondItem="GvP-BF-zXH" secondAttribute="trailing" constant="20" symbolic="YES" id="rXl-b0-rk2"/>
                 <constraint firstItem="kOv-LA-86n" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="10" id="t7y-Lj-7Un"/>
             </constraints>
-            <animations/>
         </customView>
     </objects>
 </document>
diff --git a/Config/Balthisar Tidy Help Project.xcconfig b/Config/Balthisar Tidy Help Project.xcconfig
new file mode 100644
index 00000000..42a139ff
--- /dev/null
+++ b/Config/Balthisar Tidy Help Project.xcconfig	
@@ -0,0 +1,11 @@
+//
+// Balthisar Tidy Help Project.xcconfig
+//
+// This is the configuration for Balthisar Tidy Help Project, which is an
+// external build system. Note that this is a convenience target and nothing
+// more, and assumes that you have all of the build dependencies installed,
+// and managed by RVM.
+//
+
+
+PRODUCT_NAME = $(TARGET_NAME)
diff --git a/Config/JSDTidyFramework Documentation.xcconfig b/Config/JSDTidyFramework Documentation.xcconfig
new file mode 100644
index 00000000..973ca424
--- /dev/null
+++ b/Config/JSDTidyFramework Documentation.xcconfig	
@@ -0,0 +1,10 @@
+//
+// JSDTidyFramework Documentation.xcconfig
+//
+// This is the configuration for JSDTidyFramework Documentation. Given that
+// this is an external build system project, there's not really anything to
+// see here other than the required product name.
+//
+
+
+PRODUCT_NAME = $(TARGET_NAME)
diff --git a/Config/JSDTidyFramework.xcconfig b/Config/JSDTidyFramework.xcconfig
new file mode 100644
index 00000000..9a040215
--- /dev/null
+++ b/Config/JSDTidyFramework.xcconfig
@@ -0,0 +1,29 @@
+//
+// JSDTidyFramework.xcconfig
+//
+// This is the configuration for JSDTidyFramework. It inherits the majority
+// of its settings from the project level, so be sure to check the project
+// configuration if you attempt to extract the framework from the project.
+
+
+// This framework is used in application extensions, and so it must be 
+// prohibited from accessing non-safe APIs.
+APPLICATION_EXTENSION_API_ONLY = YES
+
+CURRENT_PROJECT_VERSION = 1
+DEFINES_MODULE = YES
+DYLIB_COMPATIBILITY_VERSION = 1
+DYLIB_CURRENT_VERSION = 1
+DYLIB_INSTALL_NAME_BASE = @rpath
+FRAMEWORK_VERSION = A
+INFOPLIST_FILE = JSDTidyFramework/Info.plist
+
+// In order to allow the use of user-installed libtidy-balthisar.dylib, we want
+// the linker to search the traditional Unix location for it first, followed
+// by the typical macOS paths. Probably can be updated for iOS paths, too.
+LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/local/lib @executable_path/../Frameworks @loader_path/Frameworks
+
+PRODUCT_BUNDLE_IDENTIFIER = com.balthisar.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = $(TARGET_NAME)
+SKIP_INSTALL = YES
+VERSIONING_SYSTEM = apple-generic
diff --git a/Config/balthisar-base.xcconfig b/Config/balthisar-base.xcconfig
new file mode 100644
index 00000000..7f9cdaf1
--- /dev/null
+++ b/Config/balthisar-base.xcconfig
@@ -0,0 +1,81 @@
+//
+// balthisar-base.xcconfig
+//
+// Contains project-wide defaults for all build settings in this project. We
+// only keep settings that are different from the XCode defaults.
+//
+// This file is not used as a configuration directly, but is imported by the
+// debug and release project-level configurations.
+//
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+
+CODE_SIGN_IDENTITY = Mac Developer
+FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Balthisar Tidy/Frameworks"
+MACOSX_DEPLOYMENT_TARGET = 10.10
+SDKROOT = macosx
+
+
+//*****************************************************************************
+// Common plist Settings
+//*****************************************************************************
+
+// Publically visible version.
+TIDY_CFBundleShortVersionString = 3.7.0
+
+// Used by app store; does not have to match the CFBundleShortVersionString.
+TIDY_CFBundleVersion = 370.0.1
+
+TIDY_NSHumanReadableCopyright = Copyright ©2017 Jim Derry. All Rights Reserved.
+
+
+//*****************************************************************************
+// Other defaults
+//*****************************************************************************
+
+ALWAYS_SEARCH_USER_PATHS = NO
+APPLY_RULES_IN_COPY_FILES = YES
+
+CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
+CLANG_ENABLE_MODULES = YES
+CLANG_ENABLE_OBJC_ARC = YES
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES
+CLANG_WARN_BOOL_CONVERSION = YES
+CLANG_WARN_COMMA = YES
+CLANG_WARN_CONSTANT_CONVERSION = YES
+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES
+CLANG_WARN_EMPTY_BODY = YES
+CLANG_WARN_ENUM_CONVERSION = YES
+CLANG_WARN_FLOAT_CONVERSION = YES
+CLANG_WARN_INFINITE_RECURSION = YES
+CLANG_WARN_INT_CONVERSION = YES
+CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES
+CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES
+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
+CLANG_WARN_OBJC_LITERAL_CONVERSION = YES
+CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
+CLANG_WARN_RANGE_LOOP_ANALYSIS = YES
+CLANG_WARN_STRICT_PROTOTYPES = YES
+CLANG_WARN_SUSPICIOUS_MOVE = YES
+CLANG_WARN_UNREACHABLE_CODE = YES
+
+COMBINE_HIDPI_IMAGES = YES
+COPY_PHASE_STRIP = NO
+ENABLE_STRICT_OBJC_MSGSEND = YES
+
+GCC_C_LANGUAGE_STANDARD = gnu99
+GCC_NO_COMMON_BLOCKS = YES
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES
+GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
+GCC_WARN_SHADOW = YES
+GCC_WARN_UNDECLARED_SELECTOR = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES
+GCC_WARN_UNUSED_FUNCTION = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+
+
diff --git a/Config/balthisar-debug.xcconfig b/Config/balthisar-debug.xcconfig
new file mode 100644
index 00000000..a45ec511
--- /dev/null
+++ b/Config/balthisar-debug.xcconfig
@@ -0,0 +1,23 @@
+//
+// balthisar-debug.xcconfig
+//
+// Debug configuration specific settings for the base project.
+//
+
+#include "balthisar-base.xcconfig"
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1
+
+
+//*****************************************************************************
+// Other defaults
+//*****************************************************************************
+
+ENABLE_TESTABILITY = YES
+GCC_OPTIMIZATION_LEVEL = 0
+ONLY_ACTIVE_ARCH = YES
diff --git a/Config/balthisar-release.xcconfig b/Config/balthisar-release.xcconfig
new file mode 100644
index 00000000..d02895d5
--- /dev/null
+++ b/Config/balthisar-release.xcconfig
@@ -0,0 +1,21 @@
+//
+// balthisar-release.xcconfig
+//
+// Debug configuration specific settings for the base project.
+//
+
+#include "balthisar-base.xcconfig"
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+
+
+//*****************************************************************************
+// Other defaults
+//*****************************************************************************
+
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+ENABLE_NS_ASSERTIONS = NO
+GCC_OPTIMIZATION_LEVEL = 3
diff --git a/Config/balthisar-tidy-id.xcconfig b/Config/balthisar-tidy-id.xcconfig
new file mode 100644
index 00000000..190a7e5a
--- /dev/null
+++ b/Config/balthisar-tidy-id.xcconfig
@@ -0,0 +1,84 @@
+//
+// balthisar-tidy-id.xcconfig
+//
+// This configures the base identifying information for Balthisar Tidy.
+//
+// This file is not used as a configuration directly, but is imported by
+// other configurations in order to avoid redefining these values and
+// having to keep them synchnronized.
+
+
+// These will be used to make the TIDY_APP_BUNDLE_ID, which will be used to
+// populate PRODUCT_BUNDLE_IDENTIFIER, but must also be known to create the
+// proper identifiers for helper applications and extensions.
+TABID_app_debug = com.balthisar.Balthisar-Tidy
+TABID_app_release = com.balthisar.Balthisar-Tidy
+TABID_pro_debug = com.balthisar.Balthisar-Tidy.pro
+TABID_pro_release = com.balthisar.Balthisar-Tidy.pro
+TABID_web_debug = com.balthisar.web.free.balthisar-tidy
+TABID_web_release = com.balthisar.web.free.balthisar-tidy
+
+
+// These will be used to make the TIDY_APP_PRODUCT_NAME, which will be used to
+// populate PRODUCT_NAME, but must also be known to create the proper
+// identifiers for helper applications and extensions.
+PN_app_debug = Balthisar Tidy (debug)
+PN_app_release = Balthisar Tidy
+PN_pro_debug = Balthisar Tidy for Work (debug)
+PN_pro_release = Balthisar Tidy for Work
+PN_web_debug = Balthisar Tidy (web-debug)
+PN_web_release = Balthisar Tidy
+
+
+// These will be used to set the required pre-processor definitions in the
+// application as well as the helpers.
+PPD_app_debug = TARGET_APP
+PPD_app_release = TARGET_APP
+PPD_pro_debug = TARGET_PRO
+PPD_pro_release = TARGET_PRO
+PPD_web_debug = TARGET_WEB
+PPD_web_release = TARGET_WEB
+
+
+// These will be used to make the JSD_APPLESCRIPT_VALUE, which is used in the
+// plist to indicate whether or not the executable supports AppleScript. Note
+// that the final Boolean value in the plist editor will always show NO,
+// despite setting this to a configuration value.
+ASV_app_debug = no
+ASV_app_release = no
+ASV_pro_debug = yes
+ASV_pro_release = yes
+ASV_web_debug = no
+ASV_web_release = no
+
+
+// These will be used to make the TIDY_SDEF, which is used in the plist to
+// indicate the scripting definition file for AppleScript support.
+SDEF_app_debug =
+SDEF_app_release =
+SDEF_pro_debug = TidyScripting.sdef
+SDEF_pro_release = TidyScripting.sdef
+SDEF_web_debug =
+SDEF_web_release =
+
+
+// Assets to exclude from the individual builds.
+EXCL_app_debug = "AppleScriptsforTidy.dmg" "Balthisar Tidy (pro).help" "Balthisar Tidy (web).help" "TidyScripting.sdef" "Credits (pro).rtf" "Credits (web).rtf" "Sparkle.framework"
+EXCL_app_release = $(EXCL_app_debug)
+EXCL_pro_debug = "Balthisar Tidy (app).help" "Balthisar Tidy (web).help" "Credits (app).rtf" "Credits (web).rtf" "Sparkle.framework"
+EXCL_pro_release = $(EXCL_pro_debug)
+EXCL_web_debug = "AppleScriptsforTidy.dmg" "Balthisar Tidy (app).help" "Balthisar Tidy (pro).help" "TidyScripting.sdef" "Credits (app).rtf" "Credits (pro).rtf"
+EXCL_web_release = $(EXCL_web_debug)
+
+
+//*****************************************************************************
+// FINAL VALUES
+//*****************************************************************************
+TIDY_APP_BUNDLE_ID = $(TABID_$(CONFIGURATION))
+TIDY_APP_PRODUCT_NAME = $(PN_$(CONFIGURATION))
+TIDY_PREPROCESSOR_DEFS = $(PPD_$(CONFIGURATION))
+
+JSD_APPLESCRIPT_VALUE = $(ASV_$(CONFIGURATION))
+TIDY_SDEF = $(SDEF_$(CONFIGURATION))
+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCL_$(CONFIGURATION))
diff --git a/Config/balthisar-tidy.xcconfig b/Config/balthisar-tidy.xcconfig
new file mode 100644
index 00000000..17307729
--- /dev/null
+++ b/Config/balthisar-tidy.xcconfig
@@ -0,0 +1,69 @@
+//
+// balthisar-tidy-web.xcconfig
+//
+// This is the configuration for Balthisar Tidy.
+//
+
+#include "balthisar-tidy-id.xcconfig"
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+INFOPLIST_FILE = Balthisar Tidy/Info.plist
+LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
+PRODUCT_BUNDLE_IDENTIFIER = ${TIDY_APP_BUNDLE_ID}
+PRODUCT_NAME = ${TIDY_APP_PRODUCT_NAME}
+GCC_PREPROCESSOR_DEFINITIONS = ${TIDY_PREPROCESSOR_DEFS} $(inherited)
+CODE_SIGN_ENTITLEMENTS = $(SRCROOT)/Balthisar Tidy/Balthisar Tidy.entitlements
+
+//*****************************************************************************
+// Scheme Dependant Values
+//*****************************************************************************
+
+// These will be used to make the TIDY_HELP_BOOK_FOLDER for the plist.
+THBF_app_debug = Balthisar Tidy (app).help
+THBF_app_release = Balthisar Tidy (app).help
+THBF_pro_debug = Balthisar Tidy (pro).help
+THBF_pro_release = Balthisar Tidy (pro).help
+THBF_web_debug = Balthisar Tidy (web).help
+THBF_web_release = Balthisar Tidy (web).help
+
+
+// These will be used to make the TIDY_HELP_BOOK_KEY for the plist.
+THBK_app_debug = com.balthisar.Balthisar-Tidy.help
+THBK_app_release = com.balthisar.Balthisar-Tidy.help
+THBK_pro_debug = com.balthisar.Balthisar-Tidy.pro.help
+THBK_pro_release = com.balthisar.Balthisar-Tidy.pro.help
+THBK_web_debug = com.balthisar.Balthisar-Tidy.web.help
+THBK_web_release = com.balthisar.Balthisar-Tidy.web.help
+
+
+// These will be used to make the TIDY_UPDATE_URL for the plist.
+// The $() variable substitution prevents a bug from dropping the URL.
+TURL_app_debug =
+TURL_app_release =
+TURL_pro_debug =
+TURL_pro_release =
+TURL_web_debug = http:/$()/localhost:4567/softwareupdates/updatecheck/tidy/index.xml
+TURL_web_release = http:/$()/www.balthisar.com/softwareupdates/updatecheck/tidy/index.xml
+
+
+// Service
+SVC_app_debug = Tidy selection in new Balthisar Tidy document (app)
+SVC_app_release = Tidy selection in new Balthisar Tidy document
+SVC_pro_debug = Tidy selection in new Balthisar Tidy document (pro)
+SVC_pro_release = Tidy selection in new Balthisar Tidy for Work document
+SVC_web_debug = Tidy selection in new Balthisar Tidy document (web)
+SVC_web_release = Tidy selection in new Balthisar Tidy document
+
+
+//*****************************************************************************
+// FINAL VALUES
+//*****************************************************************************
+TIDY_HELP_BOOK_FOLDER = $(THBF_$(CONFIGURATION))
+TIDY_HELP_BOOK_KEY = $(THBK_$(CONFIGURATION))
+TIDY_UPDATE_URL = $(TURL_$(CONFIGURATION))
+
+TIDY_SERVICE_MENU_NAME = $(SVC_$(CONFIGURATION))
+
diff --git a/Config/extension-tidy.xcconfig b/Config/extension-tidy.xcconfig
new file mode 100644
index 00000000..f7f5cd45
--- /dev/null
+++ b/Config/extension-tidy.xcconfig
@@ -0,0 +1,39 @@
+//
+// extension-tidy.xcconfig
+//
+// This is the configuration for the Tidy extension.
+//
+
+#include "balthisar-tidy-id.xcconfig"
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+
+INFOPLIST_FILE = Balthisar Tidy Extension/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = ${TIDY_APP_BUNDLE_ID}.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = ${TARGET_NAME}
+SKIP_INSTALL = YES
+CODE_SIGN_ENTITLEMENTS = $(SRCROOT)/Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements
+
+// The required framework is in the bundle, so we don't need to look for it
+// in our own Frameworks directory; can can go up to the app's framework.
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks
+
+
+//*****************************************************************************
+// Scheme Dependant Values
+//*****************************************************************************
+
+CFBDN_app_debug = Tidy with Balthisar Tidy (app)
+CFBDN_app_release = Tidy with Balthisar Tidy
+CFBDN_pro_debug = Tidy with Balthisar Tidy (pro)
+CFBDN_pro_release = Tidy with Balthisar Tidy for Work
+CFBDN_web_debug = Tidy with Balthisar Tidy (web)
+CFBDN_web_release = Tidy using Balthisar Tidy
+
+
+TIDY_EXT_CFBundleDisplayName = $(CFBDN_$(CONFIGURATION))
+GCC_PREPROCESSOR_DEFINITIONS = BODY_ONLY=0 ${TIDY_PREPROCESSOR_DEFS} $(inherited)
+
diff --git a/Config/extension-tidybody.xcconfig b/Config/extension-tidybody.xcconfig
new file mode 100644
index 00000000..84fa91b2
--- /dev/null
+++ b/Config/extension-tidybody.xcconfig
@@ -0,0 +1,39 @@
+//
+// extension-tidybody.xcconfig
+//
+// This is the configuration for Tidy (Body Only) extension.
+//
+
+#include "balthisar-tidy-id.xcconfig"
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+
+INFOPLIST_FILE = Balthisar Tidy Extension/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = ${TIDY_APP_BUNDLE_ID}.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = ${TARGET_NAME}
+SKIP_INSTALL = YES
+CODE_SIGN_ENTITLEMENTS = $(SRCROOT)/Balthisar Tidy Extension/Balthisar Tidy Extension.entitlements
+
+// The required framework is in the bundle, so we don't need to look for it
+// in our own Frameworks directory; can can go up to the app's framework.
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks
+
+
+//*****************************************************************************
+// Scheme Dependant Values
+//*****************************************************************************
+
+CFBDN_app_debug = Tidy with Balthisar Tidy (fragment only) (app)
+CFBDN_app_release = Tidy with Balthisar Tidy (fragment only)
+CFBDN_pro_debug = Tidy with Balthisar Tidy (fragment only) (pro)
+CFBDN_pro_release = Tidy with Balthisar Tidy for Work (fragment only)
+CFBDN_web_debug = Tidy with Balthisar Tidy (fragment only) (web)
+CFBDN_web_release = Tidy using Balthisar Tidy (fragment only)
+
+
+TIDY_EXT_CFBundleDisplayName = $(CFBDN_$(CONFIGURATION))
+GCC_PREPROCESSOR_DEFINITIONS = BODY_ONLY=1 ${TIDY_PREPROCESSOR_DEFS} $(inherited)
+
diff --git a/Config/libtidy-balthisar.dylib.xcconfig b/Config/libtidy-balthisar.dylib.xcconfig
new file mode 100644
index 00000000..0b6d92f1
--- /dev/null
+++ b/Config/libtidy-balthisar.dylib.xcconfig
@@ -0,0 +1,28 @@
+//
+// libtidy-balthisar.dylib.xcconfig
+//
+// This is the configuration for the LibTidy used by JSDTidyFramework. Note that
+// most of the build settings are inherited from the project settings.
+//
+
+
+// This dylib is used in application extensions, and so it must be 
+// prohibited from accessing non-safe APIs.
+APPLICATION_EXTENSION_API_ONLY = YES
+
+// The prefix header is generated during build via a custom build rule which
+// processes the upstream's `version.txt` file to produce this header.
+GCC_PREFIX_HEADER = HTMLTidy/xcode-version.h
+
+DYLIB_INSTALL_NAME_BASE = @rpath
+EXECUTABLE_EXTENSION = dylib
+EXECUTABLE_PREFIX = lib
+LD_DYLIB_INSTALL_NAME = $(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)
+MACH_O_TYPE = mh_dylib
+PRODUCT_NAME = $(TARGET_NAME)
+SKIP_INSTALL = YES
+
+CLANG_WARN_COMMA = NO
+GCC_WARN_64_TO_32_BIT_CONVERSION = NO
+GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO
+GCC_WARN_SHADOW = NO
diff --git a/Config/service-helper.xcconfig b/Config/service-helper.xcconfig
new file mode 100644
index 00000000..0850bcd1
--- /dev/null
+++ b/Config/service-helper.xcconfig
@@ -0,0 +1,53 @@
+//
+// service-helper-base.xcconfig
+//
+// This is the configuration for Balthisar Tidy as distributed on the Mac
+// App Store.
+//
+
+#include "balthisar-tidy-id.xcconfig"
+
+
+//*****************************************************************************
+// Common Settings
+//*****************************************************************************
+
+INFOPLIST_FILE = Balthisar Tidy Service Helper/Info.plist
+GCC_PREPROCESSOR_DEFINITIONS = ${TIDY_PREPROCESSOR_DEFS} $(inherited)
+PRODUCT_BUNDLE_IDENTIFIER = com.balthisar.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = $(TARGET_NAME)
+SKIP_INSTALL = YES
+CODE_SIGN_ENTITLEMENTS = $(SRCROOT)/Balthisar Tidy Service Helper/Balthisar Tidy Service Helper.entitlements
+
+// The required framework is in the bundle, so we don't need to look for it
+// in our own Frameworks directory; can can go up to the app's framework.
+LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks @executable_path/../../../../Frameworks
+
+
+//*****************************************************************************
+// Scheme Dependant Values
+//*****************************************************************************
+
+SH_app_debug = Tidy selection with Balthisar Tidy (app)
+SH_app_release = Tidy selection with Balthisar Tidy
+SH_pro_debug = Tidy selection with Balthisar Tidy (pro)
+SH_pro_release = Tidy selection with Balthisar Tidy for Work
+SH_web_debug = Tidy selection with Balthisar Tidy (web)
+SH_web_release = Tidy selection using Balthisar Tidy
+
+SHBO_app_debug = Tidy selection with Balthisar Tidy (fragment only) (app)
+SHBO_app_release = Tidy selection with Balthisar Tidy (fragment only)
+SHBO_pro_debug = Tidy selection with Balthisar Tidy (fragment only) (pro)
+SHBO_pro_release = Tidy selection with Balthisar Tidy for Work (fragment only)
+SHBO_web_debug = Tidy selection with Balthisar Tidy (fragment only) (web)
+SHBO_web_release = Tidy selection using Balthisar Tidy (fragment only)
+
+
+
+//*****************************************************************************
+// FINAL VALUES
+//*****************************************************************************
+
+TIDY_SERVICE_MENU_NAME = $(SH_$(CONFIGURATION))
+TIDY_SERVICE_MENU_NAME_FRAGMENT = $(SHBO_$(CONFIGURATION))
+
diff --git a/HTMLTidy/vendor/tidy-html5/include/tidy.h b/HTMLTidy/vendor/tidy-html5/include/tidy.h
index bc83b799..c7018904 100644
--- a/HTMLTidy/vendor/tidy-html5/include/tidy.h
+++ b/HTMLTidy/vendor/tidy-html5/include/tidy.h
@@ -84,7 +84,7 @@ extern "C" {
  **       public API function internally. In most cases, the public API
  **       functions simply call an internal function.
  ** - - -
- ** @note This documention _is not_ a substitute for browsing the source
+ ** @note This documentation _is not_ a substitute for browsing the source
  **       code. Although the public API is fairly well documented, the
  **       internal API is a very long, very slow, work-in-progress.
  ******************************************************************************/
@@ -336,9 +336,10 @@ TIDY_EXPORT Bool TIDY_CALL tidySetPanicCall( TidyPanic fpanic );
  */
     
 /** The primary creation of a document instance. Instances of a TidyDoc are used
- ** throughout the API as a token to represent a particular document. When done
- ** using a TidyDoc instance, be sure to `tidyRelease(myTidyDoc);` in order
- ** to free related memory.
+ ** throughout the API as a token to represent a particular document. You must
+ ** create at least one TidyDoc instance to initialize the library and begin
+ ** interaction with the API. When done using a TidyDoc instance, be sure to
+ ** `tidyRelease(myTidyDoc);` in order to free related memory.
  ** @result Returns a TidyDoc instance.
  */
 TIDY_EXPORT TidyDoc TIDY_CALL     tidyCreate(void);
@@ -395,6 +396,11 @@ TIDY_EXPORT ctmbstr TIDY_CALL     tidyReleaseDate(void);
  */
 TIDY_EXPORT ctmbstr TIDY_CALL     tidyLibraryVersion(void);
 
+/** Get the platform for which Tidy was built.
+ ** @result The string representing the version number.
+ */
+TIDY_EXPORT ctmbstr TIDY_CALL     tidyPlatform(void);
+
     
 /** @}
  ** @name Diagnostics and Repair
@@ -405,7 +411,7 @@ TIDY_EXPORT ctmbstr TIDY_CALL     tidyLibraryVersion(void);
 /** Get status of current document.
  ** @param tdoc An instance of a TidyDoc to query.
  ** @result Returns the highest of `2` indicating that errors were present in
- **         the docment, `1` indicating warnings, and `0` in the case of
+ **         the document, `1` indicating warnings, and `0` in the case of
  **         everything being okay.
  */
 TIDY_EXPORT int TIDY_CALL         tidyStatus( TidyDoc tdoc );
@@ -488,7 +494,7 @@ TIDY_EXPORT int TIDY_CALL         tidyLoadConfig(TidyDoc tdoc,      /**< The Tid
  */
 TIDY_EXPORT int TIDY_CALL         tidyLoadConfigEnc(TidyDoc tdoc,       /**< The TidyDoc to which to apply the configuration. */
                                                     ctmbstr configFile, /**< The complete path to the file to load. */
-                                                    ctmbstr charenc     /**< The encodingto use. See the _enc2iana struct for valid values. */
+                                                    ctmbstr charenc     /**< The encoding to use. See the _enc2iana struct for valid values. */
                                                     );
 
 /** Determine whether or not a particular file exists. On Unix systems, the use
@@ -538,6 +544,14 @@ TIDY_EXPORT int TIDY_CALL         tidySetOutCharEncoding(TidyDoc tdoc,  /**< The
  ** @defgroup Configuration Configuration Options
  **
  ** Functions for getting and setting Tidy configuration options.
+ **
+ ** @note In general, you should expect that options you set should stay set.
+ **       This isn't always the case, though, because Tidy will adjust options
+ **       for internal use during the lexing, parsing, cleaning, and printing
+ **       phases, but will restore them after the printing process. If you
+ **       require access to user configuration values at any time between the
+ **       tidyParseXXX() process and the tidySaveXXX() process, make sure to
+ **       keep your own copy.
  ** @{
  ******************************************************************************/
 
@@ -571,7 +585,7 @@ TIDY_EXPORT Bool TIDY_CALL          tidySetOptionCallback(TidyDoc tdoc,
                                                           );
 
 /** This typedef represents the required signature for your provided callback
- ** function should you wish to register one with tidySetOptionCallback().
+ ** function should you wish to register one with tidySetConfigCallback().
  ** Your callback function will be provided with the following parameters.
  ** @param tdoc The document instance for which the callback was invoked.
  ** @param option The option name that was provided.
@@ -586,14 +600,33 @@ typedef Bool (TIDY_CALL *TidyConfigCallback)(TidyDoc tdoc, ctmbstr option, ctmbs
  ** configuration file options. Setting this callback allows a LibTidy
  ** application developer to examine command-line and configuration file options
  ** after LibTidy has examined them and failed to recognize them.
- ** Note that this is deprecated and you should instead migrate to
- ** tidySetConfigCallback().
  ** @result Returns `yes` upon success.
  */
 TIDY_EXPORT Bool TIDY_CALL          tidySetConfigCallback(TidyDoc tdoc,                      /**< The document to apply the callback to. */
                                                           TidyConfigCallback pConfigCallback /**< The name of a function of type TidyConfigCallback() to serve as your callback. */
                                                           );
 
+    
+/** This typedef represents the required signature for your provided callback
+ ** function should you wish to register one with tidySetConfigChangeCallback().
+ ** Your callback function will be provided with the following parameters.
+ ** @param tdoc The document instance for which the callback was invoked.
+ ** @param option The option that will be changed.
+ */
+typedef void (TIDY_CALL *TidyConfigChangeCallback)(TidyDoc tdoc, TidyOption option);
+
+/** Applications using TidyLib may want to be informed when changes to options
+ ** are made. Temporary changes made internally by Tidy are not reported, but
+ ** permanent changes made by Tidy (such as indent-spaces or output-encoding)
+ ** will be reported.
+ ** @note This callback is not currently implemented.
+ ** @result Returns `yes` upon success.
+ */
+TIDY_EXPORT Bool TIDY_CALL          tidySetConfigChangeCallback(TidyDoc tdoc,                      /**< The document to apply the callback to. */
+                                                                TidyConfigChangeCallback pCallback /**< The name of a function of type TidyConfigChangeCallback() to serve as your callback. */
+                                                                );
+
+
 /** @}
  ** @name Option ID Discovery
  ** @{
@@ -675,12 +708,21 @@ TIDY_EXPORT ctmbstr TIDY_CALL       tidyOptGetName( TidyOption opt );
 
 /** Get datatype of given Option
  ** @param opt An instance of a TidyOption to query.
- ** @result the TidyOptionType of the given option.
+ ** @result The TidyOptionType of the given option.
  */
 TIDY_EXPORT TidyOptionType TIDY_CALL tidyOptGetType( TidyOption opt );
 
+/** Indicates that an option takes a list of items.
+ ** @param opt An instance of a TidyOption to query.
+ ** @result A bool indicating whether or not the option accepts a list.
+ */
+TIDY_EXPORT Bool TIDY_CALL tidyOptionIsList( TidyOption opt );
+
 /** Is Option read-only? Some options (mainly internal use only options) are
  ** read-only.
+ ** @deprecated This is no longer a valid test for the public API; instead
+ **   you should test an option's availability using `tidyOptGetCategory()`
+ **   against `TidyInternalCategory`. This API will be removed!
  ** @param opt An instance of a TidyOption to query.
  ** @result Returns `yes` or `no` depending on whether or not the specified
  **         option is read-only.
@@ -810,15 +852,17 @@ TIDY_EXPORT Bool TIDY_CALL          tidyOptResetToDefault(TidyDoc tdoc,    /**<
  */
 TIDY_EXPORT Bool TIDY_CALL          tidyOptResetAllToDefault( TidyDoc tdoc );
 
-/** Take a snapshot of current config settings.
+/** Take a snapshot of current config settings. These settings are stored
+ ** within the tidy document. Note, however, that snapshots do not reliably
+ ** survive the tidyParseXXX() process, as Tidy uses the snapshot mechanism
+ ** in order to store the current configuration right at the beginning of the
+ ** parsing process.
  ** @param tdoc The tidy document for which to take a snapshot.
  ** @result Returns a bool indicating success or failure.
  */
 TIDY_EXPORT Bool TIDY_CALL          tidyOptSnapshot( TidyDoc tdoc );
 
-/** Apply a snapshot of config settings to a document, such as after document
- ** processing. This will ensure that any values which Tidy may have changed
- ** are back to the intended configuration.
+/** Apply a snapshot of config settings to a document.
  ** @param tdoc The tidy document for which to apply a snapshot.
  ** @result Returns a bool indicating success or failure.
  */
@@ -836,7 +880,10 @@ TIDY_EXPORT Bool TIDY_CALL          tidyOptDiffThanDefault( TidyDoc tdoc );
  */
 TIDY_EXPORT Bool TIDY_CALL          tidyOptDiffThanSnapshot( TidyDoc tdoc );
 
-/** Copy current configuration settings from one document to another.
+/** Copy current configuration settings from one document to another. Note
+ ** that the destination document's existing settings will be stored as that
+ ** document's snapshot prior to having its option values overwritten by the
+ ** source document's settings.
  ** @result Returns a bool indicating success or failure.
  */
 TIDY_EXPORT Bool TIDY_CALL          tidyOptCopyConfig(TidyDoc tdocTo,  /**< The destination tidy document. */
@@ -892,6 +939,58 @@ TIDY_EXPORT ctmbstr TIDY_CALL       tidyOptGetNextDeclTag(TidyDoc tdoc,       /*
                                                           TidyIterator* iter  /**< The TidyIterator (initiated with tidyOptGetDeclTagList()) token.  */
                                                           );
 
+/** Initiates an iterator for a list of priority attributes. This iterator
+ ** allows you to iterate through all of the priority attributes defined with
+ ** the `priority-attributes` configuration option. In order to iterate through
+ ** the attributes, initiate the iterator with this function, and then use
+ ** tidyOptGetNextPriorityAttr() to retrieve the first and subsequent attributes.
+ ** For example:
+ ** @code{.c}
+ **   TidyIterator itAttr = tidyOptGetPriorityAttrList( tdoc );
+ **   while ( itAttr ) {
+ **     printf("%s", tidyOptGetNextPriorityAttr( tdoc, &itAttr ));
+ **   }
+ ** @endcode
+ ** @param tdoc An instance of a TidyDoc to query.
+ ** @result Returns a TidyIterator, which is a token used to represent the
+ **         current position in a list within LibTidy.
+ */
+TIDY_EXPORT TidyIterator TIDY_CALL  tidyOptGetPriorityAttrList( TidyDoc tdoc );
+
+/** Given a valid TidyIterator initiated with tidyOptGetPriorityAttrList(),
+ ** returns a string representing a priority attribute.
+ ** @result A string containing the next tag.
+ */
+TIDY_EXPORT ctmbstr TIDY_CALL       tidyOptGetNextPriorityAttr(TidyDoc tdoc,       /**< The tidy document to query. */
+                                                               TidyIterator* iter  /**< The TidyIterator (initiated with tidyOptGetPriorityAttrList()) token.  */
+                                                               );
+
+/** Initiates an iterator for a list of muted messages. This iterator allows
+ ** you to iterate through all of the priority attributes defined with the
+ ** `mute` configuration option. In order to iterate through the list, initiate
+ ** with this function, and then use tidyOptGetNextMutedMessage() to retrieve
+ ** the first and subsequent attributes.
+ ** For example:
+ ** @code{.c}
+ **   TidyIterator itAttr = tidyOptGetMutedMessageList( tdoc );
+ **   while ( itAttr ) {
+ **     printf("%s", tidyOptGetNextMutedMessage( tdoc, &itAttr ));
+ **   }
+ ** @endcode
+ ** @param tdoc An instance of a TidyDoc to query.
+ ** @result Returns a TidyIterator, which is a token used to represent the
+ **         current position in a list within LibTidy.
+ */
+TIDY_EXPORT TidyIterator TIDY_CALL  tidyOptGetMutedMessageList( TidyDoc tdoc );
+
+/** Given a valid TidyIterator initiated with tidyOptGetMutedMessageList(),
+ ** returns a string representing a muted message.
+ ** @result A string containing the next tag.
+ */
+TIDY_EXPORT ctmbstr TIDY_CALL       tidyOptGetNextMutedMessage(TidyDoc tdoc,       /**< The tidy document to query. */
+                                                               TidyIterator* iter  /**< The TidyIterator (initiated with tidyOptGetMutedMessageList()) token.  */
+                                                               );
+
 /** @}
  ** @name Option Documentation
  ** @{
@@ -925,7 +1024,7 @@ TIDY_EXPORT TidyIterator TIDY_CALL  tidyOptGetDocLinksList(TidyDoc tdoc,  /**< T
 
 /** Given a valid TidyIterator initiated with tidyOptGetDocLinksList(), returns
  ** a TidyOption instance.
- ** @result Returns in instane of TidyOption.
+ ** @result Returns in instance of TidyOption.
  */
 TIDY_EXPORT TidyOption TIDY_CALL    tidyOptGetNextDocLinks(TidyDoc tdoc,     /**< The tidy document to query. */
                                                            TidyIterator* pos /**< The TidyIterator (initiated with tidyOptGetDocLinksList()) token. */
@@ -1243,7 +1342,16 @@ TIDY_EXPORT int TIDY_CALL tidyGetMessageColumn( TidyMessage tmessage );
  **         message.
  */
 TIDY_EXPORT TidyReportLevel TIDY_CALL tidyGetMessageLevel( TidyMessage tmessage );
-    
+
+
+/** Get the muted status of the message, that is, whether or not the
+ ** current configuration indicated that this message should be muted.
+ ** @param tmessage Specify the message that you are querying.
+ ** @result Returns a Bool indicating that the config indicates muting this
+ **         message.
+ */
+TIDY_EXPORT Bool TIDY_CALL tidyGetMessageIsMuted( TidyMessage tmessage );
+
 /** Get the default format string, which is the format string for the message
  ** in Tidy's default localization (en_us).
  ** @param tmessage Specify the message that you are querying.
@@ -1418,10 +1526,8 @@ TIDY_EXPORT double TIDY_CALL tidyGetArgValueDouble(TidyMessage tmessage,    /**<
  ** Your callback function will be provided with the following parameters.
  ** @param tdoc Indicates the source tidy document.
  ** @param line Indicates the line in the source document at this point in the process.
- ** @param column Indicates the column in the source document at this point in the process.
+ ** @param col Indicates the column in the source document at this point in the process.
  ** @param destLine Indicates the line number in the output document at this point in the process.
- ** @return Your callback function will return `yes` if Tidy should include the
- **         report in its own output sink, or `no` if Tidy should suppress it.
  */
 typedef void (TIDY_CALL *TidyPPProgress)( TidyDoc tdoc, uint line, uint col, uint destLine );
 
@@ -1447,7 +1553,7 @@ TIDY_EXPORT Bool TIDY_CALL   tidySetPrettyPrinterCallback(TidyDoc tdoc,
 
 /** Parse markup in named file.
  ** @result Returns the highest of `2` indicating that errors were present in
- **         the docment, `1` indicating warnings, and `0` in the case of
+ **         the document, `1` indicating warnings, and `0` in the case of
  **         everything being okay.
  */
 TIDY_EXPORT int TIDY_CALL         tidyParseFile(TidyDoc tdoc,    /**< The tidy document to use for parsing. */
@@ -1457,14 +1563,14 @@ TIDY_EXPORT int TIDY_CALL         tidyParseFile(TidyDoc tdoc,    /**< The tidy d
 /** Parse markup from the standard input.
  ** @param tdoc The tidy document to use for parsing.
  ** @result Returns the highest of `2` indicating that errors were present in
- **         the docment, `1` indicating warnings, and `0` in the case of
+ **         the document, `1` indicating warnings, and `0` in the case of
  **         everything being okay.
  */
 TIDY_EXPORT int TIDY_CALL         tidyParseStdin( TidyDoc tdoc );
 
 /** Parse markup in given string.
  ** @result Returns the highest of `2` indicating that errors were present in
- **         the docment, `1` indicating warnings, and `0` in the case of
+ **         the document, `1` indicating warnings, and `0` in the case of
  **         everything being okay.
  */
 TIDY_EXPORT int TIDY_CALL         tidyParseString(TidyDoc tdoc,   /**< The tidy document to use for parsing. */
@@ -1473,7 +1579,7 @@ TIDY_EXPORT int TIDY_CALL         tidyParseString(TidyDoc tdoc,   /**< The tidy
 
 /** Parse markup in given buffer.
  ** @result Returns the highest of `2` indicating that errors were present in
- **         the docment, `1` indicating warnings, and `0` in the case of
+ **         the document, `1` indicating warnings, and `0` in the case of
  **         everything being okay.
  */
 TIDY_EXPORT int TIDY_CALL         tidyParseBuffer(TidyDoc tdoc,   /**< The tidy document to use for parsing. */
@@ -1482,7 +1588,7 @@ TIDY_EXPORT int TIDY_CALL         tidyParseBuffer(TidyDoc tdoc,   /**< The tidy
 
 /** Parse markup in given generic input source.
  ** @result Returns the highest of `2` indicating that errors were present in
- **         the docment, `1` indicating warnings, and `0` in the case of
+ **         the document, `1` indicating warnings, and `0` in the case of
  **         everything being okay.
  */
 TIDY_EXPORT int TIDY_CALL         tidyParseSource(TidyDoc tdoc,           /**< The tidy document to use for parsing. */
@@ -1506,8 +1612,8 @@ TIDY_EXPORT int TIDY_CALL         tidyParseSource(TidyDoc tdoc,           /**< T
  */
 TIDY_EXPORT int TIDY_CALL         tidyCleanAndRepair( TidyDoc tdoc );
 
-/** Run configured diagnostics on parsed and repaired markup. You must call
- ** tidyCleanAndRepair() before using this function.
+/** Reports the document type and diagnostic statistics on parsed and repaired 
+ ** markup. You must call tidyCleanAndRepair() before using this function.
  ** @param tdoc The tidy document to use.
  ** @result An integer representing the status.
  */
@@ -1898,7 +2004,7 @@ TIDY_EXPORT uint TIDY_CALL tidyErrorCodeFromKey(ctmbstr code);
  ** @result Returns a TidyIterator, which is a token used to represent the
  **         current position in a list within LibTidy.
  */
-TIDY_EXPORT TidyIterator TIDY_CALL getErrorCodeList();
+TIDY_EXPORT TidyIterator TIDY_CALL getErrorCodeList(void);
 
 /** Given a valid TidyIterator initiated with getErrorCodeList(), returns
  ** an instance of the opaque type TidyMessageArgument, which serves as a token
@@ -1925,12 +2031,6 @@ TIDY_EXPORT uint TIDY_CALL getNextErrorCode( TidyIterator* iter );
  ** @{
  */
 
-/** Determines the current locale without affecting the C locale.
- ** @param  result The buffer to use to return the string, or NULL on failure.
- ** @return The same buffer for convenience.
- */
-TIDY_EXPORT tmbstr TIDY_CALL tidySystemLocale(tmbstr result);
-
 /** Tells Tidy to use a different language for output.
  ** @param  languageCode A Windows or POSIX language code, and must match
  **         a TIDY_LANGUAGE for an installed language.
@@ -1946,7 +2046,7 @@ TIDY_EXPORT Bool TIDY_CALL tidySetLanguage( ctmbstr languageCode );
 /** Gets the current language used by Tidy.
  ** @result Returns a string indicating the currently set language.
  */
-TIDY_EXPORT ctmbstr TIDY_CALL tidyGetLanguage();
+TIDY_EXPORT ctmbstr TIDY_CALL tidyGetLanguage(void);
 
 /** @}
  ** @name Locale Mappings
@@ -1978,7 +2078,7 @@ opaque_type(tidyLocaleMapItem);
  ** @result Returns a TidyIterator, which is a token used to represent the
  **         current position in a list within LibTidy.
  */
-TIDY_EXPORT TidyIterator TIDY_CALL getWindowsLanguageList();
+TIDY_EXPORT TidyIterator TIDY_CALL getWindowsLanguageList(void);
 
 /** Given a valid TidyIterator initiated with getWindowsLanguageList(), returns
  ** a pointer to a tidyLocaleMapItem, which can be further interrogated with
@@ -2046,7 +2146,7 @@ TIDY_EXPORT ctmbstr TIDY_CALL tidyDefaultString( uint messageType );
  ** @result Returns a TidyIterator, which is a token used to represent the
  **         current position in a list within LibTidy.
  */
-TIDY_EXPORT TidyIterator TIDY_CALL getStringKeyList();
+TIDY_EXPORT TidyIterator TIDY_CALL getStringKeyList(void);
 
 /** Given a valid TidyIterator initiated with getStringKeyList(), returns
  ** an unsigned integer representing the next key value.
@@ -2076,7 +2176,7 @@ TIDY_EXPORT uint TIDY_CALL getNextStringKey( TidyIterator* iter );
  ** @result Returns a TidyIterator, which is a token used to represent the
  **         current position in a list within LibTidy.
  */
-TIDY_EXPORT TidyIterator TIDY_CALL getInstalledLanguageList();
+TIDY_EXPORT TidyIterator TIDY_CALL getInstalledLanguageList(void);
 
 /** Given a valid TidyIterator initiated with getInstalledLanguageList(),
  ** returns a string representing a language name that is installed in Tidy.
diff --git a/HTMLTidy/vendor/tidy-html5/include/tidybuffio.h b/HTMLTidy/vendor/tidy-html5/include/tidybuffio.h
index 7410da71..1c1b017d 100644
--- a/HTMLTidy/vendor/tidy-html5/include/tidybuffio.h
+++ b/HTMLTidy/vendor/tidy-html5/include/tidybuffio.h
@@ -1,15 +1,25 @@
 #ifndef __TIDY_BUFFIO_H__
 #define __TIDY_BUFFIO_H__
 
-/** @file tidybuffio.h - Treat buffer as an I/O stream.
-
-  (c) 1998-2016 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-
-  Requires buffer to automatically grow as bytes are added.
-  Must keep track of current read and write points.
-
-*/
+/**************************************************************************//**
+ * @file
+ * Treat buffer as a stream that Tidy can use for I/O operations. It offers
+ * the ability for the buffer to grow as bytes are added, and keeps track
+ * of current read and write points.
+ *
+ * @author
+ *     HTACG, et al (consult git log)
+ *
+ * @copyright
+ *     Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts
+ *     Institute of Technology, European Research Consortium for Informatics
+ *     and Mathematics, Keio University).
+ * @copyright
+ *     See tidy.h for license.
+ *
+ * @date
+ *     Consult git log.
+ ******************************************************************************/
 
 #include "tidyplatform.h"
 #include "tidy.h"
diff --git a/HTMLTidy/vendor/tidy-html5/include/tidyenum.h b/HTMLTidy/vendor/tidy-html5/include/tidyenum.h
index 5f969355..949d4646 100644
--- a/HTMLTidy/vendor/tidy-html5/include/tidyenum.h
+++ b/HTMLTidy/vendor/tidy-html5/include/tidyenum.h
@@ -87,12 +87,18 @@ extern "C" {
 
 /** Codes for populating TidyConfigCategory enumeration. */
 #define FOREACH_TIDYCONFIGCATEGORY(FN)                                    \
-    FN(TidyMarkup)           /**< Markup options: (X)HTML version, etc */ \
     FN(TidyDiagnostics)      /**< Diagnostics */                          \
-    FN(TidyPrettyPrint)      /**< Output layout */                        \
-    FN(TidyEncoding)         /**< Character encodings */                  \
-    FN(TidyMiscellaneous)    /**< File handling, message format, etc. */  \
-    FN(TidyInternalCategory) /**< Option is internal only. */
+    FN(TidyDisplay)          /**< Affecting screen display */             \
+    FN(TidyDocumentIO)       /**< Pertaining to document I/O */           \
+    FN(TidyEncoding)         /**< Relating to encoding */                 \
+    FN(TidyFileIO)           /**< Pertaining to file I/O */               \
+    FN(TidyMarkupCleanup)    /**< Cleanup related options */              \
+    FN(TidyMarkupEntities)   /**< Entity related options */               \
+    FN(TidyMarkupRepair)     /**< Document repair related options */      \
+    FN(TidyMarkupTeach)      /**< Teach tidy new things */                \
+    FN(TidyMarkupXForm)      /**< Transform HTML one way or another */    \
+    FN(TidyPrettyPrint)      /**< Pretty printing options */              \
+    FN(TidyInternalCategory) /**< Option is internal only. */             \
 
 
 /** These message codes comprise every possible message that can be output by
@@ -100,26 +106,15 @@ extern "C" {
  ** application specific messages.
  */
 #define FOREACH_MSG_MISC(FN) \
-/** File can't be opened */                        FN(FILE_CANT_OPEN)              \
-/** Not a file */                                  FN(FILE_NOT_FILE)               \
 /** line %d column %d */                           FN(LINE_COLUMN_STRING)          \
-/** Document content looks like %s */              FN(STRING_CONTENT_LOOKS)        \
 /** discarding */                                  FN(STRING_DISCARDING)           \
-/** Doctype given is %s */                         FN(STRING_DOCTYPE_GIVEN)        \
-/** %u %s, %u %s were found! */                    FN(STRING_ERROR_COUNT)          \
 /** error and errors */                            FN(STRING_ERROR_COUNT_ERROR)    \
 /** warning and warnings */                        FN(STRING_ERROR_COUNT_WARNING)  \
 /** Accessibility hello message */                 FN(STRING_HELLO_ACCESS)         \
 /** HTML Proprietary */                            FN(STRING_HTML_PROPRIETARY)     \
-/** missing or malformed argument for option: */   FN(STRING_MISSING_MALFORMED)    \
-/** Errors must be fixed */                        FN(STRING_NEEDS_INTERVENTION)   \
-/** No warnings or errors were found */            FN(STRING_NO_ERRORS)            \
-/** No system identifier in emitted doctype */     FN(STRING_NO_SYSID)             \
-/** Not all warnings/errors were shown */          FN(STRING_NOT_ALL_SHOWN)        \
 /** plain text */                                  FN(STRING_PLAIN_TEXT)           \
 /** replacing */                                   FN(STRING_REPLACING)            \
 /** specified */                                   FN(STRING_SPECIFIED)            \
-/** unknown option: %s */                          FN(STRING_UNKNOWN_OPTION)       \
 /** XML declaration */                             FN(STRING_XML_DECLARATION)      \
 /** no */                                          FN(TIDYCUSTOMNO_STRING)         \
 /** block level */                                 FN(TIDYCUSTOMBLOCKLEVEL_STRING) \
@@ -128,164 +123,182 @@ extern "C" {
 /** pre */                                         FN(TIDYCUSTOMPRE_STRING)        \
 
     
+/** These messages are used to generate additional dialogue style output from
+ ** Tidy when certain conditions exist, and provide more verbose explanations
+ ** than the short report.
+ */
+#define FOREACH_FOOTNOTE_MSG(FN) \
+    FN(FOOTNOTE_TRIM_EMPTY_ELEMENT) \
+    FN(TEXT_ACCESS_ADVICE1)         \
+    FN(TEXT_ACCESS_ADVICE2)         \
+    FN(TEXT_BAD_FORM)               \
+    FN(TEXT_BAD_MAIN)               \
+    FN(TEXT_HTML_T_ALGORITHM)       \
+    FN(TEXT_INVALID_URI)            \
+    FN(TEXT_INVALID_UTF16)          \
+    FN(TEXT_INVALID_UTF8)           \
+    FN(TEXT_M_IMAGE_ALT)            \
+    FN(TEXT_M_IMAGE_MAP)            \
+    FN(TEXT_M_LINK_ALT)             \
+    FN(TEXT_M_SUMMARY)              \
+    FN(TEXT_SGML_CHARS)             \
+    FN(TEXT_USING_BODY)             \
+    FN(TEXT_USING_FONT)             \
+    FN(TEXT_USING_FRAMES)           \
+    FN(TEXT_USING_LAYER)            \
+    FN(TEXT_USING_NOBR)             \
+    FN(TEXT_USING_SPACER)           \
+    FN(TEXT_VENDOR_CHARS)           \
+    FN(TEXT_WINDOWS_CHARS)
+
+
 /** These messages are used to generate additional dialogue style output from
  ** Tidy when certain conditions exist, and provide more verbose explanations
  ** than the short report.
  */
 #define FOREACH_DIALOG_MSG(FN) \
-/** Explanatory text. */           FN(TEXT_ACCESS_ADVICE1)        \
-/** Explanatory text. */           FN(TEXT_ACCESS_ADVICE2)        \
-/** Explanatory text. */           FN(TEXT_BAD_FORM)              \
-/** Explanatory text. */           FN(TEXT_BAD_MAIN)              \
-/** Explanatory text. */           FN(TEXT_GENERAL_INFO_PLEA)     \
-/** Explanatory text. */           FN(TEXT_GENERAL_INFO)          \
-/** Explanatory text. */           FN(TEXT_HTML_T_ALGORITHM)      \
-/** Explanatory text. */           FN(TEXT_INVALID_URI)           \
-/** Explanatory text. */           FN(TEXT_INVALID_UTF16)         \
-/** Explanatory text. */           FN(TEXT_INVALID_UTF8)          \
-/** Explanatory text. */           FN(TEXT_M_IMAGE_ALT)           \
-/** Explanatory text. */           FN(TEXT_M_IMAGE_MAP)           \
-/** Explanatory text. */           FN(TEXT_M_LINK_ALT)            \
-/** Explanatory text. */           FN(TEXT_M_SUMMARY)             \
-/** Explanatory text. */           FN(TEXT_SGML_CHARS)            \
-/** Explanatory text. */           FN(TEXT_USING_BODY)            \
-/** Explanatory text. */           FN(TEXT_USING_FONT)            \
-/** Explanatory text. */           FN(TEXT_USING_FRAMES)          \
-/** Explanatory text. */           FN(TEXT_USING_LAYER)           \
-/** Explanatory text. */           FN(TEXT_USING_NOBR)            \
-/** Explanatory text. */           FN(TEXT_USING_SPACER)          \
-/** Explanatory text. */           FN(TEXT_VENDOR_CHARS)          \
-/** Explanatory text. */           FN(TEXT_WINDOWS_CHARS)
+/* TidyDialogueSummary */  FN(STRING_ERROR_COUNT)          \
+/* TidyDialogueSummary */  FN(STRING_NEEDS_INTERVENTION)   \
+/* TidyDialogueSummary */  FN(STRING_NO_ERRORS)            \
+/* TidyDialogueSummary */  FN(STRING_NOT_ALL_SHOWN)        \
+/* TidyDialogueInfo */     FN(TEXT_GENERAL_INFO_PLEA)      \
+/* TidyDialogueInfo */     FN(TEXT_GENERAL_INFO)
 
 
 /** These are report messages, i.e., messages that appear in Tidy's table
  ** of errors and warnings.
  */
 #define FOREACH_REPORT_MSG(FN)        \
-    /* ReportAttrError */             \
+    FN(ADDED_MISSING_CHARSET)         \
     FN(ANCHOR_NOT_UNIQUE)             \
+    FN(APOS_UNDEFINED)                \
     FN(ATTR_VALUE_NOT_LCASE)          \
     FN(ATTRIBUTE_IS_NOT_ALLOWED)      \
+    FN(ATTRIBUTE_VALUE_REPLACED)      \
     FN(BACKSLASH_IN_URI)              \
     FN(BAD_ATTRIBUTE_VALUE_REPLACED)  \
     FN(BAD_ATTRIBUTE_VALUE)           \
+    FN(BAD_CDATA_CONTENT)             \
+    FN(BAD_SUMMARY_HTML5)             \
+    FN(BAD_SURROGATE_LEAD)            \
+    FN(BAD_SURROGATE_PAIR)            \
+    FN(BAD_SURROGATE_TAIL)            \
+    FN(CANT_BE_NESTED)                \
+    FN(COERCE_TO_ENDTAG)              \
+    FN(CONTENT_AFTER_BODY)            \
+    FN(CUSTOM_TAG_DETECTED)           \
+    FN(DISCARDING_UNEXPECTED)         \
+    FN(DOCTYPE_AFTER_TAGS)            \
+    FN(DUPLICATE_FRAMESET)            \
+    FN(ELEMENT_NOT_EMPTY)             \
+    FN(ELEMENT_VERS_MISMATCH_ERROR)   \
+    FN(ELEMENT_VERS_MISMATCH_WARN)    \
+    FN(ENCODING_MISMATCH)             \
     FN(ESCAPED_ILLEGAL_URI)           \
+    FN(FILE_CANT_OPEN)                \
+    FN(FILE_CANT_OPEN_CFG)            \
+    FN(FILE_NOT_FILE)                 \
     FN(FIXED_BACKSLASH)               \
+    FN(FOUND_STYLE_IN_BODY)           \
     FN(ID_NAME_MISMATCH)              \
+    FN(ILLEGAL_NESTING)               \
     FN(ILLEGAL_URI_CODEPOINT)         \
     FN(ILLEGAL_URI_REFERENCE)         \
     FN(INSERTING_AUTO_ATTRIBUTE)      \
+    FN(INSERTING_TAG)                 \
     FN(INVALID_ATTRIBUTE)             \
+    FN(INVALID_NCR)                   \
+    FN(INVALID_SGML_CHARS)            \
+    FN(INVALID_UTF8)                  \
+    FN(INVALID_UTF16)                 \
     FN(INVALID_XML_ID)                \
     FN(JOINING_ATTRIBUTE)             \
+    FN(MALFORMED_COMMENT)             \
+    FN(MALFORMED_COMMENT_DROPPING)    \
+    FN(MALFORMED_COMMENT_EOS)         \
+    FN(MALFORMED_COMMENT_WARN)        \
+    FN(MALFORMED_DOCTYPE)             \
     FN(MISMATCHED_ATTRIBUTE_ERROR)    \
     FN(MISMATCHED_ATTRIBUTE_WARN)     \
     FN(MISSING_ATTR_VALUE)            \
+    FN(MISSING_ATTRIBUTE)             \
+    FN(MISSING_DOCTYPE)               \
+    FN(MISSING_ENDTAG_BEFORE)         \
+    FN(MISSING_ENDTAG_FOR)            \
+    FN(MISSING_ENDTAG_OPTIONAL)       \
     FN(MISSING_IMAGEMAP)              \
     FN(MISSING_QUOTEMARK)             \
-    FN(NEWLINE_IN_URI)                \
-    FN(PROPRIETARY_ATTR_VALUE)        \
-    FN(PROPRIETARY_ATTRIBUTE)         \
-    FN(REPEATED_ATTRIBUTE)            \
-    FN(UNEXPECTED_END_OF_FILE_ATTR)   \
-    FN(UNEXPECTED_EQUALSIGN)          \
-    FN(UNEXPECTED_GT)                 \
-    FN(UNEXPECTED_QUOTEMARK)          \
-    FN(WHITE_IN_URI)                  \
-    FN(XML_ATTRIBUTE_VALUE)           \
-    FN(XML_ID_SYNTAX)                 \
-    /* ReportEncodingError */         \
-    FN(INVALID_NCR)                   \
-    FN(INVALID_SGML_CHARS)            \
-    FN(INVALID_UTF16)                 \
-    FN(INVALID_UTF8)                  \
-    FN(VENDOR_SPECIFIC_CHARS)         \
-    /* ReportEncodingWarning */       \
-    FN(ENCODING_MISMATCH)             \
-    /* ReportEntityError */           \
-    FN(APOS_UNDEFINED)                \
+    FN(MISSING_QUOTEMARK_OPEN)        \
     FN(MISSING_SEMICOLON_NCR)         \
     FN(MISSING_SEMICOLON)             \
-    FN(UNESCAPED_AMPERSAND)           \
-    FN(UNKNOWN_ENTITY)                \
-    /* ReportError */                 \
-    FN(BAD_CDATA_CONTENT)             \
-    FN(BAD_COMMENT_CHARS)             \
-    FN(BAD_XML_COMMENT)               \
-    FN(CANT_BE_NESTED)                \
-    FN(CONTENT_AFTER_BODY)            \
-    FN(DISCARDING_UNEXPECTED)         \
-    FN(DOCTYPE_AFTER_TAGS)            \
-    FN(DTYPE_NOT_UPPER_CASE)          \
-    FN(ELEMENT_VERS_MISMATCH_ERROR)   \
-    FN(ELEMENT_VERS_MISMATCH_WARN)    \
-    FN(ENCODING_IO_CONFLICT)          \
-    FN(ILLEGAL_NESTING)               \
-    FN(INCONSISTENT_NAMESPACE)        \
-    FN(INCONSISTENT_VERSION)          \
-    FN(INSERTING_TAG)                 \
-    FN(MALFORMED_COMMENT)             \
-    FN(MALFORMED_DOCTYPE)             \
-    FN(MISSING_DOCTYPE)               \
-    FN(MISSING_ENDTAG_BEFORE)         \
-    FN(MISSING_ENDTAG_FOR)            \
     FN(MISSING_STARTTAG)              \
     FN(MISSING_TITLE_ELEMENT)         \
+    FN(MOVED_STYLE_TO_HEAD)           \
+    FN(NESTED_EMPHASIS)               \
+    FN(NESTED_QUOTATION)              \
+    FN(NEWLINE_IN_URI)                \
     FN(NOFRAMES_CONTENT)              \
     FN(NON_MATCHING_ENDTAG)           \
+    FN(OBSOLETE_ELEMENT)              \
+    FN(OPTION_REMOVED)                \
+    FN(OPTION_REMOVED_APPLIED)        \
+    FN(OPTION_REMOVED_UNAPPLIED)      \
     FN(PREVIOUS_LOCATION)             \
+    FN(PROPRIETARY_ATTR_VALUE)        \
+    FN(PROPRIETARY_ATTRIBUTE)         \
     FN(PROPRIETARY_ELEMENT)           \
+    FN(REMOVED_HTML5)                 \
+    FN(REPEATED_ATTRIBUTE)            \
+    FN(REPLACING_ELEMENT)             \
     FN(REPLACING_UNEX_ELEMENT)        \
     FN(SPACE_PRECEDING_XMLDECL)       \
+    FN(STRING_CONTENT_LOOKS)        \
+    FN(STRING_ARGUMENT_BAD)           \
+    FN(STRING_DOCTYPE_GIVEN)        \
+    FN(STRING_MISSING_MALFORMED)      \
+    FN(STRING_MUTING_TYPE)            \
+    FN(STRING_NO_SYSID)             \
+    FN(STRING_UNKNOWN_OPTION)         \
+    FN(SUSPECTED_MISSING_QUOTE)       \
     FN(TAG_NOT_ALLOWED_IN)            \
     FN(TOO_MANY_ELEMENTS_IN)          \
     FN(TOO_MANY_ELEMENTS)             \
-    FN(UNESCAPED_ELEMENT)             \
-    FN(USING_BR_INPLACE_OF)           \
-    /* ReportFatal */                 \
-    FN(DUPLICATE_FRAMESET)            \
-    FN(SUSPECTED_MISSING_QUOTE)       \
+    FN(TRIM_EMPTY_ELEMENT)            \
+    FN(UNESCAPED_AMPERSAND)           \
+    FN(UNEXPECTED_END_OF_FILE_ATTR)   \
+    FN(UNEXPECTED_END_OF_FILE)        \
+    FN(UNEXPECTED_ENDTAG_ERR)         \
     FN(UNEXPECTED_ENDTAG_IN)          \
+    FN(UNEXPECTED_ENDTAG)             \
+    FN(UNEXPECTED_EQUALSIGN)          \
+    FN(UNEXPECTED_GT)                 \
+    FN(UNEXPECTED_QUOTEMARK)          \
     FN(UNKNOWN_ELEMENT_LOOKS_CUSTOM)  \
     FN(UNKNOWN_ELEMENT)               \
-    /* ReportMissingAttr */           \
-    FN(MISSING_ATTRIBUTE)             \
-    /* ReportNotice */                \
-    FN(CUSTOM_TAG_DETECTED)           \
-    FN(REPLACING_ELEMENT)             \
-    FN(TRIM_EMPTY_ELEMENT)            \
-    /* ReportSurrogateError */        \
-    FN(BAD_SURROGATE_LEAD)            \
-    FN(BAD_SURROGATE_PAIR)            \
-    FN(BAD_SURROGATE_TAIL)            \
-    /* ReportWarning */               \
-    FN(BAD_SUMMARY_HTML5)             \
-    FN(COERCE_TO_ENDTAG_WARN)         \
-    FN(NESTED_EMPHASIS)               \
-    FN(NESTED_QUOTATION)              \
-    FN(OBSOLETE_ELEMENT)              \
-    FN(REMOVED_HTML5)                 \
+    FN(UNKNOWN_ENTITY)                \
+    FN(USING_BR_INPLACE_OF)           \
+    FN(VENDOR_SPECIFIC_CHARS)         \
+    FN(WHITE_IN_URI)                  \
     FN(XML_DECLARATION_DETECTED)      \
-    /* Report, mixed use */           \
-    FN(COERCE_TO_ENDTAG)              \
-    FN(ELEMENT_NOT_EMPTY)             \
-    FN(UNEXPECTED_END_OF_FILE)        \
-    FN(UNEXPECTED_ENDTAG)
-    
+    FN(XML_ID_SYNTAX)
+
 
-/** These are report messages added by Tidy's accessibility module. */
+/** These are report messages added by Tidy's accessibility module. 
+ ** Note that commented out items don't have checks for them at this time,
+ ** and it was probably intended that some test would eventually be written.
+ */
 #define FOREACH_ACCESS_MSG(FN)                                          \
 /** [1.1.1.1] */     FN(IMG_MISSING_ALT)                                \
 /** [1.1.1.2] */     FN(IMG_ALT_SUSPICIOUS_FILENAME)                    \
 /** [1.1.1.3] */     FN(IMG_ALT_SUSPICIOUS_FILE_SIZE)                   \
 /** [1.1.1.4] */     FN(IMG_ALT_SUSPICIOUS_PLACEHOLDER)                 \
 /** [1.1.1.10] */    FN(IMG_ALT_SUSPICIOUS_TOO_LONG)                    \
-/** [1.1.1.11] */    FN(IMG_MISSING_ALT_BULLET)                         \
-/** [1.1.1.12] */    FN(IMG_MISSING_ALT_H_RULE)                         \
+/** [1.1.1.11] */    /* FN(IMG_MISSING_ALT_BULLET) */                   \
+/** [1.1.1.12] */    /* FN(IMG_MISSING_ALT_H_RULE) */                   \
 /** [1.1.2.1] */     FN(IMG_MISSING_LONGDESC_DLINK)                     \
 /** [1.1.2.2] */     FN(IMG_MISSING_DLINK)                              \
 /** [1.1.2.3] */     FN(IMG_MISSING_LONGDESC)                           \
-/** [1.1.2.5] */     FN(LONGDESC_NOT_REQUIRED)                          \
+/** [1.1.2.5] */     /* FN(LONGDESC_NOT_REQUIRED) */                    \
 /** [1.1.3.1] */     FN(IMG_BUTTON_MISSING_ALT)                         \
 /** [1.1.4.1] */     FN(APPLET_MISSING_ALT)                             \
 /** [1.1.5.1] */     FN(OBJECT_MISSING_ALT)                             \
@@ -321,7 +334,7 @@ extern "C" {
 /** [3.6.1.1] */     FN(LIST_USAGE_INVALID_UL)                          \
 /** [3.6.1.2] */     FN(LIST_USAGE_INVALID_OL)                          \
 /** [3.6.1.4] */     FN(LIST_USAGE_INVALID_LI)                          \
-/** [4.1.1.1] */     FN(INDICATE_CHANGES_IN_LANGUAGE)                   \
+/** [4.1.1.1] */     /* FN(INDICATE_CHANGES_IN_LANGUAGE) */             \
 /** [4.3.1.1] */     FN(LANGUAGE_NOT_IDENTIFIED)                        \
 /** [4.3.1.1] */     FN(LANGUAGE_INVALID)                               \
 /** [5.1.2.1] */     FN(DATA_TABLE_MISSING_HEADERS)                     \
@@ -375,11 +388,11 @@ extern "C" {
 /** [9.3.1.6] */     FN(SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE)   \
 /** [10.1.1.1] */    FN(NEW_WINDOWS_REQUIRE_WARNING_NEW)                \
 /** [10.1.1.2] */    FN(NEW_WINDOWS_REQUIRE_WARNING_BLANK)              \
-/** [10.2.1.1] */    FN(LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT)         \
-/** [10.2.1.2] */    FN(LABEL_NEEDS_REPOSITIONING_AFTER_INPUT)          \
-/** [10.4.1.1] */    FN(FORM_CONTROL_REQUIRES_DEFAULT_TEXT)             \
-/** [10.4.1.2] */    FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL)         \
-/** [10.4.1.3] */    FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES)       \
+/** [10.2.1.1] */    /* FN(LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT) */   \
+/** [10.2.1.2] */    /* FN(LABEL_NEEDS_REPOSITIONING_AFTER_INPUT) */    \
+/** [10.4.1.1] */    /* FN(FORM_CONTROL_REQUIRES_DEFAULT_TEXT) */       \
+/** [10.4.1.2] */    /* FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL) */   \
+/** [10.4.1.3] */    /* FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES) */ \
 /** [11.2.1.1] */    FN(REPLACE_DEPRECATED_HTML_APPLET)                 \
 /** [11.2.1.2] */    FN(REPLACE_DEPRECATED_HTML_BASEFONT)               \
 /** [11.2.1.3] */    FN(REPLACE_DEPRECATED_HTML_CENTER)                 \
@@ -400,10 +413,10 @@ extern "C" {
 /** [13.1.1.2] */    FN(LINK_TEXT_MISSING)                              \
 /** [13.1.1.3] */    FN(LINK_TEXT_TOO_LONG)                             \
 /** [13.1.1.4] */    FN(LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE)            \
-/** [13.1.1.5] */    FN(LINK_TEXT_NOT_MEANINGFUL_MORE)                  \
-/** [13.1.1.6] */    FN(LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS)           \
+/** [13.1.1.5] */    /* FN(LINK_TEXT_NOT_MEANINGFUL_MORE) */            \
+/** [13.1.1.6] */    /* FN(LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS) */     \
 /** [13.2.1.1] */    FN(METADATA_MISSING)                               \
-/** [13.2.1.2] */    FN(METADATA_MISSING_LINK)                          \
+/** [13.2.1.2] */    /* FN(METADATA_MISSING_LINK) */                    \
 /** [13.2.1.3] */    FN(METADATA_MISSING_REDIRECT_AUTOREFRESH)          \
 /** [13.10.1.1] */   FN(SKIPOVER_ASCII_ART)
 
@@ -432,6 +445,7 @@ extern "C" {
         FN(TC_OPT_GDOC)                     \
         FN(TC_OPT_HELP)                     \
         FN(TC_OPT_HELPCFG)                  \
+        FN(TC_OPT_HELPENV)                  \
         FN(TC_OPT_HELPOPT)                  \
         FN(TC_OPT_IBM858)                   \
         FN(TC_OPT_INDENT)                   \
@@ -448,6 +462,8 @@ extern "C" {
         FN(TC_OPT_RAW)                      \
         FN(TC_OPT_SHIFTJIS)                 \
         FN(TC_OPT_SHOWCFG)                  \
+        FN(TC_OPT_EXP_CFG)                  \
+        FN(TC_OPT_EXP_DEF)                  \
         FN(TC_OPT_UPPER)                    \
         FN(TC_OPT_UTF16)                    \
         FN(TC_OPT_UTF16BE)                  \
@@ -486,10 +502,15 @@ extern "C" {
         FN(TC_TXT_HELP_2A)                  \
         FN(TC_TXT_HELP_2B)                  \
         FN(TC_TXT_HELP_3)                   \
+        FN(TC_TXT_HELP_3A)                  \
         FN(TC_TXT_HELP_CONFIG)              \
         FN(TC_TXT_HELP_CONFIG_NAME)         \
         FN(TC_TXT_HELP_CONFIG_TYPE)         \
         FN(TC_TXT_HELP_CONFIG_ALLW)         \
+        FN(TC_TXT_HELP_ENV_1)               \
+        FN(TC_TXT_HELP_ENV_1A)              \
+        FN(TC_TXT_HELP_ENV_1B)              \
+        FN(TC_TXT_HELP_ENV_1C)              \
         FN(TC_TXT_HELP_LANG_1)              \
         FN(TC_TXT_HELP_LANG_2)              \
         FN(TC_TXT_HELP_LANG_3)
@@ -583,6 +604,7 @@ typedef enum
     TidyJoinClasses,             /**< Join multiple class attributes */
     TidyJoinStyles,              /**< Join multiple style attributes */
     TidyKeepFileTimes,           /**< If yes last modied time is preserved */
+    TidyKeepTabs,                /**< If yes keep input source tabs */
     TidyLiteralAttribs,          /**< If true attributes may use newlines */
     TidyLogicalEmphasis,         /**< Replace i by em and b by strong */
     TidyLowerLiterals,           /**< Folds known attribute values to lower case */
@@ -592,29 +614,21 @@ typedef enum
     TidyMergeDivs,               /**< Merge multiple DIVs */
     TidyMergeEmphasis,           /**< Merge nested B and I elements */
     TidyMergeSpans,              /**< Merge multiple SPANs */
-#if SUPPORT_ASIAN_ENCODINGS
+    TidyMetaCharset,             /**< Adds/checks/fixes meta charset in the head, based on document type */
+    TidyMuteReports,             /**< Filter these messages from output. */
+    TidyMuteShow,                /**< Show message ID's in the error table */
     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 */
-#else
-    TidyOutputBOMNotUsed,        /**< This option is not compiled in */
-#endif
     TidyPPrintTabs,              /**< Indent using tabs istead of spaces */
     TidyPreserveEntities,        /**< Preserve entities */
     TidyPreTags,                 /**< Declared pre tags */
-#if SUPPORT_ASIAN_ENCODINGS
+    TidyPriorityAttributes,      /**< Attributes to place first in an element */
     TidyPunctWrap,               /**< consider punctuation and breaking spaces for wrapping */
-#else
-    TidyPunctWrapNotUsed,        /**< This option is not compiled in */
-#endif
     TidyQuiet,                   /**< No 'Parsing X', guessed DTD or summary */
     TidyQuoteAmpersand,          /**< Output naked ampersand as &amp; */
     TidyQuoteMarks,              /**< Output " marks as &quot; */
@@ -623,10 +637,12 @@ typedef enum
     TidyShowErrors,              /**< Number of errors to put out */
     TidyShowInfo,                /**< If true, info-level messages are shown */
     TidyShowMarkup,              /**< If false, normal output is suppressed */
+    TidyShowMetaChange,          /**< show when meta http-equiv content charset was changed - compatibility */
     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 */
+    TidyStyleTags,               /**< Move sytle to head */
     TidyTabSize,                 /**< Expand tabs to n spaces */
     TidyUpperCaseAttrs,          /**< Output attributes in upper not lower case */
     TidyUpperCaseTags,           /**< Output tags in upper not lower case */
@@ -742,17 +758,11 @@ typedef enum
     TidyEncMac,
     TidyEncWin1252,
     TidyEncIbm858,
-
-#if SUPPORT_UTF16_ENCODINGS
     TidyEncUtf16le,
     TidyEncUtf16be,
     TidyEncUtf16,
-#endif
-
-#if SUPPORT_ASIAN_ENCODINGS
     TidyEncBig5,
     TidyEncShiftjis
-#endif
 } TidyEncodingOptions;
 
 
@@ -1037,6 +1047,7 @@ typedef enum
   TidyAttr_DEFER,                  /**< DEFER= */
   TidyAttr_DIR,                    /**< DIR= */
   TidyAttr_DISABLED,               /**< DISABLED= */
+  TidyAttr_DOWNLOAD,               /**< DOWNLOAD= */
   TidyAttr_ENCODING,               /**< ENCODING= */
   TidyAttr_ENCTYPE,                /**< ENCTYPE= */
   TidyAttr_FACE,                   /**< FACE= */
@@ -1350,16 +1361,17 @@ typedef enum
  */
 typedef enum
 {
-    TidyInfo = 350,       /**< Report: Information about markup usage */
-    TidyWarning,          /**< Report: Warning message */
-    TidyConfig,           /**< Report: Configuration error */
-    TidyAccess,           /**< Report: Accessibility message */
-    TidyError,            /**< Report: Error message - output suppressed */
-    TidyBadDocument,      /**< Report: I/O or file system error */
-    TidyFatal,            /**< Report: Crash! */
-    TidyDialogueInfo,     /**< Dialogue: Non-document related information */
-    TidyDialogueSummary,  /**< Dialogue: Summary-related information */
-    TidyDialogueDoc,      /**< Dialogue: Document-related information */
+    TidyInfo = 350,         /**< Report: Information about markup usage */
+    TidyWarning,            /**< Report: Warning message */
+    TidyConfig,             /**< Report: Configuration error */
+    TidyAccess,             /**< Report: Accessibility message */
+    TidyError,              /**< Report: Error message - output suppressed */
+    TidyBadDocument,        /**< Report: I/O or file system error */
+    TidyFatal,              /**< Report: Crash! */
+    TidyDialogueSummary,    /**< Dialogue: Summary-related information */
+    TidyDialogueInfo,       /**< Dialogue: Non-document related information */
+    TidyDialogueFootnote,   /**< Dialogue: Footnote */
+    TidyDialogueDoc = TidyDialogueFootnote, /**< Dialogue: Deprecated (renamed) */
 } TidyReportLevel;
 
     
@@ -1405,13 +1417,12 @@ typedef enum
     TIDYSTRINGS_FIRST = 500,
 
     FOREACH_MSG_MISC(MAKE_ENUM)
+    FOREACH_FOOTNOTE_MSG(MAKE_ENUM)
     FOREACH_DIALOG_MSG(MAKE_ENUM)
+    REPORT_MESSAGE_FIRST,
     FOREACH_REPORT_MSG(MAKE_ENUM)
-    
-#if SUPPORT_ACCESSIBILITY_CHECKS
-    /* Defined in `access.h` */
+    REPORT_MESSAGE_LAST,
     FOREACH_ACCESS_MSG(MAKE_ENUM)
-#endif
 
 #if SUPPORT_CONSOLE_APP
     FOREACH_MSG_CONSOLE(MAKE_ENUM)
diff --git a/HTMLTidy/vendor/tidy-html5/include/tidyplatform.h b/HTMLTidy/vendor/tidy-html5/include/tidyplatform.h
index 9187e4ba..28de4682 100644
--- a/HTMLTidy/vendor/tidy-html5/include/tidyplatform.h
+++ b/HTMLTidy/vendor/tidy-html5/include/tidyplatform.h
@@ -1,358 +1,370 @@
 #ifndef __TIDY_PLATFORM_H__
 #define __TIDY_PLATFORM_H__
 
-/** @file tidyplatform.h - Platform specifics
-
-  (c) 1998-2016 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-  
-  This file is included by tidy.h, and need not 
-  be included sepearately. It sets a number of 
-  default defines, and a PLATFORM_NAME, and includes
-  the most common system headers.
-
-*/
+/**************************************************************************//**
+ * @file
+ * Platform specific definitions, specifics, and headers. This file is
+ * included by `tidy.h` already, and need not be included separately. Among
+ * other things, the PLATFORM_NAME is defined and the most common systems
+ * headers are included.
+ *
+ * @note It should be largely unnecessary to modify this file unless adding
+ * support for a completely new architecture. Most options defined in this
+ * file specify defaults that can be overriden by the build system; for
+ * example, passing -D flags to CMake.
+ *
+ * @author  Charles Reitzel [creitzel@rcn.com]
+ * @author  HTACG, et al (consult git log)
+ *
+ * @copyright
+ *     Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts
+ *     Institute of Technology, European Research Consortium for Informatics
+ *     and Mathematics, Keio University).
+ * @copyright
+ *     See tidy.h for license.
+ *
+ * @date      Created 2001-05-20 by Charles Reitzel
+ * @date      Updated 2002-07-01 by Charles Reitzel
+ * @date      Further modifications: consult git log.
+ ******************************************************************************/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
-  Uncomment and edit one of the following #defines if you
-  want to specify the config file at compile-time.
-*/
-
-/* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
-/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
-/* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
-
-/*
-  Uncomment the following #define if you are on a system
-  supporting the HOME environment variable.
-  It enables tidy to find config files named ~/.tidyrc if 
-  the HTML_TIDY environment variable is not set.
-*/
-/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
-
-/*
-  Uncomment the following #define if your
-  system supports the call getpwnam(). 
-  E.g. Unix and Linux.
+/*=============================================================================
+ * Unix console application features
+ *   By default on Unix-like systems when building for the console program,
+ *   support runtime configuration files in /etc/ and in ~/. To prevent this,
+ *   set ENABLE_CONFIG_FILES to NO. Specify -DTIDY_CONFIG_FILE and/or
+ *   -DTIDY_USER_CONFIG_FILE to override the default paths in tidyplatform.h.
+ * @note: this section refactored to support #584.
+ *===========================================================================*/
+
+/* #define ENABLE_CONFIG_FILES */
+
+#if defined(TIDY_ENABLE_CONFIG_FILES)
+#  if !defined(TIDY_CONFIG_FILE)
+#    define TIDY_CONFIG_FILE "/etc/tidy.conf"
+#  endif
+#  if !defined(TIDY_USER_CONFIG_FILE)
+#    define TIDY_USER_CONFIG_FILE "~/.tidyrc"
+#  endif
+#else
+#  if defined(TIDY_CONFIG_FILE)
+#    undef TIDY_CONFIG_FILE
+#  endif
+#  if defined(TIDY_USER_CONFIG_FILE)
+#    undef TIDY_USER_CONFIG_FILE
+#  endif
+#endif
 
-  It enables tidy to find files named 
-  ~your/foo for use in the HTML_TIDY environment
-  variable or CONFIG_FILE or USER_CONFIGFILE or
-  on the command line: -config ~joebob/tidy.cfg
 
-  Contributed by Todd Lewis.
-*/
+/*=============================================================================
+ * Unix tilde expansion support
+ *   By default on Unix-like systems when building for the console program,
+ *   this flag is set so that Tidy knows getpwname() is available. It allows
+ *   tidy to find files named ~your/foo for use in the HTML_TIDY environment
+ *   variable or TIDY_CONFIG_FILE or TIDY_USER_CONFIG_FILE or on the command
+ *   command line: -config ~joebob/tidy.cfg
+ * Contributed by Todd Lewis.
+ *===========================================================================*/
 
 /* #define SUPPORT_GETPWNAM */
 
 
-/* Enable/disable support for Big5 and Shift_JIS character encodings */
-#ifndef SUPPORT_ASIAN_ENCODINGS
-#define SUPPORT_ASIAN_ENCODINGS 1
-#endif
-
-/* Enable/disable support for UTF-16 character encodings */
-#ifndef SUPPORT_UTF16_ENCODINGS
-#define SUPPORT_UTF16_ENCODINGS 1
-#endif
-
-/* Enable/disable support for additional accessibility checks */
-#ifndef SUPPORT_ACCESSIBILITY_CHECKS
-#define SUPPORT_ACCESSIBILITY_CHECKS 1
-#endif
+/*=============================================================================
+ * Optional Tidy features support
+ *===========================================================================*/
 
 /* Enable/disable support for additional languages */
 #ifndef SUPPORT_LOCALIZATIONS
-#define SUPPORT_LOCALIZATIONS 1
+#  define SUPPORT_LOCALIZATIONS 1
 #endif
     
 /* Enable/disable support for console */
 #ifndef SUPPORT_CONSOLE_APP
-#define SUPPORT_CONSOLE_APP 1
+#  define SUPPORT_CONSOLE_APP 1
 #endif
 
 
-/* Convenience defines for Mac platforms */
+/*=============================================================================
+ * Platform specific convenience definitions
+ *===========================================================================*/
+
+/* === Convenience defines for Mac platforms === */
 
 #if defined(macintosh)
 /* Mac OS 6.x/7.x/8.x/9.x, with or without CarbonLib - MPW or Metrowerks 68K/PPC compilers */
-#define MAC_OS_CLASSIC
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Mac OS"
-#endif
+#  define MAC_OS_CLASSIC
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Mac OS"
+#  endif
 
 /* needed for access() */
-#if !defined(_POSIX) && !defined(NO_ACCESS_SUPPORT)
-#define NO_ACCESS_SUPPORT
-#endif
+#  if !defined(_POSIX) && !defined(NO_ACCESS_SUPPORT)
+#    define NO_ACCESS_SUPPORT
+#  endif
 
-#ifdef SUPPORT_GETPWNAM
-#undef SUPPORT_GETPWNAM
-#endif
+#  ifdef SUPPORT_GETPWNAM
+#    undef SUPPORT_GETPWNAM
+#  endif
 
 #elif defined(__APPLE__) && defined(__MACH__)
-/* Mac OS X (client) 10.x (or server 1.x/10.x) - gcc or Metrowerks MachO compilers */
-#define MAC_OS_X
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Mac OS X"
-#endif
+    /* Mac OS X (client) 10.x (or server 1.x/10.x) - gcc or Metrowerks MachO compilers */
+#  define MAC_OS_X
+#  ifndef PLATFORM_NAME
+#    include "TargetConditionals.h"
+#    if TARGET_OS_IOS
+#      define PLATFORM_NAME "Apple iOS"
+#    elif TARGET_OS_MAC
+#      define PLATFORM_NAME "Apple macOS"
+#    elif TARGET_OS_TV
+#      define PLATFORM_NAME "Apple tvOS"
+#    elif TARGET_OS_WATCH
+#      define PLATFORM_NAME "Apple watchOS"
+#    else
+#      define PLATFORM_NAME "Apple Unknown OS"
+#    endif
+#  endif
 #endif
 
 #if defined(MAC_OS_CLASSIC) || defined(MAC_OS_X)
 /* Any OS on Mac platform */
-#define MAC_OS
-#define FILENAMES_CASE_SENSITIVE 0
-#define strcasecmp strcmp
+#  define MAC_OS
+#  define FILENAMES_CASE_SENSITIVE 0
+#  define strcasecmp strcmp
 #endif
 
-/* Convenience defines for BSD like platforms */
- 
+/* === Convenience defines for BSD-like platforms === */
+
 #if defined(__FreeBSD__)
-#define BSD_BASED_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "FreeBSD"
-#endif
+#  define BSD_BASED_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "FreeBSD"
+#  endif
 
 #elif defined(__NetBSD__)
-#define BSD_BASED_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "NetBSD"
-#endif
+#  define BSD_BASED_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "NetBSD"
+#  endif
 
 #elif defined(__OpenBSD__)
-#define BSD_BASED_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "OpenBSD"
-#endif
+#  define BSD_BASED_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "OpenBSD"
+#  endif
 
 #elif defined(__DragonFly__)
-#define BSD_BASED_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "DragonFly"
-#endif
+#  define BSD_BASED_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "DragonFly"
+#  endif
 
 #elif defined(__MINT__)
-#define BSD_BASED_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "FreeMiNT"
-#endif
+#  define BSD_BASED_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "FreeMiNT"
+#  endif
 
 #elif defined(__bsdi__)
-#define BSD_BASED_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "BSD/OS"
+#  define BSD_BASED_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "BSD/OS"
+#  endif
 #endif
 
-#endif
+/* === Convenience defines for Windows platforms === */
 
-/* Convenience defines for Windows platforms */
- 
 #if defined(WINDOWS) || defined(_WIN32)
 
-#define WINDOWS_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Windows"
-#endif
+#  define WINDOWS_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Windows"
+#  endif
 
-#if defined(__MWERKS__) || defined(__MSL__)
-/* not available with Metrowerks Standard Library */
+#  if defined(__MWERKS__) || defined(__MSL__)
+     /* not available with Metrowerks Standard Library */
+#    ifdef SUPPORT_GETPWNAM
+#      undef SUPPORT_GETPWNAM
+#    endif
+     /* needed for setmode() */
+#    if !defined(NO_SETMODE_SUPPORT)
+#      define NO_SETMODE_SUPPORT
+#    endif
+#    define strcasecmp _stricmp
+#  endif
 
-#ifdef SUPPORT_GETPWNAM
-#undef SUPPORT_GETPWNAM
-#endif
+#  if defined(__BORLANDC__)
+#    define strcasecmp stricmp
+#  endif
 
-/* needed for setmode() */
-#if !defined(NO_SETMODE_SUPPORT)
-#define NO_SETMODE_SUPPORT
-#endif
+#  define FILENAMES_CASE_SENSITIVE 0
+#  define SUPPORT_POSIX_MAPPED_FILES 0
 
-#define strcasecmp _stricmp
-
-#endif
-
-#if defined(__BORLANDC__)
-#define strcasecmp stricmp
-#endif
+#endif /* WINDOWS */
 
-#define FILENAMES_CASE_SENSITIVE 0
-#define SUPPORT_POSIX_MAPPED_FILES 0
+/* === Convenience defines for Linux platforms === */
 
-#endif
-
-/* Convenience defines for Linux platforms */
- 
 #if defined(linux) && defined(__alpha__)
-/* Linux on Alpha - gcc compiler */
-#define LINUX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Linux/Alpha"
-#endif
+   /* Linux on Alpha - gcc compiler */
+#  define LINUX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Linux/Alpha"
+#  endif
 
 #elif defined(linux) && defined(__sparc__)
-/* Linux on Sparc - gcc compiler */
-#define LINUX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Linux/Sparc"
-#endif
+    /* Linux on Sparc - gcc compiler */
+#  define LINUX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Linux/Sparc"
+#  endif
 
 #elif defined(linux) && (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__))
-/* Linux on x86 - gcc compiler */
-#define LINUX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Linux/x86"
-#endif
+    /* Linux on x86 - gcc compiler */
+#  define LINUX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Linux/x86"
+#  endif
 
 #elif defined(linux) && defined(__powerpc__)
-/* Linux on PPC - gcc compiler */
-#define LINUX_OS
-
-#if defined(__linux__) && defined(__powerpc__)
-
-/* #if #system(linux) */
-/* MkLinux on PPC  - gcc (egcs) compiler */
-/* #define MAC_OS_MKLINUX */
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "MkLinux"
-#endif
-
-#else
-
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Linux/PPC"
-#endif
-
-#endif
+    /* Linux on PPC - gcc compiler */
+#  define LINUX_OS
+#  if defined(__linux__) && defined(__powerpc__)
+#    ifndef PLATFORM_NAME
+       /* MkLinux on PPC  - gcc (egcs) compiler */
+#      define PLATFORM_NAME "MkLinux"
+#    endif
+#  else
+#    ifndef PLATFORM_NAME
+#      define PLATFORM_NAME "Linux/PPC"
+#    endif
+#  endif
 
 #elif defined(linux) || defined(__linux__)
-/* generic Linux */
-#define LINUX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Linux"
-#endif
-
+    /* generic Linux */
+#  define LINUX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Linux"
+#  endif
 #endif
 
-/* Convenience defines for Solaris platforms */
+/* === Convenience defines for Solaris platforms === */
  
 #if defined(sun)
-#define SOLARIS_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Solaris"
-#endif
+#  define SOLARIS_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Solaris"
+#  endif
 #endif
 
-/* Convenience defines for HPUX + gcc platforms */
+/* === Convenience defines for HPUX + gcc platforms === */
 
 #if defined(__hpux)
-#define HPUX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "HPUX"
-#endif
+#  define HPUX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "HPUX"
+#  endif
 #endif
 
-/* Convenience defines for RISCOS + gcc platforms */
+/* === Convenience defines for RISCOS + gcc platforms === */
 
 #if defined(__riscos__)
-#define RISC_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "RISC OS"
-#endif
+#  define RISC_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "RISC OS"
+#  endif
 #endif
 
-/* Convenience defines for OS/2 + icc/gcc platforms */
+/* === Convenience defines for OS/2 + icc/gcc platforms === */
 
 #if defined(__OS2__) || defined(__EMX__)
-#define OS2_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "OS/2"
-#endif
-#define FILENAMES_CASE_SENSITIVE 0
-#define strcasecmp stricmp
+#  define OS2_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "OS/2"
+#  endif
+#  define FILENAMES_CASE_SENSITIVE 0
+#  define strcasecmp stricmp
 #endif
 
-/* Convenience defines for IRIX */
+/* === Convenience defines for IRIX === */
 
 #if defined(__sgi)
-#define IRIX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "SGI IRIX"
-#endif
+#  define IRIX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "SGI IRIX"
+#  endif
 #endif
 
-/* Convenience defines for AIX */
+/* === Convenience defines for AIX === */
 
 #if defined(_AIX)
-#define AIX_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "IBM AIX"
-#endif
+#  define AIX_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "IBM AIX"
+#  endif
 #endif
 
-
-/* Convenience defines for BeOS platforms */
+/* === Convenience defines for BeOS platforms === */
 
 #if defined(__BEOS__)
-#define BE_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "BeOS"
-#endif
+#  define BE_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "BeOS"
+#  endif
 #endif
 
-/* Convenience defines for Cygwin platforms */
+/* === Convenience defines for Cygwin platforms === */
 
 #if defined(__CYGWIN__)
-#define CYGWIN_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Cygwin"
-#endif
-#define FILENAMES_CASE_SENSITIVE 0
+#  define CYGWIN_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "Cygwin"
+#  endif
+#  define FILENAMES_CASE_SENSITIVE 0
 #endif
 
-/* Convenience defines for OpenVMS */
+/* === Convenience defines for OpenVMS === */
 
 #if defined(__VMS)
-#define OPENVMS_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "OpenVMS"
-#endif
-#define FILENAMES_CASE_SENSITIVE 0
+#  define OPENVMS_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "OpenVMS"
+#  endif
+#  define FILENAMES_CASE_SENSITIVE 0
 #endif
 
-/* Convenience defines for DEC Alpha OSF + gcc platforms */
+/* === Convenience defines for DEC Alpha OSF + gcc platforms === */
 
 #if defined(__osf__)
-#define OSF_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "DEC Alpha OSF"
-#endif
+#  define OSF_OS
+#  ifndef PLATFORM_NAME
+#    define PLATFORM_NAME "DEC Alpha OSF"
+#  endif
 #endif
 
-/* Convenience defines for ARM platforms */
+/* === Convenience defines for ARM platforms === */
 
 #if defined(__arm)
-#define ARM_OS
-
-#if defined(forARM) && defined(__NEWTON_H)
-
-/* Using Newton C++ Tools ARMCpp compiler */
-#define NEWTON_OS
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "Newton"
+#  define ARM_OS
+#  if defined(forARM) && defined(__NEWTON_H)
+     /* Using Newton C++ Tools ARMCpp compiler */
+#    define NEWTON_OS
+#    ifndef PLATFORM_NAME
+#      define PLATFORM_NAME "Newton"
+#    endif
+#  else
+#    ifndef PLATFORM_NAME
+#      define PLATFORM_NAME "ARM"
+#    endif
+#  endif
 #endif
 
-#else
-
-#ifndef PLATFORM_NAME
-#define PLATFORM_NAME "ARM"
-#endif
 
-#endif
-
-#endif
+/*=============================================================================
+ * Standard Library Includes
+ *===========================================================================*/
 
 #include <ctype.h>
 #include <stdio.h>
@@ -363,193 +375,214 @@ extern "C" {
 #include <assert.h>
 
 #ifdef NEEDS_MALLOC_H
-#include <malloc.h>
+#  include <malloc.h>
 #endif
 
 #ifdef SUPPORT_GETPWNAM
-#include <pwd.h>
+#  include <pwd.h>
 #endif
 
 #ifdef NEEDS_UNISTD_H
-#include <unistd.h>  /* needed for unlink on some Unix systems */
+#  include <unistd.h>  /* needed for unlink on some Unix systems */
 #endif
 
-/* By default, use case-sensitive filename comparison.
-*/
+
+/*=============================================================================
+ * Case sensitive file systems
+ *===========================================================================*/
+
+/* By default, use case-sensitive filename comparison. */
 #ifndef FILENAMES_CASE_SENSITIVE
-#define FILENAMES_CASE_SENSITIVE 1
+#  define FILENAMES_CASE_SENSITIVE 1
 #endif
 
 
-/*
-  Tidy preserves the last modified time for the files it
-  cleans up.
-*/
-
-/*
-  If your platform doesn't support <utime.h> and the
-  utime() function, or <sys/futime> and the futime()
-  function then set PRESERVE_FILE_TIMES to 0.
-  
-  If your platform doesn't support <sys/utime.h> and the
-  futime() function, then set HAS_FUTIME to 0.
-  
-  If your platform supports <utime.h> and the
-  utime() function requires the file to be
-  closed first, then set UTIME_NEEDS_CLOSED_FILE to 1.
-*/
+/*=============================================================================
+ * Last modified time preservation
+ *   Tidy preserves the last modified time for the files it cleans up.
+ *
+ *   If your platform doesn't support <utime.h> and the utime() function, or
+ *   <sys/futime> and the futime() function then set PRESERVE_FILE_TIMES to 0.
+ *
+ *   If your platform doesn't support <sys/utime.h> and the futime() function,
+ *   then set HAS_FUTIME to 0.
+ *
+ *   If your platform supports <utime.h> and the utime() function requires the
+ *   file to be closed first, then set UTIME_NEEDS_CLOSED_FILE to 1.
+ *===========================================================================*/
 
 /* Keep old PRESERVEFILETIMES define for compatibility */
 #ifdef PRESERVEFILETIMES
-#undef PRESERVE_FILE_TIMES
-#define PRESERVE_FILE_TIMES PRESERVEFILETIMES
+#  undef PRESERVE_FILE_TIMES
+#  define PRESERVE_FILE_TIMES PRESERVEFILETIMES
 #endif
 
 #ifndef PRESERVE_FILE_TIMES
-#if defined(RISC_OS) || defined(OPENVMS_OS) || defined(OSF_OS)
-#define PRESERVE_FILE_TIMES 0
-#else
-#define PRESERVE_FILE_TIMES 1
-#endif
+#  if defined(RISC_OS) || defined(OPENVMS_OS) || defined(OSF_OS)
+#    define PRESERVE_FILE_TIMES 0
+#  else
+#    define PRESERVE_FILE_TIMES 1
+#  endif
 #endif
 
 #if PRESERVE_FILE_TIMES
 
-#ifndef HAS_FUTIME
-#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) || defined(__GLIBC__)
-#define HAS_FUTIME 0
-#else
-#define HAS_FUTIME 1
-#endif
-#endif
+#  ifndef HAS_FUTIME
+#    if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) || defined(__GLIBC__)
+#      define HAS_FUTIME 0
+#    else
+#      define HAS_FUTIME 1
+#    endif
+#  endif
+
+#  ifndef UTIME_NEEDS_CLOSED_FILE
+#    if defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(LINUX_OS)
+#      define UTIME_NEEDS_CLOSED_FILE 1
+#    else
+#      define UTIME_NEEDS_CLOSED_FILE 0
+#    endif
+#  endif
+
+#  if defined(MAC_OS_X) || (!defined(MAC_OS_CLASSIC) && !defined(__MSL__))
+#    include <sys/types.h>
+#    include <sys/stat.h>
+#  else
+#    include <stat.h>
+#  endif
+
+#  if HAS_FUTIME
+#    include <sys/utime.h>
+#  else
+#    include <utime.h>
+#  endif
+
+/* MS Windows needs _ prefix for Unix file functions.
+   Not required by Metrowerks Standard Library (MSL).
+  
+   Tidy uses following for preserving the last modified time.
 
-#ifndef UTIME_NEEDS_CLOSED_FILE
-#if defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(LINUX_OS)
-#define UTIME_NEEDS_CLOSED_FILE 1
-#else
-#define UTIME_NEEDS_CLOSED_FILE 0
-#endif
-#endif
+   WINDOWS automatically set by Win16 compilers.
+   _WIN32 automatically set by Win32 compilers.
+*/
+#  if defined(_WIN32) && !defined(__MSL__) && !defined(__BORLANDC__)
+#    define futime _futime
+#    define fstat _fstat
+#    define utimbuf _utimbuf /* Windows seems to want utimbuf */
+#    define stat _stat
+#    define utime _utime
+#    define vsnprintf _vsnprintf
+#  endif
 
-#if defined(MAC_OS_X) || (!defined(MAC_OS_CLASSIC) && !defined(__MSL__))
-#include <sys/types.h> 
-#include <sys/stat.h>
-#else
-#include <stat.h>
 #endif
 
-#if HAS_FUTIME
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif /* HASFUTIME */
 
-/*
-  MS Windows needs _ prefix for Unix file functions.
-  Not required by Metrowerks Standard Library (MSL).
-  
-  Tidy uses following for preserving the last modified time.
+/*=============================================================================
+ * Windows file functions
+ * Windows needs _ prefix for Unix file functions.
+ * Not required by Metrowerks Standard Library (MSL).
+ *
+ * WINDOWS automatically set by Win16 compilers.
+ * _WIN32 automatically set by Win32 compilers.
+ *===========================================================================*/
 
-  WINDOWS automatically set by Win16 compilers.
-  _WIN32 automatically set by Win32 compilers.
-*/
 #if defined(_WIN32) && !defined(__MSL__) && !defined(__BORLANDC__)
 
-#define futime _futime
-#define fstat _fstat
-#define utimbuf _utimbuf /* Windows seems to want utimbuf */
-#define stat _stat
-#define utime _utime
-#define vsnprintf _vsnprintf
-#endif /* _WIN32 */
-
-#endif /* PRESERVE_FILE_TIMES */
-
-/*
-  MS Windows needs _ prefix for Unix file functions.
-  Not required by Metrowerks Standard Library (MSL).
-  
-  WINDOWS automatically set by Win16 compilers.
-  _WIN32 automatically set by Win32 compilers.
-*/
-#if defined(_WIN32) && !defined(__MSL__) && !defined(__BORLANDC__)
+#  if !(defined(__WATCOMC__) || defined(__MINGW32__))
+#    define fileno _fileno
+#    define setmode _setmode
+#  endif
 
-#if !(defined(__WATCOMC__) || defined(__MINGW32__))
-#define fileno _fileno
-#define setmode _setmode
+# if defined(_MSC_VER)
+#    define fileno _fileno
+#if !defined(NDEBUG) && !defined(ENABLE_DEBUG_LOG) && !defined(DISABLE_DEBUG_LOG)
+#define ENABLE_DEBUG_LOG
+#endif
 #endif
 
-#define access _access
-#define strcasecmp _stricmp
+#  define access _access
+#  define strcasecmp _stricmp
 
-#ifndef va_copy
-#define va_copy(dest, src) (dest = src)
-#endif
+#  ifndef va_copy
+#    define va_copy(dest, src) (dest = src)
+#  endif
 
-#if _MSC_VER > 1000
-#pragma warning( disable : 4189 ) /* local variable is initialized but not referenced */
-#pragma warning( disable : 4100 ) /* unreferenced formal parameter */
-#pragma warning( disable : 4706 ) /* assignment within conditional expression */
-#endif
+#  if _MSC_VER > 1000
+#    pragma warning( disable : 4189 ) /* local variable is initialized but not referenced */
+#    pragma warning( disable : 4100 ) /* unreferenced formal parameter */
+#    pragma warning( disable : 4706 ) /* assignment within conditional expression */
+#  endif
 
-#if _MSC_VER > 1300
-#pragma warning( disable : 4996 ) /* disable depreciation warning */
-#endif
+#  if _MSC_VER > 1300
+#    pragma warning( disable : 4996 ) /* disable depreciation warning */
+#  endif
 
 #endif /* _WIN32 */
 
 #if defined(_WIN32)
 
-#if (defined(_USRDLL) || defined(_WINDLL) || defined(BUILD_SHARED_LIB)) && !defined(TIDY_EXPORT) && !defined(TIDY_STATIC)
-#ifdef BUILDING_SHARED_LIB
-#define TIDY_EXPORT __declspec( dllexport ) 
-#else
-#define TIDY_EXPORT __declspec( dllimport ) 
-#endif
-#else
-#define TIDY_EXPORT extern
-#endif
-
-#ifndef TIDY_CALL
-#ifdef _WIN64
-#  define TIDY_CALL __fastcall
-#else
-#  define TIDY_CALL __stdcall
-#endif
-#endif
+#  if (defined(_USRDLL) || defined(_WINDLL) || defined(BUILD_SHARED_LIB)) && !defined(TIDY_EXPORT) && !defined(TIDY_STATIC)
+#    ifdef BUILDING_SHARED_LIB
+#      define TIDY_EXPORT __declspec( dllexport )
+#    else
+#      define TIDY_EXPORT __declspec( dllimport )
+#    endif
+#  else
+#    define TIDY_EXPORT extern
+#  endif
+
+#  ifndef TIDY_CALL
+#    ifdef _WIN64
+#      define TIDY_CALL __fastcall
+#    else
+#      define TIDY_CALL __stdcall
+#    endif
+#  endif
 
 #endif /* _WIN32 */
 
-/* hack for gnu sys/types.h file which defines uint and ulong */
+
+/*=============================================================================
+ * Hack for gnu sys/types.h file which defines uint and ulong
+ *===========================================================================*/
 
 #if defined(BE_OS) || defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
-#include <sys/types.h>
+#  include <sys/types.h>
 #endif
+
 #if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS)
-# undef uint
-typedef unsigned int uint;
+#  undef uint
+   typedef unsigned int uint;
 #endif
+
 #if defined(HPUX_OS) || defined(CYGWIN_OS) || defined(MAC_OS) || defined(BSD_BASED_OS) || defined(_WIN32)
-# undef ulong
-typedef unsigned long ulong;
+#  undef ulong
+   typedef unsigned long ulong;
 #endif
 
-/*
-With GCC 4,  __attribute__ ((visibility("default"))) can be used along compiling with tidylib 
-with "-fvisibility=hidden". See http://gcc.gnu.org/wiki/Visibility and build/gmake/Makefile.
-*/
+
+/*=============================================================================
+ * Visibility support
+ *   With GCC 4,  __attribute__ ((visibility("default"))) can be used
+ *   along compiling with tidylib with "-fvisibility=hidden". See
+ *   http://gcc.gnu.org/wiki/Visibility and build/gmake/Makefile.
+ *===========================================================================*/
 /*
 #if defined(__GNUC__) && __GNUC__ >= 4
-#define TIDY_EXPORT __attribute__ ((visibility("default")))
+#  define TIDY_EXPORT __attribute__ ((visibility("default")))
 #endif
 */
 
+
+/*=============================================================================
+ * Other definitions
+ *===========================================================================*/
+
 #ifndef TIDY_EXPORT /* Define it away for most builds */
-#define TIDY_EXPORT 
+#  define TIDY_EXPORT
 #endif
 
 #ifndef TIDY_STRUCT
-#define TIDY_STRUCT
+#  define TIDY_STRUCT
 #endif
 
 typedef unsigned char byte;
@@ -557,41 +590,39 @@ typedef unsigned char byte;
 typedef uint tchar;         /* single, full character */
 typedef char tmbchar;       /* single, possibly partial character */
 #ifndef TMBSTR_DEFINED
-typedef tmbchar* tmbstr;    /* pointer to buffer of possibly partial chars */
-typedef const tmbchar* ctmbstr; /* Ditto, but const */
-#define NULLSTR (tmbstr)""
-#define TMBSTR_DEFINED
+   typedef tmbchar* tmbstr;    /* pointer to buffer of possibly partial chars */
+   typedef const tmbchar* ctmbstr; /* Ditto, but const */
+#  define NULLSTR (tmbstr)""
+#  define TMBSTR_DEFINED
 #endif
 
 #ifndef TIDY_CALL
-#define TIDY_CALL
+#  define TIDY_CALL
 #endif
 
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
-# define ARG_UNUSED(x) x __attribute__((unused))
-# define FUNC_UNUSED __attribute__((unused))
+#  define ARG_UNUSED(x) x __attribute__((unused))
+#  define FUNC_UNUSED __attribute__((unused))
 #else
-# define ARG_UNUSED(x) x
-# define FUNC_UNUSED
+#  define ARG_UNUSED(x) x
+#  define FUNC_UNUSED
 #endif
 
 /* HAS_VSNPRINTF triggers the use of "vsnprintf", which is safe related to
    buffer overflow. Therefore, we make it the default unless HAS_VSNPRINTF
    has been defined. */
 #ifndef HAS_VSNPRINTF
-# define HAS_VSNPRINTF 1
+#  define HAS_VSNPRINTF 1
 #endif
 
 #ifndef SUPPORT_POSIX_MAPPED_FILES
-# define SUPPORT_POSIX_MAPPED_FILES 1
+#  define SUPPORT_POSIX_MAPPED_FILES 1
 #endif
 
-/*
-  bool is a reserved word in some but
-  not all C++ compilers depending on age
-  work around is to avoid bool altogether
-  by introducing a new enum called Bool
+/* `bool` is a reserved word in some but not all C++ compilers depending on age.
+   age. Work around is to avoid bool by introducing a new enum called `Bool`.
 */
+    
 /* We could use the C99 definition where supported
 typedef _Bool Bool;
 #define no (_Bool)0
@@ -609,7 +640,7 @@ extern void* null;
 */
 
 #if defined(DMALLOC)
-#include "dmalloc.h"
+#  include "dmalloc.h"
 #endif
 
 /* Opaque data structure.
@@ -636,7 +667,6 @@ opaque_type( TidyIterator );
 
 #endif /* __TIDY_PLATFORM_H__ */
 
-
 /*
  * local variables:
  * mode: c
diff --git a/HTMLTidy/vendor/tidy-html5/src/access.c b/HTMLTidy/vendor/tidy-html5/src/access.c
index ac3b9aaa..55bfde61 100644
--- a/HTMLTidy/vendor/tidy-html5/src/access.c
+++ b/HTMLTidy/vendor/tidy-html5/src/access.c
@@ -8,9 +8,6 @@
 
 
 #include "tidy-int.h"
-
-#if SUPPORT_ACCESSIBILITY_CHECKS
-
 #include "access.h"
 #include "message.h"
 #include "tags.h"
@@ -506,19 +503,19 @@ static void CheckColorAvailable( TidyDocImpl* doc, Node* node )
     if (Level1_Enabled( doc ))
     {
         if ( nodeIsIMG(node) )
-            TY_(ReportAccessWarning)( doc, node, INFORMATION_NOT_CONVEYED_IMAGE );
+            TY_(ReportAccessError)( doc, node, INFORMATION_NOT_CONVEYED_IMAGE );
 
         else if ( nodeIsAPPLET(node) )
-            TY_(ReportAccessWarning)( doc, node, INFORMATION_NOT_CONVEYED_APPLET );
+            TY_(ReportAccessError)( doc, node, INFORMATION_NOT_CONVEYED_APPLET );
 
         else if ( nodeIsOBJECT(node) )
-            TY_(ReportAccessWarning)( doc, node, INFORMATION_NOT_CONVEYED_OBJECT );
+            TY_(ReportAccessError)( doc, node, INFORMATION_NOT_CONVEYED_OBJECT );
 
         else if ( nodeIsSCRIPT(node) )
-            TY_(ReportAccessWarning)( doc, node, INFORMATION_NOT_CONVEYED_SCRIPT );
+            TY_(ReportAccessError)( doc, node, INFORMATION_NOT_CONVEYED_SCRIPT );
 
         else if ( nodeIsINPUT(node) )
-            TY_(ReportAccessWarning)( doc, node, INFORMATION_NOT_CONVEYED_INPUT );
+            TY_(ReportAccessError)( doc, node, INFORMATION_NOT_CONVEYED_INPUT );
     }
 }
 
@@ -580,7 +577,7 @@ static void CheckColorContrast( TidyDocImpl* doc, Node* node )
                 if ( GetRgb(av->value, rgbFG) &&
                      !CompareColors(rgbBG, rgbFG) )
                 {
-                    TY_(ReportAccessWarning)( doc, node, errcode );
+                    TY_(ReportAccessError)( doc, node, errcode );
                 }
             }
         }
@@ -738,25 +735,25 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                     else if (TY_(tmbstrlen)(av->value) > 150)
                     {
                         HasAlt = yes;
-                        TY_(ReportAccessWarning)( doc, node, IMG_ALT_SUSPICIOUS_TOO_LONG );
+                        TY_(ReportAccessError)( doc, node, IMG_ALT_SUSPICIOUS_TOO_LONG );
                     }
 
                     else if (IsImage (av->value) == yes)
                     {
                         HasAlt = yes;
-                        TY_(ReportAccessWarning)( doc, node, IMG_ALT_SUSPICIOUS_FILENAME);
+                        TY_(ReportAccessError)( doc, node, IMG_ALT_SUSPICIOUS_FILENAME);
                     }
             
                     else if (IsPlaceholderAlt (av->value) == yes)
                     {
                         HasAlt = yes;
-                        TY_(ReportAccessWarning)( doc, node, IMG_ALT_SUSPICIOUS_PLACEHOLDER);
+                        TY_(ReportAccessError)( doc, node, IMG_ALT_SUSPICIOUS_PLACEHOLDER);
                     }
 
                     else if (EndsWithBytes (av->value) == yes)
                     {
                         HasAlt = yes;
-                        TY_(ReportAccessWarning)( doc, node, IMG_ALT_SUSPICIOUS_FILE_SIZE);
+                        TY_(ReportAccessError)( doc, node, IMG_ALT_SUSPICIOUS_FILE_SIZE);
                     }
                 }
             }
@@ -913,19 +910,19 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
             if ((HasDLINK == yes)&&
                 (HasLongDesc == no))
             {
-                TY_(ReportAccessWarning)( doc, node, IMG_MISSING_LONGDESC);
+                TY_(ReportAccessError)( doc, node, IMG_MISSING_LONGDESC);
             }
 
             if ((HasLongDesc == yes)&&
                 (HasDLINK == no))
             {
-                TY_(ReportAccessWarning)( doc, node, IMG_MISSING_DLINK);
+                TY_(ReportAccessError)( doc, node, IMG_MISSING_DLINK);
             }
 
             if ((HasLongDesc == no)&&
                 (HasDLINK == no))
             {
-                TY_(ReportAccessWarning)( doc, node, IMG_MISSING_LONGDESC_DLINK);
+                TY_(ReportAccessError)( doc, node, IMG_MISSING_LONGDESC_DLINK);
             }
         }
 
@@ -933,7 +930,7 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
         {
             TY_(ReportAccessError)( doc, node, IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION);
 
-            TY_(ReportAccessWarning)( doc, node, IMG_MAP_SERVER_REQUIRES_TEXT_LINKS);
+            TY_(ReportAccessError)( doc, node, IMG_MAP_SERVER_REQUIRES_TEXT_LINKS);
         }
     }
 }
@@ -1180,7 +1177,7 @@ static void CheckFrame( TidyDocImpl* doc, Node* node )
         if ( doc->access.numFrames==3 && doc->access.HasCheckedLongDesc<3 )
         {
             doc->access.numFrames = 0;
-            TY_(ReportAccessWarning)( doc, node, FRAME_MISSING_LONGDESC );
+            TY_(ReportAccessError)( doc, node, FRAME_MISSING_LONGDESC );
         }
     }
 }
@@ -1284,11 +1281,11 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
             {
                 if (AttrValueIs(av, "_new"))
                 {
-                    TY_(ReportAccessWarning)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_NEW);
+                    TY_(ReportAccessError)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_NEW);
                 }
                 else if (AttrValueIs(av, "_blank"))
                 {
-                    TY_(ReportAccessWarning)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_BLANK);
+                    TY_(ReportAccessError)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_BLANK);
                 }
             }
         }
@@ -1311,20 +1308,20 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
 
                 if (TY_(tmbstrcmp) (word, "click here") == 0)
                 {
-                    TY_(ReportAccessWarning)( doc, node, LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE);
+                    TY_(ReportAccessError)( doc, node, LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE);
                 }
 
                 if (HasTriggeredLink == no)
                 {
                     if (TY_(tmbstrlen)(word) < 6)
                     {
-                        TY_(ReportAccessWarning)( doc, node, LINK_TEXT_NOT_MEANINGFUL);
+                        TY_(ReportAccessError)( doc, node, LINK_TEXT_NOT_MEANINGFUL);
                     }
                 }
 
                 if (TY_(tmbstrlen)(word) > 60)
                 {
-                    TY_(ReportAccessWarning)( doc, node, LINK_TEXT_TOO_LONG);
+                    TY_(ReportAccessError)( doc, node, LINK_TEXT_TOO_LONG);
                 }
 
             }
@@ -1332,7 +1329,7 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
         
         if (node->content == NULL)
         {
-            TY_(ReportAccessWarning)( doc, node, LINK_TEXT_MISSING);
+            TY_(ReportAccessError)( doc, node, LINK_TEXT_MISSING);
         }
     }
 }
@@ -1380,11 +1377,11 @@ static void CheckArea( TidyDocImpl* doc, Node* node )
             {
                 if (AttrValueIs(av, "_new"))
                 {
-                    TY_(ReportAccessWarning)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_NEW);
+                    TY_(ReportAccessError)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_NEW);
                 }
                 else if (AttrValueIs(av, "_blank"))
                 {
-                    TY_(ReportAccessWarning)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_BLANK);
+                    TY_(ReportAccessError)( doc, node, NEW_WINDOWS_REQUIRE_WARNING_BLANK);
                 }
             }
         }
@@ -1539,14 +1536,14 @@ static void CheckTH( TidyDocImpl* doc, Node* node )
                     (TY_(tmbstrlen)(av->value) == 0))
                 {
                     HasAbbr = yes;
-                    TY_(ReportAccessWarning)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_NULL);
+                    TY_(ReportAccessError)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_NULL);
                 }
                 
                 if ((IsWhitespace (av->value) == yes)&&
                     (TY_(tmbstrlen)(av->value) > 0))
                 {
                     HasAbbr = yes;
-                    TY_(ReportAccessWarning)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES);
+                    TY_(ReportAccessError)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES);
                 }
             }
         }
@@ -1561,7 +1558,7 @@ static void CheckTH( TidyDocImpl* doc, Node* node )
             if ((TY_(tmbstrlen)(word) > 15)&&
                 (HasAbbr == no))
             {
-                TY_(ReportAccessWarning)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR);
+                TY_(ReportAccessError)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR);
             }
         }
     }
@@ -1644,14 +1641,14 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node )
             /* Displays HTML 4 Table Algorithm when multiple column of headers used */
             if (validColSpanRows == no)
             {
-                TY_(ReportAccessWarning)( doc, node, DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS );
-                TY_(DialogueMessage)( doc, TEXT_HTML_T_ALGORITHM, TidyDialogueDoc );
+                TY_(ReportAccessError)( doc, node, DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS );
+                TY_(Dialogue)( doc, TEXT_HTML_T_ALGORITHM );
             }
 
             if (validColSpanColumns == no)
             {
-                TY_(ReportAccessWarning)( doc, node, DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS );
-                TY_(DialogueMessage)( doc, TEXT_HTML_T_ALGORITHM, TidyDialogueDoc );
+                TY_(ReportAccessError)( doc, node, DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS );
+                TY_(Dialogue)( doc, TEXT_HTML_T_ALGORITHM );
             }
         }
     }
@@ -1805,13 +1802,13 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
 
             if (numTR == 1)
             {
-                TY_(ReportAccessWarning)( doc, node, LAYOUT_TABLES_LINEARIZE_PROPERLY);
+                TY_(ReportAccessError)( doc, node, LAYOUT_TABLES_LINEARIZE_PROPERLY);
             }
         }
     
         if ( doc->access.HasTH )
         {
-            TY_(ReportAccessWarning)( doc, node, LAYOUT_TABLE_INVALID_MARKUP);
+            TY_(ReportAccessError)( doc, node, LAYOUT_TABLE_INVALID_MARKUP);
         }
     }
 
@@ -2216,10 +2213,10 @@ static void CheckHeaderNesting( TidyDocImpl* doc, Node* node )
         }
 
         if ( !IsValidIncrease )
-            TY_(ReportAccessWarning)( doc, node, HEADERS_IMPROPERLY_NESTED );
+            TY_(ReportAccessError)( doc, node, HEADERS_IMPROPERLY_NESTED );
     
         if ( NeedsDescription )
-            TY_(ReportAccessWarning)( doc, node, HEADER_USED_FORMAT_TEXT );    
+            TY_(ReportAccessError)( doc, node, HEADER_USED_FORMAT_TEXT );    
     }
 }
 
@@ -2262,17 +2259,17 @@ static void CheckParagraphHeader( TidyDocImpl* doc, Node* node )
             {
                 if ( nodeIsSTRONG(node->content) )
                 {
-                    TY_(ReportAccessWarning)( doc, node, POTENTIAL_HEADER_BOLD);
+                    TY_(ReportAccessError)( doc, node, POTENTIAL_HEADER_BOLD);
                 }
 
                 if ( nodeIsU(node->content) )
                 {
-                    TY_(ReportAccessWarning)( doc, node, POTENTIAL_HEADER_UNDERLINE);
+                    TY_(ReportAccessError)( doc, node, POTENTIAL_HEADER_UNDERLINE);
                 }
 
                 if ( nodeIsEM(node->content) )
                 {
-                    TY_(ReportAccessWarning)( doc, node, POTENTIAL_HEADER_ITALICS);
+                    TY_(ReportAccessError)( doc, node, POTENTIAL_HEADER_ITALICS);
                 }
             }
         }
@@ -2408,7 +2405,7 @@ static void CheckLink( TidyDocImpl* doc, Node* node )
         }
 
         if (HasRel && HasType)
-            TY_(ReportAccessWarning)( doc, node, STYLESHEETS_REQUIRE_TESTING_LINK );
+            TY_(ReportAccessError)( doc, node, STYLESHEETS_REQUIRE_TESTING_LINK );
     }
 }
 
@@ -2424,7 +2421,7 @@ static void CheckStyle( TidyDocImpl* doc, Node* node )
 {
     if (Level1_Enabled( doc ))
     {
-        TY_(ReportAccessWarning)( doc, node, STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT );
+        TY_(ReportAccessError)( doc, node, STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT );
     }
 }
 
@@ -2450,7 +2447,7 @@ static void DynamicContent( TidyDocImpl* doc, Node* node )
             msgcode = TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT;
 
         if ( msgcode )
-            TY_(ReportAccessWarning)( doc, node, msgcode );
+            TY_(ReportAccessError)( doc, node, msgcode );
     }
 }
 
@@ -2477,7 +2474,7 @@ static void ProgrammaticObjects( TidyDocImpl* doc, Node* node )
             msgcode = PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET;
 
         if ( msgcode )
-            TY_(ReportAccessWarning)( doc, node, msgcode );
+            TY_(ReportAccessError)( doc, node, msgcode );
     }
 }
 
@@ -2503,55 +2500,11 @@ static void AccessibleCompatible( TidyDocImpl* doc, Node* node )
             msgcode = ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET;
 
         if ( msgcode )
-            TY_(ReportAccessWarning)( doc, node, msgcode );
+            TY_(ReportAccessError)( doc, node, msgcode );
     }
 }
 
 
-/********************************************************
-* WordCount
-*
-* Counts the number of words in the document.  Must have
-* more than 3 words to verify changes in natural
-* language of document.
-*
-* CPR - Not sure what intent is here, but this 
-* routine has nothing to do with changes in language.
-* It seems like a bad idea to emit this message for
-* every document with _more_ than 3 words!
-********************************************************/
-#if 0
-static int WordCount( TidyDocImpl* doc, Node* node )
-{
-    int wc = 0;
-
-    if (Level1_Enabled( doc ))
-    {
-        /* Count the number of words found within a text node */
-        if ( TY_(nodeIsText)( node ) )
-        {
-            tmbchar ch;
-            ctmbstr word = textFromOneNode( doc, node );
-            if ( !IsWhitespace(word) )
-            {
-                ++wc;
-                while ( (ch = *word++) && wc < 5 )
-                {
-                    if ( ch == ' ')
-                        ++wc;
-                }
-            }
-        }
-
-        for ( node = node->content; wc < 5 && node; node = node->next )
-        {
-            wc += WordCount( doc, node );
-        }
-    }
-    return wc;
-}
-#endif
-
 /**************************************************
 * CheckFlicker
 *
@@ -2586,7 +2539,7 @@ static void CheckFlicker( TidyDocImpl* doc, Node* node )
         }            
 
         if ( msgcode )
-            TY_(ReportAccessWarning)( doc, node, msgcode );
+            TY_(ReportAccessError)( doc, node, msgcode );
     }
 }
 
@@ -2935,7 +2888,7 @@ static void CheckForStyleAttribute( TidyDocImpl* doc, Node* node )
         AttVal* style = attrGetSTYLE( node );
         if ( hasValue(style) )
         {
-            TY_(ReportAccessWarning)( doc, node, STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR );
+            TY_(ReportAccessError)( doc, node, STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR );
         }
     }
 
@@ -2999,9 +2952,9 @@ static void CheckListUsage( TidyDocImpl* doc, Node* node )
        ** IFF OL/UL node is implicit
        */
        if ( !nodeIsLI(node->content) ) {
-            TY_(ReportAccessWarning)( doc, node, msgcode );
+            TY_(ReportAccessError)( doc, node, msgcode );
        } else if ( node->implicit ) {  /* if a tidy added node */
-            TY_(ReportAccessWarning)( doc, node, LIST_USAGE_INVALID_LI );
+            TY_(ReportAccessError)( doc, node, LIST_USAGE_INVALID_LI );
        }
     }
     else if ( nodeIsLI(node) )
@@ -3017,13 +2970,13 @@ static void CheckListUsage( TidyDocImpl* doc, Node* node )
         if ( node->parent == NULL ||
              ( !nodeIsOL(node->parent) && !nodeIsUL(node->parent) ) )
         {
-            TY_(ReportAccessWarning)( doc, node, LIST_USAGE_INVALID_LI );
+            TY_(ReportAccessError)( doc, node, LIST_USAGE_INVALID_LI );
         } else if ( node->implicit && node->parent &&
                     ( nodeIsOL(node->parent) || nodeIsUL(node->parent) ) ) {
             /* if tidy added LI node, then */
             msgcode = nodeIsUL(node->parent) ?
                 LIST_USAGE_INVALID_UL : LIST_USAGE_INVALID_OL;
-            TY_(ReportAccessWarning)( doc, node, msgcode );
+            TY_(ReportAccessError)( doc, node, msgcode );
         }
     }
 }
@@ -3290,7 +3243,7 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
     InitAccessibilityChecks( doc, cfg(doc, TidyAccessibilityCheckLevel) );
 
     /* Hello there, ladies and gentlemen... */
-    TY_(DialogueMessage)( doc, STRING_HELLO_ACCESS, TidyDialogueDoc );
+    TY_(Dialogue)( doc, STRING_HELLO_ACCESS );
 
     /* Checks all elements for script accessibility */
     CheckScriptKeyboardAccessible( doc, &doc->root );
@@ -3306,27 +3259,12 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
     if ( Level2_Enabled( doc )
          && ! CheckMissingStyleSheets( doc, &doc->root ) )
     {
-        TY_(ReportAccessWarning)( doc, &doc->root, STYLE_SHEET_CONTROL_PRESENTATION );
+        TY_(ReportAccessError)( doc, &doc->root, STYLE_SHEET_CONTROL_PRESENTATION );
     }
 
     /* Check to see if any list elements are found within the document */
     CheckForListElements( doc, &doc->root );
 
-    /* Checks for natural language change */
-    /* Must contain more than 3 words of text in the document
-    **
-    ** CPR - Not sure what intent is here, but this 
-    ** routine has nothing to do with changes in language.
-    ** It seems like a bad idea to emit this message for
-    ** every document with _more_ than 3 words!
-
-    if ( WordCount(doc, &doc->root) > 3 )
-    {
-        TY_(ReportAccessWarning)( doc, node, INDICATE_CHANGES_IN_LANGUAGE);
-    }
-    */
-
-
     /* Recursively apply all remaining checks to 
     ** each node in document.
     */
@@ -3336,13 +3274,3 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
     FreeAccessibilityChecks( doc );
 }
 
-#endif
-
-/*
- * local variables:
- * mode: c
- * indent-tabs-mode: nil
- * c-basic-offset: 4
- * eval: (c-set-offset 'substatement-open 0)
- * end:
- */
diff --git a/HTMLTidy/vendor/tidy-html5/src/access.h b/HTMLTidy/vendor/tidy-html5/src/access.h
index 04f003b2..cbb62576 100644
--- a/HTMLTidy/vendor/tidy-html5/src/access.h
+++ b/HTMLTidy/vendor/tidy-html5/src/access.h
@@ -4,11 +4,6 @@
 /*********************************************************************
  * carry out accessibility checks
  *
- * This module is an add-on to HTML Tidy and is enabled or disabled via
- * the SUPPORT_ACCESSIBILITY_CHECKS macro, which is defined by default
- * in `tidyplatform.h`. Search this code for this macro to determine
- * other locations supporting code exists.
- *
  * This module carries out processes for all accessibility checks. It
  * traverses through all the content within the tree and evaluates the
  * tags for accessibility.
@@ -37,8 +32,6 @@
 
 #include "forward.h"
 
-#if SUPPORT_ACCESSIBILITY_CHECKS
-
 
 enum {
   TEXTBUF_SIZE=128u
@@ -94,5 +87,4 @@ struct _TidyAccessImpl
 void TY_(AccessibilityChecks)( TidyDocImpl* doc );
 
 
-#endif /* SUPPORT_ACCESSIBILITY_CHECKS */
 #endif /* __ACCESS_H__ */
diff --git a/HTMLTidy/vendor/tidy-html5/src/alloc.c b/HTMLTidy/vendor/tidy-html5/src/alloc.c
index 8cf0856f..7235a3c5 100644
--- a/HTMLTidy/vendor/tidy-html5/src/alloc.c
+++ b/HTMLTidy/vendor/tidy-html5/src/alloc.c
@@ -9,15 +9,20 @@
 
 #include "tidy.h"
 #include "forward.h"
-#ifdef DEBUG_MEMORY
 #include "sprtf.h"
-#endif
 
 static TidyMalloc  g_malloc  = NULL;
 static TidyRealloc g_realloc = NULL;
 static TidyFree    g_free    = NULL;
 static TidyPanic   g_panic   = NULL;
 
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_MEMORY)
+static int alloccnt = 0;
+static int realloccnt = 0;
+static int freecnt = 0;
+#endif
+
+
 Bool TIDY_CALL tidySetMallocCall( TidyMalloc fmalloc )
 {
   g_malloc  = fmalloc;
@@ -59,8 +64,9 @@ static void* TIDY_CALL defaultAlloc( TidyAllocator* allocator, size_t size )
     void *p = ( g_malloc ? g_malloc(size) : malloc(size) );
     if ( !p )
         defaultPanic( allocator,"Out of memory!");
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_MEMORY)
-    SPRTF("alloc   MEM %p, size %d\n", p, (int)size );
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_MEMORY)
+    alloccnt++;
+    SPRTF("%d: alloc   MEM %p, size %d\n", alloccnt, p, (int)size );
     if (size == 0) {
         SPRTF("NOTE: An allocation of ZERO bytes!!!!!!\n");
     }
@@ -77,8 +83,9 @@ static void* TIDY_CALL defaultRealloc( TidyAllocator* allocator, void* mem, size
     p = ( g_realloc ? g_realloc(mem, newsize) : realloc(mem, newsize) );
     if (!p)
         defaultPanic( allocator, "Out of memory!");
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_MEMORY)
-    SPRTF("realloc MEM %p, size %d\n", p, (int)newsize );
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_MEMORY)
+    realloccnt++;
+    SPRTF("%d: realloc MEM %p, size %d\n", realloccnt, p, (int)newsize );
 #endif
     return p;
 }
@@ -87,8 +94,9 @@ static void TIDY_CALL defaultFree( TidyAllocator* ARG_UNUSED(allocator), void* m
 {
     if ( mem )
     {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_MEMORY)
-        SPRTF("free    MEM %p\n", mem );
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_MEMORY)
+        freecnt++;
+        SPRTF("%d: free    MEM %p\n", freecnt, mem );
 #endif
         if ( g_free )
             g_free( mem );
diff --git a/HTMLTidy/vendor/tidy-html5/src/attrapi.c b/HTMLTidy/vendor/tidy-html5/src/attrapi.c
deleted file mode 100644
index c6b806e3..00000000
--- a/HTMLTidy/vendor/tidy-html5/src/attrapi.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* attrget.c -- Additional attribute API
-
-  (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-  
-*/
-
-#include "tidy-int.h"
-#include "tidy.h"
-
-TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId )
-{
-    Node* nimp = tidyNodeToImpl(tnod);
-    return tidyImplToAttr( TY_(AttrGetById)( nimp, attId ) );
-}
-
-
-Bool TIDY_CALL tidyAttrIsEvent( TidyAttr tattr )
-{
-    return TY_(attrIsEvent)( tidyAttrToImpl(tattr) );
-}
-
-
-/*
- * local variables:
- * mode: c
- * indent-tabs-mode: nil
- * c-basic-offset: 4
- * eval: (c-set-offset 'substatement-open 0)
- * end:
- */
diff --git a/HTMLTidy/vendor/tidy-html5/src/attrdict.c b/HTMLTidy/vendor/tidy-html5/src/attrdict.c
index e6c389b6..c9ee060b 100644
--- a/HTMLTidy/vendor/tidy-html5/src/attrdict.c
+++ b/HTMLTidy/vendor/tidy-html5/src/attrdict.c
@@ -180,6 +180,7 @@ const AttrVersion TY_(W3CAttrsFor_A)[] =
   { TidyAttr_CLASS,                 xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */
   { TidyAttr_COORDS,                xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|xxxx|xxxx },
   { TidyAttr_DIR,                   xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|HT50|XH50 }, /* CORE override */
+  { TidyAttr_DOWNLOAD,              xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 },
   { TidyAttr_HREF,                  HT20|HT32|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 },
   { TidyAttr_HREFLANG,              xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 },
   { TidyAttr_ID,                    xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */
diff --git a/HTMLTidy/vendor/tidy-html5/src/attrs.c b/HTMLTidy/vendor/tidy-html5/src/attrs.c
index a4cb3798..2aaf638b 100644
--- a/HTMLTidy/vendor/tidy-html5/src/attrs.c
+++ b/HTMLTidy/vendor/tidy-html5/src/attrs.c
@@ -146,6 +146,7 @@ static const Attribute attribute_defs [] =
   { TidyAttr_DEFER,                   "defer",                   CH_BOOL      }, /* SCRIPT */
   { TidyAttr_DIR,                     "dir",                     CH_TEXTDIR   }, /* ltr or rtl */
   { TidyAttr_DISABLED,                "disabled",                CH_BOOL      }, /* form fields */
+  { TidyAttr_DOWNLOAD,                "download",                CH_PCDATA    }, /* anchor */
   { TidyAttr_ENCODING,                "encoding",                CH_PCDATA    }, /* <?xml?> */
   { TidyAttr_ENCTYPE,                 "enctype",                 CH_XTYPE     }, /* FORM */
   { TidyAttr_FACE,                    "face",                    CH_PCDATA    }, /* BASEFONT, FONT */
@@ -411,24 +412,14 @@ static const Attribute attribute_defs [] =
   { TidyAttr_ARIA_VALUEMIN,           "aria-valuemin",           CH_PCDATA   },
   { TidyAttr_ARIA_VALUENOW,           "aria-valuenow",           CH_PCDATA   },
   { TidyAttr_ARIA_VALUETEXT,          "aria-valuetext",          CH_PCDATA   },
-
   { TidyAttr_X,                       "x",                       CH_PCDATA    }, /* for <svg> */
   { TidyAttr_Y,                       "y",                       CH_PCDATA    }, /* for <svg> */
-#if 0   /* with uppercase chars taken directly from W3C; are these case-insensitive everywhere? */
-  { TidyAttr_VIEWBOX,                 "viewBox",                 VERS_INLINE_SVG,   CH_PCDATA    }, /* for <svg> */
-  { TidyAttr_PRESERVEASPECTRATIO,     "preserveAspectRatio",     VERS_INLINE_SVG,   CH_PCDATA    }, /* for <svg> */
-  { TidyAttr_ZOOMANDPAN,              "zoomAndPan",              VERS_INLINE_SVG,   CH_PCDATA    }, /* for <svg> */
-  { TidyAttr_BASEPROFILE,             "baseProfile",             VERS_INLINE_SVG,   CH_PCDATA    }, /* for <svg> */
-  { TidyAttr_CONTENTSCRIPTTYPE,       "contentScriptType",       VERS_INLINE_SVG,   CH_PCDATA    }, /* for <svg> */
-  { TidyAttr_CONTENTSTYLETYPE,        "contentStyleType",        VERS_INLINE_SVG,   CH_PCDATA    }, /* for <svg> */
-#else
   { TidyAttr_VIEWBOX,                  "viewbox",                CH_PCDATA    }, /* for <svg> */
   { TidyAttr_PRESERVEASPECTRATIO,      "preserveaspectratio",    CH_PCDATA    }, /* for <svg> */
   { TidyAttr_ZOOMANDPAN,               "zoomandpan",             CH_PCDATA    }, /* for <svg> */
   { TidyAttr_BASEPROFILE,              "baseprofile",            CH_PCDATA    }, /* for <svg> */
   { TidyAttr_CONTENTSCRIPTTYPE,        "contentscripttype",      CH_PCDATA    }, /* for <svg> */
   { TidyAttr_CONTENTSTYLETYPE,         "contentstyletype",       CH_PCDATA    }, /* for <svg> */
-#endif
   { TidyAttr_DISPLAY,                  "display",                CH_PCDATA   }, /* on MATH tag (html5) */
 
   /* RDFa Attributes */
@@ -591,154 +582,6 @@ static ctmbstr GetColorName(ctmbstr code)
     return NULL;
 }
 
-#if 0
-static const struct _colors fancy_colors[] =
-{
-    { "darkgreen",            "#006400" },
-    { "antiquewhite",         "#FAEBD7" },
-    { "aqua",                 "#00FFFF" },
-    { "aquamarine",           "#7FFFD4" },
-    { "azure",                "#F0FFFF" },
-    { "beige",                "#F5F5DC" },
-    { "bisque",               "#FFE4C4" },
-    { "black",                "#000000" },
-    { "blanchedalmond",       "#FFEBCD" },
-    { "blue",                 "#0000FF" },
-    { "blueviolet",           "#8A2BE2" },
-    { "brown",                "#A52A2A" },
-    { "burlywood",            "#DEB887" },
-    { "cadetblue",            "#5F9EA0" },
-    { "chartreuse",           "#7FFF00" },
-    { "chocolate",            "#D2691E" },
-    { "coral",                "#FF7F50" },
-    { "cornflowerblue",       "#6495ED" },
-    { "cornsilk",             "#FFF8DC" },
-    { "crimson",              "#DC143C" },
-    { "cyan",                 "#00FFFF" },
-    { "darkblue",             "#00008B" },
-    { "darkcyan",             "#008B8B" },
-    { "darkgoldenrod",        "#B8860B" },
-    { "darkgray",             "#A9A9A9" },
-    { "darkgreen",            "#006400" },
-    { "darkkhaki",            "#BDB76B" },
-    { "darkmagenta",          "#8B008B" },
-    { "darkolivegreen",       "#556B2F" },
-    { "darkorange",           "#FF8C00" },
-    { "darkorchid",           "#9932CC" },
-    { "darkred",              "#8B0000" },
-    { "darksalmon",           "#E9967A" },
-    { "darkseagreen",         "#8FBC8F" },
-    { "darkslateblue",        "#483D8B" },
-    { "darkslategray",        "#2F4F4F" },
-    { "darkturquoise",        "#00CED1" },
-    { "darkviolet",           "#9400D3" },
-    { "deeppink",             "#FF1493" },
-    { "deepskyblue",          "#00BFFF" },
-    { "dimgray",              "#696969" },
-    { "dodgerblue",           "#1E90FF" },
-    { "firebrick",            "#B22222" },
-    { "floralwhite",          "#FFFAF0" },
-    { "forestgreen",          "#228B22" },
-    { "fuchsia",              "#FF00FF" },
-    { "gainsboro",            "#DCDCDC" },
-    { "ghostwhite",           "#F8F8FF" },
-    { "gold",                 "#FFD700" },
-    { "goldenrod",            "#DAA520" },
-    { "gray",                 "#808080" },
-    { "green",                "#008000" },
-    { "greenyellow",          "#ADFF2F" },
-    { "honeydew",             "#F0FFF0" },
-    { "hotpink",              "#FF69B4" },
-    { "indianred",            "#CD5C5C" },
-    { "indigo",               "#4B0082" },
-    { "ivory",                "#FFFFF0" },
-    { "khaki",                "#F0E68C" },
-    { "lavender",             "#E6E6FA" },
-    { "lavenderblush",        "#FFF0F5" },
-    { "lawngreen",            "#7CFC00" },
-    { "lemonchiffon",         "#FFFACD" },
-    { "lightblue",            "#ADD8E6" },
-    { "lightcoral",           "#F08080" },
-    { "lightcyan",            "#E0FFFF" },
-    { "lightgoldenrodyellow", "#FAFAD2" },
-    { "lightgreen",           "#90EE90" },
-    { "lightgrey",            "#D3D3D3" },
-    { "lightpink",            "#FFB6C1" },
-    { "lightsalmon",          "#FFA07A" },
-    { "lightseagreen",        "#20B2AA" },
-    { "lightskyblue",         "#87CEFA" },
-    { "lightslategray",       "#778899" },
-    { "lightsteelblue",       "#B0C4DE" },
-    { "lightyellow",          "#FFFFE0" },
-    { "lime",                 "#00FF00" },
-    { "limegreen",            "#32CD32" },
-    { "linen",                "#FAF0E6" },
-    { "magenta",              "#FF00FF" },
-    { "maroon",               "#800000" },
-    { "mediumaquamarine",     "#66CDAA" },
-    { "mediumblue",           "#0000CD" },
-    { "mediumorchid",         "#BA55D3" },
-    { "mediumpurple",         "#9370DB" },
-    { "mediumseagreen",       "#3CB371" },
-    { "mediumslateblue",      "#7B68EE" },
-    { "mediumspringgreen",    "#00FA9A" },
-    { "mediumturquoise",      "#48D1CC" },
-    { "mediumvioletred",      "#C71585" },
-    { "midnightblue",         "#191970" },
-    { "mintcream",            "#F5FFFA" },
-    { "mistyrose",            "#FFE4E1" },
-    { "moccasin",             "#FFE4B5" },
-    { "navajowhite",          "#FFDEAD" },
-    { "navy",                 "#000080" },
-    { "oldlace",              "#FDF5E6" },
-    { "olive",                "#808000" },
-    { "olivedrab",            "#6B8E23" },
-    { "orange",               "#FFA500" },
-    { "orangered",            "#FF4500" },
-    { "orchid",               "#DA70D6" },
-    { "palegoldenrod",        "#EEE8AA" },
-    { "palegreen",            "#98FB98" },
-    { "paleturquoise",        "#AFEEEE" },
-    { "palevioletred",        "#DB7093" },
-    { "papayawhip",           "#FFEFD5" },
-    { "peachpuff",            "#FFDAB9" },
-    { "peru",                 "#CD853F" },
-    { "pink",                 "#FFC0CB" },
-    { "plum",                 "#DDA0DD" },
-    { "powderblue",           "#B0E0E6" },
-    { "purple",               "#800080" },
-    { "red",                  "#FF0000" },
-    { "rosybrown",            "#BC8F8F" },
-    { "royalblue",            "#4169E1" },
-    { "saddlebrown",          "#8B4513" },
-    { "salmon",               "#FA8072" },
-    { "sandybrown",           "#F4A460" },
-    { "seagreen",             "#2E8B57" },
-    { "seashell",             "#FFF5EE" },
-    { "sienna",               "#A0522D" },
-    { "silver",               "#C0C0C0" },
-    { "skyblue",              "#87CEEB" },
-    { "slateblue",            "#6A5ACD" },
-    { "slategray",            "#708090" },
-    { "snow",                 "#FFFAFA" },
-    { "springgreen",          "#00FF7F" },
-    { "steelblue",            "#4682B4" },
-    { "tan",                  "#D2B48C" },
-    { "teal",                 "#008080" },
-    { "thistle",              "#D8BFD8" },
-    { "tomato",               "#FF6347" },
-    { "turquoise",            "#40E0D0" },
-    { "violet",               "#EE82EE" },
-    { "wheat",                "#F5DEB3" },
-    { "white",                "#FFFFFF" },
-    { "whitesmoke",           "#F5F5F5" },
-    { "yellow",               "#FFFF00" },
-    { "yellowgreen",          "#9ACD32" },
-    { NULL,                   NULL      }
-};
-#endif
-
-#if ATTRIBUTE_HASH_LOOKUP
 static uint attrsHash(ctmbstr s)
 {
     uint hashval;
@@ -808,21 +651,17 @@ static void attrsEmptyHash( TidyDocImpl* doc, TidyAttribImpl * attribs )
         attribs->hashtab[i] = NULL;
     }
 }
-#endif
 
 static const Attribute* attrsLookup(TidyDocImpl* doc,
                                TidyAttribImpl* ARG_UNUSED(attribs),
                                ctmbstr atnam)
 {
     const Attribute *np;
-#if ATTRIBUTE_HASH_LOOKUP
     const AttrHash *p;
-#endif
 
     if (!atnam)
         return NULL;
 
-#if ATTRIBUTE_HASH_LOOKUP
     for (p = attribs->hashtab[attrsHash(atnam)]; p && p->attr; p = p->next)
         if (TY_(tmbstrcasecmp)(atnam, p->attr->name) == 0)
             return p->attr;
@@ -830,11 +669,6 @@ static const Attribute* attrsLookup(TidyDocImpl* doc,
     for (np = attribute_defs; np && np->name; ++np)
         if (TY_(tmbstrcasecmp)(atnam, np->name) == 0)
             return attrsInstall(doc, attribs, np);
-#else
-    for (np = attribute_defs; np && np->name; ++np)
-        if (TY_(tmbstrcasecmp)(atnam, np->name) == 0)
-            return np;
-#endif
 
     return NULL;
 }
@@ -929,6 +763,78 @@ AttVal* TY_(RepairAttrValue)(TidyDocImpl* doc, Node* node, ctmbstr name, ctmbstr
         return TY_(AddAttribute)(doc, node, name, value);
 }
 
+
+void TY_(FreeAttrPriorityList)( TidyDocImpl* doc )
+{
+    PriorityAttribs *priorities = &(doc->attribs.priorityAttribs);
+
+    if ( priorities->list )
+    {
+        uint i = 0;
+        while ( priorities->list[i] != NULL )
+        {
+            TidyFree( doc->allocator, priorities->list[i] );
+            i++;
+        }
+
+        TidyFree( doc->allocator, priorities->list );
+    }
+}
+
+
+void TY_(DefinePriorityAttribute)(TidyDocImpl* doc, ctmbstr name)
+{
+    enum { capacity = 10 };
+    PriorityAttribs *priorities = &(doc->attribs.priorityAttribs);
+
+    if ( !priorities->list )
+    {
+        priorities->list = TidyAlloc(doc->allocator, sizeof(ctmbstr) * capacity );
+        priorities->list[0] = NULL;
+        priorities->capacity = capacity;
+        priorities->count = 0;
+    }
+
+    if ( priorities->count >= priorities->capacity )
+    {
+        priorities->capacity = priorities->capacity * 2;
+        priorities->list = realloc( priorities->list, sizeof(tmbstr) * priorities->capacity + 1 );
+    }
+
+    priorities->list[priorities->count] = TY_(tmbstrdup)( doc->allocator, name);
+    priorities->count++;
+    priorities->list[priorities->count] = NULL;
+}
+
+
+TidyIterator TY_(getPriorityAttrList)( TidyDocImpl* doc )
+{
+    PriorityAttribs *priorities = &(doc->attribs.priorityAttribs);
+    size_t result = priorities->count > 0 ? 1 : 0;
+
+    return (TidyIterator) result;
+}
+
+
+ctmbstr  TY_(getNextPriorityAttr)( TidyDocImpl* doc, TidyIterator* iter )
+{
+    PriorityAttribs *priorities = &(doc->attribs.priorityAttribs);
+    size_t index;
+    ctmbstr result = NULL;
+    assert( iter != NULL );
+    index = (size_t)*iter;
+
+    if ( index > 0 && index <= priorities->count )
+    {
+        result = priorities->list[index-1];
+        index++;
+    }
+    *iter = (TidyIterator) ( index <= priorities->count ? index : (size_t)0 );
+
+    return result;
+}
+
+
 static Bool CheckAttrType( TidyDocImpl* doc,
                            ctmbstr attrname, AttrCheck type )
 {
@@ -1204,9 +1110,7 @@ static void FreeDeclaredAttributes( TidyDocImpl* doc )
     while ( NULL != (dict = attribs->declared_attr_list) )
     {
         attribs->declared_attr_list = dict->next;
-#if ATTRIBUTE_HASH_LOOKUP
         attrsRemoveFromHash( doc, &doc->attribs, dict->name );
-#endif
         TidyDocFree( doc, dict->name );
         TidyDocFree( doc, dict );
     }
@@ -1214,9 +1118,7 @@ static void FreeDeclaredAttributes( TidyDocImpl* doc )
 
 void TY_(FreeAttrTable)( TidyDocImpl* doc )
 {
-#if ATTRIBUTE_HASH_LOOKUP
     attrsEmptyHash( doc, &doc->attribs );
-#endif
     TY_(FreeAnchors)( doc );
     FreeDeclaredAttributes( doc );
 }
@@ -1474,15 +1376,16 @@ static void CheckLowerCaseAttrValue( TidyDocImpl* doc, Node *node, AttVal *attva
     }
 }
 
-/* methods for checking value of a specific attribute */
-#ifdef _WIN32
+/* Issue #588 - use simple macros only!
+   Seems 'isalnum(c)' is undefined and can
+   cause an assert or a SIGSEGV in some libraries
+   if 'c' is not EOF, or in the range 0 to 0xff,
+   so avoid using it.
+*/
 #define ISUPPER(a) ((a >= 'A') && (a <= 'Z'))
 #define ISLOWER(a) ((a >= 'a') && (a <= 'z'))
 #define ISNUMERIC(a) ((a >= '0') && (a <= '9'))
 #define ISALNUM(a) (ISUPPER(a) || ISLOWER(a) || ISNUMERIC(a))
-#else
-#define ISALNUM(a)  isalnum(a)
-#endif
 
 static Bool IsURLCodePoint( ctmbstr p, uint *increment )
 {
@@ -2174,15 +2077,15 @@ void CheckType( TidyDocImpl* doc, Node *node, AttVal *attval)
 }
 
 static
-AttVal *SortAttVal( AttVal* list, TidyAttrSortStrategy strat );
+AttVal *SortAttVal( TidyDocImpl* doc, AttVal* list, TidyAttrSortStrategy strat );
 
-void TY_(SortAttributes)(Node* node, TidyAttrSortStrategy strat)
+void TY_(SortAttributes)(TidyDocImpl* doc, Node* node, TidyAttrSortStrategy strat)
 {
     while (node)
     {
-        node->attributes = SortAttVal( node->attributes, strat );
+        node->attributes = SortAttVal( doc, node->attributes, strat );
         if (node->content)
-            TY_(SortAttributes)(node->content, strat);
+            TY_(SortAttributes)(doc, node->content, strat);
         node = node->next;
     }
 }
@@ -2219,25 +2122,88 @@ void TY_(SortAttributes)(Node* node, TidyAttrSortStrategy strat)
 * SOFTWARE.
 */
 
-typedef int(*ptAttValComparator)(AttVal *one, AttVal *two);
+typedef int(*ptAttValComparator)(AttVal *one, AttVal *two, ctmbstr *list);
 
-/* Comparison function for TidySortAttrAlpha */
+/* Returns the index of the item in the array, or -1 if not in the array */
 static
-int AlphaComparator(AttVal *one, AttVal *two)
+int indexof( ctmbstr item, ctmbstr *list )
 {
+    if ( list )
+    {
+        uint i = 0;
+        while ( list[i] != NULL ) {
+            if ( TY_(tmbstrcasecmp)(item, list[i]) == 0 )
+                return i;
+            i++;
+        }
+    }
+
+    return -1;
+}
+
+/* Comparison function for TidySortAttrAlpha. Will also consider items in
+   the passed in list as higher-priority, and will group them first.
+ */
+static
+int AlphaComparator(AttVal *one, AttVal *two, ctmbstr *list)
+{
+    int oneIndex = indexof( one->attribute, list );
+    int twoIndex = indexof( two->attribute, list );
+
+    /* If both on the list, the lower index has priority. */
+    if ( oneIndex >= 0 && twoIndex >= 0 )
+        return oneIndex < twoIndex ? -1 : 1;
+
+    /* If A on the list but B not on the list, then A has priority. */
+    if ( oneIndex >= 0 && twoIndex == -1 )
+        return -1;
+
+    /* If A not on the list but B is on the list, then B has priority. */
+    if ( oneIndex == -1 && twoIndex >= 0 )
+        return 1;
+
+    /* Otherwise nothing is on the list, so just compare strings. */
     return TY_(tmbstrcmp)(one->attribute, two->attribute);
 }
 
 
+/* Comparison function for prioritizing list items. It doesn't otherwise
+   sort.
+ */
+static
+int PriorityComparator(AttVal *one, AttVal *two, ctmbstr *list)
+{
+    int oneIndex = indexof( one->attribute, list );
+    int twoIndex = indexof( two->attribute, list );
+
+    /* If both on the list, the lower index has priority. */
+    if ( oneIndex >= 0 && twoIndex >= 0 )
+        return oneIndex < twoIndex ? -1 : 1;
+
+    /* If A on the list but B not on the list, then A has priority. */
+    if ( oneIndex >= 0 && twoIndex == -1 )
+        return -1;
+
+    /* If A not on the list but B is on the list, then B has priority. */
+    if ( oneIndex == -1 && twoIndex >= 0 )
+        return 1;
+
+    /* Otherwise nothing is on the list, so just mark them as the same. */
+    return 0;
+}
+
+
 /* The "factory method" that returns a pointer to the comparator function */
 static
-ptAttValComparator GetAttValComparator(TidyAttrSortStrategy strat)
+ptAttValComparator GetAttValComparator(TidyAttrSortStrategy strat, ctmbstr *list)
 {
     switch (strat)
     {
     case TidySortAttrAlpha:
         return AlphaComparator;
     case TidySortAttrNone:
+        if ( list && list[0] )
+            return PriorityComparator;
         break;
     }
     return 0;
@@ -2245,9 +2211,12 @@ ptAttValComparator GetAttValComparator(TidyAttrSortStrategy strat)
 
 /* The sort routine */
 static
-AttVal *SortAttVal( AttVal *list, TidyAttrSortStrategy strat)
+AttVal *SortAttVal( TidyDocImpl* doc, AttVal *list, TidyAttrSortStrategy strat)
 {
-    ptAttValComparator ptComparator = GetAttValComparator(strat);
+    /* Get the list from the passed-in tidyDoc. */
+    ctmbstr* priorityList = (ctmbstr*)doc->attribs.priorityAttribs.list;
+
+    ptAttValComparator ptComparator = GetAttValComparator(strat, priorityList);
     AttVal *p, *q, *e, *tail;
     int insize, nmerges, psize, qsize, i;
 
@@ -2258,6 +2227,10 @@ AttVal *SortAttVal( AttVal *list, TidyAttrSortStrategy strat)
     if (!list)
         return NULL;
 
+    /* If no comparator, return the list as-is */
+    if (ptComparator == 0)
+        return list;
+
     insize = 1;
 
     while (1) {
@@ -2291,7 +2264,7 @@ AttVal *SortAttVal( AttVal *list, TidyAttrSortStrategy strat)
                 } else if (qsize == 0 || !q) {
                     /* q is empty; e must come from p. */
                     e = p; p = p->next; psize--;
-                } else if (ptComparator(p,q) <= 0) {
+                } else if (ptComparator(p,q, priorityList) <= 0) {
                     /* First element of p is lower (or same);
                     * e must come from p. */
                     e = p; p = p->next; psize--;
diff --git a/HTMLTidy/vendor/tidy-html5/src/attrs.h b/HTMLTidy/vendor/tidy-html5/src/attrs.h
index e5b0fa97..befdcd12 100644
--- a/HTMLTidy/vendor/tidy-html5/src/attrs.h
+++ b/HTMLTidy/vendor/tidy-html5/src/attrs.h
@@ -36,11 +36,6 @@ struct _Anchor
 
 typedef struct _Anchor Anchor;
 
-#if !defined(ATTRIBUTE_HASH_LOOKUP)
-#define ATTRIBUTE_HASH_LOOKUP 1
-#endif
-
-#if ATTRIBUTE_HASH_LOOKUP
 enum
 {
     ATTRIBUTE_HASH_SIZE=178u
@@ -53,13 +48,19 @@ struct _AttrHash
 };
 
 typedef struct _AttrHash AttrHash;
-#endif
 
 enum
 {
     ANCHOR_HASH_SIZE=1021u
 };
 
+/* Keeps a list of attributes that are sorted ahead of the others. */
+typedef struct _priorityAttribs {
+    tmbstr* list;
+    uint count;
+    uint capacity;
+} PriorityAttribs;
+
 struct _TidyAttribImpl
 {
     /* anchor/node lookup */
@@ -68,9 +69,10 @@ struct _TidyAttribImpl
     /* Declared literal attributes */
     Attribute* declared_attr_list;
 
-#if ATTRIBUTE_HASH_LOOKUP
+    /* Prioritized list of attributes to write */
+    PriorityAttribs priorityAttribs;
+
     AttrHash*  hashtab[ATTRIBUTE_HASH_SIZE];
-#endif
 };
 
 typedef struct _TidyAttribImpl TidyAttribImpl;
@@ -93,6 +95,15 @@ AttVal* TY_(AddAttribute)( TidyDocImpl* doc,
 
 AttVal* TY_(RepairAttrValue)(TidyDocImpl* doc, Node* node, ctmbstr name, ctmbstr value);
 
+/* Add an item to the list of priority attributes to write first. */
+void TY_(DefinePriorityAttribute)(TidyDocImpl* doc, ctmbstr name);
+
+/* Start an iterator for priority attributes. */
+TidyIterator TY_(getPriorityAttrList)( TidyDocImpl* doc );
+
+/* Get the next priority attribute. */
+ctmbstr TY_(getNextPriorityAttr)( TidyDocImpl* doc, TidyIterator* iter );
+
 Bool TY_(IsUrl)( TidyDocImpl* doc, ctmbstr attrname );
 
 /* Bool IsBool( TidyDocImpl* doc, ctmbstr attrname ); */
@@ -132,13 +143,15 @@ void TY_(FreeAnchors)( TidyDocImpl* doc );
 void TY_(InitAttrs)( TidyDocImpl* doc );
 void TY_(FreeAttrTable)( TidyDocImpl* doc );
 
+void TY_(FreeAttrPriorityList)( TidyDocImpl* doc );
+
 void TY_(AppendToClassAttr)( TidyDocImpl* doc, AttVal *classattr, ctmbstr classname );
 /*
  the same attribute name can't be used
  more than once in each element
 */
 void TY_(RepairDuplicateAttributes)( TidyDocImpl* doc, Node* node, Bool isXml );
-void TY_(SortAttributes)(Node* node, TidyAttrSortStrategy strat);
+void TY_(SortAttributes)(TidyDocImpl* doc, Node* node, TidyAttrSortStrategy strat);
 
 Bool TY_(IsBoolAttribute)( AttVal* attval );
 Bool TY_(attrIsEvent)( AttVal* attval );
@@ -184,6 +197,7 @@ Bool TY_(AttributeIsMismatched)(Node* node, AttVal* attval, TidyDocImpl* doc);
 #define attrIsBOTTOMMARGIN(av)      AttrIsId( av, TidyAttr_BOTTOMMARGIN  )
 #define attrIsCELLPADDING(av)       AttrIsId( av, TidyAttr_CELLPADDING  )
 #define attrIsCELLSPACING(av)       AttrIsId( av, TidyAttr_CELLSPACING  )
+#define attrIsCHARSET(av)           AttrIsId( av, TidyAttr_CHARSET  )
 #define attrIsCHAR(av)              AttrIsId( av, TidyAttr_CHAR  )
 #define attrIsCHAROFF(av)           AttrIsId( av, TidyAttr_CHAROFF  )
 #define attrIsCHARSET(av)           AttrIsId( av, TidyAttr_CHARSET  )
@@ -385,6 +399,7 @@ Bool TY_(AttributeIsMismatched)(Node* node, AttVal* attval, TidyDocImpl* doc);
 #define attrGetHEIGHT( nod )      TY_(AttrGetById)( nod, TidyAttr_HEIGHT  )
 #define attrGetFOR( nod )         TY_(AttrGetById)( nod, TidyAttr_FOR  )
 #define attrGetSELECTED( nod )    TY_(AttrGetById)( nod, TidyAttr_SELECTED  )
+#define attrGetCHARSET( nod )     TY_(AttrGetById)( nod, TidyAttr_CHARSET  )
 #define attrGetCHECKED( nod )     TY_(AttrGetById)( nod, TidyAttr_CHECKED  )
 #define attrGetLANG( nod )        TY_(AttrGetById)( nod, TidyAttr_LANG  )
 #define attrGetTARGET( nod )      TY_(AttrGetById)( nod, TidyAttr_TARGET  )
diff --git a/HTMLTidy/vendor/tidy-html5/src/clean.c b/HTMLTidy/vendor/tidy-html5/src/clean.c
index 779ddecb..de4caf52 100644
--- a/HTMLTidy/vendor/tidy-html5/src/clean.c
+++ b/HTMLTidy/vendor/tidy-html5/src/clean.c
@@ -1902,7 +1902,9 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
             attval = node->attributes;
             while ( attval ) {
                 next_attr = attval->next;
-                if ( strcmp(attval->attribute, "xmlns") != 0 )
+
+                /* Issue #591 - take care of a NULL attribute, too. */
+                if ( !attval->attribute || ( strcmp(attval->attribute, "xmlns") != 0 ))
                     TY_(ReportAttrError)(doc, node, attval, PROPRIETARY_ATTRIBUTE);
                 attval = next_attr;
             }
@@ -1986,7 +1988,7 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
              * meaning this result would not ordinarily be displayed.
              */
             Node* next;
-            TY_(ReportError)(doc, NULL, node, PROPRIETARY_ELEMENT);
+            TY_(Report)(doc, NULL, node, PROPRIETARY_ELEMENT);
             DiscardContainer( doc, node, &next );
             node = next;
             continue;
@@ -2164,126 +2166,204 @@ void TY_(BumpObject)( TidyDocImpl* doc, Node *html )
     }
 }
 
-/* This is disabled due to http://tidy.sf.net/bug/681116 */
-#if 0
-void FixBrakes( TidyDocImpl* pDoc, Node *pParent )
-{
-    Node *pNode;
-    Bool bBRDeleted = no;
-
-    if (NULL == pParent)
-        return;
-
-    /*  First, check the status of All My Children  */
-    pNode = pParent->content;
-    while (NULL != pNode )
-    {
-        /* The node may get trimmed, so save the next pointer, if any */
-        Node *pNext = pNode->next;
-        FixBrakes( pDoc, pNode );
-        pNode = pNext;
-    }
-
 
-    /*  As long as my last child is a <br />, move it to my last peer  */
-    if ( nodeCMIsBlock( pParent ))
-    { 
-        for ( pNode = pParent->last; 
-              NULL != pNode && nodeIsBR( pNode ); 
-              pNode = pParent->last ) 
-        {
-            if ( NULL == pNode->attributes && no == bBRDeleted )
+/*\
+*  Issue #456 - Check meta charset
+*  1. if there is no meta charset, it adds one, according to doctype, no warning.
+*  2. if there is a meta charset, it moves it to the top if HEAD. Not sure this required?
+*  3. if it doesn't match the output encoding, and fix. Naybe no warning?
+*  4. if there are duplicates, discard them, with warning.
+\*/
+Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
+{
+    AttVal *charsetAttr;
+    AttVal *contentAttr;
+    AttVal *httpEquivAttr;
+    Bool charsetFound = no;
+    uint outenc = cfg(doc, TidyOutCharEncoding);
+    ctmbstr enc = TY_(GetEncodingNameFromTidyId)(outenc);
+    Node *currentNode;
+    Node *head = TY_(FindHEAD)(doc);
+    Node *metaTag;
+    Node *prevNode;
+    TidyBuffer buf;
+    TidyBuffer charsetString;
+    /* tmbstr httpEquivAttrValue; */
+    /* tmbstr lcontent; */
+    tmbstr newValue;
+    Bool add_meta = cfgBool(doc, TidyMetaCharset);
+
+    /* We can't do anything we don't have a head or encoding is NULL */
+    if (!head || !enc || !TY_(tmbstrlen)(enc))
+        return no;
+    if (outenc == RAW)
+        return no;
+#ifndef NO_NATIVE_ISO2022_SUPPORT
+    if (outenc == ISO2022)
+        return no;
+#endif
+    if (cfgAutoBool(doc, TidyBodyOnly) == TidyYesState)
+        return no; /* nothing to do here if showing body only */
+
+    tidyBufInit(&charsetString);
+    /* Set up the content test 'charset=value' */
+    tidyBufClear(&charsetString);
+    tidyBufAppend(&charsetString, "charset=", 8);
+    tidyBufAppend(&charsetString, (char*)enc, TY_(tmbstrlen)(enc));
+    tidyBufAppend(&charsetString, "\0", 1); /* zero terminate the buffer */
+                                            /* process the children of the head */
+    for (currentNode = head->content; currentNode; currentNode = currentNode->next)
+    {
+        if (!nodeIsMETA(currentNode))
+            continue;   /* not a meta node */
+        charsetAttr = attrGetCHARSET(currentNode);
+        httpEquivAttr = attrGetHTTP_EQUIV(currentNode);
+        if (!charsetAttr && !httpEquivAttr)
+            continue;   /* has no charset attribute */
+                        /*
+                        Meta charset comes in quite a few flavors:
+                        1. <meta charset="value"> - expected for (X)HTML5.
+                        */
+        if (charsetAttr && !httpEquivAttr)
+        {
+            /* we already found one, so remove the rest. */
+            if (charsetFound || !charsetAttr->value)
             {
-                TY_(DiscardElement)( pDoc, pNode );
-                bBRDeleted = yes;
+                prevNode = currentNode->prev;
+                TY_(Report)(doc, head, currentNode, DISCARDING_UNEXPECTED);
+                TY_(DiscardElement)(doc, currentNode);
+                currentNode = prevNode;
+                continue;
             }
-            else
+            charsetFound = yes;
+            /* Fix mismatched attribute value */
+            if (TY_(tmbstrcasecmp)(charsetAttr->value, enc) != 0)
             {
-                TY_(RemoveNode)( pNode );
-                TY_(InsertNodeAfterElement)( pParent, pNode );
+                newValue = (tmbstr)TidyDocAlloc(doc, TY_(tmbstrlen)(enc) + 1);   /* allocate + 1 for 0 */
+                TY_(tmbstrcpy)(newValue, enc);
+                /* Note: previously http-equiv had been modified, without warning
+                in void TY_(VerifyHTTPEquiv)(TidyDocImpl* doc, Node *head)
+                */
+                TY_(ReportAttrError)(doc, currentNode, charsetAttr, ATTRIBUTE_VALUE_REPLACED);
+                TidyDocFree(doc, charsetAttr->value);   /* free current value */
+                charsetAttr->value = newValue;
+            }
+            /* Make sure it's the first element. */
+            if (currentNode != head->content->next) {
+                TY_(RemoveNode)(currentNode);
+                TY_(InsertNodeAtStart)(head, currentNode);
             }
-        }
-        TY_(TrimEmptyElement)( pDoc, pParent );
-    }
-}
-#endif
-
-void TY_(VerifyHTTPEquiv)(TidyDocImpl* doc, Node *head)
-{
-    Node *pNode;
-    StyleProp *pFirstProp = NULL, *pLastProp = NULL, *prop = NULL;
-    tmbstr s, pszBegin, pszEnd;
-    ctmbstr enc = TY_(GetEncodingNameFromTidyId)(cfg(doc, TidyOutCharEncoding));
-
-    if (!enc)
-        return;
-
-    if (!nodeIsHEAD(head))
-        head = TY_(FindHEAD)(doc);
-
-    if (!head)
-        return;
-
-    /* Find any <meta http-equiv='Content-Type' content='...' /> */
-    for (pNode = head->content; NULL != pNode; pNode = pNode->next)
-    {
-        AttVal* httpEquiv = TY_(AttrGetById)(pNode, TidyAttr_HTTP_EQUIV);
-        AttVal* metaContent = TY_(AttrGetById)(pNode, TidyAttr_CONTENT);
-
-        if ( !nodeIsMETA(pNode) || !metaContent ||
-             !AttrValueIs(httpEquiv, "Content-Type") )
             continue;
-
-        pszBegin = s = TY_(tmbstrdup)( doc->allocator, metaContent->value );
-        while (pszBegin && *pszBegin)
-        {
-            while (isspace( *pszBegin ))
-                pszBegin++;
-            pszEnd = pszBegin;
-            while ('\0' != *pszEnd && ';' != *pszEnd)
-                pszEnd++;
-            if (';' == *pszEnd )
-                *(pszEnd++) = '\0';
-            if (pszEnd > pszBegin)
+        }
+        /*
+        2. <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+        expected for HTML4. This is normally ok - but can clash.
+        */
+        if (httpEquivAttr && !charsetAttr)
+        {
+            contentAttr = TY_(AttrGetById)(currentNode, TidyAttr_CONTENT);
+            if (!contentAttr)
+                continue;   /* has no 'content' attribute */
+            if (!httpEquivAttr->value)
             {
-                prop = (StyleProp *)TidyDocAlloc(doc, sizeof(StyleProp));
-                prop->name = TY_(tmbstrdup)( doc->allocator, pszBegin );
-                prop->value = NULL;
-                prop->next = NULL;
-
-                if (NULL != pLastProp)
-                    pLastProp->next = prop;
+                prevNode = currentNode->prev;
+                TY_(Report)(doc, head, currentNode, DISCARDING_UNEXPECTED);
+                TY_(DiscardElement)(doc, currentNode);
+                currentNode = prevNode;
+                continue;
+            }
+            /* httpEquivAttrValue = TY_(tmbstrtolower)(httpEquivAttr->value); */
+            if (TY_(tmbstrcasecmp)(httpEquivAttr->value, (tmbstr) "content-type") != 0)
+                continue;   /* is not 'content-type' */
+            if (!contentAttr->value)
+            {
+                continue; /* has no 'content' attribute has NO VALUE! */
+            }
+            /* check encoding matches
+            If a miss-match found here, fix it. previous silently done
+            in void TY_(VerifyHTTPEquiv)(TidyDocImpl* doc, Node *head)
+            lcontent = TY_(tmbstrtolower)(contentAttr->value);
+            */
+            if (TY_(tmbstrcasecmp)(contentAttr->value, (ctmbstr)charsetString.bp) == 0)
+            {
+                /* we already found one, so remove the rest. */
+                if (charsetFound)
+                {
+                    prevNode = currentNode->prev;
+                    TY_(Report)(doc, head, currentNode, DISCARDING_UNEXPECTED);
+                    TY_(DiscardElement)(doc, currentNode);
+                    currentNode = prevNode;
+                    continue;
+                }
+                charsetFound = yes;
+            }
+            else
+            {
+                /* fix a mis-match */
+                if (charsetFound)
+                {
+                    prevNode = currentNode->prev;
+                    TY_(Report)(doc, head, currentNode, DISCARDING_UNEXPECTED);
+                    TY_(DiscardElement)(doc, currentNode);
+                    currentNode = prevNode;
+                }
                 else
-                    pFirstProp = prop;
-
-                pLastProp = prop;
-                pszBegin = pszEnd;
+                {
+                    /* correct the content */
+                    newValue = (tmbstr)TidyDocAlloc(doc, 19 + TY_(tmbstrlen)(enc) + 1);
+                    TY_(tmbstrcpy)(newValue, "text/html; charset=");
+                    TY_(tmbstrcpy)(newValue + 19, enc);
+                    if (cfgBool(doc, TidyShowMetaChange))   /* Issue #456 - backward compatibility only */
+                        TY_(ReportAttrError)(doc, currentNode, contentAttr, ATTRIBUTE_VALUE_REPLACED);
+                    TidyDocFree(doc, contentAttr->value);
+                    contentAttr->value = newValue;
+                    charsetFound = yes;
+                }
             }
+            continue;
         }
-        TidyDocFree( doc, s );
-
-        /*  find the charset property */
-        for (prop = pFirstProp; NULL != prop; prop = prop->next)
+        /*
+        3. <meta charset="utf-8" http-equiv="Content-Type" content="...">
+        This is generally bad. Discard and warn.
+        */
+        if (httpEquivAttr && charsetAttr)
         {
-            if (0 != TY_(tmbstrncasecmp)( prop->name, "charset", 7 ))
-                continue;
-
-            TidyDocFree( doc, prop->name );
-            prop->name = (tmbstr)TidyDocAlloc( doc, 8 + TY_(tmbstrlen)(enc) + 1 );
-            TY_(tmbstrcpy)(prop->name, "charset=");
-            TY_(tmbstrcpy)(prop->name+8, enc);
-            s = CreatePropString( doc, pFirstProp );
-            TidyDocFree( doc, metaContent->value );
-            metaContent->value = s;
-            break;
+            /* printf("WARN ABOUT HTTP EQUIV AND CHARSET ATTR! \n"); */
+            prevNode = currentNode->prev;
+            TY_(Report)(doc, head, currentNode, DISCARDING_UNEXPECTED);
+            TY_(DiscardElement)(doc, currentNode);
+            currentNode = prevNode;
         }
-        /* #718127, prevent memory leakage */
-        FreeStyleProps(doc, pFirstProp);
-        pFirstProp = NULL;
-        pLastProp = NULL;
     }
+
+    /* completed head scan - add appropriate meta - if 'yes' and none exists */
+    if (add_meta && !charsetFound)
+    {
+        /* add appropriate meta charset tag - no warning */
+        metaTag = TY_(InferredTag)(doc, TidyTag_META);
+        switch (TY_(HTMLVersion)(doc))
+        {
+        case HT50:
+        case XH50:
+            TY_(AddAttribute)(doc, metaTag, "charset", enc);
+            break;
+        default:
+            tidyBufInit(&buf);
+            tidyBufAppend(&buf, "text/html; ", 11);
+            tidyBufAppend(&buf, charsetString.bp, TY_(tmbstrlen)((ctmbstr)charsetString.bp));
+            tidyBufAppend(&buf, "\0", 1);   /* zero terminate the buffer */
+            TY_(AddAttribute)(doc, metaTag, "http-equiv", "Content-Type"); /* add 'http-equiv' const. */
+            TY_(AddAttribute)(doc, metaTag, "content", (char*)buf.bp);  /* add 'content="<enc>"' */
+            tidyBufFree(&buf);
+        }
+        TY_(InsertNodeAtStart)(head, metaTag);
+        TY_(Report)(doc, metaTag, head, ADDED_MISSING_CHARSET); /* actually just 'Info:' */
+    }
+    tidyBufFree(&charsetString);
+    return yes;
 }
 
+
 void TY_(DropComments)(TidyDocImpl* doc, Node* node)
 {
     Node* next;
@@ -2647,6 +2727,57 @@ void TY_(FixAnchors)(TidyDocImpl* doc, Node *node, Bool wantName, Bool wantId)
     }
 }
 
+/* Issue #567 - move style elements from body to head 
+ * ==================================================
+ */
+static void StyleToHead(TidyDocImpl* doc, Node *head, Node *node, Bool fix, int indent)
+{
+	Node *next;
+	while (node)
+	{
+		next = node->next;	/* get 'next' now , in case the node is moved */
+		/* dbg_show_node(doc, node, 0, indent); */
+		if (nodeIsSTYLE(node))
+		{
+			if (fix)
+			{
+				TY_(RemoveNode)(node); /* unhook style node from body */
+				TY_(InsertNodeAtEnd)(head, node);   /* add to end of head */
+				TY_(Report)(doc, node, head, MOVED_STYLE_TO_HEAD); /* report move */
+			}
+			else
+			{
+				TY_(Report)(doc, node, head, FOUND_STYLE_IN_BODY);
+			}
+		}
+		else if (node->content)
+		{
+			StyleToHead(doc, head, node->content, fix, indent + 1);
+		}
+		node = next;	/* process the 'next', if any */
+	}
+}
+
+
+void TY_(CleanStyle)(TidyDocImpl* doc, Node *html)
+{
+    Node *head = NULL, *body = NULL;
+    Bool fix = cfgBool(doc, TidyStyleTags);
+
+    if (!html)
+        return; /* oops, not given a start node */
+
+    head = TY_(FindHEAD)( doc );
+    body = TY_(FindBody)( doc );
+
+    if ((head != NULL) && (body != NULL))
+    {
+		StyleToHead(doc, head, body, fix, 0); /* found head and body */
+    }
+}
+/* ==================================================
+ */
+
 /*
  * local variables:
  * mode: c
diff --git a/HTMLTidy/vendor/tidy-html5/src/clean.h b/HTMLTidy/vendor/tidy-html5/src/clean.h
index 00d4923e..f0ef7a6d 100644
--- a/HTMLTidy/vendor/tidy-html5/src/clean.h
+++ b/HTMLTidy/vendor/tidy-html5/src/clean.h
@@ -59,12 +59,7 @@ Bool TY_(IsWord2000)( TidyDocImpl* doc );
 /* where appropriate move object elements from head to body */
 void TY_(BumpObject)( TidyDocImpl* doc, Node *html );
 
-/* This is disabled due to http://tidy.sf.net/bug/681116 */
-#if 0
-void TY_(FixBrakes)( TidyDocImpl* pDoc, Node *pParent );
-#endif
-
-void TY_(VerifyHTTPEquiv)( TidyDocImpl* pDoc, Node *pParent );
+Bool TY_(TidyMetaCharset)(TidyDocImpl* doc);
 
 void TY_(DropComments)(TidyDocImpl* doc, Node* node);
 void TY_(DropFontElements)(TidyDocImpl* doc, Node* node, Node **pnode);
@@ -78,5 +73,7 @@ void TY_(FixAnchors)(TidyDocImpl* doc, Node *node, Bool wantName, Bool wantId);
 void TY_(FixXhtmlNamespace)(TidyDocImpl* doc, Bool wantXmlns);
 void TY_(FixLanguageInformation)(TidyDocImpl* doc, Node* node, Bool wantXmlLang, Bool wantLang);
 
+/* Issue #567 - move style elements from body to head */
+void TY_(CleanStyle)(TidyDocImpl* doc, Node *html);
 
 #endif /* __CLEAN_H__ */
diff --git a/HTMLTidy/vendor/tidy-html5/src/config.c b/HTMLTidy/vendor/tidy-html5/src/config.c
index cd1d20c8..cb53989d 100644
--- a/HTMLTidy/vendor/tidy-html5/src/config.c
+++ b/HTMLTidy/vendor/tidy-html5/src/config.c
@@ -15,43 +15,29 @@
 #include "tags.h"
 
 #ifdef WINDOWS_OS
-#include <io.h>
+#  include <io.h>
 #else
-#ifdef DMALLOC
-/*
-   macro for valloc() in dmalloc.h may conflict with declaration for valloc()
-   in unistd.h - we don't need (debugging for) valloc() here. dmalloc.h should
-  come last but it doesn't.
-*/
-#ifdef valloc
-#undef valloc
-#endif
-#endif
-#include <unistd.h>
+#  ifdef DMALLOC
+   /* macro for valloc() in dmalloc.h may conflict with declaration for valloc()
+      in unistd.h - we don't need (debugging for) valloc() here. dmalloc.h should
+      come last but it doesn't.*/
+#    ifdef valloc
+#      undef valloc
+#    endif
+#  endif
+#  include <unistd.h>
 #endif
 
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-#include "win32tc.h"
-#endif
-
-void TY_(InitConfig)( TidyDocImpl* doc )
-{
-    TidyClearMemory( &doc->config, sizeof(TidyConfigImpl) );
-    TY_(ResetConfigToDefault)( doc );
-}
-
-void TY_(FreeConfig)( TidyDocImpl* doc )
-{
-    TY_(ResetConfigToDefault)( doc );
-    TY_(TakeConfigSnapshot)( doc );
-}
 
+/*****************************************************************************
+ ** Picklist Configuration
+ **
+ ** Arrange so index can be cast to enum. Note that the value field in the
+ ** following structures is not currently used in code; they're present for
+ ** documentation purposes currently. The arrays must be populated in enum
+ ** order.
+ ******************************************************************************/
 
-/* 
-   Arrange so index can be cast to enum. Note that the value field in the 
-   following structures is not currently used in code; they're present for 
-   documentation purposes currently. The arrays must be populated in enum order.
-*/
 static PickListItems boolPicks = {
     { "no",  TidyNoState,  { "0", "n", "f", "no",  "false", NULL } },
     { "yes", TidyYesState, { "1", "y", "t", "yes", "true",  NULL } },
@@ -59,9 +45,9 @@ static PickListItems boolPicks = {
 };
 
 static PickListItems autoBoolPicks = {
-    { "no",   TidyNoState,  { "0", "n", "f", "no",  "false", NULL } },
-    { "yes",  TidyYesState, { "1", "y", "t", "yes", "true",  NULL } },
-    { "auto", TidyYesState, { "auto",                        NULL } },
+    { "no",   TidyNoState,   { "0", "n", "f", "no",  "false", NULL } },
+    { "yes",  TidyYesState,  { "1", "y", "t", "yes", "true",  NULL } },
+    { "auto", TidyAutoState, { "auto",                        NULL } },
     { NULL }
 };
 
@@ -91,18 +77,11 @@ static PickListItems charEncPicks = {
     { "mac",      TidyEncMac,      { "mac",      NULL } },
     { "win1252",  TidyEncWin1252,  { "win1252",  NULL } },
     { "ibm858",   TidyEncIbm858,   { "ibm858",   NULL } },
-
-#if SUPPORT_UTF16_ENCODINGS
     { "utf16le",  TidyEncUtf16le,  { "utf16le",  NULL } },
     { "utf16be",  TidyEncUtf16be,  { "utf16be",  NULL } },
     { "utf16",    TidyEncUtf16,    { "utf16",    NULL } },
-#endif
-
-#if SUPPORT_ASIAN_ENCODINGS
     { "big5",     TidyEncBig5,     { "big5",     NULL } },
     { "shiftjis", TidyEncShiftjis, { "shiftjis", NULL } },
-#endif
-
     { NULL }
 };
 
@@ -146,12 +125,21 @@ static PickListItems attributeCasePicks = {
 };
 
 
+/*****************************************************************************
+ ** Option Configuration
+ ******************************************************************************/
 
-#define MU TidyMarkup
 #define DG TidyDiagnostics
-#define PP TidyPrettyPrint
+#define DD TidyDisplay
+#define DT TidyDocumentIO
 #define CE TidyEncoding
-#define MS TidyMiscellaneous
+#define IO TidyFileIO
+#define MC TidyMarkupCleanup
+#define ME TidyMarkupEntities
+#define MR TidyMarkupRepair
+#define MT TidyMarkupTeach
+#define MX TidyMarkupXForm
+#define PP TidyPrettyPrint
 #define IR TidyInternalCategory
 
 #define IN TidyInteger
@@ -163,141 +151,115 @@ static PickListItems attributeCasePicks = {
 
 #define DLF DEFAULT_NL_CONFIG
 
-/* If Accessibility checks not supported, make config setting read-only */
-#if SUPPORT_ACCESSIBILITY_CHECKS
-#define ParseAcc ParsePickList
-#else
-#define ParseAcc NULL 
-#endif
-
-static void AdjustConfig( TidyDocImpl* doc );
-
-/* parser for integer values */
+/* forward declarations */
 static ParseProperty ParseInt;
-
-/* a string excluding whitespace */
+static ParseProperty ParseList;
 static ParseProperty ParseName;
-
-/* a CSS1 selector - CSS class naming for -clean option */
 static ParseProperty ParseCSS1Selector;
-
-/* a string including whitespace */
 static ParseProperty ParseString;
-
-/* a space or comma separated list of tag names */
-static ParseProperty ParseTagNames;
-
-/* RAW, ASCII, LATIN0, LATIN1, UTF8, ISO2022, MACROMAN,
-   WIN1252, IBM858, UTF16LE, UTF16BE, UTF16, BIG5, SHIFTJIS
-*/
 static ParseProperty ParseCharEnc;
-
-/* html5 | omit | auto | strict | loose | <fpi> */
 static ParseProperty ParseDocType;
-
-/* 20150515 - support using tabs instead of spaces - Issue #108
- */
 static ParseProperty ParseTabs;
-
-/* General parser for options having picklists */
 static ParseProperty ParsePickList;
 
-
+/*****************************************************************/
 /* Ensure struct order is same order as tidyenum.h:TidyOptionId! */
+/*****************************************************************/
 static const TidyOptionImpl option_defs[] =
 {
-    { 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,             ParsePickList,     &boolPicks          },
-    { TidyAsciiChars,              CE, "ascii-chars",                 BL, no,              ParsePickList,     &boolPicks          },
-    { TidyBlockTags,               MU, "new-blocklevel-tags",         ST, 0,               ParseTagNames,     NULL                },
-    { TidyBodyOnly,                MU, "show-body-only",              IN, no,              ParsePickList,     &autoBoolPicks      },
+    { TidyUnknownOption,           IR, "unknown!",                    IN, 0,               NULL,              NULL                },
+    { TidyAccessibilityCheckLevel, DG, "accessibility-check",         IN, 0,               ParsePickList,     &accessPicks        },
+    { TidyAltText,                 MR, "alt-text",                    ST, 0,               ParseString,       NULL                },
+    { TidyAnchorAsName,            MR, "anchor-as-name",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyAsciiChars,              ME, "ascii-chars",                 BL, no,              ParsePickList,     &boolPicks          },
+    { TidyBlockTags,               MT, "new-blocklevel-tags",         ST, 0,               ParseList,         NULL                },
+    { TidyBodyOnly,                DD, "show-body-only",              IN, no,              ParsePickList,     &autoBoolPicks      },
     { TidyBreakBeforeBR,           PP, "break-before-br",             BL, no,              ParsePickList,     &boolPicks          },
     { TidyCharEncoding,            CE, "char-encoding",               IN, UTF8,            ParseCharEnc,      &charEncPicks       },
-    { TidyCoerceEndTags,           MU, "coerce-endtags",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyCSSPrefix,               MU, "css-prefix",                  ST, 0,               ParseCSS1Selector, NULL                },
-    { TidyCustomTags,              IR, "new-custom-tags",             ST, 0,               ParseTagNames,     NULL                }, /* 20170309 - Issue #119 */
-    { TidyDecorateInferredUL,      MU, "decorate-inferred-ul",        BL, no,              ParsePickList,     &boolPicks          },
-    { TidyDoctype,                 MU, "doctype",                     ST, 0,               ParseDocType,      &doctypePicks       },
+    { TidyCoerceEndTags,           MR, "coerce-endtags",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyCSSPrefix,               MR, "css-prefix",                  ST, 0,               ParseCSS1Selector, NULL,           "c" },
+    { TidyCustomTags,              IR, "new-custom-tags",             ST, 0,               ParseList,         NULL                }, /* 20170309 - Issue #119 */
+    { TidyDecorateInferredUL,      MX, "decorate-inferred-ul",        BL, no,              ParsePickList,     &boolPicks          },
+    { TidyDoctype,                 DT, "doctype",                     ST, TidyDoctypeAuto, ParseDocType,      &doctypePicks       },
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     { TidyDoctypeMode,             IR, "doctype-mode",                IN, TidyDoctypeAuto, NULL,              &doctypePicks       },
 #endif
-    { TidyDropEmptyElems,          MU, "drop-empty-elements",         BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyDropEmptyParas,          MU, "drop-empty-paras",            BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyDropPropAttrs,           MU, "drop-proprietary-attributes", BL, no,              ParsePickList,     &boolPicks          },
-    { TidyDuplicateAttrs,          MU, "repeated-attributes",         IN, TidyKeepLast,    ParsePickList,     &repeatAttrPicks    },
-    { TidyEmacs,                   MS, "gnu-emacs",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyDropEmptyElems,          MC, "drop-empty-elements",         BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyDropEmptyParas,          MC, "drop-empty-paras",            BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyDropPropAttrs,           MC, "drop-proprietary-attributes", BL, no,              ParsePickList,     &boolPicks          },
+    { TidyDuplicateAttrs,          MR, "repeated-attributes",         IN, TidyKeepLast,    ParsePickList,     &repeatAttrPicks    },
+    { TidyEmacs,                   DD, "gnu-emacs",                   BL, no,              ParsePickList,     &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,              ParsePickList,     &boolPicks          },
-    { TidyEncloseBodyText,         MU, "enclose-text",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyErrFile,                 MS, "error-file",                  ST, 0,               ParseString,       NULL                },
-    { TidyEscapeCdata,             MU, "escape-cdata",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyEscapeScripts,           PP, "escape-scripts",              BL, yes,             ParsePickList,     &boolPicks          }, /* 20160227 - Issue #348 */
-    { TidyFixBackslash,            MU, "fix-backslash",               BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyFixComments,             MU, "fix-bad-comments",            BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyFixUri,                  MU, "fix-uri",                     BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyForceOutput,             MS, "force-output",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyGDocClean,               MU, "gdoc",                        BL, no,              ParsePickList,     &boolPicks          },
-    { TidyHideComments,            MU, "hide-comments",               BL, no,              ParsePickList,     &boolPicks          },
-    { TidyHtmlOut,                 MU, "output-html",                 BL, no,              ParsePickList,     &boolPicks          },
+    { TidyEmptyTags,               MT, "new-empty-tags",              ST, 0,               ParseList,         NULL                },
+    { TidyEncloseBlockText,        MR, "enclose-block-text",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyEncloseBodyText,         MR, "enclose-text",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyErrFile,                 IO, "error-file",                  ST, 0,               ParseString,       NULL                },
+    { TidyEscapeCdata,             MX, "escape-cdata",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyEscapeScripts,           MR, "escape-scripts",              BL, yes,             ParsePickList,     &boolPicks          }, /* 20160227 - Issue #348 */
+    { TidyFixBackslash,            MR, "fix-backslash",               BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyFixComments,             MR, "fix-bad-comments",            IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
+    { TidyFixUri,                  MR, "fix-uri",                     BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyForceOutput,             DG, "force-output",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyGDocClean,               MC, "gdoc",                        BL, no,              ParsePickList,     &boolPicks          },
+    { TidyHideComments,            MX, "hide-comments",               BL, no,              ParsePickList,     &boolPicks          },
+    { TidyHtmlOut,                 DT, "output-html",                 BL, no,              ParsePickList,     &boolPicks          },
     { TidyInCharEncoding,          CE, "input-encoding",              IN, UTF8,            ParseCharEnc,      &charEncPicks       },
     { TidyIndentAttributes,        PP, "indent-attributes",           BL, no,              ParsePickList,     &boolPicks          },
-    { TidyIndentCdata,             MU, "indent-cdata",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyIndentCdata,             PP, "indent-cdata",                BL, no,              ParsePickList,     &boolPicks          },
     { TidyIndentContent,           PP, "indent",                      IN, TidyNoState,     ParsePickList,     &autoBoolPicks      },
     { TidyIndentSpaces,            PP, "indent-spaces",               IN, 2,               ParseInt,          NULL                },
-    { TidyInlineTags,              MU, "new-inline-tags",             ST, 0,               ParseTagNames,     NULL                },
-    { TidyJoinClasses,             MU, "join-classes",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyJoinStyles,              MU, "join-styles",                 BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyKeepFileTimes,           MS, "keep-time",                   BL, no,              ParsePickList,     &boolPicks          },
-    { TidyLiteralAttribs,          MU, "literal-attributes",          BL, no,              ParsePickList,     &boolPicks          },
-    { TidyLogicalEmphasis,         MU, "logical-emphasis",            BL, no,              ParsePickList,     &boolPicks          },
-    { TidyLowerLiterals,           MU, "lower-literals",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyMakeBare,                MU, "bare",                        BL, no,              ParsePickList,     &boolPicks          },
-    { TidyMakeClean,               MU, "clean",                       BL, no,              ParsePickList,     &boolPicks          },
-    { TidyMark,                    MS, "tidy-mark",                   BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyMergeDivs,               MU, "merge-divs",                  IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
-    { TidyMergeEmphasis,           MU, "merge-emphasis",              BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyMergeSpans,              MU, "merge-spans",                 IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
-#if SUPPORT_ASIAN_ENCODINGS
-    { TidyNCR,                     MU, "ncr",                         BL, yes,             ParsePickList,     &boolPicks          },
-#endif
+    { TidyInlineTags,              MT, "new-inline-tags",             ST, 0,               ParseList,         NULL                },
+    { TidyJoinClasses,             MX, "join-classes",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyJoinStyles,              MX, "join-styles",                 BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyKeepFileTimes,           IO, "keep-time",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyKeepTabs,                PP, "keep-tabs",                   BL, no,              ParsePickList,     &boolPicks          }, /* 20171103 - Issue #403 */
+    { TidyLiteralAttribs,          MR, "literal-attributes",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyLogicalEmphasis,         MC, "logical-emphasis",            BL, no,              ParsePickList,     &boolPicks          },
+    { TidyLowerLiterals,           MR, "lower-literals",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyMakeBare,                MC, "bare",                        BL, no,              ParsePickList,     &boolPicks          },
+    { TidyMakeClean,               MC, "clean",                       BL, no,              ParsePickList,     &boolPicks          },
+    { TidyMark,                    PP, "tidy-mark",                   BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyMergeDivs,               MC, "merge-divs",                  IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
+    { TidyMergeEmphasis,           MX, "merge-emphasis",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyMergeSpans,              MC, "merge-spans",                 IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
+    { TidyMetaCharset,             DT, "add-meta-charset",            BL, no,              ParsePickList,     &boolPicks          }, /* 20161004 - Issue #456 */
+    { TidyMuteReports,             DD, "mute",                        ST, 0,               ParseList,         NULL                },
+    { TidyMuteShow,                DD, "mute-id",                     BL, no,              ParsePickList,     &boolPicks          },
+    { TidyNCR,                     ME, "ncr",                         BL, yes,             ParsePickList,     &boolPicks          },
     { TidyNewline,                 CE, "newline",                     IN, DLF,             ParsePickList,     &newlinePicks       },
-    { TidyNumEntities,             MU, "numeric-entities",            BL, no,              ParsePickList,     &boolPicks          },
-    { TidyOmitOptionalTags,        MU, "omit-optional-tags",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyNumEntities,             ME, "numeric-entities",            BL, no,              ParsePickList,     &boolPicks          },
+    { TidyOmitOptionalTags,        PP, "omit-optional-tags",          BL, no,              ParsePickList,     &boolPicks          },
     { TidyOutCharEncoding,         CE, "output-encoding",             IN, UTF8,            ParseCharEnc,      &charEncPicks       },
-    { TidyOutFile,                 MS, "output-file",                 ST, 0,               ParseString,       NULL                },
-#if SUPPORT_UTF16_ENCODINGS
+    { TidyOutFile,                 IO, "output-file",                 ST, 0,               ParseString,       NULL                },
     { TidyOutputBOM,               CE, "output-bom",                  IN, TidyAutoState,   ParsePickList,     &autoBoolPicks      },
-#endif
     { TidyPPrintTabs,              PP, "indent-with-tabs",            BL, no,              ParseTabs,         &boolPicks          }, /* 20150515 - Issue #108 */
-    { TidyPreserveEntities,        MU, "preserve-entities",           BL, no,              ParsePickList,     &boolPicks          },
-    { TidyPreTags,                 MU, "new-pre-tags",                ST, 0,               ParseTagNames,     NULL                },
-#if SUPPORT_ASIAN_ENCODINGS
+    { TidyPreserveEntities,        ME, "preserve-entities",           BL, no,              ParsePickList,     &boolPicks          },
+    { TidyPreTags,                 MT, "new-pre-tags",                ST, 0,               ParseList,         NULL                },
+    { TidyPriorityAttributes,      PP, "priority-attributes",         ST, 0,               ParseList,         NULL                },
     { TidyPunctWrap,               PP, "punctuation-wrap",            BL, no,              ParsePickList,     &boolPicks          },
-#endif
-    { TidyQuiet,                   MS, "quiet",                       BL, no,              ParsePickList,     &boolPicks          },
-    { TidyQuoteAmpersand,          MU, "quote-ampersand",             BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyQuoteMarks,              MU, "quote-marks",                 BL, no,              ParsePickList,     &boolPicks          },
-    { TidyQuoteNbsp,               MU, "quote-nbsp",                  BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyReplaceColor,            MU, "replace-color",               BL, no,              ParsePickList,     &boolPicks          },
-    { TidyShowErrors,              DG, "show-errors",                 IN, 6,               ParseInt,          NULL                },
-    { TidyShowInfo,                DG, "show-info",                   BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyShowMarkup,              PP, "markup",                      BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyShowWarnings,            DG, "show-warnings",               BL, yes,             ParsePickList,     &boolPicks          },
-    { TidySkipNested,              MU, "skip-nested",                 BL, yes,             ParsePickList,     &boolPicks          }, /* 1642186 - Issue #65 */
+    { TidyQuiet,                   DD, "quiet",                       BL, no,              ParsePickList,     &boolPicks          },
+    { TidyQuoteAmpersand,          ME, "quote-ampersand",             BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyQuoteMarks,              ME, "quote-marks",                 BL, no,              ParsePickList,     &boolPicks          },
+    { TidyQuoteNbsp,               ME, "quote-nbsp",                  BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyReplaceColor,            MX, "replace-color",               BL, no,              ParsePickList,     &boolPicks          },
+    { TidyShowErrors,              DD, "show-errors",                 IN, 6,               ParseInt,          NULL                },
+    { TidyShowInfo,                DD, "show-info",                   BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyShowMarkup,              DD, "markup",                      BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyShowMetaChange,          DG, "show-meta-change",            BL, no,              ParsePickList,     &boolPicks          }, /* 20170609 - Issue #456 */
+    { TidyShowWarnings,            DD, "show-warnings",               BL, yes,             ParsePickList,     &boolPicks          },
+    { TidySkipNested,              MR, "skip-nested",                 BL, yes,             ParsePickList,     &boolPicks          }, /* 1642186 - Issue #65 */
     { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParsePickList,     &sorterPicks        },
-    { TidyStrictTagsAttr,          MU, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
+    { TidyStrictTagsAttr,          MR, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
+    { TidyStyleTags,               MR, "fix-style-tags",              BL, yes,             ParsePickList,     &boolPicks          },
     { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL                },
-    { TidyUpperCaseAttrs,          MU, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
-    { TidyUpperCaseTags,           MU, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },
-    { TidyUseCustomTags,           MU, "custom-tags",                 IN, TidyCustomNo,    ParsePickList,     &customTagsPicks    }, /* 20170309 - Issue #119 */
+    { TidyUpperCaseAttrs,          MR, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
+    { TidyUpperCaseTags,           MR, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },
+    { TidyUseCustomTags,           MR, "custom-tags",                 IN, TidyCustomNo,    ParsePickList,     &customTagsPicks    }, /* 20170309 - Issue #119 */
     { TidyVertSpace,               PP, "vertical-space",              IN, no,              ParsePickList,     &autoBoolPicks      }, /* #228 - tri option */
-    { TidyWarnPropAttrs,           MU, "warn-proprietary-attributes", BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyWord2000,                MU, "word-2000",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyWarnPropAttrs,           DG, "warn-proprietary-attributes", BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyWord2000,                MC, "word-2000",                   BL, no,              ParsePickList,     &boolPicks          },
     { TidyWrapAsp,                 PP, "wrap-asp",                    BL, yes,             ParsePickList,     &boolPicks          },
     { TidyWrapAttVals,             PP, "wrap-attributes",             BL, no,              ParsePickList,     &boolPicks          },
     { TidyWrapJste,                PP, "wrap-jste",                   BL, yes,             ParsePickList,     &boolPicks          },
@@ -305,17 +267,60 @@ static const TidyOptionImpl option_defs[] =
     { TidyWrapPhp,                 PP, "wrap-php",                    BL, yes,             ParsePickList,     &boolPicks          },
     { TidyWrapScriptlets,          PP, "wrap-script-literals",        BL, no,              ParsePickList,     &boolPicks          },
     { TidyWrapSection,             PP, "wrap-sections",               BL, yes,             ParsePickList,     &boolPicks          },
-    { TidyWriteBack,               MS, "write-back",                  BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXhtmlOut,                MU, "output-xhtml",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlDecl,                 MU, "add-xml-decl",                BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlOut,                  MU, "output-xml",                  BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlPIs,                  MU, "assume-xml-procins",          BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlSpace,                MU, "add-xml-space",               BL, no,              ParsePickList,     &boolPicks          },
-    { TidyXmlTags,                 MU, "input-xml",                   BL, no,              ParsePickList,     &boolPicks          },
+    { TidyWriteBack,               IO, "write-back",                  BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXhtmlOut,                DT, "output-xhtml",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlDecl,                 DT, "add-xml-decl",                BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlOut,                  DT, "output-xml",                  BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlPIs,                  MR, "assume-xml-procins",          BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlSpace,                DT, "add-xml-space",               BL, no,              ParsePickList,     &boolPicks          },
+    { TidyXmlTags,                 DT, "input-xml",                   BL, no,              ParsePickList,     &boolPicks          },
     { N_TIDY_OPTIONS,              XX, NULL,                          XY, 0,               NULL,              NULL                }
 };
 
 
+/*****************************************************************************
+ ** Deleted Options Configuration
+ **
+ ** Keep track of options that have been removed from Tidy, so that we can
+ ** suggests a replacement. When a deleted option is used, client programs
+ ** will have the opportunity to consume the option first via the callback,
+ ** and if not handled by the callback, will be handled by Tidy, generally
+ ** by setting an alternate or new option, in `subDeprecatedOption()`.
+ ******************************************************************************/
+
+static const struct {
+    ctmbstr name;                /**< name of the deprecated option */
+    TidyOptionId replacementId;  /**< Id of the replacement option, or 0 if none. */
+} deprecatedOptions[] = {
+/*    { "show-body-only", TidyBodyOnly }, */
+    { NULL }
+};
+
+
+/*****************************************************************************
+ ** Supporting Functions
+ ******************************************************************************/
+
+
+/* forward declarations */
+static Bool GetPickListValue( ctmbstr value, PickListItems* pickList, uint *result );
+
+
+void TY_(InitConfig)( TidyDocImpl* doc )
+{
+    TidyClearMemory( &doc->config, sizeof(TidyConfigImpl) );
+    TY_(ResetConfigToDefault)( doc );
+}
+
+
+void TY_(FreeConfig)( TidyDocImpl* doc )
+{
+    doc->pConfigChangeCallback = NULL;
+    TY_(ResetConfigToDefault)( doc );
+    TY_(TakeConfigSnapshot)( doc );
+}
+
+
 /* Should only be called by options set by name
 ** thus, it is cheaper to do a few scans than set
 ** up every option in a hash table.
@@ -331,6 +336,7 @@ const TidyOptionImpl* TY_(lookupOption)( ctmbstr s )
     return NULL;
 }
 
+
 const TidyOptionImpl* TY_(getOption)( TidyOptionId optId )
 {
   if ( optId < N_TIDY_OPTIONS )
@@ -338,6 +344,34 @@ const TidyOptionImpl* TY_(getOption)( TidyOptionId optId )
   return NULL;
 }
 
+const Bool TY_(getOptionIsList)( TidyOptionId optId )
+{
+    const TidyOptionImpl* option = TY_(getOption)( optId );
+    return option->parser == ParseList;
+}
+
+static Bool OptionChangedValuesDiffer( ctmbstr a, ctmbstr b )
+{
+    if ( a != b )
+    {
+        if ( a == NULL || b == NULL ) /* can't both be null at this point. */
+            return yes;
+        else
+            return TY_(tmbstrcmp)( a, b ) != 0;
+    }
+
+    return no;
+}
+
+static void PerformOptionChangedCallback( TidyDocImpl* doc, const TidyOptionImpl* option )
+{
+    if ( doc->pConfigChangeCallback )
+    {
+        TidyDoc tdoc = tidyImplToDoc( doc );
+        TidyOption opt = tidyImplToOption( option );
+        doc->pConfigChangeCallback( tdoc, opt );
+    }
+}
 
 static void FreeOptionValue( TidyDocImpl* doc, const TidyOptionImpl* option, TidyOptionValue* value )
 {
@@ -345,10 +379,22 @@ static void FreeOptionValue( TidyDocImpl* doc, const TidyOptionImpl* option, Tid
         TidyDocFree( doc, value->p );
 }
 
+
 static void CopyOptionValue( TidyDocImpl* doc, const TidyOptionImpl* option,
                              TidyOptionValue* oldval, const TidyOptionValue* newval )
 {
+    Bool fire_callback = no;
     assert( oldval != NULL );
+
+    /* Compare the old and new values. */
+    if ( doc->pConfigChangeCallback )
+    {
+        if ( option->type == TidyString )
+            fire_callback = OptionChangedValuesDiffer( oldval->p, newval->p );
+        else
+            fire_callback = oldval->v != newval->v;
+    }
+
     FreeOptionValue( doc, option, oldval );
 
     if ( option->type == TidyString )
@@ -360,47 +406,101 @@ static void CopyOptionValue( TidyDocImpl* doc, const TidyOptionImpl* option,
     }
     else
         oldval->v = newval->v;
+
+    if ( fire_callback )
+        PerformOptionChangedCallback( doc, option );
 }
 
 
 static Bool SetOptionValue( TidyDocImpl* doc, TidyOptionId optId, ctmbstr val )
 {
-   const TidyOptionImpl* option = &option_defs[ optId ];
-   Bool status = ( optId < N_TIDY_OPTIONS );
-   if ( status )
-   {
-      assert( option->id == optId && option->type == TidyString );
-      FreeOptionValue( doc, option, &doc->config.value[ optId ] );
-      if ( TY_(tmbstrlen)(val)) /* Issue #218 - ONLY if it has LENGTH! */
-          doc->config.value[ optId ].p = TY_(tmbstrdup)( doc->allocator, val );
-      else
-          doc->config.value[ optId ].p = 0; /* should already be zero, but to be sure... */
-   }
-   return status;
+    const TidyOptionImpl* option = &option_defs[ optId ];
+    Bool fire_callback = no;
+    Bool status = ( optId < N_TIDY_OPTIONS );
+
+    if ( status )
+    {
+        assert( option->id == optId && option->type == TidyString );
+
+        /* Compare the old and new values. */
+        if ( doc->pConfigChangeCallback )
+        {
+            TidyOptionValue* oldval = &(doc->config.value[ optId ]);
+            fire_callback = OptionChangedValuesDiffer( oldval->p, val );
+        }
+
+        FreeOptionValue( doc, option, &doc->config.value[ optId ] );
+        if ( TY_(tmbstrlen)(val)) /* Issue #218 - ONLY if it has LENGTH! */
+            doc->config.value[ optId ].p = TY_(tmbstrdup)( doc->allocator, val );
+        else
+            doc->config.value[ optId ].p = 0; /* should already be zero, but to be sure... */
+    }
+
+    if ( fire_callback )
+        PerformOptionChangedCallback( doc, option );
+
+    return status;
+}
+
+
+ctmbstr TY_(GetPickListLabelForPick)( TidyOptionId optId, uint pick )
+{
+    const TidyOptionImpl* option = TY_(getOption)( optId );
+
+    if ( option && option->pickList )
+    {
+        uint ix = 0;
+        const PickListItem *item = NULL;
+
+        /* Loop through the picklist until index matches the value. */
+        while ( (item = &(*option->pickList)[ ix ]) && item->label && ix<pick )
+        {
+            ++ix;
+        }
+        if ( ix==pick && item->label )
+            return item->label;
+    }
+
+    return NULL;
+}
+
+
+static void SetOptionInteger( TidyDocImpl* doc, TidyOptionId optId, ulong val )
+{
+    const TidyOptionImpl* option = &option_defs[ optId ];
+    ulong* optVal = &(doc->config.value[ optId ].v);
+    Bool fire_callback = doc->pConfigChangeCallback && *optVal != val;
+
+    *optVal = val;
+
+    if ( fire_callback )
+        PerformOptionChangedCallback( doc, option );
 }
 
 Bool TY_(SetOptionInt)( TidyDocImpl* doc, TidyOptionId optId, ulong val )
 {
-   Bool status = ( optId < N_TIDY_OPTIONS );
-   if ( status )
-   {
-       assert( option_defs[ optId ].type == TidyInteger );
-       doc->config.value[ optId ].v = val;
-   }
-   return status;
+    Bool status = ( optId < N_TIDY_OPTIONS );
+    if ( status )
+    {
+        assert( option_defs[ optId ].type == TidyInteger );
+        SetOptionInteger( doc, optId, val );
+    }
+    return status;
 }
 
+
 Bool TY_(SetOptionBool)( TidyDocImpl* doc, TidyOptionId optId, Bool val )
 {
-   Bool status = ( optId < N_TIDY_OPTIONS );
-   if ( status )
-   {
-       assert( option_defs[ optId ].type == TidyBoolean );
-       doc->config.value[ optId ].v = val;
-   }
-   return status;
+    Bool status = ( optId < N_TIDY_OPTIONS );
+    if ( status )
+    {
+        assert( option_defs[ optId ].type == TidyBoolean );
+        SetOptionInteger( doc, optId, (ulong)val );
+    }
+    return status;
 }
 
+
 static void GetOptionDefault( const TidyOptionImpl* option,
                               TidyOptionValue* dflt )
 {
@@ -410,6 +510,7 @@ static void GetOptionDefault( const TidyOptionImpl* option,
         dflt->v = option->dflt;
 }
 
+
 static Bool OptionValueEqDefault( const TidyOptionImpl* option,
                                   const TidyOptionValue* val )
 {
@@ -418,6 +519,7 @@ static Bool OptionValueEqDefault( const TidyOptionImpl* option,
         val->v == option->dflt;
 }
 
+
 Bool TY_(ResetOptionToDefault)( TidyDocImpl* doc, TidyOptionId optId )
 {
     Bool status = ( optId > 0 && optId < N_TIDY_OPTIONS );
@@ -433,6 +535,7 @@ Bool TY_(ResetOptionToDefault)( TidyDocImpl* doc, TidyOptionId optId )
     return status;
 }
 
+
 static void ReparseTagType( TidyDocImpl* doc, TidyOptionId optId )
 {
     ctmbstr tagdecl = cfgStr( doc, optId );
@@ -441,6 +544,7 @@ static void ReparseTagType( TidyDocImpl* doc, TidyOptionId optId )
     TidyDocFree( doc, dupdecl );
 }
 
+
 static Bool OptionValueIdentical( const TidyOptionImpl* option,
                                   const TidyOptionValue* val1,
                                   const TidyOptionValue* val2 )
@@ -457,6 +561,7 @@ static Bool OptionValueIdentical( const TidyOptionImpl* option,
         return val1->v == val2->v;
 }
 
+
 static Bool NeedReparseTagDecls( TidyDocImpl* doc,
                                  const TidyOptionValue* current,
                                  const TidyOptionValue* new,
@@ -491,6 +596,7 @@ static Bool NeedReparseTagDecls( TidyDocImpl* doc,
     return ret;
 }
 
+
 static void ReparseTagDecls( TidyDocImpl* doc, uint changedUserTags  )
 {
 #define REPARSE_USERTAGS(USERTAGOPTION,USERTAGTYPE) \
@@ -505,6 +611,83 @@ static void ReparseTagDecls( TidyDocImpl* doc, uint changedUserTags  )
     REPARSE_USERTAGS(TidyPreTags,tagtype_pre);
 }
 
+
+/*  Returns the option id of the replacement Tidy option for optName. Because
+ ** an option might not have a replacement (0, TidyUnknownOption), a return
+ ** value of N_TIDY_OPTIONS indicates an error, i.e., that the option isn't
+ ** in the deprecated list.
+ */
+static TidyOptionId getOptionReplacement( ctmbstr optName )
+{
+    uint i = 0;
+    ctmbstr testName;
+    while ( (testName = deprecatedOptions[i].name) )
+    {
+        if ( TY_(tmbstrcasecmp)( optName, testName ) == 0 )
+            return deprecatedOptions[i].replacementId;
+
+        i++;
+    }
+    return N_TIDY_OPTIONS;
+}
+
+
+/* Indicates whether or not optName is deprecated */
+static Bool isOptionDeprecated( ctmbstr optName )
+{
+    return getOptionReplacement( optName ) != N_TIDY_OPTIONS;
+}
+
+
+/* Substitute the new option for the deprecated one. */
+static Bool subDeprecatedOption( TidyDocImpl* doc, ctmbstr oldName, ctmbstr oldValue)
+{
+    TidyOptionId newOptId = getOptionReplacement( oldName );
+    ctmbstr newName = TY_(getOption)( newOptId )->name;
+    TidyDoc tdoc = tidyImplToDoc( doc );
+
+    assert( isOptionDeprecated(oldName));
+
+    if ( newOptId == TidyUnknownOption )
+    {
+        TY_(Report)( doc, NULL, NULL, OPTION_REMOVED, oldName );
+        return no;
+    }
+
+    /********************/
+    /* `show-body-only` */
+    /********************/
+    if ( TY_(tmbstrcasecmp)( oldName, "show-body-only" ) == 0 )
+    {
+        uint value;
+
+        /* `show-body-only` used to use the autoBoolPicks */
+        if ( GetPickListValue( oldValue, &autoBoolPicks, &value ) )
+        {
+            if ( value == TidyNoState )
+            {
+                TY_(SetOptionInt)( doc, newOptId, value );
+                TY_(Report)( doc, NULL, NULL, OPTION_REMOVED_UNAPPLIED, oldName, newName );
+            }
+            else
+            {
+                ctmbstr val;
+                TY_(SetOptionInt)( doc, newOptId, value );
+                val = tidyOptGetCurrPick( tdoc, newOptId );
+                TY_(Report)( doc, NULL, NULL, OPTION_REMOVED_APPLIED, oldName, newName, val );
+            }
+        }
+        else
+        {
+            TY_(ReportBadArgument)(doc, oldName);
+        }
+        return yes;
+    }
+
+    return no;
+}
+
+
 void TY_(ResetConfigToDefault)( TidyDocImpl* doc )
 {
     uint ixVal;
@@ -520,6 +703,7 @@ void TY_(ResetConfigToDefault)( TidyDocImpl* doc )
     TY_(FreeDeclaredTags)( doc, tagtype_null );
 }
 
+
 void TY_(TakeConfigSnapshot)( TidyDocImpl* doc )
 {
     uint ixVal;
@@ -527,7 +711,6 @@ void TY_(TakeConfigSnapshot)( TidyDocImpl* doc )
     const TidyOptionValue* value = &doc->config.value[ 0 ];
     TidyOptionValue* snap  = &doc->config.snapshot[ 0 ];
 
-    AdjustConfig( doc );  /* Make sure it's consistent */
     for ( ixVal=0; ixVal < N_TIDY_OPTIONS; ++option, ++ixVal )
     {
         assert( ixVal == (uint) option->id );
@@ -535,6 +718,7 @@ void TY_(TakeConfigSnapshot)( TidyDocImpl* doc )
     }
 }
 
+
 void TY_(ResetConfigToSnapshot)( TidyDocImpl* doc )
 {
     uint ixVal;
@@ -554,6 +738,7 @@ void TY_(ResetConfigToSnapshot)( TidyDocImpl* doc )
         ReparseTagDecls( doc, changedUserTags );
 }
 
+
 void TY_(CopyConfig)( TidyDocImpl* docTo, TidyDocImpl* docFrom )
 {
     if ( docTo != docFrom )
@@ -574,7 +759,6 @@ void TY_(CopyConfig)( TidyDocImpl* docTo, TidyDocImpl* docFrom )
         }
         if ( needReparseTagsDecls )
             ReparseTagDecls( docTo, changedUserTags  );
-        AdjustConfig( docTo );  /* Make sure it's consistent */
     }
 }
 
@@ -624,12 +808,14 @@ static tchar GetC( TidyConfigImpl* config )
     return EndOfStream;
 }
 
+
 static tchar FirstChar( TidyConfigImpl* config )
 {
     config->c = GetC( config );
     return config->c;
 }
 
+
 static tchar AdvanceChar( TidyConfigImpl* config )
 {
     if ( config->c != EndOfStream )
@@ -637,6 +823,7 @@ static tchar AdvanceChar( TidyConfigImpl* config )
     return config->c;
 }
 
+
 static tchar SkipWhite( TidyConfigImpl* config )
 {
     while ( TY_(IsWhite)(config->c) && !TY_(IsNewline)(config->c) )
@@ -644,23 +831,8 @@ static tchar SkipWhite( TidyConfigImpl* config )
     return config->c;
 }
 
-/* skip until end of line
-static tchar SkipToEndofLine( TidyConfigImpl* config )
-{
-    while ( config->c != EndOfStream )
-    {
-        config->c = GetC( config );
-        if ( config->c == '\n' || config->c == '\r' )
-            break;
-    }
-    return config->c;
-}
-*/
 
-/*
- skip over line continuations
- to start of next property
-*/
+/* skip over line continuations to start of next property */
 static uint NextProperty( TidyConfigImpl* config )
 {
     do
@@ -681,13 +853,12 @@ static uint NextProperty( TidyConfigImpl* config )
     return config->c;
 }
 
+
 /*
- Todd Lewis contributed this code for expanding
- ~/foo or ~your/foo according to $HOME and your
- user name. This will work partially on any system 
- which defines $HOME.  Support for ~user/foo will
- work on systems that support getpwnam(userid), 
- namely Unix/Linux.
+ Todd Lewis contributed this code for expanding ~/foo or ~your/foo according
+ to $HOME and your user name. This will work partially on any system which
+ defines $HOME. Support for ~user/foo will work on systems that support
+ getpwnam(userid), namely Unix/Linux.
 */
 static ctmbstr ExpandTilde( TidyDocImpl* doc, ctmbstr filename )
 {
@@ -715,7 +886,7 @@ static ctmbstr ExpandTilde( TidyDocImpl* doc, ctmbstr filename )
         while ( *s && *s != '/' )
             s++;
 
-        if ( t = TidyDocAlloc(doc, s - filename) )
+        if ( (t = TidyDocAlloc(doc, s - filename)) )
         {
             memcpy(t, filename+1, s-filename-1);
             t[s-filename-1] = 0;
@@ -744,6 +915,7 @@ static ctmbstr ExpandTilde( TidyDocImpl* doc, ctmbstr filename )
     return (ctmbstr) filename;
 }
 
+
 Bool TIDY_CALL tidyFileExists( TidyDoc tdoc, ctmbstr filename )
 {
   TidyDocImpl* doc = tidyDocToImpl( tdoc );
@@ -764,10 +936,6 @@ Bool TIDY_CALL tidyFileExists( TidyDoc tdoc, ctmbstr filename )
 }
 
 
-#ifndef TIDY_MAX_NAME
-#define TIDY_MAX_NAME 64
-#endif
-
 int TY_(ParseConfigFile)( TidyDocImpl* doc, ctmbstr file )
 {
     return TY_(ParseConfigFileEnc)( doc, file, "ascii" );
@@ -777,6 +945,7 @@ int TY_(ParseConfigFile)( TidyDocImpl* doc, ctmbstr file )
 */
 int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
 {
+    enum { tidy_max_name = 64 };
     uint opterrs = doc->optionErrors;
     tmbstr fname = (tmbstr) ExpandTilde( doc, file );
     TidyConfigImpl* cfg = &doc->config;
@@ -785,7 +954,7 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
 
     if ( fin == NULL || enc < 0 )
     {
-        TY_(FileError)( doc, fname, TidyConfig, FILE_CANT_OPEN );
+        TY_(ReportFileError)( doc, fname, FILE_CANT_OPEN_CFG );
         return -1;
     }
     else
@@ -797,7 +966,7 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
         for ( c = SkipWhite(cfg); c != EndOfStream; c = NextProperty(cfg) )
         {
             uint ix = 0;
-            tmbchar name[ TIDY_MAX_NAME ] = {0};
+            tmbchar name[ tidy_max_name ] = {0};
 
             /* // or # start a comment */
             if ( c == '/' || c == '#' )
@@ -811,20 +980,21 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
 
             if ( c == ':' )
             {
+                Bool isDeprecated = isOptionDeprecated( name );
                 const TidyOptionImpl* option = TY_(lookupOption)( name );
                 c = AdvanceChar( cfg );
-                if ( option )
+                if ( option && !isDeprecated )
                     option->parser( doc, option );
                 else
                 {
-                    if ( (NULL != doc->pOptCallback) || (NULL != doc->pConfigCallback) )
+                    if ( (NULL != doc->pOptCallback) || (NULL != doc->pConfigCallback) || isDeprecated )
                     {
                         TidyConfigImpl* cfg = &doc->config;
                         tmbchar buf[8192];
                         uint i = 0;
                         tchar delim = 0;
                         Bool waswhite = yes;
-                        Bool response = yes;
+                        Bool response = no;
 
                         tchar c = SkipWhite( cfg );
 
@@ -857,12 +1027,15 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
                         buf[i] = '\0';
                         
                         if ( doc->pOptCallback )
-                            response = response && (*doc->pOptCallback)( name, buf );
+                            response = (*doc->pOptCallback)( name, buf );
 
                         if ( doc->pConfigCallback )
-                            response = response && (*doc->pConfigCallback)( tidyImplToDoc(doc), name, buf );
+                            response = response || (*doc->pConfigCallback)( tidyImplToDoc(doc), name, buf );
+
+                        if ( !response && isDeprecated )
+                            response = subDeprecatedOption( doc, name, buf);
 
-                        if (response == no)
+                        if ( response == no )
                             TY_(ReportUnknownOption)( doc, name );
                     }
                     else
@@ -879,33 +1052,39 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
     if ( fname != (tmbstr) file )
         TidyDocFree( doc, fname );
 
-    AdjustConfig( doc );
-
     /* any new config errors? If so, return warning status. */
     return (doc->optionErrors > opterrs ? 1 : 0); 
 }
 
+
 /* returns false if unknown option, missing parameter,
 ** or option doesn't use parameter
 */
 Bool TY_(ParseConfigOption)( TidyDocImpl* doc, ctmbstr optnam, ctmbstr optval )
 {
     const TidyOptionImpl* option = TY_(lookupOption)( optnam );
-    Bool status = ( option != NULL );
+    Bool isDeprecated = isOptionDeprecated( optnam );
+    Bool status = ( option != NULL ) && !isDeprecated;
     if ( !status )
     {
-        /* Not a standard tidy option.  Check to see if the user application 
-           recognizes it  */
+        /* Unknown or deprecated, so check to see if the user application
+           wants to deal with it first. */
         if (NULL != doc->pOptCallback)
             status = (*doc->pOptCallback)( optnam, optval );
+        if (NULL != doc->pConfigCallback )
+            status = status || (*doc->pConfigCallback)( tidyImplToDoc(doc), optnam, optval );
+        if (!status && isDeprecated)
+            status = subDeprecatedOption( doc, optnam, optval);
         if (!status)
             TY_(ReportUnknownOption)( doc, optnam );
     }
-    else 
+    else
         status = TY_(ParseConfigValue)( doc, option->id, optval );
+
     return status;
 }
 
+
 /* returns false if unknown option, missing parameter,
 ** or option doesn't use parameter
 */
@@ -990,15 +1169,11 @@ Bool  TY_(AdjustCharEncoding)( TidyDocImpl* doc, int encoding )
     case ISO2022:
 #endif
 
-#if SUPPORT_UTF16_ENCODINGS
     case UTF16LE:
     case UTF16BE:
     case UTF16:
-#endif
-#if SUPPORT_ASIAN_ENCODINGS
     case SHIFTJIS:
     case BIG5:
-#endif
         inenc = outenc = encoding;
         break;
     }
@@ -1013,8 +1188,9 @@ Bool  TY_(AdjustCharEncoding)( TidyDocImpl* doc, int encoding )
     return no;
 }
 
+
 /* ensure that config is self consistent */
-void AdjustConfig( TidyDocImpl* doc )
+void TY_(AdjustConfig)( TidyDocImpl* doc )
 {
     if ( cfgBool(doc, TidyEncloseBlockText) )
         TY_(SetOptionBool)( doc, TidyEncloseBodyText, yes );
@@ -1059,11 +1235,9 @@ void AdjustConfig( TidyDocImpl* doc )
     */
     if ( cfg(doc, TidyOutCharEncoding) != ASCII &&
          cfg(doc, TidyOutCharEncoding) != UTF8 &&
-#if SUPPORT_UTF16_ENCODINGS
          cfg(doc, TidyOutCharEncoding) != UTF16 &&
          cfg(doc, TidyOutCharEncoding) != UTF16BE &&
          cfg(doc, TidyOutCharEncoding) != UTF16LE &&
-#endif
          cfg(doc, TidyOutCharEncoding) != RAW &&
          cfgBool(doc, TidyXmlOut) )
     {
@@ -1073,17 +1247,158 @@ void AdjustConfig( TidyDocImpl* doc )
     /* XML requires end tags */
     if ( cfgBool(doc, TidyXmlOut) )
     {
-#if SUPPORT_UTF16_ENCODINGS
         /* XML requires a BOM on output if using UTF-16 encoding */
         ulong enc = cfg( doc, TidyOutCharEncoding );
         if ( enc == UTF16LE || enc == UTF16BE || enc == UTF16 )
             TY_(SetOptionInt)( doc, TidyOutputBOM, yes );
-#endif
+        
         TY_(SetOptionBool)( doc, TidyQuoteAmpersand, yes );
         TY_(SetOptionBool)( doc, TidyOmitOptionalTags, no );
     }
 }
 
+
+/* A service to ParseList(), keeps option values nicely formatted and
+   coordinates additions to the internal lists. Within Tidy, this function
+   might be used to programmatically add individual values to items that use
+   this service.
+ */
+void TY_(DeclareListItem)( TidyDocImpl* doc, const TidyOptionImpl* opt, ctmbstr name )
+{
+    ctmbstr prvval = cfgStr( doc, opt->id );
+    tmbstr catval = NULL;
+    ctmbstr theval = name;
+    if ( prvval )
+    {
+        uint len = TY_(tmbstrlen)(name) + TY_(tmbstrlen)(prvval) + 3;
+        catval = TY_(tmbstrndup)( doc->allocator, prvval, len );
+        TY_(tmbstrcat)( catval, ", " );
+        TY_(tmbstrcat)( catval, name );
+        theval = catval;
+    }
+
+    switch ( opt->id )
+    {
+        case TidyPriorityAttributes:
+            TY_(DefinePriorityAttribute)( doc, name );
+            break;
+
+        case TidyMuteReports:
+            TY_(DefineMutedMessage)( doc, opt, name );
+            break;
+
+        case TidyInlineTags:
+        case TidyBlockTags:
+        case TidyEmptyTags:
+        case TidyPreTags:
+        case TidyCustomTags:
+            TY_(DeclareUserTag)( doc, opt, name );
+            break;
+
+        default:
+            break;
+    }
+
+    SetOptionValue( doc, opt->id, theval );
+    if ( catval )
+        TidyDocFree( doc, catval );
+}
+
+
+/* a space or comma separated list of items */
+Bool ParseList( TidyDocImpl* doc, const TidyOptionImpl* option )
+{
+    TidyConfigImpl* cfg = &doc->config;
+    tmbchar buf[1024];
+    uint i = 0, nItems = 0;
+    uint c;
+    TidyConfigChangeCallback callback = doc->pConfigChangeCallback;
+    tmbstr oldbuff = NULL;
+
+    /* Handle comparing before and after for the config change callback.
+       We have do handle this manually, because otherwise TY_(DeclareListItem)
+       would fire a callback for EVERY list item being added. */
+    doc->pConfigChangeCallback = NULL;
+    if ( callback )
+    {
+        TidyOptionValue* oldval = &(doc->config.value[ option->id ]);
+        oldbuff = TY_(tmbstrdup)( doc->allocator, oldval->p );
+    }
+
+    SetOptionValue( doc, option->id, NULL );
+
+    /* Given an empty string, so signal success. */
+    if ( cfg->c == EndOfStream )
+        return yes;
+
+    c = SkipWhite( cfg );
+
+    do
+    {
+        if (c == ' ' || c == '\t' || c == ',')
+        {
+            c = AdvanceChar( cfg );
+            continue;
+        }
+
+        if ( c == '\r' || c == '\n' )
+        {
+            uint c2 = AdvanceChar( cfg );
+            if ( c == '\r' && c2 == '\n' )
+                c = AdvanceChar( cfg );
+            else
+                c = c2;
+
+            if ( !TY_(IsWhite)(c) )
+            {
+                buf[i] = 0;
+                TY_(UngetChar)( c, cfg->cfgIn );
+                TY_(UngetChar)( '\n', cfg->cfgIn );
+                break;
+            }
+        }
+
+        while ( i < sizeof(buf)-2 && c != EndOfStream && !TY_(IsWhite)(c) && c != ',' )
+        {
+            buf[i++] = (tmbchar) c;
+            c = AdvanceChar( cfg );
+        }
+
+        buf[i] = '\0';
+        if (i == 0)          /* Skip empty attribute definition. Possible when */
+            continue;        /* there is a trailing space on the line. */
+
+        /* add attribute to array */
+        TY_(DeclareListItem)( doc, option, buf );
+
+        i = 0;
+        ++nItems;
+    }
+    while ( c != EndOfStream );
+
+    if ( i > 0 )
+        TY_(DeclareListItem)( doc, option, buf );
+
+    /* If there's a callback, compare the old and new values, and fire
+       the callback appropriately. */
+    if ( callback )
+    {
+        TidyOptionValue* val = &(doc->config.value[ option->id ]);
+        Bool fire_callback = OptionChangedValuesDiffer( val->p, oldbuff);
+
+        doc->pConfigChangeCallback = callback;
+
+        if ( oldbuff )
+            TidyFree( doc->allocator, oldbuff );
+
+        if ( fire_callback )
+            PerformOptionChangedCallback( doc, option );
+    }
+
+    return ( nItems > 0 );
+}
+
+
 /* unsigned integers */
 Bool ParseInt( TidyDocImpl* doc, const TidyOptionImpl* entry )
 {
@@ -1106,6 +1421,7 @@ Bool ParseInt( TidyDocImpl* doc, const TidyOptionImpl* entry )
     return digits;
 }
 
+
 /* a string excluding whitespace */
 Bool FUNC_UNUSED ParseName( TidyDocImpl* doc, const TidyOptionImpl* option )
 {
@@ -1127,12 +1443,23 @@ Bool FUNC_UNUSED ParseName( TidyDocImpl* doc, const TidyOptionImpl* option )
     return ( i > 0 );
 }
 
+
 /* #508936 - CSS class naming for -clean option */
 Bool ParseCSS1Selector( TidyDocImpl* doc, const TidyOptionImpl* option )
 {
+    TidyConfigImpl* cfg = &doc->config;
     char buf[256] = {0};
     uint i = 0;
-    uint c = SkipWhite( &doc->config );
+    uint c;
+
+    /* Given an empty string, so signal success. */
+    if ( cfg->c == EndOfStream )
+    {
+        SetOptionValue( doc, option->id, NULL );
+        return yes;
+    }
+
+    c = SkipWhite( cfg );
 
     while ( i < sizeof(buf)-2 && c != EndOfStream && !TY_(IsWhite)(c) )
     {
@@ -1157,32 +1484,20 @@ Bool ParseCSS1Selector( TidyDocImpl* doc, const TidyOptionImpl* option )
     return yes;
 }
 
-/* A general parser for anything using pick lists. This provides the engine to
-   determine the proper option value, and can be used by parsers in addition to
-   ParsePickList that require special handling.
- */
-Bool GetParsePickListValue( TidyDocImpl* doc, const TidyOptionImpl* entry, uint *result )
+
+/* Given a string, return the picklist value from an arbitrary picklist. */
+static Bool GetPickListValue( ctmbstr value, PickListItems* pickList, uint *result )
 {
-    TidyConfigImpl* cfg = &doc->config;
-    tchar c = SkipWhite( cfg );
-    tmbchar work[ 16 ] = {0};
-    tmbstr cp = work, end = work + sizeof(work);
     const PickListItem *item = NULL;
     uint ix = 0;
-    
-    while ( c!=EndOfStream && cp < end && !TY_(IsWhite)(c) && c != '\r' && c != '\n' )
-    {
-        *cp++ = (tmbchar) c;
-        c = AdvanceChar( cfg );
-    }
-    
-    while ( (item = &(*entry->pickList)[ ix ]) && item->label )
+
+    while ( (item = &(*pickList)[ ix ]) && item->label )
     {
         ctmbstr input;
         uint i = 0;
         while ( ( input = &(*item->inputs[i]) ) )
         {
-            if (TY_(tmbstrcasecmp)(work, input) == 0 )
+            if (TY_(tmbstrcasecmp)(value, input) == 0 )
             {
                 *result = ix;
                 return yes;
@@ -1191,12 +1506,38 @@ Bool GetParsePickListValue( TidyDocImpl* doc, const TidyOptionImpl* entry, uint
         }
         ++ix;
     }
-    
-    TY_(ReportBadArgument)( doc, entry->name );
+
     return no;
 }
 
 
+/* A general parser for anything using pick lists. This provides the engine to
+   determine the proper option value, and can be used by parsers in addition to
+   ParsePickList that require special handling.
+ */
+static Bool GetParsePickListValue( TidyDocImpl* doc, const TidyOptionImpl* entry, uint *result )
+{
+    TidyConfigImpl* cfg = &doc->config;
+    tchar c = SkipWhite( cfg );
+    tmbchar work[ 16 ] = {0};
+    tmbstr cp = work, end = work + sizeof(work);
+
+    while ( c!=EndOfStream && cp < end && !TY_(IsWhite)(c) && c != '\r' && c != '\n' )
+    {
+        *cp++ = (tmbchar) c;
+        c = AdvanceChar( cfg );
+    }
+
+    if ( GetPickListValue( work, entry->pickList, result ) != yes )
+    {
+        TY_(ReportBadArgument)( doc, entry->name );
+        return no;
+    }
+
+    return yes;
+}
+
+
 /* A general parser for anything using pick lists that don't require special
    handling.
  */
@@ -1241,116 +1582,8 @@ Bool ParseTabs( TidyDocImpl* doc, const TidyOptionImpl* entry )
 }
 
 
-/* Coordinates Config update and Tags data */
-void TY_(DeclareUserTag)( TidyDocImpl* doc, TidyOptionId optId,
-                            UserTagType tagType, ctmbstr name )
-{
-  ctmbstr prvval = cfgStr( doc, optId );
-  tmbstr catval = NULL;
-  ctmbstr theval = name;
-  if ( prvval )
-  {
-    uint len = TY_(tmbstrlen)(name) + TY_(tmbstrlen)(prvval) + 3;
-    catval = TY_(tmbstrndup)( doc->allocator, prvval, len );
-    TY_(tmbstrcat)( catval, ", " );
-    TY_(tmbstrcat)( catval, name );
-    theval = catval;
-  }
-  TY_(DefineTag)( doc, tagType, name );
-  SetOptionValue( doc, optId, theval );
-  if ( catval )
-    TidyDocFree( doc, catval );
-}
-
-/* a space or comma separated list of tag names */
-Bool ParseTagNames( TidyDocImpl* doc, const TidyOptionImpl* option )
-{
-    TidyConfigImpl* cfg = &doc->config;
-    tmbchar buf[1024];
-    uint i = 0, nTags = 0;
-    uint c = SkipWhite( cfg );
-    UserTagType ttyp = tagtype_null;
-
-    switch ( option->id )
-    {
-        case TidyInlineTags:  ttyp = tagtype_inline;              break;
-        case TidyBlockTags:   ttyp = tagtype_block;               break;
-        case TidyEmptyTags:   ttyp = tagtype_empty;               break;
-        case TidyPreTags:     ttyp = tagtype_pre;                 break;
-        case TidyCustomTags:  ttyp = cfg(doc, TidyUseCustomTags); break;
-        default:
-            TY_(ReportUnknownOption)( doc, option->name );
-            return no;
-    }
-
-    SetOptionValue( doc, option->id, NULL );
-    TY_(FreeDeclaredTags)( doc, ttyp );
-    cfg->defined_tags |= ttyp;
-
-    do
-    {
-        if (c == ' ' || c == '\t' || c == ',')
-        {
-            c = AdvanceChar( cfg );
-            continue;
-        }
-
-        if ( c == '\r' || c == '\n' )
-        {
-            uint c2 = AdvanceChar( cfg );
-            if ( c == '\r' && c2 == '\n' )
-                c = AdvanceChar( cfg );
-            else
-                c = c2;
-
-            if ( !TY_(IsWhite)(c) )
-            {
-                buf[i] = 0;
-                TY_(UngetChar)( c, cfg->cfgIn );
-                TY_(UngetChar)( '\n', cfg->cfgIn );
-                break;
-            }
-        }
-
-        /*
-        if ( c == '\n' )
-        {
-            c = AdvanceChar( cfg );
-            if ( !TY_(IsWhite)(c) )
-            {
-                buf[i] = 0;
-                TY_(UngetChar)( c, cfg->cfgIn );
-                TY_(UngetChar)( '\n', cfg->cfgIn );
-                break;
-            }
-        }
-        */
-
-        while ( i < sizeof(buf)-2 && c != EndOfStream && !TY_(IsWhite)(c) && c != ',' )
-        {
-            buf[i++] = (tmbchar) c;
-            c = AdvanceChar( cfg );
-        }
-
-        buf[i] = '\0';
-        if (i == 0)          /* Skip empty tag definition.  Possible when */
-            continue;        /* there is a trailing space on the line. */
-            
-        /* add tag to dictionary */
-        TY_(DeclareUserTag)( doc, option->id, ttyp, buf );
-        i = 0;
-        ++nTags;
-    }
-    while ( c != EndOfStream );
-
-    if ( i > 0 )
-      TY_(DeclareUserTag)( doc, option->id, ttyp, buf );
-    return ( nTags > 0 );
-}
-
 /* a string including whitespace */
 /* munges whitespace sequences */
-
 Bool ParseString( TidyDocImpl* doc, const TidyOptionImpl* option )
 {
     TidyConfigImpl* cfg = &doc->config;
@@ -1393,6 +1626,7 @@ Bool ParseString( TidyDocImpl* doc, const TidyOptionImpl* option )
     return yes;
 }
 
+
 Bool ParseCharEnc( TidyDocImpl* doc, const TidyOptionImpl* option )
 {
     tmbchar buf[64] = {0};
@@ -1410,12 +1644,6 @@ Bool ParseCharEnc( TidyDocImpl* doc, const TidyOptionImpl* option )
 
     enc = TY_(CharEncodingId)( doc, buf );
 
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    /* limit support to --input-encoding */
-    if (option->id != TidyInCharEncoding && enc > WIN32MLANG)
-        enc = -1;
-#endif
-
     if ( enc < 0 )
     {
         validEncoding = no;
@@ -1433,19 +1661,10 @@ Bool ParseCharEnc( TidyDocImpl* doc, const TidyOptionImpl* option )
 int TY_(CharEncodingId)( TidyDocImpl* ARG_UNUSED(doc), ctmbstr charenc )
 {
     int enc = TY_(GetCharEncodingFromOptName)( charenc );
-
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    if (enc == -1)
-    {
-        uint wincp = TY_(Win32MLangGetCPFromName)(doc->allocator, charenc);
-        if (wincp)
-            enc = wincp;
-    }
-#endif
-
     return enc;
 }
 
+
 ctmbstr TY_(CharEncodingName)( int encoding )
 {
     ctmbstr encodingName = TY_(GetEncodingNameFromTidyId)(encoding);
@@ -1456,6 +1675,7 @@ ctmbstr TY_(CharEncodingName)( int encoding )
     return encodingName;
 }
 
+
 ctmbstr TY_(CharEncodingOptName)( int encoding )
 {
     ctmbstr encodingName = TY_(GetEncodingOptNameFromTidyId)(encoding);
@@ -1466,6 +1686,7 @@ ctmbstr TY_(CharEncodingOptName)( int encoding )
     return encodingName;
 }
 
+
 /*
    doctype: html5 | omit | auto | strict | loose | <fpi>
 
@@ -1478,11 +1699,21 @@ Bool ParseDocType( TidyDocImpl* doc, const TidyOptionImpl* option )
     Bool status = yes;
     uint value;
     TidyConfigImpl* cfg = &doc->config;
-    tchar c = SkipWhite( cfg );
+    tchar c;
+
+    /* Given an empty string, so signal success. */
+    if ( cfg->c == EndOfStream )
+    {
+        SetOptionValue( doc, option->id, NULL );
+        return yes;
+    }
+
+    c = SkipWhite( cfg );
+
 
     /* "-//ACME//DTD HTML 3.14159//EN" or similar */
 
-    if ( c == '"' || c == '\'' )
+    if ( c == '"' || c == '\''|| c == '-' || c == '+' )
     {
         status = ParseString(doc, option);
         if (status)
@@ -1504,6 +1735,7 @@ Bool ParseDocType( TidyDocImpl* doc, const TidyOptionImpl* option )
     return status;
 }
 
+
 /* Use TidyOptionId as iterator.
 ** Send index of 1st option after TidyOptionUnknown as start of list.
 */
@@ -1512,6 +1744,7 @@ TidyIterator TY_(getOptionList)( TidyDocImpl* ARG_UNUSED(doc) )
     return (TidyIterator) (size_t)1;
 }
 
+
 /* Check if this item is last valid option.
 ** If so, zero out iterator.
 */
@@ -1531,6 +1764,7 @@ const TidyOptionImpl*  TY_(getNextOption)( TidyDocImpl* ARG_UNUSED(doc),
     return option;
 }
 
+
 /* Use a 1-based array index as iterator: 0 == end-of-list
 */
 TidyIterator TY_(getOptionPickList)( const TidyOptionImpl* option )
@@ -1541,6 +1775,7 @@ TidyIterator TY_(getOptionPickList)( const TidyOptionImpl* option )
     return (TidyIterator) ix;
 }
 
+
 ctmbstr      TY_(getNextOptionPick)( const TidyOptionImpl* option,
                                      TidyIterator* iter )
 {
@@ -1565,6 +1800,7 @@ ctmbstr      TY_(getNextOptionPick)( const TidyOptionImpl* option,
     return val;
 }
 
+
 static int  WriteOptionString( const TidyOptionImpl* option,
                                ctmbstr sval, StreamOut* out )
 {
@@ -1580,6 +1816,7 @@ static int  WriteOptionString( const TidyOptionImpl* option,
   return 0;
 }
 
+
 static int  WriteOptionInt( const TidyOptionImpl* option, uint ival, StreamOut* out )
 {
   tmbchar sval[ 32 ] = {0};
@@ -1587,12 +1824,14 @@ static int  WriteOptionInt( const TidyOptionImpl* option, uint ival, StreamOut*
   return WriteOptionString( option, sval, out );
 }
 
+
 static int  WriteOptionBool( const TidyOptionImpl* option, Bool bval, StreamOut* out )
 {
   ctmbstr sval = bval ? "yes" : "no";
   return WriteOptionString( option, sval, out );
 }
 
+
 static int  WriteOptionPick( const TidyOptionImpl* option, uint ival, StreamOut* out )
 {
     uint ix = 0;
@@ -1611,6 +1850,7 @@ static int  WriteOptionPick( const TidyOptionImpl* option, uint ival, StreamOut*
     return -1;
 }
 
+
 Bool  TY_(ConfigDiffThanSnapshot)( TidyDocImpl* doc )
 {
   int diff = memcmp( &doc->config.value, &doc->config.snapshot,
@@ -1618,11 +1858,12 @@ Bool  TY_(ConfigDiffThanSnapshot)( TidyDocImpl* doc )
   return ( diff != 0 );
 }
 
+
 Bool  TY_(ConfigDiffThanDefault)( TidyDocImpl* doc )
 {
   Bool diff = no;
   const TidyOptionImpl* option = option_defs + 1;
-  const TidyOptionValue* val = doc->config.value;
+  const TidyOptionValue* val = doc->config.value + 1;
   for ( /**/; !diff && option && option->name; ++option, ++val )
   {
       diff = !OptionValueEqDefault( option, val );
@@ -1688,6 +1929,7 @@ static int  SaveConfigToStream( TidyDocImpl* doc, StreamOut* out )
     return rc;
 }
 
+
 int  TY_(SaveConfigFile)( TidyDocImpl* doc, ctmbstr cfgfil )
 {
     int status = -1;
@@ -1705,6 +1947,7 @@ int  TY_(SaveConfigFile)( TidyDocImpl* doc, ctmbstr cfgfil )
     return status;
 }
 
+
 int  TY_(SaveConfigSink)( TidyDocImpl* doc, TidyOutputSink* sink )
 {
     uint outenc = cfg( doc, TidyOutCharEncoding );
@@ -1715,11 +1958,3 @@ int  TY_(SaveConfigSink)( TidyDocImpl* doc, TidyOutputSink* sink )
     return status;
 }
 
-/*
- * local variables:
- * mode: c
- * indent-tabs-mode: nil
- * c-basic-offset: 4
- * eval: (c-set-offset 'substatement-open 0)
- * end:
- */
diff --git a/HTMLTidy/vendor/tidy-html5/src/config.h b/HTMLTidy/vendor/tidy-html5/src/config.h
index dae71e0e..41e1b4f6 100644
--- a/HTMLTidy/vendor/tidy-html5/src/config.h
+++ b/HTMLTidy/vendor/tidy-html5/src/config.h
@@ -36,14 +36,31 @@
 #include "tidy.h"
 #include "streamio.h"
 
-/** PickLists may have up to 16 items. For some reason,
- ** this limit has always been hard-coded into Tidy.
+/** @addtogroup internal_api */
+/** @{ */
+
+
+/***************************************************************************//**
+ ** @defgroup configuration_options Configuration Options
+ **
+ ** This module organizes all of Tidy's configuration options, including
+ ** picklist management, option setting and retrieval, option file utilities,
+ ** and so on.
+ **
+ ** @{
+ ******************************************************************************/
+
+
+/** Determines the maximum number of items in an option's picklist. PickLists
+ ** may have up to 16 items. For some reason, this limit has been hard-coded
+ ** into Tidy for some time. Feel free to increase this as needed.
  */
 #define TIDY_PL_SIZE 16
 
-/** Structs of this type contain information needed in order to present pick lists,
- ** relate pick list entries to public enum values, and parse strings that are
- ** accepted in order to assign the value.
+
+/** Structs of this type contain information needed in order to present
+ ** picklists, relate picklist entries to public enum values, and parse
+ ** strings that are accepted in order to assign the value.
  */
 typedef struct PickListItem {
     ctmbstr label;      /**< PickList label for this item. */
@@ -51,6 +68,7 @@ typedef struct PickListItem {
     ctmbstr inputs[10]; /**< String values that can select this value. */
 } PickListItem;
 
+
 /** An array of PickListItems, fixed in size for in-code declarations. 
  ** Arrays must be populated in 0 to 10 order, as the option value is assigned
  ** based on this index and *not* on the structures' value field. It remains
@@ -60,104 +78,313 @@ typedef struct PickListItem {
 typedef const PickListItem PickListItems[TIDY_PL_SIZE];
 
 
-struct _tidy_option;
+struct _tidy_option; /* forward */
+
+/** The TidyOptionImpl type implements the `_tidy_option` structure.
+ */
 typedef struct _tidy_option TidyOptionImpl;
 
+
+/** This typedef describes a function that is used for parsing the input
+ ** given for a particular Tidy option.
+ */
 typedef Bool (ParseProperty)( TidyDocImpl* doc, const TidyOptionImpl* opt );
 
+
+/** This structure defines the internal representation of a Tidy option.
+ */
 struct _tidy_option
 {
-    TidyOptionId        id;
-    TidyConfigCategory  category;        /* put 'em in groups */
-    ctmbstr             name;            /* property name */
-    TidyOptionType      type;            /* string, int or bool */
-    ulong               dflt;            /* default for TidyInteger and TidyBoolean */
-    ParseProperty*      parser;          /* parsing method, read-only if NULL */
-    PickListItems*      pickList;        /* new style pick list */
-    ctmbstr             pdflt;           /* default for TidyString */
+    TidyOptionId        id;              /**< The unique identifier for this option. */
+    TidyConfigCategory  category;        /**< The category of the option. */
+    ctmbstr             name;            /**< The name of the option. */
+    TidyOptionType      type;            /**< The date type for the option. */
+    ulong               dflt;            /**< Default value for TidyInteger and TidyBoolean */
+    ParseProperty*      parser;          /**< Function to parse input; read-only if NULL. */
+    PickListItems*      pickList;        /**< The picklist of possible values for this option. */
+    ctmbstr             pdflt;           /**< Default value for TidyString. */
 };
 
+
+/** Stored option values can be one of two internal types.
+ */
 typedef union
 {
-  ulong v;  /* Value for TidyInteger and TidyBoolean */
-  char *p;  /* Value for TidyString */
+  ulong v;  /**< Value for TidyInteger and TidyBoolean */
+  char *p;  /**< Value for TidyString */
 } TidyOptionValue;
 
+
+/** This type is used to define a structure for keeping track of the values
+ ** for each option.
+ */
 typedef struct _tidy_config
 {
-    TidyOptionValue value[ N_TIDY_OPTIONS + 1 ];     /* current config values */
-    TidyOptionValue snapshot[ N_TIDY_OPTIONS + 1 ];  /* Snapshot of values to be restored later */
-
-    /* track what tags user has defined to eliminate unnecessary searches */
-    uint  defined_tags;
-
-    uint c;           /* current char in input stream */
-    StreamIn* cfgIn;  /* current input source */
-
+    TidyOptionValue value[ N_TIDY_OPTIONS + 1 ];     /**< Current config values. */
+    TidyOptionValue snapshot[ N_TIDY_OPTIONS + 1 ];  /**< Snapshot of values to be restored later. */
+    uint  defined_tags;                              /**< Tracks user-defined tags. */
+    uint c;                                          /**< Current char in input stream for reading options. */
+    StreamIn* cfgIn;                                 /**< Current input source for reading options.*/
 } TidyConfigImpl;
 
 
-/* Used to build a table of documentation cross-references. */
+/** Used to build a table of documentation cross-references.
+ */
 typedef struct {
   TidyOptionId opt;          /**< Identifier. */
   TidyOptionId const *links; /**< Cross references. Last element must be 'TidyUnknownOption'. */
 } TidyOptionDoc;
 
 
+/** Given an option name, return an instance of an option.
+ ** @param optnam The option name to retrieve.
+ ** @returns The instance of the requested option.
+ */
 const TidyOptionImpl* TY_(lookupOption)( ctmbstr optnam );
+
+
+/** Given an option ID, return an instance of an option.
+ ** @param optId The option ID to retrieve.
+ ** @returns The instance of the requested option.
+ */
 const TidyOptionImpl* TY_(getOption)( TidyOptionId optId );
 
+/** Given an option ID, indicates whether or not the option is a list.
+ ** @param optId The option ID to check.
+ ** @returns Returns yes if the option value is a list.
+ */
+const Bool TY_(getOptionIsList)( TidyOptionId optId );
+
+/** Initiates an iterator to cycle through all of the available options.
+ ** @param doc The Tidy document to get options.
+ ** @returns An iterator token to be used with TY_(getNextOption)().
+ */
 TidyIterator TY_(getOptionList)( TidyDocImpl* doc );
+
+
+/** Gets the next option provided by the iterator.
+ ** @param doc The Tidy document to get options.
+ ** @param iter The iterator token initialized by TY_(getOptionList)().
+ ** @returns The instance of the next option.
+ */
 const TidyOptionImpl* TY_(getNextOption)( TidyDocImpl* doc, TidyIterator* iter );
 
+
+/** Initiates an iterator to cycle through all of the available picklist
+ ** possibilities.
+ ** @param option An instance of an option for which to iterate a picklist.
+ ** @returns An interator token to be used with TY_(getNextOptionPick)().
+ */
 TidyIterator TY_(getOptionPickList)( const TidyOptionImpl* option );
+
+
+/** Gets the next picklist possibility provided by the iterator.
+ ** @param option The instance of the option for which to iterate a picklist.
+ ** @param iter The iterator token initialized by TY_(getOptionPickList)().
+ ** @returns The next picklist entry.
+ */
 ctmbstr TY_(getNextOptionPick)( const TidyOptionImpl* option, TidyIterator* iter );
 
+
 #if SUPPORT_CONSOLE_APP
+/** Returns the cross-reference information structure for optID, which is
+ ** used for generating documentation.
+ ** @param optId The option ID to get cross-reference information for.
+ ** @returns Cross reference information.
+ */
 const TidyOptionDoc* TY_(OptGetDocDesc)( TidyOptionId optId );
 #endif /* SUPPORT_CONSOLE_APP */
 
+
+/** Initialize the configuration for the given Tidy document.
+ ** @param doc The Tidy document.
+ */
 void TY_(InitConfig)( TidyDocImpl* doc );
+
+
+/** Frees the configuration memory for the given Tidy document.
+ ** @param doc The Tidy document.
+ */
 void TY_(FreeConfig)( TidyDocImpl* doc );
 
-/* Bool SetOptionValue( TidyDocImpl* doc, TidyOptionId optId, ctmbstr val ); */
+
+/** Gets the picklist label for a given value.
+ ** @param optId the option id having a picklist to check.
+ ** @param pick the picklist item to retrieve.
+ ** @returns The label for the pick.
+ */
+ctmbstr TY_(GetPickListLabelForPick)( TidyOptionId optId, uint pick );
+
+
+/** Sets the integer value for the given option Id.
+ ** @param doc The Tidy document.
+ ** @param optId The option ID to set.
+ ** @param val The value to set.
+ ** @returns Success or failure.
+ */
 Bool TY_(SetOptionInt)( TidyDocImpl* doc, TidyOptionId optId, ulong val );
+
+
+/** Sets the bool value for the given option Id.
+ ** @param doc The Tidy document.
+ ** @param optId The option ID to set.
+ ** @param val The value to set.
+ ** @returns Success or failure.
+ */
 Bool TY_(SetOptionBool)( TidyDocImpl* doc, TidyOptionId optId, Bool val );
 
+
+/** Resets the given option to its default value.
+ ** @param doc The Tidy document.
+ ** @param optId The option ID to set.
+ ** @returns Success or failure.
+ */
 Bool TY_(ResetOptionToDefault)( TidyDocImpl* doc, TidyOptionId optId );
+
+
+/** Resets all options in the document to their default values.
+ ** @param doc The Tidy document.
+ */
 void TY_(ResetConfigToDefault)( TidyDocImpl* doc );
+
+
+/** Stores a snapshot of all of the configuration values that can be
+ ** restored later.
+ ** @param doc The Tidy document.
+ */
 void TY_(TakeConfigSnapshot)( TidyDocImpl* doc );
+
+
+/** Restores all of the configuration values to their snapshotted values.
+ ** @param doc The Tidy document.
+ */
 void TY_(ResetConfigToSnapshot)( TidyDocImpl* doc );
 
+
+/** Copies the configuration from one document to another.
+ ** @param docTo The destination Tidy document.
+ ** @param docFrom The source Tidy document.
+ */
 void TY_(CopyConfig)( TidyDocImpl* docTo, TidyDocImpl* docFrom );
 
+
+/** Attempts to parse the given config file into the document.
+ ** @param doc The Tidy document.
+ ** @param cfgfil The file to load.
+ ** @returns a file system error code.
+ */
 int  TY_(ParseConfigFile)( TidyDocImpl* doc, ctmbstr cfgfil );
+
+
+/** Attempts to parse the given config file into the document, using
+ ** the provided encoding.
+ ** @param doc The Tidy document.
+ ** @param cfgfil The file to load.
+ ** @param charenc The name of the encoding to use for reading the file.
+ ** @returns a file system error code.
+ */
 int  TY_(ParseConfigFileEnc)( TidyDocImpl* doc,
                               ctmbstr cfgfil, ctmbstr charenc );
 
+
+/** Saves the current configuration for options not having default values
+ ** into the specified file.
+ ** @param doc The Tidy document.
+ ** @param cfgfil The file to save.
+ ** @returns a file system error code.
+ */
 int  TY_(SaveConfigFile)( TidyDocImpl* doc, ctmbstr cfgfil );
+
+
+/** Writes the current configuration for options not having default values
+ ** into the specified sink.
+ ** @param doc The Tidy document.
+ ** @param sink The sink to save into.
+ ** @returns a file system error code.
+ */
 int  TY_(SaveConfigSink)( TidyDocImpl* doc, TidyOutputSink* sink );
 
-/* returns false if unknown option, missing parameter, or
-   option doesn't use parameter
-*/
+
+/** Attempts to parse the provided value for the given option name. Returns
+ ** false if unknown option, missing parameter, or the option doesn't
+ ** use the parameter.
+ ** @param doc The Tidy document.
+ ** @param optnam The name of the option to be set.
+ ** @param optVal The string value to attempt to parse.
+ ** @returns Success or failure.
+ */
 Bool  TY_(ParseConfigOption)( TidyDocImpl* doc, ctmbstr optnam, ctmbstr optVal );
+
+
+/** Attempts to parse the provided value for the given option id. Returns
+ ** false if unknown option, missing parameter, or the option doesn't
+ ** use the parameter.
+ ** @param doc The Tidy document.
+ ** @param optId The ID of the option to be set.
+ ** @param optVal The string value to attempt to parse.
+ ** @returns Success or failure.
+ */
 Bool  TY_(ParseConfigValue)( TidyDocImpl* doc, TidyOptionId optId, ctmbstr optVal );
 
-/* ensure that char encodings are self consistent */
+
+/** Ensure that char encodings are self consistent.
+ ** @param doc The Tidy document to adjust.
+ ** @param encoding The encoding being applied.
+ ** @returns A bool indicating success or failure.
+ */
 Bool  TY_(AdjustCharEncoding)( TidyDocImpl* doc, int encoding );
 
+
+/** Ensure that the configuration options are self consistent.
+ ** @param doc The Tidy document to adjust.
+ */
+void TY_(AdjustConfig)( TidyDocImpl* doc );
+
+
+/** Indicates whether or not the current configuration is completely default.
+ ** @param doc The Tidy document.
+ ** @returns The result.
+ */
 Bool  TY_(ConfigDiffThanDefault)( TidyDocImpl* doc );
+
+
+/** Indicates whether or not the current configuration is different from the
+ ** stored snapshot.
+ ** @param doc The Tidy document.
+ ** @returns The result.
+ */
 Bool  TY_(ConfigDiffThanSnapshot)( TidyDocImpl* doc );
 
+
+/** Returns the character encoding ID for the given character encoding
+ ** string.
+ ** @param doc The Tidy document.
+ ** @param charenc The name of the character encoding.
+ ** @returns The Id of the character encoding.
+ */
 int TY_(CharEncodingId)( TidyDocImpl* doc, ctmbstr charenc );
+
+
+/** Returns the full name of the encoding for the given ID.
+ ** @param encoding The Id of the encoding.
+ ** @returns The name of the character encoding.
+ */
 ctmbstr TY_(CharEncodingName)( int encoding );
+
+
+/** Returns the Tidy command line option name of the encoding for the given ID.
+ ** @param encoding The Id of the encoding.
+ ** @returns The Tidy command line option representing the encoding.
+ */
 ctmbstr TY_(CharEncodingOptName)( int encoding );
 
-/* Coordinates Config update and Tags data */
-void TY_(DeclareUserTag)( TidyDocImpl* doc, TidyOptionId optId,
-                         uint tagType, ctmbstr name );
 
+/** Coordinates Config update and list data.
+ ** @param doc The Tidy document.
+ ** @param opt The option the list item is intended for.
+ ** @param name The name of the new list item.
+ */
+void TY_(DeclareListItem)( TidyDocImpl* doc, const TidyOptionImpl* opt, ctmbstr name );
 
 #ifdef _DEBUG
 
@@ -175,11 +402,24 @@ ctmbstr TY_(_cfgGetString)( TidyDocImpl* doc, TidyOptionId optId );
 #else
 
 /* Release build macros for speed */
+
+/** Access the raw, non-string uint value of the given option ID. */
 #define cfg(doc, id)            ((doc)->config.value[ (id) ].v)
+
+/** Access the Bool value of the given option ID. */
 #define cfgBool(doc, id)        ((Bool) cfg(doc, id))
+
+/** Access the TidyTriState value of the given option ID. */
 #define cfgAutoBool(doc, id)    ((TidyTriState) cfg(doc, id))
+
+/** Access the string value of the given option ID. */
 #define cfgStr(doc, id)         ((ctmbstr) (doc)->config.value[ (id) ].p)
 
 #endif /* _DEBUG */
 
+
+/** @} configuration_options group */
+/** @} internal_api addtogroup */
+
+
 #endif /* __CONFIG_H__ */
diff --git a/HTMLTidy/vendor/tidy-html5/src/entities.c b/HTMLTidy/vendor/tidy-html5/src/entities.c
index 7dd55ebb..c1b4453d 100644
--- a/HTMLTidy/vendor/tidy-html5/src/entities.c
+++ b/HTMLTidy/vendor/tidy-html5/src/entities.c
@@ -24,330 +24,2092 @@ struct _entity
     uint    code;
 };
 
+#ifndef VERS_CHECK
+#define VERS_CHECK VERS_HTML5
+#endif
+
+/*
+** Issue #643 - list increased to
+** 2032 known entities.
+** Note also stuct /not/ padded to 
+** keep source weight down, 79K vs 149K,
+** and is strictly alphabetic to optimize 
+** the searching.
+** All new entities have been given VERS_CHECK
+** This should be replaced if versioning can
+** successfully be established.
+*/
 
 static const entity entities[] =
 {
-    /*
-    ** Markup pre-defined character entities
-    */
-    { "quot",    VERS_ALL|VERS_XML,    34 },
-    { "amp",     VERS_ALL|VERS_XML,    38 },
-    { "apos",    VERS_FROM40|VERS_XML, 39 },
-    { "lt",      VERS_ALL|VERS_XML,    60 },
-    { "gt",      VERS_ALL|VERS_XML,    62 },
-
-    /*
-    ** Latin-1 character entities
-    */
-    { "nbsp",     VERS_ALL,      160 },
-    { "iexcl",    VERS_ALL,      161 },
-    { "cent",     VERS_ALL,      162 },
-    { "pound",    VERS_ALL,      163 },
-    { "curren",   VERS_ALL,      164 },
-    { "yen",      VERS_ALL,      165 },
-    { "brvbar",   VERS_ALL,      166 },
-    { "sect",     VERS_ALL,      167 },
-    { "uml",      VERS_ALL,      168 },
-    { "copy",     VERS_ALL,      169 },
-    { "ordf",     VERS_ALL,      170 },
-    { "laquo",    VERS_ALL,      171 },
-    { "not",      VERS_ALL,      172 },
-    { "shy",      VERS_ALL,      173 },
-    { "reg",      VERS_ALL,      174 },
-    { "macr",     VERS_ALL,      175 },
-    { "deg",      VERS_ALL,      176 },
-    { "plusmn",   VERS_ALL,      177 },
-    { "sup2",     VERS_ALL,      178 },
-    { "sup3",     VERS_ALL,      179 },
-    { "acute",    VERS_ALL,      180 },
-    { "micro",    VERS_ALL,      181 },
-    { "para",     VERS_ALL,      182 },
-    { "middot",   VERS_ALL,      183 },
-    { "cedil",    VERS_ALL,      184 },
-    { "sup1",     VERS_ALL,      185 },
-    { "ordm",     VERS_ALL,      186 },
-    { "raquo",    VERS_ALL,      187 },
-    { "frac14",   VERS_ALL,      188 },
-    { "frac12",   VERS_ALL,      189 },
-    { "frac34",   VERS_ALL,      190 },
-    { "iquest",   VERS_ALL,      191 },
-    { "Agrave",   VERS_ALL,      192 },
-    { "Aacute",   VERS_ALL,      193 },
-    { "Acirc",    VERS_ALL,      194 },
-    { "Atilde",   VERS_ALL,      195 },
-    { "Auml",     VERS_ALL,      196 },
-    { "Aring",    VERS_ALL,      197 },
-    { "AElig",    VERS_ALL,      198 },
-    { "Ccedil",   VERS_ALL,      199 },
-    { "Egrave",   VERS_ALL,      200 },
-    { "Eacute",   VERS_ALL,      201 },
-    { "Ecirc",    VERS_ALL,      202 },
-    { "Euml",     VERS_ALL,      203 },
-    { "Igrave",   VERS_ALL,      204 },
-    { "Iacute",   VERS_ALL,      205 },
-    { "Icirc",    VERS_ALL,      206 },
-    { "Iuml",     VERS_ALL,      207 },
-    { "ETH",      VERS_ALL,      208 },
-    { "Ntilde",   VERS_ALL,      209 },
-    { "Ograve",   VERS_ALL,      210 },
-    { "Oacute",   VERS_ALL,      211 },
-    { "Ocirc",    VERS_ALL,      212 },
-    { "Otilde",   VERS_ALL,      213 },
-    { "Ouml",     VERS_ALL,      214 },
-    { "times",    VERS_ALL,      215 },
-    { "Oslash",   VERS_ALL,      216 },
-    { "Ugrave",   VERS_ALL,      217 },
-    { "Uacute",   VERS_ALL,      218 },
-    { "Ucirc",    VERS_ALL,      219 },
-    { "Uuml",     VERS_ALL,      220 },
-    { "Yacute",   VERS_ALL,      221 },
-    { "THORN",    VERS_ALL,      222 },
-    { "szlig",    VERS_ALL,      223 },
-    { "agrave",   VERS_ALL,      224 },
-    { "aacute",   VERS_ALL,      225 },
-    { "acirc",    VERS_ALL,      226 },
-    { "atilde",   VERS_ALL,      227 },
-    { "auml",     VERS_ALL,      228 },
-    { "aring",    VERS_ALL,      229 },
-    { "aelig",    VERS_ALL,      230 },
-    { "ccedil",   VERS_ALL,      231 },
-    { "egrave",   VERS_ALL,      232 },
-    { "eacute",   VERS_ALL,      233 },
-    { "ecirc",    VERS_ALL,      234 },
-    { "euml",     VERS_ALL,      235 },
-    { "igrave",   VERS_ALL,      236 },
-    { "iacute",   VERS_ALL,      237 },
-    { "icirc",    VERS_ALL,      238 },
-    { "iuml",     VERS_ALL,      239 },
-    { "eth",      VERS_ALL,      240 },
-    { "ntilde",   VERS_ALL,      241 },
-    { "ograve",   VERS_ALL,      242 },
-    { "oacute",   VERS_ALL,      243 },
-    { "ocirc",    VERS_ALL,      244 },
-    { "otilde",   VERS_ALL,      245 },
-    { "ouml",     VERS_ALL,      246 },
-    { "divide",   VERS_ALL,      247 },
-    { "oslash",   VERS_ALL,      248 },
-    { "ugrave",   VERS_ALL,      249 },
-    { "uacute",   VERS_ALL,      250 },
-    { "ucirc",    VERS_ALL,      251 },
-    { "uuml",     VERS_ALL,      252 },
-    { "yacute",   VERS_ALL,      253 },
-    { "thorn",    VERS_ALL,      254 },
-    { "yuml",     VERS_ALL,      255 },
-
-    /*
-    ** Extended Entities defined in HTML 4: Symbols 
-    */
-    { "fnof",     VERS_FROM40,   402 },
-    { "Alpha",    VERS_FROM40,   913 },
-    { "Beta",     VERS_FROM40,   914 },
-    { "Gamma",    VERS_FROM40,   915 },
-    { "Delta",    VERS_FROM40,   916 },
-    { "Epsilon",  VERS_FROM40,   917 },
-    { "Zeta",     VERS_FROM40,   918 },
-    { "Eta",      VERS_FROM40,   919 },
-    { "Theta",    VERS_FROM40,   920 },
-    { "Iota",     VERS_FROM40,   921 },
-    { "Kappa",    VERS_FROM40,   922 },
-    { "Lambda",   VERS_FROM40,   923 },
-    { "Mu",       VERS_FROM40,   924 },
-    { "Nu",       VERS_FROM40,   925 },
-    { "Xi",       VERS_FROM40,   926 },
-    { "Omicron",  VERS_FROM40,   927 },
-    { "Pi",       VERS_FROM40,   928 },
-    { "Rho",      VERS_FROM40,   929 },
-    { "Sigma",    VERS_FROM40,   931 },
-    { "Tau",      VERS_FROM40,   932 },
-    { "Upsilon",  VERS_FROM40,   933 },
-    { "Phi",      VERS_FROM40,   934 },
-    { "Chi",      VERS_FROM40,   935 },
-    { "Psi",      VERS_FROM40,   936 },
-    { "Omega",    VERS_FROM40,   937 },
-    { "alpha",    VERS_FROM40,   945 },
-    { "beta",     VERS_FROM40,   946 },
-    { "gamma",    VERS_FROM40,   947 },
-    { "delta",    VERS_FROM40,   948 },
-    { "epsilon",  VERS_FROM40,   949 },
-    { "zeta",     VERS_FROM40,   950 },
-    { "eta",      VERS_FROM40,   951 },
-    { "theta",    VERS_FROM40,   952 },
-    { "iota",     VERS_FROM40,   953 },
-    { "kappa",    VERS_FROM40,   954 },
-    { "lambda",   VERS_FROM40,   955 },
-    { "mu",       VERS_FROM40,   956 },
-    { "nu",       VERS_FROM40,   957 },
-    { "xi",       VERS_FROM40,   958 },
-    { "omicron",  VERS_FROM40,   959 },
-    { "pi",       VERS_FROM40,   960 },
-    { "rho",      VERS_FROM40,   961 },
-    { "sigmaf",   VERS_FROM40,   962 },
-    { "sigma",    VERS_FROM40,   963 },
-    { "tau",      VERS_FROM40,   964 },
-    { "upsilon",  VERS_FROM40,   965 },
-    { "phi",      VERS_FROM40,   966 },
-    { "chi",      VERS_FROM40,   967 },
-    { "psi",      VERS_FROM40,   968 },
-    { "omega",    VERS_FROM40,   969 },
-    { "thetasym", VERS_FROM40,   977 },
-    { "upsih",    VERS_FROM40,   978 },
-    { "piv",      VERS_FROM40,   982 },
-    { "bull",     VERS_FROM40,  8226 },
-    { "hellip",   VERS_FROM40,  8230 },
-    { "prime",    VERS_FROM40,  8242 },
-    { "Prime",    VERS_FROM40,  8243 },
-    { "oline",    VERS_FROM40,  8254 },
-    { "frasl",    VERS_FROM40,  8260 },
-    { "weierp",   VERS_FROM40,  8472 },
-    { "image",    VERS_FROM40,  8465 },
-    { "real",     VERS_FROM40,  8476 },
-    { "trade",    VERS_FROM40,  8482 },
-    { "alefsym",  VERS_FROM40,  8501 },
-    { "larr",     VERS_FROM40,  8592 },
-    { "uarr",     VERS_FROM40,  8593 },
-    { "rarr",     VERS_FROM40,  8594 },
-    { "darr",     VERS_FROM40,  8595 },
-    { "harr",     VERS_FROM40,  8596 },
-    { "crarr",    VERS_FROM40,  8629 },
-    { "lArr",     VERS_FROM40,  8656 },
-    { "uArr",     VERS_FROM40,  8657 },
-    { "rArr",     VERS_FROM40,  8658 },
-    { "dArr",     VERS_FROM40,  8659 },
-    { "hArr",     VERS_FROM40,  8660 },
-    { "forall",   VERS_FROM40,  8704 },
-    { "part",     VERS_FROM40,  8706 },
-    { "exist",    VERS_FROM40,  8707 },
-    { "empty",    VERS_FROM40,  8709 },
-    { "nabla",    VERS_FROM40,  8711 },
-    { "isin",     VERS_FROM40,  8712 },
-    { "notin",    VERS_FROM40,  8713 },
-    { "ni",       VERS_FROM40,  8715 },
-    { "prod",     VERS_FROM40,  8719 },
-    { "sum",      VERS_FROM40,  8721 },
-    { "minus",    VERS_FROM40,  8722 },
-    { "lowast",   VERS_FROM40,  8727 },
-    { "radic",    VERS_FROM40,  8730 },
-    { "prop",     VERS_FROM40,  8733 },
-    { "infin",    VERS_FROM40,  8734 },
-    { "ang",      VERS_FROM40,  8736 },
-    { "and",      VERS_FROM40,  8743 },
-    { "or",       VERS_FROM40,  8744 },
-    { "cap",      VERS_FROM40,  8745 },
-    { "cup",      VERS_FROM40,  8746 },
-    { "int",      VERS_FROM40,  8747 },
-    { "there4",   VERS_FROM40,  8756 },
-    { "sim",      VERS_FROM40,  8764 },
-    { "cong",     VERS_FROM40,  8773 },
-    { "asymp",    VERS_FROM40,  8776 },
-    { "ne",       VERS_FROM40,  8800 },
-    { "equiv",    VERS_FROM40,  8801 },
-    { "le",       VERS_FROM40,  8804 },
-    { "ge",       VERS_FROM40,  8805 },
-    { "sub",      VERS_FROM40,  8834 },
-    { "sup",      VERS_FROM40,  8835 },
-    { "nsub",     VERS_FROM40,  8836 },
-    { "sube",     VERS_FROM40,  8838 },
-    { "supe",     VERS_FROM40,  8839 },
-    { "oplus",    VERS_FROM40,  8853 },
-    { "otimes",   VERS_FROM40,  8855 },
-    { "perp",     VERS_FROM40,  8869 },
-    { "sdot",     VERS_FROM40,  8901 },
-    { "lceil",    VERS_FROM40,  8968 },
-    { "rceil",    VERS_FROM40,  8969 },
-    { "lfloor",   VERS_FROM40,  8970 },
-    { "rfloor",   VERS_FROM40,  8971 },
-    { "lang",     VERS_FROM40, 10216 },
-    { "rang",     VERS_FROM40, 10217 },
-    { "loz",      VERS_FROM40,  9674 },
-    { "spades",   VERS_FROM40,  9824 },
-    { "clubs",    VERS_FROM40,  9827 },
-    { "hearts",   VERS_FROM40,  9829 },
-    { "diams",    VERS_FROM40,  9830 },
-
-    /*
-    ** Extended Entities defined in HTML 4: Special (less Markup at top)
-    */
-    { "OElig",    VERS_FROM40,   338 },
-    { "oelig",    VERS_FROM40,   339 },
-    { "Scaron",   VERS_FROM40,   352 },
-    { "scaron",   VERS_FROM40,   353 },
-    { "Yuml",     VERS_FROM40,   376 },
-    { "circ",     VERS_FROM40,   710 },
-    { "tilde",    VERS_FROM40,   732 },
-    { "ensp",     VERS_FROM40,  8194 },
-    { "emsp",     VERS_FROM40,  8195 },
-    { "thinsp",   VERS_FROM40,  8201 },
-    { "zwnj",     VERS_FROM40,  8204 },
-    { "zwj",      VERS_FROM40,  8205 },
-    { "lrm",      VERS_FROM40,  8206 },
-    { "rlm",      VERS_FROM40,  8207 },
-    { "ndash",    VERS_FROM40,  8211 },
-    { "mdash",    VERS_FROM40,  8212 },
-    { "lsquo",    VERS_FROM40,  8216 },
-    { "rsquo",    VERS_FROM40,  8217 },
-    { "sbquo",    VERS_FROM40,  8218 },
-    { "ldquo",    VERS_FROM40,  8220 },
-    { "rdquo",    VERS_FROM40,  8221 },
-    { "bdquo",    VERS_FROM40,  8222 },
-    { "dagger",   VERS_FROM40,  8224 },
-    { "Dagger",   VERS_FROM40,  8225 },
-    { "permil",   VERS_FROM40,  8240 },
-    { "lsaquo",   VERS_FROM40,  8249 },
-    { "rsaquo",   VERS_FROM40,  8250 },
-    { "euro",     VERS_FROM40,  8364 },
-    { NULL,       VERS_UNKNOWN, 0 }
+    { "AElig", VERS_ALL, 198 },
+    { "AMP", VERS_CHECK, 38 },
+    { "Aacute", VERS_ALL, 193 },
+    { "Abreve", VERS_CHECK, 258 },
+    { "Acirc", VERS_ALL, 194 },
+    { "Acy", VERS_CHECK, 1040 },
+    { "Afr", VERS_CHECK, 120068 },
+    { "Agrave", VERS_ALL, 192 },
+    { "Alpha", VERS_FROM40, 913 },
+    { "Amacr", VERS_CHECK, 256 },
+    { "And", VERS_CHECK, 10835 },
+    { "Aogon", VERS_CHECK, 260 },
+    { "Aopf", VERS_CHECK, 120120 },
+    { "ApplyFunction", VERS_CHECK, 8289 },
+    { "Aring", VERS_ALL, 197 },
+    { "Ascr", VERS_CHECK, 119964 },
+    { "Assign", VERS_CHECK, 8788 },
+    { "Atilde", VERS_ALL, 195 },
+    { "Auml", VERS_ALL, 196 },
+    { "Backslash", VERS_CHECK, 8726 },
+    { "Barv", VERS_CHECK, 10983 },
+    { "Barwed", VERS_CHECK, 8966 },
+    { "Bcy", VERS_CHECK, 1041 },
+    { "Because", VERS_CHECK, 8757 },
+    { "Bernoullis", VERS_CHECK, 8492 },
+    { "Beta", VERS_FROM40, 914 },
+    { "Bfr", VERS_CHECK, 120069 },
+    { "Bopf", VERS_CHECK, 120121 },
+    { "Breve", VERS_CHECK, 728 },
+    { "Bscr", VERS_CHECK, 8492 },
+    { "Bumpeq", VERS_CHECK, 8782 },
+    { "CHcy", VERS_CHECK, 1063 },
+    { "COPY", VERS_CHECK, 169 },
+    { "Cacute", VERS_CHECK, 262 },
+    { "Cap", VERS_CHECK, 8914 },
+    { "CapitalDifferentialD", VERS_CHECK, 8517 },
+    { "Cayleys", VERS_CHECK, 8493 },
+    { "Ccaron", VERS_CHECK, 268 },
+    { "Ccedil", VERS_ALL, 199 },
+    { "Ccirc", VERS_CHECK, 264 },
+    { "Cconint", VERS_CHECK, 8752 },
+    { "Cdot", VERS_CHECK, 266 },
+    { "Cedilla", VERS_CHECK, 184 },
+    { "CenterDot", VERS_CHECK, 183 },
+    { "Cfr", VERS_CHECK, 8493 },
+    { "Chi", VERS_FROM40, 935 },
+    { "CircleDot", VERS_CHECK, 8857 },
+    { "CircleMinus", VERS_CHECK, 8854 },
+    { "CirclePlus", VERS_CHECK, 8853 },
+    { "CircleTimes", VERS_CHECK, 8855 },
+    { "ClockwiseContourIntegral", VERS_CHECK, 8754 },
+    { "CloseCurlyDoubleQuote", VERS_CHECK, 8221 },
+    { "CloseCurlyQuote", VERS_CHECK, 8217 },
+    { "Colon", VERS_CHECK, 8759 },
+    { "Colone", VERS_CHECK, 10868 },
+    { "Congruent", VERS_CHECK, 8801 },
+    { "Conint", VERS_CHECK, 8751 },
+    { "ContourIntegral", VERS_CHECK, 8750 },
+    { "Copf", VERS_CHECK, 8450 },
+    { "Coproduct", VERS_CHECK, 8720 },
+    { "CounterClockwiseContourIntegral", VERS_CHECK, 8755 },
+    { "Cross", VERS_CHECK, 10799 },
+    { "Cscr", VERS_CHECK, 119966 },
+    { "Cup", VERS_CHECK, 8915 },
+    { "CupCap", VERS_CHECK, 8781 },
+    { "DD", VERS_CHECK, 8517 },
+    { "DDotrahd", VERS_CHECK, 10513 },
+    { "DJcy", VERS_CHECK, 1026 },
+    { "DScy", VERS_CHECK, 1029 },
+    { "DZcy", VERS_CHECK, 1039 },
+    { "Dagger", VERS_FROM40, 8225 },
+    { "Darr", VERS_CHECK, 8609 },
+    { "Dashv", VERS_CHECK, 10980 },
+    { "Dcaron", VERS_CHECK, 270 },
+    { "Dcy", VERS_CHECK, 1044 },
+    { "Del", VERS_CHECK, 8711 },
+    { "Delta", VERS_FROM40, 916 },
+    { "Dfr", VERS_CHECK, 120071 },
+    { "DiacriticalAcute", VERS_CHECK, 180 },
+    { "DiacriticalDot", VERS_CHECK, 729 },
+    { "DiacriticalDoubleAcute", VERS_CHECK, 733 },
+    { "DiacriticalGrave", VERS_CHECK, 96 },
+    { "DiacriticalTilde", VERS_CHECK, 732 },
+    { "Diamond", VERS_CHECK, 8900 },
+    { "DifferentialD", VERS_CHECK, 8518 },
+    { "Dopf", VERS_CHECK, 120123 },
+    { "Dot", VERS_CHECK, 168 },
+    { "DotDot", VERS_CHECK, 8412 },
+    { "DotEqual", VERS_CHECK, 8784 },
+    { "DoubleContourIntegral", VERS_CHECK, 8751 },
+    { "DoubleDot", VERS_CHECK, 168 },
+    { "DoubleDownArrow", VERS_CHECK, 8659 },
+    { "DoubleLeftArrow", VERS_CHECK, 8656 },
+    { "DoubleLeftRightArrow", VERS_CHECK, 8660 },
+    { "DoubleLeftTee", VERS_CHECK, 10980 },
+    { "DoubleLongLeftArrow", VERS_CHECK, 10232 },
+    { "DoubleLongLeftRightArrow", VERS_CHECK, 10234 },
+    { "DoubleLongRightArrow", VERS_CHECK, 10233 },
+    { "DoubleRightArrow", VERS_CHECK, 8658 },
+    { "DoubleRightTee", VERS_CHECK, 8872 },
+    { "DoubleUpArrow", VERS_CHECK, 8657 },
+    { "DoubleUpDownArrow", VERS_CHECK, 8661 },
+    { "DoubleVerticalBar", VERS_CHECK, 8741 },
+    { "DownArrow", VERS_CHECK, 8595 },
+    { "DownArrowBar", VERS_CHECK, 10515 },
+    { "DownArrowUpArrow", VERS_CHECK, 8693 },
+    { "DownBreve", VERS_CHECK, 785 },
+    { "DownLeftRightVector", VERS_CHECK, 10576 },
+    { "DownLeftTeeVector", VERS_CHECK, 10590 },
+    { "DownLeftVector", VERS_CHECK, 8637 },
+    { "DownLeftVectorBar", VERS_CHECK, 10582 },
+    { "DownRightTeeVector", VERS_CHECK, 10591 },
+    { "DownRightVector", VERS_CHECK, 8641 },
+    { "DownRightVectorBar", VERS_CHECK, 10583 },
+    { "DownTee", VERS_CHECK, 8868 },
+    { "DownTeeArrow", VERS_CHECK, 8615 },
+    { "Downarrow", VERS_CHECK, 8659 },
+    { "Dscr", VERS_CHECK, 119967 },
+    { "Dstrok", VERS_CHECK, 272 },
+    { "ENG", VERS_CHECK, 330 },
+    { "ETH", VERS_ALL, 208 },
+    { "Eacute", VERS_ALL, 201 },
+    { "Ecaron", VERS_CHECK, 282 },
+    { "Ecirc", VERS_ALL, 202 },
+    { "Ecy", VERS_CHECK, 1069 },
+    { "Edot", VERS_CHECK, 278 },
+    { "Efr", VERS_CHECK, 120072 },
+    { "Egrave", VERS_ALL, 200 },
+    { "Element", VERS_CHECK, 8712 },
+    { "Emacr", VERS_CHECK, 274 },
+    { "EmptySmallSquare", VERS_CHECK, 9723 },
+    { "EmptyVerySmallSquare", VERS_CHECK, 9643 },
+    { "Eogon", VERS_CHECK, 280 },
+    { "Eopf", VERS_CHECK, 120124 },
+    { "Epsilon", VERS_FROM40, 917 },
+    { "Equal", VERS_CHECK, 10869 },
+    { "EqualTilde", VERS_CHECK, 8770 },
+    { "Equilibrium", VERS_CHECK, 8652 },
+    { "Escr", VERS_CHECK, 8496 },
+    { "Esim", VERS_CHECK, 10867 },
+    { "Eta", VERS_FROM40, 919 },
+    { "Euml", VERS_ALL, 203 },
+    { "Exists", VERS_CHECK, 8707 },
+    { "ExponentialE", VERS_CHECK, 8519 },
+    { "Fcy", VERS_CHECK, 1060 },
+    { "Ffr", VERS_CHECK, 120073 },
+    { "FilledSmallSquare", VERS_CHECK, 9724 },
+    { "FilledVerySmallSquare", VERS_CHECK, 9642 },
+    { "Fopf", VERS_CHECK, 120125 },
+    { "ForAll", VERS_CHECK, 8704 },
+    { "Fouriertrf", VERS_CHECK, 8497 },
+    { "Fscr", VERS_CHECK, 8497 },
+    { "GJcy", VERS_CHECK, 1027 },
+    { "GT", VERS_CHECK, 62 },
+    { "Gamma", VERS_FROM40, 915 },
+    { "Gammad", VERS_CHECK, 988 },
+    { "Gbreve", VERS_CHECK, 286 },
+    { "Gcedil", VERS_CHECK, 290 },
+    { "Gcirc", VERS_CHECK, 284 },
+    { "Gcy", VERS_CHECK, 1043 },
+    { "Gdot", VERS_CHECK, 288 },
+    { "Gfr", VERS_CHECK, 120074 },
+    { "Gg", VERS_CHECK, 8921 },
+    { "Gopf", VERS_CHECK, 120126 },
+    { "GreaterEqual", VERS_CHECK, 8805 },
+    { "GreaterEqualLess", VERS_CHECK, 8923 },
+    { "GreaterFullEqual", VERS_CHECK, 8807 },
+    { "GreaterGreater", VERS_CHECK, 10914 },
+    { "GreaterLess", VERS_CHECK, 8823 },
+    { "GreaterSlantEqual", VERS_CHECK, 10878 },
+    { "GreaterTilde", VERS_CHECK, 8819 },
+    { "Gscr", VERS_CHECK, 119970 },
+    { "Gt", VERS_CHECK, 8811 },
+    { "HARDcy", VERS_CHECK, 1066 },
+    { "Hacek", VERS_CHECK, 711 },
+    { "Hat", VERS_CHECK, 94 },
+    { "Hcirc", VERS_CHECK, 292 },
+    { "Hfr", VERS_CHECK, 8460 },
+    { "HilbertSpace", VERS_CHECK, 8459 },
+    { "Hopf", VERS_CHECK, 8461 },
+    { "HorizontalLine", VERS_CHECK, 9472 },
+    { "Hscr", VERS_CHECK, 8459 },
+    { "Hstrok", VERS_CHECK, 294 },
+    { "HumpDownHump", VERS_CHECK, 8782 },
+    { "HumpEqual", VERS_CHECK, 8783 },
+    { "IEcy", VERS_CHECK, 1045 },
+    { "IJlig", VERS_CHECK, 306 },
+    { "IOcy", VERS_CHECK, 1025 },
+    { "Iacute", VERS_ALL, 205 },
+    { "Icirc", VERS_ALL, 206 },
+    { "Icy", VERS_CHECK, 1048 },
+    { "Idot", VERS_CHECK, 304 },
+    { "Ifr", VERS_CHECK, 8465 },
+    { "Igrave", VERS_ALL, 204 },
+    { "Im", VERS_CHECK, 8465 },
+    { "Imacr", VERS_CHECK, 298 },
+    { "ImaginaryI", VERS_CHECK, 8520 },
+    { "Implies", VERS_CHECK, 8658 },
+    { "Int", VERS_CHECK, 8748 },
+    { "Integral", VERS_CHECK, 8747 },
+    { "Intersection", VERS_CHECK, 8898 },
+    { "InvisibleComma", VERS_CHECK, 8291 },
+    { "InvisibleTimes", VERS_CHECK, 8290 },
+    { "Iogon", VERS_CHECK, 302 },
+    { "Iopf", VERS_CHECK, 120128 },
+    { "Iota", VERS_FROM40, 921 },
+    { "Iscr", VERS_CHECK, 8464 },
+    { "Itilde", VERS_CHECK, 296 },
+    { "Iukcy", VERS_CHECK, 1030 },
+    { "Iuml", VERS_ALL, 207 },
+    { "Jcirc", VERS_CHECK, 308 },
+    { "Jcy", VERS_CHECK, 1049 },
+    { "Jfr", VERS_CHECK, 120077 },
+    { "Jopf", VERS_CHECK, 120129 },
+    { "Jscr", VERS_CHECK, 119973 },
+    { "Jsercy", VERS_CHECK, 1032 },
+    { "Jukcy", VERS_CHECK, 1028 },
+    { "KHcy", VERS_CHECK, 1061 },
+    { "KJcy", VERS_CHECK, 1036 },
+    { "Kappa", VERS_FROM40, 922 },
+    { "Kcedil", VERS_CHECK, 310 },
+    { "Kcy", VERS_CHECK, 1050 },
+    { "Kfr", VERS_CHECK, 120078 },
+    { "Kopf", VERS_CHECK, 120130 },
+    { "Kscr", VERS_CHECK, 119974 },
+    { "LJcy", VERS_CHECK, 1033 },
+    { "LT", VERS_CHECK, 60 },
+    { "Lacute", VERS_CHECK, 313 },
+    { "Lambda", VERS_FROM40, 923 },
+    { "Lang", VERS_CHECK, 10218 },
+    { "Laplacetrf", VERS_CHECK, 8466 },
+    { "Larr", VERS_CHECK, 8606 },
+    { "Lcaron", VERS_CHECK, 317 },
+    { "Lcedil", VERS_CHECK, 315 },
+    { "Lcy", VERS_CHECK, 1051 },
+    { "LeftAngleBracket", VERS_CHECK, 10216 },
+    { "LeftArrow", VERS_CHECK, 8592 },
+    { "LeftArrowBar", VERS_CHECK, 8676 },
+    { "LeftArrowRightArrow", VERS_CHECK, 8646 },
+    { "LeftCeiling", VERS_CHECK, 8968 },
+    { "LeftDoubleBracket", VERS_CHECK, 10214 },
+    { "LeftDownTeeVector", VERS_CHECK, 10593 },
+    { "LeftDownVector", VERS_CHECK, 8643 },
+    { "LeftDownVectorBar", VERS_CHECK, 10585 },
+    { "LeftFloor", VERS_CHECK, 8970 },
+    { "LeftRightArrow", VERS_CHECK, 8596 },
+    { "LeftRightVector", VERS_CHECK, 10574 },
+    { "LeftTee", VERS_CHECK, 8867 },
+    { "LeftTeeArrow", VERS_CHECK, 8612 },
+    { "LeftTeeVector", VERS_CHECK, 10586 },
+    { "LeftTriangle", VERS_CHECK, 8882 },
+    { "LeftTriangleBar", VERS_CHECK, 10703 },
+    { "LeftTriangleEqual", VERS_CHECK, 8884 },
+    { "LeftUpDownVector", VERS_CHECK, 10577 },
+    { "LeftUpTeeVector", VERS_CHECK, 10592 },
+    { "LeftUpVector", VERS_CHECK, 8639 },
+    { "LeftUpVectorBar", VERS_CHECK, 10584 },
+    { "LeftVector", VERS_CHECK, 8636 },
+    { "LeftVectorBar", VERS_CHECK, 10578 },
+    { "Leftarrow", VERS_CHECK, 8656 },
+    { "Leftrightarrow", VERS_CHECK, 8660 },
+    { "LessEqualGreater", VERS_CHECK, 8922 },
+    { "LessFullEqual", VERS_CHECK, 8806 },
+    { "LessGreater", VERS_CHECK, 8822 },
+    { "LessLess", VERS_CHECK, 10913 },
+    { "LessSlantEqual", VERS_CHECK, 10877 },
+    { "LessTilde", VERS_CHECK, 8818 },
+    { "Lfr", VERS_CHECK, 120079 },
+    { "Ll", VERS_CHECK, 8920 },
+    { "Lleftarrow", VERS_CHECK, 8666 },
+    { "Lmidot", VERS_CHECK, 319 },
+    { "LongLeftArrow", VERS_CHECK, 10229 },
+    { "LongLeftRightArrow", VERS_CHECK, 10231 },
+    { "LongRightArrow", VERS_CHECK, 10230 },
+    { "Longleftarrow", VERS_CHECK, 10232 },
+    { "Longleftrightarrow", VERS_CHECK, 10234 },
+    { "Longrightarrow", VERS_CHECK, 10233 },
+    { "Lopf", VERS_CHECK, 120131 },
+    { "LowerLeftArrow", VERS_CHECK, 8601 },
+    { "LowerRightArrow", VERS_CHECK, 8600 },
+    { "Lscr", VERS_CHECK, 8466 },
+    { "Lsh", VERS_CHECK, 8624 },
+    { "Lstrok", VERS_CHECK, 321 },
+    { "Lt", VERS_CHECK, 8810 },
+    { "Map", VERS_CHECK, 10501 },
+    { "Mcy", VERS_CHECK, 1052 },
+    { "MediumSpace", VERS_CHECK, 8287 },
+    { "Mellintrf", VERS_CHECK, 8499 },
+    { "Mfr", VERS_CHECK, 120080 },
+    { "MinusPlus", VERS_CHECK, 8723 },
+    { "Mopf", VERS_CHECK, 120132 },
+    { "Mscr", VERS_CHECK, 8499 },
+    { "Mu", VERS_FROM40, 924 },
+    { "NJcy", VERS_CHECK, 1034 },
+    { "Nacute", VERS_CHECK, 323 },
+    { "Ncaron", VERS_CHECK, 327 },
+    { "Ncedil", VERS_CHECK, 325 },
+    { "Ncy", VERS_CHECK, 1053 },
+    { "NegativeMediumSpace", VERS_CHECK, 8203 },
+    { "NegativeThickSpace", VERS_CHECK, 8203 },
+    { "NegativeThinSpace", VERS_CHECK, 8203 },
+    { "NegativeVeryThinSpace", VERS_CHECK, 8203 },
+    { "NestedGreaterGreater", VERS_CHECK, 8811 },
+    { "NestedLessLess", VERS_CHECK, 8810 },
+    { "NewLine", VERS_CHECK, 10 },
+    { "Nfr", VERS_CHECK, 120081 },
+    { "NoBreak", VERS_CHECK, 8288 },
+    { "NonBreakingSpace", VERS_CHECK, 160 },
+    { "Nopf", VERS_CHECK, 8469 },
+    { "Not", VERS_CHECK, 10988 },
+    { "NotCongruent", VERS_CHECK, 8802 },
+    { "NotCupCap", VERS_CHECK, 8813 },
+    { "NotDoubleVerticalBar", VERS_CHECK, 8742 },
+    { "NotElement", VERS_CHECK, 8713 },
+    { "NotEqual", VERS_CHECK, 8800 },
+    { "NotExists", VERS_CHECK, 8708 },
+    { "NotGreater", VERS_CHECK, 8815 },
+    { "NotGreaterEqual", VERS_CHECK, 8817 },
+    { "NotGreaterLess", VERS_CHECK, 8825 },
+    { "NotGreaterTilde", VERS_CHECK, 8821 },
+    { "NotLeftTriangle", VERS_CHECK, 8938 },
+    { "NotLeftTriangleEqual", VERS_CHECK, 8940 },
+    { "NotLess", VERS_CHECK, 8814 },
+    { "NotLessEqual", VERS_CHECK, 8816 },
+    { "NotLessGreater", VERS_CHECK, 8824 },
+    { "NotLessTilde", VERS_CHECK, 8820 },
+    { "NotPrecedes", VERS_CHECK, 8832 },
+    { "NotPrecedesSlantEqual", VERS_CHECK, 8928 },
+    { "NotReverseElement", VERS_CHECK, 8716 },
+    { "NotRightTriangle", VERS_CHECK, 8939 },
+    { "NotRightTriangleEqual", VERS_CHECK, 8941 },
+    { "NotSquareSubsetEqual", VERS_CHECK, 8930 },
+    { "NotSquareSupersetEqual", VERS_CHECK, 8931 },
+    { "NotSubsetEqual", VERS_CHECK, 8840 },
+    { "NotSucceeds", VERS_CHECK, 8833 },
+    { "NotSucceedsSlantEqual", VERS_CHECK, 8929 },
+    { "NotSupersetEqual", VERS_CHECK, 8841 },
+    { "NotTilde", VERS_CHECK, 8769 },
+    { "NotTildeEqual", VERS_CHECK, 8772 },
+    { "NotTildeFullEqual", VERS_CHECK, 8775 },
+    { "NotTildeTilde", VERS_CHECK, 8777 },
+    { "NotVerticalBar", VERS_CHECK, 8740 },
+    { "Nscr", VERS_CHECK, 119977 },
+    { "Ntilde", VERS_ALL, 209 },
+    { "Nu", VERS_FROM40, 925 },
+    { "OElig", VERS_FROM40, 338 },
+    { "Oacute", VERS_ALL, 211 },
+    { "Ocirc", VERS_ALL, 212 },
+    { "Ocy", VERS_CHECK, 1054 },
+    { "Odblac", VERS_CHECK, 336 },
+    { "Ofr", VERS_CHECK, 120082 },
+    { "Ograve", VERS_ALL, 210 },
+    { "Omacr", VERS_CHECK, 332 },
+    { "Omega", VERS_FROM40, 937 },
+    { "Omicron", VERS_FROM40, 927 },
+    { "Oopf", VERS_CHECK, 120134 },
+    { "OpenCurlyDoubleQuote", VERS_CHECK, 8220 },
+    { "OpenCurlyQuote", VERS_CHECK, 8216 },
+    { "Or", VERS_CHECK, 10836 },
+    { "Oscr", VERS_CHECK, 119978 },
+    { "Oslash", VERS_ALL, 216 },
+    { "Otilde", VERS_ALL, 213 },
+    { "Otimes", VERS_CHECK, 10807 },
+    { "Ouml", VERS_ALL, 214 },
+    { "OverBar", VERS_CHECK, 8254 },
+    { "OverBrace", VERS_CHECK, 9182 },
+    { "OverBracket", VERS_CHECK, 9140 },
+    { "OverParenthesis", VERS_CHECK, 9180 },
+    { "PartialD", VERS_CHECK, 8706 },
+    { "Pcy", VERS_CHECK, 1055 },
+    { "Pfr", VERS_CHECK, 120083 },
+    { "Phi", VERS_FROM40, 934 },
+    { "Pi", VERS_FROM40, 928 },
+    { "PlusMinus", VERS_CHECK, 177 },
+    { "Poincareplane", VERS_CHECK, 8460 },
+    { "Popf", VERS_CHECK, 8473 },
+    { "Pr", VERS_CHECK, 10939 },
+    { "Precedes", VERS_CHECK, 8826 },
+    { "PrecedesEqual", VERS_CHECK, 10927 },
+    { "PrecedesSlantEqual", VERS_CHECK, 8828 },
+    { "PrecedesTilde", VERS_CHECK, 8830 },
+    { "Prime", VERS_FROM40, 8243 },
+    { "Product", VERS_CHECK, 8719 },
+    { "Proportion", VERS_CHECK, 8759 },
+    { "Proportional", VERS_CHECK, 8733 },
+    { "Pscr", VERS_CHECK, 119979 },
+    { "Psi", VERS_FROM40, 936 },
+    { "QUOT", VERS_CHECK, 34 },
+    { "Qfr", VERS_CHECK, 120084 },
+    { "Qopf", VERS_CHECK, 8474 },
+    { "Qscr", VERS_CHECK, 119980 },
+    { "RBarr", VERS_CHECK, 10512 },
+    { "REG", VERS_CHECK, 174 },
+    { "Racute", VERS_CHECK, 340 },
+    { "Rang", VERS_CHECK, 10219 },
+    { "Rarr", VERS_CHECK, 8608 },
+    { "Rarrtl", VERS_CHECK, 10518 },
+    { "Rcaron", VERS_CHECK, 344 },
+    { "Rcedil", VERS_CHECK, 342 },
+    { "Rcy", VERS_CHECK, 1056 },
+    { "Re", VERS_CHECK, 8476 },
+    { "ReverseElement", VERS_CHECK, 8715 },
+    { "ReverseEquilibrium", VERS_CHECK, 8651 },
+    { "ReverseUpEquilibrium", VERS_CHECK, 10607 },
+    { "Rfr", VERS_CHECK, 8476 },
+    { "Rho", VERS_FROM40, 929 },
+    { "RightAngleBracket", VERS_CHECK, 10217 },
+    { "RightArrow", VERS_CHECK, 8594 },
+    { "RightArrowBar", VERS_CHECK, 8677 },
+    { "RightArrowLeftArrow", VERS_CHECK, 8644 },
+    { "RightCeiling", VERS_CHECK, 8969 },
+    { "RightDoubleBracket", VERS_CHECK, 10215 },
+    { "RightDownTeeVector", VERS_CHECK, 10589 },
+    { "RightDownVector", VERS_CHECK, 8642 },
+    { "RightDownVectorBar", VERS_CHECK, 10581 },
+    { "RightFloor", VERS_CHECK, 8971 },
+    { "RightTee", VERS_CHECK, 8866 },
+    { "RightTeeArrow", VERS_CHECK, 8614 },
+    { "RightTeeVector", VERS_CHECK, 10587 },
+    { "RightTriangle", VERS_CHECK, 8883 },
+    { "RightTriangleBar", VERS_CHECK, 10704 },
+    { "RightTriangleEqual", VERS_CHECK, 8885 },
+    { "RightUpDownVector", VERS_CHECK, 10575 },
+    { "RightUpTeeVector", VERS_CHECK, 10588 },
+    { "RightUpVector", VERS_CHECK, 8638 },
+    { "RightUpVectorBar", VERS_CHECK, 10580 },
+    { "RightVector", VERS_CHECK, 8640 },
+    { "RightVectorBar", VERS_CHECK, 10579 },
+    { "Rightarrow", VERS_CHECK, 8658 },
+    { "Ropf", VERS_CHECK, 8477 },
+    { "RoundImplies", VERS_CHECK, 10608 },
+    { "Rrightarrow", VERS_CHECK, 8667 },
+    { "Rscr", VERS_CHECK, 8475 },
+    { "Rsh", VERS_CHECK, 8625 },
+    { "RuleDelayed", VERS_CHECK, 10740 },
+    { "SHCHcy", VERS_CHECK, 1065 },
+    { "SHcy", VERS_CHECK, 1064 },
+    { "SOFTcy", VERS_CHECK, 1068 },
+    { "Sacute", VERS_CHECK, 346 },
+    { "Sc", VERS_CHECK, 10940 },
+    { "Scaron", VERS_FROM40, 352 },
+    { "Scedil", VERS_CHECK, 350 },
+    { "Scirc", VERS_CHECK, 348 },
+    { "Scy", VERS_CHECK, 1057 },
+    { "Sfr", VERS_CHECK, 120086 },
+    { "ShortDownArrow", VERS_CHECK, 8595 },
+    { "ShortLeftArrow", VERS_CHECK, 8592 },
+    { "ShortRightArrow", VERS_CHECK, 8594 },
+    { "ShortUpArrow", VERS_CHECK, 8593 },
+    { "Sigma", VERS_FROM40, 931 },
+    { "SmallCircle", VERS_CHECK, 8728 },
+    { "Sopf", VERS_CHECK, 120138 },
+    { "Sqrt", VERS_CHECK, 8730 },
+    { "Square", VERS_CHECK, 9633 },
+    { "SquareIntersection", VERS_CHECK, 8851 },
+    { "SquareSubset", VERS_CHECK, 8847 },
+    { "SquareSubsetEqual", VERS_CHECK, 8849 },
+    { "SquareSuperset", VERS_CHECK, 8848 },
+    { "SquareSupersetEqual", VERS_CHECK, 8850 },
+    { "SquareUnion", VERS_CHECK, 8852 },
+    { "Sscr", VERS_CHECK, 119982 },
+    { "Star", VERS_CHECK, 8902 },
+    { "Sub", VERS_CHECK, 8912 },
+    { "Subset", VERS_CHECK, 8912 },
+    { "SubsetEqual", VERS_CHECK, 8838 },
+    { "Succeeds", VERS_CHECK, 8827 },
+    { "SucceedsEqual", VERS_CHECK, 10928 },
+    { "SucceedsSlantEqual", VERS_CHECK, 8829 },
+    { "SucceedsTilde", VERS_CHECK, 8831 },
+    { "SuchThat", VERS_CHECK, 8715 },
+    { "Sum", VERS_CHECK, 8721 },
+    { "Sup", VERS_CHECK, 8913 },
+    { "Superset", VERS_CHECK, 8835 },
+    { "SupersetEqual", VERS_CHECK, 8839 },
+    { "Supset", VERS_CHECK, 8913 },
+    { "THORN", VERS_ALL, 222 },
+    { "TRADE", VERS_CHECK, 8482 },
+    { "TSHcy", VERS_CHECK, 1035 },
+    { "TScy", VERS_CHECK, 1062 },
+    { "Tab", VERS_CHECK, 9 },
+    { "Tau", VERS_FROM40, 932 },
+    { "Tcaron", VERS_CHECK, 356 },
+    { "Tcedil", VERS_CHECK, 354 },
+    { "Tcy", VERS_CHECK, 1058 },
+    { "Tfr", VERS_CHECK, 120087 },
+    { "Therefore", VERS_CHECK, 8756 },
+    { "Theta", VERS_FROM40, 920 },
+    { "ThinSpace", VERS_CHECK, 8201 },
+    { "Tilde", VERS_CHECK, 8764 },
+    { "TildeEqual", VERS_CHECK, 8771 },
+    { "TildeFullEqual", VERS_CHECK, 8773 },
+    { "TildeTilde", VERS_CHECK, 8776 },
+    { "Topf", VERS_CHECK, 120139 },
+    { "TripleDot", VERS_CHECK, 8411 },
+    { "Tscr", VERS_CHECK, 119983 },
+    { "Tstrok", VERS_CHECK, 358 },
+    { "Uacute", VERS_ALL, 218 },
+    { "Uarr", VERS_CHECK, 8607 },
+    { "Uarrocir", VERS_CHECK, 10569 },
+    { "Ubrcy", VERS_CHECK, 1038 },
+    { "Ubreve", VERS_CHECK, 364 },
+    { "Ucirc", VERS_ALL, 219 },
+    { "Ucy", VERS_CHECK, 1059 },
+    { "Udblac", VERS_CHECK, 368 },
+    { "Ufr", VERS_CHECK, 120088 },
+    { "Ugrave", VERS_ALL, 217 },
+    { "Umacr", VERS_CHECK, 362 },
+    { "UnderBar", VERS_CHECK, 95 },
+    { "UnderBrace", VERS_CHECK, 9183 },
+    { "UnderBracket", VERS_CHECK, 9141 },
+    { "UnderParenthesis", VERS_CHECK, 9181 },
+    { "Union", VERS_CHECK, 8899 },
+    { "UnionPlus", VERS_CHECK, 8846 },
+    { "Uogon", VERS_CHECK, 370 },
+    { "Uopf", VERS_CHECK, 120140 },
+    { "UpArrow", VERS_CHECK, 8593 },
+    { "UpArrowBar", VERS_CHECK, 10514 },
+    { "UpArrowDownArrow", VERS_CHECK, 8645 },
+    { "UpDownArrow", VERS_CHECK, 8597 },
+    { "UpEquilibrium", VERS_CHECK, 10606 },
+    { "UpTee", VERS_CHECK, 8869 },
+    { "UpTeeArrow", VERS_CHECK, 8613 },
+    { "Uparrow", VERS_CHECK, 8657 },
+    { "Updownarrow", VERS_CHECK, 8661 },
+    { "UpperLeftArrow", VERS_CHECK, 8598 },
+    { "UpperRightArrow", VERS_CHECK, 8599 },
+    { "Upsi", VERS_CHECK, 978 },
+    { "Upsilon", VERS_FROM40, 933 },
+    { "Uring", VERS_CHECK, 366 },
+    { "Uscr", VERS_CHECK, 119984 },
+    { "Utilde", VERS_CHECK, 360 },
+    { "Uuml", VERS_ALL, 220 },
+    { "VDash", VERS_CHECK, 8875 },
+    { "Vbar", VERS_CHECK, 10987 },
+    { "Vcy", VERS_CHECK, 1042 },
+    { "Vdash", VERS_CHECK, 8873 },
+    { "Vdashl", VERS_CHECK, 10982 },
+    { "Vee", VERS_CHECK, 8897 },
+    { "Verbar", VERS_CHECK, 8214 },
+    { "Vert", VERS_CHECK, 8214 },
+    { "VerticalBar", VERS_CHECK, 8739 },
+    { "VerticalLine", VERS_CHECK, 124 },
+    { "VerticalSeparator", VERS_CHECK, 10072 },
+    { "VerticalTilde", VERS_CHECK, 8768 },
+    { "VeryThinSpace", VERS_CHECK, 8202 },
+    { "Vfr", VERS_CHECK, 120089 },
+    { "Vopf", VERS_CHECK, 120141 },
+    { "Vscr", VERS_CHECK, 119985 },
+    { "Vvdash", VERS_CHECK, 8874 },
+    { "Wcirc", VERS_CHECK, 372 },
+    { "Wedge", VERS_CHECK, 8896 },
+    { "Wfr", VERS_CHECK, 120090 },
+    { "Wopf", VERS_CHECK, 120142 },
+    { "Wscr", VERS_CHECK, 119986 },
+    { "Xfr", VERS_CHECK, 120091 },
+    { "Xi", VERS_FROM40, 926 },
+    { "Xopf", VERS_CHECK, 120143 },
+    { "Xscr", VERS_CHECK, 119987 },
+    { "YAcy", VERS_CHECK, 1071 },
+    { "YIcy", VERS_CHECK, 1031 },
+    { "YUcy", VERS_CHECK, 1070 },
+    { "Yacute", VERS_ALL, 221 },
+    { "Ycirc", VERS_CHECK, 374 },
+    { "Ycy", VERS_CHECK, 1067 },
+    { "Yfr", VERS_CHECK, 120092 },
+    { "Yopf", VERS_CHECK, 120144 },
+    { "Yscr", VERS_CHECK, 119988 },
+    { "Yuml", VERS_FROM40, 376 },
+    { "ZHcy", VERS_CHECK, 1046 },
+    { "Zacute", VERS_CHECK, 377 },
+    { "Zcaron", VERS_CHECK, 381 },
+    { "Zcy", VERS_CHECK, 1047 },
+    { "Zdot", VERS_CHECK, 379 },
+    { "ZeroWidthSpace", VERS_CHECK, 8203 },
+    { "Zeta", VERS_FROM40, 918 },
+    { "Zfr", VERS_CHECK, 8488 },
+    { "Zopf", VERS_CHECK, 8484 },
+    { "Zscr", VERS_CHECK, 119989 },
+    { "aacute", VERS_ALL, 225 },
+    { "abreve", VERS_CHECK, 259 },
+    { "ac", VERS_CHECK, 8766 },
+    { "acd", VERS_CHECK, 8767 },
+    { "acirc", VERS_ALL, 226 },
+    { "acute", VERS_ALL, 180 },
+    { "acy", VERS_CHECK, 1072 },
+    { "aelig", VERS_ALL, 230 },
+    { "af", VERS_CHECK, 8289 },
+    { "afr", VERS_CHECK, 120094 },
+    { "agrave", VERS_ALL, 224 },
+    { "alefsym", VERS_FROM40, 8501 },
+    { "aleph", VERS_CHECK, 8501 },
+    { "alpha", VERS_FROM40, 945 },
+    { "amacr", VERS_CHECK, 257 },
+    { "amalg", VERS_CHECK, 10815 },
+    { "amp", VERS_ALL | VERS_XML, 38 },
+    { "and", VERS_FROM40, 8743 },
+    { "andand", VERS_CHECK, 10837 },
+    { "andd", VERS_CHECK, 10844 },
+    { "andslope", VERS_CHECK, 10840 },
+    { "andv", VERS_CHECK, 10842 },
+    { "ang", VERS_FROM40, 8736 },
+    { "ange", VERS_CHECK, 10660 },
+    { "angle", VERS_CHECK, 8736 },
+    { "angmsd", VERS_CHECK, 8737 },
+    { "angmsdaa", VERS_CHECK, 10664 },
+    { "angmsdab", VERS_CHECK, 10665 },
+    { "angmsdac", VERS_CHECK, 10666 },
+    { "angmsdad", VERS_CHECK, 10667 },
+    { "angmsdae", VERS_CHECK, 10668 },
+    { "angmsdaf", VERS_CHECK, 10669 },
+    { "angmsdag", VERS_CHECK, 10670 },
+    { "angmsdah", VERS_CHECK, 10671 },
+    { "angrt", VERS_CHECK, 8735 },
+    { "angrtvb", VERS_CHECK, 8894 },
+    { "angrtvbd", VERS_CHECK, 10653 },
+    { "angsph", VERS_CHECK, 8738 },
+    { "angst", VERS_CHECK, 197 },
+    { "angzarr", VERS_CHECK, 9084 },
+    { "aogon", VERS_CHECK, 261 },
+    { "aopf", VERS_CHECK, 120146 },
+    { "ap", VERS_CHECK, 8776 },
+    { "apE", VERS_CHECK, 10864 },
+    { "apacir", VERS_CHECK, 10863 },
+    { "ape", VERS_CHECK, 8778 },
+    { "apid", VERS_CHECK, 8779 },
+    { "apos", VERS_FROM40 | VERS_XML, 39 },
+    { "approx", VERS_CHECK, 8776 },
+    { "approxeq", VERS_CHECK, 8778 },
+    { "aring", VERS_ALL, 229 },
+    { "ascr", VERS_CHECK, 119990 },
+    { "ast", VERS_CHECK, 42 },
+    { "asymp", VERS_FROM40, 8776 },
+    { "asympeq", VERS_CHECK, 8781 },
+    { "atilde", VERS_ALL, 227 },
+    { "auml", VERS_ALL, 228 },
+    { "awconint", VERS_CHECK, 8755 },
+    { "awint", VERS_CHECK, 10769 },
+    { "bNot", VERS_CHECK, 10989 },
+    { "backcong", VERS_CHECK, 8780 },
+    { "backepsilon", VERS_CHECK, 1014 },
+    { "backprime", VERS_CHECK, 8245 },
+    { "backsim", VERS_CHECK, 8765 },
+    { "backsimeq", VERS_CHECK, 8909 },
+    { "barvee", VERS_CHECK, 8893 },
+    { "barwed", VERS_CHECK, 8965 },
+    { "barwedge", VERS_CHECK, 8965 },
+    { "bbrk", VERS_CHECK, 9141 },
+    { "bbrktbrk", VERS_CHECK, 9142 },
+    { "bcong", VERS_CHECK, 8780 },
+    { "bcy", VERS_CHECK, 1073 },
+    { "bdquo", VERS_FROM40, 8222 },
+    { "becaus", VERS_CHECK, 8757 },
+    { "because", VERS_CHECK, 8757 },
+    { "bemptyv", VERS_CHECK, 10672 },
+    { "bepsi", VERS_CHECK, 1014 },
+    { "bernou", VERS_CHECK, 8492 },
+    { "beta", VERS_FROM40, 946 },
+    { "beth", VERS_CHECK, 8502 },
+    { "between", VERS_CHECK, 8812 },
+    { "bfr", VERS_CHECK, 120095 },
+    { "bigcap", VERS_CHECK, 8898 },
+    { "bigcirc", VERS_CHECK, 9711 },
+    { "bigcup", VERS_CHECK, 8899 },
+    { "bigodot", VERS_CHECK, 10752 },
+    { "bigoplus", VERS_CHECK, 10753 },
+    { "bigotimes", VERS_CHECK, 10754 },
+    { "bigsqcup", VERS_CHECK, 10758 },
+    { "bigstar", VERS_CHECK, 9733 },
+    { "bigtriangledown", VERS_CHECK, 9661 },
+    { "bigtriangleup", VERS_CHECK, 9651 },
+    { "biguplus", VERS_CHECK, 10756 },
+    { "bigvee", VERS_CHECK, 8897 },
+    { "bigwedge", VERS_CHECK, 8896 },
+    { "bkarow", VERS_CHECK, 10509 },
+    { "blacklozenge", VERS_CHECK, 10731 },
+    { "blacksquare", VERS_CHECK, 9642 },
+    { "blacktriangle", VERS_CHECK, 9652 },
+    { "blacktriangledown", VERS_CHECK, 9662 },
+    { "blacktriangleleft", VERS_CHECK, 9666 },
+    { "blacktriangleright", VERS_CHECK, 9656 },
+    { "blank", VERS_CHECK, 9251 },
+    { "blk12", VERS_CHECK, 9618 },
+    { "blk14", VERS_CHECK, 9617 },
+    { "blk34", VERS_CHECK, 9619 },
+    { "block", VERS_CHECK, 9608 },
+    { "bnot", VERS_CHECK, 8976 },
+    { "bopf", VERS_CHECK, 120147 },
+    { "bot", VERS_CHECK, 8869 },
+    { "bottom", VERS_CHECK, 8869 },
+    { "bowtie", VERS_CHECK, 8904 },
+    { "boxDL", VERS_CHECK, 9559 },
+    { "boxDR", VERS_CHECK, 9556 },
+    { "boxDl", VERS_CHECK, 9558 },
+    { "boxDr", VERS_CHECK, 9555 },
+    { "boxH", VERS_CHECK, 9552 },
+    { "boxHD", VERS_CHECK, 9574 },
+    { "boxHU", VERS_CHECK, 9577 },
+    { "boxHd", VERS_CHECK, 9572 },
+    { "boxHu", VERS_CHECK, 9575 },
+    { "boxUL", VERS_CHECK, 9565 },
+    { "boxUR", VERS_CHECK, 9562 },
+    { "boxUl", VERS_CHECK, 9564 },
+    { "boxUr", VERS_CHECK, 9561 },
+    { "boxV", VERS_CHECK, 9553 },
+    { "boxVH", VERS_CHECK, 9580 },
+    { "boxVL", VERS_CHECK, 9571 },
+    { "boxVR", VERS_CHECK, 9568 },
+    { "boxVh", VERS_CHECK, 9579 },
+    { "boxVl", VERS_CHECK, 9570 },
+    { "boxVr", VERS_CHECK, 9567 },
+    { "boxbox", VERS_CHECK, 10697 },
+    { "boxdL", VERS_CHECK, 9557 },
+    { "boxdR", VERS_CHECK, 9554 },
+    { "boxdl", VERS_CHECK, 9488 },
+    { "boxdr", VERS_CHECK, 9484 },
+    { "boxh", VERS_CHECK, 9472 },
+    { "boxhD", VERS_CHECK, 9573 },
+    { "boxhU", VERS_CHECK, 9576 },
+    { "boxhd", VERS_CHECK, 9516 },
+    { "boxhu", VERS_CHECK, 9524 },
+    { "boxminus", VERS_CHECK, 8863 },
+    { "boxplus", VERS_CHECK, 8862 },
+    { "boxtimes", VERS_CHECK, 8864 },
+    { "boxuL", VERS_CHECK, 9563 },
+    { "boxuR", VERS_CHECK, 9560 },
+    { "boxul", VERS_CHECK, 9496 },
+    { "boxur", VERS_CHECK, 9492 },
+    { "boxv", VERS_CHECK, 9474 },
+    { "boxvH", VERS_CHECK, 9578 },
+    { "boxvL", VERS_CHECK, 9569 },
+    { "boxvR", VERS_CHECK, 9566 },
+    { "boxvh", VERS_CHECK, 9532 },
+    { "boxvl", VERS_CHECK, 9508 },
+    { "boxvr", VERS_CHECK, 9500 },
+    { "bprime", VERS_CHECK, 8245 },
+    { "breve", VERS_CHECK, 728 },
+    { "brvbar", VERS_ALL, 166 },
+    { "bscr", VERS_CHECK, 119991 },
+    { "bsemi", VERS_CHECK, 8271 },
+    { "bsim", VERS_CHECK, 8765 },
+    { "bsime", VERS_CHECK, 8909 },
+    { "bsol", VERS_CHECK, 92 },
+    { "bsolb", VERS_CHECK, 10693 },
+    { "bsolhsub", VERS_CHECK, 10184 },
+    { "bull", VERS_FROM40, 8226 },
+    { "bullet", VERS_CHECK, 8226 },
+    { "bump", VERS_CHECK, 8782 },
+    { "bumpE", VERS_CHECK, 10926 },
+    { "bumpe", VERS_CHECK, 8783 },
+    { "bumpeq", VERS_CHECK, 8783 },
+    { "cacute", VERS_CHECK, 263 },
+    { "cap", VERS_FROM40, 8745 },
+    { "capand", VERS_CHECK, 10820 },
+    { "capbrcup", VERS_CHECK, 10825 },
+    { "capcap", VERS_CHECK, 10827 },
+    { "capcup", VERS_CHECK, 10823 },
+    { "capdot", VERS_CHECK, 10816 },
+    { "caret", VERS_CHECK, 8257 },
+    { "caron", VERS_CHECK, 711 },
+    { "ccaps", VERS_CHECK, 10829 },
+    { "ccaron", VERS_CHECK, 269 },
+    { "ccedil", VERS_ALL, 231 },
+    { "ccirc", VERS_CHECK, 265 },
+    { "ccups", VERS_CHECK, 10828 },
+    { "ccupssm", VERS_CHECK, 10832 },
+    { "cdot", VERS_CHECK, 267 },
+    { "cedil", VERS_ALL, 184 },
+    { "cemptyv", VERS_CHECK, 10674 },
+    { "cent", VERS_ALL, 162 },
+    { "centerdot", VERS_CHECK, 183 },
+    { "cfr", VERS_CHECK, 120096 },
+    { "chcy", VERS_CHECK, 1095 },
+    { "check", VERS_CHECK, 10003 },
+    { "checkmark", VERS_CHECK, 10003 },
+    { "chi", VERS_FROM40, 967 },
+    { "cir", VERS_CHECK, 9675 },
+    { "cirE", VERS_CHECK, 10691 },
+    { "circ", VERS_FROM40, 710 },
+    { "circeq", VERS_CHECK, 8791 },
+    { "circlearrowleft", VERS_CHECK, 8634 },
+    { "circlearrowright", VERS_CHECK, 8635 },
+    { "circledR", VERS_CHECK, 174 },
+    { "circledS", VERS_CHECK, 9416 },
+    { "circledast", VERS_CHECK, 8859 },
+    { "circledcirc", VERS_CHECK, 8858 },
+    { "circleddash", VERS_CHECK, 8861 },
+    { "cire", VERS_CHECK, 8791 },
+    { "cirfnint", VERS_CHECK, 10768 },
+    { "cirmid", VERS_CHECK, 10991 },
+    { "cirscir", VERS_CHECK, 10690 },
+    { "clubs", VERS_FROM40, 9827 },
+    { "clubsuit", VERS_CHECK, 9827 },
+    { "colon", VERS_CHECK, 58 },
+    { "colone", VERS_CHECK, 8788 },
+    { "coloneq", VERS_CHECK, 8788 },
+    { "comma", VERS_CHECK, 44 },
+    { "commat", VERS_CHECK, 64 },
+    { "comp", VERS_CHECK, 8705 },
+    { "compfn", VERS_CHECK, 8728 },
+    { "complement", VERS_CHECK, 8705 },
+    { "complexes", VERS_CHECK, 8450 },
+    { "cong", VERS_FROM40, 8773 },
+    { "congdot", VERS_CHECK, 10861 },
+    { "conint", VERS_CHECK, 8750 },
+    { "copf", VERS_CHECK, 120148 },
+    { "coprod", VERS_CHECK, 8720 },
+    { "copy", VERS_ALL, 169 },
+    { "copysr", VERS_CHECK, 8471 },
+    { "crarr", VERS_FROM40, 8629 },
+    { "cross", VERS_CHECK, 10007 },
+    { "cscr", VERS_CHECK, 119992 },
+    { "csub", VERS_CHECK, 10959 },
+    { "csube", VERS_CHECK, 10961 },
+    { "csup", VERS_CHECK, 10960 },
+    { "csupe", VERS_CHECK, 10962 },
+    { "ctdot", VERS_CHECK, 8943 },
+    { "cudarrl", VERS_CHECK, 10552 },
+    { "cudarrr", VERS_CHECK, 10549 },
+    { "cuepr", VERS_CHECK, 8926 },
+    { "cuesc", VERS_CHECK, 8927 },
+    { "cularr", VERS_CHECK, 8630 },
+    { "cularrp", VERS_CHECK, 10557 },
+    { "cup", VERS_FROM40, 8746 },
+    { "cupbrcap", VERS_CHECK, 10824 },
+    { "cupcap", VERS_CHECK, 10822 },
+    { "cupcup", VERS_CHECK, 10826 },
+    { "cupdot", VERS_CHECK, 8845 },
+    { "cupor", VERS_CHECK, 10821 },
+    { "curarr", VERS_CHECK, 8631 },
+    { "curarrm", VERS_CHECK, 10556 },
+    { "curlyeqprec", VERS_CHECK, 8926 },
+    { "curlyeqsucc", VERS_CHECK, 8927 },
+    { "curlyvee", VERS_CHECK, 8910 },
+    { "curlywedge", VERS_CHECK, 8911 },
+    { "curren", VERS_ALL, 164 },
+    { "curvearrowleft", VERS_CHECK, 8630 },
+    { "curvearrowright", VERS_CHECK, 8631 },
+    { "cuvee", VERS_CHECK, 8910 },
+    { "cuwed", VERS_CHECK, 8911 },
+    { "cwconint", VERS_CHECK, 8754 },
+    { "cwint", VERS_CHECK, 8753 },
+    { "cylcty", VERS_CHECK, 9005 },
+    { "dArr", VERS_FROM40, 8659 },
+    { "dHar", VERS_CHECK, 10597 },
+    { "dagger", VERS_FROM40, 8224 },
+    { "daleth", VERS_CHECK, 8504 },
+    { "darr", VERS_FROM40, 8595 },
+    { "dash", VERS_CHECK, 8208 },
+    { "dashv", VERS_CHECK, 8867 },
+    { "dbkarow", VERS_CHECK, 10511 },
+    { "dblac", VERS_CHECK, 733 },
+    { "dcaron", VERS_CHECK, 271 },
+    { "dcy", VERS_CHECK, 1076 },
+    { "dd", VERS_CHECK, 8518 },
+    { "ddagger", VERS_CHECK, 8225 },
+    { "ddarr", VERS_CHECK, 8650 },
+    { "ddotseq", VERS_CHECK, 10871 },
+    { "deg", VERS_ALL, 176 },
+    { "delta", VERS_FROM40, 948 },
+    { "demptyv", VERS_CHECK, 10673 },
+    { "dfisht", VERS_CHECK, 10623 },
+    { "dfr", VERS_CHECK, 120097 },
+    { "dharl", VERS_CHECK, 8643 },
+    { "dharr", VERS_CHECK, 8642 },
+    { "diam", VERS_CHECK, 8900 },
+    { "diamond", VERS_CHECK, 8900 },
+    { "diamondsuit", VERS_CHECK, 9830 },
+    { "diams", VERS_FROM40, 9830 },
+    { "die", VERS_CHECK, 168 },
+    { "digamma", VERS_CHECK, 989 },
+    { "disin", VERS_CHECK, 8946 },
+    { "div", VERS_CHECK, 247 },
+    { "divide", VERS_ALL, 247 },
+    { "divideontimes", VERS_CHECK, 8903 },
+    { "divonx", VERS_CHECK, 8903 },
+    { "djcy", VERS_CHECK, 1106 },
+    { "dlcorn", VERS_CHECK, 8990 },
+    { "dlcrop", VERS_CHECK, 8973 },
+    { "dollar", VERS_CHECK, 36 },
+    { "dopf", VERS_CHECK, 120149 },
+    { "dot", VERS_CHECK, 729 },
+    { "doteq", VERS_CHECK, 8784 },
+    { "doteqdot", VERS_CHECK, 8785 },
+    { "dotminus", VERS_CHECK, 8760 },
+    { "dotplus", VERS_CHECK, 8724 },
+    { "dotsquare", VERS_CHECK, 8865 },
+    { "doublebarwedge", VERS_CHECK, 8966 },
+    { "downarrow", VERS_CHECK, 8595 },
+    { "downdownarrows", VERS_CHECK, 8650 },
+    { "downharpoonleft", VERS_CHECK, 8643 },
+    { "downharpoonright", VERS_CHECK, 8642 },
+    { "drbkarow", VERS_CHECK, 10512 },
+    { "drcorn", VERS_CHECK, 8991 },
+    { "drcrop", VERS_CHECK, 8972 },
+    { "dscr", VERS_CHECK, 119993 },
+    { "dscy", VERS_CHECK, 1109 },
+    { "dsol", VERS_CHECK, 10742 },
+    { "dstrok", VERS_CHECK, 273 },
+    { "dtdot", VERS_CHECK, 8945 },
+    { "dtri", VERS_CHECK, 9663 },
+    { "dtrif", VERS_CHECK, 9662 },
+    { "duarr", VERS_CHECK, 8693 },
+    { "duhar", VERS_CHECK, 10607 },
+    { "dwangle", VERS_CHECK, 10662 },
+    { "dzcy", VERS_CHECK, 1119 },
+    { "dzigrarr", VERS_CHECK, 10239 },
+    { "eDDot", VERS_CHECK, 10871 },
+    { "eDot", VERS_CHECK, 8785 },
+    { "eacute", VERS_ALL, 233 },
+    { "easter", VERS_CHECK, 10862 },
+    { "ecaron", VERS_CHECK, 283 },
+    { "ecir", VERS_CHECK, 8790 },
+    { "ecirc", VERS_ALL, 234 },
+    { "ecolon", VERS_CHECK, 8789 },
+    { "ecy", VERS_CHECK, 1101 },
+    { "edot", VERS_CHECK, 279 },
+    { "ee", VERS_CHECK, 8519 },
+    { "efDot", VERS_CHECK, 8786 },
+    { "efr", VERS_CHECK, 120098 },
+    { "eg", VERS_CHECK, 10906 },
+    { "egrave", VERS_ALL, 232 },
+    { "egs", VERS_CHECK, 10902 },
+    { "egsdot", VERS_CHECK, 10904 },
+    { "el", VERS_CHECK, 10905 },
+    { "elinters", VERS_CHECK, 9191 },
+    { "ell", VERS_CHECK, 8467 },
+    { "els", VERS_CHECK, 10901 },
+    { "elsdot", VERS_CHECK, 10903 },
+    { "emacr", VERS_CHECK, 275 },
+    { "empty", VERS_FROM40, 8709 },
+    { "emptyset", VERS_CHECK, 8709 },
+    { "emptyv", VERS_CHECK, 8709 },
+    { "emsp", VERS_FROM40, 8195 },
+    { "emsp13", VERS_CHECK, 8196 },
+    { "emsp14", VERS_CHECK, 8197 },
+    { "eng", VERS_CHECK, 331 },
+    { "ensp", VERS_FROM40, 8194 },
+    { "eogon", VERS_CHECK, 281 },
+    { "eopf", VERS_CHECK, 120150 },
+    { "epar", VERS_CHECK, 8917 },
+    { "eparsl", VERS_CHECK, 10723 },
+    { "eplus", VERS_CHECK, 10865 },
+    { "epsi", VERS_CHECK, 949 },
+    { "epsilon", VERS_FROM40, 949 },
+    { "epsiv", VERS_CHECK, 1013 },
+    { "eqcirc", VERS_CHECK, 8790 },
+    { "eqcolon", VERS_CHECK, 8789 },
+    { "eqsim", VERS_CHECK, 8770 },
+    { "eqslantgtr", VERS_CHECK, 10902 },
+    { "eqslantless", VERS_CHECK, 10901 },
+    { "equals", VERS_CHECK, 61 },
+    { "equest", VERS_CHECK, 8799 },
+    { "equiv", VERS_FROM40, 8801 },
+    { "equivDD", VERS_CHECK, 10872 },
+    { "eqvparsl", VERS_CHECK, 10725 },
+    { "erDot", VERS_CHECK, 8787 },
+    { "erarr", VERS_CHECK, 10609 },
+    { "escr", VERS_CHECK, 8495 },
+    { "esdot", VERS_CHECK, 8784 },
+    { "esim", VERS_CHECK, 8770 },
+    { "eta", VERS_FROM40, 951 },
+    { "eth", VERS_ALL, 240 },
+    { "euml", VERS_ALL, 235 },
+    { "euro", VERS_FROM40, 8364 },
+    { "excl", VERS_CHECK, 33 },
+    { "exist", VERS_FROM40, 8707 },
+    { "expectation", VERS_CHECK, 8496 },
+    { "exponentiale", VERS_CHECK, 8519 },
+    { "fallingdotseq", VERS_CHECK, 8786 },
+    { "fcy", VERS_CHECK, 1092 },
+    { "female", VERS_CHECK, 9792 },
+    { "ffilig", VERS_CHECK, 64259 },
+    { "fflig", VERS_CHECK, 64256 },
+    { "ffllig", VERS_CHECK, 64260 },
+    { "ffr", VERS_CHECK, 120099 },
+    { "filig", VERS_CHECK, 64257 },
+    { "flat", VERS_CHECK, 9837 },
+    { "fllig", VERS_CHECK, 64258 },
+    { "fltns", VERS_CHECK, 9649 },
+    { "fnof", VERS_FROM40, 402 },
+    { "fopf", VERS_CHECK, 120151 },
+    { "forall", VERS_FROM40, 8704 },
+    { "fork", VERS_CHECK, 8916 },
+    { "forkv", VERS_CHECK, 10969 },
+    { "fpartint", VERS_CHECK, 10765 },
+    { "frac12", VERS_ALL, 189 },
+    { "frac13", VERS_CHECK, 8531 },
+    { "frac14", VERS_ALL, 188 },
+    { "frac15", VERS_CHECK, 8533 },
+    { "frac16", VERS_CHECK, 8537 },
+    { "frac18", VERS_CHECK, 8539 },
+    { "frac23", VERS_CHECK, 8532 },
+    { "frac25", VERS_CHECK, 8534 },
+    { "frac34", VERS_ALL, 190 },
+    { "frac35", VERS_CHECK, 8535 },
+    { "frac38", VERS_CHECK, 8540 },
+    { "frac45", VERS_CHECK, 8536 },
+    { "frac56", VERS_CHECK, 8538 },
+    { "frac58", VERS_CHECK, 8541 },
+    { "frac78", VERS_CHECK, 8542 },
+    { "frasl", VERS_FROM40, 8260 },
+    { "frown", VERS_CHECK, 8994 },
+    { "fscr", VERS_CHECK, 119995 },
+    { "gE", VERS_CHECK, 8807 },
+    { "gEl", VERS_CHECK, 10892 },
+    { "gacute", VERS_CHECK, 501 },
+    { "gamma", VERS_FROM40, 947 },
+    { "gammad", VERS_CHECK, 989 },
+    { "gap", VERS_CHECK, 10886 },
+    { "gbreve", VERS_CHECK, 287 },
+    { "gcirc", VERS_CHECK, 285 },
+    { "gcy", VERS_CHECK, 1075 },
+    { "gdot", VERS_CHECK, 289 },
+    { "ge", VERS_FROM40, 8805 },
+    { "gel", VERS_CHECK, 8923 },
+    { "geq", VERS_CHECK, 8805 },
+    { "geqq", VERS_CHECK, 8807 },
+    { "geqslant", VERS_CHECK, 10878 },
+    { "ges", VERS_CHECK, 10878 },
+    { "gescc", VERS_CHECK, 10921 },
+    { "gesdot", VERS_CHECK, 10880 },
+    { "gesdoto", VERS_CHECK, 10882 },
+    { "gesdotol", VERS_CHECK, 10884 },
+    { "gesles", VERS_CHECK, 10900 },
+    { "gfr", VERS_CHECK, 120100 },
+    { "gg", VERS_CHECK, 8811 },
+    { "ggg", VERS_CHECK, 8921 },
+    { "gimel", VERS_CHECK, 8503 },
+    { "gjcy", VERS_CHECK, 1107 },
+    { "gl", VERS_CHECK, 8823 },
+    { "glE", VERS_CHECK, 10898 },
+    { "gla", VERS_CHECK, 10917 },
+    { "glj", VERS_CHECK, 10916 },
+    { "gnE", VERS_CHECK, 8809 },
+    { "gnap", VERS_CHECK, 10890 },
+    { "gnapprox", VERS_CHECK, 10890 },
+    { "gne", VERS_CHECK, 10888 },
+    { "gneq", VERS_CHECK, 10888 },
+    { "gneqq", VERS_CHECK, 8809 },
+    { "gnsim", VERS_CHECK, 8935 },
+    { "gopf", VERS_CHECK, 120152 },
+    { "grave", VERS_CHECK, 96 },
+    { "gscr", VERS_CHECK, 8458 },
+    { "gsim", VERS_CHECK, 8819 },
+    { "gsime", VERS_CHECK, 10894 },
+    { "gsiml", VERS_CHECK, 10896 },
+    { "gt", VERS_ALL | VERS_XML, 62 },
+    { "gtcc", VERS_CHECK, 10919 },
+    { "gtcir", VERS_CHECK, 10874 },
+    { "gtdot", VERS_CHECK, 8919 },
+    { "gtlPar", VERS_CHECK, 10645 },
+    { "gtquest", VERS_CHECK, 10876 },
+    { "gtrapprox", VERS_CHECK, 10886 },
+    { "gtrarr", VERS_CHECK, 10616 },
+    { "gtrdot", VERS_CHECK, 8919 },
+    { "gtreqless", VERS_CHECK, 8923 },
+    { "gtreqqless", VERS_CHECK, 10892 },
+    { "gtrless", VERS_CHECK, 8823 },
+    { "gtrsim", VERS_CHECK, 8819 },
+    { "hArr", VERS_FROM40, 8660 },
+    { "hairsp", VERS_CHECK, 8202 },
+    { "half", VERS_CHECK, 189 },
+    { "hamilt", VERS_CHECK, 8459 },
+    { "hardcy", VERS_CHECK, 1098 },
+    { "harr", VERS_FROM40, 8596 },
+    { "harrcir", VERS_CHECK, 10568 },
+    { "harrw", VERS_CHECK, 8621 },
+    { "hbar", VERS_CHECK, 8463 },
+    { "hcirc", VERS_CHECK, 293 },
+    { "hearts", VERS_FROM40, 9829 },
+    { "heartsuit", VERS_CHECK, 9829 },
+    { "hellip", VERS_FROM40, 8230 },
+    { "hercon", VERS_CHECK, 8889 },
+    { "hfr", VERS_CHECK, 120101 },
+    { "hksearow", VERS_CHECK, 10533 },
+    { "hkswarow", VERS_CHECK, 10534 },
+    { "hoarr", VERS_CHECK, 8703 },
+    { "homtht", VERS_CHECK, 8763 },
+    { "hookleftarrow", VERS_CHECK, 8617 },
+    { "hookrightarrow", VERS_CHECK, 8618 },
+    { "hopf", VERS_CHECK, 120153 },
+    { "horbar", VERS_CHECK, 8213 },
+    { "hscr", VERS_CHECK, 119997 },
+    { "hslash", VERS_CHECK, 8463 },
+    { "hstrok", VERS_CHECK, 295 },
+    { "hybull", VERS_CHECK, 8259 },
+    { "hyphen", VERS_CHECK, 8208 },
+    { "iacute", VERS_ALL, 237 },
+    { "ic", VERS_CHECK, 8291 },
+    { "icirc", VERS_ALL, 238 },
+    { "icy", VERS_CHECK, 1080 },
+    { "iecy", VERS_CHECK, 1077 },
+    { "iexcl", VERS_ALL, 161 },
+    { "iff", VERS_CHECK, 8660 },
+    { "ifr", VERS_CHECK, 120102 },
+    { "igrave", VERS_ALL, 236 },
+    { "ii", VERS_CHECK, 8520 },
+    { "iiiint", VERS_CHECK, 10764 },
+    { "iiint", VERS_CHECK, 8749 },
+    { "iinfin", VERS_CHECK, 10716 },
+    { "iiota", VERS_CHECK, 8489 },
+    { "ijlig", VERS_CHECK, 307 },
+    { "imacr", VERS_CHECK, 299 },
+    { "image", VERS_FROM40, 8465 },
+    { "imagline", VERS_CHECK, 8464 },
+    { "imagpart", VERS_CHECK, 8465 },
+    { "imath", VERS_CHECK, 305 },
+    { "imof", VERS_CHECK, 8887 },
+    { "imped", VERS_CHECK, 437 },
+    { "in", VERS_CHECK, 8712 },
+    { "incare", VERS_CHECK, 8453 },
+    { "infin", VERS_FROM40, 8734 },
+    { "infintie", VERS_CHECK, 10717 },
+    { "inodot", VERS_CHECK, 305 },
+    { "int", VERS_FROM40, 8747 },
+    { "intcal", VERS_CHECK, 8890 },
+    { "integers", VERS_CHECK, 8484 },
+    { "intercal", VERS_CHECK, 8890 },
+    { "intlarhk", VERS_CHECK, 10775 },
+    { "intprod", VERS_CHECK, 10812 },
+    { "iocy", VERS_CHECK, 1105 },
+    { "iogon", VERS_CHECK, 303 },
+    { "iopf", VERS_CHECK, 120154 },
+    { "iota", VERS_FROM40, 953 },
+    { "iprod", VERS_CHECK, 10812 },
+    { "iquest", VERS_ALL, 191 },
+    { "iscr", VERS_CHECK, 119998 },
+    { "isin", VERS_FROM40, 8712 },
+    { "isinE", VERS_CHECK, 8953 },
+    { "isindot", VERS_CHECK, 8949 },
+    { "isins", VERS_CHECK, 8948 },
+    { "isinsv", VERS_CHECK, 8947 },
+    { "isinv", VERS_CHECK, 8712 },
+    { "it", VERS_CHECK, 8290 },
+    { "itilde", VERS_CHECK, 297 },
+    { "iukcy", VERS_CHECK, 1110 },
+    { "iuml", VERS_ALL, 239 },
+    { "jcirc", VERS_CHECK, 309 },
+    { "jcy", VERS_CHECK, 1081 },
+    { "jfr", VERS_CHECK, 120103 },
+    { "jmath", VERS_CHECK, 567 },
+    { "jopf", VERS_CHECK, 120155 },
+    { "jscr", VERS_CHECK, 119999 },
+    { "jsercy", VERS_CHECK, 1112 },
+    { "jukcy", VERS_CHECK, 1108 },
+    { "kappa", VERS_FROM40, 954 },
+    { "kappav", VERS_CHECK, 1008 },
+    { "kcedil", VERS_CHECK, 311 },
+    { "kcy", VERS_CHECK, 1082 },
+    { "kfr", VERS_CHECK, 120104 },
+    { "kgreen", VERS_CHECK, 312 },
+    { "khcy", VERS_CHECK, 1093 },
+    { "kjcy", VERS_CHECK, 1116 },
+    { "kopf", VERS_CHECK, 120156 },
+    { "kscr", VERS_CHECK, 120000 },
+    { "lAarr", VERS_CHECK, 8666 },
+    { "lArr", VERS_FROM40, 8656 },
+    { "lAtail", VERS_CHECK, 10523 },
+    { "lBarr", VERS_CHECK, 10510 },
+    { "lE", VERS_CHECK, 8806 },
+    { "lEg", VERS_CHECK, 10891 },
+    { "lHar", VERS_CHECK, 10594 },
+    { "lacute", VERS_CHECK, 314 },
+    { "laemptyv", VERS_CHECK, 10676 },
+    { "lagran", VERS_CHECK, 8466 },
+    { "lambda", VERS_FROM40, 955 },
+    { "lang", VERS_FROM40, 10216 },
+    { "langd", VERS_CHECK, 10641 },
+    { "langle", VERS_CHECK, 10216 },
+    { "lap", VERS_CHECK, 10885 },
+    { "laquo", VERS_ALL, 171 },
+    { "larr", VERS_FROM40, 8592 },
+    { "larrb", VERS_CHECK, 8676 },
+    { "larrbfs", VERS_CHECK, 10527 },
+    { "larrfs", VERS_CHECK, 10525 },
+    { "larrhk", VERS_CHECK, 8617 },
+    { "larrlp", VERS_CHECK, 8619 },
+    { "larrpl", VERS_CHECK, 10553 },
+    { "larrsim", VERS_CHECK, 10611 },
+    { "larrtl", VERS_CHECK, 8610 },
+    { "lat", VERS_CHECK, 10923 },
+    { "latail", VERS_CHECK, 10521 },
+    { "late", VERS_CHECK, 10925 },
+    { "lbarr", VERS_CHECK, 10508 },
+    { "lbbrk", VERS_CHECK, 10098 },
+    { "lbrace", VERS_CHECK, 123 },
+    { "lbrack", VERS_CHECK, 91 },
+    { "lbrke", VERS_CHECK, 10635 },
+    { "lbrksld", VERS_CHECK, 10639 },
+    { "lbrkslu", VERS_CHECK, 10637 },
+    { "lcaron", VERS_CHECK, 318 },
+    { "lcedil", VERS_CHECK, 316 },
+    { "lceil", VERS_FROM40, 8968 },
+    { "lcub", VERS_CHECK, 123 },
+    { "lcy", VERS_CHECK, 1083 },
+    { "ldca", VERS_CHECK, 10550 },
+    { "ldquo", VERS_FROM40, 8220 },
+    { "ldquor", VERS_CHECK, 8222 },
+    { "ldrdhar", VERS_CHECK, 10599 },
+    { "ldrushar", VERS_CHECK, 10571 },
+    { "ldsh", VERS_CHECK, 8626 },
+    { "le", VERS_FROM40, 8804 },
+    { "leftarrow", VERS_CHECK, 8592 },
+    { "leftarrowtail", VERS_CHECK, 8610 },
+    { "leftharpoondown", VERS_CHECK, 8637 },
+    { "leftharpoonup", VERS_CHECK, 8636 },
+    { "leftleftarrows", VERS_CHECK, 8647 },
+    { "leftrightarrow", VERS_CHECK, 8596 },
+    { "leftrightarrows", VERS_CHECK, 8646 },
+    { "leftrightharpoons", VERS_CHECK, 8651 },
+    { "leftrightsquigarrow", VERS_CHECK, 8621 },
+    { "leftthreetimes", VERS_CHECK, 8907 },
+    { "leg", VERS_CHECK, 8922 },
+    { "leq", VERS_CHECK, 8804 },
+    { "leqq", VERS_CHECK, 8806 },
+    { "leqslant", VERS_CHECK, 10877 },
+    { "les", VERS_CHECK, 10877 },
+    { "lescc", VERS_CHECK, 10920 },
+    { "lesdot", VERS_CHECK, 10879 },
+    { "lesdoto", VERS_CHECK, 10881 },
+    { "lesdotor", VERS_CHECK, 10883 },
+    { "lesges", VERS_CHECK, 10899 },
+    { "lessapprox", VERS_CHECK, 10885 },
+    { "lessdot", VERS_CHECK, 8918 },
+    { "lesseqgtr", VERS_CHECK, 8922 },
+    { "lesseqqgtr", VERS_CHECK, 10891 },
+    { "lessgtr", VERS_CHECK, 8822 },
+    { "lesssim", VERS_CHECK, 8818 },
+    { "lfisht", VERS_CHECK, 10620 },
+    { "lfloor", VERS_FROM40, 8970 },
+    { "lfr", VERS_CHECK, 120105 },
+    { "lg", VERS_CHECK, 8822 },
+    { "lgE", VERS_CHECK, 10897 },
+    { "lhard", VERS_CHECK, 8637 },
+    { "lharu", VERS_CHECK, 8636 },
+    { "lharul", VERS_CHECK, 10602 },
+    { "lhblk", VERS_CHECK, 9604 },
+    { "ljcy", VERS_CHECK, 1113 },
+    { "ll", VERS_CHECK, 8810 },
+    { "llarr", VERS_CHECK, 8647 },
+    { "llcorner", VERS_CHECK, 8990 },
+    { "llhard", VERS_CHECK, 10603 },
+    { "lltri", VERS_CHECK, 9722 },
+    { "lmidot", VERS_CHECK, 320 },
+    { "lmoust", VERS_CHECK, 9136 },
+    { "lmoustache", VERS_CHECK, 9136 },
+    { "lnE", VERS_CHECK, 8808 },
+    { "lnap", VERS_CHECK, 10889 },
+    { "lnapprox", VERS_CHECK, 10889 },
+    { "lne", VERS_CHECK, 10887 },
+    { "lneq", VERS_CHECK, 10887 },
+    { "lneqq", VERS_CHECK, 8808 },
+    { "lnsim", VERS_CHECK, 8934 },
+    { "loang", VERS_CHECK, 10220 },
+    { "loarr", VERS_CHECK, 8701 },
+    { "lobrk", VERS_CHECK, 10214 },
+    { "longleftarrow", VERS_CHECK, 10229 },
+    { "longleftrightarrow", VERS_CHECK, 10231 },
+    { "longmapsto", VERS_CHECK, 10236 },
+    { "longrightarrow", VERS_CHECK, 10230 },
+    { "looparrowleft", VERS_CHECK, 8619 },
+    { "looparrowright", VERS_CHECK, 8620 },
+    { "lopar", VERS_CHECK, 10629 },
+    { "lopf", VERS_CHECK, 120157 },
+    { "loplus", VERS_CHECK, 10797 },
+    { "lotimes", VERS_CHECK, 10804 },
+    { "lowast", VERS_FROM40, 8727 },
+    { "lowbar", VERS_CHECK, 95 },
+    { "loz", VERS_FROM40, 9674 },
+    { "lozenge", VERS_CHECK, 9674 },
+    { "lozf", VERS_CHECK, 10731 },
+    { "lpar", VERS_CHECK, 40 },
+    { "lparlt", VERS_CHECK, 10643 },
+    { "lrarr", VERS_CHECK, 8646 },
+    { "lrcorner", VERS_CHECK, 8991 },
+    { "lrhar", VERS_CHECK, 8651 },
+    { "lrhard", VERS_CHECK, 10605 },
+    { "lrm", VERS_FROM40, 8206 },
+    { "lrtri", VERS_CHECK, 8895 },
+    { "lsaquo", VERS_FROM40, 8249 },
+    { "lscr", VERS_CHECK, 120001 },
+    { "lsh", VERS_CHECK, 8624 },
+    { "lsim", VERS_CHECK, 8818 },
+    { "lsime", VERS_CHECK, 10893 },
+    { "lsimg", VERS_CHECK, 10895 },
+    { "lsqb", VERS_CHECK, 91 },
+    { "lsquo", VERS_FROM40, 8216 },
+    { "lsquor", VERS_CHECK, 8218 },
+    { "lstrok", VERS_CHECK, 322 },
+    { "lt", VERS_ALL | VERS_XML, 60 },
+    { "ltcc", VERS_CHECK, 10918 },
+    { "ltcir", VERS_CHECK, 10873 },
+    { "ltdot", VERS_CHECK, 8918 },
+    { "lthree", VERS_CHECK, 8907 },
+    { "ltimes", VERS_CHECK, 8905 },
+    { "ltlarr", VERS_CHECK, 10614 },
+    { "ltquest", VERS_CHECK, 10875 },
+    { "ltrPar", VERS_CHECK, 10646 },
+    { "ltri", VERS_CHECK, 9667 },
+    { "ltrie", VERS_CHECK, 8884 },
+    { "ltrif", VERS_CHECK, 9666 },
+    { "lurdshar", VERS_CHECK, 10570 },
+    { "luruhar", VERS_CHECK, 10598 },
+    { "mDDot", VERS_CHECK, 8762 },
+    { "macr", VERS_ALL, 175 },
+    { "male", VERS_CHECK, 9794 },
+    { "malt", VERS_CHECK, 10016 },
+    { "maltese", VERS_CHECK, 10016 },
+    { "map", VERS_CHECK, 8614 },
+    { "mapsto", VERS_CHECK, 8614 },
+    { "mapstodown", VERS_CHECK, 8615 },
+    { "mapstoleft", VERS_CHECK, 8612 },
+    { "mapstoup", VERS_CHECK, 8613 },
+    { "marker", VERS_CHECK, 9646 },
+    { "mcomma", VERS_CHECK, 10793 },
+    { "mcy", VERS_CHECK, 1084 },
+    { "mdash", VERS_FROM40, 8212 },
+    { "measuredangle", VERS_CHECK, 8737 },
+    { "mfr", VERS_CHECK, 120106 },
+    { "mho", VERS_CHECK, 8487 },
+    { "micro", VERS_ALL, 181 },
+    { "mid", VERS_CHECK, 8739 },
+    { "midast", VERS_CHECK, 42 },
+    { "midcir", VERS_CHECK, 10992 },
+    { "middot", VERS_ALL, 183 },
+    { "minus", VERS_FROM40, 8722 },
+    { "minusb", VERS_CHECK, 8863 },
+    { "minusd", VERS_CHECK, 8760 },
+    { "minusdu", VERS_CHECK, 10794 },
+    { "mlcp", VERS_CHECK, 10971 },
+    { "mldr", VERS_CHECK, 8230 },
+    { "mnplus", VERS_CHECK, 8723 },
+    { "models", VERS_CHECK, 8871 },
+    { "mopf", VERS_CHECK, 120158 },
+    { "mp", VERS_CHECK, 8723 },
+    { "mscr", VERS_CHECK, 120002 },
+    { "mstpos", VERS_CHECK, 8766 },
+    { "mu", VERS_FROM40, 956 },
+    { "multimap", VERS_CHECK, 8888 },
+    { "mumap", VERS_CHECK, 8888 },
+    { "nLeftarrow", VERS_CHECK, 8653 },
+    { "nLeftrightarrow", VERS_CHECK, 8654 },
+    { "nRightarrow", VERS_CHECK, 8655 },
+    { "nVDash", VERS_CHECK, 8879 },
+    { "nVdash", VERS_CHECK, 8878 },
+    { "nabla", VERS_FROM40, 8711 },
+    { "nacute", VERS_CHECK, 324 },
+    { "nap", VERS_CHECK, 8777 },
+    { "napos", VERS_CHECK, 329 },
+    { "napprox", VERS_CHECK, 8777 },
+    { "natur", VERS_CHECK, 9838 },
+    { "natural", VERS_CHECK, 9838 },
+    { "naturals", VERS_CHECK, 8469 },
+    { "nbsp", VERS_ALL, 160 },
+    { "ncap", VERS_CHECK, 10819 },
+    { "ncaron", VERS_CHECK, 328 },
+    { "ncedil", VERS_CHECK, 326 },
+    { "ncong", VERS_CHECK, 8775 },
+    { "ncup", VERS_CHECK, 10818 },
+    { "ncy", VERS_CHECK, 1085 },
+    { "ndash", VERS_FROM40, 8211 },
+    { "ne", VERS_FROM40, 8800 },
+    { "neArr", VERS_CHECK, 8663 },
+    { "nearhk", VERS_CHECK, 10532 },
+    { "nearr", VERS_CHECK, 8599 },
+    { "nearrow", VERS_CHECK, 8599 },
+    { "nequiv", VERS_CHECK, 8802 },
+    { "nesear", VERS_CHECK, 10536 },
+    { "nexist", VERS_CHECK, 8708 },
+    { "nexists", VERS_CHECK, 8708 },
+    { "nfr", VERS_CHECK, 120107 },
+    { "nge", VERS_CHECK, 8817 },
+    { "ngeq", VERS_CHECK, 8817 },
+    { "ngsim", VERS_CHECK, 8821 },
+    { "ngt", VERS_CHECK, 8815 },
+    { "ngtr", VERS_CHECK, 8815 },
+    { "nhArr", VERS_CHECK, 8654 },
+    { "nharr", VERS_CHECK, 8622 },
+    { "nhpar", VERS_CHECK, 10994 },
+    { "ni", VERS_FROM40, 8715 },
+    { "nis", VERS_CHECK, 8956 },
+    { "nisd", VERS_CHECK, 8954 },
+    { "niv", VERS_CHECK, 8715 },
+    { "njcy", VERS_CHECK, 1114 },
+    { "nlArr", VERS_CHECK, 8653 },
+    { "nlarr", VERS_CHECK, 8602 },
+    { "nldr", VERS_CHECK, 8229 },
+    { "nle", VERS_CHECK, 8816 },
+    { "nleftarrow", VERS_CHECK, 8602 },
+    { "nleftrightarrow", VERS_CHECK, 8622 },
+    { "nleq", VERS_CHECK, 8816 },
+    { "nless", VERS_CHECK, 8814 },
+    { "nlsim", VERS_CHECK, 8820 },
+    { "nlt", VERS_CHECK, 8814 },
+    { "nltri", VERS_CHECK, 8938 },
+    { "nltrie", VERS_CHECK, 8940 },
+    { "nmid", VERS_CHECK, 8740 },
+    { "nopf", VERS_CHECK, 120159 },
+    { "not", VERS_ALL, 172 },
+    { "notin", VERS_FROM40, 8713 },
+    { "notinva", VERS_CHECK, 8713 },
+    { "notinvb", VERS_CHECK, 8951 },
+    { "notinvc", VERS_CHECK, 8950 },
+    { "notni", VERS_CHECK, 8716 },
+    { "notniva", VERS_CHECK, 8716 },
+    { "notnivb", VERS_CHECK, 8958 },
+    { "notnivc", VERS_CHECK, 8957 },
+    { "npar", VERS_CHECK, 8742 },
+    { "nparallel", VERS_CHECK, 8742 },
+    { "npolint", VERS_CHECK, 10772 },
+    { "npr", VERS_CHECK, 8832 },
+    { "nprcue", VERS_CHECK, 8928 },
+    { "nprec", VERS_CHECK, 8832 },
+    { "nrArr", VERS_CHECK, 8655 },
+    { "nrarr", VERS_CHECK, 8603 },
+    { "nrightarrow", VERS_CHECK, 8603 },
+    { "nrtri", VERS_CHECK, 8939 },
+    { "nrtrie", VERS_CHECK, 8941 },
+    { "nsc", VERS_CHECK, 8833 },
+    { "nsccue", VERS_CHECK, 8929 },
+    { "nscr", VERS_CHECK, 120003 },
+    { "nshortmid", VERS_CHECK, 8740 },
+    { "nshortparallel", VERS_CHECK, 8742 },
+    { "nsim", VERS_CHECK, 8769 },
+    { "nsime", VERS_CHECK, 8772 },
+    { "nsimeq", VERS_CHECK, 8772 },
+    { "nsmid", VERS_CHECK, 8740 },
+    { "nspar", VERS_CHECK, 8742 },
+    { "nsqsube", VERS_CHECK, 8930 },
+    { "nsqsupe", VERS_CHECK, 8931 },
+    { "nsub", VERS_FROM40, 8836 },
+    { "nsube", VERS_CHECK, 8840 },
+    { "nsubseteq", VERS_CHECK, 8840 },
+    { "nsucc", VERS_CHECK, 8833 },
+    { "nsup", VERS_CHECK, 8837 },
+    { "nsupe", VERS_CHECK, 8841 },
+    { "nsupseteq", VERS_CHECK, 8841 },
+    { "ntgl", VERS_CHECK, 8825 },
+    { "ntilde", VERS_ALL, 241 },
+    { "ntlg", VERS_CHECK, 8824 },
+    { "ntriangleleft", VERS_CHECK, 8938 },
+    { "ntrianglelefteq", VERS_CHECK, 8940 },
+    { "ntriangleright", VERS_CHECK, 8939 },
+    { "ntrianglerighteq", VERS_CHECK, 8941 },
+    { "nu", VERS_FROM40, 957 },
+    { "num", VERS_CHECK, 35 },
+    { "numero", VERS_CHECK, 8470 },
+    { "numsp", VERS_CHECK, 8199 },
+    { "nvDash", VERS_CHECK, 8877 },
+    { "nvHarr", VERS_CHECK, 10500 },
+    { "nvdash", VERS_CHECK, 8876 },
+    { "nvinfin", VERS_CHECK, 10718 },
+    { "nvlArr", VERS_CHECK, 10498 },
+    { "nvrArr", VERS_CHECK, 10499 },
+    { "nwArr", VERS_CHECK, 8662 },
+    { "nwarhk", VERS_CHECK, 10531 },
+    { "nwarr", VERS_CHECK, 8598 },
+    { "nwarrow", VERS_CHECK, 8598 },
+    { "nwnear", VERS_CHECK, 10535 },
+    { "oS", VERS_CHECK, 9416 },
+    { "oacute", VERS_ALL, 243 },
+    { "oast", VERS_CHECK, 8859 },
+    { "ocir", VERS_CHECK, 8858 },
+    { "ocirc", VERS_ALL, 244 },
+    { "ocy", VERS_CHECK, 1086 },
+    { "odash", VERS_CHECK, 8861 },
+    { "odblac", VERS_CHECK, 337 },
+    { "odiv", VERS_CHECK, 10808 },
+    { "odot", VERS_CHECK, 8857 },
+    { "odsold", VERS_CHECK, 10684 },
+    { "oelig", VERS_FROM40, 339 },
+    { "ofcir", VERS_CHECK, 10687 },
+    { "ofr", VERS_CHECK, 120108 },
+    { "ogon", VERS_CHECK, 731 },
+    { "ograve", VERS_ALL, 242 },
+    { "ogt", VERS_CHECK, 10689 },
+    { "ohbar", VERS_CHECK, 10677 },
+    { "ohm", VERS_CHECK, 937 },
+    { "oint", VERS_CHECK, 8750 },
+    { "olarr", VERS_CHECK, 8634 },
+    { "olcir", VERS_CHECK, 10686 },
+    { "olcross", VERS_CHECK, 10683 },
+    { "oline", VERS_FROM40, 8254 },
+    { "olt", VERS_CHECK, 10688 },
+    { "omacr", VERS_CHECK, 333 },
+    { "omega", VERS_FROM40, 969 },
+    { "omicron", VERS_FROM40, 959 },
+    { "omid", VERS_CHECK, 10678 },
+    { "ominus", VERS_CHECK, 8854 },
+    { "oopf", VERS_CHECK, 120160 },
+    { "opar", VERS_CHECK, 10679 },
+    { "operp", VERS_CHECK, 10681 },
+    { "oplus", VERS_FROM40, 8853 },
+    { "or", VERS_FROM40, 8744 },
+    { "orarr", VERS_CHECK, 8635 },
+    { "ord", VERS_CHECK, 10845 },
+    { "order", VERS_CHECK, 8500 },
+    { "orderof", VERS_CHECK, 8500 },
+    { "ordf", VERS_ALL, 170 },
+    { "ordm", VERS_ALL, 186 },
+    { "origof", VERS_CHECK, 8886 },
+    { "oror", VERS_CHECK, 10838 },
+    { "orslope", VERS_CHECK, 10839 },
+    { "orv", VERS_CHECK, 10843 },
+    { "oscr", VERS_CHECK, 8500 },
+    { "oslash", VERS_ALL, 248 },
+    { "osol", VERS_CHECK, 8856 },
+    { "otilde", VERS_ALL, 245 },
+    { "otimes", VERS_FROM40, 8855 },
+    { "otimesas", VERS_CHECK, 10806 },
+    { "ouml", VERS_ALL, 246 },
+    { "ovbar", VERS_CHECK, 9021 },
+    { "par", VERS_CHECK, 8741 },
+    { "para", VERS_ALL, 182 },
+    { "parallel", VERS_CHECK, 8741 },
+    { "parsim", VERS_CHECK, 10995 },
+    { "parsl", VERS_CHECK, 11005 },
+    { "part", VERS_FROM40, 8706 },
+    { "pcy", VERS_CHECK, 1087 },
+    { "percnt", VERS_CHECK, 37 },
+    { "period", VERS_CHECK, 46 },
+    { "permil", VERS_FROM40, 8240 },
+    { "perp", VERS_FROM40, 8869 },
+    { "pertenk", VERS_CHECK, 8241 },
+    { "pfr", VERS_CHECK, 120109 },
+    { "phi", VERS_FROM40, 966 },
+    { "phiv", VERS_CHECK, 981 },
+    { "phmmat", VERS_CHECK, 8499 },
+    { "phone", VERS_CHECK, 9742 },
+    { "pi", VERS_FROM40, 960 },
+    { "pitchfork", VERS_CHECK, 8916 },
+    { "piv", VERS_FROM40, 982 },
+    { "planck", VERS_CHECK, 8463 },
+    { "planckh", VERS_CHECK, 8462 },
+    { "plankv", VERS_CHECK, 8463 },
+    { "plus", VERS_CHECK, 43 },
+    { "plusacir", VERS_CHECK, 10787 },
+    { "plusb", VERS_CHECK, 8862 },
+    { "pluscir", VERS_CHECK, 10786 },
+    { "plusdo", VERS_CHECK, 8724 },
+    { "plusdu", VERS_CHECK, 10789 },
+    { "pluse", VERS_CHECK, 10866 },
+    { "plusmn", VERS_ALL, 177 },
+    { "plussim", VERS_CHECK, 10790 },
+    { "plustwo", VERS_CHECK, 10791 },
+    { "pm", VERS_CHECK, 177 },
+    { "pointint", VERS_CHECK, 10773 },
+    { "popf", VERS_CHECK, 120161 },
+    { "pound", VERS_ALL, 163 },
+    { "pr", VERS_CHECK, 8826 },
+    { "prE", VERS_CHECK, 10931 },
+    { "prap", VERS_CHECK, 10935 },
+    { "prcue", VERS_CHECK, 8828 },
+    { "pre", VERS_CHECK, 10927 },
+    { "prec", VERS_CHECK, 8826 },
+    { "precapprox", VERS_CHECK, 10935 },
+    { "preccurlyeq", VERS_CHECK, 8828 },
+    { "preceq", VERS_CHECK, 10927 },
+    { "precnapprox", VERS_CHECK, 10937 },
+    { "precneqq", VERS_CHECK, 10933 },
+    { "precnsim", VERS_CHECK, 8936 },
+    { "precsim", VERS_CHECK, 8830 },
+    { "prime", VERS_FROM40, 8242 },
+    { "primes", VERS_CHECK, 8473 },
+    { "prnE", VERS_CHECK, 10933 },
+    { "prnap", VERS_CHECK, 10937 },
+    { "prnsim", VERS_CHECK, 8936 },
+    { "prod", VERS_FROM40, 8719 },
+    { "profalar", VERS_CHECK, 9006 },
+    { "profline", VERS_CHECK, 8978 },
+    { "profsurf", VERS_CHECK, 8979 },
+    { "prop", VERS_FROM40, 8733 },
+    { "propto", VERS_CHECK, 8733 },
+    { "prsim", VERS_CHECK, 8830 },
+    { "prurel", VERS_CHECK, 8880 },
+    { "pscr", VERS_CHECK, 120005 },
+    { "psi", VERS_FROM40, 968 },
+    { "puncsp", VERS_CHECK, 8200 },
+    { "qfr", VERS_CHECK, 120110 },
+    { "qint", VERS_CHECK, 10764 },
+    { "qopf", VERS_CHECK, 120162 },
+    { "qprime", VERS_CHECK, 8279 },
+    { "qscr", VERS_CHECK, 120006 },
+    { "quaternions", VERS_CHECK, 8461 },
+    { "quatint", VERS_CHECK, 10774 },
+    { "quest", VERS_CHECK, 63 },
+    { "questeq", VERS_CHECK, 8799 },
+    { "quot", VERS_ALL | VERS_XML, 34 },
+    { "rAarr", VERS_CHECK, 8667 },
+    { "rArr", VERS_FROM40, 8658 },
+    { "rAtail", VERS_CHECK, 10524 },
+    { "rBarr", VERS_CHECK, 10511 },
+    { "rHar", VERS_CHECK, 10596 },
+    { "racute", VERS_CHECK, 341 },
+    { "radic", VERS_FROM40, 8730 },
+    { "raemptyv", VERS_CHECK, 10675 },
+    { "rang", VERS_FROM40, 10217 },
+    { "rangd", VERS_CHECK, 10642 },
+    { "range", VERS_CHECK, 10661 },
+    { "rangle", VERS_CHECK, 10217 },
+    { "raquo", VERS_ALL, 187 },
+    { "rarr", VERS_FROM40, 8594 },
+    { "rarrap", VERS_CHECK, 10613 },
+    { "rarrb", VERS_CHECK, 8677 },
+    { "rarrbfs", VERS_CHECK, 10528 },
+    { "rarrc", VERS_CHECK, 10547 },
+    { "rarrfs", VERS_CHECK, 10526 },
+    { "rarrhk", VERS_CHECK, 8618 },
+    { "rarrlp", VERS_CHECK, 8620 },
+    { "rarrpl", VERS_CHECK, 10565 },
+    { "rarrsim", VERS_CHECK, 10612 },
+    { "rarrtl", VERS_CHECK, 8611 },
+    { "rarrw", VERS_CHECK, 8605 },
+    { "ratail", VERS_CHECK, 10522 },
+    { "ratio", VERS_CHECK, 8758 },
+    { "rationals", VERS_CHECK, 8474 },
+    { "rbarr", VERS_CHECK, 10509 },
+    { "rbbrk", VERS_CHECK, 10099 },
+    { "rbrace", VERS_CHECK, 125 },
+    { "rbrack", VERS_CHECK, 93 },
+    { "rbrke", VERS_CHECK, 10636 },
+    { "rbrksld", VERS_CHECK, 10638 },
+    { "rbrkslu", VERS_CHECK, 10640 },
+    { "rcaron", VERS_CHECK, 345 },
+    { "rcedil", VERS_CHECK, 343 },
+    { "rceil", VERS_FROM40, 8969 },
+    { "rcub", VERS_CHECK, 125 },
+    { "rcy", VERS_CHECK, 1088 },
+    { "rdca", VERS_CHECK, 10551 },
+    { "rdldhar", VERS_CHECK, 10601 },
+    { "rdquo", VERS_FROM40, 8221 },
+    { "rdquor", VERS_CHECK, 8221 },
+    { "rdsh", VERS_CHECK, 8627 },
+    { "real", VERS_FROM40, 8476 },
+    { "realine", VERS_CHECK, 8475 },
+    { "realpart", VERS_CHECK, 8476 },
+    { "reals", VERS_CHECK, 8477 },
+    { "rect", VERS_CHECK, 9645 },
+    { "reg", VERS_ALL, 174 },
+    { "rfisht", VERS_CHECK, 10621 },
+    { "rfloor", VERS_FROM40, 8971 },
+    { "rfr", VERS_CHECK, 120111 },
+    { "rhard", VERS_CHECK, 8641 },
+    { "rharu", VERS_CHECK, 8640 },
+    { "rharul", VERS_CHECK, 10604 },
+    { "rho", VERS_FROM40, 961 },
+    { "rhov", VERS_CHECK, 1009 },
+    { "rightarrow", VERS_CHECK, 8594 },
+    { "rightarrowtail", VERS_CHECK, 8611 },
+    { "rightharpoondown", VERS_CHECK, 8641 },
+    { "rightharpoonup", VERS_CHECK, 8640 },
+    { "rightleftarrows", VERS_CHECK, 8644 },
+    { "rightleftharpoons", VERS_CHECK, 8652 },
+    { "rightrightarrows", VERS_CHECK, 8649 },
+    { "rightsquigarrow", VERS_CHECK, 8605 },
+    { "rightthreetimes", VERS_CHECK, 8908 },
+    { "ring", VERS_CHECK, 730 },
+    { "risingdotseq", VERS_CHECK, 8787 },
+    { "rlarr", VERS_CHECK, 8644 },
+    { "rlhar", VERS_CHECK, 8652 },
+    { "rlm", VERS_FROM40, 8207 },
+    { "rmoust", VERS_CHECK, 9137 },
+    { "rmoustache", VERS_CHECK, 9137 },
+    { "rnmid", VERS_CHECK, 10990 },
+    { "roang", VERS_CHECK, 10221 },
+    { "roarr", VERS_CHECK, 8702 },
+    { "robrk", VERS_CHECK, 10215 },
+    { "ropar", VERS_CHECK, 10630 },
+    { "ropf", VERS_CHECK, 120163 },
+    { "roplus", VERS_CHECK, 10798 },
+    { "rotimes", VERS_CHECK, 10805 },
+    { "rpar", VERS_CHECK, 41 },
+    { "rpargt", VERS_CHECK, 10644 },
+    { "rppolint", VERS_CHECK, 10770 },
+    { "rrarr", VERS_CHECK, 8649 },
+    { "rsaquo", VERS_FROM40, 8250 },
+    { "rscr", VERS_CHECK, 120007 },
+    { "rsh", VERS_CHECK, 8625 },
+    { "rsqb", VERS_CHECK, 93 },
+    { "rsquo", VERS_FROM40, 8217 },
+    { "rsquor", VERS_CHECK, 8217 },
+    { "rthree", VERS_CHECK, 8908 },
+    { "rtimes", VERS_CHECK, 8906 },
+    { "rtri", VERS_CHECK, 9657 },
+    { "rtrie", VERS_CHECK, 8885 },
+    { "rtrif", VERS_CHECK, 9656 },
+    { "rtriltri", VERS_CHECK, 10702 },
+    { "ruluhar", VERS_CHECK, 10600 },
+    { "rx", VERS_CHECK, 8478 },
+    { "sacute", VERS_CHECK, 347 },
+    { "sbquo", VERS_FROM40, 8218 },
+    { "sc", VERS_CHECK, 8827 },
+    { "scE", VERS_CHECK, 10932 },
+    { "scap", VERS_CHECK, 10936 },
+    { "scaron", VERS_FROM40, 353 },
+    { "sccue", VERS_CHECK, 8829 },
+    { "sce", VERS_CHECK, 10928 },
+    { "scedil", VERS_CHECK, 351 },
+    { "scirc", VERS_CHECK, 349 },
+    { "scnE", VERS_CHECK, 10934 },
+    { "scnap", VERS_CHECK, 10938 },
+    { "scnsim", VERS_CHECK, 8937 },
+    { "scpolint", VERS_CHECK, 10771 },
+    { "scsim", VERS_CHECK, 8831 },
+    { "scy", VERS_CHECK, 1089 },
+    { "sdot", VERS_FROM40, 8901 },
+    { "sdotb", VERS_CHECK, 8865 },
+    { "sdote", VERS_CHECK, 10854 },
+    { "seArr", VERS_CHECK, 8664 },
+    { "searhk", VERS_CHECK, 10533 },
+    { "searr", VERS_CHECK, 8600 },
+    { "searrow", VERS_CHECK, 8600 },
+    { "sect", VERS_ALL, 167 },
+    { "semi", VERS_CHECK, 59 },
+    { "seswar", VERS_CHECK, 10537 },
+    { "setminus", VERS_CHECK, 8726 },
+    { "setmn", VERS_CHECK, 8726 },
+    { "sext", VERS_CHECK, 10038 },
+    { "sfr", VERS_CHECK, 120112 },
+    { "sfrown", VERS_CHECK, 8994 },
+    { "sharp", VERS_CHECK, 9839 },
+    { "shchcy", VERS_CHECK, 1097 },
+    { "shcy", VERS_CHECK, 1096 },
+    { "shortmid", VERS_CHECK, 8739 },
+    { "shortparallel", VERS_CHECK, 8741 },
+    { "shy", VERS_ALL, 173 },
+    { "sigma", VERS_FROM40, 963 },
+    { "sigmaf", VERS_FROM40, 962 },
+    { "sigmav", VERS_CHECK, 962 },
+    { "sim", VERS_FROM40, 8764 },
+    { "simdot", VERS_CHECK, 10858 },
+    { "sime", VERS_CHECK, 8771 },
+    { "simeq", VERS_CHECK, 8771 },
+    { "simg", VERS_CHECK, 10910 },
+    { "simgE", VERS_CHECK, 10912 },
+    { "siml", VERS_CHECK, 10909 },
+    { "simlE", VERS_CHECK, 10911 },
+    { "simne", VERS_CHECK, 8774 },
+    { "simplus", VERS_CHECK, 10788 },
+    { "simrarr", VERS_CHECK, 10610 },
+    { "slarr", VERS_CHECK, 8592 },
+    { "smallsetminus", VERS_CHECK, 8726 },
+    { "smashp", VERS_CHECK, 10803 },
+    { "smeparsl", VERS_CHECK, 10724 },
+    { "smid", VERS_CHECK, 8739 },
+    { "smile", VERS_CHECK, 8995 },
+    { "smt", VERS_CHECK, 10922 },
+    { "smte", VERS_CHECK, 10924 },
+    { "softcy", VERS_CHECK, 1100 },
+    { "sol", VERS_CHECK, 47 },
+    { "solb", VERS_CHECK, 10692 },
+    { "solbar", VERS_CHECK, 9023 },
+    { "sopf", VERS_CHECK, 120164 },
+    { "spades", VERS_FROM40, 9824 },
+    { "spadesuit", VERS_CHECK, 9824 },
+    { "spar", VERS_CHECK, 8741 },
+    { "sqcap", VERS_CHECK, 8851 },
+    { "sqcup", VERS_CHECK, 8852 },
+    { "sqsub", VERS_CHECK, 8847 },
+    { "sqsube", VERS_CHECK, 8849 },
+    { "sqsubset", VERS_CHECK, 8847 },
+    { "sqsubseteq", VERS_CHECK, 8849 },
+    { "sqsup", VERS_CHECK, 8848 },
+    { "sqsupe", VERS_CHECK, 8850 },
+    { "sqsupset", VERS_CHECK, 8848 },
+    { "sqsupseteq", VERS_CHECK, 8850 },
+    { "squ", VERS_CHECK, 9633 },
+    { "square", VERS_CHECK, 9633 },
+    { "squarf", VERS_CHECK, 9642 },
+    { "squf", VERS_CHECK, 9642 },
+    { "srarr", VERS_CHECK, 8594 },
+    { "sscr", VERS_CHECK, 120008 },
+    { "ssetmn", VERS_CHECK, 8726 },
+    { "ssmile", VERS_CHECK, 8995 },
+    { "sstarf", VERS_CHECK, 8902 },
+    { "star", VERS_CHECK, 9734 },
+    { "starf", VERS_CHECK, 9733 },
+    { "straightepsilon", VERS_CHECK, 1013 },
+    { "straightphi", VERS_CHECK, 981 },
+    { "strns", VERS_CHECK, 175 },
+    { "sub", VERS_FROM40, 8834 },
+    { "subE", VERS_CHECK, 10949 },
+    { "subdot", VERS_CHECK, 10941 },
+    { "sube", VERS_FROM40, 8838 },
+    { "subedot", VERS_CHECK, 10947 },
+    { "submult", VERS_CHECK, 10945 },
+    { "subnE", VERS_CHECK, 10955 },
+    { "subne", VERS_CHECK, 8842 },
+    { "subplus", VERS_CHECK, 10943 },
+    { "subrarr", VERS_CHECK, 10617 },
+    { "subset", VERS_CHECK, 8834 },
+    { "subseteq", VERS_CHECK, 8838 },
+    { "subseteqq", VERS_CHECK, 10949 },
+    { "subsetneq", VERS_CHECK, 8842 },
+    { "subsetneqq", VERS_CHECK, 10955 },
+    { "subsim", VERS_CHECK, 10951 },
+    { "subsub", VERS_CHECK, 10965 },
+    { "subsup", VERS_CHECK, 10963 },
+    { "succ", VERS_CHECK, 8827 },
+    { "succapprox", VERS_CHECK, 10936 },
+    { "succcurlyeq", VERS_CHECK, 8829 },
+    { "succeq", VERS_CHECK, 10928 },
+    { "succnapprox", VERS_CHECK, 10938 },
+    { "succneqq", VERS_CHECK, 10934 },
+    { "succnsim", VERS_CHECK, 8937 },
+    { "succsim", VERS_CHECK, 8831 },
+    { "sum", VERS_FROM40, 8721 },
+    { "sung", VERS_CHECK, 9834 },
+    { "sup", VERS_FROM40, 8835 },
+    { "sup1", VERS_ALL, 185 },
+    { "sup2", VERS_ALL, 178 },
+    { "sup3", VERS_ALL, 179 },
+    { "supE", VERS_CHECK, 10950 },
+    { "supdot", VERS_CHECK, 10942 },
+    { "supdsub", VERS_CHECK, 10968 },
+    { "supe", VERS_FROM40, 8839 },
+    { "supedot", VERS_CHECK, 10948 },
+    { "suphsol", VERS_CHECK, 10185 },
+    { "suphsub", VERS_CHECK, 10967 },
+    { "suplarr", VERS_CHECK, 10619 },
+    { "supmult", VERS_CHECK, 10946 },
+    { "supnE", VERS_CHECK, 10956 },
+    { "supne", VERS_CHECK, 8843 },
+    { "supplus", VERS_CHECK, 10944 },
+    { "supset", VERS_CHECK, 8835 },
+    { "supseteq", VERS_CHECK, 8839 },
+    { "supseteqq", VERS_CHECK, 10950 },
+    { "supsetneq", VERS_CHECK, 8843 },
+    { "supsetneqq", VERS_CHECK, 10956 },
+    { "supsim", VERS_CHECK, 10952 },
+    { "supsub", VERS_CHECK, 10964 },
+    { "supsup", VERS_CHECK, 10966 },
+    { "swArr", VERS_CHECK, 8665 },
+    { "swarhk", VERS_CHECK, 10534 },
+    { "swarr", VERS_CHECK, 8601 },
+    { "swarrow", VERS_CHECK, 8601 },
+    { "swnwar", VERS_CHECK, 10538 },
+    { "szlig", VERS_ALL, 223 },
+    { "target", VERS_CHECK, 8982 },
+    { "tau", VERS_FROM40, 964 },
+    { "tbrk", VERS_CHECK, 9140 },
+    { "tcaron", VERS_CHECK, 357 },
+    { "tcedil", VERS_CHECK, 355 },
+    { "tcy", VERS_CHECK, 1090 },
+    { "tdot", VERS_CHECK, 8411 },
+    { "telrec", VERS_CHECK, 8981 },
+    { "tfr", VERS_CHECK, 120113 },
+    { "there4", VERS_FROM40, 8756 },
+    { "therefore", VERS_CHECK, 8756 },
+    { "theta", VERS_FROM40, 952 },
+    { "thetasym", VERS_FROM40, 977 },
+    { "thetav", VERS_CHECK, 977 },
+    { "thickapprox", VERS_CHECK, 8776 },
+    { "thicksim", VERS_CHECK, 8764 },
+    { "thinsp", VERS_FROM40, 8201 },
+    { "thkap", VERS_CHECK, 8776 },
+    { "thksim", VERS_CHECK, 8764 },
+    { "thorn", VERS_ALL, 254 },
+    { "tilde", VERS_FROM40, 732 },
+    { "times", VERS_ALL, 215 },
+    { "timesb", VERS_CHECK, 8864 },
+    { "timesbar", VERS_CHECK, 10801 },
+    { "timesd", VERS_CHECK, 10800 },
+    { "tint", VERS_CHECK, 8749 },
+    { "toea", VERS_CHECK, 10536 },
+    { "top", VERS_CHECK, 8868 },
+    { "topbot", VERS_CHECK, 9014 },
+    { "topcir", VERS_CHECK, 10993 },
+    { "topf", VERS_CHECK, 120165 },
+    { "topfork", VERS_CHECK, 10970 },
+    { "tosa", VERS_CHECK, 10537 },
+    { "tprime", VERS_CHECK, 8244 },
+    { "trade", VERS_FROM40, 8482 },
+    { "triangle", VERS_CHECK, 9653 },
+    { "triangledown", VERS_CHECK, 9663 },
+    { "triangleleft", VERS_CHECK, 9667 },
+    { "trianglelefteq", VERS_CHECK, 8884 },
+    { "triangleq", VERS_CHECK, 8796 },
+    { "triangleright", VERS_CHECK, 9657 },
+    { "trianglerighteq", VERS_CHECK, 8885 },
+    { "tridot", VERS_CHECK, 9708 },
+    { "trie", VERS_CHECK, 8796 },
+    { "triminus", VERS_CHECK, 10810 },
+    { "triplus", VERS_CHECK, 10809 },
+    { "trisb", VERS_CHECK, 10701 },
+    { "tritime", VERS_CHECK, 10811 },
+    { "trpezium", VERS_CHECK, 9186 },
+    { "tscr", VERS_CHECK, 120009 },
+    { "tscy", VERS_CHECK, 1094 },
+    { "tshcy", VERS_CHECK, 1115 },
+    { "tstrok", VERS_CHECK, 359 },
+    { "twixt", VERS_CHECK, 8812 },
+    { "twoheadleftarrow", VERS_CHECK, 8606 },
+    { "twoheadrightarrow", VERS_CHECK, 8608 },
+    { "uArr", VERS_FROM40, 8657 },
+    { "uHar", VERS_CHECK, 10595 },
+    { "uacute", VERS_ALL, 250 },
+    { "uarr", VERS_FROM40, 8593 },
+    { "ubrcy", VERS_CHECK, 1118 },
+    { "ubreve", VERS_CHECK, 365 },
+    { "ucirc", VERS_ALL, 251 },
+    { "ucy", VERS_CHECK, 1091 },
+    { "udarr", VERS_CHECK, 8645 },
+    { "udblac", VERS_CHECK, 369 },
+    { "udhar", VERS_CHECK, 10606 },
+    { "ufisht", VERS_CHECK, 10622 },
+    { "ufr", VERS_CHECK, 120114 },
+    { "ugrave", VERS_ALL, 249 },
+    { "uharl", VERS_CHECK, 8639 },
+    { "uharr", VERS_CHECK, 8638 },
+    { "uhblk", VERS_CHECK, 9600 },
+    { "ulcorn", VERS_CHECK, 8988 },
+    { "ulcorner", VERS_CHECK, 8988 },
+    { "ulcrop", VERS_CHECK, 8975 },
+    { "ultri", VERS_CHECK, 9720 },
+    { "umacr", VERS_CHECK, 363 },
+    { "uml", VERS_ALL, 168 },
+    { "uogon", VERS_CHECK, 371 },
+    { "uopf", VERS_CHECK, 120166 },
+    { "uparrow", VERS_CHECK, 8593 },
+    { "updownarrow", VERS_CHECK, 8597 },
+    { "upharpoonleft", VERS_CHECK, 8639 },
+    { "upharpoonright", VERS_CHECK, 8638 },
+    { "uplus", VERS_CHECK, 8846 },
+    { "upsi", VERS_CHECK, 965 },
+    { "upsih", VERS_FROM40, 978 },
+    { "upsilon", VERS_FROM40, 965 },
+    { "upuparrows", VERS_CHECK, 8648 },
+    { "urcorn", VERS_CHECK, 8989 },
+    { "urcorner", VERS_CHECK, 8989 },
+    { "urcrop", VERS_CHECK, 8974 },
+    { "uring", VERS_CHECK, 367 },
+    { "urtri", VERS_CHECK, 9721 },
+    { "uscr", VERS_CHECK, 120010 },
+    { "utdot", VERS_CHECK, 8944 },
+    { "utilde", VERS_CHECK, 361 },
+    { "utri", VERS_CHECK, 9653 },
+    { "utrif", VERS_CHECK, 9652 },
+    { "uuarr", VERS_CHECK, 8648 },
+    { "uuml", VERS_ALL, 252 },
+    { "uwangle", VERS_CHECK, 10663 },
+    { "vArr", VERS_CHECK, 8661 },
+    { "vBar", VERS_CHECK, 10984 },
+    { "vBarv", VERS_CHECK, 10985 },
+    { "vDash", VERS_CHECK, 8872 },
+    { "vangrt", VERS_CHECK, 10652 },
+    { "varepsilon", VERS_CHECK, 1013 },
+    { "varkappa", VERS_CHECK, 1008 },
+    { "varnothing", VERS_CHECK, 8709 },
+    { "varphi", VERS_CHECK, 981 },
+    { "varpi", VERS_CHECK, 982 },
+    { "varpropto", VERS_CHECK, 8733 },
+    { "varr", VERS_CHECK, 8597 },
+    { "varrho", VERS_CHECK, 1009 },
+    { "varsigma", VERS_CHECK, 962 },
+    { "vartheta", VERS_CHECK, 977 },
+    { "vartriangleleft", VERS_CHECK, 8882 },
+    { "vartriangleright", VERS_CHECK, 8883 },
+    { "vcy", VERS_CHECK, 1074 },
+    { "vdash", VERS_CHECK, 8866 },
+    { "vee", VERS_CHECK, 8744 },
+    { "veebar", VERS_CHECK, 8891 },
+    { "veeeq", VERS_CHECK, 8794 },
+    { "vellip", VERS_CHECK, 8942 },
+    { "verbar", VERS_CHECK, 124 },
+    { "vert", VERS_CHECK, 124 },
+    { "vfr", VERS_CHECK, 120115 },
+    { "vltri", VERS_CHECK, 8882 },
+    { "vopf", VERS_CHECK, 120167 },
+    { "vprop", VERS_CHECK, 8733 },
+    { "vrtri", VERS_CHECK, 8883 },
+    { "vscr", VERS_CHECK, 120011 },
+    { "vzigzag", VERS_CHECK, 10650 },
+    { "wcirc", VERS_CHECK, 373 },
+    { "wedbar", VERS_CHECK, 10847 },
+    { "wedge", VERS_CHECK, 8743 },
+    { "wedgeq", VERS_CHECK, 8793 },
+    { "weierp", VERS_FROM40, 8472 },
+    { "wfr", VERS_CHECK, 120116 },
+    { "wopf", VERS_CHECK, 120168 },
+    { "wp", VERS_CHECK, 8472 },
+    { "wr", VERS_CHECK, 8768 },
+    { "wreath", VERS_CHECK, 8768 },
+    { "wscr", VERS_CHECK, 120012 },
+    { "xcap", VERS_CHECK, 8898 },
+    { "xcirc", VERS_CHECK, 9711 },
+    { "xcup", VERS_CHECK, 8899 },
+    { "xdtri", VERS_CHECK, 9661 },
+    { "xfr", VERS_CHECK, 120117 },
+    { "xhArr", VERS_CHECK, 10234 },
+    { "xharr", VERS_CHECK, 10231 },
+    { "xi", VERS_FROM40, 958 },
+    { "xlArr", VERS_CHECK, 10232 },
+    { "xlarr", VERS_CHECK, 10229 },
+    { "xmap", VERS_CHECK, 10236 },
+    { "xnis", VERS_CHECK, 8955 },
+    { "xodot", VERS_CHECK, 10752 },
+    { "xopf", VERS_CHECK, 120169 },
+    { "xoplus", VERS_CHECK, 10753 },
+    { "xotime", VERS_CHECK, 10754 },
+    { "xrArr", VERS_CHECK, 10233 },
+    { "xrarr", VERS_CHECK, 10230 },
+    { "xscr", VERS_CHECK, 120013 },
+    { "xsqcup", VERS_CHECK, 10758 },
+    { "xuplus", VERS_CHECK, 10756 },
+    { "xutri", VERS_CHECK, 9651 },
+    { "xvee", VERS_CHECK, 8897 },
+    { "xwedge", VERS_CHECK, 8896 },
+    { "yacute", VERS_ALL, 253 },
+    { "yacy", VERS_CHECK, 1103 },
+    { "ycirc", VERS_CHECK, 375 },
+    { "ycy", VERS_CHECK, 1099 },
+    { "yen", VERS_ALL, 165 },
+    { "yfr", VERS_CHECK, 120118 },
+    { "yicy", VERS_CHECK, 1111 },
+    { "yopf", VERS_CHECK, 120170 },
+    { "yscr", VERS_CHECK, 120014 },
+    { "yucy", VERS_CHECK, 1102 },
+    { "yuml", VERS_ALL, 255 },
+    { "zacute", VERS_CHECK, 378 },
+    { "zcaron", VERS_CHECK, 382 },
+    { "zcy", VERS_CHECK, 1079 },
+    { "zdot", VERS_CHECK, 380 },
+    { "zeetrf", VERS_CHECK, 8488 },
+    { "zeta", VERS_FROM40, 950 },
+    { "zfr", VERS_CHECK, 120119 },
+    { "zhcy", VERS_CHECK, 1078 },
+    { "zigrarr", VERS_CHECK, 8669 },
+    { "zopf", VERS_CHECK, 120171 },
+    { "zscr", VERS_CHECK, 120015 },
+    { "zwj", VERS_FROM40, 8205 },
+    { "zwnj", VERS_FROM40, 8204 },
+    { NULL, VERS_UNKNOWN, 0 },
 };
 
-
-/* Pure static implementation.  Trades off lookup speed
+/* 
+** Pure static implementation.  Trades off lookup speed
 ** for faster setup time (well, none actually).
 ** Optimization of comparing 1st character buys enough
 ** speed that hash doesn't improve things without > 500
 ** items in list.
+** Issue #643 - Keep list fully alphabetic for more 
+** optimization, now that the list has grown to 2031
+** entries. Perhaps hashing setup should be now considered.
+**
 */
 static const entity* entitiesLookup( ctmbstr s )
 {
     tmbchar ch = (tmbchar)( s ? *s : 0 );
-    const entity *np;
-    for ( np = entities; ch && np && np->name; ++np )
-        if ( ch == *np->name && TY_(tmbstrcmp)(s, np->name) == 0 )
-            return np;
-    return NULL;
-}
-
-#if 0
-/* entity starting with "&" returns zero on error */
-uint EntityCode( ctmbstr name, uint versions )
-{
-    const entity* np;
-    assert( name && name[0] == '&' );
-
-    /* numeric entitity: name = "&#" followed by number */
-    if ( name[1] == '#' )
+    const entity *np = entities;
+    if (ch == 0)
+        return NULL;
+    while (np->name)
     {
-        uint c = 0;  /* zero on missing/bad number */
-        Bool isXml = ( (versions & VERS_XML) == VERS_XML );
-
-        /* 'x' prefix denotes hexadecimal number format */
-        if ( name[2] == 'x' || (!isXml && name[2] == 'X') )
-            sscanf( name+3, "%x", &c );
-        else
-            sscanf( name+2, "%u", &c );
-
-        return (uint) c;
+        if (ch == *np->name)
+            break;  /* stop when first letter matches */
+        np++;
     }
-
-   /* Named entity: name ="&" followed by a name */
-    if ( NULL != (np = entitiesLookup(name+1)) )
+    while (np->name)
     {
-        /* Only recognize entity name if version supports it.  */
-        if ( np->versions & versions )
-            return np->code;
+        if (ch != *np->name)
+            break;  /* stop when first letter does not match */
+        if (TY_(tmbstrcmp)(s, np->name) == 0)
+            return np;
+        np++;
     }
-
-    return 0;   /* zero signifies unknown entity name */
+    return NULL;
 }
-#endif
 
 Bool TY_(EntityInfo)( ctmbstr name, Bool isXml, uint* code, uint* versions )
 {
@@ -396,7 +2158,14 @@ Bool TY_(EntityInfo)( ctmbstr name, Bool isXml, uint* code, uint* versions )
     return no;
 }
 
-
+/*
+**
+** Issue #643 - Now that the list has been enlarged to 
+** 2031 entries, including multiple case entries for some
+** like &amp; & &AMP;, the value can be repeated several
+** time, so this lookup will now only return the first.
+**
+*/
 ctmbstr TY_(EntityName)( uint ch, uint versions )
 {
     ctmbstr entnam = NULL;
@@ -406,9 +2175,11 @@ ctmbstr TY_(EntityName)( uint ch, uint versions )
     {
         if ( ep->code == ch )
         {
-            if ( ep->versions & versions )
+            if (ep->versions & versions)
+            {
                 entnam = ep->name;
-            break; /* Found code. Stop search. */
+                break; /* Issue #643 - Found code and version. Stop search? */
+            }
         }
     }
     return entnam;
diff --git a/HTMLTidy/vendor/tidy-html5/src/fileio.c b/HTMLTidy/vendor/tidy-html5/src/fileio.c
index 31c4d5b1..61048c0d 100644
--- a/HTMLTidy/vendor/tidy-html5/src/fileio.c
+++ b/HTMLTidy/vendor/tidy-html5/src/fileio.c
@@ -13,9 +13,7 @@
 #include "forward.h"
 #include "fileio.h"
 #include "tidy.h"
-#if !defined(NDEBUG) && defined(_MSC_VER)
 #include "sprtf.h"
-#endif
 
 typedef struct _fp_input_source
 {
@@ -50,8 +48,8 @@ static void TIDY_CALL filesrc_ungetByte( void* sourceData, byte bv )
 }
 
 #if SUPPORT_POSIX_MAPPED_FILES
-#define initFileSource initStdIOFileSource
-#define freeFileSource freeStdIOFileSource
+#  define initFileSource initStdIOFileSource
+#  define freeFileSource freeStdIOFileSource
 #endif
 int TY_(initFileSource)( TidyAllocator *allocator, TidyInputSource* inp, FILE* fp )
 {
@@ -85,8 +83,8 @@ void TIDY_CALL TY_(filesink_putByte)( void* sinkData, byte bv )
 {
   FILE* fout = (FILE*) sinkData;
   fputc( bv, fout );
-#if !defined(NDEBUG) && defined(_MSC_VER)
-  if (_fileno(fout) != 2)
+#if defined(ENABLE_DEBUG_LOG)
+  if (fileno(fout) != 2)
   {
       if (bv != 0x0d)
       {
diff --git a/HTMLTidy/vendor/tidy-html5/src/forward.h b/HTMLTidy/vendor/tidy-html5/src/forward.h
index e5450d52..7f593715 100644
--- a/HTMLTidy/vendor/tidy-html5/src/forward.h
+++ b/HTMLTidy/vendor/tidy-html5/src/forward.h
@@ -34,6 +34,7 @@ typedef struct _TidyDocImpl TidyDocImpl;
 struct _TidyMessageImpl;
 typedef struct _TidyMessageImpl TidyMessageImpl;
 
+/* @todo: this name isn't very instructive! */
 struct _Dict;
 typedef struct _Dict Dict;
 
diff --git a/HTMLTidy/vendor/tidy-html5/src/iconvtc.c b/HTMLTidy/vendor/tidy-html5/src/iconvtc.c
deleted file mode 100644
index 262a4b61..00000000
--- a/HTMLTidy/vendor/tidy-html5/src/iconvtc.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* iconvtc.c -- Interface to iconv transcoding routines
-
-  (c) 1998-2008 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-
-*/
-
-#include "tidy.h"
-#include "forward.h"
-#include "streamio.h"
-
-#ifdef TIDY_ICONV_SUPPORT
-
-#include <iconv.h>
-
-/* maximum number of bytes for a single character */
-#define TC_INBUFSIZE  16
-
-/* maximum number of characters per byte sequence */
-#define TC_OUTBUFSIZE 16
-
-Bool IconvInitInputTranscoder(void)
-{
-    return no;
-}
-
-void IconvUninitInputTranscoder(void)
-{
-    return;
-}
-
-int IconvGetChar(byte firstByte, StreamIn * in, uint * bytesRead)
-{
-    iconv_t cd;
-    TidyInputSource * source;
-    char inbuf[TC_INBUFSIZE] = { 0 };
-    char outbuf[TC_OUTBUFSIZE] = { 0 };
-    size_t inbufsize = 0;
-
-    assert( in != NULL );
-    assert( &in->source != NULL );
-    assert( bytesRead != NULL );
-    assert( in->iconvptr != 0 );
-
-    cd = (iconv_t)in->iconvptr;
-    source = &in->source;
-
-    inbuf[inbufsize++] = (char)firstByte;
-    
-    while(inbufsize < TC_INBUFSIZE)
-    {
-        char * outbufptr = (char*)outbuf;
-        char * inbufptr = (char*)inbuf;
-        size_t readNow = inbufsize;
-        size_t writeNow = TC_OUTBUFSIZE;
-        size_t result = 0;
-        int iconv_errno = 0;
-        int nextByte = EndOfStream;
-
-        result = iconv(cd, (const char**)&inbufptr, &readNow, (char**)&outbufptr, &writeNow);
-        iconv_errno = errno;
-
-        if (result != (size_t)(-1))
-        {
-            int c;
-
-            /* create codepoint from UTF-32LE octets */
-            c = (unsigned char)outbuf[0];
-            c += (unsigned char)outbuf[1] << 8;
-            c += (unsigned char)outbuf[2] << 16;
-            c += (unsigned char)outbuf[3] << 32;
-
-            /* set number of read bytes */
-            *bytesRead = inbufsize;
-
-            return c;
-        }
-
-        assert( iconv_errno != EILSEQ ); /* broken multibyte sequence */
-        assert( iconv_errno != E2BIG );  /* not enough memory         */
-        assert( iconv_errno == EINVAL ); /* incomplete sequence       */
-
-        /* we need more bytes */
-        nextByte = source->getByte(source->sourceData);
-
-        if (nextByte == EndOfStream)
-        {
-            /* todo: error message for broken stream? */
-
-            *bytesRead = inbufsize;
-            return EndOfStream;
-        }
-
-        inbuf[inbufsize++] = (char)nextByte;
-    }
-
-    /* No full character found after reading TC_INBUFSIZE bytes, */
-    /* give up to read this stream, it's obviously unreadable.   */
-
-    /* todo: error message for broken stream? */
-    return EndOfStream;
-}
-
-#endif /* TIDY_ICONV_SUPPORT */
diff --git a/HTMLTidy/vendor/tidy-html5/src/iconvtc.h b/HTMLTidy/vendor/tidy-html5/src/iconvtc.h
deleted file mode 100644
index 1965ca04..00000000
--- a/HTMLTidy/vendor/tidy-html5/src/iconvtc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ICONVTC_H__
-#define __ICONVTC_H__
-#ifdef TIDY_ICONV_SUPPORT
-
-/* iconvtc.h -- Interface to iconv transcoding routines
-
-  (c) 1998-2003 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-
-*/
-
-
-#endif /* TIDY_ICONV_SUPPORT */
-#endif /* __ICONVTC_H__ */
diff --git a/HTMLTidy/vendor/tidy-html5/src/istack.c b/HTMLTidy/vendor/tidy-html5/src/istack.c
index dc708e4b..5097de02 100644
--- a/HTMLTidy/vendor/tidy-html5/src/istack.c
+++ b/HTMLTidy/vendor/tidy-html5/src/istack.c
@@ -10,9 +10,6 @@
 #include "attrs.h"
 #include "streamio.h"
 #include "tmbstr.h"
-#if !defined(NDEBUG) && defined(_MSC_VER)
-#include "sprtf.h"
-#endif
 
 /* duplicate attributes */
 AttVal *TY_(DupAttrs)( TidyDocImpl* doc, AttVal *attrs)
@@ -272,7 +269,7 @@ Node *TY_(InsertedToken)( TidyDocImpl* doc )
     istack = lexer->insert;
 
 /* #if 0 && defined(_DEBUG) */
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if definedENABLE_DEBUG_LOG
     if ( lexer->istacksize == 0 )
     {
         SPRTF( "WARNING: ZERO sized istack!\n" );
diff --git a/HTMLTidy/vendor/tidy-html5/src/language.c b/HTMLTidy/vendor/tidy-html5/src/language.c
index d64fd726..d55938c2 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language.c
+++ b/HTMLTidy/vendor/tidy-html5/src/language.c
@@ -14,6 +14,7 @@
 #include "language_en_gb.h"
 #include "language_es.h"
 #include "language_es_mx.h"
+#include "language_pt_br.h"
 #include "language_zh_cn.h"
 #include "language_fr.h"
 #endif
@@ -23,6 +24,7 @@
  *  This structure type provides universal access to all of Tidy's strings.
  */
 typedef struct {
+    Bool manually_set;
     languageDefinition *currentLanguage;
     languageDefinition *fallbackLanguage;
     languageDefinition *languages[];
@@ -34,6 +36,7 @@ typedef struct {
  *  `.currentLanguage` to language_en, which is Tidy's default language.
  */
 static tidyLanguagesType tidyLanguages = {
+    no,           /* library language was NOT manually set */
     &language_en, /* current language */
     &language_en, /* first fallback language */
     {
@@ -44,6 +47,7 @@ static tidyLanguagesType tidyLanguages = {
         &language_en_gb,
         &language_es,
         &language_es_mx,
+        &language_pt_br,
         &language_zh_cn,
         &language_fr,
 #endif
@@ -293,47 +297,20 @@ ctmbstr TY_(tidyLocalizedString)( uint messageType )
 }
 
 
-/**
- **  Determines the current locale without affecting the C locale.
- **  Tidy has always used the default C locale, and at this point
- **  in its development we're not going to tamper with that.
- **  @param  result The buffer to use to return the string.
- **          Returns NULL on failure.
- **  @return The same buffer for convenience.
- */
-tmbstr TY_(tidySystemLocale)(tmbstr result)
-{
-    ctmbstr temp;
-    
-    /* This should set the OS locale. */
-    setlocale( LC_ALL, "" );
-    
-    /* This should read the current locale. */
-    temp = setlocale( LC_ALL, NULL);
-    
-    /* Make a new copy of the string, because temp
-     always points to the current locale. */
-    if (( result = malloc( strlen( temp ) + 1 ) ))
-        strcpy(result, temp);
-    
-    /* This should restore the C locale. */
-    setlocale( LC_ALL, "C" );
-    
-    return result;
-}
-
-
 /**
  *  Retrieves the POSIX name for a string. Result is a static char so please
  *  don't try to free it. If the name looks like a cc_ll identifier, we will
  *  return it if there's no other match.
+ *  @note this routine uses default allocator, see tidySetMallocCall.
  */
 tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
 {
     uint i;
     uint len;
     static char result[6] = "xx_yy";
-    tmbstr search = strdup(locale);
+    TidyAllocator * allocator = &TY_(g_default_allocator);
+
+    tmbstr search = TY_(tmbstrdup)( allocator, locale );
     search = TY_(tmbstrtolower)(search);
     
     /* See if our string matches a Windows name. */
@@ -341,8 +318,8 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
     {
         if ( strcmp( localeMappings[i].winName, search ) == 0 )
         {
-            free(search);
-            search = strdup(localeMappings[i].POSIXName);
+            TidyFree( allocator, search );
+            search = TY_(tmbstrdup)( allocator, localeMappings[i].POSIXName );
             break;
         }
     }
@@ -374,7 +351,7 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
         }
     }
     
-    free( search );
+    TidyFree( allocator, search );
     return result;
 }
 
@@ -476,6 +453,26 @@ ctmbstr TY_(tidyGetLanguage)()
 }
 
 
+/**
+ *  Indicates whether or not the current language was set by a
+ *  LibTidy user (yes) or internally by the library (no).
+ */
+Bool TY_(tidyGetLanguageSetByUser)()
+{
+    return tidyLanguages.manually_set;
+}
+
+
+/**
+ *  Specifies to LibTidy that the user (rather than the library)
+ *  selected the current language.
+ */
+void TY_(tidySetLanguageSetByUser)( void )
+{
+    tidyLanguages.manually_set = yes;
+}
+
+
 /**
  *  Provides a string given `messageType` in the default
  *  localization (which is `en`), for single plural form.
diff --git a/HTMLTidy/vendor/tidy-html5/src/language.h b/HTMLTidy/vendor/tidy-html5/src/language.h
index 5419df66..c8542b5d 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language.h
@@ -113,7 +113,27 @@ Bool TY_(tidySetLanguage)( ctmbstr languageCode );
 /**
  *  Gets the current language used by Tidy.
  */
-ctmbstr TY_(tidyGetLanguage)();
+ctmbstr TY_(tidyGetLanguage)(void);
+
+
+/**
+ *  Indicates whether or not the current language was set by a
+ *  LibTidy user or internally by the library. This flag prevents
+ *  subsequently created instances of TidyDocument from changing the
+ *  user's language.
+ *  @returns Returns yes to indicate that the current language was
+ *    specified by an API user.
+ */
+Bool TY_(tidyGetLanguageSetByUser)(void);
+
+
+/**
+ *  Specifies to LibTidy that the user (rather than the library)
+ *  selected the current language. This flag prevents subsequently
+ *  created instances of TidyDocument from changing the user's language.
+ */
+void TY_(tidySetLanguageSetByUser)( void );
+
 
 /**
  *  Provides a string given `messageType` in the current
@@ -145,7 +165,7 @@ ctmbstr TY_(tidyDefaultString)( uint messageType );
  *  these are provided for documentation generation purposes
  *  and probably aren't useful for LibTidy implementors.
  */
-TidyIterator TY_(getStringKeyList)();
+TidyIterator TY_(getStringKeyList)(void);
 
 /*
  *  Provides the next key value in Tidy's list of localized
@@ -160,7 +180,7 @@ uint TY_(getNextStringKey)( TidyIterator* iter );
  *  in Tidy's structure of Windows<->POSIX local mapping.
  *  Items can be retrieved with getNextWindowsLanguage();
  */
-TidyIterator TY_(getWindowsLanguageList)();
+TidyIterator TY_(getWindowsLanguageList)(void);
 
 /**
  *  Returns the next record of type `localeMapItem` in
@@ -183,7 +203,7 @@ const ctmbstr TY_(TidyLangPosixName)( const tidyLocaleMapItemImpl *item );
  *  in Tidy's list of installed language codes.
  *  Items can be retrieved with getNextInstalledLanguage();
  */
-TidyIterator TY_(getInstalledLanguageList)();
+TidyIterator TY_(getInstalledLanguageList)(void);
 
 /**
  *  Returns the next installed language.
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_en.h b/HTMLTidy/vendor/tidy-html5/src/language_en.h
index 8628e9b5..c84a7d8b 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language_en.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language_en.h
@@ -197,29 +197,26 @@ static languageDefinition language_en = { whichPluralForm_en, {
       - The strings "Tidy" and "HTML Tidy" are the program name and must not
       be translated. */
         TidyCharEncoding,             0,
-        "This option specifies the character encoding Tidy uses for both the input "
-        "and output. "
+        "This option specifies the character encoding Tidy uses for input, and "
+        "when set, automatically chooses an appropriate character encoding to "
+        "be used for output. The output encoding Tidy chooses may be different "
+        "from the input encoding. "
         "<br/>"
-        "For <var>ascii</var> Tidy will accept Latin-1 (ISO-8859-1) character "
-        "values, but will use entities for all characters whose value &gt;127. "
+        "For <var>ascii</var>, <var>latin0</var>, <var>ibm858</var>, "
+        "<var>mac</var>, and <var>win1252</var> input encodings, the "
+        "<code>output-encoding</code> option will automatically be set to "
+        "<var>ascii</var>. You can set <code>output-encoding</code> manually "
+        "to override this. "
         "<br/>"
-        "For <var>raw</var>, Tidy will output values above 127 without "
-        "translating them into entities. "
+        "For other input encodings, the <code>output-encoding</code> option "
+        "will automatically be set to the the same value. "
         "<br/>"
-        "For <var>latin1</var>, characters above 255 will be written as entities. "
+        "Regardless of the preset value, you can set "
+        "<code>output-encoding</code> manually to override this. "
         "<br/>"
-        "For <var>utf8</var>, Tidy assumes that both input and output are encoded "
-        "as UTF-8. "
-        "<br/>"
-        "You can use <var>iso2022</var> for files encoded using the ISO-2022 "
-        "family of encodings e.g. ISO-2022-JP. "
-        "<br/>"
-        "For <var>mac</var> and <var>win1252</var>, Tidy will accept vendor "
-        "specific character values, but will use entities for all characters whose "
-        "value &gt;127. "
-        "<br/>"
-        "For unsupported encodings, use an external utility to convert to and from "
-        "UTF-8. "
+        "Tidy is not an encoding converter. Although the Latin and UTF "
+        "encodings can be mixed freely, it is not possible to convert Asian "
+        "encodings to Latin encodings with Tidy. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -285,7 +282,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "<code>&lt;!DOCTYPE html&gt;</code>."
         "<br/>"
         "If set to <var>auto</var> (the default) Tidy will use an educated guess "
-        "based upon the contents of the document."
+        "based upon the contents of the document. Note that selecting this option "
+        "will <em>not</em> change the current document's DOCTYPE on output. "
         "<br/>"
         "If set to <var>strict</var>, Tidy will set the DOCTYPE to the HTML4 or "
         "XHTML1 strict DTD."
@@ -476,10 +474,14 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies if Tidy should replace unexpected hyphens with "
         "<code>=</code> characters when it comes across adjacent hyphens. "
         "<br/>"
-        "The default is <var>yes</var>. "
+        "The default is <var>auto</var> will which will act as <var>no</var> "
+        "for HTML5 document types, and <var>yes</var> for all other document "
+        "types. "
         "<br/>"
-        "This option is provided for users of Cold Fusion which uses the "
-        "comment syntax: <code>&lt;!--- ---&gt;</code>. "
+        "HTML has abandonded SGML comment syntax, and allows adjacent hypens "
+        "for all versions of HTML, although XML and XHTML do not. If you plan "
+        "to support older browsers that require SGML comment syntax, then "
+        "consider setting this value to <var>yes</var>."
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -554,8 +556,25 @@ static languageDefinition language_en = { whichPluralForm_en, {
       - The strings "Tidy" and "HTML Tidy" are the program name and must not
       be translated. */
         TidyInCharEncoding,           0,
-        "This option specifies the character encoding Tidy uses for the input. See "
-        "<code>char-encoding</code> for more info. "
+        "This option specifies the character encoding Tidy uses for input. "
+        "Tidy makes certain assumptions about some of the input encodings. "
+        "<br/>"
+        "For <var>ascii</var>, Tidy will accept Latin-1 (ISO-8859-1) character "
+        "values and convert them to entities as necessary. "
+        "<br/>"
+        "For <var>raw</var>, Tidy will make no assumptions about the character "
+        "values and will pass them unchanged to output. "
+        "<br/>"
+        "For <var>mac</var> and <var>win1252</var>, vendor specific characters "
+        "values will be accepted and converted to entities as necessary. "
+        "<br/>"
+        "Asian encodings such as <var>iso2022</var> will be handled "
+        "appropriately assuming the corresponding <code>output-encoding</code> "
+        "is also specified. "
+        "<br/>"
+        "Tidy is not an encoding converter. Although the Latin and UTF "
+        "encodings can be mixed freely, it is not possible to convert Asian "
+        "encodings to Latin encodings with Tidy. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -680,6 +699,27 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "<br/>"
         "Note this feature is not supported on some platforms. "
     },
+    {/* Important notes for translators:
+     - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+     <br/>.
+     - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+     - Option values should be enclosed in <var></var>.
+     - It's very important that <br/> be self-closing!
+     - The strings "Tidy" and "HTML Tidy" are the program name and must not
+     be translated. */
+        TidyKeepTabs,            0,
+        "With the default <var>no</var> Tidy will replace all source tabs with spaces, "
+        "controlled by the option <code>tab-size</code>, and the current line offset. "
+        "Of course, except in the special blocks/elements enumerated below, this will later "
+        "be reduced to just one space. "
+        "<br/>"
+        "If set <var>yes</var> this option specifies Tidy should keep certain tabs "
+        "found in the source, but only "
+        "in preformatted blocks like <code>&lt;pre&gt;</code>, and other CDATA elements like "
+        "<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, and other pseudo elements like "
+        "<code>&lt;?php ... ?&gt;</code>. As always, all other tabs, or sequences of tabs, in "
+        "the source will continue to be replaced with a space. "
+    },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
       <br/>.
@@ -754,9 +794,9 @@ static languageDefinition language_en = { whichPluralForm_en, {
         TidyMakeClean,                0,
         "This option specifies if Tidy should perform cleaning of some legacy "
         "presentational tags (currently <code>&lt;i&gt;</code>, "
-        "<code>&lt;b&gt;</code>, <code>&lt;center&gt;</code> when enclosed within "
-        "appropriate inline tags, and <code>&lt;font&gt;</code>). If set to "
-        "<var>yes</var> then legacy tags will be replaced with CSS "
+        "<code>&lt;b&gt;</code>, <code>&lt;center&gt;</code> when enclosed "
+        "within appropriate inline tags, and <code>&lt;font&gt;</code>). If "
+        "set to <var>yes</var>, then the legacy tags will be replaced with CSS "
         "<code>&lt;style&gt;</code> tags and structural markup as appropriate. "
     },
     {/* Important notes for translators:
@@ -830,7 +870,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "<br/>"
         "The algorithm is identical to the one used by <code>merge-divs</code>. "
     },
-#if SUPPORT_ASIAN_ENCODINGS
     {/* Important notes for translators:
         - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
           <br/>.
@@ -842,7 +881,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TidyNCR,                      0,
         "This option specifies if Tidy should allow numeric character references. "
     },
-#endif
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
       <br/>.
@@ -854,8 +892,9 @@ static languageDefinition language_en = { whichPluralForm_en, {
         TidyNewline,                  0,
         "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). "
+        "Genrally <var>CRLF</var> on PC-DOS, Windows and OS/2; <var>CR</var> "
+        "on Classic Mac OS; and <var>LF</var> everywhere else (Linux, macOS, "
+        "and Unix). "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -907,14 +946,32 @@ static languageDefinition language_en = { whichPluralForm_en, {
       - The strings "Tidy" and "HTML Tidy" are the program name and must not
       be translated. */
         TidyOutCharEncoding,          0,
-        "This option specifies the character encoding Tidy uses for the output. "
+        "This option specifies the character encoding Tidy uses for "
+        "output. Some of the output encodings affect whether or not "
+        "some characters are translated to entities, although in all "
+        "cases, some entities will be written according to other Tidy "
+        "configuration options. "
+        "<br/>"
+        "For <var>ascii</var>, <var>mac</var>, and <var>win1252</var> "
+        "output encodings, entities will be used for all characters "
+        "with values over 127. "
+        "<br/>"
+        "For <var>raw</var> output, Tidy will write values above 127 "
+        "without translating them to entities. "
+        "<br/>"
+        "Output using <var>latin1</var> will cause Tidy to write "
+        "character values higher than 255 as entities. "
         "<br/>"
-        "Note that this may only be different from <code>input-encoding</code> for "
-        "Latin encodings (<var>ascii</var>, <var>latin0</var>, "
-        "<var>latin1</var>, <var>mac</var>, <var>win1252</var>, "
-        "<var>ibm858</var>)."
+        "The UTF family such as <var>utf8</var> will write output "
+        "in the respective UTF encoding. "
         "<br/>"
-        "See <code>char-encoding</code> for more information"
+        "Asian output encodings such as <var>iso2022</var> will write "
+        "output in the specified encoding, assuming a corresponding "
+        "<code>input-encoding</code> was specified. "
+        "<br/>"
+        "Tidy is not an encoding converter. Although the Latin and UTF "
+        "encodings can be mixed freely, it is not possible to convert Asian "
+        "encodings to Latin encodings with Tidy. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -928,7 +985,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies the output file Tidy uses for markup. Normally "
         "markup is written to <code>stdout</code>. "
     },
-#if SUPPORT_UTF16_ENCODINGS
     {/* Important notes for translators:
         - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
           <br/>.
@@ -949,7 +1005,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "A BOM is always written for XML/XHTML output using UTF-16 output "
         "encodings. "
     },
-#endif
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
       <br/>.
@@ -1005,7 +1060,22 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "<br/>"
         "This option is ignored in XML mode. "
     },
-#if SUPPORT_ASIAN_ENCODINGS
+    {/* Important notes for translators:
+      - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+      <br/>.
+      - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+      - Option values should be enclosed in <var></var>.
+      - It's very important that <br/> be self-closing!
+      - The strings "Tidy" and "HTML Tidy" are the program name and must not
+      be translated. */
+        TidyPriorityAttributes,       0,
+        "This option allows prioritizing the writing of attributes in tidied "
+        "documents, allowing them to written before the other attributes of an "
+        "element. For example, you might specify that <strong>id</strong> and "
+        "<strong>name</strong> are written before every other attribute. "
+        "<br/>"
+        "This option takes a space or comma separated list of attribute names. "
+    },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
       <br/>.
@@ -1018,7 +1088,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies if Tidy should line wrap after some Unicode or "
         "Chinese punctuation characters. "
     },
-#endif
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
       <br/>.
@@ -1028,8 +1097,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
       - The strings "Tidy" and "HTML Tidy" are the program name and must not
       be translated. */
         TidyQuiet,                    0,
-        "This option specifies if Tidy should output the summary of the numbers "
-        "of errors and warnings, or the welcome or informational messages. "
+        "When enabled, this option limits Tidy's non-document output to report "
+        "only document warnings and errors. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -1156,6 +1225,41 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies that Tidy should sort attributes within an element "
         "using the specified sort algorithm. If set to <var>alpha</var>, the "
         "algorithm is an ascending alphabetic sort. "
+        "<br/>"
+        "When used while sorting with <code>priority-attributes</code>, any "
+        "attribute sorting will take place after the priority attributes have "
+        "been output. "
+    },
+    {/* Important notes for translators:
+      - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+      <br/>.
+      - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+      - Option values should be enclosed in <var></var>.
+      - It's very important that <br/> be self-closing!
+      - The strings "Tidy" and "HTML Tidy" are the program name and must not
+      be translated. */
+        TidyMuteReports,           0,
+        "Use this option to prevent Tidy from displaying certain types of "
+        "report output, for example, for conditions that you wish to ignore. "
+        "<br/>"
+        "This option takes a list of one or more keys indicating the message "
+        "type to mute. You can discover these message keys by using the "
+        "<code>mute-id</code> configuration option and examining Tidy's "
+        "output. " 
+    },
+    {/* Important notes for translators:
+      - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+      <br/>.
+      - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+      - Option values should be enclosed in <var></var>.
+      - It's very important that <br/> be self-closing!
+      - The strings "Tidy" and "HTML Tidy" are the program name and must not
+      be translated. */
+        TidyMuteShow,              0,
+        "This option indicates whether or not Tidy should display message ID's "
+        "with each of its error reports. This could be useful if you wanted to "
+        "use the <code>mute</code> configuration option in order to filter "
+        "out certain report messages. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -1233,10 +1337,11 @@ static languageDefinition language_en = { whichPluralForm_en, {
       be translated. */
         TidyUseCustomTags,          0,
         "This option enables the use of tags for autonomous custom elements, "
-        "e.g. &lt;flag-icon&gt; with Tidy. Custom tags are disabled if this "
-        "value is <var>no</var>. Other settings - <var>blocklevel</var>, "
-        "<var>empty</var>, <var>inline</var>, and <var>pre</var> will treat "
-        "<em>all</em> detected custom tags accordingly. "
+        "e.g. <code>&lt;flag-icon&gt;</code> with Tidy. Custom tags are "
+        "disabled if this value is <var>no</var>. Other settings - "
+        "<var>blocklevel</var>, <var>empty</var>, <var>inline</var>, and "
+        "<var>pre</var> will treat <em>all</em> detected custom tags "
+        "accordingly. "
         "<br/>"
         "The use of <code>new-blocklevel-tags</code>, "
         "<code>new-empty-tags</code>, <code>new-inline-tags</code>, or "
@@ -1285,11 +1390,12 @@ static languageDefinition language_en = { whichPluralForm_en, {
       - The strings "Tidy" and "HTML Tidy" are the program name and must not
       be translated. */
         TidyWord2000,                 0,
-        "This option specifies if Tidy should go to great pains to strip out all "
-        "the surplus stuff Microsoft Word 2000 inserts when you save Word "
+        "This option specifies if Tidy should go to great pains to strip out "
+        "all the surplus stuff Microsoft Word 2000 inserts when you save Word "
         "documents as \"Web pages\". It doesn't handle embedded images or VML. "
         "<br/>"
-        "You should consider using Word's \"Save As: Web Page, Filtered\". "
+        "You should consider saving using Word's <strong>Save As...</strong>, "
+        "and choosing <strong>Web Page, Filtered</strong>. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -1352,8 +1458,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "<br/>"
         "Tidy tries to wrap lines so that they do not exceed this length. "
         "<br/>"
-        "Set <code>wrap</code> to <var>0</var>(zero) if you want to disable line "
-        "wrapping. "
+        "Set <code>wrap</code> to <var>0</var> (zero) if you want to disable "
+        "line wrapping. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -1512,19 +1618,45 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "This option specifies if Tidy should use the XML parser rather than the "
         "error correcting HTML parser. "
     },
-
-
-    /********************************************
-     ** TidyConfigCategory enumeration
-     ** @remark enum source TidyConfigCategory
-     ********************************************/
-    { TidyUnknownCategory,          0,   "unknown category!"                                                       },
-    { TidyDiagnostics,              0,   "diagnostics"                                                             },
-    { TidyEncoding,                 0,   "encoding"                                                                },
-    { TidyInternalCategory,         0,   "internal (private)"                                                      },
-    { TidyMarkup,                   0,   "markup"                                                                  },
-    { TidyMiscellaneous,            0,   "misc"                                                                    },
-    { TidyPrettyPrint,              0,   "print"                                                                   },
+    {/* Important notes for translators:
+        - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+          <br/>.
+        - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+        - Option values should be enclosed in <var></var>.
+        - It's very important that <br/> be self-closing!
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not
+          be translated. */
+      TidyMetaCharset,             0,
+        "This option, when enabled, adds a <code>&lt;meta&gt;</code> element "
+        "and sets the <code>charset</code> attribute to the encoding of the "
+        "document. Set this option to <var>yes</var> to enable it. "
+    },
+    {/* Important notes for translators:
+      - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+      <br/>.
+      - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+      - Option values should be enclosed in <var></var>.
+      - It's very important that <br/> be self-closing!
+      - The strings "Tidy" and "HTML Tidy" are the program name and must not
+        be translated. */
+      TidyShowMetaChange,             0,
+        "This option enables a message whenever Tidy changes the "
+        "<code>content</code> attribute of a meta charset declaration to match "
+        "the encoding of the document. Set this option to <var>yes</var> to "
+        "enable it. "
+    },
+    {/* Important notes for translators:
+     - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
+     <br/>.
+     - Entities, tags, attributes, etc., should be enclosed in <code></code>.
+     - Option values should be enclosed in <var></var>.
+     - It's very important that <br/> be self-closing!
+     - The strings "Tidy" and "HTML Tidy" are the program name and must not
+       be translated. */
+      TidyStyleTags,                  0,
+        "This option specifies if Tidy should move all style tags to the "
+        "head of the document. "
+    },
 
 
     /********************************************
@@ -1538,28 +1670,20 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TidyError,              0,   "Error: "         },
     { TidyBadDocument,        0,   "Document: "      },
     { TidyFatal,              0,   "Panic: "         },
-    { TidyDialogueInfo,       0,   "Information: "   },
     { TidyDialogueSummary,    0,   "Summary: "       },
-    { TidyDialogueDoc,        0,   "Document: "      },
+    { TidyDialogueInfo,       0,   "Information: "   },
+    { TidyDialogueFootnote,   0,   "Footnote: "      },
     
     
     /********************************************
      ** Miscellaneous Strings
      ** @remark enum source TidyStrings
-     ** @rename enum generator FOREACH_MSG_MISC
+     ** @remark enum generator FOREACH_MSG_MISC
      ********************************************/
-    { FILE_CANT_OPEN,               0,   "Can't open \"%s\"\n"                                                     },
-    { FILE_NOT_FILE,                0,   "\"%s\" is not a file!\n"                                                 },
     { LINE_COLUMN_STRING,           0,   "line %d column %d - "                                                    },
-    { STRING_CONTENT_LOOKS,         0,   "Document content looks like %s"                                          },
     {/* For example, "discarding invalid UTF-16 surrogate pair" */
       STRING_DISCARDING,            0,   "discarding"
     },
-    { STRING_DOCTYPE_GIVEN,         0,   "Doctype given is \"%s\""                                                 },
-
-    {/* The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
-      STRING_ERROR_COUNT,           0,   "Tidy found %u %s and %u %s!"
-    },
     { STRING_ERROR_COUNT_ERROR,     0,   "error"                                                                   },
     { STRING_ERROR_COUNT_ERROR,     1,   "errors"                                                                  },
     { STRING_ERROR_COUNT_WARNING,   0,   "warning"                                                                 },
@@ -1568,17 +1692,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
     {/* This is not a formal name and can be translated. */
       STRING_HTML_PROPRIETARY,      0,   "HTML Proprietary"
     },
-    { STRING_MISSING_MALFORMED,     0,   "missing or malformed argument for option: %s"                            },
     { STRING_XML_DECLARATION,       0,   "XML declaration"                                                         },
-    {/* This console output should be limited to 78 characters per line.
-      - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
-      STRING_NEEDS_INTERVENTION,    0,
-        "This document has errors that must be fixed before\n"
-        "using HTML Tidy to generate a tidied up version.\n"
-    },
-    { STRING_NO_ERRORS,             0,   "No warnings or errors were found."                                       },
-    { STRING_NO_SYSID,              0,   "No system identifier in emitted doctype"                                 },
-    { STRING_NOT_ALL_SHOWN,         0,   "Tidy found %u %s and %u %s! Not all warnings/errors were shown."         },
     { STRING_PLAIN_TEXT,            0,   "plain text"                                                              },
     {/* For example, "replacing invalid UTF-8 bytes" */
       STRING_REPLACING,             0,   "replacing"
@@ -1586,7 +1700,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     {/* For example, "you should avoid using the specified encoding." */
       STRING_SPECIFIED,             0,   "specified"
     },
-    { STRING_UNKNOWN_OPTION,        0,   "unknown option: %s"                                                      },
     { TIDYCUSTOMNO_STRING,          0,   "no"                                                                      },
     { TIDYCUSTOMBLOCKLEVEL_STRING,  0,   "block level"                                                             },
     { TIDYCUSTOMEMPTY_STRING,       0,   "empty"                                                                   },
@@ -1595,9 +1708,9 @@ static languageDefinition language_en = { whichPluralForm_en, {
   
     
     /********************************************
-     ** Miscellaneous Strings
+     ** Footnote Strings
      ** @remark enum source TidyStrings
-     ** @rename enum generator FOREACH_DIALOG_MSG
+     ** @rename enum generator FOREACH_FOOTNOTE_MSG
      ********************************************/
     {/* This console output should be limited to 78 characters per line. */
       TEXT_HTML_T_ALGORITHM,        0,
@@ -1716,6 +1829,13 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "doesn't support frames. A frames-based page should always\n"
         "include an alternative layout inside a NOFRAMES element.\n"
     },
+    {/* This console output should be limited to 78 characters per line. */
+      FOOTNOTE_TRIM_EMPTY_ELEMENT,  0,
+        "One or more empty elements were present in the source document but\n"
+        "dropped on output. If these elements are necessary or you don't want\n"
+        "this behavior, then consider setting the option \"drop-empty-elements\"\n"
+        "to no.\n"
+    },
     {/* This console output should be limited to 78 characters per line.
         - The URL should not be translated unless you find a matching URL in your language. */
       TEXT_ACCESS_ADVICE1,          0,
@@ -1757,8 +1877,28 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TEXT_USING_BODY,              0,
         "You are recommended to use CSS to specify page and link colors"
     },
+    
+    /********************************************
+     ** Miscellaneous Dialogue Strings
+     ** @remark enum source TidyStrings
+     ** @rename enum generator FOREACH_DIALOG_MSG
+     ********************************************/
+    { STRING_CONTENT_LOOKS,         0,   "Document content looks like %s"                                          },
+    { STRING_DOCTYPE_GIVEN,         0,   "Doctype given is \"%s\""                                                 },
+    {/* The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
+      STRING_ERROR_COUNT,           0,   "Tidy found %u %s and %u %s!\n"
+    },
     {/* This console output should be limited to 78 characters per line.
-        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
+      - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
+      STRING_NEEDS_INTERVENTION,    0,
+        "This document has errors that must be fixed before\n"
+        "using HTML Tidy to generate a tidied up version.\n"
+    },
+    { STRING_NO_ERRORS,             0,   "No warnings or errors were found.\n"                                     },
+    { STRING_NO_SYSID,              0,   "No system identifier in emitted doctype"                                 },
+    { STRING_NOT_ALL_SHOWN,         0,   "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n"       },
+    {/* This console output should be limited to 78 characters per line.
+      - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
       TEXT_GENERAL_INFO,            0,
         "About HTML Tidy: https://github.com/htacg/tidy-html5\n"
         "Bug reports and comments: https://github.com/htacg/tidy-html5/issues\n"
@@ -1776,124 +1916,123 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md"
     },
     
-    
+
     /********************************************
      ** Report Output
      ** @remark enum source TidyStrings
-     ** @rename enum generator FOREACH_DIALOG_MSG
-     ********************************************/
-    { ANCHOR_NOT_UNIQUE,            0,   "%s anchor \"%s\" already defined"                                        }, /* ReportAttrError */
-    { ATTR_VALUE_NOT_LCASE,         0,   "%s attribute value \"%s\" must be lower case for XHTML"                  }, /* ReportAttrError */
-    { ATTRIBUTE_IS_NOT_ALLOWED,     0,   "%s attribute \"is\" not allowed for autonomous custom tags."             }, /* ReportAttrError */
-    { BACKSLASH_IN_URI,             0,   "%s URI reference contains backslash. Typo?"                              }, /* ReportAttrError */
-    { BAD_ATTRIBUTE_VALUE_REPLACED, 0,   "%s attribute \"%s\" had invalid value \"%s\" and has been replaced"      }, /* ReportAttrError */
-    { BAD_ATTRIBUTE_VALUE,          0,   "%s attribute \"%s\" has invalid value \"%s\""                            }, /* ReportAttrError */
-    { ESCAPED_ILLEGAL_URI,          0,   "%s escaping malformed URI reference"                                     }, /* ReportAttrError */
-    { FIXED_BACKSLASH,              0,   "%s converting backslash in URI to slash"                                 }, /* ReportAttrError */
-    { ID_NAME_MISMATCH,             0,   "%s id and name attribute value mismatch"                                 }, /* ReportAttrError */
-    { ILLEGAL_URI_CODEPOINT,        0,   "%s illegal characters found in URI"                                      }, /* ReportAttrError */
-    { ILLEGAL_URI_REFERENCE,        0,   "%s improperly escaped URI reference"                                     }, /* ReportAttrError */
-    { INSERTING_AUTO_ATTRIBUTE,     0,   "%s inserting \"%s\" attribute using value \"%s\""                        }, /* ReportAttrError */
-    { INVALID_ATTRIBUTE,            0,   "%s attribute name \"%s\" (value=\"%s\") is invalid"                      }, /* ReportAttrError */
-    { INVALID_XML_ID,               0,   "%s cannot copy name attribute to id"                                     }, /* ReportAttrError */
-    { JOINING_ATTRIBUTE,            0,   "%s joining values of repeated attribute \"%s\""                          }, /* ReportAttrError */
-    { MISMATCHED_ATTRIBUTE_ERROR,   0,   "%s attribute \"%s\" not allowed for %s"                                  }, /* ReportAttrError */
-    { MISMATCHED_ATTRIBUTE_WARN,    0,   "%s attribute \"%s\" not allowed for %s"                                  }, /* ReportAttrError */
-    { MISSING_ATTR_VALUE,           0,   "%s attribute \"%s\" lacks value"                                         }, /* ReportAttrError */
-    { MISSING_IMAGEMAP,             0,   "%s should use client-side image map"                                     }, /* ReportAttrError */
-    { MISSING_QUOTEMARK,            0,   "%s attribute with missing trailing quote mark"                           }, /* ReportAttrError */
-    { NEWLINE_IN_URI,               0,   "%s discarding newline in URI reference"                                  }, /* ReportAttrError */
-    { PROPRIETARY_ATTR_VALUE,       0,   "%s proprietary attribute value \"%s\""                                   }, /* ReportAttrError */
-    { PROPRIETARY_ATTRIBUTE,        0,   "%s proprietary attribute \"%s\""                                         }, /* ReportAttrError */
-    { REPEATED_ATTRIBUTE,           0,   "%s dropping value \"%s\" for repeated attribute \"%s\""                  }, /* ReportAttrError */
-    { UNEXPECTED_END_OF_FILE_ATTR,  0,   "%s end of file while parsing attributes"                                 }, /* ReportAttrError */
-    { UNEXPECTED_EQUALSIGN,         0,   "%s unexpected '=', expected attribute name"                              }, /* ReportAttrError */
-    { UNEXPECTED_GT,                0,   "%s missing '>' for end of tag"                                           }, /* ReportAttrError */
-    { UNEXPECTED_QUOTEMARK,         0,   "%s unexpected or duplicate quote mark"                                   }, /* ReportAttrError */
-    { WHITE_IN_URI,                 0,   "%s discarding whitespace in URI reference"                               }, /* ReportAttrError */
-    { XML_ATTRIBUTE_VALUE,          0,   "%s has XML attribute \"%s\""                                             }, /* ReportAttrError */
-    { XML_ID_SYNTAX,                0,   "%s ID \"%s\" uses XML ID syntax"                                         }, /* ReportAttrError */
-    
-    { INVALID_NCR,                  0,   "%s invalid numeric character reference %s"                               }, /* ReportEncodingError */
-    { INVALID_SGML_CHARS,           0,   "%s invalid character code %s"                                            }, /* ReportEncodingError */
-    { INVALID_UTF16,                0,   "%s invalid UTF-16 surrogate pair (char. code %s)"                        }, /* ReportEncodingError */
-    { INVALID_UTF8,                 0,   "%s invalid UTF-8 bytes (char. code %s)"                                  }, /* ReportEncodingError */
-    { VENDOR_SPECIFIC_CHARS,        0,   "%s invalid character code %s"                                            }, /* ReportEncodingError */
-    
-    { ENCODING_MISMATCH,            0,   "specified input encoding (%s) does not match actual input encoding (%s)" }, /* ReportEncodingWarning */
-    
-    { APOS_UNDEFINED,               0,   "named entity &apos; only defined in XML/XHTML"                           }, /* ReportEntityError */
-    { MISSING_SEMICOLON_NCR,        0,   "numeric character reference \"%s\" doesn't end in ';'"                   }, /* ReportEntityError */
-    { MISSING_SEMICOLON,            0,   "entity \"%s\" doesn't end in ';'"                                        }, /* ReportEntityError */
-    { UNESCAPED_AMPERSAND,          0,   "unescaped & which should be written as &amp;"                            }, /* ReportEntityError */
-    { UNKNOWN_ENTITY,               0,   "unescaped & or unknown entity \"%s\""                                    }, /* ReportEntityError */
-    
-    { BAD_CDATA_CONTENT,            0,   "'<' + '/' + letter not allowed here"                                     }, /* ReportError */
-    { BAD_COMMENT_CHARS,            0,   "expecting -- or >"                                                       }, /* ReportError */
-    { BAD_XML_COMMENT,              0,   "XML comments can't contain --"                                           }, /* ReportError */
-    { CANT_BE_NESTED,               0,   "%s can't be nested"                                                      }, /* ReportError */
-    { CONTENT_AFTER_BODY,           0,   "content occurs after end of body"                                        }, /* ReportError */
-    { DISCARDING_UNEXPECTED,        0,   "discarding unexpected %s"                                                }, /* ReportError */
-    { DOCTYPE_AFTER_TAGS,           0,   "<!DOCTYPE> isn't allowed after elements"                                 }, /* ReportError */
-    { DTYPE_NOT_UPPER_CASE,         0,   "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"                         }, /* ReportError */
-    { ELEMENT_VERS_MISMATCH_ERROR,  0,   "%s element not available in %s"                                          }, /* ReportError */
-    { ELEMENT_VERS_MISMATCH_WARN,   0,   "%s element not available in %s"                                          }, /* ReportError */
-    { ENCODING_IO_CONFLICT,         0,   "Output encoding does not work with standard output"                      }, /* ReportError */
-    { ILLEGAL_NESTING,              0,   "%s shouldn't be nested"                                                  }, /* ReportError */
-    { INCONSISTENT_NAMESPACE,       0,   "HTML namespace doesn't match content"                                    }, /* ReportError */
-    { INCONSISTENT_VERSION,         0,   "HTML DOCTYPE doesn't match content"                                      }, /* ReportError */
-    { INSERTING_TAG,                0,   "inserting implicit <%s>"                                                 }, /* ReportError */
-    { MALFORMED_COMMENT,            0,   "adjacent hyphens within comment"                                         }, /* ReportError */
-    { MALFORMED_DOCTYPE,            0,   "discarding malformed <!DOCTYPE>"                                         }, /* ReportError */
-    { MISSING_DOCTYPE,              0,   "missing <!DOCTYPE> declaration"                                          }, /* ReportError */
-    { MISSING_ENDTAG_BEFORE,        0,   "missing </%s> before %s"                                                 }, /* ReportError */
-    { MISSING_ENDTAG_FOR,           0,   "missing </%s>"                                                           }, /* ReportError */
-    { MISSING_STARTTAG,             0,   "missing <%s>"                                                            }, /* ReportError */
-    { MISSING_TITLE_ELEMENT,        0,   "inserting missing 'title' element"                                       }, /* ReportError */
-    { NOFRAMES_CONTENT,             0,   "%s not inside 'noframes' element"                                        }, /* ReportError */
-    { NON_MATCHING_ENDTAG,          0,   "replacing unexpected %s with </%s>"                                      }, /* ReportError */
-    { PREVIOUS_LOCATION,            0,   "<%s> previously mentioned"                                               }, /* ReportError */
-    { PROPRIETARY_ELEMENT,          0,   "%s is not approved by W3C"                                               }, /* ReportError */
-    { REPLACING_UNEX_ELEMENT,       0,   "replacing unexpected %s with %s"                                         }, /* ReportError */
-    { SPACE_PRECEDING_XMLDECL,      0,   "removing whitespace preceding XML Declaration"                           }, /* ReportError */
-    { TAG_NOT_ALLOWED_IN,           0,   "%s isn't allowed in <%s> elements"                                       }, /* ReportError */
-    { TOO_MANY_ELEMENTS_IN,         0,   "too many %s elements in <%s>"                                            }, /* ReportError */
-    { TOO_MANY_ELEMENTS,            0,   "too many %s elements"                                                    }, /* ReportError */
-    { UNESCAPED_ELEMENT,            0,   "unescaped %s in pre content"                                             }, /* ReportError */
-    { USING_BR_INPLACE_OF,          0,   "using <br> in place of %s"                                               }, /* ReportError */
-    
-    { DUPLICATE_FRAMESET,           0,   "repeated FRAMESET element"                                               }, /* ReportFatal */
-    { SUSPECTED_MISSING_QUOTE,      0,   "missing quote mark for attribute value"                                  }, /* ReportFatal */
-    { UNEXPECTED_ENDTAG_IN,         0,   "unexpected </%s> in <%s>"                                                }, /* ReportFatal */
-    { UNKNOWN_ELEMENT_LOOKS_CUSTOM, 0,   "%s is not recognized! Did you mean to enable the custom-tags option?"    }, /* ReportFatal */
-    { UNKNOWN_ELEMENT,              0,   "%s is not recognized!"                                                   }, /* ReportFatal */
-    
-    { MISSING_ATTRIBUTE,            0,   "%s lacks \"%s\" attribute"                                               }, /* ReportMissingAttr */
-    
-    { CUSTOM_TAG_DETECTED,          0,   "detected autonomous custom tag %s; will treat as %s"                     }, /* ReportNotice */
-    { REPLACING_ELEMENT,            0,   "replacing %s with %s"                                                    }, /* ReportNotice */
-    { TRIM_EMPTY_ELEMENT,           0,   "trimming empty %s"                                                       }, /* ReportNotice */
-    
-    { BAD_SURROGATE_LEAD,           0,   "Trailing (Low) surrogate pair U+%04X, with no leading (High) entity, replaced with U+FFFD." }, /* ReportSurrogateError */
-    { BAD_SURROGATE_PAIR,           0,   "Have out-of-range surrogate pair U+%04X:U+%04X, replaced with U+FFFD value."                }, /* ReportSurrogateError */
-    { BAD_SURROGATE_TAIL,           0,   "Leading (High) surrogate pair U+%04X, with no trailing (Low) entity, replaced with U+FFFD." }, /* ReportSurrogateError */
-    
-    { BAD_SUMMARY_HTML5,            0,   "The summary attribute on the %s element is obsolete in HTML5"            }, /* ReportWarning */
-    { COERCE_TO_ENDTAG_WARN,        0,   "<%s> is probably intended as </%s>"                                      }, /* ReportWarning */
-    { NESTED_EMPHASIS,              0,   "nested emphasis %s"                                                      }, /* ReportWarning */
-    { NESTED_QUOTATION,             0,   "nested q elements, possible typo."                                       }, /* ReportWarning */
-    { OBSOLETE_ELEMENT,             0,   "replacing obsolete element %s with %s"                                   }, /* ReportWarning */
-    { REMOVED_HTML5,                0,   "%s element removed from HTML5"                                           }, /* ReportWarning */
-    { XML_DECLARATION_DETECTED,     0,   "An XML declaration was detected. Did you mean to use input-xml?"         }, /* ReportWarning */
-    
-    { COERCE_TO_ENDTAG,             0,   "<%s> is probably intended as </%s>"                                      }, /* ReportError, ReportWarning */
-    { ELEMENT_NOT_EMPTY,            0,   "%s element not empty or not closed"                                      }, /* ReportError, ReportAttrError */
-    { UNEXPECTED_END_OF_FILE,       0,   "unexpected end of file %s"                                               }, /* ReportError, ReportAttrError */
-    { UNEXPECTED_ENDTAG,            0,   "unexpected </%s>"                                                        }, /* ReportError, ReportFatal */
+     ** @rename enum generator FOREACH_REPORT_MSG
+     ********************************************/    
+    { ADDED_MISSING_CHARSET,        0,   "Added appropriate missing <meta charset=...> to %s"                      },
+    { ANCHOR_NOT_UNIQUE,            0,   "%s anchor \"%s\" already defined"                                        },
+    { APOS_UNDEFINED,               0,   "named entity &apos; only defined in XML/XHTML"                           },
+    { ATTR_VALUE_NOT_LCASE,         0,   "%s attribute value \"%s\" must be lower case for XHTML"                  },
+    { ATTRIBUTE_IS_NOT_ALLOWED,     0,   "%s attribute \"is\" not allowed for autonomous custom tags."             },
+    { ATTRIBUTE_VALUE_REPLACED,     0,   "%s attribute \"%s\", incorrect value \"%s\" replaced"                    },
+    { BACKSLASH_IN_URI,             0,   "%s URI reference contains backslash. Typo?"                              },
+    { BAD_ATTRIBUTE_VALUE_REPLACED, 0,   "%s attribute \"%s\" had invalid value \"%s\" and has been replaced"      },
+    { BAD_ATTRIBUTE_VALUE,          0,   "%s attribute \"%s\" has invalid value \"%s\""                            },
+    { BAD_CDATA_CONTENT,            0,   "'<' + '/' + letter not allowed here"                                     },
+    { BAD_SUMMARY_HTML5,            0,   "The summary attribute on the %s element is obsolete in HTML5"            },
+    { BAD_SURROGATE_LEAD,           0,   "Trailing (Low) surrogate pair U+%04X, with no leading (High) entity, replaced with U+FFFD." },
+    { BAD_SURROGATE_PAIR,           0,   "Have out-of-range surrogate pair U+%04X:U+%04X, replaced with U+FFFD value."                },
+    { BAD_SURROGATE_TAIL,           0,   "Leading (High) surrogate pair U+%04X, with no trailing (Low) entity, replaced with U+FFFD." },
+    { CANT_BE_NESTED,               0,   "%s can't be nested"                                                      },
+    { COERCE_TO_ENDTAG,             0,   "<%s> is probably intended as </%s>"                                      },
+    { CONTENT_AFTER_BODY,           0,   "content occurs after end of body"                                        },
+    { CUSTOM_TAG_DETECTED,          0,   "detected autonomous custom tag %s; will treat as %s"                     },
+    { DISCARDING_UNEXPECTED,        0,   "discarding unexpected %s"                                                },
+    { DOCTYPE_AFTER_TAGS,           0,   "<!DOCTYPE> isn't allowed after elements"                                 },
+    { DUPLICATE_FRAMESET,           0,   "repeated FRAMESET element"                                               },
+    { ELEMENT_NOT_EMPTY,            0,   "%s element not empty or not closed"                                      },
+    { ELEMENT_VERS_MISMATCH_ERROR,  0,   "%s element not available in %s"                                          },
+    { ELEMENT_VERS_MISMATCH_WARN,   0,   "%s element not available in %s"                                          },
+    { ENCODING_MISMATCH,            0,   "specified input encoding (%s) does not match actual input encoding (%s)" },
+    { ESCAPED_ILLEGAL_URI,          0,   "%s escaping malformed URI reference"                                     },
+    { FILE_CANT_OPEN,               0,   "Can't open \"%s\"\n"                                                     },
+    { FILE_CANT_OPEN_CFG,           0,   "Can't open configuration file \"%s\"\n"                                  },
+    { FILE_NOT_FILE,                0,   "\"%s\" is not a file!\n"                                                 },
+    { FIXED_BACKSLASH,              0,   "%s converting backslash in URI to slash"                                 },
+    { FOUND_STYLE_IN_BODY,          0,   "found <style> tag in <body>! fix-style-tags: yes to move."               },
+    { ID_NAME_MISMATCH,             0,   "%s id and name attribute value mismatch"                                 },
+    { ILLEGAL_NESTING,              0,   "%s shouldn't be nested"                                                  },
+    { ILLEGAL_URI_CODEPOINT,        0,   "%s illegal characters found in URI"                                      },
+    { ILLEGAL_URI_REFERENCE,        0,   "%s improperly escaped URI reference"                                     },
+    { INSERTING_AUTO_ATTRIBUTE,     0,   "%s inserting \"%s\" attribute using value \"%s\""                        },
+    { INSERTING_TAG,                0,   "inserting implicit <%s>"                                                 },
+    { INVALID_ATTRIBUTE,            0,   "%s attribute name \"%s\" (value=\"%s\") is invalid"                      },
+    { INVALID_NCR,                  0,   "%s invalid numeric character reference %s"                               },
+    { INVALID_SGML_CHARS,           0,   "%s invalid character code %s"                                            },
+    { INVALID_UTF8,                 0,   "%s invalid UTF-8 bytes (char. code %s)"                                  },
+    { INVALID_UTF16,                0,   "%s invalid UTF-16 surrogate pair (char. code %s)"                        },
+    { INVALID_XML_ID,               0,   "%s cannot copy name attribute to id"                                     },
+    { JOINING_ATTRIBUTE,            0,   "%s joining values of repeated attribute \"%s\""                          },
+    { MALFORMED_COMMENT,            0,   "tidy replaced adjacent \"-\" with \"=\""                                 },
+    { MALFORMED_COMMENT_DROPPING,   0,   "dropping a possible comment due to a missing hyphen"                     },
+    { MALFORMED_COMMENT_EOS,        0,   "the end of the document was reached before the end of the comment"       },
+    { MALFORMED_COMMENT_WARN,       0,   "detected adjacent hyphens within the comment; consider fix-bad-comments" },
+    { MALFORMED_DOCTYPE,            0,   "discarding malformed <!DOCTYPE>"                                         },
+    { MISMATCHED_ATTRIBUTE_ERROR,   0,   "%s attribute \"%s\" not allowed for %s"                                  },
+    { MISMATCHED_ATTRIBUTE_WARN,    0,   "%s attribute \"%s\" not allowed for %s"                                  },
+    { MISSING_ATTR_VALUE,           0,   "%s attribute \"%s\" lacks value"                                         },
+    { MISSING_ATTRIBUTE,            0,   "%s lacks \"%s\" attribute"                                               },
+    { MISSING_DOCTYPE,              0,   "missing <!DOCTYPE> declaration"                                          },
+    { MISSING_ENDTAG_BEFORE,        0,   "missing </%s> before %s"                                                 },
+    { MISSING_ENDTAG_FOR,           0,   "missing </%s>"                                                           },
+    { MISSING_ENDTAG_OPTIONAL,      0,   "missing optional end tag </%s>"                                          },
+    { MISSING_IMAGEMAP,             0,   "%s should use client-side image map"                                     },
+    { MISSING_QUOTEMARK,            0,   "%s attribute with missing trailing quote mark"                           },
+    { MISSING_QUOTEMARK_OPEN,       0,   "value for attribute \"%s\" missing quote marks"                          },
+    { MISSING_SEMICOLON_NCR,        0,   "numeric character reference \"%s\" doesn't end in ';'"                   },
+    { MISSING_SEMICOLON,            0,   "entity \"%s\" doesn't end in ';'"                                        },
+    { MISSING_STARTTAG,             0,   "missing <%s>"                                                            },
+    { MISSING_TITLE_ELEMENT,        0,   "inserting missing 'title' element"                                       },
+    { MOVED_STYLE_TO_HEAD,          0,   "moved <style> tag to <head>! fix-style-tags: no to avoid."               },
+    { NESTED_EMPHASIS,              0,   "nested emphasis %s"                                                      },
+    { NESTED_QUOTATION,             0,   "nested q elements, possible typo."                                       },
+    { NEWLINE_IN_URI,               0,   "%s discarding newline in URI reference"                                  },
+    { NOFRAMES_CONTENT,             0,   "%s not inside 'noframes' element"                                        },
+    { NON_MATCHING_ENDTAG,          0,   "replacing unexpected %s with </%s>"                                      },
+    { OBSOLETE_ELEMENT,             0,   "replacing obsolete element %s with %s"                                   },
+    { OPTION_REMOVED,               0,   "option \"%s\" no longer exists, and no replacement could be found."      },
+    { OPTION_REMOVED_APPLIED,       0,   "option \"%s\" replaced with \"%s\", which Tidy has set to \"%s\"."       },
+    { OPTION_REMOVED_UNAPPLIED,     0,   "option \"%s\" replaced with \"%s\", but Tidy could not set it for you."  },
+    { PREVIOUS_LOCATION,            0,   "<%s> previously mentioned"                                               },
+    { PROPRIETARY_ATTR_VALUE,       0,   "%s proprietary attribute value \"%s\""                                   },
+    { PROPRIETARY_ATTRIBUTE,        0,   "%s proprietary attribute \"%s\""                                         },
+    { PROPRIETARY_ELEMENT,          0,   "%s is not approved by W3C"                                               },
+    { REMOVED_HTML5,                0,   "%s element removed from HTML5"                                           },
+    { REPEATED_ATTRIBUTE,           0,   "%s dropping value \"%s\" for repeated attribute \"%s\""                  },
+    { REPLACING_ELEMENT,            0,   "replacing %s with %s"                                                    },
+    { REPLACING_UNEX_ELEMENT,       0,   "replacing unexpected %s with %s"                                         },
+    { SPACE_PRECEDING_XMLDECL,      0,   "removing whitespace preceding XML Declaration"                           },
+    { STRING_ARGUMENT_BAD,          0,   "option \"%s\" given bad argument \"%s\""                                 },
+    { STRING_MISSING_MALFORMED,     0,   "missing or malformed argument for option: %s"                            },
+    { STRING_MUTING_TYPE,           0,   "messages of type \"%s\" will not be output"                              },
+    { STRING_UNKNOWN_OPTION,        0,   "unknown option: %s"                                                      },
+    { SUSPECTED_MISSING_QUOTE,      0,   "suspected missing quote mark for attribute value"                        },
+    { TAG_NOT_ALLOWED_IN,           0,   "%s isn't allowed in <%s> elements"                                       },
+    { TOO_MANY_ELEMENTS_IN,         0,   "too many %s elements in <%s>"                                            },
+    { TOO_MANY_ELEMENTS,            0,   "too many %s elements"                                                    },
+    { TRIM_EMPTY_ELEMENT,           0,   "trimming empty %s"                                                       },
+    { UNESCAPED_AMPERSAND,          0,   "unescaped & which should be written as &amp;"                            },
+    { UNEXPECTED_END_OF_FILE_ATTR,  0,   "%s end of file while parsing attributes"                                 },
+    { UNEXPECTED_END_OF_FILE,       0,   "unexpected end of file %s"                                               },
+    { UNEXPECTED_ENDTAG_ERR,        0,   "unexpected </%s>"                                                        },
+    { UNEXPECTED_ENDTAG_IN,         0,   "unexpected </%s> in <%s>"                                                },
+    { UNEXPECTED_ENDTAG,            0,   "unexpected </%s>"                                                        },
+    { UNEXPECTED_EQUALSIGN,         0,   "%s unexpected '=', expected attribute name"                              },
+    { UNEXPECTED_GT,                0,   "%s missing '>' for end of tag"                                           },
+    { UNEXPECTED_QUOTEMARK,         0,   "%s unexpected or duplicate quote mark"                                   },
+    { UNKNOWN_ELEMENT_LOOKS_CUSTOM, 0,   "%s is not recognized! Did you mean to enable the custom-tags option?"    },
+    { UNKNOWN_ELEMENT,              0,   "%s is not recognized!"                                                   },
+    { UNKNOWN_ENTITY,               0,   "unescaped & or unknown entity \"%s\""                                    },
+    { USING_BR_INPLACE_OF,          0,   "using <br> in place of %s"                                               },
+    { VENDOR_SPECIFIC_CHARS,        0,   "%s invalid character code %s"                                            },
+    { WHITE_IN_URI,                 0,   "%s discarding whitespace in URI reference"                               },
+    { XML_DECLARATION_DETECTED,     0,   "An XML declaration was detected. Did you mean to use input-xml?"         },
+    { XML_ID_SYNTAX,                0,   "%s ID \"%s\" uses XML ID syntax"                                         },
+
 
-    
-#if SUPPORT_ACCESSIBILITY_CHECKS
-    
     /***************************************
      ** Report Output -- Accessibility
      ***************************************/
@@ -1940,7 +2079,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { LIST_USAGE_INVALID_UL,                         0,   "[3.6.1.1]: list usage invalid <ul>."                                      },
     { LIST_USAGE_INVALID_OL,                         0,   "[3.6.1.2]: list usage invalid <ol>."                                      },
     { LIST_USAGE_INVALID_LI,                         0,   "[3.6.1.4]: list usage invalid <li>."                                      },
-    { INDICATE_CHANGES_IN_LANGUAGE,                  0,   "[4.1.1.1]: indicate changes in language."                                 },
     { LANGUAGE_NOT_IDENTIFIED,                       0,   "[4.3.1.1]: language not identified."                                      },
     { LANGUAGE_INVALID,                              0,   "[4.3.1.2]: language attribute invalid."                                   },
     { DATA_TABLE_MISSING_HEADERS,                    0,   "[5.1.2.1]: data <table> missing row/column headers (all)."                },
@@ -1994,9 +2132,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  0,   "[9.3.1.6]: <script> not keyboard accessible (onMouseMove)."               },
     { NEW_WINDOWS_REQUIRE_WARNING_NEW,               0,   "[10.1.1.1]: new windows require warning (_new)."                          },
     { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             0,   "[10.1.1.2]: new windows require warning (_blank)."                        },
-    { FORM_CONTROL_REQUIRES_DEFAULT_TEXT,            0,   "[10.4.1.1]: form control requires default text."                          },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL,        0,   "[10.4.1.2]: form control default text invalid (null)."                    },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES,      0,   "[10.4.1.3]: form control default text invalid (spaces)."                  },
     { REPLACE_DEPRECATED_HTML_APPLET,                0,   "[11.2.1.1]: replace deprecated html <applet>."                            },
     { REPLACE_DEPRECATED_HTML_BASEFONT,              0,   "[11.2.1.2]: replace deprecated html <basefont>."                          },
     { REPLACE_DEPRECATED_HTML_CENTER,                0,   "[11.2.1.3]: replace deprecated html <center>."                            },
@@ -2020,7 +2155,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { METADATA_MISSING,                              0,   "[13.2.1.1]: Metadata missing."                                            },
     { METADATA_MISSING_REDIRECT_AUTOREFRESH,         0,   "[13.2.1.3]: Metadata missing (redirect/auto-refresh)."                    },
     { SKIPOVER_ASCII_ART,                            0,   "[13.10.1.1]: skip over ascii art."                                        },
-#endif /* SUPPORT_ACCESSIBILITY_CHECKS */
     
     
 #if SUPPORT_CONSOLE_APP
@@ -2053,6 +2187,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TC_OPT_GDOC,                  0,   "produce clean version of html exported by Google Docs"                   },
     { TC_OPT_HELP,                  0,   "list the command line options"                                           },
     { TC_OPT_HELPCFG,               0,   "list all configuration options"                                          },
+    { TC_OPT_HELPENV,               0,   "show information about the environment and runtime configuration"        },
     { TC_OPT_HELPOPT,               0,   "show a description of the <option>"                                      },
     { TC_OPT_IBM858,                0,   "use IBM-858 (CP850+Euro) for input, US-ASCII for output"                 },
     { TC_OPT_INDENT,                0,   "indent element content"                                                  },
@@ -2076,6 +2211,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TC_OPT_RAW,                   0,   "output values above 127 without conversion to entities"                  },
     { TC_OPT_SHIFTJIS,              0,   "use Shift_JIS for both input and output"                                 },
     { TC_OPT_SHOWCFG,               0,   "list the current configuration settings"                                 },
+    { TC_OPT_EXP_CFG,               0,   "list the current configuration settings, suitable for a config file"     },
+    { TC_OPT_EXP_DEF,               0,   "list the default configuration settings, suitable for a config file"     },
     { TC_OPT_UPPER,                 0,   "force tags to upper case"                                                },
     { TC_OPT_UTF16,                 0,   "use UTF-16 for both input and output"                                    },
     { TC_OPT_UTF16BE,               0,   "use UTF-16BE for both input and output"                                  },
@@ -2167,48 +2304,67 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "Command Line Arguments for HTML Tidy:"
     },
     {/* This console output should be limited to 78 characters per line. 
-        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
+        - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options. */
       TC_TXT_HELP_3,                0,
         "\n"
         "Tidy Configuration Options\n"
         "==========================\n"
-        "Use Tidy's configuration options as command line arguments in the form\n"
-        "of \"--some-option <value>\", for example, \"--indent-with-tabs yes\".\n"
+        " Use Tidy's configuration options as command line arguments in the form\n"
+        " of \"--some-option <value>\", for example, \"--indent-with-tabs yes\".\n"
         "\n"
-        "For a list of all configuration options, use \"-help-config\" or refer\n"
-        "to the man page (if your OS has one).\n"
+        " You can also specify a file containing configuration options with the \n"
+        " -options <file> directive, or in one or more files specific to your \n"
+        " environment (see next section). \n"
         "\n"
-        "If your environment has an $HTML_TIDY variable set point to a Tidy \n"
-        "configuration file then Tidy will attempt to use it.\n"
+        " For a list of all configuration options, use \"-help-config\" or refer\n"
+        " to the man page (if your OS has one).\n"
         "\n"
-        "On some platforms Tidy will also attempt to use a configuration specified \n"
-        "in /etc/tidy.conf or ~/.tidy.conf.\n"
+        "Configuration Files\n"
+        "===================\n"
+        " If your environment has an $HTML_TIDY variable set to point to a Tidy \n"
+        " configuration file, then Tidy will attempt to use it. \n"
+        "%s"
+        " Use \"-help-env\" for more information about how you can use the environment. \n"
+        " to specify Tidy options. \n"
         "\n"
         "Other\n"
         "=====\n"
-        "Input/Output default to stdin/stdout respectively.\n"
+        " Input/Output default to stdin/stdout respectively.\n"
         "\n"
-        "Single letter options apart from -f may be combined\n"
-        "as in:  tidy -f errs.txt -imu foo.html\n"
+        " Single letter options apart from -f may be combined\n"
+        " as in:  tidy -f errs.txt -imu foo.html\n"
         "\n"
         "Information\n"
         "===========\n"
-        "For more information about HTML Tidy, see\n"
+        " For more information about HTML Tidy, see\n"
         "  http://www.html-tidy.org/\n"
         "\n"
-        "For more information on HTML, see the following:\n"
+        " For more information on HTML, see the following:\n"
         "\n"
-        "  HTML: Edition for Web Authors (the latest HTML specification)\n"
-        "  http://dev.w3.org/html5/spec-author-view\n"
+        "   HTML: Edition for Web Authors (the latest HTML specification)\n"
+        "   http://dev.w3.org/html5/spec-author-view\n"
         "\n"
-        "  HTML: The Markup Language (an HTML language reference)\n"
-        "  http://dev.w3.org/html5/markup/\n"
+        "   HTML: The Markup Language (an HTML language reference)\n"
+        "   http://dev.w3.org/html5/markup/\n"
         "\n"
-        "File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
-        "or send questions and comments to public-htacg@w3.org.\n"
+        " File bug reports at https://github.com/htacg/tidy-html5/issues/\n"
+        " or send questions and comments to public-htacg@w3.org.\n"
         "\n"
-        "Validate your HTML documents using the W3C Nu Markup Validator:\n"
-        "  http://validator.w3.org/nu/\n"
+        " Validate your HTML documents using the W3C Nu Markup Validator:\n"
+        "   http://validator.w3.org/nu/\n"
+        "\n"
+    },
+    {/* This console output should be limited to 78 characters per line.
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
+        - Both parameters %s reflect file paths and names. */
+      TC_TXT_HELP_3A,               0,
+        "\n"
+        " Additionally, Tidy will automatically attempt to use configuration specified \n"
+        " in these files, if present: \n"
+        "\n"
+        "  %s \n"
+        "  %s \n"
         "\n"
     },
     {/* This console output should be limited to 78 characters per line.
@@ -2230,6 +2386,44 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TC_TXT_HELP_CONFIG_NAME,      0,   "Name"                                                                    },
     { TC_TXT_HELP_CONFIG_TYPE,      0,   "Type"                                                                    },
     { TC_TXT_HELP_CONFIG_ALLW,      0,   "Allowable values"                                                        },
+    {/* This console output should be limited to 78 characters per line.
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
+        - The first %s indicates two more list items, or an empty string.
+        - The second %s indicates a file name, or a message indicating no file name. */
+      TC_TXT_HELP_ENV_1,           0,
+        "\n"
+        "Tidy can configure its option values from multiple sources, in the \n"
+        "order below. Subsequent use of the same option overrides previous \n"
+        "option settings. \n"
+        "\n"
+        " - Tidy's built-in default values. \n"
+        "%s" /* rc files */
+        " - The file specified in the $HTML_TIDY environment variable: \n"
+        "     %s \n"
+        " - Options in a file specified on the command line. \n"
+        " - Options set directly on the command line. \n"
+    },
+    {/* This console output should be limited to 78 characters per line.
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
+      TC_TXT_HELP_ENV_1A,          0,
+        " - The system runtime configuration file: \n"
+        "     %s \n"
+        " - The user runtime configuration file: \n"
+        "     %s \n"
+    },
+    {/* This console output should be limited to 78 characters per line.
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated.
+        - This message indicates that a file name is not currently set. */
+      TC_TXT_HELP_ENV_1B,          0,
+        "(not currently set)"
+    },
+    {/* This console output should be limited to 78 characters per line.
+        - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
+      TC_TXT_HELP_ENV_1C,          0,
+        "\n"
+        "Note that because $HTML_TIDY is set, the user runtime configuration file \n"
+        "%s will not be used. \n"
+    },
     {/* This console output should be limited to 78 characters per line.
         - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */
       TC_TXT_HELP_LANG_1,           0,
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_en_gb.h b/HTMLTidy/vendor/tidy-html5/src/language_en_gb.h
index c6d5f633..97cc6963 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language_en_gb.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language_en_gb.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-05-13 21:04:45
+ *   PO_REVISION_DATE=2017-10-03 12:44:37
  */
 
 #ifdef _MSC_VER
@@ -59,9 +59,33 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
      ** Specify the code for this language.
      ***************************************/
     {/* Specify the ll or ll_cc language code here. */
-      TIDY_LANGUAGE,                   0, "en_gb"
+      TIDY_LANGUAGE,                    0, "en_gb"
     },
-    { TidyMergeDivs,                   0,        
+    { TidyAsciiChars,                   0,        
+        "Can be used to modify behaviour of the <code>clean</code> option when set "
+        "to <var>yes</var>. "
+        "<br/>"
+        "If set to <var>yes</var> when using <code>clean</code>, "
+        "<code>&amp;emdash;</code>, <code>&amp;rdquo;</code>, and other named "
+        "character entities are downgraded to their closest ASCII equivalents. "
+    },
+    { TidyGDocClean,                    0,        
+        "This option specifies if Tidy should enable specific behaviour for "
+        "cleaning up HTML exported from Google Docs. "
+    },
+    { TidyLiteralAttribs,               0,        
+        "This option specifies how Tidy deals with whitespace characters within "
+        "attribute values. "
+        "<br/>"
+        "If the value is <var>no</var> Tidy normalises attribute values by "
+        "replacing any newline or tab with a single space, and further by replacing "
+        "any contiguous whitespace with a single space. "
+        "<br/>"
+        "To force Tidy to preserve the original, literal values of all attributes "
+        "and ensure that whitespace within attribute values is passed "
+        "through unchanged, set this option to <var>yes</var>. "
+    },
+    { TidyMergeDivs,                    0,        
         "This option can be used to modify the behaviour of <code>clean</code> when "
         "set to <code>yes</code>."
         "<br/>"
@@ -77,7 +101,7 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
         "<code>&lt;div&gt;</code> are discarded with the exception of "
         "<code>class</code> and <code>style</code>. "
     },
-    { TidyMergeSpans,                  0,        
+    { TidyMergeSpans,                   0,        
         "This option can be used to modify the behaviour of <code>clean</code> when "
         "set to <code>yes</code>."
         "<br/>"
@@ -86,39 +110,70 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
         "<br/>"
         "The algorithm is identical to the one used by <code>merge-divs</code>. "
     },
-    { TidyReplaceColor,                0,        
+    { TidyReplaceColor,                 0,        
         "This option specifies if Tidy should replace numeric values in colour "
         "attributes with HTML/XHTML colour names where defined, e.g. replace "
         "<code>#ffffff</code> with <code>white</code>. "
     },
-    { TEXT_USING_FONT,                 0,        
+    { TidyUseCustomTags,                0,        
+        "This option enables the use of tags for autonomous custom elements, "
+        "e.g. &lt;flag-icon&gt; with Tidy. Custom tags are disabled if this "
+        "value is <var>no</var>. Other settings - <var>blocklevel</var>, "
+        "<var>empty</var>, <var>inline</var>, and <var>pre</var> will treat "
+        "<em>all</em> detected custom tags accordingly. "
+        "<br/>"
+        "The use of <code>new-blocklevel-tags</code>, "
+        "<code>new-empty-tags</code>, <code>new-inline-tags</code>, or "
+        "<code>new-pre-tags</code> will override the treatment of custom tags "
+        "by this configuration option. This may be useful if you have "
+        "different types of custom tags."
+        "<br/>"
+        "When enabled these tags are determined during the processing of your "
+        "document using opening tags; matching closing tags will be recognised "
+        "accordingly, and unknown closing tags will be discarded. "
+    },
+    { TEXT_USING_FONT,                  0,        
         "You are recommended to use CSS to specify the font and\n"
         "properties such as its size and colour. This will reduce\n"
         "the size of HTML files and make them easier to maintain\n"
         "compared with using <FONT> elements.\n\n"
     },
-    { TEXT_USING_BODY,                 0, "You are recommended to use CSS to specify page and link colours\n"           },
-    { TEXT_GENERAL_INFO_PLEA,          0,        
+    { TEXT_USING_BODY,                  0, "You are recommended to use CSS to specify page and link colours\n"           },
+    { TEXT_GENERAL_INFO_PLEA,           0,        
         "\n"
         "Would you like to see Tidy in proper, British English? Please consider \n"
         "helping us to localise HTML Tidy. For details please see \n"
         "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md\n"
     },
+    { UNKNOWN_ELEMENT_LOOKS_CUSTOM,     0, "%s is not recognised! Did you mean to enable the custom-tags option?"        },
+    { UNKNOWN_ELEMENT,                  0, "%s is not recognised!"                                                       },
+    { MULTIMEDIA_REQUIRES_TEXT,         0, "[1.4.1.1]: multimedia requires synchronised text equivalents."               },
+    { INFORMATION_NOT_CONVEYED_IMAGE,   0, "[2.1.1.1]: ensure information not conveyed through colour alone (image)."    },
+    { INFORMATION_NOT_CONVEYED_APPLET,  0, "[2.1.1.2]: ensure information not conveyed through colour alone (applet)."   },
+    { INFORMATION_NOT_CONVEYED_OBJECT,  0, "[2.1.1.3]: ensure information not conveyed through colour alone (object)."   },
+    { INFORMATION_NOT_CONVEYED_SCRIPT,  0, "[2.1.1.4]: ensure information not conveyed through colour alone (script)."   },
+    { INFORMATION_NOT_CONVEYED_INPUT,   0, "[2.1.1.5]: ensure information not conveyed through colour alone (input)."    },
+    { COLOR_CONTRAST_TEXT,              0, "[2.2.1.1]: poor colour contrast (text)."                                     },
+    { COLOR_CONTRAST_LINK,              0, "[2.2.1.2]: poor colour contrast (link)."                                     },
+    { COLOR_CONTRAST_ACTIVE_LINK,       0, "[2.2.1.3]: poor colour contrast (active link)."                              },
+    { COLOR_CONTRAST_VISITED_LINK,      0, "[2.2.1.4]: poor colour contrast (visited link)."                             },
+    { LAYOUT_TABLES_LINEARIZE_PROPERLY, 0, "[5.3.1.1]: verify layout tables linearise properly."                         },
 
-#if SUPPORT_ACCESSIBILITY_CHECKS
-    { INFORMATION_NOT_CONVEYED_IMAGE,  0, "[2.1.1.1]: ensure information not conveyed through colour alone (image)."    },
-    { INFORMATION_NOT_CONVEYED_APPLET, 0, "[2.1.1.2]: ensure information not conveyed through colour alone (applet)."   },
-    { INFORMATION_NOT_CONVEYED_OBJECT, 0, "[2.1.1.3]: ensure information not conveyed through colour alone (object)."   },
-    { INFORMATION_NOT_CONVEYED_SCRIPT, 0, "[2.1.1.4]: ensure information not conveyed through colour alone (script)."   },
-    { INFORMATION_NOT_CONVEYED_INPUT,  0, "[2.1.1.5]: ensure information not conveyed through colour alone (input)."    },
-    { COLOR_CONTRAST_TEXT,             0, "[2.2.1.1]: poor colour contrast (text)."                                     },
-    { COLOR_CONTRAST_LINK,             0, "[2.2.1.2]: poor colour contrast (link)."                                     },
-    { COLOR_CONTRAST_ACTIVE_LINK,      0, "[2.2.1.3]: poor colour contrast (active link)."                              },
-    { COLOR_CONTRAST_VISITED_LINK,     0, "[2.2.1.4]: poor colour contrast (visited link)."                             },
-#endif /* SUPPORT_ACCESSIBILITY_CHECKS */
+#if SUPPORT_CONSOLE_APP
+    { TC_TXT_HELP_LANG_2,               0,        
+        "\n"
+        "The following languages are currently installed in Tidy. Please \n"
+        "note that there's no guarantee that they are complete; only that \n"
+        "one developer or another started to add the language indicated. \n"
+        "\n"
+        "Incomplete localisations will default to \"en\" when necessary. \n"
+        "Please report instances of incorrect strings to the Tidy team. \n"
+        "\n"
+    },
+#endif /* SUPPORT_CONSOLE_APP */
 
     {/* This MUST be present and last. */
-      TIDY_MESSAGE_TYPE_LAST,          0, NULL
+      TIDY_MESSAGE_TYPE_LAST,           0, NULL
     }
 
 }};
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_es.h b/HTMLTidy/vendor/tidy-html5/src/language_es.h
index a4672120..eff66e49 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language_es.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language_es.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-05-13 21:04:45
+ *   PO_REVISION_DATE=2017-10-03 12:44:37
  */
 
 #ifdef _MSC_VER
@@ -68,11 +68,7 @@ static languageDefinition language_es = { whichPluralForm_es, {
         "code>). Si se establece en <code>yes</code>, entonces etiquetas existentes serán reemplazados "
         "con CSS <code>&lt;style&gt;</code> y estructural markup según corresponda. "
     },
-
-#if SUPPORT_ASIAN_ENCODINGS
     { TidyNCR,                0, "Esta opción especifica si Tidy debe permitir referencias de caracteres numéricos. "   },
-#endif /* SUPPORT_ASIAN_ENCODINGS */
-
     { TEXT_GENERAL_INFO_PLEA, 0,        
         "\n"
         "¿Le gustaría ver Tidy en un español correcto? Por favor considere \n"
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_es_mx.h b/HTMLTidy/vendor/tidy-html5/src/language_es_mx.h
index df444b63..7f061b6e 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language_es_mx.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language_es_mx.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-05-13 21:04:45
+ *   PO_REVISION_DATE=2017-10-03 12:44:37
  */
 
 #ifdef _MSC_VER
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_fr.h b/HTMLTidy/vendor/tidy-html5/src/language_fr.h
index 500dfeeb..c6140e9e 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language_fr.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language_fr.h
@@ -27,8 +27,8 @@
  * Template Created by Jim Derry on 01/14/2016.
  *
  * Orginating PO file metadata:
- *   PO_LAST_TRANSLATOR=seb
- *   PO_REVISION_DATE=2017-05-16 22:36:48
+ *   PO_LAST_TRANSLATOR=jderry
+ *   PO_REVISION_DATE=2017-10-05 15:13:40
  */
 
 #ifdef _MSC_VER
@@ -201,7 +201,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TidyFixComments,                               0,        
         "Cette option précise si Tidy doit remplacer les traits d'unions par le caractère <code>=</code> "
         "s'il rencontre des traits-d'unions adjacents. <br/>La valeur par défaut est <var>yes</var>. <br/"
-        ">Cette option est fourni pour les utilisateurs de Cold Fusion qui utilisent la syntaxe de "
+        ">Cette option est fourni pour les utilisateurs de ColdFusion qui utilisent la syntaxe de "
         "commentaire: <code>&lt;!--- ---&gt;</code>. "
     },
     { TidyFixUri,                                    0,        
@@ -319,11 +319,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "imbriqués, comme suit : <code>&lt;span&gt;&lt;span&gt;...&lt;/span&gt;&lt;/span&gt;</code>. <br/"
         ">L'algorithme est le même que celui de <code>merge-divs</code>. "
     },
-
-#if SUPPORT_ASIAN_ENCODINGS
     { TidyNCR,                                       0, "Cette option précise si Tidy doit autoriser les références numériques de caractères. "                  },
-#endif /* SUPPORT_ASIAN_ENCODINGS */
-
     { TidyNewline,                                   0,        
         "La valeur par défaut est appropriée à la plateforme d'exécution de Tidy. <br/>Généralement "
         "<var>CRLF</var> sur PC-DOS, Windows et OS/2; <var>CR</var> sur Classic Mac OS; et <var>LF</var> "
@@ -355,8 +351,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "Cette option précise le fichier de sortie que Tidy utilise pour la structure de balises. En "
         "principe la structure est écrite vers <code>stdout</code>. "
     },
-
-#if SUPPORT_UTF16_ENCODINGS
     { TidyOutputBOM,                                 0,        
         "Cette option précise si Tidy doit écrire un caractère indicateur d'ordre des octets (Unicode Byte "
         "Order Mark ou BOM; connu aussi sous Zero Width No-Break Space; a la valeur de U+FEFF) au début de "
@@ -364,8 +358,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "<var>auto</var>, Tidy écrira un BOM vers la sortie seulement si un BOM était présent au début de "
         "l'entrée. <br/>Un BOM est toujours écrit pour la sortie XML/XHTML des sorties encodées en UTF-16. "
     },
-#endif /* SUPPORT_UTF16_ENCODINGS */
-
     { TidyPPrintTabs,                                0,        
         "Cette option précise si tidy doit indenter avec des tabulations plutôt que des espaces, en "
         "supposant que <code>indent</code> vaut <var>yes</var>. <br/>Définir cette option à <var>yes</var> "
@@ -385,14 +377,10 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "inconnues. <br/>Notez que vous ne pouvez encore ajouter de nouveaux éléments CDATA. <br/>Cette "
         "option est ignorée avec le mode XML. "
     },
-
-#if SUPPORT_ASIAN_ENCODINGS
     { TidyPunctWrap,                                 0,        
         "Cette option précise si Tidy doit passer à la ligne après certains caractères de ponctuation "
         "Unicode ou chinois."
     },
-#endif /* SUPPORT_ASIAN_ENCODINGS */
-
     { TidyQuiet,                                     0,        
         "Cette option précise si Tidy doit afficher le résumé du nombre des erreurs et avertissements, ou "
         "les messages de bienvenue et d'information."
@@ -566,12 +554,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "Cette option précise si Tidy doit utiliser l'analyseur XML plutôt que l'analyseur de correction "
         "d'erreur HTML."
     },
-    { TidyUnknownCategory,                           0, "catégorie inconnue!"                                                                                    },
-    { TidyEncoding,                                  0, "encodage"                                                                                               },
-    { TidyInternalCategory,                          0, "interne (privée)"                                                                                       },
-    { TidyMarkup,                                    0, "structure de balises"                                                                                   },
-    { TidyMiscellaneous,                             0, "divers"                                                                                                 },
-    { TidyPrettyPrint,                               0, "affichage"                                                                                              },
     { TidyInfo,                                      0, "Info:"                                                                                                  },
     { TidyWarning,                                   0, "Avertissement:"                                                                                         },
     { TidyConfig,                                    0, "Config:"                                                                                                },
@@ -579,16 +561,11 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TidyError,                                     0, "Erreur:"                                                                                                },
     { TidyBadDocument,                               0, "Document:"                                                                                              },
     { TidyFatal,                                     0, "Panique:"                                                                                               },
-    { TidyDialogueInfo,                              0, "Informations: "                                                                                         },
     { TidyDialogueSummary,                           0, "Résumé:"                                                                                                },
-    { TidyDialogueDoc,                               0, "Document:"                                                                                              },
-    { FILE_CANT_OPEN,                                0, "Impossible d'ouvrir « %s »\n"                                                                           },
-    { FILE_NOT_FILE,                                 0, "\"%s\" n'est pas un fichier!\n"                                                                         },
+    { TidyDialogueInfo,                              0, "Informations: "                                                                                         },
+    { TidyDialogueFootnote,                          0, "Remarque:"                                                                                              },
     { LINE_COLUMN_STRING,                            0, "Ligne: %d Col: %d - "                                                                                   },
-    { STRING_CONTENT_LOOKS,                          0, "Le contenu du document ressemble à %s"                                                                  },
     { STRING_DISCARDING,                             0, "rejet"                                                                                                  },
-    { STRING_DOCTYPE_GIVEN,                          0, "DOCTYPE donnée est «%s»"                                                                                },
-    { STRING_ERROR_COUNT,                            0, "Tidy a trouvé %u %s et %u %s!"                                                                          },
     { STRING_ERROR_COUNT_ERROR,                      0, "erreur"                                                                                                 },
     { STRING_ERROR_COUNT_ERROR,                      1, "erreurs"                                                                                                },
     { STRING_ERROR_COUNT_WARNING,                    0, "avertissement"                                                                                          },
@@ -598,19 +575,10 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "Contrôles d'accessibilité:\n"
     },
     { STRING_HTML_PROPRIETARY,                       0, "HTML Propriétaire"                                                                                      },
-    { STRING_MISSING_MALFORMED,                      0, "argument manquant ou incorrect pour l'option: %s"                                                       },
     { STRING_XML_DECLARATION,                        0, "déclaration XML"                                                                                        },
-    { STRING_NEEDS_INTERVENTION,                     0,        
-        "Ce document contient des erreurs qui doivent d'abord être résolues\n"
-        "en utilisant HTML Tidy pour produire une version nettoyée.\n"
-    },
-    { STRING_NO_ERRORS,                              0, "Aucun avertissement ou erreur trouvée."                                                                 },
-    { STRING_NO_SYSID,                               0, "Aucun identifiant système dans le doctype soumis"                                                       },
-    { STRING_NOT_ALL_SHOWN,                          0, "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés."               },
     { STRING_PLAIN_TEXT,                             0, "texte brut"                                                                                             },
     { STRING_REPLACING,                              0, "remplacement"                                                                                           },
     { STRING_SPECIFIED,                              0, "précisé"                                                                                                },
-    { STRING_UNKNOWN_OPTION,                         0, "option inconnue: %s"                                                                                    },
     { TIDYCUSTOMNO_STRING,                           0, "aucune"                                                                                                 },
     { TIDYCUSTOMBLOCKLEVEL_STRING,                   0, "élément de bloc"                                                                                        },
     { TIDYCUSTOMEMPTY_STRING,                        0, "vide"                                                                                                   },
@@ -766,6 +734,16 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "Il est recommandé d'utiliser les CSS pour préciser les couleurs \n"
         "de la page et des liens"
     },
+    { STRING_CONTENT_LOOKS,                          0, "Le contenu du document ressemble à %s"                                                                  },
+    { STRING_DOCTYPE_GIVEN,                          0, "DOCTYPE donnée est «%s»"                                                                                },
+    { STRING_ERROR_COUNT,                            0, "Tidy a trouvé %u %s et %u %s!\n"                                                                        },
+    { STRING_NEEDS_INTERVENTION,                     0,        
+        "Ce document contient des erreurs qui doivent d'abord être résolues\n"
+        "en utilisant HTML Tidy pour produire une version nettoyée.\n"
+    },
+    { STRING_NO_ERRORS,                              0, "Aucun avertissement ou erreur trouvée.\n"                                                               },
+    { STRING_NO_SYSID,                               0, "Aucun identifiant système dans le doctype soumis"                                                       },
+    { STRING_NOT_ALL_SHOWN,                          0, "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés.\n"             },
     { TEXT_GENERAL_INFO,                             0,        
         "À propos de HTML Tidy: https://github.com/htacg/tidy-html5\n"
         "Rapports de bugs et commentaires: https://github.com/htacg/tidy-html5/issues\n"
@@ -781,111 +759,105 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md"
     },
     { ANCHOR_NOT_UNIQUE,                             0, "%s ancre \"%s\" déjà défini"                                                                            },
+    { APOS_UNDEFINED,                                0, "l'entité nommée &apos; est défini seulement en XML/XHTML"                                               },
     { ATTR_VALUE_NOT_LCASE,                          0, "valeur d'attribut de %s « %s » doit être en minuscule pour XHTML"                                       },
     { ATTRIBUTE_IS_NOT_ALLOWED,                      0, "L'attribut %s n'\"est\" pas autorisé pour les balises personnalisées autonomes."                        },
     { BACKSLASH_IN_URI,                              0, "La référence d'URI %s contient des anti-slash. Faute de frappe ?"                                       },
     { BAD_ATTRIBUTE_VALUE_REPLACED,                  0, "%s l'attribut « %s » a une valeur non valide « %s » et a été remplacé"                                  },
     { BAD_ATTRIBUTE_VALUE,                           0, "%s l'attribut \"%s\" a une valeur non valide \"%s\""                                                    },
+    { BAD_CDATA_CONTENT,                             0, "'<' + '/' + lettres non permises ici"                                                                   },
+    { BAD_SUMMARY_HTML5,                             0, "L'attribut summary sur l'élément %s est obsolète avec HTML5"                                            },
+    { BAD_SURROGATE_LEAD,                            0,        
+        "Paire de substitution U+%04X de terminaison (Bas), sans entité principale (Haut), remplacée par U"
+        "+FFFD."
+    },
+    { BAD_SURROGATE_PAIR,                            0, "Présence d'une paire de substitution hors intervalle U+%04X:U+%04X, remplacée par la valeur U+FFFD."    },
+    { BAD_SURROGATE_TAIL,                            0,        
+        "Paire de substitution principale (Haute) U+%04X, sans entité de terminaison (Haut), remplacée par U"
+        "+FFFD."
+    },
+    { CANT_BE_NESTED,                                0, "%s ne peut pas être imbriqué"                                                                           },
+    { COERCE_TO_ENDTAG,                              0, "<%s> est probablement souhaité pour </%s>"                                                              },
+    { CONTENT_AFTER_BODY,                            0, "contenu trouvé après la fin de body"                                                                    },
+    { CUSTOM_TAG_DETECTED,                           0, "balise personnalisée autonome détectée %s; sera traitée comme %s"                                       },
+    { DISCARDING_UNEXPECTED,                         0, "inhibition de valeur inattendue %s"                                                                     },
+    { DOCTYPE_AFTER_TAGS,                            0, "<!DOCTYPE> n'est pas autorisée après les éléments"                                                      },
+    { DUPLICATE_FRAMESET,                            0, "élément répété FRAMESET"                                                                                },
+    { ELEMENT_NOT_EMPTY,                             0, "%s élément non vide ou non fermé"                                                                       },
+    { ELEMENT_VERS_MISMATCH_ERROR,                   0, "%s élément non disponible dans %s"                                                                      },
+    { ELEMENT_VERS_MISMATCH_WARN,                    0, "%s élément non disponible dans %s"                                                                      },
+    { ENCODING_MISMATCH,                             0, "l'encodage de caractère précisé en entrée (%s) ne correspond pas à l'encodage réellement entré (%s)"    },
     { ESCAPED_ILLEGAL_URI,                           0, "%s échappement de la référence d''URI mal formée"                                                       },
+    { FILE_CANT_OPEN,                                0, "Impossible d'ouvrir « %s »\n"                                                                           },
+    { FILE_NOT_FILE,                                 0, "\"%s\" n'est pas un fichier!\n"                                                                         },
     { FIXED_BACKSLASH,                               0, "%s conversion des antislash vers slash dans l'URI "                                                     },
     { ID_NAME_MISMATCH,                              0, "%s discordance entre id et valeur de nom d'attribut"                                                    },
+    { ILLEGAL_NESTING,                               0, "%s ne doit pas être imbriqué"                                                                           },
     { ILLEGAL_URI_CODEPOINT,                         0, "%s caractères interdits trouvés dans l'URI"                                                             },
     { ILLEGAL_URI_REFERENCE,                         0, "%s mal échappé dans la référence d'URI"                                                                 },
     { INSERTING_AUTO_ATTRIBUTE,                      0, "%s insertion de l'attribut « %s », en utilisant la valeur « %s »"                                       },
+    { INSERTING_TAG,                                 0, "insertion implicite de <%s>"                                                                            },
     { INVALID_ATTRIBUTE,                             0, "%s nom d'attribut « %s » (valeur=« %s ») n'est pas valide"                                              },
+    { INVALID_NCR,                                   0, "%s référence de caractère numérique non valide %s"                                                      },
+    { INVALID_SGML_CHARS,                            0, "%s code de caractère non valide %s"                                                                     },
+    { INVALID_UTF8,                                  0, "%s octets UTF-8 non valides (code de caract. %s)"                                                       },
+    { INVALID_UTF16,                                 0, "%s paire de substitution UFT-16 non valide (code de caract. %s)"                                        },
     { INVALID_XML_ID,                                0, "%s impossible de copier le nom attribut vers id"                                                        },
     { JOINING_ATTRIBUTE,                             0, "%s regroupement des valeurs répétées de l'attribut « %s »"                                              },
+    { MALFORMED_COMMENT,                             0, "tirets adjacents dans un commentaire"                                                                   },
+    { MALFORMED_DOCTYPE,                             0, "inhibition de la <!DOCTYPE> mal formée"                                                                 },
     { MISMATCHED_ATTRIBUTE_ERROR,                    0, "%s attribut \"%s\" non permis pour %s"                                                                  },
     { MISMATCHED_ATTRIBUTE_WARN,                     0, "%s attribut \"%s\" non permis pour %s"                                                                  },
     { MISSING_ATTR_VALUE,                            0, "%s attribut \"%s\" n'a pas de valeur"                                                                   },
+    { MISSING_ATTRIBUTE,                             0, "%s absence d'attribut \"%s\""                                                                           },
+    { MISSING_DOCTYPE,                               0, "déclaration <!DOCTYPE> manquante"                                                                       },
+    { MISSING_ENDTAG_BEFORE,                         0, "absence de </%s> avant %s"                                                                              },
+    { MISSING_ENDTAG_FOR,                            0, "absence de </%s>"                                                                                       },
     { MISSING_IMAGEMAP,                              0, "%s doivent utiliser une image-map côté client"                                                          },
     { MISSING_QUOTEMARK,                             0, "%s attribut avec apostrophe de fin manquante"                                                           },
-    { NEWLINE_IN_URI,                                0, "%s inhibition des nouvelles lignes dans la référence d'URI"                                             },
-    { PROPRIETARY_ATTR_VALUE,                        0, "%s valeur d'attribut propriétaire « %s »"                                                               },
-    { PROPRIETARY_ATTRIBUTE,                         0, "%s attribut propriétaire \"%s\""                                                                        },
-    { REPEATED_ATTRIBUTE,                            0, "%s abandon de la valeur « %s » pour l'attribut répété « %s »"                                           },
-    { UNEXPECTED_END_OF_FILE_ATTR,                   0, "%s fin de fichier lors de l'analyse des attributs"                                                      },
-    { UNEXPECTED_EQUALSIGN,                          0, "%s symbole imprévu '=', nom d'attribut attendu"                                                         },
-    { UNEXPECTED_GT,                                 0, "%s symbole '>' manquant pour la fin de balise"                                                          },
-    { UNEXPECTED_QUOTEMARK,                          0, "%s guillemet double inattendu ou dupliqué"                                                              },
-    { WHITE_IN_URI,                                  0, "%s rejet des espaces dans la référence URI"                                                             },
-    { XML_ATTRIBUTE_VALUE,                           0, "%s a un attribut XML \"%s\""                                                                            },
-    { XML_ID_SYNTAX,                                 0, "%s ID « %s » utilise la syntaxe XML ID"                                                                 },
-    { INVALID_NCR,                                   0, "%s référence de caractère numérique non valide %s"                                                      },
-    { INVALID_SGML_CHARS,                            0, "%s code de caractère non valide %s"                                                                     },
-    { INVALID_UTF16,                                 0, "%s paire de substitution UFT-16 non valide (code de caract. %s)"                                        },
-    { INVALID_UTF8,                                  0, "%s octets UTF-8 non valides (code de caract. %s)"                                                       },
-    { VENDOR_SPECIFIC_CHARS,                         0, "%s code de caractère non valide %s"                                                                     },
-    { ENCODING_MISMATCH,                             0, "l'encodage de caractère précisé en entrée (%s) ne correspond pas à l'encodage réellement entré (%s)"    },
-    { APOS_UNDEFINED,                                0, "l'entité nommée &apos; est défini seulement en XML/XHTML"                                               },
     { MISSING_SEMICOLON_NCR,                         0, "La référence de caractère numérique « %s » ne se termine pas par « ; »"                                 },
     { MISSING_SEMICOLON,                             0, "l'entité « %s » ne se termine pas par « ; »"                                                            },
-    { UNESCAPED_AMPERSAND,                           0, "symbole & non échappé qui devrait être écrit &amp;"                                                     },
-    { UNKNOWN_ENTITY,                                0, "symbole & non échappé ou entité inconnue « %s »"                                                        },
-    { BAD_CDATA_CONTENT,                             0, "'<' + '/' + lettres non permises ici"                                                                   },
-    { BAD_COMMENT_CHARS,                             0, "attendu -- ou >"                                                                                        },
-    { BAD_XML_COMMENT,                               0, "les commentaires XML ne peuvent pas contenir --"                                                        },
-    { CANT_BE_NESTED,                                0, "%s ne peut pas être imbriqué"                                                                           },
-    { CONTENT_AFTER_BODY,                            0, "contenu trouvé après la fin de body"                                                                    },
-    { DISCARDING_UNEXPECTED,                         0, "inhibition de valeur inattendue %s"                                                                     },
-    { DOCTYPE_AFTER_TAGS,                            0, "<!DOCTYPE> n'est pas autorisée après les éléments"                                                      },
-    { DTYPE_NOT_UPPER_CASE,                          0, "SYSTEM, PUBLIC, W3C, DTD, EN doivent être en majuscules"                                                },
-    { ELEMENT_VERS_MISMATCH_ERROR,                   0, "%s élément non disponible dans %s"                                                                      },
-    { ELEMENT_VERS_MISMATCH_WARN,                    0, "%s élément non disponible dans %s"                                                                      },
-    { ENCODING_IO_CONFLICT,                          0, "Encodage de sortie non fonctionnel avec la sortie standard"                                             },
-    { ILLEGAL_NESTING,                               0, "%s ne doit pas être imbriqué"                                                                           },
-    { INCONSISTENT_NAMESPACE,                        0, "l'espace de nom HTML ne correspond pas au contenu"                                                      },
-    { INCONSISTENT_VERSION,                          0, "La déclaration DOCTYPE HTML ne correspond pas au contenu"                                               },
-    { INSERTING_TAG,                                 0, "insertion implicite de <%s>"                                                                            },
-    { MALFORMED_COMMENT,                             0, "tirets adjacents dans un commentaire"                                                                   },
-    { MALFORMED_DOCTYPE,                             0, "inhibition de la <!DOCTYPE> mal formée"                                                                 },
-    { MISSING_DOCTYPE,                               0, "déclaration <!DOCTYPE> manquante"                                                                       },
-    { MISSING_ENDTAG_BEFORE,                         0, "absence de </%s> avant %s"                                                                              },
-    { MISSING_ENDTAG_FOR,                            0, "absence de </%s>"                                                                                       },
     { MISSING_STARTTAG,                              0, "absence de <%s>"                                                                                        },
     { MISSING_TITLE_ELEMENT,                         0, "ajout d'un élément 'title' manquant"                                                                    },
+    { NESTED_EMPHASIS,                               0, "accentuation imbriquée %s"                                                                              },
+    { NESTED_QUOTATION,                              0, "éléments \"q\" imbriqués, erreur typographique possible"                                                },
+    { NEWLINE_IN_URI,                                0, "%s inhibition des nouvelles lignes dans la référence d'URI"                                             },
     { NOFRAMES_CONTENT,                              0, "%s non positionné dans l'élément 'noframes'"                                                            },
     { NON_MATCHING_ENDTAG,                           0, "remplacement des %s inattendus par </%s>"                                                               },
+    { OBSOLETE_ELEMENT,                              0, "remplacement de l'élément obsolète %s par %s"                                                           },
     { PREVIOUS_LOCATION,                             0, "<%s> précédemment mentionnés"                                                                           },
+    { PROPRIETARY_ATTR_VALUE,                        0, "%s valeur d'attribut propriétaire « %s »"                                                               },
+    { PROPRIETARY_ATTRIBUTE,                         0, "%s attribut propriétaire \"%s\""                                                                        },
     { PROPRIETARY_ELEMENT,                           0, "%s n'est pas approuvé par le W3C"                                                                       },
+    { REMOVED_HTML5,                                 0, "élément %s retiré de HTML5"                                                                             },
+    { REPEATED_ATTRIBUTE,                            0, "%s abandon de la valeur « %s » pour l'attribut répété « %s »"                                           },
+    { REPLACING_ELEMENT,                             0, "remplacement de %s par %s"                                                                              },
     { REPLACING_UNEX_ELEMENT,                        0, "remplacement des %s inattendus par %s"                                                                  },
     { SPACE_PRECEDING_XMLDECL,                       0, "suppression de l'espace précédant la déclaration XML"                                                   },
+    { STRING_MISSING_MALFORMED,                      0, "argument manquant ou incorrect pour l'option: %s"                                                       },
+    { STRING_UNKNOWN_OPTION,                         0, "option inconnue: %s"                                                                                    },
+    { SUSPECTED_MISSING_QUOTE,                       0, "absence de guillemet pour la valeur d'attribut"                                                         },
     { TAG_NOT_ALLOWED_IN,                            0, "%s n'est pas permis dans les éléments <%s>"                                                             },
     { TOO_MANY_ELEMENTS_IN,                          0, "trop d'éléments %s dans <%s>"                                                                           },
     { TOO_MANY_ELEMENTS,                             0, "trop d'éléments %s"                                                                                     },
-    { UNESCAPED_ELEMENT,                             0, "%s non échappé dans le contenu pre"                                                                     },
-    { USING_BR_INPLACE_OF,                           0, "utilisation de <br> à la place de %s"                                                                   },
-    { DUPLICATE_FRAMESET,                            0, "élément répété FRAMESET"                                                                                },
-    { SUSPECTED_MISSING_QUOTE,                       0, "absence de guillemet pour la valeur d'attribut"                                                         },
+    { TRIM_EMPTY_ELEMENT,                            0, "réduction des %s vides"                                                                                 },
+    { UNESCAPED_AMPERSAND,                           0, "symbole & non échappé qui devrait être écrit &amp;"                                                     },
+    { UNEXPECTED_END_OF_FILE_ATTR,                   0, "%s fin de fichier lors de l'analyse des attributs"                                                      },
+    { UNEXPECTED_END_OF_FILE,                        0, "fin de fichier inattendue %s"                                                                           },
+    { UNEXPECTED_ENDTAG_ERR,                         0, "</%s> inattendu"                                                                                        },
     { UNEXPECTED_ENDTAG_IN,                          0, "</%s> inattendu dans <%s>"                                                                              },
+    { UNEXPECTED_ENDTAG,                             0, "</%s> inattendu"                                                                                        },
+    { UNEXPECTED_EQUALSIGN,                          0, "%s symbole imprévu '=', nom d'attribut attendu"                                                         },
+    { UNEXPECTED_GT,                                 0, "%s symbole '>' manquant pour la fin de balise"                                                          },
+    { UNEXPECTED_QUOTEMARK,                          0, "%s guillemet double inattendu ou dupliqué"                                                              },
     { UNKNOWN_ELEMENT_LOOKS_CUSTOM,                  0, "%s n'est pas reconnue! Vouliez-vous activer l'option custom-tags?"                                      },
     { UNKNOWN_ELEMENT,                               0, "%s n'est pas reconnue!"                                                                                 },
-    { MISSING_ATTRIBUTE,                             0, "%s absence d'attribut \"%s\""                                                                           },
-    { CUSTOM_TAG_DETECTED,                           0, "balise personnalisée autonome détectée %s; sera traitée comme %s"                                       },
-    { REPLACING_ELEMENT,                             0, "remplacement de %s par %s"                                                                              },
-    { TRIM_EMPTY_ELEMENT,                            0, "réduction des %s vides"                                                                                 },
-    { BAD_SURROGATE_LEAD,                            0,        
-        "Paire de substitution U+%04X de terminaison (Bas), sans entité principale (Haut), remplacée par U"
-        "+FFFD."
-    },
-    { BAD_SURROGATE_PAIR,                            0, "Présence d'une paire de substitution hors intervalle U+%04X:U+%04X, remplacée par la valeur U+FFFD."    },
-    { BAD_SURROGATE_TAIL,                            0,        
-        "Paire de substitution principale (Haute) U+%04X, sans entité de terminaison (Haut), remplacée par U"
-        "+FFFD."
-    },
-    { BAD_SUMMARY_HTML5,                             0, "L'attribut summary sur l'élément %s est obsolète avec HTML5"                                            },
-    { COERCE_TO_ENDTAG_WARN,                         0, "<%s> est probablement destiné à </%s>"                                                                  },
-    { NESTED_EMPHASIS,                               0, "accentuation imbriquée %s"                                                                              },
-    { NESTED_QUOTATION,                              0, "éléments \"q\" imbriqués, erreur typographique possible"                                                },
-    { OBSOLETE_ELEMENT,                              0, "remplacement de l'élément obsolète %s par %s"                                                           },
-    { REMOVED_HTML5,                                 0, "élément %s retiré de HTML5"                                                                             },
+    { UNKNOWN_ENTITY,                                0, "symbole & non échappé ou entité inconnue « %s »"                                                        },
+    { USING_BR_INPLACE_OF,                           0, "utilisation de <br> à la place de %s"                                                                   },
+    { VENDOR_SPECIFIC_CHARS,                         0, "%s code de caractère non valide %s"                                                                     },
+    { WHITE_IN_URI,                                  0, "%s rejet des espaces dans la référence URI"                                                             },
     { XML_DECLARATION_DETECTED,                      0, "Une déclaration XML a été détectée. Voulez-vous utiliser l'option input-xml?"                           },
-    { COERCE_TO_ENDTAG,                              0, "<%s> est probablement souhaité pour </%s>"                                                              },
-    { ELEMENT_NOT_EMPTY,                             0, "%s élément non vide ou non fermé"                                                                       },
-    { UNEXPECTED_END_OF_FILE,                        0, "fin de fichier inattendue %s"                                                                           },
-    { UNEXPECTED_ENDTAG,                             0, "</%s> inattendu"                                                                                        },
-
-#if SUPPORT_ACCESSIBILITY_CHECKS
+    { XML_ID_SYNTAX,                                 0, "%s ID « %s » utilise la syntaxe XML ID"                                                                 },
     { IMG_MISSING_ALT,                               0, "[1.1.1.1]: <img> texte manquant 'alt'."                                                                 },
     { IMG_ALT_SUSPICIOUS_FILENAME,                   0, "[1.1.1.2]: texte 'alt' suspect (nom de fichier)."                                                       },
     { IMG_ALT_SUSPICIOUS_FILE_SIZE,                  0, "[1.1.1.3]: texte 'alt' suspect (taille de fichier)."                                                    },
@@ -932,7 +904,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { LIST_USAGE_INVALID_UL,                         0, "[3.6.1.1]: Usage non valide de liste <ul>."                                                             },
     { LIST_USAGE_INVALID_OL,                         0, "[3.6.1.2]: usage non valide de liste <ol>."                                                             },
     { LIST_USAGE_INVALID_LI,                         0, "[3.6.1.4]: usage non valide de liste <li>."                                                             },
-    { INDICATE_CHANGES_IN_LANGUAGE,                  0, "[4.1.1.1]: indique des changements dans le langage."                                                    },
     { LANGUAGE_NOT_IDENTIFIED,                       0, "[4.3.1.1]: langage non identifié."                                                                      },
     { LANGUAGE_INVALID,                              0, "[4.3.1.2]: attribut de langage non valide."                                                             },
     { DATA_TABLE_MISSING_HEADERS,                    0, "[5.1.2.1]: data <table> absence d'entêtes rangée/colonne (tous)."                                       },
@@ -986,9 +957,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  0, "[9.3.1.6]: <script> non accessible par le clavier (onMouseMove)."                                       },
     { NEW_WINDOWS_REQUIRE_WARNING_NEW,               0, "[10.1.1.1]: les nouvelles fenêtres nécessitent un avertissement (_new)."                                },
     { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             0, "[10.1.1.2]: les nouvelles fenêtres nécessitent un avertissement (_blank)."                              },
-    { FORM_CONTROL_REQUIRES_DEFAULT_TEXT,            0, "[10.4.1.1]: les contrôles de formulaires nécessitent un texte par défaut."                              },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL,        0, "[10.4.1.2]: texte par défaut du contrôle de formulaire non valide (null)."                              },
-    { FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES,      0, "[10.4.1.3]: texte par défaut du contrôle de formulaire non valide (espaces)."                           },
     { REPLACE_DEPRECATED_HTML_APPLET,                0, "[11.2.1.1]: remplacer l'élément HTML déprécié <applet>."                                                },
     { REPLACE_DEPRECATED_HTML_BASEFONT,              0, "[11.2.1.2]: remplacer l'élément HTML déprécié <basefont>."                                              },
     { REPLACE_DEPRECATED_HTML_CENTER,                0, "[11.2.1.3]: remplacer l'élément HTML déprécié <center>."                                                },
@@ -1012,8 +980,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { METADATA_MISSING,                              0, "[13.2.1.1]: Métadonnées manquantes."                                                                    },
     { METADATA_MISSING_REDIRECT_AUTOREFRESH,         0, "[13.2.1.3]: Métadonnées manquantes (redirect/auto-refresh)."                                            },
     { SKIPOVER_ASCII_ART,                            0, "[13.10.1.1]: ignore l'ascii art."                                                                       },
-#endif /* SUPPORT_ACCESSIBILITY_CHECKS */
-
 
 #if SUPPORT_CONSOLE_APP
     { TC_LABEL_COL,                                  0, "colonne"                                                                                                },
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_pt_br.h b/HTMLTidy/vendor/tidy-html5/src/language_pt_br.h
new file mode 100644
index 00000000..2b65d885
--- /dev/null
+++ b/HTMLTidy/vendor/tidy-html5/src/language_pt_br.h
@@ -0,0 +1,1296 @@
+#ifndef language_pt_br_h
+#define language_pt_br_h
+/*
+ * language_pt_br.h
+ * Localization support for HTML Tidy.
+ *
+ *
+ * This file is a localization file for HTML Tidy. It will have been machine
+ * generated or created and/or edited by hand. Both are valid options, but
+ * please help keep our localization efforts simple to maintain by maintaining
+ * the structure of this file, and changing the check box below if you make
+ * changes (so others know the file origin):
+ *
+ * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
+ *     language (and maybe region) "pt_br". The source of
+ *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     "language_pt_br.po".
+ *
+ * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
+ *     directly (and check this box). If you prefer to edit PO files then use
+ *     `poconvert.rb msgunfmt language_pt_br.h` (our own
+ *     conversion tool) to generate a fresh PO from this file first!
+ *
+ * (c) 2015-2017 HTACG
+ * See tidy.h and access.h for the copyright notice.
+ *
+ * Template Created by Jim Derry on 01/14/2016.
+ *
+ * Orginating PO file metadata:
+ *   PO_LAST_TRANSLATOR=jderry
+ *   PO_REVISION_DATE=2017-10-05 15:13:40
+ */
+
+#ifdef _MSC_VER
+#pragma execution_character_set("utf-8")
+#endif
+
+
+/**
+ *  This language-specific function returns the correct pluralForm
+ *  to use given n items, and is used as a member of each language
+ *  definition.
+ */
+static uint whichPluralForm_pt_br(uint n) {
+    /* Plural-Forms: nplurals=2; */
+    return (n > 1);
+}
+
+
+/**
+ *  This structure specifies all of the strings needed by Tidy for a
+ *  single language. Static definition in a header file makes it
+ *  easy to include and exclude languages without tinkering with
+ *  the build system.
+ */
+static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
+    /***************************************
+     ** This MUST be present and first. 
+     ** Specify the code for this language.
+     ***************************************/
+    {/* Specify the ll or ll_cc language code here. */
+      TIDY_LANGUAGE,                                 0, "pt_br"
+    },
+    { TidyAccessibilityCheckLevel,                   0,        
+        "Esta opção especifica o nível de verificação de acessibilidade, se houver, "
+        "que Tidy deve executar. <br/>Nível <var>0 (Tidy Classic)</var> é equivalente "
+        "à verificação de acessibilidade do Tidy Classic.<br/> Para obter mais "
+        "informações sobre a verificação de acessibilidade do Tidy, visite <a href=\""
+        "http://www.html-tidy.org/accessibility/\"> Página de acessibilidade do "
+        "Tidy</a>. "
+    },
+    { TidyAltText,                                   0,        
+        "Esta opção especifica o texto padrão <code>alt=</code> que o Tidy usa para "
+        "atributos <code>&lt;img&gt;</code> quando o atributo <code>alt=</code> está "
+        "faltando. <br/>Use com cuidado, pois é sua responsabilidade tornar seus "
+        "documentos acessíveis para pessoas que não conseguem ver as imagens. "
+    },
+    { TidyAnchorAsName,                              0,        
+        "Esta opção controla a exclusão ou adição do atributo <code>name</code> em "
+        "elementos onde ele pode servir como âncora. <br/>Se configurado para "
+        "<var>yes</var>, um atributo <code>name</code>, se não já existir, é "
+        "adicionado ao longo de um atributo <code>id</code> existente se o DTD o "
+        "permitir. <br/>Se configurado para <var>no</var> qualquer atributo de nome "
+        "existente é removido se um atributo <code>id</code> existir ou tenha sido "
+        "adicionado. "
+    },
+    { TidyAsciiChars,                                0,        
+        "Pode ser usado para modificar o comportamento da opção <code>clean</code> "
+        "quando configurado para <var>yes</var>. <br/>Se configurado para "
+        "<var>yes</var> ao usar <code>clean</code>, <code>&amp;emdash;</code>, "
+        "<code>&amp;rdquo;</code>, e outras entidades de caracteres nomeadas são "
+        "rebaixadas para os equivalentes ASCII mais próximos. "
+    },
+    { TidyBlockTags,                                 0,        
+        "Esta opção especifica novas tags de nível de bloco. Esta opção possui uma "
+        "lista separada por vírgulas ou espaço de nomes de tags. <br/>A menos que "
+        "você declare novas tags, o Tidy se recusará a gerar um arquivo arrumado se a "
+        "entrada incluir tags anteriormente desconhecidas. <br/>Note que você não "
+        "pode alterar o modelo de conteúdo para elementos como "
+        "<code>&lt;table&gt;</code>, <code>&lt;ul&gt;</code>, <code>&lt;ol&gt;</code> "
+        "e <code>&lt;dl&gt;</code>. <br/>Esta opção é ignorada no modo XML. "
+    },
+    { TidyBodyOnly,                                  0,        
+        "Esta opção especifica se o Tidy deve imprimir apenas o conteúdo da tag body "
+        "como um fragmento HTML. <br/>Se configurado para <var>auto</var>, isso é "
+        "realizado somente se a tag body tiver sido inferida. <br/>Útil para "
+        "incorporar páginas inteiras existentes como uma porção de outra página. <br/>"
+        "Esta opção não tem efeito se a saída XML for solicitada. "
+    },
+    { TidyBreakBeforeBR,                             0,        
+        "Esta opção especifica se o Tidy deve emitir uma quebra de linha antes de "
+        "cada elemento <code>&lt;br&gt;</code>. "
+    },
+    { TidyCharEncoding,                              0,        
+        "Esta opção especifica a codificação de caracteres que o Tidy usa tanto para "
+        "a entrada como para a saída. <br/>Para <var>ascii</var>, o Tidy aceitará "
+        "valores de caracteres Latin-1 (ISO-8859-1), mas usará entidades para todos "
+        "os caracteres cujo valor seja &gt;127. <br/>Para <var>raw</var>, o Tidy "
+        "emitirá valores acima de 127 sem traduzi-los em entidades. <br/>Para "
+        "<var>latin1</var>, os caracteres acima de 255 serão escritos como entidades. "
+        "<br/>Para <var>utf8</var>, Tidy presume que tanto a entrada como a saída são "
+        "codificadas como UTF-8. <br/>Você pode usar <var>iso2022</var> para arquivos "
+        "codificados usando a família de codificações ISO-2022, p.ex. ISO-2022-JP. "
+        "<br/> Para <var>mac</var> e <var>win1252</var>, o Tidy aceitará valores de "
+        "caracteres específicos do fornecedor, mas usará entidades para todos os "
+        "caracteres cujo valor seja &gt;127. <br/>Para codificações sem suporte, use "
+        "um utilitário externo para converter de e para UTF-8. "
+    },
+    { TidyCoerceEndTags,                             0,        
+        "Esta opção especifica se o Tidy deve coagir uma tag de início em uma tag de "
+        "fim nos casos em que parece que uma tag de fim provavelmente foi projetada; "
+        "por exemplo, dado <br/><code>&lt;span&gt;foo &lt;b&gt;bar&lt;b&gt; "
+        "baz&lt;/span&gt;</code>, <br/>Tidy vai emitir <br/><code>&lt;span&gt;foo "
+        "&lt;b&gt;bar&lt;/b&gt; baz&lt;/span&gt;</code> "
+    },
+    { TidyCSSPrefix,                                 0,        
+        "Esta opção especifica o prefixo que o Tidy usa para regras de estilo. <br/>Por padrão, <var>c</"
+        "var> será usado. "
+    },
+    { TidyDecorateInferredUL,                        0,        
+        "Esta opção especifica se o Tidy deve decorar elementos inferidos "
+        "<code>&lt;ul&gt;</code> com algumas marcações CSS para evitar recuo para a "
+        "direita. "
+    },
+    { TidyDoctype,                                   0,        
+        "Esta opção especifica a declaração DOCTYPE gerada pelo Tidy. <br/>Se "
+        "configurado para <var>omit</var>, a saída não conterá uma declaração "
+        "DOCTYPE. Note que isso também implica que <code>numeric-entity</code> esteja "
+        "definido para <var>yes</var>. <br/>Se configurado para <var>html5</var>, o "
+        "DOCTYPE é configurado para <code>&lt;!DOCTYPE html&gt;</code>. <br/>Se "
+        "configurado para <var>auto</var> (o padrão), Tidy usará um palpite educado "
+        "com base no conteúdo do documento. <br/>Se configurado para <var>strict</var>"
+        ", o Tidy configurará o DOCTYPE para o DTD estrito HTML4 ou XHTML1. <br/>Se "
+        "configurado para <var>loose</var>, o DOCTYPE é definido como o DTD loose "
+        "(transicional) HTML4 ou XHTML1. <br/>Alternativamente, você pode fornecer "
+        "uma string para o identificador público formal (FPI). <br/>Por exemplo: "
+        "<br/><code>doctype: \"-//ACME//DTD HTML 3.14159//EN\"</code><br/>Se você "
+        "especificar o FPI para um documento XHTML, o Tidy irá definir o "
+        "identificador do sistema em uma string vazia. Para um documento HTML, a Tidy "
+        "adiciona um identificador de sistema somente se um já estivesse presente "
+        "para preservar o modo de processamento de alguns navegadores. Tidy deixa o "
+        "DOCTYPE para documentos genéricos XML inalterados. <br/>Esta opção não "
+        "oferece uma validação da conformidade do documento. "
+    },
+    { TidyDropEmptyElems,                            0, "Esta opção especifica se Tidy deve descartar elementos vazios. "                                 },
+    { TidyDropEmptyParas,                            0, "Esta opção especifica se Tidy deve descartar parágrafos vazios. "                                },
+    { TidyDropPropAttrs,                             0,        
+        "Esta opção especifica se o Tidy deve remover os atributos de propriedade, "
+        "como os atributos de ligação de dados da Microsoft. Além disso, os atributos "
+        "que não são permitidos na versão de saída do HTML serão descartados se "
+        "usados com <code>strict-tags-attributes</code>. "
+    },
+    { TidyDuplicateAttrs,                            0,        
+        "Esta opção especifica se o Tidy deve manter o primeiro ou último atributo, "
+        "se um atributo estiver repetido, p.ex. possui dois atributos "
+        "<code>align</code>. "
+    },
+    { TidyEmacs,                                     0,        
+        "Esta opção especifica se o Tidy deve alterar o formato para relatar erros e "
+        "avisos para um formato que é analisado mais facilmente pelo GNU Emacs. "
+    },
+    { TidyEmptyTags,                                 0,        
+        "Esta opção especifica novas tags em-linha vazias. Esta opção possui uma "
+        "lista separada por espaço ou vírgulas de nomes de tags. <br/>A menos que "
+        "você declare novas tags, o Tidy se recusará a gerar um arquivo arrumado se a "
+        "entrada incluir tags anteriormente desconhecidas. <br/>Lembre-se de declarar "
+        "tags vazias como em linha ou bloqueio. <br/>Esta opção é ignorada no modo "
+        "XML. "
+    },
+    { TidyEncloseBlockText,                          0,        
+        "Esta opção especifica se Tidy deve inserir um elemento <code>&lt;p&gt;</code>"
+        " para incluir qualquer texto que encontre em qualquer elemento que permita o "
+        "conteúdo misto para HTML transicional mas não HTML estrito. "
+    },
+    { TidyEncloseBodyText,                           0,        
+        "Esta opção especifica se o Tidy deve incluir qualquer texto encontrado no "
+        "elemento do corpo dentro de um elemento <code>&lt;p&gt;</code>. <br/>Isso é "
+        "útil quando você deseja usar o HTML existente e usá-lo com uma folha de "
+        "estilo. "
+    },
+    { TidyErrFile,                                   0,        
+        "Esta opção especifica o arquivo de erro que o Tidy usa para erros e avisos. "
+        "Normalmente, erros e avisos são emitidos para <code>stderr</code>. "
+    },
+    { TidyEscapeCdata,                               0,        
+        "Esta opção especifica se o Tidy deve converter seções "
+        "<code>&lt;![CDATA[]]&gt;</code> em texto normal. "
+    },
+    { TidyEscapeScripts,                             0,        
+        "Esta opção faz com que itens que se parecem com tags de fechamento, como <code>&lt;/g</code> "
+        "sejam escapadas para <code>&lt;\\/g</code>. Defina esta opção para <var>no</var> se você não "
+        "deseja isso."
+    },
+    { TidyFixBackslash,                              0,        
+        "Esta opção especifica se o Tidy deve substituir caracteres de barra "
+        "invertida <code>\\</code> em URLs com barras <code>/</code>. "
+    },
+    { TidyFixComments,                               0,        
+        "Esta opção especifica se Tidy deve substituir hífenes inesperados com "
+        "caracteres <code>=</code> quando se trata de hífenes adjacentes. <br/>O "
+        "padrão é <var>yes</var>. <br/>Esta opção é fornecida para usuários do Cold "
+        "Fusion que usam a sintaxe do comentário: <code>&lt;!--- ---&gt;</code>. "
+    },
+    { TidyFixUri,                                    0,        
+        "Esta opção especifica se o Tidy deve verificar valores de atributos que "
+        "carregam URIs para caracteres ilegais e, se tal for encontrado, escapa-os "
+        "conforme o HTML4 recomenda. "
+    },
+    { TidyForceOutput,                               0,        
+        "Esta opção especifica se o Tidy deve produzir saída, mesmo se forem "
+        "encontrados erros. <br/>Use esta opção com cuidado; Se o Tidy relatar um "
+        "erro, significa que o Tidy não conseguiu corrigir o erro (ou não sabe como), "
+        "então a saída resultante pode não refletir sua intenção. "
+    },
+    { TidyGDocClean,                                 0,        
+        "Esta opção especifica se o Tidy deve habilitar comportamento específico para "
+        "limpeza de HTML exportado do Google Docs. "
+    },
+    { TidyHideComments,                              0, "Esta opção especifica se Tidy deve imprimir os comentários. "                                    },
+    { TidyHtmlOut,                                   0,        
+        "Esta opção especifica se o Tidy deve gerar uma impressão amigável, "
+        "escrevendo como HTML. "
+    },
+    { TidyInCharEncoding,                            0,        
+        "Esta opção especifica a codificação de caracteres que o Tidy usa para a "
+        "entrada. Veja <code>char-encoding</code> para mais informações. "
+    },
+    { TidyIndentAttributes,                          0,        
+        "Esta opção especifica se o Tidy deve começar cada atributo em uma nova "
+        "linha. "
+    },
+    { TidyIndentCdata,                               0,        
+        "Esta opção especifica se o Tidy deve aplicar recuo nas seções "
+        "<code>&lt;![CDATA[]]&gt;</code>. "
+    },
+    { TidyIndentContent,                             0,        
+        "Esta opção especifica se Tidy deve aplicar recuo nas tags de nível de bloco. "
+        "<br/>Se configurado para <var>auto</var>, Tidy decidirá se aplica ou não "
+        "recuo no conteúdo das tags, como <code>&lt;title&gt;</code>, "
+        "<code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code>, <code>&lt;li&gt;</code>, "
+        "<code>&lt;td&gt;</code> ou <code>&lt;p&gt;</code> com base no conteúdo, "
+        "incluindo um elemento de nível de bloco. <br/>Configurar <code>indent</code> "
+        "para <var>yes</var> pode expor erros de layout em alguns navegadores. <br/>"
+        "Use a opção <code>indent-spaces</code> para controlar o número de espaços ou "
+        "tabulações de saída por nível de recuo e <code>indent-with-tabs</code> para "
+        "especificar se espaços ou tabulações são usados. "
+    },
+    { TidyIndentSpaces,                              0,        
+        "Esta opção especifica o número de espaços ou guias que o Tidy usa para "
+        "recuar o conteúdo quando <code>indent</code> está habilitado. <br/>Note que "
+        "o valor padrão para esta opção depende do valor de <code>indent-with-"
+        "tabs</code> (veja também). "
+    },
+    { TidyInlineTags,                                0,        
+        "Esta opção especifica novas tags em-linha não vazias. Esta opção possui uma "
+        "lista separada por espaço ou vírgulas de nomes de tags. <br/>A menos que "
+        "você declare novas tags, o Tidy se recusará a gerar um arquivo arrumado se a "
+        "entrada incluir tags anteriormente desconhecidas. <br/>Esta opção é ignorada "
+        "no modo XML. "
+    },
+    { TidyJoinClasses,                               0,        
+        "Esta opção especifica se o Tidy deve combinar os nomes das classes para "
+        "gerar um nome de classe único e novo se várias atribuições de classe forem "
+        "detectadas em um elemento. "
+    },
+    { TidyJoinStyles,                                0,        
+        "Esta opção especifica se o Tidy deve combinar os estilos para gerar um "
+        "estilo único e novo se vários valores de estilo forem detectados em um "
+        "elemento. "
+    },
+    { TidyKeepFileTimes,                             0,        
+        "Esta opção especifica se o Tidy deve manter o tempo de modificação original "
+        "dos arquivos que o Tidy modifica no local. <br/>Configurar a opção para "
+        "<var>yes</var> permite arrumar arquivos sem alterar a data de modificação do "
+        "arquivo, o que pode ser útil com determinadas ferramentas que usam a data de "
+        "modificação para coisas como a implantação automática do servidor. <br/>Note "
+        "que não há suporte a este recurso em algumas plataformas. "
+    },
+    { TidyLiteralAttribs,                            0,        
+        "Esta opção especifica como o Tidy lida com caracteres de espaço em branco "
+        "dentro de valores de atributos. <br/>Se o valor for <var>no</var>, Tidy "
+        "normaliza os valores dos atributos substituindo qualquer nova linha ou "
+        "tabulação por um único espaço, além de substituir qualquer espaço contíguo "
+        "em espaço único. <br/>Para forçar o Tidy a preservar os valores literais "
+        "originais de todos os atributos e garantir que os espaços em branco dentro "
+        "dos valores de atributo sejam passados inalterados através, defina esta "
+        "opção como <var>yes</var>. "
+    },
+    { TidyLogicalEmphasis,                           0,        
+        "Esta opção especifica se o Tidy deve substitui qualquer ocorrência de "
+        "<code>&lt;i&gt;</code> com <code>&lt;em&gt;</code> e qualquer ocorrência de "
+        "<code>&lt;b&gt;</code> com <code>&lt;strong&gt;</code>. Quaisquer atributos "
+        "são preservados inalterados. <br/>Esta opção pode ser definida "
+        "independentemente da opção <code>clean</code>. "
+    },
+    { TidyLowerLiterals,                             0,        
+        "Esta opção especifica se o Tidy deve converter o valor de um atributo que "
+        "leva uma lista de valores predefinidos para minúsculas. <br/>Isto é "
+        "necessário para documentos XHTML. "
+    },
+    { TidyMakeBare,                                  0,        
+        "Esta opção especifica se o Tidy deve retirar o HTML específico da Microsoft "
+        "de documentos do Word 2000 e exibir espaços em vez de espaços rígidos (nbsp) "
+        "nos quais eles existam na entrada. "
+    },
+    { TidyMakeClean,                                 0,        
+        "Esta opção especifica se o Tidy deve executar a limpeza de algumas tags de "
+        "apresentação legadas (atualmente <code>&lt;i&gt;</code>, "
+        "<code>&lt;b&gt;</code>, <code>&lt;center&gt;</code> quando incluídas nas "
+        "tags em-linha apropriadas e <code>&lt;font&gt;</code>). Se configurado para "
+        "<var>yes</var>, as tags legadas serão substituídas por tags CSS "
+        "<code>&lt;style&gt;</code> e marcação estrutural conforme apropriado. "
+    },
+    { TidyMark,                                      0,        
+        "Esta opção especifica se o Tidy deve adicionar um elemento <code>meta</code> "
+        "ao cabeçalho do documento para indicar que o documento foi arrumado. <br/>"
+        "Tidy não adicionará um elemento meta se um já estiver presente. "
+    },
+    { TidyMergeDivs,                                 0,        
+        "Esta opção pode ser usada para modificar o comportamento de "
+        "<code>clean</code> quando configurado para <var>yes</var>. <br/>Esta opção "
+        "especifica se o Tidy deve mesclar <code>&lt;div&gt;</code> aninhados, como "
+        "<code>&lt;div&gt;&lt;div&gt;...&lt;/div&gt;&lt;/div&gt;</code>. <br/>Se "
+        "configurado para <var>auto</var>, os atributos do <code>&lt;div&gt;</code> "
+        "internos são movidos para o externo. <code>&lt;div&gt;</code> aninhados com "
+        "os atributos <code>id</code> <em>não</em> são mesclados. <br/>Se configurado "
+        "para <var>yes</var>, os atributos de <code>&lt;div&gt;</code> interno são "
+        "descartados com a exceção de <code>class</code> e <code>style</code>. "
+    },
+    { TidyMergeEmphasis,                             0,        
+        "Esta opção especifica se o Tidy deve mesclar elementos <code>&lt;b&gt;</code>"
+        " e <code>&lt;i&gt;</code> aninhados; por exemplo, para o caso de "
+        "<br/><code>&lt;b class=\"rtop-2\"&gt;foo &lt;b class=\"r2-2\""
+        "&gt;bar&lt;/b&gt; baz&lt;/b&gt;</code>, <br/>Tidy vai emitir <code>&lt;b "
+        "class=\"rtop-2\"&gt;foo bar baz&lt;/b&gt;</code>. "
+    },
+    { TidyMergeSpans,                                0,        
+        "Esta opção pode ser usada para modificar o comportamento de "
+        "<code>clean</code> quando configurado para <var>yes</var>. <br/>Esta opção "
+        "especifica se o Tidy deve mesclar <code>&lt;span&gt;</code> aninhados como "
+        "<code>&lt;span&gt;&lt;span&gt;...&lt;/span&gt;&lt;/span&gt;</code>. <br/>O "
+        "algoritmo é idêntico àquele usado por <code>merge-divs</code>. "
+    },
+    { TidyNCR,                                       0,        
+        "Esta opção especifica se o Tidy deve permitir referências de caracteres "
+        "numéricos. "
+    },
+    { TidyNewline,                                   0,        
+        "O padrão é apropriado para a plataforma atual. <br/>Geralmente, CRLF no PC-"
+        "DOS, Windows e OS/2; CR no Mac OS Clássico; e LF nos demais (Linux, Mac OS X "
+        "e Unix). "
+    },
+    { TidyNumEntities,                               0,        
+        "Esta opção especifica se o Tidy deve produzir entidades diferentes das "
+        "entidades HTML integradas (<code>&amp;amp;</code>, <code>&amp;lt;</code>, "
+        "<code>&amp;gt;</code> e <code>&amp;quot;</code>) no formulário numérico em "
+        "vez do formulário nomeado. <br/>Somente são usadas entidades compatíveis com "
+        "a declaração DOCTYPE gerada. <br/>As entidades que podem ser representadas "
+        "na codificação de saída são traduzidas correspondentemente. "
+    },
+    { TidyOmitOptionalTags,                          0,        
+        "Esta opção especifica se o Tidy deve omitir tags de início e de fim "
+        "opcionais ao gerar saída. <br/>Configurar essa opção causa todas as tags "
+        "para os elementos <code>&lt;html&gt;</code>, <code>&lt;head&gt;</code> e "
+        "<code>&lt;body&gt;</code> serem omitidos da saída, assim como tags de saída "
+        "como <code>&lt;/p&gt;</code>, <code>&lt;/li&gt;</code>, "
+        "<code>&lt;/dt&gt;</code>, <code>&lt;/dd&gt;</code>, "
+        "<code>&lt;/option&gt;</code>, <code>&lt;/tr&gt;</code>, "
+        "<code>&lt;/td&gt;</code> e <code>&lt;/th&gt;</code>. <br/>Essa opção é "
+        "ignorada para saída XML. "
+    },
+    { TidyOutCharEncoding,                           0,        
+        "Esta opção especifica a codificação de caracteres que o Tidy usa para a saída. <br/>Note que "
+        "isso só pode ser diferente de <code>input-encoding</code> para codificações latinas "
+        "(<var>ascii</var>, <var>latin0</var>, <var>latin1</var>, <var>mac</var>, <var>win1252</var>, "
+        "<var>ibm858</var>). <br/>Veja <code>char-encoding</code> para mais informações"
+    },
+    { TidyOutFile,                                   0,        
+        "Essa opção especifica o arquivo de saída que o Tidy usa para marcação. "
+        "Normalmente, a marcação é escrita para <code>stdout</code>. "
+    },
+    { TidyOutputBOM,                                 0,        
+        "Esta opção especifica se o Tidy deve escrever um caractere Unicode de marca "
+        "de ordem de byte (BOM, também conhecido como Zero Width No Break Break, tem "
+        "valor de U+FEFF) no início da saída, e aplica-se apenas a codificações de "
+        "saída UTF-8 e UTF-16. <br/>Se configurado para <var>auto</var>, esta opção "
+        "faz com que Tidy escreva um BOM para a saída somente se um BOM estiver "
+        "presente no início da entrada. <br/>Um BOM está sempre escrita para saída "
+        "XML/XHTML usando codificações de saída UTF-16. "
+    },
+    { TidyPPrintTabs,                                0,        
+        "Esta opção especifica se o Tidy deve aplicar recuo com tabulações em vez de "
+        "espaços, presumindo que <code>indent</code> seja <var>yes</var>. <br/>Defina-"
+        "o para <var>yes</var> para recuar usando tabulações em vez dos espaços "
+        "padrão. <br/>Use a opção <code>indent-spaces</code> para controlar o número "
+        "de saídas de tabulação por nível de recuo. Note que quando <code>indent-with-"
+        "tabs</code> está habilitado, o valor padrão de <code>indent-spaces</code> é "
+        "reiniciado para <var>1</var>. <br/>Note que <code>tab-size</code> controla a "
+        "conversão de tabulações de entrada em espaços. Coloque-o em zero para reter "
+        "as tabulações de entrada. "
+    },
+    { TidyPreserveEntities,                          0,        
+        "Esta opção especifica se o Tidy deve preservar entidades bem-formadas como "
+        "localizado na entrada. "
+    },
+    { TidyPreTags,                                   0,        
+        "Esta opção especifica novas tags que devem ser processadas exatamente da "
+        "mesma forma que o elemento <code>&lt;pre&gt;</code> de HTML. Esta opção "
+        "possui uma lista separada por vírgulas ou espaços de nomes de tag. <br/>A "
+        "menos que você declare novas tags, o Tidy se recusará a gerar um arquivo "
+        "arrumado se a entrada incluir tags anteriormente desconhecidas. <br/>Note "
+        "que você ainda não pode adicionar novos elementos CDATA. <br/>Esta opção é "
+        "ignorada no modo XML. "
+    },
+    { TidyPunctWrap,                                 0,        
+        "Essa opção especifica se o Tidy deve quebrar linha após alguns Unicode ou "
+        "caracteres de pontuação chineses. "
+    },
+    { TidyQuiet,                                     0,        
+        "Essa opção especifica se o Tidy deve emitir o resumo dos números de erros e "
+        "avisos, ou as mensagens de boas-vidas ou informacionais. "
+    },
+    { TidyQuoteAmpersand,                            0,        
+        "Essa opção especifica se o Tidy deve emitir caracteres <code>&amp;</code> "
+        "sem adornos como <code>&amp;amp;</code>. "
+    },
+    { TidyQuoteMarks,                                0,        
+        "Esta opção especifica se o Tidy deve enviar caracteres <code>&quot;</code> "
+        "como <code>&quot;</code> como é preferido por alguns ambientes de edição. "
+        "<br/>O caractere do apóstrofe <code>'</code> é escrito como "
+        "<code>&amp;#39;</code> porque muitos navegadores web ainda não oferecem "
+        "suporte a <code>&amp;apos;</code>. "
+    },
+    { TidyQuoteNbsp,                                 0,        
+        "Esta opção especifica se o Tidy deve produzir caracteres de espaço rígido "
+        "como entidades, em vez de como o caractere Unicode de valor 160 (decimal). "
+    },
+    { TidyReplaceColor,                              0,        
+        "Esta opção especifica se o Tidy deve substituir os valores numéricos nos atributos de cor com "
+        "nomes de cor HTML/XHTML onde definido, p.ex. substituir <code>#ffffff</code> com <code>white</"
+        "code>. "
+    },
+    { TidyShowErrors,                                0,        
+        "Esta opção especifica o número que o Tidy usa para determinar se outros "
+        "erros devem ser exibidos. Se configurado para <var>0</var>, nenhum erro será "
+        "mostrado. "
+    },
+    { TidyShowInfo,                                  0,        
+        "Esta opção especifica se o Tidy deve exibir mensagens de nível "
+        "informacional. "
+    },
+    { TidyShowMarkup,                                0,        
+        "Esta opção especifica se o Tidy deve gerar uma versão de impressão amigável "
+        "da marcação. Note que o Tidy não gerará uma versão de impressão amigável se "
+        "encontrar erros significativos (veja <code>force-output</code>). "
+    },
+    { TidyShowWarnings,                              0,        
+        "Esta opção especifica se o Tidy deve suprimir avisos. Isso pode ser útil "
+        "quando alguns erros estão ocultos em uma agitação de avisos. "
+    },
+    { TidySkipNested,                                0,        
+        "Esta opção especifica que o Tidy deve pular tags aninhadas ao analisar "
+        "script e dados de estilo. "
+    },
+    { TidySortAttributes,                            0,        
+        "Esta opção especifica que o Tidy deve ordenar atributos dentro de um "
+        "elemento usando o algoritmo de ordenação especificado. Se configurado para "
+        "<var>alpha</var>, o algoritmo é uma ordenação alfabética ascendente. "
+    },
+    { TidyStrictTagsAttr,                            0,        
+        "Esta opção garante que tags e atributos sejam aplicáveis à versão do HTML "
+        "que o Tidy emite. Quando definido para <var>yes</var> e o tipo de documento "
+        "de saída é um doctype estrito, então o Tidy informará os erros. Se o tipo de "
+        "documento de saída for um tipo de documento loose ou transicional, o Tidy "
+        "informará os avisos. <br/>Além disso, se <code>drop-proprietary-"
+        "attributes</code> estiver habilitado, os atributos não aplicáveis também "
+        "serão descartados. <br/>Quando configurado para <var>no</var>, essas "
+        "verificações não são executadas. "
+    },
+    { TidyTabSize,                                   0,        
+        "Esta opção especifica o número de colunas que o Tidy usa entre paradas de "
+        "tabulação sucessivas. Ela é usada para mapear tabulações para espaços ao ler "
+        "a entrada. "
+    },
+    { TidyUpperCaseAttrs,                            0,        
+        "Esta opção especifica se o Tidy deve produzir nomes de atributo em "
+        "maiúsculo. <br/>Quando configurado para <var>no</var>, os nomes dos "
+        "atributos serão escritos em minúsculas. Especificar <var>yes</var> exibirá "
+        "nomes de atributos em maiúsculas e <var>preserve</var> pode ser usado para "
+        "deixar nomes de atributos intactos. <br/>Ao usar a entrada XML, o "
+        "maiusculização original é sempre preservada. "
+    },
+    { TidyUpperCaseTags,                             0,        
+        "Esta opção especifica se o Tidy deve emitir nomes de tags em maiúsculo. <br/>"
+        "O padrão é <var>no</var>, o que resulta em nomes de tags minúsculos, exceto "
+        "para entrada XML na qual a maiusculização original é preservada. "
+    },
+    { TidyUseCustomTags,                             0,        
+        "Esta opção permite o uso de tags para elementos personalizados autônomos, "
+        "p.ex. &lt;flag-icon&gt; com Tidy. As tags personalizadas são desativadas se "
+        "esse valor for <var>no</var>. Outras configurações - <var>blocklevel</var>, "
+        "<var>empty</var>, <var>inline</var> e <var>pre</var> tratarão <em>todas</em> "
+        "as tags personalizadas detectadas em conformidade. <br/>O uso de <code>new-"
+        "blocklevel-tags</code>, <code>new-empty-tags</code>, <code>new-inline-"
+        "tags</code> ou <code>new-pre-tags</code> substituirá o tratamento de tags "
+        "personalizadas por esta opção de configuração. Isso pode ser útil se você "
+        "tiver diferentes tipos de tags personalizadas. <br/>Quando habilitado, essas "
+        "tags são determinadas durante o processamento do documento usando tags de "
+        "abertura; As tags de fechamento de correspondência serão reconhecidas de "
+        "acordo, e as tags de fechamento desconhecidas serão descartadas. "
+    },
+    { TidyVertSpace,                                 0,        
+        "Esta opção especifica se o Tidy deve adicionar algumas linhas vazias extras para legibilidade. "
+        "<br/>O padrão é <var>no</var>. <br/>Se configurado para <var>auto</var>, Tidy vai eliminar "
+        "quase todos os caracteres de nova linha."
+    },
+    { TidyWarnPropAttrs,                             0, "Essa opção especifica se o Tidy deve avisar sobre atributos proprietários."                      },
+    { TidyWord2000,                                  0,        
+        "Esta opção especifica se o Tidy deve se esforçar duro para tirar todas as "
+        "coisas excedentes que o Microsoft Word 2000 insere quando você salva os "
+        "documentos do Word como \"páginas web\". Não manipula imagens embutidas ou "
+        "VML. <br/>Você deve considerar usar o Word \"Salvar Como: Página da Web, "
+        "Filtrada\". "
+    },
+    { TidyWrapAsp,                                   0,        
+        "Essa opção especifica se o Tidy deve quebrar linha de textos contidos em "
+        "pseudoelementos do ASP, que se parecem com: <code>&lt;% ... %&gt;</code>. "
+    },
+    { TidyWrapAttVals,                               0,        
+        "Esta opção especifica se Tidy deve incluir valores de atributos de linha, o "
+        "que significa que, se o valor de um atributo faz com que uma linha exceda a "
+        "largura especificada por <code>wrap</code>, Tidy irá adicionar uma ou mais "
+        "quebras de linha ao valor, fazendo com que ele seja embrulhado em várias "
+        "linhas. <br/>Note que esta opção pode ser definida independentemente de <code"
+        ">wrap-script-literals</code>. Por padrão, o Tidy substitui qualquer nova "
+        "linha ou tabulação com um único espaço e substitui qualquer sequência de "
+        "espaços em branco com um único espaço. <br/>Para forçar a Tidy a preservar "
+        "os valores literais originais de todos os atributos e garantir que os "
+        "caracteres de espaço em branco nos valores de atributos sejam passados "
+        "através de alterações, configure <code>literal-attributes</code> para "
+        "<var>yes</var>. "
+    },
+    { TidyWrapJste,                                  0,        
+        "Essa opção especifica se o Tidy deve quebrar linha de textos contidos em "
+        "pseudoelementos do JSTE, que se parecem com: <code>&lt;# ... #&gt;</code>. "
+    },
+    { TidyWrapLen,                                   0,        
+        "Esta opção especifica a margem direita que o Tidy usa para quebra de linha. "
+        "<br/>Tidy tenta quebrar linhas para que não excedam esse comprimento. <br/>"
+        "Defina <code>wrap</code> para <var>0</var> (zero) se desejar desativar a "
+        "quebra de linha. "
+    },
+    { TidyWrapPhp,                                   0,        
+        "Essa opção especifica se o Tidy deve quebrar linha de textos contidos em "
+        "pseudoelementos do PHP, que se parecem com: <code>&lt;?php ... ?&gt;</code>. "
+    },
+    { TidyWrapScriptlets,                            0,        
+        "Esta opção especifica se Tidy deve efetuar quebra de linha em string "
+        "literais que aparecem em atributos de script. <br/>Tidy efetua essa quebra "
+        "em string literais de scripts longos inserindo um caractere de barra "
+        "invertida antes da quebra de linha. "
+    },
+    { TidyWrapSection,                               0,        
+        "Essa opção especifica se o Tidy deve efetuar quebra de linha de textos "
+        "contidos em tags de seção <code>&lt;![ ... ]&gt;</code>. "
+    },
+    { TidyWriteBack,                                 0,        
+        "Esta opção especifica se o Tidy deve escrever novamente a marcação arrumada "
+        "para o mesmo arquivo que lê. <br/> É aconselhável manter cópias de arquivos "
+        "importantes antes de ordená-los, como em ocasiões raras, o resultado pode "
+        "não ser o que você espera. "
+    },
+    { TidyXhtmlOut,                                  0,        
+        "Esta opção especifica se o Tidy deve gerar uma impressão amigável, "
+        "escrevendo como HTML extensível. <br/>Esta opção faz com que o Tidy "
+        "configure o DOCTYPE e o espaço de nomes padrão conforme apropriado para "
+        "XHTML e use o valor corrigido no resultado, independentemente de outras "
+        "fontes. <br/> Para XHTML, as entidades podem ser escritas como entidades "
+        "nomeadas ou numéricas de acordo com a configuração de <code>numeric-"
+        "entities</code>. <br/>A maiusculização original de tags e atributos será "
+        "preservada, independentemente de outras opções. "
+    },
+    { TidyXmlDecl,                                   0,        
+        "Esta opção especifica se o Tidy deve adicionar a declaração XML ao enviar "
+        "XML ou XHTML. <br/>Note que, se a entrada já incluir uma declaração "
+        "<code>&lt;?xml ... ?&gt;</code>, esta opção será ignorada. <br/>Se a "
+        "codificação para a saída for diferente de <var>ascii</var>, uma das "
+        "codificações <var>utf*</var> ou de <var>raw</var>, então a declaração é "
+        "sempre adicionado conforme exigido pelo padrão XML. "
+    },
+    { TidyXmlOut,                                    0,        
+        "Esta opção especifica se o Tidy deve emitir impressão amigável, escrevendo-o "
+        "como XML bem formado. <br/>Todas as entidades não definidas no XML 1.0 serão "
+        "escritas como entidades numéricas para permitir que elas sejam analisadas "
+        "por um analisador XML. <br/>A maiusculização original de tags e atributos "
+        "será preservada, independentemente de outras opções. "
+    },
+    { TidyXmlPIs,                                    0,        
+        "Esta opção especifica se o Tidy deve alterar a análise das instruções de "
+        "processamento para exigir <code>?&gt;</code> como o terminador, em vez de "
+        "<code>&gt;</code>. <br/>Esta opção é configurada automaticamente se a "
+        "entrada for um XML. "
+    },
+    { TidyXmlSpace,                                  0,        
+        "Esta opção especifica se o Tidy deve adicionar <code>xml:space=\"preserve\"</code> para "
+        "elementos tais como <code>&lt;pre&gt;</code>, <code>&lt;style&gt;</code> e <code>&lt;script&gt;"
+        "</code> ao gerar o XML. <br/>Isso é necessário se o espaço em branco em tais elementos deve ser "
+        "analisado apropriadamente sem ter acesso ao DTD. "
+    },
+    { TidyXmlTags,                                   0,        
+        "Esta opção especifica se o Tidy deve usar o analisador XML em vez do "
+        "analisador HTML de correção de erro. "
+    },
+    { TidyMetaCharset,                               0,        
+        "Esta opção, quando ativada, adiciona um elemento <code>&lt;meta&gt;</code> e "
+        "define o atributo <code>charset</code> para a codificação do documento. "
+        "Configure esta opção para <var>yes</var> para habilitá-lo. "
+    },
+    { TidyShowMetaChange,                            0,        
+        "Esta opção habilita uma mensagem sempre que o Tidy alterar o atributo "
+        "<code>content</code> de uma declaração de meta conjunto de caracteres para "
+        "coincidir com a codificação do documento. Defina esta opção para "
+        "<var>yes</var> para habilitá-lo. "
+    },
+    { TidyStyleTags,                                 0,        
+        "Esta opção especifica se o Tidy deve mover todas as tags de estilo para o "
+        "cabeçalho do documento. "
+    },
+    { TidyWarning,                                   0, "Acesso: "                                                                                        },
+    { TidyAccess,                                    0, "Acesso: "                                                                                        },
+    { TidyError,                                     0, "Erro: "                                                                                          },
+    { TidyBadDocument,                               0, "Documento: "                                                                                     },
+    { TidyFatal,                                     0, "Pânico: "                                                                                        },
+    { TidyDialogueSummary,                           0, "Resumo: "                                                                                        },
+    { TidyDialogueInfo,                              0, "Informação: "                                                                                    },
+    { TidyDialogueFootnote,                          0, "Nota de rodapé: "                                                                                },
+    { LINE_COLUMN_STRING,                            0, "linha %d coluna %d - "                                                                           },
+    { STRING_DISCARDING,                             0, "descartando"                                                                                     },
+    { STRING_ERROR_COUNT_ERROR,                      0, "erro"                                                                                            },
+    { STRING_ERROR_COUNT_ERROR,                      1, "erros"                                                                                           },
+    { STRING_ERROR_COUNT_WARNING,                    0, "aviso"                                                                                           },
+    { STRING_ERROR_COUNT_WARNING,                    1, "avisos"                                                                                          },
+    { STRING_HELLO_ACCESS,                           0,        
+        "\n"
+        "Verificações de acessibilidade:\n"
+    },
+    { STRING_HTML_PROPRIETARY,                       0, "Proprietário HTML"                                                                               },
+    { STRING_XML_DECLARATION,                        0, "declaração XML"                                                                                  },
+    { STRING_PLAIN_TEXT,                             0, "texto simples"                                                                                   },
+    { STRING_REPLACING,                              0, "substituindo"                                                                                    },
+    { STRING_SPECIFIED,                              0, "especificada"                                                                                    },
+    { TIDYCUSTOMNO_STRING,                           0, "não"                                                                                             },
+    { TIDYCUSTOMBLOCKLEVEL_STRING,                   0, "nível de bloco"                                                                                  },
+    { TIDYCUSTOMEMPTY_STRING,                        0, "vazio"                                                                                           },
+    { TIDYCUSTOMINLINE_STRING,                       0, "em-linha"                                                                                        },
+    { TIDYCUSTOMPRE_STRING,                          0, "pré"                                                                                             },
+    { TEXT_HTML_T_ALGORITHM,                         0,        
+        "\n"
+        "      - Primeiro, pesquisa à esquerda da posição da célula para\n"
+        "        localizar células de cabeçalho de linha.\n"
+        "      - Então, pesquisa para cima para localizar células de cabeçalho\n"
+        "        de coluna.\n"
+        "      - A pesquisa em uma direção dada interrompe quando a borda da\n"
+        "        tabela é atingida ou quando uma célula de dados é localizada\n"
+        "        após uma célula de cabeçalho.\n"
+        "      - Cabeçalhos de linha são inseridas em uma linha na ordem que\n"
+        "        elas aparecem na tabela.\n"
+        "      - Para tabelas esquerda-para-direita, cabeçalhos são inseridas\n"
+        "        da esquerda para direita.\n"
+        "      - Cabeçalhos de coluna são inseridas após cabeçalhos de linha,\n"
+        "        na ordem que elas aparecem na tabela, de cima para baixo.\n"
+        "      - Se uma célula de cabeçalho tem atributo de cabeçalhos configurado,\n"
+        "        então os cabeçalhos referenciados por este atributo são inseridos\n"
+        "        na lisa e a pesquisa interrompe para a direção atual.\n"
+        "        células TD que configuram o atributo de eixo também são tratadas\n"
+        "        com células de cabeçalho.\n"
+    },
+    { TEXT_VENDOR_CHARS,                             0,        
+        "É improvável que as codificações dependentes do sistema específicas\n"
+        "do fornecedor funcionem amplamente na World Wide Web; você deve\n"
+        "evitar o uso da codificação de caracteres %s; em vez disso,\n"
+        "recomenda-se que você use entidades nomeadas, p.ex. &trade;.\n"
+    },
+    { TEXT_SGML_CHARS,                               0,        
+        "Os códigos de caracteres 128 a 159 (U+0080 a U+009F)\n"
+        "não são aceitos no HTML; mesmo se eles fossem, eles\n"
+        "provavelmente seriam caracteres de controle não imprimíveis.\n"
+        "Tidy presumiu que você queria se referir a um caractere\n"
+        "com o mesmo valor de bytes na codificação %s e substituiu\n"
+        "aquela referência com o equivalente Unicode.\n"
+    },
+    { TEXT_INVALID_UTF8,                             0,        
+        "Os códigos de caracteres para UTF-8 devem estar dentro\n"
+        "do intervalo: U+0000 a U+10FFFF. A definição de UTF-8\n"
+        "no Anexo D do ISO/IEC 10646-1:2000 também permite para\n"
+        "o uso de sequências de cinco e seis bytes para codificar\n"
+        "caracteres que estão fora do intervalo do conjunto de\n"
+        "caracteres do Unicode; aquelas sequências de cinco e\n"
+        "seis bytes são ilegais para o uso de UTF-8 como uma\n"
+        "transformação de caracteres Unicode. ISO/IEC 10646 não\n"
+        "permite mapeamento de substitutos não pareados, nem\n"
+        "U+FFFE e U+FFFF (mas permite outros não caracteres).\n"
+        "Para mais informações, veja http://www.unicode.org/ e\n"
+        "http://www.cl.cam.ac.uk/~mgk25/unicode.html\n"
+    },
+    { TEXT_INVALID_UTF16,                            0,        
+        "Os códigos de caracteres para UTF-16 devem estar dentro\n"
+        "do intervalo: U+0000 a U+10FFFF. A definição de UTF-16\n"
+        "no Anexo C da ISO/IEC 10646-1:2000 não permite o mapeamento\n"
+        "de substitutos não pareados. Para mais informações,\n"
+        "por favor veja http://www.unicode.org/ e\n"
+        "http://www.cl.cam.ac.uk/~mgk25/unicode.html\n"
+    },
+    { TEXT_INVALID_URI,                              0,        
+        "URIs devem ser devidamente escapadas, elas não devem\n"
+        "conter caracteres não elaborados abaixo de U+0021,\n"
+        "incluindo o caractere de espaço e não acima de U+007E.\n"
+        "Tidy escapa a URI para você conforme recomendado pelo\n"
+        "HTML 4.01 seção B.2.1 e XML 1.0 seção 4.2.2. Alguns\n"
+        "agentes de usuários usam outro algoritmo para escapar\n"
+        "tais URIs e alguns scripts de servidor dependem disso.\n"
+        "Se você quiser depender disso, você deve escapar a URI\n"
+        "por conta própria. Para mais informações, consulte\n"
+        "http://www.w3.org/International/O-URL-and-ident.html\n"
+    },
+    { TEXT_BAD_FORM,                                 0,        
+        "Talvez seja necessário mover uma ou ambas as tags <form>\n"
+        "e </form>. Os elementos HTML devem estar adequadamente\n"
+        "aninhados e os elementos de formulário não são uma exceção.\n"
+        "Por exemplo, você não deve colocar o <form> em uma célula\n"
+        "de tabela e </form> em outra. Se o <form> for colocado\n"
+        "antes de uma tabela, o </form> não pode ser colocado dentro\n"
+        "da tabela! Note que um formulário não pode ser aninhado\n"
+        "dentro de outro!\n"
+    },
+    { TEXT_BAD_MAIN,                                 0,        
+        "Apenas um elemento <main> é permitido em um documento.\n"
+        "Elementos <main> subsequentes foram descartados, o que\n"
+        "pode tornar o documento inválido.\n"
+    },
+    { TEXT_M_SUMMARY,                                0,        
+        "O atributo de resumo da tabela deve ser usado para\n"
+        "descrever a estrutura da tabela. É muito útil para\n"
+        "pessoas que usam navegadores não visuais. Os atributos\n"
+        "de escopo e cabeçalho para células de tabela são\n"
+        "úteis para especificar quais cabeçalhos se aplicam\n"
+        "a cada célula de tabela, permitindo que navegadores\n"
+        "não visuais forneçam um contexto significativo para\n"
+        "cada célula.\n"
+    },
+    { TEXT_M_IMAGE_ALT,                              0,        
+        "O atributo alt deve ser usado para dar uma breve descrição\n"
+        "de uma imagem; descrições mais longas devem ser fornecidas\n"
+        "com o atributo longdesc que leva uma URL vinculada à\n"
+        "descrição. Essas medidas são necessárias para pessoas que\n"
+        "usam navegadores não-gráficos.\n"
+    },
+    { TEXT_M_IMAGE_MAP,                              0,        
+        "Use os mapas de imagens do lado do cliente de preferência\n"
+        "aos mapas de imagens do lado do servidor, pois estes são\n"
+        "inacessíveis para pessoas que usam navegadores não gráficos.\n"
+        "Além disso, os mapas do lado do cliente são mais fáceis\n"
+        "de configurar e fornecer feedback imediato aos usuários.\n"
+    },
+    { TEXT_M_LINK_ALT,                               0,        
+        "Para links de hipertexto definidos usando um mapa de imagem\n"
+        "do lado do cliente, você precisa usar o atributo alt para\n"
+        "fornecer uma descrição textual do link para pessoas que usam\n"
+        "navegadores não gráficos.\n"
+    },
+    { TEXT_USING_FRAMES,                             0,        
+        "Páginas desenhadas usando quadros apresentam problemas\n"
+        "para pessoas que são cegas ou que usam um navegador que\n"
+        "não oferece suporte a quadros. Uma página baseada em\n"
+        "quadros deve sempre incluir um layout alternativo dentro\n"
+        "de um elemento NOFRAMES.\n"
+    },
+    { TEXT_ACCESS_ADVICE1,                           0,        
+        "Para mais conselhos sobre como tornar suas páginas\n"
+        "acessíveis, veja http://www.w3.org/WAI/GL."
+    },
+    { TEXT_ACCESS_ADVICE2,                           0,        
+        "Para mais conselhos sobre como tornar suas páginas\n"
+        "acessíveis, veja http://www.w3.org/WAI/GL e\n"
+        "http://www.html-tidy.org/accessibility/."
+    },
+    { TEXT_USING_LAYER,                              0,        
+        "O mecanismo de posicionamento do Cascading Style\n"
+        "Sheets (CSS) é recomendado em preferência ao\n"
+        "elemento proprietário <LAYER> devido ao suporte\n"
+        "de fornecedor limitado a LAYER.\n"
+    },
+    { TEXT_USING_SPACER,                             0,        
+        "É recomendável usar CSS para controlar o espaço em\n"
+        "branco (p.ex., para recuo, margens e espaçamento\n"
+        "entre linhas). O elemento proprietário <SPACER>\n"
+        "possui suporte limitado para fornecedores.\n"
+    },
+    { TEXT_USING_FONT,                               0,        
+        "É recomendável usar o CSS para especificar a fonte e\n"
+        "as propriedades, como seu tamanho e cor. Isso reduzirá\n"
+        "o tamanho dos arquivos HTML e facilitando a manutenção\n"
+        "em comparação com o uso de elementos <FONT>.\n"
+    },
+    { TEXT_USING_NOBR,                               0,        
+        "É recomendável usar CSS para controlar a quebra de linha.\n"
+        "Use \"white-space: nowrap\" para inibir a quebra em vez\n"
+        "de inserir <NOBR>...</NOBR> na marcação.\n"
+    },
+    { TEXT_USING_BODY,                               0, "É recomendável usar CSS para especificar cores de página e link"                                 },
+    { STRING_CONTENT_LOOKS,                          0, "O conteúdo do documento se parece com %s"                                                        },
+    { STRING_DOCTYPE_GIVEN,                          0, "Doctype dado é \"%s\""                                                                           },
+    { STRING_ERROR_COUNT,                            0, "Tidy encontrou %u %s e %u %s!\n"                                                                 },
+    { STRING_NEEDS_INTERVENTION,                     0,        
+        "Esse documento possui erros que devem ser corrigidos\n"
+        "antes de usar HTML Tidy para gerar uma versão arrumada.\n"
+    },
+    { STRING_NO_ERRORS,                              0, "Nenhum aviso ou erro foi localizado.\n"                                                          },
+    { STRING_NO_SYSID,                               0, "Nenhum identificado de sistema no doctype emitido"                                               },
+    { STRING_NOT_ALL_SHOWN,                          0, "Tidy encontrou %u %s e %u %s! Nem todos avisos/erros foram mostrados.\n"                         },
+    { TEXT_GENERAL_INFO,                             0,        
+        "Sobre o HTML Tidy: https://github.com/htacg/tidy-html5\n"
+        "Relatórios de erro e comentários: https://github.com/htacg/tidy-html5/"
+        "issues\n"
+        "Lista de discussão: https://lists.w3.org/Archives/Public/public-htacg/\n"
+        "Especificação HTML mais recente: http://dev.w3.org/html5/spec-author-view/\n"
+        "Valide seus documentos HTML: http://validator.w3.org/nu/\n"
+        "Incentive sua empresa a se juntar à W3C: http://www.w3.org/Consortium\n"
+    },
+    { TEXT_GENERAL_INFO_PLEA,                        0,        
+        "Você fala um idioma diferente do português brasileiro, ou uma variante \n"
+        "diferente do português? Considere em ajudar a traduzir o HTML Tidy. \n"
+        "Para mais detalhes, por favor veja: \n"
+        "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md"
+    },
+    { ADDED_MISSING_CHARSET,                         0, "Adicionado o <meta charset=...> apropriado em falta ao %s"                                       },
+    { ANCHOR_NOT_UNIQUE,                             0, "âncora de %s \"%s\" já está definido"                                                            },
+    { APOS_UNDEFINED,                                0, "a entidade declarada &apos; só definida em XML/XHTML"                                            },
+    { ATTR_VALUE_NOT_LCASE,                          0, "valor do atributo de %s \"%s\" deve ser minúsculo para XHTML"                                    },
+    { ATTRIBUTE_IS_NOT_ALLOWED,                      0, "atributo de %s \"is\" não permitido para tags personalizadas autônomas."                         },
+    { ATTRIBUTE_VALUE_REPLACED,                      0, "atributo %s \"%s\", valor incorreto \"%s\" substituído"                                          },
+    { BACKSLASH_IN_URI,                              0, "referência da URI %s contém barra invertida. Erro de escrita?"                                   },
+    { BAD_ATTRIBUTE_VALUE_REPLACED,                  0, "atributo %s \"%s\" tinha valor inválido \"%s\" e foi substituído"                                },
+    { BAD_ATTRIBUTE_VALUE,                           0, "atributo %s \"%s\" possui valor inválido \"%s\""                                                 },
+    { BAD_CDATA_CONTENT,                             0, "'<' + '/' + letra não permitido aqui"                                                            },
+    { BAD_SUMMARY_HTML5,                             0, "O atributo de resumo no elemento %s é obsoleto no HTML5"                                         },
+    { BAD_SURROGATE_LEAD,                            0,        
+        "Par substituto ao final (baixo) U+%04X, com nenhuma entidade precedente "
+        "(Alta), substituído por U+FFFD."
+    },
+    { BAD_SURROGATE_PAIR,                            0,        
+        "Possui par substituto U+%04X:U+%04X fora do intervalo, substituído pelo "
+        "valor U+FFFD."
+    },
+    { BAD_SURROGATE_TAIL,                            0,        
+        "Par substituto precedente (alto) U+%04X, com nenhuma entidade ao final "
+        "(Baixo), substituído por U+FFFD."
+    },
+    { CANT_BE_NESTED,                                0, "%s não pode ser aninhado"                                                                        },
+    { COERCE_TO_ENDTAG,                              0, "<%s> provavelmente deveria ser </%s>"                                                            },
+    { CONTENT_AFTER_BODY,                            0, "o conteúdo ocorre após o fim do corpo"                                                           },
+    { CUSTOM_TAG_DETECTED,                           0, "tag personalizada autônoma %s detectada; será tratada como %s"                                   },
+    { DISCARDING_UNEXPECTED,                         0, "descartando %s inesperado"                                                                       },
+    { DOCTYPE_AFTER_TAGS,                            0, "<!DOCTYPE> não é permitido após elementos"                                                       },
+    { DUPLICATE_FRAMESET,                            0, "elemento FRAMESET repetido"                                                                      },
+    { ELEMENT_NOT_EMPTY,                             0, "%s elemento não vazio ou não fechado"                                                            },
+    { ELEMENT_VERS_MISMATCH_ERROR,                   0, "%s elemento não disponível na %s"                                                                },
+    { ELEMENT_VERS_MISMATCH_WARN,                    0, "%s elemento não disponível na %s"                                                                },
+    { ENCODING_MISMATCH,                             0,        
+        "a codificação de entrada especificada (%s) não corresponde à codificação de "
+        "entrada atual (%s)"
+    },
+    { ESCAPED_ILLEGAL_URI,                           0, "%s escapando referência de URI malformada"                                                       },
+    { FILE_CANT_OPEN,                                0, "Não foi possível abrir \"%s\"\n"                                                                 },
+    { FILE_CANT_OPEN_CFG,                            0, "Não foi possível abrir o arquivo de configuração \"%s\"\n"                                       },
+    { FILE_NOT_FILE,                                 0, "\"%s\" não é um arquivo!\n"                                                                      },
+    { FIXED_BACKSLASH,                               0, "%s convertendo barra invertida em URI para barra"                                                },
+    { FOUND_STYLE_IN_BODY,                           0, "encontrada tag <style> em <body>! fix-style-tags: yes para mover."                               },
+    { ID_NAME_MISMATCH,                              0, "%s valores dos atributos id e name incompatíveis"                                                },
+    { ILLEGAL_NESTING,                               0, "%s não devem ser aninhados"                                                                      },
+    { ILLEGAL_URI_CODEPOINT,                         0, "%s caracteres ilegais localizados na URI"                                                        },
+    { ILLEGAL_URI_REFERENCE,                         0, "referência de URI %s inadequadamente escapada"                                                   },
+    { INSERTING_AUTO_ATTRIBUTE,                      0, "%s inserindo atributo \"%s\" usando valor \"%s\""                                                },
+    { INSERTING_TAG,                                 0, "inserindo <%s> implícita"                                                                        },
+    { INVALID_ATTRIBUTE,                             0, "nome do atributo de %s \"%s\" (valor=\"%s\") é inválido"                                         },
+    { INVALID_NCR,                                   0, "%s referência de caractere numérico %s"                                                          },
+    { INVALID_SGML_CHARS,                            0, "%s código de caracteres inválido %s"                                                             },
+    { INVALID_UTF8,                                  0, "%s bytes de UTF-8 inválido (código de caracteres %s)"                                            },
+    { INVALID_UTF16,                                 0, "%s par de substituto de UTF-16 inválido (código de caracteres %s)"                               },
+    { INVALID_XML_ID,                                0, "%s não pôde copiar atributo de nome para id"                                                     },
+    { JOINING_ATTRIBUTE,                             0, "%s juntando valores de atributo repetido \"%s\""                                                 },
+    { MALFORMED_COMMENT,                             0, "hífenes adjacentes dentro de comentário"                                                         },
+    { MALFORMED_DOCTYPE,                             0, "descartando <!DOCTYPE> malformado"                                                               },
+    { MISMATCHED_ATTRIBUTE_ERROR,                    0, "atributo de %s \"%s\" não permitido para %s"                                                     },
+    { MISMATCHED_ATTRIBUTE_WARN,                     0, "atributo de %s \"%s\" não permitido para %s"                                                     },
+    { MISSING_ATTR_VALUE,                            0, "atributo de %s \"%s\" carece de valor"                                                           },
+    { MISSING_ATTRIBUTE,                             0, "%s carece de atributo \"%s\""                                                                    },
+    { MISSING_DOCTYPE,                               0, "faltando declaração <!DOCTYPE>"                                                                  },
+    { MISSING_ENDTAG_BEFORE,                         0, "faltando </%s> antes de %s"                                                                      },
+    { MISSING_ENDTAG_FOR,                            0, "faltando </%s>"                                                                                  },
+    { MISSING_IMAGEMAP,                              0, "%s deve usar mapa de imagem no lado de cliente"                                                  },
+    { MISSING_QUOTEMARK,                             0, "atributo de %s faltando aspas ao final"                                                          },
+    { MISSING_SEMICOLON_NCR,                         0, "referência de caractere numérico \"%s\" não termina em ';'"                                      },
+    { MISSING_SEMICOLON,                             0, "entidade \"%s\" não termina em ';'"                                                              },
+    { MISSING_STARTTAG,                              0, "faltando <%s>"                                                                                   },
+    { MISSING_TITLE_ELEMENT,                         0, "inserindo elemento faltante 'title'"                                                             },
+    { MOVED_STYLE_TO_HEAD,                           0, "tag <style> movida para <head>! fix-style-tags: no para evitar."                                 },
+    { NESTED_EMPHASIS,                               0, "ênfase aninhada %s"                                                                              },
+    { NESTED_QUOTATION,                              0, "elementos q aninhados, possível erro de escrita."                                                },
+    { NEWLINE_IN_URI,                                0, "%s descartando nova linha na referência de URI"                                                  },
+    { NOFRAMES_CONTENT,                              0, "%s não dentre de elemento 'noframes'"                                                            },
+    { NON_MATCHING_ENDTAG,                           0, "substituindo %s inesperada por </%s>"                                                            },
+    { OBSOLETE_ELEMENT,                              0, "substituindo elemento obsoleto %s por %s"                                                        },
+    { PREVIOUS_LOCATION,                             0, "<%s> anteriormente mencionada"                                                                   },
+    { PROPRIETARY_ATTR_VALUE,                        0, "atributo proprietário %s com valor \"%s\""                                                       },
+    { PROPRIETARY_ATTRIBUTE,                         0, "atributo proprietário %s \"%s\""                                                                 },
+    { PROPRIETARY_ELEMENT,                           0, "%s não é aprovado pela W3C"                                                                      },
+    { REMOVED_HTML5,                                 0, "elemento %s removido do HTML5"                                                                   },
+    { REPEATED_ATTRIBUTE,                            0, "%s descartando valor \"%s\" para atributo repetido \"%s\""                                       },
+    { REPLACING_ELEMENT,                             0, "substituindo %s por %s"                                                                          },
+    { REPLACING_UNEX_ELEMENT,                        0, "substituindo %s inesperada por %s"                                                               },
+    { SPACE_PRECEDING_XMLDECL,                       0, "removendo espaço em branco precedendo a declaração XML"                                          },
+    { STRING_MISSING_MALFORMED,                      0, "argumento faltando ou malformado para opção: %s"                                                 },
+    { STRING_UNKNOWN_OPTION,                         0, "opção desconhecida: %s"                                                                          },
+    { SUSPECTED_MISSING_QUOTE,                       0, "faltando aspas para o valor de atributo"                                                         },
+    { TAG_NOT_ALLOWED_IN,                            0, "%s não é permitido em elementos <%s>"                                                            },
+    { TOO_MANY_ELEMENTS_IN,                          0, "número excessivo de elementos %s em <%s>"                                                        },
+    { TOO_MANY_ELEMENTS,                             0, "número excessivo de elementos %s"                                                                },
+    { TRIM_EMPTY_ELEMENT,                            0, "aparando %s vazio"                                                                               },
+    { UNESCAPED_AMPERSAND,                           0, "& não escapado que deve ser escrito como &amp;"                                                  },
+    { UNEXPECTED_END_OF_FILE_ATTR,                   0, "%s fim de arquivo enquanto analisava atributos"                                                  },
+    { UNEXPECTED_END_OF_FILE,                        0, "fim do arquivo %s inesperado"                                                                    },
+    { UNEXPECTED_ENDTAG_ERR,                         0, "</%s> inesperada"                                                                                },
+    { UNEXPECTED_ENDTAG_IN,                          0, "</%s> inesperada em <%s>"                                                                        },
+    { UNEXPECTED_ENDTAG,                             0, "</%s> inesperada"                                                                                },
+    { UNEXPECTED_EQUALSIGN,                          0, "%s inesperado '=', esperava nome de atributo"                                                    },
+    { UNEXPECTED_GT,                                 0, "%s carece de '>' para o fim da tag"                                                              },
+    { UNEXPECTED_QUOTEMARK,                          0, "%s aspas inesperadas ou duplicadas"                                                              },
+    { UNKNOWN_ELEMENT_LOOKS_CUSTOM,                  0, "%s não é reconhecido! Você queria habilitar a opção custom-tags?"                                },
+    { UNKNOWN_ELEMENT,                               0, "%s não é reconhecido!"                                                                           },
+    { UNKNOWN_ENTITY,                                0, "& não escapado ou entidade desconhecida \"%s\""                                                  },
+    { USING_BR_INPLACE_OF,                           0, "usando <br> no lugar de %s"                                                                      },
+    { VENDOR_SPECIFIC_CHARS,                         0, "%s código de caractere inválido %s"                                                              },
+    { WHITE_IN_URI,                                  0, "%s descartando espaço em branco na referência de URI"                                            },
+    { XML_DECLARATION_DETECTED,                      0, "Uma declaração XML foi detectada. Você queria usar input-xml?"                                   },
+    { XML_ID_SYNTAX,                                 0, "%s ID \"%s\" usa sintaxe de ID de XML"                                                           },
+    { IMG_MISSING_ALT,                               0, "[1.1.1.1]: <img> carece de texto 'alt'."                                                         },
+    { IMG_ALT_SUSPICIOUS_FILENAME,                   0, "[1.1.1.2]: texto 'alt' suspeito (nome de arquivo)."                                              },
+    { IMG_ALT_SUSPICIOUS_FILE_SIZE,                  0, "[1.1.1.3]: texto 'alt' suspeito (tamanho de arquivo)."                                           },
+    { IMG_ALT_SUSPICIOUS_PLACEHOLDER,                0, "[1.1.1.4]: texto 'alt' suspeito (espaço reservado)."                                             },
+    { IMG_ALT_SUSPICIOUS_TOO_LONG,                   0, "[1.1.1.10]: texto 'alt' suspeito (longo demais)."                                                },
+    { IMG_MISSING_LONGDESC_DLINK,                    0, "[1.1.2.1]: <img> carece de 'longdesc' e d-link."                                                 },
+    { IMG_MISSING_DLINK,                             0, "[1.1.2.2]: <img> carece de d-link."                                                              },
+    { IMG_MISSING_LONGDESC,                          0, "[1.1.2.3]: <img> carece de 'longdesc'."                                                          },
+    { IMG_BUTTON_MISSING_ALT,                        0, "[1.1.3.1]: <img> (botão) carece de texto 'alt'."                                                 },
+    { APPLET_MISSING_ALT,                            0, "[1.1.4.1]: <applet> carece de conteúdo alternativo."                                             },
+    { OBJECT_MISSING_ALT,                            0, "[1.1.5.1]: <object> carece de conteúdo alternativo."                                             },
+    { AUDIO_MISSING_TEXT_WAV,                        0, "[1.1.6.1]: áudio carece de transcrição de texto (wav)."                                          },
+    { AUDIO_MISSING_TEXT_AU,                         0, "[1.1.6.2]: áudio carece de transcrição de texto (au)."                                           },
+    { AUDIO_MISSING_TEXT_AIFF,                       0, "[1.1.6.3]: áudio carece de transcrição de texto (aiff)."                                         },
+    { AUDIO_MISSING_TEXT_SND,                        0, "[1.1.6.4]: áudio carece de transcrição de texto (snd)."                                          },
+    { AUDIO_MISSING_TEXT_RA,                         0, "[1.1.6.5]: áudio carece de transcrição de texto (ra)."                                           },
+    { AUDIO_MISSING_TEXT_RM,                         0, "[1.1.6.6]: áudio carece de transcrição de texto (rm)."                                           },
+    { FRAME_MISSING_LONGDESC,                        0, "[1.1.8.1]: <frame> pode exigir 'longdesc'."                                                      },
+    { AREA_MISSING_ALT,                              0, "[1.1.9.1]: <area> carece de texto 'alt'."                                                        },
+    { SCRIPT_MISSING_NOSCRIPT,                       0, "[1.1.10.1]: <script> carece de seção <noscript>."                                                },
+    { ASCII_REQUIRES_DESCRIPTION,                    0, "[1.1.12.1]: arte em ascii exige descrição."                                                      },
+    { IMG_MAP_SERVER_REQUIRES_TEXT_LINKS,            0, "[1.2.1.1]: mapa de imagem (lado do servidor) exige links de texto."                              },
+    { MULTIMEDIA_REQUIRES_TEXT,                      0, "[1.4.1.1]: multimídia exibe equivalentes de texto sincronizado."                                 },
+    { IMG_MAP_CLIENT_MISSING_TEXT_LINKS,             0, "[1.5.1.1]: mapa da imagem (lado do cliente) carece de links de texto."                           },
+    { INFORMATION_NOT_CONVEYED_IMAGE,                0, "[2.1.1.1]: certificar de que as informações não sejam transmitidas apenas por cores (imagem)."   },
+    { INFORMATION_NOT_CONVEYED_APPLET,               0, "[2.1.1.2]: certificar de que as informações não sejam transmitidas apenas por cores (applet)."   },
+    { INFORMATION_NOT_CONVEYED_OBJECT,               0, "[2.1.1.3]: certificar de que as informações não sejam transmitidas apenas por cores (objeto)."   },
+    { INFORMATION_NOT_CONVEYED_SCRIPT,               0, "[2.1.1.4]: certificar de que as informações não sejam transmitidas apenas por cores (script)."   },
+    { INFORMATION_NOT_CONVEYED_INPUT,                0,        
+        "[2.1.1.5]: certificar de que as informações não sejam transmitidas apenas por cores "
+        "(entrada)."
+    },
+    { COLOR_CONTRAST_TEXT,                           0, "[2.2.1.1]: contraste de cores ruim (texto)."                                                     },
+    { COLOR_CONTRAST_LINK,                           0, "[2.2.1.2]: contraste de cores ruim (link)."                                                      },
+    { COLOR_CONTRAST_ACTIVE_LINK,                    0, "[2.2.1.3]: contraste de cores ruim (link ativo)."                                                },
+    { COLOR_CONTRAST_VISITED_LINK,                   0, "[2.2.1.4]: contraste de cores ruim (link visitado)."                                             },
+    { DOCTYPE_MISSING,                               0, "[3.2.1.1]: faltando <doctype>."                                                                  },
+    { STYLE_SHEET_CONTROL_PRESENTATION,              0, "[3.3.1.1]: use folhas de estilo para controlar apresentação."                                    },
+    { HEADERS_IMPROPERLY_NESTED,                     0, "[3.5.1.1]: cabeçalhos aninhados incorretamente."                                                 },
+    { POTENTIAL_HEADER_BOLD,                         0, "[3.5.2.1]: cabeçalho potencial (negrito)."                                                       },
+    { POTENTIAL_HEADER_ITALICS,                      0, "[3.5.2.2]: cabeçalho potencial (itálico)."                                                       },
+    { POTENTIAL_HEADER_UNDERLINE,                    0, "[3.5.2.3]: cabeçalho potencial (sublinhado)."                                                    },
+    { HEADER_USED_FORMAT_TEXT,                       0, "[3.5.3.1]: cabeçalho usado para formatar o texto."                                               },
+    { LIST_USAGE_INVALID_UL,                         0, "[3.6.1.1]: uso de lista inválido <ul>."                                                          },
+    { LIST_USAGE_INVALID_OL,                         0, "[3.6.1.2]: uso de lista inválido <ol>."                                                          },
+    { LIST_USAGE_INVALID_LI,                         0, "[3.6.1.4]: uso de lista inválido <li>."                                                          },
+    { LANGUAGE_NOT_IDENTIFIED,                       0, "[4.3.1.1]: idioma não identificado."                                                             },
+    { LANGUAGE_INVALID,                              0, "[4.3.1.2]: atributo de idioma inválido."                                                         },
+    { DATA_TABLE_MISSING_HEADERS,                    0, "[5.1.2.1]: <table> de dados carece de cabeçalhos de linha/coluna (todos)."                       },
+    { DATA_TABLE_MISSING_HEADERS_COLUMN,             0, "[5.1.2.2]: <table> de dados carece de cabeçalhos de linha/coluna (1 col)."                       },
+    { DATA_TABLE_MISSING_HEADERS_ROW,                0, "[5.1.2.3]: <table> de dados carece de cabeçalhos de linha/coluna (1 lin)."                       },
+    { DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS,      0, "[5.2.1.1]: <table> pode exigir marcação (cabeçalhos de coluna)."                                 },
+    { DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS,         0, "[5.2.1.2]: <table> pode exigir marcação (cabeçalhos de linha)."                                  },
+    { LAYOUT_TABLES_LINEARIZE_PROPERLY,              0, "[5.3.1.1]: verifique se tabelas de layout linearizaram corretamente."                            },
+    { LAYOUT_TABLE_INVALID_MARKUP,                   0, "[5.4.1.1]: marcação inválida usada em <table> de layout."                                        },
+    { TABLE_MISSING_SUMMARY,                         0, "[5.5.1.1]: <table> carece de sumário."                                                           },
+    { TABLE_SUMMARY_INVALID_NULL,                    0, "[5.5.1.2]: resumo da <table> inválido (nulo)."                                                   },
+    { TABLE_SUMMARY_INVALID_SPACES,                  0, "[5.5.1.3]: resumo da <table> inválido (espaços)."                                                },
+    { TABLE_SUMMARY_INVALID_PLACEHOLDER,             0, "[5.5.1.6]: resumo da <table> inválido (texto de espaço reservado)."                              },
+    { TABLE_MISSING_CAPTION,                         0, "[5.5.2.1]: <table> carece de <caption>."                                                         },
+    { TABLE_MAY_REQUIRE_HEADER_ABBR,                 0, "[5.6.1.1]: <table> pode exigir abreviações de cabeçalho."                                        },
+    { TABLE_MAY_REQUIRE_HEADER_ABBR_NULL,            0, "[5.6.1.2]: abreviações de cabeçalho de <table> inválidas (nula)."                                },
+    { TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES,          0, "[5.6.1.3]: abreviações de cabeçalho de <table> inválidas (espaços)."                             },
+    { STYLESHEETS_REQUIRE_TESTING_LINK,              0, "[6.1.1.1]: folhas de estilo exigem teste (link)."                                                },
+    { STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT,     0, "[6.1.1.2]: folhas de estilo exigem teste (elemento de estilo)."                                  },
+    { STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR,        0, "[6.1.1.3]: folhas de estilo exigem teste (atributo de estilo)."                                  },
+    { FRAME_SRC_INVALID,                             0, "[6.2.1.1]: fonte de <frame> inválida."                                                           },
+    { TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET,      0, "[6.2.2.1]: equivalentes de texto exigem atualização (applet)."                                   },
+    { TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT,      0, "[6.2.2.2]: equivalentes de texto exigem atualização (script)."                                   },
+    { TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT,      0, "[6.2.2.3]: equivalentes de texto exigem atualização (object)."                                   },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT,   0, "[6.3.1.1]: objetos programáticos exigem teste (script)."                                         },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT,   0, "[6.3.1.2]: objetos programáticos exigem teste (object)."                                         },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED,    0, "[6.3.1.3]: objetos programáticos exigem teste (embed)."                                          },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET,   0, "[6.3.1.4]: objetos programáticos exigem teste (applet)."                                         },
+    { FRAME_MISSING_NOFRAMES,                        0, "[6.5.1.1]: <frameset> carece de seção <noframes>."                                               },
+    { NOFRAMES_INVALID_NO_VALUE,                     0, "[6.5.1.2]: seção <noframes> inválida (sem valor)."                                               },
+    { NOFRAMES_INVALID_CONTENT,                      0, "[6.5.1.3]: seção <noframes> inválida (conteúdo)."                                                },
+    { NOFRAMES_INVALID_LINK,                         0, "[6.5.1.4]: seção <noframes> inválida (link)."                                                    },
+    { REMOVE_FLICKER_SCRIPT,                         0, "[7.1.1.1]: remoção de cintilação (script)."                                                      },
+    { REMOVE_FLICKER_OBJECT,                         0, "[7.1.1.2]: remoção de cintilação (object)."                                                      },
+    { REMOVE_FLICKER_EMBED,                          0, "[7.1.1.3]: remoção de cintilação (embed)."                                                       },
+    { REMOVE_FLICKER_APPLET,                         0, "[7.1.1.4]: remoção de cintilação (applet)."                                                      },
+    { REMOVE_FLICKER_ANIMATED_GIF,                   0, "[7.1.1.5]: remoção de cintilação (gif animado)."                                                 },
+    { REMOVE_BLINK_MARQUEE,                          0, "[7.2.1.1]: remoção de blink/marquee."                                                            },
+    { REMOVE_AUTO_REFRESH,                           0, "[7.4.1.1]: remoção de autorrenovação."                                                           },
+    { REMOVE_AUTO_REDIRECT,                          0, "[7.5.1.1]: remoção de autorredirecionamento."                                                    },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT, 0, "[8.1.1.1]: certifique-se que objetos programáticos sejam acessíveis (script)."                   },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT, 0, "[8.1.1.2]: certifique-se que objetos programáticos sejam acessíveis (object)."                   },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET, 0, "[8.1.1.3]: certifique-se que objetos programáticos sejam acessíveis (applet)."                   },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED,  0, "[8.1.1.43]: certifique-se que objetos programáticos sejam acessíveis (embed)."                   },
+    { IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION,     0, "[9.1.1.1]: mapa de imagem (lado do servidor) exige conversão."                                   },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN,  0, "[9.3.1.1]: <script> não é acessível por teclado (onMouseDown)."                                  },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP,    0, "[9.3.1.2]: <script> não é acessível por teclado (onMouseUp)."                                    },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK,       0, "[9.3.1.3]: <script> não é acessível por teclado (onClick)."                                      },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER,  0, "[9.3.1.4]: <script> não é acessível por teclado (onMouseOver)."                                  },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT,   0, "[9.3.1.5]: <script> não é acessível por teclado (onMouseOut)."                                   },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  0, "[9.3.1.6]: <script> não é acessível por teclado (onMouseMove)."                                  },
+    { NEW_WINDOWS_REQUIRE_WARNING_NEW,               0, "[10.1.1.1]: novas janelas exigem aviso (_new)."                                                  },
+    { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             0, "[10.1.1.2]: novas janelas exigem aviso (_blank)."                                                },
+    { REPLACE_DEPRECATED_HTML_APPLET,                0, "[11.2.1.1]: substituir o elemento html obsoleto <applet>."                                       },
+    { REPLACE_DEPRECATED_HTML_BASEFONT,              0, "[11.2.1.2]: substituir o elemento html obsoleto <basefont>."                                     },
+    { REPLACE_DEPRECATED_HTML_CENTER,                0, "[11.2.1.3]: substituir o elemento html obsoleto <center>."                                       },
+    { REPLACE_DEPRECATED_HTML_DIR,                   0, "[11.2.1.4]: substituir o elemento html obsoleto <dir>."                                          },
+    { REPLACE_DEPRECATED_HTML_FONT,                  0, "[11.2.1.5]: substituir o elemento html obsoleto <font>."                                         },
+    { REPLACE_DEPRECATED_HTML_ISINDEX,               0, "[11.2.1.6]: substituir o elemento html obsoleto <isindex>."                                      },
+    { REPLACE_DEPRECATED_HTML_MENU,                  0, "[11.2.1.7]: substituir o elemento html obsoleto <menu>."                                         },
+    { REPLACE_DEPRECATED_HTML_S,                     0, "[11.2.1.8]: substituir o elemento html obsoleto <s>."                                            },
+    { REPLACE_DEPRECATED_HTML_STRIKE,                0, "[11.2.1.9]: substituir o elemento html obsoleto <strike>."                                       },
+    { REPLACE_DEPRECATED_HTML_U,                     0, "[11.2.1.10]: substituir o elemento html obsoleto <u>."                                           },
+    { FRAME_MISSING_TITLE,                           0, "[12.1.1.1]: <frame> carece de título."                                                           },
+    { FRAME_TITLE_INVALID_NULL,                      0, "[12.1.1.2]: título de <frame> inválido (nulo)."                                                  },
+    { FRAME_TITLE_INVALID_SPACES,                    0, "[12.1.1.3]: título de <frame> inválido (espaços)."                                               },
+    { ASSOCIATE_LABELS_EXPLICITLY,                   0, "[12.4.1.1]: associar rótulos explicitamente com controles de formulário."                        },
+    { ASSOCIATE_LABELS_EXPLICITLY_FOR,               0,        
+        "[12.4.1.2]: associar rótulos explicitamente com controles de formulário "
+        "(for)."
+    },
+    { ASSOCIATE_LABELS_EXPLICITLY_ID,                0, "[12.4.1.3]: associar rótulos explicitamente com controles de formulário (id)."                   },
+    { LINK_TEXT_NOT_MEANINGFUL,                      0, "[13.1.1.1]: texto de link não significativo."                                                    },
+    { LINK_TEXT_MISSING,                             0, "[13.1.1.2]: faltando texto de link."                                                             },
+    { LINK_TEXT_TOO_LONG,                            0, "[13.1.1.3]: texto de link longo demais."                                                         },
+    { LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE,           0, "[13.1.1.4]: texto de link não significativo (clique aqui)."                                      },
+    { METADATA_MISSING,                              0, "[13.2.1.1]: faltando metadados."                                                                 },
+    { METADATA_MISSING_REDIRECT_AUTOREFRESH,         0, "[13.2.1.3]: faltando metadados (redirecionamento/autorrenovação)."                               },
+    { SKIPOVER_ASCII_ART,                            0, "[13.10.1.1]: pular arte em ascii."                                                               },
+
+#if SUPPORT_CONSOLE_APP
+    { TC_LABEL_COL,                                  0, "coluna"                                                                                          },
+    { TC_LABEL_FILE,                                 0, "arquivo"                                                                                         },
+    { TC_LABEL_LANG,                                 0, "idioma"                                                                                          },
+    { TC_LABEL_LEVL,                                 0, "nível"                                                                                           },
+    { TC_LABEL_OPT,                                  0, "opção"                                                                                           },
+    { TC_MAIN_ERROR_LOAD_CONFIG,                     0, "Falha ao carregar o arquivo de config \"%s\", err = %d"                                          },
+    { TC_OPT_ACCESS,                                 0,        
+        " faz verificações adicionais de acessibilidade (<nível> = 0, 1, 2, 3). 0 é "
+        "presumido se <nível> estiver faltando."
+    },
+    { TC_OPT_ASCII,                                  0, "usa ISO-8859-1 para entrada, US-ASCII para saída"                                                },
+    { TC_OPT_ASHTML,                                 0, "força XHTML para HTML bem formatado"                                                             },
+    { TC_OPT_ASXML,                                  0, "converte HTML para XHTML bem formatado"                                                          },
+    { TC_OPT_BARE,                                   0, "retira aspas inteligentes, travessões etc."                                                      },
+    { TC_OPT_BIG5,                                   0, "usa Big5 para tanto entrada quanto saída"                                                        },
+    { TC_OPT_CLEAN,                                  0, "substitui tags FONT, NOBR e CENTER com CSS"                                                      },
+    { TC_OPT_CONFIG,                                 0, "define opções de configuração a partir do <arquivo> especificado"                                },
+    { TC_OPT_ERRORS,                                 0, "mostra apenas erros e avisos"                                                                    },
+    { TC_OPT_FILE,                                   0, "escreve erros e avisos para o <arquivo> especificado"                                            },
+    { TC_OPT_GDOC,                                   0, "produz versão limpa do html exportado pelo Google Docs"                                          },
+    { TC_OPT_HELP,                                   0, "lista as opções de linha de comando"                                                             },
+    { TC_OPT_HELPCFG,                                0, "lista todas as opções de configuração"                                                           },
+    { TC_OPT_HELPOPT,                                0, "  mostra uma descrição da <opção>"                                                               },
+    { TC_OPT_IBM858,                                 0, "usa IBM-858 (CP850+Euro) para entrada, US-ASCII para saída"                                      },
+    { TC_OPT_INDENT,                                 0, "recua o conteúdo do elemento"                                                                    },
+    { TC_OPT_ISO2022,                                0, "usa ISO-2022 para tanto entrada quanto saída"                                                    },
+    { TC_OPT_LANGUAGE,                               0,        
+        "define o idioma de saída do Tidy para <idioma>. Especifique '-language help' "
+        "para mais ajuda. Use antes de argumentos que gerem saída para garantir que o "
+        "idioma surta efeitos, p.ex.:\n"
+        "`tidy -lang es -lang help`."
+    },
+    { TC_OPT_LATIN0,                                 0, "usa ISO-8859-15 para entrada, US-ASCII para saída"                                               },
+    { TC_OPT_LATIN1,                                 0, "usa ISO-8859-1 para tanto entrada quanto saída"                                                  },
+    { TC_OPT_MAC,                                    0, "usa MacRoman para entrada, US-ASCII para saída"                                                  },
+    { TC_OPT_MODIFY,                                 0, "modifica os arquivos de entrada originais"                                                       },
+    { TC_OPT_NUMERIC,                                0, "emite entidades numéricas em vez de nomeadas"                                                    },
+    { TC_OPT_OMIT,                                   0, "omite tags opcionais de início e de fim"                                                         },
+    { TC_OPT_OUTPUT,                                 0, "escreve a saída para o <arquivo> especificado"                                                   },
+    { TC_OPT_QUIET,                                  0, "suprime saída não essencial"                                                                     },
+    { TC_OPT_RAW,                                    0, "emite valores acima de 127 sem conversão para entidades"                                         },
+    { TC_OPT_SHIFTJIS,                               0, "usa Shift_JIS para tanto entrada quanto saída"                                                   },
+    { TC_OPT_SHOWCFG,                                0, "lista as definições da configuração atual"                                                       },
+    { TC_OPT_UPPER,                                  0, "força tags para maiúsculo"                                                                       },
+    { TC_OPT_UTF16,                                  0, "usa UTF-16 para tanto entrada quanto saída"                                                      },
+    { TC_OPT_UTF16BE,                                0, "usa UTF-16BE para tanto entrada quanto saída"                                                    },
+    { TC_OPT_UTF16LE,                                0, "usa UTF-16LE para tanto entrada quanto saída"                                                    },
+    { TC_OPT_UTF8,                                   0, "usa UTF-8 para tanto entrada quanto saída"                                                       },
+    { TC_OPT_VERSION,                                0, "mostra a versão do Tidy"                                                                         },
+    { TC_OPT_WIN1252,                                0, "usa Windows--1252 para entrada, US-ASCII para saída"                                             },
+    { TC_OPT_WRAP,                                   0,        
+        "efetua quebra de texto na <coluna> especificada, 0 é presumido se <coluna> "
+        "estiver faltando. Quando esta opção é omitida, o padrão da opção da "
+        "configuração 'wrap' é aplicado."
+    },
+    { TC_OPT_XML,                                    0, "especifica a entrada é XML bem formatado"                                                        },
+    { TC_OPT_XMLCFG,                                 0, "lista todas as opções de configuração no formato XML"                                            },
+    { TC_OPT_XMLHELP,                                0, "lista as opções de linha de comando no formato XML"                                              },
+    { TC_OPT_XMLSTRG,                                0, "emite todas as strings do Tidy no formato XML"                                                   },
+    { TC_OPT_XMLERRS,                                0, "emite constantes de erro e strings no formato XML"                                               },
+    { TC_OPT_XMLOPTS,                                0, "emite descrições de opção no formato XML"                                                        },
+    { TC_STRING_CONF_HEADER,                         0, "Definições do arquivo de configuração:"                                                          },
+    { TC_STRING_CONF_NAME,                           0, "Nome"                                                                                            },
+    { TC_STRING_CONF_TYPE,                           0, "Tipo"                                                                                            },
+    { TC_STRING_CONF_VALUE,                          0, "Valor atual"                                                                                     },
+    { TC_STRING_OPT_NOT_DOCUMENTED,                  0, "Aviso: a opção '%s' não está documentada."                                                       },
+    { TC_STRING_OUT_OF_MEMORY,                       0, "Memória insuficiente. Saindo."                                                                   },
+    { TC_STRING_FATAL_ERROR,                         0, "Erro fatal: valor impossível para id='%d'."                                                      },
+    { TC_STRING_FILE_MANIP,                          0, "Manipulação de arquivo"                                                                          },
+    { TC_STRING_PROCESS_DIRECTIVES,                  0, "Diretivas de processamento"                                                                      },
+    { TC_STRING_CHAR_ENCODING,                       0, "Codificações de caracteres"                                                                      },
+    { TC_STRING_LANG_MUST_SPECIFY,                   0, "Uma localidade POSIX ou Windows deve ser especificada."                                          },
+    { TC_STRING_LANG_NOT_FOUND,                      0, "Tidy não possui o idioma '%s'; em vez desta, usará '%s'."                                        },
+    { TC_STRING_MISC,                                0, "Diversos"                                                                                        },
+    { TC_STRING_XML,                                 0, "XML"                                                                                             },
+    { TC_STRING_MUST_SPECIFY,                        0, "Um nome de opção Tidy deve ser especificado."                                                    },
+    { TC_STRING_UNKNOWN_OPTION,                      0, "HTML Tidy: opção desconhecida: %c"                                                               },
+    { TC_STRING_UNKNOWN_OPTION_B,                    0, "HTML Tidy: opção desconhecida."                                                                  },
+    { TC_STRING_VERS_A,                              0, "HTML Tidy para %s versão %s"                                                                     },
+    { TC_STRING_VERS_B,                              0, "HTML Tidy versão %s"                                                                             },
+    { TC_TXT_HELP_1,                                 0,        
+        "\n"
+        "%s [opções...] [arquivo...] [opções...] [arquivo...]\n"
+        "Utilitário para limpar e melhor imprimir HTML/XHTML/XML.\n"
+        "\n"
+        "Essa é o HTML Tidy moderno versão %s.\n"
+        "\n"
+    },
+    { TC_TXT_HELP_2A,                                0, "Os argumentos de linha de comando para HTML Tidy para %s:"                                       },
+    { TC_TXT_HELP_2B,                                0, "Os argumentos de linha de comando para HTML Tidy:"                                               },
+    { TC_TXT_HELP_3,                                 0,        
+        "\n"
+        "Opções de configuração do Tidy\n"
+        "==========================\n"
+        "Use as opções de configuração do Tidy como argumentos de linha de comando\n"
+        "no forma de \"--alguma-opcao <valor>\", por exemplo \"--indent-with-tabs "
+        "yes\".\n"
+        "\n"
+        "Para uma lista de todas as opções de configuração, use \"-help-config\" ou\n"
+        "veja a página man (se seu SO tiver uma).\n"
+        "\n"
+        "Se seu ambiente tem uma variável $HTML_TIDY definida, aponte para um "
+        "arquivo\n"
+        "de configuração Tidy e, então, Tidy vai tentar usá-la.\n"
+        "\n"
+        "Em algumas plataformas, Tidy também vai tentar usar uma configuração\n"
+        "especificada no /etc/tidy.conf ou ~/.tidy.conf.\n"
+        "\n"
+        "Outro\n"
+        "=====\n"
+        "Entrada/Saída usa, por padrão, stdin/stdout respectivamente.\n"
+        "\n"
+        "Opções de uma só letra, com exceção de -f, podem ser combinadas\n"
+        "como em: tidy -f errs.txt -imu foo.html\n"
+        "\n"
+        "Informação\n"
+        "===========\n"
+        "Para mais informações sobre HTML Tidy, veja\n"
+        "  http://www.html-tidy.org/\n"
+        "\n"
+        "Para mais informações sobre HTML, veja o seguinte:\n"
+        "\n"
+        "  HTML: Edition for Web Authors (the latest HTML specification)\n"
+        "  http://dev.w3.org/html5/spec-author-view\n"
+        "\n"
+        "  HTML: The Markup Language (an HTML language reference)\n"
+        "  http://dev.w3.org/html5/markup/\n"
+        "\n"
+        "Preencha relatórios de erros em https://github.com/htacg/tidy-html5/issues/\n"
+        "ou envie perguntas e comentários para public-htacg@w3.org.\n"
+        "\n"
+        "Valide seus documentos HTML usando Nu, o validador de marcação da W3C:\n"
+        "  http://validator.w3.org/nu/\n"
+        "\n"
+    },
+    { TC_TXT_HELP_CONFIG,                            0,        
+        "\n"
+        "Definições de configuração do HTML Tidy\n"
+        "\n"
+        "Dentro de um arquivo, use a forma:\n"
+        "\n"
+        "wrap: 72\n"
+        "indent: no\n"
+        "\n"
+        "Quando especificado na linha de comando, use a forma:\n"
+        "\n"
+        "--wrap 72 --indent no\n"
+        "\n"
+    },
+    { TC_TXT_HELP_CONFIG_NAME,                       0, "Nome"                                                                                            },
+    { TC_TXT_HELP_CONFIG_TYPE,                       0, "Tipo"                                                                                            },
+    { TC_TXT_HELP_CONFIG_ALLW,                       0, "Valores permitidos"                                                                              },
+    { TC_TXT_HELP_LANG_1,                            0,        
+        "\n"
+        "A opção -language (ou -lang) indica qual idioma o Tidy deve usar\n"
+        "para comunicar sua saída. Por favor, note que este não é um serviço\n"
+        "de tradução de documentos e afeta apenas as mensagens com as quais\n"
+        "o Tidy se comunica com você.\n"
+        "\n"
+        "Quando usado a partir da linha de comando, o argumento -language\n"
+        "deve ser usado antes de qualquer argumento que resulte em saída; do\n"
+        "contrário, o Tidy produzirá saída antes de saber qual idioma usar.\n"
+        "\n"
+        "Além dos códigos de idioma POSIX padrão, o Tidy é capaz de entender\n"
+        "os códigos legados de idioma do Windows. Por favor, note que esta\n"
+        "lista indica códigos Tidy entende e não indica que o idioma esteja\n"
+        "instalado no momento.\n"
+        "\n"
+        "A coluna mais à direita indica como o Tidy vai entender o nome do\n"
+        "Windows legado.\n"
+        "\n"
+    },
+    { TC_TXT_HELP_LANG_2,                            0,        
+        "\n"
+        "Os seguintes idiomas estão atualmente instalados em Tidy. Por favor, \n"
+        "note que não há garantia de que eles estejam completos; apenas que \n"
+        "esse desenvolvedor ou outro começou a adicionar o idioma indicado. \n"
+        "\n"
+        "As localizações incompletas serão padrão para \"en\" quando necessário. \n"
+        "Informe as instâncias de strings incorretas para a equipe do Tidy. \n"
+        "\n"
+    },
+    { TC_TXT_HELP_LANG_3,                            0,        
+        "\n"
+        "Se o Tidy for capaz de determinar sua localidade, o Tidy usará \n"
+        "o idioma da localidade automaticamente. Por exemplo, os sistemas \n"
+        "tipo Unix usam uma variável de ambiente $LANG e/ou $LC_ALL. \n"
+        "Consulte a documentação de seu sistema operacional para obter \n"
+        "mais informações. \n"
+        "\n"
+        "Tidy está usando a localidade %s. \n"
+        "\n"
+    },
+#endif /* SUPPORT_CONSOLE_APP */
+
+    {/* This MUST be present and last. */
+      TIDY_MESSAGE_TYPE_LAST,                        0, NULL
+    }
+
+}};
+
+
+#endif /* language_pt_br_h */
diff --git a/HTMLTidy/vendor/tidy-html5/src/language_zh_cn.h b/HTMLTidy/vendor/tidy-html5/src/language_zh_cn.h
index d6e7f8e5..23219745 100644
--- a/HTMLTidy/vendor/tidy-html5/src/language_zh_cn.h
+++ b/HTMLTidy/vendor/tidy-html5/src/language_zh_cn.h
@@ -28,7 +28,7 @@
  *
  * Orginating PO file metadata:
  *   PO_LAST_TRANSLATOR=jderry
- *   PO_REVISION_DATE=2017-05-13 21:04:45
+ *   PO_REVISION_DATE=2017-10-03 12:44:37
  */
 
 #ifdef _MSC_VER
@@ -61,9 +61,9 @@ static languageDefinition language_zh_cn = { whichPluralForm_zh_cn, {
     {/* Specify the ll or ll_cc language code here. */
       TIDY_LANGUAGE,          0, "zh_cn"
     },
-    { FILE_CANT_OPEN,         0, "无法打开”%s”\n"              },
     { LINE_COLUMN_STRING,     0, "行 %d 列 %d - "            },
     { STRING_CONTENT_LOOKS,   0, "文档内容看起来像 %s"             },
+    { FILE_CANT_OPEN,         0, "无法打开”%s”\n"              },
 
 #if SUPPORT_CONSOLE_APP
     { TC_STRING_VERS_A,       0, "HTML Tidy 用于 %s 版本 %s"   },
diff --git a/HTMLTidy/vendor/tidy-html5/src/lexer.c b/HTMLTidy/vendor/tidy-html5/src/lexer.c
index 667d69cd..3d6a489f 100644
--- a/HTMLTidy/vendor/tidy-html5/src/lexer.c
+++ b/HTMLTidy/vendor/tidy-html5/src/lexer.c
@@ -39,15 +39,9 @@
 #include "clean.h"
 #include "utf8.h"
 #include "streamio.h"
-#ifdef _MSC_VER
 #include "sprtf.h"
-#endif
-
-#ifndef SPRTF
-#define SPRTF printf
-#endif
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
 /* #define DEBUG_ALLOCATION   special EXTRA allocation debug information - VERY NOISY */
 static void check_me(char *name);
 static Bool show_attrs = yes;
@@ -69,6 +63,9 @@ static tmbstr get_text_string(Lexer* lexer, Node *node)
             if (c == '\n') {
                 buffer[i++] = '\\';
                 buffer[i++] = 'n';
+            } else if (c == '\t') {
+                buffer[i++] = '\\';
+                buffer[i++] = 't';
             } else if ( c == ' ' ) {
                 if (!insp)
                     buffer[i++] = c;
@@ -90,6 +87,9 @@ static tmbstr get_text_string(Lexer* lexer, Node *node)
             if (c == '\n') {
                 buffer[i++] = '\\';
                 buffer[i++] = 'n';
+            } else if (c == '\t') {
+                buffer[i++] = '\\';
+                buffer[i++] = 't';
             } else if ( c == ' ' ) {
                 if (!insp)
                     buffer[i++] = c;
@@ -122,6 +122,9 @@ static tmbstr get_text_string(Lexer* lexer, Node *node)
             if (c == '\n') {
                 buffer[i++] = '\\';
                 buffer[i++] = 'n';
+            } else if (c == '\t') {
+                buffer[i++] = '\\';
+                buffer[i++] = 't';
             } else if ( c == ' ' ) {
                 if (!insp)
                     buffer[i++] = c;
@@ -144,7 +147,7 @@ static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node )
     tmbstr src = lex ? "lexer" : "stream";
     SPRTF("R=%d C=%d: ", line, col );
     /* DEBUG: Be able to set a TRAP on a SPECIFIC row,col */
-    if ((line == 67) && (col == 95)) {
+    if ((line == 3) && (col == 1)) {
         check_me("Show_Node"); /* just a debug trap */
     }
     if (lexer && lexer->token && 
@@ -180,9 +183,9 @@ static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node )
     }
 }
 #define GTDBG(a,b,c) Show_Node(a,b,c)
-#else
+#else /* ENABLE_DEBUG_LOG */
 #define GTDBG(a,b,c)
-#endif
+#endif /* defined(ENABLE_DEBUG_LOG) */
 
 /* Forward references
 */
@@ -238,15 +241,18 @@ static struct _doctypes
   { 20, HT50, 500, no,  "HTML5",                  NULL,                                     NULL                                                        },
   { 21, XH50, 500, yes, "XHTML5",                 NULL,                                     NULL                                                        },
 
-  /* reminder to add XHTML Print 1.0 support, see http://www.w3.org/TR/xhtml-print */
-#if 0
-  { 14, XP10, 100, yes, "XHTML Print 1.0",        "-//W3C//DTD XHTML-Print 1.0//EN",         "http://www.w3.org/MarkUp/DTD/xhtml-print10.dtd"           },
-  { 14, XP10, 100, yes, "XHTML Print 1.0",        "-//PWG//DTD XHTML-Print 1.0//EN",         "http://www.xhtml-print.org/xhtml-print/xhtml-print10.dtd" },
-#endif
   /* final entry */
   {  0,    0, 0,  no,  NULL,                     NULL,                                     NULL                                                        }
 };
 
+/* 
+ * Issue #643 - Since VERS_FROM40 was extended to include VERS_HTML5
+ * to be used in the expanded entity table some 155 times,
+ * need a special macro here to denote just HTML 4 plus XHTML,
+ * which is actually the former define of VERS_FROM40
+ */
+#define VERS_HMTL40PX        (VERS_HTML40|VERS_XHTML11|VERS_BASIC)
+
 int TY_(HTMLVersion)(TidyDocImpl* doc)
 {
     uint i;
@@ -258,7 +264,7 @@ int TY_(HTMLVersion)(TidyDocImpl* doc)
     Bool xhtml = (cfgBool(doc, TidyXmlOut) || doc->lexer->isvoyager) &&
                  !cfgBool(doc, TidyHtmlOut);
     Bool html4 = ((dtmode == TidyDoctypeStrict) || (dtmode == TidyDoctypeLoose) ||
-                  (VERS_FROM40 & dtver) ? yes : no);
+                  (VERS_HMTL40PX & dtver) ? yes : no);
     Bool html5 = (!html4 && ((dtmode == TidyDoctypeAuto) ||
                   (dtmode == TidyDoctypeHtml5)) ? yes : no);
 
@@ -273,7 +279,7 @@ int TY_(HTMLVersion)(TidyDocImpl* doc)
     for (i = 0; W3C_Doctypes[i].name; ++i)
     {
         if ((xhtml && !(VERS_XHTML & W3C_Doctypes[i].vers)) ||
-            (html4 && !(VERS_FROM40 & W3C_Doctypes[i].vers)))
+            (html4 && !(VERS_HMTL40PX & W3C_Doctypes[i].vers)))
             continue;
 
         if (vers & W3C_Doctypes[i].vers &&
@@ -334,7 +340,11 @@ static uint GetVersFromFPI(ctmbstr fpi)
     return 0;
 }
 
-#if (defined(_MSC_VER) && !defined(NDEBUG))
+#ifdef ENABLE_DEBUG_LOG
+#  ifndef EndBuf
+#    define EndBuf(a)   ( a + strlen(a) )
+#  endif
+
 /* Issue #377 - Output diminishing version bits */
 typedef struct tagV2S {
     uint bit;
@@ -425,14 +435,14 @@ void TY_(ConstrainVersion)(TidyDocImpl* doc, uint vers)
         SPRTF("After : %s\n", vcur);
     }
 }
-#else /* !#if (defined(_MSC_VER) && !defined(NDEBUG)) */
+#else /* !#if defined(ENABLE_DEBUG_LOG) */
 /* everything is allowed in proprietary version of HTML */
 /* this is handled here rather than in the tag/attr dicts */
 void TY_(ConstrainVersion)(TidyDocImpl* doc, uint vers)
 {
     doc->lexer->versions &= (vers | VERS_PROPRIETARY);
 }
-#endif /* #if (defined(_MSC_VER) && !defined(NDEBUG)) y/n */
+#endif /* #if defined(ENABLE_DEBUG_LOG) y/n */
 
 Bool TY_(IsWhite)(uint c)
 {
@@ -825,15 +835,6 @@ Bool TY_(IsXMLNamechar)(uint c)
         (c >= 0x30fc && c <= 0x30fe));
 }
 
-#if 0
-Bool IsLower(uint c)
-{
-    uint map = MAP(c);
-
-    return (map & lowercase)!=0;
-}
-#endif
-
 Bool TY_(IsUpper)(uint c)
 {
     uint map = MAP(c);
@@ -861,24 +862,6 @@ uint TY_(ToUpper)(uint c)
     return c;
 }
 
-#if 0
-char FoldCase( TidyDocImpl* doc, tmbchar c, Bool tocaps )
-{
-    if ( !cfgBool(doc, TidyXmlTags) )
-    {
-        if ( tocaps )
-        {
-            c = (tmbchar) ToUpper(c);
-        }
-        else /* force to lower case */
-        {
-            c = (tmbchar) ToLower(c);
-        }
-    }
-    return c;
-}
-#endif
-
 /*
  return last character in string
  this is useful when trailing quotemark
@@ -1002,9 +985,6 @@ void TY_(AddCharToLexer)( Lexer *lexer, uint c )
     err = TY_(EncodeCharToUTF8Bytes)( c, buf, NULL, &count );
     if (err)
     {
-#if 0 && defined(_DEBUG)
-        fprintf( stderr, "lexer UTF-8 encoding error for U+%x : ", c );
-#endif
         /* replacement character 0xFFFD encoded as UTF-8 */
         buf[0] = (byte) 0xEF;
         buf[1] = (byte) 0xBF;
@@ -1215,15 +1195,14 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
 
         if (charRead == 1 && c == '#')
         {
-#if SUPPORT_ASIAN_ENCODINGS
-            if ( !cfgBool(doc, TidyNCR) || 
+            if ( !cfgBool(doc, TidyNCR) ||
                  cfg(doc, TidyInCharEncoding) == BIG5 ||
                  cfg(doc, TidyInCharEncoding) == SHIFTJIS )
             {
                 TY_(UngetChar)('#', doc->docIn);
                 return;
             }
-#endif
+
             TY_(AddCharToLexer)( lexer, c );
             entState = ENT_numdec;
             continue;
@@ -1456,7 +1435,7 @@ Node *TY_(NewNode)(TidyAllocator* allocator, Lexer *lexer)
         node->column = lexer->columns;
     }
     node->type = TextNode;
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_ALLOCATION)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_ALLOCATION)
     SPRTF("Allocated node %p\n", node );
 #endif
     return node;
@@ -1550,8 +1529,16 @@ void TY_(RemoveAttribute)( TidyDocImpl* doc, Node *node, AttVal *attr )
  */
 void TY_(FreeNode)( TidyDocImpl* doc, Node *node )
 {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_ALLOCATION)
-    if (node) SPRTF("Free node %p\n", node );
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_ALLOCATION)
+    /* avoid showing free of root node! */
+    if (node) {
+        if (RootNode != node->type) {
+            SPRTF("Free node %p\n", node);
+        }
+        else {
+            SPRTF("Root node %p\n", node);
+        }
+    }
 #endif
     /* this is no good ;=((
     if (node && doc && doc->lexer) {
@@ -1567,10 +1554,6 @@ void TY_(FreeNode)( TidyDocImpl* doc, Node *node )
         TY_(FreeAttrs)( doc, node );
         TY_(FreeNode)( doc, node->content );
         TidyDocFree( doc, node->element );
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-        if (node->otext)
-            TidyDocFree(doc, node->otext);
-#endif
         if (RootNode != node->type)
             TidyDocFree( doc, node );
         else
@@ -1580,53 +1563,6 @@ void TY_(FreeNode)( TidyDocImpl* doc, Node *node )
     }
 }
 
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-void StoreOriginalTextInToken(TidyDocImpl* doc, Node* node, uint count)
-{
-    if (!doc->storeText)
-        return;
-
-    if (count >= doc->docIn->otextlen)
-        return;
-
-    if (!doc->docIn->otextsize)
-        return;
-
-    if (count == 0)
-    {
-        node->otext = doc->docIn->otextbuf;
-        doc->docIn->otextbuf = NULL;
-        doc->docIn->otextlen = 0;
-        doc->docIn->otextsize = 0;
-    }
-    else
-    {
-        uint len = doc->docIn->otextlen;
-        tmbstr buf1 = (tmbstr)TidyDocAlloc(doc, len - count + 1);
-        tmbstr buf2 = (tmbstr)TidyDocAlloc(doc, count + 1);
-        uint i, j;
-
-        /* strncpy? */
-
-        for (i = 0; i < len - count; ++i)
-            buf1[i] = doc->docIn->otextbuf[i];
-
-        buf1[i] = 0;
-
-        for (j = 0; j + i < len; ++j)
-            buf2[j] = doc->docIn->otextbuf[j + i];
-
-        buf2[j] = 0;
-
-        TidyDocFree(doc, doc->docIn->otextbuf);
-        node->otext = buf1;
-        doc->docIn->otextbuf = buf2;
-        doc->docIn->otextlen = count;
-        doc->docIn->otextsize = count + 1;
-    }
-}
-#endif
-
 Node* TY_(TextToken)( Lexer *lexer )
 {
     Node *node = TY_(NewNode)( lexer->allocator, lexer );
@@ -1679,9 +1615,6 @@ static Node* NewToken(TidyDocImpl* doc, NodeType type)
     node->type = type;
     node->start = lexer->txtstart;
     node->end = lexer->txtend;
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    StoreOriginalTextInToken(doc, node, 0);
-#endif
     return node;
 }
 
@@ -2454,7 +2387,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
                 if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts))
                 {
                     /* Issue #281 - only warn if adding the escape! */
-                    TY_(ReportError)(doc, NULL, NULL, BAD_CDATA_CONTENT);
+                    TY_(Report)(doc, NULL, NULL, BAD_CDATA_CONTENT);
 
                     for (i = lexer->lexsize; i > start-1; --i)
                         lexer->lexbuf[i] = lexer->lexbuf[i-1];
@@ -2472,17 +2405,9 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
         lexer->txtend = lexer->lexsize;
 
     if (c == EndOfStream)
-        TY_(ReportError)(doc, container, NULL, MISSING_ENDTAG_FOR );
+        TY_(Report)(doc, container, NULL, MISSING_ENDTAG_FOR );
 
-/* this was disabled for some reason... */
-#if 0
-    if (lexer->txtend > lexer->txtstart)
-        return TextToken(lexer);
-    else
-        return NULL;
-#else
     return TY_(TextToken)(lexer);
-#endif
 }
 
 void TY_(UngetToken)( TidyDocImpl* doc )
@@ -2490,17 +2415,8 @@ void TY_(UngetToken)( TidyDocImpl* doc )
     doc->lexer->pushed = yes;
 }
 
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-#define CondReturnTextNode(doc, skip) \
-            if (lexer->txtend > lexer->txtstart) \
-            { \
-                lexer->token = TY_(TextToken)(lexer); \
-                StoreOriginalTextInToken(doc, lexer->token, skip); \
-                return lexer->token; \
-            }
-#else
-#if !defined(NDEBUG) && defined(_MSC_VER)
-#define CondReturnTextNode(doc, skip) \
+#if defined(ENABLE_DEBUG_LOG)
+#  define CondReturnTextNode(doc, skip) \
             if (lexer->txtend > lexer->txtstart) { \
                 Node *_node = TY_(TextToken)(lexer); \
                 lexer->token = _node; \
@@ -2509,14 +2425,13 @@ void TY_(UngetToken)( TidyDocImpl* doc )
             }
 
 #else
-#define CondReturnTextNode(doc, skip) \
+#  define CondReturnTextNode(doc, skip) \
             if (lexer->txtend > lexer->txtstart) \
             { \
                 lexer->token = TY_(TextToken)(lexer); \
                 return lexer->token; \
             }
 #endif
-#endif
 
 /*
   modes for GetToken()
@@ -2591,7 +2506,7 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
     return GetTokenFromStream( doc, mode );
 }
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
 static void check_me(char *name)
 {
     SPRTF("Have node %s\n", name);
@@ -2605,6 +2520,22 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
     Bool isempty = no;
     AttVal *attributes = NULL;
     Node *node;
+    Bool fixComments;
+    
+    switch ( cfgAutoBool(doc, TidyFixComments) )
+    {
+        case TidyYesState:
+            fixComments = yes;
+            break;
+
+        case TidyNoState:
+            fixComments = no;
+            break;
+
+        default:
+            fixComments = (TY_(HTMLVersion)(doc) & HT50) == 0;
+            break;
+    }
 
     /* Lexer->token must be set on return. Nullify it for safety. */
     lexer->token = NULL;
@@ -2696,7 +2627,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
 
                     TY_(AddCharToLexer)(lexer, c);
 
-                    if (TY_(IsLetter)(c))
+                    if (TY_(IsLetter)(c) || (cfgBool(doc, TidyXmlTags) && TY_(IsXMLNamechar)(c)))
                     {
                         lexer->lexsize -= 3;
                         lexer->txtend = lexer->lexsize;
@@ -2715,9 +2646,6 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                                 lexer->txtend = lexer->lexsize;
                             }
                             lexer->token = TY_(TextToken)(lexer);
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-                            StoreOriginalTextInToken(doc, lexer->token, 3);
-#endif
                             node = lexer->token;
                             GTDBG(doc,"text", node);
                             return node;
@@ -2764,7 +2692,11 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                             continue;
                         }
 
-                        TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
+                        /*
+                           We only print this message if there's a missing
+                           starting hyphen; this comment will be dropped.
+                         */
+                        TY_(Report)(doc, NULL, NULL, MALFORMED_COMMENT_DROPPING );
                     }
                     else if (c == 'd' || c == 'D')
                     {
@@ -2897,7 +2829,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 }
 
                 /* check for start tag */
-                if (TY_(IsLetter)(c))
+                if (TY_(IsLetter)(c) || (cfgBool(doc, TidyXmlTags) && TY_(IsXMLNamechar)(c)))
                 {
                     TY_(UngetChar)(c, doc->docIn);     /* push back letter */
                     TY_(UngetChar)('<', doc->docIn);
@@ -2941,9 +2873,6 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
 
                 lexer->state = LEX_CONTENT;
                 lexer->waswhite = no;
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-                StoreOriginalTextInToken(doc, lexer->token, 0); /* hmm... */
-#endif
                 node = lexer->token;
                 GTDBG(doc,"endtag", node);
                 return node;  /* the endtag token */
@@ -3013,9 +2942,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                            for older HTML, because it's not truly supported
                            by the standard, although Tidy will allow it. */
                         if ( (doc->lexer->doctype & VERS_HTML5) > 0 && TY_(elementIsAutonomousCustomFormat)( lexer->token->element ) )
-                            TY_(ReportFatal)( doc, NULL, lexer->token, UNKNOWN_ELEMENT_LOOKS_CUSTOM );
+                            TY_(Report)( doc, NULL, lexer->token, UNKNOWN_ELEMENT_LOOKS_CUSTOM );
                         else
-                            TY_(ReportFatal)( doc, NULL, lexer->token, UNKNOWN_ELEMENT );
+                            TY_(Report)( doc, NULL, lexer->token, UNKNOWN_ELEMENT );
                     }
                 }
                 else if ( !cfgBool(doc, TidyXmlTags) )
@@ -3024,9 +2953,6 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                     TY_(RepairDuplicateAttributes)( doc, lexer->token, no );
                 } else 
                     TY_(RepairDuplicateAttributes)( doc, lexer->token, yes );
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-                StoreOriginalTextInToken(doc, lexer->token, 0);
-#endif
                 node = lexer->token;
                 GTDBG(doc,"starttag", node);
                 return node;  /* return start tag */
@@ -3037,6 +2963,13 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                     continue;
 
                 c = TY_(ReadChar)(doc->docIn);
+
+                /* Fix hyphens at beginning of tag */
+                if ( c != '-' && fixComments && lexer->lexsize - lexer->txtstart == 1 )
+                {
+                    lexer->lexbuf[lexer->lexsize - 1] = '=';
+                }
+
                 TY_(AddCharToLexer)(lexer, c);
 
                 if (c != '-')
@@ -3048,7 +2981,26 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 if (c == '>')
                 {
                     if (badcomment)
-                        TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
+                    {
+                        /*
+                           We've got bad comments that we either fixed or
+                           ignored; provide proper user feedback based on
+                           doctype and whether or not we fixed them.
+                         */
+                        if ( (TY_(HTMLVersion)(doc) & HT50) )
+                        {
+                            if ( fixComments )
+                                TY_(Report)(doc, NULL, NULL, MALFORMED_COMMENT );
+                            /* Otherwise for HTML5, it's safe to ignore. */
+                        }
+                        else
+                        {
+                            if ( fixComments )
+                                TY_(Report)(doc, NULL, NULL, MALFORMED_COMMENT );
+                            else
+                                TY_(Report)(doc, NULL, NULL, MALFORMED_COMMENT_WARN );
+                        }
+                    }
 
                     /* do not store closing -- in lexbuf */
                     lexer->lexsize -= 2;
@@ -3081,7 +3033,8 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
 
                 badcomment++;
 
-                if ( cfgBool(doc, TidyFixComments) )
+                /* fix hyphens in the middle */
+                if ( fixComments )
                     lexer->lexbuf[lexer->lexsize - 2] = '=';
 
                 /* if '-' then look for '>' to end the comment */
@@ -3091,8 +3044,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                     goto end_comment;
                 }
 
-                /* otherwise continue to look for --> */
-                lexer->lexbuf[lexer->lexsize - 1] = '=';
+                /* fix hyphens end, and continue to look for --> */
+                if ( fixComments )
+                    lexer->lexbuf[lexer->lexsize - 1] = '=';
 
                 /* http://tidy.sf.net/bug/1266647 */
                 TY_(AddCharToLexer)(lexer, c);
@@ -3163,7 +3117,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
 
                     if (c == EndOfStream)
                     {
-                        TY_(ReportError)(doc, NULL, NULL, UNEXPECTED_END_OF_FILE );
+                        TY_(Report)(doc, NULL, NULL, UNEXPECTED_END_OF_FILE );
                         TY_(UngetChar)(c, doc->docIn);
                         continue;
                     }
@@ -3463,9 +3417,6 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 lexer->txtend = lexer->lexsize;
             }
             lexer->token = TY_(TextToken)(lexer);
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-            StoreOriginalTextInToken(doc, lexer->token, 0); /* ? */
-#endif
             node = lexer->token;
             GTDBG(doc,"textstring", node);
             return node;  /* the textstring token */
@@ -3474,7 +3425,10 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
     else if (lexer->state == LEX_COMMENT) /* comment */
     {
         if (c == EndOfStream)
-            TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
+        {
+            /* We print this if we reached end of the stream mid-comment. */
+            TY_(Report)(doc, NULL, NULL, MALFORMED_COMMENT_EOS );
+        }
 
         lexer->txtend = lexer->lexsize;
         lexer->lexbuf[lexer->lexsize] = '\0';
@@ -3486,9 +3440,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
         return node;  /* the COMMENT token */
     }
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Returning NULL...\n");
-#endif
+    DEBUG_LOG(SPRTF("Returning NULL...\n"));
     return NULL;
 }
 
@@ -3613,8 +3565,9 @@ static Node *ParsePhp( TidyDocImpl* doc )
 }   
 
 /* consumes the '>' terminating start tags */
+/* @TODO: float the errors back to the calling method */
 static tmbstr  ParseAttribute( TidyDocImpl* doc, Bool *isempty,
-                              Node **asp, Node **php)
+                              Node **asp, Node **php )
 {
     Lexer* lexer = doc->lexer;
     int start, len = 0;
@@ -3976,8 +3929,6 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
             {
                 uint q = c;
 
-                TY_(ReportAttrError)( doc, lexer->token, NULL, UNEXPECTED_QUOTEMARK );
-
                 /* handle <input onclick=s("btn1")> and <a title=foo""">...</a> */
                 /* this doesn't handle <a title=foo"/> which browsers treat as  */
                 /* 'foo"/' nor  <a title=foo" /> which browser treat as 'foo"'  */
@@ -4111,7 +4062,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
              !(TY_(IsUrl)(doc, name) && TY_(tmbstrncmp)(lexer->lexbuf+start, "javascript:", 11) == 0) &&
              !(TY_(tmbstrncmp)(lexer->lexbuf+start, "<xml ", 5) == 0)
            )
-            TY_(ReportFatal)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE ); 
+            TY_(Report)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE ); 
     }
 
     len = lexer->lexsize - start;
@@ -4148,7 +4099,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
         value = NULL;
 
     /* note delimiter if given */
-    *pdelim = (delim ? delim : '"');
+    *pdelim = delim;
 
     return value;
 }
@@ -4265,11 +4216,13 @@ static AttVal* ParseAttrs( TidyDocImpl* doc, Bool *isempty )
             (cfgBool(doc, TidyXmlTags) && IsValidXMLAttrName(attribute))))
         {
             av = TY_(NewAttribute)(doc);
-            av->delim = delim;
+            av->delim = delim ? delim : '"';
             av->attribute = attribute;
             av->value = value;
             av->dict = TY_(FindAttribute)( doc, av );
-            AddAttrToList( &list, av ); 
+            AddAttrToList( &list, av );
+            if ( !delim && value )
+                TY_(ReportAttrError)( doc, lexer->token, av, MISSING_QUOTEMARK_OPEN);
         }
         else
         {
@@ -4383,13 +4336,10 @@ static Node *ParseDocTypeDecl(TidyDocImpl* doc)
 
                 if (!node->element || !IsValidXMLElemName(node->element))
                 {
-                    TY_(ReportError)(doc, NULL, NULL, MALFORMED_DOCTYPE);
+                    TY_(Report)(doc, NULL, NULL, MALFORMED_DOCTYPE);
                     TY_(FreeNode)(doc, node);
                     return NULL;
                 }
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-                StoreOriginalTextInToken(doc, node, 0);
-#endif
                 return node;
             }
             else
@@ -4469,7 +4419,7 @@ static Node *ParseDocTypeDecl(TidyDocImpl* doc)
     }
 
     /* document type declaration not finished */
-    TY_(ReportError)(doc, NULL, NULL, MALFORMED_DOCTYPE);
+    TY_(Report)(doc, NULL, NULL, MALFORMED_DOCTYPE);
     TY_(FreeNode)(doc, node);
     return NULL;
 }
diff --git a/HTMLTidy/vendor/tidy-html5/src/lexer.h b/HTMLTidy/vendor/tidy-html5/src/lexer.h
index 1d3d9cd7..50fa2cdd 100644
--- a/HTMLTidy/vendor/tidy-html5/src/lexer.h
+++ b/HTMLTidy/vendor/tidy-html5/src/lexer.h
@@ -207,8 +207,8 @@ typedef enum
 #define VERS_IFRAME        (VERS_HTML40_LOOSE|VERS_FRAMESET)
 #define VERS_LOOSE         (VERS_HTML20|VERS_HTML32|VERS_IFRAME)
 #define VERS_EVENTS        (VERS_HTML40|VERS_XHTML11)
-#define VERS_FROM32        (VERS_HTML32|VERS_HTML40)
-#define VERS_FROM40        (VERS_HTML40|VERS_XHTML11|VERS_BASIC)
+#define VERS_FROM32        (VERS_HTML32|VERS_HTML40|HT50)
+#define VERS_FROM40        (VERS_HTML40|VERS_XHTML11|VERS_BASIC|VERS_HTML5)
 #define VERS_XHTML         (X10S|X10T|X10F|XH11|XB10|XH50)
 
 /* strict */
@@ -317,10 +317,6 @@ struct _Node
     Bool        closed;         /* true if closed by explicit end tag */
     Bool        implicit;       /* true if inferred */
     Bool        linebreak;      /* true if followed by a line break */
-
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    tmbstr      otext;
-#endif
 };
 
 
@@ -332,18 +328,6 @@ struct _Node
 
 struct _Lexer
 {
-#if 0  /* Move to TidyDocImpl */
-    StreamIn* in;           /* document content input */
-    StreamOut* errout;      /* error output stream */
-
-    uint badAccess;         /* for accessibility errors */
-    uint badLayout;         /* for bad style errors */
-    uint badChars;          /* for bad character encodings */
-    uint badForm;           /* for mismatched/mispositioned form tags */
-    uint warnings;          /* count of warnings in this document */
-    uint errors;            /* count of errors */
-#endif
-
     uint lines;             /* lines seen */
     uint columns;           /* at start of current token */
     Bool waswhite;          /* used to collapse contiguous white space */
@@ -392,10 +376,6 @@ struct _Lexer
     TagStyle *styles;          /* used for cleaning up presentation markup */
 
     TidyAllocator* allocator; /* allocator */
-
-#if 0
-    TidyDocImpl* doc;       /* Pointer back to doc for error reporting */
-#endif 
 };
 
 
diff --git a/HTMLTidy/vendor/tidy-html5/src/mappedio.c b/HTMLTidy/vendor/tidy-html5/src/mappedio.c
index e5da3439..c2c403d9 100644
--- a/HTMLTidy/vendor/tidy-html5/src/mappedio.c
+++ b/HTMLTidy/vendor/tidy-html5/src/mappedio.c
@@ -93,19 +93,18 @@ void TY_(freeFileSource)( TidyInputSource* inp, Bool closeIt )
         TY_(freeStdIOFileSource)( inp, closeIt );
 }
 
-#endif
+#endif /* SUPPORT_POSIX_MAPPED_FILES */
 
 
 #if defined(_WIN32)
-#if defined(_MSC_VER) && (_MSC_VER < 1300)  /* less than msvc++ 7.0 */
-#pragma warning(disable:4115) /* named type definition in parentheses in windows headers */
-#endif
-#include <windows.h>
-#include <errno.h>
-
-#include "streamio.h"
-#include "tidy-int.h"
-#include "message.h"
+#  if defined(_MSC_VER) && (_MSC_VER < 1300)  /* less than msvc++ 7.0 */
+#    pragma warning(disable:4115) /* named type definition in parentheses in windows headers */
+#  endif
+#  include <windows.h>
+#  include <errno.h>
+#  include "streamio.h"
+#  include "tidy-int.h"
+#  include "message.h"
 
 typedef struct _fp_input_mapped_source
 {
@@ -192,7 +191,7 @@ static int initMappedFileSource( TidyAllocator *allocator, TidyInputSource* inp,
     if ( !fin )
         return -1;
 
-#if defined(__MINGW32__)
+#  if defined(__MINGW32__)
     {
         DWORD lowVal, highVal;
         lowVal = GetFileSize(fp, &highVal);
@@ -205,8 +204,8 @@ static int initMappedFileSource( TidyAllocator *allocator, TidyInputSource* inp,
         fin->size = (fin->size << 32);
         fin->size += lowVal;
     }
-#else /* NOT a MinGW build */
-#if defined(_MSC_VER) && (_MSC_VER < 1300)  /* less than msvc++ 7.0 */
+#  else /* NOT a MinGW build */
+#    if defined(_MSC_VER) && (_MSC_VER < 1300)  /* less than msvc++ 7.0 */
     {
         LARGE_INTEGER* pli = (LARGE_INTEGER *)&fin->size;
         (DWORD)pli->LowPart = GetFileSize( fp, (DWORD *)&pli->HighPart );
@@ -216,15 +215,15 @@ static int initMappedFileSource( TidyAllocator *allocator, TidyInputSource* inp,
             return -1;
         }
     }
-#else
+#    else
     if ( !GetFileSizeEx( fp, (LARGE_INTEGER*)&fin->size )
          || fin->size <= 0 )
     {
         TidyFree(allocator, fin);
         return -1;
     }
-#endif
-#endif /* MinGW y/n */
+#    endif
+#  endif /* MinGW y/n */
 
     fin->map = CreateFileMapping( fp, NULL, PAGE_READONLY, 0, 0, NULL );
 
@@ -291,25 +290,25 @@ int TY_(DocParseFileWithMappedFile)( TidyDocImpl* doc, ctmbstr filnam ) {
     HANDLE fin = CreateFileA( filnam, GENERIC_READ, FILE_SHARE_READ, NULL,
                               OPEN_EXISTING, 0, NULL );
 
-#if PRESERVE_FILE_TIMES
+#  if PRESERVE_FILE_TIMES
     LONGLONG actime, modtime;
     TidyClearMemory( &doc->filetimes, sizeof(doc->filetimes) );
 
     if ( fin != INVALID_HANDLE_VALUE && cfgBool(doc,TidyKeepFileTimes) &&
          GetFileTime(fin, NULL, (FILETIME*)&actime, (FILETIME*)&modtime) )
     {
-#define TY_I64(str) TYDYAPPEND(str,LL)
-#if _MSC_VER < 1300  && !defined(__GNUC__) /* less than msvc++ 7.0 */
-# undef TY_I64
-# define TY_I64(str) TYDYAPPEND(str,i64)
-#endif
+#    define TY_I64(str) TYDYAPPEND(str,LL)
+#    if _MSC_VER < 1300  && !defined(__GNUC__) /* less than msvc++ 7.0 */
+#      undef TY_I64
+#      define TY_I64(str) TYDYAPPEND(str,i64)
+#    endif
         doc->filetimes.actime =
             (time_t)( ( actime  - TY_I64(116444736000000000)) / 10000000 );
 
         doc->filetimes.modtime =
             (time_t)( ( modtime - TY_I64(116444736000000000)) / 10000000 );
     }
-#endif
+#  endif /* PRESERVE_FILE_TIMES */
 
     if ( fin != INVALID_HANDLE_VALUE )
     {
@@ -326,18 +325,9 @@ int TY_(DocParseFileWithMappedFile)( TidyDocImpl* doc, ctmbstr filnam ) {
         TY_(freeStreamIn)( in );
     }
     else /* Error message! */
-        TY_(FileError)( doc, filnam, TidyError, FILE_CANT_OPEN );
+        TY_(ReportFileError)( doc, filnam, FILE_CANT_OPEN );
     return status;
 }
 
-#endif
-
+#endif /* defined(_WIN32) */
 
-/*
- * local variables:
- * mode: c
- * indent-tabs-mode: nil
- * c-basic-offset: 4
- * eval: (c-set-offset 'substatement-open 0)
- * end:
- */
diff --git a/HTMLTidy/vendor/tidy-html5/src/message.c b/HTMLTidy/vendor/tidy-html5/src/message.c
old mode 100755
new mode 100644
index 9b86bb55..eb097de2
--- a/HTMLTidy/vendor/tidy-html5/src/message.c
+++ b/HTMLTidy/vendor/tidy-html5/src/message.c
@@ -14,9 +14,6 @@
 #include "streamio.h"
 #include "tmbstr.h"
 #include "utf8.h"
-#if !defined(NDEBUG) && defined(_MSC_VER)
-#include "sprtf.h"
-#endif
 #include "version.h"
 
 
@@ -40,46 +37,6 @@ ctmbstr TY_(tidyLibraryVersion)(void)
  * General Message Utility Functions
  *********************************************************************/
 
-/* Updates document message counts and compares counts to options to
-** see if message display should go forward.
-*/
-static Bool UpdateCount( TidyDocImpl* doc, TidyReportLevel level )
-{
-  /* keep quiet after <ShowErrors> errors */
-  Bool go = ( doc->errors < cfg(doc, TidyShowErrors) );
-
-  switch ( level )
-  {
-      case TidyInfo:
-          doc->infoMessages++;
-          break;
-      case TidyWarning:
-          doc->warnings++;
-          go = go && cfgBool( doc, TidyShowWarnings );
-          break;
-      case TidyConfig:
-          doc->optionErrors++;
-          break;
-      case TidyAccess:
-          doc->accessErrors++;
-          break;
-      case TidyError:
-          doc->errors++;
-          break;
-      case TidyBadDocument:
-          doc->docErrors++;
-          break;
-      case TidyFatal:
-          /* Ack! */
-          break;
-      default:
-          break;
-  }
-
-  return go;
-}
-
-
 /* Returns the given node's tag as a string. */
 static char* TagToString(Node* tag, char* buf, size_t count)
 {
@@ -131,6 +88,19 @@ static void NtoS(int n, tmbstr str)
 }
 
 
+/* Get an HTML version string */
+static ctmbstr HTMLVersion( TidyDocImpl* doc )
+{
+    uint versionEmitted = doc->lexer->versionEmitted;
+    uint declared = doc->lexer->doctype;
+    uint version = versionEmitted == 0 ? declared : versionEmitted;
+    ctmbstr result = TY_(HTMLVersionNameFromCode)(version, 0);
+    if (!result)
+        result = tidyLocalizedString(STRING_HTML_PROPRIETARY);
+    return result;
+}
+
+
 /*********************************************************************
  * Message Writing Functions
  * These funtions provide final, formatted output to the output sink.
@@ -145,7 +115,7 @@ static void NtoS(int n, tmbstr str)
 static void messageOut( TidyMessageImpl *message )
 {
     TidyDocImpl *doc;
-    Bool go;
+    Bool go = yes;
 
     if ( !message )
         return;
@@ -155,22 +125,71 @@ static void messageOut( TidyMessageImpl *message )
     /* The filter has had a chance to suppress *any* message from output. */
     go = message->allowMessage;
 
-    /* Allow UpdateCount a chance to suppress further report messages. */
+    /* Update the count of each report type. */
+    switch ( message->level )
+    {
+        case TidyInfo:
+            doc->infoMessages++;
+            break;
+        case TidyWarning:
+            doc->warnings++;
+            break;
+        case TidyConfig:
+            doc->optionErrors++;
+            break;
+        case TidyAccess:
+            doc->accessErrors++;
+            break;
+        case TidyError:
+            doc->errors++;
+            break;
+        case TidyBadDocument:
+            doc->docErrors++;
+            break;
+        case TidyFatal:
+            /* Ack! */
+            break;
+        default:
+            break;
+    }
+
+    /* Suppress report messages if they've been muted. */
+    go = go & !message->muted;
+
+    /* Suppress report messages if we've already reached the reporting limit. */
     if ( message->level <= TidyFatal )
     {
-        go = go & UpdateCount( doc, message->level );
+        go = go & ( doc->errors < cfg(doc, TidyShowErrors) );
     }
-    
-    /* If suppressing TidyInfo/TidyDialogueInfo on Reports, suppress them. */
-    if ( message->level == TidyInfo || message->level == TidyDialogueInfo )
+
+    /* Let TidyQuiet silence a lot of things. */
+    if ( cfgBool( doc, TidyQuiet ) == yes )
+    {
+        go = go && message->code != STRING_DOCTYPE_GIVEN;
+        go = go && message->code != STRING_CONTENT_LOOKS;
+        go = go && message->code != STRING_NO_SYSID;
+        go = go && message->level != TidyDialogueInfo;
+        go = go && message->level != TidyConfig;
+        go = go && message->level != TidyInfo;
+        go = go && !(message->level >= TidyDialogueSummary &&
+                            message->code != STRING_NEEDS_INTERVENTION);
+    }
+
+    /* Let !TidyShowInfo silence some things. */
+    if ( cfgBool( doc, TidyShowInfo ) == no )
     {
-        go = go & (cfgBool(doc, TidyShowInfo) == yes);
+        go = go && message->level != TidyInfo;
+
+        /* Temporary; TidyShowInfo shouldn't affect TidyDialogueInfo, but
+           right now such messages are hidden until we granularize the
+           output controls. */
+        go = go && message->level != TidyDialogueInfo;
     }
 
-    /* If we're TidyQuiet and handling TidyDialogue, then suppress. */
-    if ( cfgBool(doc, TidyQuiet) )
+    /* Let !TidyShowWarnings silence some things. */
+    if ( cfgBool( doc, TidyShowWarnings ) == no )
     {
-        go = go & !(message->level > TidyFatal);
+        go = go && message->level != TidyWarning;
     }
 
     /* Output the message if applicable. */
@@ -199,260 +218,671 @@ static void messageOut( TidyMessageImpl *message )
 
 
 /*********************************************************************
- * High Level Message Writing Functions - General
- * When adding new reports to LibTidy, preference should be given
- * to one of these existing, general purpose message writing
- * functions, if at all possible.
+ * Report Formatting
+ * In order to provide a single, predictable reporting system, Tidy
+ * provides an extensible messaging system that provides most of the
+ * basic requirements for most reports, while permitting simple
+ * implementation of new reports in a flexible manner. By adding
+ * additional formatters, new messages can be added easily while
+ * maintaining Tidy's internal organization.
  *********************************************************************/
 
 
-void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+/* Functions of this type will create new instances of TidyMessage specific to
+** the type of report being emitted. Many messages share the same fomatter for
+** messages, but new ones can be written as required. Please have a look at
+** the existing formatters in order to determine if an existing signature is
+** compatible with the report you wish to output before adding a new formatter.
+** In particular, if an existing formatter provides most of the local variables
+** required to populate your format string, try to use it.
+*/
+typedef TidyMessageImpl*(messageFormatter)(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args);
+
+
+/* Forward declarations of messageFormatter functions. */
+static messageFormatter formatAccessReport;
+static messageFormatter formatAttributeReport;
+static messageFormatter formatEncodingReport;
+static messageFormatter formatStandard;
+static messageFormatter formatStandardDynamic;
+
+
+/* This structure ties together for each report Code the default 
+** TidyReportLevel, the Formatter to be used to construct the message, and the
+** next code to output, if applicable. Assuming an existing formatter can,
+** this it makes it simple to output new reports, or to change report level by
+** modifying this array.
+*/
+static struct _dispatchTable {
+    uint code;                 /**< The message code. */
+    TidyReportLevel level;     /**< The default TidyReportLevel of the message. */
+    messageFormatter *handler; /**< The formatter for the report. */
+    uint next;                 /**< If multiple codes should be displayed, which is next? */
+} dispatchTable[] = {
+    { ADDED_MISSING_CHARSET,        TidyInfo,        formatStandard          },
+    { ANCHOR_NOT_UNIQUE,            TidyWarning,     formatAttributeReport   },
+    { APOS_UNDEFINED,               TidyWarning,     formatStandard          },
+    { ATTR_VALUE_NOT_LCASE,         TidyWarning,     formatAttributeReport   },
+    { ATTRIBUTE_VALUE_REPLACED,     TidyInfo,        formatAttributeReport   },
+    { ATTRIBUTE_IS_NOT_ALLOWED,     TidyWarning,     formatAttributeReport   },
+    { BACKSLASH_IN_URI,             TidyWarning,     formatAttributeReport   },
+    { BAD_ATTRIBUTE_VALUE_REPLACED, TidyWarning,     formatAttributeReport   },
+    { BAD_ATTRIBUTE_VALUE,          TidyWarning,     formatAttributeReport   },
+    { BAD_CDATA_CONTENT,            TidyWarning,     formatStandard          },
+    { BAD_SUMMARY_HTML5,            TidyWarning,     formatStandard          },
+    { BAD_SURROGATE_LEAD,           TidyWarning,     formatStandard          },
+    { BAD_SURROGATE_PAIR,           TidyWarning,     formatStandard          },
+    { BAD_SURROGATE_TAIL,           TidyWarning,     formatStandard          },
+    { CANT_BE_NESTED,               TidyWarning,     formatStandard          },
+    { COERCE_TO_ENDTAG,             TidyWarning,     formatStandard          },
+    { CONTENT_AFTER_BODY,           TidyWarning,     formatStandard          },
+    { CUSTOM_TAG_DETECTED,          TidyInfo,        formatStandard          },
+    { DISCARDING_UNEXPECTED,        0,               formatStandardDynamic   },
+    { DOCTYPE_AFTER_TAGS,           TidyWarning,     formatStandard          },
+    { DUPLICATE_FRAMESET,           TidyError,       formatStandard          },
+    { ELEMENT_NOT_EMPTY,            TidyWarning,     formatStandard          },
+    { ELEMENT_VERS_MISMATCH_ERROR,  TidyError,       formatStandard          },
+    { ELEMENT_VERS_MISMATCH_WARN,   TidyWarning,     formatStandard          },
+    { ENCODING_MISMATCH,            TidyWarning,     formatEncodingReport    },
+    { ESCAPED_ILLEGAL_URI,          TidyWarning,     formatAttributeReport   },
+    { FILE_CANT_OPEN,               TidyBadDocument, formatStandard          },
+    { FILE_CANT_OPEN_CFG,           TidyBadDocument, formatStandard          },
+    { FILE_NOT_FILE,                TidyBadDocument, formatStandard          },
+    { FIXED_BACKSLASH,              TidyWarning,     formatAttributeReport   },
+    { FOUND_STYLE_IN_BODY,          TidyWarning,     formatStandard          },
+    { ID_NAME_MISMATCH,             TidyWarning,     formatAttributeReport   },
+    { ILLEGAL_NESTING,              TidyWarning,     formatStandard          },
+    { ILLEGAL_URI_CODEPOINT,        TidyWarning,     formatAttributeReport   },
+    { ILLEGAL_URI_REFERENCE,        TidyWarning,     formatAttributeReport   },
+    { INSERTING_AUTO_ATTRIBUTE,     TidyWarning,     formatAttributeReport   },
+    { INSERTING_TAG,                TidyWarning,     formatStandard          },
+    { INVALID_ATTRIBUTE,            TidyWarning,     formatAttributeReport   },
+    { INVALID_NCR,                  TidyWarning,     formatEncodingReport    },
+    { INVALID_SGML_CHARS,           TidyWarning,     formatEncodingReport    },
+    { INVALID_UTF8,                 TidyWarning,     formatEncodingReport    },
+    { INVALID_UTF16,                TidyWarning,     formatEncodingReport    },
+    { INVALID_XML_ID,               TidyWarning,     formatAttributeReport   },
+    { JOINING_ATTRIBUTE,            TidyWarning,     formatAttributeReport   },
+    { MALFORMED_COMMENT,            TidyInfo,        formatStandard          },
+    { MALFORMED_COMMENT_EOS,        TidyError,       formatStandard          },
+    { MALFORMED_COMMENT_DROPPING,   TidyWarning,     formatStandard          },
+    { MALFORMED_COMMENT_WARN,       TidyWarning,     formatStandard          },
+    { MALFORMED_DOCTYPE,            TidyWarning,     formatStandard          },
+    { MISMATCHED_ATTRIBUTE_ERROR,   TidyError,       formatAttributeReport   },
+    { MISMATCHED_ATTRIBUTE_WARN,    TidyWarning,     formatAttributeReport   },
+    { MISSING_ATTR_VALUE,           TidyWarning,     formatAttributeReport   },
+    { MISSING_ATTRIBUTE,            TidyWarning,     formatStandard          },
+    { MISSING_DOCTYPE,              TidyWarning,     formatStandard          },
+    { MISSING_ENDTAG_BEFORE,        TidyWarning,     formatStandard          },
+    { MISSING_ENDTAG_FOR,           TidyWarning,     formatStandard          },
+    { MISSING_ENDTAG_OPTIONAL,      TidyInfo,        formatStandard          },
+    { MISSING_IMAGEMAP,             TidyWarning,     formatAttributeReport   },
+    { MISSING_QUOTEMARK,            TidyWarning,     formatAttributeReport   },
+    { MISSING_QUOTEMARK_OPEN,       TidyInfo,        formatAttributeReport   },
+    { MISSING_SEMICOLON_NCR,        TidyWarning,     formatStandard          },
+    { MISSING_SEMICOLON,            TidyWarning,     formatStandard          },
+    { MISSING_STARTTAG,             TidyWarning,     formatStandard          },
+    { MISSING_TITLE_ELEMENT,        TidyWarning,     formatStandard          },
+    { MOVED_STYLE_TO_HEAD,          TidyWarning,     formatStandard          },
+    { NESTED_EMPHASIS,              TidyWarning,     formatStandard          },
+    { NESTED_QUOTATION,             TidyWarning,     formatStandard          },
+    { NEWLINE_IN_URI,               TidyWarning,     formatAttributeReport   },
+    { NOFRAMES_CONTENT,             TidyWarning,     formatStandard          },
+    { NON_MATCHING_ENDTAG,          TidyWarning,     formatStandard          },
+    { OBSOLETE_ELEMENT,             TidyWarning,     formatStandard          },
+    { OPTION_REMOVED,               TidyConfig,      formatStandard          },
+    { OPTION_REMOVED_APPLIED,       TidyConfig,      formatStandard          },
+    { OPTION_REMOVED_UNAPPLIED,     TidyConfig,      formatStandard          },
+    { PREVIOUS_LOCATION,            TidyInfo,        formatStandard          },
+    { PROPRIETARY_ATTR_VALUE,       TidyWarning,     formatAttributeReport   },
+    { PROPRIETARY_ATTRIBUTE,        TidyWarning,     formatAttributeReport   },
+    { PROPRIETARY_ELEMENT,          TidyWarning,     formatStandard          },
+    { REMOVED_HTML5,                TidyWarning,     formatStandard          },
+    { REPEATED_ATTRIBUTE,           TidyWarning,     formatAttributeReport   },
+    { REPLACING_ELEMENT,            TidyWarning,     formatStandard          },
+    { REPLACING_UNEX_ELEMENT,       TidyWarning,     formatStandard          },
+    { SPACE_PRECEDING_XMLDECL,      TidyWarning,     formatStandard          },
+    { STRING_ARGUMENT_BAD,          TidyConfig,      formatStandard          },
+    { STRING_CONTENT_LOOKS,         TidyInfo,        formatStandard          }, /* reportMarkupVersion() */
+    { STRING_DOCTYPE_GIVEN,         TidyInfo,        formatStandard          }, /* reportMarkupVersion() */
+    { STRING_MISSING_MALFORMED,     TidyConfig,      formatStandard          },
+    { STRING_MUTING_TYPE,           TidyConfig,      formatStandard          },
+    { STRING_NO_SYSID,              TidyInfo,        formatStandard          }, /* reportMarkupVersion() */
+    { STRING_UNKNOWN_OPTION,        TidyConfig,      formatStandard          },
+    { SUSPECTED_MISSING_QUOTE,      TidyWarning,     formatStandard          },
+    { TAG_NOT_ALLOWED_IN,           TidyWarning,     formatStandard, PREVIOUS_LOCATION },
+    { TOO_MANY_ELEMENTS_IN,         TidyWarning,     formatStandard, PREVIOUS_LOCATION },
+    { TOO_MANY_ELEMENTS,            TidyWarning,     formatStandard          },
+    { TRIM_EMPTY_ELEMENT,           TidyWarning,     formatStandard          },
+    { UNESCAPED_AMPERSAND,          TidyWarning,     formatStandard          },
+    { UNEXPECTED_END_OF_FILE_ATTR,  TidyWarning,     formatAttributeReport   },
+    { UNEXPECTED_END_OF_FILE,       TidyWarning,     formatStandard          },
+    { UNEXPECTED_ENDTAG_IN,         TidyError,       formatStandard          },
+    { UNEXPECTED_ENDTAG,            TidyWarning,     formatStandard          },
+    { UNEXPECTED_ENDTAG_ERR,        TidyError,       formatStandard          },
+    { UNEXPECTED_EQUALSIGN,         TidyWarning,     formatAttributeReport   },
+    { UNEXPECTED_GT,                TidyWarning,     formatAttributeReport   },
+    { UNEXPECTED_QUOTEMARK,         TidyWarning,     formatAttributeReport   },
+    { UNKNOWN_ELEMENT_LOOKS_CUSTOM, TidyError,       formatStandard          },
+    { UNKNOWN_ELEMENT,              TidyError,       formatStandard          },
+    { UNKNOWN_ENTITY,               TidyWarning,     formatStandard          },
+    { USING_BR_INPLACE_OF,          TidyWarning,     formatStandard          },
+    { VENDOR_SPECIFIC_CHARS,        TidyWarning,     formatEncodingReport    },
+    { WHITE_IN_URI,                 TidyWarning,     formatAttributeReport   },
+    { XML_DECLARATION_DETECTED,     TidyWarning,     formatStandard          },
+    { XML_ID_SYNTAX,                TidyWarning,     formatAttributeReport   },
+
+    { APPLET_MISSING_ALT,                            TidyAccess, formatAccessReport },
+    { AREA_MISSING_ALT,                              TidyAccess, formatAccessReport },
+    { ASCII_REQUIRES_DESCRIPTION,                    TidyAccess, formatAccessReport },
+    { ASSOCIATE_LABELS_EXPLICITLY,                   TidyAccess, formatAccessReport },
+    { ASSOCIATE_LABELS_EXPLICITLY_FOR,               TidyAccess, formatAccessReport },
+    { ASSOCIATE_LABELS_EXPLICITLY_ID,                TidyAccess, formatAccessReport },
+    { AUDIO_MISSING_TEXT_AIFF,                       TidyAccess, formatAccessReport },
+    { AUDIO_MISSING_TEXT_AU,                         TidyAccess, formatAccessReport },
+    { AUDIO_MISSING_TEXT_RA,                         TidyAccess, formatAccessReport },
+    { AUDIO_MISSING_TEXT_RM,                         TidyAccess, formatAccessReport },
+    { AUDIO_MISSING_TEXT_SND,                        TidyAccess, formatAccessReport },
+    { AUDIO_MISSING_TEXT_WAV,                        TidyAccess, formatAccessReport },
+    { COLOR_CONTRAST_ACTIVE_LINK,                    TidyAccess, formatAccessReport },
+    { COLOR_CONTRAST_LINK,                           TidyAccess, formatAccessReport },
+    { COLOR_CONTRAST_TEXT,                           TidyAccess, formatAccessReport },
+    { COLOR_CONTRAST_VISITED_LINK,                   TidyAccess, formatAccessReport },
+    { DATA_TABLE_MISSING_HEADERS,                    TidyAccess, formatAccessReport },
+    { DATA_TABLE_MISSING_HEADERS_COLUMN,             TidyAccess, formatAccessReport },
+    { DATA_TABLE_MISSING_HEADERS_ROW,                TidyAccess, formatAccessReport },
+    { DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS,      TidyAccess, formatAccessReport },
+    { DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS,         TidyAccess, formatAccessReport },
+    { DOCTYPE_MISSING,                               TidyAccess, formatAccessReport },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET, TidyAccess, formatAccessReport },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED,  TidyAccess, formatAccessReport },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT, TidyAccess, formatAccessReport },
+    { ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT, TidyAccess, formatAccessReport },
+    { FRAME_MISSING_LONGDESC,                        TidyAccess, formatAccessReport },
+    { FRAME_MISSING_NOFRAMES,                        TidyAccess, formatAccessReport },
+    { FRAME_MISSING_TITLE,                           TidyAccess, formatAccessReport },
+    { FRAME_SRC_INVALID,                             TidyAccess, formatAccessReport },
+    { FRAME_TITLE_INVALID_NULL,                      TidyAccess, formatAccessReport },
+    { FRAME_TITLE_INVALID_SPACES,                    TidyAccess, formatAccessReport },
+    { HEADER_USED_FORMAT_TEXT,                       TidyAccess, formatAccessReport },
+    { HEADERS_IMPROPERLY_NESTED,                     TidyAccess, formatAccessReport },
+    { IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION,     TidyAccess, formatAccessReport },
+    { IMG_ALT_SUSPICIOUS_FILE_SIZE,                  TidyAccess, formatAccessReport },
+    { IMG_ALT_SUSPICIOUS_FILENAME,                   TidyAccess, formatAccessReport },
+    { IMG_ALT_SUSPICIOUS_PLACEHOLDER,                TidyAccess, formatAccessReport },
+    { IMG_ALT_SUSPICIOUS_TOO_LONG,                   TidyAccess, formatAccessReport },
+    { IMG_BUTTON_MISSING_ALT,                        TidyAccess, formatAccessReport },
+    { IMG_MAP_CLIENT_MISSING_TEXT_LINKS,             TidyAccess, formatAccessReport },
+    { IMG_MAP_SERVER_REQUIRES_TEXT_LINKS,            TidyAccess, formatAccessReport },
+    { IMG_MISSING_ALT,                               TidyAccess, formatAccessReport },
+    { IMG_MISSING_DLINK,                             TidyAccess, formatAccessReport },
+    { IMG_MISSING_LONGDESC,                          TidyAccess, formatAccessReport },
+    { IMG_MISSING_LONGDESC_DLINK,                    TidyAccess, formatAccessReport },
+    { INFORMATION_NOT_CONVEYED_APPLET,               TidyAccess, formatAccessReport },
+    { INFORMATION_NOT_CONVEYED_IMAGE,                TidyAccess, formatAccessReport },
+    { INFORMATION_NOT_CONVEYED_INPUT,                TidyAccess, formatAccessReport },
+    { INFORMATION_NOT_CONVEYED_OBJECT,               TidyAccess, formatAccessReport },
+    { INFORMATION_NOT_CONVEYED_SCRIPT,               TidyAccess, formatAccessReport },
+    { LANGUAGE_INVALID,                              TidyAccess, formatAccessReport },
+    { LANGUAGE_NOT_IDENTIFIED,                       TidyAccess, formatAccessReport },
+    { LAYOUT_TABLE_INVALID_MARKUP,                   TidyAccess, formatAccessReport },
+    { LAYOUT_TABLES_LINEARIZE_PROPERLY,              TidyAccess, formatAccessReport },
+    { LINK_TEXT_MISSING,                             TidyAccess, formatAccessReport },
+    { LINK_TEXT_NOT_MEANINGFUL,                      TidyAccess, formatAccessReport },
+    { LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE,           TidyAccess, formatAccessReport },
+    { LINK_TEXT_TOO_LONG,                            TidyAccess, formatAccessReport },
+    { LIST_USAGE_INVALID_LI,                         TidyAccess, formatAccessReport },
+    { LIST_USAGE_INVALID_OL,                         TidyAccess, formatAccessReport },
+    { LIST_USAGE_INVALID_UL,                         TidyAccess, formatAccessReport },
+    { METADATA_MISSING,                              TidyAccess, formatAccessReport },
+    { METADATA_MISSING_REDIRECT_AUTOREFRESH,         TidyAccess, formatAccessReport },
+    { MULTIMEDIA_REQUIRES_TEXT,                      TidyAccess, formatAccessReport },
+    { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             TidyAccess, formatAccessReport },
+    { NEW_WINDOWS_REQUIRE_WARNING_NEW,               TidyAccess, formatAccessReport },
+    { NOFRAMES_INVALID_CONTENT,                      TidyAccess, formatAccessReport },
+    { NOFRAMES_INVALID_LINK,                         TidyAccess, formatAccessReport },
+    { NOFRAMES_INVALID_NO_VALUE,                     TidyAccess, formatAccessReport },
+    { OBJECT_MISSING_ALT,                            TidyAccess, formatAccessReport },
+    { POTENTIAL_HEADER_BOLD,                         TidyAccess, formatAccessReport },
+    { POTENTIAL_HEADER_ITALICS,                      TidyAccess, formatAccessReport },
+    { POTENTIAL_HEADER_UNDERLINE,                    TidyAccess, formatAccessReport },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET,   TidyAccess, formatAccessReport },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED,    TidyAccess, formatAccessReport },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT,   TidyAccess, formatAccessReport },
+    { PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT,   TidyAccess, formatAccessReport },
+    { REMOVE_AUTO_REDIRECT,                          TidyAccess, formatAccessReport },
+    { REMOVE_AUTO_REFRESH,                           TidyAccess, formatAccessReport },
+    { REMOVE_BLINK_MARQUEE,                          TidyAccess, formatAccessReport },
+    { REMOVE_FLICKER_ANIMATED_GIF,                   TidyAccess, formatAccessReport },
+    { REMOVE_FLICKER_APPLET,                         TidyAccess, formatAccessReport },
+    { REMOVE_FLICKER_EMBED,                          TidyAccess, formatAccessReport },
+    { REMOVE_FLICKER_OBJECT,                         TidyAccess, formatAccessReport },
+    { REMOVE_FLICKER_SCRIPT,                         TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_APPLET,                TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_BASEFONT,              TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_CENTER,                TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_DIR,                   TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_FONT,                  TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_ISINDEX,               TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_MENU,                  TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_S,                     TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_STRIKE,                TidyAccess, formatAccessReport },
+    { REPLACE_DEPRECATED_HTML_U,                     TidyAccess, formatAccessReport },
+    { SCRIPT_MISSING_NOSCRIPT,                       TidyAccess, formatAccessReport },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK,       TidyAccess, formatAccessReport },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN,  TidyAccess, formatAccessReport },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  TidyAccess, formatAccessReport },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT,   TidyAccess, formatAccessReport },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER,  TidyAccess, formatAccessReport },
+    { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP,    TidyAccess, formatAccessReport },
+    { SKIPOVER_ASCII_ART,                            TidyAccess, formatAccessReport },
+    { STYLE_SHEET_CONTROL_PRESENTATION,              TidyAccess, formatAccessReport },
+    { STYLESHEETS_REQUIRE_TESTING_LINK,              TidyAccess, formatAccessReport },
+    { STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR,        TidyAccess, formatAccessReport },
+    { STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT,     TidyAccess, formatAccessReport },
+    { TABLE_MAY_REQUIRE_HEADER_ABBR,                 TidyAccess, formatAccessReport },
+    { TABLE_MAY_REQUIRE_HEADER_ABBR_NULL,            TidyAccess, formatAccessReport },
+    { TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES,          TidyAccess, formatAccessReport },
+    { TABLE_MISSING_CAPTION,                         TidyAccess, formatAccessReport },
+    { TABLE_MISSING_SUMMARY,                         TidyAccess, formatAccessReport },
+    { TABLE_SUMMARY_INVALID_NULL,                    TidyAccess, formatAccessReport },
+    { TABLE_SUMMARY_INVALID_PLACEHOLDER,             TidyAccess, formatAccessReport },
+    { TABLE_SUMMARY_INVALID_SPACES,                  TidyAccess, formatAccessReport },
+    { TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET,      TidyAccess, formatAccessReport },
+    { TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT,      TidyAccess, formatAccessReport },
+    { TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT,      TidyAccess, formatAccessReport },
+
+    { 0, 0, NULL }
+};
+
+
+/*********************************************************************
+ * Message Formatting
+ * These individual message formatters populate messages with the
+ * correct, pertinent data.
+ *********************************************************************/
+
+
+/* Provides formatting for the Attribute-related reports. This formatter
+** should be reserved for messages generated by Tidy's accessibility module,
+** even if the signature matches some unrelated report that you wish to
+** generate.
+*/
+TidyMessageImpl *formatAccessReport(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args)
 {
-    TidyMessageImpl *message = NULL;
-    Node* rpt = ( element ? element : node );
-    char nodedesc[256] = { 0 };
-    char elemdesc[256] = { 0 };
-    ctmbstr tagtype;
-    
-    TagToString(node, nodedesc, sizeof(nodedesc));
+    doc->badAccess |= BA_WAI;
 
+    /* Currently *all* cases are handled in the default, but maintain this
+       structure for possible future cases. */
     switch (code)
     {
-        case TRIM_EMPTY_ELEMENT:
-            TagToString(element, elemdesc, sizeof(nodedesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc );
-            break;
+        default:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level );
+    }
 
-        case REPLACING_ELEMENT:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
-            break;
+    return NULL;
+}
 
-        case CUSTOM_TAG_DETECTED:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            
-            switch ( cfg( doc, TidyUseCustomTags ) )
-            {
-                case TidyCustomBlocklevel:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMBLOCKLEVEL_STRING );
-                    break;
-                case TidyCustomEmpty:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMEMPTY_STRING );
-                    break;
-                case TidyCustomInline:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMINLINE_STRING );
-                    break;
-                case TidyCustomPre:
-                default:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMPRE_STRING );
-                    break;
-            }
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype );
-            break;
+/* Provides formatting for the Attribute-related reports. This formatter
+** provides local variables that are used principally in the formats used for
+** the attribute related reports.
+*/
+TidyMessageImpl *formatAttributeReport(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args)
+{
+    AttVal *av = NULL;
+    char const *name = "NULL";
+    char const *value = "NULL";
+    char tagdesc[64];
+
+    TagToString(node, tagdesc, sizeof(tagdesc));
+
+    if ( ( av = va_arg(args, AttVal*) ) )
+    {
+        if (av->attribute)
+            name = av->attribute;
+        if (av->value)
+            value = av->value;
+    }
+
+    switch (code)
+    {
+        case MISSING_QUOTEMARK_OPEN:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, name );
+		
+        case BACKSLASH_IN_URI:
+        case ESCAPED_ILLEGAL_URI:
+        case FIXED_BACKSLASH:
+        case ID_NAME_MISMATCH:
+        case ILLEGAL_URI_CODEPOINT:
+        case ILLEGAL_URI_REFERENCE:
+        case INVALID_XML_ID:
+        case MISSING_IMAGEMAP:
+        case MISSING_QUOTEMARK:
+        case NEWLINE_IN_URI:
+        case UNEXPECTED_EQUALSIGN:
+        case UNEXPECTED_GT:
+        case UNEXPECTED_QUOTEMARK:
+        case WHITE_IN_URI:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, tagdesc );
+
+        case ATTRIBUTE_IS_NOT_ALLOWED:
+        case JOINING_ATTRIBUTE:
+        case MISSING_ATTR_VALUE:
+        case PROPRIETARY_ATTRIBUTE:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, tagdesc, name );
+
+        case ATTRIBUTE_VALUE_REPLACED:
+        case BAD_ATTRIBUTE_VALUE:
+        case BAD_ATTRIBUTE_VALUE_REPLACED:
+        case INSERTING_AUTO_ATTRIBUTE:
+        case INVALID_ATTRIBUTE:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, tagdesc, name, value );
+
+        case MISMATCHED_ATTRIBUTE_ERROR:
+        case MISMATCHED_ATTRIBUTE_WARN:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, tagdesc, name, HTMLVersion(doc));
+
+        case ANCHOR_NOT_UNIQUE:
+        case ATTR_VALUE_NOT_LCASE:
+        case PROPRIETARY_ATTR_VALUE:
+        case XML_ID_SYNTAX:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, tagdesc, value );
+
+        case REPEATED_ATTRIBUTE:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, tagdesc, value, name );
+
+        case UNEXPECTED_END_OF_FILE_ATTR:
+            /* on end of file adjust reported position to end of input */
+            doc->lexer->lines   = doc->docIn->curline;
+            doc->lexer->columns = doc->docIn->curcol;
+            return TY_(tidyMessageCreateWithLexer)(doc, code, level, tagdesc );
     }
 
-    messageOut( message );
+    return NULL;
 }
 
 
-void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+/* Provides report formatting *and* additional status settings for Tidy's
+** encoding reports. Provides the local variables typically used for this type
+** of report.
+** @todo: These status changes probably SHOULD be made in the calling code;
+**   however these states are captured to generate future output, which may be
+**   useful here in the long run.
+*/
+TidyMessageImpl *formatEncodingReport(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args)
 {
-    TidyMessageImpl *message = NULL;
-    Node* rpt = (element ? element : node);
-    char nodedesc[256] = { 0 };
-    char elemdesc[256] = { 0 };
-
-    TagToString(node, nodedesc, sizeof(nodedesc));
+    char buf[ 32 ] = {'\0'};
+    uint c = va_arg( args, uint );
+    Bool discarded = va_arg( args, Bool );
+    ctmbstr action = tidyLocalizedString(discarded ? STRING_DISCARDING : STRING_REPLACING);
 
     switch (code)
     {
-        case NESTED_QUOTATION:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
+        case INVALID_NCR:
+            NtoS(c, buf);
+            doc->badChars |= BC_INVALID_NCR;
             break;
 
-        case OBSOLETE_ELEMENT:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
+        case INVALID_SGML_CHARS:
+            NtoS(c, buf);
+            doc->badChars |= BC_INVALID_SGML_CHARS;
             break;
 
-        case NESTED_EMPHASIS:
-        case REMOVED_HTML5:
-        case BAD_SUMMARY_HTML5:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, nodedesc );
+        case INVALID_UTF8:
+            TY_(tmbsnprintf)(buf, sizeof(buf), "U+%04X", c);
+            doc->badChars |= BC_INVALID_UTF8;
             break;
-        case COERCE_TO_ENDTAG_WARN:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
+
+        case INVALID_UTF16:
+            TY_(tmbsnprintf)(buf, sizeof(buf), "U+%04X", c);
+            doc->badChars |= BC_INVALID_UTF16;
             break;
-        case XML_DECLARATION_DETECTED:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
+
+        case VENDOR_SPECIFIC_CHARS:
+            NtoS(c, buf);
+            doc->badChars |= BC_VENDOR_SPECIFIC_CHARS;
+            break;
+
+        case ENCODING_MISMATCH:
+            doc->badChars |= BC_ENCODING_MISMATCH;
+            return TY_(tidyMessageCreateWithLexer)(doc,
+                                                   code,
+                                                   level,
+                                                   TY_(CharEncodingName)(doc->docIn->encoding),
+                                                   TY_(CharEncodingName)(c));
             break;
     }
 
-    messageOut( message );
+    return TY_(tidyMessageCreateWithLexer)(doc, code, level, action, buf );
+
 }
 
 
-void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+/* Provides general formatting for the majority of Tidy's reports. Because most
+** reports use the same basic data derived from the element and node, this
+** formatter covers the vast majority of Tidy's report messages. Note that this
+** formatter guarantees the values of TidyReportLevel in the dispatchTable[].
+** Some of the cases in this formatter start new contexts from the va_list
+** when the required data is simple. For complex local variable needs, it may
+** be preferred to write a new formatter.
+*/
+TidyMessageImpl *formatStandard(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args)
 {
-    TidyMessageImpl *message = NULL;
-    TidyMessageImpl *message2 = NULL; /* extra, when TidyShowWarnings */
     char nodedesc[ 256 ] = {0};
     char elemdesc[ 256 ] = {0};
     Node* rpt = ( element ? element : node );
-    uint versionEmitted, declared, version;
-    ctmbstr extra_string = NULL;
 
     TagToString(node, nodedesc, sizeof(nodedesc));
 
+    if ( element )
+        TagToString(element, elemdesc, sizeof(elemdesc));
+
     switch ( code )
     {
-        case MISSING_STARTTAG:
-        case UNEXPECTED_ENDTAG:
-        case TOO_MANY_ELEMENTS:
-        case INSERTING_TAG:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element );
-            break;
+        case CUSTOM_TAG_DETECTED:
+        {
+            ctmbstr tagtype;
+            switch ( cfg( doc, TidyUseCustomTags ) )
+            {
+                case TidyCustomBlocklevel:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMBLOCKLEVEL_STRING );
+                    break;
+                case TidyCustomEmpty:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMEMPTY_STRING );
+                    break;
+                case TidyCustomInline:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMINLINE_STRING );
+                    break;
+                case TidyCustomPre:
+                default:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMPRE_STRING );
+                    break;
+            }
+            return TY_(tidyMessageCreateWithNode)(doc, element, code, level, elemdesc, tagtype );
+        }
+
+        case STRING_NO_SYSID:
+            return TY_(tidyMessageCreate)( doc, code, level );
+            
+        case FILE_CANT_OPEN:
+        case FILE_CANT_OPEN_CFG:
+        case FILE_NOT_FILE:
+        case STRING_CONTENT_LOOKS:
+        case STRING_DOCTYPE_GIVEN:
+        case STRING_MISSING_MALFORMED:
+        case STRING_MUTING_TYPE:
+        {
+            ctmbstr str;
+            if ( (str = va_arg( args, ctmbstr)) )
+                return TY_(tidyMessageCreate)( doc, code, level, str );
+
+        } break;
+
+        case APOS_UNDEFINED:
+        case MISSING_SEMICOLON_NCR:
+        case MISSING_SEMICOLON:
+        case UNESCAPED_AMPERSAND:
+        case UNKNOWN_ENTITY:
+        {
+            ctmbstr entityname;
+            if ( !(entityname = va_arg( args, ctmbstr)) )
+            {
+                entityname = "NULL";
+            }
+            return TY_(tidyMessageCreateWithLexer)(doc, code, level, entityname);
+        }
+
+        case MISSING_ATTRIBUTE:
+        {
+            ctmbstr name;
+            if ( (name = va_arg( args, ctmbstr)) )
+                return TY_(tidyMessageCreateWithNode)(doc, node, code, level, nodedesc, name );
+        } break;
+
+        case STRING_UNKNOWN_OPTION:
+        case OPTION_REMOVED:
+        {
+            ctmbstr str;
+            if ( (str = va_arg( args, ctmbstr)) )
+                return TY_(tidyMessageCreateWithLexer)(doc, code, level, str);
+        } break;
+
+        case OPTION_REMOVED_UNAPPLIED:
+        case STRING_ARGUMENT_BAD:
+        {
+            ctmbstr s1 = va_arg( args, ctmbstr );
+            ctmbstr s2 = va_arg( args, ctmbstr );
+            return TY_(tidyMessageCreateWithLexer)(doc, code, level, s1, s2);
+        }
+
+        case OPTION_REMOVED_APPLIED:
+        {
+            ctmbstr s1 = va_arg( args, ctmbstr );
+            ctmbstr s2 = va_arg( args, ctmbstr );
+            ctmbstr s3 = va_arg( args, ctmbstr );
+            return TY_(tidyMessageCreateWithLexer)(doc, code, level, s1, s2, s3);
+        }
+
+
+        case BAD_SURROGATE_LEAD:
+        case BAD_SURROGATE_PAIR:
+        case BAD_SURROGATE_TAIL:
+        {
+            uint c1 = va_arg( args, uint );
+            uint c2 = va_arg( args, uint );
+            return TY_(tidyMessageCreateWithLexer)(doc, code, level, c1, c2);
+        }
+
+        case SPACE_PRECEDING_XMLDECL:
+            /* @TODO: Should this be a TidyInfo "silent" fix? */
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level );
 
-        case USING_BR_INPLACE_OF:
         case CANT_BE_NESTED:
-        case PROPRIETARY_ELEMENT:
-        case UNESCAPED_ELEMENT:
         case NOFRAMES_CONTENT:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc );
-            break;
-
-        case ELEMENT_VERS_MISMATCH_WARN:
-            versionEmitted = doc->lexer->versionEmitted;
-            declared = doc->lexer->doctype;
-            version = versionEmitted == 0 ? declared : versionEmitted;
-            extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
-            if (!extra_string)
-                extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string );
-            break;
+        case USING_BR_INPLACE_OF:
+            /* Can we use `rpt` here? No; `element` has a value in every case. */
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, nodedesc );
 
         case ELEMENT_VERS_MISMATCH_ERROR:
-            versionEmitted = doc->lexer->versionEmitted;
-            declared = doc->lexer->doctype;
-            version = versionEmitted == 0 ? declared : versionEmitted;
-            extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
-            if (!extra_string)
-                extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc, extra_string );
-            break;
+        case ELEMENT_VERS_MISMATCH_WARN:
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, nodedesc, HTMLVersion(doc) );
 
-        case MISSING_TITLE_ELEMENT:
-        case INCONSISTENT_VERSION:
-        case MALFORMED_DOCTYPE:
-        case CONTENT_AFTER_BODY:
-        case MALFORMED_COMMENT:
-        case BAD_COMMENT_CHARS:
-        case BAD_XML_COMMENT:
-        case BAD_CDATA_CONTENT:
-        case INCONSISTENT_NAMESPACE:
-        case DOCTYPE_AFTER_TAGS:
-        case DTYPE_NOT_UPPER_CASE:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
-            break;
+        case TAG_NOT_ALLOWED_IN:
+            /* Can we use `rpt` here? No; `element` has a value in every case. */
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, nodedesc, element->element );
 
-        case COERCE_TO_ENDTAG:
-        case NON_MATCHING_ENDTAG:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
-            break;
+        case INSERTING_TAG:
+        case MISSING_STARTTAG:
+        case TOO_MANY_ELEMENTS:
+        case UNEXPECTED_ENDTAG:
+        case UNEXPECTED_ENDTAG_ERR:  /* generated by XML docs */
+            /* Can we use `rpt` here? No; `element` has a value in every case. */
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, node->element );
 
         case UNEXPECTED_ENDTAG_IN:
-        case TOO_MANY_ELEMENTS_IN:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element, node->element );
-            message2 = TY_(tidyMessageCreateWithNode)(doc, node, PREVIOUS_LOCATION, TidyInfo, element->element );
-            break;
+            /* Can we use `rpt` here? No; `element` has a value in every case. */
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, level, node->element, element->element );
 
-        case ENCODING_IO_CONFLICT:
+        case BAD_CDATA_CONTENT:
+        case CONTENT_AFTER_BODY:
+        case DOCTYPE_AFTER_TAGS:
+        case DUPLICATE_FRAMESET:
+        case MALFORMED_COMMENT:
+        case MALFORMED_COMMENT_DROPPING:
+        case MALFORMED_COMMENT_EOS:
+        case MALFORMED_COMMENT_WARN:
+        case MALFORMED_DOCTYPE:
         case MISSING_DOCTYPE:
-        case SPACE_PRECEDING_XMLDECL:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
-            break;
+        case MISSING_TITLE_ELEMENT:
+        case NESTED_QUOTATION:
+        case SUSPECTED_MISSING_QUOTE:
+        case XML_DECLARATION_DETECTED:
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level );
 
-        case TRIM_EMPTY_ELEMENT:
+        case ELEMENT_NOT_EMPTY:
+        case FOUND_STYLE_IN_BODY:
         case ILLEGAL_NESTING:
+        case MOVED_STYLE_TO_HEAD:
+        case TRIM_EMPTY_ELEMENT:
         case UNEXPECTED_END_OF_FILE:
-        case ELEMENT_NOT_EMPTY:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc );
-            break;
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, elemdesc );
+
+        case OBSOLETE_ELEMENT:
+        case REPLACING_ELEMENT:
+        case REPLACING_UNEX_ELEMENT:
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, elemdesc, nodedesc );
 
+        case ADDED_MISSING_CHARSET:
+        case BAD_SUMMARY_HTML5:
+        case NESTED_EMPHASIS:
+        case PROPRIETARY_ELEMENT:
+        case REMOVED_HTML5:
+        case UNKNOWN_ELEMENT:
+        case UNKNOWN_ELEMENT_LOOKS_CUSTOM:
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, nodedesc );
 
         case MISSING_ENDTAG_FOR:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element );
-            break;
+        case MISSING_ENDTAG_OPTIONAL:
+        case PREVIOUS_LOCATION:
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, element->element );
 
         case MISSING_ENDTAG_BEFORE:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element, nodedesc );
-            break;
-
-        case DISCARDING_UNEXPECTED:
-            /* Force error if in a bad form, or
-             Issue #166 - repeated <main> element
-             */
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, doc->badForm ? TidyError : TidyWarning, nodedesc );
-            break;
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, element->element, nodedesc );
 
-        case TAG_NOT_ALLOWED_IN:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, element->element );
-            message2 = TY_(tidyMessageCreateWithNode)(doc, element, PREVIOUS_LOCATION, TidyInfo, element->element );
-            break;
-            
-        case REPLACING_UNEX_ELEMENT:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
-            break;
-        case REMOVED_HTML5:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyError, nodedesc );
-            break;
+        case COERCE_TO_ENDTAG:
+        case NON_MATCHING_ENDTAG:
+        case TOO_MANY_ELEMENTS_IN:
+            return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, node->element, node->element );
     }
 
-    messageOut( message );
-
-    /* Although the callback is always executed for message2, it's only
-       added to the output sink TidyShowWarnings is enabled. */
-    if (cfgBool( doc, TidyShowWarnings ))
-        messageOut( message2 );
+    return NULL;
 }
 
 
-void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
+/* Provides general formatting as formatStandard, except TidyReportLevel is set
+** dynamically for these items as it cannot be predicted except at runtime.
+ */
+TidyMessageImpl *formatStandardDynamic(TidyDocImpl* doc, Node *element, Node *node, uint code, uint level, va_list args)
 {
-    TidyMessageImpl *message = NULL;
     char nodedesc[ 256 ] = {0};
-    Node* rpt = ( element ? element : node );
 
-    switch ( code )
-    {
-        case SUSPECTED_MISSING_QUOTE:
-        case DUPLICATE_FRAMESET:
-            message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyError );
-            break;
-
-        case UNKNOWN_ELEMENT:
-        case UNKNOWN_ELEMENT_LOOKS_CUSTOM:
-            TagToString(node, nodedesc, sizeof(nodedesc));
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc );
-            break;
-
-        case UNEXPECTED_ENDTAG_IN:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, node->element, element->element );
-            break;
+    TagToString(node, nodedesc, sizeof(nodedesc));
 
-        case UNEXPECTED_ENDTAG:  /* generated by XML docs */
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, node->element );
+    switch (code)
+    {
+        case DISCARDING_UNEXPECTED:
+            /* Force error if in a bad form, or Issue #166 - repeated <main> element. */
+            /* Can we use `rpt` here? No; `element` has a value in every case. */
+            return TY_(tidyMessageCreateWithNode)(doc, node, code, doc->badForm ? TidyError : TidyWarning, nodedesc );
             break;
     }
 
-    messageOut( message );
+    return NULL;
 }
 
 
 /*********************************************************************
- * High Level Message Writing Functions - Specific
+ * High Level Message Writing Functions
  * When adding new reports to LibTidy, preference should be given
  * to one of the existing, general pupose message writing functions
  * above, if possible, otherwise try to use one of these, or as a
@@ -460,283 +890,276 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
  *********************************************************************/
 
 
-void TY_(FileError)( TidyDocImpl* doc, ctmbstr file, TidyReportLevel level, uint code )
-{
-    TidyMessageImpl *message = TY_(tidyMessageCreate)( doc, code, level, file);
-    messageOut( message );
-}
-
-
-void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
+/* This function performs the heavy lifting for TY_(Report)(). Critically we
+** can accept the va_list needed for recursion.
+*/
+static void vReport(TidyDocImpl* doc, Node *element, Node *node, uint code, va_list args)
 {
-    TidyMessageImpl *message = NULL;
-    char const *name = "NULL", *value = "NULL";
-    char tagdesc[64];
-    uint version;
-    ctmbstr extra_string;
-
-    TagToString(node, tagdesc, sizeof(tagdesc));
+    int i = 0;
+    va_list args_copy;
 
-    if (av)
+    while ( dispatchTable[i].code != 0 )
     {
-        if (av->attribute)
-            name = av->attribute;
-        if (av->value)
-            value = av->value;
-    }
-
-    switch (code)
-    {
-        case MISSING_ATTR_VALUE:
-        case XML_ATTRIBUTE_VALUE:
-        case PROPRIETARY_ATTRIBUTE:
-        case JOINING_ATTRIBUTE:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name );
-            break;
-
-        case ATTRIBUTE_IS_NOT_ALLOWED:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name );
-            break;
-
-        case MISMATCHED_ATTRIBUTE_WARN:
-            version = doc->lexer->versionEmitted == 0 ? doc->lexer->doctype : doc->lexer->versionEmitted;
-            extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
-            if (!extra_string)
-                extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name, extra_string );
-            break;
-
-        case MISMATCHED_ATTRIBUTE_ERROR:
-            version = doc->lexer->versionEmitted == 0 ? doc->lexer->doctype : doc->lexer->versionEmitted;
-            extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
-            if (!extra_string)
-                extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, tagdesc, name, extra_string );
-            break;
-
-        case BAD_ATTRIBUTE_VALUE:
-        case BAD_ATTRIBUTE_VALUE_REPLACED:
-        case INVALID_ATTRIBUTE:
-        case INSERTING_AUTO_ATTRIBUTE:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name, value );
-            break;
-
-        case UNEXPECTED_QUOTEMARK:
-        case MISSING_QUOTEMARK:
-        case ID_NAME_MISMATCH:
-        case BACKSLASH_IN_URI:
-        case FIXED_BACKSLASH:
-        case ILLEGAL_URI_CODEPOINT:
-        case ILLEGAL_URI_REFERENCE:
-        case ESCAPED_ILLEGAL_URI:
-        case NEWLINE_IN_URI:
-        case WHITE_IN_URI:
-        case UNEXPECTED_GT:
-        case INVALID_XML_ID:
-        case UNEXPECTED_EQUALSIGN:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc );
-            break;
-
-        case XML_ID_SYNTAX:
-        case PROPRIETARY_ATTR_VALUE:
-        case ANCHOR_NOT_UNIQUE:
-        case ATTR_VALUE_NOT_LCASE:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, value );
-            break;
+        if ( dispatchTable[i].code == code )
+        {
+            TidyMessageImpl *message;
+            messageFormatter *handler = dispatchTable[i].handler;
+            TidyReportLevel level = dispatchTable[i].level;
 
+            va_copy(args_copy, args);
+            message = handler( doc, element, node, code, level, args_copy );
+            va_end(args_copy);
 
-        case MISSING_IMAGEMAP:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc );
-            doc->badAccess |= BA_MISSING_IMAGE_MAP; /* @todo: why is this here instead of calling function? */
-            break;
+            messageOut( message );
 
-        case REPEATED_ATTRIBUTE:
-            message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, value, name );
-            break;
-            
-        case UNEXPECTED_END_OF_FILE_ATTR:
-            /* on end of file adjust reported position to end of input */
-            doc->lexer->lines   = doc->docIn->curline;
-            doc->lexer->columns = doc->docIn->curcol;
-            message = TY_(tidyMessageCreateWithLexer)(doc, code, TidyWarning, tagdesc );
+            if ( dispatchTable[i].next )
+            {
+                va_copy(args_copy, args);
+                vReport(doc, element, node, dispatchTable[i].next, args_copy);
+                va_end(args_copy);
+            }
             break;
+        }
+        i++;
     }
-
-    messageOut( message );
 }
 
 
-/* lexer is not defined when this is called */
-void TY_(ReportBadArgument)( TidyDocImpl* doc, ctmbstr option )
+/* This single Report output function uses the correct formatter with all
+** possible, relevant data that can be reported. The only real drawbacks are
+** having to pass NULL when some of the values aren't used, and the lack of
+** type safety by using the variable arguments. To counter this some convenience
+** report output functions exist, too. Any new reports you wish to create must
+** be able to use this function signature, although convenience functions should
+** be added to abstract the full fuction signature and to preserve type safety.
+*/
+void TY_(Report)(TidyDocImpl* doc, Node *element, Node *node, uint code, ...)
 {
-    TidyMessageImpl *message;
-    assert( option != NULL );
-    message = TY_(tidyMessageCreate)( doc, STRING_MISSING_MALFORMED, TidyConfig, option );
-    messageOut( message );
+    va_list args;
+    va_start(args, code);
+    vReport(doc, element, node, code, args);
+    va_end(args);
 }
 
 
-void TY_(ReportEncodingError)(TidyDocImpl* doc, uint code, uint c, Bool discarded)
+/*********************************************************************
+ * Convenience Reporting Functions
+ * Functions that don't require the full signature of TY_(Report),
+ * and help protect type safety by avoiding variable arguments in the
+ * rest of Tidy's code.
+ *********************************************************************/
+
+void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code )
 {
-    TidyMessageImpl *message = NULL;
-    char buf[ 32 ] = {'\0'};
-    ctmbstr action = tidyLocalizedString(discarded ? STRING_DISCARDING : STRING_REPLACING);
+    TY_(Report)( doc, NULL, node, code );
+}
 
-    /* An encoding mismatch is currently treated as a non-fatal error */
-    switch (code)
-    {
-        case VENDOR_SPECIFIC_CHARS:
-            NtoS(c, buf);
-            doc->badChars |= BC_VENDOR_SPECIFIC_CHARS;
-            break;
 
-        case INVALID_SGML_CHARS:
-            NtoS(c, buf);
-            doc->badChars |= BC_INVALID_SGML_CHARS;
-            break;
+void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
+{
+    TY_(Report)( doc, NULL, node, code, av );
+}
 
-        case INVALID_UTF8:
-            TY_(tmbsnprintf)(buf, sizeof(buf), "U+%04X", c);
-            doc->badChars |= BC_INVALID_UTF8;
-            break;
 
-#if SUPPORT_UTF16_ENCODINGS
-        case INVALID_UTF16:
-            TY_(tmbsnprintf)(buf, sizeof(buf), "U+%04X", c);
-            doc->badChars |= BC_INVALID_UTF16;
-            break;
-#endif
+void TY_(ReportBadArgument)( TidyDocImpl* doc, ctmbstr option )
+{
+    assert( option != NULL );
+    TY_(Report)( doc, NULL, NULL, STRING_MISSING_MALFORMED, option );
+}
 
-        case INVALID_NCR:
-            NtoS(c, buf);
-            doc->badChars |= BC_INVALID_NCR;
-            break;
-    }
 
-    message = TY_(tidyMessageCreateWithLexer)(doc, code, TidyWarning, action, buf );
-    messageOut( message );
+void TY_(ReportEntityError)( TidyDocImpl* doc, uint code, ctmbstr entity, int ARG_UNUSED(c) )
+{
+    /* Note that the report formatter currently doesn't use argument c */
+    TY_(Report)( doc, NULL, NULL, code, entity, c );
 }
 
 
-void TY_(ReportEncodingWarning)(TidyDocImpl* doc, uint code, uint encoding)
+void TY_(ReportFileError)( TidyDocImpl* doc, ctmbstr file, uint code )
 {
-    TidyMessageImpl *message = NULL;
-    switch(code)
-    {
-        case ENCODING_MISMATCH:
-            message = TY_(tidyMessageCreateWithLexer)(doc,
-                                                      code,
-                                                      TidyWarning,
-                                                      TY_(CharEncodingName)(doc->docIn->encoding),
-                                                      TY_(CharEncodingName)(encoding));
-            doc->badChars |= BC_ENCODING_MISMATCH; /* @todo: why not in calling function? */
-            break;
-    }
-
-    messageOut( message );
+    TY_(Report)( doc, NULL, NULL, code, file );
 }
 
 
-void TY_(ReportEntityError)( TidyDocImpl* doc, uint code, ctmbstr entity,
-                             int ARG_UNUSED(c) )
+void TY_(ReportEncodingError)(TidyDocImpl* doc, uint code, uint c, Bool discarded)
 {
-    TidyMessageImpl *message = NULL;
-    ctmbstr entityname = ( entity ? entity : "NULL" );
-
-    message = TY_(tidyMessageCreateWithLexer)(doc, code, TidyWarning, entityname);
-    messageOut( message );
+    TY_(Report)( doc, NULL, NULL, code, c, discarded );
 }
 
-
-void TY_(ReportMarkupVersion)( TidyDocImpl* doc )
+void TY_(ReportEncodingWarning)(TidyDocImpl* doc, uint code, uint encoding)
 {
-    TidyMessageImpl *message = NULL;
-    
-    if ( doc->givenDoctype )
-    {
-        /* @todo: deal with non-ASCII characters in FPI */
-        message = TY_(tidyMessageCreate)( doc, STRING_DOCTYPE_GIVEN, TidyInfo, doc->givenDoctype );
-        messageOut(message);
-    }
-    
-    if ( ! cfgBool(doc, TidyXmlTags) )
-    {
-        Bool isXhtml = doc->lexer->isvoyager;
-        uint apparentVers;
-        ctmbstr vers;
-        
-        apparentVers = TY_(ApparentVersion)( doc );
-        
-        vers = TY_(HTMLVersionNameFromCode)( apparentVers, isXhtml );
-        
-        if ( !vers )
-        {
-            vers = tidyLocalizedString(STRING_HTML_PROPRIETARY);
-        }
-        
-        message = TY_(tidyMessageCreate)( doc, STRING_CONTENT_LOOKS, TidyInfo, vers );
-        messageOut(message);
-        
-        /* Warn about missing sytem identifier (SI) in emitted doctype */
-        if ( TY_(WarnMissingSIInEmittedDocType)( doc ) )
-        {
-            message = TY_(tidyMessageCreate)( doc, STRING_NO_SYSID, TidyInfo);
-            messageOut(message);
-        }
-    }
+    /* va_list in formatter expects trailing `no` argument */
+    TY_(Report)( doc, NULL, NULL, code, encoding, no );
 }
 
 
 void TY_(ReportMissingAttr)( TidyDocImpl* doc, Node* node, ctmbstr name )
 {
-    TidyMessageImpl *message = NULL;
-    char tagdesc[ 64 ];
-
-    TagToString(node, tagdesc, sizeof(tagdesc));
-    message = TY_(tidyMessageCreateWithNode)(doc, node, MISSING_ATTRIBUTE, TidyWarning, tagdesc, name );
-    messageOut(message);
+    TY_(Report)( doc, NULL, node, MISSING_ATTRIBUTE, name );
 }
 
 
 void TY_(ReportSurrogateError)(TidyDocImpl* doc, uint code, uint c1, uint c2)
 {
-    TidyMessageImpl *message = NULL;
-    message = TY_(tidyMessageCreateWithLexer)(doc, code, TidyWarning, c1, c2);
-    messageOut(message);
+    TY_(Report)( doc, NULL, NULL, code, c1,c2 );
 }
 
 
-/* lexer is not defined when this is called */
 void TY_(ReportUnknownOption)( TidyDocImpl* doc, ctmbstr option )
 {
-    TidyMessageImpl *message = NULL;
-    assert( option != NULL );
-    message = TY_(tidyMessageCreateWithLexer)(doc, STRING_UNKNOWN_OPTION, TidyConfig, option);
-    messageOut(message);
+    /* lexer is not defined when this is called */
+    TY_(Report)( doc, NULL, NULL, STRING_UNKNOWN_OPTION, option );
 }
 
 
 /*********************************************************************
- * Output Dialogue Information
- * In addition to reports that are added to the table, Tidy emits
- * various dialogue type information. Most of these are specific to
- * exact circumstances, although `TY_(DialogueMessage)` should be
- * used instead of adding a new function, if possible.
+ * Dialogue Output Functions
+ * As for issuing reports, Tidy manages all dialogue output from a
+ * single source in order to manage message categories in a simple
+ * an consistent manner.
  *********************************************************************/
 
 
-void TY_(DialogueMessage)( TidyDocImpl* doc, uint code, TidyReportLevel level )
+/* This structure ties together for each dialogue Code the default
+** TidyReportLevel. This it makes it simple to output new dialogue
+** messages, or to change report level by modifying this array.
+*/
+static struct _dialogueDispatchTable {
+    uint code;                 /**< The message code. */
+    TidyReportLevel level;     /**< The default TidyReportLevel of the message. */
+} dialogueDispatchTable[] = {
+    { STRING_HELLO_ACCESS,         TidyDialogueInfo     }, /* AccessibilityChecks() */
+    { TEXT_GENERAL_INFO,           TidyDialogueInfo     }, /* tidyGeneralInfo() */
+    { TEXT_GENERAL_INFO_PLEA,      TidyDialogueInfo     }, /* tidyGeneralInfo() */
+    
+    { STRING_NEEDS_INTERVENTION,   TidyDialogueSummary  }, /* tidyDocRunDiagnostics() */
+    { STRING_ERROR_COUNT,          TidyDialogueSummary  }, /* ReportNumWarnings() */
+    { STRING_NO_ERRORS,            TidyDialogueSummary  }, /* ReportNumWarnings() */
+    { STRING_NOT_ALL_SHOWN,        TidyDialogueSummary  }, /* ReportNumWarnings() */
+    
+    { FOOTNOTE_TRIM_EMPTY_ELEMENT, TidyDialogueFootnote },
+    { TEXT_ACCESS_ADVICE1,         TidyDialogueFootnote }, /* errorSummary() */
+    { TEXT_ACCESS_ADVICE2,         TidyDialogueFootnote },
+    { TEXT_BAD_FORM,               TidyDialogueFootnote },
+    { TEXT_BAD_MAIN,               TidyDialogueFootnote },
+    { TEXT_HTML_T_ALGORITHM,       TidyDialogueFootnote },
+    { TEXT_INVALID_URI,            TidyDialogueFootnote },
+    { TEXT_INVALID_UTF8,           TidyDialogueFootnote },
+    { TEXT_INVALID_UTF16,          TidyDialogueFootnote },
+    { TEXT_M_IMAGE_ALT,            TidyDialogueFootnote },
+    { TEXT_M_IMAGE_MAP,            TidyDialogueFootnote },
+    { TEXT_M_LINK_ALT,             TidyDialogueFootnote },
+    { TEXT_M_SUMMARY,              TidyDialogueFootnote },
+    { TEXT_SGML_CHARS,             TidyDialogueFootnote },
+    { TEXT_USING_BODY,             TidyDialogueFootnote },
+    { TEXT_USING_FONT,             TidyDialogueFootnote },
+    { TEXT_USING_FRAMES,           TidyDialogueFootnote },
+    { TEXT_USING_LAYER,            TidyDialogueFootnote },
+    { TEXT_USING_NOBR,             TidyDialogueFootnote },
+    { TEXT_USING_SPACER,           TidyDialogueFootnote },
+    { TEXT_VENDOR_CHARS,           TidyDialogueFootnote },
+    
+    { 0, 0 }
+};
+
+
+/* This message formatter for dialogue messages should be capable of formatting
+** every message, because they're not all the complex and there aren't that
+** many.
+*/
+TidyMessageImpl *formatDialogue( TidyDocImpl* doc, uint code, TidyReportLevel level, va_list args )
+{
+    switch (code)
+    {
+        case TEXT_SGML_CHARS:
+        case TEXT_VENDOR_CHARS:
+        {
+            ctmbstr str = va_arg(args, ctmbstr);
+            return TY_(tidyMessageCreate)( doc, code, level, str );
+        }
+            
+        case STRING_ERROR_COUNT:
+        case STRING_NOT_ALL_SHOWN:
+            return TY_(tidyMessageCreate)( doc, code, level,
+                                           doc->warnings, tidyLocalizedStringN( STRING_ERROR_COUNT_WARNING, doc->warnings ),
+                                           doc->errors, tidyLocalizedStringN( STRING_ERROR_COUNT_ERROR, doc->errors ) );
+
+        case FOOTNOTE_TRIM_EMPTY_ELEMENT:
+        case STRING_HELLO_ACCESS:
+        case STRING_NEEDS_INTERVENTION:
+        case STRING_NO_ERRORS:
+        case TEXT_ACCESS_ADVICE1:
+        case TEXT_ACCESS_ADVICE2:
+        case TEXT_BAD_FORM:
+        case TEXT_BAD_MAIN:
+        case TEXT_GENERAL_INFO:
+        case TEXT_GENERAL_INFO_PLEA:
+        case TEXT_HTML_T_ALGORITHM:
+        case TEXT_INVALID_URI:
+        case TEXT_INVALID_UTF8:
+        case TEXT_INVALID_UTF16:
+        case TEXT_M_IMAGE_ALT:
+        case TEXT_M_IMAGE_MAP:
+        case TEXT_M_LINK_ALT:
+        case TEXT_M_SUMMARY:
+        case TEXT_USING_BODY:
+        case TEXT_USING_FONT:
+        case TEXT_USING_FRAMES:
+        case TEXT_USING_LAYER:
+        case TEXT_USING_NOBR:
+        case TEXT_USING_SPACER:
+        default:
+            return TY_(tidyMessageCreate)( doc, code, level );
+    }
+    
+    return NULL;
+}
+
+
+/* This single Dialogue output function determines the correct message level
+** and formats the message with the appropriate formatter, and then outputs it.
+** This one dialogue function should be sufficient for every use case.
+*/
+void TY_(Dialogue)(TidyDocImpl* doc, uint code, ...)
 {
-    TidyMessageImpl *message = NULL;
+    int i = 0;
+    va_list args;
 
-    message = TY_(tidyMessageCreate)( doc, code, level);
-    messageOut(message);
+    while ( dialogueDispatchTable[i].code != 0 )
+    {
+        if ( dialogueDispatchTable[i].code == code )
+        {
+            TidyMessageImpl *message;
+            TidyReportLevel level = dialogueDispatchTable[i].level;
+            va_start(args, code);
+            message = formatDialogue( doc, code, level, args );
+            va_end(args);
+            messageOut( message );
+            break;
+        }
+        i++;
+    }
 }
 
 
+/*********************************************************************
+ * Output Dialogue Information
+ * In addition to reports that are added to the table, Tidy emits
+ * various dialogue type information. Most of these are specific to
+ * exact circumstances, although `TY_(Dialogue)` should be used
+ * instead of adding a new function, if possible.
+ *********************************************************************/
+
+
+/* Outputs the footnotes and other dialogue information after document cleanup
+** is complete. LibTidy users might consider capturing these individually in
+** the message callback rather than capturing this entire buffer.
+** Called by tidyErrorSummary(), in console.
+** @todo: This name is a bit misleading and should probably be renamed to
+** indicate its focus on printing footnotes.
+*/
 void TY_(ErrorSummary)( TidyDocImpl* doc )
 {
-    TidyMessageImpl *message = NULL;
     ctmbstr encnam = tidyLocalizedString(STRING_SPECIFIED);
     int charenc = cfg( doc, TidyCharEncoding ); 
     if ( charenc == WIN1252 ) 
@@ -760,48 +1183,28 @@ void TY_(ErrorSummary)( TidyDocImpl* doc )
     if (doc->badChars)
     {
         if (doc->badChars & BC_VENDOR_SPECIFIC_CHARS)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_VENDOR_CHARS, TidyDialogueDoc, encnam);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_VENDOR_CHARS, encnam );
+
         if ((doc->badChars & BC_INVALID_SGML_CHARS) || (doc->badChars & BC_INVALID_NCR))
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_SGML_CHARS, TidyDialogueDoc, encnam);
-            messageOut(message);
-        }
-        if (doc->badChars & BC_INVALID_UTF8)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_INVALID_UTF8, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_SGML_CHARS, encnam );
 
-#if SUPPORT_UTF16_ENCODINGS
+        if (doc->badChars & BC_INVALID_UTF8)
+            TY_(Dialogue)( doc, TEXT_INVALID_UTF8 );
 
         if (doc->badChars & BC_INVALID_UTF16)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_INVALID_UTF16, TidyDialogueDoc);
-            messageOut(message);
-        }
-
-#endif
+            TY_(Dialogue)( doc, TEXT_INVALID_UTF16 );
 
         if (doc->badChars & BC_INVALID_URI)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_INVALID_URI, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_INVALID_URI );
     }
-
-    if (doc->badForm & flg_BadForm) /* Issue #166 - changed to BIT flag to support other errors */
+    
+    if (doc->badForm)
     {
-        message = TY_(tidyMessageCreate)( doc, TEXT_BAD_FORM, TidyDialogueDoc);
-        messageOut(message);
-    }
+        if (doc->badForm & flg_BadForm) /* Issue #166 - changed to BIT flag to support other errors */
+            TY_(Dialogue)( doc, TEXT_BAD_FORM );
 
-    if (doc->badForm & flg_BadMain) /* Issue #166 - repeated <main> element */
-    {
-        message = TY_(tidyMessageCreate)( doc, TEXT_BAD_MAIN, TidyDialogueDoc);
-        messageOut(message);
+        if (doc->badForm & flg_BadMain) /* Issue #166 - repeated <main> element */
+            TY_(Dialogue)( doc, TEXT_BAD_MAIN );
     }
 
     if (doc->badAccess)
@@ -810,109 +1213,178 @@ void TY_(ErrorSummary)( TidyDocImpl* doc )
         if ( cfg(doc, TidyAccessibilityCheckLevel) == 0 )
         {
             if (doc->badAccess & BA_MISSING_SUMMARY)
-            {
-                message = TY_(tidyMessageCreate)( doc, TEXT_M_SUMMARY, TidyDialogueDoc);
-                messageOut(message);
-            }
+                TY_(Dialogue)( doc, TEXT_M_SUMMARY );
 
             if (doc->badAccess & BA_MISSING_IMAGE_ALT)
-            {
-                message = TY_(tidyMessageCreate)( doc, TEXT_M_IMAGE_ALT, TidyDialogueDoc);
-                messageOut(message);
-            }
+                TY_(Dialogue)( doc, TEXT_M_IMAGE_ALT );
 
             if (doc->badAccess & BA_MISSING_IMAGE_MAP)
-            {
-                message = TY_(tidyMessageCreate)( doc, TEXT_M_IMAGE_MAP, TidyDialogueDoc);
-                messageOut(message);
-            }
+                TY_(Dialogue)( doc, TEXT_M_IMAGE_MAP );
 
             if (doc->badAccess & BA_MISSING_LINK_ALT)
-            {
-                message = TY_(tidyMessageCreate)( doc, TEXT_M_LINK_ALT, TidyDialogueDoc);
-                messageOut(message);
-            }
+                TY_(Dialogue)( doc, TEXT_M_LINK_ALT );
 
             if ((doc->badAccess & BA_USING_FRAMES) && !(doc->badAccess & BA_USING_NOFRAMES))
-            {
-                message = TY_(tidyMessageCreate)( doc, TEXT_USING_FRAMES, TidyDialogueDoc);
-                messageOut(message);
-            }
+                TY_(Dialogue)( doc, TEXT_USING_FRAMES );
         }
 
         if ( cfg(doc, TidyAccessibilityCheckLevel) > 0 )
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_ACCESS_ADVICE2, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_ACCESS_ADVICE2 );
         else
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_ACCESS_ADVICE1, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_ACCESS_ADVICE1 );
     }
 
     if (doc->badLayout)
     {
         if (doc->badLayout & USING_LAYER)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_USING_LAYER, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_USING_LAYER );
 
         if (doc->badLayout & USING_SPACER)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_USING_SPACER, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_USING_SPACER );
 
         if (doc->badLayout & USING_FONT)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_USING_FONT, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_USING_FONT );
 
         if (doc->badLayout & USING_NOBR)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_USING_NOBR, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_USING_NOBR );
         
         if (doc->badLayout & USING_BODY)
-        {
-            message = TY_(tidyMessageCreate)( doc, TEXT_USING_BODY, TidyDialogueDoc);
-            messageOut(message);
-        }
+            TY_(Dialogue)( doc, TEXT_USING_BODY );
+    }
+    
+    if (doc->footnotes)
+    {
+        if (doc->footnotes & FN_TRIM_EMPTY_ELEMENT)
+            TY_(Dialogue)( doc, FOOTNOTE_TRIM_EMPTY_ELEMENT );
     }
 }
 
 
-void TY_(ReportNumWarnings)( TidyDocImpl* doc )
+/* Outputs document HTML version and version-related information. 
+** Called by tidyRunDiagnostics(), from console.
+** Called by tidyDocReportDoctype(), currently unused.
+*/
+void TY_(ReportMarkupVersion)( TidyDocImpl* doc )
 {
-    TidyMessageImpl *message = NULL;
+    if ( doc->givenDoctype )
+        TY_(Report)( doc, NULL, NULL, STRING_DOCTYPE_GIVEN, doc->givenDoctype );
+
+    if ( ! cfgBool(doc, TidyXmlTags) )
+    {
+        Bool isXhtml = doc->lexer->isvoyager;
+        uint apparentVers = TY_(ApparentVersion)( doc );
+        ctmbstr vers = TY_(HTMLVersionNameFromCode)( apparentVers, isXhtml );
 
+        if ( !vers )
+            vers = tidyLocalizedString(STRING_HTML_PROPRIETARY);
+
+        TY_(Report)( doc, NULL, NULL, STRING_CONTENT_LOOKS, vers );
+
+        /* Warn about missing sytem identifier (SI) in emitted doctype */
+        if ( TY_(WarnMissingSIInEmittedDocType)( doc ) )
+            TY_(Report)( doc, NULL, NULL, STRING_NO_SYSID );
+    }
+}
+
+
+/* Reports the number of warnings and errors found in the document. 
+** Called by tidyRunDiagnostics(), from console.
+*/
+void TY_(ReportNumWarnings)( TidyDocImpl* doc )
+{
     if ( doc->warnings > 0 || doc->errors > 0 )
     {
-        uint code;
         if ( doc->errors > cfg(doc, TidyShowErrors) || !cfgBool(doc, TidyShowWarnings) )
         {
-            code = STRING_NOT_ALL_SHOWN;
+            TY_(Dialogue)( doc, STRING_NOT_ALL_SHOWN );
         }
         else
         {
-            code = STRING_ERROR_COUNT;
+            TY_(Dialogue)( doc, STRING_ERROR_COUNT );
         }
 
-        message = TY_(tidyMessageCreate)( doc, code, TidyDialogueSummary,
-                                         doc->warnings, tidyLocalizedStringN( STRING_ERROR_COUNT_WARNING, doc->warnings ),
-                                         doc->errors, tidyLocalizedStringN( STRING_ERROR_COUNT_ERROR, doc->errors ) );
     }
     else
     {
-        message = TY_(tidyMessageCreate)( doc, STRING_NO_ERRORS, TidyDialogueSummary);
+        TY_(Dialogue)( doc, STRING_NO_ERRORS );
+    }
+}
+
+
+/*********************************************************************
+ * Message Muting
+ *********************************************************************/
+
+
+void TY_(FreeMutedMessageList)( TidyDocImpl* doc )
+{
+    TidyMutedMessages *list = &(doc->muted);
+
+    if ( list->list )
+        TidyFree( doc->allocator, list->list );
+}
+
+
+void TY_(DefineMutedMessage)(TidyDocImpl* doc, const TidyOptionImpl* opt, ctmbstr name)
+{
+    enum { capacity = 10 };
+    TidyMutedMessages *list = &(doc->muted);
+    tidyStrings message = TY_(tidyErrorCodeFromKey)( name );
+
+    if ( message <= REPORT_MESSAGE_FIRST || message >= REPORT_MESSAGE_LAST)
+    {
+        TY_(Report)( doc, NULL, NULL, STRING_ARGUMENT_BAD, opt->name, name );
+        return;
+    }
+
+    if ( !list->list )
+    {
+        list->list = TidyAlloc(doc->allocator, sizeof(tidyStrings) * capacity );
+        list->list[0] = 0;
+        list->capacity = capacity;
+        list->count = 0;
+    }
+
+    if ( list->count >= list->capacity )
+    {
+        list->capacity = list->capacity * 2;
+        list->list = realloc( list->list, sizeof(tidyStrings) * list->capacity + 1 );
+    }
+
+    list->list[list->count] = message;
+    list->count++;
+    list->list[list->count] = 0;
+
+    /* Must come *after* adding to the list, in case it's muted, too. */
+    TY_(Report)( doc, NULL, NULL, STRING_MUTING_TYPE, name );
+}
+
+
+TidyIterator TY_(getMutedMessageList)( TidyDocImpl* doc )
+{
+    TidyMutedMessages *list = &(doc->muted);
+    size_t result = list->count > 0 ? 1 : 0;
+
+    return (TidyIterator) result;
+}
+
+
+ctmbstr TY_(getNextMutedMessage)( TidyDocImpl* doc, TidyIterator* iter )
+{
+    TidyMutedMessages *list = &(doc->muted);
+    size_t index;
+    ctmbstr result = NULL;
+    assert( iter != NULL );
+    index = (size_t)*iter;
+
+    if ( index > 0 && index <= list->count )
+    {
+        result = TY_(tidyErrorCodeAsKey)(list->list[index-1]);
+        index++;
     }
-    messageOut(message);
-    TY_(WriteChar)( '\n', doc->errout );
+    *iter = (TidyIterator) ( index <= list->count ? index : (size_t)0 );
+
+    return result;
 }
 
 
@@ -936,23 +1408,16 @@ typedef struct tidyStringsKeyItem {
 } tidyStringsKeyItem;
 
 static const tidyStringsKeyItem tidyStringsKeys[] = {
-
     FOREACH_TIDYCONFIGCATEGORY(MAKE_STRUCT)
     FOREACH_MSG_MISC(MAKE_STRUCT)
+    FOREACH_FOOTNOTE_MSG(MAKE_STRUCT)
     FOREACH_DIALOG_MSG(MAKE_STRUCT)
     FOREACH_REPORT_MSG(MAKE_STRUCT)
-    
-    { "TIDYSTRINGS_FIRST",                        TIDYSTRINGS_FIRST },
-    
-#if SUPPORT_ACCESSIBILITY_CHECKS
     FOREACH_ACCESS_MSG(MAKE_STRUCT)
-#endif
-
-
 #if SUPPORT_CONSOLE_APP
     FOREACH_MSG_CONSOLE(MAKE_STRUCT)
 #endif
-
+    { "TIDYSTRINGS_FIRST",                        TIDYSTRINGS_FIRST },
     { "TIDYSTRINGS_LAST",                         TIDYSTRINGS_LAST  },
     { NULL,                                       0                 },
 };
@@ -1037,36 +1502,6 @@ uint TY_(getNextErrorCode)( TidyIterator* iter )
 }
 
 
-/*********************************************************************
- * Accessibility Module
- * These methods are part of the accessibility module access.h/c.
- *********************************************************************/
-
-
-#if SUPPORT_ACCESSIBILITY_CHECKS
-
-void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code )
-{
-    TidyMessageImpl *message = NULL;
-
-    doc->badAccess |= BA_WAI;
-    message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyAccess );
-    messageOut(message);
-}
-
-
-void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code )
-{
-    TidyMessageImpl *message = NULL;
-
-    doc->badAccess |= BA_WAI;
-    message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyAccess );
-    messageOut(message);
-}
-
-#endif /* SUPPORT_ACCESSIBILITY_CHECKS */
-
-
 /*********************************************************************
  * Documentation of configuration options
  *
@@ -1093,10 +1528,13 @@ static const TidyOptionId TidyIndentSpacesLinks[] =    { TidyIndentContent, Tidy
 static const TidyOptionId TidyInlineTagsLinks[] =      { TidyBlockTags, TidyEmptyTags, TidyPreTags, TidyUseCustomTags, TidyUnknownOption };
 static const TidyOptionId TidyMergeDivsLinks[] =       { TidyMakeClean, TidyMergeSpans, TidyUnknownOption };
 static const TidyOptionId TidyMergeSpansLinks[] =      { TidyMakeClean, TidyMergeDivs, TidyUnknownOption };
+static const TidyOptionId TidyMuteLinks[] =            { TidyMuteShow, TidyUnknownOption };
+static const TidyOptionId TidyMuteShowLinks[] =        { TidyMuteReports, TidyUnknownOption };
 static const TidyOptionId TidyNumEntitiesLinks[] =     { TidyDoctype, TidyPreserveEntities, TidyUnknownOption };
 static const TidyOptionId TidyOutCharEncodingLinks[] = { TidyCharEncoding, TidyUnknownOption };
 static const TidyOptionId TidyOutFileLinks[] =         { TidyErrFile, TidyUnknownOption };
 static const TidyOptionId TidyPreTagsLinks[] =         { TidyBlockTags, TidyEmptyTags, TidyInlineTags, TidyUseCustomTags, TidyUnknownOption };
+static const TidyOptionId TidySortAttributesLinks[] =  { TidyPriorityAttributes, TidyUnknownOption };
 static const TidyOptionId TidyUseCustomTagsLinks[] =   { TidyBlockTags, TidyEmptyTags, TidyInlineTags, TidyPreTags, TidyUnknownOption };
 static const TidyOptionId TidyWrapAttValsLinks[] =     { TidyWrapScriptlets, TidyLiteralAttribs, TidyUnknownOption };
 static const TidyOptionId TidyWrapScriptletsLinks[] =  { TidyWrapAttVals, TidyUnknownOption };
@@ -1120,10 +1558,13 @@ static const TidyOptionDoc docs_xrefs[] =
     { TidyInlineTags,      TidyInlineTagsLinks      },
     { TidyMergeDivs,       TidyMergeDivsLinks       },
     { TidyMergeSpans,      TidyMergeSpansLinks      },
+    { TidyMuteShow,        TidyMuteShowLinks        },
     { TidyNumEntities,     TidyNumEntitiesLinks     },
     { TidyOutCharEncoding, TidyOutCharEncodingLinks },
     { TidyOutFile,         TidyOutFileLinks         },
     { TidyPreTags,         TidyPreTagsLinks         },
+    { TidySortAttributes,  TidySortAttributesLinks  },
+    { TidyMuteReports,     TidyMuteLinks            },
     { TidyUseCustomTags,   TidyUseCustomTagsLinks   },
     { TidyWrapAttVals,     TidyWrapAttValsLinks     },
     { TidyWrapScriptlets,  TidyWrapScriptletsLinks  },
diff --git a/HTMLTidy/vendor/tidy-html5/src/message.h b/HTMLTidy/vendor/tidy-html5/src/message.h
index 82a36224..b093d1d8 100644
--- a/HTMLTidy/vendor/tidy-html5/src/message.h
+++ b/HTMLTidy/vendor/tidy-html5/src/message.h
@@ -2,7 +2,8 @@
 #define __MESSAGE_H__
 
 /******************************************************************************
- * General Message Writing Routines
+ * @file
+ * Provides General Message Writing Routines
  *
  * This module handles LibTidy's high level output routines, as well as
  * provides lookup functions and management for keys used for retrieval
@@ -17,9 +18,10 @@
  *    prefer to hook into a callback in order to take advantage of the data
  *    that are available in a more flexible way.
  *
- *  - Dialogue, consisting of general information that's not related to your
- *    source file in particular, is also written to the current output buffer
- *    when appropriate.
+ *  - Dialogue, consisting of footnotes related to your source file, and of
+ *    general information that's not related to your source file in particular.
+ *    This is also written to the current output buffer when appropriate, and
+ *    available via callbacks.
  *
  * Report information typically takes the form of a warning, an error, info,
  * etc., and the output routines keep track of the count of these.
@@ -27,56 +29,119 @@
  * The preferred way of handling Tidy diagnostics output is either
  *   - define a new output sink, or
  *   - use a message filter callback routine.
- * *
- * (c) 1998-2017 (W3C) MIT, ERCIM, Keio University, University of
- * Toronto, HTACG
- * See tidy.h for the copyright notice.
+ *
+ * @author  HTACG, et al (consult git log)
+ * 
+ * @copyright
+ *     Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts
+ *     Institute of Technology, European Research Consortium for Informatics
+ *     and Mathematics, Keio University) and HTACG.
+ * @par
+ *     All Rights Reserved.
+ * @par
+ *     See `tidy.h` for the complete license.
+ *
+ * @date Additional updates: consult git log
+ *
  ******************************************************************************/
 
 #include "forward.h"
+#include "config.h"
 
-/** @name Release Information */
+/** @addtogroup internal_api */
 /** @{ */
 
 
+/***************************************************************************//**
+ ** @defgroup message_releaseinfo Tidy Release Information
+ **
+ ** These functions return information about the current release version date
+ ** and version number. Note that the latest release date or the highest
+ ** version number alone do not guarantee the latest Tidy release, as we may
+ ** backport important fixes to older releases of Tidy.
+ **
+ ** @{
+ ******************************************************************************/
+
+/**
+ *  Returns the release date of this instance of HTML Tidy.
+ */
 ctmbstr TY_(ReleaseDate)(void);
+
+/** 
+ *  Returns the release version of this instance of HTML Tidy.
+ */
 ctmbstr TY_(tidyLibraryVersion)(void);
 
 
-/** @} */
-/** @name High Level Message Writing Functions - General */
+/** @} message_releaseinfo group */
+
+
+/***************************************************************************//**
+ ** @defgroup message_reporting Report and Dialogue Writing Functions
+ **
+ ** These simple functions perform the vast majority of Tidy's output, and
+ ** one these should be your first choice when adding your own output.
+ **
+ ** A report is typically diagnostic output that is generated each time Tidy
+ ** detects an issue in your document or makes a change. A dialogue is a piece
+ ** of information such as a summary, a footnote, or other non-tabular data.
+ ** Some of these functions emit multiple reports or dialogue in order to
+ ** effect a summary.
+ **
+ ** @{
+ ******************************************************************************/
+
+/** @name General Report Writing 
+ ** If one of the convenience reporting functions does not fit your required
+ ** message signature, then this designated reporting function will fit the
+ ** bill. Be sure to see if a message formatter exists that can handle the
+ ** variable arguments.
+ */
 /** @{ */
 
 
-void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code);
-void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code);
-void TY_(ReportError)(TidyDocImpl* doc, Node* element, Node* node, uint code);
-void TY_(ReportFatal)(TidyDocImpl* doc, Node* element, Node* node, uint code);
+/**
+ *  The designated report writing function. When a proper formatter exists,
+ *  this one function can hanle all report output.
+ */
+void TY_(Report)(TidyDocImpl* doc, Node *element, Node *node, uint code, ...);
 
 
 /** @} */
-/** @name High Level Message Writing Functions - Specific */
+/** @name Convenience Reporting Functions
+ ** These convenience reporting functions are able to handle the bulk of Tidy's
+ ** necessary reporting, and avoid the danger of using a variadic if you are
+ ** unfamiliar with Tidy.
+ */
 /** @{ */
 
 
-void TY_(FileError)( TidyDocImpl* doc, ctmbstr file, TidyReportLevel level, uint code );
-void TY_(ReportAttrError)( TidyDocImpl* doc, Node* node, AttVal* av, uint code );
+void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code );
+void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code);
 void TY_(ReportBadArgument)( TidyDocImpl* doc, ctmbstr option );
+void TY_(ReportEntityError)( TidyDocImpl* doc, uint code, ctmbstr entity, int c );
+void TY_(ReportFileError)( TidyDocImpl* doc, ctmbstr file, uint code );
 void TY_(ReportEncodingError)(TidyDocImpl* doc, uint code, uint c, Bool discarded);
 void TY_(ReportEncodingWarning)(TidyDocImpl* doc, uint code, uint encoding);
-void TY_(ReportEntityError)( TidyDocImpl* doc, uint code, ctmbstr entity, int c );
-void TY_(ReportMarkupVersion)( TidyDocImpl* doc );
 void TY_(ReportMissingAttr)( TidyDocImpl* doc, Node* node, ctmbstr name );
 void TY_(ReportSurrogateError)(TidyDocImpl* doc, uint code, uint c1, uint c2);
 void TY_(ReportUnknownOption)( TidyDocImpl* doc, ctmbstr option );
 
 
-#if SUPPORT_ACCESSIBILITY_CHECKS
+/** @} */
+/** @name General Dialogue Writing
+ ** These functions produce dialogue output such as individual messages, or
+ ** several messages in summary form.
+ */
+/** @{ */
 
-void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code );
-void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code );
 
-#endif
+/**
+ *  Emits a single dialogue message, and is capable of accepting a variadic
+ *  that is passed to the correct message formatter as needed.
+ */
+void TY_(Dialogue)( TidyDocImpl* doc, uint code, ... );
 
 
 /** @} */
@@ -84,22 +149,101 @@ void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code );
 /** @{ */
 
 
-void TY_(DialogueMessage)( TidyDocImpl* doc, uint code, TidyReportLevel level );
+/** 
+ *  Outputs the footnotes and other dialogue information after document cleanup
+ *  is complete. LibTidy users might consider capturing these individually in
+ *  the message callback rather than capturing this entire buffer.
+ *  Called by `tidyErrorSummary()`, in console.
+ *  @todo: This name is a bit misleading and should probably be renamed to
+ *  indicate its focus on printing footnotes.
+ */
 void TY_(ErrorSummary)( TidyDocImpl* doc );
+
+
+/** 
+ *  Outputs document HTML version and version-related information as the final
+ *  report(s) in the report table.
+ *  Called by `tidyRunDiagnostics()`, from console.
+ *  Called by `tidyDocReportDoctype()`, currently unused.
+ */
+void TY_(ReportMarkupVersion)( TidyDocImpl* doc );
+
+
+/**
+ *  Reports the number of warnings and errors found in the document as dialogue
+ *  inforation.
+ *  Called by `tidyRunDiagnostics()`, from console.
+ */
 void TY_(ReportNumWarnings)( TidyDocImpl* doc );
 
 
 /** @} */
-/** @name Key Discovery */
-/** @{ */
+/** @} message_reporting group */
+
+
+/***************************************************************************//**
+ ** @defgroup message_mutinging Message Muting
+ **
+ ** Message types included in the `mute` option will be be printed in
+ ** messageOut().
+ **
+ ** @{
+ ******************************************************************************/
+
+/** Maintains a list of messages not to display. */
+typedef struct _mutedMessages {
+    tidyStrings* list; /**< A list of messages that won't be output. */
+    uint count;        /**< Current count of the list. */
+    uint capacity;     /**< Current capacity of the list. */
+} TidyMutedMessages;
+
+
+/** Frees the list of muted messages.
+ ** @param doc The Tidy document.
+ */
+void TY_(FreeMutedMessageList)( TidyDocImpl* doc );
+
+/** Adds a new message ID to the list of muted messages.
+ ** @param doc The Tidy document.
+ ** @param opt The option that is defining the muted message.
+ ** @param name The message code as a string.
+ */
+void TY_(DefineMutedMessage)( TidyDocImpl* doc, const TidyOptionImpl* opt, ctmbstr name );
+
+/** Start an iterator for muted messages.
+ ** @param doc The Tidy document.
+ ** @returns Returns an iterator token.
+ */
+TidyIterator TY_(getMutedMessageList)( TidyDocImpl* doc );
+
+/** Get the next priority attribute.
+ ** @param doc The Tidy document.
+ ** @param iter The iterator token.
+ ** @returns The next priority attribute.
+ */
+ctmbstr TY_(getNextMutedMessage)( TidyDocImpl* doc, TidyIterator* iter );
+
+
+/** @} message_muting group */
+
+
+/***************************************************************************//**
+ ** @defgroup message_keydiscovery Key Discovery
+ **
+ ** LibTidy users may want to use `TidyReportCallback` to enable their own
+ ** localization lookup features. Because Tidy's report codes are enums the
+ ** specific values can change over time. Using these functions provides the
+ ** ability for LibTidy users to use LibTidy's enum values as strings for
+ ** lookup purposes.
+ **
+ ** @{
+ ******************************************************************************/
 
 /**
- *  LibTidy users may want to use `TidyReportCallback` to enable their own
- *  localization lookup features. Because Tidy's report codes are enums the
- *  specific values can change over time. This function returns a string
- *  representing the enum value name that can be used as a lookup key
- *  independent of changing string values. `TidyReportCallback` will return
- *  this general string as the report message key.
+ *  This function returns a string representing the enum value name that can
+ *  be used as a lookup key independent of changing string values. 
+ *  `TidyReportCallback` will return this general string as the report 
+ *  message key.
  */
 ctmbstr TY_(tidyErrorCodeAsKey)(uint code);
 
@@ -116,7 +260,7 @@ uint TY_(tidyErrorCodeFromKey)(ctmbstr code);
  *  `TidyReportFilter3`.
  *  Items can be retrieved with getNextErrorCode();
  */
-TidyIterator TY_(getErrorCodeList)();
+TidyIterator TY_(getErrorCodeList)(void);
 
 /**
  *  Returns the next error code having initialized the iterator
@@ -126,7 +270,9 @@ TidyIterator TY_(getErrorCodeList)();
 uint TY_(getNextErrorCode)( TidyIterator* iter );
 
 
-/** @} */
+/** @} message_keydiscovery group */
+/** @} internal_api addtogroup */
+
 
 
 /* accessibility flaws */
@@ -158,6 +304,10 @@ uint TY_(getNextErrorCode)( TidyIterator* iter );
 #define BC_INVALID_URI             32
 #define BC_INVALID_NCR             64
 
+/* other footnote bit field (temporary until formalized) */
+
+#define FN_TRIM_EMPTY_ELEMENT     1
+
 /* Lexer and I/O Macros */
 
 #define REPLACED_CHAR           0
diff --git a/HTMLTidy/vendor/tidy-html5/src/messageobj.c b/HTMLTidy/vendor/tidy-html5/src/messageobj.c
index 31563568..6f76152a 100644
--- a/HTMLTidy/vendor/tidy-html5/src/messageobj.c
+++ b/HTMLTidy/vendor/tidy-html5/src/messageobj.c
@@ -10,9 +10,6 @@
 #include "tidy-int.h"
 #include "limits.h"
 #include "tmbstr.h"
-#if !defined(NDEBUG) && defined(_MSC_VER)
-#include "sprtf.h"
-#endif
 
 
 /*********************************************************************
@@ -88,6 +85,8 @@ static TidyMessageImpl *tidyMessageCreateInitV( TidyDocImpl *doc,
     va_list args_copy;
     enum { sizeMessageBuf=2048 };
     ctmbstr pattern;
+    uint i = 0;
+
 
     /* Things we know... */
 
@@ -140,7 +139,7 @@ static TidyMessageImpl *tidyMessageCreateInitV( TidyDocImpl *doc,
     result->messagePrefix = tidyLocalizedString(level);
 
     if ( line > 0 && column > 0 )
-        pattern = "%s%s%s";      /* pattern in there's location information */
+        pattern = "%s%s%s";      /* pattern if there's location information */
     else
         pattern = "%.0s%s%s";    /* otherwise if there isn't */
 
@@ -157,6 +156,11 @@ static TidyMessageImpl *tidyMessageCreateInitV( TidyDocImpl *doc,
                      result->messagePos, result->messagePrefix,
                      result->message);
 
+    if ( ( cfgBool(doc, TidyMuteShow) == yes ) && level <= TidyFatal )
+    {
+        TY_(tmbsnprintf)(result->messageOutputDefault, sizeMessageBuf, "%s (%s)", result->messageOutputDefault, TY_(tidyErrorCodeAsKey)(code) );
+        TY_(tmbsnprintf)(result->messageOutput, sizeMessageBuf, "%s (%s)", result->messageOutput, TY_(tidyErrorCodeAsKey)(code) );
+    }
 
     result->allowMessage = yes;
 
@@ -187,6 +191,19 @@ static TidyMessageImpl *tidyMessageCreateInitV( TidyDocImpl *doc,
         result->allowMessage = result->allowMessage & doc->messageCallback( tidyImplToMessage(result) );
     }
 
+    /* finally, check the document's configuration to determine whether
+       this message is muted. */
+    result->muted = no;
+    while ( ( doc->muted.list ) && ( doc->muted.list[i] != 0 ) )
+    {
+        if ( doc->muted.list[i] == code )
+        {
+            result->muted = yes;
+            break;
+        }
+        i++;
+    }
+
     return result;
 }
 
@@ -256,6 +273,7 @@ void TY_(tidyMessageRelease)( TidyMessageImpl *message )
     TidyDocFree( tidyDocToImpl(message->tidyDoc), message->messagePos );
     TidyDocFree( tidyDocToImpl(message->tidyDoc), message->messageOutputDefault );
     TidyDocFree( tidyDocToImpl(message->tidyDoc), message->messageOutput );
+    TidyDocFree(tidyDocToImpl(message->tidyDoc), message); /* Issue #597 - and discard the message structure */
 }
 
 
@@ -294,6 +312,11 @@ TidyReportLevel TY_(getMessageLevel)( TidyMessageImpl message )
     return message.level;
 }
 
+Bool TY_(getMessageIsMuted)( TidyMessageImpl message )
+{
+    return message.muted;
+}
+
 ctmbstr TY_(getMessageFormatDefault)( TidyMessageImpl message )
 {
     return message.messageFormatDefault;
@@ -369,7 +392,7 @@ TidyMessageArgument TY_(getNextMessageArgument)( TidyMessageImpl message, TidyIt
     
     if ( itemIndex >= 1 && itemIndex <= (size_t)message.argcount )
     {
-        item = itemIndex - 1;
+        item = itemIndex;
         itemIndex++;
     }
     
@@ -384,7 +407,7 @@ TidyMessageArgument TY_(getNextMessageArgument)( TidyMessageImpl message, TidyIt
 
 TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
-    int argNum = (int)(size_t)*arg;
+    int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     
     return message.arguments[argNum].type;
@@ -393,7 +416,7 @@ TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArg
 
 ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
-    int argNum = (int)(size_t)*arg;
+    int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     
     return message.arguments[argNum].format;
@@ -402,7 +425,7 @@ ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
 
 ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
-    int argNum = (int)(size_t)*arg;
+    int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     assert( message.arguments[argNum].type == tidyFormatType_STRING);
     
@@ -412,7 +435,7 @@ ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* ar
 
 uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
-    int argNum = (int)(size_t)*arg;
+    int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     assert( message.arguments[argNum].type == tidyFormatType_UINT);
 
@@ -422,7 +445,7 @@ uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg )
 
 int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
-    int argNum = (int)(size_t)*arg;
+    int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     assert( message.arguments[argNum].type == tidyFormatType_INT);
 
@@ -432,7 +455,7 @@ int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg )
 
 double TY_(getArgValueDouble)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
-    int argNum = (int)(size_t)*arg;
+    int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     assert( message.arguments[argNum].type == tidyFormatType_DOUBLE);
     
diff --git a/HTMLTidy/vendor/tidy-html5/src/messageobj.h b/HTMLTidy/vendor/tidy-html5/src/messageobj.h
index b12505df..0ee16664 100644
--- a/HTMLTidy/vendor/tidy-html5/src/messageobj.h
+++ b/HTMLTidy/vendor/tidy-html5/src/messageobj.h
@@ -80,6 +80,9 @@ int TY_(getMessageColumn)( TidyMessageImpl message );
 /** get the TidyReportLevel of the message. */
 TidyReportLevel TY_(getMessageLevel)( TidyMessageImpl message );
 
+/** get whether or not the message was muted by the configuration. */
+Bool TY_(getMessageIsMuted)( TidyMessageImpl message );
+
 /** the built-in format string */
 ctmbstr TY_(getMessageFormatDefault)( TidyMessageImpl message );
 
diff --git a/HTMLTidy/vendor/tidy-html5/src/parser.c b/HTMLTidy/vendor/tidy-html5/src/parser.c
index a037280c..8569ed5c 100644
--- a/HTMLTidy/vendor/tidy-html5/src/parser.c
+++ b/HTMLTidy/vendor/tidy-html5/src/parser.c
@@ -12,17 +12,7 @@
 #include "clean.h"
 #include "tags.h"
 #include "tmbstr.h"
-#ifdef _MSC_VER
 #include "sprtf.h"
-#endif
-
-#ifndef SPRTF
-#define SPRTF printf
-#endif
-
-#ifdef AUTO_INPUT_ENCODING
-#include "charsets.h"
-#endif
 
 /*
   Issue #72 - Need to know to avoid error-reporting - no warning only if --show-body-only yes
@@ -69,7 +59,7 @@ Bool TY_(CheckNodeIntegrity)(Node *node)
  used to determine how attributes
  without values should be printed
  this was introduced to deal with
- user defined tags e.g. Cold Fusion
+ user defined tags e.g. ColdFusion
 */
 Bool TY_(IsNewNode)(Node *node)
 {
@@ -86,11 +76,11 @@ void TY_(CoerceNode)(TidyDocImpl* doc, Node *node, TidyTagId tid, Bool obsolete,
     Node* tmp = TY_(InferredTag)(doc, tag->id);
 
     if (obsolete)
-        TY_(ReportWarning)(doc, node, tmp, OBSOLETE_ELEMENT);
+        TY_(Report)(doc, node, tmp, OBSOLETE_ELEMENT);
     else if (unexpected)
-        TY_(ReportError)(doc, node, tmp, REPLACING_UNEX_ELEMENT);
+        TY_(Report)(doc, node, tmp, REPLACING_UNEX_ELEMENT);
     else
-        TY_(ReportNotice)(doc, node, tmp, REPLACING_ELEMENT);
+        TY_(Report)(doc, node, tmp, REPLACING_ELEMENT);
 
     TidyDocFree(doc, tmp->element);
     TidyDocFree(doc, tmp);
@@ -336,9 +326,12 @@ Node *TY_(TrimEmptyElement)( TidyDocImpl* doc, Node *element )
 {
     if ( CanPrune(doc, element) )
     {
-       if (element->type != TextNode)
-            TY_(ReportNotice)(doc, element, NULL, TRIM_EMPTY_ELEMENT);
-
+        if (element->type != TextNode)
+        {
+            doc->footnotes |= FN_TRIM_EMPTY_ELEMENT;
+            TY_(Report)(doc, element, NULL, TRIM_EMPTY_ELEMENT);
+        }
+        
         return TY_(DiscardElement)(doc, element);
     }
     return element->next;
@@ -402,70 +395,17 @@ static void TrimTrailingSpace( TidyDocImpl* doc, Node *element, Node *last )
         {
             c = (byte) lexer->lexbuf[ last->end - 1 ];
 
-            if (   c == ' '
-#ifdef COMMENT_NBSP_FIX
-                || c == 160
-#endif
-               )
-            {
-#ifdef COMMENT_NBSP_FIX
-                /* take care with <td>&nbsp;</td> */
-                if ( c == 160 && 
-                     ( element->tag == doc->tags.tag_td || 
-                       element->tag == doc->tags.tag_th )
-                   )
-                {
-                    if (last->end > last->start + 1)
-                        last->end -= 1;
-                }
-                else
-#endif
-                {
-                    last->end -= 1;
-                    if ( (element->tag->model & CM_INLINE) &&
-                         !(element->tag->model & CM_FIELD) )
-                        lexer->insertspace = yes;
-                }
+            if ( c == ' ' )
+            {
+                last->end -= 1;
+                if ( (element->tag->model & CM_INLINE) &&
+                     !(element->tag->model & CM_FIELD) )
+                    lexer->insertspace = yes;
             }
         }
     }
 }
 
-#if 0
-static Node *EscapeTag(Lexer *lexer, Node *element)
-{
-    Node *node = NewNode(lexer->allocator, lexer);
-
-    node->start = lexer->lexsize;
-    AddByte(lexer, '<');
-
-    if (element->type == EndTag)
-        AddByte(lexer, '/');
-
-    if (element->element)
-    {
-        char *p;
-        for (p = element->element; *p != '\0'; ++p)
-            AddByte(lexer, *p);
-    }
-    else if (element->type == DocTypeTag)
-    {
-        uint i;
-        AddStringLiteral( lexer, "!DOCTYPE " );
-        for (i = element->start; i < element->end; ++i)
-            AddByte(lexer, lexer->lexbuf[i]);
-    }
-
-    if (element->type == StartEndTag)
-        AddByte(lexer, '/');
-
-    AddByte(lexer, '>');
-    node->end = lexer->lexsize;
-
-    return node;
-}
-#endif /* 0 */
-
 /* Only true for text nodes. */
 Bool TY_(IsBlank)(Lexer *lexer, Node *node)
 {
@@ -515,10 +455,8 @@ static void TrimInitialSpace( TidyDocImpl* doc, Node *element, Node *text )
                 node->end = element->start;
                 lexer->lexbuf[node->start] = ' ';
                 TY_(InsertNodeBeforeElement)(element ,node);
-#if !defined(NDEBUG) && defined(_MSC_VER)
-                SPRTF("TrimInitialSpace: Created text node, inserted before <%s>\n", 
-                    (element->element ? element->element : "unknown"));
-#endif
+                DEBUG_LOG(SPRTF("TrimInitialSpace: Created text node, inserted before <%s>\n",
+                    (element->element ? element->element : "unknown")));
             }
         }
 
@@ -783,12 +721,12 @@ static void InsertDocType( TidyDocImpl* doc, Node *element, Node *doctype )
     Node* existing = TY_(FindDocType)( doc );
     if ( existing )
     {
-        TY_(ReportError)(doc, element, doctype, DISCARDING_UNEXPECTED );
+        TY_(Report)(doc, element, doctype, DISCARDING_UNEXPECTED );
         TY_(FreeNode)( doc, doctype );
     }
     else
     {
-        TY_(ReportError)(doc, element, doctype, DOCTYPE_AFTER_TAGS );
+        TY_(Report)(doc, element, doctype, DOCTYPE_AFTER_TAGS );
         while ( !nodeIsHTML(element) )
             element = element->parent;
         TY_(InsertNodeBeforeElement)( element, doctype );
@@ -807,7 +745,7 @@ static void MoveToHead( TidyDocImpl* doc, Node *element, Node *node )
 
     if ( TY_(nodeIsElement)(node) )
     {
-        TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN );
+        TY_(Report)(doc, element, node, TAG_NOT_ALLOWED_IN );
 
         head = TY_(FindHEAD)(doc);
         assert(head != NULL);
@@ -819,7 +757,7 @@ static void MoveToHead( TidyDocImpl* doc, Node *element, Node *node )
     }
     else
     {
-        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node );
     }
 }
@@ -855,7 +793,7 @@ static void AddClassNoIndent( TidyDocImpl* doc, Node *node )
 */
 void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
 {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     static int in_parse_block = 0;
     static int parse_block_cnt = 0;
 #endif
@@ -863,7 +801,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
     Node *node;
     Bool checkstack = yes;
     uint istackbase = 0;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_block++;
     parse_block_cnt++;
     SPRTF("Entering ParseBlock %d... %d %s\n",in_parse_block,parse_block_cnt,
@@ -871,7 +809,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
 #endif
 
     if ( element->tag->model & CM_EMPTY ) {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
         in_parse_block--;
         SPRTF("Exit ParseBlockL 1 %d...\n",in_parse_block);
 #endif
@@ -880,7 +818,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
 
     if ( nodeIsFORM(element) && 
          DescendantOf(element, TidyTag_FORM) )
-        TY_(ReportError)(doc, element, NULL, ILLEGAL_NESTING );
+        TY_(Report)(doc, element, NULL, ILLEGAL_NESTING );
 
     /*
      InlineDup() asks the lexer to insert inline emphasis tags
@@ -936,33 +874,17 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
 
             element->closed = yes;
             TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_block--;
             SPRTF("Exit ParseBlock 2 %d...\n",in_parse_block);
 #endif
             return;
         }
 
-#if OBSOLETE /* Issue #380 Kill this code! But leave in src, just in case! */
-        if ( nodeIsBODY( node ) && DescendantOf( element, TidyTag_HEAD ))
-        {
-            /*  If we're in the HEAD, close it before proceeding.
-                This is an extremely rare occurance, but has been observed.
-                ****************************************************************
-                Issue #380 - This can cause an INFINITE loop!
-                This code was added to SF CVS Tidy
-                revision 1.121 by lpassey, Wed Jul 28 18:08:06 2004 UTC
-                ****************************************************************
-            */
-            TY_(UngetToken)( doc );
-            break;
-        }
-#endif /* #if OBSOLETE */
-
         if ( nodeIsHTML(node) || nodeIsHEAD(node) || nodeIsBODY(node) )
         {
             if ( TY_(nodeIsElement)(node) )
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -972,7 +894,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         {
             if (node->tag == NULL)
             {
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -988,12 +910,6 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 */
                 node->type = StartEndTag;
                 node->implicit = yes;
-#if OBSOLETE
-                TY_(CoerceNode)(doc, node, TidyTag_BR, no, no);
-                TY_(FreeAttrs)( doc, node ); /* discard align attribute etc. */
-                TY_(InsertNodeAtEnd)( element, node );
-                node = InferredTag(doc, TidyTag_BR);
-#endif
             }
             else if (DescendantOf( element, node->tag->id ))
             {
@@ -1003,32 +919,6 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 */
                 TY_(UngetToken)( doc );
                 break;
-#if OBSOLETE
-                Node *parent;
-                for ( parent = element->parent;
-                      parent != NULL; 
-                      parent = parent->parent )
-                {
-                    if (node->tag == parent->tag)
-                    {
-                        if (!(element->tag->model & CM_OPT))
-                            TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
-
-                        TY_(UngetToken)( doc );
-
-                        if (element->tag->model & CM_OBJECT)
-                        {
-                            /* pop inline stack */
-                            while (lexer->istacksize > lexer->istackbase)
-                                TY_(PopInline)( doc, NULL );
-                            lexer->istackbase = istackbase;
-                        }
-
-                        TrimSpaces( doc, element );
-                        return;
-                    }
-                }
-#endif
             }
             else
             {
@@ -1038,7 +928,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 {
                     TY_(UngetToken)( doc );
                     TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_block--;
                     SPRTF("Exit ParseBlock 2 %d...\n",in_parse_block);
 #endif
@@ -1093,7 +983,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             }
 
             /* otherwise discard it */
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+            TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1108,7 +998,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             }
 
             /* otherwise discard it */
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+            TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1116,7 +1006,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         /* ignore unknown start/end tags */
         if ( node->tag == NULL )
         {
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+            TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1139,7 +1029,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 if ( nodeIsFORM(node) )
                     BadForm( doc );
 
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -1167,7 +1057,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                      nodeIsOPTGROUP(node) ||
                      nodeIsOPTION(node) )
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                    TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
                     TY_(FreeNode)( doc, node );  /* DSR - 27Apr02 avoid memory leak */
                     continue;
                 }
@@ -1202,7 +1092,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 {
                     TY_(UngetToken)( doc );
                     TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_block--;
                     SPRTF("Exit ParseBlock 3 %d...\n",in_parse_block);
 #endif
@@ -1214,7 +1104,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 if ( lexer->excludeBlocks )
                 {
                     if ( !TY_(nodeHasCM)(element, CM_OPT) )
-                        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                        TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE );
 
                     TY_(UngetToken)( doc );
 
@@ -1222,7 +1112,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                         lexer->istackbase = istackbase;
 
                     TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_block--;
                     SPRTF("Exit ParseBlock 4 %d...\n",in_parse_block);
 #endif
@@ -1248,14 +1138,14 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 {
                     if ( nodeIsTD(node) )
                     {
-                        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                        TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
                         TY_(FreeNode)( doc, node );
                         continue;
                     }
 
                     if ( nodeIsTH(node) )
                     {
-                        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                        TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
                         TY_(FreeNode)( doc, node );
                         node = element->parent;
                         TidyDocFree(doc, node->element);
@@ -1266,7 +1156,12 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 }
 
                 if ( !TY_(nodeHasCM)(element, CM_OPT) && !element->implicit )
-                    TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                    TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                
+                /* #521, warn on missing optional end-tags if not omitting them. */
+                if ( cfgBool( doc, TidyOmitOptionalTags ) == no && TY_(nodeHasCM)(element, CM_OPT) )
+                    TY_(Report)(doc, element, node, MISSING_ENDTAG_OPTIONAL );
+
 
                 TY_(UngetToken)( doc );
 
@@ -1276,7 +1171,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                          element->parent->tag->parser == TY_(ParseList) )
                     {
                         TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                         in_parse_block--;
                         SPRTF("Exit ParseBlock 5 %d...\n",in_parse_block);
 #endif
@@ -1291,7 +1186,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                     if ( nodeIsDL(element->parent) )
                     {
                         TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                         in_parse_block--;
                         SPRTF("Exit ParseBlock 6 %d...\n",in_parse_block);
 #endif
@@ -1306,7 +1201,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                     /* In exiled mode, return so table processing can 
                        continue. */
                     if (lexer->exiled) {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                         in_parse_block--;
                         SPRTF("Exit ParseBlock 7 %d...\n",in_parse_block);
 #endif
@@ -1321,7 +1216,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                         TY_(PopInline)( doc, NULL );
                     lexer->istackbase = istackbase;
                     TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_block--;
                     SPRTF("Exit ParseBlock 8 %d...\n",in_parse_block);
 #endif
@@ -1331,7 +1226,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 else
                 {
                     TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_block--;
                     SPRTF("Exit ParseBlock 9 %d...\n",in_parse_block);
 #endif
@@ -1354,21 +1249,28 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 && cfgBool(doc, TidyCoerceEndTags) )
             {
                 node->type = EndTag;
-                TY_(ReportError)(doc, element, node, COERCE_TO_ENDTAG);
+                TY_(Report)(doc, element, node, COERCE_TO_ENDTAG);
                 TY_(UngetToken)( doc );
                 continue;
             }
 
             if (nodeIsA(element))
             {
+                TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE);
                 TY_(UngetToken)( doc );
             }
-            TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+            else
+            {
+                /* Issue #597 - if we not 'UngetToken' then it is being discarded.
+                   Add message, and 'FreeNode' - thanks @ralfjunker */
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
+                TY_(FreeNode)(doc, node);
+            }
 
             if (!(mode & Preformatted))
                 TrimSpaces(doc, element);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_block--;
             SPRTF("Exit ParseBlock 9b %d...\n",in_parse_block);
 #endif
@@ -1406,7 +1308,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             TY_(InsertNodeAtEnd)(element, node);
             
             if (node->implicit)
-                TY_(ReportError)(doc, element, node, INSERTING_TAG );
+                TY_(Report)(doc, element, node, INSERTING_TAG );
 
             /* Issue #212 - WHY is this hard coded to 'IgnoreWhitespace' while an 
                effort has been made above to set a 'MixedContent' mode in some cases?
@@ -1419,13 +1321,13 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         if (node->type == EndTag)
             TY_(PopInline)( doc, node );  /* if inline end tag */
 
-        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+        TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
         TY_(FreeNode)( doc, node );
         continue;
     }
 
     if (!(element->tag->model & CM_OPT))
-        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_FOR);
+        TY_(Report)(doc, element, node, MISSING_ENDTAG_FOR);
 
     if (element->tag->model & CM_OBJECT)
     {
@@ -1436,7 +1338,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
     }
 
     TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_block--;
     SPRTF("Exit ParseBlock 10 %d...\n",in_parse_block);
 #endif
@@ -1561,7 +1463,7 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
                 {
                     /* n->implicit = yes; */
                     n->closed = yes;
-                    TY_(ReportError)(doc, n->parent, n, MISSING_ENDTAG_BEFORE);
+                    TY_(Report)(doc, n->parent, n, MISSING_ENDTAG_BEFORE);
                 }
 
                 /* Issue #369 - Since 'assert' is DEBUG only, and there are
@@ -1599,8 +1501,8 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
             else
             {
                 /* unmatched close tag: report an error and discard */
-                /* TY_(ReportError)(doc, parent, node, NON_MATCHING_ENDTAG); Issue #308 - Seems wrong warning! */
-                TY_(ReportError)(doc, parent, node, DISCARDING_UNEXPECTED);
+                /* TY_(Report)(doc, parent, node, NON_MATCHING_ENDTAG); Issue #308 - Seems wrong warning! */
+                TY_(Report)(doc, parent, node, DISCARDING_UNEXPECTED);
                 assert(parent);
                 /* assert(parent->tag != node->tag); Issue #308 - Seems would always be true! */
                 TY_(FreeNode)( doc, node); /* Issue #308 - Discard unexpected end tag memory */
@@ -1630,24 +1532,24 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
         }
     }
 
-    TY_(ReportError)(doc, basenode->parent, basenode, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, basenode->parent, basenode, MISSING_ENDTAG_FOR);
 }
 
 
 void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
 {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     static int in_parse_inline = 0;
 #endif
     Lexer* lexer = doc->lexer;
     Node *node, *parent;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_inline++;
     SPRTF("Entering ParseInline %d...\n",in_parse_inline);
 #endif
 
     if (element->tag->model & CM_EMPTY) {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
         in_parse_inline--;
         SPRTF("Exit ParseInline 1 %d...\n",in_parse_inline);
 #endif
@@ -1729,7 +1631,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
 
             element->closed = yes;
             TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_inline--;
             SPRTF("Exit ParseInline 2 %d...\n",in_parse_inline);
 #endif
@@ -1763,14 +1665,14 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 && TY_(nodeIsText)(element->last)
                 && !TY_(TextNodeEndWithSpace)(doc->lexer, element->last) )
             {
-                TY_(ReportWarning)(doc, element, node, COERCE_TO_ENDTAG_WARN);
+                TY_(Report)(doc, element, node, COERCE_TO_ENDTAG);
                 node->type = EndTag;
                 TY_(UngetToken)(doc);
                 continue;
             }
 
             if (node->attributes == NULL || element->attributes == NULL)
-                TY_(ReportWarning)(doc, element, node, NESTED_EMPHASIS);
+                TY_(Report)(doc, element, node, NESTED_EMPHASIS);
         }
         else if ( TY_(IsPushed)(doc, node) && node->type == StartTag && 
                   nodeIsQ(node) )
@@ -1781,7 +1683,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             \*/
             if (TY_(HTMLVersion)(doc) != HT50) 
             {
-                TY_(ReportWarning)(doc, element, node, NESTED_QUOTATION);
+                TY_(Report)(doc, element, node, NESTED_QUOTATION);
             }
         }
 
@@ -1810,7 +1712,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         {
             if ( TY_(nodeIsElement)(node) )
             {
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED );
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED );
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -1820,7 +1722,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
 
             if (!(mode & Preformatted))
                 TrimSpaces(doc, element);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_inline--;
             SPRTF("Exit ParseInline 3 %d...\n",in_parse_inline);
 #endif
@@ -1858,7 +1760,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         /* ignore unknown and PARAM tags */
         if ( node->tag == NULL || nodeIsPARAM(node) )
         {
-            TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node );
             continue;
         }
@@ -1905,12 +1807,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                        <b>bold <i>bold and italic</b> italics</i> */
                     if ( TY_(SwitchInline)( doc, element, node ) )
                     {
-                        TY_(ReportError)(doc, element, node, NON_MATCHING_ENDTAG);
+                        TY_(Report)(doc, element, node, NON_MATCHING_ENDTAG);
                         TY_(UngetToken)( doc ); /* put this back */
                         TY_(InlineDup1)( doc, NULL, element ); /* dupe the <i>, after </b> */
                         if (!(mode & Preformatted))
                             TrimSpaces( doc, element );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                         in_parse_inline--;
                         SPRTF("Exit ParseInline 4 %d...\n",in_parse_inline);
 #endif
@@ -1923,18 +1825,18 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 {
                     if ( nodeIsA(node) && node->tag != element->tag )
                     {
-                       TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                       TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE );
                        TY_(UngetToken)( doc );
                     }
                     else
                     {
-                        TY_(ReportError)(doc, element, node, NON_MATCHING_ENDTAG);
+                        TY_(Report)(doc, element, node, NON_MATCHING_ENDTAG);
                         TY_(FreeNode)( doc, node);
                     }
 
                     if (!(mode & Preformatted))
                         TrimSpaces(doc, element);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_inline--;
                     SPRTF("Exit ParseInline 5 %d...\n",in_parse_inline);
 #endif
@@ -1942,7 +1844,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 }
 
                 /* if parent is <a> then discard unexpected inline end tag */
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }  /* special case </tr> etc. for stuff moved in front of table */
@@ -1951,7 +1853,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             {
                 TY_(UngetToken)( doc );
                 TrimSpaces(doc, element);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                 in_parse_inline--;
                 SPRTF("Exit ParseInline 6 %d...\n",in_parse_inline);
 #endif
@@ -1965,19 +1867,19 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
 
             if ( node->tag == element->tag )
             {
-                TY_(ReportError)(doc, element, node, NON_MATCHING_ENDTAG );
+                TY_(Report)(doc, element, node, NON_MATCHING_ENDTAG );
                 TY_(FreeNode)( doc, node);
             }
             else
             {
-                TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE );
+                TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE );
                 TY_(UngetToken)( doc );
             }
 
             if (!(mode & Preformatted))
                 TrimSpaces(doc, element);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_inline--;
             SPRTF("Exit ParseInline 7 %d...\n",in_parse_inline);
 #endif
@@ -2001,20 +1903,20 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 && cfgBool(doc, TidyCoerceEndTags) )
             {
                 node->type = EndTag;
-                TY_(ReportError)(doc, element, node, COERCE_TO_ENDTAG);
+                TY_(Report)(doc, element, node, COERCE_TO_ENDTAG);
                 /* TY_(PopInline)( doc, node ); */
                 TY_(UngetToken)( doc );
                 continue;
             }
 
             TY_(UngetToken)( doc );
-            TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+            TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE);
             /* TY_(PopInline)( doc, element ); */
 
             if (!(mode & Preformatted))
                 TrimSpaces(doc, element);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_inline--;
             SPRTF("Exit ParseInline 8 %d...\n",in_parse_inline);
 #endif
@@ -2027,12 +1929,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             {
                 if (!TY_(nodeIsElement)(node))
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                    TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
 
-                TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, element, node, TAG_NOT_ALLOWED_IN);
 
                 /* insert center as parent if heading is empty */
                 if (element->content == NULL)
@@ -2056,12 +1958,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             {
                 if ( !TY_(nodeIsElement)(node) )
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                    TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
 
-                TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, element, node, TAG_NOT_ALLOWED_IN);
 
                 /* insert hr before heading if heading is empty */
                 if (element->content == NULL)
@@ -2089,12 +1991,12 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 Node *dd;
                 if ( !TY_(nodeIsElement)(node) )
                 {
-                    TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                    TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
 
-                TY_(ReportError)(doc, element, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, element, node, TAG_NOT_ALLOWED_IN);
                 dd = TY_(InferredTag)(doc, TidyTag_DD);
 
                 /* insert hr within dd before dt if dt is empty */
@@ -2131,7 +2033,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 if (node->tag == parent->tag)
                 {
                     if (!(element->tag->model & CM_OPT) && !element->implicit)
-                        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+                        TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE);
 
                     if( TY_(IsPushedLast)( doc, element, node ) ) 
                         TY_(PopInline)( doc, element );
@@ -2140,7 +2042,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                     if (!(mode & Preformatted))
                         TrimSpaces(doc, element);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_inline--;
                     SPRTF("Exit ParseInline 9 %d...\n",in_parse_inline);
 #endif
@@ -2163,7 +2065,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         {
             if ( !TY_(nodeIsElement)(node) )
             {
-                TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2172,7 +2074,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 TY_(ConstrainVersion)( doc, ~VERS_HTML5 );
             } else
             if (!(element->tag->model & CM_OPT))
-                TY_(ReportError)(doc, element, node, MISSING_ENDTAG_BEFORE);
+                TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE);
 
             if (node->tag->model & CM_HEAD && !(node->tag->model & CM_BLOCK))
             {
@@ -2192,7 +2094,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                 {
                     TY_(DiscardElement)( doc, element );
                     TY_(UngetToken)( doc );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_inline--;
                     SPRTF("Exit ParseInline 10 %d...\n",in_parse_inline);
 #endif
@@ -2205,7 +2107,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             if (!(mode & Preformatted))
                 TrimSpaces(doc, element);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_inline--;
             SPRTF("Exit ParseInline 11 %d...\n",in_parse_inline);
 #endif
@@ -2216,7 +2118,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         if (TY_(nodeIsElement)(node))
         {
             if (node->implicit)
-                TY_(ReportError)(doc, element, node, INSERTING_TAG);
+                TY_(Report)(doc, element, node, INSERTING_TAG);
 
             /* trim white space before <br> */
             if ( nodeIsBR(node) )
@@ -2228,15 +2130,15 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, element, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, element, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node );
         continue;
     }
 
     if (!(element->tag->model & CM_OPT))
-        TY_(ReportError)(doc, element, node, MISSING_ENDTAG_FOR);
+        TY_(Report)(doc, element, node, MISSING_ENDTAG_FOR);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_inline--;
     SPRTF("Exit ParseInline 12 %d...\n",in_parse_inline);
 #endif
@@ -2252,7 +2154,7 @@ void TY_(ParseEmpty)(TidyDocImpl* doc, Node *element, GetTokenMode mode)
         {
             if ( !(node->type == EndTag && node->tag == element->tag) )
             {
-                /* TY_(ReportError)(doc, element, node, ELEMENT_NOT_EMPTY); */
+                /* TY_(Report)(doc, element, node, ELEMENT_NOT_EMPTY); */
                 TY_(UngetToken)( doc );
             }
             else
@@ -2290,12 +2192,12 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
         {
             TY_(UngetToken)( doc );
             node = TY_(InferredTag)(doc, TidyTag_DT);
-            TY_(ReportError)(doc, list, node, MISSING_STARTTAG);
+            TY_(Report)(doc, list, node, MISSING_STARTTAG);
         }
 
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2310,7 +2212,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node );
                 continue;
             }
@@ -2328,7 +2230,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
                 }
                 if (node->tag == parent->tag)
                 {
-                    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_BEFORE);
+                    TY_(Report)(doc, list, node, MISSING_ENDTAG_BEFORE);
 
                     TY_(UngetToken)( doc );
                     return;
@@ -2336,7 +2238,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             }
             if (discardIt)
             {
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2350,11 +2252,6 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             else /* trim empty dl list */
             {
                 TY_(InsertNodeBeforeElement)(list, node);
-
-/* #540296 tidy dumps with empty definition list */
-#if 0
-                TY_(DiscardElement)(list);
-#endif
             }
 
             /* #426885 - fix by Glenn Carroll 19 Apr 00, and
@@ -2389,7 +2286,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
 
             if (!(node->tag->model & (CM_BLOCK | CM_INLINE)))
             {
-                TY_(ReportError)(doc, list, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, list, node, TAG_NOT_ALLOWED_IN);
                 return;
             }
 
@@ -2398,12 +2295,12 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
                 return;
 
             node = TY_(InferredTag)(doc, TidyTag_DD);
-            TY_(ReportError)(doc, list, node, MISSING_STARTTAG);
+            TY_(Report)(doc, list, node, MISSING_STARTTAG);
         }
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2413,7 +2310,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
         ParseTag( doc, node, IgnoreWhitespace);
     }
 
-    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, list, node, MISSING_ENDTAG_FOR);
 }
 
 static Bool FindLastLI( Node *list, Node **lastli )
@@ -2429,20 +2326,21 @@ static Bool FindLastLI( Node *list, Node **lastli )
 
 void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
 {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     static int in_parse_list = 0;
 #endif
     Lexer* lexer = doc->lexer;
     Node *node, *parent, *lastli;
     Bool wasblock;
+    Bool nodeisOL = nodeIsOL(list);
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_list++;
     SPRTF("Entering ParseList %d...\n",in_parse_list);
 #endif
     if (list->tag->model & CM_EMPTY)
     {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
         in_parse_list--;
         SPRTF("Exit ParseList 1 %d... CM_EMPTY\n",in_parse_list);
 #endif
@@ -2452,11 +2350,12 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
 
     while ((node = TY_(GetToken)( doc, IgnoreWhitespace)) != NULL)
     {
+        Bool foundLI = no;
         if (node->tag == list->tag && node->type == EndTag)
         {
             TY_(FreeNode)( doc, node);
             list->closed = yes;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_list--;
             SPRTF("Exit ParseList 2 %d... Endtag\n",in_parse_list);
 #endif
@@ -2469,10 +2368,25 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
 
         if (node->type != TextNode && node->tag == NULL)
         {
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
+        if (lexer && (node->type == TextNode))
+        {
+            uint ch, ix = node->start;
+            /* Issue #572 - Skip whitespace. */
+            while (ix < node->end && (ch = (lexer->lexbuf[ix] & 0xff))
+                && (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'))
+                ++ix;
+            if (ix >= node->end)
+            {
+                /* Issue #572 - Discard if ALL whitespace. */
+                TY_(FreeNode)(doc, node);
+                continue;
+            }
+        }
+
 
         /* 
           if this is the end tag for an ancestor element
@@ -2483,14 +2397,14 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node );
                 continue;
             }
 
             if (TY_(nodeHasCM)(node,CM_INLINE))
             {
-                TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
                 TY_(PopInline)( doc, node );
                 TY_(FreeNode)( doc, node);
                 continue;
@@ -2506,9 +2420,9 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                     break;
                 if (node->tag == parent->tag)
                 {
-                    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_BEFORE);
+                    TY_(Report)(doc, list, node, MISSING_ENDTAG_BEFORE);
                     TY_(UngetToken)( doc );
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_list--;
                     SPRTF("Exit ParseList 3 %d... No End Tag\n",in_parse_list);
 #endif
@@ -2516,15 +2430,21 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                 }
             }
 
-            TY_(ReportError)(doc, list, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, list, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
 
-        if ( nodeIsLI(node) || TY_(IsHTML5Mode)(doc))
+        if ( !nodeIsLI(node) && nodeisOL )
         {
-            /* node is <LI> 
-               Issue #396 - A <ul> can have Zero or more li elements
+            /* Issue #572 - A <ol><li> can have nested <ol> elements */
+            foundLI = FindLastLI(list, &lastli); /* find last <li> */
+        }
+
+        if ( nodeIsLI(node) || (TY_(IsHTML5Mode)(doc) && !foundLI) )
+        {
+            /* node is <LI> OR
+               Issue #396 - A <ul> can have Zero or more <li> elements
              */
             TY_(InsertNodeAtEnd)(list,node);
         }
@@ -2534,8 +2454,8 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
 
             if (TY_(nodeHasCM)(node,CM_BLOCK) && lexer->excludeBlocks)
             {
-                TY_(ReportError)(doc, list, node, MISSING_ENDTAG_BEFORE);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+                TY_(Report)(doc, list, node, MISSING_ENDTAG_BEFORE);
+#if defined(ENABLE_DEBUG_LOG)
                 in_parse_list--;
                 SPRTF("Exit ParseList 4 %d... No End Tag\n",in_parse_list);
 #endif
@@ -2547,7 +2467,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                       && (TY_(nodeHasCM)(node, CM_TABLE|CM_ROWGRP|CM_ROW)
                           || nodeIsTABLE(node)) )
             {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                 in_parse_list--;
                 SPRTF("Exit ParseList 5 %d... exiled\n",in_parse_list);
 #endif
@@ -2561,7 +2481,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
             {
                 /* Create a node for error reporting */
                 node = TY_(InferredTag)(doc, TidyTag_LI);
-                TY_(ReportError)(doc, list, node, MISSING_STARTTAG );
+                TY_(Report)(doc, list, node, MISSING_STARTTAG );
                 TY_(FreeNode)( doc, node);
                 node = lastli;
             }
@@ -2577,7 +2497,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                                        ? "list-style: none; display: inline"
                                        : "list-style: none" 
                                        );
-                TY_(ReportError)(doc, list, node, MISSING_STARTTAG );
+                TY_(Report)(doc, list, node, MISSING_STARTTAG );
                 TY_(InsertNodeAtEnd)(list,node);
             }
         }
@@ -2585,8 +2505,8 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
         ParseTag( doc, node, IgnoreWhitespace);
     }
 
-    TY_(ReportError)(doc, list, node, MISSING_ENDTAG_FOR);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+    TY_(Report)(doc, list, node, MISSING_ENDTAG_FOR);
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_list--;
     SPRTF("Exit ParseList 6 %d... missing end tag\n",in_parse_list);
 #endif
@@ -2628,7 +2548,7 @@ static void FixEmptyRow(TidyDocImpl* doc, Node *row)
     {
         cell = TY_(InferredTag)(doc, TidyTag_TD);
         TY_(InsertNodeAtEnd)(row, cell);
-        TY_(ReportError)(doc, row, cell, MISSING_STARTTAG);
+        TY_(Report)(doc, row, cell, MISSING_STARTTAG);
     }
 }
 
@@ -2677,14 +2597,14 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
                 if ( nodeIsFORM(node) )
                     BadForm( doc );
 
-                TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, row, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if ( nodeIsTD(node) || nodeIsTH(node) )
             {
-                TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, row, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2697,7 +2617,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
         /* discard unknown tags */
         if (node->tag == NULL && node->type != TextNode)
         {
-            TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, row, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2705,7 +2625,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
         /* discard unexpected <table> element */
         if ( nodeIsTABLE(node) )
         {
-            TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, row, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2719,7 +2639,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, row, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, row, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2735,13 +2655,13 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
             {
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_TD);
-                TY_(ReportError)(doc, row, node, MISSING_STARTTAG);
+                TY_(Report)(doc, row, node, MISSING_STARTTAG);
             }
             else if ( TY_(nodeIsText)(node)
                       || TY_(nodeHasCM)(node, CM_BLOCK | CM_INLINE) )
             {
                 MoveBeforeTable( doc, row, node );
-                TY_(ReportError)(doc, row, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, row, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
                 exclude_state = lexer->excludeBlocks;
                 lexer->excludeBlocks = no;
@@ -2755,7 +2675,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
             }
             else if (node->tag->model & CM_HEAD)
             {
-                TY_(ReportError)(doc, row, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, row, node, TAG_NOT_ALLOWED_IN);
                 MoveToHead( doc, row, node);
                 continue;
             }
@@ -2763,7 +2683,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
 
         if ( !(nodeIsTD(node) || nodeIsTH(node)) )
         {
-            TY_(ReportError)(doc, row, node, TAG_NOT_ALLOWED_IN);
+            TY_(Report)(doc, row, node, TAG_NOT_ALLOWED_IN);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2820,7 +2740,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
         /* discard unknown tags */
         if (node->tag == NULL && node->type != TextNode)
         {
-            TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2837,13 +2757,13 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
             {
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_TR);
-                TY_(ReportError)(doc, rowgroup, node, MISSING_STARTTAG);
+                TY_(Report)(doc, rowgroup, node, MISSING_STARTTAG);
             }
             else if ( TY_(nodeIsText)(node)
                       || TY_(nodeHasCM)(node, CM_BLOCK|CM_INLINE) )
             {
                 MoveBeforeTable( doc, rowgroup, node );
-                TY_(ReportError)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
 
                 if (node->type != TextNode)
@@ -2854,7 +2774,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
             }
             else if (node->tag->model & CM_HEAD)
             {
-                TY_(ReportError)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, rowgroup, node, TAG_NOT_ALLOWED_IN);
                 MoveToHead(doc, rowgroup, node);
                 continue;
             }
@@ -2871,14 +2791,14 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
                 if ( nodeIsFORM(node) )
                     BadForm( doc );
 
-                TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if ( nodeIsTR(node) || nodeIsTD(node) || nodeIsTH(node) )
             {
-                TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2910,7 +2830,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, rowgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2918,7 +2838,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
         if ( !nodeIsTR(node) )
         {
             node = TY_(InferredTag)(doc, TidyTag_TR);
-            TY_(ReportError)(doc, rowgroup, node, MISSING_STARTTAG);
+            TY_(Report)(doc, rowgroup, node, MISSING_STARTTAG);
             TY_(UngetToken)( doc );
         }
 
@@ -2954,7 +2874,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, colgroup, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, colgroup, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -2984,7 +2904,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
         /* discard unknown tags */
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, colgroup, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, colgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -2997,7 +2917,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, colgroup, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, colgroup, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3010,7 +2930,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
 
 void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(mode))
 {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     static int in_parse_table = 0;
 #endif
     Lexer* lexer = doc->lexer;
@@ -3020,7 +2940,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
     TY_(DeferDup)( doc );
     istackbase = lexer->istackbase;
     lexer->istackbase = lexer->istacksize;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_table++;
     SPRTF("Entering ParseTableTag %d...\n",in_parse_table);
 #endif
@@ -3041,11 +2961,11 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
                  * this second <table>
                  */
                 TY_(UngetToken)(doc);
-                TY_(ReportError)(doc, table, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, table, node, TAG_NOT_ALLOWED_IN);
             }
             lexer->istackbase = istackbase;
             table->closed = yes;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_table--;
             SPRTF("Exit ParseTableTag 1 %d... EndTag\n",in_parse_table);
 #endif
@@ -3059,7 +2979,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
         /* discard unknown tags */
         if (node->tag == NULL && node->type != TextNode)
         {
-            TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, table, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3072,12 +2992,12 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             {
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_TR);
-                TY_(ReportError)(doc, table, node, MISSING_STARTTAG);
+                TY_(Report)(doc, table, node, MISSING_STARTTAG);
             }
             else if ( TY_(nodeIsText)(node) ||TY_(nodeHasCM)(node,CM_BLOCK|CM_INLINE) )
             {
                 TY_(InsertNodeBeforeElement)(table, node);
-                TY_(ReportError)(doc, table, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, table, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
 
                 if (node->type != TextNode) 
@@ -3102,7 +3022,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             if ( nodeIsFORM(node) )
             {
                 BadForm( doc );
-                TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, table, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -3111,7 +3031,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             if ( TY_(nodeHasCM)(node, CM_TABLE|CM_ROW) ||
                  TY_(nodeHasCM)(node, CM_BLOCK|CM_INLINE) )
             {
-                TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, table, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -3122,10 +3042,10 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             {
                 if (node->tag == parent->tag)
                 {
-                    TY_(ReportError)(doc, table, node, MISSING_ENDTAG_BEFORE );
+                    TY_(Report)(doc, table, node, MISSING_ENDTAG_BEFORE );
                     TY_(UngetToken)( doc );
                     lexer->istackbase = istackbase;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
                     in_parse_table--;
                     SPRTF("Exit ParseTableTag 2 %d... missing EndTag\n",in_parse_table);
 #endif
@@ -3137,9 +3057,9 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
         if (!(node->tag->model & CM_TABLE))
         {
             TY_(UngetToken)( doc );
-            TY_(ReportError)(doc, table, node, TAG_NOT_ALLOWED_IN);
+            TY_(Report)(doc, table, node, TAG_NOT_ALLOWED_IN);
             lexer->istackbase = istackbase;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_table--;
             SPRTF("Exit ParseTableTag 3 %d... CM_TABLE\n",in_parse_table);
 #endif
@@ -3154,13 +3074,13 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
         }
 
         /* discard unexpected text nodes and end tags */
-        TY_(ReportError)(doc, table, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, table, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, table, node, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, table, node, MISSING_ENDTAG_FOR);
     lexer->istackbase = istackbase;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_table--;
     SPRTF("Exit ParseTableTag 4 %d... missing end\n",in_parse_table);
 #endif
@@ -3197,7 +3117,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
         {
             if (nodeIsBODY(node) || nodeIsHTML(node))
             {
-                TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, pre, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)(doc, node);
                 continue;
             }
@@ -3207,7 +3127,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             }
             else
             {
-                TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_BEFORE );
+                TY_(Report)(doc, pre, node, MISSING_ENDTAG_BEFORE );
                 TY_(UngetToken)( doc );
             }
             pre->closed = yes;
@@ -3227,7 +3147,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
 
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, pre, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -3249,7 +3169,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
                   return;
                }
 
-               TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+               TY_(Report)(doc, pre, node, DISCARDING_UNEXPECTED);
                TY_(FreeNode)(doc, node);
                continue;
             }
@@ -3259,7 +3179,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             {
                 if (!doc->lexer->exiled)
                     /* No missing close warning if exiled. */
-                    TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_BEFORE);
+                    TY_(Report)(doc, pre, node, MISSING_ENDTAG_BEFORE);
 
                 TY_(UngetToken)(doc);
                 return;
@@ -3303,11 +3223,11 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
               Todo: discarding </p> is abviously a bug, it should be replaced by <br>.
             */
             TY_(InsertNodeAfterElement)(pre, node);
-            TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_BEFORE);
+            TY_(Report)(doc, pre, node, MISSING_ENDTAG_BEFORE);
             ParseTag(doc, node, IgnoreWhitespace);
 
             newnode = TY_(InferredTag)(doc, TidyTag_PRE);
-            TY_(ReportError)(doc, pre, newnode, INSERTING_TAG);
+            TY_(Report)(doc, pre, newnode, INSERTING_TAG);
             pre = newnode;
             TY_(InsertNodeAfterElement)(node, pre);
 
@@ -3318,7 +3238,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
         {
             if (node->type == StartTag)
             {
-                TY_(ReportError)(doc, pre, node, USING_BR_INPLACE_OF);
+                TY_(Report)(doc, pre, node, USING_BR_INPLACE_OF);
 
                 /* trim white space before <p> in <pre>*/
                 TrimSpaces(doc, pre);
@@ -3330,7 +3250,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             }
             else
             {
-                TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, pre, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
             }
             continue;
@@ -3348,11 +3268,11 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, pre, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, pre, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, pre, node, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, pre, node, MISSING_ENDTAG_FOR);
 }
 
 void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mode))
@@ -3380,7 +3300,7 @@ void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
              (nodeIsOPTION(node) || nodeIsOPTGROUP(node)) )
         {
             if ( nodeIsOPTGROUP(node) )
-                TY_(ReportError)(doc, field, node, CANT_BE_NESTED);
+                TY_(Report)(doc, field, node, CANT_BE_NESTED);
 
             TY_(InsertNodeAtEnd)(field, node);
             ParseTag(doc, node, MixedContent);
@@ -3388,7 +3308,7 @@ void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED );
+        TY_(Report)(doc, field, node, DISCARDING_UNEXPECTED );
         TY_(FreeNode)( doc, node);
     }
 }
@@ -3396,14 +3316,14 @@ void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
 
 void TY_(ParseSelect)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mode))
 {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     static int in_parse_select = 0;
 #endif
     Lexer* lexer = doc->lexer;
     Node *node;
 
     lexer->insert = NULL;  /* defer implicit inline start tags */
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_select++;
     SPRTF("Entering ParseSelect %d...\n",in_parse_select);
 #endif
@@ -3415,7 +3335,7 @@ void TY_(ParseSelect)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mod
             TY_(FreeNode)( doc, node);
             field->closed = yes;
             TrimSpaces(doc, field);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_select--;
             SPRTF("Exit ParseSelect 1 %d...\n",in_parse_select);
 #endif
@@ -3439,12 +3359,12 @@ void TY_(ParseSelect)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mod
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, field, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, field, node, MISSING_ENDTAG_FOR);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+    TY_(Report)(doc, field, node, MISSING_ENDTAG_FOR);
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_select--;
     SPRTF("Exit ParseSelect 2 %d...\n",in_parse_select);
 #endif
@@ -3453,14 +3373,14 @@ void TY_(ParseSelect)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mod
 /* HTML5 */
 void TY_(ParseDatalist)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mode))
 {
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     static int in_parse_datalist = 0;
 #endif
     Lexer* lexer = doc->lexer;
     Node *node;
 
     lexer->insert = NULL;  /* defer implicit inline start tags */
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_datalist++;
     SPRTF("Entering ParseDatalist %d...\n",in_parse_datalist);
 #endif
@@ -3472,7 +3392,7 @@ void TY_(ParseDatalist)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
             TY_(FreeNode)( doc, node);
             field->closed = yes;
             TrimSpaces(doc, field);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
             in_parse_datalist--;
             SPRTF("Exit ParseDatalist 1 %d...\n",in_parse_datalist);
 #endif
@@ -3496,12 +3416,12 @@ void TY_(ParseDatalist)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, field, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, field, node, MISSING_ENDTAG_FOR);
-#if !defined(NDEBUG) && defined(_MSC_VER)
+    TY_(Report)(doc, field, node, MISSING_ENDTAG_FOR);
+#if defined(ENABLE_DEBUG_LOG)
     in_parse_datalist--;
     SPRTF("Exit ParseDatalist 2 %d...\n",in_parse_datalist);
 #endif
@@ -3559,14 +3479,14 @@ void TY_(ParseText)(TidyDocImpl* doc, Node *field, GetTokenMode mode)
             && node->tag->model & CM_INLINE
             && !(node->tag->model & CM_FIELD)) /* #487283 - fix by Lee Passey 25 Jan 02 */
         {
-            TY_(ReportError)(doc, field, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, field, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
 
         /* terminate element on other tags */
         if (!(field->tag->model & CM_OPT))
-            TY_(ReportError)(doc, field, node, MISSING_ENDTAG_BEFORE);
+            TY_(Report)(doc, field, node, MISSING_ENDTAG_BEFORE);
 
         TY_(UngetToken)( doc );
         TrimSpaces(doc, field);
@@ -3574,7 +3494,7 @@ void TY_(ParseText)(TidyDocImpl* doc, Node *field, GetTokenMode mode)
     }
 
     if (!(field->tag->model & CM_OPT))
-        TY_(ReportError)(doc, field, node, MISSING_ENDTAG_FOR);
+        TY_(Report)(doc, field, node, MISSING_ENDTAG_FOR);
 }
 
 
@@ -3586,7 +3506,7 @@ void TY_(ParseTitle)(TidyDocImpl* doc, Node *title, GetTokenMode ARG_UNUSED(mode
         if (node->tag == title->tag && node->type == StartTag
             && cfgBool(doc, TidyCoerceEndTags) )
         {
-            TY_(ReportError)(doc, title, node, COERCE_TO_ENDTAG);
+            TY_(Report)(doc, title, node, COERCE_TO_ENDTAG);
             node->type = EndTag;
             TY_(UngetToken)( doc );
             continue;
@@ -3622,19 +3542,19 @@ void TY_(ParseTitle)(TidyDocImpl* doc, Node *title, GetTokenMode ARG_UNUSED(mode
         /* discard unknown tags */
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, title, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, title, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
 
         /* pushback unexpected tokens */
-        TY_(ReportError)(doc, title, node, MISSING_ENDTAG_BEFORE);
+        TY_(Report)(doc, title, node, MISSING_ENDTAG_BEFORE);
         TY_(UngetToken)( doc );
         TrimSpaces(doc, title);
         return;
     }
 
-    TY_(ReportError)(doc, title, node, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, title, node, MISSING_ENDTAG_FOR);
 }
 
 /*
@@ -3659,7 +3579,7 @@ void TY_(ParseScript)(TidyDocImpl* doc, Node *script, GetTokenMode ARG_UNUSED(mo
     else
     {
         /* handle e.g. a document like "<script>" */
-        TY_(ReportError)(doc, script, NULL, MISSING_ENDTAG_FOR);
+        TY_(Report)(doc, script, NULL, MISSING_ENDTAG_FOR);
         return;
     }
 
@@ -3668,7 +3588,7 @@ void TY_(ParseScript)(TidyDocImpl* doc, Node *script, GetTokenMode ARG_UNUSED(mo
     if (!(node && node->type == EndTag && node->tag &&
         node->tag->id == script->tag->id))
     {
-        TY_(ReportError)(doc, script, node, MISSING_ENDTAG_FOR);
+        TY_(Report)(doc, script, node, MISSING_ENDTAG_FOR);
 
         if (node)
             TY_(UngetToken)(doc);
@@ -3707,9 +3627,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
     int HasTitle = 0;
     int HasBase = 0;
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Enter ParseHead...\n");
-#endif
+    DEBUG_LOG(SPRTF("Enter ParseHead...\n"));
     while ((node = TY_(GetToken)(doc, IgnoreWhitespace)) != NULL)
     {
         if (node->tag == head->tag && node->type == EndTag)
@@ -3723,7 +3641,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         /* find and discard <html> in <head> elements */
         if ((node->tag == head->tag || nodeIsHTML(node)) && node->type == StartTag)
         {
-            TY_(ReportError)(doc, head, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, head, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -3737,7 +3655,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
             if (!cfgBool( doc, TidyOmitOptionalTags ) &&
                 !showingBodyOnly(doc) )
             {
-                TY_(ReportError)(doc, head, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, head, node, TAG_NOT_ALLOWED_IN);
             }
             TY_(UngetToken)( doc );
             break;
@@ -3746,7 +3664,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         if (node->type == ProcInsTag && node->element &&
             TY_(tmbstrcmp)(node->element, "xml-stylesheet") == 0)
         {
-            TY_(ReportError)(doc, head, node, TAG_NOT_ALLOWED_IN);
+            TY_(Report)(doc, head, node, TAG_NOT_ALLOWED_IN);
             TY_(InsertNodeBeforeElement)(TY_(FindHTML)(doc), node);
             continue;
         }
@@ -3764,7 +3682,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         /* discard unknown tags */
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, head, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, head, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -3778,7 +3696,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
         {
             /* #545067 Implicit closing of head broken - warn only for XHTML input */
             if ( lexer->isvoyager )
-                TY_(ReportError)(doc, head, node, TAG_NOT_ALLOWED_IN );
+                TY_(Report)(doc, head, node, TAG_NOT_ALLOWED_IN );
             TY_(UngetToken)( doc );
             break;
         }
@@ -3790,7 +3708,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
                 ++HasTitle;
 
                 if (HasTitle > 1)
-                    TY_(ReportError)(doc, head, node,
+                    TY_(Report)(doc, head, node,
                                      head ?
                                      TOO_MANY_ELEMENTS_IN : TOO_MANY_ELEMENTS);
             }
@@ -3799,66 +3717,21 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
                 ++HasBase;
 
                 if (HasBase > 1)
-                    TY_(ReportError)(doc, head, node,
+                    TY_(Report)(doc, head, node,
                                      head ?
                                      TOO_MANY_ELEMENTS_IN : TOO_MANY_ELEMENTS);
             }
 
-#ifdef AUTO_INPUT_ENCODING
-            else if (nodeIsMETA(node))
-            {
-                AttVal * httpEquiv = AttrGetById(node, TidyAttr_HTTP_EQUIV);
-                AttVal * content = AttrGetById(node, TidyAttr_CONTENT);
-                if (httpEquiv && AttrValueIs(httpEquiv, "Content-Type") && AttrHasValue(content))
-                {
-                    tmbstr val, charset;
-                    uint end = 0;
-                    val = charset = TY_(tmbstrdup)(doc->allocator, content->value);
-                    val = TY_(tmbstrtolower)(val);
-                    val = strstr(content->value, "charset");
-                    
-                    if (val)
-                        val += 7;
-
-                    while(val && *val && (TY_(IsWhite)((tchar)*val) ||
-                          *val == '=' || *val == '"' || *val == '\''))
-                        ++val;
-
-                    while(val && val[end] && !(TY_(IsWhite)((tchar)val[end]) ||
-                          val[end] == '"' || val[end] == '\'' || val[end] == ';'))
-                        ++end;
-
-                    if (val && end)
-                    {
-                        tmbstr encoding = TY_(tmbstrndup)(doc->allocator,val, end);
-                        uint id = TY_(GetEncodingIdFromName)(encoding);
-
-                        /* todo: detect mismatch with BOM/XMLDecl/declared */
-                        /* todo: error for unsupported encodings */
-                        /* todo: try to re-init transcoder */
-                        /* todo: change input/output encoding settings */
-                        /* todo: store id in StreamIn */
-
-                        TidyDocFree(doc, encoding);
-                    }
-
-                    TidyDocFree(doc, charset);
-                }
-            }
-#endif /* AUTO_INPUT_ENCODING */
-
             TY_(InsertNodeAtEnd)(head, node);
             ParseTag(doc, node, IgnoreWhitespace);
             continue;
         }
 
         /* discard unexpected text nodes and end tags */
-        TY_(ReportError)(doc, head, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, head, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Exit ParseHead 1...\n");
-#endif
+    DEBUG_LOG(SPRTF("Exit ParseHead 1...\n"));
 }
 
 /*\ 
@@ -3912,16 +3785,14 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
     checkstack = yes;
 
     TY_(BumpObject)( doc, body->parent );
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Enter ParseBody...\n");
-#endif
 
+    DEBUG_LOG(SPRTF("Enter ParseBody...\n"));
     while ((node = TY_(GetToken)(doc, mode)) != NULL)
     {
         /* find and discard multiple <body> elements */
         if (node->tag == body->tag && node->type == StartTag)
         {
-            TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, body, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -3930,7 +3801,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         if ( nodeIsHTML(node) )
         {
             if (TY_(nodeIsElement)(node) || lexer->seenEndHtml) 
-                TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, body, node, DISCARDING_UNEXPECTED);
             else
                 lexer->seenEndHtml = 1;
 
@@ -3943,7 +3814,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
                node->type == EndTag   ||
                node->type == StartEndTag ) )
         {
-            TY_(ReportError)(doc, body, node, CONTENT_AFTER_BODY );
+            TY_(Report)(doc, body, node, CONTENT_AFTER_BODY );
         }
 
         if ( node->tag == body->tag && node->type == EndTag )
@@ -3996,15 +3867,6 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         if (InsertMisc(body, node))
             continue;
 
-        /* #538536 Extra endtags not detected */
-#if 0
-        if ( lexer->seenEndBody == 1 && !iswhitenode )
-        {
-            ++lexer->seenEndBody;
-            TY_(ReportError)(doc, body, node, CONTENT_AFTER_BODY);
-        }
-#endif
-
         /* mixed content model permits text */
         if (TY_(nodeIsText)(node))
         {
@@ -4038,7 +3900,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         /* discard unknown  and PARAM tags */
         if ( node->tag == NULL || nodeIsPARAM(node) )
         {
-            TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, body, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -4057,7 +3919,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         {
             /* avoid this error message being issued twice */
             if (!(node->tag->model & CM_HEAD))
-                TY_(ReportError)(doc, body, node, TAG_NOT_ALLOWED_IN);
+                TY_(Report)(doc, body, node, TAG_NOT_ALLOWED_IN);
 
             if (node->tag->model & CM_HTML)
             {
@@ -4129,12 +3991,6 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
             {
                 node->type = StartEndTag;
                 node->implicit = yes;
-#if OBSOLETE
-                TY_(CoerceNode)(doc, node, TidyTag_BR, no, no);
-                FreeAttrs( doc, node ); /* discard align attribute etc. */
-                TY_(InsertNodeAtEnd)(body, node);
-                node = TY_(InferredTag)(doc, TidyTag_BR);
-#endif
             }
             else if ( TY_(nodeHasCM)(node, CM_INLINE) )
                 TY_(PopInline)( doc, node );
@@ -4149,7 +4005,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
                 if ( TY_(FindNodeById)(doc, TidyTag_MAIN) )
                 {
                     doc->badForm |= flg_BadMain; /* this is an ERROR in format */
-                    TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+                    TY_(Report)(doc, body, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
@@ -4183,7 +4039,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
             }
 
             if (node->implicit)
-                TY_(ReportError)(doc, body, node, INSERTING_TAG);
+                TY_(Report)(doc, body, node, INSERTING_TAG);
 
             TY_(InsertNodeAtEnd)(body, node);
             ParseTag(doc, node, mode);
@@ -4191,12 +4047,10 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         }
 
         /* discard unexpected tags */
-        TY_(ReportError)(doc, body, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, body, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Exit ParseBody 1...\n");
-#endif
+    DEBUG_LOG(SPRTF("Exit ParseBody 1...\n"));
 }
 
 void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
@@ -4225,12 +4079,12 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
             TrimSpaces(doc, noframes);
             if (node->type == EndTag)
             {
-                TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, noframes, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);       /* Throw it away */
             }
             else
             {
-                TY_(ReportError)(doc, noframes, node, MISSING_ENDTAG_BEFORE);
+                TY_(Report)(doc, noframes, node, MISSING_ENDTAG_BEFORE);
                 TY_(UngetToken)( doc );
             }
             return;
@@ -4239,7 +4093,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
         if ( nodeIsHTML(node) )
         {
             if (TY_(nodeIsElement)(node))
-                TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, noframes, node, DISCARDING_UNEXPECTED);
 
             TY_(FreeNode)( doc, node);
             continue;
@@ -4272,7 +4126,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
             {
                 if ( body == NULL )
                 {
-                    TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+                    TY_(Report)(doc, noframes, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)( doc, node);
                     continue;
                 }
@@ -4280,7 +4134,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
                 {
                     TY_(UngetToken)( doc );
                     node = TY_(InferredTag)(doc, TidyTag_P);
-                    TY_(ReportError)(doc, noframes, node, CONTENT_AFTER_BODY );
+                    TY_(Report)(doc, noframes, node, CONTENT_AFTER_BODY );
                 }
                 TY_(InsertNodeAtEnd)( body, node );
             }
@@ -4289,7 +4143,7 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
                 TY_(UngetToken)( doc );
                 node = TY_(InferredTag)(doc, TidyTag_BODY);
                 if ( cfgBool(doc, TidyXmlOut) )
-                    TY_(ReportError)(doc, noframes, node, INSERTING_TAG);
+                    TY_(Report)(doc, noframes, node, INSERTING_TAG);
                 TY_(InsertNodeAtEnd)( noframes, node );
             }
 
@@ -4298,11 +4152,11 @@ void TY_(ParseNoFrames)(TidyDocImpl* doc, Node *noframes, GetTokenMode mode)
         }
 
         /* discard unexpected end tags */
-        TY_(ReportError)(doc, noframes, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, noframes, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, noframes, node, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, noframes, node, MISSING_ENDTAG_FOR);
 }
 
 void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSED(mode))
@@ -4331,7 +4185,7 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
 
         if (node->tag == NULL)
         {
-            TY_(ReportError)(doc, frameset, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, frameset, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue; 
         }
@@ -4349,7 +4203,7 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
         {
             TY_(UngetToken)( doc );
             node = TY_(InferredTag)(doc, TidyTag_NOFRAMES);
-            TY_(ReportError)(doc, frameset, node, INSERTING_TAG);
+            TY_(Report)(doc, frameset, node, INSERTING_TAG);
         }
 
         if (node->type == StartTag && (node->tag->model & CM_FRAMES))
@@ -4366,17 +4220,15 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
         }
 
         /* discard unexpected tags */
-#if SUPPORT_ACCESSIBILITY_CHECKS
         /* WAI [6.5.1.4] link is being discarded outside of NOFRAME */
         if ( nodeIsA(node) )
            doc->badAccess |= BA_INVALID_LINK_NOFRAMES;
-#endif
 
-        TY_(ReportError)(doc, frameset, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, frameset, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
-    TY_(ReportError)(doc, frameset, node, MISSING_ENDTAG_FOR);
+    TY_(Report)(doc, frameset, node, MISSING_ENDTAG_FOR);
 }
 
 void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
@@ -4385,9 +4237,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
     Node *frameset = NULL;
     Node *noframes = NULL;
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Entering ParseHTML...\n");
-#endif
+    DEBUG_LOG(SPRTF("Entering ParseHTML...\n"));
     TY_(SetOptionBool)( doc, TidyXmlTags, no );
 
     for (;;)
@@ -4405,7 +4255,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
 
         if (node->tag == html->tag && node->type == EndTag)
         {
-            TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -4413,7 +4263,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         /* find and discard multiple <html> elements */
         if (node->tag == html->tag && node->type == StartTag)
         {
-            TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)(doc, node);
             continue;
         }
@@ -4443,9 +4293,8 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
                 TY_(InsertNodeAtEnd)(html, node);
                 TY_(ParseBody)(doc, node, mode);
             }
-#if !defined(NDEBUG) && defined(_MSC_VER)
-            SPRTF("Exit ParseHTML 1...\n");
-#endif
+
+            DEBUG_LOG(SPRTF("Exit ParseHTML 1...\n"));
             return;
         }
 
@@ -4453,7 +4302,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         if (node->tag == html->tag)
         {
             if (node->type != StartTag && frameset == NULL)
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
 
             TY_(FreeNode)( doc, node);
             continue;
@@ -4468,7 +4317,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         {
             if (node->type != StartTag)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
@@ -4483,7 +4332,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
                     {
                         noframes = TY_(InferredTag)(doc, TidyTag_NOFRAMES);
                         TY_(InsertNodeAtEnd)(frameset, noframes);
-                        TY_(ReportError)(doc, html, noframes, INSERTING_TAG);
+                        TY_(Report)(doc, html, noframes, INSERTING_TAG);
                     }
                     else
                     {
@@ -4505,13 +4354,13 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         {
             if (node->type != StartTag)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if (frameset != NULL)
-                TY_(ReportFatal)(doc, html, node, DUPLICATE_FRAMESET);
+                TY_(Report)(doc, html, node, DUPLICATE_FRAMESET);
             else
                 frameset = node;
 
@@ -4536,14 +4385,14 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         {
             if (node->type != StartTag)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 continue;
             }
 
             if (frameset == NULL)
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
                 node = TY_(InferredTag)(doc, TidyTag_BODY);
                 break;
@@ -4572,7 +4421,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
             /* discard illegal frame element following a frameset */
             if ( frameset != NULL && nodeIsFRAME(node) )
             {
-                TY_(ReportError)(doc, html, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)(doc, node);
                 continue;
             }
@@ -4591,7 +4440,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
             }
             else
             {
-                TY_(ReportError)(doc, html, node, NOFRAMES_CONTENT);
+                TY_(Report)(doc, html, node, NOFRAMES_CONTENT);
                 if (noframes->type == StartEndTag)
                     noframes->type = StartTag;
             }
@@ -4605,7 +4454,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
         /* Issue #132 - disable inserting BODY tag warning
            BUT only if NOT --show-body-only yes */
         if (!showingBodyOnly(doc))
-            TY_(ReportError)(doc, html, node, INSERTING_TAG );
+            TY_(Report)(doc, html, node, INSERTING_TAG );
         TY_(ConstrainVersion)(doc, ~VERS_FRAMESET);
         break;
     }
@@ -4614,9 +4463,7 @@ void TY_(ParseHTML)(TidyDocImpl* doc, Node *html, GetTokenMode mode)
 
     TY_(InsertNodeAtEnd)(html, node);
     ParseTag(doc, node, mode);
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    SPRTF("Exit ParseHTML 2...\n");
-#endif
+    DEBUG_LOG(SPRTF("Exit ParseHTML 2...\n"));
 }
 
 static Bool nodeCMIsOnlyInline( Node* node )
@@ -4764,31 +4611,15 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
 
             if (TY_(FindXmlDecl)(doc) && doc->root.content)
             {
-                TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)(doc, node);
                 continue;
             }
             if (node->line > 1 || node->column != 1)
             {
-                TY_(ReportError)(doc, &doc->root, node, SPACE_PRECEDING_XMLDECL);
-            }
-        }
-#ifdef AUTO_INPUT_ENCODING
-        if (node->type == XmlDecl)
-        {
-            AttVal* encoding = GetAttrByName(node, "encoding");
-            if (AttrHasValue(encoding))
-            {
-                uint id = TY_(GetEncodingIdFromName)(encoding->value);
-
-                /* todo: detect mismatch with BOM/XMLDecl/declared */
-                /* todo: error for unsupported encodings */
-                /* todo: try to re-init transcoder */
-                /* todo: change input/output encoding settings */
-                /* todo: store id in StreamIn */
+                TY_(Report)(doc, &doc->root, node, SPACE_PRECEDING_XMLDECL);
             }
         }
-#endif /* AUTO_INPUT_ENCODING */
 
         /* deal with comments etc. */
         if (InsertMisc( &doc->root, node ))
@@ -4803,7 +4634,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
             }
             else
             {
-                TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
             }
             continue;
@@ -4811,7 +4642,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
 
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+            TY_(Report)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -4855,7 +4686,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
         {
             ulong dtmode = cfg( doc, TidyDoctypeMode );
             if ((dtmode != TidyDoctypeOmit) && !showingBodyOnly(doc))
-                TY_(ReportError)(doc, NULL, NULL, MISSING_DOCTYPE);
+                TY_(Report)(doc, NULL, NULL, MISSING_DOCTYPE);
             if ((dtmode != TidyDoctypeAuto) && (dtmode != TidyDoctypeHtml5))
             {
                 /*\
@@ -4870,11 +4701,9 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
         break;
     }
 
-#if SUPPORT_ACCESSIBILITY_CHECKS
     /* do this before any more document fixes */
     if ( cfg( doc, TidyAccessibilityCheckLevel ) > 0 )
         TY_(AccessibilityChecks)( doc );
-#endif /* #if SUPPORT_ACCESSIBILITY_CHECKS */
 
     if (!TY_(FindHTML)(doc))
     {
@@ -4890,7 +4719,7 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
         /* #72, avoid MISSING_TITLE_ELEMENT if show-body-only (but allow InsertNodeAtEnd to avoid new warning) */
         if (!showingBodyOnly(doc))
         {
-            TY_(ReportError)(doc, head, NULL, MISSING_TITLE_ELEMENT);
+            TY_(Report)(doc, head, NULL, MISSING_TITLE_ELEMENT);
         }
         TY_(InsertNodeAtEnd)(head, TY_(InferredTag)(doc, TidyTag_TITLE));
     }
@@ -4967,9 +4796,9 @@ static void ParseXMLElement(TidyDocImpl* doc, Node *element, GetTokenMode mode)
         if (node->type == EndTag)
         {
             if (element)
-                TY_(ReportFatal)(doc, element, node, UNEXPECTED_ENDTAG_IN);
+                TY_(Report)(doc, element, node, UNEXPECTED_ENDTAG_IN);
             else
-                TY_(ReportFatal)(doc, element, node, UNEXPECTED_ENDTAG);
+                TY_(Report)(doc, element, node, UNEXPECTED_ENDTAG_ERR);
 
             TY_(FreeNode)( doc, node);
             continue;
@@ -5032,7 +4861,7 @@ void TY_(ParseXMLDocument)(TidyDocImpl* doc)
         /* discard unexpected end tags */
         if (node->type == EndTag)
         {
-            TY_(ReportError)(doc, NULL, node, UNEXPECTED_ENDTAG);
+            TY_(Report)(doc, NULL, node, UNEXPECTED_ENDTAG);
             TY_(FreeNode)( doc, node);
             continue;
         }
@@ -5050,7 +4879,7 @@ void TY_(ParseXMLDocument)(TidyDocImpl* doc)
             }
             else
             {
-                TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+                TY_(Report)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
                 TY_(FreeNode)( doc, node);
             }
             continue;
@@ -5070,7 +4899,7 @@ void TY_(ParseXMLDocument)(TidyDocImpl* doc)
             continue;
         }
 
-        TY_(ReportError)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
+        TY_(Report)(doc, &doc->root, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
 
diff --git a/HTMLTidy/vendor/tidy-html5/src/parser.h b/HTMLTidy/vendor/tidy-html5/src/parser.h
index 3ad42b8f..6c4b6afa 100644
--- a/HTMLTidy/vendor/tidy-html5/src/parser.h
+++ b/HTMLTidy/vendor/tidy-html5/src/parser.h
@@ -1,70 +1,205 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
-/* parser.h -- HTML Parser
-
-  (c) 1998-2007 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-  
-*/
+/**************************************************************************//**
+ * @file
+ * HTML and XML Parsers.
+ *
+ * Tidy's HTML parser corrects many conditions and enforces certain user
+ * preferences during the parsing process. The XML parser produces a tree
+ * of nodes useful to Tidy but also suitable for use in other XML processing
+ * applications.
+ *
+ * @author  HTACG, et al (consult git log)
+ *
+ * @copyright
+ *     Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts
+ *     Institute of Technology, European Research Consortium for Informatics
+ *     and Mathematics, Keio University) and HTACG.
+ * @par
+ *     All Rights Reserved.
+ * @par
+ *     See `tidy.h` for the complete license.
+ *
+ * @date Additional updates: consult git log
+ *
+ ******************************************************************************/
 
 #include "forward.h"
 
+/** @addtogroup internal_api */
+/** @{ */
+
+
+/***************************************************************************//**
+ ** @defgroup parser_h HTML and XML Parsing
+ **
+ ** These functions and structures form the internal API for document
+ ** parsing.
+ **
+ ** @{
+ ******************************************************************************/
+
+
+/**
+ *  Is used to perform a node integrity check recursively after parsing
+ *  an HTML or XML document.
+ *  @note Actual performance of this check can be disabled by defining the
+ *  macro NO_NODE_INTEGRITY_CHECK.
+ *  @param node The root node for the integrity check.
+ *  @returns Returns yes or no indicating integrity of the node structure.
+ */
 Bool TY_(CheckNodeIntegrity)(Node *node);
 
+
+/**
+ *  Indicates whether or not a text node ends with a space or newline.
+ *  @note Implementation of this method is found in `pprint.c` for
+ *  some reason.
+ *  @param lexer A reference to the lexer used to lex the document.
+ *  @param node The node to check.
+ *  @returns The result of the check.
+ */
 Bool TY_(TextNodeEndWithSpace)( Lexer *lexer, Node *node );
 
-/*
- used to determine how attributes
- without values should be printed
- this was introduced to deal with
- user defined tags e.g. Cold Fusion
-*/
+
+/**
+ *  Used to check if a node uses CM_NEW, which determines how attributes
+ *  without values should be printed. This was introduced to deal with
+ *  user-defined tags e.g. ColdFusion.
+ *  @param node The node to check.
+ *  @returns The result of the check.
+ */
 Bool TY_(IsNewNode)(Node *node);
 
+
+/**
+ *  Transforms a given node to another element, for example, from a `p`
+ *  to a `br`.
+ *  @param doc The document which the node belongs to.
+ *  @param node The node to coerce.
+ *  @param tid The tag type to coerce the node into.
+ *  @param obsolete If the old node was obsolete, a report will be generated.
+ *  @param expected If the old node was not expected to be found in this
+ *    particular location, a report will be generated.
+ */
 void TY_(CoerceNode)(TidyDocImpl* doc, Node *node, TidyTagId tid, Bool obsolete, Bool expected);
 
-/* extract a node and its children from a markup tree */
+
+/**
+ *  Extract a node and its children from a markup tree.
+ *  @param node The node to remove.
+ *  @returns Returns the removed node.
+ */
 Node *TY_(RemoveNode)(Node *node);
 
-/* remove node from markup tree and discard it */
+
+/**
+ *  Remove node from markup tree and discard it.
+ *  @param doc The Tidy document from which to discarb the node.
+ *  @param element The node to discard.
+ *  @returns Returns the next node.
+ */
 Node *TY_(DiscardElement)( TidyDocImpl* doc, Node *element);
 
-/* insert node into markup tree as the firt element
- of content of element */
+
+/**
+ *  Insert node into markup tree as the firt element of content of element.
+ *  @param element The new destination node.
+ *  @param node The node to insert.
+ */
 void TY_(InsertNodeAtStart)(Node *element, Node *node);
 
-/* insert node into markup tree as the last element
- of content of "element" */
+
+/**
+ *  Insert node into markup tree as the last element of content of element.
+ *  @param element The new destination node.
+ *  @param node The node to insert.
+ */
 void TY_(InsertNodeAtEnd)(Node *element, Node *node);
 
-/* insert node into markup tree before element */
+
+/**
+ *  Insert node into markup tree before element.
+ *  @param element The node before which the node is inserted.
+ *  @param node The node to insert.
+ */
 void TY_(InsertNodeBeforeElement)(Node *element, Node *node);
 
-/* insert node into markup tree after element */
+
+/**
+ *  Insert node into markup tree after element.
+ *  @param element The node after which the node is inserted.
+ *  @param node The node to insert.
+ */
 void TY_(InsertNodeAfterElement)(Node *element, Node *node);
 
+
+/**
+ *  Trims a single, empty element, returning the next node.
+ *  @param doc The Tidy document.
+ *  @param element The element to trim.
+ *  @returns Returns the next node.
+ */
 Node *TY_(TrimEmptyElement)( TidyDocImpl* doc, Node *element );
+
+
+/**
+ *  Trims a tree of empty elements recursively, returning the next node.
+ *  @param doc The Tidy document.
+ *  @param node The element to trim.
+ *  @returns Returns the next node.
+ */
 Node* TY_(DropEmptyElements)(TidyDocImpl* doc, Node* node);
 
 
-/* assumes node is a text node */
+/**
+ *  Indicates whether or not a text node is blank, meaning that it consists
+ *  of nothing, or a single space.
+ *  @param lexer The lexer used to lex the document.
+ *  @param node The node to test.
+ *  @returns Returns the result of the test.
+ */
 Bool TY_(IsBlank)(Lexer *lexer, Node *node);
 
+
+/**
+ *  Indicates whether or not a node is declared as containing javascript
+ *  code.
+ *  @param node The node to test.
+ *  @returns Returns the result of the test.
+ */
 Bool TY_(IsJavaScript)(Node *node);
 
-/*
-  HTML is the top level element
-*/
-void TY_(ParseDocument)( TidyDocImpl* doc );
 
+/**
+ *  Parses a document after lexing using the HTML parser. It begins by properly
+ *  configuring the overall HTML structure, and subsequently processes all
+ *  remaining nodes. HTML is the root node.
+ *  @param doc The Tidy document.
+ */
+void TY_(ParseDocument)( TidyDocImpl* doc );
 
 
-/*
-  XML documents
-*/
+/**
+ *  Indicates whether or not whitespace is to be preserved in XHTML/XML
+ *  documents.
+ *  @param doc The Tidy document.
+ *  @param element The node to test.
+ *  @returns Returns the result of the test.
+ */
 Bool TY_(XMLPreserveWhiteSpace)( TidyDocImpl* doc, Node *element );
 
+
+/**
+ *  Parses a document after lexing using the XML parser.
+ *  @param doc The Tidy document.
+ */
 void TY_(ParseXMLDocument)( TidyDocImpl* doc );
 
+
+/** @} end parser_h group */
+/** @} end internal_api group */
+
 #endif /* __PARSER_H__ */
+
diff --git a/HTMLTidy/vendor/tidy-html5/src/pprint.c b/HTMLTidy/vendor/tidy-html5/src/pprint.c
index 68e8d447..57cd7b1a 100644
--- a/HTMLTidy/vendor/tidy-html5/src/pprint.c
+++ b/HTMLTidy/vendor/tidy-html5/src/pprint.c
@@ -18,16 +18,11 @@
 #include "utf8.h"
 
 /* *** FOR DEBUG ONLY *** */
-#if !defined(NDEBUG) && defined(_MSC_VER)
 /* #define DEBUG_PPRINT */
 /* #define DEBUG_INDENT */
-#ifdef DEBUG_PPRINT
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_PPRINT)
 extern void dbg_show_node( TidyDocImpl* doc, Node *node, int caller, int indent );
 #endif
-#ifdef DEBUG_INDENT
-#include "sprtf.h"
-#endif
-#endif
 
 /*
   Block-level and unknown elements are printed on
@@ -69,7 +64,6 @@ void TY_(PPrintSpaces)(void)
     indent_char = ' ';
 }
 
-#if SUPPORT_ASIAN_ENCODINGS
 /* #431953 - start RJ Wraplen adjusted for smooth international ride */
 
 typedef enum
@@ -128,36 +122,6 @@ static struct _unicode4cat
   UnicodeCategory category;
 } const unicode4cat[] =
 {
-#if 0
-  { 0x037E, UCPO }, { 0x0387, UCPO }, { 0x055A, UCPO }, { 0x055B, UCPO },
-  { 0x055C, UCPO }, { 0x055D, UCPO }, { 0x055E, UCPO }, { 0x055F, UCPO },
-  { 0x0589, UCPO }, { 0x058A, UCPD }, { 0x05BE, UCPO }, { 0x05C0, UCPO },
-  { 0x05C3, UCPO }, { 0x05F3, UCPO }, { 0x05F4, UCPO }, { 0x060C, UCPO },
-  { 0x060D, UCPO }, { 0x061B, UCPO }, { 0x061F, UCPO }, { 0x066A, UCPO },
-  { 0x066B, UCPO }, { 0x066C, UCPO }, { 0x066D, UCPO }, { 0x06D4, UCPO },
-  { 0x0700, UCPO }, { 0x0701, UCPO }, { 0x0702, UCPO }, { 0x0703, UCPO },
-  { 0x0704, UCPO }, { 0x0705, UCPO }, { 0x0706, UCPO }, { 0x0707, UCPO },
-  { 0x0708, UCPO }, { 0x0709, UCPO }, { 0x070A, UCPO }, { 0x070B, UCPO },
-  { 0x070C, UCPO }, { 0x070D, UCPO }, { 0x0964, UCPO }, { 0x0965, UCPO },
-  { 0x0970, UCPO }, { 0x0DF4, UCPO }, { 0x0E4F, UCPO }, { 0x0E5A, UCPO },
-  { 0x0E5B, UCPO }, { 0x0F04, UCPO }, { 0x0F05, UCPO }, { 0x0F06, UCPO },
-  { 0x0F07, UCPO }, { 0x0F08, UCPO }, { 0x0F09, UCPO }, { 0x0F0A, UCPO },
-  { 0x0F0B, UCPO }, { 0x0F0D, UCPO }, { 0x0F0E, UCPO }, { 0x0F0F, UCPO },
-  { 0x0F10, UCPO }, { 0x0F11, UCPO }, { 0x0F12, UCPO }, { 0x0F3A, UCPS },
-  { 0x0F3B, UCPE }, { 0x0F3C, UCPS }, { 0x0F3D, UCPE }, { 0x0F85, UCPO },
-  { 0x104A, UCPO }, { 0x104B, UCPO }, { 0x104C, UCPO }, { 0x104D, UCPO },
-  { 0x104E, UCPO }, { 0x104F, UCPO }, { 0x10FB, UCPO }, { 0x1361, UCPO },
-  { 0x1362, UCPO }, { 0x1363, UCPO }, { 0x1364, UCPO }, { 0x1365, UCPO },
-  { 0x1366, UCPO }, { 0x1367, UCPO }, { 0x1368, UCPO }, { 0x166D, UCPO },
-  { 0x166E, UCPO }, { 0x1680, UCZS }, { 0x169B, UCPS }, { 0x169C, UCPE },
-  { 0x16EB, UCPO }, { 0x16EC, UCPO }, { 0x16ED, UCPO }, { 0x1735, UCPO },
-  { 0x1736, UCPO }, { 0x17D4, UCPO }, { 0x17D5, UCPO }, { 0x17D6, UCPO },
-  { 0x17D8, UCPO }, { 0x17D9, UCPO }, { 0x17DA, UCPO }, { 0x1800, UCPO },
-  { 0x1801, UCPO }, { 0x1802, UCPO }, { 0x1803, UCPO }, { 0x1804, UCPO },
-  { 0x1805, UCPO }, { 0x1806, UCPD }, { 0x1807, UCPO }, { 0x1808, UCPO },
-  { 0x1809, UCPO }, { 0x180A, UCPO }, { 0x180E, UCZS }, { 0x1944, UCPO },
-  { 0x1945, UCPO }, 
-#endif
   { 0x2000, UCZS }, { 0x2001, UCZS }, { 0x2002, UCZS }, { 0x2003, UCZS },
   { 0x2004, UCZS }, { 0x2005, UCZS }, { 0x2006, UCZS }, { 0x2008, UCZS },
   { 0x2009, UCZS }, { 0x200A, UCZS }, { 0x2010, UCPD }, { 0x2012, UCPD },
@@ -287,7 +251,6 @@ static WrapPoint Big5WrapPoint(tchar c)
     return NoWrapPoint;
 }
 
-#endif /* SUPPORT_ASIAN_ENCODINGS */
 
 static void InitIndent( TidyIndent* ind )
 {
@@ -651,7 +614,7 @@ static Bool CheckWrapIndent( TidyDocImpl* doc, uint indent )
         WrapLine( doc );
         if ( pprint->indent[ 0 ].spaces < 0 )
         {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
             SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
             pprint->indent[ 0 ].spaces = indent;
@@ -715,7 +678,7 @@ void TY_(PFlushLine)( TidyDocImpl* doc, uint indent )
 
     if (pprint->indent[ 0 ].spaces != (int)indent )
     {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
         pprint->indent[ 0 ].spaces = indent;
@@ -737,7 +700,7 @@ static void PCondFlushLine( TidyDocImpl* doc, uint indent )
     /* Issue #390 - Whether chars to flush or not, set new indent */
     if ( pprint->indent[ 0 ].spaces != (int)indent )
     {
-#if !defined(NDEBUG) && defined(_MSC_VER)  && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
          pprint->indent[ 0 ].spaces = indent;
@@ -765,7 +728,7 @@ void TY_(PFlushLineSmart)( TidyDocImpl* doc, uint indent )
 
     if ( pprint->indent[ 0 ].spaces != (int)indent )
     {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
         pprint->indent[ 0 ].spaces = indent;
@@ -794,7 +757,7 @@ static void PCondFlushLineSmart( TidyDocImpl* doc, uint indent )
     \*/
     if (pprint->indent[ 0 ].spaces != (int)indent)
     {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
         pprint->indent[ 0 ].spaces = indent;
@@ -888,18 +851,14 @@ static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
         }
     }
 
-#if SUPPORT_ASIAN_ENCODINGS
-
     /* #431953 - start RJ */
     /* Handle encoding-specific issues */
     switch ( outenc )
     {
     case UTF8:
-#if SUPPORT_UTF16_ENCODINGS
     case UTF16:
     case UTF16LE:
     case UTF16BE:
-#endif
         if (!(mode & PREFORMATTED) && cfg(doc, TidyPunctWrap))
         {
             WrapPoint wp = CharacterWrapPoint(c);
@@ -932,22 +891,6 @@ static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
         AddChar( pprint, c );
         return;
     }
-    /* #431953 - end RJ */
-
-#else /* SUPPORT_ASIAN_ENCODINGS */
-
-    /* otherwise ISO 2022 characters are passed raw */
-    if (
-#ifndef NO_NATIVE_ISO2022_SUPPORT
-        outenc == ISO2022 ||
-#endif
-        outenc == RAW )
-    {
-        AddChar( pprint, c );
-        return;
-    }
-
-#endif /* SUPPORT_ASIAN_ENCODINGS */
 
     /* don't map latin-1 chars to entities */
     if ( outenc == LATIN1 )
@@ -982,14 +925,12 @@ static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
         return;
     }
 
-#if SUPPORT_UTF16_ENCODINGS
     /* don't map UTF-16 chars to entities */
     if ( outenc == UTF16 || outenc == UTF16LE || outenc == UTF16BE )
     {
         AddChar( pprint, c );
         return;
     }
-#endif
 
     /* use numeric entities only  for XML */
     if ( cfgBool(doc, TidyXmlTags) )
@@ -1088,14 +1029,6 @@ static void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
     }
 }
 
-#if 0
-static void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
-{
-    while ( *str != '\0' )
-        AddChar( &doc->pprint, *str++ );
-}
-#endif /* 0 */
-
 
 static void PPrintAttrValue( TidyDocImpl* doc, uint indent,
                              ctmbstr value, uint delim, Bool wrappable, Bool scriptAttr )
@@ -1294,15 +1227,6 @@ static void PPrintAttribute( TidyDocImpl* doc, uint indent,
         ++name;
     }
 
-/* fix for bug 732038 */
-#if 0
-    /* If not indenting attributes, bump up indent for 
-    ** value after putting out name.
-    */
-    if ( !indAttrs )
-        indent += xtra;
-#endif
-
     CheckWrapIndent( doc, indent );
  
     if ( attr->value == NULL )
@@ -1574,17 +1498,6 @@ static void PPrintEndTag( TidyDocImpl* doc, uint ARG_UNUSED(mode),
     tmbstr s = node->element;
     tchar c;
 
-   /*
-     Netscape ignores SGML standard by not ignoring a
-     line break before </A> or </U> etc. To avoid rendering 
-     this as an underlined space, I disable line wrapping
-     before inline end tags by the #if 0 ... #endif
-   */
-#if 0
-    if ( !(mode & NOWRAP) )
-        SetWrap( doc, indent );
-#endif
-
     AddString( pprint, "</" );
 
     if (s)
@@ -1613,17 +1526,8 @@ static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
     SetWrap( doc, indent );
     AddString( pprint, "<!--" );
 
-#if 0
-    SetWrap( doc, indent );
-#endif
-
     PPrintText(doc, COMMENT, 0, node);
 
-#if 0
-    SetWrap( doc, indent );
-    AddString( pprint, "--" );
-#endif
-
     AddString(pprint, "--");
     AddChar( pprint, '>' );
     if ( node->linebreak && node->next )
@@ -1766,9 +1670,6 @@ static void PPrintAsp( TidyDocImpl* doc, uint indent, Node *node )
     Bool wrapJste = cfgBool( doc, TidyWrapJste );
     uint saveWrap = WrapOffCond( doc, !wrapAsp || !wrapJste );
 
-#if 0
-    SetWrap( doc, indent );
-#endif
     AddString( pprint, "<%" );
     PPrintText( doc, (wrapAsp ? CDATA : COMMENT), indent, node );
     AddString( pprint, "%>" );
@@ -1799,9 +1700,6 @@ static void PPrintPhp( TidyDocImpl* doc, uint indent, Node *node )
     TidyPrintImpl* pprint = &doc->pprint;
     Bool wrapPhp = cfgBool( doc, TidyWrapPhp );
     uint saveWrap = WrapOffCond( doc, !wrapPhp  );
-#if 0
-    SetWrap( doc, indent );
-#endif
 
     AddString( pprint, "<?" );
     PPrintText( doc, (wrapPhp ? CDATA : COMMENT),
@@ -1836,9 +1734,6 @@ static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
     TidyPrintImpl* pprint = &doc->pprint;
     Bool wrapSect = cfgBool( doc, TidyWrapSection );
     uint saveWrap = WrapOffCond( doc, !wrapSect  );
-#if 0
-    SetWrap( doc, indent );
-#endif
 
     AddString( pprint, "<![" );
     PPrintText( doc, (wrapSect ? CDATA : COMMENT),
@@ -1850,29 +1745,6 @@ static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
 }
 
 
-#if 0
-/*
-** Print script and style elements. For XHTML, wrap the content as follows:
-**
-**     JavaScript:
-**         //<![CDATA[
-**             content
-**         //]]>
-**     VBScript:
-**         '<![CDATA[
-**             content
-**         ']]>
-**     CSS:
-**         / *<![CDATA[* /     Extra spaces to keep compiler happy
-**             content
-**         / *]]>* /
-**     other:
-**         <![CDATA[
-**             content
-**         ]]>
-*/
-#endif
-
 static ctmbstr CDATA_START           = "<![CDATA[";
 static ctmbstr CDATA_END             = "]]>";
 static ctmbstr JS_COMMENT_START      = "//";
@@ -2073,7 +1945,7 @@ void PPrintScriptStyle( TidyDocImpl* doc, uint mode, uint indent, Node *node )
 
     if ( node->content && pprint->indent[ 0 ].spaces != (int)indent )
     {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
         pprint->indent[ 0 ].spaces = indent;
@@ -2181,7 +2053,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
         doc->progressCallback( tidyImplToDoc(doc), node->line, node->column, doc->pprint.line + 1 );
     }
 
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_PPRINT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_PPRINT)
     dbg_show_node( doc, node, 4, GetSpaces( &doc->pprint ) );
 #endif
 
@@ -2340,7 +2212,8 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
         else /* other tags */
         {
             Bool indcont  = ( cfgAutoBool(doc, TidyIndentContent) != TidyNoState );
-            Bool indsmart = ( cfgAutoBool(doc, TidyIndentContent) == TidyAutoState );
+            /* Issue #582 - Seems this is no longer used
+               Bool indsmart = ( cfgAutoBool(doc, TidyIndentContent) == TidyAutoState ); */
             Bool hideend  = cfgBool( doc, TidyOmitOptionalTags );
             Bool classic  = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
             uint contentIndent = indent;
@@ -2360,9 +2233,11 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
              *  Issue #180 - with the above PCondFlushLine, 
              *  this adds an uneccessary additional line!
              *  Maybe only if 'classic' ie --vertical-space yes 
+             *  Issue #582 - maybe this is no longer needed!
+             *  It adds a 3rd newline if indent: auto...
+             *  if ( indsmart && node->prev != NULL && classic)
+             *   TY_(PFlushLineSmart)( doc, indent );
             \*/
-            if ( indsmart && node->prev != NULL && classic)
-                TY_(PFlushLineSmart)( doc, indent );
 
             /* do not omit elements with attributes */
             if ( !hideend || !TY_(nodeHasCM)(node, CM_OMITST) ||
@@ -2438,7 +2313,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
                     TidyPrintImpl* pprint = &doc->pprint;
                     if (pprint->indent[ 0 ].spaces != (int)indent)
                     {
-#if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_INDENT)
+#if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
                         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
 #endif  
                         pprint->indent[ 0 ].spaces = indent;
diff --git a/HTMLTidy/vendor/tidy-html5/src/pprint.h b/HTMLTidy/vendor/tidy-html5/src/pprint.h
index 8d473a41..6ae36df4 100644
--- a/HTMLTidy/vendor/tidy-html5/src/pprint.h
+++ b/HTMLTidy/vendor/tidy-html5/src/pprint.h
@@ -60,11 +60,6 @@ typedef struct _TidyPrintImpl
 } TidyPrintImpl;
 
 
-#if 0 && SUPPORT_ASIAN_ENCODINGS
-/* #431953 - start RJ Wraplen adjusted for smooth international ride */
-uint CWrapLen( TidyDocImpl* doc, uint ind );
-#endif
-
 void TY_(InitPrintBuf)( TidyDocImpl* doc );
 void TY_(FreePrintBuf)( TidyDocImpl* doc );
 
diff --git a/HTMLTidy/vendor/tidy-html5/src/sprtf.c b/HTMLTidy/vendor/tidy-html5/src/sprtf.c
index 7e18868f..3468ac14 100644
--- a/HTMLTidy/vendor/tidy-html5/src/sprtf.c
+++ b/HTMLTidy/vendor/tidy-html5/src/sprtf.c
@@ -1,50 +1,49 @@
-/*
- *  SPRTF - Log output utility - part of the HTML Tidy project
+/* sprtf.c
+ * SPRTF - Log output utility - part of the HTML Tidy project
  *
- *   Author: Geoff R. McLane <reports _at_ geoffair _dot_ info>
- *   License: MIT (see tidy.h for the copyright notice)
- *
- *   Revision 1.0.2  2017/02/12 17:06:02  geoff - correct license and coding style
- *   Revision 1.0.1  2012/11/06 13:01:25  geoff
- *   Revision 1.0.0  2012/10/17 00:00:00  geoff
+ * Copyright (c) 1998-2017 Geoff R. McLane and HTACG
  *
+ * See tidy.h for the copyright notice.
  */
 
 #ifdef _MSC_VER
-#pragma warning( disable : 4995 )
+#  pragma warning( disable : 4995 )
 #endif
-/* Module: sprtf.c */
-/* Debug log file output */
-#include <stdio.h> /* fopen()... */
+
+#include <stdio.h>  /* fopen()... */
 #include <string.h> /* strcpy */
 #include <stdarg.h> /* va_start, va_end, ... */
+
 #ifdef _MSC_VER
-#include <WinSock2.h>
-#include <sys/timeb.h>
-#if (defined(UNICODE) || defined(_UNICODE))
-#include <Strsafe.h>
-#endif
+#  include <WinSock2.h>
+#  include <sys/timeb.h>
+#  if (defined(UNICODE) || defined(_UNICODE))
+#    include <Strsafe.h>
+#  endif
 #else /* !_MSC_VER */
-#include <sys/time.h> /* gettimeoday(), struct timeval,... */
+#  include <sys/time.h> /* gettimeoday(), struct timeval,... */
 #endif /* _MSC_VER y/n */
+
 #include <time.h>
 #include <stdlib.h> /* for exit() in unix */
 #include "sprtf.h"
 
+#ifdef ENABLE_DEBUG_LOG
+
 #ifdef _MSC_VER
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif /* #ifndef _CRT_SECURE_NO_DEPRECATE */
-#pragma warning( disable:4996 )
+#  ifndef _CRT_SECURE_NO_DEPRECATE
+#    define _CRT_SECURE_NO_DEPRECATE
+#  endif /* #ifndef _CRT_SECURE_NO_DEPRECATE */
+#  pragma warning( disable:4996 )
 #else
-#define strcmpi strcasecmp
+#  define strcmpi strcasecmp
 #endif 
 
 #ifndef MX_ONE_BUF
-#define MX_ONE_BUF 1024
+#  define MX_ONE_BUF 1024
 #endif
 #ifndef MX_BUFFERS
-#define MX_BUFFERS 1024
+#  define MX_BUFFERS 1024
 #endif
 
 static char _s_strbufs[MX_ONE_BUF * MX_BUFFERS];
@@ -59,11 +58,8 @@ char *GetNxtBuf()
 }
 
 #define  MXIO     512
-#ifdef _MSC_VER /* use local log */
-static char def_log[] = "tempex.txt";
-#else
-static char def_log[] = "ex.log";
-#endif
+
+static char def_log[] = "temptidy.txt"; /* use local log */
 static char logfile[264] = "\0";
 static FILE * outfile = NULL;
 static int addsystime = 0;
@@ -75,7 +71,7 @@ static int add2listview = 0;
 static int append_to_log = 0;
 
 #ifndef VFP
-#define VFP(a) ( a && ( a != (FILE *)-1 ) )
+#  define VFP(a) ( a && ( a != (FILE *)-1 ) )
 #endif
 
 int   add_list_out( int val )
@@ -294,7 +290,7 @@ static void oi( char * psin )
       }
 
       if( addstdout ) {
-         fwrite( ps, 1, len, stdout );
+         fwrite( ps, 1, len, stderr );  /* 20170917 - Switch to using 'stderr' in place of 'stdout' */
       }
 #ifdef ADD_LISTVIEW
        if (add2listview) {
@@ -422,4 +418,5 @@ int MCDECL wsprtf( PTSTR pf, ... )
 
 #endif /* #ifdef UNICODE */
 
+#endif /* #ifdef ENABLE_DEBUG_LOG */
 /* eof - sprtf.c */
diff --git a/HTMLTidy/vendor/tidy-html5/src/sprtf.h b/HTMLTidy/vendor/tidy-html5/src/sprtf.h
index c5df3a97..47033f06 100644
--- a/HTMLTidy/vendor/tidy-html5/src/sprtf.h
+++ b/HTMLTidy/vendor/tidy-html5/src/sprtf.h
@@ -1,28 +1,61 @@
-/*
- *  SPRTF - Log output utility - part of the HTML Tidy project
+#ifndef _SPRTF_HXX_
+#define _SPRTF_HXX_
+
+/**************************************************************************//**
+ * @file
+ * Log output utility - part of the HTML Tidy project
+ *
+ * @author  Geoff R. McLane [reports _at_ geoffair _dot_ info]
  *
- *   Author: Geoff R. McLane <reports _at_ geoffair _dot_ info>
- *   License: MIT (see tidy.h for the copyright notice)
+ * @copyright
+ *     Copyright (c) 1998-2017 Geoff R. McLane and HTACG.
+ * @par
+ *     All Rights Reserved.
+ * @par
+ *     See `tidy.h` for the complete license.
  *
- *   Revision 1.0.2  2017/02/12 17:06:02  geoff - correct license and coding style
- *   Revision 1.0.1  2012/11/06 13:01:25  geoff
- *   Revision 1.0.0  2012/10/17 00:00:00  geoff
+ * @date 2017/02/12 17:06:02 Revision 1.0.2  geoff - correct license and coding style
+ * @date 2012/11/06 13:01:25 Revision 1.0.1  geoff
+ * @date 2012/10/17 00:00:00 Revision 1.0.0  geoff
+ * @date Additional updates: consult git log
  *
- */
+ ******************************************************************************/
 
-/* Module: sprtf.h */
-/* Debug log file output */
-#ifndef _SPRTF_HXX_
-#define _SPRTF_HXX_
 #include "tidyplatform.h"
 
 #ifdef   __cplusplus
 extern "C" {
 #endif
+#ifdef ENABLE_DEBUG_LOG
+    /*=============================================================================
+    * EXTRA Debugging, and information aid.
+    *
+    *  When building and defining the ENABLE_DEBUG_LOG macro, Tidy will output
+    *  extensive debug information. In addition to this macro, you can supply
+    *  cmake build flags for additional diagnostic information:
+    *    - -DENABLE_ALLOC_DEBUG:BOOL=ON   - DEBUG_ALLOCATION
+    *    - -DENABLE_MEMORY_DEBUG:BOOL=ON  - DEBUG_MEMORY
+    *    - -DENABLE_CRTDBG_MEMORY:BOOL=ON - _CRTDBG_MAP_ALLOC (WIN32 only)
+    *
+    *  _MSC_VER Only - ENABLE_DEBUG_LOG is automatically enabled in the Debug
+    *  build, unless DISABLE_DEBUG_LOG is defined. See 'tidyplatform.h'
+    *
+    *  You can use DEBUG_LOG( SPRTF() ) to avoid #ifdef ENABLE_DEBUG_LOG for
+    *  one-liners.
+    *
+    *  This EXTRA Debug information is also written to a 'temptidy.txt' log
+    *  file, for review, and analysis.
+    *
+    *===========================================================================*/
+
+#ifndef SPRTF
+#  define SPRTF sprtf
+#endif
+
 #ifdef _MSC_VER
-#define MCDECL _cdecl
+#  define MCDECL _cdecl
 #else
-#define MCDECL
+#  define MCDECL
 #endif
 
 TIDY_EXPORT int add_std_out( int val );
@@ -42,19 +75,22 @@ TIDY_EXPORT int MCDECL sprtf( const char *pf, ... );
 #define M_MAX_SPRTF 2048
 TIDY_EXPORT int direct_out_it( char *cp );
 
-TIDY_EXPORT char *GetNxtBuf();
+TIDY_EXPORT char *GetNxtBuf(void);
 
 #define EndBuf(a)   ( a + strlen(a) )
 
-TIDY_EXPORT char *get_date_stg();
-TIDY_EXPORT char *get_time_stg();
-TIDY_EXPORT char *get_date_time_stg();
+TIDY_EXPORT char *get_date_stg(void);
+TIDY_EXPORT char *get_time_stg(void);
+TIDY_EXPORT char *get_date_time_stg(void);
+
 #ifdef _MSC_VER
 TIDY_EXPORT int gettimeofday(struct timeval *tp, void *tzp);
 #endif
 
-#ifndef SPRTF
-#define SPRTF sprtf
+#  define DEBUG_LOG(ARG) do { ARG; } while(0)
+
+#else
+#  define DEBUG_LOG(ARG)
 #endif
 
 #ifdef   __cplusplus
diff --git a/HTMLTidy/vendor/tidy-html5/src/streamio.c b/HTMLTidy/vendor/tidy-html5/src/streamio.c
index 866d9d6a..d23f0560 100644
--- a/HTMLTidy/vendor/tidy-html5/src/streamio.c
+++ b/HTMLTidy/vendor/tidy-html5/src/streamio.c
@@ -20,9 +20,6 @@
 #include "utf8.h"
 #include "tmbstr.h"
 
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-#include "win32tc.h"
-#endif
 
 /************************
 ** Forward Declarations
@@ -54,9 +51,6 @@ static StreamOut stderrStreamOut =
     ASCII,
     FSM_ASCII,
     DEFAULT_NL_CONFIG,
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    NULL,
-#endif
     FileIO,
     { 0, TY_(filesink_putByte) }
 };
@@ -66,9 +60,6 @@ static StreamOut stdoutStreamOut =
     ASCII,
     FSM_ASCII,
     DEFAULT_NL_CONFIG,
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    NULL,
-#endif
     FileIO,
     { 0, TY_(filesink_putByte) }
 };
@@ -80,15 +71,6 @@ StreamOut* TY_(StdErrOutput)(void)
   return &stderrStreamOut;
 }
 
-#if 0
-StreamOut* TY_(StdOutOutput)(void)
-{
-  if ( stdoutStreamOut.sink.sinkData == 0 )
-      stdoutStreamOut.sink.sinkData = stdout;
-  return &stdoutStreamOut;
-}
-#endif
-
 void  TY_(ReleaseStreamOut)( TidyDocImpl *doc,  StreamOut* out )
 {
     if ( out && out != &stderrStreamOut && out != &stdoutStreamOut )
@@ -119,20 +101,11 @@ StreamIn* TY_(initStreamIn)( TidyDocImpl* doc, int encoding )
     in->allocator = doc->allocator;
     in->charbuf = (tchar*)TidyDocAlloc(doc, sizeof(tchar) * in->bufsize);
     InitLastPos( in );
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    in->otextbuf = NULL;
-    in->otextlen = 0;
-    in->otextsize = 0;
-#endif
     return in;
 }
 
 void TY_(freeStreamIn)(StreamIn* in)
 {
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    if (in->otextbuf)
-        TidyFree(in->allocator, in->otextbuf);
-#endif
     TidyFree(in->allocator, in->charbuf);
     TidyFree(in->allocator, in);
 }
@@ -168,9 +141,7 @@ StreamIn* TY_(UserInput)( TidyDocImpl* doc, TidyInputSource* source, int encodin
 int TY_(ReadBOMEncoding)(StreamIn *in)
 {
     uint c, c1;
-#if SUPPORT_UTF16_ENCODINGS
     uint bom;
-#endif
 
     c = ReadByte(in);
     if (c == EndOfStream)
@@ -186,7 +157,6 @@ int TY_(ReadBOMEncoding)(StreamIn *in)
     /* todo: dont warn about mismatch for auto input encoding */
     /* todo: let the user override the encoding found here */
 
-#if SUPPORT_UTF16_ENCODINGS
     bom = (c << 8) + c1;
 
     if ( bom == UNICODE_BOM_BE )
@@ -206,7 +176,6 @@ int TY_(ReadBOMEncoding)(StreamIn *in)
         return UTF16LE; /* return decoded BOM */
     }
     else
-#endif /* SUPPORT_UTF16_ENCODINGS */
     {
         uint c2 = ReadByte(in);
 
@@ -235,40 +204,6 @@ int TY_(ReadBOMEncoding)(StreamIn *in)
     return -1;
 }
 
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-void TY_(AddByteToOriginalText)(StreamIn *in, tmbchar c)
-{
-    if (in->otextlen + 1 >= in->otextsize)
-    {
-        size_t size = in->otextsize ? 1 : 2;
-        in->otextbuf = TidyRealloc(in->allocator, in->otextbuf, in->otextsize + size);
-        in->otextsize += size;
-    }
-    in->otextbuf[in->otextlen++] = c;
-    in->otextbuf[in->otextlen  ] = 0;
-}
-
-void TY_(AddCharToOriginalText)(StreamIn *in, tchar c)
-{
-    int i, err, count = 0;
-    tmbchar buf[10] = {0};
-    
-    err = TY_(EncodeCharToUTF8Bytes)(c, buf, NULL, &count);
-
-    if (err)
-    {
-        /* replacement character 0xFFFD encoded as UTF-8 */
-        buf[0] = (byte) 0xEF;
-        buf[1] = (byte) 0xBF;
-        buf[2] = (byte) 0xBD;
-        count = 3;
-    }
-    
-    for (i = 0; i < count; ++i)
-        TY_(AddByteToOriginalText)(in, buf[i]);
-}
-#endif
-
 static void InitLastPos( StreamIn *in )
 {
     in->curlastpos = 0;
@@ -304,10 +239,6 @@ static void RestoreLastPos( StreamIn *in )
 uint TY_(ReadChar)( StreamIn *in )
 {
     uint c = EndOfStream;
-    uint tabsize = cfg( in->doc, TidyTabSize );
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    Bool added = no;
-#endif
 
     if ( in->pushed )
         return PopChar( in );
@@ -330,10 +261,6 @@ uint TY_(ReadChar)( StreamIn *in )
 
         if (c == '\n')
         {
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-            added = yes;
-            TY_(AddCharToOriginalText)(in, (tchar)c);
-#endif
             in->curcol = 1;
             in->curline++;
             break;
@@ -341,25 +268,21 @@ uint TY_(ReadChar)( StreamIn *in )
 
         if (c == '\t')
         {
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-            added = yes;
-            TY_(AddCharToOriginalText)(in, (tchar)c);
-#endif
-            in->tabs = tabsize > 0 ?
-                tabsize - ((in->curcol - 1) % tabsize) - 1
-                : 0;
+            Bool keeptabs = cfg( in->doc, TidyKeepTabs );
+            if (!keeptabs) {
+                uint tabsize = cfg(in->doc, TidyTabSize);
+                in->tabs = tabsize > 0 ?
+                    tabsize - ((in->curcol - 1) % tabsize) - 1
+                    : 0;
+                c = ' ';
+            }
             in->curcol++;
-            c = ' ';
             break;
         }
 
         /* #427663 - map '\r' to '\n' - Andy Quick 11 Aug 00 */
         if (c == '\r')
         {
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-            added = yes;
-            TY_(AddCharToOriginalText)(in, (tchar)c);
-#endif
             c = ReadCharFromStream(in);
             if (c != '\n')
             {
@@ -368,9 +291,6 @@ uint TY_(ReadChar)( StreamIn *in )
             }
             else
             {
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-                TY_(AddCharToOriginalText)(in, (tchar)c);
-#endif
             }
             in->curcol = 1;
             in->curline++;
@@ -399,18 +319,14 @@ uint TY_(ReadChar)( StreamIn *in )
          || in->encoding == ISO2022
 #endif
          || in->encoding == UTF8
-
-#if SUPPORT_ASIAN_ENCODINGS
          || in->encoding == SHIFTJIS /* #431953 - RJ */
          || in->encoding == BIG5     /* #431953 - RJ */
-#endif
            )
         {
             in->curcol++;
             break;
         }
 
-#if SUPPORT_UTF16_ENCODINGS
         /* handle surrogate pairs */
         if ( in->encoding == UTF16LE ||
              in->encoding == UTF16   ||
@@ -441,7 +357,6 @@ uint TY_(ReadChar)( StreamIn *in )
                     TY_(ReportEncodingError)( in->doc, INVALID_UTF16, c, yes );
             }
         }
-#endif
 
         /* Do first: acts on range 128 - 255 */
         switch ( in->encoding )
@@ -495,11 +410,6 @@ uint TY_(ReadChar)( StreamIn *in )
         break;
     }
 
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    if (!added)
-        TY_(AddCharToOriginalText)(in, (tchar)c);
-#endif
-
     return c;
 }
 
@@ -620,7 +530,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
         TY_(EncodeCharToUTF8Bytes)( c, NULL, &out->sink, &count );
         if (count <= 0)
         {
-          /* TY_(ReportEncodingError)(in->lexer, INVALID_UTF8 | REPLACED_CHAR, c); */
             /* replacement char 0xFFFD encoded as UTF-8 */
             PutByte(0xEF, out); PutByte(0xBF, out); PutByte(0xBF, out);
         }
@@ -671,7 +580,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
     }
 #endif /* NO_NATIVE_ISO2022_SUPPORT */
 
-#if SUPPORT_UTF16_ENCODINGS
     else if ( out->encoding == UTF16LE ||
               out->encoding == UTF16BE ||
               out->encoding == UTF16 )
@@ -682,7 +590,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
         if ( !TY_(IsValidUTF16FromUCS4)(c) )
         {
             /* invalid UTF-16 value */
-            /* TY_(ReportEncodingError)(in->lexer, INVALID_UTF16 | DISCARDED_CHAR, c); */
             c = 0;
             numChars = 0;
         }
@@ -692,7 +599,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
             numChars = 2;
             if ( !TY_(SplitSurrogatePair)(c, &theChars[0], &theChars[1]) )
             {
-                /* TY_(ReportEncodingError)(in->lexer, INVALID_UTF16 | DISCARDED_CHAR, c); */
                 c = 0;
                 numChars = 0;
             }
@@ -720,9 +626,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
             }
         }
     }
-#endif
-
-#if SUPPORT_ASIAN_ENCODINGS
     else if (out->encoding == BIG5 || out->encoding == SHIFTJIS)
     {
         if (c < 128)
@@ -733,8 +636,6 @@ void TY_(WriteChar)( uint c, StreamOut* out )
             ch = c & 0xFF; PutByte(ch, out); 
         }
     }
-#endif
-
     else
         PutByte( c, out );
 }
@@ -936,78 +837,6 @@ static void EncodeLatin0( uint c, StreamOut* out )
     PutByte(c, out);
 }
 
-#if 0 /* 000000000000000000000000000000000000000 */
-
-/*
-   Table to map symbol font characters to Unicode; undefined
-   characters are mapped to 0x0000 and characters without any
-   Unicode equivalent are mapped to '?'. Is this appropriate?
-*/
-
-static const uint Symbol2Unicode[] = 
-{
-    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-    0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
-    
-    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
-    0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
-    
-    0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220D,
-    0x0028, 0x0029, 0x2217, 0x002B, 0x002C, 0x2212, 0x002E, 0x002F,
-    
-    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
-    0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
-    
-    0x2245, 0x0391, 0x0392, 0x03A7, 0x0394, 0x0395, 0x03A6, 0x0393,
-    0x0397, 0x0399, 0x03D1, 0x039A, 0x039B, 0x039C, 0x039D, 0x039F,
-    
-    0x03A0, 0x0398, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03C2, 0x03A9,
-    0x039E, 0x03A8, 0x0396, 0x005B, 0x2234, 0x005D, 0x22A5, 0x005F,
-    
-    0x00AF, 0x03B1, 0x03B2, 0x03C7, 0x03B4, 0x03B5, 0x03C6, 0x03B3,
-    0x03B7, 0x03B9, 0x03D5, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF,
-    
-    0x03C0, 0x03B8, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03D6, 0x03C9,
-    0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C, 0x003F,
-    
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    
-    0x00A0, 0x03D2, 0x2032, 0x2264, 0x2044, 0x221E, 0x0192, 0x2663,
-    0x2666, 0x2665, 0x2660, 0x2194, 0x2190, 0x2191, 0x2192, 0x2193,
-    
-    0x00B0, 0x00B1, 0x2033, 0x2265, 0x00D7, 0x221D, 0x2202, 0x00B7,
-    0x00F7, 0x2260, 0x2261, 0x2248, 0x2026, 0x003F, 0x003F, 0x21B5,
-    
-    0x2135, 0x2111, 0x211C, 0x2118, 0x2297, 0x2295, 0x2205, 0x2229,
-    0x222A, 0x2283, 0x2287, 0x2284, 0x2282, 0x2286, 0x2208, 0x2209,
-    
-    0x2220, 0x2207, 0x00AE, 0x00A9, 0x2122, 0x220F, 0x221A, 0x22C5,
-    0x00AC, 0x2227, 0x2228, 0x21D4, 0x21D0, 0x21D1, 0x21D2, 0x21D3,
-    
-    0x25CA, 0x2329, 0x00AE, 0x00A9, 0x2122, 0x2211, 0x003F, 0x003F,
-    0x003F, 0x003F, 0x003F, 0x003F, 0x003F, 0x003F, 0x003F, 0x003F,
-    
-    0x20AC, 0x232A, 0x222B, 0x2320, 0x003F, 0x2321, 0x003F, 0x003F,
-    0x003F, 0x003F, 0x003F, 0x003F, 0x003F, 0x003F, 0x003F, 0x003F
-};
-
-/* Function to convert from Symbol Font chars to Unicode */
-uint DecodeSymbolFont(uint c)
-{
-    if (c > 255)
-        return c;
-
-    /* todo: add some error message */
-
-    return Symbol2Unicode[c];
-}
-#endif /* #if 0 000000000000000000000000000000000000000 */
-
-
 /* Facilitates user defined source by providing
 ** an entry point to marshal pointers-to-functions.
 ** Needed by .NET and possibly other language bindings.
@@ -1083,61 +912,10 @@ static void PutByte( uint byteValue, StreamOut* out )
     tidyPutByte( &out->sink, byteValue );
 }
 
-#if 0
-static void UngetRawBytesToStream( StreamIn *in, byte* buf, int *count )
-{
-    int i;
-    
-    for (i = 0; i < *count; i++)
-    {
-        /* should never get here; testing for 0xFF, a valid char, is not a good idea */
-        if ( in && TY_(IsEOF)(in) )
-        {
-            /* fprintf(stderr,"Attempt to unget EOF in UngetRawBytesToStream\n"); */
-            *count = -i;
-            return;
-        }
-
-        in->source.ungetByte( in->source.sourceData, buf[i] );
-    }
-}
-
-/*
-   Read raw bytes from stream, return <= 0 if EOF; or if
-   "unget" is true, Unget the bytes to re-synchronize the input stream
-   Normally UTF-8 successor bytes are read using this routine.
-*/
-static void ReadRawBytesFromStream( StreamIn *in, byte* buf, int *count )
-{
-    int ix;
-    for ( ix=0; ix < *count; ++ix )
-    {
-        if ( in->rawPushed )
-        {
-            buf[ix] = in->rawBytebuf[ --in->rawBufpos ];
-            if ( in->rawBufpos == 0 )
-                in->rawPushed = no;
-        }
-        else
-        {
-            if ( in->source.eof(in->source.sourceData) )
-            {
-                *count = -i;
-                break;
-            }
-            buf[ix] = in->source.getByte( in->source.sourceData );
-        }
-    }
-}
-#endif /* 0 */
-
 /* read char from stream */
 static uint ReadCharFromStream( StreamIn* in )
 {
     uint c, n;
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    uint bytesRead = 0;
-#endif
 
     if ( TY_(IsEOF)(in) )
         return EndOfStream;
@@ -1211,9 +989,8 @@ static uint ReadCharFromStream( StreamIn* in )
 
         return c;
     }
-#endif /* #ifndef NO_NATIVE_ISO2022_SUPPORT */
+#endif /* NO_NATIVE_ISO2022_SUPPORT */
 
-#if SUPPORT_UTF16_ENCODINGS
     if ( in->encoding == UTF16LE )
     {
         uint c1 = ReadByte( in );
@@ -1231,7 +1008,6 @@ static uint ReadCharFromStream( StreamIn* in )
         n = (c << 8) + c1;
         return n;
     }
-#endif
 
     if ( in->encoding == UTF8 )
     {
@@ -1256,7 +1032,6 @@ static uint ReadCharFromStream( StreamIn* in )
         return n;
     }
     
-#if SUPPORT_ASIAN_ENCODINGS
     /*
        This section is suitable for any "multibyte" variable-width 
        character encoding in which a one-byte code is less than
@@ -1286,16 +1061,6 @@ static uint ReadCharFromStream( StreamIn* in )
             return n;
         }
     }
-#endif
-
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    else if (in->encoding > WIN32MLANG)
-    {
-        assert( in->mlang != NULL );
-        return TY_(Win32MLangGetChar)((byte)c, in, &bytesRead);
-    }
-#endif
-
     else
         n = c;
         
@@ -1306,11 +1071,9 @@ static uint ReadCharFromStream( StreamIn* in )
 void TY_(outBOM)( StreamOut *out )
 {
     if ( out->encoding == UTF8
-#if SUPPORT_UTF16_ENCODINGS
          || out->encoding == UTF16LE
          || out->encoding == UTF16BE
          || out->encoding == UTF16
-#endif
        )
     {
         /* this will take care of encoding the BOM correctly */
@@ -1334,15 +1097,11 @@ static struct _enc2iana
   { MACROMAN, "macintosh",    "mac"     },
   { WIN1252,  "windows-1252", "win1252" },
   { IBM858,   "ibm00858",     "ibm858"  },
-#if SUPPORT_UTF16_ENCODINGS
   { UTF16LE,  "utf-16",       "utf16le" },
   { UTF16BE,  "utf-16",       "utf16be" },
   { UTF16,    "utf-16",       "utf16"   },
-#endif
-#if SUPPORT_ASIAN_ENCODINGS
   { BIG5,     "big5",         "big5"    },
   { SHIFTJIS, "shift_jis",    "shiftjis"},
-#endif
 #ifndef NO_NATIVE_ISO2022_SUPPORT
   { ISO2022,  NULL,           "iso2022" },
 #endif
diff --git a/HTMLTidy/vendor/tidy-html5/src/streamio.h b/HTMLTidy/vendor/tidy-html5/src/streamio.h
index 696cea97..d3908f2c 100644
--- a/HTMLTidy/vendor/tidy-html5/src/streamio.h
+++ b/HTMLTidy/vendor/tidy-html5/src/streamio.h
@@ -79,16 +79,6 @@ struct _StreamIn
 
     TidyInputSource source;
 
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    void* mlang;
-#endif
-
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    tmbstr otextbuf;
-    size_t otextsize;
-    uint   otextlen;
-#endif
-
     /* Pointer back to document for error reporting */
     TidyDocImpl* doc;
 };
@@ -115,11 +105,6 @@ struct _StreamOut
     int   encoding;
     ISO2022State   state;     /* for ISO 2022 */
     uint  nl;
-
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    void* mlang;
-#endif
-
     IOType iotype;
     TidyOutputSink sink;
 };
@@ -154,32 +139,11 @@ int TY_(GetCharEncodingFromOptName)(ctmbstr charenc);
 #define MACROMAN    6
 #define WIN1252     7
 #define IBM858      8
-
-#if SUPPORT_UTF16_ENCODINGS
 #define UTF16LE     9
 #define UTF16BE     10
 #define UTF16       11
-#endif
-
-/* Note that Big5 and SHIFTJIS are not converted to ISO 10646 codepoints
-** (i.e., to Unicode) before being recoded into UTF-8. This may be
-** confusing: usually UTF-8 implies ISO10646 codepoints.
-*/
-#if SUPPORT_ASIAN_ENCODINGS
-#if SUPPORT_UTF16_ENCODINGS
 #define BIG5        12
 #define SHIFTJIS    13
-#else
-#define BIG5        9
-#define SHIFTJIS    10
-#endif
-#endif
-
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-/* hack: windows code page numbers start at 37 */
-#define WIN32MLANG  36
-#endif
-
 
 /* Function for conversion from Windows-1252 to Unicode */
 uint TY_(DecodeWin1252)(uint c);
@@ -198,12 +162,12 @@ uint TY_(DecodeMacRoman)(uint c);
 #define CR    0xD
 #define LF    0xA
 
-#if   defined(MAC_OS_CLASSIC)
-#define DEFAULT_NL_CONFIG TidyCR
+#if defined(MAC_OS_CLASSIC)
+#  define DEFAULT_NL_CONFIG TidyCR
 #elif defined(_WIN32) || defined(OS2_OS)
-#define DEFAULT_NL_CONFIG TidyCRLF
+#  define DEFAULT_NL_CONFIG TidyCRLF
 #else
-#define DEFAULT_NL_CONFIG TidyLF
+#  define DEFAULT_NL_CONFIG TidyLF
 #endif
 
 
diff --git a/HTMLTidy/vendor/tidy-html5/src/tags.c b/HTMLTidy/vendor/tidy-html5/src/tags.c
index 36a372c3..139db114 100644
--- a/HTMLTidy/vendor/tidy-html5/src/tags.c
+++ b/HTMLTidy/vendor/tidy-html5/src/tags.c
@@ -1,18 +1,18 @@
-/* tags.c -- recognize HTML tags
-
-  (c) 1998-2008 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-
-  The HTML tags are stored as 8 bit ASCII strings.
-
-*/
+/* tags.c
+ * Recognize HTML tags.
+ *
+ * Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts
+ * Institute of Technology, European Research Consortium for Informatics
+ * and Mathematics, Keio University) and HTACG.
+ *
+ * See tidy.h for the copyright notice.
+ */
 
 #include "tidy-int.h"
 #include "message.h"
 #include "tmbstr.h"
-#if !defined(NDEBUG) && defined(_MSC_VER)
 #include "sprtf.h"
-#endif
+
 /* Attribute checking methods */
 static CheckAttribs CheckIMG;
 static CheckAttribs CheckLINK;
@@ -297,7 +297,7 @@ static Dict tag_defs[] =
   { TidyTag_ARTICLE,     "article",      VERS_ELEM_ARTICLE,     &TY_(W3CAttrsFor_ARTICLE)[0],     (CM_BLOCK),                    TY_(ParseBlock),     NULL           },
   { TidyTag_ASIDE,       "aside",        VERS_ELEM_ASIDE,       &TY_(W3CAttrsFor_ASIDE)[0],       (CM_BLOCK),                    TY_(ParseBlock),     NULL           },
   { TidyTag_AUDIO,       "audio",        VERS_ELEM_AUDIO,       &TY_(W3CAttrsFor_AUDIO)[0],       (CM_BLOCK|CM_INLINE),          TY_(ParseBlock),     NULL           },
-  { TidyTag_BDI,         "bdi",          VERS_ELEM_BDI,         &TY_(W3CAttrsFor_BDI)[0],         (CM_BLOCK),                    TY_(ParseBlock),     NULL           },
+  { TidyTag_BDI,         "bdi",          VERS_ELEM_BDI,         &TY_(W3CAttrsFor_BDI)[0],         (CM_INLINE),                   TY_(ParseInline),    NULL           },
   { TidyTag_CANVAS,      "canvas",       VERS_ELEM_CANVAS,      &TY_(W3CAttrsFor_CANVAS)[0],      (CM_BLOCK),                    TY_(ParseBlock),     NULL           },
   { TidyTag_COMMAND,     "command",      VERS_ELEM_COMMAND,     &TY_(W3CAttrsFor_COMMAND)[0],     (CM_HEAD|CM_INLINE|CM_EMPTY),  TY_(ParseEmpty),     NULL           },
   { TidyTag_DATALIST,    "datalist",     VERS_ELEM_DATALIST,    &TY_(W3CAttrsFor_DATALIST)[0],    (CM_INLINE|CM_FIELD),          TY_(ParseDatalist),  NULL           },
@@ -332,7 +332,6 @@ static Dict tag_defs[] =
   { (TidyTagId)0,        NULL,         0,                    NULL,                       (0),                                           NULL,          NULL           }
 };
 
-#if ELEMENT_HASH_LOOKUP
 static uint tagsHash(ctmbstr s)
 {
     uint hashval;
@@ -401,19 +400,15 @@ static void tagsEmptyHash( TidyDocImpl* doc, TidyTagImpl* tags )
         tags->hashtab[i] = NULL;
     }
 }
-#endif /* ELEMENT_HASH_LOOKUP */
 
 static const Dict* tagsLookup( TidyDocImpl* doc, TidyTagImpl* tags, ctmbstr s )
 {
     const Dict *np;
-#if ELEMENT_HASH_LOOKUP
     const DictHash* p;
-#endif
 
     if (!s)
         return NULL;
 
-#if ELEMENT_HASH_LOOKUP
     /* this breaks if declared elements get changed between two   */
     /* parser runs since Tidy would use the cached version rather */
     /* than the new one.                                          */
@@ -430,17 +425,6 @@ static const Dict* tagsLookup( TidyDocImpl* doc, TidyTagImpl* tags, ctmbstr s )
     for (np = tags->declared_tag_list; np; np = np->next)
         if (TY_(tmbstrcmp)(s, np->name) == 0)
             return tagsInstall(doc, tags, np);
-#else
-
-    for (np = tag_defs + 1; np < tag_defs + N_TIDY_TAGS; ++np)
-        if (TY_(tmbstrcmp)(s, np->name) == 0)
-            return np;
-
-    for (np = tags->declared_tag_list; np; np = np->next)
-        if (TY_(tmbstrcmp)(s, np->name) == 0)
-            return np;
-
-#endif /* ELEMENT_HASH_LOOKUP */
 
     return NULL;
 }
@@ -492,10 +476,39 @@ static void declare( TidyDocImpl* doc, TidyTagImpl* tags,
     }
 }
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
-/* ==================================================================== 
-   MSVC DEBUG ONLY
- */
+
+/* Coordinates Config update and Tags data */
+void TY_(DeclareUserTag)( TidyDocImpl* doc, const TidyOptionImpl* opt, ctmbstr name )
+{
+    UserTagType tagType;
+
+    switch ( opt->id )
+    {
+        case TidyInlineTags:  tagType = tagtype_inline;              break;
+        case TidyBlockTags:   tagType = tagtype_block;               break;
+        case TidyEmptyTags:   tagType = tagtype_empty;               break;
+        case TidyPreTags:     tagType = tagtype_pre;                 break;
+        case TidyCustomTags:
+        {
+            switch (cfg( doc, TidyUseCustomTags ))
+            {
+                case TidyCustomBlocklevel: tagType = tagtype_block;  break;
+                case TidyCustomEmpty:      tagType = tagtype_empty;  break;
+                case TidyCustomInline:     tagType = tagtype_inline; break;
+                case TidyCustomPre:        tagType = tagtype_pre;    break;
+                default: TY_(ReportUnknownOption)( doc, opt->name ); return;
+            }
+        } break;
+        default:
+        TY_(ReportUnknownOption)( doc, opt->name );
+        return;
+    }
+
+    TY_(DefineTag)( doc, tagType, name );
+}
+
+
+#if defined(ENABLE_DEBUG_LOG)
 void ListElementsPerVersion( uint vers, Bool has )
 {
     uint val, cnt, total, wrap = 10;
@@ -541,12 +554,11 @@ void show_have_html5(void)
     ListElementsPerVersion( VERS_HTML5, yes );
 }
 
-#endif
+#endif /* defined(ENABLE_DEBUG_LOG) */
 
 /* public interface for finding tag by name */
 Bool TY_(FindTag)( TidyDocImpl* doc, Node *node )
 {
-    TidyUseCustomTagsState configtype = cfg( doc, TidyUseCustomTags );
     const Dict *np = NULL;
 
     if ( cfgBool(doc, TidyXmlTags) )
@@ -565,23 +577,14 @@ Bool TY_(FindTag)( TidyDocImpl* doc, Node *node )
        earlier, although if it's earlier we will complain about it elsewhere. */
     if ( TY_(nodeIsAutonomousCustomTag)( doc, node) )
     {
-        UserTagType type;
-
-        if ( configtype == TidyCustomEmpty )
-            type = tagtype_empty;
-        else if ( configtype == TidyCustomInline )
-            type = tagtype_inline;
-        else if ( configtype == TidyCustomPre )
-            type = tagtype_pre;
-        else
-            type = tagtype_block;
-        
-        TY_(DeclareUserTag)( doc, TidyCustomTags, type, node->element );
+        const TidyOptionImpl* opt = TY_(getOption)( TidyCustomTags );
+
+        TY_(DeclareUserTag)( doc, opt, node->element );
         node->tag = tagsLookup(doc, &doc->tags, node->element);
 
         /* Output a message the first time we encounter an autonomous custom 
            tag. This applies despite the HTML5 mode. */
-        TY_(ReportNotice)(doc, node, node, CUSTOM_TAG_DETECTED);
+        TY_(Report)(doc, node, node, CUSTOM_TAG_DETECTED);
 
         return yes;
     }
@@ -742,9 +745,7 @@ void TY_(FreeDeclaredTags)( TidyDocImpl* doc, UserTagType tagType )
 
         if ( deleteIt )
         {
-#if ELEMENT_HASH_LOOKUP
           tagsRemoveFromHash( doc, &doc->tags, curr->name );
-#endif
           FreeDict( doc, curr );
           if ( prev )
             prev->next = next;
@@ -808,9 +809,7 @@ void TY_(AdjustTags)( TidyDocImpl *doc )
         np->parser = TY_(ParseBlock);
     }
 
-#if ELEMENT_HASH_LOOKUP
     tagsEmptyHash(doc, tags); /* not sure this is really required, but to be sure */
-#endif
     doc->HTML5Mode = no;   /* set *NOT* HTML5 mode */
 
 }
@@ -857,9 +856,7 @@ void TY_(ResetTags)( TidyDocImpl *doc )
         np->parser = TY_(ParseInline);
     }
 
-#if ELEMENT_HASH_LOOKUP
     tagsEmptyHash( doc, tags ); /* not sure this is really required, but to be sure */
-#endif
     doc->HTML5Mode = yes;   /* set HTML5 mode */
 }
 
@@ -867,9 +864,7 @@ void TY_(FreeTags)( TidyDocImpl* doc )
 {
     TidyTagImpl* tags = &doc->tags;
 
-#if ELEMENT_HASH_LOOKUP
     tagsEmptyHash( doc, tags );
-#endif
     TY_(FreeDeclaredTags)( doc, tagtype_null );
     FreeDict( doc, tags->xml_tags );
 
@@ -924,7 +919,10 @@ void CheckIMG( TidyDocImpl* doc, Node *node )
     if ( cfg(doc, TidyAccessibilityCheckLevel) == 0 )
     {
         if ( HasIsMap && !HasUseMap )
+        {
             TY_(ReportAttrError)( doc, node, NULL, MISSING_IMAGEMAP);
+            doc->badAccess |= BA_MISSING_IMAGE_MAP;
+        }
     }
 }
 
@@ -990,7 +988,7 @@ void CheckTABLE( TidyDocImpl* doc, Node *node )
         if (HasSummary && isHTML5)
         {
             /* #210 - has summary, and is HTML5, then report obsolete */
-            TY_(ReportWarning)(doc, node, node, BAD_SUMMARY_HTML5);
+            TY_(Report)(doc, node, node, BAD_SUMMARY_HTML5);
         } 
         else if (!HasSummary && !isHTML5) 
         {
@@ -1053,18 +1051,6 @@ Bool TY_(nodeIsElement)( Node* node )
            (node->type == StartTag || node->type == StartEndTag) );
 }
 
-#if 0
-/* Compare & result to operand.  If equal, then all bits
-** requested are set.
-*/
-Bool nodeMatchCM( Node* node, uint contentModel )
-{
-  return ( node && node->tag &&
-           (node->tag->model & contentModel) == contentModel );
-}
-#endif
-
-
 Bool TY_(elementIsAutonomousCustomFormat)( ctmbstr element )
 {
     if ( element )
diff --git a/HTMLTidy/vendor/tidy-html5/src/tags.h b/HTMLTidy/vendor/tidy-html5/src/tags.h
index ba746edf..cb4d3993 100644
--- a/HTMLTidy/vendor/tidy-html5/src/tags.h
+++ b/HTMLTidy/vendor/tidy-html5/src/tags.h
@@ -1,96 +1,231 @@
 #ifndef __TAGS_H__
 #define __TAGS_H__
 
-/* tags.h -- recognize HTML tags
+/**************************************************************************//**
+ * @file
+ * Recognize HTML Tags.
+ *
+ * The HTML tags are stored as 8 bit ASCII strings.
+ * Use lookupw() to find a tag given a wide char string.
+ *
+ * @author  HTACG, et al (consult git log)
+ *
+ * @copyright
+ *     Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts
+ *     Institute of Technology, European Research Consortium for Informatics
+ *     and Mathematics, Keio University) and HTACG.
+ * @par
+ *     All Rights Reserved.
+ * @par
+ *     See `tidy.h` for the complete license.
+ *
+ * @date Additional updates: consult git log
+ *
+ ******************************************************************************/
 
-  (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
+#include "forward.h"
+#include "attrdict.h"
 
-  The HTML tags are stored as 8 bit ASCII strings.
-  Use lookupw() to find a tag given a wide char string.
+/** @addtogroup internal_api */
+/** @{ */
 
-*/
 
-#include "forward.h"
-#include "attrdict.h"
+/***************************************************************************//**
+ ** @defgroup tags_h HTML Tags
+ **
+ ** This module organizes all of Tidy's HTML tag operations, such as parsing
+ ** tags, defining tags, and user-defined tags.
+ **
+ ** @{
+ ******************************************************************************/
 
-typedef void (Parser)( TidyDocImpl* doc, Node *node, GetTokenMode mode );
-typedef void (CheckAttribs)( TidyDocImpl* doc, Node *node );
 
-/*
- Tag dictionary node
-*/
+/** @name Basic Structures and Tag Operations.
+ ** These structures form the backbone of Tidy tag processing, and the
+ ** functions in this group provide basic operations with tags and nodes.
+ */
+/** @{ */
 
-/* types of tags that the user can define */
+
+/** This enumeration defines the types of user-defined tags that can be
+ ** created.
+ */
 typedef enum
 {
-    tagtype_null = 0,
-    tagtype_empty = 1,
-    tagtype_inline = 2,
-    tagtype_block = 4,
-    tagtype_pre = 8
+    tagtype_null = 0,   /**< First item marker. */
+    tagtype_empty = 1,  /**< Tag is an empty element. */
+    tagtype_inline = 2, /**< Tag is an inline element. */
+    tagtype_block = 4,  /**< Tag is a block level element. */
+    tagtype_pre = 8     /**< Tag is a preformatted tag. */
 } UserTagType;
 
+
+/** This typedef describes a function to be used to parse HTML of a Tidy tag.
+ */
+typedef void (Parser)( TidyDocImpl* doc, Node *node, GetTokenMode mode );
+
+
+/** This typedef describes a function be be used to check the attributes
+ ** of a Tidy tag.
+ */
+typedef void (CheckAttribs)( TidyDocImpl* doc, Node *node );
+
+
+/** Defines a dictionary entry for a single Tidy tag, including all of the
+ ** relevant information that it requires.
+ */
 struct _Dict
 {
-    TidyTagId       id;
-    tmbstr          name;
-    uint            versions;
-    AttrVersion const *    attrvers;
-    uint            model;
-    Parser*         parser;
-    CheckAttribs*   chkattrs;
-    Dict*           next;
+    TidyTagId           id;       /**< Identifier for this tag. */
+    tmbstr              name;     /**< The tag name. */
+    uint                versions; /**< Accumulates potential HTML versions. See TY_(ConstrainVersion). */
+    AttrVersion const * attrvers; /**< Accumulates potential HTML versions for attributes. */
+    uint                model;    /**< Indicates the relevant content models for the tag. See lexer.h; there is no enum. */
+    Parser*             parser;   /**< Specifies the parser to use for this tag. */
+    CheckAttribs*       chkattrs; /**< Specifies the function to check this tag's attributes. */
+    Dict*               next;     /**< Link to next tag. */
 };
 
-#if !defined(ELEMENT_HASH_LOOKUP)
-#define ELEMENT_HASH_LOOKUP 1
-#endif
 
-#if ELEMENT_HASH_LOOKUP
+/** This enum indicates the maximum size of the has table for tag hash lookup.
+ */
 enum
 {
-    ELEMENT_HASH_SIZE=178u
+    ELEMENT_HASH_SIZE=178u  /**< Maximum number of tags in the hash table. */
 };
 
-struct _DictHash
+
+/** This structure provide hash lookup for Tidy tags.
+ */
+typedef struct _DictHash
 {
-    Dict const*         tag;
-    struct _DictHash*   next;
-};
+    Dict const*         tag;   /**< The current tag. */
+    struct _DictHash*   next;  /**< The next tag. */
+} DictHash;
 
-typedef struct _DictHash DictHash;
-#endif
 
-struct _TidyTagImpl
+/** This structure consists of the lists of all tags known to Tidy.
+ */
+typedef struct _TidyTagImpl
 {
-    Dict* xml_tags;                /* placeholder for all xml tags */
-    Dict* declared_tag_list;       /* User declared tags */
-#if ELEMENT_HASH_LOOKUP
-    DictHash* hashtab[ELEMENT_HASH_SIZE];
-#endif
-};
+    Dict* xml_tags;                        /**< Placeholder for all xml tags. */
+    Dict* declared_tag_list;               /**< User-declared tags. */
+    DictHash* hashtab[ELEMENT_HASH_SIZE];  /**< All of Tidy's built-in tags. */
+} TidyTagImpl;
+
 
-typedef struct _TidyTagImpl TidyTagImpl;
+/** Coordinates Config update and Tags data.
+ ** @param doc The Tidy document.
+ ** @param opt The option the tag is intended for.
+ ** @param name The name of the new tag.
+ */
+void TY_(DeclareUserTag)( TidyDocImpl* doc, const TidyOptionImpl* opt, ctmbstr name );
 
-/* interface for finding tag by name */
+
+/** Interface for finding a tag by TidyTagId.
+ ** @param tid The TidyTagId to search for.
+ ** @returns An instance of a Tidy tag.
+ */
 const Dict* TY_(LookupTagDef)( TidyTagId tid );
+
+/** Assigns the node's tag.
+ ** @param doc The Tidy document.
+ ** @param node The node to assign the tag to.
+ ** @returns Returns a bool indicating whether or not the tag was assigned.
+ */
 Bool    TY_(FindTag)( TidyDocImpl* doc, Node *node );
+
+
+/** Finds the parser function for a given node.
+ ** @param doc The Tidy document.
+ ** @param node The node to lookup.
+ ** @returns The parser for the given node.
+ */
 Parser* TY_(FindParser)( TidyDocImpl* doc, Node *node );
+
+
+/** Defines a new user-defined tag.
+ ** @param doc The Tidy document.
+ ** @param tagType The type of user-defined tag to define.
+ ** @param name The name of the new tag.
+ */
 void    TY_(DefineTag)( TidyDocImpl* doc, UserTagType tagType, ctmbstr name );
-void    TY_(FreeDeclaredTags)( TidyDocImpl* doc, UserTagType tagType ); /* tagtype_null to free all */
 
+
+/** Frees user-defined tags of the given type, or all user tags in given
+ ** `tagtype_null`.
+ ** @param doc The Tidy document.
+ ** @param tagType The type of tag to free, or `tagtype_null` to free all
+ **        user-defined tags.
+ */
+void    TY_(FreeDeclaredTags)( TidyDocImpl* doc, UserTagType tagType );
+
+
+/** Initiates an iterator for a list of user-declared tags, including autonomous
+ ** custom tags detected in the document if @ref TidyUseCustomTags is not set to
+ ** **no**.
+ ** @param doc An instance of a TidyDocImp to query.
+ ** @result Returns a TidyIterator, which is a token used to represent the
+ **         current position in a list within LibTidy.
+ */
 TidyIterator   TY_(GetDeclaredTagList)( TidyDocImpl* doc );
+
+
+/** Given a valid TidyIterator initiated with TY_(GetDeclaredTagList)(),
+ ** returns a string representing a user-declared or autonomous custom tag.
+ ** @remark Specifying tagType limits the scope of the tags to one of
+ **         @ref UserTagType types. Note that autonomous custom tags (if used)
+ **         are added to one of these option types, depending on the value of
+ **         @ref TidyUseCustomTags.
+ ** @param doc The Tidy document.
+ ** @param tagType The type of tag to iterate through.
+ ** @param iter The iterator token provided initially by
+ **        TY_(GetDeclaredTagList)().
+ ** @result A string containing the next tag.
+ */
 ctmbstr        TY_(GetNextDeclaredTag)( TidyDocImpl* doc, UserTagType tagType,
                                         TidyIterator* iter );
 
+
+/** Initializes tags and tag structures for the given Tidy document.
+ ** @param doc The Tidy document.
+ */
 void TY_(InitTags)( TidyDocImpl* doc );
+
+
+/** Frees the tags and structures used by Tidy for tags.
+ ** @param doc The Tidy document.
+ */
 void TY_(FreeTags)( TidyDocImpl* doc );
-void TY_(AdjustTags)( TidyDocImpl *doc ); /* if NOT HTML5 DOCTYPE, fall back to HTML4 legacy mode */
-void TY_(ResetTags)( TidyDocImpl *doc ); /* set table to HTML5 mode */
+
+
+/** Tidy defaults to HTML5 mode. If the <!DOCTYPE ...> is found to NOT be
+ ** HTML5, then adjust the tags table to HTML4 mode.
+ ** @param doc The Tidy document.
+ */
+void TY_(AdjustTags)( TidyDocImpl *doc );
+
+
+/** Reset the tags table back to default HTML5 mode.
+ ** @param doc The Tidy document.
+ */
+void TY_(ResetTags)( TidyDocImpl *doc );
+
+
+/** Indicates whether or not the Tidy is procesing in HTML5 mode.
+ ** @param doc The Tidy document.
+ ** @returns Returns `yes` if processing in HTML5 mode.
+ */
 Bool TY_(IsHTML5Mode)( TidyDocImpl *doc );
 
-/* Parser methods for tags */
+
+/** @} */
+/** @name Parser Methods And Attribute Checker Functions for Tags
+ ** These functions define the parsers and attribute checking functions for
+ ** each of Tidy's tags.
+ */
+/** @{ */
+
 
 Parser TY_(ParseHTML);
 Parser TY_(ParseHead);
@@ -117,47 +252,115 @@ Parser TY_(ParseNamespace);
 
 CheckAttribs TY_(CheckAttributes);
 
-/* 0 == TidyTag_UNKNOWN */
+
+/** @} */
+/** @name Other Tag and Node Lookup Functions
+ ** These functions perform additional lookup on tags and nodes.
+ */
+/** @{ */
+
+
+/** Gets the TidyTagId of the given node. 0 == TidyTag_UNKNOWN.
+ */
 #define TagId(node)        ((node) && (node)->tag ? (node)->tag->id : TidyTag_UNKNOWN)
+
+
+/** Determines if the given node is of the given tag id type.
+ */
 #define TagIsId(node, tid) ((node) && (node)->tag && (node)->tag->id == tid)
 
+
+/** Inquires whether or not the given node is a text node.
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeIsText)( Node* node );
+
+
+/** Inquires whether or not the given node is an element node.
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeIsElement)( Node* node );
 
-Bool TY_(nodeHasText)( TidyDocImpl* doc, Node* node );
 
-#if 0
-/* Compare & result to operand.  If equal, then all bits
-** requested are set.
-*/
-Bool nodeMatchCM( Node* node, uint contentModel );
-#endif
+/** Inquires whether or not the given node has any text.
+ ** @param doc The Tidy document.
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
+Bool TY_(nodeHasText)( TidyDocImpl* doc, Node* node );
 
 
-/* True if the element looks like it's an autonomous custom element tag. */
+/** Inquires whether the given element looks like it's an autonomous custom
+ ** element tag.
+ ** @param element A string to be checked.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(elementIsAutonomousCustomFormat)( ctmbstr element );
 
-/* True if the node looks like it's an autonomous custom element tag. */
+
+/** Inquires whether the given node looks like it's an autonomous custom
+ ** element tag.
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeIsAutonomousCustomFormat)( Node* node );
 
-/* True if the node looks like it's an autonomous custom element tag, and
-   TidyCustomTags is not disabled, and we're in HTML5 mode, which are all
-   requirements for valid autonomous custom tags.
-*/
+
+/** True if the node looks like it's an autonomous custom element tag, and
+ ** TidyCustomTags is not disabled, and we're in HTML5 mode, which are all
+ ** requirements for valid autonomous custom tags.
+ ** @param doc The Tidy document.
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeIsAutonomousCustomTag)( TidyDocImpl* doc, Node* node );
 
 
-/* True if any of the bits requested are set.
-*/
+/** Does the node have the indicated content model? True if any of the bits
+ ** requested are set.
+ ** @param node The node being interrogated.
+ ** @param contentModel The content model to check against.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeHasCM)( Node* node, uint contentModel );
 
+
+/** Does the content model of the node include block?
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeCMIsBlock)( Node* node );
+
+
+/** Does the content model of the node include inline?
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeCMIsInline)( Node* node );
+
+
+/** Does the content model of the node include empty?
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
 Bool TY_(nodeCMIsEmpty)( Node* node );
 
 
-Bool TY_(nodeIsHeader)( Node* node );     /* H1, H2, ..., H6 */
-uint TY_(nodeHeaderLevel)( Node* node );  /* 1, 2, ..., 6 */
+/** Is the node a header, such as H1, H2, ..., H6?
+ ** @param node The node being interrogated.
+ ** @returns The status of the inquiry.
+ */
+Bool TY_(nodeIsHeader)( Node* node );
+
+
+/** Inquires as to the header level of the given node: 1, 2, ..., 6.
+ ** @param node The node being interrogated.
+ ** @returns The header level.
+ */
+uint TY_(nodeHeaderLevel)( Node* node );
+
 
 #define nodeIsHTML( node )       TagIsId( node, TidyTag_HTML )
 #define nodeIsHEAD( node )       TagIsId( node, TidyTag_HEAD )
@@ -258,4 +461,10 @@ uint TY_(nodeHeaderLevel)( Node* node );  /* 1, 2, ..., 6 */
 #define nodesIsFRAME( node )     TagIsId( node, TidyTag_FRAME )
 #define nodeIsTT( node )         TagIsId( node, TidyTag_TT )
 
+
+/** @} name */
+/** @} tags_h group */
+/** @} internal_api addtogroup */
+
+
 #endif /* __TAGS_H__ */
diff --git a/HTMLTidy/vendor/tidy-html5/src/tidy-int.h b/HTMLTidy/vendor/tidy-html5/src/tidy-int.h
old mode 100755
new mode 100644
index 6bcfaf53..55ab3416
--- a/HTMLTidy/vendor/tidy-html5/src/tidy-int.h
+++ b/HTMLTidy/vendor/tidy-html5/src/tidy-int.h
@@ -15,6 +15,7 @@
 #include "attrs.h"
 #include "pprint.h"
 #include "access.h"
+#include "message.h"
 
 #ifndef MAX
 #define MAX(a,b) (((a) > (b))?(a):(b))
@@ -40,28 +41,26 @@ struct _TidyDocImpl
     Lexer*              lexer;
 
     /* Config + Markup Declarations */
-    TidyConfigImpl      config;
-    TidyTagImpl         tags;
-    TidyAttribImpl      attribs;
-
-#if SUPPORT_ACCESSIBILITY_CHECKS
-    /* Accessibility Checks state */
-    TidyAccessImpl      access;
-#endif
+    TidyConfigImpl          config;
+    TidyTagImpl             tags;
+    TidyAttribImpl          attribs;
+    TidyAccessImpl          access;
+    TidyMutedMessages       muted;
 
     /* The Pretty Print buffer */
     TidyPrintImpl       pprint;
 
     /* I/O */
-    StreamIn*           docIn;
-    StreamOut*          docOut;
-    StreamOut*          errout;
-    TidyReportFilter    reportFilter;
-    TidyReportCallback  reportCallback;
-    TidyMessageCallback messageCallback;
-    TidyOptCallback     pOptCallback;
-    TidyConfigCallback  pConfigCallback;
-    TidyPPProgress      progressCallback;
+    StreamIn*                docIn;
+    StreamOut*               docOut;
+    StreamOut*               errout;
+    TidyReportFilter         reportFilter;
+    TidyReportCallback       reportCallback;
+    TidyMessageCallback      messageCallback;
+    TidyOptCallback          pOptCallback;
+    TidyConfigCallback       pConfigCallback;
+    TidyConfigChangeCallback pConfigChangeCallback;
+    TidyPPProgress           progressCallback;
 
     /* Parse + Repair Results */
     uint                optionErrors;
@@ -76,6 +75,7 @@ struct _TidyDocImpl
     uint                badLayout;   /* for bad style errors */
     uint                badChars;    /* for bad char encodings */
     uint                badForm;     /* bit field, for badly placed form tags, or other format errors */
+    uint                footnotes;   /* bit field, for other footnotes, until formalized */
 
     Bool                HTML5Mode;   /* current mode is html5 */
     Bool                xmlDetected; /* true if XML was used/detected */
@@ -88,10 +88,6 @@ struct _TidyDocImpl
     uint                nClassId;
     Bool                inputHadBOM;
 
-#ifdef TIDY_STORE_ORIGINAL_TEXT
-    Bool                storeText;
-#endif
-
 #if PRESERVE_FILE_TIMES
     struct utimbuf      filetimes;
 #endif
@@ -111,6 +107,7 @@ struct _TidyMessageImpl
     int                 column;       /* the column the message applies to */
     TidyReportLevel     level;        /* the severity level of the message */
     Bool                allowMessage; /* indicates whether or not a filter rejected a message */
+    Bool                muted;        /* indicates whether or not a configuration mutes this message */
     
     int                 argcount;    /* the number of arguments */
     struct printfArg*   arguments;   /* the arguments' values and types */
@@ -134,21 +131,6 @@ struct _TidyMessageImpl
 };
 
 
-/* Twizzle internal/external types */
-#ifdef NEVER
-TidyDocImpl* tidyDocToImpl( TidyDoc tdoc );
-TidyDoc      tidyImplToDoc( TidyDocImpl* impl );
-
-Node*        tidyNodeToImpl( TidyNode tnod );
-TidyNode     tidyImplToNode( Node* node );
-
-AttVal*      tidyAttrToImpl( TidyAttr tattr );
-TidyAttr     tidyImplToAttr( AttVal* attval );
-
-const TidyOptionImpl* tidyOptionToImpl( TidyOption topt );
-TidyOption   tidyImplToOption( const TidyOptionImpl* option );
-#else
-
 #define tidyDocToImpl( tdoc )           ((TidyDocImpl*)(tdoc))
 #define tidyImplToDoc( doc )            ((TidyDoc)(doc))
 
@@ -164,7 +146,6 @@ TidyOption   tidyImplToOption( const TidyOptionImpl* option );
 #define tidyOptionToImpl( topt )        ((const TidyOptionImpl*)(topt))
 #define tidyImplToOption( option )      ((TidyOption)(option))
 
-#endif
 
 /** Wrappers for easy memory allocation using the document's allocator */
 #define TidyDocAlloc(doc, size) TidyAlloc((doc)->allocator, size)
diff --git a/HTMLTidy/vendor/tidy-html5/src/tidylib.c b/HTMLTidy/vendor/tidy-html5/src/tidylib.c
old mode 100755
new mode 100644
index 9d7c0a2f..85d59e28
--- a/HTMLTidy/vendor/tidy-html5/src/tidylib.c
+++ b/HTMLTidy/vendor/tidy-html5/src/tidylib.c
@@ -33,12 +33,10 @@
 #include "utf8.h"
 #include "mappedio.h"
 #include "language.h"
-
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-#include "win32tc.h"
-#endif
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#include "attrs.h"
 #include "sprtf.h"
+#if SUPPORT_LOCALIZATIONS
+#  include "locale.h"
 #endif
 
 /* Create/Destroy a Tidy "document" object */
@@ -73,43 +71,6 @@ static int          tidyDocSaveBuffer( TidyDocImpl* impl, TidyBuffer* outbuf );
 static int          tidyDocSaveSink( TidyDocImpl* impl, TidyOutputSink* docOut );
 static int          tidyDocSaveStream( TidyDocImpl* impl, StreamOut* out );
 
-#ifdef NEVER
-TidyDocImpl* tidyDocToImpl( TidyDoc tdoc )
-{
-  return (TidyDocImpl*) tdoc;
-}
-TidyDoc      tidyImplToDoc( TidyDocImpl* impl )
-{
-  return (TidyDoc) impl;
-}
-
-Node*        tidyNodeToImpl( TidyNode tnod )
-{
-  return (Node*) tnod;
-}
-TidyNode     tidyImplToNode( Node* node )
-{
-  return (TidyNode) node;
-}
-
-AttVal*      tidyAttrToImpl( TidyAttr tattr )
-{
-  return (AttVal*) tattr;
-}
-TidyAttr     tidyImplToAttr( AttVal* attval )
-{
-  return (TidyAttr) attval;
-}
-
-const TidyOptionImpl* tidyOptionToImpl( TidyOption topt )
-{
-  return (const TidyOptionImpl*) topt;
-}
-TidyOption   tidyImplToOption( const TidyOptionImpl* option )
-{
-  return (TidyOption) option;
-}
-#endif
 
 /* Tidy public interface
 **
@@ -151,6 +112,17 @@ TidyDocImpl* tidyDocCreate( TidyAllocator *allocator )
     TY_(InitConfig)( doc );
     TY_(InitPrintBuf)( doc );
 
+    /* Set the locale for tidy's output. This both configures
+    ** LibTidy to use the environment's locale as well as the
+    ** standard library.
+    */
+#if SUPPORT_LOCALIZATIONS
+    if ( TY_(tidyGetLanguageSetByUser)() == no )
+    {
+        TY_(tidySetLanguage)( setlocale( LC_ALL, "") );
+    }
+#endif
+
     /* By default, wire tidy messages to standard error.
     ** Document input will be set by parsing routines.
     ** Document output will be set by pretty print routines.
@@ -181,6 +153,8 @@ void          tidyDocRelease( TidyDocImpl* doc )
 
         TY_(FreeConfig)( doc );
         TY_(FreeAttrTable)( doc );
+        TY_(FreeAttrPriorityList)( doc );
+        TY_(FreeMutedMessageList( doc ));
         TY_(FreeTags)( doc );
         /*\ 
          *  Issue #186 - Now FreeNode depend on the doctype, so the lexer is needed
@@ -218,10 +192,19 @@ ctmbstr TIDY_CALL     tidyLibraryVersion(void)
     return TY_(tidyLibraryVersion)();
 }
 
+ctmbstr TIDY_CALL     tidyPlatform(void)
+{
+#ifdef PLATFORM_NAME
+    return PLATFORM_NAME;
+#else
+    return NULL;
+#endif
+}
+
 
 /* Get/set configuration options
 */
-Bool TIDY_CALL        tidySetOptionCallback( TidyDoc tdoc, TidyOptCallback pOptCallback )
+Bool TIDY_CALL     tidySetOptionCallback( TidyDoc tdoc, TidyOptCallback pOptCallback )
 {
   TidyDocImpl* impl = tidyDocToImpl( tdoc );
   if ( impl )
@@ -232,7 +215,7 @@ Bool TIDY_CALL        tidySetOptionCallback( TidyDoc tdoc, TidyOptCallback pOptC
   return no;
 }
 
-Bool TIDY_CALL         tidySetConfigCallback(TidyDoc tdoc, TidyConfigCallback pConfigCallback)
+Bool TIDY_CALL     tidySetConfigCallback(TidyDoc tdoc, TidyConfigCallback pConfigCallback)
 {
   TidyDocImpl* impl = tidyDocToImpl( tdoc );
   if ( impl )
@@ -243,6 +226,18 @@ Bool TIDY_CALL         tidySetConfigCallback(TidyDoc tdoc, TidyConfigCallback pC
   return no;
 }
 
+Bool TIDY_CALL    tidySetConfigChangeCallback(TidyDoc tdoc, TidyConfigChangeCallback pCallback)
+{
+  TidyDocImpl* impl = tidyDocToImpl( tdoc );
+  if ( impl )
+  {
+    impl->pConfigChangeCallback = pCallback;
+    return yes;
+  }
+  return no;
+}
+
+
 
 int TIDY_CALL     tidyLoadConfig( TidyDoc tdoc, ctmbstr cfgfil )
 {
@@ -362,6 +357,13 @@ TidyOptionType TIDY_CALL tidyOptGetType( TidyOption topt )
         return option->type;
     return (TidyOptionType) -1;
 }
+Bool TIDY_CALL           tidyOptionIsList( TidyOption opt )
+{
+    const TidyOptionImpl* option = tidyOptionToImpl( opt );
+    if ( option )
+        return TY_(getOptionIsList)( option->id );
+    return no;
+}
 TidyConfigCategory TIDY_CALL tidyOptGetCategory( TidyOption topt )
 {
     const TidyOptionImpl* option = tidyOptionToImpl( topt );
@@ -372,6 +374,12 @@ TidyConfigCategory TIDY_CALL tidyOptGetCategory( TidyOption topt )
 ctmbstr TIDY_CALL       tidyOptGetDefault( TidyOption topt )
 {
     const TidyOptionImpl* option = tidyOptionToImpl( topt );
+    /* Special case for TidyDoctype, because it is declared as string */
+    if ( option && option->id == TidyDoctype )
+    {
+        const TidyOptionImpl* newopt = TY_(getOption)( TidyDoctypeMode );
+        return TY_(GetPickListLabelForPick)( TidyDoctypeMode, newopt->dflt );
+    }
     if ( option && option->type == TidyString )
         return option->pdflt; /* Issue #306 - fix an old typo hidden by a cast! */
     return NULL;
@@ -381,6 +389,14 @@ ulong TIDY_CALL          tidyOptGetDefaultInt( TidyOption topt )
     const TidyOptionImpl* option = tidyOptionToImpl( topt );
     if ( option && option->type != TidyString )
         return option->dflt;
+
+    /* Special case for TidyDoctype, because it has a picklist */
+    if ( option->id == TidyDoctype )
+    {
+        const TidyOptionImpl* newopt = TY_(getOption)( TidyDoctypeMode );
+        return newopt->dflt;
+    }
+
     return ~0U;
 }
 Bool TIDY_CALL          tidyOptGetDefaultBool( TidyOption topt )
@@ -417,11 +433,26 @@ ctmbstr TIDY_CALL       tidyOptGetNextPick( TidyOption topt, TidyIterator* pos )
 
 ctmbstr TIDY_CALL       tidyOptGetValue( TidyDoc tdoc, TidyOptionId optId )
 {
-  TidyDocImpl* impl = tidyDocToImpl( tdoc );
-  ctmbstr optval = NULL;
-  if ( impl )
-    optval = cfgStr( impl, optId );
-  return optval;
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
+    ctmbstr optval = NULL;
+    if ( impl )
+    {
+        if ( optId == TidyDoctype )
+        {
+            /* Special case for TidyDoctype, because it has a picklist and is a string. */
+            uint pick = tidyOptGetInt( tdoc, TidyDoctypeMode );
+            if ( pick != TidyDoctypeUser )
+            {
+                optval = TY_(GetPickListLabelForPick)( TidyDoctypeMode, pick );
+            } else {
+                optval = cfgStr( impl, optId );
+            }
+        } else {
+            /* Standard case. */
+            optval = cfgStr( impl, optId );
+        }
+    }
+    return optval;
 }
 Bool TIDY_CALL        tidyOptSetValue( TidyDoc tdoc, TidyOptionId optId, ctmbstr val )
 {
@@ -443,7 +474,13 @@ ulong TIDY_CALL        tidyOptGetInt( TidyDoc tdoc, TidyOptionId optId )
     TidyDocImpl* impl = tidyDocToImpl( tdoc );
     ulong opti = 0;
     if ( impl )
-        opti = cfg( impl, optId );
+    {
+        /* Special case for TidyDoctype, because it has a picklist */
+        if ( optId == TidyDoctype )
+            opti = cfg( impl, TidyDoctypeMode);
+        else
+            opti = cfg( impl, optId );
+    }
     return opti;
 }
 
@@ -451,7 +488,13 @@ Bool TIDY_CALL        tidyOptSetInt( TidyDoc tdoc, TidyOptionId optId, ulong val
 {
     TidyDocImpl* impl = tidyDocToImpl( tdoc );
     if ( impl )
-        return TY_(SetOptionInt)( impl, optId, val );
+    {
+        /* Special case for TidyDoctype, because it has a picklist */
+        if ( optId == TidyDoctype )
+            return TY_(SetOptionInt)( impl, TidyDoctypeMode, val );
+        else
+            return TY_(SetOptionInt)( impl, optId, val );
+    }
     return no;
 }
 
@@ -486,24 +529,8 @@ ctmbstr TIDY_CALL       tidyOptGetEncName( TidyDoc tdoc, TidyOptionId optId )
 
 ctmbstr TIDY_CALL       tidyOptGetCurrPick( TidyDoc tdoc, TidyOptionId optId )
 {
-    const TidyOptionImpl* option = TY_(getOption)( optId );
-
-    if ( option && option->pickList )
-    {
-        uint ix = 0;
-        uint pick = tidyOptGetInt( tdoc, optId );
-        const PickListItem *item = NULL;
-        
-        // loop through the picklist until index matches the value
-        while ( (item = &(*option->pickList)[ ix ]) && item->label && ix<pick )
-        {
-            ++ix;
-        }
-        if ( ix==pick && item->label )
-            return item->label;
-    }
-    
-    return NULL;
+    uint pick = tidyOptGetInt( tdoc, optId );
+    return TY_(GetPickListLabelForPick)( optId, pick );
 }
 
 
@@ -538,6 +565,44 @@ ctmbstr TIDY_CALL       tidyOptGetNextDeclTag( TidyDoc tdoc, TidyOptionId optId,
     return tagnam;
 }
 
+TidyIterator TIDY_CALL tidyOptGetPriorityAttrList( TidyDoc tdoc )
+{
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
+    if ( impl )
+        return TY_(getPriorityAttrList)( impl );
+    return (TidyIterator) -1;
+}
+
+ctmbstr TIDY_CALL      tidyOptGetNextPriorityAttr(TidyDoc tdoc, TidyIterator* iter )
+{
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
+    ctmbstr result = NULL;
+    if ( impl )
+        result = TY_(getNextPriorityAttr)( impl, iter );
+    else if ( iter )
+        *iter = 0;
+    return result;
+}
+
+TidyIterator TIDY_CALL tidyOptGetMutedMessageList( TidyDoc tdoc )
+{
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
+    if ( impl )
+        return TY_(getMutedMessageList)( impl );
+    return (TidyIterator) -1;
+}
+
+ctmbstr TIDY_CALL      tidyOptGetNextMutedMessage(TidyDoc tdoc, TidyIterator* iter )
+{
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
+    ctmbstr result = NULL;
+    if ( impl )
+        result = TY_(getNextMutedMessage)( impl, iter );
+    else if ( iter )
+        *iter = 0;
+    return result;
+}
+
 ctmbstr TIDY_CALL tidyOptGetDoc( TidyDoc ARG_UNUSED(tdoc), TidyOption opt )
 {
     const TidyOptionId optId = tidyOptGetId( opt );
@@ -756,7 +821,11 @@ TidyReportLevel TIDY_CALL tidyGetMessageLevel( TidyMessage tmessage )
     return TY_(getMessageLevel)(*message);
 }
 
-
+Bool TIDY_CALL tidyGetMessageIsMuted( TidyMessage tmessage )
+{
+    TidyMessageImpl *message = tidyMessageToImpl(tmessage);
+    return TY_(getMessageIsMuted)(*message);
+}
 
 ctmbstr TIDY_CALL tidyGetMessageFormatDefault( TidyMessage tmessage )
 {
@@ -868,44 +937,6 @@ double TIDY_CALL tidyGetArgValueDouble( TidyMessage tmessage, TidyMessageArgumen
 }
 
 
-
-
-#if 0   /* Not yet */
-int         tidySetContentOutputSink( TidyDoc tdoc, TidyOutputSink* outp )
-{
-  TidyDocImpl* impl = tidyDocToImpl( tdoc );
-  if ( impl )
-  {
-    impl->docOut = outp;
-    return 0;
-  }
-  return -EINVAL;
-}
-int         tidySetDiagnosticOutputSink( TidyDoc tdoc, TidyOutputSink* outp )
-{
-  TidyDocImpl* impl = tidyDocToImpl( tdoc );
-  if ( impl )
-  {
-    impl->msgOut = outp;
-    return 0;
-  }
-  return -EINVAL;
-}
-
-
-/* Library helpers
-*/
-cmbstr       tidyLookupMessage( TidyDoc tdoc, int errorNo )
-{
-  TidyDocImpl* impl = tidyDocToImpl( tdoc );
-  cmbstr mssg = NULL;
-  if ( impl )
-    mssg = tidyMessage_Lookup( impl->messages, errorNo );
-  return mssg;
-}
-#endif
-
-
 FILE* TIDY_CALL   tidySetErrorFile( TidyDoc tdoc, ctmbstr errfilnam )
 {
     TidyDocImpl* impl = tidyDocToImpl( tdoc );
@@ -921,7 +952,7 @@ FILE* TIDY_CALL   tidySetErrorFile( TidyDoc tdoc, ctmbstr errfilnam )
             return errout;
         }
         else /* Emit message to current error sink */
-            TY_(FileError)( impl, errfilnam, TidyError, FILE_CANT_OPEN );
+            TY_(ReportFileError)( impl, errfilnam, FILE_CANT_OPEN );
     }
     return NULL;
 }
@@ -1041,8 +1072,8 @@ void TIDY_CALL         tidyGeneralInfo( TidyDoc tdoc )
     TidyDocImpl* impl = tidyDocToImpl( tdoc );
     if ( impl )
     {
-        TY_(DialogueMessage)( impl, TEXT_GENERAL_INFO, TidyDialogueInfo);
-        TY_(DialogueMessage)( impl, TEXT_GENERAL_INFO_PLEA, TidyDialogueInfo);
+        TY_(Dialogue)( impl, TEXT_GENERAL_INFO );
+        TY_(Dialogue)( impl, TEXT_GENERAL_INFO_PLEA );
     }
 }
 
@@ -1091,7 +1122,7 @@ int   tidyDocParseFile( TidyDocImpl* doc, ctmbstr filnam )
 
     if ( !fin )
     {
-        TY_(FileError)( doc, filnam, TidyError, FILE_NOT_FILE );
+        TY_(ReportFileError)( doc, filnam, FILE_NOT_FILE );
         return status;
     }
 
@@ -1128,7 +1159,7 @@ int   tidyDocParseFile( TidyDocImpl* doc, ctmbstr filnam )
         TY_(freeStreamIn)(in);
     }
     else /* Error message! */
-        TY_(FileError)( doc, filnam, TidyError, FILE_CANT_OPEN );
+        TY_(ReportFileError)( doc, filnam, FILE_CANT_OPEN );
     return status;
 #endif
 }
@@ -1137,6 +1168,7 @@ int   tidyDocParseStdin( TidyDocImpl* doc )
 {
     StreamIn* in = TY_(FileInput)( doc, stdin, cfg( doc, TidyInCharEncoding ));
     int status = TY_(DocParseStream)( doc, in );
+    TY_(freeFileSource)(&in->source, yes);
     TY_(freeStreamIn)(in);
     return status;
 }
@@ -1242,7 +1274,7 @@ int         tidyDocSaveFile( TidyDocImpl* doc, ctmbstr filnam )
 #endif /* PRESERVFILETIMES */
     }
     if ( status < 0 ) /* Error message! */
-        TY_(FileError)( doc, filnam, TidyError, FILE_CANT_OPEN );
+        TY_(ReportFileError)( doc, filnam, FILE_CANT_OPEN );
     return status;
 }
 
@@ -1258,35 +1290,30 @@ int         tidyDocSaveFile( TidyDocImpl* doc, ctmbstr filnam )
 */
 
 #if !defined(NO_SETMODE_SUPPORT)
-
-#if defined(_WIN32) || defined(OS2_OS)
-#include <fcntl.h>
-#include <io.h>
-#endif
-
+#  if defined(_WIN32) || defined(OS2_OS)
+#   include <fcntl.h>
+#     include <io.h>
+#   endif
 #endif
 
 int         tidyDocSaveStdout( TidyDocImpl* doc )
 {
 #if !defined(NO_SETMODE_SUPPORT)
-
-#if defined(_WIN32) || defined(OS2_OS)
+#  if defined(_WIN32) || defined(OS2_OS)
     int oldstdoutmode = -1, oldstderrmode = -1;
+#  endif
 #endif
 
-#endif
     int status = 0;
     uint outenc = cfg( doc, TidyOutCharEncoding );
     uint nl = cfg( doc, TidyNewline );
     StreamOut* out = TY_(FileOutput)( doc, stdout, outenc, nl );
 
 #if !defined(NO_SETMODE_SUPPORT)
-
-#if defined(_WIN32) || defined(OS2_OS)
+#  if defined(_WIN32) || defined(OS2_OS)
     oldstdoutmode = setmode( fileno(stdout), _O_BINARY );
     oldstderrmode = setmode( fileno(stderr), _O_BINARY );
-#endif
-
+#  endif
 #endif
 
     if ( 0 == status )
@@ -1296,14 +1323,12 @@ int         tidyDocSaveStdout( TidyDocImpl* doc )
     fflush(stderr);
 
 #if !defined(NO_SETMODE_SUPPORT)
-
-#if defined(_WIN32) || defined(OS2_OS)
+#  if defined(_WIN32) || defined(OS2_OS)
     if ( oldstdoutmode != -1 )
         oldstdoutmode = setmode( fileno(stdout), oldstdoutmode );
     if ( oldstderrmode != -1 )
         oldstderrmode = setmode( fileno(stderr), oldstderrmode );
-#endif
-
+#  endif
 #endif
 
     TidyDocFree( doc, out );
@@ -1409,6 +1434,9 @@ static ctmbstr integrity = "\nPanic - tree has lost its integrity\n";
 int         TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in )
 {
     Bool xmlIn = cfgBool( doc, TidyXmlTags );
+    TidyConfigChangeCallback callback = doc->pConfigChangeCallback;
+    
+    doc->pConfigChangeCallback = NULL;
     int bomEnc;
 
     assert( doc != NULL && in != NULL );
@@ -1417,6 +1445,7 @@ int         TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in )
 
     TY_(ResetTags)(doc);    /* reset table to html5 mode */
     TY_(TakeConfigSnapshot)( doc );    /* Save config state */
+    TY_(AdjustConfig)( doc ); /* ensure config consistency */
     TY_(FreeAnchors)( doc );
 
     TY_(FreeNode)(doc, &doc->root);
@@ -1446,11 +1475,6 @@ int         TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in )
         TY_(SetOptionInt)(doc, TidyInCharEncoding, bomEnc);
     }
 
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    if (in->encoding > WIN32MLANG)
-        TY_(Win32MLangInitInputTranscoder)(in, in->encoding);
-#endif /* TIDY_WIN32_MLANG_SUPPORT */
-
     /* Tidy doesn't alter the doctype for generic XML docs */
     if ( xmlIn )
     {
@@ -1466,28 +1490,19 @@ int         TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in )
             TidyPanic( doc->allocator, integrity );
     }
 
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-    TY_(Win32MLangUninitInputTranscoder)(in);
-#endif /* TIDY_WIN32_MLANG_SUPPORT */
-
     doc->docIn = NULL;
+    doc->pConfigChangeCallback = callback;
+
     return tidyDocStatus( doc );
 }
 
 int         tidyDocRunDiagnostics( TidyDocImpl* doc )
 {
-    Bool quiet = cfgBool( doc, TidyQuiet );
-    Bool force = cfgBool( doc, TidyForceOutput );
-
-    if ( !quiet )
-    {
-
-        TY_(ReportMarkupVersion)( doc );
-        TY_(ReportNumWarnings)( doc );
-    }
+    TY_(ReportMarkupVersion)( doc );
+    TY_(ReportNumWarnings)( doc );
 
-    if ( doc->errors > 0 && !force )
-        TY_(DialogueMessage)(doc, STRING_NEEDS_INTERVENTION, TidyDialogueDoc);
+    if ( doc->errors > 0 && !cfgBool( doc, TidyForceOutput ) )
+        TY_(Dialogue)(doc, STRING_NEEDS_INTERVENTION );
 
      return tidyDocStatus( doc );
 }
@@ -1501,7 +1516,7 @@ void         tidyDocReportDoctype( TidyDocImpl* doc )
 /*****************************************************************************
  *  HTML5 STUFF
  *****************************************************************************/
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if 0 && defined(ENABLE_DEBUG_LOG)
 extern void show_not_html5(void);
 /* -----------------------------
 List tags that do not have version HTML5 (HT50|XH50)
@@ -1600,9 +1615,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
     Bool warn = yes;    /* should this be a warning, error, or report??? */
     AttVal* attr = NULL;
     int i = 0;
-#if !defined(NDEBUG) && defined(_MSC_VER)
-    //    list_not_html5();
-#endif
+
     while (node)
     {
         if ( nodeHasAlignAttr( node ) ) {
@@ -1640,7 +1653,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_ABBR, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(Report)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsAPPLET(node) ) {
@@ -1651,7 +1664,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_OBJECT, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(Report)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsBASEFONT(node) ) {
@@ -1664,7 +1677,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * - For now just report a warning
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(Report)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsBIG(node) ) {
             /* big: CSS equivalent 'font-size:larger'
@@ -1686,7 +1699,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(Report)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsCENTER(node) ) {
@@ -1697,7 +1710,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * see: static Bool Center2Div( TidyDocImpl* doc, Node *node, Node **pnode)
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(Report)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsDIR(node) ) {
             /* dir: replace by <ul>
@@ -1705,7 +1718,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * Should this be CHANGED???
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(Report)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsFONT(node) ) {
             /* Tidy already handles this -
@@ -1714,13 +1727,13 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
              * done in Bool Font2Span( TidyDocImpl* doc, Node *node, Node **pnode ) (I think?)
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(Report)(doc, node, node, REMOVED_HTML5);
         } else
         if (( nodesIsFRAME(node) ) || ( nodeIsFRAMESET(node) ) || ( nodeIsNOFRAMES(node) )) {
             /* YOW: What to do here?????? Maybe <iframe>????
              */
             if ( !already_strict )
-                TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                TY_(Report)(doc, node, node, REMOVED_HTML5);
         } else
         if ( nodeIsSTRIKE(node) ) {
             /* strike: CSS equivalent 'text-decoration:line-through'
@@ -1731,7 +1744,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(Report)(doc, node, node, REMOVED_HTML5);
             }
         } else
         if ( nodeIsTT(node) ) {
@@ -1745,14 +1758,14 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
                 TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
             } else {
                 if ( !already_strict )
-                    TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                    TY_(Report)(doc, node, node, REMOVED_HTML5);
             }
         } else
             if (TY_(nodeIsElement)(node)) {
                 if (node->tag) {
                     if ( (!(node->tag->versions & VERS_HTML5) && !(node->tag->versions & VERS_PROPRIETARY)) || (inRemovedInfo(node->tag->id)) ) {
                         if ( !already_strict )
-                            TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
+                            TY_(Report)(doc, node, node, REMOVED_HTML5);
                     }
                 }
             }
@@ -1805,7 +1818,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
                 /* Version mismatches take priority. */
                 if ( check_versions && !(node->tag->versions & version) )
                 {
-                    TY_(ReportError)(doc, NULL, node, tagReportType );
+                    TY_(Report)(doc, NULL, node, tagReportType );
                 }
                 /* If it's not mismatched, it could still be proprietary. */
                 else if ( node->tag->versions & VERS_PROPRIETARY )
@@ -1825,7 +1838,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
 
                         if ( (htmlIs5 && !tagLooksCustom) || !htmlIs5 )
                         {
-                            TY_(ReportError)(doc, NULL, node, PROPRIETARY_ELEMENT );
+                            TY_(Report)(doc, NULL, node, PROPRIETARY_ELEMENT );
                         }
 
                         if ( nodeIsLAYER(node) )
@@ -1878,7 +1891,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
 }
 
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
 /* *** FOR DEBUG ONLY *** */
 const char *dbg_get_lexer_type( void *vp )
 {
@@ -2014,13 +2027,21 @@ int         tidyDocCleanAndRepair( TidyDocImpl* doc )
     Bool wantNameAttr = cfgBool( doc, TidyAnchorAsName );
     Bool mergeEmphasis = cfgBool( doc, TidyMergeEmphasis );
     Node* node;
+    TidyConfigChangeCallback callback = doc->pConfigChangeCallback;
+    doc->pConfigChangeCallback = NULL;
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     SPRTF("All nodes BEFORE clean and repair\n");
     dbg_show_all_nodes( doc, &doc->root, 0  );
 #endif
     if (tidyXmlTags)
-       return tidyDocStatus( doc );
+    {
+        doc->pConfigChangeCallback = callback;
+        return tidyDocStatus( doc );
+    }
+
+    /* Issue #567 - move style elements from body to head */
+    TY_(CleanStyle)(doc, &doc->root);
 
     /* simplifies <b><b> ... </b> ...</b> etc. */
     if ( mergeEmphasis )
@@ -2052,21 +2073,8 @@ int         tidyDocCleanAndRepair( TidyDocImpl* doc )
     if ( gdoc )
         TY_(CleanGoogleDocument)( doc );
 
-    /*  Move terminating <br /> tags from out of paragraphs  */
-    /*!  Do we want to do this for all block-level elements?  */
-
-    /* This is disabled due to http://tidy.sf.net/bug/681116 */
-#if 0
-    FixBrakes( doc, TY_(FindBody)( doc ));
-#endif
-
     /*  Reconcile http-equiv meta element with output encoding  */
-    if (cfg( doc, TidyOutCharEncoding) != RAW
-#ifndef NO_NATIVE_ISO2022_SUPPORT
-        && cfg( doc, TidyOutCharEncoding) != ISO2022
-#endif
-        )
-        TY_(VerifyHTTPEquiv)( doc, TY_(FindHEAD)( doc ));
+    TY_(TidyMetaCharset)(doc);
 
     if ( !TY_(CheckNodeIntegrity)( &doc->root ) )
         TidyPanic( doc->allocator, integrity );
@@ -2113,6 +2121,7 @@ int         tidyDocCleanAndRepair( TidyDocImpl* doc )
 
         if (tidyMark )
             TY_(AddGenerator)(doc);
+
     }
 
     /* ensure presence of initial <?xml version="1.0"?> */
@@ -2137,15 +2146,17 @@ int         tidyDocCleanAndRepair( TidyDocImpl* doc )
 
         if ( !doc->lexer->isvoyager && doc->xmlDetected )
         {
-            TY_(ReportWarning)(doc, NULL, TY_(FindXmlDecl)(doc), XML_DECLARATION_DETECTED );
+            TY_(Report)(doc, NULL, TY_(FindXmlDecl)(doc), XML_DECLARATION_DETECTED );
 
         }
     }
 
-#if !defined(NDEBUG) && defined(_MSC_VER)
+#if defined(ENABLE_DEBUG_LOG)
     SPRTF("All nodes AFTER clean and repair\n");
     dbg_show_all_nodes( doc, &doc->root, 0  );
 #endif
+
+    doc->pConfigChangeCallback = callback;
     return tidyDocStatus( doc );
 }
 
@@ -2173,10 +2184,8 @@ int         tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
 {
     Bool showMarkup  = cfgBool( doc, TidyShowMarkup );
     Bool forceOutput = cfgBool( doc, TidyForceOutput );
-#if SUPPORT_UTF16_ENCODINGS
     Bool outputBOM   = ( cfgAutoBool(doc, TidyOutputBOM) == TidyYesState );
     Bool smartBOM    = ( cfgAutoBool(doc, TidyOutputBOM) == TidyAutoState );
-#endif
     Bool xmlOut      = cfgBool( doc, TidyXmlOut );
     Bool xhtmlOut    = cfgBool( doc, TidyXhtmlOut );
     TidyTriState bodyOnly    = cfgAutoBool( doc, TidyBodyOnly );
@@ -2188,6 +2197,8 @@ int         tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
     Bool escapeCDATA  = cfgBool(doc, TidyEscapeCdata);
     Bool ppWithTabs   = cfgBool(doc, TidyPPrintTabs);
     TidyAttrSortStrategy sortAttrStrat = cfg(doc, TidySortAttributes);
+    TidyConfigChangeCallback callback = doc->pConfigChangeCallback;
+    doc->pConfigChangeCallback = NULL;
 
     if (ppWithTabs)
         TY_(PPrintTabs)();
@@ -2216,16 +2227,13 @@ int         tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
     else
         TY_(ReplacePreformattedSpaces)(doc, &doc->root);
 
-    if ( sortAttrStrat != TidySortAttrNone )
-        TY_(SortAttributes)(&doc->root, sortAttrStrat);
+    TY_(SortAttributes)(doc, &doc->root, sortAttrStrat);
 
     if ( showMarkup && (doc->errors == 0 || forceOutput) )
     {
-#if SUPPORT_UTF16_ENCODINGS
         /* Output a Byte Order Mark if required */
         if ( outputBOM || (doc->inputHadBOM && smartBOM) )
             TY_(outBOM)( out );
-#endif
 
         /* No longer necessary. No DOCTYPE == HTML 3.2,
         ** which gives you only the basic character entities,
@@ -2247,6 +2255,8 @@ int         tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
     }
 
     TY_(ResetConfigToSnapshot)( doc );
+    doc->pConfigChangeCallback = callback;
+    
     return tidyDocStatus( doc );
 }
 
@@ -2533,6 +2543,18 @@ TidyAttrId TIDY_CALL tidyAttrGetId( TidyAttr tattr )
   return attrId;
 }
 
+TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId )
+{
+    Node* nimp = tidyNodeToImpl(tnod);
+    return tidyImplToAttr( TY_(AttrGetById)( nimp, attId ) );
+}
+
+
+Bool TIDY_CALL tidyAttrIsEvent( TidyAttr tattr )
+{
+    return TY_(attrIsEvent)( tidyAttrToImpl(tattr) );
+}
+
 
 /*******************************************************************
  ** Message Key Management
@@ -2563,14 +2585,14 @@ uint TIDY_CALL getNextErrorCode( TidyIterator* iter )
  *******************************************************************/
 
 
-tmbstr TIDY_CALL tidySystemLocale(tmbstr result)
-{
-    return TY_(tidySystemLocale)( result );
-}
-
 Bool TIDY_CALL tidySetLanguage( ctmbstr languageCode )
 {
-    return TY_(tidySetLanguage)( languageCode );
+    Bool result = TY_(tidySetLanguage)( languageCode );
+
+    if ( result )
+        TY_(tidySetLanguageSetByUser)();
+
+    return result;
 }
 
 ctmbstr TIDY_CALL tidyGetLanguage()
diff --git a/HTMLTidy/vendor/tidy-html5/src/tmbstr.c b/HTMLTidy/vendor/tidy-html5/src/tmbstr.c
index ca5f9db2..0cfe5f23 100644
--- a/HTMLTidy/vendor/tidy-html5/src/tmbstr.c
+++ b/HTMLTidy/vendor/tidy-html5/src/tmbstr.c
@@ -102,7 +102,7 @@ uint TY_(tmbstrlen)( ctmbstr str )
 }
 
 /*
- MS C 4.2 doesn't include strcasecmp.
+ MS C 4.2 (and ANSI C) doesn't include strcasecmp.
  Note that tolower and toupper won't
  work on chars > 127.
 
@@ -128,6 +128,13 @@ int TY_(tmbstrncmp)( ctmbstr s1, ctmbstr s2, uint n )
 {
     uint c;
 
+	if (s1 == NULL || s2 == NULL)
+    {
+        if (s1 == s2)
+            return 0;
+        return (s1 == NULL ? -1 : 1);
+    }
+
     while ((c = (byte)*s1) == (byte)*s2)
     {
         if (c == '\0')
@@ -170,25 +177,6 @@ int TY_(tmbstrncasecmp)( ctmbstr s1, ctmbstr s2, uint n )
     return (*s1 > *s2 ? 1 : -1);
 }
 
-#if 0
-/* return offset of cc from beginning of s1,
-** -1 if not found.
-*/
-int TY_(tmbstrnchr)( ctmbstr s1, uint maxlen, tmbchar cc )
-{
-    int i;
-    ctmbstr cp = s1;
-
-    for ( i = 0; (uint)i < maxlen; ++i, ++cp )
-    {
-        if ( *cp == cc )
-            return i;
-    }
-
-    return -1;
-}
-#endif
-
 ctmbstr TY_(tmbsubstrn)( ctmbstr s1, uint len1, ctmbstr s2 )
 {
     uint len2 = TY_(tmbstrlen)(s2);
@@ -202,21 +190,6 @@ ctmbstr TY_(tmbsubstrn)( ctmbstr s1, uint len1, ctmbstr s2 )
     return NULL;
 }
 
-#if 0
-ctmbstr TY_(tmbsubstrncase)( ctmbstr s1, uint len1, ctmbstr s2 )
-{
-    uint len2 = TY_(tmbstrlen)(s2);
-    int ix, diff = len1 - len2;
-
-    for ( ix = 0; ix <= diff; ++ix )
-    {
-        if ( TY_(tmbstrncasecmp)(s1+ix, s2, len2) == 0 )
-            return (ctmbstr) s1+ix;
-    }
-    return NULL;
-}
-#endif
-
 ctmbstr TY_(tmbsubstr)( ctmbstr s1, ctmbstr s2 )
 {
     uint len1 = TY_(tmbstrlen)(s1), len2 = TY_(tmbstrlen)(s2);
@@ -250,17 +223,6 @@ tmbstr TY_(tmbstrtoupper)(tmbstr s)
     return s;
 }
 
-#if 0
-Bool TY_(tmbsamefile)( ctmbstr filename1, ctmbstr filename2 )
-{
-#if FILENAMES_CASE_SENSITIVE
-    return ( TY_(tmbstrcmp)( filename1, filename2 ) == 0 );
-#else
-    return ( TY_(tmbstrcasecmp)( filename1, filename2 ) == 0 );
-#endif
-}
-#endif
-
 int TY_(tmbvsnprintf)(tmbstr buffer, size_t count, ctmbstr format, va_list args)
 {
     int retval;
diff --git a/HTMLTidy/vendor/tidy-html5/src/utf8.c b/HTMLTidy/vendor/tidy-html5/src/utf8.c
index a23d8885..1ed423ec 100644
--- a/HTMLTidy/vendor/tidy-html5/src/utf8.c
+++ b/HTMLTidy/vendor/tidy-html5/src/utf8.c
@@ -273,12 +273,6 @@ int TY_(DecodeUTF8BytesToChar)( uint* c, uint firstByte, ctmbstr successorBytes,
     if (!hasError && (n > kMaxUTF8FromUCS4))
         hasError = yes;
 
-#if 0 /* Breaks Big5 D8 - DF */
-    if (!hasError && (n >= kUTF16LowSurrogateBegin) && (n <= kUTF16HighSurrogateEnd))
-        /* unpaired surrogates not allowed */
-        hasError = yes;
-#endif
-
     if (!hasError)
     {
         int lo, hi;
@@ -364,11 +358,6 @@ int TY_(EncodeCharToUTF8Bytes)( uint c, tmbstr encodebuf,
         bytes = 3;
         if ( c == kUTF8ByteSwapNotAChar || c == kUTF8NotAChar )
             hasError = yes;
-#if 0 /* Breaks Big5 D8 - DF */
-        else if ( c >= kUTF16LowSurrogateBegin && c <= kUTF16HighSurrogateEnd )
-            /* unpaired surrogates not allowed */
-            hasError = yes;
-#endif
     }
     else if (c <= 0x1FFFFF)  /* 1111 0XXX  four bytes */
     {
diff --git a/HTMLTidy/vendor/tidy-html5/src/win32tc.c b/HTMLTidy/vendor/tidy-html5/src/win32tc.c
deleted file mode 100644
index 6d9cd448..00000000
--- a/HTMLTidy/vendor/tidy-html5/src/win32tc.c
+++ /dev/null
@@ -1,794 +0,0 @@
-/* win32tc.c -- Interface to Win32 transcoding routines
-
-  (c) 1998-2008 (W3C) MIT, ERCIM, Keio University
-  See tidy.h for the copyright notice.
-
-*/
-
-/* keep these here to keep file non-empty */
-#include "tidy.h"
-#include "forward.h"
-#include "streamio.h"
-#include "tmbstr.h"
-#include "utf8.h"
-
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-
-#define VC_EXTRALEAN
-#define CINTERFACE
-#define COBJMACROS
-
-#include <windows.h>
-#include <mlang.h>
-
-#undef COBJMACROS
-#undef CINTERFACE
-#undef VC_EXTRALEAN
-
-/* maximum number of bytes for a single character */
-#define TC_INBUFSIZE  16
-
-/* maximum number of characters per byte sequence */
-#define TC_OUTBUFSIZE 16
-
-#define CreateMLangObject(p) \
-  CoCreateInstance( \
-        &CLSID_CMLangConvertCharset, \
-        NULL, \
-        CLSCTX_ALL, \
-        &IID_IMLangConvertCharset, \
-        (VOID **)&p);
-
-
-/* Character Set to Microsoft Windows Codepage Identifier map,     */
-/* from <rotor/sscli/clr/src/classlibnative/nls/encodingdata.cpp>. */
-
-/* note: the 'safe' field indicates whether this encoding can be   */
-/* read/written character-by-character; this does not apply to     */
-/* various stateful encodings such as ISO-2022 or UTF-7, these     */
-/* must be read/written as a complete stream. It is possible that  */
-/* some 'unsafe' encodings are marked as 'save'.                   */
-
-/* todo: cleanup; Tidy should use only a single mapping table to   */
-/* circumvent unsupported aliases in other transcoding libraries,  */
-/* enable reverse lookup of encoding names and ease maintenance.   */
-
-static struct _nameWinCPMap
-{
-    tmbstr name;
-    uint wincp;
-    Bool safe;
-} const NameWinCPMap[] = {
-  { "cp037",                                            37, yes },
-  { "csibm037",                                         37, yes },
-  { "ebcdic-cp-ca",                                     37, yes },
-  { "ebcdic-cp-nl",                                     37, yes },
-  { "ebcdic-cp-us",                                     37, yes },
-  { "ebcdic-cp-wt",                                     37, yes },
-  { "ibm037",                                           37, yes },
-  { "cp437",                                           437, yes },
-  { "cspc8codepage437",                                437, yes },
-  { "ibm437",                                          437, yes },
-  { "cp500",                                           500, yes },
-  { "csibm500",                                        500, yes },
-  { "ebcdic-cp-be",                                    500, yes },
-  { "ebcdic-cp-ch",                                    500, yes },
-  { "ibm500",                                          500, yes },
-  { "asmo-708",                                        708, yes },
-  { "dos-720",                                         720, yes },
-  { "ibm737",                                          737, yes },
-  { "ibm775",                                          775, yes },
-  { "cp850",                                           850, yes },
-  { "ibm850",                                          850, yes },
-  { "cp852",                                           852, yes },
-  { "ibm852",                                          852, yes },
-  { "cp855",                                           855, yes },
-  { "ibm855",                                          855, yes },
-  { "cp857",                                           857, yes },
-  { "ibm857",                                          857, yes },
-  { "ccsid00858",                                      858, yes },
-  { "cp00858",                                         858, yes },
-  { "cp858",                                           858, yes },
-  { "ibm00858",                                        858, yes },
-  { "pc-multilingual-850+euro",                        858, yes },
-  { "cp860",                                           860, yes },
-  { "ibm860",                                          860, yes },
-  { "cp861",                                           861, yes },
-  { "ibm861",                                          861, yes },
-  { "cp862",                                           862, yes },
-  { "dos-862",                                         862, yes },
-  { "ibm862",                                          862, yes },
-  { "cp863",                                           863, yes },
-  { "ibm863",                                          863, yes },
-  { "cp864",                                           864, yes },
-  { "ibm864",                                          864, yes },
-  { "cp865",                                           865, yes },
-  { "ibm865",                                          865, yes },
-  { "cp866",                                           866, yes },
-  { "ibm866",                                          866, yes },
-  { "cp869",                                           869, yes },
-  { "ibm869",                                          869, yes },
-  { "cp870",                                           870, yes },
-  { "csibm870",                                        870, yes },
-  { "ebcdic-cp-roece",                                 870, yes },
-  { "ebcdic-cp-yu",                                    870, yes },
-  { "ibm870",                                          870, yes },
-  { "dos-874",                                         874, yes },
-  { "iso-8859-11",                                     874, yes },
-  { "tis-620",                                         874, yes },
-  { "windows-874",                                     874, yes },
-  { "cp875",                                           875, yes },
-  { "csshiftjis",                                      932, yes },
-  { "cswindows31j",                                    932, yes },
-  { "ms_kanji",                                        932, yes },
-  { "shift-jis",                                       932, yes },
-  { "shift_jis",                                       932, yes },
-  { "sjis",                                            932, yes },
-  { "x-ms-cp932",                                      932, yes },
-  { "x-sjis",                                          932, yes },
-  { "chinese",                                         936, yes },
-  { "cn-gb",                                           936, yes },
-  { "csgb2312",                                        936, yes },
-  { "csgb231280",                                      936, yes },
-  { "csiso58gb231280",                                 936, yes },
-  { "gb2312",                                          936, yes },
-  { "gb2312-80",                                       936, yes },
-  { "gb231280",                                        936, yes },
-  { "gb_2312-80",                                      936, yes },
-  { "gbk",                                             936, yes },
-  { "iso-ir-58",                                       936, yes },
-  { "csksc56011987",                                   949, yes },
-  { "iso-ir-149",                                      949, yes },
-  { "korean",                                          949, yes },
-  { "ks-c-5601",                                       949, yes },
-  { "ks-c5601",                                        949, yes },
-  { "ks_c_5601",                                       949, yes },
-  { "ks_c_5601-1987",                                  949, yes },
-  { "ks_c_5601-1989",                                  949, yes },
-  { "ks_c_5601_1987",                                  949, yes },
-  { "ksc5601",                                         949, yes },
-  { "ksc_5601",                                        949, yes },
-  { "big5",                                            950, yes },
-  { "big5-hkscs",                                      950, yes },
-  { "cn-big5",                                         950, yes },
-  { "csbig5",                                          950, yes },
-  { "x-x-big5",                                        950, yes },
-  { "cp1026",                                         1026, yes },
-  { "csibm1026",                                      1026, yes },
-  { "ibm1026",                                        1026, yes },
-  { "ibm01047",                                       1047, yes },
-  { "ccsid01140",                                     1140, yes },
-  { "cp01140",                                        1140, yes },
-  { "ebcdic-us-37+euro",                              1140, yes },
-  { "ibm01140",                                       1140, yes },
-  { "ccsid01141",                                     1141, yes },
-  { "cp01141",                                        1141, yes },
-  { "ebcdic-de-273+euro",                             1141, yes },
-  { "ibm01141",                                       1141, yes },
-  { "ccsid01142",                                     1142, yes },
-  { "cp01142",                                        1142, yes },
-  { "ebcdic-dk-277+euro",                             1142, yes },
-  { "ebcdic-no-277+euro",                             1142, yes },
-  { "ibm01142",                                       1142, yes },
-  { "ccsid01143",                                     1143, yes },
-  { "cp01143",                                        1143, yes },
-  { "ebcdic-fi-278+euro",                             1143, yes },
-  { "ebcdic-se-278+euro",                             1143, yes },
-  { "ibm01143",                                       1143, yes },
-  { "ccsid01144",                                     1144, yes },
-  { "cp01144",                                        1144, yes },
-  { "ebcdic-it-280+euro",                             1144, yes },
-  { "ibm01144",                                       1144, yes },
-  { "ccsid01145",                                     1145, yes },
-  { "cp01145",                                        1145, yes },
-  { "ebcdic-es-284+euro",                             1145, yes },
-  { "ibm01145",                                       1145, yes },
-  { "ccsid01146",                                     1146, yes },
-  { "cp01146",                                        1146, yes },
-  { "ebcdic-gb-285+euro",                             1146, yes },
-  { "ibm01146",                                       1146, yes },
-  { "ccsid01147",                                     1147, yes },
-  { "cp01147",                                        1147, yes },
-  { "ebcdic-fr-297+euro",                             1147, yes },
-  { "ibm01147",                                       1147, yes },
-  { "ccsid01148",                                     1148, yes },
-  { "cp01148",                                        1148, yes },
-  { "ebcdic-international-500+euro",                  1148, yes },
-  { "ibm01148",                                       1148, yes },
-  { "ccsid01149",                                     1149, yes },
-  { "cp01149",                                        1149, yes },
-  { "ebcdic-is-871+euro",                             1149, yes },
-  { "ibm01149",                                       1149, yes },
-  { "iso-10646-ucs-2",                                1200, yes },
-  { "ucs-2",                                          1200, yes },
-  { "unicode",                                        1200, yes },
-  { "utf-16",                                         1200, yes },
-  { "utf-16le",                                       1200, yes },
-  { "unicodefffe",                                    1201, yes },
-  { "utf-16be",                                       1201, yes },
-  { "windows-1250",                                   1250, yes },
-  { "x-cp1250",                                       1250, yes },
-  { "windows-1251",                                   1251, yes },
-  { "x-cp1251",                                       1251, yes },
-  { "windows-1252",                                   1252, yes },
-  { "x-ansi",                                         1252, yes },
-  { "windows-1253",                                   1253, yes },
-  { "windows-1254",                                   1254, yes },
-  { "windows-1255",                                   1255, yes },
-  { "cp1256",                                         1256, yes },
-  { "windows-1256",                                   1256, yes },
-  { "windows-1257",                                   1257, yes },
-  { "windows-1258",                                   1258, yes },
-  { "johab",                                          1361, yes },
-  { "macintosh",                                     10000, yes },
-  { "x-mac-japanese",                                10001, yes },
-  { "x-mac-chinesetrad",                             10002, yes },
-  { "x-mac-korean",                                  10003, yes },
-  { "x-mac-arabic",                                  10004, yes },
-  { "x-mac-hebrew",                                  10005, yes },
-  { "x-mac-greek",                                   10006, yes },
-  { "x-mac-cyrillic",                                10007, yes },
-  { "x-mac-chinesesimp",                             10008, yes },
-  { "x-mac-romanian",                                10010, yes },
-  { "x-mac-ukrainian",                               10017, yes },
-  { "x-mac-thai",                                    10021, yes },
-  { "x-mac-ce",                                      10029, yes },
-  { "x-mac-icelandic",                               10079, yes },
-  { "x-mac-turkish",                                 10081, yes },
-  { "x-mac-croatian",                                10082, yes },
-  { "x-chinese-cns",                                 20000, yes },
-  { "x-cp20001",                                     20001, yes },
-  { "x-chinese-eten",                                20002, yes },
-  { "x-cp20003",                                     20003, yes },
-  { "x-cp20004",                                     20004, yes },
-  { "x-cp20005",                                     20005, yes },
-  { "irv",                                           20105, yes },
-  { "x-ia5",                                         20105, yes },
-  { "din_66003",                                     20106, yes },
-  { "german",                                        20106, yes },
-  { "x-ia5-german",                                  20106, yes },
-  { "sen_850200_b",                                  20107, yes },
-  { "swedish",                                       20107, yes },
-  { "x-ia5-swedish",                                 20107, yes },
-  { "norwegian",                                     20108, yes },
-  { "ns_4551-1",                                     20108, yes },
-  { "x-ia5-norwegian",                               20108, yes },
-  { "ansi_x3.4-1968",                                20127, yes },
-  { "ansi_x3.4-1986",                                20127, yes },
-  { "ascii",                                         20127, yes },
-  { "cp367",                                         20127, yes },
-  { "csascii",                                       20127, yes },
-  { "ibm367",                                        20127, yes },
-  { "iso-ir-6",                                      20127, yes },
-  { "iso646-us",                                     20127, yes },
-  { "iso_646.irv:1991",                              20127, yes },
-  { "us",                                            20127, yes },
-  { "us-ascii",                                      20127, yes },
-  { "x-cp20261",                                     20261, yes },
-  { "x-cp20269",                                     20269, yes },
-  { "cp273",                                         20273, yes },
-  { "csibm273",                                      20273, yes },
-  { "ibm273",                                        20273, yes },
-  { "csibm277",                                      20277, yes },
-  { "ebcdic-cp-dk",                                  20277, yes },
-  { "ebcdic-cp-no",                                  20277, yes },
-  { "ibm277",                                        20277, yes },
-  { "cp278",                                         20278, yes },
-  { "csibm278",                                      20278, yes },
-  { "ebcdic-cp-fi",                                  20278, yes },
-  { "ebcdic-cp-se",                                  20278, yes },
-  { "ibm278",                                        20278, yes },
-  { "cp280",                                         20280, yes },
-  { "csibm280",                                      20280, yes },
-  { "ebcdic-cp-it",                                  20280, yes },
-  { "ibm280",                                        20280, yes },
-  { "cp284",                                         20284, yes },
-  { "csibm284",                                      20284, yes },
-  { "ebcdic-cp-es",                                  20284, yes },
-  { "ibm284",                                        20284, yes },
-  { "cp285",                                         20285, yes },
-  { "csibm285",                                      20285, yes },
-  { "ebcdic-cp-gb",                                  20285, yes },
-  { "ibm285",                                        20285, yes },
-  { "cp290",                                         20290, yes },
-  { "csibm290",                                      20290, yes },
-  { "ebcdic-jp-kana",                                20290, yes },
-  { "ibm290",                                        20290, yes },
-  { "cp297",                                         20297, yes },
-  { "csibm297",                                      20297, yes },
-  { "ebcdic-cp-fr",                                  20297, yes },
-  { "ibm297",                                        20297, yes },
-  { "cp420",                                         20420, yes },
-  { "csibm420",                                      20420, yes },
-  { "ebcdic-cp-ar1",                                 20420, yes },
-  { "ibm420",                                        20420, yes },
-  { "cp423",                                         20423, yes },
-  { "csibm423",                                      20423, yes },
-  { "ebcdic-cp-gr",                                  20423, yes },
-  { "ibm423",                                        20423, yes },
-  { "cp424",                                         20424, yes },
-  { "csibm424",                                      20424, yes },
-  { "ebcdic-cp-he",                                  20424, yes },
-  { "ibm424",                                        20424, yes },
-  { "x-ebcdic-koreanextended",                       20833, yes },
-  { "csibmthai",                                     20838, yes },
-  { "ibm-thai",                                      20838, yes },
-  { "cskoi8r",                                       20866, yes },
-  { "koi",                                           20866, yes },
-  { "koi8",                                          20866, yes },
-  { "koi8-r",                                        20866, yes },
-  { "koi8r",                                         20866, yes },
-  { "cp871",                                         20871, yes },
-  { "csibm871",                                      20871, yes },
-  { "ebcdic-cp-is",                                  20871, yes },
-  { "ibm871",                                        20871, yes },
-  { "cp880",                                         20880, yes },
-  { "csibm880",                                      20880, yes },
-  { "ebcdic-cyrillic",                               20880, yes },
-  { "ibm880",                                        20880, yes },
-  { "cp905",                                         20905, yes },
-  { "csibm905",                                      20905, yes },
-  { "ebcdic-cp-tr",                                  20905, yes },
-  { "ibm905",                                        20905, yes },
-  { "ccsid00924",                                    20924, yes },
-  { "cp00924",                                       20924, yes },
-  { "ebcdic-latin9--euro",                           20924, yes },
-  { "ibm00924",                                      20924, yes },
-  { "x-cp20936",                                     20936, yes },
-  { "x-cp20949",                                     20949, yes },
-  { "cp1025",                                        21025, yes },
-  { "x-cp21027",                                     21027, yes },
-  { "koi8-ru",                                       21866, yes },
-  { "koi8-u",                                        21866, yes },
-  { "cp819",                                         28591, yes },
-  { "csisolatin1",                                   28591, yes },
-  { "ibm819",                                        28591, yes },
-  { "iso-8859-1",                                    28591, yes },
-  { "iso-ir-100",                                    28591, yes },
-  { "iso8859-1",                                     28591, yes },
-  { "iso_8859-1",                                    28591, yes },
-  { "iso_8859-1:1987",                               28591, yes },
-  { "l1",                                            28591, yes },
-  { "latin1",                                        28591, yes },
-  { "csisolatin2",                                   28592, yes },
-  { "iso-8859-2",                                    28592, yes },
-  { "iso-ir-101",                                    28592, yes },
-  { "iso8859-2",                                     28592, yes },
-  { "iso_8859-2",                                    28592, yes },
-  { "iso_8859-2:1987",                               28592, yes },
-  { "l2",                                            28592, yes },
-  { "latin2",                                        28592, yes },
-  { "csisolatin3",                                   28593, yes },
-  { "iso-8859-3",                                    28593, yes },
-  { "iso-ir-109",                                    28593, yes },
-  { "iso_8859-3",                                    28593, yes },
-  { "iso_8859-3:1988",                               28593, yes },
-  { "l3",                                            28593, yes },
-  { "latin3",                                        28593, yes },
-  { "csisolatin4",                                   28594, yes },
-  { "iso-8859-4",                                    28594, yes },
-  { "iso-ir-110",                                    28594, yes },
-  { "iso_8859-4",                                    28594, yes },
-  { "iso_8859-4:1988",                               28594, yes },
-  { "l4",                                            28594, yes },
-  { "latin4",                                        28594, yes },
-  { "csisolatincyrillic",                            28595, yes },
-  { "cyrillic",                                      28595, yes },
-  { "iso-8859-5",                                    28595, yes },
-  { "iso-ir-144",                                    28595, yes },
-  { "iso_8859-5",                                    28595, yes },
-  { "iso_8859-5:1988",                               28595, yes },
-  { "arabic",                                        28596, yes },
-  { "csisolatinarabic",                              28596, yes },
-  { "ecma-114",                                      28596, yes },
-  { "iso-8859-6",                                    28596, yes },
-  { "iso-ir-127",                                    28596, yes },
-  { "iso_8859-6",                                    28596, yes },
-  { "iso_8859-6:1987",                               28596, yes },
-  { "csisolatingreek",                               28597, yes },
-  { "ecma-118",                                      28597, yes },
-  { "elot_928",                                      28597, yes },
-  { "greek",                                         28597, yes },
-  { "greek8",                                        28597, yes },
-  { "iso-8859-7",                                    28597, yes },
-  { "iso-ir-126",                                    28597, yes },
-  { "iso_8859-7",                                    28597, yes },
-  { "iso_8859-7:1987",                               28597, yes },
-  { "csisolatinhebrew",                              28598, yes },
-  { "hebrew",                                        28598, yes },
-  { "iso-8859-8",                                    28598, yes },
-  { "iso-ir-138",                                    28598, yes },
-  { "iso_8859-8",                                    28598, yes },
-  { "iso_8859-8:1988",                               28598, yes },
-  { "logical",                                       28598, yes },
-  { "visual",                                        28598, yes },
-  { "csisolatin5",                                   28599, yes },
-  { "iso-8859-9",                                    28599, yes },
-  { "iso-ir-148",                                    28599, yes },
-  { "iso_8859-9",                                    28599, yes },
-  { "iso_8859-9:1989",                               28599, yes },
-  { "l5",                                            28599, yes },
-  { "latin5",                                        28599, yes },
-  { "iso-8859-13",                                   28603, yes },
-  { "csisolatin9",                                   28605, yes },
-  { "iso-8859-15",                                   28605, yes },
-  { "iso_8859-15",                                   28605, yes },
-  { "l9",                                            28605, yes },
-  { "latin9",                                        28605, yes },
-  { "x-europa",                                      29001, yes },
-  { "iso-8859-8-i",                                  38598, yes },
-  { "iso-2022-jp",                                   50220,  no },
-  { "csiso2022jp",                                   50221,  no },
-  { "csiso2022kr",                                   50225,  no },
-  { "iso-2022-kr",                                   50225,  no },
-  { "iso-2022-kr-7",                                 50225,  no },
-  { "iso-2022-kr-7bit",                              50225,  no },
-  { "cp50227",                                       50227,  no },
-  { "x-cp50227",                                     50227,  no },
-  { "cp930",                                         50930, yes },
-  { "x-ebcdic-japaneseanduscanada",                  50931, yes },
-  { "cp933",                                         50933, yes },
-  { "cp935",                                         50935, yes },
-  { "cp937",                                         50937, yes },
-  { "cp939",                                         50939, yes },
-  { "cseucpkdfmtjapanese",                           51932, yes },
-  { "euc-jp",                                        51932, yes },
-  { "extended_unix_code_packed_format_for_japanese", 51932, yes },
-  { "iso-2022-jpeuc",                                51932, yes },
-  { "x-euc",                                         51932, yes },
-  { "x-euc-jp",                                      51932, yes },
-  { "euc-cn",                                        51936, yes },
-  { "x-euc-cn",                                      51936, yes },
-  { "cseuckr",                                       51949, yes },
-  { "euc-kr",                                        51949, yes },
-  { "iso-2022-kr-8",                                 51949, yes },
-  { "iso-2022-kr-8bit",                              51949, yes },
-  { "hz-gb-2312",                                    52936,  no },
-  { "gb18030",                                       54936, yes },
-  { "x-iscii-de",                                    57002, yes },
-  { "x-iscii-be",                                    57003, yes },
-  { "x-iscii-ta",                                    57004, yes },
-  { "x-iscii-te",                                    57005, yes },
-  { "x-iscii-as",                                    57006, yes },
-  { "x-iscii-or",                                    57007, yes },
-  { "x-iscii-ka",                                    57008, yes },
-  { "x-iscii-ma",                                    57009, yes },
-  { "x-iscii-gu",                                    57010, yes },
-  { "x-iscii-pa",                                    57011, yes },
-  { "csunicode11utf7",                               65000,  no },
-  { "unicode-1-1-utf-7",                             65000,  no },
-  { "unicode-2-0-utf-7",                             65000,  no },
-  { "utf-7",                                         65000,  no },
-  { "x-unicode-1-1-utf-7",                           65000,  no },
-  { "x-unicode-2-0-utf-7",                           65000,  no },
-  { "unicode-1-1-utf-8",                             65001, yes },
-  { "unicode-2-0-utf-8",                             65001, yes },
-  { "utf-8",                                         65001, yes },
-  { "x-unicode-1-1-utf-8",                           65001, yes },
-  { "x-unicode-2-0-utf-8",                           65001, yes },
-
-  /* final entry */
-  { NULL,                                                0,  no }
-};
-
-uint TY_(Win32MLangGetCPFromName)(TidyAllocator *allocator, ctmbstr encoding)
-{
-    uint i;
-    tmbstr enc;
-
-    /* ensure name is in lower case */
-    enc = TY_(tmbstrdup)(allocator,encoding);
-    enc = TY_(tmbstrtolower)(enc);
-
-    for (i = 0; NameWinCPMap[i].name; ++i)
-    {
-        if (TY_(tmbstrcmp)(NameWinCPMap[i].name, enc) == 0)
-        {
-            IMLangConvertCharset * p = NULL;
-            uint wincp = NameWinCPMap[i].wincp;
-            HRESULT hr;
-
-            TidyFree(allocator, enc);
-
-            /* currently no support for unsafe encodings */
-            if (!NameWinCPMap[i].safe)
-                return 0;
-
-            /* hack for config.c */
-            CoInitialize(NULL);
-            hr = CreateMLangObject(p);
-
-            if (hr != S_OK || !p)
-            {
-                wincp = 0;
-            }
-            else
-            {
-                hr = IMLangConvertCharset_Initialize(p, wincp, 1200, 0);
-
-                if (hr != S_OK)
-                    wincp = 0;
-
-                IMLangConvertCharset_Release(p);
-                p = NULL;
-            }
-
-            CoUninitialize();
-
-            return wincp;
-        }
-    }
-
-    TidyFree(allocator, enc);
-    return 0;
-}
-
-Bool TY_(Win32MLangInitInputTranscoder)(StreamIn * in, uint wincp)
-{
-    IMLangConvertCharset * p = NULL;
-    HRESULT hr;
-
-    assert( in != NULL );
-
-    CoInitialize(NULL);
-
-    if (wincp == 0)
-    {
-        /* no codepage found for this encoding */
-        return no;
-    }
-
-    hr = CreateMLangObject(p);
-
-    if (hr != S_OK || !p)
-    {
-        /* MLang not supported */
-        return no;
-    }
-
-    hr = IMLangConvertCharset_Initialize(p, wincp, 1200, 0);
-
-    if (hr != S_OK)
-    {
-        /* encoding not supported, insufficient memory, etc. */
-        return no;
-    }
-
-    in->mlang = p;
-
-    return yes;
-}
-
-void TY_(Win32MLangUninitInputTranscoder)(StreamIn * in)
-{
-    IMLangConvertCharset * p;
-
-    assert( in != NULL );
-
-    p = (IMLangConvertCharset *)in->mlang;
-    if (p)
-    {
-        IMLangConvertCharset_Release(p);
-        p = NULL;
-        in->mlang = NULL;
-    }
-
-    CoUninitialize();
-}
-
-#if 0
-Bool Win32MLangInitOutputTranscoder(TidyAllocator *allocator, StreamOut * out, tmbstr encoding)
-{
-    IMLangConvertCharset * p = NULL;
-    HRESULT hr;
-    uint wincp;
-
-    assert( out != NULL );
-
-    CoInitialize(NULL);
-
-    wincp = TY_(Win32MLangGetCPFromName)(allocator, encoding);
-    if (wincp == 0)
-    {
-        /* no codepage found for this encoding */
-        return no;
-    }
-
-    hr = CreateMLangObject(p);
-
-    if (hr != S_OK || !p)
-    {
-        /* MLang not supported */
-        return no;
-    }
-
-    IMLangConvertCharset_Initialize(p, 1200, wincp, MLCONVCHARF_NOBESTFITCHARS);
-
-    if (hr != S_OK)
-    {
-        /* encoding not supported, insufficient memory, etc. */
-        return no;
-    }
-
-    out->mlang = p;
-
-    return yes;
-}
-
-void Win32MLangUninitOutputTranscoder(StreamOut * out)
-{
-    IMLangConvertCharset * p;
-
-    assert( out != NULL );
-
-    p = (IMLangConvertCharset *)out->mlang;
-    if (p)
-    {
-        IMLangConvertCharset_Release(p);
-        p = NULL;
-        out->mlang = NULL;
-    }
-
-    CoUninitialize();
-}
-#endif
-
-int TY_(Win32MLangGetChar)(byte firstByte, StreamIn * in, uint * bytesRead)
-{
-    IMLangConvertCharset * p;
-    TidyInputSource * source;
-    CHAR inbuf[TC_INBUFSIZE] = { 0 };
-    WCHAR outbuf[TC_OUTBUFSIZE] = { 0 };
-    HRESULT hr = S_OK;
-    size_t inbufsize = 0;
-
-    assert( in != NULL );
-    assert( &in->source != NULL );
-    assert( bytesRead != NULL );
-    assert( in->mlang != NULL );
-
-    p = (IMLangConvertCharset *)in->mlang;
-    source = &in->source;
-
-    inbuf[inbufsize++] = (CHAR)firstByte;
-
-    while(inbufsize < TC_INBUFSIZE)
-    {
-        UINT outbufsize = TC_OUTBUFSIZE;
-        UINT readNow = inbufsize;
-        int nextByte = EndOfStream;
-
-        hr = IMLangConvertCharset_DoConversionToUnicode(p, inbuf, &readNow, outbuf, &outbufsize);
-
-        assert( hr == S_OK );
-        assert( outbufsize <= 2 );
-
-        if (outbufsize == 2)
-        {
-            /* U+10000-U+10FFFF are returned as a pair of surrogates */
-            tchar m = (tchar)outbuf[0];
-            tchar n = (tchar)outbuf[1];
-            assert( TY_(IsHighSurrogate)(n) && TY_(IsLowSurrogate)(m) );
-            *bytesRead = readNow;
-            return (int)TY_(CombineSurrogatePair)(n, m);
-        }
-
-        if (outbufsize == 1)
-        {
-            /* we found the character   */
-            /* set bytesRead and return */
-            *bytesRead = readNow;
-            return (int)outbuf[0];
-        }
-
-        /* we need more bytes */
-        nextByte = source->getByte(source->sourceData);
-
-        if (nextByte == EndOfStream)
-        {
-            /* todo: error message for broken stream? */
-
-            *bytesRead = readNow;
-            return EndOfStream;
-        }
-
-        inbuf[inbufsize++] = (CHAR)nextByte;
-    }
-
-    /* No full character found after reading TC_INBUFSIZE bytes, */
-    /* give up to read this stream, it's obviously unreadable.   */
-
-    /* todo: error message for broken stream? */
-    return EndOfStream;
-}
-
-Bool Win32MLangIsConvertible(tchar c, StreamOut * out)
-{
-    IMLangConvertCharset * p;
-    UINT i = 1;
-    HRESULT hr;
-    WCHAR inbuf[2] = { 0 };
-    UINT inbufsize = 0;
-
-    assert( c != 0 );
-    assert( c <= 0x10FFFF );
-    assert( out != NULL );
-    assert( out->mlang != NULL );
-
-    if (c > 0xFFFF)
-    {
-        tchar high = 0;
-        tchar low = 0;
-
-        TY_(SplitSurrogatePair)(c, &low, &high);
-
-        inbuf[inbufsize++] = (WCHAR)low;
-        inbuf[inbufsize++] = (WCHAR)high;
-    }
-    else
-        inbuf[inbufsize++] = (WCHAR)c;
-
-    p = (IMLangConvertCharset *)out->mlang;
-    hr = IMLangConvertCharset_DoConversionFromUnicode(p, inbuf, &inbufsize, NULL, NULL);
-
-    return hr == S_OK ? yes : no;
-}
-
-void Win32MLangPutChar(tchar c, StreamOut * out, uint * bytesWritten)
-{
-    IMLangConvertCharset * p;
-    TidyOutputSink * sink;
-    CHAR outbuf[TC_OUTBUFSIZE] = { 0 };
-    UINT outbufsize = TC_OUTBUFSIZE;
-    HRESULT hr = S_OK;
-    WCHAR inbuf[2] = { 0 };
-    UINT inbufsize = 0;
-    uint i;
-
-    assert( c != 0 );
-    assert( c <= 0x10FFFF );
-    assert( bytesWritten != NULL );
-    assert( out != NULL );
-    assert( &out->sink != NULL );
-    assert( out->mlang != NULL );
-
-    p = (IMLangConvertCharset *)out->mlang;
-    sink = &out->sink;
-
-    if (c > 0xFFFF)
-    {
-        tchar high = 0;
-        tchar low = 0;
-
-        TY_(SplitSurrogatePair)(c, &low, &high);
-
-        inbuf[inbufsize++] = (WCHAR)low;
-        inbuf[inbufsize++] = (WCHAR)high;
-    }
-    else
-        inbuf[inbufsize++] = (WCHAR)c;
-
-    hr = IMLangConvertCharset_DoConversionFromUnicode(p, inbuf, &inbufsize, outbuf, &outbufsize);
-    
-    assert( hr == S_OK );
-    assert( outbufsize > 0 );
-    assert( inbufsize == 1 || inbufsize == 2 );
-
-    for (i = 0; i < outbufsize; ++i)
-        sink->putByte(sink->sinkData, (byte)(outbuf[i]));
-
-    *bytesWritten = outbufsize;
-
-    return;
-}
-
-#endif /* TIDY_WIN32_MLANG_SUPPORT */
-
-/*
- * local variables:
- * mode: c
- * indent-tabs-mode: nil
- * c-basic-offset: 4
- * eval: (c-set-offset 'substatement-open 0)
- * end:
- */
diff --git a/HTMLTidy/vendor/tidy-html5/src/win32tc.h b/HTMLTidy/vendor/tidy-html5/src/win32tc.h
deleted file mode 100644
index 613754ef..00000000
--- a/HTMLTidy/vendor/tidy-html5/src/win32tc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __WIN32TC_H__
-#define __WIN32TC_H__
-#ifdef TIDY_WIN32_MLANG_SUPPORT
-
-/* win32tc.h -- Interface to Win32 transcoding routines
-
-   (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
-   See tidy.h for the copyright notice.
-
-*/
-
-uint TY_(Win32MLangGetCPFromName)(TidyAllocator *allocator,ctmbstr encoding);
-Bool TY_(Win32MLangInitInputTranscoder)(StreamIn * in, uint wincp);
-void TY_(Win32MLangUninitInputTranscoder)(StreamIn * in);
-int TY_(Win32MLangGetChar)(byte firstByte, StreamIn * in, uint * bytesRead);
-
-#endif /* TIDY_WIN32_MLANG_SUPPORT */
-#endif /* __WIN32TC_H__ */
diff --git a/HTMLTidy/vendor/tidy-html5/version.txt b/HTMLTidy/vendor/tidy-html5/version.txt
index a9d582db..f71e9d44 100644
--- a/HTMLTidy/vendor/tidy-html5/version.txt
+++ b/HTMLTidy/vendor/tidy-html5/version.txt
@@ -1,2 +1,2 @@
-5.5.32
-2017.08.26
+5.7.0
+2017.11.25
diff --git a/JSDTidyFramework/Info.plist b/JSDTidyFramework/Info.plist
index b9f12ec5..66a5193d 100644
--- a/JSDTidyFramework/Info.plist
+++ b/JSDTidyFramework/Info.plist
@@ -15,13 +15,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.3</string>
+	<string>${TIDY_CFBundleShortVersionString}</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>${TIDY_CFBundleVersion}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Jim Derry. All rights reserved.</string>
+	<string>${TIDY_NSHumanReadableCopyright}</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/JSDTidyFramework/JSDTidyModel/JSDTidyModel.m b/JSDTidyFramework/JSDTidyModel/JSDTidyModel.m
index d7987cd2..05997a94 100755
--- a/JSDTidyFramework/JSDTidyModel/JSDTidyModel.m
+++ b/JSDTidyFramework/JSDTidyModel/JSDTidyModel.m
@@ -662,7 +662,7 @@ - (void)optionsPopulateTidyOptions
 	
 	self.tidyOptions = localOptions;
 
-	[self optionsPopulateTidyOptionHeaders];
+//    [self optionsPopulateTidyOptionHeaders];
 
 	[self didChangeValueForKey:@"tidyOptionsBindable"];
 }
@@ -720,6 +720,13 @@ - (void)processTidy
 
 	TidyDoc newTidy = tidyCreate();
 
+    /*
+        Force the library to use its default localization! Otherwise we will
+        get Tidy's localized strings instead of our own.
+     */
+
+    tidySetLanguage( "en" );
+
 	/* Capture the array locally. */
 	NSArray *localOptions = [[NSArray alloc] initWithArray:[self.tidyOptions allValues]];
 	for (JSDTidyOption *localOption in localOptions)
@@ -768,7 +775,9 @@ - (void)processTidy
 
 	tidyParseString(newTidy, [self.sourceText UTF8String]);
 	tidyCleanAndRepair(newTidy);
-	tidyRunDiagnostics(newTidy);
+
+    /* Not needed, unless LibTidy formalizes its footnotes support. */
+//    tidyRunDiagnostics(newTidy);
 
 
 	/*
diff --git a/JSDTidyFramework/JSDTidyModel/JSDTidyOption.h b/JSDTidyFramework/JSDTidyModel/JSDTidyOption.h
index 484ca086..cbf66977 100755
--- a/JSDTidyFramework/JSDTidyModel/JSDTidyOption.h
+++ b/JSDTidyFramework/JSDTidyModel/JSDTidyOption.h
@@ -247,10 +247,19 @@
  */
 @property (nonatomic, assign) BOOL optionIsSuppressed;
 
+/**
+ *  Indicates whether or not this option is a list-type option.
+ */
+@property (nonatomic, assign) BOOL optionIsList;
 
 #pragma mark - Other Public Methods
 /** @name Other Public Methods */
 
+/**
+ *  Given a proposed value, returns a normalized variant thereof, but does
+ *  not set it. For example, commas will be added to list items.
+ */
+- (NSString *)normalizedOptionValue:(NSString *)value;
 
 /**
  *  Applies this option value to another TidyDoc (from `tiylib`) instance.
diff --git a/JSDTidyFramework/JSDTidyModel/JSDTidyOption.m b/JSDTidyFramework/JSDTidyModel/JSDTidyOption.m
index 4711ef9a..da84732d 100755
--- a/JSDTidyFramework/JSDTidyModel/JSDTidyOption.m
+++ b/JSDTidyFramework/JSDTidyModel/JSDTidyOption.m
@@ -128,7 +128,13 @@ - (void)setOptionValue:(NSString *)optionValue
 		}
 		else
 		{
-			_optionValue = optionValue;
+//            if ( optionValue && self.optionType == TidyString )
+//            {
+//                _optionValue = [self normalizedOptionValue: optionValue];
+//            } else {
+//                _optionValue = optionValue;
+//            }
+            _optionValue = optionValue;
 		}
 
         [[NSNotificationCenter defaultCenter] postNotificationName:tidyNotifyOptionChanged
@@ -523,7 +529,7 @@ - (TidyConfigCategory)builtInCategory
  *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
 - (BOOL)optionCanAcceptNULLSTR
 {
-	return ([[NSSet setWithObjects:@"doctype", @"slide-style", @"language", @"css-prefix", nil] member:_name]) == nil;
+	return ([[NSSet setWithObjects:@"doctype", @"css-prefix", nil] member:_name]) == nil;
 }
 
 
@@ -538,6 +544,50 @@ - (BOOL)optionIsEncodingOption
 }
 
 
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  @property optionIsList
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (BOOL)optionIsList
+{
+    return ([[NSSet setWithObjects:
+              @"new-blocklevel-tags",
+              @"new-custom-tags",
+              @"new-empty-tags",
+              @"new-inline-tags",
+              @"new-pre-tags",
+              @"priority-attributes",
+              @"mute",
+              nil]
+             member:_name]) != nil;
+}
+
+/*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
+  @property normalizedOptionValue
+ *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
+- (NSString *)normalizedOptionValue:(NSString *)value
+{
+    if ( self.optionType != TidyString || !value )
+    {
+        return value;
+    }
+
+    TidyDoc doc = tidyCreate();
+    tidyOptSetValue( doc, self.optionId, [value UTF8String]);
+    ctmbstr result = tidyOptGetValue( doc, self.optionId );
+    NSString *retval = nil;
+
+    if ( result )
+    {
+        retval = [NSString stringWithUTF8String:result];
+    } else {
+        retval = nil;
+    }
+
+    tidyRelease( doc );
+    return retval;
+}
+
+
 /*–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*
   @property userDefaults
  *–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––*/
diff --git a/JSDTidyFramework/Resources/Base.lproj/Localizable.strings b/JSDTidyFramework/Resources/Base.lproj/Localizable.strings
index 281a2e36..371d96a3 100755
--- a/JSDTidyFramework/Resources/Base.lproj/Localizable.strings
+++ b/JSDTidyFramework/Resources/Base.lproj/Localizable.strings
@@ -2,17 +2,24 @@
  * Localizable.strings for JSDTidyFramework
  *
  *  HTML Tidy `libtidy` now supports language localization, but there aren't
- *  any languages available for it yet. As such we will continue to perform
+ *  many languages available for it yet. As such we will continue to perform
  *  our own localization using this file.
  ******************************************************************************/
 
 
 /* Tidy Categories */
-"category-TidyMarkup"         = "Markup Options";
-"category-TidyDiagnostics"    = "Diagnostic Options";
-"category-TidyPrettyPrint"    = "Pretty Printing Options";
-"category-TidyEncoding"       = "Encoding Options";
-"category-TidyMiscellaneous"  = "Miscellaneous Options";
+"category-TidyDiagnostics"      = "Diagnostics Options";
+"category-TidyDisplay"          = "Document Display Options";
+"category-TidyDocumentIO"       = "Document In and Out Options";
+"category-TidyEncoding"         = "Encoding Options";
+"category-TidyFileIO"           = "File Input-Output";
+"category-TidyMarkupCleanup"    = "Cleanup Options";
+"category-TidyMarkupEntities"   = "Entities Options";
+"category-TidyMarkupRepair"     = "Repair Options";
+"category-TidyMarkupTeach"      = "Teaching Tidy Options";
+"category-TidyMarkupXForm"      = "Transformation Options";
+"category-TidyPrettyPrint"      = "Pretty Print Options";
+"category-TidyInternalCategory" = "ERROR, Internal Only!";
 
 /* Severity Levels */
 "messagesInfo"          = "Information";
@@ -49,12 +56,13 @@
  *  The human-readable tags prefixed with `--` simply aren't used in
  *  Balthisar Tidy.
  *********************************************************************/
-"tag-accessibility-check"                   = "Accessibility Check";
+"tag-accessibility-check"                   = "Perform Accessibility Checks";
+"tag-add-meta-charset"                      = "Add <meta charset> Declaration";
 "tag-add-xml-decl"                          = "Add XML Declaration";
 "tag-add-xml-space"                         = "Add xml:space='preserve'";
-"tag-alt-text"                              = "Alt text default for images";
-"tag-anchor-as-name"                        = "Anchor-as-name";
-"tag-ascii-chars"                           = "ASCII characters";
+"tag-alt-text"                              = "Add Alt text default for images";
+"tag-anchor-as-name"                        = "Use name for Anchors";
+"tag-ascii-chars"                           = "Use ASCII characters";
 "tag-assume-xml-procins"                    = "Assume XML Processing Instructions";
 "tag-bare"                                  = "Bare";
 "tag-break-before-br"                       = "Break before <br>";
@@ -77,18 +85,18 @@
 "tag-escape-scripts"                        = "Escape Tag-like Slashes in Scripts";
 "tag-fix-backslash"                         = "Fix Backslashes";
 "tag-fix-bad-comments"                      = "Fix Bad Comments";
+"tag-fix-style-tags"                        = "Move <style> to <head>";
 "tag-fix-uri"                               = "Fix URI’s";
 "tag-force-output"                          = "Force Output";
 "tag-gdoc"                                  = "Google Documents Cleanup";
 "tag-gnu-emacs-file"                        = "--gnu-emacs-file";
 "tag-gnu-emacs"                             = "--gnu-emacs";
 "tag-hide-comments"                         = "Hide Comments";
-"tag-hide-endtags"                          = "--hide-endtags";
 "tag-indent-attributes"                     = "Indent Attributes";
 "tag-indent-cdata"                          = "Indent CDATA";
 "tag-indent-spaces"                         = "Indent Number of Spaces";
-"tag-indent"                                = "Indent";
 "tag-indent-with-tabs"                      = "Indent with Tabs";
+"tag-indent"                                = "Indent";
 "tag-input-encoding"                        = "Input Encoding";
 "tag-input-xml"                             = "Input is XML";
 "tag-join-classes"                          = "Join Classes";
@@ -98,10 +106,12 @@
 "tag-literal-attributes"                    = "Literal Attributes";
 "tag-logical-emphasis"                      = "Logical Emphasis";
 "tag-lower-literals"                        = "Lowercase Literals";
-"tag-markup"                                = "Markup";
+"tag-markup"                                = "--markup";
 "tag-merge-divs"                            = "Merge Nested <div>’s";
 "tag-merge-emphasis"                        = "Merge Nested Emphasis";
 "tag-merge-spans"                           = "Merge Nexted <span>’s";
+"tag-mute"                                  = "--mute";
+"tag-mute-id"                               = "--muteid";
 "tag-ncr"                                   = "Numeric Character References";
 "tag-new-blocklevel-tags"                   = "New Blocklevel Tags";
 "tag-new-empty-tags"                        = "New Empty Tags";
@@ -117,6 +127,7 @@
 "tag-output-xhtml"                          = "Output XHTML";
 "tag-output-xml"                            = "Output XML";
 "tag-preserve-entities"                     = "Preserve Entities";
+"tag-priority-attributes"                   = "Prioritize Attribute Order";
 "tag-punctuation-wrap"                      = "Punctuation Wrap";
 "tag-quiet"                                 = "--quiet";
 "tag-quote-ampersand"                       = "Quote Ampersand";
@@ -127,11 +138,10 @@
 "tag-show-body-only"                        = "Show <body> Only";
 "tag-show-errors"                           = "--show-errors";
 "tag-show-info"                             = "--show-info";
+"tag-show-meta-change"                      = "Indicate Meta Charset Changes";
 "tag-show-warnings"                         = "--show-warnings";
 "tag-skip-nested"                           = "Skip Script-Nested Tags";
-"tag-slide-style"                           = "--slide-style";
 "tag-sort-attributes"                       = "Sort Attributes";
-"tag-split"                                 = "--split";
 "tag-strict-tags-attributes"                = "Strict Tags and Attributes";
 "tag-tab-size"                              = "Tab Size";
 "tag-tidy-mark"                             = "Tidy <meta> Mark";
@@ -169,14 +179,19 @@
  *  NOTE: this flaggable mechanism exists because some localizations
  *  may not be able to use RTF.
  *
- *  NOTE: items I've prefixed with `--- `have no special meaning;
- *  it's just a reminder to me that I'm not using them in Balthisar
- *  Tidy.
- *
- *  NOTE: as of 2016-February these are all back in sync with HTACG's
- *  tidy, other than cases we want to use custom-only strings.
+ *  NOTE: as of 2017-November these are all back in sync with HTACG's
+ *  tidy, other than cases we want to use custom-only strings, which
+ *  occur first in this list.
  *********************************************************************/
+"description-doctype"                     = "*This option specifies the DOCTYPE declaration generated by Tidy.\\par If set to {\\f0\\b omit} the output won't contain a DOCTYPE declaration. Note this this also implies {\\f0 numeric-entities} is set to {\\f0\\b yes}.\\par If set to {\\f0\\b html5} the DOCTYPE is set to {\\f0 <!DOCTYPE html>}.\\par If set to {\\f0\\b auto} (the default) Tidy will use an educated guess based upon the contents of the document. Note that selecting this option will {\\b not} change the current document's DOCTYPE on output.\\par If set to {\\f0\\b strict}, Tidy will set the DOCTYPE to the HTML4 or XHTML1 strict DTD.\\par If set to {\\f0\\b loose}, the DOCTYPE is set to the HTML4 or XHTML1 loose (transitional) DTD.";
+"description-input-encoding"              = "*This option specifies the character encoding Balthisar Tidy uses for the source file.";
+"description-newline"                     = "*The default is appropriate for macOS.\\par Genrally {\\f0\\b CRLF} on PC-DOS, Windows and OS/2; {\\f0\\b CR} on Classic Mac OS; and {\\f0\\b LF} everywhere else (Linux, macOS, and Unix).";
+"description-output-encoding"             = "*This option specifies the character encoding Balthisar Tidy uses when saving a file.\\par It’s recommended to use {\\f0\\b Unicode (UTF-8)}.";
+"description-wrap-jste"                   = "*This option specifies if Tidy should line wrap text contained within JSTE pseudo elements, which look like: {\\f0  <# ... #>}.";
+
+
 "description-accessibility-check"         = "*This option specifies what level of accessibility checking, if any, that Tidy should perform.\\par Level {\\f0\\b 0 (Tidy Classic)} is equivalent to Tidy Classic's accessibility checking.\\par For more information on Tidy's accessibility checking, visit {\\f0 http://www.html-tidy.org/accessibility/}.";
+"description-add-meta-charset"            = "*This option, when enabled, adds a {\\f0 <meta>} element and sets the {\\f0 charset} attribute to the encoding of the document. Set this option to {\\f0\\b yes} to enable it.";
 "description-add-xml-decl"                = "*This option specifies if Tidy should add the XML declaration when outputting XML or XHTML.\\par Note that if the input already includes an {\\f0 <?xml ... ?>} declaration then this option will be ignored.\\par If the encoding for the output is different from {\\f0\\b ascii}, one of the {\\f0\\b utf*} encodings, or {\\f0\\b raw}, then the declaration is always added as required by the XML standard.";
 "description-add-xml-space"               = "*This option specifies if Tidy should add {\\f0 xml:space=\"preserve\"} to elements such as {\\f0 <pre>}, {\\f0 <style>} and {\\f0 <script>} when generating XML.\\par This is needed if the whitespace in such elements is to be parsed appropriately without having access to the DTD.";
 "description-alt-text"                    = "*This option specifies the default {\\f0 alt=} text Tidy uses for {\\f0 <img>} attributes when the {\\f0 alt=} attribute is missing.\\par Use with care, as it is your responsibility to make your documents accessible to people who cannot see the images.";
@@ -185,96 +200,90 @@
 "description-assume-xml-procins"          = "*This option specifies if Tidy should change the parsing of processing instructions to require {\\f0 ?>} as the terminator rather than {\\f0 >}.\\par This option is automatically set if the input is in XML.";
 "description-bare"                        = "*This option specifies if Tidy should strip Microsoft specific HTML from Word 2000 documents, and output spaces rather than non-breaking spaces where they exist in the input.";
 "description-break-before-br"             = "*This option specifies if Tidy should output a line break before each {\\f0 <br>} element.";
-"description-char-encoding"               = "---This option specifies the character encoding Tidy uses for both the input and output.\\par For {\\f0\\b ascii} Tidy will accept Latin-1 (ISO-8859-1) character values, but will use entities for all characters whose value >127.\\par For {\\f0\\b raw}, Tidy will output values above 127 without translating them into entities.\\par For {\\f0\\b latin1}, characters above 255 will be written as entities.\\par For {\\f0\\b utf8}, Tidy assumes that both input and output are encoded as UTF-8.\\par You can use {\\f0\\b iso2022} for files encoded using the ISO-2022 family of encodings e.g. ISO-2022-JP.\\par For {\\f0\\b mac} and {\\f0\\b win1252}, Tidy will accept vendor specific character values, but will use entities for all characters whose value >127.\\par For unsupported encodings, use an external utility to convert to and from UTF-8.";
-"description-clean"                       = "*This option specifies if Tidy should perform cleaning of some legacy presentational tags (currently {\\f0 <i>}, {\\f0 <b>}, {\\f0 <center>} when enclosed within appropriate inline tags, and {\\f0 <font>}). If set to {\\f0\\b yes} then legacy tags will be replaced with CSS {\\f0 <style>} tags and structural markup as appropriate.";
-"description-coerce-endtags"              = "*This option specifies if Tidy should coerce a start tag into an end tag in cases where it looks like an end tag was probably intended; for example, given \\line {\\f0 <span>foo <b>bar<b> baz</span>} \\line Tidy will output \\line {\\f0 <span>foo <b>bar</b> baz</span>}";
+"description-char-encoding"               = "*This option specifies the character encoding Tidy uses for input, and when set, automatically chooses an appropriate character encoding to be used for output. The output encoding Tidy chooses may be different from the input encoding.\\par For {\\f0\\b ascii}, {\\f0\\b latin0}, {\\f0\\b ibm858}, {\\f0\\b mac}, and {\\f0\\b win1252} input encodings, the {\\f0 output-encoding} option will automatically be set to {\\f0\\b ascii}. You can set {\\f0 output-encoding} manually to override this.\\par For other input encodings, the {\\f0 output-encoding} option will automatically be set to the the same value.\\par Regardless of the preset value, you can set {\\f0 output-encoding} manually to override this.\\par Tidy is not an encoding converter. Although the Latin and UTF encodings can be mixed freely, it is not possible to convert Asian encodings to Latin encodings with Tidy.";
+"description-clean"                       = "*This option specifies if Tidy should perform cleaning of some legacy presentational tags (currently {\\f0 <i>}, {\\f0 <b>}, {\\f0 <center>} when enclosed within appropriate inline tags, and {\\f0 <font>}). If set to {\\f0\\b yes}, then the legacy tags will be replaced with CSS {\\f0 <style>} tags and structural markup as appropriate.";
+"description-coerce-endtags"              = "*This option specifies if Tidy should coerce a start tag into an end tag in cases where it looks like an end tag was probably intended; for example, given\\par {\\f0 <span>foo <b>bar<b> baz</span>}\\par Tidy will output\\par {\\f0 <span>foo <b>bar</b> baz</span>}";
 "description-css-prefix"                  = "*This option specifies the prefix that Tidy uses for styles rules.\\par By default, {\\f0\\b c} will be used.";
-"description-custom-tags"                 = "*This option enables the use of tags for autonomous custom elements, e.g. {\\f0 <flag-icon>} with Tidy. Custom tags are disabled if this value is {\\f0\\b no}. Other settings – {\\f0\\b blocklevel}, {\\f0\\b empty}, {\\f0\\b inline}, and {\\f0\\b pre} – will treat {\\b all} detected custom tags accordingly.\\par The use of {\\f0 new-blocklevel-tags}, {\\f0 new-empty-tags}, {\\f0 new-inline-tags}, or {\\f0 new-pre-tags} will override the treatment of custom tags by this configuration option. This may be useful if you have different types of custom tags.\\par When enabled these tags are determined during the processing of your document using opening tags; matching closing tags will be recognized accordingly, and unknown closing tags will be discarded.";
+"description-custom-tags"                 = "*This option enables the use of tags for autonomous custom elements, e.g. {\\f0 <flag-icon>} with Tidy. Custom tags are disabled if this value is {\\f0\\b no}. Other settings - {\\f0\\b blocklevel}, {\\f0\\b empty}, {\\f0\\b inline}, and {\\f0\\b pre} will treat {\\b all} detected custom tags accordingly.\\par The use of {\\f0 new-blocklevel-tags}, {\\f0 new-empty-tags}, {\\f0 new-inline-tags}, or {\\f0 new-pre-tags} will override the treatment of custom tags by this configuration option. This may be useful if you have different types of custom tags.\\par When enabled these tags are determined during the processing of your document using opening tags; matching closing tags will be recognized accordingly, and unknown closing tags will be discarded.";
 "description-decorate-inferred-ul"        = "*This option specifies if Tidy should decorate inferred {\\f0 <ul>} elements with some CSS markup to avoid indentation to the right.";
-"description-doctype-mode"                = "---This option specifies the DOCTYPE declaration generated by Tidy.\\par If set to {\\f0\\b omit} the output won't contain a DOCTYPE declaration. Note this this also implies {\\f0 numeric-entities} is set to {\\f0\\b yes}.\\par If set to {\\f0\\b html5} the DOCTYPE is set to {\\f0 <!DOCTYPE html>}.\\par If set to {\\f0\\b auto} (the default) Tidy will use an educated guess based upon the contents of the document.\\par If set to {\\f0\\b strict}, Tidy will set the DOCTYPE to the HTML4 or XHTML1 strict DTD.\\par If set to {\\f0\\b loose}, the DOCTYPE is set to the HTML4 or XHTML1 loose (transitional) DTD.\\par Alternatively, you can supply a string for the formal public identifier (FPI).\\par For example:\\par {\\f0 doctype: \"-//ACME//DTD HTML 3.14159//EN\"}\\par If you specify the FPI for an XHTML document, Tidy will set the 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.\\par This option does not offer a validation of document conformance.";
-"description-doctype"                     = "*This option specifies the DOCTYPE declaration generated by Tidy.\\par If set to {\\f0\\b omit} the output won't contain a DOCTYPE declaration. Note this this also implies {\\f0 numeric-entities} is set to {\\f0\\b yes}.\\par If set to {\\f0\\b html5} the DOCTYPE is set to {\\f0 <!DOCTYPE html>}.\\par If set to {\\f0\\b auto} (the default) Tidy will use an educated guess based upon the contents of the document.\\par If set to {\\f0\\b strict}, Tidy will set the DOCTYPE to the HTML4 or XHTML1 strict DTD.\\par If set to {\\f0\\b loose}, the DOCTYPE is set to the HTML4 or XHTML1 loose (transitional) DTD.\\par This option does not offer a validation of document conformance.";
 "description-drop-empty-elements"         = "*This option specifies if Tidy should discard empty elements.";
 "description-drop-empty-paras"            = "*This option specifies if Tidy should discard empty paragraphs.";
-"description-drop-font-tags"              = "---Deprecated; {\\b do not use}. This option is destructive to {\\f0 <font>} tags, and it will be removed from future versions of Tidy. Use the {\\f0 clean} option instead.\\par If you do set this option despite the warning it will perform as {\\f0 clean} except styles will be inline instead of put into a CSS class. {\\f0 <font>} tags will be dropped completely and their styles will not be preserved.\\par If both {\\f0 clean} and this option are enabled, {\\f0 <font>} tags will still be dropped completely, and other styles will be preserved in a CSS class instead of inline.\\par See {\\f0 clean} for more information.";
 "description-drop-proprietary-attributes" = "*This option specifies if Tidy should strip out proprietary attributes, such as Microsoft data binding attributes. Additionally attributes that aren't permitted in the output version of HTML will be dropped if used with {\\f0 strict-tags-attributes}.";
 "description-enclose-block-text"          = "*This option specifies if Tidy should insert a {\\f0 <p>} element to enclose any text it finds in any element that allows mixed content for HTML transitional but not HTML strict.";
 "description-enclose-text"                = "*This option specifies if Tidy should enclose any text it finds in the body element within a {\\f0 <p>} element.\\par This is useful when you want to take existing HTML and use it with a style sheet.";
-"description-error-file"                  = "---This option specifies the error file Tidy uses for errors and warnings. Normally errors and warnings are output to {\\f0 stderr}.";
+"description-error-file"                  = "*This option specifies the error file Tidy uses for errors and warnings. Normally errors and warnings are output to {\\f0 stderr}.";
 "description-escape-cdata"                = "*This option specifies if Tidy should convert {\\f0 <![CDATA[]]>} sections to normal text.";
-"description-escape-scripts"              = "*This option causes items that look like closing tags in scripts to be escaped. For example {\\f0 </g} will be escaped to {\\f0 <\\\\/g}. Set this option to {\\f0\\b no} to prevent this.";
-"description-fix-backslash"               = "*This option specifies if Tidy should replace backslash characters {\\f0 \\\\} in URLs with forward slashes {\\f0 /}.";
-"description-fix-bad-comments"            = "*This option specifies if Tidy should replace unexpected hyphens with {\\f0 =} characters when it comes across adjacent hyphens.\\par The default is {\\f0\\b yes}.\\par This option is provided for users of Cold Fusion which uses the comment syntax: {\\f0 <!--- --->}.";
+"description-escape-scripts"              = "*This option causes items that look like closing tags, like {\\f0 </g} to be escaped to {\\f0 <\/g}. Set this option to {\\f0\\b no} if you do not want this.";
+"description-fix-backslash"               = "*This option specifies if Tidy should replace backslash characters {\\f0 \} in URLs with forward slashes {\\f0 /}.";
+"description-fix-bad-comments"            = "*This option specifies if Tidy should replace unexpected hyphens with {\\f0 =} characters when it comes across adjacent hyphens.\\par The default is {\\f0\\b auto} will which will act as {\\f0\\b no} for HTML5 document types, and {\\f0\\b yes} for all other document types.\\par HTML has abandonded SGML comment syntax, and allows adjacent hypens for all versions of HTML, although XML and XHTML do not. If you plan to support older browsers that require SGML comment syntax, then consider setting this value to {\\f0\\b yes}.";
+"description-fix-style-tags"              = "*This option specifies if Tidy should move all style tags to the head of the document.";
 "description-fix-uri"                     = "*This option specifies if Tidy should check attribute values that carry URIs for illegal characters and if such are found, escape them as HTML4 recommends.";
 "description-force-output"                = "*This option specifies if Tidy should produce output even if errors are encountered.\\par 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.";
 "description-gdoc"                        = "*This option specifies if Tidy should enable specific behavior for cleaning up HTML exported from Google Docs.";
-"description-gnu-emacs-file"              = "---Used internally.";
-"description-gnu-emacs"                   = "---This option specifies if Tidy should change the format for reporting errors and warnings to a format that is more easily parsed by GNU Emacs.";
+"description-gnu-emacs"                   = "*This option specifies if Tidy should change the format for reporting errors and warnings to a format that is more easily parsed by GNU Emacs.";
 "description-hide-comments"               = "*This option specifies if Tidy should print out comments.";
-"description-hide-endtags"                = "---This option is an alias for {\\f0 omit-optional-tags}.";
+"description-indent"                      = "*This option specifies if Tidy should indent block-level tags.\\par If set to {\\f0\\b auto} Tidy will decide whether or not to indent the content of tags such as {\\f0 <title>}, {\\f0 <h1>}-{\\f0 <h6>}, {\\f0 <li>}, {\\f0 <td>}, or {\\f0 <p>} based on the content including a block-level element.\\par Setting {\\f0 indent} to {\\f0\\b yes} can expose layout bugs in some browsers.\\par Use the option {\\f0 indent-spaces} to control the number of spaces or tabs output per level of indent, and {\\f0 indent-with-tabs} to specify whether spaces or tabs are used.";
 "description-indent-attributes"           = "*This option specifies if Tidy should begin each attribute on a new line.";
 "description-indent-cdata"                = "*This option specifies if Tidy should indent {\\f0 <![CDATA[]]>} sections.";
 "description-indent-spaces"               = "*This option specifies the number of spaces or tabs that Tidy uses to indent content when {\\f0 indent} is enabled.\\par Note that the default value for this option is dependent upon the value of {\\f0 indent-with-tabs} (see also).";
 "description-indent-with-tabs"            = "*This option specifies if Tidy should indent with tabs instead of spaces, assuming {\\f0 indent} is {\\f0\\b yes}.\\par Set it to {\\f0\\b yes} to indent using tabs instead of the default spaces.\\par Use the option {\\f0 indent-spaces} to control the number of tabs output per level of indent. Note that when {\\f0 indent-with-tabs} is enabled the default value of {\\f0 indent-spaces} is reset to {\\f0\\b 1}.\\par Note {\\f0 tab-size} controls converting input tabs to spaces. Set it to zero to retain input tabs.";
-"description-indent"                      = "*This option specifies if Tidy should indent block-level tags.\\par If set to {\\f0\\b auto} Tidy will decide whether or not to indent the content of tags such as {\\f0 <title>}, {\\f0 <h1>}-{\\f0 <h6>}, {\\f0 <li>}, {\\f0 <td>}, or {\\f0 <p>} based on the content including a block-level element.\\par Setting {\\f0 indent} to {\\f0\\b yes} can expose layout bugs in some browsers.\\par Use the option {\\f0 indent-spaces} to control the number of spaces or tabs output per level of indent, and {\\f0 indent-with-tabs} to specify whether spaces or tabs are used.";
-"description-input-encoding"              = "*This option specifies the character encoding Balthisar Tidy uses for the source file.";
 "description-input-xml"                   = "*This option specifies if Tidy should use the XML parser rather than the error correcting HTML parser.";
 "description-join-classes"                = "*This option specifies if Tidy should combine class names to generate a single, new class name if multiple class assignments are detected on an element.";
 "description-join-styles"                 = "*This option specifies if Tidy should combine styles to generate a single, new style if multiple style values are detected on an element.";
-"description-keep-time"                   = "---This option specifies if Tidy should keep the original modification time of files that Tidy modifies in place.\\par Setting the option to {\\f0\\b yes} 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.\\par Note this feature is not supported on some platforms.";
-"description-language"                    = "---Currently not used, but this option specifies the language Tidy would use if it were properly localized. For example: {\\f0\\b en}.";
+"description-keep-tabs"                   = "*With the default {\\f0\\b no} Tidy will replace all source tabs with spaces, controlled by the option {\\f0 tab-size}, and the current line offset. Of course, except in the special blocks/elements enumerated below, this will later be reduced to just one space.\\par If set {\\f0\\b yes} this option specifies Tidy should keep certain tabs found in the source, but only in preformatted blocks like {\\f0 <pre>}, and other CDATA elements like {\\f0 <script>}, {\\f0 <style>}, and other pseudo elements like {\\f0 <?php ... ?>}. As always, all other tabs, or sequences of tabs, in the source will continue to be replaced with a space.";
+"description-keep-time"                   = "*This option specifies if Tidy should keep the original modification time of files that Tidy modifies in place.\\par Setting the option to {\\f0\\b yes} 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.\\par Note this feature is not supported on some platforms.";
 "description-literal-attributes"          = "*This option specifies how Tidy deals with whitespace characters within attribute values.\\par If the value is {\\f0\\b no} Tidy normalizes attribute values by replacing any newline or tab with a single space, and further by replacing any contiguous whitespace with a single space.\\par To force Tidy to preserve the original, literal values of all attributes and ensure that whitespace within attribute values is passed through unchanged, set this option to {\\f0\\b yes}.";
 "description-logical-emphasis"            = "*This option specifies if Tidy should replace any occurrence of {\\f0 <i>} with {\\f0 <em>} and any occurrence of {\\f0 <b>} with {\\f0 <strong>}. Any attributes are preserved unchanged.\\par This option can be set independently of the {\\f0 clean} option.";
 "description-lower-literals"              = "*This option specifies if Tidy should convert the value of an attribute that takes a list of predefined values to lower case.\\par This is required for XHTML documents.";
 "description-markup"                      = "*This option specifies if Tidy should generate a pretty printed version of the markup. Note that Tidy won't generate a pretty printed version if it finds significant errors (see {\\f0 force-output}).";
 "description-merge-divs"                  = "*This option can be used to modify the behavior of {\\f0 clean} when set to {\\f0\\b yes}.\\par This option specifies if Tidy should merge nested {\\f0 <div>} such as {\\f0 <div><div>...</div></div>}.\\par If set to {\\f0\\b auto} the attributes of the inner {\\f0 <div>} are moved to the outer one. Nested {\\f0 <div>} with {\\f0 id} attributes are {\\b not} merged.\\par If set to {\\f0\\b yes} the attributes of the inner {\\f0 <div>} are discarded with the exception of {\\f0 class} and {\\f0 style}.";
-"description-merge-emphasis"              = "*This option specifies if Tidy should merge nested {\\f0 <b>} and {\\f0 <i>} elements; for example, for the case\\line {\\f0 <b class=\"rtop-2\">foo <b class=\"r2-2\">bar</b> baz</b>},\\line Tidy will output\\line {\\f0 <b class=\"rtop-2\">foo bar baz</b>}.";
+"description-merge-emphasis"              = "*This option specifies if Tidy should merge nested {\\f0 <b>} and {\\f0 <i>} elements; for example, for the case\\par {\\f0 <b class=\"rtop-2\">foo <b class=\"r2-2\">bar</b> baz</b>},\\par Tidy will output {\\f0 <b class=\"rtop-2\">foo bar baz</b>}.";
 "description-merge-spans"                 = "*This option can be used to modify the behavior of {\\f0 clean} when set to {\\f0\\b yes}.\\par This option specifies if Tidy should merge nested {\\f0 <span>} such as {\\f0 <span><span>...</span></span>}.\\par The algorithm is identical to the one used by {\\f0 merge-divs}.";
+"description-mute"                        = "*Use this option to prevent Tidy from displaying certain types of report output, for example, for conditions that you wish to ignore.\\par This option takes a list of one or more keys indicating the message type to mute. You can discover these message keys by using the {\\f0 mute-id} configuration option and examining Tidy's output.";
+"description-mute-id"                     = "*This option indicates whether or not Tidy should display message ID's with each of its error reports. This could be useful if you wanted to use the {\\f0 mute} configuration option in order to filter out certain report messages.";
 "description-ncr"                         = "*This option specifies if Tidy should allow numeric character references.";
 "description-new-blocklevel-tags"         = "*This option specifies new block-level tags. This option takes a space or comma separated list of tag names.\\par Unless you declare new tags, Tidy will refuse to generate a tidied file if the input includes previously unknown tags.\\par Note you can't change the content model for elements such as {\\f0 <table>}, {\\f0 <ul>}, {\\f0 <ol>} and {\\f0 <dl>}.\\par This option is ignored in XML mode.";
 "description-new-empty-tags"              = "*This option specifies new empty inline tags. This option takes a space or comma separated list of tag names.\\par Unless you declare new tags, Tidy will refuse to generate a tidied file if the input includes previously unknown tags.\\par Remember to also declare empty tags as either inline or blocklevel.\\par This option is ignored in XML mode.";
 "description-new-inline-tags"             = "*This option specifies new non-empty inline tags. This option takes a space or comma separated list of tag names.\\par Unless you declare new tags, Tidy will refuse to generate a tidied file if the input includes previously unknown tags.\\par This option is ignored in XML mode.";
 "description-new-pre-tags"                = "*This option specifies new tags that are to be processed in exactly the same way as HTML's {\\f0 <pre>} element. This option takes a space or comma separated list of tag names.\\par Unless you declare new tags, Tidy will refuse to generate a tidied file if the input includes previously unknown tags.\\par Note you cannot as yet add new CDATA elements.\\par This option is ignored in XML mode.";
-"description-newline"                     = "*The default is appropriate for Mac OS X.\\par Generally CRLF on PC-DOS, MS-Windows and OS/2; CR on Classic Mac OS; and LF everywhere else (Linux, Mac OS X, and Unix).";
 "description-numeric-entities"            = "*This option specifies if Tidy should output entities other than the built-in HTML entities ({\\f0 &amp;}, {\\f0 &lt;}, {\\f0 &gt;}, and {\\f0 &quot;}) in the numeric rather than the named entity form.\\par Only entities compatible with the DOCTYPE declaration generated are used.\\par Entities that can be represented in the output encoding are translated correspondingly.";
 "description-omit-optional-tags"          = "*This option specifies if Tidy should omit optional start tags and end tags when generating output.\\par Setting this option causes all tags for the {\\f0 <html>}, {\\f0 <head>}, and {\\f0 <body>} elements to be omitted from output, as well as such end tags as {\\f0 </p>}, {\\f0 </li>}, {\\f0 </dt>}, {\\f0 </dd>}, {\\f0 </option>}, {\\f0 </tr>}, {\\f0 </td>}, and {\\f0 </th>}.\\par This option is ignored for XML output.";
-"description-output-bom"                  = "---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, and only applies to UTF-8 and UTF-16 output encodings.\\par If set to {\\f0\\b auto} this option causes Tidy to write a BOM to the output only if a BOM was present at the beginning of the input.\\par A BOM is always written for XML/XHTML output using UTF-16 output encodings.";
-"description-output-encoding"             = "*This option specifies the character encoding Balthisar Tidy uses when saving a file.\\par It’s recommended to use {\\f0\\b Unicode (UTF-8)}.";
-"description-output-file"                 = "---This option specifies the output file Tidy uses for markup. Normally markup is written to {\\f0 stdout}.";
+"description-output-bom"                  = "*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, and only applies to UTF-8 and UTF-16 output encodings.\\par If set to {\\f0\\b auto} this option causes Tidy to write a BOM to the output only if a BOM was present at the beginning of the input.\\par A BOM is always written for XML/XHTML output using UTF-16 output encodings.";
+"description-output-file"                 = "*This option specifies the output file Tidy uses for markup. Normally markup is written to {\\f0 stdout}.";
 "description-output-html"                 = "*This option specifies if Tidy should generate pretty printed output, writing it as HTML.";
 "description-output-xhtml"                = "*This option specifies if Tidy should generate pretty printed output, writing it as extensible HTML.\\par This option causes Tidy to set the DOCTYPE and default namespace as appropriate to XHTML, and will use the corrected value in output regardless of other sources.\\par For XHTML, entities can be written as named or numeric entities according to the setting of {\\f0 numeric-entities}.\\par The original case of tags and attributes will be preserved, regardless of other options.";
 "description-output-xml"                  = "*This option specifies if Tidy should pretty print output, writing it as well-formed XML.\\par Any entities not defined in XML 1.0 will be written as numeric entities to allow them to be parsed by an XML parser.\\par The original case of tags and attributes will be preserved, regardless of other options.";
 "description-preserve-entities"           = "*This option specifies if Tidy should preserve well-formed entities as found in the input.";
+"description-priority-attributes"         = "*This option allows prioritizing the writing of attributes in tidied documents, allowing them to written before the other attributes of an element. For example, you might specify that {\\b id} and {\\b name} are written before every other attribute.\\par This option takes a space or comma separated list of attribute names.";
 "description-punctuation-wrap"            = "*This option specifies if Tidy should line wrap after some Unicode or Chinese punctuation characters.";
-"description-quiet"                       = "---This option specifies if Tidy should output the summary of the numbers of errors and warnings, or the welcome or informational messages.";
+"description-quiet"                       = "*When enabled, this option limits Tidy's non-document output to report only document warnings and errors.";
 "description-quote-ampersand"             = "*This option specifies if Tidy should output unadorned {\\f0 &} characters as {\\f0 &amp;}.";
 "description-quote-marks"                 = "*This option specifies if Tidy should output {\\f0 \"} characters as {\\f0 &quot;} as is preferred by some editing environments.\\par The apostrophe character {\\f0 '} is written out as {\\f0 &#39;} since many web browsers don't yet support {\\f0 &apos;}.";
 "description-quote-nbsp"                  = "*This option specifies if Tidy should output non-breaking space characters as entities, rather than as the Unicode character value 160 (decimal).";
 "description-repeated-attributes"         = "*This option specifies if Tidy should keep the first or last attribute, if an attribute is repeated, e.g. has two {\\f0 align} attributes.";
 "description-replace-color"               = "*This option specifies if Tidy should replace numeric values in color attributes with HTML/XHTML color names where defined, e.g. replace {\\f0 #ffffff} with {\\f0 white}.";
 "description-show-body-only"              = "*This option specifies if Tidy should print only the contents of the body tag as an HTML fragment.\\par If set to {\\f0\\b auto}, this is performed only if the body tag has been inferred.\\par Useful for incorporating existing whole pages as a portion of another page.\\par This option has no effect if XML output is requested.";
-"description-show-errors"                 = "---This option specifies the number Tidy uses to determine if further errors should be shown. If set to {\\f0\\b 0}, then no errors are shown.";
-"description-show-info"                   = "---This option specifies if Tidy should display info-level messages.";
-"description-show-warnings"               = "---This option specifies if Tidy should suppress warnings. This can be useful when a few errors are hidden in a flurry of warnings.";
+"description-show-errors"                 = "*This option specifies the number Tidy uses to determine if further errors should be shown. If set to {\\f0\\b 0}, then no errors are shown.";
+"description-show-info"                   = "*This option specifies if Tidy should display info-level messages.";
+"description-show-meta-change"            = "*This option enables a message whenever Tidy changes the {\\f0 content} attribute of a meta charset declaration to match the encoding of the document. Set this option to {\\f0\\b yes} to enable it.";
+"description-show-warnings"               = "*This option specifies if Tidy should suppress warnings. This can be useful when a few errors are hidden in a flurry of warnings.";
 "description-skip-nested"                 = "*This option specifies that Tidy should skip nested tags when parsing script and style data.";
-"description-slide-style"                 = "---This option has no function and is deprecated.";
-"description-sort-attributes"             = "*This option specifies that Tidy should sort attributes within an element using the specified sort algorithm. If set to {\\f0\\b alpha}, the algorithm is an ascending alphabetic sort.";
-"description-split"                       = "---This option has no function and is deprecated.";
+"description-sort-attributes"             = "*This option specifies that Tidy should sort attributes within an element using the specified sort algorithm. If set to {\\f0\\b alpha}, the algorithm is an ascending alphabetic sort.\\par When used while sorting with {\\f0 priority-attributes}, any attribute sorting will take place after the priority attributes have been output.";
 "description-strict-tags-attributes"      = "*This options ensures that tags and attributes are applicable for the version of HTML that Tidy outputs. When set to {\\f0\\b yes} and the output document type is a strict doctype, then Tidy will report errors. If the output document type is a loose or transitional doctype, then Tidy will report warnings.\\par Additionally if {\\f0 drop-proprietary-attributes} is enabled, then not applicable attributes will be dropped, too.\\par When set to {\\f0\\b no}, these checks are not performed.";
 "description-tab-size"                    = "*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.";
 "description-tidy-mark"                   = "*This option specifies if Tidy should add a {\\f0 meta} element to the document head to indicate that the document has been tidied.\\par Tidy won't add a meta element if one is already present.";
-"description-uppercase-attributes"        = "*This option specifies if Tidy should output attribute names in upper case.\\par The default is {\\f0\\b no}, which results in lower case attribute names, except for XML input, where the original case is preserved.";
+"description-uppercase-attributes"        = "*This option specifies if Tidy should output attribute names in upper case.\\par When set to {\\f0\\b no}, attribute names will be written in lower case. Specifying {\\f0\\b yes} will output attribute names in upper case, and {\\f0\\b preserve} can used to leave attribute names untouched.\\par When using XML input, the original case is always preserved.";
 "description-uppercase-tags"              = "*This option specifies if Tidy should output tag names in upper case.\\par The default is {\\f0\\b no} which results in lower case tag names, except for XML input where the original case is preserved.";
 "description-vertical-space"              = "*This option specifies if Tidy should add some extra empty lines for readability.\\par The default is {\\f0\\b no}.\\par If set to {\\f0\\b auto} Tidy will eliminate nearly all newline characters.";
 "description-warn-proprietary-attributes" = "*This option specifies if Tidy should warn on proprietary attributes.";
-"description-word-2000"                   = "*This option specifies if Tidy should go to great pains to strip out all the surplus stuff Microsoft Word 2000 inserts when you save Word documents as \"Web pages\". It doesn't handle embedded images or VML.\\par You should consider using Word's \"Save As: Web Page, Filtered\".";
-"description-wrap-asp"                    = "*This option specifies if Tidy should line wrap text contained within ASP pseudo elements, which look like: {\\f0 <% … %>}.";
+"description-word-2000"                   = "*This option specifies if Tidy should go to great pains to strip out all the surplus stuff Microsoft Word 2000 inserts when you save Word documents as \"Web pages\". It doesn't handle embedded images or VML.\\par You should consider saving using Word's {\\b Save As...}, and choosing {\\b Web Page, Filtered}.";
+"description-wrap"                        = "*This option specifies the right margin Tidy uses for line wrapping.\\par Tidy tries to wrap lines so that they do not exceed this length.\\par Set {\\f0 wrap} to {\\f0\\b 0} (zero) if you want to disable line wrapping.";
+"description-wrap-asp"                    = "*This option specifies if Tidy should line wrap text contained within ASP pseudo elements, which look like: {\\f0 <% ... %>}.";
 "description-wrap-attributes"             = "*This option specifies if Tidy should line-wrap attribute values, meaning that if the value of an attribute causes a line to exceed the width specified by {\\f0 wrap}, Tidy will add one or more line breaks to the value, causing it to be wrapped into multiple lines.\\par Note that this option can be set independently of {\\f0 wrap-script-literals}. By default Tidy replaces any newline or tab with a single space and replaces any sequences of whitespace with a single space.\\par To force Tidy to preserve the original, literal values of all attributes, and ensure that whitespace characters within attribute values are passed through unchanged, set {\\f0 literal-attributes} to {\\f0\\b yes}.";
-"description-wrap-jste"                   = "*This option specifies if Tidy should line wrap text contained within JSTE pseudo elements, which look like: {\\f0 <# … #>}.";
-"description-wrap-php"                    = "*This option specifies if Tidy should line wrap text contained within PHP pseudo elements, which look like: {\\f0 <?php … ?>}.";
+"description-wrap-php"                    = "*This option specifies if Tidy should line wrap text contained within PHP pseudo elements, which look like: {\\f0 <?php ... ?>}.";
 "description-wrap-script-literals"        = "*This option specifies if Tidy should line wrap string literals that appear in script attributes.\\par Tidy wraps long script string literals by inserting a backslash character before the line break.";
-"description-wrap-sections"               = "*This option specifies if Tidy should line wrap text contained within {\\f0<![ … ]>} section tags.";
-"description-wrap"                        = "*This option specifies the right margin Tidy uses for line wrapping.\\par Tidy tries to wrap lines so that they do not exceed this length.\\par Set {\\f0 wrap} to {\\f0\\b 0}(zero) if you want to disable line wrapping.";
-"description-write-back"                  = "---This option specifies if Tidy should write back the tidied markup to the same file it read from.\\par You are advised to keep copies of important files before tidying them, as on rare occasions the result may not be what you expect.";
+"description-wrap-sections"               = "*This option specifies if Tidy should line wrap text contained within {\\f0 <![ ... ]>} section tags.";
+"description-write-back"                  = "*This option specifies if Tidy should write back the tidied markup to the same file it read from.\\par You are advised to keep copies of important files before tidying them, as on rare occasions the result may not be what you expect.";
 
 
 
@@ -292,208 +301,179 @@
  *  string including line and column data and other output, which was
  *  impossible to localize.
  *********************************************************************/
-"CODES_TIDY_ERROR_FIRST"                        = "";
-"MISSING_SEMICOLON"                             = "entity \"%s\" doesn't end in ';'";
-"MISSING_SEMICOLON_NCR"                         = "numeric character reference \"%s\" doesn't end in ';'";
-"UNKNOWN_ENTITY"                                = "unescaped & or unknown entity \"%s\"";
-"UNESCAPED_AMPERSAND"                           = "unescaped & which should be written as &amp;";
+"ANCHOR_NOT_UNIQUE"                             = "%s anchor \"%s\" already defined";
 "APOS_UNDEFINED"                                = "named entity &apos; only defined in XML/XHTML";
-"MISSING_ENDTAG_FOR"                            = "missing </%s>";
-"MISSING_ENDTAG_BEFORE"                         = "missing </%s> before %s";
-"DISCARDING_UNEXPECTED"                         = "discarding unexpected %s";
-"NESTED_EMPHASIS"                               = "nested emphasis %s";
-"NON_MATCHING_ENDTAG"                           = "replacing unexpected %s with </%s>";
-"TAG_NOT_ALLOWED_IN"                            = "%s isn't allowed in <%s> elements";
-"MISSING_STARTTAG"                              = "missing <%s>";
-"UNEXPECTED_ENDTAG"                             = "unexpected </%s>";
-"USING_BR_INPLACE_OF"                           = "using <br> in place of %s";
-"INSERTING_TAG"                                 = "inserting implicit <%s>";
-"SUSPECTED_MISSING_QUOTE"                       = "missing quote mark for attribute value";
-"MISSING_TITLE_ELEMENT"                         = "inserting missing 'title' element";
-"DUPLICATE_FRAMESET"                            = "repeated FRAMESET element";
+"APPLET_MISSING_ALT"                            = "[1.1.4.1]: <applet> missing alternate content.";
+"AREA_MISSING_ALT"                              = "[1.1.9.1]: <area> missing 'alt' text.";
+"ASCII_REQUIRES_DESCRIPTION"                    = "[1.1.12.1]: ascii art requires description.";
+"ASSOCIATE_LABELS_EXPLICITLY_FOR"               = "[12.4.1.2]: associate labels explicitly with form controls (for).";
+"ASSOCIATE_LABELS_EXPLICITLY_ID"                = "[12.4.1.3]: associate labels explicitly with form controls (id).";
+"ASSOCIATE_LABELS_EXPLICITLY"                   = "[12.4.1.1]: associate labels explicitly with form controls.";
+"ATTR_VALUE_NOT_LCASE"                          = "%s attribute value \"%s\" must be lower case for XHTML";
+"AUDIO_MISSING_TEXT_AIFF"                       = "[1.1.6.3]: audio missing text transcript (aiff).";
+"AUDIO_MISSING_TEXT_AU"                         = "[1.1.6.2]: audio missing text transcript (au).";
+"AUDIO_MISSING_TEXT_RA"                         = "[1.1.6.5]: audio missing text transcript (ra).";
+"AUDIO_MISSING_TEXT_RM"                         = "[1.1.6.6]: audio missing text transcript (rm).";
+"AUDIO_MISSING_TEXT_SND"                        = "[1.1.6.4]: audio missing text transcript (snd).";
+"AUDIO_MISSING_TEXT_WAV"                        = "[1.1.6.1]: audio missing text transcript (wav).";
+"BACKSLASH_IN_URI"                              = "%s URI reference contains backslash. Typo?";
+"BAD_ATTRIBUTE_VALUE_REPLACED"                  = "%s attribute \"%s\" had invalid value \"%s\" and has been replaced";
+"BAD_ATTRIBUTE_VALUE"                           = "%s attribute \"%s\" has invalid value \"%s\"";
+"BAD_CDATA_CONTENT"                             = "'<' + '/' + letter not allowed here";
+"BAD_COMMENT_CHARS"                             = "expecting -- or >";
+"BAD_SUMMARY_HTML5"                             = "The summary attribute on the %s element is obsolete in HTML5";
+"BAD_SURROGATE_LEAD"                            = "Trailing (Low) surrogate pair U+%04X, with no leading (High) entity, replaced with U+FFFD.";
+"BAD_SURROGATE_PAIR"                            = "Have out-of-range surrogate pair U+%04X:U+%04X, replaced with U+FFFD value.";
+"BAD_SURROGATE_TAIL"                            = "Leading (High) surrogate pair U+%04X, with no trailing (Low) entity, replaced with U+FFFD.";
+"BAD_XML_COMMENT"                               = "XML comments can't contain --";
 "CANT_BE_NESTED"                                = "%s can't be nested";
-"OBSOLETE_ELEMENT"                              = "replacing obsolete element %s with %s";
-"PROPRIETARY_ELEMENT"                           = "%s is not approved by W3C";
-"ELEMENT_VERS_MISMATCH_ERROR"                   = "%s element not available in %s";
-"ELEMENT_VERS_MISMATCH_WARN"                    = "%s element not available in %s";
-"UNKNOWN_ELEMENT"                               = "%s is not recognized!";
-"TRIM_EMPTY_ELEMENT"                            = "trimming empty %s";
+"CODES_TIDY_ERROR_LAST"                         = "";
+"COERCE_TO_ENDTAG_WARN"                         = "<%s> is probably intended as </%s>";
 "COERCE_TO_ENDTAG"                              = "<%s> is probably intended as </%s>";
-"ILLEGAL_NESTING"                               = "%s shouldn't be nested";
-"NOFRAMES_CONTENT"                              = "%s not inside 'noframes' element";
+"COLOR_CONTRAST_ACTIVE_LINK"                    = "[2.2.1.3]: poor color contrast (active link).";
+"COLOR_CONTRAST_LINK"                           = "[2.2.1.2]: poor color contrast (link).";
+"COLOR_CONTRAST_TEXT"                           = "[2.2.1.1]: poor color contrast (text).";
+"COLOR_CONTRAST_VISITED_LINK"                   = "[2.2.1.4]: poor color contrast (visited link).";
 "CONTENT_AFTER_BODY"                            = "content occurs after end of body";
-"INCONSISTENT_VERSION"                          = "HTML DOCTYPE doesn't match content";
-"MALFORMED_COMMENT"                             = "adjacent hyphens within comment";
-"BAD_COMMENT_CHARS"                             = "expecting -- or >";
-"BAD_XML_COMMENT"                               = "XML comments can't contain --";
-"BAD_CDATA_CONTENT"                             = "'<' + '/' + letter not allowed here";
-"INCONSISTENT_NAMESPACE"                        = "HTML namespace doesn't match content";
+"DATA_TABLE_MISSING_HEADERS_COLUMN"             = "[5.1.2.2]: data <table> missing row/column headers (1 col).";
+"DATA_TABLE_MISSING_HEADERS_ROW"                = "[5.1.2.3]: data <table> missing row/column headers (1 row).";
+"DATA_TABLE_MISSING_HEADERS"                    = "[5.1.2.1]: data <table> missing row/column headers (all).";
+"DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS"      = "[5.2.1.1]: data <table> may require markup (column headers).";
+"DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS"         = "[5.2.1.2]: data <table> may require markup (row headers).";
+"DISCARDING_UNEXPECTED"                         = "discarding unexpected %s";
 "DOCTYPE_AFTER_TAGS"                            = "<!DOCTYPE> isn't allowed after elements";
-"MALFORMED_DOCTYPE"                             = "discarding malformed <!DOCTYPE>";
-"UNEXPECTED_END_OF_FILE"                        = "unexpected end of file %s";
+"DOCTYPE_MISSING"                               = "[3.2.1.1]: <doctype> missing.";
 "DTYPE_NOT_UPPER_CASE"                          = "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case";
-"TOO_MANY_ELEMENTS"                             = "too many %s elements";
-"UNESCAPED_ELEMENT"                             = "unescaped %s in pre content";
-"NESTED_QUOTATION"                              = "nested q elements, possible typo.";
+"DUPLICATE_FRAMESET"                            = "repeated FRAMESET element";
 "ELEMENT_NOT_EMPTY"                             = "%s element not empty or not closed";
+"ELEMENT_VERS_MISMATCH_ERROR"                   = "%s element not available in %s";
+"ELEMENT_VERS_MISMATCH_WARN"                    = "%s element not available in %s";
 "ENCODING_IO_CONFLICT"                          = "Output encoding does not work with standard output";
-"MIXED_CONTENT_IN_BLOCK"                        = "";
-"MISSING_DOCTYPE"                               = "missing <!DOCTYPE> declaration";
-"SPACE_PRECEDING_XMLDECL"                       = "removing whitespace preceding XML Declaration";
-"TOO_MANY_ELEMENTS_IN"                          = "too many %s elements in <%s>";
-"UNEXPECTED_ENDTAG_IN"                          = "unexpected </%s> in <%s>";
-"REPLACING_ELEMENT"                             = "replacing %s with %s";
-"REPLACING_UNEX_ELEMENT"                        = "replacing unexpected %s with %s";
-"COERCE_TO_ENDTAG_WARN"                         = "<%s> is probably intended as </%s>";
-"UNKNOWN_ATTRIBUTE"                             = "%s unknown attribute \"%s\"";
-"INSERTING_ATTRIBUTE"                           = "%s inserting \"%s\" attribute";
-"INSERTING_AUTO_ATTRIBUTE"                      = "%s inserting \"%s\" attribute using value \"%s\"";
-"MISSING_ATTR_VALUE"                            = "%s attribute \"%s\" lacks value";
-"BAD_ATTRIBUTE_VALUE"                           = "%s attribute \"%s\" has invalid value \"%s\"";
-"UNEXPECTED_GT"                                 = "%s missing '>' for end of tag";
-"PROPRIETARY_ATTRIBUTE"                         = "%s proprietary attribute \"%s\"";
-"MISMATCHED_ATTRIBUTE_ERROR"                    = "%s attribute \"%s\" not allowed for %s";
-"MISMATCHED_ATTRIBUTE_WARN"                     = "%s attribute \"%s\" not allowed for %s";
-"PROPRIETARY_ATTR_VALUE"                        = "%s proprietary attribute value \"%s\"";
-"REPEATED_ATTRIBUTE"                            = "%s dropping value \"%s\" for repeated attribute \"%s\"";
-"MISSING_IMAGEMAP"                              = "%s should use client-side image map";
-"XML_ATTRIBUTE_VALUE"                           = "%s has XML attribute \"%s\"";
-"UNEXPECTED_QUOTEMARK"                          = "%s unexpected or duplicate quote mark";
-"MISSING_QUOTEMARK"                             = "%s attribute with missing trailing quote mark";
-"ID_NAME_MISMATCH"                              = "%s id and name attribute value mismatch";
-"BACKSLASH_IN_URI"                              = "%s URI reference contains backslash. Typo?";
-"FIXED_BACKSLASH"                               = "%s converting backslash in URI to slash";
-"ILLEGAL_URI_REFERENCE"                         = "%s improperly escaped URI reference";
-"ESCAPED_ILLEGAL_URI"                           = "%s escaping malformed URI reference";
-"NEWLINE_IN_URI"                                = "%s discarding newline in URI reference";
-"ANCHOR_NOT_UNIQUE"                             = "%s anchor \"%s\" already defined";
-"JOINING_ATTRIBUTE"                             = "%s joining values of repeated attribute \"%s\"";
-"UNEXPECTED_EQUALSIGN"                          = "%s unexpected '=', expected attribute name";
-"ATTR_VALUE_NOT_LCASE"                          = "%s attribute value \"%s\" must be lower case for XHTML";
-"XML_ID_SYNTAX"                                 = "%s ID \"%s\" uses XML ID syntax";
-"INVALID_ATTRIBUTE"                             = "%s attribute name \"%s\" (value=\"%s\") is invalid";
-"BAD_ATTRIBUTE_VALUE_REPLACED"                  = "%s attribute \"%s\" had invalid value \"%s\" and has been replaced";
-"INVALID_XML_ID"                                = "%s cannot copy name attribute to id";
-"UNEXPECTED_END_OF_FILE_ATTR"                   = "%s end of file while parsing attributes";
-"MISSING_ATTRIBUTE"                             = "%s lacks \"%s\" attribute";
-"WHITE_IN_URI"                                  = "%s discarding whitespace in URI reference";
-"REMOVED_HTML5"                                 = "%s element removed from HTML5";
-"BAD_SUMMARY_HTML5"                             = "The summary attribute on the %s element is obsolete in HTML5";
-"PREVIOUS_LOCATION"                             = "<%s> previously mentioned";
-"VENDOR_SPECIFIC_CHARS"                         = "%s invalid character code %s";
-"INVALID_SGML_CHARS"                            = "%s invalid character code %s";
-"INVALID_UTF8"                                  = "%s invalid UTF-8 bytes (char. code %s)";
-"INVALID_UTF16"                                 = "%s invalid UTF-16 surrogate pair (char. code %s)";
 "ENCODING_MISMATCH"                             = "specified input encoding (%s) does not match actual input encoding (%s)";
-"INVALID_URI"                                   = "";
-"INVALID_NCR"                                   = "%s invalid numeric character reference %s";
-"CODES_TIDY_ERROR_LAST"                         = "";
+"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET" = "[8.1.1.3]: ensure programmatic objects are accessible (applet).";
+"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED"  = "[8.1.1.4]: ensure programmatic objects are accessible (embed).";
+"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT" = "[8.1.1.2]: ensure programmatic objects are accessible (object).";
+"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT" = "[8.1.1.1]: ensure programmatic objects are accessible (script).";
+"ESCAPED_ILLEGAL_URI"                           = "%s escaping malformed URI reference";
 "FIRST_ACCESS_ERR"                              = "";
-"IMG_MISSING_ALT"                               = "[1.1.1.1]: <img> missing 'alt' text.";
-"IMG_ALT_SUSPICIOUS_FILENAME"                   = "[1.1.1.2]: suspicious 'alt' text (filename).";
+"FIXED_BACKSLASH"                               = "%s converting backslash in URI to slash";
+"FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"        = "[10.4.1.2]: form control default text invalid (null).";
+"FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"      = "[10.4.1.3]: form control default text invalid (spaces).";
+"FORM_CONTROL_REQUIRES_DEFAULT_TEXT"            = "[10.4.1.1]: form control requires default text.";
+"FRAME_MISSING_LONGDESC"                        = "[1.1.8.1]: <frame> may require 'longdesc'.";
+"FRAME_MISSING_NOFRAMES"                        = "[6.5.1.1]: <frameset> missing <noframes> section.";
+"FRAME_MISSING_TITLE"                           = "[12.1.1.1]: <frame> missing title.";
+"FRAME_SRC_INVALID"                             = "[6.2.1.1]: <frame> source invalid.";
+"FRAME_TITLE_INVALID_NULL"                      = "[12.1.1.2]: <frame> title invalid (null).";
+"FRAME_TITLE_INVALID_SPACES"                    = "[12.1.1.3]: <frame> title invalid (spaces).";
+"HEADER_USED_FORMAT_TEXT"                       = "[3.5.3.1]: header used to format text.";
+"HEADERS_IMPROPERLY_NESTED"                     = "[3.5.1.1]: headers improperly nested.";
+"ID_NAME_MISMATCH"                              = "%s id and name attribute value mismatch";
+"ILLEGAL_NESTING"                               = "%s shouldn't be nested";
+"ILLEGAL_URI_REFERENCE"                         = "%s improperly escaped URI reference";
+"IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION"     = "[9.1.1.1]: image map (server-side) requires conversion.";
 "IMG_ALT_SUSPICIOUS_FILE_SIZE"                  = "[1.1.1.3]: suspicious 'alt' text (file size).";
+"IMG_ALT_SUSPICIOUS_FILENAME"                   = "[1.1.1.2]: suspicious 'alt' text (filename).";
 "IMG_ALT_SUSPICIOUS_PLACEHOLDER"                = "[1.1.1.4]: suspicious 'alt' text (placeholder).";
 "IMG_ALT_SUSPICIOUS_TOO_LONG"                   = "[1.1.1.10]: suspicious 'alt' text (too long).";
+"IMG_BUTTON_MISSING_ALT"                        = "[1.1.3.1]: <img> (button) missing 'alt' text.";
+"IMG_MAP_CLIENT_MISSING_TEXT_LINKS"             = "[1.5.1.1]: image map (client-side) missing text links.";
+"IMG_MAP_SERVER_REQUIRES_TEXT_LINKS"            = "[1.2.1.1]: image map (server-side) requires text links.";
 "IMG_MISSING_ALT_BULLET"                        = "";
 "IMG_MISSING_ALT_H_RULE"                        = "";
-"IMG_MISSING_LONGDESC_DLINK"                    = "[1.1.2.1]: <img> missing 'longdesc' and d-link.";
+"IMG_MISSING_ALT"                               = "[1.1.1.1]: <img> missing 'alt' text.";
 "IMG_MISSING_DLINK"                             = "[1.1.2.2]: <img> missing d-link.";
+"IMG_MISSING_LONGDESC_DLINK"                    = "[1.1.2.1]: <img> missing 'longdesc' and d-link.";
 "IMG_MISSING_LONGDESC"                          = "[1.1.2.3]: <img> missing 'longdesc'.";
-"LONGDESC_NOT_REQUIRED"                         = "";
-"IMG_BUTTON_MISSING_ALT"                        = "[1.1.3.1]: <img> (button) missing 'alt' text.";
-"APPLET_MISSING_ALT"                            = "[1.1.4.1]: <applet> missing alternate content.";
-"OBJECT_MISSING_ALT"                            = "[1.1.5.1]: <object> missing alternate content.";
-"AUDIO_MISSING_TEXT_WAV"                        = "[1.1.6.1]: audio missing text transcript (wav).";
-"AUDIO_MISSING_TEXT_AU"                         = "[1.1.6.2]: audio missing text transcript (au).";
-"AUDIO_MISSING_TEXT_AIFF"                       = "[1.1.6.3]: audio missing text transcript (aiff).";
-"AUDIO_MISSING_TEXT_SND"                        = "[1.1.6.4]: audio missing text transcript (snd).";
-"AUDIO_MISSING_TEXT_RA"                         = "[1.1.6.5]: audio missing text transcript (ra).";
-"AUDIO_MISSING_TEXT_RM"                         = "[1.1.6.6]: audio missing text transcript (rm).";
-"FRAME_MISSING_LONGDESC"                        = "[1.1.8.1]: <frame> may require 'longdesc'.";
-"AREA_MISSING_ALT"                              = "[1.1.9.1]: <area> missing 'alt' text.";
-"SCRIPT_MISSING_NOSCRIPT"                       = "[1.1.10.1]: <script> missing <noscript> section.";
-"ASCII_REQUIRES_DESCRIPTION"                    = "[1.1.12.1]: ascii art requires description.";
-"IMG_MAP_SERVER_REQUIRES_TEXT_LINKS"            = "[1.2.1.1]: image map (server-side) requires text links.";
-"MULTIMEDIA_REQUIRES_TEXT"                      = "[1.4.1.1]: multimedia requires synchronized text equivalents.";
-"IMG_MAP_CLIENT_MISSING_TEXT_LINKS"             = "[1.5.1.1]: image map (client-side) missing text links.";
-"INFORMATION_NOT_CONVEYED_IMAGE"                = "[2.1.1.1]: ensure information not conveyed through color alone (image).";
+"INCONSISTENT_NAMESPACE"                        = "HTML namespace doesn't match content";
+"INCONSISTENT_VERSION"                          = "HTML DOCTYPE doesn't match content";
+"INDICATE_CHANGES_IN_LANGUAGE"                  = "[4.1.1.1]: indicate changes in language.";
 "INFORMATION_NOT_CONVEYED_APPLET"               = "[2.1.1.2]: ensure information not conveyed through color alone (applet).";
+"INFORMATION_NOT_CONVEYED_IMAGE"                = "[2.1.1.1]: ensure information not conveyed through color alone (image).";
+"INFORMATION_NOT_CONVEYED_INPUT"                = "[2.1.1.5]: ensure information not conveyed through color alone (input).";
 "INFORMATION_NOT_CONVEYED_OBJECT"               = "[2.1.1.3]: ensure information not conveyed through color alone (object).";
 "INFORMATION_NOT_CONVEYED_SCRIPT"               = "[2.1.1.4]: ensure information not conveyed through color alone (script).";
-"INFORMATION_NOT_CONVEYED_INPUT"                = "[2.1.1.5]: ensure information not conveyed through color alone (input).";
-"COLOR_CONTRAST_TEXT"                           = "[2.2.1.1]: poor color contrast (text).";
-"COLOR_CONTRAST_LINK"                           = "[2.2.1.2]: poor color contrast (link).";
-"COLOR_CONTRAST_ACTIVE_LINK"                    = "[2.2.1.3]: poor color contrast (active link).";
-"COLOR_CONTRAST_VISITED_LINK"                   = "[2.2.1.4]: poor color contrast (visited link).";
-"DOCTYPE_MISSING"                               = "[3.2.1.1]: <doctype> missing.";
-"STYLE_SHEET_CONTROL_PRESENTATION"              = "[3.3.1.1]: use style sheets to control presentation.";
-"HEADERS_IMPROPERLY_NESTED"                     = "[3.5.1.1]: headers improperly nested.";
-"POTENTIAL_HEADER_BOLD"                         = "[3.5.2.1]: potential header (bold).";
-"POTENTIAL_HEADER_ITALICS"                      = "[3.5.2.2]: potential header (italics).";
-"POTENTIAL_HEADER_UNDERLINE"                    = "[3.5.2.3]: potential header (underline).";
-"HEADER_USED_FORMAT_TEXT"                       = "[3.5.3.1]: header used to format text.";
-"LIST_USAGE_INVALID_UL"                         = "[3.6.1.1]: list usage invalid <ul>.";
-"LIST_USAGE_INVALID_OL"                         = "[3.6.1.2]: list usage invalid <ol>.";
-"LIST_USAGE_INVALID_LI"                         = "[3.6.1.4]: list usage invalid <li>.";
-"INDICATE_CHANGES_IN_LANGUAGE"                  = "[4.1.1.1]: indicate changes in language.";
-"LANGUAGE_NOT_IDENTIFIED"                       = "[4.3.1.1]: language not identified.";
+"INSERTING_ATTRIBUTE"                           = "%s inserting \"%s\" attribute";
+"INSERTING_AUTO_ATTRIBUTE"                      = "%s inserting \"%s\" attribute using value \"%s\"";
+"INSERTING_TAG"                                 = "inserting implicit <%s>";
+"INVALID_ATTRIBUTE"                             = "%s attribute name \"%s\" (value=\"%s\") is invalid";
+"INVALID_NCR"                                   = "%s invalid numeric character reference %s";
+"INVALID_SGML_CHARS"                            = "%s invalid character code %s";
+"INVALID_URI"                                   = "";
+"INVALID_UTF8"                                  = "%s invalid UTF-8 bytes (char. code %s)";
+"INVALID_UTF16"                                 = "%s invalid UTF-16 surrogate pair (char. code %s)";
+"INVALID_XML_ID"                                = "%s cannot copy name attribute to id";
+"JOINING_ATTRIBUTE"                             = "%s joining values of repeated attribute \"%s\"";
+"LABEL_NEEDS_REPOSITIONING_AFTER_INPUT"         = "";
+"LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT"        = "";
 "LANGUAGE_INVALID"                              = "[4.3.1.2]: language attribute invalid.";
-"DATA_TABLE_MISSING_HEADERS"                    = "[5.1.2.1]: data <table> missing row/column headers (all).";
-"DATA_TABLE_MISSING_HEADERS_COLUMN"             = "[5.1.2.2]: data <table> missing row/column headers (1 col).";
-"DATA_TABLE_MISSING_HEADERS_ROW"                = "[5.1.2.3]: data <table> missing row/column headers (1 row).";
-"DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS"      = "[5.2.1.1]: data <table> may require markup (column headers).";
-"DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS"         = "[5.2.1.2]: data <table> may require markup (row headers).";
-"LAYOUT_TABLES_LINEARIZE_PROPERLY"              = "[5.3.1.1]: verify layout tables linearize properly.";
+"LANGUAGE_NOT_IDENTIFIED"                       = "[4.3.1.1]: language not identified.";
+"LAST_ACCESS_ERR"                               = "";
 "LAYOUT_TABLE_INVALID_MARKUP"                   = "[5.4.1.1]: invalid markup used in layout <table>.";
-"TABLE_MISSING_SUMMARY"                         = "[5.5.1.1]: <table> missing summary.";
-"TABLE_SUMMARY_INVALID_NULL"                    = "[5.5.1.2]: <table> summary invalid (null).";
-"TABLE_SUMMARY_INVALID_SPACES"                  = "[5.5.1.3]: <table> summary invalid (spaces).";
-"TABLE_SUMMARY_INVALID_PLACEHOLDER"             = "[5.5.1.6]: <table> summary invalid (placeholder text).";
-"TABLE_MISSING_CAPTION"                         = "[5.5.2.1]: <table> missing <caption>.";
-"TABLE_MAY_REQUIRE_HEADER_ABBR"                 = "[5.6.1.1]: <table> may require header abbreviations.";
-"TABLE_MAY_REQUIRE_HEADER_ABBR_NULL"            = "[5.6.1.2]: <table> header abbreviations invalid (null).";
-"TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES"          = "[5.6.1.3]: <table> header abbreviations invalid (spaces).";
-"STYLESHEETS_REQUIRE_TESTING_LINK"              = "[6.1.1.1]: style sheets require testing (link).";
-"STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT"     = "[6.1.1.2]: style sheets require testing (style element).";
-"STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR"        = "[6.1.1.3]: style sheets require testing (style attribute).";
-"FRAME_SRC_INVALID"                             = "[6.2.1.1]: <frame> source invalid.";
-"TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET"      = "[6.2.2.1]: text equivalents require updating (applet).";
-"TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT"      = "[6.2.2.2]: text equivalents require updating (script).";
-"TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT"      = "[6.2.2.3]: text equivalents require updating (object).";
-"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT"   = "[6.3.1.1]: programmatic objects require testing (script).";
-"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT"   = "[6.3.1.2]: programmatic objects require testing (object).";
-"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED"    = "[6.3.1.3]: programmatic objects require testing (embed).";
-"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET"   = "[6.3.1.4]: programmatic objects require testing (applet).";
-"FRAME_MISSING_NOFRAMES"                        = "[6.5.1.1]: <frameset> missing <noframes> section.";
-"NOFRAMES_INVALID_NO_VALUE"                     = "[6.5.1.2]: <noframes> section invalid (no value).";
+"LAYOUT_TABLES_LINEARIZE_PROPERLY"              = "[5.3.1.1]: verify layout tables linearize properly.";
+"LINK_TEXT_MISSING"                             = "[13.1.1.2]: link text missing.";
+"LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE"           = "[13.1.1.4]: link text not meaningful (click here).";
+"LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS"          = "";
+"LINK_TEXT_NOT_MEANINGFUL_MORE"                 = "";
+"LINK_TEXT_NOT_MEANINGFUL"                      = "[13.1.1.1]: link text not meaningful.";
+"LINK_TEXT_TOO_LONG"                            = "[13.1.1.3]: link text too long.";
+"LIST_USAGE_INVALID_LI"                         = "[3.6.1.4]: list usage invalid <li>.";
+"LIST_USAGE_INVALID_OL"                         = "[3.6.1.2]: list usage invalid <ol>.";
+"LIST_USAGE_INVALID_UL"                         = "[3.6.1.1]: list usage invalid <ul>.";
+"LONGDESC_NOT_REQUIRED"                         = "";
+"MALFORMED_COMMENT"                             = "adjacent hyphens within comment";
+"MALFORMED_DOCTYPE"                             = "discarding malformed <!DOCTYPE>";
+"METADATA_MISSING_LINK"                         = "";
+"METADATA_MISSING_REDIRECT_AUTOREFRESH"         = "[13.2.1.3]: Metadata missing (redirect/auto-refresh).";
+"METADATA_MISSING"                              = "[13.2.1.1]: Metadata missing.";
+"MISMATCHED_ATTRIBUTE_ERROR"                    = "%s attribute \"%s\" not allowed for %s";
+"MISMATCHED_ATTRIBUTE_WARN"                     = "%s attribute \"%s\" not allowed for %s";
+"MISSING_ATTR_VALUE"                            = "%s attribute \"%s\" lacks value";
+"MISSING_ATTRIBUTE"                             = "%s lacks \"%s\" attribute";
+"MISSING_DOCTYPE"                               = "missing <!DOCTYPE> declaration";
+"MISSING_ENDTAG_BEFORE"                         = "missing </%s> before %s";
+"MISSING_ENDTAG_FOR"                            = "missing </%s>";
+"MISSING_IMAGEMAP"                              = "%s should use client-side image map";
+"MISSING_QUOTEMARK"                             = "%s attribute with missing trailing quote mark";
+"MISSING_SEMICOLON_NCR"                         = "numeric character reference \"%s\" doesn't end in ';'";
+"MISSING_SEMICOLON"                             = "entity \"%s\" doesn't end in ';'";
+"MISSING_STARTTAG"                              = "missing <%s>";
+"MISSING_TITLE_ELEMENT"                         = "inserting missing 'title' element";
+"MIXED_CONTENT_IN_BLOCK"                        = "";
+"MULTIMEDIA_REQUIRES_TEXT"                      = "[1.4.1.1]: multimedia requires synchronized text equivalents.";
+"NESTED_EMPHASIS"                               = "nested emphasis %s";
+"NESTED_QUOTATION"                              = "nested q elements, possible typo.";
+"NEW_WINDOWS_REQUIRE_WARNING_BLANK"             = "[10.1.1.2]: new windows require warning (_blank).";
+"NEW_WINDOWS_REQUIRE_WARNING_NEW"               = "[10.1.1.1]: new windows require warning (_new).";
+"NEWLINE_IN_URI"                                = "%s discarding newline in URI reference";
+"NOFRAMES_CONTENT"                              = "%s not inside 'noframes' element";
 "NOFRAMES_INVALID_CONTENT"                      = "[6.5.1.3]: <noframes> section invalid (content).";
 "NOFRAMES_INVALID_LINK"                         = "[6.5.1.4]: <noframes> section invalid (link).";
-"REMOVE_FLICKER_SCRIPT"                         = "[7.1.1.1]: remove flicker (script).";
-"REMOVE_FLICKER_OBJECT"                         = "[7.1.1.2]: remove flicker (object).";
-"REMOVE_FLICKER_EMBED"                          = "[7.1.1.3]: remove flicker (embed).";
-"REMOVE_FLICKER_APPLET"                         = "[7.1.1.4]: remove flicker (applet).";
-"REMOVE_FLICKER_ANIMATED_GIF"                   = "[7.1.1.5]: remove flicker (animated gif).";
-"REMOVE_BLINK_MARQUEE"                          = "[7.2.1.1]: remove blink/marquee.";
-"REMOVE_AUTO_REFRESH"                           = "[7.4.1.1]: remove auto-refresh.";
+"NOFRAMES_INVALID_NO_VALUE"                     = "[6.5.1.2]: <noframes> section invalid (no value).";
+"NON_MATCHING_ENDTAG"                           = "replacing unexpected %s with </%s>";
+"OBJECT_MISSING_ALT"                            = "[1.1.5.1]: <object> missing alternate content.";
+"OBSOLETE_ELEMENT"                              = "replacing obsolete element %s with %s";
+"POTENTIAL_HEADER_BOLD"                         = "[3.5.2.1]: potential header (bold).";
+"POTENTIAL_HEADER_ITALICS"                      = "[3.5.2.2]: potential header (italics).";
+"POTENTIAL_HEADER_UNDERLINE"                    = "[3.5.2.3]: potential header (underline).";
+"PREVIOUS_LOCATION"                             = "<%s> previously mentioned";
+"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET"   = "[6.3.1.4]: programmatic objects require testing (applet).";
+"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED"    = "[6.3.1.3]: programmatic objects require testing (embed).";
+"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT"   = "[6.3.1.2]: programmatic objects require testing (object).";
+"PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT"   = "[6.3.1.1]: programmatic objects require testing (script).";
+"PROPRIETARY_ATTR_VALUE"                        = "%s proprietary attribute value \"%s\"";
+"PROPRIETARY_ATTRIBUTE"                         = "%s proprietary attribute \"%s\"";
+"PROPRIETARY_ELEMENT"                           = "%s is not approved by W3C";
 "REMOVE_AUTO_REDIRECT"                          = "[7.5.1.1]: remove auto-redirect.";
-"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT" = "[8.1.1.1]: ensure programmatic objects are accessible (script).";
-"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT" = "[8.1.1.2]: ensure programmatic objects are accessible (object).";
-"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET" = "[8.1.1.3]: ensure programmatic objects are accessible (applet).";
-"ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED"  = "[8.1.1.4]: ensure programmatic objects are accessible (embed).";
-"IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION"     = "[9.1.1.1]: image map (server-side) requires conversion.";
-"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN"  = "[9.3.1.1]: <script> not keyboard accessible (onMouseDown).";
-"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP"    = "[9.3.1.2]: <script> not keyboard accessible (onMouseUp).";
-"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK"       = "[9.3.1.3]: <script> not keyboard accessible (onClick).";
-"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER"  = "[9.3.1.4]: <script> not keyboard accessible (onMouseOver).";
-"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT"   = "[9.3.1.5]: <script> not keyboard accessible (onMouseOut).";
-"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE"  = "[9.3.1.6]: <script> not keyboard accessible (onMouseMove).";
-"NEW_WINDOWS_REQUIRE_WARNING_NEW"               = "[10.1.1.1]: new windows require warning (_new).";
-"NEW_WINDOWS_REQUIRE_WARNING_BLANK"             = "[10.1.1.2]: new windows require warning (_blank).";
-"LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT"        = "";
-"LABEL_NEEDS_REPOSITIONING_AFTER_INPUT"         = "";
-"FORM_CONTROL_REQUIRES_DEFAULT_TEXT"            = "[10.4.1.1]: form control requires default text.";
-"FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"        = "[10.4.1.2]: form control default text invalid (null).";
-"FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"      = "[10.4.1.3]: form control default text invalid (spaces).";
+"REMOVE_AUTO_REFRESH"                           = "[7.4.1.1]: remove auto-refresh.";
+"REMOVE_BLINK_MARQUEE"                          = "[7.2.1.1]: remove blink/marquee.";
+"REMOVE_FLICKER_ANIMATED_GIF"                   = "[7.1.1.5]: remove flicker (animated gif).";
+"REMOVE_FLICKER_APPLET"                         = "[7.1.1.4]: remove flicker (applet).";
+"REMOVE_FLICKER_EMBED"                          = "[7.1.1.3]: remove flicker (embed).";
+"REMOVE_FLICKER_OBJECT"                         = "[7.1.1.2]: remove flicker (object).";
+"REMOVE_FLICKER_SCRIPT"                         = "[7.1.1.1]: remove flicker (script).";
+"REMOVED_HTML5"                                 = "%s element removed from HTML5";
+"REPEATED_ATTRIBUTE"                            = "%s dropping value \"%s\" for repeated attribute \"%s\"";
 "REPLACE_DEPRECATED_HTML_APPLET"                = "[11.2.1.1]: replace deprecated html <applet>.";
 "REPLACE_DEPRECATED_HTML_BASEFONT"              = "[11.2.1.2]: replace deprecated html <basefont>.";
 "REPLACE_DEPRECATED_HTML_CENTER"                = "[11.2.1.3]: replace deprecated html <center>.";
@@ -504,28 +484,59 @@
 "REPLACE_DEPRECATED_HTML_S"                     = "[11.2.1.8]: replace deprecated html <s>.";
 "REPLACE_DEPRECATED_HTML_STRIKE"                = "[11.2.1.9]: replace deprecated html <strike>.";
 "REPLACE_DEPRECATED_HTML_U"                     = "[11.2.1.10]: replace deprecated html <u>.";
-"FRAME_MISSING_TITLE"                           = "[12.1.1.1]: <frame> missing title.";
-"FRAME_TITLE_INVALID_NULL"                      = "[12.1.1.2]: <frame> title invalid (null).";
-"FRAME_TITLE_INVALID_SPACES"                    = "[12.1.1.3]: <frame> title invalid (spaces).";
-"ASSOCIATE_LABELS_EXPLICITLY"                   = "[12.4.1.1]: associate labels explicitly with form controls.";
-"ASSOCIATE_LABELS_EXPLICITLY_FOR"               = "[12.4.1.2]: associate labels explicitly with form controls (for).";
-"ASSOCIATE_LABELS_EXPLICITLY_ID"                = "[12.4.1.3]: associate labels explicitly with form controls (id).";
-"LINK_TEXT_NOT_MEANINGFUL"                      = "[13.1.1.1]: link text not meaningful.";
-"LINK_TEXT_MISSING"                             = "[13.1.1.2]: link text missing.";
-"LINK_TEXT_TOO_LONG"                            = "[13.1.1.3]: link text too long.";
-"LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE"           = "[13.1.1.4]: link text not meaningful (click here).";
-"LINK_TEXT_NOT_MEANINGFUL_MORE"                 = "";
-"LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS"          = "";
-"METADATA_MISSING"                              = "[13.2.1.1]: Metadata missing.";
-"METADATA_MISSING_LINK"                         = "";
-"METADATA_MISSING_REDIRECT_AUTOREFRESH"         = "[13.2.1.3]: Metadata missing (redirect/auto-refresh).";
+"REPLACING_ELEMENT"                             = "replacing %s with %s";
+"REPLACING_UNEX_ELEMENT"                        = "replacing unexpected %s with %s";
+"SCRIPT_MISSING_NOSCRIPT"                       = "[1.1.10.1]: <script> missing <noscript> section.";
+"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK"       = "[9.3.1.3]: <script> not keyboard accessible (onClick).";
+"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN"  = "[9.3.1.1]: <script> not keyboard accessible (onMouseDown).";
+"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE"  = "[9.3.1.6]: <script> not keyboard accessible (onMouseMove).";
+"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT"   = "[9.3.1.5]: <script> not keyboard accessible (onMouseOut).";
+"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER"  = "[9.3.1.4]: <script> not keyboard accessible (onMouseOver).";
+"SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP"    = "[9.3.1.2]: <script> not keyboard accessible (onMouseUp).";
 "SKIPOVER_ASCII_ART"                            = "[13.10.1.1]: skip over ascii art.";
-"LAST_ACCESS_ERR"                               = "";
-"STRING_UNKNOWN_OPTION"                         = "unknown option: %s";
-"STRING_MISSING_MALFORMED"                      = "missing or malformed argument for option: %s";
+"SPACE_PRECEDING_XMLDECL"                       = "removing whitespace preceding XML Declaration";
+"STRING_CONTENT_LOOKS"                          = "Document content looks like %s";
 "STRING_DOCTYPE_GIVEN"                          = "Doctype given is \"%s\"";
 "STRING_HTML_PROPRIETARY"                       = "HTML Proprietary";
-"STRING_CONTENT_LOOKS"                          = "Document content looks like %s";
+"STRING_MISSING_MALFORMED"                      = "missing or malformed argument for option: %s";
 "STRING_NO_SYSID"                               = "No system identifier in emitted doctype";
+"STRING_UNKNOWN_OPTION"                         = "unknown option: %s";
+"STYLE_SHEET_CONTROL_PRESENTATION"              = "[3.3.1.1]: use style sheets to control presentation.";
+"STYLESHEETS_REQUIRE_TESTING_LINK"              = "[6.1.1.1]: style sheets require testing (link).";
+"STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR"        = "[6.1.1.3]: style sheets require testing (style attribute).";
+"STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT"     = "[6.1.1.2]: style sheets require testing (style element).";
+"SUSPECTED_MISSING_QUOTE"                       = "missing quote mark for attribute value";
+"TABLE_MAY_REQUIRE_HEADER_ABBR_NULL"            = "[5.6.1.2]: <table> header abbreviations invalid (null).";
+"TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES"          = "[5.6.1.3]: <table> header abbreviations invalid (spaces).";
+"TABLE_MAY_REQUIRE_HEADER_ABBR"                 = "[5.6.1.1]: <table> may require header abbreviations.";
+"TABLE_MISSING_CAPTION"                         = "[5.5.2.1]: <table> missing <caption>.";
+"TABLE_MISSING_SUMMARY"                         = "[5.5.1.1]: <table> missing summary.";
+"TABLE_SUMMARY_INVALID_NULL"                    = "[5.5.1.2]: <table> summary invalid (null).";
+"TABLE_SUMMARY_INVALID_PLACEHOLDER"             = "[5.5.1.6]: <table> summary invalid (placeholder text).";
+"TABLE_SUMMARY_INVALID_SPACES"                  = "[5.5.1.3]: <table> summary invalid (spaces).";
+"TAG_NOT_ALLOWED_IN"                            = "%s isn't allowed in <%s> elements";
+"TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET"      = "[6.2.2.1]: text equivalents require updating (applet).";
+"TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT"      = "[6.2.2.3]: text equivalents require updating (object).";
+"TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT"      = "[6.2.2.2]: text equivalents require updating (script).";
+"TOO_MANY_ELEMENTS_IN"                          = "too many %s elements in <%s>";
+"TOO_MANY_ELEMENTS"                             = "too many %s elements";
+"TRIM_EMPTY_ELEMENT"                            = "trimming empty %s";
+"UNESCAPED_AMPERSAND"                           = "unescaped & which should be written as &amp;";
+"UNESCAPED_ELEMENT"                             = "unescaped %s in pre content";
+"UNEXPECTED_END_OF_FILE_ATTR"                   = "%s end of file while parsing attributes";
+"UNEXPECTED_END_OF_FILE"                        = "unexpected end of file %s";
+"UNEXPECTED_ENDTAG_IN"                          = "unexpected </%s> in <%s>";
+"UNEXPECTED_ENDTAG"                             = "unexpected </%s>";
+"UNEXPECTED_EQUALSIGN"                          = "%s unexpected '=', expected attribute name";
+"UNEXPECTED_GT"                                 = "%s missing '>' for end of tag";
+"UNEXPECTED_QUOTEMARK"                          = "%s unexpected or duplicate quote mark";
+"UNKNOWN_ATTRIBUTE"                             = "%s unknown attribute \"%s\"";
+"UNKNOWN_ELEMENT"                               = "%s is not recognized!";
+"UNKNOWN_ENTITY"                                = "unescaped & or unknown entity \"%s\"";
+"USING_BR_INPLACE_OF"                           = "using <br> in place of %s";
+"VENDOR_SPECIFIC_CHARS"                         = "%s invalid character code %s";
+"WHITE_IN_URI"                                  = "%s discarding whitespace in URI reference";
+"XML_ATTRIBUTE_VALUE"                           = "%s has XML attribute \"%s\"";
+"XML_ID_SYNTAX"                                 = "%s ID \"%s\" uses XML ID syntax";