summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/tex4htk/ChangeLog6
-rw-r--r--Build/source/texk/tex4htk/Makefile.am8
-rw-r--r--Build/source/texk/tex4htk/Makefile.in10
-rwxr-xr-xBuild/source/texk/tex4htk/xhlatex.sh (renamed from Build/source/texk/tex4htk/xhlatex)0
l---------Master/bin/amd64-freebsd/xhlatex1
l---------Master/bin/amd64-netbsd/xhlatex1
l---------Master/bin/armel-linux/xhlatex1
l---------Master/bin/armhf-linux/xhlatex1
l---------Master/bin/i386-cygwin/xhlatex1
l---------Master/bin/i386-freebsd/xhlatex1
l---------Master/bin/i386-linux/xhlatex1
l---------Master/bin/i386-netbsd/xhlatex1
l---------Master/bin/i386-solaris/xhlatex1
l---------Master/bin/powerpc-linux/xhlatex1
l---------Master/bin/sparc-solaris/xhlatex1
l---------Master/bin/universal-darwin/xhlatex1
-rwxr-xr-xMaster/bin/win32/xhlatex.bat35
-rwxr-xr-xMaster/bin/win32/xhlatex.exebin0 -> 1536 bytes
l---------Master/bin/x86_64-cygwin/xhlatex1
l---------Master/bin/x86_64-darwin/xhlatex1
l---------Master/bin/x86_64-linux/xhlatex1
l---------Master/bin/x86_64-solaris/xhlatex1
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ht/xhlatex.sh36
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht43
-rw-r--r--Master/tlpkg/tlpsrc/tex4ht.tlpsrc3
25 files changed, 129 insertions, 28 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index b87ce8abef8..9199e44d177 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-14 Karl Berry <karl@tug.org>
+
+ * Makefile.am (shell_scripts): re-add xhlatex.
+ (EXTRA_DIST): remove from unused list.
+ * xhlatex.sh: rename from xhlatex.
+
2016-05-22 Karl Berry <karl@freefriends.org>
* tex4ht-c.tex (search_file): return NULL rather than FALSE
diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index 4a1aa2dd9ce..cce13b45005 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -1,6 +1,7 @@
## Makefile.am for the TeX Live subdirectory texk/tex4htk/
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2016 Karl Berry <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## We distribute the whole java tree.
@@ -26,7 +27,9 @@ LDADD = $(KPATHSEA_LIBS)
@KPATHSEA_RULE@
perl_scripts = mk4ht
-shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
+shell_scripts = ht htcontext htlatex htmex httex httexi \
+ htxelatex htxetex xhlatex
+
scriptsdir = texmf-dist/scripts/tex4ht
nodist_bin_SCRIPTS =
@@ -144,7 +147,6 @@ EXTRA_DIST += \
wxelatex \
wxetex \
xhcontext \
- xhlatex \
xhmcontext \
xhmex \
xhmlatex \
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index dcb497ee985..ab88614565b 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -131,7 +131,7 @@ tex4ht_OBJECTS = $(am_tex4ht_OBJECTS)
tex4ht_LDADD = $(LDADD)
tex4ht_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__dist_bin_SCRIPTS_DIST = ht.bat htcontext.bat htlatex.bat htmex.bat \
- httex.bat httexi.bat htxelatex.bat htxetex.bat
+ httex.bat httexi.bat htxelatex.bat htxetex.bat xhlatex.bat
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -392,8 +392,8 @@ EXTRA_DIST = java $(top_builddir)/../../build-aux/relpath dbcontext \
teixelatex teixetex test.tex test1.tex testa.tex testb.tex \
uxhcontext uxhlatex uxhmex uxhtex uxhtexi uxhxelatex uxhxetex \
wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \
- xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
- xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
+ xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi xhmxelatex \
+ xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
NEVER_DIST = `find . $(NEVER_NAMES)`
NEVER_NAMES = -name .svn
NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
@@ -406,7 +406,9 @@ t4ht_SOURCES = t4ht.c
tex4ht_SOURCES = tex4ht.c
LDADD = $(KPATHSEA_LIBS)
perl_scripts = mk4ht
-shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
+shell_scripts = ht htcontext htlatex htmex httex httexi \
+ htxelatex htxetex xhlatex
+
scriptsdir = texmf-dist/scripts/tex4ht
nodist_bin_SCRIPTS = $(am__append_1)
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
diff --git a/Build/source/texk/tex4htk/xhlatex b/Build/source/texk/tex4htk/xhlatex.sh
index 2889e48571f..2889e48571f 100755
--- a/Build/source/texk/tex4htk/xhlatex
+++ b/Build/source/texk/tex4htk/xhlatex.sh
diff --git a/Master/bin/amd64-freebsd/xhlatex b/Master/bin/amd64-freebsd/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/amd64-freebsd/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/xhlatex b/Master/bin/amd64-netbsd/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/amd64-netbsd/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/armel-linux/xhlatex b/Master/bin/armel-linux/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/armel-linux/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/armhf-linux/xhlatex b/Master/bin/armhf-linux/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/armhf-linux/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/xhlatex b/Master/bin/i386-cygwin/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/i386-cygwin/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/xhlatex b/Master/bin/i386-freebsd/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/i386-freebsd/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-linux/xhlatex b/Master/bin/i386-linux/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/i386-linux/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/xhlatex b/Master/bin/i386-netbsd/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/i386-netbsd/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/i386-solaris/xhlatex b/Master/bin/i386-solaris/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/i386-solaris/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/xhlatex b/Master/bin/powerpc-linux/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/powerpc-linux/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/xhlatex b/Master/bin/sparc-solaris/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/sparc-solaris/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/universal-darwin/xhlatex b/Master/bin/universal-darwin/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/universal-darwin/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/win32/xhlatex.bat b/Master/bin/win32/xhlatex.bat
new file mode 100755
index 00000000000..8dd8a396918
--- /dev/null
+++ b/Master/bin/win32/xhlatex.bat
@@ -0,0 +1,35 @@
+
+Rem
+Rem
+Rem xhlatex.bat Version 1.1
+Rem Copyright (C) 2003--2009 Eitan M. Gurari
+Rem Copyright 2009 TeX Users Group
+Rem
+Rem This work may be distributed and/or modified under the
+Rem conditions of the LaTeX Project Public License, either
+Rem version 1.3 of this license or (at your option) any
+Rem later version. The latest version of this license is
+Rem in
+Rem http://www.latex-project.org/lppl.txt
+Rem and version 1.3 or later is part of all distributions
+Rem of LaTeX version 2003/12/01 or later.
+Rem
+Rem This work has the LPPL maintenance status "maintained".
+Rem
+Rem The Current Maintainer of this work
+Rem is the TeX4ht Project.
+Rem
+Rem tex4ht@tug.org
+Rem http://www.tug.org/tex4ht
+Rem
+Rem
+
+
+ latex %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ latex %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ latex %5 \makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input %1
+ tex4ht %1 -ic:/tex4ht/texmf/tex4ht/ht-fonts/%3 -ec:/tex4ht/texmf/tex4ht/base/win32/tex4ht.env
+ t4ht %1 %4 -ec:/tex4ht/texmf/tex4ht/base/win32/tex4ht.env -cvalidate
+
+
+
diff --git a/Master/bin/win32/xhlatex.exe b/Master/bin/win32/xhlatex.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/xhlatex.exe
Binary files differ
diff --git a/Master/bin/x86_64-cygwin/xhlatex b/Master/bin/x86_64-cygwin/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/x86_64-cygwin/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/xhlatex b/Master/bin/x86_64-darwin/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/x86_64-darwin/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/xhlatex b/Master/bin/x86_64-linux/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/x86_64-linux/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/xhlatex b/Master/bin/x86_64-solaris/xhlatex
new file mode 120000
index 00000000000..d10ceaa43c8
--- /dev/null
+++ b/Master/bin/x86_64-solaris/xhlatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/xhlatex.sh \ No newline at end of file
diff --git a/Master/texmf-dist/scripts/tex4ht/xhlatex.sh b/Master/texmf-dist/scripts/tex4ht/xhlatex.sh
new file mode 100755
index 00000000000..979fb06e79b
--- /dev/null
+++ b/Master/texmf-dist/scripts/tex4ht/xhlatex.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#
+#
+# xhlatex Version 1.1
+# Copyright (C) 2003--2009 Eitan M. Gurari
+# Copyright 2009 TeX Users Group
+#
+# This work may be distributed and/or modified under the
+# conditions of the LaTeX Project Public License, either
+# version 1.3 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.3 or later is part of all distributions
+# of LaTeX version 2003/12/01 or later.
+#
+# This work has the LPPL maintenance status "maintained".
+#
+# The Current Maintainer of this work
+# is the TeX4ht Project.
+#
+# tex4ht@tug.org
+# http://www.tug.org/tex4ht
+#
+#
+
+
+ latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
+ latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
+ latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,xhtml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
+ tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+ t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644
+
+
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index cd9cc73f814..1efad0ab6f0 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -1,4 +1,4 @@
-% ooffice.4ht (2016-03-31-11:13), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2016-06-13-16:17), generated from tex4ht-ooffice.tex
% Copyright 2009-2016 TeX Users Group
% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2016-03-31-11:13}
+\immediate\write-1{version 2016-06-13-16:17}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -6884,7 +6884,6 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{graphics}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -7986,6 +7985,7 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsmath}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8140,6 +8140,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{biblatex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8221,6 +8222,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{url}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8294,6 +8296,8 @@ Y{0178}\i{00EF}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{longtable}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8383,6 +8387,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{fancyvrb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8395,7 +8400,7 @@ Y{0178}\i{00EF}%
{\gHAdvance\fancyvrb:cnt by 1
\ifnum \fancyvrb:cnt>1
\HCode{<text:line-break />}\fi} {}
- {\ \ }{}
+ {}{}
\Configure{BVerbatimInput}
{\ifvmode \IgnorePar \fi \EndP
\gHAssign\HRow=0
@@ -8413,6 +8418,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{color}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8541,7 +8547,6 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{xcolor}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8619,11 +8624,6 @@ Y{0178}\i{00EF}%
-
-
-
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{apacite}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8648,7 +8648,6 @@ Y{0178}\i{00EF}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{wrapfig}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8714,6 +8713,10 @@ Y{0178}\i{00EF}%
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -10101,7 +10104,6 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrartcl}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12790,7 +12792,6 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{apa}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13233,6 +13234,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{jurabib}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13274,9 +13276,6 @@ Y{0178}\i{00EF}%
-
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{slides}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13562,6 +13561,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pstricks}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13585,7 +13585,6 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pst-all}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13615,6 +13614,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{curve}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13873,6 +13873,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{enumerate}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13978,7 +13979,6 @@ Y{0178}\i{00EF}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{linguex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14062,6 +14062,7 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{covington}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14171,7 +14172,6 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{pst-jtree}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14329,6 +14329,7 @@ Y{0178}\i{00EF}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{ulem}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14395,6 +14396,7 @@ Y{0178}\i{00EF}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{paralist}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14689,7 +14691,6 @@ Y{0178}\i{00EF}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{listings}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14814,6 +14815,7 @@ Y{0178}\i{00EF}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{lineno}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14893,7 +14895,6 @@ Y{0178}\i{00EF}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{soul}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
index e0e9fa4c041..1d81c2803d1 100644
--- a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
@@ -10,7 +10,10 @@ binpattern f bin/${ARCH}/htxetex
binpattern f bin/${ARCH}/mk4ht
binpattern f bin/${ARCH}/t4ht
binpattern f bin/${ARCH}/tex4ht
+binpattern f bin/${ARCH}/xhlatex
+
docpattern d texmf-dist/doc/generic/tex4ht
+
runpattern d texmf-dist/scripts/tex4ht
runpattern d texmf-dist/tex/generic/tex4ht
runpattern d texmf-dist/tex4ht