summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf7
-rw-r--r--Build/source/texk/web2c/hitexdir/doc/Makefile4
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/Makefile21
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/README2
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/hilatex.ini10
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex25
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/hiplainpage.tex25
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/hitex.ini8
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/ifhint.tex2
-rw-r--r--Master/texmf-dist/tex/hitex/base/hilatex.ini10
-rw-r--r--Master/texmf-dist/tex/hitex/base/hiltxpage.tex78
-rw-r--r--Master/texmf-dist/tex/hitex/base/hiplainpage.tex60
-rw-r--r--Master/texmf-dist/tex/hitex/base/hitex.ini8
-rw-r--r--Master/texmf-dist/tex/hitex/base/ifhint.tex9
-rw-r--r--Master/texmf-dist/web2c/texmf.cnf7
-rw-r--r--Master/tlpkg/tlpsrc/hitex.tlpsrc15
17 files changed, 288 insertions, 7 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 0cf167addc4..5dc2c549c64 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-05 Karl Berry <karl@freefriends.org>
+
+ * texmf.cnf (TEXINPUTS.hi*tex): new entries.
+
2022-02-27 Karl Berry <karl@tug.org>
* texmf.cnf (nest_size): 500 -> 1000.
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 8e0de981e16..b5d2dfda668 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -281,7 +281,12 @@ TEXINPUTS.context = $TEXMFDOTDIR;$TEXMF/tex/{context,plain,generic,}//
% OpTeX.
TEXINPUTS.optex = $TEXMFDOTDIR;$TEXMF/tex/{optex,plain,generic,}//
-% jadetex.
+% HiTeX.
+TEXINPUTS.hilatex = $TEXMFDOTDIR;$TEXMF/tex/{hilatex,latex,hitex,generic,}//
+TEXINPUTS.hilatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,hilatex,latex,hitex,generic,}//
+TEXINPUTS.hitex = $TEXMFDOTDIR;$TEXMF/tex/{hitex,plain,generic,latex,}//
+
+% JadeTeX.
TEXINPUTS.jadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
TEXINPUTS.pdfjadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
diff --git a/Build/source/texk/web2c/hitexdir/doc/Makefile b/Build/source/texk/web2c/hitexdir/doc/Makefile
index e2257dabe04..c069723a2c5 100644
--- a/Build/source/texk/web2c/hitexdir/doc/Makefile
+++ b/Build/source/texk/web2c/hitexdir/doc/Makefile
@@ -3,7 +3,7 @@
# This is not run as part of the build, just a convenience used by hand
# from the Build/source/... directory.
-INSTALL_DATA = cp -pf
+INSTALL_DATA = cp -pfv
texmf_dist = ../../../../../../Master/texmf-dist
hitex_makeindex_dir = $(texmf_dist)/makeindex/hitex/hint.ist
@@ -13,4 +13,4 @@ install:
$(INSTALL_DATA) hint.ist $(hitex_makeindex_dir)
for f in hiformat.hnt hiformat.pdf hint.sty \
hitexman.hnt hitexman.pdf hitexman.tex; do \
- $(INSTALL_DATA) $$f $(hitex_doc_dir) || exit 1; done
+ $(INSTALL_DATA) $$f $(hitex_doc_dir)/ || exit 1; done
diff --git a/Build/source/texk/web2c/hitexdir/tex/Makefile b/Build/source/texk/web2c/hitexdir/tex/Makefile
new file mode 100644
index 00000000000..0834136eae0
--- /dev/null
+++ b/Build/source/texk/web2c/hitexdir/tex/Makefile
@@ -0,0 +1,21 @@
+# $Id$
+# Standalone Makefile for hitex/tex. Public domain.
+# This is not run as part of the build, just a convenience used by hand
+# from the Build/source/... directory.
+
+INSTALL_DATA = cp -pfv
+
+texmf_dist = ../../../../../../Master/texmf-dist
+hitex_doc_dir = $(texmf_dist)/tex/hitex/base
+#
+install:
+ for f in hilatex.ini hiltxpage.tex hiplainpage.tex \
+ hitex.ini ifhint.tex; do \
+ $(INSTALL_DATA) $$f $(hitex_doc_dir)/ || exit 1; done
+
+fmt: hitex.fmt
+hitex.fmt: hitex.ini
+ hitex -ini -etex -ltx $<
+
+clean:
+ rm -f *.fmt *.log *.aux *.hint *.hnt
diff --git a/Build/source/texk/web2c/hitexdir/tex/README b/Build/source/texk/web2c/hitexdir/tex/README
deleted file mode 100644
index 43edd62fe4d..00000000000
--- a/Build/source/texk/web2c/hitexdir/tex/README
+++ /dev/null
@@ -1,2 +0,0 @@
-q$Id$
-TeX input files for HiTeX. Eventually will end up in the Master/ runtime tree.
diff --git a/Build/source/texk/web2c/hitexdir/tex/hilatex.ini b/Build/source/texk/web2c/hitexdir/tex/hilatex.ini
new file mode 100644
index 00000000000..0eb306ef18b
--- /dev/null
+++ b/Build/source/texk/web2c/hitexdir/tex/hilatex.ini
@@ -0,0 +1,10 @@
+% $Id$
+% Karl Berry, 2022. Public domain.
+\scrollmode
+\let\dumpprimitiveforhilatex\dump % regain control after latex.ltx
+\let\dump\relax
+\input latex.ltx
+\input ifhint.tex
+\input hiltxpage.tex
+\dumpprimitiveforhilatex
+\endinput
diff --git a/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex b/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex
index 7868f6a681a..04573fbdad1 100644
--- a/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex
+++ b/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex
@@ -1,3 +1,28 @@
+% Copyright 2017-2022 Martin Ruckert, Hochschule Muenchen, Lothstrasse 64, 80336 Muenchen
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the "Software"), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+% OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+% THE SOFTWARE.
+%
+% Except as contained in this notice, the name of the copyright holders shall
+% not be used in advertising or otherwise to promote the sale, use or other
+% dealings in this Software without prior written authorization from the
+% copyright holders.
+
\ifhint
\textwidth=\hsize
\textheight=\vsize
diff --git a/Build/source/texk/web2c/hitexdir/tex/hiplainpage.tex b/Build/source/texk/web2c/hitexdir/tex/hiplainpage.tex
index 96afd91e2fa..98255e913c9 100644
--- a/Build/source/texk/web2c/hitexdir/tex/hiplainpage.tex
+++ b/Build/source/texk/web2c/hitexdir/tex/hiplainpage.tex
@@ -1,3 +1,28 @@
+% Copyright 2017-2022 Martin Ruckert, Hochschule Muenchen, Lothstrasse 64, 80336 Muenchen
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the "Software"), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+% OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+% THE SOFTWARE.
+%
+% Except as contained in this notice, the name of the copyright holders shall
+% not be used in advertising or otherwise to promote the sale, use or other
+% dealings in this Software without prior written authorization from the
+% copyright holders.
+
\ifhint
\dimen0=1.25\hsize
\advance\dimen0 by -9pt
diff --git a/Build/source/texk/web2c/hitexdir/tex/hitex.ini b/Build/source/texk/web2c/hitexdir/tex/hitex.ini
new file mode 100644
index 00000000000..5c7f45d5b0a
--- /dev/null
+++ b/Build/source/texk/web2c/hitexdir/tex/hitex.ini
@@ -0,0 +1,8 @@
+% $Id$
+% Karl Berry, 2022. Public domain.
+%\input plain.tex
+\input etex.src
+\input ifhint.tex
+\input hiplainpage.tex
+\dump
+\endinput
diff --git a/Build/source/texk/web2c/hitexdir/tex/ifhint.tex b/Build/source/texk/web2c/hitexdir/tex/ifhint.tex
index 87ae7b4b1c1..b27ed859199 100644
--- a/Build/source/texk/web2c/hitexdir/tex/ifhint.tex
+++ b/Build/source/texk/web2c/hitexdir/tex/ifhint.tex
@@ -1,3 +1,5 @@
+% Public domain. Originally written by Martin Ruckert.
+
\newif\ifhint
% How to test for the HiTeX engine
\expandafter\ifx\csname HINTversion\endcsname\relax
diff --git a/Master/texmf-dist/tex/hitex/base/hilatex.ini b/Master/texmf-dist/tex/hitex/base/hilatex.ini
new file mode 100644
index 00000000000..0eb306ef18b
--- /dev/null
+++ b/Master/texmf-dist/tex/hitex/base/hilatex.ini
@@ -0,0 +1,10 @@
+% $Id$
+% Karl Berry, 2022. Public domain.
+\scrollmode
+\let\dumpprimitiveforhilatex\dump % regain control after latex.ltx
+\let\dump\relax
+\input latex.ltx
+\input ifhint.tex
+\input hiltxpage.tex
+\dumpprimitiveforhilatex
+\endinput
diff --git a/Master/texmf-dist/tex/hitex/base/hiltxpage.tex b/Master/texmf-dist/tex/hitex/base/hiltxpage.tex
new file mode 100644
index 00000000000..04573fbdad1
--- /dev/null
+++ b/Master/texmf-dist/tex/hitex/base/hiltxpage.tex
@@ -0,0 +1,78 @@
+% Copyright 2017-2022 Martin Ruckert, Hochschule Muenchen, Lothstrasse 64, 80336 Muenchen
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the "Software"), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+% OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+% THE SOFTWARE.
+%
+% Except as contained in this notice, the name of the copyright holders shall
+% not be used in advertising or otherwise to promote the sale, use or other
+% dealings in this Software without prior written authorization from the
+% copyright holders.
+
+\ifhint
+\textwidth=\hsize
+\textheight=\vsize
+\newinsert\topins
+\skip\topins=0pt % no space added when a topinsert is present
+\count\topins=1000 % magnification factor (1 to 1)
+\dimen\topins=\maxdimen % no limit per page
+\def\topinsert{\bgroup\setbox0\vbox\bgroup}
+\def\endinsert{\egroup
+ \insert\topins{%
+ \penalty100\splittopskip0pt\floatingpenalty0\box0\nobreak\bigskip\egroup}}
+\dimen0=1.25\hsize
+\advance\dimen0 by -9pt
+\dimen1=1.25\vsize
+\advance\dimen1 by -9pt
+\HINTsetpage1 = basic
+ priority 10
+ width \dimen0
+ height \dimen1
+{%
+ \maxdepth=4pt
+ \topskip=10pt
+ \HINTstream\topins %topinsert
+ \HINTstream0 %main text
+ \HINTstream\footins
+ \HINTsetstream\topins = %topinsert
+ prefered 0
+ {%
+ \HINTafter = {}
+ }
+ \HINTsetstream\footins =%footnotes
+ prefered 255
+ ratio 0
+ {%
+ \hsize=300pt
+ \count\footins=1000 % the magnification factor
+ \skip\footins=\bigskipamount % the extra space needed
+ \dimen\footins=\vsize % maximum height on the page
+ \HINTbefore =
+ {\vskip\skip\footins
+ \footnoterule}
+ \HINTafter = {}
+ }
+}% end page template
+\fi
+
+% the footins had this:
+% \before =
+% {\vskip 0pt plus 1filll\vskip 9pt plus 4pt minus 2pt
+% \kern -3pt
+% \hrule width 5em
+% \kern 2.6pt}
+% }
diff --git a/Master/texmf-dist/tex/hitex/base/hiplainpage.tex b/Master/texmf-dist/tex/hitex/base/hiplainpage.tex
new file mode 100644
index 00000000000..98255e913c9
--- /dev/null
+++ b/Master/texmf-dist/tex/hitex/base/hiplainpage.tex
@@ -0,0 +1,60 @@
+% Copyright 2017-2022 Martin Ruckert, Hochschule Muenchen, Lothstrasse 64, 80336 Muenchen
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the "Software"), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+% OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+% THE SOFTWARE.
+%
+% Except as contained in this notice, the name of the copyright holders shall
+% not be used in advertising or otherwise to promote the sale, use or other
+% dealings in this Software without prior written authorization from the
+% copyright holders.
+
+\ifhint
+ \dimen0=1.25\hsize
+ \advance\dimen0 by -9pt
+ \dimen1=1.25\vsize
+ \advance\dimen1 by -9pt
+\HINTsetpage1 = basic
+ priority 10
+ width \dimen0
+ height \dimen1
+{%
+ \maxdepth=4pt
+ \topskip=10pt
+ \HINTstream\topins %topinsert
+ \HINTstream0 %main text
+ \HINTstream\footins
+ \HINTsetstream\topins = %topinsert
+ prefered 0
+ {%
+ \HINTafter = {}
+ }
+ \HINTsetstream\footins =%footnotes
+ prefered 255
+ ratio 0
+ {%
+ \hsize=300pt
+ \count\footins=1000 % the magnification factor
+ \skip\footins=\bigskipamount % the extra space needed
+ \dimen\footins=\vsize % maximum height on the page
+ \HINTbefore =
+ {\vskip\skip\footins
+ \footnoterule}
+ \HINTafter = {}
+ }
+}% end page template
+\fi
diff --git a/Master/texmf-dist/tex/hitex/base/hitex.ini b/Master/texmf-dist/tex/hitex/base/hitex.ini
new file mode 100644
index 00000000000..5c7f45d5b0a
--- /dev/null
+++ b/Master/texmf-dist/tex/hitex/base/hitex.ini
@@ -0,0 +1,8 @@
+% $Id$
+% Karl Berry, 2022. Public domain.
+%\input plain.tex
+\input etex.src
+\input ifhint.tex
+\input hiplainpage.tex
+\dump
+\endinput
diff --git a/Master/texmf-dist/tex/hitex/base/ifhint.tex b/Master/texmf-dist/tex/hitex/base/ifhint.tex
new file mode 100644
index 00000000000..b27ed859199
--- /dev/null
+++ b/Master/texmf-dist/tex/hitex/base/ifhint.tex
@@ -0,0 +1,9 @@
+% Public domain. Originally written by Martin Ruckert.
+
+\newif\ifhint
+% How to test for the HiTeX engine
+\expandafter\ifx\csname HINTversion\endcsname\relax
+ \hintfalse
+\else
+ \hinttrue
+\fi
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index 8e0de981e16..b5d2dfda668 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -281,7 +281,12 @@ TEXINPUTS.context = $TEXMFDOTDIR;$TEXMF/tex/{context,plain,generic,}//
% OpTeX.
TEXINPUTS.optex = $TEXMFDOTDIR;$TEXMF/tex/{optex,plain,generic,}//
-% jadetex.
+% HiTeX.
+TEXINPUTS.hilatex = $TEXMFDOTDIR;$TEXMF/tex/{hilatex,latex,hitex,generic,}//
+TEXINPUTS.hilatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,hilatex,latex,hitex,generic,}//
+TEXINPUTS.hitex = $TEXMFDOTDIR;$TEXMF/tex/{hitex,plain,generic,latex,}//
+
+% JadeTeX.
TEXINPUTS.jadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
TEXINPUTS.pdfjadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
diff --git a/Master/tlpkg/tlpsrc/hitex.tlpsrc b/Master/tlpkg/tlpsrc/hitex.tlpsrc
index c1adbab3c85..a3fdf4b35d1 100644
--- a/Master/tlpkg/tlpsrc/hitex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hitex.tlpsrc
@@ -1,9 +1,22 @@
+category TLCore
+
+tlpsetvar fmtcomm cm,hyphen-base
+#
+execute AddFormat name=hitex engine=hitex patterns=language.def \
+ options="-etex -ltx hitex.ini" \
+ fmttriggers=${fmtcomm},etex,plain
+#
+execute AddFormat name=hilatex engine=hitex patterns=language.dat \
+ options="-etex -ltx hilatex.ini" \
+ fmttriggers=${global_latex_deps}
+
binpattern f bin/${ARCH}/hishrink
binpattern f bin/${ARCH}/histretch
binpattern f bin/${ARCH}/hitex
+runpattern d texmf-dist/tex/hitex/base
+
docpattern d texmf-dist/doc/hitex/base
-#
docpattern f texmf-dist/doc/man/man1/hishrink.*
docpattern f texmf-dist/doc/man/man1/histretch.*
docpattern f texmf-dist/doc/man/man1/hitex.*