win32/ tex4ht files updated

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

82 files changed, 248 insertions, 124 deletions

diff --git a/Master/bin/win32/dbcontext.bat b/Master/bin/win32/dbcontext.bat
index 72777a2e99d..91d4825e01c 100644
--- a/Master/bin/win32/dbcontext.bat
+++ b/Master/bin/win32/dbcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dblatex.bat b/Master/bin/win32/dblatex.bat
index e45f6254bd3..f932257fa51 100644
--- a/Master/bin/win32/dblatex.bat
+++ b/Master/bin/win32/dblatex.bat
@@ -1,5 +1,5 @@
         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,docbook]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\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,docbook]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\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,docbook]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbmcontext.bat b/Master/bin/win32/dbmcontext.bat
index dc9bac6624b..91d4825e01c 100644
--- a/Master/bin/win32/dbmcontext.bat
+++ b/Master/bin/win32/dbmcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbmex.bat b/Master/bin/win32/dbmex.bat
index 4de9b94f6ec..f1d309a2e23 100644
--- a/Master/bin/win32/dbmex.bat
+++ b/Master/bin/win32/dbmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbmlatex.bat b/Master/bin/win32/dbmlatex.bat
index 59b59129f4b..feb12f36367 100644
--- a/Master/bin/win32/dbmlatex.bat
+++ b/Master/bin/win32/dbmlatex.bat
@@ -1,5 +1,5 @@
         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,docbook-mml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\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,docbook-mml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\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,docbook-mml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbmmex.bat b/Master/bin/win32/dbmmex.bat
index 8838b060f59..c14b915a436 100644
--- a/Master/bin/win32/dbmmex.bat
+++ b/Master/bin/win32/dbmmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbmtex.bat b/Master/bin/win32/dbmtex.bat
index ee57953cf98..51d96a97077 100644
--- a/Master/bin/win32/dbmtex.bat
+++ b/Master/bin/win32/dbmtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbmtexi.bat b/Master/bin/win32/dbmtexi.bat
index afab293da16..cf91e0f4ad8 100644
--- a/Master/bin/win32/dbmtexi.bat
+++ b/Master/bin/win32/dbmtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i\tex4ht\ht-fonts\%3 -ewin32\tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32\tex4ht.env -cvalidate -cdocbk 

 Rem         texindex ?

diff --git a/Master/bin/win32/dbtex.bat b/Master/bin/win32/dbtex.bat
index c6d8b39bad0..80e03a13ae0 100644
--- a/Master/bin/win32/dbtex.bat
+++ b/Master/bin/win32/dbtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk

diff --git a/Master/bin/win32/dbtexi.bat b/Master/bin/win32/dbtexi.bat
index 95d4ece8f0e..3b697b47904 100644
--- a/Master/bin/win32/dbtexi.bat
+++ b/Master/bin/win32/dbtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,docbook}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate -cdocbk 

 Rem         texindex ?

diff --git a/Master/bin/win32/escontext.bat b/Master/bin/win32/escontext.bat
new file mode 100755
index 00000000000..d793d2b2a8e
--- /dev/null
+++ b/Master/bin/win32/escontext.bat
@@ -0,0 +1,3 @@
+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cemspkhtf -s4es

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cemspk

diff --git a/Master/bin/win32/eslatex.bat b/Master/bin/win32/eslatex.bat
new file mode 100755
index 00000000000..bc621773e7a
--- /dev/null
+++ b/Master/bin/win32/eslatex.bat
@@ -0,0 +1,5 @@
+        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,emspk]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\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,emspk]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\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,emspk]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cemspkhtf -s4es

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cemspk

diff --git a/Master/bin/win32/esmex.bat b/Master/bin/win32/esmex.bat
new file mode 100755
index 00000000000..f1273adf3a7
--- /dev/null
+++ b/Master/bin/win32/esmex.bat
@@ -0,0 +1,5 @@
+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cemspkhtf -s4es

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cemspk

diff --git a/Master/bin/win32/estex.bat b/Master/bin/win32/estex.bat
new file mode 100755
index 00000000000..03c2e7567e8
--- /dev/null
+++ b/Master/bin/win32/estex.bat
@@ -0,0 +1,5 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cemspkhtf -s4es

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cemspk

