From 0d938df7b3a7c5c29ee7c3416d664240088cfa8e Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Tue, 31 Dec 2024 09:44:00 +0000 Subject: [PATCH 01/15] Increment tally in tprint also when doterm is true (thanks to user202729@protonmail.com). Avoid useless 0 beginbfrange endbfrange in pdf. LuaTeX 1.19.4 git-svn-id: svn://tug.org/texlive/trunk/Build@73242 c570f23f-e606-0410-a88d-b1316a301751 From 0e21b5da5ccb87392f8e6252c703b39c760ce4e5 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Tue, 31 Dec 2024 14:49:02 +0000 Subject: [PATCH 02/15] [CTWILL] Append 'Names of the sections'. git-svn-id: svn://tug.org/texlive/trunk/Build@73243 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/cwebdir/ChangeLog | 4 +++ .../web2c/cwebdir/texinputs/pdfctwimac.tex | 29 ++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/source/texk/web2c/cwebdir/ChangeLog b/source/texk/web2c/cwebdir/ChangeLog index 358dc98cb..5970631a4 100644 --- a/source/texk/web2c/cwebdir/ChangeLog +++ b/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,7 @@ +2024-12-31 Andreas Scherer + + * texinputs/pdfctwimac.tex: Append 'Names of the sections'. + 2024-12-27 Andreas Scherer * ctwill-mini.ch, diff --git a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index 8fafb4649..28cd27602 100644 --- a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -504,14 +504,13 @@ \hsize=\pagewidth \vsize=\maxdimen \output={\twillout} %\let\page=\pagebody \raggedbottom -% \def\page{\box255 }\normalbottom % faster, but loses plain TeX footnotes -%\def\normaloutput#1#2#3{\ifodd\pageno\hoffset=\pageshift\fi - %\shipout\vbox{ - %\vbox to\fullpageheight{ - %\iftitle\global\titlefalse - %\else\hbox to\pagewidth{\vbox to10pt{}\ifodd\pageno #3\else#2\fi}\fi - %\vfill#1}} % parameter #1 is the page itself - %\global\advance\pageno by1} +\def\page{\box255 }\normalbottom % faster, but loses plain TeX footnotes +\def\normaloutput#1#2#3{\shipout\vbox{\vbox to\fullpageheight{% + \iftitle\global\titlefalse + \else\hbox to\pagewidth{\vbox to10pt{}% + \ifodd\pageno\vbox to3pc{#3\vfill}\else\vbox to3pc{#2\vfill}\fi}\fi + #1\vfill}} % parameter #1 is the page itself + \global\advance\pageno by1} %\def\topofcontents{\centerline{\titlefont\title}\vskip.7in %\vfill} % this material will start the table of contents page %\def\botofcontents{\vfill @@ -520,7 +519,7 @@ \def\contentspagenumber{0} % default page number for table of contents %\newdimen\pageshift \pageshift=\hoffset %% shift righthand pages wrt lefthand ones (changed in version 3.70) -%\def\setpage{\hsize\pagewidth\vsize\pageheight} % use after changing page size +\def\setpage{\hsize\pagewidth\vsize\pageheight} % use after changing page size \def\contentsfile{\jobname.toc} % file that gets table of contents info \def\readcontents{\input \contentsfile} \def\readsections{\input \jobname.scn} @@ -536,16 +535,20 @@ \immediate\write\cont{\catcode `\noexpand\@=12\relax} % \makeatother \immediate\closeout\cont % the contents information has been fully gathered \fi} -\def\fin{\ifacro \message{Section names:} - \def\U##1.{} \def\Us##1.{} \def\Q##1.{} \def\Qs##1.{} \let\I=\relax \let\*=* - \newrefs={} \output={\shipout\box255} +\def\fin{\ifacro \message{Section names:} \let\Xpdf\X + \def\U##1.{} \def\Us##1.{} \def\Q##1.{} \def\Qs##1.{} + \def\I{\par\hangindent 2em\noindent}\let\*=* + \def\rlhead{NAMES OF THE SECTIONS} % running left headline + \let\rrhead=\rlhead % running right headline + \output={\normaloutput\page\rightheadline\leftheadline} + \setpage \def\outsecname{Names of the sections} \ifpdflua \makebookmarks \countsections \pdfdest name {NOS} fith \pdfoutline goto name {NOS} count -\the\countNOS {\outsecname} \else \special{pdf: outline -1 << /Title (\outsecname) /Dest [ @thispage /FitH @ypos ] >>}\fi - \def\X##1:##2\X{\firstsecno##1.% + \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\makeoutlinetoks##2\outlinedone}% \ifpdflua \pdfoutline goto num \the\toksA \expandafter{\the\toksE} \else \special{pdf: outline 0 << /Title (\the\toksE) From 4aaf91f798bc5de91bdba678be8c86299d4198b4 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Tue, 31 Dec 2024 21:34:20 +0000 Subject: [PATCH 03/15] [CTWILL] Add 'notes' to the 'Names of the sections'. A set of recently created PDF files from MMIXware can be studied here: https://github.com/ascherer/mmix/releases/tag/2023-11-25 in both plain CWEB and in CTWILL format. git-svn-id: svn://tug.org/texlive/trunk/Build@73245 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index 28cd27602..f9f9845d3 100644 --- a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -536,7 +536,11 @@ \immediate\closeout\cont % the contents information has been fully gathered \fi} \def\fin{\ifacro \message{Section names:} \let\Xpdf\X - \def\U##1.{} \def\Us##1.{} \def\Q##1.{} \def\Qs##1.{} + \def\note##1##2.{\quad{\eightrm##1~\pdfnote##2.}} + \def\Q{\note{Cited in section}} % crossref for mention of a section + \def\Qs{\note{Cited in sections}} % crossref for mentions of a section + \def\U{\note{Used in section}} % crossref for use of a section + \def\Us{\note{Used in sections}} % crossref for uses of a section \def\I{\par\hangindent 2em\noindent}\let\*=* \def\rlhead{NAMES OF THE SECTIONS} % running left headline \let\rrhead=\rlhead % running right headline From e33a39c4cdd2d168a87d1bc7f8b399ca046f5d73 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 31 Dec 2024 22:40:01 +0000 Subject: [PATCH 04/15] copyright year git-svn-id: svn://tug.org/texlive/trunk/Build@73251 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/lib/ChangeLog | 4 ++++ source/texk/web2c/lib/printversion.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/texk/web2c/lib/ChangeLog b/source/texk/web2c/lib/ChangeLog index 0d7a53e8c..f022d1a81 100644 --- a/source/texk/web2c/lib/ChangeLog +++ b/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,7 @@ +2025-01-01 Akira Kakuto + + * printversion.c: Update copyright year. + 2024-04-14 TANAKA Takuji * Makefile.am: Remove eptex. diff --git a/source/texk/web2c/lib/printversion.c b/source/texk/web2c/lib/printversion.c index 1a0e12b69..a05afe48c 100644 --- a/source/texk/web2c/lib/printversion.c +++ b/source/texk/web2c/lib/printversion.c @@ -56,7 +56,7 @@ printversionandexit (const_string banner, #endif if (copyright_holder) { - printf ("Copyright 2024 %s.\n", copyright_holder); + printf ("Copyright 2025 %s.\n", copyright_holder); if (!author) author = copyright_holder; } From bc46ff1df5f2efc0b08687cfbbe07baebdee2403 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 1 Jan 2025 10:13:31 +0000 Subject: [PATCH 05/15] [CTWILL] Reduce font size in 'notes'. The is typeset in \tenrm and the associated section number(s) in \sevenrm. Placing a 'note' next to it in \eightrm shows a significant size increase in the referenced section number. (\sixrm--- though available in [pdf]ctwimac.tex---makes the number(s) too tiny.) git-svn-id: svn://tug.org/texlive/trunk/Build@73254 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index f9f9845d3..ab2d2f1c2 100644 --- a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -536,7 +536,7 @@ \immediate\closeout\cont % the contents information has been fully gathered \fi} \def\fin{\ifacro \message{Section names:} \let\Xpdf\X - \def\note##1##2.{\quad{\eightrm##1~\pdfnote##2.}} + \def\note##1##2.{\quad{\eightrm##1~{\sevenrm\pdfnote##2.}}} \def\Q{\note{Cited in section}} % crossref for mention of a section \def\Qs{\note{Cited in sections}} % crossref for mentions of a section \def\U{\note{Used in section}} % crossref for use of a section From f07f3d9d400624349721186f2da98d79b615c8b6 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 1 Jan 2025 10:24:16 +0000 Subject: [PATCH 06/15] [CTWILL] Add missing full stop. git-svn-id: svn://tug.org/texlive/trunk/Build@73256 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index ab2d2f1c2..b8beba708 100644 --- a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -536,7 +536,7 @@ \immediate\closeout\cont % the contents information has been fully gathered \fi} \def\fin{\ifacro \message{Section names:} \let\Xpdf\X - \def\note##1##2.{\quad{\eightrm##1~{\sevenrm\pdfnote##2.}}} + \def\note##1##2.{\quad{\eightrm##1~{\sevenrm\pdfnote##2.}.}} \def\Q{\note{Cited in section}} % crossref for mention of a section \def\Qs{\note{Cited in sections}} % crossref for mentions of a section \def\U{\note{Used in section}} % crossref for use of a section From 995b16bd6f4134eee4dd2e432660f0fdd7c3769e Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 1 Jan 2025 14:46:26 +0000 Subject: [PATCH 07/15] [CWEB] New release 4.12.1. * Fix a few sorting errors in the 'Names of the sections'. * Rename the PDF page dimentions in [pdf}ctwimac.tex. * Append the 'Names of the sections' in CTWILL PDF output. git-svn-id: svn://tug.org/texlive/trunk/Build@73258 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/ChangeLog | 4 +++ source/texk/web2c/ctangleboot.cin | 2 +- source/texk/web2c/cwebdir/ChangeLog | 27 +++++++++++++++++++ source/texk/web2c/cwebdir/Makefile | 6 ++--- source/texk/web2c/cwebdir/comm-mac.ch | 4 +-- source/texk/web2c/cwebdir/comm-mini.ch | 4 +-- source/texk/web2c/cwebdir/comm-ql.ch | 8 +++--- source/texk/web2c/cwebdir/comm-w2c.ch | 8 +++--- source/texk/web2c/cwebdir/comm-w2c.h | 2 +- source/texk/web2c/cwebdir/common.h | 2 +- source/texk/web2c/cwebdir/common.w | 6 ++--- source/texk/web2c/cwebdir/ctang-bs.ch | 4 +-- source/texk/web2c/cwebdir/ctang-pc.ch | 4 +-- source/texk/web2c/cwebdir/ctang-ql.ch | 8 +++--- source/texk/web2c/cwebdir/ctang-vms.ch | 4 +-- source/texk/web2c/cwebdir/ctang-w2c.ch | 12 ++++----- source/texk/web2c/cwebdir/ctang-w32.ch | 4 +-- source/texk/web2c/cwebdir/ctangle.c | 2 +- source/texk/web2c/cwebdir/ctangle.w | 8 +++--- source/texk/web2c/cwebdir/ctwill-w2c.ch | 12 ++++----- source/texk/web2c/cwebdir/cweav-bs.ch | 4 +-- source/texk/web2c/cwebdir/cweav-pc.ch | 4 +-- source/texk/web2c/cwebdir/cweav-ql.ch | 8 +++--- source/texk/web2c/cwebdir/cweav-vms.ch | 4 +-- source/texk/web2c/cwebdir/cweav-w2c.ch | 12 ++++----- source/texk/web2c/cwebdir/cweav-w32.ch | 4 +-- source/texk/web2c/cwebdir/cweave.w | 8 +++--- source/texk/web2c/cwebdir/cwebacromac.tex | 2 +- source/texk/web2c/cwebdir/cwebmac.tex | 4 +-- source/texk/web2c/cwebdir/cwebman-w2c.ch | 14 +++++----- source/texk/web2c/cwebdir/cwebman.tex | 6 ++--- source/texk/web2c/cwebdir/po/cweb-tl.pot | 10 +++---- source/texk/web2c/cwebdir/po/cweb.pot | 6 ++--- source/texk/web2c/cwebdir/po/de/cweb-tl.po | 8 +++--- source/texk/web2c/cwebdir/po/de/cweb.po | 20 +++++++------- source/texk/web2c/cwebdir/po/de/web2c-help.po | 8 +++--- source/texk/web2c/cwebdir/po/it/cweb.po | 20 +++++++------- source/texk/web2c/cwebdir/po/web2c-help.pot | 4 +-- source/texk/web2c/cwebdir/prod-cweave.w | 2 +- source/texk/web2c/cwebdir/prod-twill.w | 2 +- source/texk/web2c/cwebdir/prod.w | 2 +- source/texk/web2c/man/ChangeLog | 4 +++ source/texk/web2c/man/ctwill.man | 4 +-- 43 files changed, 163 insertions(+), 128 deletions(-) diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog index 2262e95a6..c3870c14b 100644 --- a/source/texk/web2c/ChangeLog +++ b/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2025-01-01 Andreas Scherer + + * ctangleboot.cin: CWEB 4.12.1 release. + 2024-12-01 Luigi Scarso * doc/luatex: development LuaTeX Reference Manual, kept in sync with diff --git a/source/texk/web2c/ctangleboot.cin b/source/texk/web2c/ctangleboot.cin index 3483628ef..b0118c268 100644 --- a/source/texk/web2c/ctangleboot.cin +++ b/source/texk/web2c/ctangleboot.cin @@ -28,7 +28,7 @@ /*:5*/ #line 67 "cwebdir/ctangle.w" -#define banner "This is CTANGLE, Version 4.12" \ +#define banner "This is CTANGLE, Version 4.12.1" \ \ #define _(s) gettext(s) \ diff --git a/source/texk/web2c/cwebdir/ChangeLog b/source/texk/web2c/cwebdir/ChangeLog index 5970631a4..267e40eb4 100644 --- a/source/texk/web2c/cwebdir/ChangeLog +++ b/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,30 @@ +2025-01-01 Andreas Scherer + + * Makefile, + * comm-{mac,mini,ql,w2c}.ch, + * comm-w2c.h, + * common.h, + * common.w, + * ctang-{bs,pc,ql,vms,w2c,w32}.ch, + * ctangle.c, + * ctangle.w, + * ctwill-w2c.ch, + * cweav-{bs,pc,ql,vms,w2c,w32}.ch, + * cweave.w, + * cwebacromac.tex, + * cwebmac.tex, + * cwebman-w2c.ch, + * cwebman.tex, + * po/cweb-tl.pot, + * po/cweb.pot, + * po/de/cweb-tl.po, + * po/de/cweb.po, + * po/de/web2c-help.po, + * po/it/cweb.po, + * po/web2c-help.pot, + * prod-{cweave,twill}.w, + * prod.w: CWEB 4.12.1 release. + 2024-12-31 Andreas Scherer * texinputs/pdfctwimac.tex: Append 'Names of the sections'. diff --git a/source/texk/web2c/cwebdir/Makefile b/source/texk/web2c/cwebdir/Makefile index a11936f98..af72873bf 100644 --- a/source/texk/web2c/cwebdir/Makefile +++ b/source/texk/web2c/cwebdir/Makefile @@ -1,6 +1,6 @@ # This file is part of CWEB. # It is distributed WITHOUT ANY WARRANTY, express or implied. -# Version 4.12 --- August 2024 +# Version 4.12.1 --- January 2025 # Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -216,6 +216,6 @@ tarball: tar zcvhf /tmp/cweb.tgz $(ALL) examples ctan: - git archive -o ~/cweb-4.12.zip --prefix=cweb/ cweb-4.12 + git archive -o ~/cweb-4.12.1.zip --prefix=cweb/ cweb-4.12.1 make PDF=pdf usermanual - cd ..; zip -r ~/cweb-4.12.zip cweb/cwebman.pdf + cd ..; zip -r ~/cweb-4.12.1.zip cweb/cwebman.pdf diff --git a/source/texk/web2c/cwebdir/comm-mac.ch b/source/texk/web2c/cwebdir/comm-mac.ch index 1540a9a4e..50b562739 100644 --- a/source/texk/web2c/cwebdir/comm-mac.ch +++ b/source/texk/web2c/cwebdir/comm-mac.ch @@ -4,9 +4,9 @@ No changes to CTANGLE or CWEAVE are needed. (Contributed 13 Oct 2000 by AndPio@aol.com; slightly edited by Don Knuth) @x in limbo, change the title page document to specify Mac version - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} @y - \centerline{(Version 4.12 for MacOS)} + \centerline{(Version 4.12.1 for MacOS)} @z @x section 23: Make input_ln accept \n, \r, \n\r, or \r\n as line endings diff --git a/source/texk/web2c/cwebdir/comm-mini.ch b/source/texk/web2c/cwebdir/comm-mini.ch index adf9fc0c2..e9ffe8f1f 100644 --- a/source/texk/web2c/cwebdir/comm-mini.ch +++ b/source/texk/web2c/cwebdir/comm-mini.ch @@ -1,9 +1,9 @@ Limbo. @x -\def\title{Common code for CTANGLE and CWEAVE (4.12 [\TeX~Live])} +\def\title{Common code for CTANGLE and CWEAVE (4.12.1 [\TeX~Live])} @y -\def\title{COMMON (4.12 [\TeX~Live])} +\def\title{COMMON (4.12.1 [\TeX~Live])} \def\contentspagenumber{0} @z diff --git a/source/texk/web2c/cwebdir/comm-ql.ch b/source/texk/web2c/cwebdir/comm-ql.ch index 8510fc093..31fe2966e 100644 --- a/source/texk/web2c/cwebdir/comm-ql.ch +++ b/source/texk/web2c/cwebdir/comm-ql.ch @@ -10,24 +10,24 @@ ex cc;'-v -h -c -=500000 -DCWEBINPUTS=flp2_ common_c' @x \def\v{\char'174} % vertical (|) in typewriter font -\def\title{Common code for CTANGLE and CWEAVE (Version 4.12)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.12.1)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} \vfill} \def\botofcontents{\vfill \noindent @y \def\v{\char'174} % vertical (|) in typewriter font -\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.12)} +\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.12.1)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} \vfill} \def\botofcontents{\vfill \noindent diff --git a/source/texk/web2c/cwebdir/comm-w2c.ch b/source/texk/web2c/cwebdir/comm-w2c.ch index f0d5b6a80..41507b2f5 100644 --- a/source/texk/web2c/cwebdir/comm-w2c.ch +++ b/source/texk/web2c/cwebdir/comm-w2c.ch @@ -17,16 +17,16 @@ @q Please send comments, suggestions, etc. to tex-k@@tug.org. @> @x [0.0] l.25 -\def\title{Common code for CTANGLE and CWEAVE (Version 4.12)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.12.1)} @y \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi -\def\title{Common code for CTANGLE and CWEAVE (4.12 [\TeX~Live])} +\def\title{Common code for CTANGLE and CWEAVE (4.12.1 [\TeX~Live])} @z @x [0.0] l.30 - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} @y - \centerline{(Version 4.12 [\TeX~Live])} + \centerline{(Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.32 diff --git a/source/texk/web2c/cwebdir/comm-w2c.h b/source/texk/web2c/cwebdir/comm-w2c.h index 154371c4f..908855471 100644 --- a/source/texk/web2c/cwebdir/comm-w2c.h +++ b/source/texk/web2c/cwebdir/comm-w2c.h @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 (works also with later versions) +% Version 4.12.1 --- January 2025 (works also with later versions) % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth diff --git a/source/texk/web2c/cwebdir/common.h b/source/texk/web2c/cwebdir/common.h index 2e02af934..30b00cb78 100644 --- a/source/texk/web2c/cwebdir/common.h +++ b/source/texk/web2c/cwebdir/common.h @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 (works also with later versions) +% Version 4.12.1 --- January 2025 (works also with later versions) % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth diff --git a/source/texk/web2c/cwebdir/common.w b/source/texk/web2c/cwebdir/common.w index 1c077736b..f54df852a 100644 --- a/source/texk/web2c/cwebdir/common.w +++ b/source/texk/web2c/cwebdir/common.w @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 +% Version 4.12.1 --- january 2025 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -22,12 +22,12 @@ \def\v{\char'174} % vertical (|) in typewriter font -\def\title{Common code for CTANGLE and CWEAVE (Version 4.12)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.12.1)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} \vfill} \def\botofcontents{\vfill \noindent diff --git a/source/texk/web2c/cwebdir/ctang-bs.ch b/source/texk/web2c/cwebdir/ctang-bs.ch index 234f41039..f874351c5 100644 --- a/source/texk/web2c/cwebdir/ctang-bs.ch +++ b/source/texk/web2c/cwebdir/ctang-bs.ch @@ -17,12 +17,12 @@ by using "huge" pointers. The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @y The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.12pc/big)" +@d banner "This is CTANGLE (Version 4.12.1pc/big)" @z diff --git a/source/texk/web2c/cwebdir/ctang-pc.ch b/source/texk/web2c/cwebdir/ctang-pc.ch index 61db92aa7..47066fffc 100644 --- a/source/texk/web2c/cwebdir/ctang-pc.ch +++ b/source/texk/web2c/cwebdir/ctang-pc.ch @@ -9,9 +9,9 @@ that allows >64K arrays. If you need lots of bytes and toks, try the alternate change files with -bs suffix instead of -pc. @x section 1 -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @y -@d banner "This is CTANGLE (Version 4.12pc)" +@d banner "This is CTANGLE (Version 4.12.1pc)" @z @x section 17 @d max_bytes 100000 /* the number of bytes in identifiers, diff --git a/source/texk/web2c/cwebdir/ctang-ql.ch b/source/texk/web2c/cwebdir/ctang-ql.ch index 41831c850..105634960 100644 --- a/source/texk/web2c/cwebdir/ctang-ql.ch +++ b/source/texk/web2c/cwebdir/ctang-ql.ch @@ -7,15 +7,15 @@ ex cc;"-v -h -c -=500000 ctangle_c" @x -\def\title{CTANGLE (Version 4.12)} +\def\title{CTANGLE (Version 4.12.1)} @y -\def\title{CTANGLE (QL Version 4.12)} +\def\title{CTANGLE (QL Version 4.12.1)} @z @x section 1 -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @y -@d banner "This is CTANGLE (QL Version 4.12)" +@d banner "This is CTANGLE (QL Version 4.12.1)" @z @x diff --git a/source/texk/web2c/cwebdir/ctang-vms.ch b/source/texk/web2c/cwebdir/ctang-vms.ch index 7f142df49..d053756d5 100644 --- a/source/texk/web2c/cwebdir/ctang-vms.ch +++ b/source/texk/web2c/cwebdir/ctang-vms.ch @@ -10,9 +10,9 @@ created: (these changes not necessary for initial bootstrapping) @x section 1 (01-FEB-1992 ST) -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @y -@d banner "This is CTANGLE (VAX/VMS Version 4.12)" +@d banner "This is CTANGLE (VAX/VMS Version 4.12.1)" @z @x section 5 (01-FEB-1992 ST) diff --git a/source/texk/web2c/cwebdir/ctang-w2c.ch b/source/texk/web2c/cwebdir/ctang-w2c.ch index 61eea96a0..50e2fef21 100644 --- a/source/texk/web2c/cwebdir/ctang-w2c.ch +++ b/source/texk/web2c/cwebdir/ctang-w2c.ch @@ -17,15 +17,15 @@ @q Please send comments, suggestions, etc. to tex-k@@tug.org. @> @x [0.0] l.30 -\def\title{CTANGLE (Version 4.12)} +\def\title{CTANGLE (Version 4.12.1)} @y -\def\title{CTANGLE (Version 4.12 [\TeX~Live])} +\def\title{CTANGLE (Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.34 - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} @y - \centerline{(Version 4.12 [\TeX~Live])} + \centerline{(Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.36 @@ -41,9 +41,9 @@ @z @x [1.1] l.64 -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @y -@d banner "This is CTANGLE, Version 4.12" +@d banner "This is CTANGLE, Version 4.12.1" /* will be extended by the \TeX~Live |versionstring| */ @z diff --git a/source/texk/web2c/cwebdir/ctang-w32.ch b/source/texk/web2c/cwebdir/ctang-w32.ch index 2a5c6f118..bd2b75c25 100644 --- a/source/texk/web2c/cwebdir/ctang-w32.ch +++ b/source/texk/web2c/cwebdir/ctang-w32.ch @@ -4,9 +4,9 @@ This is the change file for CWEB's CTANGLE under Win32 Changes necessary for compiling with Borland C/C++ @x section 1 -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @y -@d banner "This is CTANGLE (Version 4.12win32)" +@d banner "This is CTANGLE (Version 4.12.1win32)" @z @x section 24 diff --git a/source/texk/web2c/cwebdir/ctangle.c b/source/texk/web2c/cwebdir/ctangle.c index d1cf6c676..d5bf68060 100644 --- a/source/texk/web2c/cwebdir/ctangle.c +++ b/source/texk/web2c/cwebdir/ctangle.c @@ -15,7 +15,7 @@ /*:5*/ #line 67 "ctangle.w" -#define banner "This is CTANGLE (Version 4.12)" \ +#define banner "This is CTANGLE (Version 4.12.1)" \ #define ctangle false #define cweave true \ diff --git a/source/texk/web2c/cwebdir/ctangle.w b/source/texk/web2c/cwebdir/ctangle.w index b42595baa..5fc4cfc30 100644 --- a/source/texk/web2c/cwebdir/ctangle.w +++ b/source/texk/web2c/cwebdir/ctangle.w @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -27,11 +27,11 @@ \mathchardef\RA="3221 % right arrow \mathchardef\BA="3224 % double arrow -\def\title{CTANGLE (Version 4.12)} +\def\title{CTANGLE (Version 4.12.1)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CTANGLE} processor} \vskip 15pt - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} \vfill} \def\botofcontents{\vfill \noindent @@ -61,7 +61,7 @@ Joachim Schrod, Lee Wittenberg, and others who have contributed improvements. The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.12)" +@d banner "This is CTANGLE (Version 4.12.1)" @c @@/ diff --git a/source/texk/web2c/cwebdir/ctwill-w2c.ch b/source/texk/web2c/cwebdir/ctwill-w2c.ch index d421c3f78..8e3d0a09d 100644 --- a/source/texk/web2c/cwebdir/ctwill-w2c.ch +++ b/source/texk/web2c/cwebdir/ctwill-w2c.ch @@ -35,10 +35,10 @@ @z @x [0.0] l.34 -\def\title{CWEAVE (Version 4.12)} +\def\title{CWEAVE (Version 4.12.1)} @y \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi -\def\title{CTWILL (Version 4.12 [\TeX~Live])} +\def\title{CTWILL (Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.36 @@ -48,9 +48,9 @@ @z @x [0.0] l.38 - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} @y - \centerline{(Version 4.12 [\TeX~Live])} + \centerline{(Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.40 @@ -77,7 +77,7 @@ Crusius, and others who have contributed improvements. The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y This is the \.{CTWILL} program by D. E. Knuth, based on \.{CWEAVE} by Silvio Levy and D.~E. Knuth. It is also based on @@ -101,7 +101,7 @@ Until then, \.{CWEAVE}'s sequence of sections will be preserved. The ``banner line'' defined here should be changed whenever \.{CTWILL} is modified. The version number parallels the corresponding version of \.{CWEAVE}. -@d banner "This is CTWILL, Version 4.12" +@d banner "This is CTWILL, Version 4.12.1" /* will be extended by the \TeX~Live |versionstring| */ @z diff --git a/source/texk/web2c/cwebdir/cweav-bs.ch b/source/texk/web2c/cwebdir/cweav-bs.ch index 458a0a7e6..872995093 100644 --- a/source/texk/web2c/cwebdir/cweav-bs.ch +++ b/source/texk/web2c/cwebdir/cweav-bs.ch @@ -20,12 +20,12 @@ This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94. The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.12pc/big)" +@d banner "This is CWEAVE (Version 4.12.1pc/big)" @z diff --git a/source/texk/web2c/cwebdir/cweav-pc.ch b/source/texk/web2c/cwebdir/cweav-pc.ch index ae1fb9f45..9875d6cad 100644 --- a/source/texk/web2c/cwebdir/cweav-pc.ch +++ b/source/texk/web2c/cwebdir/cweav-pc.ch @@ -11,9 +11,9 @@ that allows >64K arrays. (If you need lots more bytes, try the alternate change files that have -bs in their name instead of -pc.) @x section 1 -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y -@d banner "This is CWEAVE (Version 4.12pc)" +@d banner "This is CWEAVE (Version 4.12.1pc)" @z @x section 17 diff --git a/source/texk/web2c/cwebdir/cweav-ql.ch b/source/texk/web2c/cwebdir/cweav-ql.ch index fd369064d..aaaf58fd6 100644 --- a/source/texk/web2c/cwebdir/cweav-ql.ch +++ b/source/texk/web2c/cwebdir/cweav-ql.ch @@ -7,15 +7,15 @@ ex cc;"-v -h -c =500000 cweave_c" @x -\def\title{CWEAVE (Version 4.12)} +\def\title{CWEAVE (Version 4.12.1)} @y -\def\title{CWEAVE (QL Version 4.12)} +\def\title{CWEAVE (QL Version 4.12.1)} @z @x section 1 -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y -@d banner "This is CWEAVE (QL Version 4.12)" +@d banner "This is CWEAVE (QL Version 4.12.1)" @z @x diff --git a/source/texk/web2c/cwebdir/cweav-vms.ch b/source/texk/web2c/cwebdir/cweav-vms.ch index f4630f986..f04a456ea 100644 --- a/source/texk/web2c/cwebdir/cweav-vms.ch +++ b/source/texk/web2c/cwebdir/cweav-vms.ch @@ -13,9 +13,9 @@ modified: (also modified by Don Knuth to keep version numbers uptodate) @x section 1 (01-FEB-1992 ST) -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y -@d banner "This is CWEAVE (VAX/VMS Version 4.12)" +@d banner "This is CWEAVE (VAX/VMS Version 4.12.1)" @z @x section 5 (01-FEB-1992 ST) diff --git a/source/texk/web2c/cwebdir/cweav-w2c.ch b/source/texk/web2c/cwebdir/cweav-w2c.ch index b0adceab7..5838e0045 100644 --- a/source/texk/web2c/cwebdir/cweav-w2c.ch +++ b/source/texk/web2c/cwebdir/cweav-w2c.ch @@ -17,15 +17,15 @@ @q Please send comments, suggestions, etc. to tex-k@@tug.org. @> @x [0.0] l.34 -\def\title{CWEAVE (Version 4.12)} +\def\title{CWEAVE (Version 4.12.1)} @y -\def\title{CWEAVE (Version 4.12 [\TeX~Live])} +\def\title{CWEAVE (Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.38 - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} @y - \centerline{(Version 4.12 [\TeX~Live])} + \centerline{(Version 4.12.1 [\TeX~Live])} @z @x [0.0] l.40 @@ -41,9 +41,9 @@ @z @x [1.1] l.69 -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y -@d banner "This is CWEAVE, Version 4.12" +@d banner "This is CWEAVE, Version 4.12.1" /* will be extended by the \TeX~Live |versionstring| */ @z diff --git a/source/texk/web2c/cwebdir/cweav-w32.ch b/source/texk/web2c/cwebdir/cweav-w32.ch index 2f9a2127a..5478d0406 100644 --- a/source/texk/web2c/cwebdir/cweav-w32.ch +++ b/source/texk/web2c/cwebdir/cweav-w32.ch @@ -2,9 +2,9 @@ This is the change file for CWEB's CWEAVE under Win32 (Contributed by Fabrice Popineau, February 2002) @x section 1 -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @y -@d banner "This is CWEAVE (Version 4.12win32)" +@d banner "This is CWEAVE (Version 4.12.1win32)" @z @x section 32 diff --git a/source/texk/web2c/cwebdir/cweave.w b/source/texk/web2c/cwebdir/cweave.w index 015a3183b..39de8a432 100644 --- a/source/texk/web2c/cwebdir/cweave.w +++ b/source/texk/web2c/cwebdir/cweave.w @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -31,11 +31,11 @@ \def\skipxTeX{\\{skip\_\TEX/}} \def\copyxTeX{\\{copy\_\TEX/}} -\def\title{CWEAVE (Version 4.12)} +\def\title{CWEAVE (Version 4.12.1)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CWEAVE} processor} \vskip 15pt - \centerline{(Version 4.12)} + \centerline{(Version 4.12.1)} \vfill} \def\botofcontents{\vfill \noindent @@ -66,7 +66,7 @@ Crusius, and others who have contributed improvements. The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.12)" +@d banner "This is CWEAVE (Version 4.12.1)" @c @@/ diff --git a/source/texk/web2c/cwebdir/cwebacromac.tex b/source/texk/web2c/cwebdir/cwebacromac.tex index c1cd4a9f6..6ec27777f 100644 --- a/source/texk/web2c/cwebdir/cwebacromac.tex +++ b/source/texk/web2c/cwebdir/cwebacromac.tex @@ -1,6 +1,6 @@ % hypertext macros for CWEB listings (in addition to cwebmac.tex) % Used in cwebmac.tex, pdfctwimac.tex, pdfproofmac.tex -% Version 3.0 --- August 2024 +% Version 3.1 --- January 2025 \ifx\ifacrohint\undefined\endinput\fi % these are not standalone macros \ifluatex % LuaTeX is almost like pdfTeX diff --git a/source/texk/web2c/cwebdir/cwebmac.tex b/source/texk/web2c/cwebdir/cwebmac.tex index 53454300a..2b7b14bf0 100644 --- a/source/texk/web2c/cwebdir/cwebmac.tex +++ b/source/texk/web2c/cwebdir/cwebmac.tex @@ -1,7 +1,7 @@ % standard macros for CWEB listings (in addition to plain.tex) -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros -\xdef\fmtversion{\fmtversion+CWEB4.12} +\xdef\fmtversion{\fmtversion+CWEB4.12.1} \chardef\cwebversion=4 \chardef\cwebrevision=12 \parskip 0pt % no stretch between paragraphs diff --git a/source/texk/web2c/cwebdir/cwebman-w2c.ch b/source/texk/web2c/cwebdir/cwebman-w2c.ch index ba340501c..51441cb49 100644 --- a/source/texk/web2c/cwebdir/cwebman-w2c.ch +++ b/source/texk/web2c/cwebdir/cwebman-w2c.ch @@ -94,17 +94,17 @@ @z @x l.34 -\def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.12)} +\def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.12.1)} @y \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} -\def\runninghead{{\ninett CWEB} USER MANUAL (Version 4.12 [\TeX~Live])} +\def\runninghead{{\ninett CWEB} USER MANUAL (Version 4.12.1 [\TeX~Live])} @z @x l.48 -\vskip 18pt\centerline{(Version 4.12 --- August 2024)} +\vskip 18pt\centerline{(Version 4.12.1 --- January 2025)} @y -\vskip 18pt\centerline{(Version 4.12 --- August 2024)% -\footnote*{This document describes the extended \.{CWEB} (Version 4.12 [\TeX~Live]).}} +\vskip 18pt\centerline{(Version 4.12.1 --- January 2025)% +\footnote*{This document describes the extended \.{CWEB} (Version 4.12.1 [\TeX~Live]).}} @z @x l.79 @@ -347,9 +347,9 @@ And here's what the same excerpt looks like when typeset. @z @x l.1613 - \.{ { }\\vskip 15pt \\centerline\{(Version 4.12)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.12.1)\}{ }\\vfill\}}\cr}$$ @y - \.{ { }\\vskip 15pt \\centerline\{(Version 4.12)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.12.1)\}{ }\\vfill\}}\cr}$$ @z @x l.1728 diff --git a/source/texk/web2c/cwebdir/cwebman.tex b/source/texk/web2c/cwebdir/cwebman.tex index 25654a531..c71bda316 100644 --- a/source/texk/web2c/cwebdir/cwebman.tex +++ b/source/texk/web2c/cwebdir/cwebman.tex @@ -31,7 +31,7 @@ \def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill} \def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno} -\def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.12)} +\def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.12.1)} % This verbatim mode assumes that ! marks are !! in the text being copied. \def\verbatim{\begingroup @@ -45,7 +45,7 @@ \null\vfill \centerline{\titlefont The {\ttitlefont CWEB} System of Structured Documentation} -\vskip 18pt\centerline{(Version 4.12 --- August 2024)} +\vskip 18pt\centerline{(Version 4.12.1 --- January 2025)} \vskip 24pt \centerline{\authorfont Donald E. Knuth and Silvio Levy} \vfill @@ -1610,7 +1610,7 @@ \.{ { }\\titlefalse \% include headline on the contents page}\cr \.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr \.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr - \.{ { }\\vskip 15pt \\centerline\{(Version 4.12)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.12.1)\}{ }\\vfill\}}\cr}$$ Redefining \.{\\rheader}, which is the headline for right-hand pages, suffices in this case to put the desired information at the top of the contents page. diff --git a/source/texk/web2c/cwebdir/po/cweb-tl.pot b/source/texk/web2c/cwebdir/po/cweb-tl.pot index 9ba80115a..f86c23292 100644 --- a/source/texk/web2c/cwebdir/po/cweb-tl.pot +++ b/source/texk/web2c/cwebdir/po/cweb-tl.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2024\n" +"Project-Id-Version: CWEBbin 2025\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-12 13:10+0200\n" +"POT-Creation-Date: 2025-01-01 15:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,15 +30,15 @@ msgid "%s: Need one to three file arguments.\n" msgstr "" #: ctang-texlive.ch:39 -msgid "This is CTANGLE, Version 4.12" +msgid "This is CTANGLE, Version 4.12.1" msgstr "" #: ctwill-texlive.ch:39 -msgid "This is CTWILL, Version 4.12" +msgid "This is CTWILL, Version 4.12.1" msgstr "" #: cweav-texlive.ch:39 -msgid "This is CWEAVE, Version 4.12" +msgid "This is CWEAVE, Version 4.12.1" msgstr "" #: comm-texlive.ch:512 diff --git a/source/texk/web2c/cwebdir/po/cweb.pot b/source/texk/web2c/cwebdir/po/cweb.pot index f45110193..1db22fc9a 100644 --- a/source/texk/web2c/cwebdir/po/cweb.pot +++ b/source/texk/web2c/cwebdir/po/cweb.pot @@ -523,15 +523,15 @@ msgid "Sorting:" msgstr "" #: ctang-i18n.ch:17 -msgid "This is CTANGLE (Version 4.12 [CWEBbin 2024])" +msgid "This is CTANGLE (Version 4.12.1 [CWEBbin 2025])" msgstr "" #: cweav-twill.ch:61 -msgid "This is CTWILL (Version 4.12 [CWEBbin 2024])" +msgid "This is CTWILL (Version 4.12.1 [CWEBbin 2025])" msgstr "" #: cweav-i18n.ch:17 cweav-twill.ch:42 -msgid "This is CWEAVE (Version 4.12 [CWEBbin 2024])" +msgid "This is CWEAVE (Version 4.12.1 [CWEBbin 2025])" msgstr "" #: cweav-i18n.ch:301 cweav-i18n.ch:309 diff --git a/source/texk/web2c/cwebdir/po/de/cweb-tl.po b/source/texk/web2c/cwebdir/po/de/cweb-tl.po index b1412747c..1f39e18a5 100644 --- a/source/texk/web2c/cwebdir/po/de/cweb-tl.po +++ b/source/texk/web2c/cwebdir/po/de/cweb-tl.po @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2024 Andreas Scherer et al. +# Copyright (C) 2025 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. # Andreas Scherer . # msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2024\n" +"Project-Id-Version: CWEBbin 2025\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-12 13:10+0200\n" -"PO-Revision-Date: 2024-08-12 13:10+0200\n" +"POT-Creation-Date: 2025-01-01 15:08+0100\n" +"PO-Revision-Date: 2025-01-01 15:08+0100\n" "Last-Translator: Andreas Scherer \n" "Language-Team: German\n" "Language: de\n" diff --git a/source/texk/web2c/cwebdir/po/de/cweb.po b/source/texk/web2c/cwebdir/po/de/cweb.po index 0b459e1b0..7cfcfe5be 100644 --- a/source/texk/web2c/cwebdir/po/de/cweb.po +++ b/source/texk/web2c/cwebdir/po/de/cweb.po @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2021 Andreas Scherer et al. +# Copyright (C) 2025 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. # Andreas Scherer , 2021. # msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2021\n" +"Project-Id-Version: CWEBbin 2025\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-06 15:25+0100\n" -"PO-Revision-Date: 2021-02-06 15:57+0100\n" +"POT-Creation-Date: 2025-01-01 15:08+0100\n" +"PO-Revision-Date: 2025-01-01 15:08+0100\n" "Last-Translator: Andreas Scherer \n" "Language-Team: German\n" "Language: de\n" @@ -603,16 +603,16 @@ msgid "Sorting:" msgstr "Sortieren:" #: ctang-i18n.ch:17 -msgid "This is CTANGLE (Version 4.12 [CWEBbin 2024])" -msgstr "Dies ist CTANGLE (Version 4.12 [CWEBbin 2024])" +msgid "This is CTANGLE (Version 4.12.1 [CWEBbin 2025])" +msgstr "Dies ist CTANGLE (Version 4.12.1 [CWEBbin 2025])" #: cweav-twill.ch:61 -msgid "This is CTWILL (Version 4.12 [CWEBbin 2024])" -msgstr "Dies ist CTWILL (Version 4.12 [CWEBbin 2024])" +msgid "This is CTWILL (Version 4.12.1 [CWEBbin 2025])" +msgstr "Dies ist CTWILL (Version 4.12.1 [CWEBbin 2025])" #: cweav-i18n.ch:17 cweav-twill.ch:42 -msgid "This is CWEAVE (Version 4.12 [CWEBbin 2024])" -msgstr "Dies ist CWEAVE (Version 4.12 [CWEBbin 2024])" +msgid "This is CWEAVE (Version 4.12.1 [CWEBbin 2025])" +msgstr "Dies ist CWEAVE (Version 4.12.1 [CWEBbin 2025])" #: cweav-i18n.ch:301 cweav-i18n.ch:309 msgid "buffer" diff --git a/source/texk/web2c/cwebdir/po/de/web2c-help.po b/source/texk/web2c/cwebdir/po/de/web2c-help.po index 139d33694..d38dd46ad 100644 --- a/source/texk/web2c/cwebdir/po/de/web2c-help.po +++ b/source/texk/web2c/cwebdir/po/de/web2c-help.po @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2021 Andreas Scherer et al. +# Copyright (C) 2025 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. # Andreas Scherer , 2021. # msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2024\n" +"Project-Id-Version: CWEBbin 2025\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-10 16:35+0100\n" -"PO-Revision-Date: 2024-03-10 16:35+0100\n" +"POT-Creation-Date: 2025-01-01 15:08+0100\n" +"PO-Revision-Date: 2025-01-01 15:08+0100\n" "Last-Translator: Andreas Scherer \n" "Language-Team: German\n" "Language: de\n" diff --git a/source/texk/web2c/cwebdir/po/it/cweb.po b/source/texk/web2c/cwebdir/po/it/cweb.po index 2cf95a994..230d79cc1 100644 --- a/source/texk/web2c/cwebdir/po/it/cweb.po +++ b/source/texk/web2c/cwebdir/po/it/cweb.po @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2024 Andreas Scherer et al. +# Copyright (C) 2025 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. # Andreas Scherer . # msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2024\n" +"Project-Id-Version: CWEBbin 2025\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-12 13:10+0200\n" -"PO-Revision-Date: 2024-08-12 13:10+0200\n" +"POT-Creation-Date: 2025-01-01 15:08+0100\n" +"PO-Revision-Date: 2025-01-01 15:08+0100\n" "Last-Translator: Andreas Scherer \n" "Language-Team: Italian\n" "Language: it\n" @@ -598,16 +598,16 @@ msgid "Sorting:" msgstr "Ordinamento:" #: ctang-i18n.ch:17 -msgid "This is CTANGLE (Version 4.12 [CWEBbin 2024])" -msgstr "Questo è CTANGLE (Versione 4.12 [CWEBbin 2024])" +msgid "This is CTANGLE (Version 4.12.1 [CWEBbin 2025])" +msgstr "Questo è CTANGLE (Versione 4.12.1 [CWEBbin 2025])" #: cweav-i18n.ch:17 -msgid "This is CWEAVE (Version 4.12 [CWEBbin 2024])" -msgstr "Questo è CWEAVE (Versione 4.12 [CWEBbin 2024])" +msgid "This is CWEAVE (Version 4.12.1 [CWEBbin 2025])" +msgstr "Questo è CWEAVE (Versione 4.12.1 [CWEBbin 2025])" #: cweav-twill.ch:68 -msgid "This is CTWILL (Version 4.12 [CWEBbin 2024])" -msgstr "Questo è CTWILL (Versione 4.12 [CWEBbin 2024])" +msgid "This is CTWILL (Version 4.12.1 [CWEBbin 2025])" +msgstr "Questo è CTWILL (Versione 4.12.1 [CWEBbin 2025])" #: cweav-i18n.ch:301 cweav-i18n.ch:309 msgid "buffer" diff --git a/source/texk/web2c/cwebdir/po/web2c-help.pot b/source/texk/web2c/cwebdir/po/web2c-help.pot index ba493504a..081045330 100644 --- a/source/texk/web2c/cwebdir/po/web2c-help.pot +++ b/source/texk/web2c/cwebdir/po/web2c-help.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2024\n" +"Project-Id-Version: CWEBbin 2025\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-10 16:35+0100\n" +"POT-Creation-Date: 2025-01-01 15:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/source/texk/web2c/cwebdir/prod-cweave.w b/source/texk/web2c/cwebdir/prod-cweave.w index e7939716b..effe5e283 100644 --- a/source/texk/web2c/cwebdir/prod-cweave.w +++ b/source/texk/web2c/cwebdir/prod-cweave.w @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 % @ Here is a table of all the productions. Each production that combines two or more consecutive scraps implicitly inserts a {\tt \$} diff --git a/source/texk/web2c/cwebdir/prod-twill.w b/source/texk/web2c/cwebdir/prod-twill.w index c1b67aedc..8a362a109 100644 --- a/source/texk/web2c/cwebdir/prod-twill.w +++ b/source/texk/web2c/cwebdir/prod-twill.w @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 % @ Here is a table of all the productions. Each production that combines two or more consecutive scraps implicitly inserts a {\tt \$} diff --git a/source/texk/web2c/cwebdir/prod.w b/source/texk/web2c/cwebdir/prod.w index 851c5ffe2..1a21fb5de 100644 --- a/source/texk/web2c/cwebdir/prod.w +++ b/source/texk/web2c/cwebdir/prod.w @@ -2,7 +2,7 @@ % This program by Silvio Levy and Donald E. Knuth % is based on a program by Knuth. % It is distributed WITHOUT ANY WARRANTY, express or implied. -% Version 4.12 --- August 2024 +% Version 4.12.1 --- January 2025 % @ Here is a table of all the productions. Each production that combines two or more consecutive scraps implicitly inserts a {\tt \$} diff --git a/source/texk/web2c/man/ChangeLog b/source/texk/web2c/man/ChangeLog index b047bb6ab..5c4208bb6 100644 --- a/source/texk/web2c/man/ChangeLog +++ b/source/texk/web2c/man/ChangeLog @@ -1,3 +1,7 @@ +2025-01-01 Andreas Scherer + + * ctwill.man: CWEB 4.12.1 release. + 2024-08-12 Andreas Scherer * ctwill.man: CWEB 4.12 release. diff --git a/source/texk/web2c/man/ctwill.man b/source/texk/web2c/man/ctwill.man index a30dcd6a0..c2d9e3b34 100644 --- a/source/texk/web2c/man/ctwill.man +++ b/source/texk/web2c/man/ctwill.man @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc .\" -.TH "CTWILL" "1" "August 12, 2024" "Web2c @VERSION@" "General Commands Manual" +.TH "CTWILL" "1" "January 1, 2025." "Web2c @VERSION@" "General Commands Manual" .SH NAME ctwill, ctwill-proofsort, ctwill-refsort, ctwill-twinx \- translate CWEB to TeX with mini-indexes @@ -122,7 +122,7 @@ The present incarnation of \f[B]ctwill\f[R] and its utilities tries hard to be a drop-in replacement for the original package. There are, however, a few differences worth noting: .IP \[bu] 2 -This version is based on the most recent version of CWEB (4.12). +This version is based on the most recent version of CWEB (4.12.1). .IP \[bu] 2 In TeX\ Live the utility programs are prefixed with \f[B]ctwill\-\f[R] and the macro files with \f[B]ct\f[R] for technical reasons. From fae8780082ed52f538083d100268efbd827b540f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Jan 2025 00:40:12 +0000 Subject: [PATCH 08/15] tl-update-auto git-svn-id: svn://tug.org/texlive/trunk/Build@73269 c570f23f-e606-0410-a88d-b1316a301751 --- source/build-aux/ar-lib | 2 +- source/build-aux/compile | 2 +- source/build-aux/depcomp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/build-aux/ar-lib b/source/build-aux/ar-lib index 152198749..7d62dea99 100755 --- a/source/build-aux/ar-lib +++ b/source/build-aux/ar-lib @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2024-06-19.01; # UTC -# Copyright (C) 2010-2024 Free Software Foundation, Inc. +# Copyright (C) 2010-2025 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify diff --git a/source/build-aux/compile b/source/build-aux/compile index c3e8760e9..14aec5621 100755 --- a/source/build-aux/compile +++ b/source/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2024-12-03.03; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/source/build-aux/depcomp b/source/build-aux/depcomp index 87974bf3e..1e2c35fad 100755 --- a/source/build-aux/depcomp +++ b/source/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2024-12-03.03; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From f662b871898ae9a69bcaeb92f3f8330d3479f8c9 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Thu, 2 Jan 2025 12:27:29 +0000 Subject: [PATCH 09/15] {,e}uptex: Accept extended upTeX internal encoding also in pTeX-compatible EUC/SJIS mode git-svn-id: svn://tug.org/texlive/trunk/Build@73271 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/Makefile.in | 78 +- source/texk/web2c/euptexdir/COPYRIGHT | 4 +- source/texk/web2c/euptexdir/ChangeLog | 9 + source/texk/web2c/euptexdir/am/euptex.am | 19 +- source/texk/web2c/euptexdir/euptex-widow.test | 32 + .../web2c/euptexdir/tests/eup-jchwidow.log | 910 ++++++++++++++++++ source/texk/web2c/euptexdir/upkcat.test | 18 +- source/texk/web2c/ptexdir/COPYRIGHT | 2 +- source/texk/web2c/ptexdir/ChangeLog | 10 + source/texk/web2c/ptexdir/am/ptex.am | 11 +- source/texk/web2c/ptexdir/ptex-prntknj.test | 4 +- source/texk/web2c/ptexdir/ptex-widow.test | 38 + .../texk/web2c/ptexdir/tests/p-jchwidow.log | 470 +++++++++ source/texk/web2c/ptexdir/tests/pknj-e.log | 2 +- source/texk/web2c/ptexdir/tests/pknj-s.log | 2 +- source/texk/web2c/uptexdir/COPYRIGHT | 2 +- source/texk/web2c/uptexdir/COPYRIGHT.ja | 2 +- source/texk/web2c/uptexdir/ChangeLog | 13 + source/texk/web2c/uptexdir/am/uptex.am | 9 +- source/texk/web2c/uptexdir/kanji.c | 6 +- source/texk/web2c/uptexdir/tests/jchwidow.tex | 88 ++ source/texk/web2c/uptexdir/tests/kcat.tex | 74 +- .../texk/web2c/uptexdir/tests/up-jchwidow.log | 817 ++++++++++++++++ source/texk/web2c/uptexdir/tests/upkcat-e.txt | 45 + source/texk/web2c/uptexdir/tests/upkcat-s.txt | 53 + source/texk/web2c/uptexdir/tests/upkcat.txt | 18 +- source/texk/web2c/uptexdir/upkcat.test | 12 +- source/texk/web2c/uptexdir/uptex-m.ch | 8 +- source/texk/web2c/uptexdir/uptex-widow.test | 32 + 29 files changed, 2705 insertions(+), 83 deletions(-) create mode 100755 source/texk/web2c/euptexdir/euptex-widow.test create mode 100644 source/texk/web2c/euptexdir/tests/eup-jchwidow.log create mode 100755 source/texk/web2c/ptexdir/ptex-widow.test create mode 100644 source/texk/web2c/ptexdir/tests/p-jchwidow.log create mode 100644 source/texk/web2c/uptexdir/tests/jchwidow.tex create mode 100644 source/texk/web2c/uptexdir/tests/up-jchwidow.log create mode 100644 source/texk/web2c/uptexdir/tests/upkcat-e.txt create mode 100644 source/texk/web2c/uptexdir/tests/upkcat-s.txt create mode 100755 source/texk/web2c/uptexdir/uptex-widow.test diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 75bf7443c..05fd556f6 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -3283,12 +3283,13 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ ptexdir/tests/pknj-e.log ptexdir/tests/p-pknj-sa.typ \ ptexdir/tests/p-pknj-ea.typ ptexdir/tests/ucs.tex \ ptexdir/tests/ucs-s.log ptexdir/tests/ucs-e.log \ - $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines \ - uptexdir/upbibtex.ch uptexdir/updvitype.ch \ - uptexdir/uppltotf.ch uptexdir/uptftopl.ch uptexdir/COPYRIGHT \ - uptexdir/COPYRIGHT.ja uptexdir/ChangeLog $(uptex_tests) \ - $(upweb_tests) tests/enc-u.bbl tests/enc-eu.bbl \ - tests/enc-su.bbl tests/enc-uu.bbl uptexdir/tests/uptex3.tex \ + ptexdir/tests/p-jchwidow.log $(uptex_web_srcs) \ + $(uptex_ch_srcs) uptexdir/uptex.defines uptexdir/upbibtex.ch \ + uptexdir/updvitype.ch uptexdir/uppltotf.ch \ + uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.ja \ + uptexdir/ChangeLog $(uptex_tests) $(upweb_tests) \ + tests/enc-u.bbl tests/enc-eu.bbl tests/enc-su.bbl \ + tests/enc-uu.bbl uptexdir/tests/uptex3.tex \ uptexdir/tests/uptex3.dvi uptexdir/tests/uptex4.tex \ uptexdir/tests/uptex4.dvi uptexdir/tests/uptex5.tex \ uptexdir/tests/uptex5.dvi uptexdir/tests/uptex3a.typ \ @@ -3307,6 +3308,7 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ uptexdir/tests/lmr1.tex uptexdir/tests/up-lmr1.log \ uptexdir/tests/lmr2.tex uptexdir/tests/up-lmr2.log \ uptexdir/tests/noto1.tex uptexdir/tests/up-noto1.log \ + uptexdir/tests/jchwidow.tex uptexdir/tests/up-jchwidow.log \ $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \ euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \ euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \ @@ -3336,22 +3338,23 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ euptexdir/tests/eup-ofm.log euptexdir/tests/eup-prim.tex \ euptexdir/tests/eup-prim.log euptexdir/tests/ucs.tex \ euptexdir/tests/ucs-s.log euptexdir/tests/ucs-e.log \ - euptexdir/tests/ucs-u.log hitexdir/ChangeLog $(hitex_web) \ - $(hitex_tests) hitexdir/tests/hello.tex \ - hitexdir/tests/rule.tex pdftexdir/regex/COPYING.LIB \ - pdftexdir/regex/README $(pdftex_ch_srcs) \ - pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \ - pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \ - tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \ - tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \ - tests/expanded.tex tests/expanded.txt tests/cnfline.tex \ - tests/partoken-ok.tex tests/partoken-xfail.tex \ - $(ttf2afm_tests) pdftexdir/tests/postV3.afm \ - pdftexdir/tests/postV3.ttf pdftexdir/tests/postV7.afm \ - pdftexdir/tests/postV7.ttf $(pdftosrc_tests) \ - pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \ - pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \ - $(libluasocket_sources) luatexdir/luasocket/src/ftp_lua.c \ + euptexdir/tests/ucs-u.log euptexdir/tests/eup-jchwidow.log \ + hitexdir/ChangeLog $(hitex_web) $(hitex_tests) \ + hitexdir/tests/hello.tex hitexdir/tests/rule.tex \ + pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \ + $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/ChangeLog \ + pdftexdir/NEWS pdftexdir/README pdftexdir/change-files.txt \ + $(pdftex_tests) tests/wprob.tex pdftexdir/tests/pdfimage.tex \ + tests/1-4.jpg tests/B.pdf tests/basic.tex \ + tests/lily-ledger-broken.png tests/expanded.tex \ + tests/expanded.txt tests/cnfline.tex tests/partoken-ok.tex \ + tests/partoken-xfail.tex $(ttf2afm_tests) \ + pdftexdir/tests/postV3.afm pdftexdir/tests/postV3.ttf \ + pdftexdir/tests/postV7.afm pdftexdir/tests/postV7.ttf \ + $(pdftosrc_tests) pdftexdir/tests/test-13.pdf \ + pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \ + pdftexdir/tests/test-15.xref $(libluasocket_sources) \ + luatexdir/luasocket/src/ftp_lua.c \ luatexdir/luasocket/src/headers_lua.c \ luatexdir/luasocket/src/http_lua.c \ luatexdir/luasocket/src/ltn12_lua.c \ @@ -3652,7 +3655,7 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ ptests/xcmr10.pl ptests/xsample*.typ ptests/x*min10.* \ ptests/xchcode*.* ptests/xskipjfmp.* ptrip.diffs p-ctrlsym.log \ p-ctrlsym.out p-ctrlsym.tex p-endline*.* p-jctrlsym*.* \ - p-chartoken.* p-lineend.* p-pknj-*.* p-ucs*.* \ + p-chartoken.* p-lineend.* p-pknj-*.* p-ucs*.* p-jchwidow*.* \ $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \ uptex.pool uptex-tangle $(upweb_programs:=.c) \ $(upweb_programs:=.h) $(upweb_programs:=.p) \ @@ -3665,13 +3668,14 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu*.* \ uptests/xuparse.* uptests/yuparse.* uptests/ygkhuge*.* \ uptests/ygk256*.* uptests/xskipjfmp.* uptrip.diffs up-ofm.* \ - up-prim.* up-lmr*.* up-noto*.* $(nodist_euptex_SOURCES) \ - euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \ - euptex-tangle euptrip.diffs pdfprimitive-euptex.* \ - eup-ctrlsym.log eup-ctrlsym.out eup-ctrlsym.tex eup-endline*.* \ - eup-jctrlsym*.* eup-pknj-*.* eup-postpena*.* eup-free_*.* \ - eup-inhibitglue*.* eup-kinsoku*.* eup-ofm.* eup-prim.* \ - eup-ucs*.* $(nodist_hitex_SOURCES) $(nodist_hishrink_SOURCES) \ + up-prim.* up-lmr*.* up-noto*.* up-jchwidow.* \ + $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \ + euptex.p euptex.pool euptex-tangle euptrip.diffs \ + pdfprimitive-euptex.* eup-ctrlsym.log eup-ctrlsym.out \ + eup-ctrlsym.tex eup-endline*.* eup-jctrlsym*.* eup-pknj-*.* \ + eup-postpena*.* eup-free_*.* eup-inhibitglue*.* eup-kinsoku*.* \ + eup-ofm.* eup-prim.* eup-ucs*.* eup-jchwidow.* \ + $(nodist_hitex_SOURCES) $(nodist_hishrink_SOURCES) \ $(nodist_histretch_SOURCES) hiformat-tangle hitex-tangle \ hello.log rule.log $(nodist_pdftex_SOURCES) pdftex-final.ch \ pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \ @@ -4496,7 +4500,7 @@ ptex_tests = \ ptexdir/wcfname.test \ ptexdir/ptex-ctrlsym.test \ ptexdir/ptex-prntknj.test \ - ptexdir/ptex-ucs.test + ptexdir/ptex-ucs.test ptexdir/ptex-widow.test uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES) uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS) @@ -4561,7 +4565,8 @@ uptex_tests = \ uptexdir/upkcat.test \ uptexdir/wcfname.test uptexdir/wcfname0.test \ uptexdir/uptex-ofm.test uptexdir/uptex-prim.test \ - uptexdir/uptex-lmr.test uptexdir/uptex-noto.test + uptexdir/uptex-lmr.test uptexdir/uptex-noto.test \ + uptexdir/uptex-widow.test # uppPLtoTF/upTFtoPL upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ @@ -4629,7 +4634,7 @@ euptex_tests = \ euptexdir/euptex-prntknj.test \ euptexdir/euptex-kinsoku.test \ euptexdir/euptex-ofm.test euptexdir/euptex-prim.test \ - euptexdir/euptex-ucs.test + euptexdir/euptex-ucs.test euptexdir/euptex-widow.test # At the moment, these are the only man pages handled in the @@ -22066,7 +22071,7 @@ ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs) ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) ptexdir/pver.log ptexdir/wcfname.log \ ptexdir/ptex-ctrlsym.log ptexdir/ptex-prntknj.log \ - ptexdir/ptex-ucs.log: ptex$(EXEEXT) + ptexdir/ptex-ucs.log ptexdir/ptex-widow.log: ptex$(EXEEXT) ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ @@ -22140,7 +22145,8 @@ uptexdir/uptriptest.log uptexdir/ptriptest.log: \ uptexdir/upver.log uptexdir/upkcat.log \ uptexdir/wcfname.log uptexdir/wcfname0.log \ uptexdir/uptex-ofm.log uptexdir/uptex-prim.log \ - uptexdir/uptex-lmr.log uptexdir/uptex-noto.log: uptex$(EXEEXT) + uptexdir/uptex-lmr.log uptexdir/uptex-noto.log \ + uptexdir/uptex-widow.log: uptex$(EXEEXT) uptexdir/upbibtex.log: upbibtex$(EXEEXT) uptexdir/updvitype.log: updvitype$(EXEEXT) uptexdir/uppltotf.log: uppltotf$(EXEEXT) @@ -22191,7 +22197,7 @@ euptexdir/eupver.log euptexdir/upkcat.log \ euptexdir/euptex-ctrlsym.log euptexdir/euptex-prntknj.log \ euptexdir/euptex-kinsoku.log \ euptexdir/euptex-ofm.log euptexdir/euptex-prim.log \ - euptexdir/euptex-ucs.log: euptex$(EXEEXT) + euptexdir/euptex-ucs.log euptexdir/euptex-widow.log: euptex$(EXEEXT) euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ diff --git a/source/texk/web2c/euptexdir/COPYRIGHT b/source/texk/web2c/euptexdir/COPYRIGHT index 88d900edb..3d1d815f9 100644 --- a/source/texk/web2c/euptexdir/COPYRIGHT +++ b/source/texk/web2c/euptexdir/COPYRIGHT @@ -1,6 +1,6 @@ Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2007-2024 Takuji Tanaka -Copyright (C) 2010-2024 Japanese TeX Development Community +Copyright (C) 2007-2025 Takuji Tanaka +Copyright (C) 2010-2025 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/source/texk/web2c/euptexdir/ChangeLog b/source/texk/web2c/euptexdir/ChangeLog index cf904b7db..684601c9f 100644 --- a/source/texk/web2c/euptexdir/ChangeLog +++ b/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,12 @@ +2025-01-02 TANAKA Takuji + + * upkcat.test: Update tests. + * euptex-widow.test, tests/eup-jchwidow.log, + am/euptex.am: Add new tests for widow penalty originally + written by Kitagawa-san. + https://github.com/texjporg/tex-jp-build/issues/103 + * COPYRIGHT: copyright year. + 2024-10-20 TANAKA Takuji * eptex.ech, etex.ch{0,1}, fam256,ch, diff --git a/source/texk/web2c/euptexdir/am/euptex.am b/source/texk/web2c/euptexdir/am/euptex.am index f03d4270d..f9579d78d 100644 --- a/source/texk/web2c/euptexdir/am/euptex.am +++ b/source/texk/web2c/euptexdir/am/euptex.am @@ -105,7 +105,7 @@ euptex_tests = \ euptexdir/euptex-prntknj.test \ euptexdir/euptex-kinsoku.test \ euptexdir/euptex-ofm.test euptexdir/euptex-prim.test \ - euptexdir/euptex-ucs.test + euptexdir/euptex-ucs.test euptexdir/euptex-widow.test euptexdir/euptriptest.log euptexdir/eptriptest.log: \ euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) euptexdir/pdfprimitive.log: euptex$(EXEEXT) @@ -114,7 +114,7 @@ euptexdir/eupver.log euptexdir/upkcat.log \ euptexdir/euptex-ctrlsym.log euptexdir/euptex-prntknj.log \ euptexdir/euptex-kinsoku.log \ euptexdir/euptex-ofm.log euptexdir/euptex-prim.log \ - euptexdir/euptex-ucs.log: euptex$(EXEEXT) + euptexdir/euptex-ucs.log euptexdir/euptex-widow.log: euptex$(EXEEXT) EXTRA_DIST += $(euptex_tests) @@ -140,20 +140,20 @@ EXTRA_DIST += \ euptexdir/tests/pdfprimitive-euptex.log DISTCLEANFILES += pdfprimitive-euptex.* -## euptex-ctrlsym.test +## euptexdir/euptex-ctrlsym.test EXTRA_DIST += euptexdir/tests/ctrlsym.tex euptexdir/tests/ctrlsym.log \ euptexdir/tests/endlinechar.tex euptexdir/tests/endline.log \ euptexdir/tests/control-symbol.tex euptexdir/tests/jctrlsym.log \ euptexdir/tests/eup-endlinea.typ euptexdir/tests/eup-jctrlsyma.typ DISTCLEANFILES += eup-ctrlsym.log eup-ctrlsym.out eup-ctrlsym.tex \ eup-endline*.* eup-jctrlsym*.* -## euptex-prntknj.test +## euptexdir/euptex-prntknj.test EXTRA_DIST += euptexdir/tests/printkanji.tex euptexdir/tests/pknj-s.log \ euptexdir/tests/pknj-e.log euptexdir/tests/pknj-u.log \ euptexdir/tests/eup-pknj-sa.typ euptexdir/tests/eup-pknj-ea.typ \ euptexdir/tests/eup-pknj-ua.typ DISTCLEANFILES += eup-pknj-*.* -## euptex-kinsoku.test +## euptexdir/euptex-kinsoku.test EXTRA_DIST += euptexdir/tests/postpena.tex euptexdir/tests/postpena.log \ euptexdir/tests/free_ixsp.tex euptexdir/tests/free_ixsp.log \ euptexdir/tests/free_pena.tex euptexdir/tests/free_pena.log \ @@ -161,16 +161,19 @@ EXTRA_DIST += euptexdir/tests/postpena.tex euptexdir/tests/postpena.log \ euptexdir/tests/kinsoku-table.tex euptexdir/tests/kinsoku-table.log \ euptexdir/tests/kinsoku-search.tex euptexdir/tests/kinsoku-search.log DISTCLEANFILES += eup-postpena*.* eup-free_*.* eup-inhibitglue*.* eup-kinsoku*.* -## euptex-ofm.test +## euptexdir/euptex-ofm.test EXTRA_DIST += euptexdir/tests/eup-ofm.tex euptexdir/tests/eup-ofm.log DISTCLEANFILES += eup-ofm.* -## euptex-prim.test +## euptexdir/euptex-prim.test EXTRA_DIST += euptexdir/tests/eup-prim.tex euptexdir/tests/eup-prim.log DISTCLEANFILES += eup-prim.* -## euptex-ucs.test +## euptexdir/euptex-ucs.test EXTRA_DIST += euptexdir/tests/ucs.tex euptexdir/tests/ucs-s.log \ euptexdir/tests/ucs-e.log euptexdir/tests/ucs-u.log DISTCLEANFILES += eup-ucs*.* +## euptexdir/euptex-widow.test +EXTRA_DIST += euptexdir/tests/eup-jchwidow.log +DISTCLEANFILES += eup-jchwidow.* euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ diff --git a/source/texk/web2c/euptexdir/euptex-widow.test b/source/texk/web2c/euptexdir/euptex-widow.test new file mode 100755 index 000000000..1faa53683 --- /dev/null +++ b/source/texk/web2c/euptexdir/euptex-widow.test @@ -0,0 +1,32 @@ +#! /bin/sh -vx +# Copyright 2025 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_euptex=$BinDir/euptex$ExeExt + +LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE + +TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF +TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS +TEXFONTS=".;$srcdir//tests"; export TEXFONTS +TEXFORMATS=.; export TEXFORMATS + +# get same filename in log +rm -f eup-jchwidow.* +$LN_S $srcdir/uptexdir/tests/jchwidow.tex ./eup-jchwidow.tex + +if test ! -f ./eup-basic.tex; then + cp $srcdir/tests/dump-basic.tex ./eup-basic.tex +fi +if test ! -f ./eup-basic.fmt; then + $_euptex -ini -etex eup-basic || exit 1 +fi + +$_euptex -fmt=eup-basic -interaction=batchmode eup-jchwidow || : + +sed 1d eup-jchwidow.log >eup-jchwidow.out + +diff $srcdir/euptexdir/tests/eup-jchwidow.log eup-jchwidow.out || exit 3 + diff --git a/source/texk/web2c/euptexdir/tests/eup-jchwidow.log b/source/texk/web2c/euptexdir/tests/eup-jchwidow.log new file mode 100644 index 000000000..97e031688 --- /dev/null +++ b/source/texk/web2c/euptexdir/tests/eup-jchwidow.log @@ -0,0 +1,910 @@ +entering extended mode + restricted \write18 enabled. + %&-line parsing enabled. +**eup-jchwidow +(./eup-jchwidow.tex TEST +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 378.1154fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\jpy す +..\glue(refer from jfm) 4.58203 minus 2.291 +..\jpy 「 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.19 \TEST{す{\kcatcode`す=18 す}「。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.20 \TEST{\CR。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.22 \TEST{\Ucharcat`す 16。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.23 \TEST{\Ucharcat`す 17。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.24 \TEST{\Ucharcat`す 18。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.25 \TEST{\Ucharcat`す 19。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.28 \TEST{す。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.29 \TEST{す\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.31 \TEST{す\kchar\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.34 \TEST{\char\kuten"0419。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.35 \TEST{\char\kuten"0419\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.37 \TEST{\char\kuten"0419\kchar\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.40 \TEST{\KR。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.41 \TEST{\kchar\kuten"0419。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.42 \TEST{\kchar\kuten"0419\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.43 \TEST{\kchar\kuten"0419\kchar\kuten"0103} + + +KCHAR"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.50 \TEST{い\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.51 \TEST{\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.52 \TEST{\relax\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.53 \TEST{\vrule\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.54 \TEST{b\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.55 \TEST{い\S。} + + +CHAR"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.60 \TEST{い\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.61 \TEST{\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.62 \TEST{\relax\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.63 \TEST{\vrule\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.64 \TEST{b\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.65 \TEST{い\S。} + + +KCHARDEF"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.70 \TEST{い\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.71 \TEST{\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.72 \TEST{\relax\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.73 \TEST{\vrule\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.74 \TEST{b\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.75 \TEST{い\S。} + + +CHARDEF"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.80 \TEST{い\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.81 \TEST{\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.82 \TEST{\relax\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.83 \TEST{\vrule\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.84 \TEST{b\CA 。} + + + ) +No pages of output. diff --git a/source/texk/web2c/euptexdir/upkcat.test b/source/texk/web2c/euptexdir/upkcat.test index 602c1e5b4..3d2291366 100755 --- a/source/texk/web2c/euptexdir/upkcat.test +++ b/source/texk/web2c/euptexdir/upkcat.test @@ -1,6 +1,6 @@ #! /bin/sh -vx # $Id$ -# Copyright 2022 TANAKA Takuji +# Copyright 2022-2025 TANAKA Takuji # You may freely use, modify and/or distribute this file. BinDir=${BinDir:-.} @@ -12,8 +12,18 @@ LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS="$srcdir/uptexdir/tests;."; export TEXINPUTS -$_euptex -ini -etex -interaction batchmode -jobname upkcat-log kcat.tex || exit 1 -grep '::' upkcat-log.log > upkcat-log_ed.log \ - && diff upkcat-log_ed.log $srcdir/uptexdir/tests/upkcat.txt || exit 2 +rm -f eupkcat*log*.log + +$_euptex -ini -etex -interaction batchmode -jobname eupkcat-log kcat.tex || exit 1 +grep '::' eupkcat-log.log > eupkcat-log_ed.log \ + && diff eupkcat-log_ed.log $srcdir/uptexdir/tests/upkcat.txt || exit 2 + +$_euptex -ini -etex -interaction batchmode -jobname eupkcat-e-log -kanji-internal=euc kcat.tex || exit 3 +grep '::' eupkcat-e-log.log > eupkcat-e-log_ed.log \ + && diff eupkcat-e-log_ed.log $srcdir/uptexdir/tests/upkcat-e.txt || exit 4 + +$_euptex -ini -etex -interaction batchmode -jobname eupkcat-s-log -kanji-internal=sjis kcat.tex || exit 5 +grep '::' eupkcat-s-log.log > eupkcat-s-log_ed.log \ + && diff eupkcat-s-log_ed.log $srcdir/uptexdir/tests/upkcat-s.txt || exit 6 exit 0 diff --git a/source/texk/web2c/ptexdir/COPYRIGHT b/source/texk/web2c/ptexdir/COPYRIGHT index 0ebd3f3a0..3e0c20b5e 100644 --- a/source/texk/web2c/ptexdir/COPYRIGHT +++ b/source/texk/web2c/ptexdir/COPYRIGHT @@ -1,5 +1,5 @@ Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2010-2023 Japanese TeX Development Community +Copyright (C) 2010-2025 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/source/texk/web2c/ptexdir/ChangeLog b/source/texk/web2c/ptexdir/ChangeLog index 92cce7d5f..fcfa2a83c 100644 --- a/source/texk/web2c/ptexdir/ChangeLog +++ b/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,13 @@ +2025-01-02 TANAKA Takuji + + * ptex-prntknj.test, tests/pknj-{e,s}.log: + Update tests. + * ptex-widow.test, tests/p-jchwidow.log, + am/ptex.am: Add new tests for widow penalty originally + written by Kitagawa-san. + https://github.com/texjporg/tex-jp-build/issues/103 + * COPYRIGHT: copyright year. + 2024-09-22 TANAKA Takuji * ptex-base.ch, ptex_version.h: Version p4.1.2. diff --git a/source/texk/web2c/ptexdir/am/ptex.am b/source/texk/web2c/ptexdir/am/ptex.am index caf30c2f9..feca2da4a 100644 --- a/source/texk/web2c/ptexdir/am/ptex.am +++ b/source/texk/web2c/ptexdir/am/ptex.am @@ -110,11 +110,11 @@ ptex_tests = \ ptexdir/wcfname.test \ ptexdir/ptex-ctrlsym.test \ ptexdir/ptex-prntknj.test \ - ptexdir/ptex-ucs.test + ptexdir/ptex-ucs.test ptexdir/ptex-widow.test ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) ptexdir/pver.log ptexdir/wcfname.log \ ptexdir/ptex-ctrlsym.log ptexdir/ptex-prntknj.log \ - ptexdir/ptex-ucs.log: ptex$(EXEEXT) + ptexdir/ptex-ucs.log ptexdir/ptex-widow.log: ptex$(EXEEXT) EXTRA_DIST += $(ptex_tests) $(pweb_tests) DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \ @@ -182,15 +182,18 @@ EXTRA_DIST += ptexdir/tests/ctrlsym.tex ptexdir/tests/ctrlsym.log \ ptexdir/tests/ptexlineendmode.tex ptexdir/tests/p-lineenda.typ DISTCLEANFILES += p-ctrlsym.log p-ctrlsym.out p-ctrlsym.tex \ p-endline*.* p-jctrlsym*.* p-chartoken.* p-lineend.* -## ptex-prntknj.test +## ptexdir/ptex-prntknj.test EXTRA_DIST += ptexdir/tests/printkanji.tex \ ptexdir/tests/pknj-s.log ptexdir/tests/pknj-e.log \ ptexdir/tests/p-pknj-sa.typ ptexdir/tests/p-pknj-ea.typ DISTCLEANFILES += p-pknj-*.* -## ptex-ucs.test +## ptexdir/ptex-ucs.test EXTRA_DIST += ptexdir/tests/ucs.tex ptexdir/tests/ucs-s.log \ ptexdir/tests/ucs-e.log DISTCLEANFILES += p-ucs*.* +## ptexdir/ptex-widow.test +EXTRA_DIST += ptexdir/tests/p-jchwidow.log +DISTCLEANFILES += p-jchwidow*.* ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ diff --git a/source/texk/web2c/ptexdir/ptex-prntknj.test b/source/texk/web2c/ptexdir/ptex-prntknj.test index 0f2c50f96..2bbbb3df7 100755 --- a/source/texk/web2c/ptexdir/ptex-prntknj.test +++ b/source/texk/web2c/ptexdir/ptex-prntknj.test @@ -31,8 +31,8 @@ fi $_ptex -fmt=p-basic-sjis -kanji-internal=sjis -jobname=p-pknj-s -interaction=batchmode printkanji || : $_ptex -fmt=p-basic-euc -kanji-internal=euc -jobname=p-pknj-e -interaction=batchmode printkanji || : -sed 1d p-pknj-s.log >p-pknj-s.out -sed 1d p-pknj-e.log >p-pknj-e.out +sed "1d;s/characters out of 621947.$/characters out of 621947X/" p-pknj-s.log >p-pknj-s.out +sed "1d;s/characters out of 621947.$/characters out of 621947X/" p-pknj-e.log >p-pknj-e.out diff $srcdir/ptexdir/tests/pknj-s.log p-pknj-s.out || exit 10 diff $srcdir/ptexdir/tests/pknj-e.log p-pknj-e.out || exit 11 diff --git a/source/texk/web2c/ptexdir/ptex-widow.test b/source/texk/web2c/ptexdir/ptex-widow.test new file mode 100755 index 000000000..f1b5f7a88 --- /dev/null +++ b/source/texk/web2c/ptexdir/ptex-widow.test @@ -0,0 +1,38 @@ +#! /bin/sh -vx +# Copyright 2025 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_ptex=$BinDir/ptex$ExeExt + +LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE + +TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF +TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS +TEXFONTS=".;$srcdir//tests"; export TEXFONTS +TEXFORMATS=.; export TEXFORMATS + +# get same filename in log +rm -f p-jchwidow*.* +$LN_S $srcdir/uptexdir/tests/jchwidow.tex ./p-jchwidow.tex + +if test ! -f ./p-basic.tex; then + cp $srcdir/tests/dump-basic.tex ./p-basic.tex +fi +if test ! -f ./p-basic-sjis.fmt; then + $_ptex -ini -kanji-internal=sjis -jobname=p-basic-sjis p-basic || exit 1 +fi +if test ! -f ./p-basic-euc.fmt; then + $_ptex -ini -kanji-internal=euc -jobname=p-basic-euc p-basic || exit 2 +fi + +$_ptex -fmt=p-basic-sjis -kanji-internal=sjis -jobname=p-jchwidow-s -interaction=batchmode p-jchwidow || : +$_ptex -fmt=p-basic-euc -kanji-internal=euc -jobname=p-jchwidow-e -interaction=batchmode p-jchwidow || : + +sed 1d p-jchwidow-s.log >p-jchwidow-s.out +sed 1d p-jchwidow-e.log >p-jchwidow-e.out + +diff $srcdir/ptexdir/tests/p-jchwidow.log p-jchwidow-s.out || exit 10 +diff $srcdir/ptexdir/tests/p-jchwidow.log p-jchwidow-e.out || exit 11 + diff --git a/source/texk/web2c/ptexdir/tests/p-jchwidow.log b/source/texk/web2c/ptexdir/tests/p-jchwidow.log new file mode 100644 index 000000000..b7c9fa40d --- /dev/null +++ b/source/texk/web2c/ptexdir/tests/p-jchwidow.log @@ -0,0 +1,470 @@ + restricted \write18 enabled. + %&-line parsing enabled. +**p-jchwidow +(./p-jchwidow.tex TEST +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 378.1154fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\jpy す +..\glue(refer from jfm) 4.58203 minus 2.291 +..\jpy 「 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.19 \TEST{す{\kcatcode`す=18 す}「。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.20 \TEST{\CR。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.28 \TEST{す。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.29 \TEST{す\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.34 \TEST{\char\kuten"0419。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.35 \TEST{\char\kuten"0419\char\kuten"0103} + + +! Invalid code (15), should be in the range 16..18. +l.46 {\kcatcode`α=15 + +I'm going to use 16 instead of that illegal code value. + +CHAR"3B1, kcatcode=15 +! Bad character code (945). + + 。\BAD. +\TEST ...kens \undefined \else \scantokens \fi {#1 + }}\showboxbreadth 10000\sh... +l.60 \TEST{い\char"03B1。} + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.10971fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.60 \TEST{い\char"03B1。} + + +! Bad character code (945). + + 。\BAD. +\TEST ...kens \undefined \else \scantokens \fi {#1 + }}\showboxbreadth 10000\sh... +l.61 \TEST{\char"03B1。} + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 400.73187fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.61 \TEST{\char"03B1。} + + +! Bad character code (945). + + 。\BAD. +\TEST ...kens \undefined \else \scantokens \fi {#1 + }}\showboxbreadth 10000\sh... +l.62 \TEST{\relax\char"03B1。} + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 400.73187fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.62 \TEST{\relax\char"03B1。} + + +! Bad character code (945). + + 。\BAD. +\TEST ...kens \undefined \else \scantokens \fi {#1 + }}\showboxbreadth 10000\sh... +l.63 \TEST{\vrule\char"03B1。} + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 400.33188fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.63 \TEST{\vrule\char"03B1。} + + +! Bad character code (945). + + 。\BAD. +\TEST ...kens \undefined \else \scantokens \fi {#1 + }}\showboxbreadth 10000\sh... +l.64 \TEST{b\char"03B1。} + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 395.1763fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.64 \TEST{b\char"03B1。} + + +! Bad character code (945). + + 。\BAD. +\TEST ...kens \undefined \else \scantokens \fi {#1 + }}\showboxbreadth 10000\sh... +l.65 \TEST{い\S。} + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.10971fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.65 \TEST{い\S。} + + +CHARDEF"3B1, kcatcode=15 +! Bad character code (945). +l.79 \chardef\CA="3B1 + +A character number must be between 0 and 255, or KANJI code. +I changed this one to zero. + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.10971fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.80 \TEST{い\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 400.73187fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.81 \TEST{\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 400.73187fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.82 \TEST{\relax\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 400.33188fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.83 \TEST{\vrule\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 395.1763fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\cmr ^^@ +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.84 \TEST{b\CA 。} + + + ) +No pages of output. diff --git a/source/texk/web2c/ptexdir/tests/pknj-e.log b/source/texk/web2c/ptexdir/tests/pknj-e.log index 36de6fe13..e86ecb65b 100644 --- a/source/texk/web2c/ptexdir/tests/pknj-e.log +++ b/source/texk/web2c/ptexdir/tests/pknj-e.log @@ -213,7 +213,7 @@ Memory usage before: 1270&5512; after: 118&5077; still untouched: 4992459 ) Here is how much of TeX's memory you used: 25 strings out of 497935 - 137 string characters out of 6219477 + 137 string characters out of 621947X 7541 words of memory out of 5000000 969 multiletter control sequences out of 15000+600000 3271 words of font info for 2 fonts, out of 8000000 for 9000 diff --git a/source/texk/web2c/ptexdir/tests/pknj-s.log b/source/texk/web2c/ptexdir/tests/pknj-s.log index 1ef300b59..632727056 100644 --- a/source/texk/web2c/ptexdir/tests/pknj-s.log +++ b/source/texk/web2c/ptexdir/tests/pknj-s.log @@ -213,7 +213,7 @@ Memory usage before: 1274&5515; after: 118&5078; still untouched: 4992456 ) Here is how much of TeX's memory you used: 24 strings out of 497935 - 135 string characters out of 6219474 + 135 string characters out of 621947X 7544 words of memory out of 5000000 968 multiletter control sequences out of 15000+600000 3271 words of font info for 2 fonts, out of 8000000 for 9000 diff --git a/source/texk/web2c/uptexdir/COPYRIGHT b/source/texk/web2c/uptexdir/COPYRIGHT index 0e73780c5..8b0aa8c9a 100644 --- a/source/texk/web2c/uptexdir/COPYRIGHT +++ b/source/texk/web2c/uptexdir/COPYRIGHT @@ -1,5 +1,5 @@ Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2007-2024 Takuji Tanaka +Copyright (C) 2007-2025 Takuji Tanaka All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/source/texk/web2c/uptexdir/COPYRIGHT.ja b/source/texk/web2c/uptexdir/COPYRIGHT.ja index c75986988..e995c3dfe 100644 --- a/source/texk/web2c/uptexdir/COPYRIGHT.ja +++ b/source/texk/web2c/uptexdir/COPYRIGHT.ja @@ -4,7 +4,7 @@ 【著作権表示】 Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2007-2024 Takuji Tanaka +Copyright (C) 2007-2025 Takuji Tanaka All rights reserved. 【契約条件】 diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog index dd12069fe..cfd05f8f4 100644 --- a/source/texk/web2c/uptexdir/ChangeLog +++ b/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,16 @@ +2025-01-02 TANAKA Takuji + + * kanji.c, uptex-m.ch: + Accept extended upTeX internal encoding also in internal + encoding EUC/SJIS (pTeX-compatible mode). + * upkcat.test, tests/kcat.tex, tests/upkcat{,-{e,s}}.txt: + Update tests. + * uptex-widow.test, tests/jchwidow.tex, tests/up-jchwidow.log, + am/uptex.am: Add new tests for widow penalty originally + written by Kitagawa-san. + https://github.com/texjporg/tex-jp-build/issues/103 + * COPYRIGHT, COPYRIGHT.ja: copyright year. + 2024-10-20 TANAKA Takuji * uptex-m.ch, uptex.defines, kanji.{c,h}: diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am index 4f56d6792..85070a691 100644 --- a/source/texk/web2c/uptexdir/am/uptex.am +++ b/source/texk/web2c/uptexdir/am/uptex.am @@ -173,13 +173,15 @@ uptex_tests = \ uptexdir/upkcat.test \ uptexdir/wcfname.test uptexdir/wcfname0.test \ uptexdir/uptex-ofm.test uptexdir/uptex-prim.test \ - uptexdir/uptex-lmr.test uptexdir/uptex-noto.test + uptexdir/uptex-lmr.test uptexdir/uptex-noto.test \ + uptexdir/uptex-widow.test uptexdir/uptriptest.log uptexdir/ptriptest.log: \ uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) uptexdir/upver.log uptexdir/upkcat.log \ uptexdir/wcfname.log uptexdir/wcfname0.log \ uptexdir/uptex-ofm.log uptexdir/uptex-prim.log \ - uptexdir/uptex-lmr.log uptexdir/uptex-noto.log: uptex$(EXEEXT) + uptexdir/uptex-lmr.log uptexdir/uptex-noto.log \ + uptexdir/uptex-widow.log: uptex$(EXEEXT) upweb_tests = \ uptexdir/upbibtex.test \ uptexdir/updvitype.test \ @@ -283,6 +285,9 @@ DISTCLEANFILES += up-lmr*.* ## uptexdir/uptex-noto.test EXTRA_DIST += uptexdir/tests/noto1.tex uptexdir/tests/up-noto1.log DISTCLEANFILES += up-noto*.* +## uptexdir/uptex-widow.test +EXTRA_DIST += uptexdir/tests/jchwidow.tex uptexdir/tests/up-jchwidow.log +DISTCLEANFILES += up-jchwidow.* uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ diff --git a/source/texk/web2c/uptexdir/kanji.c b/source/texk/web2c/uptexdir/kanji.c index bf453e246..7dce7fe51 100644 --- a/source/texk/web2c/uptexdir/kanji.c +++ b/source/texk/web2c/uptexdir/kanji.c @@ -9,6 +9,7 @@ #define IVS_CHAR_LIMIT 0x4400000 #define CJK_CHAR_LIMIT 0x1000000 #define LATIN_CHAR_LIMIT 0x2E80 +#define UCS_CHAR_LIMIT 0x110000 #define CJK_TOKEN_FLAG 0xFFFFFF #define CAT_LEFT_BRACE 1 #define CAT_DELIM_NUM 15 @@ -48,7 +49,8 @@ boolean is_char_kanji(integer c) if (is_internalUPTEX()) return ((c >= 0)&&(c \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 378.1154fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\jpy す +..\glue(refer from jfm) 4.58203 minus 2.291 +..\jpy 「 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.19 \TEST{す{\kcatcode`す=18 す}「。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.20 \TEST{\CR。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.28 \TEST{す。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.29 \TEST{す\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.31 \TEST{す\kchar\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.34 \TEST{\char\kuten"0419。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.35 \TEST{\char\kuten"0419\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.37 \TEST{\char\kuten"0419\kchar\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.40 \TEST{\KR。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.41 \TEST{\kchar\kuten"0419。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.42 \TEST{\kchar\kuten"0419\char\kuten"0103} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.84087fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy す +..\kern-0.48114 +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.43 \TEST{\kchar\kuten"0419\kchar\kuten"0103} + + +KCHAR"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.50 \TEST{い\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.51 \TEST{\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.52 \TEST{\relax\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.53 \TEST{\vrule\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.54 \TEST{b\kchar"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.55 \TEST{い\S。} + + +CHAR"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.60 \TEST{い\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.61 \TEST{\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.62 \TEST{\relax\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.63 \TEST{\vrule\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.64 \TEST{b\char"03B1。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.65 \TEST{い\S。} + + +KCHARDEF"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.70 \TEST{い\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.71 \TEST{\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.72 \TEST{\relax\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.73 \TEST{\vrule\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.74 \TEST{b\KA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.75 \TEST{い\S。} + + +CHARDEF"3B1, kcatcode=15 +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 387.73756fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy い +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.80 \TEST{い\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.81 \TEST{\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 397.35973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.82 \TEST{\relax\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 396.95973fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\rule(*+*)x0.4 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.83 \TEST{\vrule\CA 。} + + +> \box0= +\vbox(7.77588+1.38855)x469.75499, yoko direction +.\hbox(7.77588+1.38855)x469.75499, glue set 391.80415fil +..\displace 0.0 +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\jpy あ +..\glue(\xkanjiskip) 0.0 +..\cmr b +..\glue(\xkanjiskip) 0.0 +..\jpy α +..\jpy 。 +..\penalty 10000 +..\glue(\parfillskip) 0.0 plus 1.0fil +..\glue(\rightskip) 0.0 + +! OK. + + } +l.84 \TEST{b\CA 。} + + + ) +No pages of output. diff --git a/source/texk/web2c/uptexdir/tests/upkcat-e.txt b/source/texk/web2c/uptexdir/tests/upkcat-e.txt new file mode 100644 index 000000000..5dd028a14 --- /dev/null +++ b/source/texk/web2c/uptexdir/tests/upkcat-e.txt @@ -0,0 +1,45 @@ +1区::18 +2区::18 +3区::17 +4区::17 +5区::17 +6区::17 +7区::18 +8区::18 +9区::18 +10区::18 +11区::18 +12区::18 +13区::18 +14区::16 +15区::16 +16区::16 +17区::16 +18区::16 +19区::16 +20区::16 +21区::16 +22区::16 +23区::16 +24区::16 +80区::16 +81区::16 +82区::16 +83区::16 +84区::16 +90区::16 +91区::16 +92区::16 +93区::16 +94区::16 +0x110000::16 +0x120000::16 +0x130000::16 +0x140000::16 +あ^^e3^^82^^99::17 +か^^e3^^82^^9a::17 +^^f0^^9f^^87^^af^^f0^^9f^^87^^b5::18 +^^f0^^9f^^91^^b6^^f0^^9f^^8f^^bd::18 +0x800030::18 +逸^^ef^^b8^^80::16 +逸^^f3^^a0^^84^^80::16 diff --git a/source/texk/web2c/uptexdir/tests/upkcat-s.txt b/source/texk/web2c/uptexdir/tests/upkcat-s.txt new file mode 100644 index 000000000..1179027f3 --- /dev/null +++ b/source/texk/web2c/uptexdir/tests/upkcat-s.txt @@ -0,0 +1,53 @@ +1区::18 +2区::18 +3区::17 +4区::17 +5区::17 +6区::17 +7区::18 +8区::18 +9区::18 +10区::18 +11区::18 +12区::18 +13区::18 +14区::16 +15区::16 +16区::16 +17区::16 +18区::16 +19区::16 +20区::16 +21区::16 +22区::16 +23区::16 +24区::16 +80区::16 +81区::16 +82区::16 +83区::16 +84区::16 +90区::16 +91区::16 +92区::16 +93区::16 +94区::16 +95区(ext)::16 +96区(ext)::16 +97区(ext)::16 +98区(ext)::16 +117区(ext)::16 +118区(ext)::16 +119区(ext)::16 +120区(ext)::16 +0x110000::16 +0x120000::16 +0x130000::16 +0x140000::16 +あ^^e3^^82^^99::17 +か^^e3^^82^^9a::17 +^^f0^^9f^^87^^af^^f0^^9f^^87^^b5::18 +^^f0^^9f^^91^^b6^^f0^^9f^^8f^^bd::18 +0x800030::18 +逸^^ef^^b8^^80::16 +逸^^f3^^a0^^84^^80::16 diff --git a/source/texk/web2c/uptexdir/tests/upkcat.txt b/source/texk/web2c/uptexdir/tests/upkcat.txt index d4da0a6df..c117c68d1 100644 --- a/source/texk/web2c/uptexdir/tests/upkcat.txt +++ b/source/texk/web2c/uptexdir/tests/upkcat.txt @@ -25,8 +25,6 @@ A::15 丽::16 𰀀::16 𱍐::16 -逸︀::16 -逸󠄀::16 あ::17 ア::17 ㇰ::17 @@ -34,8 +32,6 @@ A::15 𛀀::17 𛄀::17 𛅐::17 -あ゙::17 -か゚::17 ※::18 ℃::18 Ⅻ::18 @@ -48,9 +44,6 @@ A::15 〠::18 ㋐::18 ㍿::18 -🇯🇵::18 -👶🏽::18 -0x800030::18 ᄀ::19 ㄱ::19 ꥠ::19 @@ -61,3 +54,14 @@ A::15 🏻::20 ︀::20 󠄀::20 +0x110000::16 +0x120000::16 +0x130000::16 +0x140000::16 +あ゙::17 +か゚::17 +🇯🇵::18 +👶🏽::18 +0x800030::18 +逸︀::16 +逸󠄀::16 diff --git a/source/texk/web2c/uptexdir/upkcat.test b/source/texk/web2c/uptexdir/upkcat.test index 195fb9c5b..f5e0eeb2e 100755 --- a/source/texk/web2c/uptexdir/upkcat.test +++ b/source/texk/web2c/uptexdir/upkcat.test @@ -1,6 +1,6 @@ #! /bin/sh -vx # $Id$ -# Copyright 2022 TANAKA Takuji +# Copyright 2022-2025 TANAKA Takuji # You may freely use, modify and/or distribute this file. BinDir=${BinDir:-.} @@ -12,8 +12,18 @@ LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS="$srcdir/uptexdir/tests;."; export TEXINPUTS +rm -f upkcat*log*.log + $_uptex -ini -interaction batchmode -jobname upkcat-log kcat.tex || exit 1 grep '::' upkcat-log.log > upkcat-log_ed.log \ && diff upkcat-log_ed.log $srcdir/uptexdir/tests/upkcat.txt || exit 2 +$_uptex -ini -interaction batchmode -jobname upkcat-e-log -kanji-internal=euc kcat.tex || exit 3 +grep '::' upkcat-e-log.log > upkcat-e-log_ed.log \ + && diff upkcat-e-log_ed.log $srcdir/uptexdir/tests/upkcat-e.txt || exit 4 + +$_uptex -ini -interaction batchmode -jobname upkcat-s-log -kanji-internal=sjis kcat.tex || exit 5 +grep '::' upkcat-s-log.log > upkcat-s-log_ed.log \ + && diff upkcat-s-log_ed.log $srcdir/uptexdir/tests/upkcat-s.txt || exit 6 + exit 0 diff --git a/source/texk/web2c/uptexdir/uptex-m.ch b/source/texk/web2c/uptexdir/uptex-m.ch index 5df4aee90..ea23e60bd 100644 --- a/source/texk/web2c/uptexdir/uptex-m.ch +++ b/source/texk/web2c/uptexdir/uptex-m.ch @@ -50,6 +50,7 @@ % (2023-09-16) TTK upTeX u1.30 % (2024-09-30) TTK upTeX u1.35 % (2024-10-20) TTK upTeX u2.00 +% (2025-01-02) TTK Accept extended upTeX internal encoding also in pTeX-compatible EUC/SJIS mode. @x \def\pTeX{p\kern-.15em\TeX} @@ -377,9 +378,6 @@ if (isinternalUPTEX) then begin @+@t\1@>for k:=@"115 to @"118 do kcat_code(k):=kana; { Kana Extended-B .. Small Kana Extension } @+@t\1@>for k:=@"145 to @"14F do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. J } @t\hskip10pt@>kcat_code(@"15B):=modifier; { Variation Selectors Supplement } - @+@t\1@>for k:=@"170 to @"171 do kcat_code(k):=kana; { Kana with (Semi-)Voiced Sound Mark } - @t\hskip10pt@>kcat_code(@"175):=kanji; { Standardized Variation Sequence } - @+@t\1@>for k:=@"177 to @"178 do kcat_code(k):=kanji; { Ideographic Variation Sequence } @+@t\1@>for k:=@"1F9 to @"1FC do kcat_code(k):=modifier; { Combining Katakana-Hiragana (Semi-)Voiced Sound Mark .. Emoji Modifier Fitzpatrick } @t\hskip10pt@>kcat_code(@"1FD):=not_cjk; { Latin-1 Letters } @@ -394,6 +392,10 @@ end else begin { $\.{@@"20}+|k| = |kcatcodekey|(|fromKUTEN|(|HILO|(k,1))$ } @+@t\1@>for k:=16 to 94 do kcat_code(@"A0+k):=kanji; {2 men 16 ku ... 94 ku} end; +@+@t\1@>for k:=@"15F to @"162 do kcat_code(k):=kanji; { for japanese-otf, japanese-otf-uptex } +@+@t\1@>for k:=@"170 to @"171 do kcat_code(k):=kana; { Kana with (Semi-)Voiced Sound Mark } +@t\hskip10pt@>kcat_code(@"175):=kanji; { Standardized Variation Sequence } +@+@t\1@>for k:=@"177 to @"178 do kcat_code(k):=kanji; { Ideographic Variation Sequence } @z @x diff --git a/source/texk/web2c/uptexdir/uptex-widow.test b/source/texk/web2c/uptexdir/uptex-widow.test new file mode 100755 index 000000000..7db6ee205 --- /dev/null +++ b/source/texk/web2c/uptexdir/uptex-widow.test @@ -0,0 +1,32 @@ +#! /bin/sh -vx +# Copyright 2025 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_uptex=$BinDir/uptex$ExeExt + +LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE + +TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF +TEXINPUTS=".;$srcdir/tests"; export TEXINPUTS +TEXFONTS=".;$srcdir//tests"; export TEXFONTS +TEXFORMATS=.; export TEXFORMATS + +# get same filename in log +rm -f up-jchwidow.* +$LN_S $srcdir/uptexdir/tests/jchwidow.tex ./up-jchwidow.tex + +if test ! -f ./up-basic.tex; then + cp $srcdir/tests/dump-basic.tex ./up-basic.tex +fi +if test ! -f ./up-basic.fmt; then + $_uptex -ini up-basic || exit 1 +fi + +$_uptex -fmt=up-basic -interaction=batchmode up-jchwidow || : + +sed 1d up-jchwidow.log >up-jchwidow.out + +diff $srcdir/uptexdir/tests/up-jchwidow.log up-jchwidow.out || exit 3 + From b3775a9a90bb28faf53ca9ded200bc3b0fb6becb Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Thu, 2 Jan 2025 23:13:49 +0000 Subject: [PATCH 10/15] New luaffi, support for aarch64. LuaTeX 1.20.0 git-svn-id: svn://tug.org/texlive/trunk/Build@73279 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 05fd556f6..695e0c118 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -5311,6 +5311,8 @@ nodist_libluaffi_a_SOURCES = $(libluaffi_sources) #nodist_liblua53ffi_a_SOURCES = $(libluaffi_sources) libluaffi_sources = \ luatexdir/luaffi/call_arm.h \ + luatexdir/luaffi/call_arm64.h \ + luatexdir/luaffi/call_arm_hf.h \ luatexdir/luaffi/call.c \ luatexdir/luaffi/call_x64.h \ luatexdir/luaffi/call_x64win.h \ From d94f422cbdb08396576fc9c7a395e0b392f530ac Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Fri, 3 Jan 2025 11:00:02 +0000 Subject: [PATCH 11/15] uptex: twaek ChangeLog git-svn-id: svn://tug.org/texlive/trunk/Build@73282 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/uptexdir/ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog index cfd05f8f4..d7a06f882 100644 --- a/source/texk/web2c/uptexdir/ChangeLog +++ b/source/texk/web2c/uptexdir/ChangeLog @@ -3,6 +3,8 @@ * kanji.c, uptex-m.ch: Accept extended upTeX internal encoding also in internal encoding EUC/SJIS (pTeX-compatible mode). + Set default kcatcode for japanese-otf-uptex macros + to 16 (kanji). * upkcat.test, tests/kcat.tex, tests/upkcat{,-{e,s}}.txt: Update tests. * uptex-widow.test, tests/jchwidow.tex, tests/up-jchwidow.log, From 5082ffa5ddad113feaf1a03cd4bff5fabd74fde4 Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Sat, 4 Jan 2025 17:42:43 +0000 Subject: [PATCH 12/15] Clean-up ffi.h. LuaTeX 1.20.1 git-svn-id: svn://tug.org/texlive/trunk/Build@73298 c570f23f-e606-0410-a88d-b1316a301751 From 044d4d48fe2915e7ff2365b94f8e5615dcc4d539 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 5 Jan 2025 00:27:58 +0000 Subject: [PATCH 13/15] empty dir git-svn-id: svn://tug.org/texlive/trunk/Build@73311 c570f23f-e606-0410-a88d-b1316a301751 From 2b480f3224fd5167de7fc25cf0af0b66b217e639 Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Mon, 6 Jan 2025 12:45:35 +0000 Subject: [PATCH 14/15] ffi.h: do not assume that struct cdata is aligned(16). More fixes for luaffi. LuaTeX 1.20.2 git-svn-id: svn://tug.org/texlive/trunk/Build@73330 c570f23f-e606-0410-a88d-b1316a301751 From 86173fa6115d21f5812c9041005410359cca5d69 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 6 Jan 2025 22:44:01 +0000 Subject: [PATCH 15/15] mfluajitlpeg depends on luajit not just lua git-svn-id: svn://tug.org/texlive/trunk/Build@73339 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 695e0c118..7f57620ce 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -21823,7 +21823,7 @@ mfluajittrap.diffs: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT) mfluajittrap-clean: rm -rf mfluajittrapdir -$(libmfluajitlpeg_a_OBJECTS): $(LUA_DEPEND) +$(libmfluajitlpeg_a_OBJECTS): $(LUAJIT_DEPEND) .PHONY: install-mpost-links uninstall-mpost-links @WIN32_TRUE@install-mpost-links: call_mpost$(EXEEXT)