diff options
-rw-r--r-- | Master/texmf-dist/doc/hitex/base/hiformat.hnt | bin | 1114325 -> 1129777 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/hitex/base/hiformat.pdf | bin | 1255399 -> 1288384 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/hitex/base/hintmac.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/hitex/base/hitexman.hnt | bin | 541228 -> 541120 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/hitex/base/hitexman.pdf | bin | 234052 -> 234052 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/hitex/base/hilatex.ini | 1 | ||||
-rw-r--r-- | Master/texmf-dist/tex/hitex/base/hiltxpage.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/hitex/base/hiplainpage.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/hitex/base/hitex.ini | 1 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 2 | ||||
-rw-r--r-- | Master/tlpkg/doc/releng.txt | 26 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/hitex.tlpsrc | 4 |
12 files changed, 28 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/hitex/base/hiformat.hnt b/Master/texmf-dist/doc/hitex/base/hiformat.hnt Binary files differindex 5e37fa75670..44414a303c7 100644 --- a/Master/texmf-dist/doc/hitex/base/hiformat.hnt +++ b/Master/texmf-dist/doc/hitex/base/hiformat.hnt diff --git a/Master/texmf-dist/doc/hitex/base/hiformat.pdf b/Master/texmf-dist/doc/hitex/base/hiformat.pdf Binary files differindex 4057b5749c3..2c952afbc46 100644 --- a/Master/texmf-dist/doc/hitex/base/hiformat.pdf +++ b/Master/texmf-dist/doc/hitex/base/hiformat.pdf diff --git a/Master/texmf-dist/doc/hitex/base/hintmac.tex b/Master/texmf-dist/doc/hitex/base/hintmac.tex index 1fa9d7232f2..e57b4ef4763 100644 --- a/Master/texmf-dist/doc/hitex/base/hintmac.tex +++ b/Master/texmf-dist/doc/hitex/base/hintmac.tex @@ -198,7 +198,7 @@ \def\TUG{\TeX\ \UG} \def\tug{\acro{TUG}} \def\UG{Users Group} -\ifacro +\ifpdf \sanitizecommand{\TeX}{TeX} \sanitizecommand{\eTeX}{eTeX} \sanitizecommand{\Prote}{PRoTE} @@ -1503,7 +1503,7 @@ \else\ifpdf \def\includefig#1{\leavevmode\hbox{\immediate\pdfximage{image/#1.pdf}\pdfrefximage\pdflastximage}} \else\ifhint - \def\includefig#1{\image=image/#1.png\relax} + \def\includefig#1{\HINTimage=image/#1.png\relax} \else \input epsf.tex \def\includefig#1{\epsfbox{image/#1.eps}}% this is a \leavevmode\hbox{...} diff --git a/Master/texmf-dist/doc/hitex/base/hitexman.hnt b/Master/texmf-dist/doc/hitex/base/hitexman.hnt Binary files differindex ac7d0cc3562..75a71233620 100644 --- a/Master/texmf-dist/doc/hitex/base/hitexman.hnt +++ b/Master/texmf-dist/doc/hitex/base/hitexman.hnt diff --git a/Master/texmf-dist/doc/hitex/base/hitexman.pdf b/Master/texmf-dist/doc/hitex/base/hitexman.pdf Binary files differindex 4cfaf2b1b24..c6b3608548b 100644 --- a/Master/texmf-dist/doc/hitex/base/hitexman.pdf +++ b/Master/texmf-dist/doc/hitex/base/hitexman.pdf diff --git a/Master/texmf-dist/tex/hitex/base/hilatex.ini b/Master/texmf-dist/tex/hitex/base/hilatex.ini index f74f17983e0..af79c0ea027 100644 --- a/Master/texmf-dist/tex/hitex/base/hilatex.ini +++ b/Master/texmf-dist/tex/hitex/base/hilatex.ini @@ -1,4 +1,3 @@ -% $Id: hilatex.ini 62436 2022-03-05 17:45:17Z karl $ % Karl Berry, 2022. Public domain. \scrollmode \let\dumpprimitiveforhilatex\dump % regain control after latex.ltx diff --git a/Master/texmf-dist/tex/hitex/base/hiltxpage.tex b/Master/texmf-dist/tex/hitex/base/hiltxpage.tex index 17f2b2828c7..c499b9d94bc 100644 --- a/Master/texmf-dist/tex/hitex/base/hiltxpage.tex +++ b/Master/texmf-dist/tex/hitex/base/hiltxpage.tex @@ -55,12 +55,12 @@ \HINTstream0 %main text \HINTstream\footins \HINTsetstream\topins = %topinsert - prefered 0 + preferred 0 {% \HINTafter = {} } \HINTsetstream\footins =%footnotes - prefered 255 + preferred 255 ratio 0 {% \hsize=300pt diff --git a/Master/texmf-dist/tex/hitex/base/hiplainpage.tex b/Master/texmf-dist/tex/hitex/base/hiplainpage.tex index b552595fcd9..4570af23ddc 100644 --- a/Master/texmf-dist/tex/hitex/base/hiplainpage.tex +++ b/Master/texmf-dist/tex/hitex/base/hiplainpage.tex @@ -45,12 +45,12 @@ \HINTstream0 %main text \HINTstream\footins \HINTsetstream\topins = %topinsert - prefered 0 + preferred 0 {% \HINTafter = {} } \HINTsetstream\footins =%footnotes - prefered 255 + preferred 255 ratio 0 {% \hsize=300pt diff --git a/Master/texmf-dist/tex/hitex/base/hitex.ini b/Master/texmf-dist/tex/hitex/base/hitex.ini index f1b08dac54b..206e3780075 100644 --- a/Master/texmf-dist/tex/hitex/base/hitex.ini +++ b/Master/texmf-dist/tex/hitex/base/hitex.ini @@ -1,4 +1,3 @@ -% $Id: hitex.ini 62436 2022-03-05 17:45:17Z karl $ % Karl Berry, 2022. Public domain. %\input plain.tex \input etex.src diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index 78c99d98538..3307fe92a32 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -208,6 +208,8 @@ for tlplat in $tlplats; do # then "Publish release" (not as pre-release, can't be accessed). # After ~30min max, should have new release tarballs at: # https://github.com/TeX-Live/texlive-source/releases + # (this is a different page than where you're put after creating + # the release) # If failure, check: # https://www.travis-ci.org/TeX-Live/texlive-source # diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index fe950235ec9..20d9ae74e7c 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -102,7 +102,9 @@ and get updated again. 0. Ensure that /home/texlive/branch from before last pretest-specific commit is created, clean, and up to date: see item 6 just above. -0b. In crontab, comment out "update tlnet from trunk" entry. +0b. In crontab, disable "update tlnet from trunk" entry, +and also disable cron.synctl entry so it doesn't interfere/lock +the repo while we're working. 1. Set up tlpretest: Update /home/ftp/texlive/tlpretest/README.md. @@ -139,7 +141,9 @@ Run tl-update-asy --build on tug to make new support files ready. 6. Run tex \\end to check that dynamic mktexfmt works. Ensure that web2c/texmf.cnf is updated for the current year (per above). -6a. Run fmtutil-user --all>&/tmp/fua to check that all formats build ok. +6a. Check that all formats build ok: +fmtutil-user --all >&/tmp/fua +egrep -i 'ERROR|failed' /tmp/fua 6b. (For karl@tug.org: leave new ~karl/.texlive`date +%Y` for bnb. Also run mtxrun --generate to be able to run ConTeXt.) @@ -149,6 +153,10 @@ Also run mtxrun --generate to be able to run ConTeXt.) diff -ru0 --exclude=man --exclude=info \ Build/source/inst/texmf-dist Master/texmf-dist +7b. HiTeX: make install in hitexdir/tex and hitexdir/doc. + +7c. Asymptote: install new runtime files per tl-update-asy. + 8. Now, finally, try a first update of tlpretest: env force_rebuild=true ~karl/bin/cron.pretest # ~15min This will fail because the pretest dir is not yet set up, but @@ -162,7 +170,7 @@ When removing platforms, have to remove from /home/texlive/trunk. 9. After a trial build goes ok, set up tlpretest: cd /home/ftp/texlive/tlpretest cp -ar ../tlnet/[a-u]* . # omit tlnet/README* - env force_rebuild=true cron.pretest # update repository + env force_rebuild=true cron.pretest # will update repository, hopefully We use cp -a because we want to start with exactly the last tlnet, and not recreate all packages, so that a file with a given name is never rewritten. See recreate comments in tl-update-tlpdb and tl-update-containers. @@ -171,8 +179,8 @@ rewritten. See recreate comments in tl-update-tlpdb and tl-update-containers. tlpretest, and keep this installation updated daily as normal users do, that is, with tlmgr update --self --all. -9c. Update other automatically-built binary sets, and ask tlbuild to -build all (including asymptote). +9c. Update other automatically-built binary sets, +and ask tlbuild to build all (including asymptote). 9d. In 2020, as a special case, after a first successful build, this was run: tl-fix-container-links @@ -185,9 +193,10 @@ described in item I.6. For safety, let's do a trial build from the new branch to a temporary destination, say /home/texlive/tmp, before updating the real tlnet. Initialize the tmp dir as above with tlpretest, item 9): + mkdir /home/texlive/tmp cd /home/texlive/tmp rm -rf * - cp -ar ~ftp/texlive/tlnet/[a-u]* . # omit tlnet/README* + time cp -ar ~ftp/texlive/tlnet/[a-u]* . # omit tlnet/README* 10a. Edit ~karl/bin/cron.tl: - use /home/texlive/tmp instead of $ftp/tlnet for tlnet_dir; @@ -200,8 +209,9 @@ There will be no linked_scripts dir (no build done), but that's ok; we won't be installing binaries from a build. 11. In cron.tl, set critical= , net_frozen=false, and - return to regular catalogue_compare=true updates. - In the crontab, enable the pretest entries. + return to regular catalogue_compare=true biweekly updates. + In the crontab, enable the pretest entries, + and re-enable cron.synctl. 12. Life and daily updates resume: run c2l to update trunk->tlpretest, c2b to update branch->tlnet. Of course, don't update the branch if a diff --git a/Master/tlpkg/tlpsrc/hitex.tlpsrc b/Master/tlpkg/tlpsrc/hitex.tlpsrc index 63e4e252c8e..3c6ac49d7ba 100644 --- a/Master/tlpkg/tlpsrc/hitex.tlpsrc +++ b/Master/tlpkg/tlpsrc/hitex.tlpsrc @@ -2,11 +2,11 @@ category TLCore tlpsetvar fmtcomm cm,hyphen-base # -execute AddFormat name=hitex engine=hitex mode=disabled patterns=language.def \ +execute AddFormat name=hitex engine=hitex patterns=language.def \ options="-etex -ltx hitex.ini" \ fmttriggers=${fmtcomm},etex,knuth-lib,plain # -execute AddFormat name=hilatex mode=disabled engine=hitex \ +execute AddFormat name=hilatex engine=hitex \ patterns=language.dat \ options="-etex -ltx hilatex.ini" \ fmttriggers=${global_latex_deps} |