texlive[65247] Build/source/texk/web2c: (e)(u)ptex: refactor change
commits+hironobu at tug.org
commits+hironobu at tug.org
Mon Dec 12 13:18:57 CET 2022
Revision: 65247
http://tug.org/svn/texlive?view=revision&revision=65247
Author: hironobu
Date: 2022-12-12 13:18:57 +0100 (Mon, 12 Dec 2022)
Log Message:
-----------
(e)(u)ptex: refactor change files
Modified Paths:
--------------
trunk/Build/source/texk/web2c/eptexdir/eptex.ech
trunk/Build/source/texk/web2c/eptexdir/etex.ch0
trunk/Build/source/texk/web2c/eptexdir/etex.ch1
trunk/Build/source/texk/web2c/eptexdir/pdfutils.ch
trunk/Build/source/texk/web2c/euptexdir/euptex.ch0
trunk/Build/source/texk/web2c/euptexdir/euptex.ch1
trunk/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch
trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch
trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
Modified: trunk/Build/source/texk/web2c/eptexdir/eptex.ech
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/eptex.ech 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/eptexdir/eptex.ech 2022-12-12 12:18:57 UTC (rev 65247)
@@ -125,8 +125,8 @@
@x
@d ptex_minor_version_code=ptex_version_code+1 {code for \.{\\ptexminorversion}}
@y
- at d ptex_minor_version_code=ptex_version_code+1 {code for \.{\\ptexminorversion}}
- at d eptex_version_code=ptex_minor_version_code+1 {code for \.{\\epTeXversion}}
+ at d eptex_version_code=ptex_version_code+1 {code for \.{\\epTeXversion}}
+ at d ptex_minor_version_code=eptex_version_code+1 {code for \.{\\ptexminorversion}}
@z
@x e-pTeX: \current(x)spacingmode
@@ -136,23 +136,22 @@
@z
@x
-primitive("ptexversion",last_item,ptex_version_code);
-@!@:ptexversion_}{\.{\\ptexversion} primitive@>
+primitive("ptexminorversion",last_item,ptex_minor_version_code);
+@!@:ptexminorversion_}{\.{\\ptexminorversion} primitive@>
@y
-primitive("ptexversion",last_item,ptex_version_code);
-@!@:ptexversion_}{\.{\\ptexversion} primitive@>
primitive("epTeXversion",last_item,eptex_version_code);
@!@:epTeXversion_}{\.{\\epTeXversion} primitive@>
+primitive("ptexminorversion",last_item,ptex_minor_version_code);
+@!@:ptexminorversion_}{\.{\\ptexminorversion} primitive@>
@z
@x
- ptex_version_code: print_esc("ptexversion");
+ ptex_minor_version_code: print_esc("ptexminorversion");
@y
- ptex_version_code: print_esc("ptexversion");
eptex_version_code: print_esc("epTeXversion");
+ ptex_minor_version_code: print_esc("ptexminorversion");
@z
-
@x [26.420] l.8474 - pTeX: Fetch a box dimension: dir_node
begin scan_eight_bit_int; q:=box(cur_val);
@y
@@ -209,10 +208,10 @@
@z
@x
- ptex_version_code: cur_val:=pTeX_version;
+ ptex_minor_version_code: cur_val:=pTeX_minor_version;
@y
- ptex_version_code: cur_val:=pTeX_version;
eptex_version_code: cur_val:=epTeX_version_number;
+ ptex_minor_version_code: cur_val:=pTeX_minor_version;
@z
@x [26.424] e-pTeX: node char
Modified: trunk/Build/source/texk/web2c/eptexdir/etex.ch0
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/etex.ch0 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/eptexdir/etex.ch0 2022-12-12 12:18:57 UTC (rev 65247)
@@ -122,8 +122,10 @@
@z
@x [30.581]
+ at p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
var old_setting: integer; {saved value of |tracing_online|}
@y
+ at p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
@z
@x [32.619]
Modified: trunk/Build/source/texk/web2c/eptexdir/etex.ch1
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/etex.ch1 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/eptexdir/etex.ch1 2022-12-12 12:18:57 UTC (rev 65247)
@@ -29,6 +29,14 @@
buffer[first+j]:=Lo(so(str_pool[k+j])); buffer2[first+j]:=Hi(so(str_pool[k+j])); end;
@z
+ at x [26.413]
+@<Fix the reference count, if any, and negate |cur_val| if |negative|@>;
+end;
+ at y
+@<Fix the reference count, if any, and negate |cur_val| if |negative|@>;
+exit:end;
+ at z
+
@x
@d eTeX_int=badness_code+1 {first of \eTeX\ codes for integers}
@y
@@ -71,8 +79,10 @@
@z
@x [30.581]
+ at p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
var @!l:0..255; {small indices or counters}
@y
+ at p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
var @!l:0..255; {small indices or counters}
old_setting: integer; {saved value of |tracing_online|}
@z
@@ -131,7 +141,8 @@
box(n):=vpack(q,natural); set_box_dir(box(n))(box_dir(v));
end;
@y
-q:=prune_page_top(q,saving_vdiscards>0); p:=list_ptr(v);
+q:=prune_page_top(q,saving_vdiscards>0);
+p:=list_ptr(v);
if q<>null then begin
q:=vpack(q,natural); set_box_dir(q)(box_dir(v));
end;
Modified: trunk/Build/source/texk/web2c/eptexdir/pdfutils.ch
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/pdfutils.ch 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/eptexdir/pdfutils.ch 2022-12-12 12:18:57 UTC (rev 65247)
@@ -840,13 +840,13 @@
@z
@x
- at d eptex_version_code=ptex_minor_version_code+1 {code for \.{\\epTeXversion}}
+ at d ptex_minor_version_code=eptex_version_code+1 {code for \.{\\ptexminorversion}}
@y
- at d eptex_version_code=ptex_minor_version_code+1 {code for \.{\\epTeXversion}}
- at d pdf_last_x_pos_code=eptex_version_code+1 {code for \.{\\pdflastxpos}}
+ at d ptex_minor_version_code=eptex_version_code+1 {code for \.{\\ptexminorversion}}
+ at d pdf_last_x_pos_code=ptex_minor_version_code+1 {code for \.{\\pdflastxpos}}
@d pdf_last_y_pos_code=pdf_last_x_pos_code+1 {code for \.{\\pdflastypos}}
@d pdf_shell_escape_code=pdf_last_y_pos_code+1 {code for \.{\\pdflastypos}}
- at d elapsed_time_code =pdf_shell_escape_code+1 {code for \.{\\pdfelapsedtime}}
+ at d elapsed_time_code=pdf_shell_escape_code+1 {code for \.{\\pdfelapsedtime}}
@d random_seed_code=elapsed_time_code+1 {code for \.{\\pdfrandomseed}}
@z
@@ -1204,11 +1204,9 @@
@z
@x \[if]pdfprimitive
-if_void_code, if_hbox_code, if_vbox_code, if_tbox_code, if_ybox_code, if_dbox_code, if_mbox_code:
- @<Test box register status@>;
+if_void_code, if_hbox_code, if_vbox_code: @<Test box register status@>;
@y
-if_void_code, if_hbox_code, if_vbox_code, if_tbox_code, if_ybox_code, if_dbox_code, if_mbox_code:
- @<Test box register status@>;
+if_void_code, if_hbox_code, if_vbox_code: @<Test box register status@>;
if_pdfprimitive_code: begin
save_scanner_status:=scanner_status;
scanner_status:=normal;
Modified: trunk/Build/source/texk/web2c/euptexdir/euptex.ch0
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/euptex.ch0 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/euptexdir/euptex.ch0 2022-12-12 12:18:57 UTC (rev 65247)
@@ -7,6 +7,13 @@
@z
@x
+ at d uptex_version_code=ptex_version_code+1 {code for \.{\\uptexversion}}
+ at d ptex_minor_version_code=uptex_version_code+1 {code for \.{\\ptexminorversion}}
+ at y
+ at d ptex_minor_version_code=ptex_version_code+1 {code for \.{\\ptexminorversion}}
+ at z
+
+ at x
uptex_version_code: print_esc("uptexversion");
@y
@z
Modified: trunk/Build/source/texk/web2c/euptexdir/euptex.ch1
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/euptex.ch1 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/euptexdir/euptex.ch1 2022-12-12 12:18:57 UTC (rev 65247)
@@ -6,9 +6,9 @@
@z
@x e-upTeX: banner
- {printed when u\pTeX\ starts}
+ {printed when \upTeX\ starts}
@y
- {printed when u\pTeX\ starts}
+ {printed when \upTeX\ starts}
@#
@d eupTeX_version==pTeX_version_string,upTeX_version_string,epTeX_version_string,eTeX_version_string
@d eupTeX_banner=='This is e-upTeX, Version 3.141592653',eupTeX_version
@@ -31,9 +31,10 @@
@z
@x
- at d uptex_version_code=ptex_minor_version_code+1 {code for \.{\\uptexversion}}
+ at d eptex_version_code=ptex_version_code+1 {code for \.{\\epTeXversion}}
@y
- at d uptex_version_code=ptex_minor_version_code+2 {code for \.{\\uptexversion}}
+ at d uptex_version_code=ptex_version_code+1 {code for \.{\\uptexversion}}
+ at d eptex_version_code=uptex_version_code+1 {code for \.{\\epTeXversion}}
@z
@x e-upTeX: \currentcjktoken
@@ -45,8 +46,8 @@
@x
eptex_version_code: print_esc("epTeXversion");
@y
+ uptex_version_code: print_esc("uptexversion");
eptex_version_code: print_esc("epTeXversion");
- uptex_version_code: print_esc("uptexversion");
@z
@x
@@ -58,8 +59,8 @@
@x
eptex_version_code: cur_val:=epTeX_version_number;
@y
+ uptex_version_code: cur_val:=upTeX_version;
eptex_version_code: cur_val:=epTeX_version_number;
- uptex_version_code: cur_val:=upTeX_version;
@z
@x
Modified: trunk/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch 2022-12-12 12:18:57 UTC (rev 65247)
@@ -5,18 +5,6 @@
@z
@x
- at d pdf_last_x_pos_code=eptex_version_code+1 {code for \.{\\pdflastxpos}}
- at y
- at d uptex_version_code=eptex_version_code+1 {code for \.{\\uptexversion}}
- at d pdf_last_x_pos_code=uptex_version_code+1 {code for \.{\\pdflastxpos}}
- at z
-
- at x
- at d uptex_version_code=ptex_minor_version_code+2 {code for \.{\\uptexversion}}
- at y
- at z
-
- at x
if (cc=not_cjk) then cc:=other_kchar;
@y
if cat>=kanji then cc:=cat else if (cc=not_cjk) then cc:=other_kchar;
Modified: trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/ptexdir/ptex-base.ch 2022-12-12 12:18:57 UTC (rev 65247)
@@ -2373,18 +2373,16 @@
var m:halfword; {|chr_code| part of the operand token}
@y
var m:halfword; {|chr_code| part of the operand token}
+@!q,@!r:pointer; {general purpose indices}
@!tx:pointer; {effective tail node}
@!qx:halfword; {general purpose index}
@z
@x [26.413] l.8345 - pTeX: scan_something_internal
-begin m:=cur_chr;
case cur_cmd of
def_code: @<Fetch a character code from some table@>;
toks_register,assign_toks,def_family,set_font,def_font: @<Fetch a token list or
font identifier, provided that |level=tok_val|@>;
@y
-@!q,@!r:pointer;
-begin m:=cur_chr;
case cur_cmd of
assign_kinsoku: @<Fetch breaking penalty from some table@>;
assign_inhibit_xsp_code: @<Fetch inhibit type from some table@>;
@@ -2884,8 +2882,8 @@
if_ydir_code: b:=(abs(direction)=dir_yoko);
if_ddir_code: b:=(abs(direction)=dir_dtou);
if_mdir_code: b:=(direction<0);
-if_void_code, if_hbox_code, if_vbox_code, if_tbox_code, if_ybox_code, if_dbox_code, if_mbox_code:
- @<Test box register status@>;
+if_tbox_code, if_ybox_code, if_dbox_code, if_mbox_code,
+if_void_code, if_hbox_code, if_vbox_code: @<Test box register status@>;
if_jfont_code, if_tfont_code:
begin scan_font_ident;
if this_if=if_jfont_code then b:=(font_dir[cur_val]=dir_yoko)
Modified: trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch 2022-12-12 09:36:54 UTC (rev 65246)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-m.ch 2022-12-12 12:18:57 UTC (rev 65247)
@@ -48,6 +48,13 @@
% (2022-07-23) TTK upTeX u1.29
% (2022-12-09) HK Hironori Kitagawa fixed a bug in \char, \kchar.
+ at x
+\def\pTeX{p\kern-.15em\TeX}
+ at y
+\def\pTeX{p\kern-.15em\TeX}
+\def\upTeX{u\pTeX}
+ at z
+
@x upTeX: banner
{printed when \pTeX\ starts}
@y
@@ -55,11 +62,11 @@
@#
@d upTeX_version=1
@d upTeX_revision==".29"
- at d upTeX_version_string=='-u1.29' {current u\pTeX\ version}
+ at d upTeX_version_string=='-u1.29' {current \upTeX\ version}
@#
@d upTeX_banner=='This is upTeX, Version 3.141592653',pTeX_version_string,upTeX_version_string
@d upTeX_banner_k==upTeX_banner
- {printed when u\pTeX\ starts}
+ {printed when \upTeX\ starts}
@z
@x upTeX: banner
@@ -174,10 +181,12 @@
@z
@x
- at d math_comp=left_right+1 {component of formula ( \.{\\mathbin}, etc.~)}
+ at d char_num=max_char_code+1 {character specified numerically ( \.{\\char} )}
+ at d math_char_num=char_num+1 {explicit math code ( \.{\\mathchar} )}
@y
- at d kchar_num=left_right+1 {cjk character specified numerically ( \.{\\kchar} )}
- at d math_comp=kchar_num+1 {component of formula ( \.{\\mathbin}, etc.~)}
+ at d char_num=max_char_code+1 {character specified numerically ( \.{\\char} )}
+ at d kchar_num=char_num+1 {cjk character specified numerically ( \.{\\kchar} )}
+ at d math_char_num=kchar_num+1 {explicit math code ( \.{\\mathchar} )}
@z
@x
@@ -188,10 +197,11 @@
@z
@x
- at d max_command=partoken_name {the largest command code seen at |big_switch|}
+ at d partoken_name=set_auto_spacing+1 {set |par_token| name}
@y
- at d set_enable_cjk_token=partoken_name+1 {set cjk mode ( \.{\\enablecjktoken}, \.{\\disablecjktoken}, \.{\\forcecjktoken} )}
- at d max_command=set_enable_cjk_token {the largest command code seen at |big_switch|}
+ at d set_enable_cjk_token=set_auto_spacing+1 {set cjk mode
+ ( \.{\\enablecjktoken}, \.{\\disablecjktoken}, \.{\\forcecjktoken} )}
+ at d partoken_name=set_enable_cjk_token+1 {set |par_token| name}
@z
@x
@@ -292,9 +302,9 @@
@z
@x
-ital_corr: print_esc("/");
+char_num: print_esc("char");
@y
-ital_corr: print_esc("/");
+char_num: print_esc("char");
kchar_num: print_esc("kchar");
@z
@@ -594,8 +604,8 @@
@x
@d ptex_minor_version_code=ptex_version_code+1 {code for \.{\\ptexminorversion}}
@y
- at d ptex_minor_version_code=ptex_version_code+1 {code for \.{\\ptexminorversion}}
- at d uptex_version_code=ptex_minor_version_code+1 {code for \.{\\uptexversion}}
+ at d uptex_version_code=ptex_version_code+1 {code for \.{\\uptexversion}}
+ at d ptex_minor_version_code=uptex_version_code+1 {code for \.{\\ptexminorversion}}
@z
@x
More information about the tex-live-commits
mailing list.