diff --git a/Master/bin/win32/estexi.bat b/Master/bin/win32/estexi.bat
new file mode 100755
index 00000000000..522c6afa2f8
--- /dev/null
+++ b/Master/bin/win32/estexi.bat
@@ -0,0 +1,6 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,emspk}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cemspkhtf -s4es

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cemspk 

+Rem         texindex ?

diff --git a/Master/bin/win32/htcontext.bat b/Master/bin/win32/htcontext.bat
index e77e46881ff..6af52abdf36 100644
--- a/Master/bin/win32/htcontext.bat
+++ b/Master/bin/win32/htcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="ht-1=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/htlatex.bat b/Master/bin/win32/htlatex.bat
index 4b580982716..bb4779577ef 100644
--- a/Master/bin/win32/htlatex.bat
+++ b/Master/bin/win32/htlatex.bat
@@ -1,5 +1,5 @@
         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,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\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,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\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,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/htmex.bat b/Master/bin/win32/htmex.bat
index 2b4764d87ed..90e177f7e86 100644
--- a/Master/bin/win32/htmex.bat
+++ b/Master/bin/win32/htmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/httex.bat b/Master/bin/win32/httex.bat
index 5e39fbdaf5c..329745dd435 100644
--- a/Master/bin/win32/httex.bat
+++ b/Master/bin/win32/httex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/httexi.bat b/Master/bin/win32/httexi.bat
index 8263f9d5d24..e3ad907b577 100644
--- a/Master/bin/win32/httexi.bat
+++ b/Master/bin/win32/httexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env 

 Rem         texindex ?

diff --git a/Master/bin/win32/jh1context.bat b/Master/bin/win32/jh1context.bat
new file mode 100755
index 00000000000..596a5f1322a
--- /dev/null
+++ b/Master/bin/win32/jh1context.bat
@@ -0,0 +1,3 @@
+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp1

diff --git a/Master/bin/win32/jh1latex.bat b/Master/bin/win32/jh1latex.bat
new file mode 100755
index 00000000000..0ababf0c833
--- /dev/null
+++ b/Master/bin/win32/jh1latex.bat
@@ -0,0 +1,5 @@
+        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,html,javahelp,3.2,unicode,jh1.0]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\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,html,javahelp,3.2,unicode,jh1.0]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\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,html,javahelp,3.2,unicode,jh1.0]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp1

diff --git a/Master/bin/win32/jh1mex.bat b/Master/bin/win32/jh1mex.bat
new file mode 100755
index 00000000000..2d86773dbcd
--- /dev/null
+++ b/Master/bin/win32/jh1mex.bat
@@ -0,0 +1,5 @@
+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp1

diff --git a/Master/bin/win32/jh1tex.bat b/Master/bin/win32/jh1tex.bat
new file mode 100755
index 00000000000..3e53c6c5cd6
--- /dev/null
+++ b/Master/bin/win32/jh1tex.bat
@@ -0,0 +1,5 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp1

diff --git a/Master/bin/win32/jh1texi.bat b/Master/bin/win32/jh1texi.bat
new file mode 100755
index 00000000000..fb382b2f671
--- /dev/null
+++ b/Master/bin/win32/jh1texi.bat
@@ -0,0 +1,6 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode,jh1.0}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp1 

+Rem         texindex ?

diff --git a/Master/bin/win32/jhcontext.bat b/Master/bin/win32/jhcontext.bat
new file mode 100755
index 00000000000..e52ef6427c5
--- /dev/null
+++ b/Master/bin/win32/jhcontext.bat
@@ -0,0 +1,3 @@
+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp

diff --git a/Master/bin/win32/jhlatex.bat b/Master/bin/win32/jhlatex.bat
new file mode 100755
index 00000000000..951e36a7824
--- /dev/null
+++ b/Master/bin/win32/jhlatex.bat
@@ -0,0 +1,5 @@
+        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,html,javahelp,3.2,unicode]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\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,html,javahelp,3.2,unicode]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\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,html,javahelp,3.2,unicode]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp

diff --git a/Master/bin/win32/jhmex.bat b/Master/bin/win32/jhmex.bat
new file mode 100755
index 00000000000..08b12a0eb3a
--- /dev/null
+++ b/Master/bin/win32/jhmex.bat
@@ -0,0 +1,5 @@
+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp

