diff options
| author | Karl Berry <karl@freefriends.org> | 2008-05-10 00:31:48 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-05-10 00:31:48 +0000 |
| commit | 3affd633834494c279f96078e95831935ea51ca7 (patch) | |
| tree | d18cbef6ade390df34099bff78c593f00e9d7971 /Build/source | |
| parent | 78d169458ffb8d121d56a1345471b5dbe3f17a2a (diff) | |
tex4ht-1.0.2008_05_07_2048
git-svn-id: svn://tug.org/texlive/trunk@8000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
73 files changed, 1011 insertions, 1513 deletions
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index bcef00338f4..a96a5b4f295 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -12,7 +12,7 @@ prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes objects = tex4ht.o t4ht.o programs = tex4ht t4ht -scripts = htcontext htmex httex httexi htlatex ht mk4ht +scripts = htcontext htlatex htmex httex httexi htxelatex htxetex ht mk4ht default all: $(programs) diff --git a/Build/source/texk/tex4htk/dbcontext b/Build/source/texk/tex4htk/dbcontext index 1ebfaab47f4..5ca613eb6cf 100755 --- a/Build/source/texk/tex4htk/dbcontext +++ b/Build/source/texk/tex4htk/dbcontext @@ -1,7 +1,7 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cvalidate -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dblatex b/Build/source/texk/tex4htk/dblatex index 06839a344fa..b17d4513169 100755 --- a/Build/source/texk/tex4htk/dblatex +++ b/Build/source/texk/tex4htk/dblatex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cvalidate -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbmcontext b/Build/source/texk/tex4htk/dbmcontext index 1ebfaab47f4..d60bef98b32 100755 --- a/Build/source/texk/tex4htk/dbmcontext +++ b/Build/source/texk/tex4htk/dbmcontext @@ -1,7 +1,7 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbmex b/Build/source/texk/tex4htk/dbmex index 7a7be686535..bb132d7a27b 100755 --- a/Build/source/texk/tex4htk/dbmex +++ b/Build/source/texk/tex4htk/dbmex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cvalidate -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbmlatex b/Build/source/texk/tex4htk/dbmlatex index 4e88f55444f..3ae040ab343 100755 --- a/Build/source/texk/tex4htk/dbmlatex +++ b/Build/source/texk/tex4htk/dbmlatex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbmmex b/Build/source/texk/tex4htk/dbmmex index 1dd17ca311e..c06dbe814e6 100755 --- a/Build/source/texk/tex4htk/dbmmex +++ b/Build/source/texk/tex4htk/dbmmex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbmtex b/Build/source/texk/tex4htk/dbmtex index 99108a48a52..356acaa9859 100755 --- a/Build/source/texk/tex4htk/dbmtex +++ b/Build/source/texk/tex4htk/dbmtex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbmtexexec b/Build/source/texk/tex4htk/dbmtexexec deleted file mode 100755 index d2d8ad431d3..00000000000 --- a/Build/source/texk/tex4htk/dbmtexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/dbmtexi b/Build/source/texk/tex4htk/dbmtexi index 42451d0b3e3..908d2c8700c 100755 --- a/Build/source/texk/tex4htk/dbmtexi +++ b/Build/source/texk/tex4htk/dbmtexi @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cdocbk ## -d~/WWW/temp/ -m644 # texindex ? diff --git a/Build/source/texk/tex4htk/dbtex b/Build/source/texk/tex4htk/dbtex index 24231d26889..d60b4633293 100755 --- a/Build/source/texk/tex4htk/dbtex +++ b/Build/source/texk/tex4htk/dbtex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cvalidate -cdocbk ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/dbtexexec b/Build/source/texk/tex4htk/dbtexexec deleted file mode 100755 index d2d8ad431d3..00000000000 --- a/Build/source/texk/tex4htk/dbtexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/dbtexi b/Build/source/texk/tex4htk/dbtexi index 52f7982e61c..df34e6baac8 100755 --- a/Build/source/texk/tex4htk/dbtexi +++ b/Build/source/texk/tex4htk/dbtexi @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 + t4ht -f/$1 $4 -cvalidate -cdocbk ## -d~/WWW/temp/ -m644 # texindex ? diff --git a/Build/source/texk/tex4htk/ht b/Build/source/texk/tex4htk/ht index 0498e529af7..e5fb159acc2 100644 --- a/Build/source/texk/tex4htk/ht +++ b/Build/source/texk/tex4htk/ht @@ -1,7 +1,6 @@ -#!/bin/sh - $1 $2 - $1 $2 - $1 $2 - tex4ht $2 - t4ht $2 $3 +$1 $2 +$1 $2 +$1 $2 +tex4ht $2 +t4ht $2 $3 # -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/htcontext b/Build/source/texk/tex4htk/htcontext index 9e01fa97f66..34d534636eb 100755 --- a/Build/source/texk/tex4htk/htcontext +++ b/Build/source/texk/tex4htk/htcontext @@ -1,7 +1,7 @@ #!/bin/sh texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 - tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 + tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/htlatex b/Build/source/texk/tex4htk/htlatex index ebab47dbaa6..1b8b7cea74a 100755 --- a/Build/source/texk/tex4htk/htlatex +++ b/Build/source/texk/tex4htk/htlatex @@ -2,8 +2,8 @@ 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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 + tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/htmex b/Build/source/texk/tex4htk/htmex index 485a7594468..b4aa3d9a06e 100755 --- a/Build/source/texk/tex4htk/htmex +++ b/Build/source/texk/tex4htk/htmex @@ -2,8 +2,8 @@ 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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 + tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/htperl.pl b/Build/source/texk/tex4htk/htperl.pl deleted file mode 100644 index 347663e0bb6..00000000000 --- a/Build/source/texk/tex4htk/htperl.pl +++ /dev/null @@ -1,45 +0,0 @@ -use File::Copy; -use File::Path; -use File::Basename; - -&main ; - -0; - -sub is_absolute { - my ($f) = @_; - return $f =~ m@^([a-zA-Z]:)?[\\/]@ ; -} - -sub canonicalize { - my ($f) = @_; - $f =~ s@/@\\@g; - return $f; -} - -sub main { - my $src = &canonicalize($ARGV[1]); - my $dst = &canonicalize($ARGV[2]); - - if (&is_absolute($src)) { - if (-d $dst) { - $dst = $dst . "\\" . &basename($src); - } - } - else { - if (-d $dst) { - $dst = "$dst\\$src"; - &mkpath(&dirname($dst)); - } - } - - if ($ARGV[0] eq 'move') { - &move($src, $dst); - } - elsif ($ARGV[0] eq 'copy') { - ©($src, $dst); - } - else { - print STDERR "$0: bad verb $ARGV[0]\n"; - } -} diff --git a/Build/source/texk/tex4htk/httex b/Build/source/texk/tex4htk/httex index 4c184897d13..44920e72077 100755 --- a/Build/source/texk/tex4htk/httex +++ b/Build/source/texk/tex4htk/httex @@ -2,8 +2,8 @@ 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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 + tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/httexi b/Build/source/texk/tex4htk/httexi index 26427698991..0ce3cb4a589 100755 --- a/Build/source/texk/tex4htk/httexi +++ b/Build/source/texk/tex4htk/httexi @@ -2,8 +2,8 @@ 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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 + tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 + t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 # texindex ? diff --git a/Build/source/texk/tex4htk/mk4ht b/Build/source/texk/tex4htk/mk4ht index 2bd1f7e2038..796872ece31 100755 --- a/Build/source/texk/tex4htk/mk4ht +++ b/Build/source/texk/tex4htk/mk4ht @@ -1,6 +1,6 @@ #!/usr/bin/env perl #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -# mk4ht 2007-01-04-01:34 % +# mk4ht 2007-11-14-18:40 % # Copyright (C) 2003--2007 Eitan M. Gurari % # % # % @@ -30,38 +30,56 @@ my @options = ( "ht", "httex", "tex", "", "", "-cvalidatehtml", "ht", "httexi", "texi", "", "", "-cvalidatehtml", "ht", "htcontext", "context", "", "", "-cvalidatehtml", + "ht", "htxetex", "xetex", "", "", "-cvalidatehtml", + "ht", "htxelatex", "xelatex", "", "", "-cvalidatehtml", "xh", "xhlatex", "latex", "xhtml", "", "-cvalidate", "xh", "xhtex", "tex", "xhtml", "", "-cvalidate", "xh", "xhtexi", "texi", "xhtml", "", "-cvalidate", - "xh", "xhcontext","context", "xhtml", "", "-cvalidat", + "xh", "xhcontext","context", "xhtml", "", "-cvalidat", + "xh", "xhxelatex", "xelatex", "xhtml", "", "-cvalidate", + "xh", "xhxetex", "xetex", "xhtml", "", "-cvalidate", "uxh", "uxhlatex", "latex", "xhtml,uni-html4", " -cunihtf", "-cvalidate", "uxh", "uxhtex", "tex", "xhtml,uni-html4", " -cunihtf", "-cvalidate", "uxh", "uxhtexi", "texi", "xhtml,uni-html4", " -cunihtf", "-cvalidate", "uxh", "uxhcontext","context", "xhtml,uni-html4", " -cunihtf", "-cvalidate", + "uxh", "uxhxelatex", "xelatex", "xhtml,uni-html4", " -cunihtf", "-cvalidate", + "uxh", "uxhxetex", "xetex", "xhtml,uni-html4", " -cunihtf", "-cvalidate", "xhm", "xhmlatex", "latex", "xhtml,mathml", " -cunihtf", "-cvalidate", "xhm", "xhmtex", "tex", "xhtml,mathml", " -cunihtf", "-cvalidate", "xhm", "xhmtexi", "texi", "xhtml,mathml", " -cunihtf", "-cvalidate", "xhm", "xhmcontext","context", "xhtml,mathml", " -cunihtf", "-cvalidate", + "xhm", "xhmxelatex", "xelatex", "xhtml,mathml", " -cunihtf", "-cvalidate", + "xhm", "xhmxetex", "xetex", "xhtml,mathml", " -cunihtf", "-cvalidate", "mz", "mzlatex", "latex", "xhtml,mozilla", " -cmozhtf", "-cvalidate", "mz", "mztex", "tex", "xhtml,mozilla", " -cmozhtf", "-cvalidate", "mz", "mztexi", "texi", "xhtml,mozilla", " -cmozhtf", "-cvalidate", "mz", "mzcontext", "context", "xhtml,mozilla", " -cmozhtf", "-cvalidate", + "mz", "mzxelatex", "xelatex", "xhtml,mozilla", " -cmozhtf", "-cvalidate", + "mz", "mzxetex", "xetex", "xhtml,mozilla", " -cmozhtf", "-cvalidate", "oo", "oolatex", "latex", "xhtml,ooffice", "ooffice/\! -cmozhtf", "-cooxtpipes -coo", "oo", "ootex", "tex", "xhtml,ooffice", "ooffice/\! -cmozhtf", "-cooxtpipes -coo", "oo", "ootexi", "texi", "xhtml,ooffice", "ooffice/\! -cmozhtf", "-cooxtpipes -coo", "oo", "oocontext", "context", "xhtml,ooffice", "ooffice/\! -cmozhtf", "-cooxtpipes -coo", + "oo", "ooxelatex", "xelatex", "xhtml,ooffice", "ooffice/\! -cmozhtf", "-cooxtpipes -coo", + "oo", "ooxetex", "xetex", "xhtml,ooffice", "ooffice/\! -cmozhtf", "-cooxtpipes -coo", "es", "eslatex", "latex", "xhtml,emspk", " -cemspkhtf -s4es", "-cemspk", "es", "estex", "tex", "xhtml,emspk", " -cemspkhtf -s4es", "-cemspk", "es", "estexi", "texi", "xhtml,emspk", " -cemspkhtf -s4es", "-cemspk", "es", "escontext", "context", "xhtml,emspk", " -cemspkhtf -s4es", "-cemspk", + "es", "esxelatex", "xelatex", "xhtml,emspk", " -cemspkhtf -s4es", "-cemspk", + "es", "esxetex", "xetex", "xhtml,emspk", " -cemspkhtf -s4es", "-cemspk", "js", "jslatex", "latex", "xhtml,jsml", " -cjsmlhtf", "-cjsml", "js", "jstex", "tex", "xhtml,jsml", " -cjsmlhtf", "-cjsml", "js", "jstexi", "texi", "xhtml,jsml", " -cjsmlhtf", "-cjsml", "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf", "-cjsml", + "js", "jsxelatex", "xelatex", "xhtml,jsml", " -cjsmlhtf", "-cjsml", + "js", "jsxetex", "xetex", "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", "", + "jm", "jmxelatex", "xelatex", "xhtml,jsmath", " -cmozhtf", "", + "jm", "jmxetex", "xetex", "xhtml,jsmath", " -cmozhtf", "", "tei", "teilatex", "latex", "xhtml,tei", " -cunihtf", "-cvalidate", "tei", "teitex", "tex", "xhtml,tei", " -cunihtf", "-cvalidate", "tei", "teitexi", "texi", "xhtml,tei", " -cunihtf", "-cvalidate", @@ -70,6 +88,8 @@ my @options = ( "teim", "teimtex", "tex", "xhtml,tei-mml"," -cunihtf", "-cvalidate", "teim", "teimtexi", "texi", "xhtml,tei-mml"," -cunihtf", "-cvalidate", "teim", "teimcontext","context","xhtml,tei-mml"," -cunihtf", "-cvalidate", + "tei", "teixelatex", "xelatex", "xhtml,tei", " -cunihtf", "-cvalidate", + "tei", "teixetex", "xetex", "xhtml,tei", " -cunihtf", "-cvalidate", "db", "dblatex", "latex", "xhtml,docbook", " -cunihtf", "-cvalidate -cdocbk", "db", "dbtex", "tex", "xhtml,docbook", " -cunihtf", "-cvalidate -cdocbk", "db", "dbtexi", "texi", "xhtml,docbook", " -cunihtf", "-cvalidate -cdocbk", @@ -78,18 +98,26 @@ my @options = ( "dbm", "dbmtex", "tex", "xhtml,docbook-mml", " -cunihtf", "-cdocbk", "dbm", "dbmtexi", "texi", "xhtml,docbook-mml", " -cunihtf", "-cdocbk", "dbm", "dbmcontext","context", "xhtml,docbook-mml", " -cunihtf", "-cdocbk", + "db", "dbxelatex", "xelatex", "xhtml,docbook", " -cunihtf", "-cvalidate -cdocbk", + "db", "dbxetex", "xetex", "xhtml,docbook", " -cunihtf", "-cvalidate -cdocbk", "w", "wlatex", "latex", "xhtml,word", " -csymhtf", "", "w", "wtex", "tex", "xhtml,word", " -csymhtf", "", "w", "wtexi", "texi", "xhtml,word", " -csymhtf", "", "w", "wcontext", "context", "xhtml,word", " -csymhtf", "", + "w", "wxelatex", "xelatex", "xhtml,word", " -csymhtf", "", + "w", "wxetex", "xetex", "xhtml,word", " -csymhtf", "", "jh", "jhlatex", "latex", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml", "jh", "jhtex", "tex", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml", "jh", "jhtexi", "texi", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml", "jh", "jhcontext","context", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml", + "jh", "jhxelatex", "xelatex", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml", + "jh", "jhxetex", "xetex", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml", "jh1", "jh1latex", "latex", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp", "jh1", "jh1tex", "tex", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp", "jh1", "jh1texi", "texi", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp", "jh1", "jh1context","context", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp", + "jh1", "jh1xelatex", "xelatex", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp", + "jh1", "jh1xetex", "xetex", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp", ); @@ -100,10 +128,11 @@ sub showInstrucions(){ print " jhlatex, eslatex, teilatex, teimlatex, uxhlatex, \n"; print " wlatex, xhmlatex\n"; print " \n"; - print " also 'tex', 'texi', and 'context' instead of 'latex'\n"; + print " also 'tex', 'texi', 'context', 'xetex', and 'xelatex'\n"; + print " instead of 'latex'\n"; print " \n"; print " #2: file name\n"; - print " #3: optional arguments for latex/tex/texi/context \n"; + print " #3: optional arguments for latex/tex/... \n"; print " #4: optional arguments for tex4ht.c\n"; print " #5: optional arguments for t4ht.c\n"; print " \n"; @@ -134,7 +163,7 @@ print " \n"; print " name = type\n"; print " Defines a ht*tex like command, and assocites to it the \n"; print " TeX compiler of the specified type. Examples of TeX \n"; -print " types: latex, tex, texi, and context.\n"; +print " types: latex, tex, texi, context, xetex, and xelatex.\n"; print " \n"; print " name.tex = options\n"; print " Command line options for the compilation under\n"; @@ -182,7 +211,7 @@ print " clean.htlatex lg tmp\n"; } -print "mk4ht (2007-01-04-01:34)\n"; +print "mk4ht (2007-11-14-18:40)\n"; if( !@ARGV ){ print "improper command\n"; showInstrucions(); exit(1); @@ -318,7 +347,16 @@ if( $t4ht ){ $command[4] = $t4ht; } else { $command[4] = ""; } } $i++; } -my $commando = $command[0] . " " . $command[1] . " \"". +my $cmd; +open (KPSEA, "kpsewhich " . $command[0] . " |"); +if ($cmd = <KPSEA>){ + $cmd =~ s/\s+$//; +} else { + $cmd = $command[0]; +} +close KPSEA; + +my $commando = $cmd . " " . $command[1] . " \"". $command[2] . "\" \"". $command[3] . "\" \"" . $command[4] . "\""; print "$commando\n"; @@ -341,6 +379,6 @@ while ($file = readdir(DIR) ){ } } } } } closedir(DIR); - exit( !$rtrn ); } +exit( $rtrn ); diff --git a/Build/source/texk/tex4htk/mzcontext b/Build/source/texk/tex4htk/mzcontext index e95d48a0bf8..6dfef02089a 100755 --- a/Build/source/texk/tex4htk/mzcontext +++ b/Build/source/texk/tex4htk/mzcontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/mzlatex b/Build/source/texk/tex4htk/mzlatex index 44b90be5fb1..a7150329dcf 100755 --- a/Build/source/texk/tex4htk/mzlatex +++ b/Build/source/texk/tex4htk/mzlatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/mzmex b/Build/source/texk/tex4htk/mzmex index c4902dc6f6c..9d494659786 100755 --- a/Build/source/texk/tex4htk/mzmex +++ b/Build/source/texk/tex4htk/mzmex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/mztex b/Build/source/texk/tex4htk/mztex index 73ef76cc951..54899d65401 100755 --- a/Build/source/texk/tex4htk/mztex +++ b/Build/source/texk/tex4htk/mztex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/mztexexec b/Build/source/texk/tex4htk/mztexexec deleted file mode 100755 index bebc65d3500..00000000000 --- a/Build/source/texk/tex4htk/mztexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/mztexi b/Build/source/texk/tex4htk/mztexi index 8230839ddc3..a93e255429f 100755 --- a/Build/source/texk/tex4htk/mztexi +++ b/Build/source/texk/tex4htk/mztexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/oocontext b/Build/source/texk/tex4htk/oocontext index 56dae400751..9d8c4e28188 100755 --- a/Build/source/texk/tex4htk/oocontext +++ b/Build/source/texk/tex4htk/oocontext @@ -1,7 +1,7 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 -coo + t4ht -f/$1 $4 -cooxtpipes -coo diff --git a/Build/source/texk/tex4htk/oolatex b/Build/source/texk/tex4htk/oolatex index 85cf7371e00..3a2b670ac7a 100755 --- a/Build/source/texk/tex4htk/oolatex +++ b/Build/source/texk/tex4htk/oolatex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 -coo + t4ht -f/$1 $4 -cooxtpipes -coo diff --git a/Build/source/texk/tex4htk/oomex b/Build/source/texk/tex4htk/oomex index 651f2bfc497..3fcb9993565 100755 --- a/Build/source/texk/tex4htk/oomex +++ b/Build/source/texk/tex4htk/oomex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 -coo + t4ht -f/$1 $4 -cooxtpipes -coo diff --git a/Build/source/texk/tex4htk/ootex b/Build/source/texk/tex4htk/ootex index 3c6252c78e0..004b1ecbc35 100755 --- a/Build/source/texk/tex4htk/ootex +++ b/Build/source/texk/tex4htk/ootex @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 -coo + t4ht -f/$1 $4 -cooxtpipes -coo diff --git a/Build/source/texk/tex4htk/ootexexec b/Build/source/texk/tex4htk/ootexexec deleted file mode 100755 index aac89bab513..00000000000 --- a/Build/source/texk/tex4htk/ootexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 -coo - - - diff --git a/Build/source/texk/tex4htk/ootexi b/Build/source/texk/tex4htk/ootexi index bd11f4f93df..b79c4ba4b38 100755 --- a/Build/source/texk/tex4htk/ootexi +++ b/Build/source/texk/tex4htk/ootexi @@ -1,9 +1,9 @@ - +#!/bin/sh 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cmozhtf - t4ht -f/$1 $4 -coo + t4ht -f/$1 $4 -cooxtpipes -coo # texindex ? diff --git a/Build/source/texk/tex4htk/runht.c b/Build/source/texk/tex4htk/runht.c deleted file mode 100644 index aad6c3fb3b6..00000000000 --- a/Build/source/texk/tex4htk/runht.c +++ /dev/null @@ -1,860 +0,0 @@ -/* runht.c: routines to call tex4ht. - -Copyright (C) 2000 Fabrice POPINEAU. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include <kpathsea/config.h> -#include <kpathsea/lib.h> -#include <kpathsea/progname.h> -#include <kpathsea/c-dir.h> -#include <kpathsea/c-pathmx.h> -#include <kpathsea/getopt.h> -#include <kpathsea/tex-file.h> - -typedef enum { - MATH_BITMAP = 0, - MATH_BITMAP_UNICODE, - MATH_MATHML, - MATH_MOZILLA, - MATH_LAST -} math_type; - -typedef enum { - DTD_HTML = 0, - DTD_XHTML, - DTD_TEI, - DTD_DOCBOOK, - DTD_EBOOK, - DTD_HTML4WORD, - DTD_XHTML4WORD, - DTD_LAST -} dtd_type; - -char *stdcfg[MATH_LAST][DTD_LAST][4] = { - /* MATH_BITMAP */ - { - { "html", "", "alias,iso8859", "" }, /* HTML */ - { "xhtml", "", "alias,iso8859", "" }, /* XHTML */ - { "", "", "", "" }, /* TEI, INVALID */ - { "", "", "", ""}, /* DOCBOOK, INVALID */ - { "", "", "", ""}, /* EBOOK, INVALID */ - { "html,word", "", "symbol,alias,iso8859", "" }, /* HTML4WORD */ - { "xhtml,word", "", "symbol,alias,iso8859", "" }, /* XHTML4WORD */ - }, - /* MATH_BITMAP_UNICODE */ - { - { "html,uni-html4", "", "unicode", "" }, /* HTML */ - { "xhtml,uni-html4", "", "unicode", "" }, /* XHTML */ - { "xhtml,tei", "", "unicode", "" }, /* TEI */ - { "xhtml,docbook", "", "unicode", ""}, /* DOCBOOK */ - { "xhtml,ebmath", "-g.png", "unicode", ""}, /* EBOOK */ - { "", "", "", "" }, /* HTML4WORD, INVALID */ - { "", "", "", "" }, /* XHTML4WORD,INVALID */ - }, - /* MATH_MATHML */ - { - { "", "", "", "" }, /* HTML, INVALID */ - { "xhtml,mathml", "", "unicode", "" }, /* XHTML */ - { "xhtml,tei-mml", "", "unicode", "" }, /* TEI */ - { "xhtml,docbook-mml", "", "unicode", ""}, /* DOCBOOK */ - { "xhtml,ebook-mml", "-g.png", "unicode", ""}, /* EBOOK */ - { "", "", "", "" }, /* HTML4WORD, INVALID */ - { "", "", "", "" }, /* XHTML4WORD, INVALID */ - }, - /* MATH_MOZILLA */ - { - { "", "", "", "" }, /* HTML, INVALID */ - { "xhtml,mozilla", "", "mozilla,unicode", "" }, /* XHTML */ - { "", "", "", "" }, /* TEI, INVALID */ - { "", "", "", ""}, /* DOCBOOK, INVALID */ - { "", "", "", ""}, /* EBOOK, INVALID */ - { "", "", "", "" }, /* HTML4WORD, INVALID */ - { "", "", "", "" }, /* XHTML4WORD, INVALID */ - } -}; - -char *long_usage_string = "Usage: %s [options] file.tex [params1] [params2] [params3]\n\ -\toptions = --math=(bitmap|mathml)\n\ - --dtd=(html|xhtml|tei|docbook|ebook)\n\ - --mozilla\n\ - --unicode\n\ - --dbcs\n\ - --symbol\n\ - --msword\n\ - --output-dir=<dir>\n\ - --output-name=<name>\n\ - --index-file\n\ - --force\n\ - --dry-run\n\ - --cleanup\n\ - --help\n\ -\tparams1 = (html|xhtml|3.2|mathml.4ht|unicode.4ht|...)*\n\ -\tparams2 = symbol,unicode,...\n\ -\tparams3 = (-p)\n"; - -char *long_simple_usage_string = "Usage: %s [options] file.tex [\"t4ht params\"]\n\ -\toptions = --output-dir=<dir>\n\ - --output-name=<name>\n\ - --index-file\n\ - --force\n\ - --dry-run\n\ - --cleanup\n\ - --help\n\ -\tt4ht params = (-p|-i|...)\n"; - -char *runstr_simple = "%s %s %s"; - -char *runstr_tex = "tex %s \"\\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 %s.a.b.c.\\input %s\""; - -char *runstr_latex = "latex %s \"\\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 %s.a.b.c.\\input %s\""; - -char *runstr_texi = "tex %s \"\\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 %s.a.b.c.\\input %s\""; - -boolean force = false; /* Should we force LaTeX runs ? */ -boolean dry_run = false; /* Verbose trace */ -boolean cleanup = false; /* remove unused files */ -dtd_type dtd = DTD_HTML; -math_type math = MATH_BITMAP; -char *texargs = NULL; -char *output_dir = NULL; -char *output_name = NULL; -char *texfile = NULL; -char *texsrc = NULL; -char *texengine = NULL; -boolean opt_index = false; -boolean newdest = false; -boolean mozilla = false; -boolean dbcs = false; -boolean symbol = false; -boolean msword = false; -boolean unicode = false; -boolean is_ht = false; - -#define RUN_SYSTEM(x) \ - { int retcode = 0; \ - if (dry_run) \ - fprintf(stderr, "%s: running command:\n%s\n", progname, x); \ - else { \ - if ((retcode = system(x)) != 0) { \ - if (retcode == -1) \ - perror("system() failed"); \ - if (! force) \ - return retcode; \ - } \ - } \ - } - -#define TESTNZ(x) ((x != NULL) && (*(x) != 0)) -#define TESTZ(x) ((x == NULL) || (*(x) == 0)) - -#define OPT_FORCE 'f' -#define OPT_DRY_RUN 'r' -#define OPT_MOZILLA 'z' -#define OPT_MSWORD 'w' -#define OPT_UNICODE 'u' -#define OPT_DBCS 'd' -#define OPT_SYMBOL 's' -#define OPT_OUTPUT_DIR 'p' -#define OPT_OUTPUT_NAME 'o' -#define OPT_INDEX_FILE 'i' -#define OPT_DTD 't' -#define OPT_MATH 'm' -#define OPT_CLEANUP 'c' -#define OPT_HELP '?' - -const struct option long_options[] = -{ - "force", no_argument, 0, OPT_FORCE, - "dry-run", no_argument, 0, OPT_DRY_RUN, - "mozilla", no_argument, 0, OPT_MOZILLA, - "msword", no_argument, 0, OPT_MSWORD, - "unicode", no_argument, 0, OPT_UNICODE, - "dbcs", no_argument, 0, OPT_DBCS, - "symbol", no_argument, 0, OPT_SYMBOL, - "output-dir", required_argument, 0, OPT_OUTPUT_DIR, - "output-name", required_argument, 0, OPT_OUTPUT_NAME, - "index-file", no_argument, 0, OPT_INDEX_FILE, - "dtd", required_argument, 0, OPT_DTD, - "math", required_argument, 0, OPT_MATH, - "cleanup", no_argument, 0, OPT_CLEANUP, - "help", no_argument, 0, OPT_HELP, - 0, no_argument, 0, 0, -}; - -char cmd[4096]; -char *progname = NULL; -char cwd[MAXPATHLEN]; -char *ext_to_cleanup[] = { "log", "aux", "toc", "lof", "lot", "dvi", - "idv", "otc", "4ct", "4tc", "lg", "tmp", - "xref" }; - -void popd(); - -void do_cleanup() -{ - int i; - char *ext; - -#if defined(_WIN32) - WIN32_FIND_DATA find_file_data; - HANDLE hnd; - char *root = xstrdup(output_name); - int rootlen = strlen(root); - - if (rootlen > 4 && _stricmp(root + rootlen - 4, ".tex") == 0) - root[rootlen - 4] = '\0'; - rootlen = strlen(root); - - hnd = FindFirstFile("*", &find_file_data); - - while (hnd != INVALID_HANDLE_VALUE && - FindNextFile(hnd, &find_file_data) != FALSE) { - int len = strlen(find_file_data.cFileName); - - if (_strnicmp(find_file_data.cFileName, root, rootlen) != 0) - continue; - - if (newdest) { - if (dry_run) { - fprintf(stderr, "%s: cleaning up %s\n", progname, find_file_data.cFileName); - } - else { - if (unlink(find_file_data.cFileName) == -1) { - fprintf(stderr, "%s: can't remove %s\n", progname, find_file_data.cFileName); - perror(find_file_data.cFileName); - } - } - continue; - } - - for (i = 0, ext = ext_to_cleanup[0]; - i < sizeof(ext_to_cleanup)/sizeof(ext_to_cleanup[0]); - ext = ext_to_cleanup[++i]) { - if (stricmp(find_file_data.cFileName + len - strlen(ext), ext) != 0) - continue; - if (dry_run) { - fprintf(stderr, "%s: cleaning up %s\n", progname, find_file_data.cFileName); - } - else { - if (unlink(find_file_data.cFileName) == -1) { - fprintf(stderr, "%s: can't remove %s\n", progname, find_file_data.cFileName); - perror(find_file_data.cFileName); - } - } - } - } - FindClose(hnd); - -#else /* ! WIN32 */ - /* FIXME : adapt to what win32 is doing. */ - DIR *dp; - struct dirent *ep; - - if ((dp = opendir("."))) { - while ((ep = readdir(dp))) { - int len = strlen(ep->d_name); - if ((strlen(ep->d_name) < 4) || - (ep->d_name[len - 4] != '.')) - continue; - for (i = 0, ext = ext_to_cleanup[0]; - i < sizeof(ext_to_cleanup)/sizeof(ext_to_cleanup[0]); - ext = ext_to_cleanup[++i]) { - if (strcmp(ep->d_name[len - 3], ext) != 0) - continue; - if (dry_run) { - fprintf(stderr, "%s: cleaning up %s\n", progname, find_file_data.cFileName); - } - else { - if (unlink(find_file_data.cFileName) == -1) { - fprintf(stderr, "%s: can't remove %s\n", progname, find_file_data.cFileName); - perror(find_file_data.cFileName); - } - } - } - } - closedir(dp); - } - else - perror(path); -#endif /* WIN32 */ -} - -void mt_exit(int code) -{ -#if 0 - if (cwd) { - popd(); - } -#endif - - if (cleanup) { - if (dry_run) - fprintf(stderr, "%s: doing cleanup ...\n", progname); - else - do_cleanup(); - } - - if (newdest) { - DeleteFile(texfile); - } - - exit(code); -} - -#ifdef _WIN32 -BOOL sigint_handler(DWORD dwCtrlType) -{ - /* Fix me : there is a problem if a system() command is running. - We should wait for the son process to be interrupted. - Only way I can think of to do that : rewrite system() based on - spawn() with parsing of the command line and set a global pid - Next cwait(pid) in the HandlerRoutine. - */ - mt_exit(2); - return FALSE; /* return value mandatory */ -} -#else -void sigint_handler (int sig) -{ - mt_exit(2); -} -#endif - -#if 0 -/* pushd */ -void pushd(char *p) -{ - if (getcwd(cwd, MAXPATHLEN) == NULL) { - fprintf(stderr, "%s: pushd error, can't getcwd() !\n", progname); - perror(p); - exit(1); - } - - if (chdir(p) == -1) { - fprintf(stderr, "%s: pushd error, can't chdir() !\n", progname); - perror(p); - exit(1); - } -} - -/* popd */ -void popd() -{ - if (cwd == NULL || *cwd == '\0') { - fprintf(stderr, "%s: popd warning, cwd empty !\n", progname); - return; - } - - if (chdir(cwd) == -1) { - fprintf(stderr, "%s: popd warning, can't chdir() !\n", progname); - perror(cwd); - return; - } - - return; -} -#endif - -void usage() -{ - if (is_ht) { - fprintf(stderr, long_simple_usage_string, progname); - } - else { - fprintf(stderr, long_usage_string, progname); - } - exit(1); -} - -int ht(int argc, char *argv[]) -{ - int i; - - if (argc != 2 && argc != 3) { - usage(); - } - - sprintf(cmd, runstr_simple, texengine, texargs, texfile); - for (i = 0; i < 3; i++) - RUN_SYSTEM(cmd); - - sprintf(cmd, "tex4ht %s", output_name); - RUN_SYSTEM(cmd); - - if (TESTNZ(argv[2])) { - sprintf(cmd, "t4ht %s %s", output_name, argv[2]); - } - else { - sprintf(cmd, "t4ht %s", output_name); - } - - if (TESTNZ(output_dir)) { - strcat(cmd, " -d"); - strcat(cmd, output_dir); - } - - RUN_SYSTEM(cmd); - - return 0; -} - -int ht_engine(char *runstr, int argc, char *argv[]) -{ - int i; - - if (argc < 2 || argc > 5) { - usage(); - } - - sprintf(cmd, runstr, texargs, argv[2], texfile); - for (i = 0; i < 3; i++) - RUN_SYSTEM(cmd); - - if (TESTNZ(argv[3])) { - xputenv("TEX4HTFONTSET", argv[3]); - } - else { - xputenv("TEX4HTFONTSET", "alias,iso8859"); - } - - if (dry_run) { - fprintf(stderr, "TEX4HTFONTSET = %s\n", getenv("TEX4HTFONTSET")); - } - - sprintf(cmd, "tex4ht %s %s", stdcfg[math][dtd][1], output_name); - RUN_SYSTEM(cmd); - - if (TESTNZ(argv[4])) { - sprintf(cmd, "t4ht %s %s", output_name, argv[4]); - } - else { - sprintf(cmd, "t4ht %s", output_name); - } - - if (TESTNZ(output_dir)) { - strcat(cmd, " -d"); - strcat(cmd, output_dir); - } - - RUN_SYSTEM(cmd); - - return 0; -} - -char **addto_argv(char *arg, int *argc, char **argv, int *max_args) -{ - if (*argc == *max_args) { - max_args += 10; - argv = (char**)(realloc(argv, *max_args * sizeof(argv[0]))); - } - argv[ *argc++ ] = strdup(arg); - return argv; -} - -char **parse_arguments(int *argc, char *argv[]) -{ - int option_index = 0; - char c; - int maxargs = 0; - int i; - - char **newargv; - - optind = 0; - while ((c = getopt_long_only(*argc, argv, "", long_options, &option_index)) != EOF) { - switch (c) { - - case OPT_HELP: - usage(); - break; - - case OPT_DRY_RUN: - dry_run = true; - break; - - case OPT_FORCE: - force = true; - break; - - case OPT_DTD: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - if (_strcmpi(optarg, "html") == 0) { - dtd = DTD_HTML; - } - else if (_strcmpi(optarg, "xhtml") == 0) { - dtd = DTD_XHTML; - } - else if (_strcmpi(optarg, "tei") == 0) { - dtd = DTD_TEI; - } - else if (_strcmpi(optarg, "docbook") == 0) { - dtd = DTD_DOCBOOK; - } - else if (_strcmpi(optarg, "ebook") == 0) { - dtd = DTD_EBOOK; - } - else { - fprintf(stderr, "%s: invalid --dtd=%s option.\n", progname, optarg); - exit(1); - } - break; - - case OPT_MATH: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - if (_strcmpi(optarg, "bitmap") == 0) { - math = MATH_BITMAP; - } - else if (_strcmpi(optarg, "mathml") == 0) { - math = MATH_MATHML; - } - else { - fprintf(stderr, "%s: invalid --math=%s option.\n", progname, optarg); - exit(1); - } - break; - - case OPT_MSWORD: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - msword = true; - break; - - case OPT_MOZILLA: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - mozilla = true; - break; - - case OPT_UNICODE: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - unicode = true; - break; - - case OPT_DBCS: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - dbcs = true; - break; - - case OPT_SYMBOL: - if (is_ht) { - fprintf(stderr, "%s: wrong option, use `--help'.\n", progname); - exit(1); - } - symbol = true; - break; - - case OPT_OUTPUT_DIR: - output_dir = xstrdup(optarg); - if (!dir_p(optarg)) { - fprintf(stderr, "%s: can't output to directory %s\n", progname, optarg); - exit(1); - } - output_dir = xstrdup(optarg); - break; - - case OPT_OUTPUT_NAME: - output_name = xstrdup(optarg); - break; - - case OPT_INDEX_FILE: - opt_index = true; - break; - - case OPT_CLEANUP: - cleanup = true; - break; - - default: - usage(); - break; - } - } - - if (is_ht) { - texengine = argv[optind++]; - } - else { - texengine = argv[0]+2; - } - - newargv = (char **)malloc(5 * sizeof(char *)); - - newargv[0] = argv[0]; - /* shifting options from argv[] list */ - for (i = 1; optind < *argc; i++, optind++) - newargv[i] = argv[optind]; - newargv[i] = NULL; - *argc = i; - for (i = *argc; i < 5; i++) - newargv[i] = NULL; - - if (is_ht) { - /* Nothing else to do */ - } - else { - - if (dtd == DTD_TEI || dtd == DTD_EBOOK || dtd == DTD_DOCBOOK) { - if (math == MATH_BITMAP && ! unicode) { - fprintf(stderr, "%s: warning, TEI, eBook and DocBook dtds valid only with `--unicode' option.\nTurning on option `--unicode'.\n", progname); - unicode = true; - math = MATH_BITMAP_UNICODE; - } - else if (mozilla) { - fprintf(stderr, "%s: warning, `--mozilla' valid only with XHTML dtd. Ignored.\n", progname); - mozilla = false; - } - } - - if (dtd = DTD_HTML) { - if (math == MATH_MATHML) { - fprintf(stderr, "%s: warning, MathML incompatible with HTML dtd, reverting to bitmap math.\n", progname); - math = MATH_BITMAP; - } - if (mozilla) { - fprintf(stderr, "%s: warning, `--mozilla' valid only with XHTML dtd. Ignored.\n", progname); - mozilla = false; - } - } - - if (msword) { - if (dtd == DTD_HTML) { - dtd = DTD_HTML4WORD; - } - else if (dtd == DTD_XHTML) { - dtd = DTD_XHTML4WORD; - } - else { - fprintf(stderr, "%s: error, `--msword' incompatible with dtds other than HTML or XHTML. Exiting...\n", progname); - mt_exit(1); - } - if (unicode) { - fprintf(stderr, "%s: warning, `--unicode' incompatible with `--msword'. Exiting...\n", progname); - mt_exit(1); - } - if (math == MATH_MATHML) { - fprintf(stderr, "%s: warning, MathML incompatible with `--msword'. Exiting...\n", progname); - mt_exit(1); - } - if (mozilla) { - fprintf(stderr, "%s: warning, `--mozilla' incompatible with `--msword'. Exiting...\n", progname); - mt_exit(1); - } - } - - if (math == MATH_BITMAP && unicode) - math = MATH_BITMAP_UNICODE; - - if (TESTNZ(newargv[2])) - newargv[2] = concat3(newargv[2], ",", stdcfg[math][dtd][0]); - else - newargv[2] = stdcfg[math][dtd][0]; - - if (TESTNZ(newargv[3])) - newargv[3] = concat3(newargv[3], ",", stdcfg[math][dtd][2]); - else - newargv[3] = stdcfg[math][dtd][2]; - - if (dbcs) - newargv[3] = concat("dbcs,", newargv[3]); - if (symbol) - newargv[3] = concat("symbol,", newargv[3]); - - if (*argc < 4) - *argc = 4; - } - return newargv; -} - -int main(int argc, char *argv[]) -{ - int i; - int retval = 0; - - kpse_set_progname(argv[0]); - progname = xstrdup(program_invocation_short_name); - -#ifdef _WIN32 - SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigint_handler, TRUE); -#else -# ifdef SIGHUP - signal (SIGHUP, sigint_handler); -# endif -# ifdef SIGINT - signal (SIGINT, sigint_handler); -# endif -# ifdef SIGQUIT - signal (SIGQUIT, sigint_handler); -# endif -# ifdef SIGEMT - signal (SIGEMT, sigint_handler); -# endif -# ifdef SIGPIPE - signal (SIGPIPE, sigint_handler); -# endif -# ifdef SIGTERM - signal (SIGTERM, sigint_handler); -# endif -#endif - - if (strlen(progname) > 4 && FILESTRNCASEEQ(progname + strlen(progname) - 4, ".exe", 4)) { - *(progname + strlen(progname) - 4) = '\0'; - } - is_ht = FILESTRCASEEQ(progname, "ht"); - - argv = parse_arguments(&argc, argv); - -#if 0 - fprintf(stderr, "%s:\n", progname); - for (i = 1; i < argc; i++) - fprintf(stderr, "\t argv[%d] = %s\n", i, argv[i]); - fprintf(stderr, "\nconfig(%d,%d) = ", math, dtd); - for (i = 0; i < 3; i++) - fprintf(stderr, "%s ", stdcfg[math][dtd][i]); - fprintf(stderr, "\n"); -#endif - - texargs = (force ? "--interaction=nonstopmode" : ""); - - if (TESTZ(argv[1])) { - fprintf(stderr, "%s: error, no file specified.\n", progname); - exit(1); - } - - texsrc = xstrdup(argv[1]); - -#if 0 - /* Rely on latex / kpathsea to find the right source file. */ - if ((strlen(texsrc) < 4) - || _strnicmp(texsrc + strlen(texsrc) - 4, ".tex", 4) != 0) { - texsrc = concat(texsrc, ".tex"); - } -#endif - - texfile = xstrdup(texsrc); - - if ((strlen(texfile) >= 4) - && _strnicmp(texfile + strlen(texfile) - 4, ".tex", 4) == 0) { - *(texfile + strlen(texfile) - 4) = '\0'; - } - - if (TESTZ(output_name)) { - output_name = xstrdup(texfile); - } - else { - if ((strlen(output_name) >= 4) - && _strnicmp(output_name + strlen(output_name) - 4, ".tex", 4) == 0) { - *(output_name + strlen(output_name) - 4) = '\0'; - } - texargs = concat3(texargs, " --jobname=", output_name); - } - -#if 0 - // copy the original name to output name if needed - if (TESTNZ(output_dir)) { - texfile = concat3(output_dir, "\\", output_name); - } - else if (TESTNZ(output_name)) { - texfile = xstrdup(output_name); - } - else - texfile = NULL; - - if (texfile) { - unixtodos_filename(texfile); - - if (dry_run) { - fprintf(stderr, "%s: copying %s to %s\n", progname, texsrc, texfile); - } - else { - if (CopyFile(texsrc, texfile, false) == 0) { - fprintf(stderr, "%s: failed to copy %s to %s (Error %d)\n", - progname, texsrc, texfile, GetLastError()); - } - } - free(texfile); - } - - texfile = xstrdup(output_name); - - if (TESTNZ(output_dir)) { - pushd(output_dir); - xputenv("KPSE_DOT", cwd); - xputenv("TEXINPUTS", concatn(cwd, "/", output_dir, ";", NULL)); - if (dry_run) { - fprintf(stderr, "%s: changing directory to %s\n", progname, output_dir); - fprintf(stderr, "%s: setting KPSE_DOT to %s\n", progname, cwd); - } - } -#endif - if (is_ht) { - retval = ht(argc, argv); - } - else if (FILESTRCASEEQ(progname, "httex")) { - retval = ht_engine(runstr_tex, argc, argv); - } - else if (FILESTRCASEEQ(progname, "htlatex")) { - retval = ht_engine(runstr_latex, argc, argv); - } - else if (FILESTRCASEEQ(progname, "httexi")) { - retval = ht_engine(runstr_texi, argc, argv); - } - else { - fprintf(stderr, "%s: %s is unknown, aborting.\n", argv[0], progname); - retval = 1; - } - - if (opt_index) { - /* copy dest_dir/output_name.html to dest_dir/index.html */ - char *destfile = output_name; - char *indexfile = "index.html"; - - if (TESTNZ(output_dir)) { - destfile = concat3(output_dir, "\\", output_name); - indexfile = concat(output_dir, "\\index.html"); - } - - if ((strlen(destfile) < 5) - || _strnicmp(destfile + strlen(destfile) - 5, ".html", 5) != 0) { - destfile = concat(destfile, ".html"); - } - - if (CopyFile(destfile, indexfile, false) == 0) { - fprintf(stderr, "%s: failed to copy %s to %s (Error %d)\n", - progname, destfile, indexfile, GetLastError()); - } - } - - mt_exit(retval); - - /* Not Reached */ - return retval; -} diff --git a/Build/source/texk/tex4htk/t4ht.c b/Build/source/texk/tex4htk/t4ht.c index cc69ab3bffd..31b91e37582 100644 --- a/Build/source/texk/tex4htk/t4ht.c +++ b/Build/source/texk/tex4htk/t4ht.c @@ -1,7 +1,7 @@ /**********************************************************/ -/* t4ht.c 2007-01-05-03:17 */ -/* Copyright (C) 1998--2007 Eitan M. Gurari */ +/* t4ht.c 2008-02-25-18:56 */ +/* Copyright (C) 1998--2008 Eitan M. Gurari */ /* */ /* This work may be distributed and/or modified under the */ /* conditions of the LaTeX Project Public License, either */ @@ -381,6 +381,9 @@ struct script_struct{ static int eoln_ch; +static BOOL check_tex4ht_c_err = FALSE; + + static Q_CHAR *ch_mod = Q_NULL; static Q_CHAR *debug = Q_NULL; static Q_CHAR *Xfield = Q_NULL; @@ -445,10 +448,12 @@ static C_CHAR *warn_err_mssg[]={ " -d... directory for output files (default: current)\n" " -e... location of tex4ht.env\n" " -i debugging info\n" +" -g ignore errors in system calls\n" " -m... chmod ... of new output files (reused bitmaps excluded)\n" " -p don't convert pictures (default: convert)\n" " -r replace bitmaps of all glyphs (default: reuse old ones)\n" " -M... chmod ... of all output files\n" +" -Q quit, if tex4ht.c had problems\n" " -S... permission for system calls: *-always, filter\n" " -X... content for field %%3 in X scripts\n" " -.... content for field %%2 in . scripts\n\n" @@ -476,6 +481,9 @@ static int system_return; static BOOL system_yes; +static BOOL always_call_sys = FALSE; + + static Q_CHAR* match[10]; static int max_match[10]; @@ -608,9 +616,9 @@ static char * abs_addr #undef SEP #endif { U_CHAR *p; - p = m_alloc(char, (int) strlen( dir ) + - (base? (int) strlen( base ):0) + - (int) strlen( HOME_DIR )); + p = m_alloc(char, (int) strlen((char *) dir ) + + (base? (int) strlen((char *) base ):0) + + (int) strlen((char *) HOME_DIR )); *p = '\0'; if( (*(dir+1) == '~') && base ){ if( *base == '~' ){ @@ -850,7 +858,7 @@ static BOOL strpre #undef SEP #endif { int i; - for( i=0; i < (int) strlen(s1); i++){ + for( i=0; i < (int) strlen((char *) s1); i++){ if( *(s1+i) != *(s2+i) ){ return FALSE; } } return TRUE; @@ -915,14 +923,15 @@ char *get_env_dir { int i; Q_CHAR *p; if(! progname || ! *progname) return NULL; - i = (int) strlen(progname); + i = (int) strlen((char *) progname); while( (progname[--i] != (int) dir_path_slash(progname) ) && i > 0) ; if(i == 0) return NULL; p = (Q_CHAR *) malloc(i+12); if(p == NULL) return NULL; strncpy(p, progname, i+1); - (IGNORED) strcpy(&p[i+1],"tex4ht.env"); + (IGNORED) strcpy((char *) &p[i+1], + (char *) "tex4ht.env"); return p; } @@ -976,7 +985,7 @@ static FILE* f_home_open U_CHAR *str; if( *name == '~' ){ if( HOME_DIR ){ - str = m_alloc(char, strlen(HOME_DIR)+strlen(name)); + str = m_alloc(char, strlen((char *) HOME_DIR)+strlen((char *) name)); (IGNORED) sprintf(str,"%s%s", HOME_DIR, name+1); file = f_open(str,flags); free((void *) str); @@ -1004,14 +1013,14 @@ static FILE* open_file { FILE* file; C_CHAR filename[255], *p; if( eq_str( ext,LG_EXT ) ) { - (IGNORED) strcpy(filename,job_name); + (IGNORED) strcpy((char *) filename, (char *) job_name); (IGNORED) strct(filename, ext); } else { - (IGNORED) strcpy( filename,name ); + (IGNORED) strcpy((char *) filename, (char *) name ); p = filename; while( TRUE ){ if( *p == '.' ){ break; } - if( *p == '\0' ){ (IGNORED) strcpy(p, ext); break; } + if( *p == '\0' ){ (IGNORED) strcpy((char *) p, (char *) ext); break; } p++; } } @@ -1171,6 +1180,7 @@ static void call_sys system_return = system_yes? (int) system(command) : -1; (IGNORED) printf("%sSystem return: %d\n", system_return? "--- Warning --- " : "", system_return ); + if( always_call_sys ){ system_return = 0; } } } @@ -1195,8 +1205,8 @@ static void strct #undef SEP #endif { Q_CHAR * ch; - ch = str1 + (int) strlen(str1); - (IGNORED) strcpy( ch, str2 ); + ch = str1 + (int) strlen((char *) str1); + (IGNORED) strcpy((char *) ch, (char *) str2 ); } @@ -1303,7 +1313,7 @@ static BOOL scan_until_end_str i++; } p[i] = '\0'; - i -= (int) strlen(str); + i -= (int) strlen((char *) str); if( i>= 0 ){ return eq_str(p+i,str); } return FALSE; } @@ -1343,7 +1353,7 @@ static BOOL scan_until_str r_alloc((void *) match[n], (size_t) max_match[n]); } p[i++] = ch; - j = i - (int) strlen(str); + j = i - (int) strlen((char *) str); if( j>= 0 ){ p[i] = '\0'; if( eq_str(p+j,str) ) { return TRUE; } @@ -1448,15 +1458,15 @@ SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigint_handler, TRUE); (IGNORED) printf("----------------------------\n"); #ifndef KPATHSEA #ifdef PLATFORM - (IGNORED) printf("t4ht.c (2007-01-05-03:17 %s)\n",PLATFORM); + (IGNORED) printf("t4ht.c (2008-02-25-18:56 %s)\n",PLATFORM); #else - (IGNORED) printf("t4ht.c (2007-01-05-03:17)\n"); + (IGNORED) printf("t4ht.c (2008-02-25-18:56)\n"); #endif #else #ifdef PLATFORM - (IGNORED) printf("t4ht.c (2007-01-05-03:17 %s kpathsea)\n",PLATFORM); + (IGNORED) printf("t4ht.c (2008-02-25-18:56 %s kpathsea)\n",PLATFORM); #else - (IGNORED) printf("t4ht.c (2007-01-05-03:17 kpathsea)\n"); + (IGNORED) printf("t4ht.c (2008-02-25-18:56 kpathsea)\n"); #endif #endif @@ -1469,8 +1479,8 @@ SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigint_handler, TRUE); int cnt; int len = 0; for( cnt=i; cnt < argc; cnt++ ){ - len += (int) strlen(argv[cnt]); - if( *(argv[cnt] + (int) strlen(argv[cnt]) -1) == *p ){ + len += (int) strlen((char *) argv[cnt]); + if( *(argv[cnt] + (int) strlen((char *) argv[cnt]) -1) == *p ){ Q_CHAR * arg = m_alloc(char, len + cnt - i + 1); Q_CHAR * toArg = arg; Q_CHAR *pp; @@ -1536,8 +1546,16 @@ system( yes ) != 0 if( argc == 1 ){ bad_arg; } for(i=1; i<argc; i++){ if( *( p=argv[i] ) == '-' ){ -if( (int) strlen( argv[i] ) == 2 ){ - if( (*(p+1)!='i') && (*(p+1) != 'p') && (*(p+1) != 'r') && (*(p+1) != 'b') ) +if( (int) strlen((char *) argv[i] ) == 2 ){ + if( + (*(p+1) != 'i') +&& (*(p+1) != 'p') +&& (*(p+1) != 'r') +&& (*(p+1) != 'b') +&& (*(p+1) != 'g') +&& (*(p+1) != 'Q') + + ) { if( ++i == argc ) bad_arg; } q = argv[i]; } else q = p+2; @@ -1569,14 +1587,16 @@ tex4ht_env_file = q; break; } case 'f':{ p = p + 2; -lg_name = p + (int) strlen( p ); +lg_name = p + (int) strlen((char *) p ); while( *lg_name != *p ){ lg_name--; } lg_name++; break; } case 'i':{ debug = q-1; break;} + case 'g':{ always_call_sys = TRUE; break;} case 'm':{ ch_mod = q; break; } case 'p':{ nopict = q-1; break;} + case 'Q':{ check_tex4ht_c_err = TRUE; break;} case 'r':{ noreuse = q-1; break;} case '.':{ Dotfield = q; break;} default:{ bad_arg; } @@ -1590,8 +1610,8 @@ lg_name++; { Q_CHAR *p, *q; FILE* file; - (IGNORED) strcpy( tmp_name, lg_name); - p = q = tmp_name + strlen( tmp_name ); + (IGNORED) strcpy((char *) (char *) tmp_name, (char *) (char *) lg_name); + p = q = tmp_name + strlen((char *) tmp_name ); while( p != tmp_name ){ if( *p == '.' ){ if( eq_str( p+1,LG_EXT ) ) { *p = '\0'; } @@ -1611,8 +1631,8 @@ lg_name++; -(IGNORED) strcpy( job_name, tmp_name); -*(job_name + strlen(job_name) - 4) = '\0'; +(IGNORED) strcpy((char *) job_name, (char *) tmp_name); +*(job_name + strlen((char *) job_name) - 4) = '\0'; } @@ -1636,7 +1656,7 @@ if( tex4ht_env_file ){ file = NULL; } if( tex4ht_env_file ){ - (IGNORED) strcpy(&env_loc[0],tex4ht_env_file); + (IGNORED) strcpy((char *) &env_loc[0], (char *) tex4ht_env_file); } if( debug && file ){ (IGNORED) printf(".......Open: %s\n", tex4ht_env_file); } @@ -1648,7 +1668,7 @@ if( !file ) { (IGNORED) printf("tex4ht.env?\n"); } file = f_open("tex4ht.env", READ_TEXT_FLAGS); - (IGNORED) strcpy(&env_loc[0],"tex4ht.env"); + (IGNORED) strcpy((char *) &env_loc[0], (char *) "tex4ht.env"); if( debug && file ){ (IGNORED) printf(".......Open: ./tex4ht.env\n"); } } @@ -1661,7 +1681,7 @@ if( !file ) { (IGNORED) printf(".tex4ht?\n"); } file = f_open(".tex4ht", READ_TEXT_FLAGS); - (IGNORED) strcpy(&env_loc[0],".tex4ht"); + (IGNORED) strcpy((char *) &env_loc[0], (char *) ".tex4ht"); if( debug && file ){ (IGNORED) printf(".......Open: ./.tex4ht\n"); } } @@ -1694,7 +1714,7 @@ if( !file ){ (IGNORED) printf("%s?\n", str); } file = f_open(str,READ_TEXT_FLAGS); - (IGNORED) strcpy(&env_loc[0],str); + (IGNORED) strcpy((char *) &env_loc[0], (char *) str); if( debug && file ){ (IGNORED) printf(".......Open: %s\n", str); } } @@ -1707,7 +1727,7 @@ if( !file ){ (IGNORED) printf("%s?\n", str); } file = f_open(str,READ_TEXT_FLAGS); - (IGNORED) strcpy(&env_loc[0],str); + (IGNORED) strcpy((char *) &env_loc[0], (char *) str); if( debug && file ){ (IGNORED) printf(".......Open: %s\n", str); } } @@ -1719,7 +1739,7 @@ if( !file ){ (IGNORED) printf("C:/tex4ht.env?\n"); } file = f_open("C:/tex4ht.env",READ_TEXT_FLAGS); - (IGNORED) strcpy(&env_loc[0],"C:/tex4ht.env"); + (IGNORED) strcpy((char *) &env_loc[0], (char *) "C:/tex4ht.env"); if( debug && file ){ (IGNORED) printf(".......Open: C:/tex4ht.env\n"); } } @@ -1733,7 +1753,7 @@ if( !file ){ (IGNORED) printf("%s?\n", ENVFILE); } file = f_home_open( ENVFILE,READ_TEXT_FLAGS); - (IGNORED) strcpy(&env_loc[0],ENVFILE); + (IGNORED) strcpy((char *) &env_loc[0], (char *) ENVFILE); if( debug && file ){ (IGNORED) printf(".......Open: %s\n", ENVFILE); } } @@ -1746,7 +1766,7 @@ if( dos_env_file ){ (IGNORED) printf("%s?\n", dos_env_file); } file = f_open( dos_env_file, READ_TEXT_FLAGS ) ; - (IGNORED) strcpy(&env_loc[0],dos_env_file); + (IGNORED) strcpy((char *) &env_loc[0], (char *) dos_env_file); if( debug && file ){ (IGNORED) printf(".......Open: %s\n", dos_env_file); } } @@ -1952,14 +1972,14 @@ if( envChoice == (struct env_c_rec*) 0 ){ if( debug ){ (IGNORED) printf("....... <%s> skipping ...\n", match[1]); } -(IGNORED) strcpy( cur_block, match[1]); +(IGNORED) strcpy((char *) cur_block, (char *) match[1]); status = FALSE; while( !status && (eoln_ch != EOF) ){ status = scan_str("</", TRUE, file); status = scan_until_str(">", 1, status, file); status = scan_until_end_str("", 2, status, file); if( status ){ - *(match[1] + strlen(match[1]) - 1) = '\0'; + *(match[1] + strlen((char *) match[1]) - 1) = '\0'; status = eq_str(match[1], cur_block); if( debug ){ (IGNORED) printf("....... </%s>\n", match[1]); @@ -1996,6 +2016,26 @@ begin_lg_file = ftell(lg_file); ); +if( check_tex4ht_c_err ){ + eoln_ch = (int) 'x'; + while( eoln_ch != EOF ) { + status = scan_str("tex4ht.c error: ", TRUE, lg_file); + if( status ){ + (IGNORED) fprintf(stderr, + "--- Error --- tex4ht.c ran into problems\n" + ); + exit(EXIT_FAILURE); + } + status = scan_until_end_str("", 1, status, lg_file); +} } + + + +(IGNORED) fseek(lg_file, begin_lg_file, +0 +); + + { Q_CHAR *file_name, file_mode[5]; int i, start_loc, end_loc, addr; @@ -2044,8 +2084,8 @@ if( rec_op != No_op ){ } else { file_name = match[1]; -*(file_name + (int) strlen(file_name) - 1) = '\0'; -strcpy(file_mode, WRITE_TEXT_FLAGS); +*(file_name + (int) strlen((char *) file_name) - 1) = '\0'; +strcpy((char *) file_mode, (char *) WRITE_TEXT_FLAGS); for(i=1; i<=2; i++){ for( p = opened_files; p != (struct files_rec*) 0; p = p->right ){ @@ -2055,9 +2095,9 @@ if( p == (struct files_rec*) 0 ){ p = m_alloc(struct files_rec, 1); p->right = opened_files; opened_files = p; p->down = (struct files_rec*) 0; - strcpy(p->file_mode,file_mode); - p->name = m_alloc(char, (int) strlen(file_name) + 1); - (IGNORED) strcpy( p->name, file_name ); + strcpy((char *) p->file_mode, (char *) file_mode); + p->name = m_alloc(char, (int) strlen((char *) file_name) + 1); + (IGNORED) strcpy((char *) p->name, (char *) file_name ); if( (p->file = fopen(file_name, file_mode)) == NULL ) { (IGNORED) warn_i_str(5,file_name); } } @@ -2065,7 +2105,7 @@ to_rec = from_rec; from_rec = p; file_name = match[5]; - strcpy(file_mode, + strcpy((char *) file_mode, (char *) READ_BIN_FLAGS ); @@ -2119,8 +2159,8 @@ p->file = to_rec->file; p->from_rec = from_rec; p->loc = -1; p->op = No_op; -p->group = m_alloc(char, (int) strlen(match[3]) + 1); -(IGNORED) strcpy( p->group, match[3] ); +p->group = m_alloc(char, (int) strlen((char *) match[3]) + 1); +(IGNORED) strcpy((char *) p->group, (char *) match[3] ); to_rec = p; @@ -2140,8 +2180,8 @@ p->name = to_rec->name; p->file = to_rec->file; p->from_rec = from_rec; p->loc = -1; -p->group = m_alloc(char, (int) strlen(match[3]) + 1); -(IGNORED) strcpy( p->group, match[3] ); +p->group = m_alloc(char, (int) strlen((char *) match[3]) + 1); +(IGNORED) strcpy((char *) p->group, (char *) match[3] ); to_rec = p; @@ -2155,7 +2195,7 @@ p->up = to_rec; if( p->down != (struct files_rec*) 0 ){ (p->down)->up = p; } -*(match[4] + (int) strlen(match[4]) - 1) = '\0'; +*(match[4] + (int) strlen((char *) match[4]) - 1) = '\0'; p->loc = (int) get_long_int(match[4]); p->op = rec_op; p->label = addr; @@ -2327,7 +2367,7 @@ if( status ){ while( *body && (*body != ' ') ){ body++; } if( *body == ' ' ){ media = body; *(body++) = '\0'; } -if( (int) strlen(body) > 6 ){ +if( (int) strlen((char *) body) > 6 ){ if( (*(body) == '@') && (*(body+1) == 'm') && (*(body+2) == 'e') @@ -2348,12 +2388,12 @@ if( *body ){ if( *key ){ p = m_alloc(struct htf_struct, 1); p->next = (struct htf_struct *) 0; -p->key = m_alloc(char, (int) strlen(key) + 1); -(IGNORED) strcpy( p->key, key ); -p->media = m_alloc(char, (int) strlen(media) + 1); -(IGNORED) strcpy( p->media, media ); -p->body = m_alloc(char, (int) strlen(body) + 1); -(IGNORED) strcpy( p->body, body ); +p->key = m_alloc(char, (int) strlen((char *) key) + 1); +(IGNORED) strcpy((char *) p->key, (char *) key ); +p->media = m_alloc(char, (int) strlen((char *) media) + 1); +(IGNORED) strcpy((char *) p->media, (char *) media ); +p->body = m_alloc(char, (int) strlen((char *) body) + 1); +(IGNORED) strcpy((char *) p->body, (char *) body ); if( last_rec ){ last_rec->next = p; last_rec = p; } else { @@ -2366,8 +2406,8 @@ if( debug ){ } else if( last_rec ){ last_rec->body = (Q_CHAR *) r_alloc((void *) last_rec->body, - (size_t) strlen(last_rec->body) - + (size_t) strlen(body) + (size_t) strlen((char *) last_rec->body) + + (size_t) strlen((char *) body) + 2); (IGNORED) strct(last_rec->body,"\n"); (IGNORED) strct(last_rec->body,body); @@ -2396,17 +2436,17 @@ while( eoln_ch != EOF ) { status = scan_until_end_str("", 2, status, lg_file); if( status ){ Q_CHAR *key; key = match[1]; - *(key + (int) strlen(key) - 1) = '\0'; + *(key + (int) strlen((char *) key) - 1) = '\0'; if( (*key != '\0') && (*key != '\n') ) { struct htf_struct *p; p = m_alloc(struct htf_struct, 1); p->next = htf_rec; htf_rec = p; - p->key = m_alloc(char, (int) strlen(key) + 1); - (IGNORED) strcpy( p->key, key ); - p->body = m_alloc(char, (int) strlen(match[2]) + 1); - (IGNORED) strcpy( p->body, match[2] ); + p->key = m_alloc(char, (int) strlen((char *) key) + 1); + (IGNORED) strcpy((char *) p->key, (char *) key ); + p->body = m_alloc(char, (int) strlen((char *) match[2]) + 1); + (IGNORED) strcpy((char *) p->body, (char *) match[2] ); if( debug ){ (IGNORED) printf(".......%s...%s\n", key, match[2]); } } @@ -2478,7 +2518,7 @@ status = scan_until_str(".idv", 1, status, lg_file); status = scan_until_str("[", 2, status, lg_file); status = scan_until_str("] ==> ", 2, status, lg_file); status = scan_until_str(" ", 3, status, lg_file); - *(match[3] + (int) strlen(match[3]) - 1) = '\0'; + *(match[3] + (int) strlen((char *) match[3]) - 1) = '\0'; status = scan_until_end_str("---", 4, status, lg_file); if( status ) { @@ -2490,12 +2530,12 @@ struct script_struct Q_CHAR *p; gif_i = get_long_int(match[2]); p = match[2]; - *(p + (int) strlen(p) - 6) = '\0'; + *(p + (int) strlen((char *) p) - 6) = '\0'; if( characters ){ Q_CHAR filename[255]; FILE* file; -(IGNORED) strcpy(filename, ""); +(IGNORED) strcpy((char *) filename, (char *) ""); if( dir && !bitmaps_no_dm ){ (IGNORED) strct(filename, dir); } (IGNORED) strct(filename, match[3]); file = fopen(filename, READ_TEXT_FLAGS); @@ -2606,7 +2646,7 @@ if( status ){ FILE *css_file, *tmp_file; BOOL css_sty; -(IGNORED) strcpy( css_name, job_name); +(IGNORED) strcpy((char *) css_name, (char *) job_name); (IGNORED) strct(css_name, ".css"); css_file = fopen(css_name, READ_TEXT_FLAGS); @@ -2671,7 +2711,7 @@ while( eoln_ch != EOF ) { status = scan_until_end_str("", 2, status, lg_file); if( status ){ Font_css_base = match[1]; - *(Font_css_base + (int) strlen(Font_css_base) - 14) = '\0'; + *(Font_css_base + (int) strlen((char *) Font_css_base) - 14) = '\0'; match[1] = (Q_CHAR *) malloc(70); max_match[1] = 70; Font_css_mag = match[2]; match[2] = (Q_CHAR *) malloc(70); max_match[2] = 70; @@ -2711,13 +2751,13 @@ while( eoln_ch != EOF ) { struct htf_struct *font_sty; int second; p = match[1]; - *(p + (int) strlen(p) - 3) = '\0'; + *(p + (int) strlen((char *) p) - 3) = '\0'; p = match[2]; - *(p + (int) strlen(p) - 3) = '\0'; + *(p + (int) strlen((char *) p) - 3) = '\0'; p = match[3]; - *(p + (int) strlen(p) - 3) = '\0'; + *(p + (int) strlen((char *) p) - 3) = '\0'; p = match[4]; - *(p + (int) strlen(p) - 2) = '\0'; + *(p + (int) strlen((char *) p) - 2) = '\0'; { Q_CHAR *p; second = (int) @@ -2731,6 +2771,17 @@ while( eoln_ch != EOF ) { if( (*p < '0') || (*p > '9') ){ second = 100; break; } p++; } + +if( (int) ( (double) get_long_int(match[2]) + / (int) get_long_int(match[4]) + + 0.5 + ) + == base_font_size +){ + second = 100; +}; + + } @@ -2913,7 +2964,7 @@ ext_script struct script_struct *cur_script; ext = match[1]; (IGNORED) strct( ext, match[2] ); - ext += strlen(ext); + ext += strlen((char *) ext); while( *(--ext) != '.' ){ ; } *ext = '\0'; ext++; @@ -2927,7 +2978,7 @@ ext_script add = cur_script = NULL_SCRIPT; while( cur ){ -(IGNORED) strcpy(extPlus, ext); +(IGNORED) strcpy((char *) extPlus, (char *) ext); /* if ( envChoice ) { (IGNORED) strct ( extPlus, envChoice ); @@ -2940,9 +2991,10 @@ ext_script temp = (struct script_struct *) m_alloc(struct script_struct, (int) 1); -temp->command = m_alloc(char, (int) strlen(cur->command) + 1); +temp->command = m_alloc(char, (int) strlen((char *) cur->command) + 1); temp->next = NULL_SCRIPT; -(IGNORED) strcpy(temp->command, cur->command + (int) strlen(extPlus) ); +(IGNORED) strcpy((char *) temp->command, + (char *) cur->command + (int) strlen((char *) extPlus) ); if( cur_script == NULL_SCRIPT ){ @@ -2984,7 +3036,7 @@ file_script if( status ){ Q_CHAR *p; p = match[1]; (IGNORED) strct( p, match[2] ); - p += strlen(p); + p += strlen((char *) p); while( *(--p) != '.' ){ ; } *p = '\0'; p++; (void) execute_script(file_script, match[1], @@ -3038,17 +3090,17 @@ while( eoln_ch != EOF ) { Q_CHAR *command, ch; status = scan_until_str("\" ---", 2, status, lg_file); if( status ){ command = match[2]; - *(command + (int) strlen(command) - 5) = '\0'; + *(command + (int) strlen((char *) command) - 5) = '\0'; flag = FALSE; p = system_calls; while( p ){ - if( (n = (int) strlen(p->filter)) == 1 ) { + if( (n = (int) strlen((char *) p->filter)) == 1 ) { if( *(p->filter) == '*' ){ flag = TRUE; break; } } - if( strlen(command) >= (unsigned int) n ) { + if( strlen((char *) command) >= (unsigned int) n ) { ch = command[n]; command[n] = '\0'; flag = flag || eq_str(p->filter,command); command[n] = ch; diff --git a/Build/source/texk/tex4htk/teicontext b/Build/source/texk/tex4htk/teicontext index 1ebfaab47f4..0bbfd358742 100755 --- a/Build/source/texk/tex4htk/teicontext +++ b/Build/source/texk/tex4htk/teicontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/teilatex b/Build/source/texk/tex4htk/teilatex index c18bec0291e..43910cc5235 100755 --- a/Build/source/texk/tex4htk/teilatex +++ b/Build/source/texk/tex4htk/teilatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teimcontext b/Build/source/texk/tex4htk/teimcontext index 1ebfaab47f4..0bbfd358742 100755 --- a/Build/source/texk/tex4htk/teimcontext +++ b/Build/source/texk/tex4htk/teimcontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/teimex b/Build/source/texk/tex4htk/teimex index d43a950ef5b..316a4c1b3b4 100755 --- a/Build/source/texk/tex4htk/teimex +++ b/Build/source/texk/tex4htk/teimex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teimlatex b/Build/source/texk/tex4htk/teimlatex index c665c3f405e..c3f48c03299 100755 --- a/Build/source/texk/tex4htk/teimlatex +++ b/Build/source/texk/tex4htk/teimlatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teimmex b/Build/source/texk/tex4htk/teimmex index b5d1d903ab9..fb87cf283aa 100755 --- a/Build/source/texk/tex4htk/teimmex +++ b/Build/source/texk/tex4htk/teimmex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teimtex b/Build/source/texk/tex4htk/teimtex index 4582ce42d0c..6b57c94b877 100755 --- a/Build/source/texk/tex4htk/teimtex +++ b/Build/source/texk/tex4htk/teimtex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teimtexexec b/Build/source/texk/tex4htk/teimtexexec deleted file mode 100755 index d2d8ad431d3..00000000000 --- a/Build/source/texk/tex4htk/teimtexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/teimtexi b/Build/source/texk/tex4htk/teimtexi index c8e52000716..81c00cad2ca 100755 --- a/Build/source/texk/tex4htk/teimtexi +++ b/Build/source/texk/tex4htk/teimtexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teitex b/Build/source/texk/tex4htk/teitex index b083067afba..6f772153ba2 100755 --- a/Build/source/texk/tex4htk/teitex +++ b/Build/source/texk/tex4htk/teitex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/teitexexec b/Build/source/texk/tex4htk/teitexexec deleted file mode 100755 index d2d8ad431d3..00000000000 --- a/Build/source/texk/tex4htk/teitexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/teitexi b/Build/source/texk/tex4htk/teitexi index 8df760149c0..352dbc26ef0 100755 --- a/Build/source/texk/tex4htk/teitexi +++ b/Build/source/texk/tex4htk/teitexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/tex4ht.c b/Build/source/texk/tex4htk/tex4ht.c index b3e17a976e7..71af448e73b 100644 --- a/Build/source/texk/tex4htk/tex4ht.c +++ b/Build/source/texk/tex4htk/tex4ht.c @@ -1,7 +1,7 @@ /**********************************************************/ -/* tex4ht.c 2006-09-13-14:27 */ -/* Copyright (C) 1996--2006 Eitan M. Gurari */ +/* tex4ht.c 2007-11-07-16:08 */ +/* Copyright (C) 1996--2007 Eitan M. Gurari */ /* */ /* This work may be distributed and/or modified under the */ /* conditions of the LaTeX Project Public License, either */ @@ -357,9 +357,6 @@ struct halign_rec{ #endif -#define ignore_ch 0 - - #define HTF_ALIAS 10000000 @@ -626,6 +623,11 @@ unsigned int *accent_array, *accented_array, accent_N, accented_N; char *math, *math_closing; + +INTEGER layout_dir; +unsigned long rgba_color; + + }; @@ -693,6 +695,9 @@ static FILE* dot_file; static FILE* dvi_file; +static U_CHAR *ext = NULL; + + static char* job_name; static int job_name_n; @@ -705,6 +710,9 @@ static FILE *out_file = (FILE *) 0, *cur_o_file = (FILE *) 0; +static int version_id; + + static int stack_len; @@ -807,6 +815,12 @@ static BOOL dvi_flag = FALSE, dvi_page = FALSE; static FILE *idv_file; +static int errCode = 0; + + +static int id_version = -1; + + static FILE* log_file; @@ -863,6 +877,9 @@ static U_CHAR *lg_font_fmt = NULL; static double word_sp = 999999.0, margin_sp; +static int ignore_ch = 0; + + static unsigned U_CHAR null_str = '\0'; @@ -1017,10 +1034,12 @@ static BOOL special_on = FALSE; static U_CHAR *warn_err_mssg[]={ -"improper command line\ntex4ht [-f<path-ch>]in-file[.dvi]\n" +"improper command line\ntex4ht [-f<path-separator-ch>]in-file[.dvi]\n" +" [-.<ext>] replacement to default file extension name .dvi\n" " [-c<tag name>] choose named segment in env file\n" " [-e<env-file>]\n" -" [-f<path-ch>] remove path from the file name\n" +" [-f<path-separator-ch>] remove path from the file name\n" +" [-F<ch-code>] replacement for missing font characters; 0--255; default 0\n" " [-g<bitmap-file-ext>]\n" " [-h(e|f|F|g|s|v|V)] trace: e-errors/warnings, f-htf, F-htf search\n" " g-groups, s-specials, v-env, V-env search\n" @@ -1032,6 +1051,7 @@ static U_CHAR *warn_err_mssg[]={ " [-t<tfm-font-dir>]\n" " [-u10] base 10 for unicode characters\n" " [-utf8] utf-8 encoding for unicode characters\n" +" [-v<idv version>] replacement forthe given dvi version\n" " [-xs] ms-dos file names for automatically generated gifs\n" , @@ -1094,6 +1114,7 @@ static U_CHAR *warn_err_mssg[]={ "Missing %s\n", "Can't back from file `%s\n'", "\\special{t4ht%s}?\n", +"Improper -v option\n", "" }; @@ -1215,6 +1236,9 @@ static struct send_back_entry * static double pos_dbl( ARG_I(long int *) ); +static void doGlyphArray( ARG_I(BOOL) ); + + static int search_font_tbl( ARG_I(int) ); @@ -1389,6 +1413,10 @@ static BOOL sigint_handler #undef SEP #endif { + +if( dwCtrlType ){ (IGNORED) printf(" "); } + + err_i(32); return FALSE; } @@ -1498,8 +1526,8 @@ static void strct #undef SEP #endif { U_CHAR * ch; - ch = str1 + (int) strlen(str1); - (IGNORED) strcpy( ch, str2 ); + ch = str1 + (int) strlen((char *) str1); + (IGNORED) strcpy((char *) ch, (char *) str2 ); } @@ -1537,8 +1565,8 @@ static FILE* open_html_file #endif { FILE* file; char* str; - str = m_alloc(char, (int) strlen(name) + 1); - (IGNORED) strcpy(str, name); + str = m_alloc(char, (int) strlen((char *) name) + 1); + (IGNORED) strcpy((char *) str, (char *) name); (IGNORED) printf(" file %s\n", str); (IGNORED) fprintf(log_file, "File: %s\n", str); if( (file = fopen(str, WRITE_TEXT_FLAGS)) == NULL ) bad_in_file(str); @@ -1714,7 +1742,7 @@ case case 243 : { - for( i=0; i<14; i++ ) ch = get_char(); + for( i=0; i<14; i++ ){ ch = get_char(); } for( i=ch + get_char(); i>0; i--) (void) get_char(); break; } @@ -2715,6 +2743,34 @@ static double pos_dbl +static void doGlyphArray +#ifdef ANSI +#define SEP , +( + BOOL yLocs +) +#undef SEP +#else +#define SEP ; +(yLocs) + BOOL yLocs +; +#undef SEP +#endif +{ int i, glyphCount; + (void) get_unt(4); + glyphCount = (INTEGER) get_unt(2); + for( i = 0; i < glyphCount; ++i ){ + (void) get_int(4); + if( yLocs ){ (void) get_int(4); } + } + for (i = 0; i < glyphCount; ++i){ + (void) get_unt(2); + } +} + + + static int search_font_tbl #ifdef ANSI #define SEP , @@ -2730,8 +2786,9 @@ static int search_font_tbl #undef SEP #endif { int i; - for( i=0; i<font_tbl_size; i++) - if( font_tbl[i].num == cur_fnt ) return i; + for( i=0; i<font_tbl_size; i++){ + if( font_tbl[i].num == cur_fnt ){ return i; } + } err_i_int( 6,cur_fnt ); return 0; } @@ -3005,7 +3062,7 @@ static void script #endif { U_CHAR *ch, *p; U_CHAR fmt[256]; - job[ (int) strlen(job) - 1 ] ='\0'; + job[ (int) strlen((char *) job) - 1 ] ='\0'; p = ch = templt; while( TRUE ){ if( *ch == '%' ){ @@ -3016,7 +3073,7 @@ static void script p=fmt; *(p++) = '%'; -if( *ch == '\0' ){ job[ (int) strlen(job) ] ='.'; return; } +if( *ch == '\0' ){ job[ (int) strlen((char *) job) ] ='.'; return; } while( *ch != '%' ){ *(p++) = *(ch ++); } *(p+1) = '\0'; @@ -3030,7 +3087,7 @@ while( *ch != '%' ){ *(p++) = *(ch ++); } (IGNORED) fprintf(log_file, fmt, font); break;} case '%':{ *p = 'c'; (IGNORED) fprintf(log_file, fmt, '%'); break;} - default:{ job[ (int) strlen(job) ] ='.'; return;} + default:{ job[ (int) strlen((char *) job) ] ='.'; return;} } p = ++ch; }else ch++; @@ -3062,7 +3119,7 @@ static void dos_gif_file { int n, m, i; struct gif_file_rec * p, * q; U_CHAR *ch; - m = n = (int) strlen(str); + m = n = (int) strlen((char *) str); if( n > 4 ){ if( (p = gif_file) != NULL ){ @@ -3104,7 +3161,7 @@ if( gif_file ){ xeh[(int)(ch[2])], xeh[(int)(ch[3])] , gif); p->name = m_alloc(char,m+1); -(IGNORED) strcpy( p->name, str ); +(IGNORED) strcpy((char *) p->name, (char *) str ); if( gif_file ){ p->next = gif_file->next; gif_file->next = p; } else p->next = p; @@ -3371,14 +3428,14 @@ char *get_env_dir { int i; U_CHAR *p; if(! progname || ! *progname) return NULL; - i = (int) strlen(progname); + i = (int) strlen((char *) progname); while( (progname[--i] != (int) dir_path_slash(progname) ) && (i > 0) ) ; if(i == 0) return NULL; p = (char *) malloc(i+12); if(p == NULL) return NULL; strncpy(p, progname, i+1); - (IGNORED) strcpy(&p[i+1],"tex4ht.env"); + (IGNORED) strcpy((char *) &p[i+1], (char *) "tex4ht.env"); return p; } @@ -3427,9 +3484,9 @@ do{ int int_ch; *ch = '\0'; - } else {(IGNORED) strcpy(str, inln); } - ch = m_alloc(char, (int) strlen(str)+2); - (IGNORED) strcpy(ch, str); + } else {(IGNORED) strcpy((char *) str, (char *) inln); } + ch = m_alloc(char, (int) strlen((char *) str)+2); + (IGNORED) strcpy((char *) ch, (char *) str); return ch; }else return name; } @@ -3485,7 +3542,7 @@ if( envChoice == (struct env_c_rec*) 0 ){ U_CHAR cur_block[90]; BOOL status; -(IGNORED) strcpy( cur_block, match); +(IGNORED) strcpy((char *) cur_block, (char *) match); status = FALSE; while( !status && (chr != EOF) ){ chr = 'x'; @@ -3538,7 +3595,7 @@ static struct env_var_rec * get_env_var tfm_dirs = (struct env_var_rec *) 0; TEX4HTTFM = getenv( env_var ); if( TEX4HTTFM ){ - env_var_len = (int) strlen(TEX4HTTFM); + env_var_len = (int) strlen((char *) TEX4HTTFM); if ( *TEX4HTTFM == *(TEX4HTTFM + env_var_len - 1 ) ){ from = TEX4HTTFM + env_var_len - 1; *from = '\0'; @@ -3551,7 +3608,7 @@ static struct env_var_rec * get_env_var { U_CHAR *str; if( *(from+1) == '~' ){ if( HOME_DIR ){ - str = m_alloc(char, strlen(HOME_DIR)+strlen(base)); + str = m_alloc(char, strlen((char *) HOME_DIR)+strlen((char *) base)); (IGNORED) sprintf(str,"%s%s", HOME_DIR, base+1); if( access(str,F_OK) ) { warn_i_str2(49, env_var, str); base = NULL; } @@ -3598,8 +3655,8 @@ static void com_dir #undef SEP #endif { int i; U_CHAR str[256]; - (IGNORED) strcpy( str, p+2 ); - i = (int) strlen(str) - 1; + (IGNORED) strcpy((char *) str, (char *) p+2 ); + i = (int) strlen((char *) str) - 1; if( str[i] == '!' ) str[i] = '\0'; } @@ -3625,7 +3682,7 @@ static void export_htf { int i; char* p; BOOL found; - i = (int) strlen(str) - 1; + i = (int) strlen((char *) str) - 1; while( (i>=0) && (str[i] == '\n') ){ str[i--] = '\0'; } while( (i>=0) && (str[i] == ' ') ) { str[i--] = '\0'; } if( (i>=0) && (str[i] == '!') ){ str[i--] = '\0'; } @@ -3647,11 +3704,11 @@ static void export_htf } } if( found ){ *export_str = (char *) r_alloc((void *) *export_str, - (int) strlen(*export_str) + (int) strlen(str) + 2 ); - if( (int) strlen(*export_str) > 0 ){ - (IGNORED) strcat(*export_str,","); + (int) strlen((char *) *export_str) + (int) strlen((char *) str) + 2 ); + if( (int) strlen((char *) *export_str) > 0 ){ + (IGNORED) strcat((char *) *export_str, (char *) ","); } - (IGNORED) strcat(*export_str,str); + (IGNORED) strcat((char *) *export_str, (char *) str); } } #endif @@ -3749,7 +3806,7 @@ while( search_dot_file( typ ) && !flag ){ U_CHAR *q, save_ch; - (*(q-1) == '/') #endif ) = '\0'; - if( (n = strlen(dot_dir)) > (m = strlen(cache_dir)) ){ flag = FALSE; } + if( (n = strlen((char *) dot_dir)) > (m = strlen((char *) cache_dir)) ){ flag = FALSE; } else { save_ch = *(cache_dir + n); *(cache_dir + n) = '\0'; @@ -3760,10 +3817,10 @@ while( search_dot_file( typ ) && !flag ){ U_CHAR *q, save_ch; if( flag ){ -n = (int) strlen(cache_dir); +n = (int) strlen((char *) cache_dir); cache_dir[n] = dir_path_slash(cache_dir); cache_dir[n+1] = '\0'; -(IGNORED) strcat(cache_dir,name); +(IGNORED) strcat((char *) cache_dir, (char *) name); } } } @@ -3854,9 +3911,9 @@ static char * abs_addr #undef SEP #endif { U_CHAR *p; - p = m_alloc(char, (int) strlen( dir ) + - (base? (int) strlen( base ):0) + - (int) strlen( HOME_DIR ) + 1 ); + p = m_alloc(char, (int) strlen((char *) dir ) + + (base? (int) strlen((char *) base ):0) + + (int) strlen((char *) HOME_DIR ) + 1 ); *p = '\0'; if( (*(dir+1) == '~') && base ){ if( *base == '~' ){ @@ -3904,8 +3961,8 @@ if( (file = f_open(name, flags)) != NULL ){ return file; } - (IGNORED) strcpy(str, dir); - i = (int) strlen(str) - 1; + (IGNORED) strcpy((char *) str, (char *) dir); + i = (int) strlen((char *) str) - 1; subs = str[i] == '!'; if( subs ) str[i] = '\0'; else i++; @@ -3969,7 +4026,7 @@ cur_cache_font->cache_file = (struct cache_file_rec *) 0; cur_cache_font->dir = m_alloc(char, n+1); - (IGNORED) strcpy(cur_cache_font->dir, dir); + (IGNORED) strcpy((char *) cur_cache_font->dir, (char *) dir); if( !cache_font ){ cur_cache_font->next = cache_font; cache_font = cur_cache_font; @@ -4008,8 +4065,8 @@ cur_cache_font->cache_file = (struct cache_file_rec *) 0; if( flag ) { file_entry = m_alloc(struct cache_file_rec, 1); -file_entry->file = m_alloc(char, strlen(name)+1); -(IGNORED) strcpy(file_entry->file,name); +file_entry->file = m_alloc(char, strlen((char *) name)+1); +(IGNORED) strcpy((char *) file_entry->file, (char *) name); if( ! cur_cache_font->cache_file ){ cur_cache_font->cache_file = file_entry; file_entry->next = (struct cache_file_rec *) 0; @@ -4054,7 +4111,7 @@ static FILE* search_file_ext { U_CHAR str[256]; FILE* file; int n; - n = (int) strlen(dir); + n = (int) strlen((char *) dir); (IGNORED) sprintf(str, #if defined(DOS_WIN32) || defined(__DJGPP__) (( dir[n-1] == '/') || ( dir[n-1] == '\\')) @@ -4088,7 +4145,7 @@ static FILE* search_file_ext WIN32_FIND_DATA find_file_data; HANDLE hnd; int proceed; - (IGNORED) strcpy(dirname, str); + (IGNORED) strcpy((char *) dirname, (char *) str); strct(dirname, (is_forward_slash(dirname)? "/" : "\\") ); strct(dirname, "*.*"); hnd = FindFirstFile(dirname, &find_file_data); @@ -4099,7 +4156,7 @@ while (proceed) { if( !eq_str(find_file_data.cFileName, ".") && !eq_str(find_file_data.cFileName, "..") ) { - (IGNORED) strcpy( str+n, find_file_data.cFileName ); + (IGNORED) strcpy((char *) str+n, (char *) find_file_data.cFileName ); str[n-1] = dir_path_slash(str); if (find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { if( (file = search_file_ext(name, str, flags)) != NULL ){ @@ -4134,7 +4191,7 @@ FindClose(hnd); if( !eq_str(dirp->d_name, ".") && !eq_str(dirp->d_name, "..") ) { -(IGNORED) strcpy( str+n, dirp->d_name ); +(IGNORED) strcpy((char *) str+n, (char *) dirp->d_name ); str[n-1] = dir_path_slash(str); if( LSTAT(str, &buf) >= 0 ) if( S_ISDIR( buf.st_mode ) ) @@ -4199,7 +4256,7 @@ static FILE* f_open_pathed_filename file = NULL; if( *name == '~' ){ if( HOME_DIR ){ - str = m_alloc(char, strlen(HOME_DIR)+strlen(name)); + str = m_alloc(char, strlen((char *) HOME_DIR)+strlen((char *) name)); (IGNORED) sprintf(str,"%s%s", HOME_DIR, name+1); file = f_open(str,flags); free((void *) str); @@ -4226,12 +4283,10 @@ static INTEGER put_4ht_ch int c; c = ch; if( ch=='&' ){ - if( !uni_code_p ){ - + flush_uni(); - } if( put_4ht_off ){ c = putc( ch, htFile ); } else { @@ -4728,8 +4783,8 @@ gif_open[gif_flag] = m_alloc(char, 29 ); -(IGNORED) strcpy(gif_open[gif_flag], - +(IGNORED) strcpy((char *) gif_open[gif_flag], +(char *) "<img src=\"+\" alt=\"+++++\" />+" ); @@ -4757,7 +4812,7 @@ gif_id[gif_flag] = gif_open[gif_flag]+28; p= gif_open[gif_flag]; if( p ) if( *p ){ - print_f(p); (IGNORED) strcpy(str, font_tbl[cur_fnt].name); + print_f(p); (IGNORED) strcpy((char *) str, (char *) font_tbl[cur_fnt].name); mag = (int) ((double) font_tbl[cur_fnt].scale / font_tbl[cur_fnt].design_sz * 10 ); @@ -5025,8 +5080,8 @@ gif_open[gif_flag] = m_alloc(char, 29 ); -(IGNORED) strcpy(gif_open[gif_flag], - +(IGNORED) strcpy((char *) gif_open[gif_flag], +(char *) "<img src=\"+\" alt=\"+++++\" />+" ); @@ -5054,7 +5109,7 @@ gif_id[gif_flag] = gif_open[gif_flag]+28; p= gif_open[gif_flag]; if( p ) if( *p ){ - print_f(p); (IGNORED) strcpy(str, font_tbl[cur_fnt].name); + print_f(p); (IGNORED) strcpy((char *) str, (char *) font_tbl[cur_fnt].name); mag = (int) ((double) font_tbl[cur_fnt].scale / font_tbl[cur_fnt].design_sz * 10 ); @@ -5876,15 +5931,15 @@ SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigint_handler, TRUE); (IGNORED) printf("----------------------------\n"); #ifndef KPATHSEA #ifdef PLATFORM - (IGNORED) printf("tex4ht.c (2006-09-13-14:27 %s)\n",PLATFORM); + (IGNORED) printf("tex4ht.c (2007-11-07-16:08 %s)\n",PLATFORM); #else - (IGNORED) printf("tex4ht.c (2006-09-13-14:27)\n"); + (IGNORED) printf("tex4ht.c (2007-11-07-16:08)\n"); #endif #else #ifdef PLATFORM - (IGNORED) printf("tex4ht.c (2006-09-13-14:27 %s kpathsea)\n",PLATFORM); + (IGNORED) printf("tex4ht.c (2007-11-07-16:08 %s kpathsea)\n",PLATFORM); #else - (IGNORED) printf("tex4ht.c (2006-09-13-14:27 kpathsea)\n"); + (IGNORED) printf("tex4ht.c (2007-11-07-16:08 kpathsea)\n"); #endif #endif for(i=0; i<argc; i++){ @@ -5936,7 +5991,7 @@ back_token->id = -1; pos_text = pos_line = end_pos_body = end_pos_text = pos_body = m_alloc(char, (int) 1); -(IGNORED) strcpy(pos_text, "" ); +(IGNORED) strcpy((char *) pos_text, (char *) "" ); margin_sp = (double) MARGINSP; @@ -5989,7 +6044,7 @@ HOME_DIR = getenv("HOME"); if( argc == 1 ){ bad_arg; } for(i=1; i<argc; i++) { if( *( p=argv[i] ) == '-' ){ -if( (int) strlen( argv[i] ) == 2 ){ +if( (int) strlen((char *) argv[i] ) == 2 ){ if( ++i == argc ) bad_arg; } switch( *(p+1) ){ @@ -6011,11 +6066,24 @@ tex4ht_env_file = p+2; break; } case 'f':{ p = p + 2; -in_name = p + (int) strlen( p ); +in_name = p + (int) strlen((char *) p ); while( *in_name != *p ){ in_name--; } in_name++; break; } + case 'F':{ +char *digit = p+2; +ignore_ch = 0; +while( *digit != '\0' ){ + if( (*digit < '0') || (*digit > '9') ){ + ignore_ch = 0; break; + } + ignore_ch = 10 * ignore_ch + (*digit - '0'); + if( ignore_ch > 255 ){ ignore_ch = 0; break; } + digit++; +} + + break; } case 'g':{ gif = p+2; @@ -6047,19 +6115,19 @@ if( !( *trace_dvi_del_P || *end_trace_dvi_del_P trace_dvi_del_P = (char *) r_alloc((void *) trace_dvi_del_P, (size_t) 4); - (IGNORED) strcpy(trace_dvi_del_P, "[G " ); + (IGNORED) strcpy((char *) trace_dvi_del_P, (char *) "[G " ); end_trace_dvi_del_P = (char *) r_alloc((void *) end_trace_dvi_del_P, (size_t) 2); - (IGNORED) strcpy(end_trace_dvi_del_P, "]" ); + (IGNORED) strcpy((char *) end_trace_dvi_del_P, (char *) "]" ); trace_dvi_del_p = (char *) r_alloc((void *) trace_dvi_del_p, (size_t) 5); - (IGNORED) strcpy(trace_dvi_del_p, "[/G " ); + (IGNORED) strcpy((char *) trace_dvi_del_p, (char *) "[/G " ); end_trace_dvi_del_p = (char *) r_alloc((void *) end_trace_dvi_del_p, (size_t) 2); - (IGNORED) strcpy(end_trace_dvi_del_p, "]" ); + (IGNORED) strcpy((char *) end_trace_dvi_del_p, (char *) "]" ); } break;} @@ -6131,6 +6199,22 @@ else if( eq_str(p+2, "tf8") ){ utf8 = TRUE; } else{ bad_arg;} break; } + case 'v':{ +{ U_CHAR *q; + q = p + 2; + id_version = 0; + while( *q != '\0' ){ + if( id_version != -1 ){ + if( (*q < '0') || (*q > '9') ){ + id_version = -1; + warn_i(53); + } + id_version = id_version * 10 + *q - '0'; + } + q++; +} } + + break; } case 'x':{ switch( *(p+2) ){ case 's':{ dos_file_names = TRUE; break; } @@ -6138,6 +6222,10 @@ switch( *(p+2) ){ } break; } + case '.':{ +ext = p+1; + + break; } default:{ bad_arg; } } @@ -6156,20 +6244,54 @@ if( css_ext == (struct css_ext_rec *) 0 ){ if( *in_name != '\0' ){ BOOL tag; -job_name_n = (int) strlen( in_name ); +job_name_n = (int) strlen((char *) in_name ); job_name = m_alloc(char, job_name_n+6); -(IGNORED) strcpy(job_name, in_name); -tag = job_name_n < 5; -if( !tag ) tag = !eq_str( job_name+job_name_n-4,".dvi"); -if( tag ){ job_name_n+=4; (IGNORED) strct(job_name, ".dvi"); } +(IGNORED) strcpy((char *) job_name, (char *) in_name); +tag = job_name_n < 3; +if( !tag ){ + tag = !eq_str( job_name+job_name_n- +( + (ext==NULL)? 4 : (int) strlen((char *) ext) +) + +, +( + (ext==NULL)? ".dvi" : ext +) + +); +} +if( tag ){ + job_name_n+= +( + (ext==NULL)? 4 : (int) strlen((char *) ext) +) + +; (IGNORED) strct(job_name, +( + (ext==NULL)? ".dvi" : ext +) + +); +} if( (dvi_file = fopen(job_name, READ_BIN_FLAGS)) == NULL ) { { int i; for(i=job_name_n-5; i; i--){ if( job_name[i] == '.' ){ job_name[i] = '\0'; - job_name_n = i + 4; - (IGNORED) strct(job_name, ".dvi"); + job_name_n = i + +( + (ext==NULL)? 4 : (int) strlen((char *) ext) +) + +; + (IGNORED) strct(job_name, +( + (ext==NULL)? ".dvi" : ext +) + +); break; } } if( (dvi_file = fopen(job_name, READ_BIN_FLAGS)) == NULL ){ @@ -6203,9 +6325,9 @@ bad_arg; } else { -int n = (int) strlen( job_name ); +int n = (int) strlen((char *) job_name ); name = m_alloc(char, 6 + n); -(IGNORED) strcpy(name,job_name); +(IGNORED) strcpy((char *) name, (char *) job_name); n -= 4; *(name + n) = '\0'; (IGNORED) strct(name,".html"); #ifdef HTM @@ -6216,9 +6338,9 @@ name[n+4] ='\0'; } else{ int tag = 1; - int n = (int) strlen( out_name ); + int n = (int) strlen((char *) out_name ); name = m_alloc(char, 6 + n); -(IGNORED) strcpy(name,out_name); +(IGNORED) strcpy((char *) name, (char *) out_name); while( n-- ) tag = tag && (*(name+n) != '.') ; if( tag ) (IGNORED) strct(name,".html"); #ifdef HTM @@ -6420,8 +6542,8 @@ while ( search_dot_file( 'P' ) ){ struct sys_call_rec *q; while( (ch !='\n') && (ch != EOF) ); p--; *p = '\0'; - q->filter = m_alloc(char, (int) strlen(str)+1); - (IGNORED) strcpy(q->filter,str); + q->filter = m_alloc(char, (int) strlen((char *) str)+1); + (IGNORED) strcpy((char *) q->filter, (char *) str); } @@ -6434,7 +6556,7 @@ class_fmt = (char *) get_script(class_fmt,LGCLS,'c'); font_gif = (char *) get_script(font_gif,LGPIC,'s'); { int n; - n = (int) strlen(font_gif); + n = (int) strlen((char *) font_gif); if( font_gif[n-1] != '%' ){ font_gif[n] = '%'; font_gif[n+1] = '\0'; } } @@ -6446,7 +6568,7 @@ begin_char_gif = (char *) get_script(begin_char_gif,LGSEP,'b'); gif = (char *) get_script(gif,LGTYP,'g'); { int n; - n = (int) strlen(gif) - 1; + n = (int) strlen((char *) gif) - 1; if( gif[n] == '%' ){ gif[n] = '%'; } else if( gif[n] == '\n' ) { gif[n] = '\0'; } } @@ -6466,7 +6588,7 @@ gif = (char *) get_script(gif,LGTYP,'g'); { U_CHAR str[256]; - (IGNORED) strcpy(str,job_name); + (IGNORED) strcpy((char *) str, (char *) job_name); str[job_name_n-1] = '\0'; str[job_name_n-2] = 'g'; str[job_name_n-3] = 'l'; @@ -6485,7 +6607,7 @@ gif = (char *) get_script(gif,LGTYP,'g'); struct htf_com_rec *q; q = htf_font_dir; while( q != (struct htf_com_rec *) 0 ){ - (IGNORED) strcpy(str,q->name); + (IGNORED) strcpy((char *) str, (char *) q->name); export_htf( &export_str, str ); q = q->next; } } @@ -6504,41 +6626,41 @@ while ( search_dot_file( 'i' ) ){ export_htf( &export_str, str ); } #ifdef HTFDIR - (IGNORED) strcpy(str, HTFDIR); + (IGNORED) strcpy((char *) str, (char *) HTFDIR); export_htf( &export_str, str ); #endif { U_CHAR * q; q = (U_CHAR *) kpse_var_value( "TEX4HTFONTSET" ); if( q ){ - if( (int) strlen(q) > 0 ){ + if( (int) strlen((char *) q) > 0 ){ export_str = (char *) r_alloc((void *) export_str, - (int) strlen(export_str) + (int) strlen(q) + 2); - if( (int) strlen(export_str) > 0 ){ - (IGNORED) strcat(export_str, ","); + (int) strlen((char *) export_str) + (int) strlen((char *) q) + 2); + if( (int) strlen((char *) export_str) > 0 ){ + (IGNORED) strcat((char *) export_str, (char *) ","); } - (IGNORED) strcat(export_str, q); + (IGNORED) strcat((char *) export_str, (char *) q); } } } - if( (int) strlen(export_str) > 0 ){ - (IGNORED) strcpy(str, "%%12"); + if( (int) strlen((char *) export_str) > 0 ){ + (IGNORED) strcpy((char *) str, (char *) "%%12"); export_str = (char *) r_alloc((void *) export_str, - (int) strlen(export_str) + (int) strlen(str) + 1 ); + (int) strlen((char *) export_str) + (int) strlen((char *) str) + 1 ); postfix = str - 1; while( *(++postfix) != '\0' ){ if( (*postfix=='%') && (*(postfix+1)=='%') && (*(postfix+2)=='1') && (*(postfix+3)=='2') ){ *postfix='\0'; postfix += 4; break; } } - if( (int) strlen(export_str) != 0 ){ + if( (int) strlen((char *) export_str) != 0 ){ { char *from_ch; int i, n, m; - n = (int) strlen(str); - m = (int) strlen(export_str); + n = (int) strlen((char *) str); + m = (int) strlen((char *) export_str); from_ch = export_str + m; for( i = 0; i<=m; i++){ *(from_ch + n) = *(from_ch); @@ -6547,7 +6669,7 @@ while ( search_dot_file( 'i' ) ){ for( i = 0; i<n; i++){ export_str[i] = str[i]; } - (IGNORED) strcat(export_str,postfix); + (IGNORED) strcat((char *) export_str, (char *) postfix); } @@ -6585,10 +6707,10 @@ if( !p && !q ){ } { int n; - n = (int) strlen(export_str); + n = (int) strlen((char *) export_str); if( n > 0 ){ export_str_chars = m_alloc(char, n+1); - (IGNORED) strcpy(export_str_chars, export_str); + (IGNORED) strcpy((char *) export_str_chars, (char *) export_str); } } @@ -6632,9 +6754,16 @@ do{ 223 ); eof_op_n = file_len; -if( (i<4) || (ch != +if( (i<4) + || + ((ch != 2 -) ) bad_dvi; +) && (ch != +5 + +)) + ) bad_dvi; +version_id = ch; file_len -= 5; @@ -6742,8 +6871,8 @@ U_CHAR files_cache[PATH_MAX]; *(p++) = ch = (int) getc(dot_file); while( (ch !='\n') && (ch != EOF) ); p--; *p = '\0'; - } else { (IGNORED) strcpy(p, - getenv("TEX4HTWR")? "~~/tex4ht.fls" : "tex4ht.fls"); + } else { (IGNORED) strcpy((char *) p, +(char *) getenv("TEX4HTWR")? "~~/tex4ht.fls" : "tex4ht.fls"); } } @@ -6841,9 +6970,9 @@ if( export_str_chars ){ { U_CHAR * head, * tail, *p; int n; -n = (int) strlen(htfname); +n = (int) strlen((char *) htfname); tail = head = m_alloc(char, n+1); -(IGNORED) strcpy(head, htfname); +(IGNORED) strcpy((char *) head, (char *) htfname); while( n>11 ){ if( (*tail=='\\') || (*tail=='/') ){ if( (*tail == *(tail+9)) && (*(tail+1) == 'h') @@ -6865,12 +6994,12 @@ for( n = 0 ; (n < cardinality) && !htfname ; n++){ p = tail; while( *p != '\0' ){ char * s, *nm; - s = m_alloc(char, (int) strlen( head ) + - (int) strlen( fontset[n] ) + - (int) strlen( p ) + 1); - (IGNORED) strcpy(s,head); - (IGNORED) strcat(s,fontset[n]); - (IGNORED) strcat(s,p); + s = m_alloc(char, (int) strlen((char *) head ) + + (int) strlen((char *) fontset[n] ) + + (int) strlen((char *) p ) + 1); + (IGNORED) strcpy((char *) s, (char *) head); + (IGNORED) strcat((char *) s, (char *) fontset[n]); + (IGNORED) strcat((char *) s, (char *) p); nm = kpse_find_file (s, kpse_program_text_format, 0); free((void *) s); if ( nm ){ @@ -6973,7 +7102,7 @@ if( (charset_n+1) == max_charset_n){ p = m_alloc(char, (int) (start[3] - start[2]) ); -(IGNORED) strcpy(p, start[2] ); +(IGNORED) strcpy((char *) p, (char *) start[2] ); i = charset_n; while( i-- > 0 ){ if( charset[i].ch == value ){ @@ -7007,7 +7136,7 @@ if( (htf_4hf_n+1) == max_htf_4hf_n){ p = m_alloc(char, (int) (start[3] - start[2]) ); -(IGNORED) strcpy(p, start[2] ); +(IGNORED) strcpy((char *) p, (char *) start[2] ); i = htf_4hf_n; while( i-- > 0 ){ if( htf_4hf[i].ch == value ){ @@ -7094,7 +7223,7 @@ max_htf_4hf_n = 0; while( (ch = get_char()) != 249 ){ - + #ifdef MAXFONTS if( (font_tbl_size + 1) < MAXFONTS ) #endif @@ -7106,7 +7235,214 @@ if( (font_tbl_size + 1) < MAXFONTS ) (size_t) ((font_tbl_size+1) * sizeof(struct font_entry))) : m_alloc(struct font_entry, 1); + if( (version_id == +5 + +) + && (ch == +252 + +) + ){ + + unsigned short flags; +new_font.num = (INTEGER) get_unt(4); +new_font.scale = (INTEGER) get_unt(4); +new_font.design_sz = new_font.scale; +flags = (INTEGER) get_unt(2); + +{ int n, family_name_n, style_name_n; + U_CHAR *ch; + + font_name_n = (INTEGER) get_unt(1); + family_name_n = (INTEGER) get_unt(1); + style_name_n = (INTEGER) get_unt(1); + n = font_name_n + 1; + ch = new_font_name = m_alloc(char, n); + while( --n ){ *ch = (int) get_unt(1); ch++; } + *ch = '\0'; + n = family_name_n + 1; + + while( --n ){ (void) get_unt(1); ch++; } + *ch = '\0'; + n = style_name_n + 1; + + while( --n ){ (void) get_unt(1); ch++; } + *ch = '\0'; +} + + +new_font.layout_dir = (flags & +0x0100 + +) ? 1 : 0; +new_font.rgba_color = (flags & +0x0200 + +)? + (unsigned long) get_unt(4) + : + 0xffffffff; +if( flags & +0x0800 + + ){ + int n = (INTEGER) get_unt(2); + int i; + for (i = 0; i < n; ++i) { + (void) get_unt(4); + } + for (i = 0; i < n; ++i) { + (void) get_int(4); +} } +(IGNORED) printf("(--- xdv font = %s (not implemented) ---)\n", new_font_name); + + +{ int i; + for( i=font_tbl_size-1; i>0; i-- ) + if( new_font.num == font_tbl[i].num ) warn_i(10); } + + + +{ + +/* + if( font_file == NULL ){ + dump_env(); err_i_str(1,file_name); + missing_fonts = TRUE; + new_font.char_f = 2; + new_font.char_l = 1; + } else { +*/ + +{ + +new_font.char_f = 0; +new_font.char_l = 255; +new_font.wtbl_n = 0; +new_font.htbl_n = 0; +new_font.dtbl_n = 0; + + + + +{ U_CHAR *ch, *hidp; + int i; + ch = new_font.char_wi = m_alloc(char, new_font.char_l + - new_font.char_f + 1); + hidp = new_font.char_hidp = m_alloc(char, new_font.char_l + - new_font.char_f + 1); + for( i = new_font.char_f; i <= new_font.char_l; i++ ){ + *(ch++) = 10; + *(hidp++) = 26; +} } + + + +{ INTEGER *p; + int i; + p = new_font.wtbl = m_alloc( INTEGER, new_font.wtbl_n); + for( i = 0; i < new_font.wtbl_n; i++ ){ + *(p++) = 600000; +} } + + + +{ INTEGER *p; + int i; + p = new_font.htbl = m_alloc( INTEGER, new_font.htbl_n); + for( i = 0; i < new_font.htbl_n; i++ ){ + *(p++) = 600000; +} } + + + + + + + + + +new_font.it = 0; + + + +new_font.word_sp = 350000; + +if( new_font.word_sp == 0 ) { + int i; + for( i = new_font.char_f; i <= new_font.char_l; i++ ){ + new_font.word_sp = + ( new_font.word_sp + + + *(new_font.wtbl + (int)(*(new_font.char_wi + i - new_font.char_f))) + ) / (new_font.char_f<i? 2:1); + } } +if( new_font.word_sp == 0 ) new_font.word_sp = MARGINSP; + + + + + + + + + + + +} + + +/* + (IGNORED) fclose(font_file); + } +*/ +} + + +new_font_name[font_name_n] = '\0'; +new_font.name = m_alloc(char, font_name_n + 1); +(IGNORED) strcpy((char *) new_font.name, (char *) new_font_name ); + +{ int n, i; + for( n=0; n<font_name_n; n++ ){ + if( ( '0' <= new_font_name[n] ) && ( new_font_name[n] <= '9' )){ + break; + } + } +{ int m; + for( m=n; m<font_name_n; m++ ){ + if( ( new_font_name[m] < '0' ) || ( new_font_name[m] > '9' )){ + n=font_name_n; + break; +} } } + + + new_font.family_name = m_alloc(char, n + 2); + new_font.font_size = m_alloc(char, font_name_n - n + 1 ); + for( i=0; i<n; i++ ){ + new_font.family_name[i] = new_font_name[i]; + } + new_font.family_name[i] = '\0'; i = 0; + while( n<font_name_n ){ + new_font.font_size[i++] = new_font_name[n++]; + } + new_font.font_size[i] = '\0'; +} + + + +new_font.mag = new_font.scale / (new_font.design_sz / 100); + + + + + + + } else { + + switch( ch ){ case 243 @@ -7129,21 +7465,22 @@ switch( ch ){ } - new_font_checksum = (INTEGER) get_int(4); - new_font.scale = (INTEGER) get_unt(4); - new_font.design_sz = (INTEGER) get_unt(4); - +new_font_checksum = (INTEGER) get_int(4); +new_font.scale = (INTEGER) get_unt(4); +new_font.design_sz = (INTEGER) get_unt(4); + { int n, area_ln; U_CHAR *ch; area_ln = (int) get_unt(1); - n = area_ln + (font_name_n = (int) get_unt(1)) + 1; + font_name_n = (int) get_unt(1); + n = area_ln + font_name_n + 1; ch = new_font_name = m_alloc(char, n); while( --n ){ *ch = (int) get_unt(1); ch++; } *ch = '\0'; } - + { int i; for( i=font_tbl_size-1; i>0; i-- ) @@ -7164,9 +7501,9 @@ switch( ch ){ tfmfile = kpse_find_file (file_name, kpse_tfm_format, 0); if( !tfmfile ){ char s [256]; -(IGNORED) strcpy(s, "kpsewhich "); -(IGNORED) strcat(s,file_name); -(IGNORED) strcat(s, " > tex4ht.tmp "); +(IGNORED) strcpy((char *) s, (char *) "kpsewhich "); +(IGNORED) strcat((char *) s, (char *) file_name); +(IGNORED) strcat((char *) s, (char *) " > tex4ht.tmp "); if( system(s) == 0 ){ char fileaddr [256]; @@ -7264,7 +7601,7 @@ if( file_length != ( 6 + header_length + new_font.dtbl_n + it_correction_table_length + lig_kern_table_length + kern_table_length + extensible_char_table_length + num_font_parameters ) - ) err_i_str(15,file_name); + ){ err_i_str(15,file_name); } @@ -7301,8 +7638,7 @@ new_font.design_pt = ( INTEGER) fget_int(font_file,4); (IGNORED) fseek(font_file, 2L, 1 ); - } -} +} } @@ -7397,6 +7733,9 @@ if( new_font.word_sp == 0 ) new_font.word_sp = MARGINSP; +new_font.ex = 450000; + + new_font.ex = (INTEGER) fget_int(font_file,4); @@ -7419,7 +7758,7 @@ new_font.ex = (INTEGER) fget_int(font_file,4); new_font_name[font_name_n] = '\0'; new_font.name = m_alloc(char, font_name_n + 1); -(IGNORED) strcpy( new_font.name, new_font_name ); +(IGNORED) strcpy((char *) new_font.name, (char *) new_font_name ); { int n, i; for( n=0; n<font_name_n; n++ ){ @@ -7455,6 +7794,9 @@ new_font.mag = new_font.scale / (new_font.design_sz / 100); + + + } { U_CHAR str[256]; int i, design_n, n_gif; @@ -7515,7 +7857,7 @@ for( i = new_font.char_f; i <= new_font.char_l ; i++ ){ design_n = 0; { char search_font_name [256]; - (IGNORED) strcpy(search_font_name,new_font.name); + (IGNORED) strcpy((char *) search_font_name, (char *) new_font.name); while( 1 ){ BOOL flag; if( eq_str( new_font_name, loopName) ){ @@ -7523,7 +7865,7 @@ if( eq_str( new_font_name, loopName) ){ (IGNORED) sprintf(name, "%s.htf", new_font_name); err_i_str(1, name); } else { - (IGNORED) strcpy(loopName,new_font_name); + (IGNORED) strcpy((char *) loopName, (char *) new_font_name); } loopBound++; if( loopBound > 10 ){ @@ -7576,9 +7918,9 @@ if( loopBound > 10 ){ { U_CHAR * head, * tail, *p; int n; -n = (int) strlen(htfname); +n = (int) strlen((char *) htfname); tail = head = m_alloc(char, n+1); -(IGNORED) strcpy(head, htfname); +(IGNORED) strcpy((char *) head, (char *) htfname); while( n>11 ){ if( (*tail=='\\') || (*tail=='/') ){ if( (*tail == *(tail+9)) && (*(tail+1) == 'h') @@ -7600,12 +7942,12 @@ for( n = 0 ; (n < cardinality) && !htfname ; n++){ p = tail; while( *p != '\0' ){ char * s, *nm; - s = m_alloc(char, (int) strlen( head ) + - (int) strlen( fontset[n] ) + - (int) strlen( p ) + 1); - (IGNORED) strcpy(s,head); - (IGNORED) strcat(s,fontset[n]); - (IGNORED) strcat(s,p); + s = m_alloc(char, (int) strlen((char *) head ) + + (int) strlen((char *) fontset[n] ) + + (int) strlen((char *) p ) + 1); + (IGNORED) strcpy((char *) s, (char *) head); + (IGNORED) strcat((char *) s, (char *) fontset[n]); + (IGNORED) strcat((char *) s, (char *) p); nm = kpse_find_file (s, kpse_program_text_format, 0); free((void *) s); if ( nm ){ @@ -7631,11 +7973,11 @@ for( n = 0 ; (n < cardinality) && !htfname ; n++){ if( file ){ -if( (strlen (new_font.family_name) + - strlen (new_font.font_size) + 4) == strlen (name) ){ +if( (strlen((char *) new_font.family_name) + + strlen((char *) new_font.font_size) + 4) == strlen((char *) name) ){ new_font.family_name = (char *) r_alloc((void *) new_font.family_name, - (size_t) (strlen (name)+1)); - (IGNORED) strcat(new_font.family_name,new_font.font_size); + (size_t) (strlen((char *) name)+1)); + (IGNORED) strcat((char *) new_font.family_name, (char *) new_font.font_size); *(new_font.font_size)='\0'; } @@ -7669,8 +8011,8 @@ if( x_char_l != HTF_ALIAS) { htf_to_lg(html_font, new_font_name, fonts_n, file); new_font_name = (char *) r_alloc((void *) new_font_name, (size_t) (font_name_n+1)); - (IGNORED) strcpy(new_font_name,search_font_name); - font_name_n = strlen (new_font_name); + (IGNORED) strcpy((char *) new_font_name, (char *) search_font_name); + font_name_n = strlen((char *) new_font_name); } @@ -7734,7 +8076,7 @@ if( (*str == '&') && (*(str+1) == '#') && ( (*(str+2) == 'x') || (*(str+2) == 'X')) - && (*(str + strlen(str) - 1) == ';') + && (*(str + strlen((char *) str) - 1) == ';') ) { char* p; int value = 0; @@ -7758,7 +8100,7 @@ while( !found ){ if( htf_4hf[mid].type1 == ch1 ){ ch1 = htf_4hf[mid].type2; - (IGNORED) strcpy(str, htf_4hf[mid].str ); + (IGNORED) strcpy((char *) str, (char *) htf_4hf[mid].str ); } @@ -7863,6 +8205,7 @@ if( dump_htf_files ){ if( flag ){ break; } } if( font_name_n == 0 ){ + if( errCode == 0 ){ errCode= 21; } warn_i_str(21,search_font_name); (IGNORED) fprintf(stderr, "%d--%d)\n", new_font.char_f, new_font.char_l); @@ -7898,7 +8241,7 @@ html_font = fonts_n? (struct html_font_rec *) r_alloc((void *) html_font, (size_t) ((fonts_n+1) * sizeof(struct html_font_rec) )) : m_alloc(struct html_font_rec, 1); html_font[fonts_n].name = m_alloc(char, font_name_n + 1); -(IGNORED) strcpy(html_font[fonts_n].name, new_font_name); +(IGNORED) strcpy((char *) html_font[fonts_n].name, (char *) new_font_name); html_font[fonts_n].i = font_tbl_size; fonts_n++; @@ -7913,9 +8256,9 @@ fonts_n++; for( search_css_ext = css_ext; search_css_ext != (struct css_ext_rec *) 0; search_css_ext = search_css_ext->next ){ - int css_name_n = (int) strlen( new_font.name ); + int css_name_n = (int) strlen((char *) new_font.name ); char * css_file_name = m_alloc(char, css_name_n + 1); - (IGNORED) strcpy(css_file_name, new_font.name); + (IGNORED) strcpy((char *) css_file_name, (char *) new_font.name); for( ; css_name_n; css_name_n-- ){ FILE* file; css_file_name[css_name_n] = '\0'; @@ -7959,9 +8302,9 @@ fonts_n++; { U_CHAR * head, * tail, *p; int n; -n = (int) strlen(htfname); +n = (int) strlen((char *) htfname); tail = head = m_alloc(char, n+1); -(IGNORED) strcpy(head, htfname); +(IGNORED) strcpy((char *) head, (char *) htfname); while( n>11 ){ if( (*tail=='\\') || (*tail=='/') ){ if( (*tail == *(tail+9)) && (*(tail+1) == 'h') @@ -7983,12 +8326,12 @@ for( n = 0 ; (n < cardinality) && !htfname ; n++){ p = tail; while( *p != '\0' ){ char * s, *nm; - s = m_alloc(char, (int) strlen( head ) + - (int) strlen( fontset[n] ) + - (int) strlen( p ) + 1); - (IGNORED) strcpy(s,head); - (IGNORED) strcat(s,fontset[n]); - (IGNORED) strcat(s,p); + s = m_alloc(char, (int) strlen((char *) head ) + + (int) strlen((char *) fontset[n] ) + + (int) strlen((char *) p ) + 1); + (IGNORED) strcpy((char *) s, (char *) head); + (IGNORED) strcat((char *) s, (char *) fontset[n]); + (IGNORED) strcat((char *) s, (char *) p); nm = kpse_find_file (s, kpse_program_text_format, 0); free((void *) s); if ( nm ){ @@ -8029,8 +8372,8 @@ while( v != (struct visited_file_rec *) 0 ){ if( !is_visited ){ struct visited_file_rec * v = m_alloc(struct visited_file_rec, 1); -v->name = m_alloc(char, (int) strlen( name ) + 1 ); -(IGNORED) strcpy(v->name, name); +v->name = m_alloc(char, (int) strlen((char *) name ) + 1 ); +(IGNORED) strcpy((char *) v->name, (char *) name); v->next = visited_file; visited_file = v; @@ -8103,7 +8446,7 @@ if( tex4ht_fls ){ FILE *in_file, *out_file; U_CHAR temp_file[256]; -(IGNORED) strcpy(temp_file,job_name); +(IGNORED) strcpy((char *) temp_file, (char *) job_name); temp_file[job_name_n] = '\0'; temp_file[job_name_n-1] = 'p'; temp_file[job_name_n-2] = 'm'; @@ -8155,7 +8498,7 @@ file_rec = cur_cache_font->cache_file; if( file_rec ){ if( !eq_str( prev_dir, cur_cache_font->dir) ){ (IGNORED) fprintf(out_file, " %s\n", cur_cache_font->dir); - (IGNORED) strcpy(prev_dir,dir); + (IGNORED) strcpy((char *) prev_dir, (char *) dir); } cur_cache_font->cache_file = (struct cache_file_rec *) 0; while( file_rec ) { @@ -8173,7 +8516,7 @@ if( file_rec ){ (IGNORED) fprintf(out_file," %s\n", dir); - (IGNORED) strcpy(prev_dir,dir); + (IGNORED) strcpy((char *) prev_dir, (char *) dir); } else if( !is_dir && (file[0] != '\0') ){ if( cur_cache_font != (struct cache_font_rec *)0 ){ @@ -8203,7 +8546,7 @@ file_rec = cur_cache_font->cache_file; if( file_rec ){ if( !eq_str( prev_dir, cur_cache_font->dir) ){ (IGNORED) fprintf(out_file, " %s\n", cur_cache_font->dir); - (IGNORED) strcpy(prev_dir,dir); + (IGNORED) strcpy((char *) prev_dir, (char *) dir); } cur_cache_font->cache_file = (struct cache_file_rec *) 0; while( file_rec ) { @@ -8254,9 +8597,7 @@ ch = get_noop(); if( ch != 247 ) bad_dvi; -if( get_char() != -2 - ) bad_dvi; +if( ((int) get_char()) != version_id ) bad_dvi; (void) get_unt(4); (void) get_unt(4); (void) get_unt(4); @@ -8658,7 +8999,7 @@ case case 243 : { - for( i=0; i<14; i++ ) ch = get_char(); + for( i=0; i<14; i++ ){ ch = get_char(); } for( i=ch + get_char(); i>0; i--) (void) get_char(); break; } @@ -8666,6 +9007,73 @@ case +case +252 + +: + if( version_id == +5 + + ){ + + unsigned short flags; +for( i=0; i<8; i++ ){ ch = get_char(); } +flags = (INTEGER) get_unt(2); +for( i = (INTEGER) get_unt(1) + + (INTEGER) get_unt(1) + + (INTEGER) get_unt(1) + ; i>0 + ; i-- ){ ch = get_char(); } +if( flags & +0x0200 + + ){ (INTEGER) get_unt(4); } +if( flags & +0x0800 + + ){ + int n = (INTEGER) get_unt(2); + int i; + for (i = 0; i < n; ++i) { + (void) get_unt(4); + } + for (i = 0; i < n; ++i) { + (void) get_int(4); +} } + + + break; + } +case +253 + +: + if( version_id == +5 + + ){ + +doGlyphArray(TRUE); + + + break; + } +case +254 + +: + if( version_id == +5 + + ){ + +doGlyphArray(FALSE); + + + break; + } + + default: { if( (ch < 171 @@ -8853,9 +9261,9 @@ while( special_n-- > 0 ){ name[i++] = get_char(); } flag = FALSE; p = system_calls; while( p ){ - if( (n = (int) strlen(p->filter)) == 1 ) { + if( (n = (int) strlen((char *) p->filter)) == 1 ) { flag = flag || (*(p->filter) == '*'); - } if( strlen(name) >= (unsigned int) n ) { + } if( strlen((char *) name) >= (unsigned int) n ) { ch = name[n]; name[n] = '\0'; flag = flag || eq_str(p->filter,name); name[n] = ch; @@ -9075,10 +9483,10 @@ p = post; while( special_n-- > 0 ) { *(p++)=get_char(); } *p='\0'; -p = m_alloc(char, 1 + (int) strlen(pre)); -(IGNORED) strcpy(p, pre ); -q = m_alloc(char, 1 + (int) strlen(post)); -(IGNORED) strcpy(q, post ); +p = m_alloc(char, 1 + (int) strlen((char *) pre)); +(IGNORED) strcpy((char *) p, (char *) pre ); +q = m_alloc(char, 1 + (int) strlen((char *) post)); +(IGNORED) strcpy((char *) q, (char *) post ); switch ( type ){ @@ -9749,7 +10157,7 @@ if( !q ){ q->i = q->depth = 0; q->max = 10; q->next = counter; counter = q; q->str = m_alloc(char, (int) n+1); - (IGNORED) strcpy( q->str, str ); + (IGNORED) strcpy((char *) q->str, (char *) str ); q->stack = m_alloc(int, q->max); } @@ -9842,7 +10250,7 @@ if( font_tbl[cur_fnt].mag != 100 ){ ], err_str[256]; bad_str= 7 -; (IGNORED) strcpy(err_str,p); +; (IGNORED) strcpy((char *) err_str, (char *) p); if( n> 10 ){ @@ -10049,7 +10457,7 @@ if(( } p->action = str[n]; str[n] = '\0'; p->path = m_alloc(char,n+1); -(IGNORED) strcpy(p->path,str); +(IGNORED) strcpy((char *) p->path, (char *) str); @@ -10635,10 +11043,10 @@ stack[stack_n-1].stack_id = -1; if( no_root_file ){ U_CHAR *name; name = m_alloc(char, 256); - (IGNORED) strcpy( name, no_root_file ); + (IGNORED) strcpy((char *) name, (char *) no_root_file ); free((void *) no_root_file); no_root_file = name; - name += (size_t) strlen(name); while( *(--name) != '.' ); name++; + name += (size_t) strlen((char *) name); while( *(--name) != '.' ); name++; while( special_n-- ){ if( (no_root_file+253) == name ) name--; *name++ = get_char(); @@ -10715,8 +11123,8 @@ stack[stack_n+1].temp_class_open ) : &(open_class[math_class]); *q = (char *) r_alloc((void *) open_class[math_class], - 1 + (size_t) strlen(str)); - (IGNORED) strcpy(*q, str); + 1 + (size_t) strlen((char *) str)); + (IGNORED) strcpy((char *) *q, (char *) str); q = (math_class > 78 @@ -10878,7 +11286,7 @@ rule_ch_off while( p != (struct group_path *) 0 ){ if( *(p->path ) == 'e' ) { - (IGNORED) strcpy(p->path,p->path+1); + (IGNORED) strcpy((char *) p->path, (char *) p->path+1); if( *(p->path) == '\0' ) { switch( p->action ){ case '<': print_f( p->info ); @@ -10909,7 +11317,7 @@ ignore_spaces++; } } else { if( *(p->path ) == 's' ) { - (IGNORED) strcpy(p->path,p->path+1); + (IGNORED) strcpy((char *) p->path, (char *) p->path+1); } place = 0 @@ -10963,13 +11371,13 @@ free((void *) q ); while( p != (struct group_path *) 0 ){ if( *(p->path ) == 'e' ) { - (IGNORED) strcpy(p->path,p->path+1); + (IGNORED) strcpy((char *) p->path, (char *) p->path+1); place = 3 ; } else { if( *(p->path ) == 's' ) { - (IGNORED) strcpy(p->path,p->path+1); + (IGNORED) strcpy((char *) p->path, (char *) p->path+1); } place = 1 @@ -11093,7 +11501,7 @@ while( p != (struct group_path *) 0 ){ if( *(p->path) != '\0' ) { char str[256]; -(IGNORED) strcpy(str,"...."); *(str+3) = p->action; +(IGNORED) strcpy((char *) str, (char *) "...."); *(str+3) = p->action; (IGNORED) strct(str,p->info); warn_i_str(38,str); @@ -11103,7 +11511,7 @@ if( *(p->path) != '\0' ) { default: { char str[256]; -(IGNORED) strcpy(str,"...."); *(str+3) = p->action; +(IGNORED) strcpy((char *) str, (char *) "...."); *(str+3) = p->action; (IGNORED) strct(str,p->info); warn_i_str(38,str); @@ -11131,7 +11539,7 @@ while( p != (struct group_path *) 0 ){ if( *(p->path) != '\0' ) { char str[256]; -(IGNORED) strcpy(str,"...."); *(str+3) = p->action; +(IGNORED) strcpy((char *) str, (char *) "...."); *(str+3) = p->action; (IGNORED) strct(str,p->info); warn_i_str(38,str); @@ -11141,7 +11549,7 @@ if( *(p->path) != '\0' ) { default: { char str[256]; -(IGNORED) strcpy(str,"...."); *(str+3) = p->action; +(IGNORED) strcpy((char *) str, (char *) "...."); *(str+3) = p->action; (IGNORED) strct(str,p->info); warn_i_str(38,str); @@ -11245,7 +11653,8 @@ text_on = stack[stack_n].text_on; } } - } + + } if( ch_map_flag ){ warn_i(27); init_ch_map(); } @@ -11289,7 +11698,13 @@ do{ ch = get_char(); }while( ch == 138 ); -for( i=13; i ; i-- ) idv_char( get_char() ); + +ch = get_char(); +if( id_version != -1 ){ ch = id_version; } +idv_char( ch ); + + +for( i=12; i ; i-- ){ idv_char( get_char() ); } i = get_char(); idv_char( (int) i ); while( i-- ) idv_copy(); @@ -11681,7 +12096,125 @@ default: { 171 ) || (ch > 234 -) ) err_i(23); +) ){ + if( +(version_id == +5 + +) +&& +( + (ch == +251 + +) + || + (ch == +252 + +) + || + (ch == +253 + +) + || + (ch == +254 + +) +) + + ){ + +switch( ch ){ + case +252 + +: + +{ int i, flags; + +(void) get_unt(4); +(void) get_unt(4); + + flags = (INTEGER) get_unt(2); + + + +if ((flags & +0x0002 + +) || (flags & +0x0001 + +)) { + +for ( +i = + (INTEGER) get_unt(1) ++ (INTEGER) get_unt(1) + + (INTEGER) get_unt(1) +; +i>0; +i-- +){ (void) get_unt(1); } + + + + + + if( flags & +0x0200 + + ){ + (void) get_unt(4); + } + +if( flags & +0x0800 + + ){ + int n = (INTEGER) get_unt(2); + for (i = 0; i < n; ++i) { + (void) get_unt(4); + } + for (i = 0; i < n; ++i) { + (void) get_int(4); +} } + +} + +} + + + break; + case +254 + +: + +{ + int i, glyphCount; + (void) get_unt(4); + glyphCount = (INTEGER) get_unt(2); + for( i = 0; i < glyphCount; ++i ){ + (void) get_int(4); + } + for (i = 0; i < glyphCount; ++i){ + (void) get_unt(2); + } +} + + + break; + default: + printf(" ===> ---------- xdv's idv ------------ <==== %d\n" , ch); +} + + + } else { err_i(23); } + } else { idv_char( ch ); file_n++; cur_font[0] = 1; cur_font[1] = ch; } break; @@ -11691,6 +12224,12 @@ default: { } +if( errCode > 0 ){ + (IGNORED) fprintf(log_file, "tex4ht.c error: %d\n", errCode); +} + + + { int ch, i, mag; U_CHAR str[256]; (IGNORED) fprintf(log_file, begin_char_gif); @@ -11757,7 +12296,7 @@ if( !dos_file_names ){ if( dos_file_names ){ - (IGNORED) strcpy(str, font_tbl[cur_fnt].name); + (IGNORED) strcpy((char *) str, (char *) font_tbl[cur_fnt].name); dos_gif_file(str, mag, ch); strct(str,gif); } @@ -11809,7 +12348,12 @@ idv_int(begin_postamble); (IGNORED) fseek(dvi_file, 4L, 1 ); file_n += 4; -idv_copy(); + +ch = get_char(); +if( id_version != -1 ){ ch = id_version; } +idv_char( ch ); + + for( i = 8 - file_n % 4; i; i-- ) idv_char( 223 ); diff --git a/Build/source/texk/tex4htk/tex4ht.in b/Build/source/texk/tex4htk/tex4ht.in deleted file mode 100644 index ab09ee6f80c..00000000000 --- a/Build/source/texk/tex4htk/tex4ht.in +++ /dev/null @@ -1,127 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% tex4ht.env / .tex4ht unix % -% % -% Notes: % -% 1. Empty lines might be harmful % -% 2. Tagged script segments <tag>...</tag> are scanned only if % -% their names are specified within -ctag switches of tex4ht.c % -% and t4ht.c. When -c switches are not supplied, a -cdefault % -% is implicitly assumed. % -% 3. Place this file in your work directory and/or root directory % -% and/or in directory `xxx' of your choice. In the latest case, % -% compile tex4ht.c and t4ht.c with `#define ENVFILE xxx', or % -% provide the address of the file to tex4ht and t4ht throught % -% the -e switch % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% * Replace `path', and possibly what follows, with appropriate % -% content % -% * A path may start with: % -% ~ for environment variable HOME % -% ~~ for environment variable TEX4HTTFM % -% * A ! requests recursive search into subdirectories % -% * Multiple t and i entries are allowed % -% * When supported by kpathsea % -% + t entries are ignored % -% + the path before /ht-font/ is ignored in i records that don't % -% represent real addresses % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% - tpath/fonts/tfm/! -% -<default> -ipath/tex4ht/ht-fonts/iso8859/! -ipath/tex4ht/ht-fonts/alias/! -</default> -% -<mozhtf> -ipath/tex4ht/ht-fonts/mozilla/! -ipath/tex4ht/ht-fonts/unicode/! -ipath/tex4ht/ht-fonts/iso8859/! -ipath/tex4ht/ht-fonts/alias/! -</mozhtf> -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% dvi-to-gif % -% dvips options % -% magnification: -x mag (e.g., -x 1200) % -% page size: -T x,y (e.g., -T 14in,14in) % -% ======== Using ImageMagick's convert is default here ======== % -% for NetPBM use -cnetpbm in the command line for t4ht run, % -% or exchange <default> </default> tags below, giving % -% <convert> </convert> tags for ImageMagick section % -<default> -Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps -Gconvert -crop 0x0 -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3 -%% alternative for older ImageMagick, instead of the above line -% Ggs -dNOPAUSE -sDEVICE=ppmraw -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -r110x110 -sOutputFile=zz%%4.ppm -q zz%%4.ps -c quit -% Gconvert -crop 0x0 -density 110x110 -transparent '#FFFFFF' zz%%4.ppm %%3 -% Grm zz%%4.ppm -Grm zz%%4.ps -</default> -% ======== Using NetPBM ======== -<netpbm> -Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps -Ggs -sDEVICE=ppm -r110 -sOutputFile=zz%%4.ppm -q -dbatch -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -dNOPAUSE zz%%4.ps -c quit -Gmv zz%%4.ppm temp.ppm -Gpnmcrop temp.ppm > zz%%4.ppm -Gppmtogif -interlace -transparent 1,1,1 zz%%4.ppm > %%3 -Grm zz%%4.ps -Grm zz%%4.ppm -Grm temp.ppm -</netpbm> -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Default scripts, shifted rightward 1 pos -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - s--- needs --- %%1.idv[%%2] ==> %%3 --- - b--- characters --- - g.gif -% empty gifs % - Ecp empty.gif %%1%%2 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% t4ht -d%%2 % -Mmv %%1 %%2%%3 -Ccp %%1 %%2%%3 -% t4ht -d%%2 -m%%1 % -Achmod %%1 %%2%%3 -% removed protection % -S* -% -% * Address for an automatically created bookkeeping file % -% * Remove leading space to activate the record % -% * The work directory is assumed for a default % - lpath/tex4ht.dir/tex4ht.fls -% -% validations, XSTL tranformations,... % - Xmake -f NSGMLS name=%%1 ext=%%2 -% -<oo> -%%% openoffice % -.4os mkdir sxw-%%0.dir -.4os mkdir sxw-%%0.dir/Pictures -.4os mv %%1.4os sxw-%%0.dir/settings.xml -.4os mv %%0.xml sxw-%%0.dir/content.xml -% % -.4om mkdir sxw-%%0.dir/%%1 -.4om mv %%1.4om sxw-%%0.dir/%%1/content.xml -.4om cp sxw-%%0.dir/settings.xml sxw-%%0.dir/%%1/settings.xml -% % -.4of mkdir sxw-%%0.dir/META-INF -.4of mv %%1.4of sxw-%%0.dir/META-INF/manifest.xml -% % -.4ot mv %%1.4ot sxw-%%0.dir/meta.xml -.4oy mv %%1.4oy sxw-%%0.dir/styles.xml -.4og mv %%1 sxw-%%0.dir/Pictures/%%1 -% % -.4ox cd sxw-%%0.dir; zip -r %%0.sxw * ; cd .. -% % -.4ox mv sxw-%%0.dir/%%0.sxw . -% % -.4ox rm %%1.4ox -.4ox rm -r -f sxw-%%0.dir -%%% end openoffice % -</oo> -% -% end of file % - - diff --git a/Build/source/texk/tex4htk/uxhcontext b/Build/source/texk/tex4htk/uxhcontext index 1ebfaab47f4..0bbfd358742 100755 --- a/Build/source/texk/tex4htk/uxhcontext +++ b/Build/source/texk/tex4htk/uxhcontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/uxhlatex b/Build/source/texk/tex4htk/uxhlatex index 2b18683d477..c44d2ff15fa 100755 --- a/Build/source/texk/tex4htk/uxhlatex +++ b/Build/source/texk/tex4htk/uxhlatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/uxhmex b/Build/source/texk/tex4htk/uxhmex index a22cf2c37fb..e507c81edaf 100755 --- a/Build/source/texk/tex4htk/uxhmex +++ b/Build/source/texk/tex4htk/uxhmex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/uxhtex b/Build/source/texk/tex4htk/uxhtex index 8b726e9f43f..9e32dc973b7 100755 --- a/Build/source/texk/tex4htk/uxhtex +++ b/Build/source/texk/tex4htk/uxhtex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/uxhtexi b/Build/source/texk/tex4htk/uxhtexi index f1fc425ac76..5c81e42ba13 100755 --- a/Build/source/texk/tex4htk/uxhtexi +++ b/Build/source/texk/tex4htk/uxhtexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/wcontext b/Build/source/texk/tex4htk/wcontext index 72b5b2d0acb..139e38c4839 100755 --- a/Build/source/texk/tex4htk/wcontext +++ b/Build/source/texk/tex4htk/wcontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -csymhtf t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/wlatex b/Build/source/texk/tex4htk/wlatex index 9a576c84a17..49391b0286c 100755 --- a/Build/source/texk/tex4htk/wlatex +++ b/Build/source/texk/tex4htk/wlatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/wmex b/Build/source/texk/tex4htk/wmex index 03bc3c01c99..68ad16f5d89 100755 --- a/Build/source/texk/tex4htk/wmex +++ b/Build/source/texk/tex4htk/wmex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/wtex b/Build/source/texk/tex4htk/wtex index 92d45352b6a..1b66187b9b3 100755 --- a/Build/source/texk/tex4htk/wtex +++ b/Build/source/texk/tex4htk/wtex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/wtexi b/Build/source/texk/tex4htk/wtexi index 8be956ff6bf..19d5a9f7679 100755 --- a/Build/source/texk/tex4htk/wtexi +++ b/Build/source/texk/tex4htk/wtexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhcontext b/Build/source/texk/tex4htk/xhcontext index cc08a24cbb0..2939b4ec98e 100755 --- a/Build/source/texk/tex4htk/xhcontext +++ b/Build/source/texk/tex4htk/xhcontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/xhcontext.unix b/Build/source/texk/tex4htk/xhcontext.unix deleted file mode 100755 index dcea73d8c16..00000000000 --- a/Build/source/texk/tex4htk/xhcontext.unix +++ /dev/null @@ -1,7 +0,0 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/xhlatex b/Build/source/texk/tex4htk/xhlatex index 50681fc9c8c..2889e48571f 100755 --- a/Build/source/texk/tex4htk/xhlatex +++ b/Build/source/texk/tex4htk/xhlatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhmcontext b/Build/source/texk/tex4htk/xhmcontext index 1ebfaab47f4..0bbfd358742 100755 --- a/Build/source/texk/tex4htk/xhmcontext +++ b/Build/source/texk/tex4htk/xhmcontext @@ -1,5 +1,5 @@ - - texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 +#!/bin/sh + texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf t4ht -f/$1 $4 -cvalidate ## -d~/WWW/temp/ -m644 diff --git a/Build/source/texk/tex4htk/xhmex b/Build/source/texk/tex4htk/xhmex index 48f0149c7d4..d2c5bcdc628 100755 --- a/Build/source/texk/tex4htk/xhmex +++ b/Build/source/texk/tex4htk/xhmex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhmlatex b/Build/source/texk/tex4htk/xhmlatex index d33bc74e6a1..dcad3b785eb 100755 --- a/Build/source/texk/tex4htk/xhmlatex +++ b/Build/source/texk/tex4htk/xhmlatex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhmmex b/Build/source/texk/tex4htk/xhmmex index 52338ffdc0c..8040dad4177 100755 --- a/Build/source/texk/tex4htk/xhmmex +++ b/Build/source/texk/tex4htk/xhmmex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhmtex b/Build/source/texk/tex4htk/xhmtex index dc731575895..e319124551e 100755 --- a/Build/source/texk/tex4htk/xhmtex +++ b/Build/source/texk/tex4htk/xhmtex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhmtexexec b/Build/source/texk/tex4htk/xhmtexexec deleted file mode 100755 index d2d8ad431d3..00000000000 --- a/Build/source/texk/tex4htk/xhmtexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 -cunihtf - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/xhmtexi b/Build/source/texk/tex4htk/xhmtexi index 77f9ee6c72d..b0e412f62ad 100755 --- a/Build/source/texk/tex4htk/xhmtexi +++ b/Build/source/texk/tex4htk/xhmtexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhtex b/Build/source/texk/tex4htk/xhtex index a159c9fd355..50a9cc8e2ce 100755 --- a/Build/source/texk/tex4htk/xhtex +++ b/Build/source/texk/tex4htk/xhtex @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xhtexexec b/Build/source/texk/tex4htk/xhtexexec deleted file mode 100755 index e2cec28146e..00000000000 --- a/Build/source/texk/tex4htk/xhtexexec +++ /dev/null @@ -1,12 +0,0 @@ - - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - echo '\\expandafter\\def\\csname tex4ht\\endcsname {'$2',xhtml}\\input tex4ht.sty \\input' $1 > $1.tmp - texexec $1.tmp - tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3 - t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 - - - diff --git a/Build/source/texk/tex4htk/xhtexi b/Build/source/texk/tex4htk/xhtexi index 20919f0a38f..e704cd665d8 100755 --- a/Build/source/texk/tex4htk/xhtexi +++ b/Build/source/texk/tex4htk/xhtexi @@ -1,4 +1,4 @@ - +#!/bin/sh 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 diff --git a/Build/source/texk/tex4htk/xv4ht.java b/Build/source/texk/tex4htk/xv4ht.java index d83d7be5854..3b76bc06ff0 100644 --- a/Build/source/texk/tex4htk/xv4ht.java +++ b/Build/source/texk/tex4htk/xv4ht.java @@ -1,6 +1,6 @@ /**********************************************************/ -/* xv4ht.java 2005-02-23-01:05 */ -/* Copyright (C) 2005 Eitan M. Gurari */ +/* xv4ht.java 2006-07-03-21:41 */ +/* Copyright (C) 2005--2006 Eitan M. Gurari */ /* */ /* This work may be distributed and/or modified under the */ /* conditions of the LaTeX Project Public License, either */ |