From 713e4aab8c2e36051734b2406e67b9fb34fba98d Mon Sep 17 00:00:00 2001
From: Caleb Callaway <cqcallaw@brainvitamins.net>
Date: Mon, 23 Nov 2020 20:29:20 -0800
Subject: [PATCH] Trim trailing whitespace

No code changes here, just a quality-of-life edit per htacg#903
---
 CMakeLists.txt                |  60 +++---
 README.md                     |   8 +-
 README/ATTRIBUTES.md          |   4 +-
 README/BUILD.md               |  16 +-
 README/CONTRIBUTING.md        |   8 +-
 README/LICENSE.md             |   8 +-
 README/LICENSE.txt            |   8 +-
 README/LOCALIZE.md            |   4 +-
 README/MESSAGES.md            |   8 +-
 README/OPTIONS.md             |   4 +-
 README/RELEASE.md             |  10 +-
 README/TAGS.md                |   2 +-
 README/VERSION.md             |   4 +-
 build/cmake/pub-bins.sh       |   8 +-
 console/tab2space.c           |  10 +-
 console/test71.cxx            |   2 +-
 console/tidy.c                |  48 ++---
 experimental/TidyNodeIter.c   |   2 +-
 experimental/TidyNodeIter.h   |  10 +-
 experimental/httpio.c         |  10 +-
 include/buffio.h              |   2 +-
 include/platform.h            |   2 +-
 include/tidy.h                |  98 ++++-----
 include/tidybuffio.h          |   4 +-
 include/tidyenum.h            |  30 +--
 include/tidyplatform.h        |  10 +-
 localize/README.md            |  22 +-
 localize/language_ll_cc.h.erb |   4 +-
 man/.gitignore                |   2 +-
 man/tidy1.xsl.in              |  32 +--
 src/access.c                  | 368 +++++++++++++++++-----------------
 src/access.h                  |  12 +-
 src/attrdict.c                | 266 ++++++++++++------------
 src/attrs.c                   | 132 ++++++------
 src/buffio.c                  |   2 +-
 src/clean.c                   |  32 +--
 src/config.c                  |  36 ++--
 src/config.h                  |   4 +-
 src/entities.c                |  12 +-
 src/fileio.h                  |   2 +-
 src/forward.h                 |   2 +-
 src/gdoc.c                    |   8 +-
 src/istack.c                  |   6 +-
 src/language.c                |  72 +++----
 src/language.h                |   8 +-
 src/language_en.h             |  28 +--
 src/language_en_gb.h          |  24 +--
 src/language_es.h             |  14 +-
 src/language_es_mx.h          |   6 +-
 src/language_fr.h             | 240 +++++++++++-----------
 src/language_pt_br.h          | 262 ++++++++++++------------
 src/language_zh_cn.h          |   4 +-
 src/lexer.c                   | 138 ++++++-------
 src/lexer.h                   |   6 +-
 src/message.c                 |  54 ++---
 src/message.h                 |  16 +-
 src/messageobj.c              |  68 +++----
 src/parser.c                  | 148 +++++++-------
 src/pprint.c                  |  76 +++----
 src/pprint.h                  |  12 +-
 src/sprtf.c                   |   4 +-
 src/streamio.c                |  60 +++---
 src/streamio.h                |   6 +-
 src/tags.c                    |  22 +-
 src/tidy-int.h                |   6 +-
 src/tidylib.c                 |  26 +--
 src/tmbstr.c                  |   2 +-
 src/utf8.c                    |  50 ++---
 test.html                     |  19 ++
 69 files changed, 1356 insertions(+), 1337 deletions(-)
 create mode 100644 test.html

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6acfd72ee..0cd3d4081 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,8 +56,8 @@ if (LIBTIDY_VERSION)
     list(GET VERSION_LIST 2 TIDY_POINT_VERSION)
 else ()
     message(FATAL_ERROR "*** FAILED to get a VERSION from version.txt!")
-endif ()   
- 
+endif ()
+
 # Establish version date
 if (LIBTIDY_DATE)
     string(REPLACE "." ";" DATE_LIST ${LIBTIDY_DATE})
@@ -145,24 +145,24 @@ option( ENABLE_MEMORY_DEBUG "Set ON to output some memory diagnostics."     OFF
 
 if ( ENABLE_DEBUG_LOG )
     add_definitions( -DENABLE_DEBUG_LOG )
-    message(STATUS "*** Debug Logging is enabled.")  
+    message(STATUS "*** Debug Logging is enabled.")
 else ()
-    message(STATUS "*** Debug Logging is NOT enabled.")  
+    message(STATUS "*** Debug Logging is NOT enabled.")
 endif ()
 
 if (ENABLE_ALLOC_DEBUG)
     add_definitions ( -DDEBUG_ALLOCATION )  # see lexer.c for details
     message(STATUS "*** Note, lexer.c node allocation diagnostics are ON")
 endif ()
-    
+
 if (ENABLE_MEMORY_DEBUG)
     add_definitions ( -DDEBUG_MEMORY )  # see alloc.c for details
     message(STATUS "*** Note, alloc.c memory diagnostics are ON")
 endif ()
-    
+
 if (WIN32)
     option( ENABLE_CRTDBG_MEMORY "Set ON to enable the Windows CRT debug library." OFF )
-    
+
     if (ENABLE_CRTDBG_MEMORY)
         add_definitions ( -D_CRTDBG_MAP_ALLOC )  # see tidy.c for details
         message(STATUS "*** Note, tidy.c Windows CRT memory debug is ON")
@@ -178,9 +178,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set( WARNING_FLAGS -Wall )
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    set( WARNING_FLAGS "-Wall -Wno-overloaded-virtual" )
-endif() 
+endif()
 
 if(WIN32 AND MSVC)
     # C4996: The compiler encountered a deprecated declaration.
@@ -190,7 +190,7 @@ if(WIN32 AND MSVC)
     foreach(warning 4996 4090 4244 4267)
         set(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
     endforeach()
-    
+
     set( MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS" )
 
     # to distinguish between debug and release lib in windows
@@ -206,7 +206,7 @@ set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}" )
 
 #------------------------------------------------------------------------
 # Static Windows Runtime
-#   Option to statically link to the Windows runtime. Maybe only 
+#   Option to statically link to the Windows runtime. Maybe only
 #   applies to WIN32/MSVC.
 #------------------------------------------------------------------------
 if (MSVC)
@@ -222,7 +222,7 @@ if (MSVC)
             )
         foreach(CompilerFlag ${CompilerFlags})
             string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-        endforeach()    
+        endforeach()
         message(STATUS "Using /MT STATIC runtime")
     else ()
         message(STATUS "Using /MD DYNAMIC runtime")
@@ -255,14 +255,14 @@ if (NO_ACCESS_SUPPORT)
 endif ()
 
 # Delete me? Not used in Tidy source!
-add_definitions ( -DHAVE_CONFIG_H ) 
+add_definitions ( -DHAVE_CONFIG_H )
 
 
 #------------------------------------------------------------------------
 # Runtime Configuration File Support
 #   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 
+#   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.
 #------------------------------------------------------------------------
@@ -276,11 +276,11 @@ if ( UNIX AND SUPPORT_CONSOLE_APP )
 else ()
 
   option ( ENABLE_CONFIG_FILES "Set to ON to enable Tidy runtime configuration file support" OFF )
-  
+
   if ( SUPPORT_GETPWNAM )
     add_definitions( -DSUPPORT_GETPWNAM=1 )
   endif ()
-  
+
 endif ()
 
 if ( ENABLE_CONFIG_FILES )
@@ -288,7 +288,7 @@ if ( ENABLE_CONFIG_FILES )
     message(STATUS "*** Building support for runtime configuration files.")
 
     add_definitions( -DTIDY_ENABLE_CONFIG_FILES )
-    
+
     # define a default here so we can pass to XSL.
     if ( NOT TIDY_CONFIG_FILE )
         set( TIDY_CONFIG_FILE "/etc/tidy.conf" )
@@ -304,7 +304,7 @@ if ( ENABLE_CONFIG_FILES )
     add_definitions( -DTIDY_USER_CONFIG_FILE="${TIDY_USER_CONFIG_FILE}" )
 
 endif ()
-  
+
 
 #------------------------------------------------------------------------
 # Shared Library
@@ -341,7 +341,7 @@ set ( CFILES
         ${SRCDIR}/tmbstr.c       ${SRCDIR}/utf8.c         ${SRCDIR}/tidylib.c
         ${SRCDIR}/mappedio.c     ${SRCDIR}/gdoc.c         ${SRCDIR}/language.c
         ${SRCDIR}/messageobj.c   ${SRCDIR}/sprtf.c )
-        
+
 set ( HFILES
         ${INCDIR}/tidyplatform.h ${INCDIR}/tidy.h         ${INCDIR}/tidyenum.h
         ${INCDIR}/tidybuffio.h )
@@ -359,7 +359,7 @@ set ( LIBHFILES
         ${SRCDIR}/tmbstr.h       ${SRCDIR}/utf8.h         ${SRCDIR}/tidy-int.h
         ${SRCDIR}/version.h      ${SRCDIR}/gdoc.h         ${SRCDIR}/language.h
         ${SRCDIR}/language_en.h  ${SRCDIR}/sprtf.h )
-  
+
 
 #------------------------------------------------------------------------
 # Target Locations
@@ -383,11 +383,11 @@ endif ()
 #------------------------------------------------------------------------
 set(name tidy-static)
 add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
-set_target_properties( ${name} PROPERTIES 
+set_target_properties( ${name} PROPERTIES
                        OUTPUT_NAME ${LIB_NAME}s )
 if (NOT TIDY_CONSOLE_SHARED) # user wants default static linkage
     list ( APPEND add_LIBS ${name} )
-endif ()    
+endif ()
 install(TARGETS ${name}
         RUNTIME DESTINATION ${BIN_INSTALL_DIR}
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
@@ -410,12 +410,12 @@ if (BUILD_SHARED_LIB)
         set(CMAKE_MACOSX_RPATH 1)
     endif ()
     add_library ( ${name} SHARED ${CFILES} ${HFILES} ${LIBHFILES} )
-    set_target_properties( ${name} PROPERTIES 
+    set_target_properties( ${name} PROPERTIES
                                    OUTPUT_NAME ${LIB_NAME} )
     set_target_properties( ${name} PROPERTIES
                                    VERSION   ${LIBTIDY_VERSION}
                                    SOVERSION ${TIDY_MAJOR_VERSION} )
-    set_target_properties( ${name} PROPERTIES 
+    set_target_properties( ${name} PROPERTIES
                                    COMPILE_FLAGS "-DBUILD_SHARED_LIB -DBUILDING_SHARED_LIB")
     install(TARGETS ${name}
         RUNTIME DESTINATION ${BIN_INSTALL_DIR}
@@ -424,7 +424,7 @@ if (BUILD_SHARED_LIB)
         )
     if (TIDY_CONSOLE_SHARED) # user wants shared/dll linkage
         list ( APPEND add_LIBS ${name} )
-    endif ()    
+    endif ()
 endif ()
 
 
@@ -442,7 +442,7 @@ if (SUPPORT_CONSOLE_APP)
         set_target_properties( ${name} PROPERTIES DEBUG_POSTFIX d )
     endif ()
     if (NOT TIDY_CONSOLE_SHARED)
-        set_target_properties( ${name} PROPERTIES 
+        set_target_properties( ${name} PROPERTIES
                                        COMPILE_FLAGS "-DTIDY_STATIC" )
     endif ()
     install (TARGETS ${name} DESTINATION bin)
@@ -488,13 +488,13 @@ if (UNIX AND SUPPORT_CONSOLE_APP)
         set(TIDYHELP ${CMAKE_CURRENT_BINARY_DIR}/tidy-help.xml)
         set(TIDYCONFIG ${CMAKE_CURRENT_BINARY_DIR}/tidy-config.xml)
         add_custom_target(man ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}")
-        
+
         ## Populate the @VARIABLES@ in the input file.
         configure_file(
             ${CMAKE_CURRENT_SOURCE_DIR}/man/tidy1.xsl.in
             ${TIDY1XSL}
         )
- 
+
         # Run the built EXE to generate xml output .
         add_custom_command(
             TARGET man
@@ -542,7 +542,7 @@ endif()
 
 #------------------------------------------------------------------------
 # System Runtime Libraries
-#   Need to ensure that system DLLs get included in a binary 
+#   Need to ensure that system DLLs get included in a binary
 #   distribution, but since it can miss some - seems incomplete - make
 #   optional.
 #------------------------------------------------------------------------
@@ -629,7 +629,7 @@ configure_file(
     "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc"
     @ONLY
     )
-    
+
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc"
     DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
diff --git a/README.md b/README.md
index bf48c5646..21072bf31 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,14 @@ All other READMEs and related materials can be found in [README/][100]. Although
 ## Building HTML Tidy
 
   - For build instructions please see [README/BUILD.md][115].
-  
+
 ## Branches and Versions
 
 Learn about which branches are available, which branch you should use, and how HTML Tidy’s versioning scheme works.
 
   - Learn about version numbering in [README/VERSION.md][160].
   - Learn about our repository branches in [README/BRANCHES.md][110].
-  
+
 ## Contributing and Development Guides
 
 We gladly accept PRs! Read about some of our contribution guidelines, and check out some of the additional explanatory documents that will aid your understanding of how to accomplish certain things in HTML Tidy.
@@ -63,7 +63,7 @@ Tidy supports localization, and welcomes translations into various languages. Pl
 This repository should be considered canonical for HTML Tidy as of 2015-January-15.
 
  - This repository originally transferred from [w3c.github.com/tidy-html5][20], now redirected to the current site.
- 
+
  - First moved to Github from [tidy.sourceforge.net][21]. Note, this site is kept only for historic reasons, and is not now well maintained.
 
 **Tidy is the granddaddy of HTML tools, with support for modern standards.** Have fun...
@@ -93,4 +93,4 @@ HTML Tidy and LibTidy are free and open source software with a permissive licens
   [150]: README/MESSAGE.md
   [155]: README/OPTIONS.md
   [160]: README/VERSION.md
- 
+
diff --git a/README/ATTRIBUTES.md b/README/ATTRIBUTES.md
index 0615998c3..6c5a530f1 100644
--- a/README/ATTRIBUTES.md
+++ b/README/ATTRIBUTES.md
@@ -14,9 +14,9 @@ So, to add a new `attribute=value`, on one or more existing tags, consists of th
  1. `tidyenum.h` - Give the attribute an internal name, like `TidyAttr_XXXX`, and thus a value. Please try to keep this enumeration in alphabetical order.
 
  2. `attrs.c` - Assign the string value of the attribute. Of course this must be unique. And then assign a `function` to verify the attribute value. There are already a considerable number of defined functions to verify specific attribute values, but maybe this new attribute requires a new function, so that should be written, and defined.
- 
+
  3. `attrdict.c` - If this attribute only relates to specific tags, then it should be added to their list. There are some general attributes that are allowed on every, or most tags, so this new attribute and value should be added accordingly.
- 
+
  4. `tags.c` - Now the new attribute will be verified for each tag it is associated with in the `tag_defs[]` table. Like for example the `<button ...>`, `{ TidyTag_BUTTON, ...` has `&TY_(W3CAttrsFor_BUTTON)[0]` assigned.
 
 So, normally, just changing 3 files, `tidyenum.h`, `attrs.c`, and `attrdict.c`, will already adjust `tags.c` to accept a new `attribute=value` for any tag, or all tags. Simple...
diff --git a/README/BUILD.md b/README/BUILD.md
index 60d441cee..2e4de5d52 100644
--- a/README/BUILD.md
+++ b/README/BUILD.md
@@ -3,13 +3,13 @@
 ## Prerequisites
 
   1. git - [http://git-scm.com/book/en/v2/Getting-Started-Installing-Git][1]
-  
+
   2. cmake - [http://www.cmake.org/download/][2]
-  
+
   3. appropriate build tools for the platform
-  
+
   4. the [xsltproc][3] tool is required to build and install the `tidy.1` man page on Unix-like platforms.
-  
+
 CMake comes in two forms - command line and GUI. Some installations only install one or the other, but sometimes both. The build commands below are only for command line use.
 
 Also the actual build tools vary for each platform. But that is one of the great features of CMake, it can generate various 'native' build files. Running `cmake --help` should list the generators available on that platform. For sure one of the common ones is "Unix Makefiles", which needs autotools make installed, but many other generators are supported.
@@ -23,11 +23,11 @@ In Windows CMake offers various versions for MSVC. Again below only the command
 
   2. `cmake ../.. -DCMAKE_BUILD_TYPE=Release [-DCMAKE_INSTALL_PREFIX=/path/for/install]`
 
-  3. Windows:  `cmake --build . --config Release`  
+  3. Windows:  `cmake --build . --config Release`
      Unix/OS X: `make`
 
-  4. Install, if desired:  
-     Windows: `cmake --build . --config Release --target INSTALL`  
+  4. Install, if desired:
+     Windows: `cmake --build . --config Release --target INSTALL`
      Unix/OS X: `[sudo] make install`
 
 By default cmake sets the install path to `/usr/local/bin` in Unix. If you wanted the binary in say `/usr/bin` instead, then in 2. above use `-DCMAKE_INSTALL_PREFIX=/usr`.
@@ -70,5 +70,5 @@ make install
   [2]: http://www.cmake.org/download/
   [3]: http://xmlsoft.org/XSLT/xsltproc2.html
 
-  
+
 ; eof
diff --git a/README/CONTRIBUTING.md b/README/CONTRIBUTING.md
index f96686e74..875516db0 100644
--- a/README/CONTRIBUTING.md
+++ b/README/CONTRIBUTING.md
@@ -16,7 +16,7 @@ In either place please start with a short subject to describe the issue. If it i
   - the output
   - the _expected_ output
   - some sample code (if an API question).
-  
+
 This information will make replication of your issue much simpler for us.
 
 If you do add sample HTML input, then it can also be very helpful if that sample **passes** the W3C [validator](https://validator.w3.org/#validate_by_upload). Tidy attempts to follow all current W3C standards.
@@ -53,11 +53,11 @@ Concerning the “Tidy Code Style,” checkout [CODESTYLE.md](CODESTYLE.md), but
 
 Item 2., SSH Key, is optional, and only required if you want to use `clone git@github.com...`. And if you generate the ssh without a `passphrase`, things like `git push` can be done without a password. Just convenience. Alternatively you can use the `HTTPS` protocol...
 
-Concerning 5., editing and committing your changes, **generally** it is better to `commit` changes often, adding an appropriate commit message to each, like `$ git commit -m "Is. #NNN - reason for change" <file[s]>`. This also aids in the **PR** review. 
+Concerning 5., editing and committing your changes, **generally** it is better to `commit` changes often, adding an appropriate commit message to each, like `$ git commit -m "Is. #NNN - reason for change" <file[s]>`. This also aids in the **PR** review.
 
 But the situation varies. Like adding say an option, which can mean several files have to be edited, where it is likely appropriate to combine a considerable number of edits into one commit. There can be no hard and fast rules on this.
 
-Please note, if you want to change **multiple** things that don't depend on each other, use **different** `branches`, and make sure you check the `next` branch back out, before making more changes in a **new** branch name. That way we can take in each **change** separately, otherwise Github will **combine** all your branch commits into one **PR**. 
+Please note, if you want to change **multiple** things that don't depend on each other, use **different** `branches`, and make sure you check the `next` branch back out, before making more changes in a **new** branch name. That way we can take in each **change** separately, otherwise Github will **combine** all your branch commits into one **PR**.
 
 See below on keeping your forks `next` fully in sync with here, called `upstream` - **this is important**.
 
@@ -85,7 +85,7 @@ $ ./testall.sh ../../tidy-fork/build/cmake/tidy
 $ diff -u ../cases/testbase-expects ../cases/testbase-results
 ```
 
-Use folder `tools-cmd` for windows. Run `alltest.bat --help`. 
+Use folder `tools-cmd` for windows. Run `alltest.bat --help`.
 
 If the `tests` shows a different exit value, or there are differences between the `expects` and `results`, these **must** be studied, and checked, very carefully. There may be cases where the **new** `results` are correct, in which case a simultaneous **PR** for the forked `tests` **must** be created to match your forked source **PR**.
 
diff --git a/README/LICENSE.md b/README/LICENSE.md
index ef9770725..4164cd00b 100644
--- a/README/LICENSE.md
+++ b/README/LICENSE.md
@@ -3,11 +3,11 @@
 ## HTML parser and pretty printer
 
 Copyright (c) 1998-2016 World Wide Web Consortium
-(Massachusetts Institute of Technology, European Research 
+(Massachusetts Institute of Technology, European Research
 Consortium for Informatics and Mathematics, Keio University).
 All Rights Reserved.
 
-Additional contributions (c) 2001-2016 University of Toronto, Terry Teague, 
+Additional contributions (c) 2001-2016 University of Toronto, Terry Teague,
 @geoffmcl, HTACG, and others.
 
 ### Contributing Author(s):
@@ -15,7 +15,7 @@ Additional contributions (c) 2001-2016 University of Toronto, Terry Teague,
   Dave Raggett <dsr@w3.org>
 
 The contributing author(s) would like to thank all those who
-helped with testing, bug fixes and suggestions for improvements. 
+helped with testing, bug fixes and suggestions for improvements.
 This wouldn't have been possible without your help.
 
 ## COPYRIGHT NOTICE:
@@ -26,7 +26,7 @@ representations or warranties, express or implied, including
 but not limited to, warranties of merchantability or fitness
 for any particular purpose or that the use of the software or
 documentation will not infringe any third party patents,
-copyrights, trademarks or other rights. 
+copyrights, trademarks or other rights.
 
 The copyright holders and contributing author(s) will not be held
 liable for any direct, indirect, special or consequential damages
diff --git a/README/LICENSE.txt b/README/LICENSE.txt
index ef9770725..4164cd00b 100644
--- a/README/LICENSE.txt
+++ b/README/LICENSE.txt
@@ -3,11 +3,11 @@
 ## HTML parser and pretty printer
 
 Copyright (c) 1998-2016 World Wide Web Consortium
-(Massachusetts Institute of Technology, European Research 
+(Massachusetts Institute of Technology, European Research
 Consortium for Informatics and Mathematics, Keio University).
 All Rights Reserved.
 
-Additional contributions (c) 2001-2016 University of Toronto, Terry Teague, 
+Additional contributions (c) 2001-2016 University of Toronto, Terry Teague,
 @geoffmcl, HTACG, and others.
 
 ### Contributing Author(s):
@@ -15,7 +15,7 @@ Additional contributions (c) 2001-2016 University of Toronto, Terry Teague,
   Dave Raggett <dsr@w3.org>
 
 The contributing author(s) would like to thank all those who
-helped with testing, bug fixes and suggestions for improvements. 
+helped with testing, bug fixes and suggestions for improvements.
 This wouldn't have been possible without your help.
 
 ## COPYRIGHT NOTICE:
@@ -26,7 +26,7 @@ representations or warranties, express or implied, including
 but not limited to, warranties of merchantability or fitness
 for any particular purpose or that the use of the software or
 documentation will not infringe any third party patents,
-copyrights, trademarks or other rights. 
+copyrights, trademarks or other rights.
 
 The copyright holders and contributing author(s) will not be held
 liable for any direct, indirect, special or consequential damages
diff --git a/README/LOCALIZE.md b/README/LOCALIZE.md
index 602fb13c6..f3191e0ed 100644
--- a/README/LOCALIZE.md
+++ b/README/LOCALIZE.md
@@ -11,9 +11,9 @@ team you will certainly earn the admiration of fellow Tidy users worldwide.
 
 ## How to Contribute
 
-All READMEs (including [instructions][2] on how to localize Tidy) and related 
+All READMEs (including [instructions][2] on how to localize Tidy) and related
 materials can be found in [localize][1].
 
  [1]: ../localize
  [2]: ../localize/README.md
- 
+
diff --git a/README/MESSAGES.md b/README/MESSAGES.md
index fc857f855..ece5c41bd 100644
--- a/README/MESSAGES.md
+++ b/README/MESSAGES.md
@@ -5,14 +5,14 @@ Tidy has a quite complex warning/error report and footnote messaging system, but
 First assign the message a **key** value. This is done in `tidyenum.h`, in one of the two enumerations that are listed there.
 
  1. `tidyStrings` - starts with the value `TIDYSTRINGS_FIRST = 500`, and it must be first. This is the list of all strings available in Tidy with the exception of strings provided by other enumerations. **However** don't modify this enum directly. You'll modify a preprocessor macro instead.
- 
+
  2. `TidyOptionId` - You probably won't need this unless you're adding new options, and there's another readme for that.
- 
+
  3. `TidyConfigCategory` - You probably won't need this, either, unless you're adding a whole new category for options.
- 
+
  4. `TidyReportLevel` - And you probably won't need this, either.
 
-All enum values are only ever used by name within **libTidy** (and incidentally, should only ever be used by name in your client applications; never trust the value!), so feel free to enter new strings in English alphabetical order (this helps us audit all of the strings from time to time). 
+All enum values are only ever used by name within **libTidy** (and incidentally, should only ever be used by name in your client applications; never trust the value!), so feel free to enter new strings in English alphabetical order (this helps us audit all of the strings from time to time).
 
 As mentioned above, `tidyStrings` messages must be defined in one of the existing macros named like `FOREACH_...(FN)`, such as `FOREACH_DIALOG_MSG(FN)`. These macros ensure that another data structure used for localization and key lookup is updated automatically any time strings are added or removed, thus limiting the possibility of developer error.
 
diff --git a/README/OPTIONS.md b/README/OPTIONS.md
index ff0d84e42..d87893413 100644
--- a/README/OPTIONS.md
+++ b/README/OPTIONS.md
@@ -12,7 +12,7 @@ This file indicates how to add a new option to tidy, here adding an option `Tidy
  2. Add to the `table` `TidyOptionImpl option_defs[]` in `config.c`
  3. Add the id, with a `description` to `language_en.h`
  4. Use the option in the code.
- 
+
 #### 1. Option ID
 
 In `tidyenum.h` the `TidyOptionId` can be in any order, but please try to keep things alphabetical, and keep in mind that `N_TIDY_OPTIONS` must remain the last. Choosing the id name can be any string, but by convention it will commence with `Tidy` followed by brief descriptive text.
@@ -120,7 +120,7 @@ This is the desription added for this new option.
 This can be added anywhere in the code to change the current code action. While the testing of the option depends on the option type, the most common is `cfgBool( doc, id )`. Here is an example of where this new option is used -
 
 ~~~
-    /*\ if javascript insert backslash before / 
+    /*\ if javascript insert backslash before /
      *  Issue #348 - Add option, escape-scripts, to skip
     \*/
     if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts))
diff --git a/README/RELEASE.md b/README/RELEASE.md
index 192a89cc6..07e00f94f 100644
--- a/README/RELEASE.md
+++ b/README/RELEASE.md
@@ -13,9 +13,9 @@ This assumes the current `next` branch is version 5.7.XXX. See VERSION.md for ch
  - Decide on any show-stopper outstanding issues, and action...
  - Change milestone of all excluded this time issues to the next 5.10 milestone, or to indefinite...
  - Decide target date for release...
- 
+
 ### The Release:
- 
+
  1. Update version.txt to 5.8.0, and date... commit
  2. Create branch, `$ git checkout -b release/5.8`
  3. Update README/vershist.log... perl script... commit
@@ -36,10 +36,10 @@ This assumes the current `next` branch is version 5.7.XXX. See VERSION.md for ch
  - Add more binaries...
 
 ## Notes on `Release Process`:
- 
-This **HTACG HTML Tidy** `official` release process must be supplemented with distribution by others. 
 
-Of course, if possible, we recomend building tidy from the git source, it is easy, but also in some OS'es others offer distribution in various ways... 
+This **HTACG HTML Tidy** `official` release process must be supplemented with distribution by others.
+
+Of course, if possible, we recomend building tidy from the git source, it is easy, but also in some OS'es others offer distribution in various ways...
 
 See [Get Tidy](http://www.html-tidy.org/#homepage19700601get_tidy) - This page really needs expanding. There are some suggestions pending, and more feedback welcome...
 
diff --git a/README/TAGS.md b/README/TAGS.md
index 36d9f52b4..2b1090240 100644
--- a/README/TAGS.md
+++ b/README/TAGS.md
@@ -11,7 +11,7 @@ So, adding a new HTML **tag** consists of the following simple steps:
  1. `tidyenum.h` - Give the element an internal name, like `TidyTag_XXXX`, and thus a value. Please keep this list in alphabetical order.
 
  2. `tags.c` - Add a line to the `tag_defs[]` table. This assigns the unique string value of the element. Then the html versions that support the element, a pointer to the attributes supported by that elelment, and a bit field of the elements characteristics, inline, block, etc.
- 
+
 So, just changing 2 files, `tidyenum.h` and `tags.c`, and libTidy will now support that element, tag, as W3C approved. Simple... And at times, there is some case for adding **tags** that are still in the `Working Draft` stage, especially when there has been wide spread support in the community, even before it reaches `REC` stage.
 
 Now, one could argue that this is not the **best** way to verify every attribute and value, for every tag, but that is a moot point - that is how tidy does it!
diff --git a/README/VERSION.md b/README/VERSION.md
index e1ea8631e..17d3eea76 100644
--- a/README/VERSION.md
+++ b/README/VERSION.md
@@ -30,7 +30,7 @@ Barring some major, monumental, massive change to Tidy, or the [release of HTML6
 
 The minor version tells a lot more about the true version of Tidy that you have, but even so it’s not a simple matter that 5 > 2 and must be better. The minor number indicates **HTML Tidy** _release versions_ or _development versions_.
 
-- **even numbered minor versions** indicate released versions of **HTML Tidy**. We provide binaries for releases, API documentation, and full support including cherry picking bug fixes back to them. In standard parlance, _released_ versions are _stable_ versions, meaning that the API is stable and you can generally expect Tidy’s output to be the same (other than as a result of bug fixes). 
+- **even numbered minor versions** indicate released versions of **HTML Tidy**. We provide binaries for releases, API documentation, and full support including cherry picking bug fixes back to them. In standard parlance, _released_ versions are _stable_ versions, meaning that the API is stable and you can generally expect Tidy’s output to be the same (other than as a result of bug fixes).
 
 - **odd numbered minor versions** are development versions, or as is considered in many contexts _bleeding edge_ or _next_ versions. HTACG do not provide binaries, and API documentation is not usually up to date, but you do have access to the latest bug fixes, newest features, and knowledge of where Tidy is going. The downside, though, is that we make absolutely no guarantees that:
 
@@ -99,5 +99,5 @@ TIDY_EXPORT ctmbstr TIDY_CALL     tidyReleaseDate(void);
 Starting with HTML Tidy 5.4.0 release, our branching scheme aligns nicely with our version numbering scheme. Please consult [BRANCHES.md](BRANCHES.md).
 
 
-Updated: 20170210  
+Updated: 20170210
    Date: 20150904
diff --git a/build/cmake/pub-bins.sh b/build/cmake/pub-bins.sh
index 762f7837a..0ea51fdf8 100755
--- a/build/cmake/pub-bins.sh
+++ b/build/cmake/pub-bins.sh
@@ -40,7 +40,7 @@ if [ ! -d "$TMPBINS" ]; then
 fi
 TMPDD="$TMPBINS/tidy-$TMPVER"
     echo ""
-if [ -d "$TMPDD" ]; then 
+if [ -d "$TMPDD" ]; then
     echo "$BN: Destination is $TMPDD"
 else
     echo "$BN: This is a NEW installation in $TMPDD"
@@ -62,7 +62,7 @@ echo ""
 echo "$BN: Will publish..."
 echo "$TMPFIL1"
 echo "$TMPFIL2"
-if [ ! -d "$TMPDD" ]; then 
+if [ ! -d "$TMPDD" ]; then
     echo "$BN: Will create dir $TMPDD"
 else
     echo "$BN: Destination $TMPDD"
@@ -71,9 +71,9 @@ echo ""
 echo "$BN: *** CONTINUE? ***"
 ask
 
-if [ ! -d "$TMPDD" ]; then 
+if [ ! -d "$TMPDD" ]; then
     mkdir $TMPDD
-    if [ ! -d "$TMPDD" ]; then 
+    if [ ! -d "$TMPDD" ]; then
         echo "$BN: Failed to create folder $TMPDD"
         exit 1
     fi
diff --git a/console/tab2space.c b/console/tab2space.c
index 73548a713..d0f9ed91e 100644
--- a/console/tab2space.c
+++ b/console/tab2space.c
@@ -143,7 +143,7 @@ static int ReadChar(Stream *in)
         in->tabs--;
         return ' ';
     }
-    
+
     /* Else go on with normal buffer: */
     for (;;)
     {
@@ -331,14 +331,14 @@ int main(int argc, char **argv)
 
             if (fin != stdin)
                 fclose(fin);
-            
+
             if (fout != stdout)
                fout = fopen(outfile, "wb");
-            
+
             if (fout)
             {
                WriteFile(in, fout);
-                
+
                if (fout != stdout)
                   fclose(fout);
             }
@@ -352,7 +352,7 @@ int main(int argc, char **argv)
 
         --argc;
         ++argv;
-        
+
         if (argc <= 1)
             break;
     }
diff --git a/console/test71.cxx b/console/test71.cxx
index 4e8adf82b..7ae0d9fee 100644
--- a/console/test71.cxx
+++ b/console/test71.cxx
@@ -1,4 +1,4 @@
-/*\ 
+/*\
  *  20150206 - Test app for Issue #71
  *
  *  A simple API example of getting the body text, first as html,
diff --git a/console/tidy.c b/console/tidy.c
index 3a3d9ad8e..a61843555 100644
--- a/console/tidy.c
+++ b/console/tidy.c
@@ -6,7 +6,7 @@
  * console application offering all of the features of LibTidy.
  *
  * @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
@@ -130,7 +130,7 @@ static tmbstr stringWithFormat(const ctmbstr fmt, /**< The format string. */
  */
 
 
-/** Used by `print1Column`, `print2Columns` and `print3Columns` to manage 
+/** Used by `print1Column`, `print2Columns` and `print3Columns` to manage
  ** wrapping text within columns.
  ** @result The pointer to the next part of the string to output.
  */
@@ -479,12 +479,12 @@ static tmbstr get_escaped_name( ctmbstr name )
 static Bool hasPickList( TidyOption topt )
 {
     TidyIterator pos;
-    
+
     if ( tidyOptGetType( topt ) != TidyInteger)
         return no;
-    
+
     pos = tidyOptGetPickList( topt );
-    
+
     return tidyOptGetNextPick( topt, &pos ) != NULL;
 }
 
@@ -519,7 +519,7 @@ typedef struct {
     Bool haveVals;        /**< if yes, vals is valid */
 } OptionDesc;
 
-/** A type for a function pointer for a function used to print out options 
+/** A type for a function pointer for a function used to print out options
  ** descriptions.
  ** @param TidyDoc The document.
  ** @param TidyOption The Tidy option.
@@ -562,7 +562,7 @@ static void GetOption(TidyDoc tdoc,    /**< The tidy document. */
             d->vals = "attributeX, attributeY, ...";
             d->def = NULL;
             break;
-            
+
         case TidyCharEncoding:
         case TidyInCharEncoding:
         case TidyOutCharEncoding:
@@ -572,7 +572,7 @@ static void GetOption(TidyDoc tdoc,    /**< The tidy document. */
                 d->def = "?";
             d->vals = NULL;
             break;
-            
+
             /* General case will handle remaining */
         default:
             switch ( optTyp )
@@ -581,7 +581,7 @@ static void GetOption(TidyDoc tdoc,    /**< The tidy document. */
                 d->type = "Boolean";
                 d->def = tidyOptGetCurrPick( tdoc, optId );
                 break;
-                
+
             case TidyInteger:
                 if (hasPickList(topt))
                 {
@@ -596,13 +596,13 @@ static void GetOption(TidyDoc tdoc,    /**< The tidy document. */
                         d->vals = "0 (no wrapping), 1, 2, ...";
                     else
                         d->vals = "0, 1, 2, ...";
-                    
+
                     idef = tidyOptGetInt( tdoc, optId );
                     sprintf(d->tempdefs, "%u", idef);
                     d->def = d->tempdefs;
                 }
                 break;
-                
+
             case TidyString:
                 d->type = "String";
                 d->vals = NULL;
@@ -1337,7 +1337,7 @@ static void optionDescribe(TidyDoc tdoc, /**< The Tidy Document */
  */
 
 
-/** Prints the Windows language names that Tidy recognizes, using the specified 
+/** Prints the Windows language names that Tidy recognizes, using the specified
  ** format string.
  ** @param format A format string used to display the Windows language names,
  **        or NULL to use the built-in default format.
@@ -1383,7 +1383,7 @@ void tidyPrintTidyLanguageNames( ctmbstr format )
 
 /** Handles the -lang help service.
  ** @remark We will not support console word wrapping for the tables. If users
- **         really have a small console, then they should make it wider or 
+ **         really have a small console, then they should make it wider or
  **         output to a file.
  ** @param tdoc The Tidy document.
  */
@@ -1834,7 +1834,7 @@ static void xml_error_strings( TidyDoc tdoc )
 
         printf( " </error_string>\n" );
     }
-    
+
     printf( "</error_strings>\n" );
 }
 
@@ -2023,7 +2023,7 @@ static Bool TIDY_CALL reportCallback(TidyMessage tmessage)
     ctmbstr messageFormat;
 
     printf("FILTER: %s, %s\n", tidyGetMessageKey( tmessage ), tidyGetMessageOutput( tmessage ));
-    
+
     /* loop through the arguments, if any, and print their details */
     pos = tidyGetMessageArguments( tmessage );
     while ( pos )
@@ -2032,17 +2032,17 @@ static Bool TIDY_CALL reportCallback(TidyMessage tmessage)
         messageType = tidyGetArgType( tmessage, &arg );
         messageFormat = tidyGetArgFormat( tmessage, &arg );
         printf( "  Type = %u, Format = %s, Value = ", messageType, messageFormat );
-        
+
         switch (messageType)
         {
             case tidyFormatType_STRING:
                 printf("%s\n", tidyGetArgValueString( tmessage, &arg ));
                 break;
-                
+
             case tidyFormatType_INT:
                 printf("%d\n", tidyGetArgValueInt( tmessage, &arg));
                 break;
-    
+
             case tidyFormatType_UINT:
                 printf("%u\n", tidyGetArgValueUInt( tmessage, &arg));
                 break;
@@ -2543,14 +2543,14 @@ int main( int argc, char** argv )
                 }
             }
         }
-        
+
         contentErrors   += tidyErrorCount( tdoc );
         contentWarnings += tidyWarningCount( tdoc );
         accessWarnings  += tidyAccessWarningCount( tdoc );
-        
+
         --argc;
         ++argv;
-        
+
         if ( argc <= 1 )
             break;
     } /* read command line loop */
@@ -2568,14 +2568,14 @@ int main( int argc, char** argv )
 
     /* called to free hash tables etc. */
     tidyRelease( tdoc );
-    
+
     /* return status can be used by scripts */
     if ( contentErrors > 0 )
         return 2;
-    
+
     if ( contentWarnings > 0 )
         return 1;
-    
+
     /* 0 signifies all is ok */
     return 0;
 }
diff --git a/experimental/TidyNodeIter.c b/experimental/TidyNodeIter.c
index 59e31e83e..2c781441f 100644
--- a/experimental/TidyNodeIter.c
+++ b/experimental/TidyNodeIter.c
@@ -26,7 +26,7 @@ Node *nextTidyNode( TidyNodeIter *pThis )
         /* the next element, if any, is my first-born child */
         pThis->pCurrent = pThis->pCurrent->content;
     }
-    else 
+    else
     {
         /* no children, I guess my next younger brother inherits the throne. */
         while (   NULL == pThis->pCurrent->next
diff --git a/experimental/TidyNodeIter.h b/experimental/TidyNodeIter.h
index e949e3f10..6fc475372 100644
--- a/experimental/TidyNodeIter.h
+++ b/experimental/TidyNodeIter.h
@@ -2,7 +2,7 @@
 
   (c) 1998-2003 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
-  
+
   These files contain utility routines to perform in-order traversals of the
   Tidy document tree, beginning at an arbitrary node.
 
@@ -28,11 +28,11 @@ typedef struct _TidyNodeIter
 
 TidyNodeIter *newTidyNodeIter( Node *pStart );
 
-/* 
+/*
     nextTidyNode( TidyNodeIter *pIter )
 
     if pCurrent is NULL, this function initializes it to match pTop, and
-    returns that value, otherwise it advances to the next node in order, 
+    returns that value, otherwise it advances to the next node in order,
     and returns that value. When pTop == pCurrent, the function returns NULL
     to indicate that the entire tree has been visited.
 */
@@ -42,10 +42,10 @@ Node *nextTidyNode( TidyNodeIter *pIter );
     setCurrentNode( TidyNodeIter *pThis, Node *newCurr )
 
     Resets pCurrent to match the passed value; useful if you need to back up
-    to an unaltered point in the tree, or to skip a section. The next call to 
+    to an unaltered point in the tree, or to skip a section. The next call to
     nextTidyNode() will return the node which follows newCurr in order.
 
-    Minimal error checking is performed; unexpected results _will_ occur if 
+    Minimal error checking is performed; unexpected results _will_ occur if
     newCurr is not a descendant node of pTop.
 */
 void setCurrentNode( TidyNodeIter *pThis, Node *newCurr );
diff --git a/experimental/httpio.c b/experimental/httpio.c
index cda927025..740679537 100644
--- a/experimental/httpio.c
+++ b/experimental/httpio.c
@@ -109,13 +109,13 @@ int fillBuffer( HTTPInputSource *in )
 int openURL( HTTPInputSource *in, tmbstr pUrl )
 {
     int rc = -1;
-#ifdef WIN32    
+#ifdef WIN32
     WSADATA wsaData;
 
     rc = WSAStartup( 514, &wsaData );
 #endif
 
-    in->tis.getByte = (TidyGetByteFunc) HTTPGetByte; 
+    in->tis.getByte = (TidyGetByteFunc) HTTPGetByte;
     in->tis.ungetByte = (TidyUngetByteFunc) HTTPUngetByte;
     in->tis.eof = (TidyEOFFunc) HTTPIsEOF;
     in->tis.sourceData = (uint) in;
@@ -137,8 +137,8 @@ int openURL( HTTPInputSource *in, tmbstr pUrl )
         {
             if (1 < blanks)
                 break;
-            for (; in->nextBytePos < sizeof( in->buffer ) 
-                   && 0 != in->buffer[ in->nextBytePos ]; 
+            for (; in->nextBytePos < sizeof( in->buffer )
+                   && 0 != in->buffer[ in->nextBytePos ];
                  in->nextBytePos++ )
             {
                 ch = in->buffer[ in->nextBytePos ];
@@ -209,7 +209,7 @@ Bool HTTPIsEOF( HTTPInputSource *source )
         /* pending ungot bytes, not done */
         return no;
 
-    if (   0 != source->nBufSize 
+    if (   0 != source->nBufSize
         && source->nextBytePos >= source->nBufSize)
         /* We've consumed the existing buffer, get another */
         fillBuffer( source );
diff --git a/include/buffio.h b/include/buffio.h
index 726a40933..4e231f97f 100644
--- a/include/buffio.h
+++ b/include/buffio.h
@@ -1,6 +1,6 @@
 /** @file buffio.h - Deprecated compatibility header. Use tidybuffio.h
 **
-** @deprecated This compatibility header is deprecated and 
+** @deprecated This compatibility header is deprecated and
 ** should be replaced by tidybuffio.h. This header will be removed!
 **
 */
diff --git a/include/platform.h b/include/platform.h
index 747976b32..4dc8e6d86 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -1,6 +1,6 @@
 /** @file platform.h - Deprecated compatibility header. Use tidyplatform.h
 **
-** @deprecated This compatibility header is deprecated and 
+** @deprecated This compatibility header is deprecated and
 ** should be replaced by tidyplatform.h. This header will be removed!
 **
 */
diff --git a/include/tidy.h b/include/tidy.h
index da80857e8..26776937f 100644
--- a/include/tidy.h
+++ b/include/tidy.h
@@ -20,8 +20,8 @@
  *
  * @author  Dave Raggett [dsr@w3.org]
  * @author  HTACG, et al (consult git log)
- * 
- * @remarks The contributing author(s) would like to thank all those who 
+ *
+ * @remarks The contributing author(s) would like to thank all those who
  *          helped with testing, bug fixes and suggestions for improvements.
  *          This wouldn't have been possible without your help.
  *
@@ -32,9 +32,9 @@
  * @par
  *     All Rights Reserved.
  * @par
- *     This software and documentation is provided "as is," and the copyright 
+ *     This software and documentation is provided "as is," and the copyright
  *     holders and contributing author(s) make no representations or warranties,
- *     express or implied, including but not limited to, warranties of 
+ *     express or implied, including but not limited to, warranties of
  *     merchantability or fitness for any particular purpose or that the use of
  *     the software or documentation will not infringe any third party patents,
  *     copyrights, trademarks or other rights.
@@ -72,7 +72,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
+
 /***************************************************************************//**
  ** @defgroup internal_api Internal API
  ** The Internal API is used exclusively within LibTidy. If you are an
@@ -91,7 +91,7 @@ extern "C" {
 
 /***************************************************************************//**
  ** @defgroup public_api External Public API
- ** The Public API is the API that LibTidy programmers must access in order 
+ ** The Public API is the API that LibTidy programmers must access in order
  ** to harness HTML Tidy as a library. The API limits all exposure to internal
  ** structures and provides only accessors that return simple types such as
  ** C strings and integers, which makes it quite suitable for integration with
@@ -241,7 +241,7 @@ struct _TidyAllocator;
 typedef struct _TidyAllocatorVtbl TidyAllocatorVtbl;
 typedef struct _TidyAllocator TidyAllocator;
 
-    
+
 /** Tidy's built-in default allocator. */
 struct _TidyAllocator {
     const TidyAllocatorVtbl *vtbl; /**< The allocator's function table. */
@@ -270,7 +270,7 @@ struct _TidyAllocatorVtbl
                    void *block,         /**< The pointer to the existing block. */
                    size_t nBytes        /**< The number of bytes to allocate. */
                    );
-    
+
     /** Called to free a previously allocated block of memory.
      */
     void *free(TidyAllocator *self,  /**< The TidyAllocator to use to free memory. */
@@ -283,7 +283,7 @@ struct _TidyAllocatorVtbl
         called if an error is detected in the tree integrity via the internal
         function CheckNodeIntegrity(). This is a situation that can only arise
         in the case of a programming error in LibTidy. You can turn off node
-        integrity checking by defining the constant `NO_NODE_INTEGRITY_CHECK` 
+        integrity checking by defining the constant `NO_NODE_INTEGRITY_CHECK`
         during the build.
     **/
     void *panic(TidyAllocator *self,  /**< The TidyAllocator to use to panic. */
@@ -334,7 +334,7 @@ TIDY_EXPORT Bool TIDY_CALL tidySetPanicCall( TidyPanic fpanic );
 /** @name Instantiation and Destruction
  ** @{
  */
-    
+
 /** The primary creation of a document instance. Instances of a TidyDoc are used
  ** 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
@@ -352,19 +352,19 @@ TIDY_EXPORT TidyDoc TIDY_CALL     tidyCreate(void);
  */
 TIDY_EXPORT TidyDoc TIDY_CALL     tidyCreateWithAllocator(TidyAllocator *allocator);
 
-/** Free all memory and release the TidyDoc. The TidyDoc can not be used after 
+/** Free all memory and release the TidyDoc. The TidyDoc can not be used after
  ** this call.
  ** @param tdoc The TidyDoc to free.
  */
 TIDY_EXPORT void TIDY_CALL        tidyRelease(TidyDoc tdoc);
 
-    
+
 /** @}
  ** @name Host Application Data
  ** @{
  */
-   
- 
+
+
 /** Allows the host application to store a chunk of data with each TidyDoc
  ** instance. This can be useful for callbacks, such as saving a reference to
  ** `self` within the document.
@@ -375,17 +375,17 @@ TIDY_EXPORT void TIDY_CALL        tidySetAppData(TidyDoc tdoc,  /**< The documen
 
 /** Returns the data previously stored with `tidySetAppData()`.
  ** @param tdoc  document where data has been stored.
- ** @result The pointer to the data block previously stored. 
+ ** @result The pointer to the data block previously stored.
  */
 TIDY_EXPORT void* TIDY_CALL       tidyGetAppData(TidyDoc tdoc);
 
-    
+
 /** @}
  ** @name LibTidy Version Information
  ** @{
  */
 
-    
+
 /** Get the release date for the current library.
  ** @result The string representing the release date.
  */
@@ -401,13 +401,13 @@ TIDY_EXPORT ctmbstr TIDY_CALL     tidyLibraryVersion(void);
  */
 TIDY_EXPORT ctmbstr TIDY_CALL     tidyPlatform(void);
 
-    
+
 /** @}
  ** @name Diagnostics and Repair
  ** @{
  */
 
-    
+
 /** 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
@@ -478,8 +478,8 @@ TIDY_EXPORT void TIDY_CALL        tidyGeneralInfo( TidyDoc tdoc );
  ** @name Configuration, File, and Encoding Operations
  ** @{
  */
-    
-    
+
+
 /** Load an ASCII Tidy configuration file and set the configuration per its
  ** contents. Reports config option errors, which can be filtered.
  ** @result Returns 0 upon success, or any other value if there was an option error.
@@ -510,7 +510,7 @@ TIDY_EXPORT Bool TIDY_CALL        tidyFileExists(TidyDoc tdoc,     /**< The Tidy
  ** include `ascii`, `latin1`, `raw`, `utf8`, `iso2022`, `mac`, `win1252`,
  ** `utf16le`, `utf16be`, `utf16`, `big5`, and `shiftjis`. These values are not
  ** case sensitive.
- ** @note This is the same as using TidySetInCharEncoding() and 
+ ** @note This is the same as using TidySetInCharEncoding() and
  **       TidySetOutCharEncoding() to set the same value.
  ** @result Returns 0 upon success, or a system standard error number `EINVAL`.
  */
@@ -518,7 +518,7 @@ TIDY_EXPORT int TIDY_CALL         tidySetCharEncoding(TidyDoc tdoc,  /**< The Ti
                                                       ctmbstr encnam /**< The encoding name as described above. */
                                                       );
 
-/** Set the input encoding for parsing markup.  Valid values include `ascii`, 
+/** Set the input encoding for parsing markup.  Valid values include `ascii`,
  ** `latin1`, `raw`, `utf8`, `iso2022`, `mac`, `win1252`, `utf16le`, `utf16be`,
  ** `utf16`, `big5`, and `shiftjis`. These values are not case sensitive.
  ** @result Returns 0 upon success, or a system standard error number `EINVAL`.
@@ -606,7 +606,7 @@ TIDY_EXPORT Bool TIDY_CALL          tidySetConfigCallback(TidyDoc tdoc,
                                                           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.
@@ -735,20 +735,20 @@ TIDY_EXPORT Bool TIDY_CALL          tidyOptIsReadOnly( TidyOption opt );
  */
 TIDY_EXPORT TidyConfigCategory TIDY_CALL tidyOptGetCategory( TidyOption opt );
 
-/** Get default value of given Option as a string 
+/** Get default value of given Option as a string
  ** @param opt An instance of a TidyOption to query.
  ** @result A string indicating the default value of the specified option.
  */
 TIDY_EXPORT ctmbstr TIDY_CALL       tidyOptGetDefault( TidyOption opt );
 
-/** Get default value of given Option as an unsigned integer 
+/** Get default value of given Option as an unsigned integer
  ** @param opt An instance of a TidyOption to query.
  ** @result An unsigned integer indicating the default value of the specified
  **         option.
  */
 TIDY_EXPORT ulong TIDY_CALL         tidyOptGetDefaultInt( TidyOption opt );
 
-/** Get default value of given Option as a Boolean value 
+/** Get default value of given Option as a Boolean value
  ** @param opt An instance of a TidyOption to query.
  ** @result A boolean indicating the default value of the specified option.
  */
@@ -757,7 +757,7 @@ TIDY_EXPORT Bool TIDY_CALL          tidyOptGetDefaultBool( TidyOption opt );
 /** Initiates an iterator for a list of TidyOption pick-list values, which
  ** allows you iterate through all of the available option values. In order to
  ** iterate through the available values, initiate the iterator with this
- ** function, and then use tidyOptGetNextPick() to retrieve the first and 
+ ** function, and then use tidyOptGetNextPick() to retrieve the first and
  ** subsequent option values. For example:
  ** @code{.c}
  **   TidyIterator itOpt = tidyOptGetPickList( opt );
@@ -868,7 +868,7 @@ TIDY_EXPORT Bool TIDY_CALL          tidyOptSnapshot( TidyDoc tdoc );
  */
 TIDY_EXPORT Bool TIDY_CALL          tidyOptResetToSnapshot( TidyDoc tdoc );
 
-/** Any settings different than default? 
+/** Any settings different than default?
  ** @param tdoc The tidy document to check.
  ** @result Returns a bool indicating whether or not a difference exists.
  */
@@ -909,7 +909,7 @@ TIDY_EXPORT ctmbstr TIDY_CALL       tidyOptGetCurrPick(TidyDoc tdoc,      /**< T
 
 /** 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**. This iterator allows you to iterate through all of the custom tags. 
+ ** **no**. This iterator allows you to iterate through all of the custom tags.
  ** In order to iterate through the tags, initiate the iterator with this
  ** function, and then use tidyOptGetNextDeclTag() to retrieve the first and
  ** subsequent tags. For example:
@@ -927,8 +927,8 @@ TIDY_EXPORT TidyIterator TIDY_CALL  tidyOptGetDeclTagList( TidyDoc tdoc );
 
 /** Given a valid TidyIterator initiated with tidyOptGetDeclTagList(), returns a
  ** string representing a user-declared or autonomous custom tag.
- ** @remark Specifying optId limits the scope of the tags to one of 
- **         @ref TidyInlineTags, @ref TidyBlockTags, @ref TidyEmptyTags, or 
+ ** @remark Specifying optId limits the scope of the tags to one of
+ **         @ref TidyInlineTags, @ref TidyBlockTags, @ref TidyEmptyTags, or
  **         @ref TidyPreTags. Note that autonomous custom tags (if used) are
  **         added to one of these option types, depending on the value of
  **         @ref TidyUseCustomTags.
@@ -1036,10 +1036,10 @@ TIDY_EXPORT TidyOption TIDY_CALL    tidyOptGetNextDocLinks(TidyDoc tdoc,     /**
 /***************************************************************************//**
  ** @defgroup IO I/O and Messages
  **
- ** Tidy provides flexible I/O. By default, Tidy will define, create and use 
+ ** Tidy provides flexible I/O. By default, Tidy will define, create and use
  ** instances of input and output handlers for standard C buffered I/O (i.e.,
  ** `FILE* stdin`, `FILE* stdout`, and `FILE* stderr` for content input,
- ** content output and diagnostic output, respectively. A `FILE* cfgFile` 
+ ** content output and diagnostic output, respectively. A `FILE* cfgFile`
  ** input handler will be used for config files. Command line options will
  ** just be set directly.
  **
@@ -1047,7 +1047,7 @@ TIDY_EXPORT TidyOption TIDY_CALL    tidyOptGetNextDocLinks(TidyDoc tdoc,     /**
  ******************************************************************************/
 
 /** @name Forward declarations and typedefs.
- ** @{ 
+ ** @{
  */
 
 TIDY_STRUCT struct _TidyBuffer;
@@ -1132,7 +1132,7 @@ typedef struct _TidyOutputSink
   TidyPutByteFunc     putByte;   /**< Pointer to "put byte" callback */
 } TidyOutputSink;
 
-/** Facilitates user defined sinks by providing an entry point to marshal 
+/** Facilitates user defined sinks by providing an entry point to marshal
  ** pointers-to-functions. This is needed by .NET, and possibly other language
  ** bindings.
  ** @result Returns a bool indicating success or failure.
@@ -1169,21 +1169,21 @@ TIDY_EXPORT void TIDY_CALL tidySetEmacsFile(TidyDoc tdoc,    /**< The tidy docum
  ** @result Returns a string indicating the file path.
  */
 TIDY_EXPORT ctmbstr TIDY_CALL tidyGetEmacsFile( TidyDoc tdoc );
-    
+
 /** @}
  ** @name Error Sink
  ** Send Tidy's output to any of several destinations with these functions.
  ** @{
  */
 
-/** Set error sink to named file. 
+/** Set error sink to named file.
  ** @result Returns a file handle.
  */
 TIDY_EXPORT FILE* TIDY_CALL tidySetErrorFile(TidyDoc tdoc,     /**< The document to set. */
                                              ctmbstr errfilnam /**< The file path to send output. */
                                              );
 
-/** Set error sink to given buffer. 
+/** Set error sink to given buffer.
  ** @result Returns 0 upon success or a standard error number.
  */
 TIDY_EXPORT int TIDY_CALL tidySetErrorBuffer(TidyDoc tdoc,      /**< The document to set. */
@@ -1291,7 +1291,7 @@ TIDY_EXPORT Bool TIDY_CALL tidySetMessageCallback(TidyDoc tdoc,
                                                   );
 
 /** @name TidyMessageCallback API
- ** When using `TidyMessageCallback` you will be supplied with a TidyMessage 
+ ** When using `TidyMessageCallback` you will be supplied with a TidyMessage
  ** object, which is used as a token to be interrogated with the following
  ** API before the callback returns.
  ** @remark Upon returning from the callback, this object is destroyed so do
@@ -1300,7 +1300,7 @@ TIDY_EXPORT Bool TIDY_CALL tidySetMessageCallback(TidyDoc tdoc,
  ** @{
  */
 
-/** Get the tidy document this message comes from. 
+/** Get the tidy document this message comes from.
  ** @param tmessage Specify the message that you are querying.
  ** @result Returns the TidyDoc that generated the message.
  */
@@ -1520,7 +1520,7 @@ TIDY_EXPORT double TIDY_CALL tidyGetArgValueDouble(TidyMessage tmessage,    /**<
  ** document ended up in the output.
  ** @{
  */
-    
+
 /** This typedef represents the required signature for your provided callback
  ** function should you wish to register one with tidySetMessageCallback().
  ** Your callback function will be provided with the following parameters.
@@ -1612,7 +1612,7 @@ TIDY_EXPORT int TIDY_CALL         tidyParseSource(TidyDoc tdoc,           /**< T
  */
 TIDY_EXPORT int TIDY_CALL         tidyCleanAndRepair( TidyDoc tdoc );
 
-/** Reports the document type and diagnostic statistics on parsed and repaired 
+/** 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.
@@ -1699,14 +1699,14 @@ TIDY_EXPORT int TIDY_CALL         tidyOptSaveSink(TidyDoc tdoc,        /**< The
  ** @defgroup Tree Document Tree
  **
  ** A parsed (and optionally repaired) document is represented by Tidy as a
- ** tree, much like a W3C DOM. This tree may be traversed using these 
+ ** tree, much like a W3C DOM. This tree may be traversed using these
  ** functions. The following snippet gives a basic idea how these functions
  ** can be used.
  **
  ** @code{.c}
  ** void dumpNode( TidyNode tnod, int indent ) {
  **   TidyNode child;
- ** 
+ **
  **   for ( child = tidyGetChild(tnod); child; child = tidyGetNext(child) ) {
  **     ctmbstr name;
  **     switch ( tidyNodeGetType(child) ) {
@@ -1721,7 +1721,7 @@ TIDY_EXPORT int TIDY_CALL         tidyOptSaveSink(TidyDoc tdoc,        /**< The
  **     case TidyNode_Jste:       name = "JSTE";                    break;
  **     case TidyNode_Php:        name = "PHP";                     break;
  **     case TidyNode_XmlDecl:    name = "XML Declaration";         break;
- ** 
+ **
  **     case TidyNode_Start:
  **     case TidyNode_End:
  **     case TidyNode_StartEnd:
@@ -1734,11 +1734,11 @@ TIDY_EXPORT int TIDY_CALL         tidyOptSaveSink(TidyDoc tdoc,        /**< The
  **     dumpNode( child, indent + 4 );
  **   }
  ** }
- ** 
+ **
  ** void dumpDoc( TidyDoc tdoc ) {
  **   dumpNode( tidyGetRoot(tdoc), 0 );
  ** }
- ** 
+ **
  ** void dumpBody( TidyDoc tdoc ) {
  **   dumpNode( tidyGetBody(tdoc), 0 );
  ** }
@@ -2062,7 +2062,7 @@ TIDY_EXPORT ctmbstr TIDY_CALL tidyGetLanguage(void);
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 opaque_type(tidyLocaleMapItem);
 #endif
-    
+
 /** Initiates an iterator for a list of Tidy's Windows<->POSIX locale mappings.
  ** This iterator allows you to iterate through this list. In order to
  ** iterate through the list, initiate the iterator with this function, and then
diff --git a/include/tidybuffio.h b/include/tidybuffio.h
index 1c1b017df..2a79c5926 100644
--- a/include/tidybuffio.h
+++ b/include/tidybuffio.h
@@ -33,7 +33,7 @@ extern "C" {
  ** @ingroup IO
  */
 TIDY_STRUCT
-struct _TidyBuffer 
+struct _TidyBuffer
 {
     TidyAllocator* allocator;  /**< Memory allocator */
     byte* bp;                  /**< Pointer to bytes */
@@ -58,7 +58,7 @@ TIDY_EXPORT void TIDY_CALL tidyBufAllocWithAllocator( TidyBuffer* buf,
                                                       TidyAllocator* allocator,
                                                       uint allocSize );
 
-/** Expand buffer to given size. 
+/** Expand buffer to given size.
 **  Chunk size is minimum growth. Pass 0 for default of 256 bytes.
 */
 TIDY_EXPORT void TIDY_CALL tidyBufCheckAlloc( TidyBuffer* buf,
diff --git a/include/tidyenum.h b/include/tidyenum.h
index 01430f741..f97eab1b1 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -123,7 +123,7 @@ extern "C" {
 /** inline */                                      FN(TIDYCUSTOMINLINE_STRING)     \
 /** 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.
@@ -285,7 +285,7 @@ extern "C" {
     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.
  */
@@ -533,7 +533,7 @@ extern "C" {
 
 /** @addtogroup public_enumerations
  ** @{ */
-    
+
 /** @name Configuration Options Enumerations
  **
  ** These enumerators are used to define available configuration options and
@@ -557,7 +557,7 @@ extern "C" {
 typedef enum
 {
     TidyUnknownOption = 0,       /**< Unknown option! */
-    
+
     TidyAccessibilityCheckLevel, /**< Accessibility check level */
     TidyAltText,                 /**< Default text for alt attribute */
     TidyAnchorAsName,            /**< Define anchors as name attributes */
@@ -734,7 +734,7 @@ typedef enum
 } TidyUseCustomTagsState;
 
 
-/** TidyNewline option values to control output line endings. 
+/** TidyNewline option values to control output line endings.
  ** @remark This enum's starting value is guaranteed to remain stable.
  */
 typedef enum
@@ -744,7 +744,7 @@ typedef enum
     TidyCR          /**< Use Macintosh style: CR */
 } TidyLineEnding;
 
-    
+
 /** TidyEncodingOptions option values specify the input and/or output encoding.
  ** @remark This enum's starting value is guaranteed to remain stable.
  */
@@ -1170,7 +1170,7 @@ typedef enum
   TidyAttr_XML_LANG,               /**< XML_LANG= */
   TidyAttr_XML_SPACE,              /**< XML_SPACE= */
   TidyAttr_XMLNS,                  /**< XMLNS= */
-     
+
   TidyAttr_EVENT,                  /**< EVENT= */
   TidyAttr_METHODS,                /**< METHODS= */
   TidyAttr_N,                      /**< N= */
@@ -1337,15 +1337,15 @@ typedef enum
   TidyAttr_RESOURCE,               /**< RESOURCE= */
   TidyAttr_TYPEOF,                 /**< TYPEOF= */
   TidyAttr_VOCAB,                  /**< VOCAB= */
-   
+
   TidyAttr_INTEGRITY,              /**< INTEGRITY= */
-   
+
   TidyAttr_AS,                     /**< AS= */
-   
+
   TidyAttr_XMLNSXLINK,             /**< svg xmls:xlink="url" */
   TidyAttr_SLOT,                   /**< SLOT= */
   TidyAttr_LOADING,                /**< LOADING= */
-   
+
   /* SVG paint attributes (SVG 1.1) */
   TidyAttr_FILL,                   /**< FILL= */
   TidyAttr_FILLRULE,               /**< FILLRULE= */
@@ -1365,7 +1365,7 @@ typedef enum
   N_TIDY_ATTRIBS                   /**< Must be last */
 } TidyAttrId;
 
-    
+
 /** @}
  ** @name I/O and Message Handling Interface
  **
@@ -1397,7 +1397,7 @@ typedef enum
     TidyDialogueDoc = TidyDialogueFootnote, /**< Dialogue: Deprecated (renamed) */
 } TidyReportLevel;
 
-    
+
 /** Indicates the data type of a format string parameter used when Tidy
  ** emits reports and dialogue as part of the messaging callback functions.
  ** See `messageobj.h` for more information on this API.
@@ -1415,12 +1415,12 @@ typedef enum
 /** @} */
 /** @} end group public_enumerations*/
 
-    
+
 /* MARK: - Public Enumerations (con't) */
 /** @addtogroup public_enumerations
  ** @{ */
 
-/** @name Messages 
+/** @name Messages
  ** @{ */
 
 /** The enumeration contains a list of every possible string that Tidy and the
diff --git a/include/tidyplatform.h b/include/tidyplatform.h
index 89b6a7700..e529641a4 100644
--- a/include/tidyplatform.h
+++ b/include/tidyplatform.h
@@ -81,7 +81,7 @@ extern "C" {
 #ifndef SUPPORT_LOCALIZATIONS
 #  define SUPPORT_LOCALIZATIONS 1
 #endif
-    
+
 /* Enable/disable support for console */
 #ifndef SUPPORT_CONSOLE_APP
 #  define SUPPORT_CONSOLE_APP 1
@@ -251,7 +251,7 @@ extern "C" {
 #endif
 
 /* === Convenience defines for Solaris platforms === */
- 
+
 #if defined(sun)
 #  define SOLARIS_OS
 #  ifndef PLATFORM_NAME
@@ -473,7 +473,7 @@ extern "C" {
 
 /* 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 automatically set by Win16 compilers.
@@ -637,7 +637,7 @@ typedef char tmbchar;       /* single, possibly partial character */
 /* `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
@@ -649,7 +649,7 @@ typedef enum
    yes
 } Bool;
 
-/* for NULL pointers 
+/* for NULL pointers
 #define null ((const void*)0)
 extern void* null;
 */
diff --git a/localize/README.md b/localize/README.md
index dc4339bbc..74514aebe 100644
--- a/localize/README.md
+++ b/localize/README.md
@@ -41,7 +41,7 @@ the event that you want to build Tidy with your new language.
   - [Update your PO to match the new POT](#update-your-po-to-match-the-new-pot)
 - [Help Tidy Get Better](#help-tidy-get-better)
 
-  
+
 ## Introduction
 
 HTML Tidy is built around the localization file `language_en.h`; without this
@@ -56,7 +56,7 @@ to them.
 
 
 ### PO and POT files
-HTML Tidy provides PO and POT files for language translations. The file 
+HTML Tidy provides PO and POT files for language translations. The file
 `tidy.pot` is the correct template to use as a basis for new translations. In a
 typical `gettext` workflow a translator will use the `tidy.pot` file to create a
 language translation PO file that contains original English strings and the
@@ -121,14 +121,14 @@ In the `localize\translations\` directory you can find existing languages, e.g.,
   - `tidy.pot` (Tidy's POT template for translations).
   - `language_en_gb.po` (British English variants for the built in language)
   - …and perhaps more.
-  
+
 In the `src\` directory you can find the master files for existing languages,
 e.g.,
 
  - `language_en.h` (Tidy's native, built-in language, mostly U.S. English)
  - `language_en_gb.po` (British English variants for the built in language)
  - …and perhaps more.
- 
+
 Although the header files are the master files for HTML Tidy, we understand that
 not all potential translators want to edit C files directly. Therefore as an
 option, the following workflow to use POT and PO files is offered.
@@ -139,7 +139,7 @@ If the language that you want to work on is already present:
   - Note that although you can use a text editor, we recommend that you use a
     dedicated PO editor so that you don't accidentally make the file illegible
     to our conversion utility.
-    
+
 If the language that you want to work on is _not_ already present:
 
   - You can open `tidy.pot` in your favorite PO editor and use its functions
@@ -187,8 +187,8 @@ Tidy, and issue a PR for the whole change.
 
 ### Repository Notes
 
-If you are working with PO files then please **only** commit PO files with 
-_English_ `msgid` fields. The `gettext` convention specifies only English 
+If you are working with PO files then please **only** commit PO files with
+_English_ `msgid` fields. The `gettext` convention specifies only English
 `msgid`, and other translators may not understand the original strings.
 
 Our `poconvert.rb` script can generate PO files using another language as
@@ -226,7 +226,7 @@ translation, or to save one of the developer team a few extra steps.
   - Build Tidy:
     - Build Tidy per the usual instructions, and try it out using the `-lang`
       option.
-    
+
 
 ## Best Practices
 
@@ -419,10 +419,10 @@ exclude strings matching another localization like so:
 ### Prepare your non-English PO for a PR
 
 Although we have provided tools to allow you to work in languages other than
-English, we can only accept PO's in the repository that have English `msgid` 
+English, we can only accept PO's in the repository that have English `msgid`
 fields. It's easy to convert your PO back to English:
 
-`./poconvert msgfmt <language_cc_ll.po>` 
+`./poconvert msgfmt <language_cc_ll.po>`
 
 `./poconvert msgunfmt <language_cc_ll.h>`
 
@@ -437,7 +437,7 @@ If Tidy's POT changes, e.g., new strings are added, new comments, etc., the
 simplest way to update your PO is to convert it to a header (which normalizes
 it to the latest Tidy standard), and then convert the header to a new PO again.
 
-`./poconvert msgfmt <language_cc_ll.po>` 
+`./poconvert msgfmt <language_cc_ll.po>`
 
 `./poconvert msgunfmt <language_cc_ll.h>`
 
diff --git a/localize/language_ll_cc.h.erb b/localize/language_ll_cc.h.erb
index cf5579502..1763f0a96 100644
--- a/localize/language_ll_cc.h.erb
+++ b/localize/language_ll_cc.h.erb
@@ -13,7 +13,7 @@
  *
  * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
  *     language (and maybe region) "<%= po_content.language %>". The source of
- *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     these strings is a gettext PO file in Tidy's source, probably called
  *     "language_<%= po_content.language %>.po".
  *
  * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
@@ -55,7 +55,7 @@ static uint whichPluralForm_<%= po_content.language %>(uint n) {
  */
 static languageDefinition language_<%= po_content.language %> = { whichPluralForm_<%= po_content.language %>, {
     /***************************************
-     ** This MUST be present and first. 
+     ** This MUST be present and first.
      ** Specify the code for this language.
      ***************************************/
 <%= report_body %>
diff --git a/man/.gitignore b/man/.gitignore
index e826225cd..468b072a0 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,5 +1,5 @@
 
-# file created during build_docs 
+# file created during build_docs
 # = tidy5 -h > tidy5.cmd.txt
 examples/tidy5.*.txt
 
diff --git a/man/tidy1.xsl.in b/man/tidy1.xsl.in
index a1d9cfdc4..0333ceeff 100644
--- a/man/tidy1.xsl.in
+++ b/man/tidy1.xsl.in
@@ -54,33 +54,33 @@
 .SH SYNOPSIS
 \fBtidy\fR [\fIoptions\fR] [\fIfile\fR ...] [\fIoptions\fR] [\fIfile\fR ...] ...
 .SH DESCRIPTION
-Tidy reads HTML, XHTML, and XML files and writes cleaned-up markup.  
+Tidy reads HTML, XHTML, and XML files and writes cleaned-up markup.
 For HTML variants, it detects, reports, and corrects many common coding errors
 and strives to produce visually equivalent markup that is both conformant
 to the HTML specifications and that works in most browsers.
 .LP
-A common use of Tidy is to convert plain HTML to XHTML.  
+A common use of Tidy is to convert plain HTML to XHTML.
 For generic XML files, Tidy is limited to correcting basic well-formedness
 errors and pretty printing.
 .LP
-If no input file is specified, Tidy reads the standard input.  
+If no input file is specified, Tidy reads the standard input.
 If no output file is specified, Tidy writes the tidied markup to the
 standard output.  If no error file is specified, Tidy writes messages
 to the standard error.
 .SH OPTIONS
-Tidy supports two different kinds of options.  
+Tidy supports two different kinds of options.
 Purely \fIcommand-line\fR options, starting with a single dash '\fB-\fR',
-can only be used on the command-line, not in configuration files.  
-They are listed in the first part of this section.  
+can only be used on the command-line, not in configuration files.
+They are listed in the first part of this section.
 \fIConfiguration\fR options, on the other hand, can either be passed
 on the command line, starting with two dashes \fB--\fR,
 or specified in a configuration file,
-using the option name, followed by a colon \fB:\fR, plus the value, without 
+using the option name, followed by a colon \fB:\fR, plus the value, without
 the starting dashes. They are listed in the second part of this section,
 with a sample config file.
 .LP
 For \fIcommand-line\fR options that expect a numerical argument,
-a default is assumed if no meaningful value can be found.  
+a default is assumed if no meaningful value can be found.
 On the other hand, \fIconfiguration\fR options cannot be used
 without a value; a \fIconfiguration\fR option without a value
 is simply discarded and reported as an error.
@@ -111,7 +111,7 @@ and telling tidy to read that file with the \fB-config\fR option:
 \fBtidy -config \fIconfig-file \fR ...
 .LP
 \fIConfiguration\fR options can be conveniently grouped
-in a single config file.  
+in a single config file.
 A Tidy configuration file is simply a text file, where each option
 is listed on a separate line in the form
 .LP
@@ -122,13 +122,13 @@ is listed on a separate line in the form
 .br
 etc.
 .LP
-The permissible values for a given option depend on the option's Type.  
+The permissible values for a given option depend on the option's Type.
 There are five Types: \fIBoolean\fR, \fIAutoBool\fR, \fIDocType\fR,
-\fIEnum\fR, and \fIString\fR.  
-\fIBoolean\fR Types allow any of \fByes/no, y/n, true/false, t/f, 1/0\fR.  
+\fIEnum\fR, and \fIString\fR.
+\fIBoolean\fR Types allow any of \fByes/no, y/n, true/false, t/f, 1/0\fR.
 \fIAutoBool\fRs allow \fBauto\fR in addition to the values allowed
-by \fIBooleans\fR.  
-\fIInteger\fR Types take non-negative integers.  
+by \fIBooleans\fR.
+\fIInteger\fR Types take non-negative integers.
 \fIString\fR Types generally have no defaults, and you should provide them in
 non-quoted form (unless you wish the output to contain the literal quotes).
 .LP
@@ -153,14 +153,14 @@ the five Types:
     error-file: errs.txt
 \fR
 .LP
-Below is a summary and brief description of each of the options.  
+Below is a summary and brief description of each of the options.
 They are listed alphabetically within each category.<xsl:text/>
 <xsl:call-template name="show-config-options" />
 .SH ENVIRONMENT
 .TP
 .B HTML_TIDY
 Name of the default configuration file.  This should be an absolute path,
-since you will probably invoke \fBtidy\fR from different directories.  
+since you will probably invoke \fBtidy\fR from different directories.
 The value of HTML_TIDY will be parsed after the compiled-in default
 (defined with -DTIDY_CONFIG_FILE), but before any of the files specified
 using \fB-config\fR.
diff --git a/src/access.c b/src/access.c
index 55bfde61b..cbf6f46a3 100644
--- a/src/access.c
+++ b/src/access.c
@@ -3,7 +3,7 @@
   Copyright University of Toronto
   Portions (c) 1998-2009 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
-  
+
 */
 
 
@@ -15,7 +15,7 @@
 #include "tmbstr.h"
 
 
-/* 
+/*
     The accessibility checks to perform depending on user's desire.
 
     1. priority 1
@@ -34,7 +34,7 @@ static const ctmbstr imageExtensions[] =
 static const ctmbstr soundExtensions[] =
 {".wav", ".au", ".aiff", ".snd", ".ra", ".rm"};
 
-static const int soundExtErrCodes[] = 
+static const int soundExtErrCodes[] =
 {
     AUDIO_MISSING_TEXT_WAV,
     AUDIO_MISSING_TEXT_AU,
@@ -47,7 +47,7 @@ static const int soundExtErrCodes[] =
 #define N_AUDIO_EXTS (sizeof(soundExtensions)/sizeof(ctmbstr))
 
 /* List of possible media extensions */
-static const ctmbstr mediaExtensions[] = 
+static const ctmbstr mediaExtensions[] =
 {".mpg", ".mov", ".asx", ".avi", ".ivf", ".m1v", ".mmm", ".mp2v",
  ".mpa", ".mpe", ".mpeg", ".ram", ".smi", ".smil", ".swf",
  ".wm", ".wma", ".wmv"};
@@ -75,7 +75,7 @@ static const int colorValues[][3] =
   {  0,128,  0},
   {  0,255,  0},
   {128,128,  0},
-  {255,255,  0},  
+  {255,255,  0},
   {  0,  0,128},
   {  0,  0,255},
   {  0,128,128},
@@ -98,7 +98,7 @@ static const ctmbstr colorNames[] =
   "green",
   "lime",
   "olive",
-  "yellow", 
+  "yellow",
   "navy",
   "blue",
   "teal",
@@ -160,13 +160,13 @@ static Bool IsFilePath( ctmbstr path )
                 else
                     state = file_found;
                 break;
-                
+
             default:
                 break;
         }
-        
+
     }
-    
+
     return state == file_found || state == initial;
 }
 
@@ -179,9 +179,9 @@ static Bool IsFilePath( ctmbstr path )
 static void GetFileExtension( ctmbstr path, tmbchar *ext, uint maxExt )
 {
     int i = TY_(tmbstrlen)(path) - 1;
-    
+
     ext[0] = '\0';
-    
+
     do {
         if ( path[i] == '/' || path[i] == '\\' )
             break;
@@ -215,7 +215,7 @@ static Bool IsImage( ctmbstr iType )
         if ( TY_(tmbstrcasecmp)(ext, imageExtensions[i]) == 0 )
             return yes;
     }
-    
+
     return no;
 }
 
@@ -233,9 +233,9 @@ static int IsSoundFile( ctmbstr sType )
     tmbchar ext[ 20 ];
 
     if ( !IsFilePath(sType) ) return 0;
-    
+
     GetFileExtension( sType, ext, sizeof(ext) );
-    
+
     for (i = 0; i < N_AUDIO_EXTS; i++)
     {
         if ( TY_(tmbstrcasecmp)(ext, soundExtensions[i]) == 0 )
@@ -249,7 +249,7 @@ static int IsSoundFile( ctmbstr sType )
 * IsValidSrcExtension
 *
 * Checks if the 'SRC' value within the FRAME element is valid
-* The 'SRC' extension must end in ".htm", ".html", ".shtm", ".shtml", 
+* The 'SRC' extension must end in ".htm", ".html", ".shtm", ".shtml",
 * ".cfm", ".cfml", ".asp", ".cgi", ".pl", or ".smil"
 *
 * Returns yes if it is, returns no otherwise.
@@ -259,9 +259,9 @@ static Bool IsValidSrcExtension( ctmbstr sType )
 {
     uint i;
     tmbchar ext[20];
-    
+
     if ( !IsFilePath(sType) ) return 0;
-    
+
     GetFileExtension( sType, ext, sizeof(ext) );
 
     for (i = 0; i < N_FRAME_EXTS; i++)
@@ -276,7 +276,7 @@ static Bool IsValidSrcExtension( ctmbstr sType )
 /*********************************************************************
 * IsValidMediaExtension
 *
-* Checks to warn the user that syncronized text equivalents are 
+* Checks to warn the user that syncronized text equivalents are
 * required if multimedia is used.
 *********************************************************************/
 
@@ -324,7 +324,7 @@ static Bool hasValue( AttVal* av )
 
 /***********************************************************************
 * IsPlaceholderAlt
-*  
+*
 * Checks to see if there is an image and photo place holder contained
 * in the ALT text.
 *
@@ -333,14 +333,14 @@ static Bool hasValue( AttVal* av )
 
 static Bool IsPlaceholderAlt( ctmbstr txt )
 {
-    return ( strstr(txt, "image") != NULL || 
+    return ( strstr(txt, "image") != NULL ||
              strstr(txt, "photo") != NULL );
 }
 
 
 /***********************************************************************
 * IsPlaceholderTitle
-*  
+*
 * Checks to see if there is an TITLE place holder contained
 * in the 'ALT' text.
 *
@@ -355,7 +355,7 @@ static Bool IsPlaceHolderTitle( ctmbstr txt )
 
 /***********************************************************************
 * IsPlaceHolderObject
-*  
+*
 * Checks to see if there is an OBJECT place holder contained
 * in the 'ALT' text.
 *
@@ -394,7 +394,7 @@ static ctmbstr textFromOneNode( TidyDocImpl* doc, Node* node )
     uint i;
     uint x = 0;
     tmbstr txt = doc->access.text;
-    
+
     if ( node )
     {
         /* Copy contents of a text node */
@@ -417,17 +417,17 @@ static ctmbstr textFromOneNode( TidyDocImpl* doc, Node* node )
 * getTextNode
 *
 * Locates text nodes within a container element.
-* Retrieves text that are found contained within 
+* Retrieves text that are found contained within
 * text nodes, and concatenates the text.
 *********************************************************/
-    
+
 static void getTextNode( TidyDocImpl* doc, Node* node )
 {
-    tmbstr txtnod = doc->access.textNode;       
-    
-    /* 
+    tmbstr txtnod = doc->access.textNode;
+
+    /*
        Continues to traverse through container element until it no
-       longer contains any more contents 
+       longer contains any more contents
     */
 
     /* If the tag of the node is NULL, then grab the text within the node */
@@ -448,7 +448,7 @@ static void getTextNode( TidyDocImpl* doc, Node* node )
         /* Traverses through the contents within a container element */
         for ( node = node->content; node != NULL; node = node->next )
             getTextNode( doc, node );
-    }   
+    }
 }
 
 
@@ -494,7 +494,7 @@ static Bool Level3_Enabled( TidyDocImpl* doc )
 /********************************************************
 * CheckColorAvailable
 *
-* Verify that information conveyed with color is 
+* Verify that information conveyed with color is
 * available without color.
 ********************************************************/
 
@@ -528,7 +528,7 @@ static void CheckColorAvailable( TidyDocImpl* doc, Node* node )
 * This logic is extremely fragile as it does not recognize
 * the fact that color is inherited by many components and
 * that BG and FG colors are often set separately.  E.g. the
-* background color may be set by for the body or a table 
+* background color may be set by for the body or a table
 * or a cell.  The foreground color may be set by any text
 * element (p, h1, h2, input, textarea), either explicitly
 * or by style.  Ergo, this test will not handle most real
@@ -546,15 +546,15 @@ static void CheckColorContrast( TidyDocImpl* doc, Node* node )
 
         /* Check for 'BGCOLOR' first to compare with other color attributes */
         for ( av = node->attributes; av; av = av->next )
-        {            
+        {
             if ( attrIsBGCOLOR(av) )
             {
                 if ( hasValue(av) )
                     gotBG = GetRgb( av->value, rgbBG );
             }
         }
-        
-        /* 
+
+        /*
            Search for COLOR attributes to compare with background color
            Must have valid colour contrast
         */
@@ -618,7 +618,7 @@ static Bool CompareColors( const int rgbBG[3], const int rgbFG[3] )
 /*********************************************************************
 * GetRgb
 *
-* Gets the red, green and blue values for this attribute for the 
+* Gets the red, green and blue values for this attribute for the
 * background.
 *
 * Example: If attribute is BGCOLOR="#121005" then red = 18, green = 16,
@@ -642,10 +642,10 @@ static Bool GetRgb( ctmbstr color, int rgb[] )
     }
 
     /*
-       No color name so must be hex values 
+       No color name so must be hex values
        Is this a number in hexadecimal format?
     */
-    
+
     /* Must be 7 characters in the RGB value (including '#') */
     if ( TY_(tmbstrlen)(color) == 7 && color[0] == '#' )
     {
@@ -655,7 +655,7 @@ static Bool GetRgb( ctmbstr color, int rgb[] )
         return yes;
     }
     return no;
-} 
+}
 
 
 
@@ -693,7 +693,7 @@ static int ctox( tmbchar ch )
 * Checks all image attributes for specific elements to
 * check for validity of the values contained within
 * the attributes.  An appropriate warning message is displayed
-* to indicate the error.  
+* to indicate the error.
 ***********************************************************/
 
 static void CheckImage( TidyDocImpl* doc, Node* node )
@@ -704,24 +704,24 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
     Bool HasDLINK = no;
     Bool HasValidHeight = no;
     Bool HasValidWidthBullet = no;
-    Bool HasValidWidthHR = no; 
+    Bool HasValidWidthHR = no;
     Bool HasTriggeredMissingLongDesc = no;
 
     AttVal* av;
-                
+
     if (Level1_Enabled( doc ))
     {
         /* Checks all image attributes for invalid values within attributes */
         for (av = node->attributes; av != NULL; av = av->next)
         {
-            /* 
+            /*
                Checks for valid ALT attribute.
-               The length of the alt text must be less than 150 characters 
+               The length of the alt text must be less than 150 characters
                long.
             */
             if ( attrIsALT(av) )
             {
-                if (av->value != NULL) 
+                if (av->value != NULL)
                 {
                     if ((TY_(tmbstrlen)(av->value) < 150) &&
                         (IsPlaceholderAlt (av->value) == no) &&
@@ -743,7 +743,7 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                         HasAlt = yes;
                         TY_(ReportAccessError)( doc, node, IMG_ALT_SUSPICIOUS_FILENAME);
                     }
-            
+
                     else if (IsPlaceholderAlt (av->value) == yes)
                     {
                         HasAlt = yes;
@@ -758,7 +758,7 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                 }
             }
 
-            /* 
+            /*
                Checks for width values of 'bullets' and 'horizontal
                rules' for validity.
 
@@ -779,11 +779,11 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                 }
             }
 
-            /* 
+            /*
                Checks for height values of 'bullets' and horizontal
                rules for validity.
 
-               Valid pixel height for 'bullets' and horizontal rules 
+               Valid pixel height for 'bullets' and horizontal rules
                mustt be < 30.
             */
             else if ( attrIsHEIGHT(av) )
@@ -793,8 +793,8 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                     HasValidHeight = yes;
             }
 
-            /* 
-               Checks for longdesc and determines validity.  
+            /*
+               Checks for longdesc and determines validity.
                The length of the 'longdesc' must be > 1
             */
             else if ( attrIsLONGDESC(av) )
@@ -803,7 +803,7 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                     HasLongDesc = yes;
               }
 
-            /* 
+            /*
                Checks for 'USEMAP' attribute.  Ensures that
                text links are provided for client-side image maps
             */
@@ -811,35 +811,35 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
             {
                 if ( hasValue(av) )
                     doc->access.HasUseMap = yes;
-            }    
+            }
 
             else if ( attrIsISMAP(av) )
             {
                 HasIsMap = yes;
             }
-        }    
-        
-        
-        /* 
+        }
+
+
+        /*
             Check to see if a dLINK is present.  The ANCHOR element must
-            be present following the IMG element.  The text found between 
+            be present following the IMG element.  The text found between
             the ANCHOR tags must be < 6 characters long, and must contain
             the letter 'd'.
         */
         if ( nodeIsA(node->next) )
         {
             node = node->next;
-            
-            /* 
+
+            /*
                 Node following the anchor must be a text node
-                for dLINK to exist 
+                for dLINK to exist
             */
 
             if (node->content != NULL && (node->content)->tag == NULL)
             {
                 /* Number of characters found within the text node */
                 ctmbstr word = textFromOneNode( doc, node->content);
-                    
+
                 if ((TY_(tmbstrcmp)(word,"d") == 0)||
                     (TY_(tmbstrcmp)(word,"D") == 0))
                 {
@@ -847,13 +847,13 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
                 }
             }
         }
-                    
+
         /*
-            Special case check for dLINK.  This will occur if there is 
-            whitespace between the <img> and <a> elements.  Ignores 
+            Special case check for dLINK.  This will occur if there is
+            whitespace between the <img> and <a> elements.  Ignores
             whitespace and continues check for dLINK.
         */
-        
+
         if ( node->next && !node->next->tag )
         {
             node = node->next;
@@ -862,9 +862,9 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
             {
                 node = node->next;
 
-                /* 
+                /*
                     Node following the ANCHOR must be a text node
-                    for dLINK to exist 
+                    for dLINK to exist
                 */
                 if (node->content != NULL && node->content->tag == NULL)
                 {
@@ -939,9 +939,9 @@ static void CheckImage( TidyDocImpl* doc, Node* node )
 /***********************************************************
 * CheckApplet
 *
-* Checks APPLET element to check for validity pertaining 
-* the 'ALT' attribute.  An appropriate warning message is 
-* displayed  to indicate the error. An appropriate warning 
+* Checks APPLET element to check for validity pertaining
+* the 'ALT' attribute.  An appropriate warning message is
+* displayed  to indicate the error. An appropriate warning
 * message is displayed to indicate the error.  If no 'ALT'
 * text is present, then there must be alternate content
 * within the APPLET element.
@@ -953,7 +953,7 @@ static void CheckApplet( TidyDocImpl* doc, Node* node )
     Bool HasDescription = no;
 
     AttVal* av;
-        
+
     if (Level1_Enabled( doc ))
     {
         /* Checks for attributes within the APPLET element */
@@ -977,7 +977,7 @@ static void CheckApplet( TidyDocImpl* doc, Node* node )
         if (HasAlt == no)
         {
             /* Must have alternate text representation for that element */
-            if (node->content != NULL) 
+            if (node->content != NULL)
             {
                 ctmbstr word = NULL;
 
@@ -989,7 +989,7 @@ static void CheckApplet( TidyDocImpl* doc, Node* node )
                 {
                     word = textFromOneNode( doc, node->content->content);
                 }
-                
+
                 if ( word != NULL && !IsWhitespace(word) )
                     HasDescription = yes;
             }
@@ -1007,8 +1007,8 @@ static void CheckApplet( TidyDocImpl* doc, Node* node )
 * CheckObject
 *
 * Checks to verify whether the OBJECT element contains
-* 'ALT' text, and to see that the sound file selected is 
-* of a valid sound file type.  OBJECT must have an alternate text 
+* 'ALT' text, and to see that the sound file selected is
+* of a valid sound file type.  OBJECT must have an alternate text
 * representation.
 *******************************************************************/
 
@@ -1049,7 +1049,7 @@ static void CheckObject( TidyDocImpl* doc, Node* node )
                 {
                     word = textFromOneNode( doc, node->content->content );
                 }
-                    
+
                 if ( word != NULL && !IsWhitespace(word) )
                     HasDescription = yes;
             }
@@ -1109,9 +1109,9 @@ static Bool CheckMissingStyleSheets( TidyDocImpl* doc, Node* node )
 * CheckFrame
 *
 * Checks if the URL is valid and to check if a 'LONGDESC' is needed
-* within the FRAME element.  If a 'LONGDESC' is needed, the value must 
-* be valid. The URL must end with the file extension, htm, or html. 
-* Also, checks to ensure that the 'SRC' and 'TITLE' values are valid. 
+* within the FRAME element.  If a 'LONGDESC' is needed, the value must
+* be valid. The URL must end with the file extension, htm, or html.
+* Also, checks to ensure that the 'SRC' and 'TITLE' values are valid.
 *******************************************************************/
 
 static void CheckFrame( TidyDocImpl* doc, Node* node )
@@ -1209,7 +1209,7 @@ static void CheckIFrame( TidyDocImpl* doc, Node* node )
 * CheckAnchorAccess
 *
 * Checks that the sound file is valid, and to ensure that
-* text transcript is present describing the 'HREF' within the 
+* text transcript is present describing the 'HREF' within the
 * ANCHOR element.  Also checks to see ensure that the 'TARGET' attribute
 * (if it exists) is not NULL and does not contain '_new' or '_blank'.
 **********************************************************************/
@@ -1238,9 +1238,9 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
                     {
                         TY_(ReportAccessError)( doc, node, MULTIMEDIA_REQUIRES_TEXT );
                     }
-            
-                    /* 
-                        Checks for validity of sound file, and checks to see if 
+
+                    /*
+                        Checks for validity of sound file, and checks to see if
                         the file is described within the document, or by a link
                         that is present which gives the description.
                     */
@@ -1254,7 +1254,7 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
                                 if (node->next->tag == NULL)
                                 {
                                     ctmbstr word = textFromOneNode( doc, node->next);
-                                
+
                                     /* Must contain at least one letter in the text */
                                     if (IsWhitespace (word) == no)
                                     {
@@ -1290,7 +1290,7 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
             }
         }
     }
-    
+
     if (Level2_Enabled( doc ))
     {
         if ((node->content != NULL)&&
@@ -1326,7 +1326,7 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
 
             }
         }
-        
+
         if (node->content == NULL)
         {
             TY_(ReportAccessError)( doc, node, LINK_TEXT_MISSING);
@@ -1338,10 +1338,10 @@ static void CheckAnchorAccess( TidyDocImpl* doc, Node* node )
 /************************************************************
 * CheckArea
 *
-* Checks attributes within the AREA element to 
+* Checks attributes within the AREA element to
 * determine if the 'ALT' text and 'HREF' values are valid.
 * Also checks to see ensure that the 'TARGET' attribute
-* (if it exists) is not NULL and does not contain '_new' 
+* (if it exists) is not NULL and does not contain '_new'
 * or '_blank'.
 ************************************************************/
 
@@ -1360,11 +1360,11 @@ static void CheckArea( TidyDocImpl* doc, Node* node )
               The length of the alt text must be > 4 characters long
               but must be less than 150 characters long.
             */
-                
+
             if ( attrIsALT(av) )
             {
                 /* The check for validity */
-                if (av->value != NULL) 
+                if (av->value != NULL)
                 {
                     HasAlt = yes;
                 }
@@ -1393,7 +1393,7 @@ static void CheckArea( TidyDocImpl* doc, Node* node )
         if (HasAlt == no)
         {
             TY_(ReportAccessError)( doc, node, AREA_MISSING_ALT);
-        }    
+        }
     }
 }
 
@@ -1402,7 +1402,7 @@ static void CheckArea( TidyDocImpl* doc, Node* node )
 * CheckScript
 *
 * Checks the SCRIPT element to ensure that a
-* NOSCRIPT section follows the SCRIPT.  
+* NOSCRIPT section follows the SCRIPT.
 ***************************************************/
 
 static void CheckScriptAcc( TidyDocImpl* doc, Node* node )
@@ -1422,14 +1422,14 @@ static void CheckScriptAcc( TidyDocImpl* doc, Node* node )
 * CheckRows
 *
 * Check to see that each table has a row of headers if
-* a column of columns doesn't exist. 
+* a column of columns doesn't exist.
 **********************************************************/
 
 static void CheckRows( TidyDocImpl* doc, Node* node )
 {
     int numTR = 0;
     int numValidTH = 0;
-    
+
     doc->access.CheckedHeaders++;
 
     for (; node != NULL; node = node->next )
@@ -1437,7 +1437,7 @@ static void CheckRows( TidyDocImpl* doc, Node* node )
         numTR++;
         if ( nodeIsTH(node->content) )
         {
-            doc->access.HasTH = yes;            
+            doc->access.HasTH = yes;
             if ( TY_(nodeIsText)(node->content->content) )
             {
                 ctmbstr word = textFromOneNode( doc, node->content->content);
@@ -1462,7 +1462,7 @@ static void CheckRows( TidyDocImpl* doc, Node* node )
 * CheckColumns
 *
 * Check to see that each table has a column of headers if
-* a row of columns doesn't exist.  
+* a row of columns doesn't exist.
 **********************************************************/
 
 static void CheckColumns( TidyDocImpl* doc, Node* node )
@@ -1508,7 +1508,7 @@ static void CheckColumns( TidyDocImpl* doc, Node* node )
 * CheckTH
 *
 * Checks to see if the header provided for a table
-* requires an abbreviation. (only required if the 
+* requires an abbreviation. (only required if the
 * length of the header is greater than 15 characters)
 *****************************************************/
 
@@ -1538,7 +1538,7 @@ static void CheckTH( TidyDocImpl* doc, Node* node )
                     HasAbbr = yes;
                     TY_(ReportAccessError)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_NULL);
                 }
-                
+
                 if ((IsWhitespace (av->value) == yes)&&
                     (TY_(tmbstrlen)(av->value) > 0))
                 {
@@ -1570,7 +1570,7 @@ static void CheckTH( TidyDocImpl* doc, Node* node )
 *
 * Layout tables should make sense when linearized.
 * TABLE must contain at least one TH element.
-* This technique applies only to tables used for layout purposes, 
+* This technique applies only to tables used for layout purposes,
 * not to data tables. Checks for column of multiple headers.
 *****************************************************************/
 
@@ -1578,7 +1578,7 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node )
 {
     Node* TNode;
     Node* temp;
-    
+
     Bool validColSpanRows = yes;
     Bool validColSpanColumns = yes;
 
@@ -1590,9 +1590,9 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node )
         {
             TNode = node->content;
 
-            /* 
-               Checks for column of multiple headers found 
-               within a data table. 
+            /*
+               Checks for column of multiple headers found
+               within a data table.
             */
             while (TNode != NULL)
             {
@@ -1608,9 +1608,9 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node )
                         {
                             while (temp != NULL)
                             {
-                                /* 
-                                   Must contain at least one TH element 
-                                   within in the TR element 
+                                /*
+                                   Must contain at least one TH element
+                                   within in the TR element
                                 */
                                 if ( nodeIsTH(temp) )
                                 {
@@ -1628,13 +1628,13 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node )
                                 }
 
                                 temp = temp->next;
-                            }    
+                            }
 
                             flag = 1;
                         }
                     }
                 }
-            
+
                 TNode = TNode->next;
             }
 
@@ -1660,7 +1660,7 @@ static void CheckMultiHeaders( TidyDocImpl* doc, Node* node )
 *
 * Checks the TABLE element to ensure that the
 * table is not missing any headers.  Must have either
-* a row or column of headers.  
+* a row or column of headers.
 ****************************************************/
 
 static void CheckTable( TidyDocImpl* doc, Node* node )
@@ -1687,7 +1687,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
                 {
                     HasSummary = yes;
 
-                    if (AttrContains(av, "summary") && 
+                    if (AttrContains(av, "summary") &&
                         AttrContains(av, "table"))
                     {
                         TY_(ReportAccessError)( doc, node, TABLE_SUMMARY_INVALID_PLACEHOLDER );
@@ -1711,7 +1711,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
         if (node->content == NULL)
         {
             TY_(ReportAccessError)( doc, node, DATA_TABLE_MISSING_HEADERS);
-        
+
             return;
         }
     }
@@ -1721,7 +1721,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
         /* Checks for multiple headers */
         CheckMultiHeaders( doc, node );
     }
-    
+
     if (Level2_Enabled( doc ))
     {
         /* Table must have a CAPTION describing the purpose of the table */
@@ -1746,7 +1746,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
         }
     }
 
-    
+
     if (node->content != NULL)
     {
         if ( nodeIsCAPTION(node->content) && nodeIsTR(node->content->next) )
@@ -1758,7 +1758,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
             CheckColumns( doc, node->content );
         }
     }
-    
+
     if ( ! doc->access.HasValidColumnHeaders )
     {
         if (node->content != NULL)
@@ -1773,8 +1773,8 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
             }
         }
     }
-    
-    
+
+
     if (Level3_Enabled( doc ))
     {
         /* Suppress warning for missing 'SUMMARY for HTML 2.0 and HTML 3.2 */
@@ -1805,7 +1805,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
                 TY_(ReportAccessError)( doc, node, LAYOUT_TABLES_LINEARIZE_PROPERLY);
             }
         }
-    
+
         if ( doc->access.HasTH )
         {
             TY_(ReportAccessError)( doc, node, LAYOUT_TABLE_INVALID_MARKUP);
@@ -1824,7 +1824,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
                 TY_(ReportAccessError)( doc, node, DATA_TABLE_MISSING_HEADERS);
             }
 
-            if ( !doc->access.HasValidRowHeaders && 
+            if ( !doc->access.HasValidRowHeaders &&
                  doc->access.HasInvalidRowHeader )
             {
                 TY_(ReportAccessError)( doc, node, DATA_TABLE_MISSING_HEADERS_ROW);
@@ -1842,7 +1842,7 @@ static void CheckTable( TidyDocImpl* doc, Node* node )
 
 /***************************************************
 * CheckASCII
-* 
+*
 * Checks for valid text equivalents for XMP and PRE
 * elements for ASCII art.  Ensures that there is
 * a skip over link to skip multi-lined ASCII art.
@@ -1856,18 +1856,18 @@ static void CheckASCII( TidyDocImpl* doc, Node* node )
     tmbstr skipOver = NULL;
     Bool IsAscii = no;
     int HasSkipOverLink = 0;
-        
+
     uint i, x;
     int newLines = -1;
     tmbchar compareLetter;
     int matchingCount = 0;
     AttVal* av;
-    
+
     if (Level1_Enabled( doc ) && node->content)
     {
-        /* 
-           Checks the text within the PRE and XMP tags to see if ascii 
-           art is present 
+        /*
+           Checks the text within the PRE and XMP tags to see if ascii
+           art is present
         */
         for (i = node->content->start + 1; i < node->content->end; i++)
         {
@@ -1878,7 +1878,7 @@ static void CheckASCII( TidyDocImpl* doc, Node* node )
             {
                 newLines++;
             }
-            
+
             compareLetter = doc->lexer->lexbuf[i];
 
             /* Counts consecutive character matches */
@@ -1902,9 +1902,9 @@ static void CheckASCII( TidyDocImpl* doc, Node* node )
             }
         }
 
-        /* 
-           Must have more than 6 lines of text OR 5 or more consecutive 
-           letters that are the same for there to be ascii art 
+        /*
+           Must have more than 6 lines of text OR 5 or more consecutive
+           letters that are the same for there to be ascii art
         */
         if (newLines >= 6 || matchingCount >= 5)
         {
@@ -1933,7 +1933,7 @@ static void CheckASCII( TidyDocImpl* doc, Node* node )
 
     if (Level2_Enabled( doc ))
     {
-        /* 
+        /*
            Checks for A element following PRE to ensure proper skipover link
            only if there is an A element preceding PRE.
         */
@@ -1942,13 +1942,13 @@ static void CheckASCII( TidyDocImpl* doc, Node* node )
             if ( nodeIsA(node->next) )
             {
                 temp2 = node->next;
-                
+
                 /* Checks for 'NAME' attribute */
                 for (av = temp2->attributes; av != NULL; av = av->next)
                 {
                     if ( attrIsNAME(av) && hasValue(av) )
                     {
-                        /* 
+                        /*
                            Value within the 'HREF' attribute must be the same
                            as the value within the 'NAME' attribute for valid
                            skipover.
@@ -1986,7 +1986,7 @@ static void CheckFormControls( TidyDocImpl* doc, Node* node )
          doc->access.HasValidId )
     {
         TY_(ReportAccessError)( doc, node, ASSOCIATE_LABELS_EXPLICITLY_FOR);
-    }    
+    }
 
     if ( !doc->access.HasValidId &&
          doc->access.HasValidFor )
@@ -2011,7 +2011,7 @@ static void CheckFormControls( TidyDocImpl* doc, Node* node )
 static void CheckLabel( TidyDocImpl* doc, Node* node )
 {
     if (Level2_Enabled( doc ))
-    {    
+    {
         /* Checks for valid 'FOR' attribute */
         AttVal* av = attrGetFOR( node );
         if ( hasValue(av) )
@@ -2028,10 +2028,10 @@ static void CheckLabel( TidyDocImpl* doc, Node* node )
 
 /************************************************************
 * CheckInputLabel
-* 
+*
 * Checks for valid 'ID' attribute within the INPUT element.
 * Checks to see if there is a LABEL directly before
-* or after the INPUT element determined by the 'TYPE'.  
+* or after the INPUT element determined by the 'TYPE'.
 * Each INPUT element must have a LABEL describing the form.
 ************************************************************/
 
@@ -2059,7 +2059,7 @@ static void CheckInputLabel( TidyDocImpl* doc, Node* node )
 
 
 /***************************************************************
-* CheckInputAttributes 
+* CheckInputAttributes
 *
 * INPUT element must have a valid 'ALT' attribute if the
 * 'VALUE' attribute is present.
@@ -2104,9 +2104,9 @@ static void CheckInputAttributes( TidyDocImpl* doc, Node* node )
 /***************************************************************
 * CheckFrameSet
 *
-* Frameset must have valid NOFRAME section.  Must contain some 
-* text but must not contain information telling user to update 
-* browsers, 
+* Frameset must have valid NOFRAME section.  Must contain some
+* text but must not contain information telling user to update
+* browsers,
 ***************************************************************/
 
 static void CheckFrameSet( TidyDocImpl* doc, Node* node )
@@ -2156,8 +2156,8 @@ static void CheckFrameSet( TidyDocImpl* doc, Node* node )
 *
 * Checks for heading increases and decreases.  Headings must
 * not increase by more than one header level, but may
-* decrease at from any level to any level.  Text within 
-* headers must not be more than 20 words in length.  
+* decrease at from any level to any level.  Text within
+* headers must not be more than 20 words in length.
 ***********************************************************/
 
 static void CheckHeaderNesting( TidyDocImpl* doc, Node* node )
@@ -2171,7 +2171,7 @@ static void CheckHeaderNesting( TidyDocImpl* doc, Node* node )
 
     if (Level2_Enabled( doc ))
     {
-        /* 
+        /*
            Text within header element cannot contain more than 20 words without
            a separate description
         */
@@ -2214,9 +2214,9 @@ static void CheckHeaderNesting( TidyDocImpl* doc, Node* node )
 
         if ( !IsValidIncrease )
             TY_(ReportAccessError)( doc, node, HEADERS_IMPROPERLY_NESTED );
-    
+
         if ( NeedsDescription )
-            TY_(ReportAccessError)( doc, node, HEADER_USED_FORMAT_TEXT );    
+            TY_(ReportAccessError)( doc, node, HEADER_USED_FORMAT_TEXT );
     }
 }
 
@@ -2237,8 +2237,8 @@ static void CheckParagraphHeader( TidyDocImpl* doc, Node* node )
     if (Level2_Enabled( doc ))
     {
         /* Cannot contain text formatting elements */
-        if (node->content != NULL)   
-        {                     
+        if (node->content != NULL)
+        {
             if (node->content->tag != NULL)
             {
                 temp = node->content;
@@ -2250,7 +2250,7 @@ static void CheckParagraphHeader( TidyDocImpl* doc, Node* node )
                         IsNotHeader = yes;
                         break;
                     }
-                        
+
                     temp = temp->next;
                 }
             }
@@ -2280,7 +2280,7 @@ static void CheckParagraphHeader( TidyDocImpl* doc, Node* node )
 /****************************************************************
 * CheckEmbed
 *
-* Checks to see if 'SRC' is a multimedia type.  Must have 
+* Checks to see if 'SRC' is a multimedia type.  Must have
 * syncronized captions if used.
 ****************************************************************/
 
@@ -2326,13 +2326,13 @@ static void CheckHTMLAccess( TidyDocImpl* doc, Node* node )
 /********************************************************
 * CheckBlink
 *
-* Document must not contain the BLINK element.  
+* Document must not contain the BLINK element.
 * It is invalid HTML/XHTML.
 *********************************************************/
 
 static void CheckBlink( TidyDocImpl* doc, Node* node )
 {
-    
+
     if (Level2_Enabled( doc ))
     {
         /* Checks to see if text is found within the BLINK element. */
@@ -2413,7 +2413,7 @@ static void CheckLink( TidyDocImpl* doc, Node* node )
 /*******************************************************
 * CheckStyle
 *
-* Document must not contain STYLE element.  HTML/XHTML 
+* Document must not contain STYLE element.  HTML/XHTML
 * document is unreadable when style sheets are applied.
 *******************************************************/
 
@@ -2429,7 +2429,7 @@ static void CheckStyle( TidyDocImpl* doc, Node* node )
 /*************************************************************
 * DynamicContent
 *
-* Verify that equivalents of dynamic content are updated and 
+* Verify that equivalents of dynamic content are updated and
 * available as often as the dynamic content.
 *************************************************************/
 
@@ -2455,7 +2455,7 @@ static void DynamicContent( TidyDocImpl* doc, Node* node )
 /*************************************************************
 * ProgrammaticObjects
 *
-* Verify that the page is usable when programmatic objects 
+* Verify that the page is usable when programmatic objects
 * are disabled.
 *************************************************************/
 
@@ -2536,7 +2536,7 @@ static void CheckFlicker( TidyDocImpl* doc, Node* node )
                 if ( TY_(tmbstrcasecmp)(ext, ".gif") == 0 )
                     msgcode = REMOVE_FLICKER_ANIMATED_GIF;
             }
-        }            
+        }
 
         if ( msgcode )
             TY_(ReportAccessError)( doc, node, msgcode );
@@ -2547,7 +2547,7 @@ static void CheckFlicker( TidyDocImpl* doc, Node* node )
 /**********************************************************
 * CheckDeprecated
 *
-* APPLET, BASEFONT, CENTER, FONT, ISINDEX, 
+* APPLET, BASEFONT, CENTER, FONT, ISINDEX,
 * S, STRIKE, and U should not be used.  Becomes deprecated
 * HTML if any of the above are used.
 **********************************************************/
@@ -2587,9 +2587,9 @@ static void CheckDeprecated( TidyDocImpl* doc, Node* node )
 /************************************************************
 * CheckScriptKeyboardAccessible
 *
-* Elements must have a device independent event handler if 
-* they have any of the following device dependent event 
-* handlers. 
+* Elements must have a device independent event handler if
+* they have any of the following device dependent event
+* handlers.
 ************************************************************/
 
 static void CheckScriptKeyboardAccessible( TidyDocImpl* doc, Node* node )
@@ -2672,7 +2672,7 @@ static void CheckScriptKeyboardAccessible( TidyDocImpl* doc, Node* node )
 * CheckMetaData
 *
 * Must have at least one of these elements in the document.
-* META, LINK, TITLE or ADDRESS.  <meta> must contain 
+* META, LINK, TITLE or ADDRESS.  <meta> must contain
 * a "content" attribute that doesn't contain a URL, and
 * an "http-Equiv" attribute that doesn't contain 'refresh'.
 **********************************************************/
@@ -2719,7 +2719,7 @@ static Bool CheckMetaData( TidyDocImpl* doc, Node* node, Bool HasMetaData )
                     ContainsAttr = yes;
                 }
             }
-        
+
             if ( HasContent || HasHttpEquiv )
             {
                 HasMetaData = yes;
@@ -2728,17 +2728,17 @@ static Bool CheckMetaData( TidyDocImpl* doc, Node* node, Bool HasMetaData )
             else
             {
                 if ( ContainsAttr && !HasContent && !HasHttpEquiv )
-                    HasMetaData = yes;                    
+                    HasMetaData = yes;
             }
         }
 
-        if ( !HasMetaData && 
+        if ( !HasMetaData &&
              nodeIsADDRESS(node) &&
              nodeIsA(node->content) )
         {
             HasMetaData = yes;
         }
-            
+
         if ( !HasMetaData &&
              !nodeIsTITLE(node) &&
              TY_(nodeIsText)(node->content) )
@@ -2754,7 +2754,7 @@ static Bool CheckMetaData( TidyDocImpl* doc, Node* node, Bool HasMetaData )
             if( !AttrContains(av, "stylesheet") )
                 HasMetaData = yes;
         }
-            
+
         /* Check for MetaData */
         for ( node = node->content; node; node = node->next )
         {
@@ -2783,7 +2783,7 @@ static void MetaDataPresent( TidyDocImpl* doc, Node* node )
 /*****************************************************
 * CheckDocType
 *
-* Checks that every HTML/XHTML document contains a 
+* Checks that every HTML/XHTML document contains a
 * '!DOCTYPE' before the root node. ie.  <HTML>
 *****************************************************/
 
@@ -2820,8 +2820,8 @@ static void CheckDocType( TidyDocImpl* doc )
 * CheckMapLinks
 *
 * Checks to see if an HREF for A element matches HREF
-* for AREA element.  There must be an HREF attribute 
-* of an A element for every HREF of an AREA element. 
+* for AREA element.  There must be an HREF attribute
+* of an A element for every HREF of an AREA element.
 ********************************************************/
 
 static Bool urlMatch( ctmbstr url1, ctmbstr url2 )
@@ -2860,7 +2860,7 @@ static void CheckMapLinks( TidyDocImpl* doc, Node* node )
     {
         if ( nodeIsAREA(child) )
         {
-            /* Checks for 'HREF' attribute */                
+            /* Checks for 'HREF' attribute */
             AttVal* href = attrGetHREF( child );
             if ( hasValue(href) &&
                  !FindLinkA( doc, &doc->root, href->value ) )
@@ -2875,7 +2875,7 @@ static void CheckMapLinks( TidyDocImpl* doc, Node* node )
 /****************************************************
 * CheckForStyleAttribute
 *
-* Checks all elements within the document to check 
+* Checks all elements within the document to check
 * for the use of 'STYLE' attribute.
 ****************************************************/
 
@@ -2959,13 +2959,13 @@ static void CheckListUsage( TidyDocImpl* doc, Node* node )
     }
     else if ( nodeIsLI(node) )
     {
-        /* Check that LI parent 
+        /* Check that LI parent
         ** a) exists,
         ** b) is either OL or UL
         ** IFF the LI parent was added by Tidy
         ** ie, if it is marked 'implicit', then
-        ** emit warnings LIST_USAGE_INVALID_UL or 
-        ** warning LIST_USAGE_INVALID_OL tests 
+        ** emit warnings LIST_USAGE_INVALID_UL or
+        ** warning LIST_USAGE_INVALID_OL tests
         */
         if ( node->parent == NULL ||
              ( !nodeIsOL(node->parent) && !nodeIsUL(node->parent) ) )
@@ -3004,7 +3004,7 @@ static void FreeAccessibilityChecks( TidyDocImpl* ARG_UNUSED(doc) )
 {
     /* free any memory allocated for the lists
 
-    Linked List of Links not used.  Just search document as 
+    Linked List of Links not used.  Just search document as
     AREA tags are encountered.  Same algorithm, but no
     data structures necessary.
 
@@ -3012,7 +3012,7 @@ static void FreeAccessibilityChecks( TidyDocImpl* ARG_UNUSED(doc) )
     while (current)
     {
         void    *templink = (void *)current;
-        
+
         current = current->next;
         TidyDocFree(doc, templink);
     }
@@ -3031,7 +3031,7 @@ static void FreeAccessibilityChecks( TidyDocImpl* ARG_UNUSED(doc) )
 static void AccessibilityCheckNode( TidyDocImpl* doc, Node* node )
 {
     Node* content;
-    
+
     /* Check BODY for color contrast */
     if ( nodeIsBODY(node) )
     {
@@ -3044,7 +3044,7 @@ static void AccessibilityCheckNode( TidyDocImpl* doc, Node* node )
         if ( !CheckMetaData( doc, node, no ) )
           MetaDataPresent( doc, node );
     }
-    
+
     /* Check the ANCHOR tag */
     else if ( nodeIsA(node) )
     {
@@ -3082,7 +3082,7 @@ static void AccessibilityCheckNode( TidyDocImpl* doc, Node* node )
         CheckColorAvailable( doc, node );
         CheckApplet(doc, node );
     }
-    
+
     /* Check the OBJECT tag */
     else if ( nodeIsOBJECT(node) )
     {
@@ -3093,19 +3093,19 @@ static void AccessibilityCheckNode( TidyDocImpl* doc, Node* node )
         CheckColorAvailable( doc, node );
         CheckObject( doc, node );
     }
-    
+
     /* Check the FRAME tag */
     else if ( nodeIsFRAME(node) )
     {
         CheckFrame( doc, node );
     }
-    
+
     /* Check the IFRAME tag */
     else if ( nodeIsIFRAME(node) )
     {
         CheckIFrame( doc, node );
     }
-    
+
     /* Check the SCRIPT tag */
     else if ( nodeIsSCRIPT(node) )
     {
@@ -3149,7 +3149,7 @@ static void AccessibilityCheckNode( TidyDocImpl* doc, Node* node )
     {
         CheckFrameSet( doc, node );
     }
-    
+
     /* Checks for header elements for valid header increase */
     else if ( TY_(nodeIsHeader)(node) )
     {
@@ -3254,7 +3254,7 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
     /* Checks for '!DOCTYPE' */
     CheckDocType( doc );
 
-    
+
     /* Checks to see if stylesheets are used to control the layout */
     if ( Level2_Enabled( doc )
          && ! CheckMissingStyleSheets( doc, &doc->root ) )
@@ -3265,7 +3265,7 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
     /* Check to see if any list elements are found within the document */
     CheckForListElements( doc, &doc->root );
 
-    /* Recursively apply all remaining checks to 
+    /* Recursively apply all remaining checks to
     ** each node in document.
     */
     AccessibilityCheckNode( doc, &doc->root );
diff --git a/src/access.h b/src/access.h
index cbb62576b..53f0f495f 100644
--- a/src/access.h
+++ b/src/access.h
@@ -49,24 +49,24 @@ struct _TidyAccessImpl
     int counter;
 
     /* list of characters in the text nodes found within a container element */
-    tmbchar textNode[ TEXTBUF_SIZE ]; 
+    tmbchar textNode[ TEXTBUF_SIZE ];
 
     /* The list of characters found within one text node */
-    tmbchar text[ TEXTBUF_SIZE ]; 
+    tmbchar text[ TEXTBUF_SIZE ];
 
     /* Number of frame elements found within a frameset */
-    int numFrames; 
+    int numFrames;
 
     /* Number of 'longdesc' attributes found within a frameset */
-    int HasCheckedLongDesc; 
+    int HasCheckedLongDesc;
 
     int  CheckedHeaders;
     int  ListElements;
     int  OtherListElements;
 
     /* For 'USEMAP' identifier */
-    Bool HasUseMap; 
-    Bool HasName; 
+    Bool HasUseMap;
+    Bool HasName;
     Bool HasMap;
 
     /* For tracking nodes that are deleted from the original parse tree - TRT */
diff --git a/src/attrdict.c b/src/attrdict.c
index 224cdc3c4..9d5ed86db 100644
--- a/src/attrdict.c
+++ b/src/attrdict.c
@@ -108,7 +108,7 @@
 /* These are the core event-handler attributes that can apply to _any_ element
    starting with HTML5. In general they will be marked as not supported for
    previous versions of HTML, in which case please override the attribute in the
-   specific item below. **This macro must be expanded at the END of each 
+   specific item below. **This macro must be expanded at the END of each
    element. **
    Most of these attributes are defined as universal for HTML5 here:
      https://www.w3.org/TR/html-markup/global-attributes.html
@@ -219,7 +219,7 @@ const AttrVersion TY_(W3CAttrsFor_A)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_ABBR)[] = 
+const AttrVersion TY_(W3CAttrsFor_ABBR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -247,7 +247,7 @@ const AttrVersion TY_(W3CAttrsFor_ABBR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_ACRONYM)[] = 
+const AttrVersion TY_(W3CAttrsFor_ACRONYM)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -275,7 +275,7 @@ const AttrVersion TY_(W3CAttrsFor_ACRONYM)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_ADDRESS)[] = 
+const AttrVersion TY_(W3CAttrsFor_ADDRESS)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -305,7 +305,7 @@ const AttrVersion TY_(W3CAttrsFor_ADDRESS)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_APPLET)[] = 
+const AttrVersion TY_(W3CAttrsFor_APPLET)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -330,7 +330,7 @@ const AttrVersion TY_(W3CAttrsFor_APPLET)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_AREA)[] = 
+const AttrVersion TY_(W3CAttrsFor_AREA)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -372,7 +372,7 @@ const AttrVersion TY_(W3CAttrsFor_AREA)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_ARTICLE)[] = 
+const AttrVersion TY_(W3CAttrsFor_ARTICLE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -382,7 +382,7 @@ const AttrVersion TY_(W3CAttrsFor_ARTICLE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_ASIDE)[] = 
+const AttrVersion TY_(W3CAttrsFor_ASIDE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -392,7 +392,7 @@ const AttrVersion TY_(W3CAttrsFor_ASIDE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_AUDIO)[] = 
+const AttrVersion TY_(W3CAttrsFor_AUDIO)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -409,7 +409,7 @@ const AttrVersion TY_(W3CAttrsFor_AUDIO)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_B)[] = 
+const AttrVersion TY_(W3CAttrsFor_B)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -438,7 +438,7 @@ const AttrVersion TY_(W3CAttrsFor_B)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BASE)[] = 
+const AttrVersion TY_(W3CAttrsFor_BASE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -452,7 +452,7 @@ const AttrVersion TY_(W3CAttrsFor_BASE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BASEFONT)[] = 
+const AttrVersion TY_(W3CAttrsFor_BASEFONT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -466,7 +466,7 @@ const AttrVersion TY_(W3CAttrsFor_BASEFONT)[] =
   { TidyAttr_UNKNOWN,               0                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BDI)[] = 
+const AttrVersion TY_(W3CAttrsFor_BDI)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -476,7 +476,7 @@ const AttrVersion TY_(W3CAttrsFor_BDI)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BDO)[] = 
+const AttrVersion TY_(W3CAttrsFor_BDO)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -504,7 +504,7 @@ const AttrVersion TY_(W3CAttrsFor_BDO)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BIG)[] = 
+const AttrVersion TY_(W3CAttrsFor_BIG)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -532,7 +532,7 @@ const AttrVersion TY_(W3CAttrsFor_BIG)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BLOCKQUOTE)[] = 
+const AttrVersion TY_(W3CAttrsFor_BLOCKQUOTE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -562,7 +562,7 @@ const AttrVersion TY_(W3CAttrsFor_BLOCKQUOTE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BODY)[] = 
+const AttrVersion TY_(W3CAttrsFor_BODY)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -612,7 +612,7 @@ const AttrVersion TY_(W3CAttrsFor_BODY)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BR)[] = 
+const AttrVersion TY_(W3CAttrsFor_BR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -629,7 +629,7 @@ const AttrVersion TY_(W3CAttrsFor_BR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_BUTTON)[] = 
+const AttrVersion TY_(W3CAttrsFor_BUTTON)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -672,7 +672,7 @@ const AttrVersion TY_(W3CAttrsFor_BUTTON)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_CANVAS)[] = 
+const AttrVersion TY_(W3CAttrsFor_CANVAS)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -684,7 +684,7 @@ const AttrVersion TY_(W3CAttrsFor_CANVAS)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_CAPTION)[] = 
+const AttrVersion TY_(W3CAttrsFor_CAPTION)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -713,7 +713,7 @@ const AttrVersion TY_(W3CAttrsFor_CAPTION)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_CENTER)[] = 
+const AttrVersion TY_(W3CAttrsFor_CENTER)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -740,7 +740,7 @@ const AttrVersion TY_(W3CAttrsFor_CENTER)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_CITE)[] = 
+const AttrVersion TY_(W3CAttrsFor_CITE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -769,7 +769,7 @@ const AttrVersion TY_(W3CAttrsFor_CITE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_CODE)[] = 
+const AttrVersion TY_(W3CAttrsFor_CODE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -798,7 +798,7 @@ const AttrVersion TY_(W3CAttrsFor_CODE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_COL)[] = 
+const AttrVersion TY_(W3CAttrsFor_COL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -832,7 +832,7 @@ const AttrVersion TY_(W3CAttrsFor_COL)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_COLGROUP)[] = 
+const AttrVersion TY_(W3CAttrsFor_COLGROUP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -866,7 +866,7 @@ const AttrVersion TY_(W3CAttrsFor_COLGROUP)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_COMMAND)[] = 
+const AttrVersion TY_(W3CAttrsFor_COMMAND)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -882,7 +882,7 @@ const AttrVersion TY_(W3CAttrsFor_COMMAND)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DATALIST)[] = 
+const AttrVersion TY_(W3CAttrsFor_DATALIST)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -892,7 +892,7 @@ const AttrVersion TY_(W3CAttrsFor_DATALIST)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DD)[] = 
+const AttrVersion TY_(W3CAttrsFor_DD)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -921,7 +921,7 @@ const AttrVersion TY_(W3CAttrsFor_DD)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DEL)[] = 
+const AttrVersion TY_(W3CAttrsFor_DEL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -951,7 +951,7 @@ const AttrVersion TY_(W3CAttrsFor_DEL)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DETAILS)[] = 
+const AttrVersion TY_(W3CAttrsFor_DETAILS)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -962,7 +962,7 @@ const AttrVersion TY_(W3CAttrsFor_DETAILS)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DFN)[] = 
+const AttrVersion TY_(W3CAttrsFor_DFN)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -990,7 +990,7 @@ const AttrVersion TY_(W3CAttrsFor_DFN)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DIALOG)[] = 
+const AttrVersion TY_(W3CAttrsFor_DIALOG)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1001,7 +1001,7 @@ const AttrVersion TY_(W3CAttrsFor_DIALOG)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DIR)[] = 
+const AttrVersion TY_(W3CAttrsFor_DIR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1031,7 +1031,7 @@ const AttrVersion TY_(W3CAttrsFor_DIR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DIV)[] = 
+const AttrVersion TY_(W3CAttrsFor_DIV)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1060,7 +1060,7 @@ const AttrVersion TY_(W3CAttrsFor_DIV)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DL)[] = 
+const AttrVersion TY_(W3CAttrsFor_DL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1091,7 +1091,7 @@ const AttrVersion TY_(W3CAttrsFor_DL)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DT)[] = 
+const AttrVersion TY_(W3CAttrsFor_DT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1120,7 +1120,7 @@ const AttrVersion TY_(W3CAttrsFor_DT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_EM)[] = 
+const AttrVersion TY_(W3CAttrsFor_EM)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1149,7 +1149,7 @@ const AttrVersion TY_(W3CAttrsFor_EM)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_EMBED)[] = 
+const AttrVersion TY_(W3CAttrsFor_EMBED)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1163,7 +1163,7 @@ const AttrVersion TY_(W3CAttrsFor_EMBED)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FIELDSET)[] = 
+const AttrVersion TY_(W3CAttrsFor_FIELDSET)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1194,7 +1194,7 @@ const AttrVersion TY_(W3CAttrsFor_FIELDSET)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FIGCAPTION)[] = 
+const AttrVersion TY_(W3CAttrsFor_FIGCAPTION)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1204,7 +1204,7 @@ const AttrVersion TY_(W3CAttrsFor_FIGCAPTION)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FIGURE)[] = 
+const AttrVersion TY_(W3CAttrsFor_FIGURE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1214,7 +1214,7 @@ const AttrVersion TY_(W3CAttrsFor_FIGURE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FONT)[] = 
+const AttrVersion TY_(W3CAttrsFor_FONT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1234,7 +1234,7 @@ const AttrVersion TY_(W3CAttrsFor_FONT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FOOTER)[] = 
+const AttrVersion TY_(W3CAttrsFor_FOOTER)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1244,7 +1244,7 @@ const AttrVersion TY_(W3CAttrsFor_FOOTER)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FORM)[] = 
+const AttrVersion TY_(W3CAttrsFor_FORM)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1285,7 +1285,7 @@ const AttrVersion TY_(W3CAttrsFor_FORM)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FRAME)[] = 
+const AttrVersion TY_(W3CAttrsFor_FRAME)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1307,7 +1307,7 @@ const AttrVersion TY_(W3CAttrsFor_FRAME)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_FRAMESET)[] = 
+const AttrVersion TY_(W3CAttrsFor_FRAMESET)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1325,7 +1325,7 @@ const AttrVersion TY_(W3CAttrsFor_FRAMESET)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_H1)[] = 
+const AttrVersion TY_(W3CAttrsFor_H1)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1355,7 +1355,7 @@ const AttrVersion TY_(W3CAttrsFor_H1)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_H2)[] = 
+const AttrVersion TY_(W3CAttrsFor_H2)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1385,7 +1385,7 @@ const AttrVersion TY_(W3CAttrsFor_H2)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_H3)[] = 
+const AttrVersion TY_(W3CAttrsFor_H3)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1415,7 +1415,7 @@ const AttrVersion TY_(W3CAttrsFor_H3)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_H4)[] = 
+const AttrVersion TY_(W3CAttrsFor_H4)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1445,7 +1445,7 @@ const AttrVersion TY_(W3CAttrsFor_H4)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_H5)[] = 
+const AttrVersion TY_(W3CAttrsFor_H5)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1475,7 +1475,7 @@ const AttrVersion TY_(W3CAttrsFor_H5)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_H6)[] = 
+const AttrVersion TY_(W3CAttrsFor_H6)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1505,7 +1505,7 @@ const AttrVersion TY_(W3CAttrsFor_H6)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_HEAD)[] = 
+const AttrVersion TY_(W3CAttrsFor_HEAD)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1521,7 +1521,7 @@ const AttrVersion TY_(W3CAttrsFor_HEAD)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_HEADER)[] = 
+const AttrVersion TY_(W3CAttrsFor_HEADER)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1531,7 +1531,7 @@ const AttrVersion TY_(W3CAttrsFor_HEADER)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_HGROUP)[] = 
+const AttrVersion TY_(W3CAttrsFor_HGROUP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1541,7 +1541,7 @@ const AttrVersion TY_(W3CAttrsFor_HGROUP)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_HR)[] = 
+const AttrVersion TY_(W3CAttrsFor_HR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1574,7 +1574,7 @@ const AttrVersion TY_(W3CAttrsFor_HR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_HTML)[] = 
+const AttrVersion TY_(W3CAttrsFor_HTML)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1592,7 +1592,7 @@ const AttrVersion TY_(W3CAttrsFor_HTML)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_I)[] = 
+const AttrVersion TY_(W3CAttrsFor_I)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1621,7 +1621,7 @@ const AttrVersion TY_(W3CAttrsFor_I)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_IFRAME)[] = 
+const AttrVersion TY_(W3CAttrsFor_IFRAME)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1650,7 +1650,7 @@ const AttrVersion TY_(W3CAttrsFor_IFRAME)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_IMG)[] = 
+const AttrVersion TY_(W3CAttrsFor_IMG)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1695,7 +1695,7 @@ const AttrVersion TY_(W3CAttrsFor_IMG)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_INPUT)[] = 
+const AttrVersion TY_(W3CAttrsFor_INPUT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1763,7 +1763,7 @@ const AttrVersion TY_(W3CAttrsFor_INPUT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_INS)[] = 
+const AttrVersion TY_(W3CAttrsFor_INS)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1793,7 +1793,7 @@ const AttrVersion TY_(W3CAttrsFor_INS)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_ISINDEX)[] = 
+const AttrVersion TY_(W3CAttrsFor_ISINDEX)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1812,7 +1812,7 @@ const AttrVersion TY_(W3CAttrsFor_ISINDEX)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_KBD)[] = 
+const AttrVersion TY_(W3CAttrsFor_KBD)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1841,7 +1841,7 @@ const AttrVersion TY_(W3CAttrsFor_KBD)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_KEYGEN)[] = 
+const AttrVersion TY_(W3CAttrsFor_KEYGEN)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1857,7 +1857,7 @@ const AttrVersion TY_(W3CAttrsFor_KEYGEN)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_LABEL)[] = 
+const AttrVersion TY_(W3CAttrsFor_LABEL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1890,7 +1890,7 @@ const AttrVersion TY_(W3CAttrsFor_LABEL)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_LEGEND)[] = 
+const AttrVersion TY_(W3CAttrsFor_LEGEND)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1920,7 +1920,7 @@ const AttrVersion TY_(W3CAttrsFor_LEGEND)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_LI)[] = 
+const AttrVersion TY_(W3CAttrsFor_LI)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1951,7 +1951,7 @@ const AttrVersion TY_(W3CAttrsFor_LI)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_LINK)[] = 
+const AttrVersion TY_(W3CAttrsFor_LINK)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -1995,7 +1995,7 @@ const AttrVersion TY_(W3CAttrsFor_LINK)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_LISTING)[] = 
+const AttrVersion TY_(W3CAttrsFor_LISTING)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2007,7 +2007,7 @@ const AttrVersion TY_(W3CAttrsFor_LISTING)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_MAIN)[] = 
+const AttrVersion TY_(W3CAttrsFor_MAIN)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2017,7 +2017,7 @@ const AttrVersion TY_(W3CAttrsFor_MAIN)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_MAP)[] = 
+const AttrVersion TY_(W3CAttrsFor_MAP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2078,7 +2078,7 @@ const AttrVersion TY_(W3CAttrsFor_MATHML)[] =  /* [i_a]2 */
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_MARK)[] = 
+const AttrVersion TY_(W3CAttrsFor_MARK)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2088,7 +2088,7 @@ const AttrVersion TY_(W3CAttrsFor_MARK)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_MENU)[] = 
+const AttrVersion TY_(W3CAttrsFor_MENU)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2120,7 +2120,7 @@ const AttrVersion TY_(W3CAttrsFor_MENU)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_MENUITEM)[] = 
+const AttrVersion TY_(W3CAttrsFor_MENUITEM)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2138,7 +2138,7 @@ const AttrVersion TY_(W3CAttrsFor_MENUITEM)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_META)[] = 
+const AttrVersion TY_(W3CAttrsFor_META)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2158,7 +2158,7 @@ const AttrVersion TY_(W3CAttrsFor_META)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_METER)[] = 
+const AttrVersion TY_(W3CAttrsFor_METER)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2175,7 +2175,7 @@ const AttrVersion TY_(W3CAttrsFor_METER)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_NAV)[] = 
+const AttrVersion TY_(W3CAttrsFor_NAV)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2185,7 +2185,7 @@ const AttrVersion TY_(W3CAttrsFor_NAV)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_NEXTID)[] = 
+const AttrVersion TY_(W3CAttrsFor_NEXTID)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2196,7 +2196,7 @@ const AttrVersion TY_(W3CAttrsFor_NEXTID)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_NOFRAMES)[] = 
+const AttrVersion TY_(W3CAttrsFor_NOFRAMES)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2223,7 +2223,7 @@ const AttrVersion TY_(W3CAttrsFor_NOFRAMES)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_NOSCRIPT)[] = 
+const AttrVersion TY_(W3CAttrsFor_NOSCRIPT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2251,7 +2251,7 @@ const AttrVersion TY_(W3CAttrsFor_NOSCRIPT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_OBJECT)[] = 
+const AttrVersion TY_(W3CAttrsFor_OBJECT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2297,7 +2297,7 @@ const AttrVersion TY_(W3CAttrsFor_OBJECT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_OL)[] = 
+const AttrVersion TY_(W3CAttrsFor_OL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2330,7 +2330,7 @@ const AttrVersion TY_(W3CAttrsFor_OL)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_OPTGROUP)[] = 
+const AttrVersion TY_(W3CAttrsFor_OPTGROUP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2360,7 +2360,7 @@ const AttrVersion TY_(W3CAttrsFor_OPTGROUP)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_OPTION)[] = 
+const AttrVersion TY_(W3CAttrsFor_OPTION)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2394,7 +2394,7 @@ const AttrVersion TY_(W3CAttrsFor_OPTION)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_OUTPUT)[] = 
+const AttrVersion TY_(W3CAttrsFor_OUTPUT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2407,7 +2407,7 @@ const AttrVersion TY_(W3CAttrsFor_OUTPUT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_P)[] = 
+const AttrVersion TY_(W3CAttrsFor_P)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2437,7 +2437,7 @@ const AttrVersion TY_(W3CAttrsFor_P)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_PARAM)[] = 
+const AttrVersion TY_(W3CAttrsFor_PARAM)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2478,7 +2478,7 @@ const AttrVersion TY_(W3CAttrsFor_PICTURE)[] = /* Issue #151 - support for 'pict
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_PLAINTEXT)[] = 
+const AttrVersion TY_(W3CAttrsFor_PLAINTEXT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2489,7 +2489,7 @@ const AttrVersion TY_(W3CAttrsFor_PLAINTEXT)[] =
   { TidyAttr_UNKNOWN,            0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_PRE)[] = 
+const AttrVersion TY_(W3CAttrsFor_PRE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2520,7 +2520,7 @@ const AttrVersion TY_(W3CAttrsFor_PRE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_PROGRESS)[] = 
+const AttrVersion TY_(W3CAttrsFor_PROGRESS)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2533,7 +2533,7 @@ const AttrVersion TY_(W3CAttrsFor_PROGRESS)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_Q)[] = 
+const AttrVersion TY_(W3CAttrsFor_Q)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2562,7 +2562,7 @@ const AttrVersion TY_(W3CAttrsFor_Q)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_RB)[] = 
+const AttrVersion TY_(W3CAttrsFor_RB)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2589,7 +2589,7 @@ const AttrVersion TY_(W3CAttrsFor_RB)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_RBC)[] = 
+const AttrVersion TY_(W3CAttrsFor_RBC)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2616,7 +2616,7 @@ const AttrVersion TY_(W3CAttrsFor_RBC)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_RP)[] = 
+const AttrVersion TY_(W3CAttrsFor_RP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2643,7 +2643,7 @@ const AttrVersion TY_(W3CAttrsFor_RP)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_RT)[] = 
+const AttrVersion TY_(W3CAttrsFor_RT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2671,7 +2671,7 @@ const AttrVersion TY_(W3CAttrsFor_RT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_RTC)[] = 
+const AttrVersion TY_(W3CAttrsFor_RTC)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2698,7 +2698,7 @@ const AttrVersion TY_(W3CAttrsFor_RTC)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_RUBY)[] = 
+const AttrVersion TY_(W3CAttrsFor_RUBY)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2725,7 +2725,7 @@ const AttrVersion TY_(W3CAttrsFor_RUBY)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_S)[] = 
+const AttrVersion TY_(W3CAttrsFor_S)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2752,7 +2752,7 @@ const AttrVersion TY_(W3CAttrsFor_S)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SAMP)[] = 
+const AttrVersion TY_(W3CAttrsFor_SAMP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2781,7 +2781,7 @@ const AttrVersion TY_(W3CAttrsFor_SAMP)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SCRIPT)[] = 
+const AttrVersion TY_(W3CAttrsFor_SCRIPT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2804,7 +2804,7 @@ const AttrVersion TY_(W3CAttrsFor_SCRIPT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SECTION)[] = 
+const AttrVersion TY_(W3CAttrsFor_SECTION)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2814,7 +2814,7 @@ const AttrVersion TY_(W3CAttrsFor_SECTION)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SELECT)[] = 
+const AttrVersion TY_(W3CAttrsFor_SELECT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2855,7 +2855,7 @@ const AttrVersion TY_(W3CAttrsFor_SELECT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SMALL)[] = 
+const AttrVersion TY_(W3CAttrsFor_SMALL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2894,7 +2894,7 @@ const AttrVersion TY_(W3CAttrsFor_SLOT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SOURCE)[] = 
+const AttrVersion TY_(W3CAttrsFor_SOURCE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2908,7 +2908,7 @@ const AttrVersion TY_(W3CAttrsFor_SOURCE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SPAN)[] = 
+const AttrVersion TY_(W3CAttrsFor_SPAN)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2936,7 +2936,7 @@ const AttrVersion TY_(W3CAttrsFor_SPAN)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_STRIKE)[] = 
+const AttrVersion TY_(W3CAttrsFor_STRIKE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2963,7 +2963,7 @@ const AttrVersion TY_(W3CAttrsFor_STRIKE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_STRONG)[] = 
+const AttrVersion TY_(W3CAttrsFor_STRONG)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -2992,7 +2992,7 @@ const AttrVersion TY_(W3CAttrsFor_STRONG)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_STYLE)[] = 
+const AttrVersion TY_(W3CAttrsFor_STYLE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3012,7 +3012,7 @@ const AttrVersion TY_(W3CAttrsFor_STYLE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SUB)[] = 
+const AttrVersion TY_(W3CAttrsFor_SUB)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3040,7 +3040,7 @@ const AttrVersion TY_(W3CAttrsFor_SUB)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SUMMARY)[] = 
+const AttrVersion TY_(W3CAttrsFor_SUMMARY)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3050,7 +3050,7 @@ const AttrVersion TY_(W3CAttrsFor_SUMMARY)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_SUP)[] = 
+const AttrVersion TY_(W3CAttrsFor_SUP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3137,7 +3137,7 @@ const AttrVersion TY_(W3CAttrsFor_SVG)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TABLE)[] = 
+const AttrVersion TY_(W3CAttrsFor_TABLE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3175,7 +3175,7 @@ const AttrVersion TY_(W3CAttrsFor_TABLE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TBODY)[] = 
+const AttrVersion TY_(W3CAttrsFor_TBODY)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3207,7 +3207,7 @@ const AttrVersion TY_(W3CAttrsFor_TBODY)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TD)[] = 
+const AttrVersion TY_(W3CAttrsFor_TD)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3249,7 +3249,7 @@ const AttrVersion TY_(W3CAttrsFor_TD)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TEXTAREA)[] = 
+const AttrVersion TY_(W3CAttrsFor_TEXTAREA)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3296,7 +3296,7 @@ const AttrVersion TY_(W3CAttrsFor_TEXTAREA)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TFOOT)[] = 
+const AttrVersion TY_(W3CAttrsFor_TFOOT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3328,7 +3328,7 @@ const AttrVersion TY_(W3CAttrsFor_TFOOT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TH)[] = 
+const AttrVersion TY_(W3CAttrsFor_TH)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3370,7 +3370,7 @@ const AttrVersion TY_(W3CAttrsFor_TH)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_THEAD)[] = 
+const AttrVersion TY_(W3CAttrsFor_THEAD)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3402,7 +3402,7 @@ const AttrVersion TY_(W3CAttrsFor_THEAD)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TEMPLATE)[] = 
+const AttrVersion TY_(W3CAttrsFor_TEMPLATE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3412,7 +3412,7 @@ const AttrVersion TY_(W3CAttrsFor_TEMPLATE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TIME)[] = 
+const AttrVersion TY_(W3CAttrsFor_TIME)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3424,7 +3424,7 @@ const AttrVersion TY_(W3CAttrsFor_TIME)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_DATA)[] = 
+const AttrVersion TY_(W3CAttrsFor_DATA)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3435,7 +3435,7 @@ const AttrVersion TY_(W3CAttrsFor_DATA)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TITLE)[] = 
+const AttrVersion TY_(W3CAttrsFor_TITLE)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3451,7 +3451,7 @@ const AttrVersion TY_(W3CAttrsFor_TITLE)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TR)[] = 
+const AttrVersion TY_(W3CAttrsFor_TR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3484,7 +3484,7 @@ const AttrVersion TY_(W3CAttrsFor_TR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TRACK)[] = 
+const AttrVersion TY_(W3CAttrsFor_TRACK)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3499,7 +3499,7 @@ const AttrVersion TY_(W3CAttrsFor_TRACK)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_TT)[] = 
+const AttrVersion TY_(W3CAttrsFor_TT)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3528,7 +3528,7 @@ const AttrVersion TY_(W3CAttrsFor_TT)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_U)[] = 
+const AttrVersion TY_(W3CAttrsFor_U)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3555,7 +3555,7 @@ const AttrVersion TY_(W3CAttrsFor_U)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_UL)[] = 
+const AttrVersion TY_(W3CAttrsFor_UL)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3586,7 +3586,7 @@ const AttrVersion TY_(W3CAttrsFor_UL)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_VAR)[] = 
+const AttrVersion TY_(W3CAttrsFor_VAR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3615,7 +3615,7 @@ const AttrVersion TY_(W3CAttrsFor_VAR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_VIDEO)[] = 
+const AttrVersion TY_(W3CAttrsFor_VIDEO)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3635,7 +3635,7 @@ const AttrVersion TY_(W3CAttrsFor_VIDEO)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_WBR)[] = 
+const AttrVersion TY_(W3CAttrsFor_WBR)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
@@ -3645,7 +3645,7 @@ const AttrVersion TY_(W3CAttrsFor_WBR)[] =
   { TidyAttr_UNKNOWN,               0                                                                          },
 };
 
-const AttrVersion TY_(W3CAttrsFor_XMP)[] = 
+const AttrVersion TY_(W3CAttrsFor_XMP)[] =
 {
   INCLUDE_ARIA
   INCLUDE_MICRODATA
diff --git a/src/attrs.c b/src/attrs.c
index 13c266879..9f3ec8591 100644
--- a/src/attrs.c
+++ b/src/attrs.c
@@ -104,43 +104,43 @@ static AttrCheck CheckSvgAttr;
 
 static const Attribute attribute_defs [] =
 {
-  { TidyAttr_UNKNOWN,                 "unknown!",                NULL         }, 
-  { TidyAttr_ABBR,                    "abbr",                    CH_PCDATA    }, 
-  { TidyAttr_ACCEPT,                  "accept",                  CH_XTYPE     }, 
-  { TidyAttr_ACCEPT_CHARSET,          "accept-charset",          CH_CHARSET   }, 
-  { TidyAttr_ACCESSKEY,               "accesskey",               CH_CHARACTER }, 
-  { TidyAttr_ACTION,                  "action",                  CH_ACTION    }, 
+  { TidyAttr_UNKNOWN,                 "unknown!",                NULL         },
+  { TidyAttr_ABBR,                    "abbr",                    CH_PCDATA    },
+  { TidyAttr_ACCEPT,                  "accept",                  CH_XTYPE     },
+  { TidyAttr_ACCEPT_CHARSET,          "accept-charset",          CH_CHARSET   },
+  { TidyAttr_ACCESSKEY,               "accesskey",               CH_CHARACTER },
+  { TidyAttr_ACTION,                  "action",                  CH_ACTION    },
   { TidyAttr_ADD_DATE,                "add_date",                CH_PCDATA    }, /* A */
   { TidyAttr_ALIGN,                   "align",                   CH_ALIGN     }, /* varies by element */
-  { TidyAttr_ALINK,                   "alink",                   CH_COLOR     }, 
+  { TidyAttr_ALINK,                   "alink",                   CH_COLOR     },
   { TidyAttr_ALLOWFULLSCREEN,         "allowfullscreen",         CH_BOOL      },
   { TidyAttr_ALT,                     "alt",                     CH_PCDATA    }, /* nowrap */
   { TidyAttr_ARCHIVE,                 "archive",                 CH_URLS      }, /* space or comma separated list */
-  { TidyAttr_AXIS,                    "axis",                    CH_PCDATA    }, 
-  { TidyAttr_BACKGROUND,              "background",              CH_URL       }, 
-  { TidyAttr_BGCOLOR,                 "bgcolor",                 CH_COLOR     }, 
+  { TidyAttr_AXIS,                    "axis",                    CH_PCDATA    },
+  { TidyAttr_BACKGROUND,              "background",              CH_URL       },
+  { TidyAttr_BGCOLOR,                 "bgcolor",                 CH_COLOR     },
   { TidyAttr_BGPROPERTIES,            "bgproperties",            CH_PCDATA    }, /* BODY "fixed" fixes background */
   { TidyAttr_BORDER,                  "border",                  CH_BORDER    }, /* like LENGTH + "border" */
   { TidyAttr_BORDERCOLOR,             "bordercolor",             CH_COLOR     }, /* used on TABLE */
   { TidyAttr_BOTTOMMARGIN,            "bottommargin",            CH_NUMBER    }, /* used on BODY */
   { TidyAttr_CELLPADDING,             "cellpadding",             CH_LENGTH    }, /* % or pixel values */
-  { TidyAttr_CELLSPACING,             "cellspacing",             CH_LENGTH    }, 
-  { TidyAttr_CHAR,                    "char",                    CH_CHARACTER }, 
-  { TidyAttr_CHAROFF,                 "charoff",                 CH_LENGTH    }, 
-  { TidyAttr_CHARSET,                 "charset",                 CH_CHARSET   }, 
+  { TidyAttr_CELLSPACING,             "cellspacing",             CH_LENGTH    },
+  { TidyAttr_CHAR,                    "char",                    CH_CHARACTER },
+  { TidyAttr_CHAROFF,                 "charoff",                 CH_LENGTH    },
+  { TidyAttr_CHARSET,                 "charset",                 CH_CHARSET   },
   { TidyAttr_CHECKED,                 "checked",                 CH_BOOL      }, /* i.e. "checked" or absent */
-  { TidyAttr_CITE,                    "cite",                    CH_URL       }, 
-  { TidyAttr_CLASS,                   "class",                   CH_PCDATA    }, 
-  { TidyAttr_CLASSID,                 "classid",                 CH_URL       }, 
+  { TidyAttr_CITE,                    "cite",                    CH_URL       },
+  { TidyAttr_CLASS,                   "class",                   CH_PCDATA    },
+  { TidyAttr_CLASSID,                 "classid",                 CH_URL       },
   { TidyAttr_CLEAR,                   "clear",                   CH_CLEAR     }, /* BR: left, right, all */
   { TidyAttr_CODE,                    "code",                    CH_PCDATA    }, /* APPLET */
   { TidyAttr_CODEBASE,                "codebase",                CH_URL       }, /* OBJECT */
   { TidyAttr_CODETYPE,                "codetype",                CH_XTYPE     }, /* OBJECT */
   { TidyAttr_COLOR,                   "color",                   CH_COLOR     }, /* BASEFONT, FONT */
   { TidyAttr_COLS,                    "cols",                    CH_COLS      }, /* TABLE & FRAMESET */
-  { TidyAttr_COLSPAN,                 "colspan",                 CH_NUMBER    }, 
+  { TidyAttr_COLSPAN,                 "colspan",                 CH_NUMBER    },
   { TidyAttr_COMPACT,                 "compact",                 CH_BOOL      }, /* lists */
-  { TidyAttr_CONTENT,                 "content",                 CH_PCDATA    }, 
+  { TidyAttr_CONTENT,                 "content",                 CH_PCDATA    },
   { TidyAttr_COORDS,                  "coords",                  CH_COORDS    }, /* AREA, A */
   { TidyAttr_DATA,                    "data",                    CH_URL       }, /* OBJECT */
   { TidyAttr_DATAFLD,                 "datafld",                 CH_PCDATA    }, /* used on DIV, IMG */
@@ -159,7 +159,7 @@ static const Attribute attribute_defs [] =
   { TidyAttr_FOR,                     "for",                     CH_IDREF     }, /* LABEL */
   { TidyAttr_FRAME,                   "frame",                   CH_TFRAME    }, /* TABLE */
   { TidyAttr_FRAMEBORDER,             "frameborder",             CH_FBORDER   }, /* 0 or 1 */
-  { TidyAttr_FRAMESPACING,            "framespacing",            CH_NUMBER    }, 
+  { TidyAttr_FRAMESPACING,            "framespacing",            CH_NUMBER    },
   { TidyAttr_GRIDX,                   "gridx",                   CH_NUMBER    }, /* TABLE Adobe golive*/
   { TidyAttr_GRIDY,                   "gridy",                   CH_NUMBER    }, /* TABLE Adobe golive */
   { TidyAttr_HEADERS,                 "headers",                 CH_IDREFS    }, /* table cells */
@@ -168,7 +168,7 @@ static const Attribute attribute_defs [] =
   { TidyAttr_HREFLANG,                "hreflang",                CH_LANG      }, /* A, LINK */
   { TidyAttr_HSPACE,                  "hspace",                  CH_NUMBER    }, /* APPLET, IMG, OBJECT */
   { TidyAttr_HTTP_EQUIV,              "http-equiv",              CH_PCDATA    }, /* META */
-  { TidyAttr_ID,                      "id",                      CH_IDDEF     }, 
+  { TidyAttr_ID,                      "id",                      CH_IDDEF     },
   { TidyAttr_IS,                      "is",                      CH_ISDEF     },
   { TidyAttr_ISMAP,                   "ismap",                   CH_BOOL      }, /* IMG */
   { TidyAttr_ITEMID,                  "itemid",                  CH_PCDATA    },
@@ -177,7 +177,7 @@ static const Attribute attribute_defs [] =
   { TidyAttr_ITEMSCOPE,               "itemscope",               CH_BOOL      },
   { TidyAttr_ITEMTYPE,                "itemtype",                CH_URL       },
   { TidyAttr_LABEL,                   "label",                   CH_PCDATA    }, /* OPT, OPTGROUP */
-  { TidyAttr_LANG,                    "lang",                    CH_LANG      }, 
+  { TidyAttr_LANG,                    "lang",                    CH_LANG      },
   { TidyAttr_LANGUAGE,                "language",                CH_PCDATA    }, /* SCRIPT */
   { TidyAttr_LAST_MODIFIED,           "last_modified",           CH_PCDATA    }, /* A */
   { TidyAttr_LAST_VISIT,              "last_visit",              CH_PCDATA    }, /* A */
@@ -192,21 +192,21 @@ static const Attribute attribute_defs [] =
   { TidyAttr_MEDIA,                   "media",                   CH_MEDIA     }, /* STYLE, LINK */
   { TidyAttr_METHOD,                  "method",                  CH_FSUBMIT   }, /* FORM: get or post */
   { TidyAttr_MULTIPLE,                "multiple",                CH_BOOL      }, /* SELECT */
-  { TidyAttr_NAME,                    "name",                    CH_NAME      }, 
+  { TidyAttr_NAME,                    "name",                    CH_NAME      },
   { TidyAttr_NOHREF,                  "nohref",                  CH_BOOL      }, /* AREA */
   { TidyAttr_NORESIZE,                "noresize",                CH_BOOL      }, /* FRAME */
   { TidyAttr_NOSHADE,                 "noshade",                 CH_BOOL      }, /* HR */
   { TidyAttr_NOWRAP,                  "nowrap",                  CH_BOOL      }, /* table cells */
   { TidyAttr_OBJECT,                  "object",                  CH_PCDATA    }, /* APPLET */
-  { TidyAttr_OnAFTERUPDATE,           "onafterupdate",           CH_SCRIPT    }, 
-  { TidyAttr_OnBEFOREUNLOAD,          "onbeforeunload",          CH_SCRIPT    }, 
-  { TidyAttr_OnBEFOREUPDATE,          "onbeforeupdate",          CH_SCRIPT    }, 
+  { TidyAttr_OnAFTERUPDATE,           "onafterupdate",           CH_SCRIPT    },
+  { TidyAttr_OnBEFOREUNLOAD,          "onbeforeunload",          CH_SCRIPT    },
+  { TidyAttr_OnBEFOREUPDATE,          "onbeforeupdate",          CH_SCRIPT    },
   { TidyAttr_OnBLUR,                  "onblur",                  CH_SCRIPT    }, /* event */
   { TidyAttr_OnCHANGE,                "onchange",                CH_SCRIPT    }, /* event */
   { TidyAttr_OnCLICK,                 "onclick",                 CH_SCRIPT    }, /* event */
   { TidyAttr_OnDATAAVAILABLE,         "ondataavailable",         CH_SCRIPT    }, /* object, applet */
   { TidyAttr_OnDATASETCHANGED,        "ondatasetchanged",        CH_SCRIPT    }, /* object, applet */
-  { TidyAttr_OnDATASETCOMPLETE,       "ondatasetcomplete",       CH_SCRIPT    }, 
+  { TidyAttr_OnDATASETCOMPLETE,       "ondatasetcomplete",       CH_SCRIPT    },
   { TidyAttr_OnDBLCLICK,              "ondblclick",              CH_SCRIPT    }, /* event */
   { TidyAttr_OnERRORUPDATE,           "onerrorupdate",           CH_SCRIPT    }, /* form fields */
   { TidyAttr_OnFOCUS,                 "onfocus",                 CH_SCRIPT    }, /* event */
@@ -229,8 +229,8 @@ static const Attribute attribute_defs [] =
   { TidyAttr_PROMPT,                  "prompt",                  CH_PCDATA    }, /* ISINDEX */
   { TidyAttr_RBSPAN,                  "rbspan",                  CH_NUMBER    }, /* ruby markup */
   { TidyAttr_READONLY,                "readonly",                CH_BOOL      }, /* form fields */
-  { TidyAttr_REL,                     "rel",                     CH_LINKTYPES }, 
-  { TidyAttr_REV,                     "rev",                     CH_LINKTYPES }, 
+  { TidyAttr_REL,                     "rel",                     CH_LINKTYPES },
+  { TidyAttr_REV,                     "rev",                     CH_LINKTYPES },
   { TidyAttr_RIGHTMARGIN,             "rightmargin",             CH_NUMBER    }, /* used on BODY */
   { TidyAttr_ROLE,                    "role",                    CH_PCDATA    },
   { TidyAttr_ROWS,                    "rows",                    CH_NUMBER    }, /* TEXTAREA */
@@ -251,7 +251,7 @@ static const Attribute attribute_defs [] =
   { TidyAttr_SRCSET,                  "srcset",                  CH_PCDATA    }, /* IMG (HTML5) */
   { TidyAttr_STANDBY,                 "standby",                 CH_PCDATA    }, /* OBJECT */
   { TidyAttr_START,                   "start",                   CH_NUMBER    }, /* OL */
-  { TidyAttr_STYLE,                   "style",                   CH_PCDATA    }, 
+  { TidyAttr_STYLE,                   "style",                   CH_PCDATA    },
   { TidyAttr_SUMMARY,                 "summary",                 CH_PCDATA    }, /* TABLE */
   { TidyAttr_TABINDEX,                "tabindex",                CH_NUMBER    }, /* fields, OBJECT  and A */
   { TidyAttr_TARGET,                  "target",                  CH_TARGET    }, /* names a frame/window */
@@ -261,8 +261,8 @@ static const Attribute attribute_defs [] =
   { TidyAttr_TRANSLATE,               "translate",               CH_BOOL      }, /* HTML5 global attribute */
   { TidyAttr_TYPE,                    "type",                    CH_TYPE      }, /* also used by SPACER */
   { TidyAttr_USEMAP,                  "usemap",                  CH_URL       }, /* things with images */
-  { TidyAttr_VALIGN,                  "valign",                  CH_VALIGN    }, 
-  { TidyAttr_VALUE,                   "value",                   CH_PCDATA    }, 
+  { TidyAttr_VALIGN,                  "valign",                  CH_VALIGN    },
+  { TidyAttr_VALUE,                   "value",                   CH_PCDATA    },
   { TidyAttr_VALUETYPE,               "valuetype",               CH_VTYPE     }, /* PARAM: data, ref, object */
   { TidyAttr_VERSION,                 "version",                 CH_PCDATA    }, /* HTML <?xml?> */
   { TidyAttr_VLINK,                   "vlink",                   CH_COLOR     }, /* BODY */
@@ -537,13 +537,13 @@ Bool TY_(AttributeIsProprietary)(Node* node, AttVal* attval)
 Bool TY_(AttributeIsMismatched)(Node* node, AttVal* attval, TidyDocImpl* doc)
 {
     uint doctype;
-    
+
     if (!node || !attval)
         return no;
-    
+
     if (!node->tag)
         return no;
-    
+
     if (!(node->tag->versions & VERS_ALL))
         return no;
 
@@ -551,7 +551,7 @@ Bool TY_(AttributeIsMismatched)(Node* node, AttVal* attval, TidyDocImpl* doc)
 
     if (AttributeVersions(node, attval) & doctype)
         return no;
-    
+
     return yes;
 }
 
@@ -646,7 +646,7 @@ static void attrsRemoveFromHash( TidyDocImpl* doc, TidyAttribImpl *attribs,
         {
             AttrHash* next = p->next;
             if ( prev )
-                prev->next = next; 
+                prev->next = next;
             else
                 attribs->hashtab[h] = next;
             TidyDocFree(doc, p);
@@ -744,7 +744,7 @@ void TY_(DropAttrByName)( TidyDocImpl* doc, Node *node, ctmbstr name )
             else
                  node->attributes = next;
 
-            TY_(FreeAttribute)( doc, attr ); 
+            TY_(FreeAttribute)( doc, attr );
             break;
         }
     }
@@ -960,7 +960,7 @@ static uint anchorNameHash(ctmbstr s)
 {
     uint hashval = 0;
     /* Issue #149 - an inferred name can be null. avoid crash */
-    if (s) 
+    if (s)
     {
         for ( ; *s != '\0'; s++) {
             tmbchar c = TY_(ToLower)( *s );
@@ -979,7 +979,7 @@ static uint anchorNameHash5(ctmbstr s)
 {
     uint hashval = 0;
     /* Issue #149 - an inferred name can be null. avoid crash */
-    if (s) 
+    if (s)
     {
         for ( ; *s != '\0'; s++) {
             tmbchar c = *s;
@@ -990,8 +990,8 @@ static uint anchorNameHash5(ctmbstr s)
 }
 
 
-/*\ 
- *  removes anchor for specific node 
+/*\
+ *  removes anchor for specific node
  *  Issue #185 - Treat elements ids as case-sensitive
  *  if in HTML5 modes, make hash of value AS IS!
 \*/
@@ -1021,7 +1021,7 @@ void TY_(RemoveAnchorByNode)( TidyDocImpl* doc, ctmbstr name, Node *node )
     FreeAnchor( doc, delme );
 }
 
-/* initialize new anchor 
+/* initialize new anchor
    Is. #726 & #185 - HTML5 is case-sensitive
 */
 static Anchor* NewAnchor( TidyDocImpl* doc, ctmbstr name, Node* node )
@@ -1038,7 +1038,7 @@ static Anchor* NewAnchor( TidyDocImpl* doc, ctmbstr name, Node* node )
 }
 
 /*\
- *  add new anchor to namespace 
+ *  add new anchor to namespace
  *  Issue #185 - Treat elements ids as case-sensitive
  *  if in HTML5 modes, make hash of value AS IS!
 \*/
@@ -1066,7 +1066,7 @@ static Anchor* AddAnchor( TidyDocImpl* doc, ctmbstr name, Node *node )
 }
 
 /*\
- *  return node associated with anchor 
+ *  return node associated with anchor
  *  Issue #185 - Treat elements ids as case-sensitive
  *  if in HTML5 modes, make hash of value AS IS!
 \*/
@@ -1090,7 +1090,7 @@ static Node* GetNodeByAnchor( TidyDocImpl* doc, ctmbstr name )
         if ( TY_(tmbstrcmp)(found->name, lname) == 0 )
             break;
     }
-    
+
     TidyDocFree(doc, lname);
     if ( found )
         return found->node;
@@ -1323,7 +1323,7 @@ const Attribute* TY_(CheckAttribute)( TidyDocImpl* doc, Node *node, AttVal *attv
         }
 
         TY_(ConstrainVersion)(doc, AttributeVersions(node, attval));
-        
+
         if (attribute->attrchk)
             attribute->attrchk( doc, node, attval );
     }
@@ -1376,12 +1376,12 @@ static void CheckLowerCaseAttrValue( TidyDocImpl* doc, Node *node, AttVal *attva
 {
     tmbstr p;
     Bool hasUpper = no;
-    
+
     if (!AttrHasValue(attval))
         return;
 
     p = attval->value;
-    
+
     while (*p)
     {
         if (TY_(IsUpper)(*p)) /* #501230 - fix by Terry Teague - 09 Jan 02 */
@@ -1397,7 +1397,7 @@ static void CheckLowerCaseAttrValue( TidyDocImpl* doc, Node *node, AttVal *attva
         Lexer* lexer = doc->lexer;
         if (lexer->isvoyager)
             TY_(ReportAttrError)( doc, node, attval, ATTR_VALUE_NOT_LCASE);
-  
+
         if ( lexer->isvoyager || cfgBool(doc, TidyLowerLiterals) )
             attval->value = TY_(tmbstrtolower)(attval->value);
     }
@@ -1508,7 +1508,7 @@ void TY_(CheckUrl)( TidyDocImpl* doc, Node *node, AttVal *attval)
         Bool hadnonspace = no;
         len = TY_(tmbstrlen)(p) + escape_count * 2 + 1;
         dest = (tmbstr) TidyDocAlloc(doc, len);
- 
+
         for (i = 0; 0 != (c = p[i]); ++i)
         {
             if ((c > 0x7e) || (c <= 0x20) || (strchr("<>", c)))
@@ -1647,7 +1647,7 @@ static Bool IsValidNMTOKEN(ctmbstr name)
 
 static Bool AttrValueIsAmong(AttVal *attval, ctmbstr const list[])
 {
-    const ctmbstr *v;   
+    const ctmbstr *v;
     for (v = list; *v; ++v)
         if (AttrValueIs(attval, *v))
             return yes;
@@ -1837,7 +1837,7 @@ void CheckValign( TidyDocImpl* doc, Node *node, AttVal *attval)
 void CheckLength( TidyDocImpl* doc, Node *node, AttVal *attval)
 {
     tmbstr p;
-    
+
     if (!AttrHasValue(attval))
     {
         TY_(ReportAttrError)( doc, node, attval, MISSING_ATTR_VALUE);
@@ -1849,7 +1849,7 @@ void CheckLength( TidyDocImpl* doc, Node *node, AttVal *attval)
         return;
 
     p = attval->value;
-    
+
     if (!TY_(IsDigit)(*p++))
     {
         TY_(ReportAttrError)( doc, node, attval, BAD_ATTRIBUTE_VALUE);
@@ -1912,7 +1912,7 @@ void CheckClear( TidyDocImpl* doc, Node *node, AttVal *attval)
     }
 
     CheckLowerCaseAttrValue( doc, node, attval );
-        
+
     if (!AttrValueIsAmong(attval, values))
         TY_(ReportAttrError)( doc, node, attval, BAD_ATTRIBUTE_VALUE);
 }
@@ -1932,7 +1932,7 @@ void CheckScope( TidyDocImpl* doc, Node *node, AttVal *attval)
 void CheckNumber( TidyDocImpl* doc, Node *node, AttVal *attval)
 {
     tmbstr p;
-    
+
     if (!AttrHasValue(attval))
     {
         TY_(ReportAttrError)( doc, node, attval, MISSING_ATTR_VALUE);
@@ -1945,7 +1945,7 @@ void CheckNumber( TidyDocImpl* doc, Node *node, AttVal *attval)
      return;
 
     p  = attval->value;
-    
+
     /* font size may be preceded by + or - */
     if ( nodeIsFONT(node) && (*p == '+' || *p == '-') )
         ++p;
@@ -2147,7 +2147,7 @@ static void CheckDecimal( TidyDocImpl* doc, Node *node, AttVal *attval)
                 TY_(ReportAttrError)( doc, node, attval, BAD_ATTRIBUTE_VALUE);
                 break;
         }
-        
+
         if (!TY_(IsDigit)(*p))
         {
             TY_(ReportAttrError)( doc, node, attval, BAD_ATTRIBUTE_VALUE);
@@ -2214,7 +2214,7 @@ static void CheckSvgAttr( TidyDocImpl* doc, Node *node, AttVal *attval)
                 CheckLowerCaseAttrValue(doc, node, attval);
             else
                 CheckColor(doc, node, attval);
-        } 
+        }
         else if (attrIsSVG_FILLRULE(attval))
         {
             static ctmbstr const values[] = {"nonzero", "evenodd", NULL};
@@ -2315,14 +2315,14 @@ void TY_(SortAttributes)(TidyDocImpl* doc, Node* node, TidyAttrSortStrategy stra
 
 /**
 * Attribute sorting contributed by Adrian Wilkins, 2007
-* 
+*
 * Portions copyright Simon Tatham 2001.
 *
-* Merge sort algortithm adpated from listsort.c linked from 
+* Merge sort algortithm adpated from listsort.c linked from
 * http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html
-* 
+*
 * Original copyright notice proceeds below.
-* 
+*
 * Permission is hereby granted, free of charge, to any person
 * obtaining a copy of this software and associated documentation
 * files (the "Software"), to deal in the Software without
@@ -2331,10 +2331,10 @@ void TY_(SortAttributes)(TidyDocImpl* doc, Node* node, TidyAttrSortStrategy stra
 * sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following
 * conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -2529,7 +2529,7 @@ AttVal *SortAttVal( TidyDocImpl* doc, AttVal *list, TidyAttrSortStrategy strat)
  * correct
  *
  * @prefix takes prefix value pairs in the form:
- * 
+ *
  *      NCName ':' ' '+ AnyURI
  */
 
diff --git a/src/buffio.c b/src/buffio.c
index 31a29c480..64edf2bdb 100644
--- a/src/buffio.c
+++ b/src/buffio.c
@@ -118,7 +118,7 @@ void TIDY_CALL tidyBufCheckAlloc( TidyBuffer* buf, uint allocSize, uint chunkSiz
 
     if ( !buf->allocator )
         setDefaultAllocator( buf );
-        
+
     if ( 0 == chunkSize )
         chunkSize = 256;
     if ( allocSize+1 > buf->allocated )
diff --git a/src/clean.c b/src/clean.c
index 6602ff9c5..4d77a6acc 100644
--- a/src/clean.c
+++ b/src/clean.c
@@ -18,13 +18,13 @@
   Such rules are applied to the element's content and then
   to the element itself until none of the rules more apply.
   Having applied all the rules to an element, it will have
-  a style attribute with one or more properties. 
+  a style attribute with one or more properties.
 
   Other rules strip the element they apply to, replacing
   it by style properties on the contents, e.g.
-  
+
   <dir><li><p>...</li></dir> -> <p style="margin-left 1em">...
-      
+
   These rules are applied to an element before processing
   its content and replace the current element by the first
   element in the exposed content.
@@ -411,7 +411,7 @@ static void CleanBodyAttrs( TidyDocImpl* doc, Node* body )
     tmbstr bgcolor = NULL;
     tmbstr color   = NULL;
     AttVal* attr;
-    
+
     if (NULL != (attr = TY_(AttrGetById)(body, TidyAttr_BACKGROUND)))
     {
         bgurl = attr->value;
@@ -1206,7 +1206,7 @@ Bool FindCSSSpanEq( Node *node, ctmbstr *s, Bool deprecatedOnly )
             *s = CSS_SpanEq[i].CSSeq;
             return yes;
         }
-    return no; 
+    return no;
 }
 
 /* Necessary conditions to apply BlockStyle(). */
@@ -1352,7 +1352,7 @@ static Bool InlineElementToCSS( TidyDocImpl* doc, Node* node,
         return yes;
     }
     return no;
-} 
+}
 
 /*
   Replace font elements by span elements, deleting
@@ -1491,7 +1491,7 @@ static void DefineStyleRules( TidyDocImpl* doc, Node *node )
 void TY_(CleanDocument)( TidyDocImpl* doc )
 {
     /* placeholder.  CleanTree()/CleanNode() will not
-    ** zap root element 
+    ** zap root element
     */
     CleanTree( doc, &doc->root );
 
@@ -1640,7 +1640,7 @@ static Node* PruneSection( TidyDocImpl* doc, Node *node )
     {
         if (node == NULL)
             return NULL;
-        
+
         ctmbstr lexbuf = lexer->lexbuf + node->start;
         if ( TY_(tmbstrncmp)(lexbuf, "if !supportEmptyParas", 21) == 0 )
         {
@@ -1663,7 +1663,7 @@ static Node* PruneSection( TidyDocImpl* doc, Node *node )
 
         if (node == NULL)
             return NULL;
-        
+
         if (node->type == SectionTag)
         {
             if (TY_(tmbstrncmp)(lexer->lexbuf + node->start, "if", 2) == 0)
@@ -1899,7 +1899,7 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
             /* Output proprietary attributes to maintain errout compatability
              * with traditional Tidy. This is a result of moving all of the
              * proprietary checks to near the end of the cleanup process,
-             * meaning this result would not ordinarily be displayed. 
+             * meaning this result would not ordinarily be displayed.
              */
             attval = node->attributes;
             while ( attval ) {
@@ -2009,7 +2009,7 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
         if ( nodeIsP(node) )
         {
             AttVal *attr, *atrStyle;
-            
+
             attr = TY_(AttrGetById)(node, TidyAttr_CLASS);
             atrStyle = TY_(AttrGetById)(node, TidyAttr_STYLE);
             /*
@@ -2093,7 +2093,7 @@ Bool TY_(IsWord2000)( TidyDocImpl* doc )
 
     if (html && TY_(GetAttrByName)(html, "xmlns:o"))
         return yes;
-    
+
     /* search for <meta name="GENERATOR" content="Microsoft ..."> */
     head = TY_(FindHEAD)( doc );
 
@@ -2215,7 +2215,7 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
     tidyBufAppend(&charsetString, "\0", 1); /* zero terminate the buffer */
     /* process the children of the head */
     /* Issue #656 - guard against 'currentNode' being set NULL in loop */
-    for (currentNode = head->content; currentNode; 
+    for (currentNode = head->content; currentNode;
         currentNode = (currentNode ? currentNode->next : NULL))
     {
         if (!nodeIsMETA(currentNode))
@@ -2467,7 +2467,7 @@ void TY_(WbrToSpace)(TidyDocImpl* doc, Node* node)
     <p title='&#x2018;'>...</p>
 
   got
-  
+
     <p title='''>...</p>
 
   Since browser support is much better nowadays and
@@ -2615,7 +2615,7 @@ void TY_(FixLanguageInformation)(TidyDocImpl* doc, Node* node, Bool wantXmlLang,
 
             if (lang && !wantLang)
                 TY_(RemoveAttribute)(doc, node, lang);
-            
+
             if (xmlLang && !wantXmlLang)
                 TY_(RemoveAttribute)(doc, node, xmlLang);
         }
@@ -2731,7 +2731,7 @@ void TY_(FixAnchors)(TidyDocImpl* doc, Node *node, Bool wantName, Bool wantId)
     }
 }
 
-/* Issue #567 - move style elements from body to head 
+/* Issue #567 - move style elements from body to head
  * ==================================================
  */
 static void StyleToHead(TidyDocImpl* doc, Node *head, Node *node, Bool fix, int indent)
diff --git a/src/config.c b/src/config.c
index bae56b8ff..bde2b2059 100644
--- a/src/config.c
+++ b/src/config.c
@@ -731,7 +731,7 @@ void TY_(ResetConfigToSnapshot)( TidyDocImpl* doc )
     uint changedUserTags;
     Bool needReparseTagsDecls = NeedReparseTagDecls( doc, value, snap,
                                                      &changedUserTags );
-    
+
     for ( ixVal=0; ixVal < N_TIDY_OPTIONS; ++option, ++ixVal )
     {
         assert( ixVal == (uint) option->id );
@@ -984,7 +984,7 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
         tchar c;
         cfg->cfgIn = TY_(FileInput)( doc, fin, enc );
         c = FirstChar( cfg );
-       
+
         for ( c = SkipWhite(cfg); c != EndOfStream; c = NextProperty(cfg) )
         {
             uint ix = 0;
@@ -1047,7 +1047,7 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
                             c = AdvanceChar( cfg );
                         }
                         buf[i] = '\0';
-                        
+
                         if ( doc->pOptCallback )
                             response = (*doc->pOptCallback)( name, buf );
 
@@ -1077,7 +1077,7 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc )
     AdjustConfig( doc );
 
     /* any new config errors? If so, return warning status. */
-    return (doc->optionErrors > opterrs ? 1 : 0); 
+    return (doc->optionErrors > opterrs ? 1 : 0);
 }
 
 
@@ -1158,7 +1158,7 @@ Bool  TY_(AdjustCharEncoding)( TidyDocImpl* doc, int encoding )
 {
     int outenc = -1;
     int inenc = -1;
-    
+
     switch( encoding )
     {
     case MACROMAN:
@@ -1275,7 +1275,7 @@ static void AdjustConfig( TidyDocImpl* doc )
         ulong enc = cfg( doc, TidyOutCharEncoding );
         if ( enc == UTF16LE || enc == UTF16BE || enc == UTF16 )
             TY_(SetOptionInt)( doc, TidyOutputBOM, yes );
-        
+
         TY_(SetOptionBool)( doc, TidyQuoteAmpersand, yes );
         TY_(SetOptionBool)( doc, TidyOmitOptionalTags, no );
     }
@@ -1571,7 +1571,7 @@ static Bool GetParsePickListValue( TidyDocImpl* doc, const TidyOptionImpl* entry
 Bool ParsePickList( TidyDocImpl* doc, const TidyOptionImpl* entry )
 {
     uint value;
-    
+
     if ( GetParsePickListValue( doc, entry, &value ) )
     {
         if ( entry->type == TidyBoolean )
@@ -1580,7 +1580,7 @@ Bool ParsePickList( TidyDocImpl* doc, const TidyOptionImpl* entry )
             TY_(SetOptionInt)( doc, entry->id, value );
         return yes;
     }
-  
+
     TY_(ReportBadArgument)( doc, entry->name );
     return no;
 }
@@ -1595,7 +1595,7 @@ Bool ParseTabs( TidyDocImpl* doc, const TidyOptionImpl* entry )
 {
     uint flag = 0;
     Bool status = GetParsePickListValue( doc, entry, &flag );
-    
+
     if ( status ) {
         Bool tabs = flag != 0 ? yes : no;
         TY_(SetOptionBool)( doc, entry->id, tabs );
@@ -1749,7 +1749,7 @@ Bool ParseDocType( TidyDocImpl* doc, const TidyOptionImpl* option )
         }
         return status;
     }
-    
+
     if ( (status = GetParsePickListValue( doc, option, &value ) ) )
     {
         TY_(SetOptionInt)( doc, TidyDoctypeMode, value );
@@ -1758,7 +1758,7 @@ Bool ParseDocType( TidyDocImpl* doc, const TidyOptionImpl* option )
     {
         TY_(ReportBadArgument)( doc, option->name );
     }
-    
+
     return status;
 }
 
@@ -1812,7 +1812,7 @@ ctmbstr      TY_(getNextOptionPick)( const TidyOptionImpl* option,
     assert( option!=NULL && iter != NULL );
 
     ix = (size_t) *iter;
-    
+
     if ( option->pickList )
     {
         if ( ix > 0 && ix < TIDY_PL_SIZE && option->pickList )
@@ -1823,7 +1823,7 @@ ctmbstr      TY_(getNextOptionPick)( const TidyOptionImpl* option,
         item = &(*option->pickList)[ ix ];
         *iter = (TidyIterator) ( val && item->label ? ix + 1 : (size_t)0 );
     }
-    
+
     return val;
 }
 
@@ -1863,7 +1863,7 @@ static int  WriteOptionPick( const TidyOptionImpl* option, uint ival, StreamOut*
 {
     uint ix = 0;
     const PickListItem *item = NULL;
-    
+
     if ( option-> pickList )
     {
         while ( (item = &(*option->pickList)[ ix ]) && item->label && ix<ival )
@@ -1873,7 +1873,7 @@ static int  WriteOptionPick( const TidyOptionImpl* option, uint ival, StreamOut*
         if ( ix==ival && item->label )
             return WriteOptionString( option, item->label, out );
     }
-    
+
     return -1;
 }
 
@@ -1917,16 +1917,16 @@ static int  SaveConfigToStream( TidyDocImpl* doc, StreamOut* out )
           if ( dtmode == TidyDoctypeUser )
           {
             tmbstr t;
-            
+
             /* add 2 double quotes */
             if (( t = (tmbstr)TidyDocAlloc( doc, TY_(tmbstrlen)( val->p ) + 2 ) ))
             {
               t[0] = '\"'; t[1] = 0;
-            
+
               TY_(tmbstrcat)( t, val->p );
               TY_(tmbstrcat)( t, "\"" );
               rc = WriteOptionString( option, t, out );
-            
+
               TidyDocFree( doc, t );
             }
           }
diff --git a/src/config.h b/src/config.h
index d89338d01..558e50850 100644
--- a/src/config.h
+++ b/src/config.h
@@ -18,7 +18,7 @@
  * the start of a line signifies a line continuation.
  *
  * @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
@@ -69,7 +69,7 @@ typedef struct PickListItem {
 } PickListItem;
 
 
-/** An array of PickListItems, fixed in size for in-code declarations. 
+/** 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
  ** a best practice, however, to assign a public enum value with the proper
diff --git a/src/entities.c b/src/entities.c
index c1b4453d9..2cb12badb 100644
--- a/src/entities.c
+++ b/src/entities.c
@@ -4,7 +4,7 @@
   See tidy.h for the copyright notice.
 
   Entity handling can be static because there are no config or
-  document-specific values.  Lookup table is 100% defined at 
+  document-specific values.  Lookup table is 100% defined at
   compile time.
 
 */
@@ -31,9 +31,9 @@ struct _entity
 /*
 ** Issue #643 - list increased to
 ** 2032 known entities.
-** Note also stuct /not/ padded to 
+** Note also stuct /not/ padded to
 ** keep source weight down, 79K vs 149K,
-** and is strictly alphabetic to optimize 
+** and is strictly alphabetic to optimize
 ** the searching.
 ** All new entities have been given VERS_CHECK
 ** This should be replaced if versioning can
@@ -2077,13 +2077,13 @@ static const entity entities[] =
     { NULL, VERS_UNKNOWN, 0 },
 };
 
-/* 
+/*
 ** 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 
+** 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.
 **
@@ -2160,7 +2160,7 @@ Bool TY_(EntityInfo)( ctmbstr name, Bool isXml, uint* code, uint* versions )
 
 /*
 **
-** Issue #643 - Now that the list has been enlarged to 
+** 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.
diff --git a/src/fileio.h b/src/fileio.h
index a0e0df9a7..a62186b45 100644
--- a/src/fileio.h
+++ b/src/fileio.h
@@ -3,7 +3,7 @@
 
 /** @file fileio.h - does standard C I/O
 
-  Implementation of a FILE* based TidyInputSource and 
+  Implementation of a FILE* based TidyInputSource and
   TidyOutputSink.
 
   (c) 1998-2007 (W3C) MIT, ERCIM, Keio University
diff --git a/src/forward.h b/src/forward.h
index 7f5937156..75126fe85 100644
--- a/src/forward.h
+++ b/src/forward.h
@@ -61,6 +61,6 @@ extern TidyAllocator TY_(g_default_allocator);
 #define TidyFree(allocator, block) ((allocator)->vtbl->free((allocator), (block)))
 #define TidyPanic(allocator, msg) ((allocator)->vtbl->panic((allocator), (msg)))
 #define TidyClearMemory(block, size) memset((block), 0, (size))
- 
+
 
 #endif /* __FORWARD_H__ */
diff --git a/src/gdoc.c b/src/gdoc.c
index 50cd9bc33..f826ad8f0 100644
--- a/src/gdoc.c
+++ b/src/gdoc.c
@@ -18,13 +18,13 @@
   Such rules are applied to the element's content and then
   to the element itself until none of the rules more apply.
   Having applied all the rules to an element, it will have
-  a style attribute with one or more properties. 
+  a style attribute with one or more properties.
 
   Other rules strip the element they apply to, replacing
   it by style properties on the contents, e.g.
-  
+
   <dir><li><p>...</li></dir> -> <p style="margin-left 1em">...
-      
+
   These rules are applied to an element before processing
   its content and replace the current element by the first
   element in the exposed content.
@@ -163,7 +163,7 @@ static void SetUTF8( TidyDocImpl* doc )
 void TY_(CleanGoogleDocument)( TidyDocImpl* doc )
 {
     /* placeholder.  CleanTree()/CleanNode() will not
-    ** zap root element 
+    ** zap root element
     */
     CleanNode( doc, &doc->root );
     SetUTF8( doc );
diff --git a/src/istack.c b/src/istack.c
index 5097de024..55a5a9b4e 100644
--- a/src/istack.c
+++ b/src/istack.c
@@ -2,7 +2,7 @@
 
   (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
-  
+
 */
 
 #include "tidy-int.h"
@@ -264,7 +264,7 @@ Node *TY_(InsertedToken)( TidyDocImpl* doc )
     node->type = StartTag;
     node->implicit = yes;
     node->start = lexer->txtstart;
-    /* #431734 [JTidy bug #226261 (was 126261)] - fix by Gary Peskin 20 Dec 00 */ 
+    /* #431734 [JTidy bug #226261 (was 126261)] - fix by Gary Peskin 20 Dec 00 */
     node->end = lexer->txtend; /* was : lexer->txtstart; */
     istack = lexer->insert;
 
@@ -307,7 +307,7 @@ Bool TY_(SwitchInline)( TidyDocImpl* doc, Node* element, Node* node )
          && element && element->tag
          && node && node->tag
          && TY_(IsPushed)( doc, element )
-         && TY_(IsPushed)( doc, node ) 
+         && TY_(IsPushed)( doc, node )
          && ((lexer->istacksize - lexer->istackbase) >= 2) )
     {
         /* we have a chance of succeeding ... */
diff --git a/src/language.c b/src/language.c
index 37e15102e..25fbaea29 100644
--- a/src/language.c
+++ b/src/language.c
@@ -222,7 +222,7 @@ static const tidyLocaleMapItemImpl localeMappings[] = {
     { "united-states",          "en_us" },
     { "us",                     "en_us" },
     { "usa",                    "en_us" },
-    
+
     /* MUST be last. */
     { NULL,                     NULL    }
 };
@@ -236,7 +236,7 @@ static ctmbstr tidyLocalizedStringImpl( uint messageType, languageDefinition *de
     int i;
     languageDictionary *dictionary = &definition->messages;
     uint pluralForm = definition->whichPluralForm(plural);
-    
+
     for (i = 0; (*dictionary)[i].value; ++i)
     {
         if ( (*dictionary)[i].key == messageType && (*dictionary)[i].pluralForm == pluralForm )
@@ -260,26 +260,26 @@ static ctmbstr tidyLocalizedStringImpl( uint messageType, languageDefinition *de
 ctmbstr TY_(tidyLocalizedStringN)( uint messageType, uint quantity )
 {
     ctmbstr result;
-    
+
     result  = tidyLocalizedStringImpl( messageType, tidyLanguages.currentLanguage, quantity);
-    
+
     if (!result && tidyLanguages.fallbackLanguage )
     {
         result = tidyLocalizedStringImpl( messageType, tidyLanguages.fallbackLanguage, quantity);
     }
-    
+
     if (!result)
     {
         /* Fallback to en which is built in. */
         result = tidyLocalizedStringImpl( messageType, &language_en, quantity);
     }
-    
+
     if (!result)
     {
         /* Last resort: Fallback to en singular which is built in. */
         result = tidyLocalizedStringImpl( messageType, &language_en, 1);
     }
-    
+
     return result;
 }
 
@@ -313,7 +313,7 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
 
     tmbstr search = TY_(tmbstrdup)( allocator, locale );
     search = TY_(tmbstrtolower)(search);
-    
+
     /* See if our string matches a Windows name. */
     for (i = 0; localeMappings[i].winName; ++i)
     {
@@ -324,15 +324,15 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
             break;
         }
     }
-    
+
     /* We're going to be stupid about this and trust the user, and
      return just the first two characters if they exist and the
      4th and 5th if they exist. The worst that can happen is a
      junk language that doesn't exist and won't be set. */
-    
+
     len = strlen( search );
     len = ( len <= 5 ? len : 5 );
-    
+
     for ( i = 0; i < len; i++ )
     {
         if ( i == 2 )
@@ -351,7 +351,7 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
             result[i] = tolower( search[i] );
         }
     }
-    
+
     TidyFree( allocator, search );
     return result;
 }
@@ -367,17 +367,17 @@ languageDefinition *TY_(tidyTestLanguage)( ctmbstr languageCode )
     languageDefinition *testLang;
     languageDictionary *testDict;
     ctmbstr testCode;
-    
+
     for (i = 0; tidyLanguages.languages[i]; ++i)
     {
         testLang = tidyLanguages.languages[i];
         testDict = &testLang->messages;
         testCode = (*testDict)[0].value;
-        
+
         if ( strcmp(testCode, languageCode) == 0 )
             return testLang;
     }
-    
+
     return NULL;
 }
 
@@ -399,26 +399,26 @@ Bool TY_(tidySetLanguage)( ctmbstr languageCode )
     languageDefinition *dict2 = NULL;
     tmbstr wantCode = NULL;
     char lang[3] = "";
-    
+
     if ( !languageCode || !(wantCode = TY_(tidyNormalizedLocaleName)( languageCode )) )
     {
         return no;
     }
-    
+
     /* We want to use the specified language as the currentLanguage, and set
      fallback language as necessary. We have either a two or five digit code,
      either or both of which might be installed. Let's test both of them:
      */
-    
+
     dict1 = TY_(tidyTestLanguage( wantCode ));  /* WANTED language */
-    
+
     if ( strlen( wantCode ) > 2 )
     {
         strncpy(lang, wantCode, 2);
         lang[2] = '\0';
         dict2 = TY_(tidyTestLanguage( lang ) ); /* BACKUP language? */
     }
-    
+
     if ( dict1 && dict2 )
     {
         tidyLanguages.currentLanguage = dict1;
@@ -438,7 +438,7 @@ Bool TY_(tidySetLanguage)( ctmbstr languageCode )
     {
         /* No change. */
     }
-    
+
     return dict1 || dict2;
 }
 
@@ -491,14 +491,14 @@ ctmbstr TY_(tidyDefaultString)( uint messageType )
 static const uint tidyStringKeyListSize()
 {
     static uint array_size = 0;
-    
+
     if ( array_size == 0 )
     {
         while ( language_en.messages[array_size].value != NULL ) {
             array_size++;
         }
     }
-    
+
     return array_size;
 }
 
@@ -525,15 +525,15 @@ uint TY_(getNextStringKey)( TidyIterator* iter )
     uint item = 0;
     size_t itemIndex;
     assert( iter != NULL );
-    
+
     itemIndex = (size_t)*iter;
-    
+
     if ( itemIndex > 0 && itemIndex <= tidyStringKeyListSize() )
     {
         item = language_en.messages[ itemIndex - 1 ].key;
         itemIndex++;
     }
-    
+
     *iter = (TidyIterator)( itemIndex <= tidyStringKeyListSize() ? itemIndex : (size_t)0 );
     return item;
 }
@@ -546,14 +546,14 @@ uint TY_(getNextStringKey)( TidyIterator* iter )
 static const uint tidyLanguageListSize()
 {
     static uint array_size = 0;
-    
+
     if ( array_size == 0 )
     {
         while ( localeMappings[array_size].winName ) {
             array_size++;
         }
     }
-    
+
     return array_size;
 }
 
@@ -576,15 +576,15 @@ const tidyLocaleMapItemImpl *TY_(getNextWindowsLanguage)( TidyIterator *iter )
     const tidyLocaleMapItemImpl *item = NULL;
     size_t itemIndex;
     assert( iter != NULL );
-    
+
     itemIndex = (size_t)*iter;
-    
+
     if ( itemIndex > 0 && itemIndex <= tidyLanguageListSize() )
     {
         item = &localeMappings[ itemIndex -1 ];
         itemIndex++;
     }
-    
+
     *iter = (TidyIterator)( itemIndex <= tidyLanguageListSize() ? itemIndex : (size_t)0 );
     return item;
 }
@@ -614,14 +614,14 @@ ctmbstr TY_(TidyLangPosixName)( const tidyLocaleMapItemImpl *item )
 static const uint tidyInstalledLanguageListSize()
 {
     static uint array_size = 0;
-    
+
     if ( array_size == 0 )
     {
         while ( tidyLanguages.languages[array_size] ) {
             array_size++;
         }
     }
-    
+
     return array_size;
 }
 
@@ -643,15 +643,15 @@ ctmbstr TY_(getNextInstalledLanguage)( TidyIterator* iter )
     ctmbstr item = NULL;
     size_t itemIndex;
     assert( iter != NULL );
-    
+
     itemIndex = (size_t)*iter;
-    
+
     if ( itemIndex > 0 && itemIndex <= tidyInstalledLanguageListSize() )
     {
         item = tidyLanguages.languages[itemIndex - 1]->messages[0].value;
         itemIndex++;
     }
-    
+
     *iter = (TidyIterator)( itemIndex <= tidyInstalledLanguageListSize() ? itemIndex : (size_t)0 );
     return item;
 }
diff --git a/src/language.h b/src/language.h
index e05313e38..3d77a08f5 100644
--- a/src/language.h
+++ b/src/language.h
@@ -6,7 +6,7 @@
  *
  * This header provides the public (within libtidy) interface to
  * basic localization support. To add your own localization, create
- * a new `language_xx.h` file and add it to the struct in 
+ * a new `language_xx.h` file and add it to the struct in
  * `language.c`.
  *
  * (c) 2015 HTACG
@@ -26,13 +26,13 @@
  *  therein.
  */
 typedef enum {
-    
+
     /* Specifies the language code for a particular language. */
     TIDY_LANGUAGE = 400,
-    
+
     /* Marker for the last key in the structure. */
     TIDY_MESSAGE_TYPE_LAST
-    
+
 } tidyLanguage;
 
 
diff --git a/src/language_en.h b/src/language_en.h
index a77433c29..f58b49ef5 100644
--- a/src/language_en.h
+++ b/src/language_en.h
@@ -1267,7 +1267,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "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. " 
+        "output. "
     },
     {/* Important notes for translators:
       - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and
@@ -1695,8 +1695,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TidyDialogueSummary,    0,   "Summary: "       },
     { TidyDialogueInfo,       0,   "Information: "   },
     { TidyDialogueFootnote,   0,   "Footnote: "      },
-    
-    
+
+
     /********************************************
      ** Miscellaneous Strings
      ** @remark enum source TidyStrings
@@ -1728,8 +1728,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TIDYCUSTOMEMPTY_STRING,       0,   "empty"                                                                   },
     { TIDYCUSTOMINLINE_STRING,      0,   "inline"                                                                  },
     { TIDYCUSTOMPRE_STRING,         0,   "pre"                                                                     },
-  
-    
+
+
     /********************************************
      ** Footnote Strings
      ** @remark enum source TidyStrings
@@ -1900,7 +1900,7 @@ 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
@@ -1930,7 +1930,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "Validate your HTML documents: http://validator.w3.org/nu/\n"
         "Lobby your company to join the W3C: http://www.w3.org/Consortium\n"
     },
-    {/* This console output should be limited to 78 characters per line. 
+    {/* 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.
       - Don't terminate the last line with a newline. */
       TEXT_GENERAL_INFO_PLEA,       0,
@@ -1938,13 +1938,13 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "English? Consider helping us to localize HTML Tidy. For details please see \n"
         "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md"
     },
-    
+
 
     /********************************************
      ** Report Output
      ** @remark enum source TidyStrings
      ** @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"                                        },
     { ANCHOR_DUPLICATED,            0,   "Implicit %s anchor \"%s\" duplicated by Tidy."                           },
@@ -2179,8 +2179,8 @@ 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."                                        },
-    
-    
+
+
 #if SUPPORT_CONSOLE_APP
     /********************************************************
      ** Console Application
@@ -2264,7 +2264,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { TC_OPT_XMLERRS,               0,   "output error constants and strings in XML format"                        },
 
     { TC_OPT_XMLOPTS,               0,   "output option descriptions in XML format"                                },
-    
+
     { TC_STRING_CONF_HEADER,        0,   "Configuration File Settings:"                                            },
 
     {/* Must be 27 characters or fewer. */
@@ -2326,7 +2326,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
       TC_TXT_HELP_2B,               0,
         "Command Line Arguments for HTML Tidy:"
     },
-    {/* This console output should be limited to 78 characters per line. 
+    {/* 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.
         - %s represents either a blank line, or TC_TXT_HELP_3A explaining environment options. */
       TC_TXT_HELP_3,                0,
@@ -2495,7 +2495,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
         "\n"
     },
 #endif /* SUPPORT_CONSOLE_APP */
-    
+
     {/* This MUST be present and last. */
       TIDY_MESSAGE_TYPE_LAST,      0,   NULL
     }
diff --git a/src/language_en_gb.h b/src/language_en_gb.h
index 71c37e4f8..670d4d937 100644
--- a/src/language_en_gb.h
+++ b/src/language_en_gb.h
@@ -13,7 +13,7 @@
  *
  * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
  *     language (and maybe region) "en_gb". The source of
- *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     these strings is a gettext PO file in Tidy's source, probably called
  *     "language_en_gb.po".
  *
  * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
@@ -55,13 +55,13 @@ static uint whichPluralForm_en_gb(uint n) {
  */
 static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
     /***************************************
-     ** This MUST be present and first. 
+     ** This MUST be present and first.
      ** Specify the code for this language.
      ***************************************/
     {/* Specify the ll or ll_cc language code here. */
       TIDY_LANGUAGE,                    0, "en_gb"
     },
-    { TidyAsciiChars,                   0,        
+    { TidyAsciiChars,                   0,
         "Can be used to modify behaviour of the <code>clean</code> option when set "
         "to <var>yes</var>. "
         "<br/>"
@@ -69,11 +69,11 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
         "<code>&amp;emdash;</code>, <code>&amp;rdquo;</code>, and other named "
         "character entities are downgraded to their closest ASCII equivalents. "
     },
-    { TidyGDocClean,                    0,        
+    { TidyGDocClean,                    0,
         "This option specifies if Tidy should enable specific behaviour for "
         "cleaning up HTML exported from Google Docs. "
     },
-    { TidyLiteralAttribs,               0,        
+    { TidyLiteralAttribs,               0,
         "This option specifies how Tidy deals with whitespace characters within "
         "attribute values. "
         "<br/>"
@@ -85,7 +85,7 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
         "and ensure that whitespace within attribute values is passed "
         "through unchanged, set this option to <var>yes</var>. "
     },
-    { TidyMergeDivs,                    0,        
+    { TidyMergeDivs,                    0,
         "This option can be used to modify the behaviour of <code>clean</code> when "
         "set to <code>yes</code>."
         "<br/>"
@@ -101,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/>"
@@ -110,12 +110,12 @@ 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>. "
     },
-    { TidyUseCustomTags,                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>, "
@@ -132,14 +132,14 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
         "document using opening tags; matching closing tags will be recognised "
         "accordingly, and unknown closing tags will be discarded. "
     },
-    { TEXT_USING_FONT,                  0,        
+    { 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_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"
@@ -160,7 +160,7 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, {
     { LAYOUT_TABLES_LINEARIZE_PROPERLY, 0, "[5.3.1.1]: verify layout tables linearise properly."                         },
 
 #if SUPPORT_CONSOLE_APP
-    { TC_TXT_HELP_LANG_2,               0,        
+    { 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"
diff --git a/src/language_es.h b/src/language_es.h
index 14f51e5c3..b824df477 100644
--- a/src/language_es.h
+++ b/src/language_es.h
@@ -13,7 +13,7 @@
  *
  * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
  *     language (and maybe region) "es". The source of
- *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     these strings is a gettext PO file in Tidy's source, probably called
  *     "language_es.po".
  *
  * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
@@ -55,13 +55,13 @@ static uint whichPluralForm_es(uint n) {
  */
 static languageDefinition language_es = { whichPluralForm_es, {
     /***************************************
-     ** This MUST be present and first. 
+     ** This MUST be present and first.
      ** Specify the code for this language.
      ***************************************/
     {/* Specify the ll or ll_cc language code here. */
       TIDY_LANGUAGE,          0, "es"
     },
-    { TidyMakeClean,          0,        
+    { TidyMakeClean,          0,
         "Esta opción especifica si Tidy debe realizar la limpieza de algún legado etiquetas de "
         "presentación (actualmente <code>&lt;i&gt;</code>, <code>&lt;b&gt;</code>, <code>&lt;center&gt;</"
         "code> cuando encerrados dentro de las etiquetas apropiadas en línea y <code>&lt;font&gt;</"
@@ -69,7 +69,7 @@ static languageDefinition language_es = { whichPluralForm_es, {
         "con CSS <code>&lt;style&gt;</code> y estructural markup según corresponda. "
     },
     { TidyNCR,                0, "Esta opción especifica si Tidy debe permitir referencias de caracteres numéricos. "   },
-    { TEXT_GENERAL_INFO_PLEA, 0,        
+    { TEXT_GENERAL_INFO_PLEA, 0,
         "\n"
         "¿Le gustaría ver Tidy en un español correcto? Por favor considere \n"
         "ayudarnos a localizar HTML Tidy. Para más detalles consulte \n"
@@ -77,7 +77,7 @@ static languageDefinition language_es = { whichPluralForm_es, {
     },
 
 #if SUPPORT_CONSOLE_APP
-    { TC_TXT_HELP_LANG_1,     0,        
+    { TC_TXT_HELP_LANG_1,     0,
         "\n"
         "La opción -language (o -lang) indica el lenguaje Tidy debe \n"
         "utilizar para comunicar su salida. Tenga en cuenta que esto no es \n"
@@ -100,7 +100,7 @@ static languageDefinition language_es = { whichPluralForm_es, {
         "Tidy está utilizando la configuración regional %s. \n"
         "\n"
     },
-    { TC_TXT_HELP_LANG_2,     0,        
+    { TC_TXT_HELP_LANG_2,     0,
         "\n"
         "Los siguientes idiomas están instalados actualmente en Tidy. Tenga \n"
         "en cuenta que no hay garantía de que están completos; sólo quiere decir \n"
@@ -110,7 +110,7 @@ static languageDefinition language_es = { whichPluralForm_es, {
         "necesario. ¡Favor de informar los desarrolladores de estes casos! \n"
         "\n"
     },
-    { TC_TXT_HELP_LANG_3,     0,        
+    { TC_TXT_HELP_LANG_3,     0,
         "\n"
         "Si Tidy es capaz de determinar la configuración regional entonces \n"
         "Tidy utilizará el lenguaje de forma automática de la configuración \n"
diff --git a/src/language_es_mx.h b/src/language_es_mx.h
index 55b1b3af5..3e3013f86 100644
--- a/src/language_es_mx.h
+++ b/src/language_es_mx.h
@@ -13,7 +13,7 @@
  *
  * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
  *     language (and maybe region) "es_mx". The source of
- *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     these strings is a gettext PO file in Tidy's source, probably called
  *     "language_es_mx.po".
  *
  * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
@@ -55,13 +55,13 @@ static uint whichPluralForm_es_mx(uint n) {
  */
 static languageDefinition language_es_mx = { whichPluralForm_es_mx, {
     /***************************************
-     ** This MUST be present and first. 
+     ** This MUST be present and first.
      ** Specify the code for this language.
      ***************************************/
     {/* Specify the ll or ll_cc language code here. */
       TIDY_LANGUAGE,          0, "es_mx"
     },
-    { TEXT_GENERAL_INFO_PLEA, 0,        
+    { TEXT_GENERAL_INFO_PLEA, 0,
         "\n"
         "¿Le gustaría ver Tidy en adecuada, español mexicano? Por favor considere \n"
         "ayudarnos a localizar HTML Tidy. Para más detalles consulte \n"
diff --git a/src/language_fr.h b/src/language_fr.h
index aeaaa6f1e..a4c6ce3cb 100644
--- a/src/language_fr.h
+++ b/src/language_fr.h
@@ -13,7 +13,7 @@
  *
  * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
  *     language (and maybe region) "fr". The source of
- *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     these strings is a gettext PO file in Tidy's source, probably called
  *     "language_fr.po".
  *
  * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
@@ -55,38 +55,38 @@ static uint whichPluralForm_fr(uint n) {
  */
 static languageDefinition language_fr = { whichPluralForm_fr, {
     /***************************************
-     ** This MUST be present and first. 
+     ** This MUST be present and first.
      ** Specify the code for this language.
      ***************************************/
     {/* Specify the ll or ll_cc language code here. */
       TIDY_LANGUAGE,                                 0, "fr"
     },
-    { TidyAccessibilityCheckLevel,                   0,        
+    { TidyAccessibilityCheckLevel,                   0,
         "Cette option précise le niveau de contrôle d'accessibilité que Tidy doit éventuellement exécuter. "
         "Le <br/>niveau <var>0 (Tidy Classic)</var> est équivalent au contrôle d'accessibilité de Tidy "
         "Classic. <br/>Pour plus d'informations sur le contrôle d'accessibilité de Tidy, consultez <a href="
         "\"http://www.html-tidy.org/accessibility/\"> la page d'accessibilité de Tidy</a>. "
     },
-    { TidyAltText,                                   0,        
+    { TidyAltText,                                   0,
         "Cette option précise la valeur par défaut du texte <code>alt=</code> qu'utilise Tidy pour les "
         "attributs <code>&lt;img&gt;</code> lorsque l'attribut <code>alt=</code> est absent. <br/> Utiliser "
         "avec toute l'attention nécessaire, il est en effet de votre responsabilité de rendre vos documents "
         "accessibles aux personnes qui ne peuvent pas voir les images."
     },
-    { TidyAnchorAsName,                              0,        
+    { TidyAnchorAsName,                              0,
         "Cette option contrôle la suppression ou l'ajout de l'attribut <code>name</code> pour les éléments "
         "qui peuvent servir d'ancre. <br/>Si la valeur de l'attribut <code>name</code> est <var>yes</var>, "
         "et qu'il n'existe pas déjà, il est ajouté à la suite d'un attribut <code>id</code> existant, si la "
         "DTD le permet. <br/>Si sa valeur est <var>no</var>, tout attribut <code>name</code> existant est "
         "supprimé, si un attribut <code>id</code> existe ou a été ajouté. "
     },
-    { TidyAsciiChars,                                0,        
+    { TidyAsciiChars,                                0,
         "Peut être utilisé pour modifier le comportement de l'option <code>clean</code> si sa valeur est "
         "<var>yes</var>. <br/> Lorsque la valeur de <code>clean</code> vaut <var>yes</var>, <code>&amp;"
         "emdash;</code>, <code>&amp;rdquo;</code>, et d'autres entités nommées sont déclassées vers leurs "
         "plus proches équivalents ASCII."
     },
-    { TidyBlockTags,                                 0,        
+    { TidyBlockTags,                                 0,
         "Cette option définit de nouvelles balises de type bloc. Elle prend une liste de noms de balises "
         "séparés par un espace ou une virgule. <br/>À moins que vous ne déclariez de nouvelles balises, Tidy "
         "refusera de produire une sortie si l'entrée introduit préalablement des balises inconnues. <br/"
@@ -94,18 +94,18 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "table&gt;</code>, <code>&lt;ul&gt;</code>, <code>&lt;ol&gt;</code> et <code>&lt;dl&gt;</code>. <br/"
         ">Cette option est ignorée avec le mode XML. "
     },
-    { TidyBodyOnly,                                  0,        
+    { TidyBodyOnly,                                  0,
         "Cette option précise si Tidy doit seulement afficher les contenus de la balise <code>&lt;body&gt;</"
         "code> en tant que fragment HTML. <br/>Si sa valeur est <var>auto</var>, ceci est effectué seulement "
         "si la balise <code>&lt;body&gt;</code> a été déduite. <br/>L'intérêt est de pouvoir incorporer "
         "entièrement des pages existantes en tant que partie d'une autre page. <br/>Cette option n'a pas "
         "d'effet si la sortie XML a été demandée. "
     },
-    { TidyBreakBeforeBR,                             0,        
+    { TidyBreakBeforeBR,                             0,
         "Cette option précise si Tidy doit ajouter un saut de ligne avant chaque élément <code>&lt;br&gt;</"
         "code>."
     },
-    { TidyCharEncoding,                              0,        
+    { TidyCharEncoding,                              0,
         "Cette option permet de préciser l'encodage des caractères qui sera utilisé par Tidy pour l'entrée "
         "et la sortie. <br/>Pour l'<var>ascii</var> Tidy acceptera les valeurs de caractère Latin-1 "
         "(ISO-8859-1), mais utilisera les entités pour tous les caractères de valeur &gt;127. <br/>Pour la "
@@ -118,21 +118,21 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "&gt;127. <br/>Pour les encodages non supportés, utilisez un utilitaire tiers pour convertir depuis "
         "et vers l'UTF-8. "
     },
-    { TidyCoerceEndTags,                             0,        
+    { TidyCoerceEndTags,                             0,
         "Cette option précise si Tidy doit forcer la fermeture d'une balise d'ouverture, dans les cas où il "
         "semble qu'une balise de fin soit attendue; Dans cet exemple,<br/><code>&lt;span&gt;foo &lt;b&gt;"
         "bar&lt;b&gt; baz&lt;/span&gt;</code> <br/>Tidy va produire <br/><code>&lt;span&gt;foo &lt;b&gt;"
         "bar&lt;/b&gt; baz&lt;/span&gt;</code> "
     },
-    { TidyCSSPrefix,                                 0,        
+    { TidyCSSPrefix,                                 0,
         "Cette option précise le préfixe que Tidy utilise pour les règles de styles. <br/> Par défaut, "
         "<var>c</var> sera utilisé."
     },
-    { TidyDecorateInferredUL,                        0,        
+    { TidyDecorateInferredUL,                        0,
         "Cette option précise si Tidy doit décorer le code déduit des éléments <code>&lt;ul&gt;</code> avec "
         "du balisage CSS pour éviter un décalage d'indentation vers la droite. "
     },
-    { TidyDoctype,                                   0,        
+    { TidyDoctype,                                   0,
         "Cette option spécifie la déclaration DOCTYPE générée par Tidy. <br/> Si <var>omit</var>, la sortie "
         "ne contiendra pas de déclaration DOCTYPE. Notez que cela implique aussi que <code>numeric-entities</"
         "code> soit réglé sur <var>yes</var>. <br/> Si <code>html5</code>, la déclaration DOCTYPE est réglée "
@@ -150,83 +150,83 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     },
     { TidyDropEmptyElems,                            0, "Cette option précise si Tidy doit rejeter les éléments vides."                                          },
     { TidyDropEmptyParas,                            0, "Cette option précise si Tidy doit rejeter les paragraphes vides."                                       },
-    { TidyDropPropAttrs,                             0,        
+    { TidyDropPropAttrs,                             0,
         "Cette option précise si Tidy doit enlever les attributs propriétaires, comme les attributs de "
         "liaison de données Microsoft. Les attributs supplémentaires qui ne sont pas autorisés dans la "
         "version HTML en sortie, seront supprimés avec l'utilisation conjointe de l'option <code>strict-tags-"
         "attributes</code>."
     },
-    { TidyDuplicateAttrs,                            0,        
+    { TidyDuplicateAttrs,                            0,
         "Cette option précise quel attribut, du premier ou du dernier, Tidy doit garder s'il est répété, par "
         "exemple dans le cas de deux attributs <code>align</code>."
     },
-    { TidyEmacs,                                     0,        
+    { TidyEmacs,                                     0,
         "Cette option précise si Tidy doit adopter un format de rapports d'erreurs et d'avertissements plus "
         "facilement exploitable par GNU Emacs."
     },
-    { TidyEmptyTags,                                 0,        
+    { TidyEmptyTags,                                 0,
         "Cette option précise les nouvelles balises inline. Cette option prend une liste de noms de balises "
         "séparés par un espace ou une virgule. <br/>Tant que vous n'avez pas déclaré de nouvelles balises, "
         "Tidy refusera de générer un fichier nettoyé si l'entrée contient des balises inconnues. <br/> "
         "pensez aussi à déclarer les balises vides, soit inline, soit bloc. <br/>Cette option est ignorée "
         "par le mode XML."
     },
-    { TidyEncloseBlockText,                          0,        
+    { TidyEncloseBlockText,                          0,
         "Cette option précise si Tidy doit insérer un élément <code>&lt;p&gt;</code> pour encadrer un "
         "quelconque texte trouvé, dans n'importe quel élément qui permet de mélanger du contenu pour "
         "<var>HTML transitional</var> mais pas HTML strict. "
     },
-    { TidyEncloseBodyText,                           0,        
+    { TidyEncloseBodyText,                           0,
         "Cette option précise si Tidy doit encadrer les textes trouvés dans l'élément <code>body</code>, par "
         "un élément <code>&lt;p&gt;</code>. <br/>Elle peut être utile lorsque vous voulez modifier du HTML "
         "existant au moyen d'une feuille de style. "
     },
-    { TidyErrFile,                                   0,        
+    { TidyErrFile,                                   0,
         "Cette option précise le fichier d'erreur que Tidy utilise pour les erreurs et avertissements. En "
         "principe les erreurs et avertissements sont envoyés vers la sortie <code>stderr</code>."
     },
-    { TidyEscapeCdata,                               0,        
+    { TidyEscapeCdata,                               0,
         "Cette option précise si Tidy doit convertir les sections <code>&lt;![CDATA[]]&gt;</code> en texte "
         "normal. "
     },
-    { TidyEscapeScripts,                             0,        
+    { TidyEscapeScripts,                             0,
         "Cette option entraîne l'échappement des items qui semblent être des balises de fermeture, ainsi "
         "<code>&lt;/g</code> sera échappée en <code>&lt;\\/g</code>. Positionner cette option à <var>no</"
         "var> si vous ne voulez pas cette fonctionnalité."
     },
-    { TidyFixBackslash,                              0,        
+    { TidyFixBackslash,                              0,
         "Cette option précise si Tidy doit remplacer les caractères de barre oblique inversée (anti-slash, "
         "<code>\\</code>) dans les URLs avec des barres obliques (slash, <code>/</code>). "
     },
-    { TidyFixComments,                               0,        
+    { 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 ColdFusion qui utilisent la syntaxe de "
         "commentaire: <code>&lt;!--- ---&gt;</code>. "
     },
-    { TidyFixUri,                                    0,        
+    { TidyFixUri,                                    0,
         "Cette option précise si Tidy doit vérifier les valeurs d'attributs qui comportent des caractères "
         "interdits pour les URI, et auquel cas les échapper selon les recommandations HTML 4."
     },
-    { TidyForceOutput,                               0,        
+    { TidyForceOutput,                               0,
         "Cette option précise si Tidy doit produire une sortie, même si des erreurs ont été rencontrées. <br/"
         ">Utilisez cette option avec attention; si Tidy affiche une erreur, cela implique que Tidy n'a pas "
         "été en mesure (ou n'est pas sûr) de pouvoir corriger cette erreur; en conséquence le résultat en "
         "sortie pourrait ne pas être conforme à vos attentes. "
     },
-    { TidyGDocClean,                                 0,        
+    { TidyGDocClean,                                 0,
         "Cette option précise si Tidy doit activer un comportement spécifique pour le nettoyage du HTML "
         "exporté à partir de Google Docs."
     },
     { TidyHideComments,                              0, "Cette option précise si Tidy doit afficher en sortie les commentaires."                                 },
     { TidyHtmlOut,                                   0, "Cette option précise si Tidy doit embellir les sorties, lorsqu'il produit du HTML."                     },
-    { TidyInCharEncoding,                            0,        
+    { TidyInCharEncoding,                            0,
         "Cette option précise l'encodage de caractère que Tidy utilise pour l'entrée. Voir <code>char-"
         "encoding</code> pour plus d'informations."
     },
     { TidyIndentAttributes,                          0, "Cette option précise si Tidy doit placer chaque attribut sur une nouvelle ligne."                       },
     { TidyIndentCdata,                               0, "Cette option précise si Tidy doit indenter les sections <code>&lt;![CDATA[]]&gt;</code>."               },
-    { TidyIndentContent,                             0,        
+    { TidyIndentContent,                             0,
         "Cette option précise si Tidy doit indenter les balises de portée bloc. <br/>Si la valeur est "
         "<var>auto</var> Tidy décidera d'indenter ou pas le contenu des balises comme <code>&lt;title&gt;</"
         "code>, <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code>, <code>&lt;li&gt;</code>, <code>&lt;td&gt;</"
@@ -236,33 +236,33 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "d'espaces ou de tabulations en sortie par niveau d'indentation, et <code>indent-with-tabs</code> "
         "pour préciser si les espaces ou tabulations sont utilisées. "
     },
-    { TidyIndentSpaces,                              0,        
+    { TidyIndentSpaces,                              0,
         "Cette option précise le nombre d'espaces ou de tabulations que Tidy utilise pour indenter le "
         "contenu lorsque <code>indent</code> est activé. <br/>Notez que la valeur par défaut pour cette "
         "option dépend de la valeur de <code>indent-with-tabs</code> (voir aussi cette option). "
     },
-    { TidyInlineTags,                                0,        
+    { TidyInlineTags,                                0,
         "Cette option porte sur les nouvelles balises inline non vides. Elle prend en valeur une liste de "
         "noms de balises, séparés par un espace ou une virgule. <br/>Sans déclaration de nouvelles balises, "
         "Tidy refusera de générer un fichier de sortie, si l'entrée comporte des balises inconnues. <br/"
         ">Cette option est ignorée avec le mode XML. "
     },
-    { TidyJoinClasses,                               0,        
+    { TidyJoinClasses,                               0,
         "Cette option précise si Tidy doit combiner les noms de classe pour produire un nouveau nom de "
         "classe unique, lorsque plusieurs affectations de classes sont détectées sur un élément."
     },
-    { TidyJoinStyles,                                0,        
+    { TidyJoinStyles,                                0,
         "Cette option indique si Tidy doit combiner les styles pour produire un nouveau style unique, "
         "lorsque plusieurs styles sont détectés sur un élément."
     },
-    { TidyKeepFileTimes,                             0,        
+    { TidyKeepFileTimes,                             0,
         "Cette option précise si Tidy doit préserver la date de modification des fichiers sur lesquels il "
         "travaille directement. <br/>Mettre cette option à <var>yes</var> vous autorise à nettoyer les "
         "fichiers sans changer la date de modification, ce qui peut avoir une utilité avec certains outils "
         "qui utilisent la date de modification pour des traitements comme le déploiement automatique.<br/"
         ">Notez que cette fonctionnalité n'est pas supportée par toutes les plateformes. "
     },
-    { TidyLiteralAttribs,                            0,        
+    { TidyLiteralAttribs,                            0,
         "Cette option précise le comportement de Tidy avec les caractères d'espacement pour les valeurs "
         "d'attributs. <br/>Si la valeur de l'option est <var>no</var>, Tidy normalise les valeurs "
         "d'attributs en remplaçant n'importe quel nouveau saut de ligne ou tabulation par un espace unique, "
@@ -270,34 +270,34 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "à préserver les valeurs initiales, les valeurs littérales de tous les attributs, et assurer que les "
         "espacements dans les valeurs d'attributs soient inchangés, passer cette option à <var>yes</var>. "
     },
-    { TidyLogicalEmphasis,                           0,        
+    { TidyLogicalEmphasis,                           0,
         "Cette option précise si Tidy doit remplacer les occurrences de <code>&lt;i&gt;</code> par <code>&lt;"
         "em&gt;</code> et les occurrences de <code>&lt;b&gt;</code> par <code>&lt;strong&gt;</code>. Les "
         "attributs sont préservés et inchangés. <br/>Cette option peut être indiquée indépendamment de "
         "l'option <code>clean</code>. "
     },
-    { TidyLowerLiterals,                             0,        
+    { TidyLowerLiterals,                             0,
         "Cette option précise si Tidy doit convertir en minuscules la valeur d'un attribut qui prend une "
         "liste de valeur prédéfinies. <br/>Ceci est requis pour les documents XHTML. "
     },
-    { TidyMakeBare,                                  0,        
+    { TidyMakeBare,                                  0,
         "Cette option précise si Tidy doit supprimer des documents Word 2000, le HTML spécifique de "
         "Microsoft, et afficher des espaces en sortie plutôt que des espaces insécables, lorsque ceux-ci "
         "sont présents en entrée."
     },
-    { TidyMakeClean,                                 0,        
+    { TidyMakeClean,                                 0,
         "Cette option précise si Tidy doit effectuer le nettoyage de certaines balises historiques de "
         "présentation (actuellement <code>&lt; i&gt;</code>, <code>&lt;b&gt;</code>, <code>&lt;center&gt;</"
         "code> lorsque placé entre les balises inline appropriées, ainsi que <code>&lt; font&gt;</code>). Si "
         "la valeur est <var>yes</var>, les balises historiques seront remplacées par des balises CSS "
         "<code>&lt;style&gt;</code> et par une structure de balisage appropriée."
     },
-    { TidyMark,                                      0,        
+    { TidyMark,                                      0,
         "Cette option précise si Tidy doit ajouter un élément <code>meta</code> dans l'entête de document, "
         "pour indiquer que le document a été nettoyé par Tidy. <br/>Tidy n'ajoutera pas cet élément "
         "<code>meta</code> s'il existe déjà. "
     },
-    { TidyMergeDivs,                                 0,        
+    { TidyMergeDivs,                                 0,
         "Cette option peut être utilisée pour modifier le comportement de l'option <code>clean</code>, "
         "lorsqu'elle vaut <var>yes</var>. <br/>Cette option précise si Tidy doit concaténer les éléments "
         "<code>&lt;div&gt;</code> imbriqués, comme <code>&lt;div&gt;&lt;div&gt;...&lt;/div&gt;&lt;/div&gt;</"
@@ -307,32 +307,32 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "attributs du <code>&lt;div&gt;</code> interne ne sont pas pris en compte, à l'exception de "
         "<code>class</code> et de <code>style</code>. "
     },
-    { TidyMergeEmphasis,                             0,        
+    { TidyMergeEmphasis,                             0,
         "Cette option précise si Tidy doit concaténer les éléments <code>&lt;b&gt;</code> et <code>&lt;i&gt;"
         "</code>; par exemple, pour le cas <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 produira la sortie <code>&lt;b class=\"rtop-2\"&gt;"
         "foo bar baz&lt;/b&gt;</code>. "
     },
-    { TidyMergeSpans,                                0,        
+    { TidyMergeSpans,                                0,
         "Cette option peut être utlisée pour modifier le comportement de <code>clean</code>, si elle vaut "
         "<var>yes</var>.<br/>Cette option précise si Tidy doit concaténer les <code>&lt;span&gt;</code> "
         "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>. "
     },
     { TidyNCR,                                       0, "Cette option précise si Tidy doit autoriser les références numériques de caractères. "                  },
-    { TidyNewline,                                   0,        
+    { 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> "
         "partout ailleurs (Linux, Mac OS X, et Unix). "
     },
-    { TidyNumEntities,                               0,        
+    { TidyNumEntities,                               0,
         "Cette option précise si Tidy doit afficher les entités autres que les entités HTML intégrées "
         "(<code>&amp;amp;</code>, <code>&amp;lt;</code>, <code>&amp;gt;</code>, et <code>&amp;quot;</code>) "
         "dans la forme numérique plutôt que dans la forme nommée. <br/>Seules les entités compatibles avec "
         "la déclaration DOCTYPE générée sont utilisées. <br/>Les entités qui peuvent être représentées dans "
         "l'encodage de sortie sont traduites avec leur correspondance. "
     },
-    { TidyOmitOptionalTags,                          0,        
+    { TidyOmitOptionalTags,                          0,
         "Cette option précise si Tidy doit omettre les balises optionnelles ouvrantes et fermantes, "
         "lorsqu'il produit une sortie. <br/>Activer cette option entraîne l'omission en sortie de toutes les "
         "balises correspondantes aux éléments <code>&lt;html&gt;</code>, <code>&lt;head&gt;</code>, and "
@@ -341,24 +341,24 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "</code>, <code>&lt;/tr&gt;</code>, <code>&lt;/td&gt;</code>, et <code>&lt;/th&gt;</code>. <br/"
         ">Cette option est ignorée pour la sortie XML. "
     },
-    { TidyOutCharEncoding,                           0,        
+    { TidyOutCharEncoding,                           0,
         "Cette option précise l'encodage de caractère utilisé par Tidy pour la sortie. <br/>Notez que cela "
         "peut être différent de <code>input-encoding</code> seulement pour les encodages latins (<var>ascii</"
         "var>, <var>latin0</var>, <var>latin1</var>, <var>mac</var>, <var>win1252</var>, <var>ibm858</var>)."
         "<br/>Voir <code>char-encoding</code> pour plus d'informations."
     },
-    { TidyOutFile,                                   0,        
+    { TidyOutFile,                                   0,
         "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>. "
     },
-    { TidyOutputBOM,                                 0,        
+    { 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 "
         "la sortie, ce qui ne s'applique qu'aux sorties encodées en UTF-8 et UTF-16. <br/>Si l'option vaut "
         "<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. "
     },
-    { TidyPPrintTabs,                                0,        
+    { 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> "
         "indente avec des tabulations plutôt que des espaces, valeur par défaut. <br />Utilisez l'option "
@@ -369,7 +369,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "conserver les tabulations en entrée."
     },
     { TidyPreserveEntities,                          0, "Cette option précise si Tidy doit préserver les entités bien formées telles que trouvées en entrée. "   },
-    { TidyPreTags,                                   0,        
+    { TidyPreTags,                                   0,
         "Cette option précise les nouvelles balises qui doivent être traitées exactement de la même façon "
         "que l'élément HTML <code>&lt;pre&gt;</code>. Cette option prend une liste de nom de balises "
         "séparées par un espace ou une virgule. <br/>Sauf si vous déclarez de nouvelles balises, Tidy "
@@ -377,57 +377,57 @@ 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. "
     },
-    { TidyPunctWrap,                                 0,        
+    { TidyPunctWrap,                                 0,
         "Cette option précise si Tidy doit passer à la ligne après certains caractères de ponctuation "
         "Unicode ou chinois."
     },
-    { TidyQuiet,                                     0,        
+    { 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."
     },
-    { TidyQuoteAmpersand,                            0,        
+    { TidyQuoteAmpersand,                            0,
         "Cette option précise si Tidy doit afficher en sortie les caractères <code>&amp;</code> en les "
         "écrivant <code>&amp;amp;</code>. "
     },
-    { TidyQuoteMarks,                                0,        
+    { TidyQuoteMarks,                                0,
         "Cette option précise si Tidy doit afficher les caractères <code>&quot;</code> comme <code>&amp;quot;"
         "</code> comme préféré par certains environnements d'édition. <br/>Le caractère apostrophe <code>'</"
         "code> est écrit <code>&amp;#39;</code> car de nombreux navigateurs webs ne supportent pas encore "
         "l'écriture <code>&amp;apos;</code>. "
     },
-    { TidyQuoteNbsp,                                 0,        
+    { TidyQuoteNbsp,                                 0,
         "Cette option précise si Tidy doit afficher les espaces insécables en tant qu'entités, plutôt qu'en "
         "utilisant la valeur de caractère unicode 160 (décimale). "
     },
-    { TidyReplaceColor,                              0,        
+    { TidyReplaceColor,                              0,
         "Cette option précise si Tidy doit remplacer les valeurs numériques dans les attributs de couleur "
         "par les noms de couleurs HTML/XHTML lorsque définies, par exemple en remplaçant <code>#ffffff</"
         "code> par <code>white</code>. "
     },
-    { TidyShowErrors,                                0,        
+    { TidyShowErrors,                                0,
         "Cette option précise le nombre utilisé par Tidy pour déterminer si les erreurs suivantes doivent "
         "être montrées. Si la valeur est <var>0</var>, aucune erreur n'est affichée. "
     },
     { TidyShowInfo,                                  0, "Cette option précise si Tidy doit afficher les messages de niveau info-level."                          },
-    { TidyShowMarkup,                                0,        
+    { TidyShowMarkup,                                0,
         "Cette option précise si Tidy doit générer un affichage embelli de la structure de balises. Notez "
         "que Tidy ne générera pas un affichage embelli s'il trouve des erreurs significatives (voir "
         "<code>force-output</code>). "
     },
-    { TidyShowWarnings,                              0,        
+    { TidyShowWarnings,                              0,
         "Cette option précise si Tidy doit supprimer les avertissements. Cela peut être utile lorsque "
         "quelques erreurs sont cachées dans une masse d'avertissements. "
     },
-    { TidySkipNested,                                0,        
+    { TidySkipNested,                                0,
         "Cette option précise que Tidy doit ignorer les balises imbriquées lors de l'analyse des données de "
         "script et de style."
     },
-    { TidySortAttributes,                            0,        
+    { TidySortAttributes,                            0,
         "Cette option précise que Tidy doit classer les attributs d'un élément en utilisant un algorithme de "
         "classement. Si la valeur est <var>alpha</var>, l'algorithme est un classement alphabétique "
         "ascendant. "
     },
-    { TidyStrictTagsAttr,                            0,        
+    { TidyStrictTagsAttr,                            0,
         "Ces options garantissent que les balises et attributs sont valides pour la version HTML en sortie "
         "de Tidy. Si la valeur est <var>yes</var> (par défaut) et que le type de document en sortie est une "
         "déclaration doctype stricte, alors Tidy rapportera les erreurs. Si le type de document en sortie "
@@ -436,21 +436,21 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "attributs non valables seront aussi supprimés. <br/>Si la valeur est <var>no</var>, ces contrôles "
         "ne sont pas effectués. "
     },
-    { TidyTabSize,                                   0,        
+    { TidyTabSize,                                   0,
         "Cette option précise le nombre de colonnes que Tidy utilise entre deux tabulations successives. "
         "Ceci est utilisé pour lier les tabulations aux espaces pendant la lecture de l'entrée."
     },
-    { TidyUpperCaseAttrs,                            0,        
+    { TidyUpperCaseAttrs,                            0,
         "Cette option précise si Tidy doit afficher les noms d'attributs en majuscules. <br/>La valeur par "
         "défaut est <var>no</var>, ce qui produit un affichage des attributs en minuscules, excepté pour une "
         "entrée XML, pour laquelle la casse originale est préservée. "
     },
-    { TidyUpperCaseTags,                             0,        
+    { TidyUpperCaseTags,                             0,
         "Cette option précise si Tidy doit afficher les noms de balises en majuscules. <br/>La valeur par "
         "défaut est <var>no</var>, ce qui produit un affichage des balises en minuscules, excepté pour une "
         "entrée XML, pour laquelle la casse originale est préservée. "
     },
-    { TidyUseCustomTags,                             0,        
+    { TidyUseCustomTags,                             0,
         "Cette option active dans Tidy l'utilisation de balises pour les éléments personnalisés autonomes, "
         "par exemple &lt;flag-icon&gt;. Les balises personnalisées sont désactivées si cette valeur est "
         "<var>no</var>. Autres configurations - <var>blocklevel</var>, <var>empty</var>, <var>inline</var>, "
@@ -463,23 +463,23 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "fermeture correspondantes seront reconnues en conséquence, et les balises de fermeture inconnues "
         "seront ignorées. "
     },
-    { TidyVertSpace,                                 0,        
+    { TidyVertSpace,                                 0,
         "Cette option précise si Tidy doit ajouter quelques lignes vides supplémentaires pour la lisibilité. "
         "<br/>La valeur par défaut est <var>no</var>. <br/>Si la valeur est <var>auto</var> Tidy éliminera "
         "presque tous les caractères de nouvelle ligne."
     },
     { TidyWarnPropAttrs,                             0, "Cette option précise si Tidy doit avertir des attributs propriétaires."                                 },
-    { TidyWord2000,                                  0,        
+    { TidyWord2000,                                  0,
         "Cette option précise si Tidy doit se donner du mal pour supprimer tous les surplus que Microsoft "
         "Word 2000 ajoute lorsque vous enregistrez des documents Word comme des \"pages Web\". Il ne prend "
         "pas en charge les images embarquées ou le VML. <br/>Vous devriez songer à utiliser la "
         "fonctionnalité de Word \"Enregistrer Sous: Page Web, Filtrée\". "
     },
-    { TidyWrapAsp,                                   0,        
+    { TidyWrapAsp,                                   0,
         "Cette option précise si Tidy doit ajouter un saut de ligne au texte contenu dans les pseudos-"
         "éléments ASP, qui ressemblent à <code>&lt;% ... %&gt;</code>. "
     },
-    { TidyWrapAttVals,                               0,        
+    { TidyWrapAttVals,                               0,
         "Cette option précise si Tidy doit ajouter des sauts de ligne aux valeurs d'attributs, ce qui "
         "signifie que si la valeur d'un attribut entraîne le dépassement de la largeur précisée par "
         "<code>wrap</code>, Tidy ajoutera un ou plusieurs sauts de lignes à la valeur, ce qui implique son "
@@ -490,35 +490,35 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "et garantir que les caractères d'espacement dans les valeurs d'attributs sont maintenus inchangés, "
         "préciser la valeur de <code>literal-attributes</code> à <var>yes</var>. "
     },
-    { TidyWrapJste,                                  0,        
+    { TidyWrapJste,                                  0,
         "Cette option précise si Tidy doit ajouter un saut de ligne au texte contenu dans les pseudos-"
         "éléments JSTE, qui ressemblent à <code>&lt;# ... #&gt;</code>. "
     },
-    { TidyWrapLen,                                   0,        
+    { TidyWrapLen,                                   0,
         "Cette option précise à Tidy la marge de droite à utiliser pour le saut de ligne. <br/> Tidy tente "
         "de couper les lignes de façon à ce qu'elles ne dépassent pas cette longueur. <br/>Passer la valeur "
         "de <code>wrap</code> à <var>0</var>(zéro) désactive l'ajout de saut de ligne. "
     },
-    { TidyWrapPhp,                                   0,        
+    { TidyWrapPhp,                                   0,
         "Cette option précise si Tidy doit ajouter un saut de ligne au texte contenu dans les pseudos-"
         "éléments PHP, qui ressemblent à: <code>&lt;?php ... ?&gt;</code>. "
     },
-    { TidyWrapScriptlets,                            0,        
+    { TidyWrapScriptlets,                            0,
         "Cette option précise si Tidy doit ajouter des sauts de lignes aux chaînes littérales dans les "
         "attributs de script. <br/>Tidy prend en charge la césure des longues chaînes littérales de scripts "
         "en ajoutant un caractère de barre oblique arrière (backslash) avant le saut de ligne. "
     },
-    { TidyWrapSection,                               0,        
+    { TidyWrapSection,                               0,
         "Cette option précise si Tidy doit ajouter des sauts de ligne pour le texte compris dans des balises "
         "de section <code>&lt;![ ... ]&gt;</code> section tags. "
     },
-    { TidyWriteBack,                                 0,        
+    { TidyWriteBack,                                 0,
         "Cette option précise si Tidy doit réécrire la structure de balise qu'il a produit vers le même "
         "fichier à partir duquel il l'a lu. <br/> Il est conseillé de garder une copie des fichiers "
         "importants avant de les faire modifier par Tidy, car dans de rares occasions le résultat peut être "
         "inattendu. "
     },
-    { TidyXhtmlOut,                                  0,        
+    { TidyXhtmlOut,                                  0,
         "Cette option précise si Tidy doit afficher une sortie embellie, en l'écrivant avec HTML étendu. <br/"
         "> Avec cette option activée, Tidy définit la déclaration DOCTYPE et l'espace de nom par défaut "
         "approprié pour du XHTML, et utilisera la valeur corrigée en sortie indépendamment des autres "
@@ -526,31 +526,31 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "conformément à la valeur de configuration de <code>numeric-entities</code>. <br/>La casse originale "
         "des balises et attributs sera préservée, indépendamment des autres options. "
     },
-    { TidyXmlDecl,                                   0,        
+    { TidyXmlDecl,                                   0,
         "Cette option précise si Tidy doit ajouter la déclaration XML lors de la sortie XML ou XHTML. <br/> "
         "Notez que si l'entrée comprend déjà une déclaration <code>&lt;?xml ... ?&gt;</code>, alors cette "
         "option sera ignorée. <br/>Si l'encodage pour la sortie est différent de <var>ascii</var>, de l'un "
         "des encodages <var>utf*</var> ou <var>raw</var>, alors la déclaration est toujours ajoutée, comme "
         "indiqué dans le standard XML."
     },
-    { TidyXmlOut,                                    0,        
+    { TidyXmlOut,                                    0,
         "Cette option précise si Tidy doit afficher une sortie embellie, en l'écrivant avec du XML bien "
         "structuré. <br/> Toutes les entités non définies en XML 1.0 seront réécrites en entités numériques "
         "pour leur permettre d'être parcourues par un analyseur XML. <br/>La casse originale des balises et "
         "attributs sera préservée, indépendamment des autres options. "
     },
-    { TidyXmlPIs,                                    0,        
+    { TidyXmlPIs,                                    0,
         "Cette option précise si Tidy doit modifier l'analyse syntaxique des instructions de traitement pour "
         "exiger <code>?&gt;</code> comme terminaison plutôt que <code>&gt;</code>. <br/> Cette option est "
         "automatiquement activée si l'entrée est en XML."
     },
-    { TidyXmlSpace,                                  0,        
+    { TidyXmlSpace,                                  0,
         "Cette option précise si tidy doit ajouter <code>xml:space=\"preserve\"</code> pour des éléments "
         "tels que <code>&lt;pre&gt;</code>, <code>&lt;style&gt;</code> and <code>&lt;script&gt;</code> lors "
         "de la production de XML. <br />Ceci est nécessaire si l'espace blanc dans de tels éléments doit "
         "être analysé convenablement sans avoir accès à la DTD."
     },
-    { TidyXmlTags,                                   0,        
+    { TidyXmlTags,                                   0,
         "Cette option précise si Tidy doit utiliser l'analyseur XML plutôt que l'analyseur de correction "
         "d'erreur HTML."
     },
@@ -570,7 +570,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { STRING_ERROR_COUNT_ERROR,                      1, "erreurs"                                                                                                },
     { STRING_ERROR_COUNT_WARNING,                    0, "avertissement"                                                                                          },
     { STRING_ERROR_COUNT_WARNING,                    1, "avertissements"                                                                                         },
-    { STRING_HELLO_ACCESS,                           0,        
+    { STRING_HELLO_ACCESS,                           0,
         "\n"
         "Contrôles d'accessibilité:\n"
     },
@@ -582,7 +582,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TIDYCUSTOMNO_STRING,                           0, "aucune"                                                                                                 },
     { TIDYCUSTOMBLOCKLEVEL_STRING,                   0, "élément de bloc"                                                                                        },
     { TIDYCUSTOMEMPTY_STRING,                        0, "vide"                                                                                                   },
-    { TEXT_HTML_T_ALGORITHM,                         0,        
+    { TEXT_HTML_T_ALGORITHM,                         0,
         "\n"
         "       - D'abord, cherchez depuis la gauche de la position de la cellule \n"
         "         pour trouver la rangée des cellules d'entête de lignes. \n"
@@ -604,14 +604,14 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "         Les cellules TD qui fixent l'attribut de l'axe sont également \n"
         "         traitées comme des cellules d'entête.\n"
     },
-    { TEXT_VENDOR_CHARS,                             0,        
+    { TEXT_VENDOR_CHARS,                             0,
         "Il est peu probable que des encodages spécifiques à un éditeur,\n"
         "dépendants d'un système, fonctionnent suffisamment largement\n"
         "pour le World Wide Web; vous devriez éviter d'utiliser l'encodage\n"
         "de caractère %s, et utiliser plutôt des entités nommées,\n"
         "par exemple &trade;.\n"
     },
-    { TEXT_SGML_CHARS,                               0,        
+    { TEXT_SGML_CHARS,                               0,
         "Les codes de caractères 128 à 159 (U + 0080 à U + 009F) ne sont pas \n"
         "autorisés en HTML; même si ils l'étaient, il seraient probablement non \n"
         "imprimables comme des caractères de contrôle .\n"
@@ -619,7 +619,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "même valeur d'encodage d'octet %s et a remplacé cette référence par \n"
         "son équivalent Unicode.\n"
     },
-    { TEXT_INVALID_UTF8,                             0,        
+    { TEXT_INVALID_UTF8,                             0,
         "Les codes de caractères UTF-8 doivent être dans l'intervalle : U+0000 à U+10FFFF.\n"
         "La définition de l'UTF-8 à l'annexe D de la norme ISO/CEI 10646-1: 2000 permet \n"
         "également l'utilisation de séquences de cinq et six octets pour coder des caractères \n"
@@ -630,13 +630,13 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "(mais il permet d'autres non-caractères). Pour plus d'informations veuillez-vous\n"
         "référer à http://www.unicode.org/ et http://www.cl.cam.ac.uk/~mgk25/unicode.html\n"
     },
-    { TEXT_INVALID_UTF16,                            0,        
+    { TEXT_INVALID_UTF16,                            0,
         "Les codes de caractères pour UTF-16 doivent être dans l'intervalle: U+0000 à U+10FFFF.\n"
         "La définition de UTF-16 dans l'annexe C de l'ISO/IEC 10646-1:2000 n'autorise pas la \n"
         "liaison de substituts non appairés. Pour plus d'informations, veuillez vous référer\n"
         "à http://www.unicode.org/ et http://www.cl.cam.ac.uk/~mgk25/unicode.html\n"
     },
-    { TEXT_INVALID_URI,                              0,        
+    { TEXT_INVALID_URI,                              0,
         "Les URIs doivent être correctement protégés, ils ne doivent pas contenir \n"
         "les caractères non-échappés ci-après U+0021, y-compris le caractère \n"
         "d'espacement et non plus le U+007E. Tidy échappe l'URI pour vous \n"
@@ -647,7 +647,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "côté. Pour plus d'informations, veuillez vous référer à\n"
         "http://www.w3.org/International/O-URL-and-ident.html\n"
     },
-    { TEXT_BAD_FORM,                                 0,        
+    { TEXT_BAD_FORM,                                 0,
         "Vous devrez peut-être déplacer une, ou les deux, balises <form>et</form>. \n"
         "Les éléments HTML doivent être correctement imbriquées et les éléments \n"
         "de formulaire ne font pas exception. Par exemple, vous ne devez pas placer \n"
@@ -655,12 +655,12 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "un tableau, </form> ne peut pas être placé à l'intérieur du tableau !\n"
         "Notez qu'un form ne peut pas être imbriqué dans un autre !\n"
     },
-    { TEXT_BAD_MAIN,                                 0,        
+    { TEXT_BAD_MAIN,                                 0,
         "Un seul élément <main> est permis dans un document.\n"
         "Les éléments <main> suivants ont été rejetés, ce qui peut rendre \n"
         "le document non valide.\n"
     },
-    { TEXT_M_SUMMARY,                                0,        
+    { TEXT_M_SUMMARY,                                0,
         "L'attribut summary du tableau devrait servir à décrire la structure\n"
         "du tableau. Il est très utile pour les personnes utilisant des \n"
         "navigateurs non visuels. Les attributs de portée et entêtes \n"
@@ -669,14 +669,14 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "non visuels de fournir un contexte significatif pour chaque cellule.\n"
         "\n"
     },
-    { TEXT_M_IMAGE_ALT,                              0,        
+    { TEXT_M_IMAGE_ALT,                              0,
         "L'attribut alt devrait servir à donner une brève description d'une\n"
         "image ; Il faudrait aussi des descriptions plus longues avec l'attribut\n"
         "longdesc qui prend une URL liée à la description. Ces mesures sont\n"
         "nécessaires pour les personnes utilisant des navigateurs textuels.\n"
         "\n"
     },
-    { TEXT_M_IMAGE_MAP,                              0,        
+    { TEXT_M_IMAGE_MAP,                              0,
         "Utiliser des images interactives côté client est préférable à celles côté \n"
         "serveur, ces dernières sont inaccessibles aux personnes utilisant des \n"
         "navigateurs non-graphiques. En outre, les cartes côté client sont plus \n"
@@ -684,13 +684,13 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "aux utilisateurs.\n"
         "\n"
     },
-    { TEXT_M_LINK_ALT,                               0,        
+    { TEXT_M_LINK_ALT,                               0,
         "Pour les liens hypertextes définis à l'aide d'une image interactive \n"
         "côté client, vous devez utiliser l'attribut alt pour fournir une \n"
         "description textuelle du lien, pour les personnes utilisant des \n"
         "\n"
     },
-    { TEXT_USING_FRAMES,                             0,        
+    { TEXT_USING_FRAMES,                             0,
         "Les pages conçues à l'aide de cadres posent des problèmes aux \n"
         "personnes malvoyantes ou à celles qui utilisent un navigateur ne \n"
         "supportant pas les frames. Une structure de page basée sur des \n"
@@ -698,53 +698,53 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "d'un élément NOFRAMES.\n"
         "\n"
     },
-    { TEXT_ACCESS_ADVICE1,                           0,        
+    { TEXT_ACCESS_ADVICE1,                           0,
         "Pour plus d'informations sur la façon de rendre vos pages\n"
         "accessibles, voir http://www.w3.org/WAI/GL"
     },
-    { TEXT_ACCESS_ADVICE2,                           0,        
+    { TEXT_ACCESS_ADVICE2,                           0,
         "Pour plus d'informations sur la façon de rendre vos pages \n"
         "accessibles, voir http://www.w3.org/WAI/GL et \n"
         "http://www.html-tidy.org/Accessibility/"
     },
-    { TEXT_USING_LAYER,                              0,        
+    { TEXT_USING_LAYER,                              0,
         "Le mécanisme de positionnement au moyen des feuilles de style \n"
         "en cascade (CSS) est préférable à l'élément propriétaire <LAYER>, \n"
         "en raison du support limité des éditeurs pour LAYER.\n"
     },
-    { TEXT_USING_SPACER,                             0,        
+    { TEXT_USING_SPACER,                             0,
         "Il est recommandé d'utiliser les CSS pour contrôler les espacements \n"
         "(par exemple pour le retrait, les marges et les interlignes).\n"
         "L'élément propriétaire <SPACER> a un soutien limité des éditeurs.\n"
         "\n"
     },
-    { TEXT_USING_FONT,                               0,        
+    { TEXT_USING_FONT,                               0,
         "Il est recommandé d'utiliser les CSS pour préciser la police et les \n"
         "propriétés telles que la taille et la couleur. Cela permettra de réduire \n"
         "la taille des fichiers HTML et de les rendre plus faciles à entretenir \n"
         "\n"
     },
-    { TEXT_USING_NOBR,                               0,        
+    { TEXT_USING_NOBR,                               0,
         "Il est recommandé d'utiliser les CSS pour contrôler les sauts de ligne.\n"
         "Utilisez \"white-space: nowrap\" pour inhiber les sauts de ligne plutôt que \n"
         "d'insérer <NOBR> ... </ NOBR> dans la structure de balises.\n"
         "\n"
     },
-    { TEXT_USING_BODY,                               0,        
+    { TEXT_USING_BODY,                               0,
         "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,        
+    { 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,        
+    { 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"
         "Liste officielle de diffusion: https://lists.w3.org/Archives/Public/public-htacg/\n"
@@ -753,7 +753,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "Encouragez votre entreprise à rejoindre le W3C: http://www.w3.org/Consortium\n"
         "\n"
     },
-    { TEXT_GENERAL_INFO_PLEA,                        0,        
+    { TEXT_GENERAL_INFO_PLEA,                        0,
         "Parlez-vous une autre langue que le français, ou une variante du français?\n"
         "Merci de nous aider à traduire HTML Tidy. Pour plus d'informations, consultez \n"
         "https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md"
@@ -767,12 +767,12 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { 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,        
+    { 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,        
+    { BAD_SURROGATE_TAIL,                            0,
         "Paire de substitution principale (Haute) U+%04X, sans entité de terminaison (Haut), remplacée par U"
         "+FFFD."
     },
@@ -886,7 +886,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { INFORMATION_NOT_CONVEYED_APPLET,               0, "[2.1.1.2]: Vérifiez que l'information n'est pas transmise uniquement par la couleur (applet)."          },
     { INFORMATION_NOT_CONVEYED_OBJECT,               0, "[2.1.1.3]: Vérifiez que l'information n'est pas transmise uniquement par la couleur (object)."          },
     { INFORMATION_NOT_CONVEYED_SCRIPT,               0, "[2.1.1.4]: Vérifiez que l'information n'est pas transmise uniquement par la couleur (script)."          },
-    { INFORMATION_NOT_CONVEYED_INPUT,                0,        
+    { INFORMATION_NOT_CONVEYED_INPUT,                0,
         "[2.1.1.5]: Vérifiez que l'information n'est pas transmise uniquement par la couleur (champs de "
         "formulaire)."
     },
@@ -988,7 +988,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TC_LABEL_LEVL,                                 0, "niveau"                                                                                                 },
     { TC_LABEL_OPT,                                  0, "option"                                                                                                 },
     { TC_MAIN_ERROR_LOAD_CONFIG,                     0, "Le chargement du fichier de configuration \"%s\" a échoué, err = %d"                                    },
-    { TC_OPT_ACCESS,                                 0,        
+    { TC_OPT_ACCESS,                                 0,
         "faire des vérifications d'accessibilité supplémentaires (<niveau> = 0, 1, 2, 3). implicitement 0 si "
         "<niveau> est manquant."
     },
@@ -1008,7 +1008,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TC_OPT_IBM858,                                 0, "utilise IBM-858 (CP850+Euro) pour l'entrée, US-ASCII pour la sortie"                                    },
     { TC_OPT_INDENT,                                 0, "indente le contenu d'un élément"                                                                        },
     { TC_OPT_ISO2022,                                0, "utilise ISO-2022 pour l'entrée et la sortie"                                                            },
-    { TC_OPT_LANGUAGE,                               0,        
+    { TC_OPT_LANGUAGE,                               0,
         "Précise le langage de sortie de Tidy pour <lang>. Ajouter '-language help' pour plus d'aide. "
         "Utiliser avant les arguments produisant des sorties pour garantir que le langage sera pris en "
         "compte, par exemple `tidy -lang fr -lang help`."
@@ -1031,7 +1031,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TC_OPT_UTF8,                                   0, "utilise UTF-8 à la fois pour l'entrée et la sortie"                                                     },
     { TC_OPT_VERSION,                                0, "affiche la version de Tidy"                                                                             },
     { TC_OPT_WIN1252,                                0, "utilise Windows-1252 pour l'entrée, US-ASCII pour la sortie"                                            },
-    { TC_OPT_WRAP,                                   0,        
+    { TC_OPT_WRAP,                                   0,
         "coupe le texte à la colonne <column>. 0 est supposé si <column> est manquante. Si cette option "
         "n'est pas précisée, la valeur par défaut de l'option 'wrap' s'applique."
     },
@@ -1060,7 +1060,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TC_STRING_UNKNOWN_OPTION_B,                    0, "HTML Tidy: option inconnue."                                                                            },
     { TC_STRING_VERS_A,                              0, "HTML Tidy pour %s version %s"                                                                           },
     { TC_STRING_VERS_B,                              0, "HTML Tidy version %s"                                                                                   },
-    { TC_TXT_HELP_1,                                 0,        
+    { TC_TXT_HELP_1,                                 0,
         "\n"
         "%s [options...] [fichier...] [options...] [fichier...]\n"
         "Utilitaire pour nettoyer et embellir le HTML/XHTML/XML.\n"
@@ -1070,7 +1070,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     },
     { TC_TXT_HELP_2A,                                0, "Arguments en ligne de commande de HTML Tidy pour %s:"                                                   },
     { TC_TXT_HELP_2B,                                0, "Arguments en ligne de commande de HTML Tidy:"                                                           },
-    { TC_TXT_HELP_3,                                 0,        
+    { TC_TXT_HELP_3,                                 0,
         "\n"
         "Options de configuration de Tidy\n"
         "==========================\n"
@@ -1106,7 +1106,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "  http://dev.w3.org/html5/spec-author-view\n"
         "\n"
     },
-    { TC_TXT_HELP_CONFIG,                            0,        
+    { TC_TXT_HELP_CONFIG,                            0,
         "\n"
         "Paramètres de configuration de HTML Tidy\n"
         "\n"
@@ -1123,7 +1123,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
     { TC_TXT_HELP_CONFIG_NAME,                       0, "Nom"                                                                                                    },
     { TC_TXT_HELP_CONFIG_TYPE,                       0, "Type"                                                                                                   },
     { TC_TXT_HELP_CONFIG_ALLW,                       0, "Valeurs possibles"                                                                                      },
-    { TC_TXT_HELP_LANG_1,                            0,        
+    { TC_TXT_HELP_LANG_1,                            0,
         "\n"
         "L'option -language (ou -lang) indique la langue que Tidy doit utiliser \n"
         "en sortie. Veuillez noter que ce n'est pas un service de traduction de \n"
@@ -1143,7 +1143,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "Windows historique.\n"
         "\n"
     },
-    { TC_TXT_HELP_LANG_2,                            0,        
+    { TC_TXT_HELP_LANG_2,                            0,
         "\n"
         "Les langages suivants sont installés pour le moment dans Tidy.\n"
         "Veuillez noter qu'il n'y a pas de garantie qu'ils soient complets ; \n"
@@ -1151,7 +1151,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
         "langage indiqué.\n"
         "\n"
     },
-    { TC_TXT_HELP_LANG_3,                            0,        
+    { TC_TXT_HELP_LANG_3,                            0,
         "\n"
         "Si Tidy est capable de déterminer votre locale, Tidy utilisera alors la langue \n"
         "locale automatiquement. Par exemple, les systèmes basés sur Unix utilisent \n"
diff --git a/src/language_pt_br.h b/src/language_pt_br.h
index f64fd32f7..c41913b32 100644
--- a/src/language_pt_br.h
+++ b/src/language_pt_br.h
@@ -13,7 +13,7 @@
  *
  * [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 
+ *     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
@@ -55,13 +55,13 @@ static uint whichPluralForm_pt_br(uint n) {
  */
 static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     /***************************************
-     ** This MUST be present and first. 
+     ** 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,        
+    { 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 "
@@ -69,13 +69,13 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "http://www.html-tidy.org/accessibility/\"> Página de acessibilidade do "
         "Tidy</a>. "
     },
-    { TidyAltText,                                   0,        
+    { 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,        
+    { 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, é "
@@ -84,14 +84,14 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "existente é removido se um atributo <code>id</code> existir ou tenha sido "
         "adicionado. "
     },
-    { TidyAsciiChars,                                0,        
+    { 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,        
+    { 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 "
@@ -100,18 +100,18 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "<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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -126,23 +126,23 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -164,22 +164,22 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     },
     { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -187,73 +187,73 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "tags vazias como em linha ou bloqueio. <br/>Esta opção é ignorada no modo "
         "XML. "
     },
-    { TidyEncloseBlockText,                          0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { TidyEscapeCdata,                               0,
         "Esta opção especifica se o Tidy deve converter seções "
         "<code>&lt;![CDATA[]]&gt;</code> em texto normal. "
     },
-    { TidyEscapeScripts,                             0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { TidyHtmlOut,                                   0,
         "Esta opção especifica se o Tidy deve gerar uma impressão amigável, "
         "escrevendo como HTML. "
     },
-    { TidyInCharEncoding,                            0,        
+    { 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,        
+    { TidyIndentAttributes,                          0,
         "Esta opção especifica se o Tidy deve começar cada atributo em uma nova "
         "linha. "
     },
-    { TidyIndentCdata,                               0,        
+    { TidyIndentCdata,                               0,
         "Esta opção especifica se o Tidy deve aplicar recuo nas seções "
         "<code>&lt;![CDATA[]]&gt;</code>. "
     },
-    { TidyIndentContent,                             0,        
+    { 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>, "
@@ -265,30 +265,30 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -296,7 +296,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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 "
@@ -306,24 +306,24 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "dos valores de atributo sejam passados inalterados através, defina esta "
         "opção como <var>yes</var>. "
     },
-    { TidyLogicalEmphasis,                           0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -331,12 +331,12 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "<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,        
+    { 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,        
+    { 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 "
@@ -347,30 +347,30 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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,        
+    { 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,        
+    { TidyNCR,                                       0,
         "Esta opção especifica se o Tidy deve permitir referências de caracteres "
         "numéricos. "
     },
-    { TidyNewline,                                   0,        
+    { 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,        
+    { 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 "
@@ -378,7 +378,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "a declaração DOCTYPE gerada. <br/>As entidades que podem ser representadas "
         "na codificação de saída são traduzidas correspondentemente. "
     },
-    { TidyOmitOptionalTags,                          0,        
+    { 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 "
@@ -389,17 +389,17 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "<code>&lt;/td&gt;</code> e <code>&lt;/th&gt;</code>. <br/>Essa opção é "
         "ignorada para saída XML. "
     },
-    { TidyOutCharEncoding,                           0,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -408,7 +408,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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 "
@@ -419,11 +419,11 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "conversão de tabulações de entrada em espaços. Coloque-o em zero para reter "
         "as tabulações de entrada. "
     },
-    { TidyPreserveEntities,                          0,        
+    { TidyPreserveEntities,                          0,
         "Esta opção especifica se o Tidy deve preservar entidades bem-formadas como "
         "localizado na entrada. "
     },
-    { TidyPreTags,                                   0,        
+    { 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 "
@@ -432,62 +432,62 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "que você ainda não pode adicionar novos elementos CDATA. <br/>Esta opção é "
         "ignorada no modo XML. "
     },
-    { TidyPunctWrap,                                 0,        
+    { TidyPunctWrap,                                 0,
         "Essa opção especifica se o Tidy deve quebrar linha após alguns Unicode ou "
         "caracteres de pontuação chineses. "
     },
-    { TidyQuiet,                                     0,        
+    { 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,        
+    { TidyQuoteAmpersand,                            0,
         "Essa opção especifica se o Tidy deve emitir caracteres <code>&amp;</code> "
         "sem adornos como <code>&amp;amp;</code>. "
     },
-    { TidyQuoteMarks,                                0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { TidyShowInfo,                                  0,
         "Esta opção especifica se o Tidy deve exibir mensagens de nível "
         "informacional. "
     },
-    { TidyShowMarkup,                                0,        
+    { 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,        
+    { 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,        
+    { TidySkipNested,                                0,
         "Esta opção especifica que o Tidy deve pular tags aninhadas ao analisar "
         "script e dados de estilo. "
     },
-    { TidySortAttributes,                            0,        
+    { 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,        
+    { 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 "
@@ -497,12 +497,12 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "serão descartados. <br/>Quando configurado para <var>no</var>, essas "
         "verificações não são executadas. "
     },
-    { TidyTabSize,                                   0,        
+    { 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,        
+    { 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á "
@@ -510,12 +510,12 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "deixar nomes de atributos intactos. <br/>Ao usar a entrada XML, o "
         "maiusculização original é sempre preservada. "
     },
-    { TidyUpperCaseTags,                             0,        
+    { 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,        
+    { 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>, "
@@ -529,24 +529,24 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "abertura; As tags de fechamento de correspondência serão reconhecidas de "
         "acordo, e as tags de fechamento desconhecidas serão descartadas. "
     },
-    { TidyVertSpace,                                 0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -560,37 +560,37 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "através de alterações, configure <code>literal-attributes</code> para "
         "<var>yes</var>. "
     },
-    { TidyWrapJste,                                  0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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 "
@@ -600,7 +600,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "entities</code>. <br/>A maiusculização original de tags e atributos será "
         "preservada, independentemente de outras opções. "
     },
-    { TidyXmlDecl,                                   0,        
+    { 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 "
@@ -608,41 +608,41 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { TidyStyleTags,                                 0,
         "Esta opção especifica se o Tidy deve mover todas as tags de estilo para o "
         "cabeçalho do documento. "
     },
@@ -660,7 +660,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { STRING_ERROR_COUNT_ERROR,                      1, "erros"                                                                                           },
     { STRING_ERROR_COUNT_WARNING,                    0, "aviso"                                                                                           },
     { STRING_ERROR_COUNT_WARNING,                    1, "avisos"                                                                                          },
-    { STRING_HELLO_ACCESS,                           0,        
+    { STRING_HELLO_ACCESS,                           0,
         "\n"
         "Verificações de acessibilidade:\n"
     },
@@ -674,7 +674,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { TIDYCUSTOMEMPTY_STRING,                        0, "vazio"                                                                                           },
     { TIDYCUSTOMINLINE_STRING,                       0, "em-linha"                                                                                        },
     { TIDYCUSTOMPRE_STRING,                          0, "pré"                                                                                             },
-    { TEXT_HTML_T_ALGORITHM,                         0,        
+    { 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"
@@ -695,13 +695,13 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "        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,        
+    { 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,        
+    { 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"
@@ -709,7 +709,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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"
@@ -723,7 +723,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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"
@@ -731,7 +731,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "por favor veja http://www.unicode.org/ e\n"
         "http://www.cl.cam.ac.uk/~mgk25/unicode.html\n"
     },
-    { TEXT_INVALID_URI,                              0,        
+    { 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"
@@ -743,7 +743,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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"
@@ -753,12 +753,12 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "da tabela! Note que um formulário não pode ser aninhado\n"
         "dentro de outro!\n"
     },
-    { TEXT_BAD_MAIN,                                 0,        
+    { 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,        
+    { 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"
@@ -768,61 +768,61 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "não visuais forneçam um contexto significativo para\n"
         "cada célula.\n"
     },
-    { TEXT_M_IMAGE_ALT,                              0,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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,        
+    { 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"
@@ -831,14 +831,14 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { 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,        
+    { 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"
@@ -847,7 +847,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "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,        
+    { 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"
@@ -864,15 +864,15 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { 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,        
+    { BAD_SURROGATE_PAIR,                            0,
         "Possui par substituto U+%04X:U+%04X fora do intervalo, substituído pelo "
         "valor U+FFFD."
     },
-    { BAD_SURROGATE_TAIL,                            0,        
+    { BAD_SURROGATE_TAIL,                            0,
         "Par substituto precedente (alto) U+%04X, com nenhuma entidade ao final "
         "(Baixo), substituído por U+FFFD."
     },
@@ -886,7 +886,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { ENCODING_MISMATCH,                             0,
         "a codificação de entrada especificada (%s) não corresponde à codificação de "
         "entrada atual (%s)"
     },
@@ -992,7 +992,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { INFORMATION_NOT_CONVEYED_INPUT,                0,
         "[2.1.1.5]: certificar de que as informações não sejam transmitidas apenas por cores "
         "(entrada)."
     },
@@ -1077,7 +1077,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { ASSOCIATE_LABELS_EXPLICITLY_FOR,               0,
         "[12.4.1.2]: associar rótulos explicitamente com controles de formulário "
         "(for)."
     },
@@ -1097,7 +1097,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { TC_OPT_ACCESS,                                 0,
         " faz verificações adicionais de acessibilidade (<nível> = 0, 1, 2, 3). 0 é "
         "presumido se <nível> estiver faltando."
     },
@@ -1117,7 +1117,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { 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"
@@ -1141,7 +1141,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { 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."
@@ -1171,7 +1171,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { 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"
@@ -1181,7 +1181,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     },
     { 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,        
+    { TC_TXT_HELP_3,                                 0,
         "\n"
         "Opções de configuração do Tidy\n"
         "==========================\n"
@@ -1226,7 +1226,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "  http://validator.w3.org/nu/\n"
         "\n"
     },
-    { TC_TXT_HELP_CONFIG,                            0,        
+    { TC_TXT_HELP_CONFIG,                            0,
         "\n"
         "Definições de configuração do HTML Tidy\n"
         "\n"
@@ -1243,7 +1243,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { 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,        
+    { 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"
@@ -1263,7 +1263,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "Windows legado.\n"
         "\n"
     },
-    { TC_TXT_HELP_LANG_2,                            0,        
+    { 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"
@@ -1273,7 +1273,7 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
         "Informe as instâncias de strings incorretas para a equipe do Tidy. \n"
         "\n"
     },
-    { TC_TXT_HELP_LANG_3,                            0,        
+    { 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"
diff --git a/src/language_zh_cn.h b/src/language_zh_cn.h
index 1919fa5ac..33f9714e4 100644
--- a/src/language_zh_cn.h
+++ b/src/language_zh_cn.h
@@ -13,7 +13,7 @@
  *
  * [X] THIS FILE IS MACHINE GENERATED. It is a localization file for the
  *     language (and maybe region) "zh_cn". The source of
- *     these strings is a gettext PO file in Tidy's source, probably called 
+ *     these strings is a gettext PO file in Tidy's source, probably called
  *     "language_zh_cn.po".
  *
  * [ ] THIS FILE WAS HAND MODIFIED. Translators, please feel to edit this file
@@ -55,7 +55,7 @@ static uint whichPluralForm_zh_cn(uint n) {
  */
 static languageDefinition language_zh_cn = { whichPluralForm_zh_cn, {
     /***************************************
-     ** This MUST be present and first. 
+     ** This MUST be present and first.
      ** Specify the code for this language.
      ***************************************/
     {/* Specify the ll or ll_cc language code here. */
diff --git a/src/lexer.c b/src/lexer.c
index 16a8fefa8..2c41720a3 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -1,5 +1,5 @@
 /* lexer.c -- Lexer for html parser
-  
+
   (c) 1998-2008 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
 
@@ -150,7 +150,7 @@ static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node )
     if ((line == 3) && (col == 1)) {
         check_me("Show_Node"); /* just a debug trap */
     }
-    if (lexer && lexer->token && 
+    if (lexer && lexer->token &&
         ((lexer->token->type == TextNode)||(node && (node->type == TextNode)))) {
         if (show_attrs) {
             uint len = node ? node->end - node->start : 0;
@@ -192,7 +192,7 @@ static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node )
 /* swallows closing '>' */
 static AttVal *ParseAttrs( TidyDocImpl* doc, Bool *isempty );
 
-static tmbstr ParseAttribute( TidyDocImpl* doc, Bool* isempty, 
+static tmbstr ParseAttribute( TidyDocImpl* doc, Bool* isempty,
                              Node **asp, Node **php );
 
 static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name, Bool foldCase,
@@ -245,7 +245,7 @@ static struct _doctypes
   {  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,
@@ -960,7 +960,7 @@ static void AddByte( Lexer *lexer, tmbchar ch )
         buf = (tmbstr) TidyRealloc( lexer->allocator, lexer->lexbuf, allocAmt );
         if ( buf )
         {
-          TidyClearMemory( buf + lexer->lexlength, 
+          TidyClearMemory( buf + lexer->lexlength,
                            allocAmt - lexer->lexlength );
           lexer->lexbuf = buf;
           lexer->lexlength = allocAmt;
@@ -984,7 +984,7 @@ void TY_(AddCharToLexer)( Lexer *lexer, uint c )
 {
     int i, err, count = 0;
     tmbchar buf[10] = {0};
-    
+
     err = TY_(EncodeCharToUTF8Bytes)( c, buf, NULL, &count );
     if (err)
     {
@@ -994,7 +994,7 @@ void TY_(AddCharToLexer)( Lexer *lexer, uint c )
         buf[2] = (byte) 0xBD;
         count = 3;
     }
-    
+
     for ( i = 0; i < count; ++i )
         AddByte( lexer, buf[i] );
 }
@@ -1146,17 +1146,17 @@ static SPStatus GetSurrogatePair(TidyDocImpl* doc, Bool isXml, uint *pch)
 
   Also Randy Waki pointed out the following case for the
   04 Aug 00 version (bug #433012):
-  
+
   For example:   <a href="something.htm?id=1&lang=en">
   was tidied to: <a href="something.htm?id=1&lang;=en">
   rather than:   <a href="something.htm?id=1&amp;lang=en">
-  
+
   where "lang" is a known entity (#9001), but browsers would
   misinterpret "&lang;" because it had a value > 256.
-  
+
   So the case of an apparently known entity with a value > 256 and
   missing a semicolon is handled specially.
-  
+
   "ParseEntity" is also a bit of a misnomer - it handles entities and
   numeric character references. Invalid NCR's are now reported.
 */
@@ -1168,7 +1168,7 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
         ENT_numdec,
         ENT_numhex
     } ENTState;
-    
+
     typedef Bool (*ENTfn)(uint);
     const ENTfn entFn[] = {
         TY_(IsNamechar),
@@ -1232,7 +1232,7 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
     /* make sure entity is NULL terminated */
     lexer->lexbuf[lexer->lexsize] = '\0';
 
-    /* Should contrain version to XML/XHTML if &apos; 
+    /* Should contrain version to XML/XHTML if &apos;
     ** is encountered.  But this is not possible with
     ** Tidy's content model bit mask.
     */
@@ -1268,7 +1268,7 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
         if ((c1 = TY_(ReadChar)(doc->docIn)) == '&')
         {
             SPStatus status;
-            /* Have a following entity, 
+            /* Have a following entity,
                so there is a chance of having a valid surrogate pair */
             c1 = ch;    /* keep first value, in case of error */
             status = GetSurrogatePair(doc, isXml, &ch);
@@ -1286,7 +1286,7 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
             TY_(ReportSurrogateError)(doc, BAD_SURROGATE_TAIL, ch, 0); /* SP WARNING: - using substitute character */
             ch = 0xFFFD;
         }
-    } 
+    }
     else if (!preserveEntities && found && TY_(IsHighSurrogate)(ch))
     {
         /* Have trailing surrogate pair, with no lead */
@@ -1308,22 +1308,22 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
             if (ch >= 128 && ch <= 159)
             {
                 /* invalid numeric character reference */
-                
+
                 uint c1 = 0;
                 int replaceMode = DISCARDED_CHAR;
-            
+
                 /* Always assume Win1252 in this circumstance. */
                 c1 = TY_(DecodeWin1252)( ch );
 
                 if ( c1 )
                     replaceMode = REPLACED_CHAR;
-                
+
                 if ( c != ';' )  /* issue warning if not terminated by ';' */
                     TY_(ReportEntityError)( doc, MISSING_SEMICOLON_NCR,
                                             lexer->lexbuf+start, c );
- 
+
                 TY_(ReportEncodingError)(doc, INVALID_NCR, ch, replaceMode == DISCARDED_CHAR);
-                
+
                 if ( c1 )
                 {
                     /* make the replacement */
@@ -1337,7 +1337,7 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
                     lexer->lexsize = start;
                     semicolon = no;
                }
-               
+
             }
             else
                 TY_(ReportEntityError)( doc, UNKNOWN_ENTITY,
@@ -1348,10 +1348,10 @@ static void ParseEntity( TidyDocImpl* doc, GetTokenMode mode )
         }
         else
         {
-            /*\ 
+            /*\
              *  Issue #207 - A naked & is allowed in HTML5, as an unambiguous ampersand!
             \*/
-            if (TY_(HTMLVersion)(doc) != HT50) 
+            if (TY_(HTMLVersion)(doc) != HT50)
             {
                 TY_(ReportEntityError)( doc, UNESCAPED_AMPERSAND,
                                     lexer->lexbuf+start, ch );
@@ -1662,7 +1662,7 @@ Node *TY_(FindDocType)( TidyDocImpl* doc )
 {
     Node* node;
     for ( node = (doc ? doc->root.content : NULL);
-          node && node->type != DocTypeTag; 
+          node && node->type != DocTypeTag;
           node = node->next )
         /**/;
     return node;
@@ -1685,7 +1685,7 @@ Node *TY_(FindHTML)( TidyDocImpl* doc )
 {
     Node *node;
     for ( node = (doc ? doc->root.content : NULL);
-          node && !nodeIsHTML(node); 
+          node && !nodeIsHTML(node);
           node = node->next )
         /**/;
 
@@ -1712,7 +1712,7 @@ Node *TY_(FindHEAD)( TidyDocImpl* doc )
     if ( node )
     {
         for ( node = node->content;
-              node && !nodeIsHEAD(node); 
+              node && !nodeIsHEAD(node);
               node = node->next )
             /**/;
     }
@@ -1770,7 +1770,7 @@ Bool TY_(AddGenerator)( TidyDocImpl* doc )
     Node *node;
     Node *head = TY_(FindHEAD)( doc );
     tmbchar buf[256];
-    
+
     if (head)
     {
 #ifdef PLATFORM_NAME
@@ -1795,7 +1795,7 @@ Bool TY_(AddGenerator)( TidyDocImpl* doc )
                     {
                         /* update the existing content to reflect the */
                         /* actual version of Tidy currently being used */
-                        
+
                         TidyDocFree(doc, attval->value);
                         attval->value = TY_(tmbstrdup)(doc->allocator, buf);
                         return no;
@@ -1817,7 +1817,7 @@ Bool TY_(AddGenerator)( TidyDocImpl* doc )
     return no;
 }
 
-/*\ examine <!DOCTYPE ...> to identify version 
+/*\ examine <!DOCTYPE ...> to identify version
  *  Issue #167 and #169
  *   If HTML5
  *        <!DOCTYPE html>
@@ -1829,7 +1829,7 @@ static uint FindGivenVersion( TidyDocImpl* doc, Node* doctype )
     AttVal * fpi = TY_(GetAttrByName)(doctype, "PUBLIC");
     uint vers;
 
-    if (!fpi || !fpi->value) 
+    if (!fpi || !fpi->value)
     {
         /*\
          * Is. #815 - change to case-insensitive test
@@ -1890,7 +1890,7 @@ Bool TY_(WarnMissingSIInEmittedDocType)( TidyDocImpl* doc )
 {
     Bool isXhtml = doc->lexer->isvoyager;
     Node* doctype;
-    
+
     /* Do not warn in XHTML mode */
     if ( isXhtml )
         return no;
@@ -1913,7 +1913,7 @@ Bool TY_(WarnMissingSIInEmittedDocType)( TidyDocImpl* doc )
 
 /* Put DOCTYPE declaration between the
 ** <?xml version "1.0" ... ?> declaration, if any,
-** and the <html> tag.  Should also work for any comments, 
+** and the <html> tag.  Should also work for any comments,
 ** etc. that may precede the <html> tag.
 */
 
@@ -2166,7 +2166,7 @@ Bool TY_(FixXmlDecl)( TidyDocImpl* doc )
     encoding = TY_(GetAttrByName)(xml, "encoding");
 
     /*
-      We need to insert a check if declared encoding 
+      We need to insert a check if declared encoding
       and output encoding mismatch and fix the XML
       declaration accordingly!!!
     */
@@ -2243,7 +2243,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
     /*\ Issue #65 (1642186) and #280 - is script or style, and the option on
      *  If yes, then avoid incrementing nested...
     \*/
-    Bool nonested = ((nodeIsSCRIPT(container) || (nodeIsSTYLE(container))) && 
+    Bool nonested = ((nodeIsSCRIPT(container) || (nodeIsSTYLE(container))) &&
         cfgBool(doc, TidySkipNested)) ? yes : no;
 
     SetLexerLocus( doc, lexer );
@@ -2287,7 +2287,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
                 TY_(AddCharToLexer)(lexer, c);
 
                 c = TY_(ReadChar)(doc->docIn);
-                
+
                 if (!TY_(IsLetter)(c))
                 {
                     TY_(UngetChar)(c, doc->docIn);
@@ -2314,17 +2314,17 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
                 TY_(AddCharToLexer)(lexer, c);
 
                 if (nonested) {
-                    /*\ 
+                    /*\
                      *  Issue #65 - for version 5.1.14.EXP2
-                     *  If the nonested option is ON then the <script> 
-                     *  tag did not bump nested, so no need to treat this as 
+                     *  If the nonested option is ON then the <script>
+                     *  tag did not bump nested, so no need to treat this as
                      *  an end tag just to decrease nested, just continue!
                     \*/
                     continue;
                 }
 
                 c = TY_(ReadChar)(doc->docIn);
-                
+
                 if (!TY_(IsLetter)(c))
                 {
                     TY_(UngetChar)(c, doc->docIn);
@@ -2388,7 +2388,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
                 SetLexerLocus( doc, lexer );
                 lexer->columns -= 3;
 
-                /*\ if javascript insert backslash before / 
+                /*\ if javascript insert backslash before /
                  *  Issue #348 - Add option, escape-scripts, to skip
                 \*/
                 if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts) &&
@@ -2471,7 +2471,7 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
             /* itoken has been accepted */
             lexer->itoken = NULL;
         }
-            
+
         /* duplicate inlines in preference to pushed text nodes when appropriate */
         lexer->pushed = no;
         if (lexer->token->type != TextNode
@@ -2489,8 +2489,8 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
     assert( !(lexer->pushed || lexer->itoken) );
 
     /* at start of block elements, unclosed inline
-       elements are inserted into the token stream 
-       Issue #341 - Can NOT insert a token if NO istacksize  
+       elements are inserted into the token stream
+       Issue #341 - Can NOT insert a token if NO istacksize
      */
     if ((lexer->insert || lexer->inode) && lexer->istacksize)
     {
@@ -2529,7 +2529,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
     AttVal *attributes = NULL;
     Node *node;
     Bool fixComments;
-    
+
     switch ( cfgAutoBool(doc, TidyFixComments) )
     {
         case TidyYesState:
@@ -2576,7 +2576,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                  to do this here rather than in parser methods
                  for elements that don't have mixed content.
                 */
-                if (TY_(IsWhite)(c) && (mode == IgnoreWhitespace) 
+                if (TY_(IsWhite)(c) && (mode == IgnoreWhitespace)
                       && lexer->lexsize == lexer->txtstart + 1)
                 {
                     --(lexer->lexsize);
@@ -2915,7 +2915,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 /* this doesn't apply to empty elements */
                 /* nor to preformatted content that needs escaping */
                 /*\
-                 * Issue #230: Need to KEEP this user newline character in certain 
+                 * Issue #230: Need to KEEP this user newline character in certain
                  * circumstances, certainly for <pre>, <script>, <style>...
                  * Any others?
                  * Issue #238: maybe **ONLY** for <pre>
@@ -2941,11 +2941,11 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                     lexer->waswhite = no;
 
                 lexer->state = LEX_CONTENT;
-                if (lexer->token->tag == NULL) 
+                if (lexer->token->tag == NULL)
                 {
                     if (mode != OtherNamespace) /* [i_a]2 only issue warning if NOT 'OtherNamespace', and tag null */
                     {
-                        /* Special case for HTML5 unknown tags: if it looks 
+                        /* Special case for HTML5 unknown tags: if it looks
                            like an autonomous custom tag, then emit a variation
                            of the standard message. We don't want to do this
                            for older HTML, because it's not truly supported
@@ -2960,7 +2960,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 {
                     TY_(ConstrainVersion)( doc, lexer->token->tag->versions );
                     TY_(RepairDuplicateAttributes)( doc, lexer->token, no );
-                } else 
+                } else
                     TY_(RepairDuplicateAttributes)( doc, lexer->token, yes );
                 node = lexer->token;
                 GTDBG(doc,"starttag", node);
@@ -3060,7 +3060,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 /* http://tidy.sf.net/bug/1266647 */
                 TY_(AddCharToLexer)(lexer, c);
 
-                continue; 
+                continue;
 
             case LEX_DOCTYPE:  /* seen <!d so look for '>' munging whitespace */
 
@@ -3085,7 +3085,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                          *  Issue #167 & #169 - TidyTag_A
                          *  Issue #196        - TidyTag_CAPTION
                          *  others?
-                        \*/ 
+                        \*/
                         TY_(AdjustTags)(doc); /* Dynamically modify the tags table  */
                     }
                 }
@@ -3276,7 +3276,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                         {
                             av = TY_(NewAttribute)(doc);
                             av->asp = asp;
-                            AddAttrToList( &attributes, av ); 
+                            AddAttrToList( &attributes, av );
                         }
 
                         /* check if attributes are created by PHP markup */
@@ -3284,9 +3284,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                         {
                             av = TY_(NewAttribute)(doc);
                             av->php = php;
-                            AddAttrToList( &attributes, av ); 
+                            AddAttrToList( &attributes, av );
                         }
-                      
+
                         /* fix for http://tidy.sf.net/bug/788031 */
                         lexer->lexsize -= 1;
                         lexer->txtend = lexer->txtstart;
@@ -3355,7 +3355,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                 if (c != '>')
                 {
                     /* Issue #153 - can also be ]'-->' */
-                    if (c == '-') 
+                    if (c == '-')
                     {
                         c = TY_(ReadChar)(doc->docIn);
                         if (c == '-')
@@ -3369,8 +3369,8 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                                 continue;
                             }
                             /* this failed!
-                               TY_(AddCharToLexer)(lexer, '-'); TY_(AddCharToLexer)(lexer, '-'); lexdump = 0; 
-                               got output <![endif]--]> - needs furhter fix in pprint section output 
+                               TY_(AddCharToLexer)(lexer, '-'); TY_(AddCharToLexer)(lexer, '-'); lexdump = 0;
+                               got output <![endif]--]> - needs furhter fix in pprint section output
                              */
                         }
                         else
@@ -3379,14 +3379,14 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
                             TY_(UngetChar)('-', doc->docIn);
                             continue;
                         }
-                    } 
-                    else 
+                    }
+                    else
                     {
                         TY_(UngetChar)(c, doc->docIn);
                         continue;
                     }
                 }
- 
+
                 lexer->lexsize -= lexdump;
                 lexer->txtend = lexer->lexsize;
                 lexer->lexbuf[lexer->lexsize] = '\0';
@@ -3551,8 +3551,8 @@ static Node *ParseAsp( TidyDocImpl* doc )
 
     lexer->txtstart = lexer->txtend;
     return asp;
-}   
- 
+}
+
 
 /*
  PHP is like ASP but is based upon XML
@@ -3595,7 +3595,7 @@ static Node *ParsePhp( TidyDocImpl* doc )
 
     lexer->txtstart = lexer->txtend;
     return php;
-}   
+}
 
 /* consumes the '>' terminating start tags */
 /* @TODO: float the errors back to the calling method */
@@ -3965,7 +3965,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
                 /* 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"'  */
-                
+
                 c = TY_(ReadChar)(doc->docIn);
                 if (c == '>')
                 {
@@ -4055,7 +4055,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
 
             if (munge)
             {
-                /* discard line breaks in quoted URLs */ 
+                /* discard line breaks in quoted URLs */
                 /* #438650 - fix by Randy Waki */
                 if ( c == '\n' && TY_(IsUrl)(doc, name) )
                 {
@@ -4063,7 +4063,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
                     TY_(ReportAttrError)( doc, lexer->token, NULL, NEWLINE_IN_URI);
                     continue;
                 }
-                
+
                 c = ' ';
 
                 if (lastc == ' ')
@@ -4095,7 +4095,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_(Report)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE ); 
+            TY_(Report)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE );
     }
 
     len = lexer->lexsize - start;
@@ -4227,7 +4227,7 @@ static AttVal* ParseAttrs( TidyDocImpl* doc, Bool *isempty )
             {
                 av = TY_(NewAttribute)(doc);
                 av->asp = asp;
-                AddAttrToList( &list, av ); 
+                AddAttrToList( &list, av );
                 continue;
             }
 
@@ -4236,7 +4236,7 @@ static AttVal* ParseAttrs( TidyDocImpl* doc, Bool *isempty )
             {
                 av = TY_(NewAttribute)(doc);
                 av->php = php;
-                AddAttrToList( &list, av ); 
+                AddAttrToList( &list, av );
                 continue;
             }
 
diff --git a/src/lexer.h b/src/lexer.h
index 50fa2cdde..160b33158 100644
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -2,7 +2,7 @@
 #define __LEXER_H__
 
 /* lexer.h -- Lexer for html parser
-  
+
    (c) 1998-2008 (W3C) MIT, ERCIM, Keio University
    See tidy.h for the copyright notice.
 
@@ -141,7 +141,7 @@ typedef enum
 #define CM_IMG          (1 << 16)
 /* Elements with inline and block model. Used to avoid calling InlineDup. */
 #define CM_MIXED        (1 << 17)
-/* Elements whose content needs to be indented only if containing one 
+/* Elements whose content needs to be indented only if containing one
    CM_BLOCK element. */
 #define CM_NO_INDENT    (1 << 18)
 /* Elements that are obsolete (such as "dir", "menu"). */
@@ -348,7 +348,7 @@ struct _Lexer
     Node* itoken;           /* last duplicate inline returned by GetToken() */
     Node* root;             /* remember root node of the document */
     Node* parent;           /* remember parent node for CDATA elements */
-    
+
     Bool seenEndBody;       /* true if a </body> tag has been encountered */
     Bool seenEndHtml;       /* true if a </html> tag has been encountered */
 
diff --git a/src/message.c b/src/message.c
index ee2e6c6f3..4ba00fe31 100644
--- a/src/message.c
+++ b/src/message.c
@@ -65,25 +65,25 @@ static void NtoS(int n, tmbstr str)
 {
     tmbchar buf[40];
     int i;
-    
+
     for (i = 0;; ++i)
     {
         buf[i] = (tmbchar)( (n % 10) + '0' );
-        
+
         n = n / 10;
-        
+
         if (n == 0)
             break;
     }
-    
+
     n = i;
-    
+
     while (i >= 0)
     {
         str[n-i] = buf[i];
         --i;
     }
-    
+
     str[n+1] = '\0';
 }
 
@@ -247,7 +247,7 @@ static messageFormatter formatStandard;
 static messageFormatter formatStandardDynamic;
 
 
-/* This structure ties together for each report Code the default 
+/* 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
@@ -549,7 +549,7 @@ TidyMessageImpl *formatAttributeReport(TidyDocImpl* doc, Node *element, Node *no
     {
         case MISSING_QUOTEMARK_OPEN:
             return TY_(tidyMessageCreateWithNode)(doc, node, code, level, name );
-		
+
         case BACKSLASH_IN_URI:
         case ESCAPED_ILLEGAL_URI:
         case FIXED_BACKSLASH:
@@ -705,7 +705,7 @@ TidyMessageImpl *formatStandard(TidyDocImpl* doc, Node *element, Node *node, uin
 
         case STRING_NO_SYSID:
             return TY_(tidyMessageCreate)( doc, code, level );
-            
+
         case FILE_CANT_OPEN:
         case FILE_CANT_OPEN_CFG:
         case FILE_NOT_FILE:
@@ -1033,12 +1033,12 @@ static struct _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 },
@@ -1060,7 +1060,7 @@ static struct _dialogueDispatchTable {
     { TEXT_USING_NOBR,             TidyDialogueFootnote },
     { TEXT_USING_SPACER,           TidyDialogueFootnote },
     { TEXT_VENDOR_CHARS,           TidyDialogueFootnote },
-    
+
     { 0, 0 }
 };
 
@@ -1079,7 +1079,7 @@ TidyMessageImpl *formatDialogue( TidyDocImpl* doc, uint code, TidyReportLevel le
             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,
@@ -1113,7 +1113,7 @@ TidyMessageImpl *formatDialogue( TidyDocImpl* doc, uint code, TidyReportLevel le
         default:
             return TY_(tidyMessageCreate)( doc, code, level );
     }
-    
+
     return NULL;
 }
 
@@ -1163,8 +1163,8 @@ void TY_(Dialogue)(TidyDocImpl* doc, uint code, ...)
 void TY_(ErrorSummary)( TidyDocImpl* doc )
 {
     ctmbstr encnam = tidyLocalizedString(STRING_SPECIFIED);
-    int charenc = cfg( doc, TidyCharEncoding ); 
-    if ( charenc == WIN1252 ) 
+    int charenc = cfg( doc, TidyCharEncoding );
+    if ( charenc == WIN1252 )
         encnam = "Windows-1252";
     else if ( charenc == MACROMAN )
         encnam = "MacRoman";
@@ -1199,7 +1199,7 @@ void TY_(ErrorSummary)( TidyDocImpl* doc )
         if (doc->badChars & BC_INVALID_URI)
             TY_(Dialogue)( doc, TEXT_INVALID_URI );
     }
-    
+
     if (doc->badForm)
     {
         if (doc->badForm & flg_BadForm) /* Issue #166 - changed to BIT flag to support other errors */
@@ -1249,11 +1249,11 @@ void TY_(ErrorSummary)( TidyDocImpl* doc )
 
         if (doc->badLayout & USING_NOBR)
             TY_(Dialogue)( doc, TEXT_USING_NOBR );
-        
+
         if (doc->badLayout & USING_BODY)
             TY_(Dialogue)( doc, TEXT_USING_BODY );
     }
-    
+
     if (doc->footnotes)
     {
         if (doc->footnotes & FN_TRIM_EMPTY_ELEMENT)
@@ -1262,7 +1262,7 @@ void TY_(ErrorSummary)( TidyDocImpl* doc )
 }
 
 
-/* Outputs document HTML version and version-related information. 
+/* Outputs document HTML version and version-related information.
 ** Called by tidyRunDiagnostics(), from console.
 ** Called by tidyDocReportDoctype(), currently unused.
 */
@@ -1289,7 +1289,7 @@ void TY_(ReportMarkupVersion)( TidyDocImpl* doc )
 }
 
 
-/* Reports the number of warnings and errors found in the document. 
+/* Reports the number of warnings and errors found in the document.
 ** Called by tidyRunDiagnostics(), from console.
 */
 void TY_(ReportNumWarnings)( TidyDocImpl* doc )
@@ -1461,14 +1461,14 @@ uint TY_(tidyErrorCodeFromKey)(ctmbstr code)
 static const uint tidyErrorCodeListSize()
 {
     static uint array_size = 0;
-    
+
     if ( array_size == 0 )
     {
         while ( tidyStringsKeys[array_size].key ) {
             array_size++;
         }
     }
-    
+
     return array_size;
 }
 
@@ -1490,15 +1490,15 @@ uint TY_(getNextErrorCode)( TidyIterator* iter )
     const tidyStringsKeyItem *item = NULL;
     size_t itemIndex;
     assert( iter != NULL );
-    
+
     itemIndex = (size_t)*iter;
-    
+
     if ( itemIndex > 0 && itemIndex <= tidyErrorCodeListSize() )
     {
         item = &tidyStringsKeys[itemIndex - 1];
         itemIndex++;
     }
-    
+
     *iter = (TidyIterator)( itemIndex <= tidyErrorCodeListSize() ? itemIndex : (size_t)0 );
     return item->value;
 }
@@ -1544,7 +1544,7 @@ static const TidyOptionId TidyWrapAttValsLinks[] =     { TidyWrapScriptlets, Tid
 static const TidyOptionId TidyWrapScriptletsLinks[] =  { TidyWrapAttVals, TidyUnknownOption };
 static const TidyOptionId TidyXmlDeclLinks[] =         { TidyCharEncoding, TidyOutCharEncoding, TidyUnknownOption };
 
-/* Cross-reference assignments. 
+/* Cross-reference assignments.
  * We can't build a complex array at compile time and we're not counting on
  * any type of initialization, so this two-stage building process is required.
  */
diff --git a/src/message.h b/src/message.h
index b093d1d8a..2d8a37236 100644
--- a/src/message.h
+++ b/src/message.h
@@ -31,7 +31,7 @@
  *   - use a message filter callback routine.
  *
  * @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
@@ -68,7 +68,7 @@
  */
 ctmbstr TY_(ReleaseDate)(void);
 
-/** 
+/**
  *  Returns the release version of this instance of HTML Tidy.
  */
 ctmbstr TY_(tidyLibraryVersion)(void);
@@ -92,7 +92,7 @@ ctmbstr TY_(tidyLibraryVersion)(void);
  ** @{
  ******************************************************************************/
 
-/** @name General Report Writing 
+/** @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
@@ -149,7 +149,7 @@ void TY_(Dialogue)( TidyDocImpl* doc, uint code, ... );
 /** @{ */
 
 
-/** 
+/**
  *  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.
@@ -160,7 +160,7 @@ void TY_(Dialogue)( TidyDocImpl* doc, uint code, ... );
 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.
@@ -241,8 +241,8 @@ ctmbstr TY_(getNextMutedMessage)( TidyDocImpl* doc, TidyIterator* iter );
 
 /**
  *  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 
+ *  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);
@@ -283,7 +283,7 @@ uint TY_(getNextErrorCode)( TidyIterator* iter );
 #define BA_MISSING_IMAGE_MAP       8
 #define BA_USING_FRAMES            16
 #define BA_USING_NOFRAMES          32
-#define BA_INVALID_LINK_NOFRAMES   64  /* WAI [6.5.1.4] */  
+#define BA_INVALID_LINK_NOFRAMES   64  /* WAI [6.5.1.4] */
 #define BA_WAI                     (1 << 31)
 
 /* presentation flaws */
diff --git a/src/messageobj.c b/src/messageobj.c
index a6a0bef6b..5543a08c4 100644
--- a/src/messageobj.c
+++ b/src/messageobj.c
@@ -203,7 +203,7 @@ static TidyMessageImpl *tidyMessageCreateInitV( TidyDocImpl *doc,
     }
 
     /* reportCallback is intended to allow LibTidy users to localize messages
-       via their own means by providing a key and the parameters to fill it. 
+       via their own means by providing a key and the parameters to fill it.
        As it's a "legacy" API, it does not receive TidyDialogue messages. */
     if ( (result->level <= TidyFatal) && doc->reportCallback )
     {
@@ -234,7 +234,7 @@ TidyMessageImpl *TY_(tidyMessageCreate)( TidyDocImpl *doc,
     va_start(args, level);
     result = tidyMessageCreateInitV(doc, NULL, code, 0, 0, level, args);
     va_end(args);
-    
+
     return result;
 }
 
@@ -251,11 +251,11 @@ TidyMessageImpl *TY_(tidyMessageCreateWithNode)( TidyDocImpl *doc,
                 ( doc->lexer ? doc->lexer->lines : 0 ) );
     int col  = ( node ? node->column :
                 ( doc->lexer ? doc->lexer->columns : 0 ) );
-    
+
     va_start(args_copy, level);
     result = tidyMessageCreateInitV(doc, node, code, line, col, level, args_copy);
     va_end(args_copy);
-    
+
     return result;
 }
 
@@ -269,11 +269,11 @@ TidyMessageImpl *TY_(tidyMessageCreateWithLexer)( TidyDocImpl *doc,
     va_list args_copy;
     int line = ( doc->lexer ? doc->lexer->lines : 0 );
     int col  = ( doc->lexer ? doc->lexer->columns : 0 );
-    
+
     va_start(args_copy, level);
     result = tidyMessageCreateInitV(doc, NULL, code, line, col, level, args_copy);
     va_end(args_copy);
-    
+
     return result;
 }
 
@@ -403,15 +403,15 @@ TidyMessageArgument TY_(getNextMessageArgument)( TidyMessageImpl message, TidyIt
     size_t item = 0;
     size_t itemIndex;
     assert( iter != NULL );
-    
+
     itemIndex = (size_t)*iter;
-    
+
     if ( itemIndex >= 1 && itemIndex <= (size_t)message.argcount )
     {
         item = itemIndex;
         itemIndex++;
     }
-    
+
     /* Just as TidyIterator is really just a dumb, one-based index, the
        TidyMessageArgument is really just a dumb, zero-based index; however
        this type of iterator and opaque interrogation is simply how Tidy
@@ -425,7 +425,7 @@ TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArg
 {
     int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
-    
+
     return message.arguments[argNum].type;
 }
 
@@ -434,7 +434,7 @@ ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
 {
     int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
-    
+
     return message.arguments[argNum].format;
 }
 
@@ -444,7 +444,7 @@ ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* ar
     int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     assert( message.arguments[argNum].type == tidyFormatType_STRING);
-    
+
     return message.arguments[argNum].u.s;
 }
 
@@ -474,7 +474,7 @@ double TY_(getArgValueDouble)( TidyMessageImpl message, TidyMessageArgument* arg
     int argNum = (int)(size_t)*arg - 1;
     assert( argNum <= message.argcount );
     assert( message.arguments[argNum].type == tidyFormatType_DOUBLE);
-    
+
     return message.arguments[argNum].u.d;
 }
 
@@ -508,28 +508,28 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
     const char* p;  /* current position in format string. */
     char c;         /* current character. */
     struct printfArg* nas;
-    
+
     /* first pass: determine number of valid % to allocate space. */
-    
+
     p = fmt;
     *rv = 0;
-    
+
     while( ( c = *p++ ) != 0 )
     {
         if( c != '%' )
             continue;
-        
+
         if( ( c = *p++ ) == '%' )	/* skip %% case */
             continue;
         else
             number++;
     }
-        
+
 
     if( number == 0 )
         return NULL;
 
-    
+
     nas = (struct printfArg*)TidyDocAlloc( doc, number * sizeof( struct printfArg ) );
     if( !nas )
     {
@@ -542,16 +542,16 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
     {
         nas[i].type = tidyFormatType_UNKNOWN;
     }
-    
-    
+
+
     /* second pass: set nas[].type and location. */
-    
+
     p = fmt;
     while( ( c = *p++ ) != 0 )
     {
         if( c != '%' )
             continue;
-        
+
         if( ( c = *p++ ) == '%' )
             continue; /* skip %% case */
 
@@ -564,13 +564,13 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
             *rv = -1;
             break;
         }
-        
+
         /* width field -- skip */
         while ((c >= '0') && (c <= '9'))
         {
             c = *p++;
         }
-        
+
         /* precision */
         if (c == '.')
         {
@@ -580,16 +580,16 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
                 *rv = -1;
                 break;
             }
-            
+
             while ((c >= '0') && (c <= '9'))
             {
                 c = *p++;
             }
         }
-        
-        
+
+
         cn++;
-        
+
         /* size and format */
         nas[cn].type = tidyFormatType_UINT;
         switch (c)
@@ -633,7 +633,7 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
         /* position and format */
         nas[cn].formatStart = pos;
         nas[cn].formatLength = (p - fmt) - pos;
-        
+
         /* the format string exceeds the buffer length */
         if ( nas[cn].formatLength >= FORMAT_LENGTH )
         {
@@ -644,7 +644,7 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
         {
             strncpy(nas[cn].format, fmt + nas[cn].formatStart, nas[cn].formatLength);
         }
-        
+
 
         /* Something's not right. */
         if( nas[cn].type == tidyFormatType_UNKNOWN )
@@ -653,10 +653,10 @@ static struct printfArg* BuildArgArray( TidyDocImpl *doc, ctmbstr fmt, va_list a
             break;
         }
     }
-    
-    
+
+
     /* third pass: fill the nas[cn].ap */
-    
+
     if( *rv < 0 )
     {
         TidyDocFree( doc, nas );;
diff --git a/src/parser.c b/src/parser.c
index 8569ed5ce..a0b7c9864 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -288,7 +288,7 @@ static Bool CanPrune( TidyDocImpl* doc, Node *element )
     /* fix for ISSUE #7 https://github.com/w3c/tidy-html5/issues/7 */
     if (nodeIsCANVAS(element))
         return no;
-    
+
     if (nodeIsPROGRESS(element))
         return no;
 
@@ -331,7 +331,7 @@ Node *TY_(TrimEmptyElement)( TidyDocImpl* doc, Node *element )
             doc->footnotes |= FN_TRIM_EMPTY_ELEMENT;
             TY_(Report)(doc, element, NULL, TRIM_EMPTY_ELEMENT);
         }
-        
+
         return TY_(DiscardElement)(doc, element);
     }
     return element->next;
@@ -362,7 +362,7 @@ Node* TY_(DropEmptyElements)(TidyDocImpl* doc, Node* node)
     return node;
 }
 
-/* 
+/*
   errors in positioning of form start or end tags
   generally require human intervention to fix
   Issue #166 - repeated <main> element also uses this flag
@@ -375,7 +375,7 @@ static void BadForm( TidyDocImpl* doc )
 }
 
 /*
-  This maps 
+  This maps
        <em>hello </em><strong>world</strong>
   to
        <em>hello</em> <strong>world</strong>
@@ -418,7 +418,7 @@ Bool TY_(IsBlank)(Lexer *lexer, Node *node)
 }
 
 /*
-  This maps 
+  This maps
        <p>hello<em> world</em>
   to
        <p>hello <em>world</em>
@@ -432,8 +432,8 @@ static void TrimInitialSpace( TidyDocImpl* doc, Node *element, Node *text )
     Lexer* lexer = doc->lexer;
     Node *prev, *node;
 
-    if ( TY_(nodeIsText)(text) && 
-         lexer->lexbuf[text->start] == ' ' && 
+    if ( TY_(nodeIsText)(text) &&
+         lexer->lexbuf[text->start] == ' ' &&
          text->start < text->end )
     {
         if ( (element->tag->model & CM_INLINE) &&
@@ -597,7 +597,7 @@ static void CleanSpaces(TidyDocImpl* doc, Node* node)
     }
 }
 
-/* 
+/*
   Move initial and trailing space out.
   This routine maps:
 
@@ -689,7 +689,7 @@ static void ParseTag( TidyDocImpl* doc, Node *node, GetTokenMode mode )
         return;
 
     /*
-       Fix by GLP 2000-12-21.  Need to reset insertspace if this 
+       Fix by GLP 2000-12-21.  Need to reset insertspace if this
        is both a non-inline and empty tag (base, link, meta, isindex, hr, area).
     */
     if (node->tag->model & CM_EMPTY)
@@ -816,7 +816,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
         return;
     }
 
-    if ( nodeIsFORM(element) && 
+    if ( nodeIsFORM(element) &&
          DescendantOf(element, TidyTag_FORM) )
         TY_(Report)(doc, element, NULL, ILLEGAL_NESTING );
 
@@ -851,7 +851,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
     else if (mode == IgnoreWhitespace)
     {
         /* Issue #212 - Further fix in case ParseBlock() is called with 'IgnoreWhitespace'
-           when such a leading space may need to be inserted before this element to 
+           when such a leading space may need to be inserted before this element to
            preverve the browser view */
         mode = MixedContent;
     }
@@ -913,7 +913,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
             }
             else if (DescendantOf( element, node->tag->id ))
             {
-                /* 
+                /*
                   if this is the end tag for an ancestor element
                   then infer end tag for this element
                 */
@@ -1157,7 +1157,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
 
                 if ( !TY_(nodeHasCM)(element, CM_OPT) && !element->implicit )
                     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 );
@@ -1198,7 +1198,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 else if ( TY_(nodeHasCM)(node, CM_TABLE) || TY_(nodeHasCM)(node, CM_ROW) )
                 {
                     /* http://tidy.sf.net/issue/1316307 */
-                    /* In exiled mode, return so table processing can 
+                    /* In exiled mode, return so table processing can
                        continue. */
                     if (lexer->exiled) {
 #if defined(ENABLE_DEBUG_LOG)
@@ -1242,7 +1242,7 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
          *  href: http://www.w3.org/TR/html-markup/a.html
          *  The interactive element a must not appear as a descendant of the a element.
         \*/
-        if ( nodeIsA(node) && !node->implicit && 
+        if ( nodeIsA(node) && !node->implicit &&
              (nodeIsA(element) || DescendantOf(element, TidyTag_A)) )
         {
             if (node->type != EndTag && node->attributes == NULL
@@ -1306,11 +1306,11 @@ void TY_(ParseBlock)( TidyDocImpl* doc, Node *element, GetTokenMode mode)
                 TrimSpaces( doc, element );
 
             TY_(InsertNodeAtEnd)(element, node);
-            
+
             if (node->implicit)
                 TY_(Report)(doc, element, node, INSERTING_TAG );
 
-            /* Issue #212 - WHY is this hard coded to 'IgnoreWhitespace' while an 
+            /* Issue #212 - WHY is this hard coded to 'IgnoreWhitespace' while an
                effort has been made above to set a 'MixedContent' mode in some cases?
                WHY IS THE 'mode' VARIABLE NOT USED HERE???? */
             ParseTag( doc, node, IgnoreWhitespace /*MixedContent*/ );
@@ -1510,7 +1510,7 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
         }
         else if (node->type == StartTag)
         {
-            /* #130 MathML attr and entity fix! 
+            /* #130 MathML attr and entity fix!
                care if it has attributes, and 'accidently' any of those attributes match known */
             for ( av = node->attributes; av; av = av->next )
             {
@@ -1522,7 +1522,7 @@ void TY_(ParseNamespace)(TidyDocImpl* doc, Node *basenode, GetTokenMode mode)
         }
         else
         {
-            /* #130 MathML attr and entity fix! 
+            /* #130 MathML attr and entity fix!
                care if it has attributes, and 'accidently' any of those attributes match known */
             for ( av = node->attributes; av; av = av->next )
             {
@@ -1564,7 +1564,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
      This test is carried out in PushInline and PopInline, see istack.c
 
      InlineDup(...) is not called for elements with a CM_MIXED (inline and
-     block) content model, e.g. <del> or <ins>, otherwise constructs like 
+     block) content model, e.g. <del> or <ins>, otherwise constructs like
 
        <p>111<a name='foo'>222<del>333</del>444</a>555</p>
        <p>111<span>222<del>333</del>444</span>555</p>
@@ -1605,7 +1605,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
              then move the font element inside the anchor since
              otherwise it won't alter the anchor text color
             */
-            if ( nodeIsFONT(element) && 
+            if ( nodeIsFONT(element) &&
                  element->content && element->content == element->last )
             {
                 Node *child = element->content;
@@ -1674,14 +1674,14 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             if (node->attributes == NULL || element->attributes == NULL)
                 TY_(Report)(doc, element, node, NESTED_EMPHASIS);
         }
-        else if ( TY_(IsPushed)(doc, node) && node->type == StartTag && 
+        else if ( TY_(IsPushed)(doc, node) && node->type == StartTag &&
                   nodeIsQ(node) )
         {
             /*\
              * Issue #215 - such nested quotes are NOT a problem if HTML5, so
              * only issue this warning if NOT HTML5 mode.
             \*/
-            if (TY_(HTMLVersion)(doc) != HT50) 
+            if (TY_(HTMLVersion)(doc) != HT50)
             {
                 TY_(Report)(doc, element, node, NESTED_QUOTATION);
             }
@@ -1733,7 +1733,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         if ( nodeIsP(node) &&
              node->type == StartTag &&
              ( (mode & Preformatted) ||
-               nodeIsDT(element) || 
+               nodeIsDT(element) ||
                DescendantOf(element, TidyTag_DT )
              )
            )
@@ -1892,7 +1892,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         */
         /* #427827 - fix by Randy Waki and Bjoern Hoehrmann 23 Aug 00 */
         /* if (node->tag == doc->tags.tag_a && !node->implicit && TY_(IsPushed)(doc, node)) */
-        if ( nodeIsA(node) && !node->implicit && 
+        if ( nodeIsA(node) && !node->implicit &&
              (nodeIsA(element) || DescendantOf(element, TidyTag_A)) )
         {
             /* coerce <a> to </a> unless it has some attributes */
@@ -2021,7 +2021,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         }
 
 
-        /* 
+        /*
           if this is the end tag for an ancestor element
           then infer end tag for this element
         */
@@ -2035,7 +2035,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
                     if (!(element->tag->model & CM_OPT) && !element->implicit)
                         TY_(Report)(doc, element, node, MISSING_ENDTAG_BEFORE);
 
-                    if( TY_(IsPushedLast)( doc, element, node ) ) 
+                    if( TY_(IsPushedLast)( doc, element, node ) )
                         TY_(PopInline)( doc, element );
                     TY_(UngetToken)( doc );
 
@@ -2052,7 +2052,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
         }
 
         /*\
-         *  block level tags end this element 
+         *  block level tags end this element
          *  Issue #333 - There seems an exception if the element is a 'span',
          *  and the node just collected is a 'meta'. The 'meta' can not have
          *  CM_INLINE added, nor can the 'span' have CM_MIXED added without
@@ -2123,7 +2123,7 @@ void TY_(ParseInline)( TidyDocImpl* doc, Node *element, GetTokenMode mode )
             /* trim white space before <br> */
             if ( nodeIsBR(node) )
                 TrimSpaces(doc, element);
-            
+
             TY_(InsertNodeAtEnd)(element, node);
             ParseTag(doc, node, mode);
             continue;
@@ -2202,7 +2202,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             continue;
         }
 
-        /* 
+        /*
           if this is the end tag for an ancestor element
           then infer end tag for this element
         */
@@ -2304,7 +2304,7 @@ void TY_(ParseDefList)(TidyDocImpl* doc, Node *list, GetTokenMode mode)
             TY_(FreeNode)( doc, node);
             continue;
         }
-        
+
         /* node should be <DT> or <DD>*/
         TY_(InsertNodeAtEnd)(list, node);
         ParseTag( doc, node, IgnoreWhitespace);
@@ -2388,7 +2388,7 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
         }
 
 
-        /* 
+        /*
           if this is the end tag for an ancestor element
           then infer end tag for this element
         */
@@ -2474,9 +2474,9 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                 return;
             }
             /* http://tidy.sf.net/issue/836462
-               If "list" is an unordered list, insert the next tag within 
-               the last <li> to preserve the numbering to match the visual 
-               rendering of most browsers. */    
+               If "list" is an unordered list, insert the next tag within
+               the last <li> to preserve the numbering to match the visual
+               rendering of most browsers. */
             if ( nodeIsOL(list) && FindLastLI(list, &lastli) )
             {
                 /* Create a node for error reporting */
@@ -2490,12 +2490,12 @@ void TY_(ParseList)(TidyDocImpl* doc, Node *list, GetTokenMode ARG_UNUSED(mode))
                 /* Add an inferred <li> */
                 wasblock = TY_(nodeHasCM)(node,CM_BLOCK);
                 node = TY_(InferredTag)(doc, TidyTag_LI);
-                /* Add "display: inline" to avoid a blank line after <li> with 
+                /* Add "display: inline" to avoid a blank line after <li> with
                    Internet Explorer. See http://tidy.sf.net/issue/836462 */
                 TY_(AddStyleProperty)( doc, node,
                                        wasblock
                                        ? "list-style: none; display: inline"
-                                       : "list-style: none" 
+                                       : "list-style: none"
                                        );
                 TY_(Report)(doc, list, node, MISSING_STARTTAG );
                 TY_(InsertNodeAtEnd)(list,node);
@@ -2579,7 +2579,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
             return;
         }
 
-        /* 
+        /*
           if this is the end tag for an ancestor element
           then infer end tag for this element
         */
@@ -2687,7 +2687,7 @@ void TY_(ParseRow)(TidyDocImpl* doc, Node *row, GetTokenMode ARG_UNUSED(mode))
             TY_(FreeNode)( doc, node);
             continue;
         }
-        
+
         /* node should be <TD> or <TH> */
         TY_(InsertNodeAtEnd)(row, node);
         exclude_state = lexer->excludeBlocks;
@@ -2780,7 +2780,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
             }
         }
 
-        /* 
+        /*
           if this is the end tag for ancestor element
           then infer end tag for this element
         */
@@ -2834,7 +2834,7 @@ void TY_(ParseRowGroup)(TidyDocImpl* doc, Node *rowgroup, GetTokenMode ARG_UNUSE
             TY_(FreeNode)( doc, node);
             continue;
         }
-        
+
         if ( !nodeIsTR(node) )
         {
             node = TY_(InferredTag)(doc, TidyTag_TR);
@@ -2865,7 +2865,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
             return;
         }
 
-        /* 
+        /*
           if this is the end tag for an ancestor element
           then infer end tag for this element
         */
@@ -2921,7 +2921,7 @@ void TY_(ParseColGroup)(TidyDocImpl* doc, Node *colgroup, GetTokenMode ARG_UNUSE
             TY_(FreeNode)( doc, node);
             continue;
         }
-        
+
         /* node should be <COL> */
         TY_(InsertNodeAtEnd)(colgroup, node);
         ParseTag(doc, node, IgnoreWhitespace);
@@ -2944,7 +2944,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
     in_parse_table++;
     SPRTF("Entering ParseTableTag %d...\n",in_parse_table);
 #endif
-    
+
     while ((node = TY_(GetToken)(doc, IgnoreWhitespace)) != NULL)
     {
         if (node->tag == table->tag )
@@ -2956,7 +2956,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             else
             {
                 /* Issue #498 - If a <table> in a <table>
-                 * just close the current table, and issue a 
+                 * just close the current table, and issue a
                  * warning. The previous action was to discard
                  * this second <table>
                  */
@@ -3000,7 +3000,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
                 TY_(Report)(doc, table, node, TAG_NOT_ALLOWED_IN);
                 lexer->exiled = yes;
 
-                if (node->type != TextNode) 
+                if (node->type != TextNode)
                     ParseTag(doc, node, IgnoreWhitespace);
 
                 lexer->exiled = no;
@@ -3013,7 +3013,7 @@ void TY_(ParseTableTag)(TidyDocImpl* doc, Node *table, GetTokenMode ARG_UNUSED(m
             }
         }
 
-        /* 
+        /*
           if this is the end tag for an ancestor element
           then infer end tag for this element
         */
@@ -3112,7 +3112,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
 
     while ((node = TY_(GetToken)(doc, Preformatted)) != NULL)
     {
-        if ( node->type == EndTag && 
+        if ( node->type == EndTag &&
              (node->tag == pre->tag || DescendantOf(pre, TagId(node))) )
         {
             if (nodeIsBODY(node) || nodeIsHTML(node))
@@ -3160,7 +3160,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             /* fix for http://tidy.sf.net/bug/772205 */
             if (node->type == EndTag)
             {
-                /* http://tidy.sf.net/issue/1590220 */ 
+                /* http://tidy.sf.net/issue/1590220 */
                if ( doc->lexer->exiled
                    && (TY_(nodeHasCM)(node, CM_TABLE) || nodeIsTABLE(node)) )
                {
@@ -3211,7 +3211,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
                 <pre>...<br>...<br>...</pre>         (Internet Explorer)
                 <pre>...<br><br>...<br><br>...</pre> (Mozilla, Opera 6)
                 <pre>...<br>...<br><br>...</pre>     (Opera 7)
-                
+
               or something similar, they could also be closing the <pre> and propagate
               the <pre> into the newly opened <p>.
 
@@ -3242,7 +3242,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
 
                 /* trim white space before <p> in <pre>*/
                 TrimSpaces(doc, pre);
-            
+
                 /* coerce both <p> and </p> to <br> */
                 TY_(CoerceNode)(doc, node, TidyTag_BR, no, no);
                 TY_(FreeAttrs)( doc, node ); /* discard align attribute etc. */
@@ -3261,7 +3261,7 @@ void TY_(ParsePre)( TidyDocImpl* doc, Node *pre, GetTokenMode ARG_UNUSED(mode) )
             /* trim white space before <br> */
             if ( nodeIsBR(node) )
                 TrimSpaces(doc, pre);
-            
+
             TY_(InsertNodeAtEnd)(pre, node);
             ParseTag(doc, node, Preformatted);
             continue;
@@ -3296,7 +3296,7 @@ void TY_(ParseOptGroup)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
         if (InsertMisc(field, node))
             continue;
 
-        if ( node->type == StartTag && 
+        if ( node->type == StartTag &&
              (nodeIsOPTION(node) || nodeIsOPTGROUP(node)) )
         {
             if ( nodeIsOPTGROUP(node) )
@@ -3346,11 +3346,11 @@ void TY_(ParseSelect)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(mod
         if (InsertMisc(field, node))
             continue;
 
-        if ( node->type == StartTag && 
+        if ( node->type == StartTag &&
              ( nodeIsOPTION(node)   ||
                nodeIsOPTGROUP(node) ||
                nodeIsDATALIST(node) ||
-               nodeIsSCRIPT(node)) 
+               nodeIsSCRIPT(node))
            )
         {
             TY_(InsertNodeAtEnd)(field, node);
@@ -3403,11 +3403,11 @@ void TY_(ParseDatalist)(TidyDocImpl* doc, Node *field, GetTokenMode ARG_UNUSED(m
         if (InsertMisc(field, node))
             continue;
 
-        if ( node->type == StartTag && 
+        if ( node->type == StartTag &&
              ( nodeIsOPTION(node)   ||
                nodeIsOPTGROUP(node) ||
                nodeIsDATALIST(node) ||
-               nodeIsSCRIPT(node)) 
+               nodeIsSCRIPT(node))
            )
         {
             TY_(InsertNodeAtEnd)(field, node);
@@ -3475,7 +3475,7 @@ void TY_(ParseText)(TidyDocImpl* doc, Node *field, GetTokenMode mode)
         /* for textarea should all cases of < and & be escaped? */
 
         /* discard inline tags e.g. font */
-        if (   node->tag 
+        if (   node->tag
             && node->tag->model & CM_INLINE
             && !(node->tag->model & CM_FIELD)) /* #487283 - fix by Lee Passey 25 Jan 02 */
         {
@@ -3567,7 +3567,7 @@ void TY_(ParseTitle)(TidyDocImpl* doc, Node *title, GetTokenMode ARG_UNUSED(mode
 void TY_(ParseScript)(TidyDocImpl* doc, Node *script, GetTokenMode ARG_UNUSED(mode))
 {
     Node *node;
-    
+
     doc->lexer->parent = script;
     node = TY_(GetToken)(doc, CdataContent);
     doc->lexer->parent = NULL;
@@ -3686,7 +3686,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
             TY_(FreeNode)( doc, node);
             continue;
         }
-        
+
         /*
          if it doesn't belong in the head then
          treat as implicit end of head and deal
@@ -3734,7 +3734,7 @@ void TY_(ParseHead)(TidyDocImpl* doc, Node *head, GetTokenMode ARG_UNUSED(mode))
     DEBUG_LOG(SPRTF("Exit ParseHead 1...\n"));
 }
 
-/*\ 
+/*\
  *  Issue #166 - repeated <main> element
  *  But this service is generalised to check for other duplicate elements
 \*/
@@ -3745,13 +3745,13 @@ Bool TY_(FindNodeWithId)( Node *node, TidyTagId tid )
     {
         if (TagIsId(node,tid))
             return yes;
-        /*\ 
+        /*\
          *   Issue #459 - Under certain circumstances, with many node this use of
          *   'for (content = node->content; content; content = content->content)'
          *   would produce a **forever** circle, or at least a very extended loop...
          *   It is sufficient to test the content, if it exists,
          *   to quickly iterate all nodes. Now all nodes are tested only once.
-        \*/ 
+        \*/
         content = node->content;
         if (content)
         {
@@ -3764,7 +3764,7 @@ Bool TY_(FindNodeWithId)( Node *node, TidyTagId tid )
 }
 
 
-/*\ 
+/*\
  *  Issue #166 - repeated <main> element
  *  Do a global search for an element
 \*/
@@ -3800,7 +3800,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
         /* #538536 Extra endtags not detected */
         if ( nodeIsHTML(node) )
         {
-            if (TY_(nodeIsElement)(node) || lexer->seenEndHtml) 
+            if (TY_(nodeIsElement)(node) || lexer->seenEndHtml)
                 TY_(Report)(doc, body, node, DISCARDING_UNEXPECTED);
             else
                 lexer->seenEndHtml = 1;
@@ -3809,7 +3809,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
             continue;
         }
 
-        if ( lexer->seenEndBody && 
+        if ( lexer->seenEndBody &&
              ( node->type == StartTag ||
                node->type == EndTag   ||
                node->type == StartEndTag ) )
@@ -3855,7 +3855,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
             TY_(UngetToken)( doc );
             break;
         }
-        
+
         iswhitenode = no;
 
         if ( TY_(nodeIsText)(node) &&
@@ -3912,7 +3912,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
           to match Netscape's observed behaviour.
         */
         lexer->excludeBlocks = no;
-        
+
         if (( nodeIsINPUT(node) ||
              (!TY_(nodeHasCM)(node, CM_BLOCK) && !TY_(nodeHasCM)(node, CM_INLINE))
            ) && !TY_(IsHTML5Mode)(doc) )
@@ -3924,7 +3924,7 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
             if (node->tag->model & CM_HTML)
             {
                 /* copy body attributes if current body was inferred */
-                if ( nodeIsBODY(node) && body->implicit 
+                if ( nodeIsBODY(node) && body->implicit
                      && body->attributes == NULL )
                 {
                     body->attributes = node->attributes;
@@ -4168,7 +4168,7 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
     {
         doc->badAccess |= BA_USING_FRAMES;
     }
-    
+
     while ((node = TY_(GetToken)(doc, IgnoreWhitespace)) != NULL)
     {
         if (node->tag == frameset->tag && node->type == EndTag)
@@ -4187,7 +4187,7 @@ void TY_(ParseFrameSet)(TidyDocImpl* doc, Node *frameset, GetTokenMode ARG_UNUSE
         {
             TY_(Report)(doc, frameset, node, DISCARDING_UNEXPECTED);
             TY_(FreeNode)( doc, node);
-            continue; 
+            continue;
         }
 
         if (TY_(nodeIsElement)(node))
@@ -4678,11 +4678,11 @@ void TY_(ParseDocument)(TidyDocImpl* doc)
             html = node;
 
         /*\
-         *  #72, avoid MISSING_DOCTYPE if show-body-only. 
+         *  #72, avoid MISSING_DOCTYPE if show-body-only.
          *  #191, also if --doctype omit, that is TidyDoctypeOmit
          *  #342, adjust tags to html4-- if not 'auto' or 'html5'
         \*/
-        if (!TY_(FindDocType)(doc)) 
+        if (!TY_(FindDocType)(doc))
         {
             ulong dtmode = cfg( doc, TidyDoctypeMode );
             if ((dtmode != TidyDoctypeOmit) && !showingBodyOnly(doc))
@@ -4753,7 +4753,7 @@ Bool TY_(XMLPreserveWhiteSpace)( TidyDocImpl* doc, Node *element)
 
     if (element->element == NULL)
         return no;
-        
+
     /* kludge for html docs without explicit xml:space attribute */
     if (nodeIsPRE(element)    ||
         nodeIsSCRIPT(element) ||
diff --git a/src/pprint.c b/src/pprint.c
index 7ef47c8fb..40242e2b7 100644
--- a/src/pprint.c
+++ b/src/pprint.c
@@ -1,6 +1,6 @@
 /*
-  pprint.c -- pretty print parse tree  
-  
+  pprint.c -- pretty print parse tree
+
   (c) 1998-2007 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
 
@@ -86,7 +86,7 @@ typedef enum
 
     U+2011 (non-breaking hyphen)
     U+202F (narrow non-break space)
-    U+2044 (fraction slash) 
+    U+2044 (fraction slash)
     U+200B (zero width space)
     ...... (bidi formatting control characters)
 
@@ -242,9 +242,9 @@ static WrapPoint CharacterWrapPoint(tchar c)
 static WrapPoint Big5WrapPoint(tchar c)
 {
     if ((c & 0xFF00) == 0xA100)
-    { 
-        /* opening brackets have odd codes: break before them */ 
-        if ( c > 0xA15C && c < 0xA1AD && (c & 1) == 1 ) 
+    {
+        /* opening brackets have odd codes: break before them */
+        if ( c > 0xA15C && c < 0xA1AD && (c & 1) == 1 )
             return WrapBefore;
         return WrapAfter;
     }
@@ -287,7 +287,7 @@ static void expand( TidyPrintImpl* pprint, uint len )
     ip = (uint*) TidyRealloc( pprint->allocator, pprint->linebuf, buflen*sizeof(uint) );
     if ( ip )
     {
-      TidyClearMemory( ip+pprint->lbufsize, 
+      TidyClearMemory( ip+pprint->lbufsize,
                        (buflen-pprint->lbufsize)*sizeof(uint) );
       pprint->lbufsize = buflen;
       pprint->linebuf = ip;
@@ -313,7 +313,7 @@ static int ToggleInString( TidyPrintImpl* pprint )
 static Bool IsInString( TidyPrintImpl* pprint )
 {
     TidyIndent *ind = pprint->indent + 0; /* Always 1st */
-    return ( ind->attrStringStart >= 0 && 
+    return ( ind->attrStringStart >= 0 &&
              ind->attrStringStart < (int) pprint->linelen );
 }
 static Bool IsWrapInString( TidyPrintImpl* pprint )
@@ -420,7 +420,7 @@ static uint AddString( TidyPrintImpl* pprint, ctmbstr str )
 }
 
 /* Saves current output point as the wrap point,
-** but only if indentation would NOT overflow 
+** but only if indentation would NOT overflow
 ** the current line.  Otherwise keep previous wrap point.
 */
 static Bool SetWrap( TidyDocImpl* doc, uint indent )
@@ -545,7 +545,7 @@ static void ResetLineAfterWrap( TidyPrintImpl* pprint )
  *  Write the 'indent' char to output
  *  Issue #335 - The GetSpaces() returns the number of spaces to be
  *  used for the indent. This is fine if ouputting spaces.
- *  However, if outputting 'tab' chars, then the number of tabs 
+ *  However, if outputting 'tab' chars, then the number of tabs
  *  output should euivalent to spaces divided by 'tab-size'
 \*/
 static void WriteIndentChar(TidyDocImpl* doc )
@@ -616,7 +616,7 @@ static Bool CheckWrapIndent( TidyDocImpl* doc, uint indent )
         {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
             SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
             pprint->indent[ 0 ].spaces = indent;
         }
         return yes;
@@ -680,7 +680,7 @@ void TY_(PFlushLine)( TidyDocImpl* doc, uint indent )
     {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
         pprint->indent[ 0 ].spaces = indent;
     }
 }
@@ -702,7 +702,7 @@ static void PCondFlushLine( TidyDocImpl* doc, uint indent )
     {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
          pprint->indent[ 0 ].spaces = indent;
     }
 }
@@ -730,7 +730,7 @@ void TY_(PFlushLineSmart)( TidyDocImpl* doc, uint indent )
     {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
         pprint->indent[ 0 ].spaces = indent;
     }
 }
@@ -759,7 +759,7 @@ static void PCondFlushLineSmart( TidyDocImpl* doc, uint indent )
     {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
         pprint->indent[ 0 ].spaces = indent;
     }
 }
@@ -803,7 +803,7 @@ static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
             AddString( pprint, "&lt;" );
             return;
         }
-            
+
         if ( c == '>')
         {
             AddString( pprint, "&gt;" );
@@ -973,7 +973,7 @@ static uint IncrWS( uint start, uint end, uint indent, int ixWS )
   }
   return start;
 }
-/* 
+/*
   The line buffer is uint not char so we can
   hold Unicode values unencoded. The translation
   to UTF-8 is deferred to the TY_(WriteChar)() routine called
@@ -1157,8 +1157,8 @@ static uint AttrIndent( TidyDocImpl* doc, Node* node, AttVal* ARG_UNUSED(attr) )
 static Bool AttrNoIndentFirst( /*TidyDocImpl* doc,*/ Node* node, AttVal* attr )
 {
   return ( attr==node->attributes );
-  
-  /*&& 
+
+  /*&&
            ( InsideHead(doc, node) ||
              !TY_(nodeHasCM)(node, CM_INLINE) ) );
              */
@@ -1228,7 +1228,7 @@ static void PPrintAttribute( TidyDocImpl* doc, uint indent,
     }
 
     CheckWrapIndent( doc, indent );
- 
+
     if ( attr->value == NULL )
     {
         Bool isB = TY_(IsBoolAttribute)(attr);
@@ -1241,7 +1241,7 @@ static void PPrintAttribute( TidyDocImpl* doc, uint indent,
         else if ( !isB && !TY_(IsNewNode)(node) )
             PPrintAttrValue( doc, indent, "", attr->delim, yes, scriptAttr );
 
-        else 
+        else
             SetWrap( doc, indent );
     }
     else
@@ -1707,8 +1707,8 @@ static void PPrintPhp( TidyDocImpl* doc, uint indent, Node *node )
 
     /* Issue #437 - add a new line if 'wrap-php' is on */
     if (wrapPhp)
-        PCondFlushLine( doc, indent ); 
-       
+        PCondFlushLine( doc, indent );
+
     /* WrapOn( doc, saveWrap ); */
 }
 
@@ -1770,7 +1770,7 @@ static Bool InsideHead( TidyDocImpl* doc, Node *node )
 }
 
 /* Is text node and already ends w/ a newline?
- 
+
    Used to pretty print CDATA/PRE text content.
    If it already ends on a newline, it is not
    necessary to print another before printing end tag.
@@ -1781,7 +1781,7 @@ static int TextEndsWithNewline(Lexer *lexer, Node *node, uint mode )
     {
         uint ch, ix = node->end - 1;
         /*\
-         *  Skip non-newline whitespace. 
+         *  Skip non-newline whitespace.
          *  Issue #379 - Only if ix is GT start can it be decremented!
         \*/
         while ( ix > node->start && (ch = (lexer->lexbuf[ix] & 0xff))
@@ -1800,7 +1800,7 @@ static int TextEndsWithNewline(Lexer *lexer, Node *node, uint mode )
  * but this also applies to the AspTag, which is text like...
  * And may apply to other text like nodes as well.
  *
- * Here the total white space is returned, and then a sister service, IncrWS() 
+ * Here the total white space is returned, and then a sister service, IncrWS()
  * will advance the start of the lexer output by the amount of the indent.
 \*/
 static Bool TY_(nodeIsTextLike)( Node *node )
@@ -1915,7 +1915,7 @@ void PPrintScriptStyle( TidyDocImpl* doc, uint mode, uint indent, Node *node )
           be one child and the only caller of this function defines
           all these modes already...
         */
-        TY_(PPrintTree)( doc, (mode | PREFORMATTED | NOWRAP | CDATA), 
+        TY_(PPrintTree)( doc, (mode | PREFORMATTED | NOWRAP | CDATA),
                          indent, content );
 
         if ( content == node->last )
@@ -1949,7 +1949,7 @@ void PPrintScriptStyle( TidyDocImpl* doc, uint mode, uint indent, Node *node )
     {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
         pprint->indent[ 0 ].spaces = indent;
     }
     PPrintEndTag( doc, mode, indent, node );
@@ -2026,7 +2026,7 @@ void TY_(PrintBody)( TidyDocImpl* doc )
     }
 }
 
-/* #130 MathML attr and entity fix! 
+/* #130 MathML attr and entity fix!
    Support MathML namepsace */
 static void PPrintMathML( TidyDocImpl* doc, uint indent, Node *node )
 {
@@ -2093,7 +2093,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
     else if ( TY_(nodeCMIsEmpty)(node) ||
               (node->type == StartEndTag && !xhtml) )
     {
-        /* Issue #8 - flush to new line? 
+        /* Issue #8 - flush to new line?
            maybe use if ( TY_(nodeHasCM)(node, CM_BLOCK) ) instead
            or remove the CM_INLINE from the tag
          */
@@ -2131,7 +2131,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
         if ( node->type == StartEndTag )
             node->type = StartTag;
 
-        if ( node->tag && 
+        if ( node->tag &&
              (node->tag->parser == TY_(ParsePre) || nodeIsTEXTAREA(node)) )
         {
             Bool classic  = TidyClassicVS; /* #228 - cfgBool( doc, TidyVertSpace ); */
@@ -2233,9 +2233,9 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
             PCondFlushLineSmart( doc, indent );
 
             /*\
-             *  Issue #180 - with the above PCondFlushLine, 
+             *  Issue #180 - with the above PCondFlushLine,
              *  this adds an uneccessary additional line!
-             *  Maybe only if 'classic' ie --vertical-space yes 
+             *  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)
@@ -2263,7 +2263,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
             {
                 /*\
                  * Issue #180 - If the tag was NOT printed due to the -omit option,
-                 * then reduce the bumped indent under the same ShouldIndent(doc, node) 
+                 * then reduce the bumped indent under the same ShouldIndent(doc, node)
                  * conditions that caused the indent to be bumped.
                 \*/
                 contentIndent -= spaces;
@@ -2287,7 +2287,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
             /* don't flush line for td and th */
             if ( ShouldIndent(doc, node) ||
                  ( !hideend &&
-                   ( TY_(nodeHasCM)(node, CM_HTML) || 
+                   ( TY_(nodeHasCM)(node, CM_HTML) ||
                      nodeIsNOFRAMES(node) ||
                      (TY_(nodeHasCM)(node, CM_HEAD) && !nodeIsTITLE(node))
                    )
@@ -2318,7 +2318,7 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
                     {
 #if defined(ENABLE_DEBUG_LOG) && defined(DEBUG_INDENT)
                         SPRTF("%s Indent from %d to %d\n", __FUNCTION__, pprint->indent[ 0 ].spaces, indent );
-#endif  
+#endif
                         pprint->indent[ 0 ].spaces = indent;
                     }
                 }
@@ -2342,7 +2342,7 @@ void TY_(PPrintXMLTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
     {
         doc->progressCallback( tidyImplToDoc(doc), node->line, node->column, doc->pprint.line + 1 );
     }
-    
+
     if ( node->type == TextNode)
     {
         PPrintText( doc, mode, indent, node );
@@ -2416,7 +2416,7 @@ void TY_(PPrintXMLTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
         PPrintTag( doc, mode, indent, node );
         if ( !mixed && node->content )
             TY_(PFlushLineSmart)( doc, cindent );
- 
+
         for ( content = node->content; content; content = content->next )
             TY_(PPrintXMLTree)( doc, mode, cindent, content );
 
diff --git a/src/pprint.h b/src/pprint.h
index 6ae36df47..475816fb6 100644
--- a/src/pprint.h
+++ b/src/pprint.h
@@ -1,11 +1,11 @@
 #ifndef __PPRINT_H__
 #define __PPRINT_H__
 
-/* pprint.h -- pretty print parse tree  
-  
+/* pprint.h -- pretty print parse tree
+
    (c) 1998-2007 (W3C) MIT, ERCIM, Keio University
    See tidy.h for the copyright notice.
-  
+
 */
 
 #include "forward.h"
@@ -35,7 +35,7 @@
 ** line, not the end of just the second line.
 **
 ** We must also keep track "In Attribute" and "In String"
-** states at the _end_ of each line, 
+** states at the _end_ of each line,
 */
 
 typedef struct _TidyIndent
@@ -54,7 +54,7 @@ typedef struct _TidyPrintImpl
     uint linelen;
     uint wraphere;
     uint line;
-  
+
     uint ixInd;
     TidyIndent indent[2];  /* Two lines worth of indent state */
 } TidyPrintImpl;
@@ -69,7 +69,7 @@ void TY_(PFlushLine)( TidyDocImpl* doc, uint indent );
 /* print just the content of the body element.
 ** useful when you want to reuse material from
 ** other documents.
-** 
+**
 ** -- Sebastiano Vigna <vigna@dsi.unimi.it>
 */
 
diff --git a/src/sprtf.c b/src/sprtf.c
index 3468ac143..cf358a08f 100644
--- a/src/sprtf.c
+++ b/src/sprtf.c
@@ -37,7 +37,7 @@
 #  pragma warning( disable:4996 )
 #else
 #  define strcmpi strcasecmp
-#endif 
+#endif
 
 #ifndef MX_ONE_BUF
 #  define MX_ONE_BUF 1024
@@ -295,7 +295,7 @@ static void oi( char * psin )
 #ifdef ADD_LISTVIEW
        if (add2listview) {
            LVInsertItem(ps);
-       } 
+       }
 #endif /* ADD_LISTVIEW */
 #ifdef ADD_SCREENOUT
        if (add2screen) {
diff --git a/src/streamio.c b/src/streamio.c
index d23f0560f..747b26451 100644
--- a/src/streamio.c
+++ b/src/streamio.c
@@ -46,7 +46,7 @@ static uint PopChar( StreamIn *in );
 ** Static (duration) Globals
 ******************************/
 
-static StreamOut stderrStreamOut = 
+static StreamOut stderrStreamOut =
 {
     ASCII,
     FSM_ASCII,
@@ -55,7 +55,7 @@ static StreamOut stderrStreamOut =
     { 0, TY_(filesink_putByte) }
 };
 
-static StreamOut stdoutStreamOut = 
+static StreamOut stdoutStreamOut =
 {
     ASCII,
     FSM_ASCII,
@@ -251,7 +251,7 @@ uint TY_(ReadChar)( StreamIn *in )
         in->tabs--;
         return ' ';
     }
-    
+
     for (;;)
     {
         c = ReadCharFromStream(in);
@@ -306,7 +306,7 @@ uint TY_(ReadChar)( StreamIn *in )
         /* Form Feed is allowed in HTML */
         if ( c == '\015' && !cfgBool(in->doc, TidyXmlTags) )
             break;
-            
+
         if ( c < 32 )
             continue; /* discard control char */
 
@@ -380,32 +380,32 @@ uint TY_(ReadChar)( StreamIn *in )
             Bool isVendorChar = ( in->encoding == WIN1252 ||
                                   in->encoding == MACROMAN );
             Bool isMacChar    = ( in->encoding == MACROMAN );
-            
+
             /* set error position just before offending character */
             if (in->doc->lexer)
             {
                 in->doc->lexer->lines = in->curline;
                 in->doc->lexer->columns = in->curcol;
             }
-                
+
             if ( isMacChar )
                 c1 = TY_(DecodeMacRoman)( c );
             else
                 c1 = TY_(DecodeWin1252)( c );
             if ( c1 )
                 replMode = REPLACED_CHAR;
-                
+
             if ( c1 == 0 && isVendorChar )
                 TY_(ReportEncodingError)(in->doc, VENDOR_SPECIFIC_CHARS, c, replMode == DISCARDED_CHAR);
             else if ( ! isVendorChar )
                 TY_(ReportEncodingError)(in->doc, INVALID_SGML_CHARS, c, replMode == DISCARDED_CHAR);
-                
+
             c = c1;
         }
 
         if ( c == 0 )
             continue; /* illegal char is discarded */
-        
+
         in->curcol++;
         break;
     }
@@ -443,7 +443,7 @@ void TY_(UngetChar)( uint c, StreamIn *in )
         /* fprintf(stderr, "Attempt to UngetChar EOF\n"); */
         return;
     }
-    
+
     in->pushed = yes;
 
     if (in->bufpos + 1 >= in->bufsize)
@@ -526,7 +526,7 @@ void TY_(WriteChar)( uint c, StreamOut* out )
     else if (out->encoding == UTF8)
     {
         int count = 0;
-        
+
         TY_(EncodeCharToUTF8Bytes)( c, NULL, &out->sink, &count );
         if (count <= 0)
         {
@@ -586,7 +586,7 @@ void TY_(WriteChar)( uint c, StreamOut* out )
     {
         int i, numChars = 1;
         uint theChars[2];
-        
+
         if ( !TY_(IsValidUTF16FromUCS4)(c) )
         {
             /* invalid UTF-16 value */
@@ -608,21 +608,21 @@ void TY_(WriteChar)( uint c, StreamOut* out )
             /* just put the char out */
             theChars[0] = c;
         }
-        
+
         for (i = 0; i < numChars; i++)
         {
             c = theChars[i];
-            
+
             if (out->encoding == UTF16LE)
             {
-                uint ch = c & 0xFF; PutByte(ch, out); 
-                ch = (c >> 8) & 0xFF; PutByte(ch, out); 
+                uint ch = c & 0xFF; PutByte(ch, out);
+                ch = (c >> 8) & 0xFF; PutByte(ch, out);
             }
-    
+
             else if (out->encoding == UTF16BE || out->encoding == UTF16)
             {
-                uint ch = (c >> 8) & 0xFF; PutByte(ch, out); 
-                ch = c & 0xFF; PutByte(ch, out); 
+                uint ch = (c >> 8) & 0xFF; PutByte(ch, out);
+                ch = c & 0xFF; PutByte(ch, out);
             }
         }
     }
@@ -632,8 +632,8 @@ void TY_(WriteChar)( uint c, StreamOut* out )
             PutByte(c, out);
         else
         {
-            uint ch = (c >> 8) & 0xFF; PutByte(ch, out); 
-            ch = c & 0xFF; PutByte(ch, out); 
+            uint ch = (c >> 8) & 0xFF; PutByte(ch, out);
+            ch = c & 0xFF; PutByte(ch, out);
         }
     }
     else
@@ -662,7 +662,7 @@ uint TY_(DecodeWin1252)(uint c)
 {
     if (127 < c && c < 160)
         c = Win2Unicode[c - 128];
-        
+
     return c;
 }
 
@@ -689,10 +689,10 @@ static void EncodeWin1252( uint c, StreamOut* out )
 */
 
 /* modified to only need chars 128-255/U+0080-U+00FF - Terry Teague 19 Aug 01 */
-static const uint Mac2Unicode[128] = 
+static const uint Mac2Unicode[128] =
 {
     /* x7F = DEL */
-    
+
     0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
     0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
 
@@ -919,7 +919,7 @@ static uint ReadCharFromStream( StreamIn* in )
 
     if ( TY_(IsEOF)(in) )
         return EndOfStream;
-    
+
     c = ReadByte( in );
 
     if (c == EndOfStream)
@@ -1014,7 +1014,7 @@ static uint ReadCharFromStream( StreamIn* in )
         /* deal with UTF-8 encoded char */
 
         int err, count = 0;
-        
+
         /* first byte "c" is passed in separately */
         err = TY_(DecodeUTF8BytesToChar)( &n, c, NULL, &in->source, &count );
         if (!err && (n == (uint)EndOfStream) && (count == 1)) /* EOF */
@@ -1028,12 +1028,12 @@ static uint ReadCharFromStream( StreamIn* in )
             TY_(ReportEncodingError)(in->doc, INVALID_UTF8, n, no);
             n = 0xFFFD; /* replacement char */
         }
-        
+
         return n;
     }
-    
+
     /*
-       This section is suitable for any "multibyte" variable-width 
+       This section is suitable for any "multibyte" variable-width
        character encoding in which a one-byte code is less than
        128, and the first byte of a two-byte code is greater or
        equal to 128. Note that Big5 and ShiftJIS fit into this
@@ -1063,7 +1063,7 @@ static uint ReadCharFromStream( StreamIn* in )
     }
     else
         n = c;
-        
+
     return n;
 }
 
diff --git a/src/streamio.h b/src/streamio.h
index d3908f2ca..d2ae18333 100644
--- a/src/streamio.h
+++ b/src/streamio.h
@@ -7,7 +7,7 @@
   See tidy.h for the copyright notice.
 
   Wrapper around Tidy input source and output sink
-  that calls appropriate interfaces, and applies 
+  that calls appropriate interfaces, and applies
   necessary char encoding transformations: to/from
   ISO-10646 and/or UTF-8.
 
@@ -70,8 +70,8 @@ struct _StreamIn
     uint   bufsize;
     int    tabs;
     int    lastcols[LASTPOS_SIZE];
-    unsigned short curlastpos; /* current last position in lastcols */ 
-    unsigned short firstlastpos; /* first valid last position in lastcols */ 
+    unsigned short curlastpos; /* current last position in lastcols */
+    unsigned short firstlastpos; /* first valid last position in lastcols */
     int    curcol;
     int    curline;
     int    encoding;
diff --git a/src/tags.c b/src/tags.c
index 70fb5acf8..0e0f0d24d 100644
--- a/src/tags.c
+++ b/src/tags.c
@@ -160,11 +160,11 @@ static CheckAttribs CheckHTML;
 #define VERS_ELEM_VIDEO      (xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50)
 #define VERS_ELEM_WBR        (xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50)
 
-/*\ 
+/*\
  * Issue #167 & #169 & #232
  * Tidy defaults to HTML5 mode
  * but allow this table to be ADJUSTED if NOT HTML5
- * was static const Dict tag_defs[] = 
+ * was static const Dict tag_defs[] =
 \*/
 static Dict tag_defs[] =
 {
@@ -575,7 +575,7 @@ Bool TY_(FindTag)( TidyDocImpl* doc, Node *node )
         node->tag = np;
         return yes;
     }
-    
+
     /* Add autonomous custom tag. This can be done in both HTML5 mode and
        earlier, although if it's earlier we will complain about it elsewhere. */
     if ( TY_(nodeIsAutonomousCustomTag)( doc, node) )
@@ -585,13 +585,13 @@ Bool TY_(FindTag)( TidyDocImpl* doc, Node *node )
         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 
+        /* Output a message the first time we encounter an autonomous custom
            tag. This applies despite the HTML5 mode. */
         TY_(Report)(doc, node, node, CUSTOM_TAG_DETECTED);
 
         return yes;
     }
-    
+
     return no;
 }
 
@@ -766,14 +766,14 @@ void TY_(FreeDeclaredTags)( TidyDocImpl* doc, UserTagType tagType )
  * If the <!DOCTYPE ...> is found to NOT be HTML5,
  * then adjust tags to HTML4 mode
  *
- * NOTE: For each change added to here, there must 
+ * NOTE: For each change added to here, there must
  * be a RESET added in TY_(ResetTags) below!
 \*/
 void TY_(AdjustTags)( TidyDocImpl *doc )
 {
     Dict *np = (Dict *)TY_(LookupTagDef)( TidyTag_A );
     TidyTagImpl* tags = &doc->tags;
-    if (np) 
+    if (np)
     {
         np->parser = TY_(ParseInline);
         np->model  = CM_INLINE;
@@ -833,7 +833,7 @@ void TY_(ResetTags)( TidyDocImpl *doc )
 {
     Dict *np = (Dict *)TY_(LookupTagDef)( TidyTag_A );
     TidyTagImpl* tags = &doc->tags;
-    if (np) 
+    if (np)
     {
         np->parser = TY_(ParseBlock);
         np->model  = (CM_INLINE|CM_BLOCK|CM_MIXED);
@@ -984,7 +984,7 @@ void CheckTABLE( TidyDocImpl* doc, Node *node )
     TY_(CheckAttributes)(doc, node);
 
     /* Issue #210 - a missing summary attribute is bad accessibility, no matter
-       what HTML version is involved; a document without is valid 
+       what HTML version is involved; a document without is valid
        EXCEPT for HTML5, when to have a summary is wrong */
     if (cfg(doc, TidyAccessibilityCheckLevel) == 0)
     {
@@ -992,8 +992,8 @@ void CheckTABLE( TidyDocImpl* doc, Node *node )
         {
             /* #210 - has summary, and is HTML5, then report obsolete */
             TY_(Report)(doc, node, node, BAD_SUMMARY_HTML5);
-        } 
-        else if (!HasSummary && !isHTML5) 
+        }
+        else if (!HasSummary && !isHTML5)
         {
             /* #210 - No summary, and NOT HTML5, then report as before */
             doc->badAccess |= BA_MISSING_SUMMARY;
diff --git a/src/tidy-int.h b/src/tidy-int.h
index 55ab3416a..b8d3e83db 100644
--- a/src/tidy-int.h
+++ b/src/tidy-int.h
@@ -36,7 +36,7 @@
 struct _TidyDocImpl
 {
     /* The Document Tree (and backing store buffer) */
-    Node                root;       /* This MUST remain the first declared 
+    Node                root;       /* This MUST remain the first declared
                                        variable in this structure */
     Lexer*              lexer;
 
@@ -108,7 +108,7 @@ struct _TidyMessageImpl
     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 */
 
@@ -125,7 +125,7 @@ struct _TidyMessageImpl
 
     ctmbstr             messagePrefixDefault;   /* the prefix part, default language */
     ctmbstr             messagePrefix;          /* the prefix part, localized */
-    
+
     tmbstr              messageOutputDefault;   /* the complete string Tidy would output */
     tmbstr              messageOutput;          /* the complete string, localized */
 };
diff --git a/src/tidylib.c b/src/tidylib.c
index 75cb1d964..40421393f 100644
--- a/src/tidylib.c
+++ b/src/tidylib.c
@@ -167,7 +167,7 @@ void          tidyDocRelease( TidyDocImpl* doc )
         TY_(FreeAttrPriorityList)( doc );
         TY_(FreeMutedMessageList( doc ));
         TY_(FreeTags)( doc );
-        /*\ 
+        /*\
          *  Issue #186 - Now FreeNode depend on the doctype, so the lexer is needed
          *  to determine which hash is to be used, so free it last.
         \*/
@@ -734,7 +734,7 @@ Bool TIDY_CALL tidyOptCopyConfig( TidyDoc to, TidyDoc from )
 
 /* I/O and Message handling interface
 **
-** By default, Tidy will define, create and use instance of input and output 
+** By default, Tidy will define, create and use instance of input and output
 ** handlers for standard C buffered I/O (i.e. FILE* stdin, FILE* stdout and
 ** FILE* stderr for content input, content output and diagnostic output,
 ** respectively.  A FILE* cfgFile input handler will be used for config files.
@@ -1027,12 +1027,12 @@ int TIDY_CALL        tidyDetectedHtmlVersion( TidyDoc ARG_UNUSED(tdoc) )
 
 Bool TIDY_CALL        tidyDetectedXhtml( TidyDoc ARG_UNUSED(tdoc) )
 {
-    TidyDocImpl* impl = tidyDocToImpl( tdoc ); 
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
     return impl->lexer->isvoyager;
 }
 Bool TIDY_CALL        tidyDetectedGenericXml( TidyDoc ARG_UNUSED(tdoc) )
 {
-    TidyDocImpl* impl = tidyDocToImpl( tdoc ); 
+    TidyDocImpl* impl = tidyDocToImpl( tdoc );
     return impl->xmlDetected;
 }
 
@@ -1448,7 +1448,7 @@ int         TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in )
 {
     Bool xmlIn = cfgBool( doc, TidyXmlTags );
     TidyConfigChangeCallback callback = doc->pConfigChangeCallback;
-    
+
     int bomEnc;
     doc->pConfigChangeCallback = NULL;
 
@@ -1465,7 +1465,7 @@ int         TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in )
 
     if (doc->givenDoctype)
         TidyDocFree(doc, doc->givenDoctype);
-    /*\ 
+    /*\
      *  Issue #186 - Now FreeNode depend on the doctype, so the lexer is needed
      *  to determine which hash is to be used, so free it last.
     \*/
@@ -1614,7 +1614,7 @@ static Bool nodeHasAlignAttr( Node *node )
  *  and error output is given regardless of the new option, and ensure that
  *  cleanup takes place. This provides mostly consistent Tidy behavior even with
  *  the introduction of this new option. Note that strings have changed, though,
- *  in order to maintain consistency with the `--strict-tags-attributes` 
+ *  in order to maintain consistency with the `--strict-tags-attributes`
  *  messages.
  *
  *  See also: http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#obsolete
@@ -1680,7 +1680,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
             }
         } else
         if ( nodeIsBASEFONT(node) ) {
-            /* basefont: CSS equivalent 'font-size', 'font-family' and 'color' 
+            /* basefont: CSS equivalent 'font-size', 'font-family' and 'color'
              * on body or class on each subsequent element.
              * Difficult - If it is the first body element, then could consider
              * adding that to the <body> as a whole, else could perhaps apply it
@@ -1784,7 +1784,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
 
         if (node->content)
             TY_(CheckHTML5)( doc, node->content );
-        
+
         node = node->next;
     }
 }
@@ -1897,7 +1897,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
 
         if (node->content)
             TY_(CheckHTMLTagsAttribsVersions)( doc, node->content );
-        
+
         node = node->next;
     }
 }
@@ -2144,9 +2144,9 @@ int         tidyDocCleanAndRepair( TidyDocImpl* doc )
        it can ever be, so we can start detecting things that shouldn't
        be in this version of HTML
      */
-    if (doc->lexer) 
+    if (doc->lexer)
     {
-        /*\ 
+        /*\
          *  Issue #429 #426 - These services can only be used
          *  when there is a document loaded, ie a lexer created.
          *  But really should not be calling a Clean and Repair
@@ -2268,7 +2268,7 @@ int         tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
 
     TY_(ResetConfigToSnapshot)( doc );
     doc->pConfigChangeCallback = callback;
-    
+
     return tidyDocStatus( doc );
 }
 
diff --git a/src/tmbstr.c b/src/tmbstr.c
index 0cfe5f23d..3b50060f8 100644
--- a/src/tmbstr.c
+++ b/src/tmbstr.c
@@ -93,7 +93,7 @@ int TY_(tmbstrcmp)( ctmbstr s1, ctmbstr s2 )
 uint TY_(tmbstrlen)( ctmbstr str )
 {
     uint len = 0;
-    if ( str ) 
+    if ( str )
     {
         while ( *str++ )
             ++len;
diff --git a/src/utf8.c b/src/utf8.c
index b12b29b02..5dc50a7be 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -10,12 +10,12 @@
 
   Note, UTF-8 encoding, by itself, does not affect the actual
   "codepoints" of the underlying character encoding.  In the
-  cases of ASCII, Latin1, Unicode (16-bit, BMP), these all 
+  cases of ASCII, Latin1, Unicode (16-bit, BMP), these all
   refer to ISO-10646 "codepoints".  For anything else, they
   refer to some other "codepoint" set.
 
-  Put another way, UTF-8 is a variable length method to 
-  represent any non-negative integer value.  The glyph 
+  Put another way, UTF-8 is a variable length method to
+  represent any non-negative integer value.  The glyph
   that a integer value represents is unchanged and defined
   externally (e.g. by ISO-10646, Big5, Win1252, MacRoman,
   Latin2-9, and so on).
@@ -28,7 +28,7 @@
 #include "forward.h"
 #include "utf8.h"
 
-/* 
+/*
 UTF-8 encoding/decoding functions
 Return # of bytes in UTF-8 sequence; result < 0 if illegal sequence
 
@@ -105,7 +105,7 @@ DBBF DFF*    F3 BF BF B*    000FFFF*
 DBFF DFF*    F4 8F BF B*    0010FFF*
 
 * = E or F
-                                   
+
 1010  A
 1011  B
 1100  C
@@ -158,7 +158,7 @@ static const struct validUTF8Sequence
     {0x1000,   0xFFFF,   3, {0xE1, 0xEF, 0x80, 0xBF, 0x80, 0xBF, 0x00, 0x00}},
     {0x10000,  0x3FFFF,  4, {0xF0, 0xF0, 0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}},
     {0x40000,  0xFFFFF,  4, {0xF1, 0xF3, 0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}},
-    {0x100000, 0x10FFFF, 4, {0xF4, 0xF4, 0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}} 
+    {0x100000, 0x10FFFF, 4, {0xF4, 0xF4, 0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}}
 };
 
 int TY_(DecodeUTF8BytesToChar)( uint* c, uint firstByte, ctmbstr successorBytes,
@@ -169,10 +169,10 @@ int TY_(DecodeUTF8BytesToChar)( uint* c, uint firstByte, ctmbstr successorBytes,
     uint ch = 0, n = 0;
     int i, bytes = 0;
     Bool hasError = no;
-    
+
     if ( successorBytes )
         buf = (byte*) successorBytes;
-        
+
     /* special check if we have been passed an EOF char */
     if ( firstByte == EndOfStream )
     {
@@ -183,7 +183,7 @@ int TY_(DecodeUTF8BytesToChar)( uint* c, uint firstByte, ctmbstr successorBytes,
     }
 
     ch = firstByte; /* first byte is passed in separately */
-    
+
     if (ch <= 0x7F) /* 0XXX XXXX one byte */
     {
         n = ch;
@@ -266,39 +266,39 @@ int TY_(DecodeUTF8BytesToChar)( uint* c, uint firstByte, ctmbstr successorBytes,
         hasError = yes;
         bytes = 1;
     }
-    
+
     if (!hasError && ((n == kUTF8ByteSwapNotAChar) || (n == kUTF8NotAChar)))
         hasError = yes;
-        
+
     if (!hasError && (n > kMaxUTF8FromUCS4))
         hasError = yes;
 
     if (!hasError)
     {
         int lo, hi;
-        
+
         lo = offsetUTF8Sequences[bytes - 1];
         hi = offsetUTF8Sequences[bytes] - 1;
-        
+
         /* check for overlong sequences */
         if ((n < validUTF8[lo].lowChar) || (n > validUTF8[hi].highChar))
             hasError = yes;
         else
         {
             hasError = yes; /* assume error until proven otherwise */
-        
+
             for (i = lo; i <= hi; i++)
             {
                 int tempCount;
                 byte theByte;
-                
+
                 for (tempCount = 0; tempCount < bytes; tempCount++)
                 {
                     if (!tempCount)
                         theByte = (tmbchar) firstByte;
                     else
                         theByte = buf[tempCount - 1];
-                        
+
                     if ( theByte >= validUTF8[i].validBytes[(tempCount * 2)] &&
                          theByte <= validUTF8[i].validBytes[(tempCount * 2) + 1] )
                         hasError = no;
@@ -335,10 +335,10 @@ int TY_(EncodeCharToUTF8Bytes)( uint c, tmbstr encodebuf,
     byte* buf = &tempbuf[0];
     int bytes = 0;
     Bool hasError = no;
-    
+
     if ( encodebuf )
         buf = (byte*) encodebuf;
-        
+
     if (c <= 0x7F)  /* 0XXX XXXX one byte */
     {
         buf[0] = (tmbchar) c;
@@ -392,7 +392,7 @@ int TY_(EncodeCharToUTF8Bytes)( uint c, tmbstr encodebuf,
     }
     else
         hasError = yes;
-        
+
     /* don't output invalid UTF-8 byte sequence to a stream */
     if ( !hasError && outp != NULL )
     {
@@ -411,7 +411,7 @@ int TY_(EncodeCharToUTF8Bytes)( uint c, tmbstr encodebuf,
         fprintf( stderr, "\n" );
     }
 #endif
-    
+
     *count = bytes;
     if (hasError)
         return -1;
@@ -428,9 +428,9 @@ uint TY_(GetUTF8)( ctmbstr str, uint *ch )
     int bytes;
 
     int err;
-    
+
     bytes = 0;
-    
+
     /* first byte "str[0]" is passed in separately from the */
     /* rest of the UTF-8 byte sequence starting at "str[1]" */
     err = TY_(DecodeUTF8BytesToChar)( &n, str[0], str+1, NULL, &bytes );
@@ -450,7 +450,7 @@ uint TY_(GetUTF8)( ctmbstr str, uint *ch )
 tmbstr TY_(PutUTF8)( tmbstr buf, uint c )
 {
     int err, count = 0;
-        
+
     err = TY_(EncodeCharToUTF8Bytes)( c, buf, NULL, &count );
     if (err)
     {
@@ -463,7 +463,7 @@ tmbstr TY_(PutUTF8)( tmbstr buf, uint c )
         buf[2] = (byte) 0xBD;
         count = 3;
     }
-    
+
     buf += count;
     return buf;
 }
@@ -485,7 +485,7 @@ Bool    TY_(IsLowSurrogate)( tchar ch )
 tchar   TY_(CombineSurrogatePair)( tchar high, tchar low )
 {
     assert( TY_(IsHighSurrogate)(high) && TY_(IsLowSurrogate)(low) );
-    return ( ((low - kUTF16LowSurrogateBegin) * 0x400) + 
+    return ( ((low - kUTF16LowSurrogateBegin) * 0x400) +
              high - kUTF16HighSurrogateBegin + 0x10000 );
 }
 
diff --git a/test.html b/test.html
new file mode 100644
index 000000000..e186a2fb0
--- /dev/null
+++ b/test.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta name="generator" content=
+"HTML Tidy for HTML5 for Linux version 5.7.42">
+<meta charset="UTF-8">
+<title>SVG sample</title>
+</head>
+<body>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
+stroke-width="2" stroke-linecap="butt" stroke-linejoin="round"
+stroke-miterlimit="4" stroke-opacity="1" stroke-dasharray="none"
+fill="currentcolor" stroke="yellowgreen">
+<path d=
+"m 0.75,12.0 11.25,-9.0 4.5,3.375 0.0,-1.5 2.25,0.0 0.0,3.375 4.5,3.75 -2.25,0.0 0.0,9.0 -5.625,0.0 0.0,-7.5 -6.75,0.0 0.0,7.5 -5.625,0.0 0.0,-9.0 z">
+</path>
+</svg>
+</body>
+</html>