Skip to content

Commit

Permalink
web2c/uptexdir: upTeX ver u1.35 (#46)
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-tk
t-tk committed Apr 27, 2024
1 parent 0e25532 commit e09288c
Show file tree
Hide file tree
Showing 14 changed files with 57 additions and 38 deletions.
31 changes: 17 additions & 14 deletions source/texk/web2c/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3224,18 +3224,21 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
$(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/uptex3a.typ \
uptexdir/tests/uptex4a.typ uptexdir/tests/umin10.pl \
uptexdir/tests/umin10.tfm uptexdir/tests/utmin10.pl \
uptexdir/tests/utmin10.tfm uptexdir/tests/testnewu.pl \
uptexdir/tests/testnewu.tfm uptexdir/tests/uparse.pl \
uptexdir/tests/uparse.tfm uptexdir/tests/gkhugeok.tfm \
uptexdir/tests/gkhugeng.tfm uptexdir/tests/gkhugeng.err \
uptexdir/tests/gk256g.tfm uptexdir/tests/gk256k.tfm \
uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf \
$(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
uptexdir/tests/uptex4.dvi uptexdir/tests/uptex5.tex \
uptexdir/tests/uptex5.dvi uptexdir/tests/uptex3a.typ \
uptexdir/tests/uptex4a.typ uptexdir/tests/uptex5a.typ \
uptexdir/tests/umin10.pl uptexdir/tests/umin10.tfm \
uptexdir/tests/utmin10.pl uptexdir/tests/utmin10.tfm \
uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \
uptexdir/tests/testnewu8.pl uptexdir/tests/testnewu8.tfm \
uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm \
uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \
uptexdir/tests/gkhugeng.err uptexdir/tests/gk256g.tfm \
uptexdir/tests/gk256k.tfm uptexdir/uptrip/uptrip.diffs \
uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
euptexdir/euptex.defines euptexdir/COPYRIGHT \
euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
euptexdir/EUPTEX.txt $(euptex_tests) \
euptexdir/eptrip/eptrip.log euptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
euptexdir/pdfprimitive.test \
Expand Down Expand Up @@ -3557,9 +3560,9 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
uptests/nissya_bib.* uptests/xexampl.aux uptests/xexampl.bbl \
uptests/xexampl.blg uptests/xenc*.* uptests/fn*.* \
uptests/memtest.bib uptests/memtest?.* uptests/xstory.dvityp \
uptests/xpagenum.typ uptests/x*ptex[34]*.typ \
uptests/xpagenum.typ uptests/x*ptex[345]*.typ \
uptests/xcmr10.tfm uptests/xcmr10.pl uptests/xsample*.typ \
uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu.* \
uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu*.* \
uptests/xuparse.* uptests/yuparse.* uptests/ygkhuge*.* \
uptests/ygk256*.* uptests/xskipjfmp.* uptrip.diffs \
$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
Expand Down
4 changes: 2 additions & 2 deletions source/texk/web2c/euptexdir/COPYRIGHT
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright (C) 2009 ASCII MEDIA WORKS.
Copyright (C) 2007-2023 Takuji Tanaka
Copyright (C) 2010-2023 Japanese TeX Development Community
Copyright (C) 2007-2024 Takuji Tanaka
Copyright (C) 2010-2024 Japanese TeX Development Community
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
8 changes: 8 additions & 0 deletions source/texk/web2c/euptexdir/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2024-04-27 TANAKA Takuji <[email protected]>

* eptex.ech, pdfutils.ch, euptex.defines:
Support new encoding of upTeX for combining characters
with multiple codepoints.
https://github.com/texjporg/tex-jp-build/issues/46
* COPYRIGHT: copyright year.

2024-04-24 TANAKA Takuji <[email protected]>

* eptex.ech, etex.ch1, euptex.ch{0,1},
Expand Down
6 changes: 3 additions & 3 deletions source/texk/web2c/euptexdir/eptex.ech
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,9 +721,9 @@ if j=1 then
if (multistrlen(ustringcast(buffer), limit+1,loc)>1)and
check_kcat_code(cur_tok,cur_chr) then
begin if (cur_tok=not_cjk) then cur_tok:=other_kchar;
if (cur_tok=latin_ucs) then cur_tok:=other_token;
cur_tok:=cur_chr+cur_tok*max_cjk_val;
loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc);
if (cur_tok=latin_ucs) then cur_tok:=other_token;
cur_tok:=cur_chr+cur_tok*max_cjk_val;
loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc);
end
else begin cur_chr:=buffer[loc]; incr(loc);
if cur_chr=" " then cur_tok:=space_token
Expand Down
4 changes: 2 additions & 2 deletions source/texk/web2c/euptexdir/pdfutils.ch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ uniform_deviate_code: scan_int;
normal_deviate_code: do_nothing;
Uchar_convert_code: begin scan_char_num;
if not is_char_ascii(cur_val) then
if kcat_code(kcatcodekey(cur_val))=not_cjk then cat:=other_kchar;
if kcat_code(kcatcodekey(cur_val))=not_cjk then cat:=other_kchar;
end;
Ucharcat_convert_code:
begin
Expand Down Expand Up @@ -1188,7 +1188,7 @@ Ucharcat_convert_code:
help1("I'm going to use 18 instead of that illegal code value.");@/
error; cat:=other_kchar;
end else cat:=cur_val;
end;
end;
cur_val:=i;
end;
@z
Expand Down
2 changes: 1 addition & 1 deletion source/texk/web2c/uptexdir/COPYRIGHT
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2009 ASCII MEDIA WORKS.
Copyright (C) 2007-2023 Takuji Tanaka
Copyright (C) 2007-2024 Takuji Tanaka
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
6 changes: 4 additions & 2 deletions source/texk/web2c/uptexdir/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
2024-04-27 TANAKA Takuji <[email protected]>

* uptex-m.ch, kanji.{c,h}, updvitype.ch: Support new encoding
of upTeX for combining characters with multiple codepoints.
* uptex-m.ch, kanji.{c,h}, updvitype.ch, uptex.defines:
Support new encoding of upTeX for combining characters
with multiple codepoints.
Trial of Unicode Latin characters (experimental).
New kcatcodes (latin_ucs(14), modifier(20)) are added.
* {uppltotf,uptftopl,updvitype}.ch: Version p240427.
Expand All @@ -12,6 +13,7 @@
* uptex-m.ch, upbibtex.ch, uptex_version.h:
upTeX version u1.35.
https://github.com/texjporg/tex-jp-build/issues/46
* COPYRIGHT: copyright year.

2024-04-14 TANAKA Takuji <[email protected]>

Expand Down
11 changes: 7 additions & 4 deletions source/texk/web2c/uptexdir/am/uptex.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,10 @@ DISTCLEANFILES += uptests/memtest.bib uptests/memtest?.*
## uptexdir/updvitype.test
EXTRA_DIST += uptexdir/tests/uptex3.tex uptexdir/tests/uptex3.dvi \
uptexdir/tests/uptex4.tex uptexdir/tests/uptex4.dvi \
uptexdir/tests/uptex3a.typ uptexdir/tests/uptex4a.typ
DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ uptests/x*ptex[34]*.typ
uptexdir/tests/uptex5.tex uptexdir/tests/uptex5.dvi \
uptexdir/tests/uptex3a.typ uptexdir/tests/uptex4a.typ \
uptexdir/tests/uptex5a.typ
DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ uptests/x*ptex[345]*.typ
## uptexdir/uppltotf.test
DISTCLEANFILES += uptests/xcmr10.tfm
## uptexdir/uptftopl.test
Expand All @@ -245,8 +247,9 @@ EXTRA_DIST += uptexdir/tests/umin10.pl uptexdir/tests/umin10.tfm
EXTRA_DIST += uptexdir/tests/utmin10.pl uptexdir/tests/utmin10.tfm
DISTCLEANFILES += uptests/x*min10.* uptests/xchcode*.*
## uptexdir/newjfm.test
EXTRA_DIST += uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm
DISTCLEANFILES += uptests/xtestnewu.*
EXTRA_DIST += uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \
uptexdir/tests/testnewu8.pl uptexdir/tests/testnewu8.tfm
DISTCLEANFILES += uptests/xtestnewu*.*
## uptexdir/uparse.test
EXTRA_DIST += uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm
DISTCLEANFILES += uptests/xuparse.* uptests/yuparse.*
Expand Down
2 changes: 1 addition & 1 deletion source/texk/web2c/uptexdir/upbibtex.ch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
@d banner=='This is BibTeX, Version 0.99d' {printed when the program starts}
@y
@d my_name=='upbibtex'
@d banner=='This is upBibTeX, Version 0.99d-j0.36-u1.30'
@d banner=='This is upBibTeX, Version 0.99d-j0.36-u1.35'
{printed when the program starts}
@z
Expand Down
2 changes: 1 addition & 1 deletion source/texk/web2c/uptexdir/updvitype.ch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@d banner=='This is DVItype, Version 3.6' {printed when the program starts}
@y
@d my_name=='updvitype'
@d banner=='This is upDVItype, Version 3.6-p221203'
@d banner=='This is upDVItype, Version 3.6-p240427'
{printed when the program starts}
@z

Expand Down
3 changes: 2 additions & 1 deletion source/texk/web2c/uptexdir/uppltotf.ch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
% This is a change file for PLtoTF
%
% (2024-04-27) TTK Support upTeX new encoding for combining characters
% (2023-09-17) HY Support more than 256 different glue/kern
% (2022-12-03) TTK Merge pPLtoTF source/binary into upPLtoTF
% (2018-01-27) HY pPLtoTF p2.0 - new JFM spec by texjporg
Expand All @@ -18,7 +19,7 @@
@d banner=='This is PLtoTF, Version 3.6' {printed when the program starts}
@y
@d my_name=='uppltotf'
@d banner=='This is upPLtoTF, Version 3.6-p230917'
@d banner=='This is upPLtoTF, Version 3.6-p240427'
{printed when the program starts}
@z

Expand Down
11 changes: 6 additions & 5 deletions source/texk/web2c/uptexdir/uptex-m.ch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% $Id$
% This is a change file for upTeX u1.30
% This is a change file for upTeX u1.35
% By Takuji Tanaka.
%
% (02/26/2007) TTK upTeX u0.01
Expand Down Expand Up @@ -48,6 +48,7 @@
% (2022-07-23) TTK upTeX u1.29
% (2022-12-09) HK Hironori Kitagawa fixed a bug in \char, \kchar.
% (2023-09-16) TTK upTeX u1.30
% (2024-04-27) TTK upTeX u1.35

@x
\def\pTeX{p\kern-.15em\TeX}
Expand All @@ -62,8 +63,8 @@
{printed when \pTeX\ starts}
@#
@d upTeX_version=1
@d upTeX_revision==".30"
@d upTeX_version_string=='-u1.30' {current \upTeX\ version}
@d upTeX_revision==".35"
@d upTeX_version_string=='-u1.35' {current \upTeX\ version}
@#
@d upTeX_banner=='This is upTeX, Version 3.141592653',pTeX_version_string,upTeX_version_string
@d upTeX_banner_k==upTeX_banner
Expand Down Expand Up @@ -166,7 +167,7 @@ else if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12))
@d max_halfword=@"3FFFFFFF {largest allowable value in a |halfword|}
@d max_cjk_val=@"1000000 {to separate wchar and kcatcode}
@d max_ivs_val=@"4400000 {to separate wchar with ivs and kcatcode}
@d biggest_usv=@"10FFFF {the largest Unicode Scalar Value}
@d max_ucs_val=@"110000 {largest Unicode Scalar Value}
@z
@x
Expand Down Expand Up @@ -1453,7 +1454,7 @@ end;