diff --git a/Master/bin/win32/jhtex.bat b/Master/bin/win32/jhtex.bat
new file mode 100755
index 00000000000..5dbb809400a
--- /dev/null
+++ b/Master/bin/win32/jhtex.bat
@@ -0,0 +1,5 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp

diff --git a/Master/bin/win32/jhtexi.bat b/Master/bin/win32/jhtexi.bat
new file mode 100755
index 00000000000..505a15da996
--- /dev/null
+++ b/Master/bin/win32/jhtexi.bat
@@ -0,0 +1,6 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html,javahelp,3.2,unicode}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf -u10

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -d%1-doc/ -cjavahelp 

+Rem         texindex ?

diff --git a/Master/bin/win32/jmcontext.bat b/Master/bin/win32/jmcontext.bat
new file mode 100755
index 00000000000..e5906063351
--- /dev/null
+++ b/Master/bin/win32/jmcontext.bat
@@ -0,0 +1,3 @@
+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/jmlatex.bat b/Master/bin/win32/jmlatex.bat
new file mode 100755
index 00000000000..94f3be337bf
--- /dev/null
+++ b/Master/bin/win32/jmlatex.bat
@@ -0,0 +1,5 @@
+        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,jsmath]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\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,jsmath]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\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,jsmath]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/jmmex.bat b/Master/bin/win32/jmmex.bat
new file mode 100755
index 00000000000..30223b01da4
--- /dev/null
+++ b/Master/bin/win32/jmmex.bat
@@ -0,0 +1,5 @@
+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/jmtex.bat b/Master/bin/win32/jmtex.bat
new file mode 100755
index 00000000000..8efb40eecdc
--- /dev/null
+++ b/Master/bin/win32/jmtex.bat
@@ -0,0 +1,5 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env

diff --git a/Master/bin/win32/jmtexi.bat b/Master/bin/win32/jmtexi.bat
new file mode 100755
index 00000000000..27f8f2e133b
--- /dev/null
+++ b/Master/bin/win32/jmtexi.bat
@@ -0,0 +1,6 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsmath}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env 

+Rem         texindex ?

diff --git a/Master/bin/win32/jscontext.bat b/Master/bin/win32/jscontext.bat
new file mode 100755
index 00000000000..6159fffe66b
--- /dev/null
+++ b/Master/bin/win32/jscontext.bat
@@ -0,0 +1,3 @@
+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cjsmlhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cjsml

diff --git a/Master/bin/win32/jslatex.bat b/Master/bin/win32/jslatex.bat
new file mode 100755
index 00000000000..5564308c3f6
--- /dev/null
+++ b/Master/bin/win32/jslatex.bat
@@ -0,0 +1,5 @@
+        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,jsml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\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,jsml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\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,jsml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cjsmlhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cjsml

diff --git a/Master/bin/win32/jsmex.bat b/Master/bin/win32/jsmex.bat
new file mode 100755
index 00000000000..f33b42449eb
--- /dev/null
+++ b/Master/bin/win32/jsmex.bat
@@ -0,0 +1,5 @@
+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cjsmlhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cjsml

diff --git a/Master/bin/win32/jstex.bat b/Master/bin/win32/jstex.bat
new file mode 100755
index 00000000000..9ea5bff569c
--- /dev/null
+++ b/Master/bin/win32/jstex.bat
@@ -0,0 +1,5 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cjsmlhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cjsml

diff --git a/Master/bin/win32/jstexi.bat b/Master/bin/win32/jstexi.bat
new file mode 100755
index 00000000000..64c1b850170
--- /dev/null
+++ b/Master/bin/win32/jstexi.bat
@@ -0,0 +1,6 @@
+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,jsml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cjsmlhtf 

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cjsml 

+Rem         texindex ?

diff --git a/Master/bin/win32/mk4ht b/Master/bin/win32/mk4ht
index 44c5f478714..35498849b9b 100644
--- a/Master/bin/win32/mk4ht
+++ b/Master/bin/win32/mk4ht
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2006-08-28-20:45 %
-# Copyright (C) 2003--2006               Eitan M. Gurari %
+# mk4ht                                 2007-01-04-01:34 %
+# Copyright (C) 2003--2007               Eitan M. Gurari %
 #                                                        %
 #                                                        %
 # This work may be distributed and/or modified under the %
