fontspec support, tex4ht r205 r210 et al., https://puszcza.gnu.org.ua/bugs/?123

git-svn-id: svn://tug.org/texlive/trunk@42654 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 623 insertions, 144 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua b/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua
new file mode 100644
index 00000000000..b7e0873e1c9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec-4ht.lua
@@ -0,0 +1,88 @@
+-- fontspec-4ht.lua (2016-12-08-16:38), generated from tex4ht-4ht.tex
+-- Copyright 2016       TeX Users Group
+--[[
+% Copyright 2009-2016 TeX Users Group
+
+--]]
+local M = {}
+
+local glyph_id = node.id "glyph"
+local whatsit_id = node.id "whatsit"
+local special_subtype = node.subtype "special"
+local dir_id = node.id "dir"
+local glue_id = node.id "glue"
+
+local escape = function(char)
+  -- prepare tex4ht special for entity with unicode value
+  return string.format("t4ht@+&{35}x%x{59}", char)
+end
+
+local make_node = function(data)
+  -- make special whathsit
+  local n = node.new(whatsit_id,special_subtype)
+  n.data = data
+  return n
+end
+
+-- this should be table with patterns for allowed fonts
+local allowed_names = {"^cmr", "^cmb","^cmt", "^cmb", "^cmcs", "^rm%-l"}
+
+local testfont = function(name)
+  -- test font name for all allowed names, when it is found, return true
+  for _, x in ipairs(allowed_names) do
+    local r = name:match(x)
+    if r then
+      return true
+    end
+  end
+  return false
+end
+
+local fonttypes = {}
+local get_font_type = function(id)
+  if fonttypes[id]~=nil then return fonttypes[id] end
+  local f = font.getfont(id)
+  local name = f.name
+  local type = testfont(string.lower(name))
+  if not type then
+    print("Unsupported font",  name)
+  end
+  fonttypes[id] = type
+  return type
+end
+
+local xchar = string.byte("x")
+
+local utfchar = unicode.utf8.char
+function M.char_to_entity(head)
+  -- traverse characters
+  for n in node.traverse(head) do
+    if n.id == glyph_id then
+      -- we need to process only default text font, ie cmr, because user may request special mathematical fonts,
+      -- which should be processed via htf files as usual
+      local t = get_font_type(n.font)
+      if t == true then
+        local char = n.char
+        if char > 127 then
+          local new = escape(char)
+          local x = make_node(new)
+          -- insert tex4ht special before char, it will replace the char
+          node.insert_before(head, n, x)
+          -- in standard tex4ht accented characters are replaced with "x" char. they are later removed anyway
+          -- maybe we don't need to do that, but we can, so why not?
+          n.char = xchar
+        end
+      end
+    elseif n.id == dir_id then
+      -- when text direction is TRT, the spaces in the DVI file have negative width and they are not recognized by tex4ht
+      -- so we just change the direction to normal TLT
+      n.dir = "TLT"
+    end
+  end
+  return head
+end
+
+M.allowed = allowed_names
+
+return M
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec-luatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/fontspec-luatex.4ht
new file mode 100644
index 00000000000..167ebab230b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec-luatex.4ht
@@ -0,0 +1,15 @@
+% fontspec-luatex.4ht, generated from tex4ht-4ht.tex
+% Copyright 2016       TeX Users Group
+% Copyright 2009-2016 TeX Users Group
+
+\RequirePackage{luatexbase}
+\RequirePackage{luacode}
+
+\begin{luacode*}
+  local fontspec = require "fontspec-4ht"
+  luatexbase.add_to_callback("pre_linebreak_filter", fontspec.char_to_entity, "Char to entity")
+  luatexbase.add_to_callback("hpack_filter", fontspec.char_to_entity, "hpack-char-to-entity")
+\end{luacode*}
+\Hinput{fontspec-luatex}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec-xetex.4ht b/Master/texmf-dist/tex/generic/tex4ht/fontspec-xetex.4ht
new file mode 100644
index 00000000000..25fe277e378
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec-xetex.4ht
@@ -0,0 +1,356 @@
+% fontspec-xetex.4ht, generated from tex4ht-4ht.tex
+% Copyright 2016       TeX Users Group
+% Copyright 2009-2016 TeX Users Group
+
+
+\input binhex
+
+% the code is inspited with newunicodechar.sty
+% call with character's numeric value
+\newcommand\xeuniregisterchar[1]{%
+  \catcode#1=\active% make the character active
+  \begingroup\lccode`\~=#1 % trick to define the character as a command
+  % the code inside \special will be converted back to utf8 by tex4ht
+  \lowercase{\endgroup\protected\def~}{\special{t4ht@+&{35}x\hex{#1}{59}}x}
+}
+% \pokus{64}
+
+\newcount\xeuniblock
+
+% register unicode range #1 - #2
+\newcommand\xeuniregisterblock[2]{%
+  \xeuniblock=#1%
+  \loop\advance\xeuniblock by 1\relax%
+  \expandafter\xeuniregisterchar\expandafter{\the\xeuniblock}%
+  \ifnum\xeuniblock<#2%
+  \repeat%
+}
+
+% register unicode range given in hex format
+\newcommand\xeuniregisterblockhex[2]{%
+  \xeuniregisterblock{"#1}{"#2}%
+}
+
+% Define unicode blocks for script name
+\newcommand\xeuniblockdef[2]{%
+  \@namedef{block:#1}{#2}
+}
+
+% delete block definition after use, we don't want to execute the unicode
+% declarations multiple times
+\newcommand\xeuniuseblock[1]{\@nameuse{block:#1}\@namedef{block:#1}{\relax}}
+
+
+% Unicode blocks definitions
+\xeuniblockdef{Latin}{%
+  % \xeuniregisterblockhex{0000}{007F}%
+  \xeuniregisterblockhex{0080}{00FF}%
+  \xeuniregisterblockhex{0100}{017F}%
+  \xeuniregisterblockhex{0180}{024F}%
+  \xeuniregisterblockhex{0250}{02AF}%
+  \xeuniregisterblockhex{02B0}{02FF}%
+  \xeuniregisterblockhex{0300}{036F}%
+  \xeuniregisterblockhex{1E00}{1EFF}%
+  \xeuniregisterblockhex{2C60}{2C7F}%
+  \xeuniregisterblockhex{A720}{A7FF}%
+  \xeuniregisterblockhex{AB30}{AB6F}%
+  \xeuniregisterblockhex{1D00}{1D7F}%
+  \xeuniregisterblockhex{1D80}{1DBF}%
+  \xeuniregisterblockhex{1DC0}{1DFF}%
+  \xeuniregisterblockhex{2000}{206F}%
+  \xeuniregisterblockhex{2070}{209F}%
+  \xeuniregisterblockhex{20A0}{20CF}%
+  \xeuniregisterblockhex{20D0}{20FF}%
+  \xeuniregisterblockhex{2100}{214F}%
+  \xeuniregisterblockhex{2150}{218F}%
+  \xeuniregisterblockhex{2190}{21FF}%
+  \xeuniregisterblockhex{2200}{22FF}%
+  \xeuniregisterblockhex{2300}{23FF}%
+  \xeuniregisterblockhex{2400}{243F}%
+  \xeuniregisterblockhex{2440}{245F}%
+  \xeuniregisterblockhex{2460}{24FF}%
+  \xeuniregisterblockhex{2500}{257F}%
+  \xeuniregisterblockhex{2580}{259F}%
+  \xeuniregisterblockhex{25A0}{25FF}%
+  \xeuniregisterblockhex{2600}{26FF}%
+  \xeuniregisterblockhex{2700}{27BF}%
+  \xeuniregisterblockhex{27C0}{27EF}%
+  \xeuniregisterblockhex{27F0}{27FF}%
+  \xeuniregisterblockhex{2800}{28FF}%
+  \xeuniregisterblockhex{2900}{297F}%
+  \xeuniregisterblockhex{2980}{29FF}%
+  \xeuniregisterblockhex{2A00}{2AFF}%
+  \xeuniregisterblockhex{2B00}{2BFF}%
+}
+\xeuniblockdef{Greek}{
+  \xeuniregisterblockhex{0370}{03FF}
+  \xeuniregisterblockhex{1F00}{1FFF}
+  \xeuniregisterblockhex{10140}{1018F}
+  \xeuniregisterblockhex{1D200}{1D24F}
+}
+\xeuniblockdef{Coptic}{
+  \xeuniregisterblockhex{0370}{03FF}
+  \xeuniregisterblockhex{2C80}{2CFF}
+  \xeuniregisterblockhex{102E0}{102FF}
+}
+\xeuniblockdef{Cyrillic}{
+  \xeuniregisterblockhex{0400}{04FF}
+  \xeuniregisterblockhex{0500}{052F}
+  \xeuniregisterblockhex{1C80}{1C8F}
+  \xeuniregisterblockhex{2DE0}{2DFF}
+  \xeuniregisterblockhex{A640}{A69F}
+}
+\xeuniblockdef{Armenian}{\xeuniregisterblockhex{0530}{058F}}
+\xeuniblockdef{Hebrew}{\xeuniregisterblockhex{0590}{05FF}}
+\xeuniblockdef{Arabic}{
+  \xeuniregisterblockhex{0600}{06FF}
+  \xeuniregisterblockhex{0750}{077F}
+  \xeuniregisterblockhex{08A0}{08FF}
+  \xeuniregisterblockhex{FB50}{FDFF}
+  \xeuniregisterblockhex{FE70}{FEFF}
+  \xeuniregisterblockhex{1EE00}{1EEFF}
+}
+\xeuniblockdef{Syriac}{\xeuniregisterblockhex{0700}{074F}}
+\xeuniblockdef{Thaana}{\xeuniregisterblockhex{0780}{07BF}}
+\xeuniblockdef{NKo}{\xeuniregisterblockhex{07C0}{07FF}}
+\xeuniblockdef{Samaritan}{\xeuniregisterblockhex{0800}{083F}}
+\xeuniblockdef{Mandaic}{\xeuniregisterblockhex{0840}{085F}}
+\xeuniblockdef{Devanagari}{
+  \xeuniregisterblockhex{0900}{097F}
+  \xeuniregisterblockhex{A8E0}{A8FF}
+
+}
+\xeuniblockdef{Bengali}{\xeuniregisterblockhex{0980}{09FF}}
+\xeuniblockdef{Gurmukhi}{\xeuniregisterblockhex{0A00}{0A7F}}
+\xeuniblockdef{Gujarati}{\xeuniregisterblockhex{0A80}{0AFF}}
+\xeuniblockdef{Oriya}{\xeuniregisterblockhex{0B00}{0B7F}}
+\xeuniblockdef{Tamil}{\xeuniregisterblockhex{0B80}{0BFF}}
+\xeuniblockdef{Telugu}{\xeuniregisterblockhex{0C00}{0C7F}}
+\xeuniblockdef{Kannada}{\xeuniregisterblockhex{0C80}{0CFF}}
+\xeuniblockdef{Malayalam}{\xeuniregisterblockhex{0D00}{0D7F}}
+\xeuniblockdef{Sinhala}{\xeuniregisterblockhex{0D80}{0DFF}}
+\xeuniblockdef{Thai}{\xeuniregisterblockhex{0E00}{0E7F}}
+\xeuniblockdef{Lao}{\xeuniregisterblockhex{0E80}{0EFF}}
+\xeuniblockdef{Tibetan}{\xeuniregisterblockhex{0F00}{0FFF}}
+\xeuniblockdef{Myanmar}{
+  \xeuniregisterblockhex{1000}{109F}
+  \xeuniregisterblockhex{A9E0}{A9FF}
+  \xeuniregisterblockhex{AA60}{AA7F}
+}
+\xeuniblockdef{Georgian}{\xeuniregisterblockhex{10A0}{10FF}}
+\xeuniblockdef{Hangul}{
+  \xeuniregisterblockhex{1100}{11FF}
+  \xeuniregisterblockhex{3130}{318F}
+  \xeuniregisterblockhex{A960}{A97F}
+  \xeuniregisterblockhex{AC00}{D7AF}
+  \xeuniregisterblockhex{D7B0}{D7FF}
+  \xeuniuseblock{CJK}
+}
+\xeuniblockdef{Ethiopic}{
+  \xeuniregisterblockhex{1200}{137F}
+  \xeuniregisterblockhex{1380}{139F}
+}
+\xeuniblockdef{Cherokee}{\xeuniregisterblockhex{13A0}{13FF}}
+\xeuniblockdef{Unified Canadian Aboriginal Syllabics}{
+  \xeuniregisterblockhex{1400}{167F}
+  \xeuniregisterblockhex{18B0}{18FF}
+}
+\xeuniblockdef{Ogham}{\xeuniregisterblockhex{1680}{169F}}
+\xeuniblockdef{Runic}{\xeuniregisterblockhex{16A0}{16FF}}
+\xeuniblockdef{Tagalog}{\xeuniregisterblockhex{1700}{171F}}
+\xeuniblockdef{Hanunoo}{\xeuniregisterblockhex{1720}{173F}}
+\xeuniblockdef{Buhid}{\xeuniregisterblockhex{1740}{175F}}
+\xeuniblockdef{Tagbanwa}{\xeuniregisterblockhex{1760}{177F}}
+\xeuniblockdef{Khmer}{
+  \xeuniregisterblockhex{1780}{17FF}
+  \xeuniregisterblockhex{19E0}{19FF}
+}
+\xeuniblockdef{Mongolian}{\xeuniregisterblockhex{1800}{18AF}}
+\xeuniblockdef{Limbu}{\xeuniregisterblockhex{1900}{194F}}
+\xeuniblockdef{Tai Le}{
+  \xeuniregisterblockhex{1950}{197F}
+  \xeuniregisterblockhex{1980}{19DF}
+}
+\xeuniblockdef{Buginese}{\xeuniregisterblockhex{1A00}{1A1F}}
+\xeuniblockdef{Tai Tham}{\xeuniregisterblockhex{1A20}{1AAF}}
+\xeuniblockdef{Combining Diacritical Marks Extended}{\xeuniregisterblockhex{1AB0}{1AFF}}
+\xeuniblockdef{Balinese}{\xeuniregisterblockhex{1B00}{1B7F}}
+\xeuniblockdef{Sundanese}{\xeuniregisterblockhex{1B80}{1BBF}}
+\xeuniblockdef{Batak}{\xeuniregisterblockhex{1BC0}{1BFF}}
+\xeuniblockdef{Lepcha}{\xeuniregisterblockhex{1C00}{1C4F}}
+\xeuniblockdef{Ol Chiki}{\xeuniregisterblockhex{1C50}{1C7F}}
+\xeuniblockdef{Sundanese Supplement}{\xeuniregisterblockhex{1CC0}{1CCF}}
+\xeuniblockdef{Vedic Extensions}{\xeuniregisterblockhex{1CD0}{1CFF}}
+\xeuniblockdef{Glagolitic}{\xeuniregisterblockhex{2C00}{2C5F}}
+\xeuniblockdef{Georgian Supplement}{\xeuniregisterblockhex{2D00}{2D2F}}
+\xeuniblockdef{Tifinagh}{\xeuniregisterblockhex{2D30}{2D7F}}
+\xeuniblockdef{Ethiopic Extended}{\xeuniregisterblockhex{2D80}{2DDF}}
+\xeuniblockdef{Supplemental Punctuation}{\xeuniregisterblockhex{2E00}{2E7F}}
+\xeuniblockdef{CJK}{%
+  \xeuniregisterblockhex{2E80}{2EFF}
+  \xeuniregisterblockhex{2F00}{2FDF}
+  \xeuniregisterblockhex{2FF0}{2FFF}
+  \xeuniregisterblockhex{3000}{303F}
+  \xeuniregisterblockhex{3040}{309F}
+  \xeuniregisterblockhex{30A0}{30FF}
+  \xeuniregisterblockhex{31C0}{31EF}
+  \xeuniregisterblockhex{31F0}{31FF}
+  \xeuniregisterblockhex{3200}{32FF}
+  \xeuniregisterblockhex{3100}{312F}
+  \xeuniregisterblockhex{3190}{319F}
+  \xeuniregisterblockhex{31A0}{31BF}
+  \xeuniregisterblockhex{3300}{33FF}
+  \xeuniregisterblockhex{3400}{4DBF}
+  \xeuniregisterblockhex{4DC0}{4DFF}
+  \xeuniregisterblockhex{4E00}{9FFF}
+  \xeuniuseblock{Modifier Tone Letters}
+}
+
+\xeuniblockdef{Hiragana}{\xeuniuseblock{CJK}}
+\xeuniblockdef{Katakana}{\xeuniuseblock{CJK}}
+\xeuniblockdef{Yi Syllables}{\xeuniregisterblockhex{A000}{A48F}}
+\xeuniblockdef{Yi Radicals}{\xeuniregisterblockhex{A490}{A4CF}}
+\xeuniblockdef{Lisu}{\xeuniregisterblockhex{A4D0}{A4FF}}
+\xeuniblockdef{Vai}{\xeuniregisterblockhex{A500}{A63F}}
+\xeuniblockdef{Bamum}{\xeuniregisterblockhex{A6A0}{A6FF}}
+\xeuniblockdef{Modifier Tone Letters}{\xeuniregisterblockhex{A700}{A71F}}
+\xeuniblockdef{Syloti Nagri}{\xeuniregisterblockhex{A800}{A82F}}
+\xeuniblockdef{Common Indic Number Forms}{\xeuniregisterblockhex{A830}{A83F}}
+\xeuniblockdef{Phags-pa}{\xeuniregisterblockhex{A840}{A87F}}
+\xeuniblockdef{Saurashtra}{\xeuniregisterblockhex{A880}{A8DF}}
+\xeuniblockdef{Kayah Li}{\xeuniregisterblockhex{A900}{A92F}}
+\xeuniblockdef{Rejang}{\xeuniregisterblockhex{A930}{A95F}}
+\xeuniblockdef{Javanese}{\xeuniregisterblockhex{A980}{A9DF}}
+\xeuniblockdef{Cham}{\xeuniregisterblockhex{AA00}{AA5F}}
+\xeuniblockdef{Tai Viet}{\xeuniregisterblockhex{AA80}{AADF}}
+\xeuniblockdef{Meetei Mayek Extensions}{\xeuniregisterblockhex{AAE0}{AAFF}}
+\xeuniblockdef{Ethiopic Extended-A}{\xeuniregisterblockhex{AB00}{AB2F}}
+\xeuniblockdef{Cherokee Supplement}{\xeuniregisterblockhex{AB70}{ABBF}}
+\xeuniblockdef{Meetei Mayek}{\xeuniregisterblockhex{ABC0}{ABFF}}
+\xeuniblockdef{High Surrogates}{\xeuniregisterblockhex{D800}{DB7F}}
+\xeuniblockdef{High Private Use Surrogates}{\xeuniregisterblockhex{DB80}{DBFF}}
+\xeuniblockdef{Low Surrogates}{\xeuniregisterblockhex{DC00}{DFFF}}
+\xeuniblockdef{Private Use Area}{\xeuniregisterblockhex{E000}{F8FF}}
+\xeuniblockdef{CJK Compatibility Ideographs}{\xeuniregisterblockhex{F900}{FAFF}}
+\xeuniblockdef{Alphabetic Presentation Forms}{\xeuniregisterblockhex{FB00}{FB4F}}
+\xeuniblockdef{Variation Selectors}{\xeuniregisterblockhex{FE00}{FE0F}}
+\xeuniblockdef{Vertical Forms}{\xeuniregisterblockhex{FE10}{FE1F}}
+\xeuniblockdef{Combining Half Marks}{\xeuniregisterblockhex{FE20}{FE2F}}
+\xeuniblockdef{CJK Compatibility Forms}{\xeuniregisterblockhex{FE30}{FE4F}}
+\xeuniblockdef{Small Form Variants}{\xeuniregisterblockhex{FE50}{FE6F}}
+\xeuniblockdef{Halfwidth and Fullwidth Forms}{\xeuniregisterblockhex{FF00}{FFEF}}
+\xeuniblockdef{Specials}{\xeuniregisterblockhex{FFF0}{FFFF}}
+\xeuniblockdef{Linear B Syllabary}{\xeuniregisterblockhex{10000}{1007F}}
+\xeuniblockdef{Linear B Ideograms}{\xeuniregisterblockhex{10080}{100FF}}
+\xeuniblockdef{Aegean Numbers}{\xeuniregisterblockhex{10100}{1013F}}
+\xeuniblockdef{Ancient Symbols}{\xeuniregisterblockhex{10190}{101CF}}
+\xeuniblockdef{Phaistos Disc}{\xeuniregisterblockhex{101D0}{101FF}}
+\xeuniblockdef{Lycian}{\xeuniregisterblockhex{10280}{1029F}}
+\xeuniblockdef{Carian}{\xeuniregisterblockhex{102A0}{102DF}}
+\xeuniblockdef{Old Italic}{\xeuniregisterblockhex{10300}{1032F}}
+\xeuniblockdef{Gothic}{\xeuniregisterblockhex{10330}{1034F}}
+\xeuniblockdef{Old Permic}{\xeuniregisterblockhex{10350}{1037F}}
+\xeuniblockdef{Ugaritic}{\xeuniregisterblockhex{10380}{1039F}}
+\xeuniblockdef{Old Persian}{\xeuniregisterblockhex{103A0}{103DF}}
+\xeuniblockdef{Deseret}{\xeuniregisterblockhex{10400}{1044F}}
+\xeuniblockdef{Shavian}{\xeuniregisterblockhex{10450}{1047F}}
+\xeuniblockdef{Osmanya}{\xeuniregisterblockhex{10480}{104AF}}
+\xeuniblockdef{Osage}{\xeuniregisterblockhex{104B0}{104FF}}
+\xeuniblockdef{Elbasan}{\xeuniregisterblockhex{10500}{1052F}}
+\xeuniblockdef{Caucasian Albanian}{\xeuniregisterblockhex{10530}{1056F}}
+\xeuniblockdef{Linear A}{\xeuniregisterblockhex{10600}{1077F}}
+\xeuniblockdef{Cypriot Syllabary}{\xeuniregisterblockhex{10800}{1083F}}
+\xeuniblockdef{Imperial Aramaic}{\xeuniregisterblockhex{10840}{1085F}}
+\xeuniblockdef{Palmyrene}{\xeuniregisterblockhex{10860}{1087F}}
+\xeuniblockdef{Nabataean}{\xeuniregisterblockhex{10880}{108AF}}
+\xeuniblockdef{Hatran}{\xeuniregisterblockhex{108E0}{108FF}}
+\xeuniblockdef{Phoenician}{\xeuniregisterblockhex{10900}{1091F}}
+\xeuniblockdef{Lydian}{\xeuniregisterblockhex{10920}{1093F}}
+\xeuniblockdef{Meroitic Hieroglyphs}{\xeuniregisterblockhex{10980}{1099F}}
+\xeuniblockdef{Meroitic Cursive}{\xeuniregisterblockhex{109A0}{109FF}}
+\xeuniblockdef{Kharoshthi}{\xeuniregisterblockhex{10A00}{10A5F}}
+\xeuniblockdef{Old South Arabian}{\xeuniregisterblockhex{10A60}{10A7F}}
+\xeuniblockdef{Old North Arabian}{\xeuniregisterblockhex{10A80}{10A9F}}
+\xeuniblockdef{Manichaean}{\xeuniregisterblockhex{10AC0}{10AFF}}
+\xeuniblockdef{Avestan}{\xeuniregisterblockhex{10B00}{10B3F}}
+\xeuniblockdef{Inscriptional Parthian}{\xeuniregisterblockhex{10B40}{10B5F}}
+\xeuniblockdef{Inscriptional Pahlavi}{\xeuniregisterblockhex{10B60}{10B7F}}
+\xeuniblockdef{Psalter Pahlavi}{\xeuniregisterblockhex{10B80}{10BAF}}
+\xeuniblockdef{Old Turkic}{\xeuniregisterblockhex{10C00}{10C4F}}
+\xeuniblockdef{Old Hungarian}{\xeuniregisterblockhex{10C80}{10CFF}}
+\xeuniblockdef{Rumi Numeral Symbols}{\xeuniregisterblockhex{10E60}{10E7F}}
+\xeuniblockdef{Brahmi}{\xeuniregisterblockhex{11000}{1107F}}
+\xeuniblockdef{Kaithi}{\xeuniregisterblockhex{11080}{110CF}}
+\xeuniblockdef{Sora Sompeng}{\xeuniregisterblockhex{110D0}{110FF}}
+\xeuniblockdef{Chakma}{\xeuniregisterblockhex{11100}{1114F}}
+\xeuniblockdef{Mahajani}{\xeuniregisterblockhex{11150}{1117F}}
+\xeuniblockdef{Sharada}{\xeuniregisterblockhex{11180}{111DF}}
+\xeuniblockdef{Sinhala Archaic Numbers}{\xeuniregisterblockhex{111E0}{111FF}}
+\xeuniblockdef{Khojki}{\xeuniregisterblockhex{11200}{1124F}}
+\xeuniblockdef{Multani}{\xeuniregisterblockhex{11280}{112AF}}
+\xeuniblockdef{Khudawadi}{\xeuniregisterblockhex{112B0}{112FF}}
+\xeuniblockdef{Grantha}{\xeuniregisterblockhex{11300}{1137F}}
+\xeuniblockdef{Newa}{\xeuniregisterblockhex{11400}{1147F}}
+\xeuniblockdef{Tirhuta}{\xeuniregisterblockhex{11480}{114DF}}
+\xeuniblockdef{Siddham}{\xeuniregisterblockhex{11580}{115FF}}
+\xeuniblockdef{Modi}{\xeuniregisterblockhex{11600}{1165F}}
+\xeuniblockdef{Mongolian Supplement}{\xeuniregisterblockhex{11660}{1167F}}
+\xeuniblockdef{Takri}{\xeuniregisterblockhex{11680}{116CF}}
+\xeuniblockdef{Ahom}{\xeuniregisterblockhex{11700}{1173F}}
+\xeuniblockdef{Warang Citi}{\xeuniregisterblockhex{118A0}{118FF}}
+\xeuniblockdef{Pau Cin Hau}{\xeuniregisterblockhex{11AC0}{11AFF}}
+\xeuniblockdef{Bhaiksuki}{\xeuniregisterblockhex{11C00}{11C6F}}
+\xeuniblockdef{Marchen}{\xeuniregisterblockhex{11C70}{11CBF}}
+\xeuniblockdef{Cuneiform}{\xeuniregisterblockhex{12000}{123FF}}
+\xeuniblockdef{Cuneiform Numbers and Punctuation}{\xeuniregisterblockhex{12400}{1247F}}
+\xeuniblockdef{Early Dynastic Cuneiform}{\xeuniregisterblockhex{12480}{1254F}}
+\xeuniblockdef{Egyptian Hieroglyphs}{\xeuniregisterblockhex{13000}{1342F}}
+\xeuniblockdef{Anatolian Hieroglyphs}{\xeuniregisterblockhex{14400}{1467F}}
+\xeuniblockdef{Bamum Supplement}{\xeuniregisterblockhex{16800}{16A3F}}
+\xeuniblockdef{Mro}{\xeuniregisterblockhex{16A40}{16A6F}}
+\xeuniblockdef{Bassa Vah}{\xeuniregisterblockhex{16AD0}{16AFF}}
+\xeuniblockdef{Pahawh Hmong}{\xeuniregisterblockhex{16B00}{16B8F}}
+\xeuniblockdef{Miao}{\xeuniregisterblockhex{16F00}{16F9F}}
+\xeuniblockdef{Ideographic Symbols and Punctuation}{\xeuniregisterblockhex{16FE0}{16FFF}}
+\xeuniblockdef{Tangut}{\xeuniregisterblockhex{17000}{187FF}}
+\xeuniblockdef{Tangut Components}{\xeuniregisterblockhex{18800}{18AFF}}
+\xeuniblockdef{Kana Supplement}{\xeuniregisterblockhex{1B000}{1B0FF}}
+\xeuniblockdef{Duployan}{\xeuniregisterblockhex{1BC00}{1BC9F}}
+\xeuniblockdef{Shorthand Format Controls}{\xeuniregisterblockhex{1BCA0}{1BCAF}}
+\xeuniblockdef{Byzantine Musical Symbols}{\xeuniregisterblockhex{1D000}{1D0FF}}
+\xeuniblockdef{Musical Symbols}{\xeuniregisterblockhex{1D100}{1D1FF}}
+\xeuniblockdef{Tai Xuan Jing Symbols}{\xeuniregisterblockhex{1D300}{1D35F}}
+\xeuniblockdef{Counting Rod Numerals}{\xeuniregisterblockhex{1D360}{1D37F}}
+\xeuniblockdef{Mathematical Alphanumeric Symbols}{\xeuniregisterblockhex{1D400}{1D7FF}}
+\xeuniblockdef{Sutton SignWriting}{\xeuniregisterblockhex{1D800}{1DAAF}}
+\xeuniblockdef{Glagolitic Supplement}{\xeuniregisterblockhex{1E000}{1E02F}}
+\xeuniblockdef{Mende Kikakui}{\xeuniregisterblockhex{1E800}{1E8DF}}
+\xeuniblockdef{Adlam}{\xeuniregisterblockhex{1E900}{1E95F}}
+\xeuniblockdef{Arabic Mathematical Alphabetic Symbols}{}
+\xeuniblockdef{Mahjong Tiles}{\xeuniregisterblockhex{1F000}{1F02F}}
+\xeuniblockdef{Domino Tiles}{\xeuniregisterblockhex{1F030}{1F09F}}
+\xeuniblockdef{Playing Cards}{\xeuniregisterblockhex{1F0A0}{1F0FF}}
+\xeuniblockdef{Enclosed Alphanumeric Supplement}{\xeuniregisterblockhex{1F100}{1F1FF}}
+\xeuniblockdef{Enclosed Ideographic Supplement}{\xeuniregisterblockhex{1F200}{1F2FF}}
+\xeuniblockdef{Miscellaneous Symbols and Pictographs}{\xeuniregisterblockhex{1F300}{1F5FF}}
+\xeuniblockdef{Emoticons}{\xeuniregisterblockhex{1F600}{1F64F}}
+\xeuniblockdef{Ornamental Dingbats}{\xeuniregisterblockhex{1F650}{1F67F}}
+\xeuniblockdef{Transport and Map Symbols}{\xeuniregisterblockhex{1F680}{1F6FF}}
+\xeuniblockdef{Alchemical Symbols}{\xeuniregisterblockhex{1F700}{1F77F}}
+\xeuniblockdef{Geometric Shapes Extended}{\xeuniregisterblockhex{1F780}{1F7FF}}
+\xeuniblockdef{Supplemental Arrows-C}{\xeuniregisterblockhex{1F800}{1F8FF}}
+\xeuniblockdef{Supplemental Symbols and Pictographs}{\xeuniregisterblockhex{1F900}{1F9FF}}
+\xeuniblockdef{CJK Unified Ideographs Extension B}{\xeuniregisterblockhex{20000}{2A6DF}}
+\xeuniblockdef{CJK Unified Ideographs Extension C}{\xeuniregisterblockhex{2A700}{2B73F}}
+\xeuniblockdef{CJK Unified Ideographs Extension D}{\xeuniregisterblockhex{2B740}{2B81F}}
+\xeuniblockdef{CJK Unified Ideographs Extension E}{\xeuniregisterblockhex{2B820}{2CEAF}}
+\xeuniblockdef{CJK Compatibility Ideographs Supplement}{\xeuniregisterblockhex{2F800}{2FA1F}}
+% load default latin block and blocks requested through Script option in fontspec's font
+% selection commands
+\ExplSyntaxOn
+\xeuniuseblock{Latin}
+\seq_map_inline:Nn \fontspec_ht_scripts {\typeout{use block #1}\xeuniuseblock{#1}}
+\ExplSyntaxOff
+\Hinput{fontspec-xetex}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht
new file mode 100644
index 00000000000..47e9ccb779a
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht
@@ -0,0 +1,7 @@
+% fontspec.4ht (2016-12-08-16:38), generated from tex4ht-4ht.tex
+% Copyright 2016       TeX Users Group
+% Copyright 2009-2016 TeX Users Group
+
+\Hinput{fontspec}
+
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht
index 3255bc658dd..ec16eb970fe 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht
@@ -1,46 +1,36 @@
 % \def\HTML{...}  \def\CONFIG{...}  \def\MAKETITLE{...}  \def\EXIST{...}
 % \def\OPTIONS{...}  \def\PREAMBLE{...}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                              %
-%  Compile this file with the command `xhlatex mktex4ht.4ht',  %
-%  and read the instructions at mktex4ht.html => index         %
-%  => mktex4ht.                                                %
-%                                                              %
-%  The compilation needs the files ProTex.sty & AlProTex.sty   %
-%  from                                                        %
-%    http://www.cse.ohio-state.edu/~gurari/systems.html        %
-%                                                              %
-%  This file is designed for machines--not human beings! You   %
-%  are strognly advised not to look at the code which follows  %
-%  the copyright notice.                                       %
-%                                                              %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mktex4ht.4ht                         2009-05-21-09:32 %
-% Copyright (C) 1999--2009      Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+%
+%  Compile this file with the command `xhlatex mktex4ht.4ht',
+%  and read the instructions at mktex4ht.html => index => mktex4ht.
+%
+%  The compilation needs the files ProTex.sty & AlProTex.sty from
+%    http://ctan.org/pkg/protex
+%
+%  This file is designed for machines--not human beings! You
+%  are strongly advised not to look at the code which follows
+%  the copyright notice.
+%
+% mktex4ht.4ht (2016-12-08-16:51), generated from cond4ht.4ht
+% Copyright 2009-2016 TeX Users Group
+% Copyright 1997-2009 Eitan M. Gurari
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2016-12-08-16:51}
 
 
 \def\infofiles{infoht4,infomml}
@@ -49,8 +39,7 @@
 
 \openin15=ProTex.sty \ifeof15
     \immediate\write16{--- Needs ProTex.sty \& AlProTex.sty
-    from http://www.cse.ohio-state.edu/\string
-    ~gurari/systems.html --}
+    from http://ctan.org/pkg/protex --}
 \fi  \closein15
 
 
@@ -90,67 +79,69 @@
 \lit{etex4ht}
 \lit{latex}
 \lit{book}\lit{report}\lit{article}
-\lit{tcilatex}\lit{fontmath}
-
-\lit{inputenc}
-\lit{graphics}
-\lit{graphicx}
-\lit{debug}\lit{footnote-dw}\lit{latex209}
-\lit{amsart}
-\lit{amsbook}\lit{amsproc}\lit{amsldoc}\lit{amsthm}\lit{amsbsy}\lit{amsmath}
-\lit{amsfonts}\lit{amstext}\lit{amstex1}
-\lit{amstex}\lit{amsppt}\lit{babel}\lit{ngerman}\lit{plain}\lit{amsopn}
-
+\lit{tcilatex}\lit{fontmath}\lit{lettrine}
+
+\lit{inputenc}\lit{graphics}\lit{graphicx}
+\lit{debug}\lit{footnote-dw}\lit{latex209}\lit{amsart}\lit{amsbook}\lit{amsproc}
+\lit{amsldoc}\lit{amsthm}\lit{amsbsy}
+\lit{amsmath}\lit{amsfonts}
+\lit{amstext}\lit{amstex1}\lit{amstex}
+\lit{amsppt}\lit{babel}\lit{ngerman}\lit{plain}
+\lit{amsopn}
 \lit{biblatex}
-\lit{reading}\lit{glossaries}\lit{glossary}
-\lit{letter}\lit{latin2}\lit{dvips}
-
+\lit{reading}\lit{glossaries}\lit{glossary}\lit{letter}
+\lit{latin2}
+\lit{dvips}
 \lit{seslideb}
-\lit{xr}\lit{xr-hyper}
-\lit{url}\lit{hyperref}\lit{supertabular}\lit{array}\lit{longtable}\lit{pctable}\lit{tabularx}\lit{ifthen}
-\lit{mwart}\lit{mwrep}
-\lit{mwbk}\lit{natbib}
-\lit{CJK}\lit{german}
-\lit{italian}\lit{french}\lit{moreverb}\lit{fancyvrb}\lit{epsf}\lit{psfig}\lit{epsfig}\lit{amscd}\lit{color}\lit{xcolor}
-\lit{dvipsnam}\lit{svgnam}\lit{colortbl}\lit{minitoc}\lit{index}\lit{multind}\lit{fancybox}\lit{alltt}\lit{latin1}\lit{utf8}\lit{utf8x}\lit{ucs}
+\lit{xr}
+\lit{xr-hyper}\lit{url}\lit{hyperref}
+\lit{supertabular}\lit{array}
+\lit{longtable}\lit{pctable}\lit{tabularx}\lit{ifthen}\lit{mwart}\lit{mwrep}\lit{mwbk}\lit{natbib}\lit{CJK}
+\lit{german}\lit{italian}\lit{french}
+\lit{moreverb}\lit{fancyvrb}
+\lit{epsf}\lit{psfig}
+\lit{epsfig}\lit{amscd}\lit{color}\lit{xcolor}\lit{dvipsnam}\lit{svgnam}
+\lit{colortbl}\lit{minitoc}\lit{index}\lit{multind}\lit{fancybox}\lit{alltt}\lit{latin1}\lit{utf8}\lit{utf8x}\lit{ucs}
 \lit{vanilla}\lit{eplain}\lit{context}
+
 \lit{varioref}
-\lit{nameref}\lit{byname}\lit{fleqn}\lit{tabulary}\lit{tabulary-a}
-\lit{theorem}
-\lit{ntheorem}\lit{t2benc}\lit{memoir}\lit{verse}\lit{mempatch}\lit{amssymb}\lit{gauss}\lit{arabicore}\lit{lfeenc}
-\lit{alatex}\lit{rlbabel}
-\lit{hebtex}\lit{abidir}\lit{hewrite}\lit{aoutput}
-\lit{koi8-r}\lit{frenchb}\lit{powerdot}\lit{powerdot-a}\lit{euler}\lit{eucal}\lit{mex}
-\lit{titlesec}\lit{jeep}\lit{apacite}\lit{mla}\lit{path}\lit{hypcap}
-\lit{dcolumn}
-\lit{mdwtab}\lit{multirow}\lit{wrapfig}\lit{subfigure}\lit{caption}
-\lit{makeidx}\lit{splitidx}\lit{chicago}\lit{srcltx}\lit{emulateapj}\lit{picins}\lit{nomencl}\lit{ot4enc}\lit{pd1enc}\lit{revtex4}
-\lit{aps}\lit{revsymb}\lit{aa}\lit{latex2man}\lit{texinfo}
-\lit{doc}\lit{holtxdoc}\lit{scrbook}\lit{scrartcl}
-\lit{scrreprt}\lit{elsart}\lit{apa}
-\lit{apa-a}\lit{JHEP}\lit{TextBook}\lit{combine}
-\lit{g-brief}\lit{ltxguide}\lit{extarticle}\lit{extbook}
-\lit{extletter}\lit{extproc}\lit{extreport}\lit{amsdtx}
-\lit{mathtools}\lit{llncs}\lit{llncs-a}\lit{lncse}
-\lit{lncse-a}\lit{bibtopic}
-\lit{overcite}\lit{harvard}\lit{jurabib}\lit{cp1256}\lit{8859-6}\lit{germanb}\lit{ngermanb}\lit{manju}
-\lit{verbatimfiles}\lit{verbatim}
-\lit{prosper}\lit{prosper-a}
-\lit{beamer}\lit{beamerbasetoc}
-\lit{beamerbasefont}\lit{seminar}\lit{seminar-a}\lit{slides}
-\lit{foils}\lit{slidesec}\lit{texpower}\lit{xy}
-\lit{pictex}\lit{diagrams}\lit{pstricks}\lit{pst-all}
-\lit{endfloat}\lit{mfpic}\lit{pb-diagram}
-\lit{pgf}\lit{textures}\lit{dvipdf}\lit{dvipsone}\lit{fig4tex}
-\lit{pctex32}\lit{overpic}\lit{dratex}\lit{europecv}
-\lit{resume}\lit{curve}\lit{vowel}\lit{enumitem}
-\lit{esperanto}\lit{IEEEtran}\lit{enumerate}\lit{accents}
-\lit{linguex}\lit{cgloss4e}\lit{covington}\lit{pst-jtree}
-\lit{diagram}\lit{subeqnarray}\lit{eurosym}\lit{SIunits}
-\lit{sistyle}\lit{ushort}\lit{chapterbib}\lit{microtype}
-\lit{bm}\lit{beton}\lit{everyshi}\lit{res}
-\lit{res-a}\lit{algorithmic}\lit{algorithmicx}\lit{algorithm}
-\lit{booktabs}\lit{gloss}\lit{dsfont}
+\lit{nameref}\lit{geometry}\lit{byname}\lit{fleqn}\lit{tabulary}
+\lit{tabulary-a}\lit{theorem}\lit{ntheorem}\lit{t2benc}\lit{memoir}\lit{verse}
+\lit{mempatch}\lit{amssymb}\lit{gauss}\lit{arabicore}\lit{lfeenc}\lit{alatex}\lit{rlbabel}\lit{hebtex}\lit{abidir}
+\lit{hewrite}\lit{aoutput}\lit{koi8-r}\lit{frenchb}\lit{powerdot}\lit{powerdot-a}
+\lit{euler}\lit{eucal}\lit{mex}
+\lit{titlesec}\lit{jeep}\lit{apacite}\lit{mla}\lit{path}\lit{hypcap}\lit{dcolumn}\lit{mdwtab}\lit{multirow}
+\lit{wrapfig}\lit{subscript}
+\lit{subfigure}\lit{caption}\lit{makeidx}\lit{splitidx}
+\lit{chicago}\lit{srcltx}
+\lit{emulateapj}\lit{picins}\lit{nomencl}
+\lit{ot4enc}
+\lit{pd1enc}\lit{revtex4}\lit{aps}\lit{revsymb}
+\lit{aa}
+\lit{latex2man}\lit{texinfo}\lit{doc}\lit{holtxdoc}
+\lit{scrbook}\lit{scrartcl}\lit{scrreprt}\lit{elsart}\lit{apa}\lit{apa-a}\lit{JHEP}
+\lit{TextBook}\lit{combine}\lit{g-brief}\lit{ltxguide}
+\lit{extarticle}\lit{extbook}\lit{extletter}\lit{extproc}
+\lit{extreport}\lit{amsdtx}\lit{mathtools}\lit{llncs}
+\lit{llncs-a}\lit{lncse}\lit{lncse-a}\lit{bibtopic}\lit{overcite}\lit{harvard}
+\lit{jurabib}\lit{cp1256}\lit{8859-6}
+\lit{germanb}
+\lit{ngermanb}\lit{manju}\lit{verbatimfiles}\lit{verbatim}\lit{prosper}\lit{prosper-a}\lit{beamer}\lit{beamerbasetoc}\lit{beamerbasefont}\lit{seminar}
+\lit{seminar-a}\lit{slides}\lit{foils}\lit{slidesec}
+\lit{texpower}\lit{xy}\lit{pictex}\lit{diagrams}
+\lit{pstricks}\lit{pst-all}\lit{endfloat}
+\lit{mfpic}\lit{pb-diagram}\lit{pgf}
+\lit{textures}\lit{dvipdf}
+\lit{dvipsone}\lit{fig4tex}\lit{pctex32}\lit{overpic}
+\lit{dratex}\lit{europecv}\lit{resume}\lit{curve}
+\lit{vowel}\lit{enumitem}\lit{esperanto}\lit{IEEEtran}
+\lit{enumerate}\lit{accents}\lit{linguex}\lit{cgloss4e}
+\lit{covington}\lit{pst-jtree}\lit{diagram}\lit{subeqnarray}
+\lit{eurosym}\lit{SIunits}\lit{sistyle}\lit{ushort}
+\lit{chapterbib}\lit{microtype}\lit{bm}\lit{beton}
+\lit{everyshi}\lit{quoting}\lit{res}\lit{res-a}
+\lit{algorithmic}\lit{algorithmicx}\lit{algorithm}\lit{booktabs}
+\lit{tocloft}\lit{gloss}\lit{dsfont}
 \lit{afterpage}\lit{longdiv}
 \lit{tugboat}\lit{ltugboat}
 \lit{ltugboat-a}\lit{ltugproc}\lit{ltugproc-a}\lit{mls}
@@ -160,19 +151,19 @@
 \lit{floatflt}\lit{lb}
 \lit{acm-proc-article-sp}\lit{sig-alternate}\lit{endnotes}\lit{2up}
 \lit{web}\lit{exerquiz}\lit{nicefrac}\lit{multicol}
-\lit{osudeG}\lit{ProTex}\lit{th4}
-\lit{footmisc}\lit{writer}\lit{mdwlist}\lit{sverb}
-\lit{syntax}\lit{soul}\lit{manmac}
-\lit{cp850}\lit{cp852}\lit{cp862}\lit{cp1250}
-\lit{cp1252}\lit{cp437}\lit{cp437de}\lit{cp865}
-\lit{norsk}\lit{polish}\lit{polski}\lit{portuges}
-\lit{romanian}\lit{russianb}\lit{scottish}\lit{slovak}
-\lit{slovene}\lit{spanish}\lit{swedish}\lit{turkish}
-\lit{ukraineb}\lit{usorbian}\lit{welsh}\lit{hebrew}
-\lit{austrian}\lit{catalan}\lit{croatian}\lit{czech}
-\lit{danish}\lit{dutch}\lit{english}\lit{esperant}
-\lit{estonian}\lit{finnish}\lit{francais}\lit{galician}
-\lit{greek}\lit{exam}\lit{mktex4ht}
+\lit{osudeG}\lit{ProTex}
+\lit{th4}\lit{footmisc}\lit{writer}\lit{mdwlist}
+\lit{sverb}\lit{syntax}\lit{soul}\lit{manmac}\lit{cp850}\lit{cp852}\lit{cp862}
+\lit{cp1250}\lit{cp1252}\lit{cp437}\lit{cp437de}
+\lit{cp865}\lit{norsk}\lit{polish}\lit{polski}
+\lit{portuges}\lit{romanian}\lit{russianb}\lit{scottish}
+\lit{slovak}\lit{slovene}\lit{spanish}\lit{swedish}
+\lit{turkish}\lit{ukraineb}\lit{usorbian}\lit{welsh}
+\lit{hebrew}\lit{austrian}\lit{catalan}\lit{croatian}
+\lit{czech}\lit{danish}\lit{dutch}\lit{english}
+\lit{esperant}\lit{estonian}\lit{finnish}\lit{francais}
+\lit{galician}\lit{greek}\lit{exam}\lit{fontspec}
+\lit{fontspec-xetex}\lit{fontspec-luatex}
    \ifx \EXIST\UnDef\else \expandafter\moreLit\EXIST,,//\fi
    \string\endinput
  >>>  \LitFile  \fi \GetLit}
@@ -224,7 +215,7 @@
 % for bootstrapping, when html4.4ht is not available %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ifx \b:HEAD\UnDef
-   \let\tbl:XV=\empty
+%   \let\tbl:XV=\empty
    \let\:Hii=\empty
    \let\End:Hii=\empty
    \let\:SPAN=\empty
@@ -302,23 +293,24 @@
 \LitRow{extbook}\LitRow{extletter}\LitRow{extproc}\LitRow{extreport}
 \LitRow{fancybox}\LitRow{fancyvrb}\LitRow{fig4tex}\LitRow{finnish}
 \LitRow{fleqn}\LitRow{float}\LitRow{floatflt}\LitRow{foils}
-\LitRow{fontmath}\LitRow{footmisc}\LitRow{footnote-dw}\LitRow{francais}
-\LitRow{french}\LitRow{frenchb}\LitRow{g-brief}\LitRow{galician}
-\LitRow{gauss}\LitRow{german}\LitRow{germanb}\LitRow{gloss}
+\LitRow{fontmath}\LitRow{fontspec}\LitRow{fontspec-luatex}\LitRow{fontspec-xetex}
+\LitRow{footmisc}\LitRow{footnote-dw}\LitRow{francais}\LitRow{french}
+\LitRow{frenchb}\LitRow{g-brief}\LitRow{galician}\LitRow{gauss}
+\LitRow{geometry}\LitRow{german}\LitRow{germanb}\LitRow{gloss}
 \LitRow{glossaries}\LitRow{glossary}\LitRow{go}\LitRow{graphics}
 \LitRow{graphicx}\LitRow{greek}\LitRow{harvard}\LitRow{hebrew}
 \LitRow{hebtex}\LitRow{hewrite}\LitRow{holtxdoc}\LitRow{hypcap}
 \LitRow{hyperref}\LitRow{ifthen}\LitRow{index}\LitRow{inputenc}
 \LitRow{italian}\LitRow{jeep}\LitRow{jurabib}\LitRow{koi8-r}
 \LitRow{latex}\LitRow{latex209}\LitRow{latex2man}\LitRow{latin1}
-\LitRow{latin2}\LitRow{lb}\LitRow{letter}\LitRow{lfeenc}
-\LitRow{lineno}\LitRow{linguex}\LitRow{listings}\LitRow{llncs}
-\LitRow{llncs-a}\LitRow{lncse}\LitRow{lncse-a}\LitRow{longdiv}
-\LitRow{longtable}\LitRow{ltugboat}\LitRow{ltugboat-a}\LitRow{ltugproc}
-\LitRow{ltugproc-a}\LitRow{ltxguide}\LitRow{makeidx}\LitRow{manju}
-\LitRow{manmac}\LitRow{mathtools}\LitRow{mdwlist}\LitRow{mdwtab}
-\LitRow{memoir}\LitRow{mempatch}\LitRow{mex}\LitRow{mfpic}
-\LitRow{microtype}\LitRow{minitoc}\LitRow{mktex4ht}\LitRow{mla}
+\LitRow{latin2}\LitRow{lb}\LitRow{letter}\LitRow{lettrine}
+\LitRow{lfeenc}\LitRow{lineno}\LitRow{linguex}\LitRow{listings}
+\LitRow{llncs}\LitRow{llncs-a}\LitRow{lncse}\LitRow{lncse-a}
+\LitRow{longdiv}\LitRow{longtable}\LitRow{ltugboat}\LitRow{ltugboat-a}
+\LitRow{ltugproc}\LitRow{ltugproc-a}\LitRow{ltxguide}\LitRow{makeidx}
+\LitRow{manju}\LitRow{manmac}\LitRow{mathtools}\LitRow{mdwlist}
+\LitRow{mdwtab}\LitRow{memoir}\LitRow{mempatch}\LitRow{mex}
+\LitRow{mfpic}\LitRow{microtype}\LitRow{minitoc}\LitRow{mla}
 \LitRow{mls}\LitRow{moreverb}\LitRow{multicol}\LitRow{multind}
 \LitRow{multirow}\LitRow{mwart}\LitRow{mwbk}\LitRow{mwrep}
 \LitRow{nameref}\LitRow{natbib}\LitRow{ngerman}\LitRow{ngermanb}
@@ -329,25 +321,26 @@
 \LitRow{pictex}\LitRow{pifont}\LitRow{plain}\LitRow{polish}
 \LitRow{polski}\LitRow{portuges}\LitRow{powerdot}\LitRow{powerdot-a}
 \LitRow{prosper}\LitRow{prosper-a}\LitRow{psfig}\LitRow{pst-all}
-\LitRow{pst-jtree}\LitRow{pstricks}\LitRow{reading}\LitRow{report}
-\LitRow{res}\LitRow{res-a}\LitRow{resume}\LitRow{revsymb}
-\LitRow{revtex4}\LitRow{rlbabel}\LitRow{romanian}\LitRow{rotating}
-\LitRow{russianb}\LitRow{scottish}\LitRow{scrartcl}\LitRow{scrbook}
-\LitRow{scrreprt}\LitRow{seminar}\LitRow{seminar-a}\LitRow{seslideb}
-\LitRow{sig-alternate}\LitRow{sistyle}\LitRow{slides}\LitRow{slidesec}
-\LitRow{slovak}\LitRow{slovene}\LitRow{soul}\LitRow{spanish}
-\LitRow{splitidx}\LitRow{srcltx}\LitRow{subeqnarray}\LitRow{subfigure}
-\LitRow{supertabular}\LitRow{sverb}\LitRow{svgnam}\LitRow{swedish}
-\LitRow{syntax}\LitRow{t2benc}\LitRow{tabularx}\LitRow{tabulary}
-\LitRow{tabulary-a}\LitRow{tcilatex}\LitRow{tex4ht}\LitRow{tex4ht2}
-\LitRow{texinfo}\LitRow{texpower}\LitRow{textures}\LitRow{th4}
-\LitRow{theorem}\LitRow{titlesec}\LitRow{tugboat}\LitRow{turkish}
-\LitRow{ucs}\LitRow{ukraineb}\LitRow{ulem}\LitRow{url}
-\LitRow{ushort}\LitRow{usorbian}\LitRow{utf8}\LitRow{utf8x}
-\LitRow{vanilla}\LitRow{varioref}\LitRow{verbatim}\LitRow{verbatimfiles}
-\LitRow{verse}\LitRow{vowel}\LitRow{web}\LitRow{welsh}
-\LitRow{wrapfig}\LitRow{writer}\LitRow{xcolor}\LitRow{xr}
-\LitRow{xr-hyper}\LitRow{xy}
+\LitRow{pst-jtree}\LitRow{pstricks}\LitRow{quoting}\LitRow{reading}
+\LitRow{report}\LitRow{res}\LitRow{res-a}\LitRow{resume}
+\LitRow{revsymb}\LitRow{revtex4}\LitRow{rlbabel}\LitRow{romanian}
+\LitRow{rotating}\LitRow{russianb}\LitRow{scottish}\LitRow{scrartcl}
+\LitRow{scrbook}\LitRow{scrreprt}\LitRow{seminar}\LitRow{seminar-a}
+\LitRow{seslideb}\LitRow{sig-alternate}\LitRow{sistyle}\LitRow{slides}
+\LitRow{slidesec}\LitRow{slovak}\LitRow{slovene}\LitRow{soul}
+\LitRow{spanish}\LitRow{splitidx}\LitRow{srcltx}\LitRow{subeqnarray}
+\LitRow{subfigure}\LitRow{subscript}\LitRow{supertabular}\LitRow{sverb}
+\LitRow{svgnam}\LitRow{swedish}\LitRow{syntax}\LitRow{t2benc}
+\LitRow{tabularx}\LitRow{tabulary}\LitRow{tabulary-a}\LitRow{tcilatex}
+\LitRow{tex4ht}\LitRow{tex4ht2}\LitRow{texinfo}\LitRow{texpower}
+\LitRow{textures}\LitRow{th4}\LitRow{theorem}\LitRow{titlesec}
+\LitRow{tocloft}\LitRow{tugboat}\LitRow{turkish}\LitRow{ucs}
+\LitRow{ukraineb}\LitRow{ulem}\LitRow{url}\LitRow{ushort}
+\LitRow{usorbian}\LitRow{utf8}\LitRow{utf8x}\LitRow{vanilla}
+\LitRow{varioref}\LitRow{verbatim}\LitRow{verbatimfiles}\LitRow{verse}
+\LitRow{vowel}\LitRow{web}\LitRow{welsh}\LitRow{wrapfig}
+\LitRow{writer}\LitRow{xcolor}\LitRow{xr}\LitRow{xr-hyper}
+\LitRow{xy}
 \ifx \EXIST\UnDef\else \expandafter\moreLitRow\EXIST,,//\fi
 \ifvmode \IgnorePar\fi\EndP \HCode{</table>}
 \IgnoreIndent\par\rightline{[\ExitHPage{}]} \EndHPage{}]
@@ -582,14 +575,33 @@ it an explicitly check. On the other hand, we should avoid duplications.
 
 
 
+%% begin comment 29/09/2016 (dg)
+%% file \jobname.4ct does not exist on first run;
+%% it should be available on second and third run
+%% end
+\newif\ifFirstPass\FirstPassfalse
+\openin15=\Jobname.4ct
+  \ifeof15
+    \FirstPasstrue
+    \message{^^J warning *********** FIRST PASS **************************** ^^J}
+  \fi
+\closein15
+
 
 \chapter{Containers for the Configurations}
 
+%%
+%% Skip processing lit entries on first pass
+%%
+
+\ifFirstPass\else
 
    \catcode`\:=11
 \expandafter\GetLit\HTML,,,!*?: \relax
    \catcode`\:=12
 
+\fi
+
 \bgroup
     \catcode`\:=11      \catcode`\@=0 \catcode`\\=11 @relax
 
@@ -634,6 +646,7 @@ it an explicitly check. On the other hand, we should avoid duplications.
 
 
 
+
 \end{document}
 \endinput