function check_kcat_code(@!ct:integer;@!cx:integer):integer;
begin
if (((ct>=kanji)or((ct=latin_ucs)and(cx<=biggest_usv)))and(enable_cjk_token=0))or(enable_cjk_token=2)then
if (((ct>=kanji)or((ct=latin_ucs)and(cx<max_ucs_val)))and(enable_cjk_token=0))or(enable_cjk_token=2)then
check_kcat_code:=1
else check_kcat_code:=0;
end;
Expand Down
2 changes: 1 addition & 1 deletion source/texk/web2c/uptexdir/uptex_version.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define UPTEX_VERSION "u1.30"
#define UPTEX_VERSION "u1.35"
3 changes: 2 additions & 1 deletion source/texk/web2c/uptexdir/uptftopl.ch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
% This is a change file for TFtoPL
%
% (2024-04-27) TTK Support upTeX new encoding for combining characters
% (2023-09-17) HY Support more than 256 different glue/kern
% (2022-12-03) TTK Merge pTFtoPL source/binary into upTFtoPL
% (2018-01-27) HY pTFtoPL p2.0 - new JFM spec by texjporg
Expand All @@ -17,7 +18,7 @@
@d banner=='This is TFtoPL, Version 3.3' {printed when the program starts}
@y
@d my_name=='uptftopl'
@d banner=='This is upTFtoPL, Version 3.3-p230917'
@d banner=='This is upTFtoPL, Version 3.3-p240427'
{printed when the program starts}
@z

Expand Down

0 comments on commit e09288c

Please sign in to comment.