@@ -58,6 +58,10 @@ my @options = (
  "js", "jstex",     "tex",     "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
  "js", "jstexi",    "texi",    "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
  "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
+ "jm", "jmlatex",   "latex",   "xhtml,jsmath", " -cmozhtf", "",
+ "jm", "jmtex",     "tex",     "xhtml,jsmath", " -cmozhtf", "",
+ "jm", "jmtexi",    "texi",    "xhtml,jsmath", " -cmozhtf", "",
+ "jm", "jmcontext", "context", "xhtml,jsmath", " -cmozhtf", "",
  "tei",  "teilatex",  "latex",   "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "tei",  "teitex",    "tex",     "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "tei",  "teitexi",   "texi",    "xhtml,tei",    " -cunihtf",  "-cvalidate",
@@ -178,7 +182,7 @@ print "  clean.htlatex     lg tmp\n";
 
 }
 
-print "mk4ht (2006-08-28-20:45)\n";
+print "mk4ht (2007-01-04-01:34)\n";
 if(  !@ARGV  ){
   print "improper command\n";
   showInstrucions(); exit(1);
diff --git a/Master/bin/win32/mzcontext.bat b/Master/bin/win32/mzcontext.bat
index 7a54fc57a9d..037c712a4cf 100644
--- a/Master/bin/win32/mzcontext.bat
+++ b/Master/bin/win32/mzcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/mzlatex.bat b/Master/bin/win32/mzlatex.bat
index 8006925006c..1278dcea384 100644
--- a/Master/bin/win32/mzlatex.bat
+++ b/Master/bin/win32/mzlatex.bat
@@ -1,5 +1,5 @@
         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,mozilla]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\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,mozilla]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\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,mozilla]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/mzmex.bat b/Master/bin/win32/mzmex.bat
index 8431badf329..4028f3f122c 100644
--- a/Master/bin/win32/mzmex.bat
+++ b/Master/bin/win32/mzmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/mztex.bat b/Master/bin/win32/mztex.bat
index f81b876c535..ae8f615ad94 100644
--- a/Master/bin/win32/mztex.bat
+++ b/Master/bin/win32/mztex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/mztexi.bat b/Master/bin/win32/mztexi.bat
index ee6bad044f6..820fb7c6752 100644
--- a/Master/bin/win32/mztexi.bat
+++ b/Master/bin/win32/mztexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mozilla}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/oocontext.bat b/Master/bin/win32/oocontext.bat
index 7bc8fea6423..9df2e2400bc 100644
--- a/Master/bin/win32/oocontext.bat
+++ b/Master/bin/win32/oocontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i\tex4ht\ht-fonts\%3 -ewin32\tex4ht.env -cmozhtf

-        t4ht %1 %4 -coo -ewin32\tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -cooxtpipes -coo -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/oolatex.bat b/Master/bin/win32/oolatex.bat
index d54dc2faae3..54408c1d470 100644
--- a/Master/bin/win32/oolatex.bat
+++ b/Master/bin/win32/oolatex.bat
@@ -1,5 +1,5 @@
         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,ooffice]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\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,ooffice]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\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,ooffice]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -coo -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -cooxtpipes -coo -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/oomex.bat b/Master/bin/win32/oomex.bat
index 2b636990811..78d30896c96 100644
--- a/Master/bin/win32/oomex.bat
+++ b/Master/bin/win32/oomex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -coo -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -cooxtpipes -coo -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/ootex.bat b/Master/bin/win32/ootex.bat
index 5597db74b4c..d8432f58197 100644
--- a/Master/bin/win32/ootex.bat
+++ b/Master/bin/win32/ootex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -coo -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -cooxtpipes -coo -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/ootexi.bat b/Master/bin/win32/ootexi.bat
index 36e36c057fa..42b6c83fbdb 100644
--- a/Master/bin/win32/ootexi.bat
+++ b/Master/bin/win32/ootexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,ooffice}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

-        t4ht %1 %4 -coo -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cmozhtf

