summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2022-11-03 10:50:32 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2022-11-03 10:50:32 +0000
commit9ab6071e267edf5835883cc795f9c6398c0f0318 (patch)
tree6f40b37b80d1496acef720220a1a62de92f218f0
parentaf2ba887dde8f8b25d8217a875faf7347b7f8a9b (diff)
pTeX also has max_quarterword 0xFFFF
git-svn-id: svn://tug.org/texlive/trunk@64914 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex.ech6
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch17
-rw-r--r--Build/source/texk/web2c/texmfmem.h2
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex-m.ch2
5 files changed, 27 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index f6d2c44d8ea..afe196314e2 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -55,12 +55,6 @@
@d banner_k==epTeX_banner_k
@z
-@x
-@d max_quarterword=255 {largest allowable value in a |quarterword|}
-@y
-@d max_quarterword=@"FFFF {largest allowable value in a |quarterword|}
-@z
-
@x [10.135] l.2895 - e-pTeX: box_lr and box_dir
In \eTeX\ the |subtype| field records the box direction mode |box_lr|.
@y
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 18bf30fed40..59d436bcf18 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,10 @@
+2022-11-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * ptex-base.ch: Increase max_quarterword to 0xFFFF on pTeX.
+ This is safe (and also necessary) as texmfmem.h already has
+ similar memory structure as upTeX, epTeX and eupTeX.
+ (Bug introduced on commit 2022-01-22)
+
2022-10-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* ptex-base.ch: Add a new syntax \font [in jis/ucs].
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index b15710a3871..3ce286b3ed5 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -458,6 +458,12 @@ if last<>first then print_unread_buffer_with_ptenc(first,last);
@z
@x
+@d max_quarterword=255 {largest allowable value in a |quarterword|}
+@y
+@d max_quarterword=@"FFFF {largest allowable value in a |quarterword|}
+@z
+
+@x
@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
@y
@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
@@ -4590,6 +4596,17 @@ inhibit_glue_flag:=false;
u:=hpack(link(head),natural); w:=width(u);
@z
+@x [37.???] l.????? - increased max_quarterword
+if n>max_quarterword then confusion("256 spans"); {this can happen, but won't}
+@^system dependencies@>
+@:this can't happen 256 spans}{\quad 256 spans@>
+@y
+if n>max_quarterword then confusion("too many spans");
+ {this can happen, but won't}
+@^system dependencies@>
+@:this can't happen too many spans}{\quad too many spans@>
+@z
+
@x [37.799] l.16331 - fin_row: pTeX: call adjust_hlist
begin p:=hpack(link(head),natural);
@y
diff --git a/Build/source/texk/web2c/texmfmem.h b/Build/source/texk/web2c/texmfmem.h
index 8957d2469e6..60c83e0124a 100644
--- a/Build/source/texk/web2c/texmfmem.h
+++ b/Build/source/texk/web2c/texmfmem.h
@@ -63,6 +63,8 @@
*/
/* Aleph is sufficiently different to separate the definition. */
+/* pTeX, upTeX, e-pTeX and e-upTeX define max_quarterword=@"FFFF,
+ so a similar memory structure is applicable. */
#if !defined(Aleph) && !defined(pTeX) && !defined(epTeX) && !defined(eupTeX) && !defined(upTeX)
typedef union
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index 9cba64c5067..264a34ce43b 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -146,7 +146,7 @@ else if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12))
@x
@d min_quarterword=0 {smallest allowable value in a |quarterword|}
-@d max_quarterword=255 {largest allowable value in a |quarterword|}
+@d max_quarterword=@"FFFF {largest allowable value in a |quarterword|}
@d min_halfword==-@"FFFFFFF {smallest allowable value in a |halfword|}
@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
@d max_cjk_val=@"10000