From 8c4b0a453a92965ace49facd0d90b9b6ae8c33a0 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Mon, 24 Apr 2017 15:13:38 +0000 Subject: p\TeX -> \pTeX by Kitagawa-san git-svn-id: svn://tug.org/texlive/trunk@44016 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/eptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/eptexdir/eptex.ech | 6 +++--- Build/source/texk/web2c/eptexdir/etex.ch1 | 4 ++-- Build/source/texk/web2c/eptexdir/pdfutils.ch | 3 ++- Build/source/texk/web2c/euptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/euptexdir/euptex.ch0 | 6 +++--- Build/source/texk/web2c/pmpostdir/ChangeLog | 4 ++++ Build/source/texk/web2c/pmpostdir/pmpxout.ch | 13 +++++++++--- Build/source/texk/web2c/ptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/ptexdir/ptex-base.ch | 24 ++++++++++++++-------- Build/source/texk/web2c/synctexdir/ChangeLog | 6 ++++++ .../texk/web2c/synctexdir/synctex-ep-mem.ch0 | 2 +- .../texk/web2c/synctexdir/synctex-ep-mem.ch1 | 2 +- .../source/texk/web2c/synctexdir/synctex-p-mem.ch0 | 2 +- .../source/texk/web2c/synctexdir/synctex-p-mem.ch1 | 2 +- Build/source/texk/web2c/synctexdir/synctex-rec.ch0 | 4 ++-- Build/source/texk/web2c/uptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/uptexdir/uptex-m.ch | 16 +++++++-------- 18 files changed, 77 insertions(+), 34 deletions(-) (limited to 'Build/source/texk/web2c') diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index a92ce7b9ae8..274f2bfa282 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,8 @@ +2017-04-24 Hironori Kitagawa + + * eptex.ech, etex.ch1, euptex.ch0, pdfutils.ch: + Adapt to changes in ptexdir/ptex-base.ch (p\TeX -> \pTeX). + 2016-12-15 Akira Kakuto * eptexextra.h: Use "issue@texjp.org" as BUG_ADDRESS. diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech index 7d89f031ae0..02696bb9707 100644 --- a/Build/source/texk/web2c/eptexdir/eptex.ech +++ b/Build/source/texk/web2c/eptexdir/eptex.ech @@ -11,7 +11,7 @@ \def\eTeX{$\varepsilon$-\TeX} @y \def\eTeX{$\varepsilon$-\TeX} -\def\epTeX{$\varepsilon$-p\TeX} +\def\epTeX{$\varepsilon$-\pTeX} @z @x [1.2] l.190 - epTeX: @@ -23,9 +23,9 @@ @z @x e-pTeX: banner - {printed when p\TeX\ starts} + {printed when \pTeX\ starts} @y - {printed when p\TeX\ starts} + {printed when \pTeX\ starts} @# @d epTeX_version==pTeX_version_string,epTeX_version_string,eTeX_version_string @d epTeX_banner=='This is e-pTeX, Version 3.14159265',epTeX_version diff --git a/Build/source/texk/web2c/eptexdir/etex.ch1 b/Build/source/texk/web2c/eptexdir/etex.ch1 index 25db708dd28..68405f2c08a 100644 --- a/Build/source/texk/web2c/eptexdir/etex.ch1 +++ b/Build/source/texk/web2c/eptexdir/etex.ch1 @@ -147,9 +147,9 @@ if b<>null then @z @x -@* \[55/p\TeX] System-dependent changes for p\TeX. +@* \[55/\pTeX] System-dependent changes for \pTeX. @y -@* \[54/p\TeX] System-dependent changes for p\TeX. +@* \[54/\pTeX] System-dependent changes for \pTeX. @z @x diff --git a/Build/source/texk/web2c/eptexdir/pdfutils.ch b/Build/source/texk/web2c/eptexdir/pdfutils.ch index fdb49056bce..1591fa8a6f2 100644 --- a/Build/source/texk/web2c/eptexdir/pdfutils.ch +++ b/Build/source/texk/web2c/eptexdir/pdfutils.ch @@ -33,6 +33,7 @@ \font\tenlogo=logo10 % font used for the METAFONT logo \def\MP{{\tenlogo META}\-{\tenlogo POST}} +\def\pdfTeX{pdf\TeX} This section is (almost) straight from MetaPost. I had to change the types (use |integer| instead of |fraction|), but that should @@ -1395,7 +1396,7 @@ end A \.{DVI} file does not have the information of the page height, which is needed to implement \.{\\pdflastypos} correctly. To keep the information of the page height, I (H.~Kitagawa) -adopted \.{\\pdfpageheight} primitive from pdf\TeX. However, in p\TeX (and \hbox{\epTeX}), +adopted \.{\\pdfpageheight} primitive from pdf\TeX. However, in \pTeX (and \hbox{\epTeX}), the papersize special \.{\\special\{papersize=|width|,|height|\}} is commonly used for specifying page width/height. Hence, I decided that the papersize special also changes the value of \.{\\pdfpagewidth} and \.{\\pdfpageheight}. diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 3f68096127d..986e39a0758 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2017-04-24 Hironori Kitagawa + + * euptex.ch0: Adapt to changes in ptexdir/ptex-base.ch (p\TeX -> \pTeX). + 2016-12-15 Akira Kakuto * euptexextra.h: Use "issue@texjp.org" as BUG_ADDRESS. diff --git a/Build/source/texk/web2c/euptexdir/euptex.ch0 b/Build/source/texk/web2c/euptexdir/euptex.ch0 index e1c9e1c0535..375193556a2 100644 --- a/Build/source/texk/web2c/euptexdir/euptex.ch0 +++ b/Build/source/texk/web2c/euptexdir/euptex.ch0 @@ -2,13 +2,13 @@ \def\eTeX{$\varepsilon$-\TeX} @y \def\eTeX{$\varepsilon$-\TeX} -\def\eupTeX{$\varepsilon$-up\TeX} +\def\eupTeX{$\varepsilon$-u\pTeX} @z @x e-upTeX: banner - {printed when up\TeX\ starts} + {printed when u\pTeX\ starts} @y - {printed when up\TeX\ starts} + {printed when u\pTeX\ 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.14159265',eupTeX_version diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog index 3a382cda34f..f84d7e5223a 100644 --- a/Build/source/texk/web2c/pmpostdir/ChangeLog +++ b/Build/source/texk/web2c/pmpostdir/ChangeLog @@ -1,3 +1,7 @@ +2017-04-24 Hironori Kitagawa + + * pmpxout.ch: p\TeX -> \pTeX. + 2017-03-31 Akira Kakuto * pmp.ch: Adapt to MetaPost 2.000. diff --git a/Build/source/texk/web2c/pmpostdir/pmpxout.ch b/Build/source/texk/web2c/pmpostdir/pmpxout.ch index eda77848972..ae6345ffcda 100644 --- a/Build/source/texk/web2c/pmpostdir/pmpxout.ch +++ b/Build/source/texk/web2c/pmpostdir/pmpxout.ch @@ -1,3 +1,10 @@ +@x +\def\MP{MetaPost} +@y +\def\MP{MetaPost} +\def\pTeX{p\kern-.15em\TeX} +@z + @x #include "avl.h" @y @@ -35,7 +42,7 @@ @x @d undefined_commands 250: case 251: case 252: case 253: case 254: case 255 @y -@d dir 255 /* p\TeX\ direction */ +@d dir 255 /* \pTeX\ direction */ @d undefined_commands 250: case 251: case 252: case 253: case 254 @z @@ -81,7 +88,7 @@ floor(mpx->dvi_scale*mpx->font_scaled_size[f]*char_width(f,c)) @ @= floor(mpx->dvi_scale*mpx->font_scaled_size[cur_font]*char_width(cur_font,p)) @y -@ @c @@; /* p\TeX */ +@ @c @@; /* \pTeX */ static integer mpx_scaled_char_width (MPX mpx,integer f,integer c) { if (mpx->font_id[f]!=0) c=mpx_lookup_ctype(mpx, f,c); @@ -420,7 +427,7 @@ if (mpx_newer(mpxopt->mpname, mpxopt->mpxname)) if (mpx_newer(mpxopt->mpname, mpxopt->mpxname)) return 0 -@ ASCII p\TeX JFM ID +@ ASCII \pTeX\ JFM ID @d yoko_jfm_id 11 /* for `yoko-kumi' fonts */ @d tate_jfm_id 9 /* for `tate-kumi' fonts */ @d font_jfm_p(A) (mpx->font_id[(A)]!=0) diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 57f75090f55..a53d3274b2c 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2017-04-24 Hironori Kitagawa + + * ptex-base.ch: p\TeX -> \pTeX. + 2017-04-09 Hironori Kitagawa * ptex-base.ch: Fix a bug in single-letter control sequence diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index abfe5925cdd..52c7e6a354a 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -57,15 +57,23 @@ % (2016-06-06) AK Hironori Kitagawa fixed a bug in check_box(box_p:pointer). % pTeX p3.7.1. % + +@x +% Here is TeX material that gets inserted after \input webmac +@y +% Here is TeX material that gets inserted after \input webmac +\def\pTeX{p\kern-.15em\TeX} +@z + @x [1.2] l.200 - pTeX: @d banner==TeX_banner @d banner_k==TeX_banner_k @y -@d pTeX_version_string=='-p3.7.1' {current p\TeX\ version} +@d pTeX_version_string=='-p3.7.1' {current \pTeX\ version} @# @d pTeX_banner=='This is pTeX, Version 3.14159265',pTeX_version_string @d pTeX_banner_k==pTeX_banner - {printed when p\TeX\ starts} + {printed when \pTeX\ starts} @# @d banner==pTeX_banner @d banner_k==pTeX_banner_k @@ -320,7 +328,7 @@ else @x [8.112] l.2450 - pTeX: hi/ho sufficiently large. @y -sufficiently large and this is required for p\TeX. +sufficiently large and this is required for \pTeX. @z @x [8.112] l.2588 - pTeX: @@ -336,7 +344,7 @@ sufficiently large and this is required for p\TeX. |fil|, |fill|, or |filll|). The |subtype| field is not used. @y |fil|, |fill|, or |filll|). The |subtype| field is not used in \TeX. -In p\TeX\ the |subtype| field records the box direction |box_dir|. +In \pTeX\ the |subtype| field records the box direction |box_dir|. @z @x [10.135] l.2897 - pTeX: box_dir, space_ptr, xspace_ptr @@ -2855,7 +2863,7 @@ comes next; this currently equals~2, as in the preamble. @ The last part of the postamble, following the |post_post| byte that signifies the end of the font definitions, contains |q|, a pointer to the |post| command that started the postamble. An identification byte, |i|, -comes next; this equals~2 or~3. If not used p\TeX primitives then the +comes next; this equals~2 or~3. If not used \pTeX primitives then the identification byte equals~2, othercase this is set to~3. @z @@ -4887,7 +4895,7 @@ q:pointer; since |head| is a one-word node. @y @ Note that in \TeX\ the condition |not is_char_node(tail)| implies that -|head<>tail|, since |head| is a one-word node; this is not so for p\TeX. +|head<>tail|, since |head| is a one-word node; this is not so for \pTeX. @z @x [47.1080] l.20940 - pTeX: disp_node @@ -6076,9 +6084,9 @@ undump_things(char_base[null_font], font_ptr+1-null_font); @x l.26984 - pTeX @* \[54] System-dependent changes. @y -@* \[55/p\TeX] System-dependent changes for p\TeX. +@* \[55/\pTeX] System-dependent changes for \pTeX. This section described extended variables, procesures, functions and so on -for pTeX. +for \pTeX. @= function get_jfm_pos(@!kcode:KANJI_code;@!f:internal_font_number):eight_bits; diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index a79bb8867bb..bf216d4c8bf 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,9 @@ +2017-04-24 Hironori Kitagawa + + * synctex-ep-mem.ch0, synctex-p-mem.ch0, + synctex-ep-mem.ch1, synctex-p-mem.ch1: + Adapt to changes in ptexdir/ptex-base.ch (p\TeX -> \pTeX). + 2017-04-22 Jerome Laurens diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0 b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0 index 80d71cfe1cd..aea5c142b85 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0 +++ b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0 @@ -19,7 +19,7 @@ disp_node: begin r:=get_node(small_node_size); @z @x tex.web l. 24956 -@* \[54/p\TeX] System-dependent changes for p\TeX. +@* \[54/\pTeX] System-dependent changes for \pTeX. @y @* \[54] System-dependent changes. @z diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1 b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1 index a70208e77f2..5fe21d9789e 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1 +++ b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1 @@ -19,5 +19,5 @@ @x tex.web l. 24956 @* \[54] System-dependent changes. @y -@* \[54/p\TeX] System-dependent changes for p\TeX. +@* \[54/\pTeX] System-dependent changes for \pTeX. @z diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0 b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0 index e4fd4a9f504..ad7cfa5825c 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0 +++ b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0 @@ -19,7 +19,7 @@ disp_node: begin r:=get_node(small_node_size); @z @x tex.web l. 24956 -@* \[55/p\TeX] System-dependent changes for p\TeX. +@* \[55/\pTeX] System-dependent changes for \pTeX. @y @* \[54] System-dependent changes. @z diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1 b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1 index c13a7279cc4..67e7a2fa660 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1 +++ b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1 @@ -19,5 +19,5 @@ @x tex.web l. 24956 @* \[54] System-dependent changes. @y -@* \[55/p\TeX] System-dependent changes for p\TeX. +@* \[55/\pTeX] System-dependent changes for \pTeX. @z diff --git a/Build/source/texk/web2c/synctexdir/synctex-rec.ch0 b/Build/source/texk/web2c/synctexdir/synctex-rec.ch0 index c2730fab349..56f8ec0abd6 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-rec.ch0 +++ b/Build/source/texk/web2c/synctexdir/synctex-rec.ch0 @@ -407,8 +407,8 @@ sync_tag(r+box_node_size):=sync_tag(p+box_node_size); sync_line(r+box_node_size):=sync_line(p+box_node_size); @ @= -{sync_tag(r+rule_node_size):=sync_tag(p+rule_node_size); -sync_line(r+rule_node_size):=sync_line(p+rule_node_size);} +{|sync_tag(r+rule_node_size):=sync_tag(p+rule_node_size);| +|sync_line(r+rule_node_size):=sync_line(p+rule_node_size);|} @ @= sync_tag(r+medium_node_size):=sync_tag(p+medium_node_size); diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index de70f3615da..00b58d2e7bd 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2017-04-24 Hironori Kitagawa + + * uptex-m.ch: Adapt to changes in ptexdir/ptex-base.ch (p\TeX -> \pTeX). + 2017-04-09 Hironori Kitagawa * uptex-m.ch: Fix a bug on a UTF-8 sequence at end of a line diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch index 2619759ea1d..472d8f45467 100644 --- a/Build/source/texk/web2c/uptexdir/uptex-m.ch +++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch @@ -38,17 +38,17 @@ % (04/09/2017) TTK Hironori Kitagawa fixed a bug in \endlinechar. @x upTeX: banner - {printed when p\TeX\ starts} + {printed when \pTeX\ starts} @y - {printed when p\TeX\ starts} + {printed when \pTeX\ starts} @# @d upTeX_version=1 @d upTeX_revision==".22" -@d upTeX_version_string=='-u1.22' {current up\TeX\ version} +@d upTeX_version_string=='-u1.22' {current u\pTeX\ version} @# @d upTeX_banner=='This is upTeX, Version 3.14159265',pTeX_version_string,upTeX_version_string @d upTeX_banner_k==upTeX_banner - {printed when up\TeX\ starts} + {printed when u\pTeX\ starts} @z @x upTeX: banner @@ -72,7 +72,7 @@ @!trick_buf2:array[0..ssup_error_line] of 0..@'24; {pTeX: buffer for KANJI} @!kcode_pos: 0..@'24; {pTeX: denotes whether first byte or second byte of KANJI 1..2:2byte-char, 11..13:3byte-char, 21..24:4byte-char} -@!kcp: 0..@'24; {temporary kcode_pos} +@!kcp: 0..@'24; {temporary |kcode_pos|} @z @x @@ -245,7 +245,7 @@ for k:=0 to 511 do { $\.{@@"20}+|k| = |kcatcodekey|(|fromKUTEN|(|HILO|(k,1))$ } @y if (isinternalUPTEX) then begin - { default: other_kchar } + { default: |other_kchar| } @t\hskip10pt@>kcat_code(@"0):=not_cjk; @t\hskip10pt@>kcat_code(@"23):=hangul; { Hangul Jamo } @+@t\1@>for k:=@"65 to @"67 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters } @@ -260,7 +260,7 @@ if (isinternalUPTEX) then begin @t\hskip10pt@>kcat_code(@"90):=hangul; { Hangul Syllables } @t\hskip10pt@>kcat_code(@"91):=hangul; { Hangul Jamo Extended-B } @t\hskip10pt@>kcat_code(@"96):=kanji; { CJK Compatibility Ideographs } - { @t\hskip10pt@>kcat_code(@"9F):=other_kchar; Halfwidth and Fullwidth Forms } + { \hskip10pt|kcat_code(@"9F):=other_kchar;| Halfwidth and Fullwidth Forms } @t\hskip10pt@>kcat_code(@"ED):=kana; { Kana Supplement } @+@t\1@>for k:=@"108 to @"10C do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. CJK Compatibility Ideographs Supplement } @t\hskip10pt@>kcat_code(@"1FE):=kana; { Fullwidth digit and latin alphabet } @@ -310,7 +310,7 @@ token that stands for a control sequence; is a multiple of~256, less~1} @d end_match_token=@'7000 {$2^8\cdot|end_match|$} @y @d cs_token_flag=@"1FFFFFFF {amount added to the |eqtb| location in a - token that stands for a control sequence; is a multiple of~@"1000000, less~1} + token that stands for a control sequence; is a multiple of~@@"1000000, less~1} @d max_char_val=@"100 {to separate char and command code} @d left_brace_token=@"100 {$2^8\cdot|left_brace|$} @d left_brace_limit=@"200 {$2^8\cdot(|left_brace|+1)$} -- cgit v1.2.3