+        t4ht \dirchar %1 %4 -cooxtpipes -coo -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/t4ht.exe b/Master/bin/win32/t4ht.exe
index 72616ac20a2..6e41a76abbf 100644
--- a/Master/bin/win32/t4ht.exe
+++ b/Master/bin/win32/t4ht.exe
diff --git a/Master/bin/win32/teicontext.bat b/Master/bin/win32/teicontext.bat
index 18e04b3eabe..174f55211cf 100644
--- a/Master/bin/win32/teicontext.bat
+++ b/Master/bin/win32/teicontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teilatex.bat b/Master/bin/win32/teilatex.bat
index 16e7b579828..8b8f828af2b 100644
--- a/Master/bin/win32/teilatex.bat
+++ b/Master/bin/win32/teilatex.bat
@@ -1,5 +1,5 @@
         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,tei]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\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,tei]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\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,tei]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teimcontext.bat b/Master/bin/win32/teimcontext.bat
index 18e04b3eabe..174f55211cf 100644
--- a/Master/bin/win32/teimcontext.bat
+++ b/Master/bin/win32/teimcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teimex.bat b/Master/bin/win32/teimex.bat
index f4f99803226..7b6c693fb50 100644
--- a/Master/bin/win32/teimex.bat
+++ b/Master/bin/win32/teimex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teimlatex.bat b/Master/bin/win32/teimlatex.bat
index b703721852f..598c9450e6f 100644
--- a/Master/bin/win32/teimlatex.bat
+++ b/Master/bin/win32/teimlatex.bat
@@ -1,5 +1,5 @@
         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,tei-mml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\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,tei-mml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\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,tei-mml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teimmex.bat b/Master/bin/win32/teimmex.bat
index 565864b7c95..e9673da2036 100644
--- a/Master/bin/win32/teimmex.bat
+++ b/Master/bin/win32/teimmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teimtex.bat b/Master/bin/win32/teimtex.bat
index a54d9708ce6..fd4cec62e2a 100644
--- a/Master/bin/win32/teimtex.bat
+++ b/Master/bin/win32/teimtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teimtexi.bat b/Master/bin/win32/teimtexi.bat
index a68c021b27d..d68f5dcac86 100644
--- a/Master/bin/win32/teimtexi.bat
+++ b/Master/bin/win32/teimtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei-mml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/teitex.bat b/Master/bin/win32/teitex.bat
index 1a3b8174de1..995cf72f8b9 100644
--- a/Master/bin/win32/teitex.bat
+++ b/Master/bin/win32/teitex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/teitexi.bat b/Master/bin/win32/teitexi.bat
index 1e61b980191..1f5b6cf63c6 100644
--- a/Master/bin/win32/teitexi.bat
+++ b/Master/bin/win32/teitexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,tei}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/uxhcontext.bat b/Master/bin/win32/uxhcontext.bat
index 18e04b3eabe..174f55211cf 100644
--- a/Master/bin/win32/uxhcontext.bat
+++ b/Master/bin/win32/uxhcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/uxhlatex.bat b/Master/bin/win32/uxhlatex.bat
index e3202d2d3e9..e3a14076942 100644
--- a/Master/bin/win32/uxhlatex.bat
+++ b/Master/bin/win32/uxhlatex.bat
@@ -1,5 +1,5 @@
         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,uni-html4]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\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,uni-html4]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\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,uni-html4]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/uxhmex.bat b/Master/bin/win32/uxhmex.bat
index aa6ff1c35b4..98e9bf9a847 100644
--- a/Master/bin/win32/uxhmex.bat
+++ b/Master/bin/win32/uxhmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/uxhtex.bat b/Master/bin/win32/uxhtex.bat
index c2d68f4ea9d..33edcd6374f 100644
--- a/Master/bin/win32/uxhtex.bat
+++ b/Master/bin/win32/uxhtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/uxhtexi.bat b/Master/bin/win32/uxhtexi.bat
index cbd141aa93e..e46752d32b6 100644
--- a/Master/bin/win32/uxhtexi.bat
+++ b/Master/bin/win32/uxhtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,uni-html4}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/wcontext.bat b/Master/bin/win32/wcontext.bat
index 5fcb29eb785..15ed1482499 100755
--- a/Master/bin/win32/wcontext.bat
+++ b/Master/bin/win32/wcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/wlatex.bat b/Master/bin/win32/wlatex.bat
index 39ee6cee986..a1f9fa71d33 100644
--- a/Master/bin/win32/wlatex.bat
+++ b/Master/bin/win32/wlatex.bat
@@ -1,5 +1,5 @@
         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,word]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\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,word]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\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,word]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/wmex.bat b/Master/bin/win32/wmex.bat
