summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/uptex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-24 22:54:21 +0000
committerKarl Berry <karl@freefriends.org>2018-02-24 22:54:21 +0000
commite79b69ab69a86d2b1d87fa756683477bee296216 (patch)
tree6e56a5642dc5edefac738848872aa214de8b6877 /Master/texmf-dist/tex/uptex
parent6ebd31bbb47745c530a012a18d0532d70eebac88 (diff)
uptex-base (24feb18)
git-svn-id: svn://tug.org/texlive/trunk@46733 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/uptex')
-rw-r--r--Master/texmf-dist/tex/uptex/uptex-base/ukinsoku.tex31
-rw-r--r--Master/texmf-dist/tex/uptex/uptex-base/uptex.tex8
2 files changed, 20 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/uptex/uptex-base/ukinsoku.tex b/Master/texmf-dist/tex/uptex/uptex-base/ukinsoku.tex
index 1276674a409..2bd64a6b763 100644
--- a/Master/texmf-dist/tex/uptex/uptex-base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uptex/uptex-base/ukinsoku.tex
@@ -1,13 +1,13 @@
%%
-%% 行頭、行末禁則パラメータ
+%% 行頭、行末禁則パラメータ (Last update: 2018/02/20 ttk, texjporg)
%%
%% 1byte characters
\prebreakpenalty`!=10000
\prebreakpenalty`"=10000
\postbreakpenalty`\#=500
\postbreakpenalty`\$=500
-\postbreakpenalty`\%=500
-\postbreakpenalty`\&=500
+\prebreakpenalty`\%=500
+\prebreakpenalty`\&=500
\postbreakpenalty`\`=10000
\prebreakpenalty`'=10000
\prebreakpenalty`)=10000
@@ -71,8 +71,8 @@
\prebreakpenalty`==200
\postbreakpenalty`#=200
\postbreakpenalty`$=200
-\postbreakpenalty`%=200
-\postbreakpenalty`&=200
+\prebreakpenalty`%=200
+\prebreakpenalty`&=200
\prebreakpenalty`ぁ=150
\prebreakpenalty`ぃ=150
\prebreakpenalty`ぅ=150
@@ -126,8 +126,9 @@
\postbreakpenalty`¡=10000
\postbreakpenalty`¿=10000
\prebreakpenalty`ː=10000
-\prebreakpenalty`ª=10000
-\prebreakpenalty`º=10000
+\prebreakpenalty`·=10000
+\prebreakpenalty"AA=10000% ª
+\prebreakpenalty"BA=10000% º
\prebreakpenalty`¹=10000
\prebreakpenalty`²=10000
\prebreakpenalty`³=10000
@@ -156,8 +157,8 @@
%%
%%\postbreakpenalty`¡=10000
%%\postbreakpenalty`¿=10000
-%%\prebreakpenalty`º=10000
-%%\prebreakpenalty`ª=10000
+%%\prebreakpenalty"BA=10000% º
+%%\prebreakpenalty"AA=10000% ª
\prebreakpenalty`™=10000
%%
%% kinsoku 半角片仮名
@@ -369,8 +370,8 @@
\inhibitxspcode`⁉=1
\inhibitxspcode`¡=2
\inhibitxspcode`¿=2
-\inhibitxspcode`ª=1
-\inhibitxspcode`º=1
+\inhibitxspcode"AA=1% ª
+\inhibitxspcode"BA=1% º
\inhibitxspcode`¹=1
\inhibitxspcode`²=1
\inhibitxspcode`³=1
@@ -378,10 +379,10 @@
%%
%% inhibitxspcode JIS X 0212
%%
-%%\inhibitxspcode`¡=1
-%%\inhibitxspcode`¿=1
-%%\inhibitxspcode`º=1
-%%\inhibitxspcode`ª=1
+%%\inhibitxspcode`¡=2
+%%\inhibitxspcode`¿=2
+%%\inhibitxspcode"BA=1% º
+%%\inhibitxspcode"AA=1% ª
\inhibitxspcode`™=1
%%
%% inhibitxspcode 半角片仮名
diff --git a/Master/texmf-dist/tex/uptex/uptex-base/uptex.tex b/Master/texmf-dist/tex/uptex/uptex-base/uptex.tex
index 86521851069..3e251e13caa 100644
--- a/Master/texmf-dist/tex/uptex/uptex-base/uptex.tex
+++ b/Master/texmf-dist/tex/uptex/uptex-base/uptex.tex
@@ -1,5 +1,5 @@
% This is the upTeX format (community edition)
-% last update: texjporg 2017/03/12
+% last update: texjporg 2017/10/18
%
% pTeX format file:
% (C)copyright ASCII corporation,1987,1995,1997
@@ -33,13 +33,13 @@
\newfam\tminfam % \tmin is family 10
\newfam\tgtfam % \tgt is family 11
%
-\def\mc{\iftdir\fam\tminfam\tentmin\else\fam\minfam\tenmin\fi}%
+\def\mc{\iftdir\fam\tminfam\else\fam\minfam\fi\tentmin\tenmin}%
\textfont\minfam=\tenmin\scriptfont\minfam=\sevenmin%
\scriptscriptfont\minfam=\fivemin
\textfont\tminfam=\tentmin\scriptfont\tminfam=\seventmin%
\scriptscriptfont\tminfam=\fivetmin
%
-\def\gt{\iftdir\fam\tgtfam\tentgt\else\fam\gtfam\tengt\fi}%
+\def\gt{\iftdir\fam\tgtfam\else\fam\gtfam\fi\tentgt\tengt}%
\textfont\gtfam=\tengt\scriptfont\gtfam=\sevengt%
\scriptscriptfont\gtfam=\fivegt
\textfont\tgtfam=\tentgt\scriptfont\tgtfam=\seventgt%
@@ -55,4 +55,4 @@
%
% identifies the current format based on plain
\def\fmtname{uptex}
-\edef\fmtversion{\fmtversion\space p1.0b_u00}
+\edef\fmtversion{\fmtversion\space p1.0c_u00}