index ba817a2e07e..7e2df9031f4 100644
--- a/Master/bin/win32/wmex.bat
+++ b/Master/bin/win32/wmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/wtex.bat b/Master/bin/win32/wtex.bat
index 8f3759dcc25..cc8331efabe 100644
--- a/Master/bin/win32/wtex.bat
+++ b/Master/bin/win32/wtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/wtexi.bat b/Master/bin/win32/wtexi.bat
index 96f33fdad42..5d48242239f 100644
--- a/Master/bin/win32/wtexi.bat
+++ b/Master/bin/win32/wtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,word}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -csymhtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/xhcontext.bat b/Master/bin/win32/xhcontext.bat
index a4bda28a1c5..b80a78f1deb 100644
--- a/Master/bin/win32/xhcontext.bat
+++ b/Master/bin/win32/xhcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhlatex.bat b/Master/bin/win32/xhlatex.bat
index a2309fbdcf3..af39a345912 100644
--- a/Master/bin/win32/xhlatex.bat
+++ b/Master/bin/win32/xhlatex.bat
@@ -1,5 +1,5 @@
         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  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhmcontext.bat b/Master/bin/win32/xhmcontext.bat
index 18e04b3eabe..174f55211cf 100644
--- a/Master/bin/win32/xhmcontext.bat
+++ b/Master/bin/win32/xhmcontext.bat
@@ -1,3 +1,3 @@
-        call texexec --arg="opt-arg=%2" --use=tex4ht %5 %1 

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        call texexec --arg="ht-1=%2" --use=tex4ht --dvi --nobackend %5 %1 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhmex.bat b/Master/bin/win32/xhmex.bat
index 53a667f88fe..5bc5793ccaa 100644
--- a/Master/bin/win32/xhmex.bat
+++ b/Master/bin/win32/xhmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhmlatex.bat b/Master/bin/win32/xhmlatex.bat
index fec54514490..fc7bbd5139c 100644
--- a/Master/bin/win32/xhmlatex.bat
+++ b/Master/bin/win32/xhmlatex.bat
@@ -1,5 +1,5 @@
         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,mathml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\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,mathml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\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,mathml]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode %2.a.b.c.\input  %1

-        tex4ht %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1  -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhmmex.bat b/Master/bin/win32/xhmmex.bat
index 7bc0f4c394a..d8ad5814198 100644
--- a/Master/bin/win32/xhmmex.bat
+++ b/Master/bin/win32/xhmmex.bat
@@ -1,5 +1,5 @@
         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         mex %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhmtex.bat b/Master/bin/win32/xhmtex.bat
index 1814a98b85b..d445bee23c2 100644
--- a/Master/bin/win32/xhmtex.bat
+++ b/Master/bin/win32/xhmtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhmtexi.bat b/Master/bin/win32/xhmtexi.bat
index 80a4bf57ab1..e896c11e5f7 100644
--- a/Master/bin/win32/xhmtexi.bat
+++ b/Master/bin/win32/xhmtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml,mathml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env -cunihtf

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?

diff --git a/Master/bin/win32/xhtex.bat b/Master/bin/win32/xhtex.bat
index 02b63f9a30d..5757ef982b0 100644
--- a/Master/bin/win32/xhtex.bat
+++ b/Master/bin/win32/xhtex.bat
@@ -1,5 +1,5 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate

diff --git a/Master/bin/win32/xhtexi.bat b/Master/bin/win32/xhtexi.bat
index 3e6fd378aba..9ec1d0bb280 100644
--- a/Master/bin/win32/xhtexi.bat
+++ b/Master/bin/win32/xhtexi.bat
@@ -1,6 +1,6 @@
         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

         tex  %5 \def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,xhtml}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode %2.a.b.c.\input  %1

-        tex4ht %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

-        t4ht %1 %4 -ewin32/tex4ht.env -cvalidate 

+        tex4ht \dirchar %1 -i/tex4ht/ht-fonts/%3 -ewin32/tex4ht.env

+        t4ht \dirchar %1 %4 -ewin32/tex4ht.env -cvalidate 

 Rem         texindex ?