summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/uplatex/base/LICENSE2
-rw-r--r--Master/texmf-dist/doc/uplatex/base/README.md2
-rw-r--r--Master/texmf-dist/doc/uplatex/base/upldoc.pdfbin638616 -> 639163 bytes
-rw-r--r--Master/texmf-dist/source/uplatex/base/plcore.dtx54
-rw-r--r--Master/texmf-dist/source/uplatex/base/ukinsoku.dtx22
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplvers.dtx2
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ukinsoku.tex12
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplcore.ltx15
8 files changed, 61 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/LICENSE b/Master/texmf-dist/doc/uplatex/base/LICENSE
index 52f34b69722..00a8d34bb1c 100644
--- a/Master/texmf-dist/doc/uplatex/base/LICENSE
+++ b/Master/texmf-dist/doc/uplatex/base/LICENSE
@@ -1,6 +1,6 @@
Copyright (c) 2010 ASCII MEDIA WORKS
Copyright (c) 2016 Takuji Tanaka
-Copyright (c) 2016-2017 Japanese TeX Development Community
+Copyright (c) 2016-2018 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
index 65781013bc3..9aabe257a09 100644
--- a/Master/texmf-dist/doc/uplatex/base/README.md
+++ b/Master/texmf-dist/doc/uplatex/base/README.md
@@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2017-12-06
+2018-01-27
Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
index a5ddafb44aa..5fe1dc8e9e9 100644
--- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx
index 24505c96e96..156d9319100 100644
--- a/Master/texmf-dist/source/uplatex/base/plcore.dtx
+++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx
@@ -3,7 +3,7 @@
%
% Copyright 1994-2001 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2017 Japanese TeX Development Community
+% Copyright (c) 2016-2018 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -78,13 +78,15 @@
% \changes{v1.2t}{2017/10/31}{v1.2s$B$NJQ99$KH<$$!"(B\cs{ref}$B$,?t<0%b!<%I$G(B
% $B%(%i!<$K$J$C$F$$$?$N$r=$@5(B}
% \changes{v1.2u}{2017/11/04}{emath$B$N(B\cs{marusuuref}$BBP:v(B}
+% \changes{v1.2v}{2018/01/27}{v1.2o$B$H(Bv1.2q$B$N=$@5$G(B\cs{nolinebreak}$B$,(B
+% $B8z$+$J$$>l9g$,$"$C$?$N$G!"85$KLa$7$?(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2017/11/04 v1.2u pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2018/01/27 v1.2v pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -286,24 +288,42 @@
% $BF1;N$N9g;;$O9T$o$l$J$$$3$H$rMxMQ$7$F$$$^$9!#(B
% \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B
% $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B}
+%
+% $B$H$3$m$,!"$=$NJQ99$K$h$C$F$=$b$=$b(B|\nolinebreak|$B$,8z$+$J$$>l9g$,(B
+% $B@8$8$?$N$G!"JQ99A4BN$r$$$C$?$s%-%c%s%;%k$7$F85$KLa$7$^$9!#(B
+% \changes{v1.2v}{2018/01/27}{v1.2o$B$H(Bv1.2q$B$N=$@5$G(B\cs{nolinebreak}$B$,(B
+% $B8z$+$J$$>l9g$,$"$C$?$N$G!"85$KLa$7$?(B}
% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2017/10/28}{\@no@lnbk}
+%<platexrelease> {Break before prebreakpenalty}%
+%<platexrelease>\def\@no@lnbk #1[#2]{%
+%<platexrelease> \ifvmode
+%<platexrelease> \@nolnerr
+%<platexrelease> \else
+%<platexrelease> \@tempskipa\lastskip
+%<platexrelease> \unskip
+%<platexrelease> \penalty #1\@getpen{#2}%
+%<platexrelease> \ifdim\@tempskipa>\z@
+%<platexrelease> \hskip\@tempskipa
+%<platexrelease> \ignorespaces
+%<platexrelease> \fi
+%<platexrelease> \fi}
+%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{2017/07/29}{\@no@lnbk}
%<platexrelease> {Break before prebreakpenalty}%
-%<*plcore|platexrelease>
-\def\@no@lnbk #1[#2]{%
- \ifvmode
- \@nolnerr
- \else
- \@tempskipa\lastskip
- \unskip
- \penalty #1\@getpen{#2}%
- \penalty\z@\relax %% added (2017/08/25)
- \ifdim\@tempskipa>\z@
- \hskip\@tempskipa
- \ignorespaces
- \fi
- \fi}
-%</plcore|platexrelease>
+%<platexrelease>\def\@no@lnbk #1[#2]{%
+%<platexrelease> \ifvmode
+%<platexrelease> \@nolnerr
+%<platexrelease> \else
+%<platexrelease> \@tempskipa\lastskip
+%<platexrelease> \unskip
+%<platexrelease> \penalty #1\@getpen{#2}%
+%<platexrelease> \penalty\z@\relax %% added (2017/08/25)
+%<platexrelease> \ifdim\@tempskipa>\z@
+%<platexrelease> \hskip\@tempskipa
+%<platexrelease> \ignorespaces
+%<platexrelease> \fi
+%<platexrelease> \fi}
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk}
%<platexrelease> {Break before prebreakpenalty}%
diff --git a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
index 12f031facb8..13ed52b7bac 100644
--- a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
@@ -7,7 +7,7 @@
%
% Copyright (c) 2010 ASCII MEDIA WORKS
% Copyright (c) 2016 Takuji Tanaka
-% Copyright (c) 2016-2017 Japanese TeX Development Community
+% Copyright (c) 2016-2018 Japanese TeX Development Community
%
% This file is part of the upLaTeX2e system (community edition).
% --------------------------------------------------------------
@@ -25,13 +25,16 @@
% \changes{v1.0b}{2017/08/05}{%、&、\%、\&の禁則ペナルティが
% 誤っていたのを修正(post $\rightarrow$ pre)}
% \changes{v1.0b-u01}{2017/08/05}{p\LaTeX{}の変更に追随}
+% \changes{v1.0b-u02}{2018/01/27}{up\TeX{}の将来の変更に備え、
+% Latin-1 Supplementのうち属性がLatinのもの
+% (Latin-1 letters)をコードポイントで指定}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{ukinsoku.dtx}[2017/08/05 v1.0b-u01 upLaTeX Kernel]
+\ProvidesFile{ukinsoku.dtx}[2018/01/27 v1.0b-u02 upLaTeX Kernel]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{ukinsoku.dtx}
@@ -122,6 +125,9 @@
% 問題が起きた場合は禁則の設定を調整してください。
% \changes{v1.0-u01}{2017/08/02}{U+00B7 (MIDDLE DOT; JIS X 0213)の
% 前禁則ペナルティをU+30FBと同じ値に設定、注意点を明文化}
+% \changes{v1.0b-u02}{2018/01/27}{up\TeX{}の将来の変更に備え、
+% Latin-1 Supplementのうち属性がLatinのもの
+% (Latin-1 letters)をコードポイントで指定}
%
% \begin{macrocode}
%%全角文字
@@ -228,8 +234,8 @@
\postbreakpenalty`¿=10000
\prebreakpenalty`ː=10000
\prebreakpenalty`·=10000
-\prebreakpenalty`ª=10000
-\prebreakpenalty`º=10000
+\prebreakpenalty"AA=10000% ª
+\prebreakpenalty"BA=10000% º
\prebreakpenalty`¹=10000
\prebreakpenalty`²=10000
\prebreakpenalty`³=10000
@@ -258,8 +264,8 @@
%%
%%\postbreakpenalty`¡=10000
%%\postbreakpenalty`¿=10000
-%%\prebreakpenalty`º=10000
-%%\prebreakpenalty`ª=10000
+%%\prebreakpenalty"BA=10000% º
+%%\prebreakpenalty"AA=10000% ª
\prebreakpenalty`™=10000
%%
%% kinsoku 半角片仮名
@@ -513,8 +519,8 @@
\inhibitxspcode`⁉=1
\inhibitxspcode`¡=2
\inhibitxspcode`¿=2
-\inhibitxspcode`ª=1
-\inhibitxspcode`º=1
+\inhibitxspcode"AA=1% ª
+\inhibitxspcode"BA=1% º
\inhibitxspcode`¹=1
\inhibitxspcode`²=1
\inhibitxspcode`³=1
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 376ba57e83d..2179550202c 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -151,7 +151,7 @@
{2017/10/28u01}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{3}
+\def\ppatch@level{4}
%</plcore>
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
index 3d49373049b..0accc803751 100644
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -143,8 +143,8 @@
\postbreakpenalty`¿=10000
\prebreakpenalty`ː=10000
\prebreakpenalty`·=10000
-\prebreakpenalty`ª=10000
-\prebreakpenalty`º=10000
+\prebreakpenalty"AA=10000% ª
+\prebreakpenalty"BA=10000% º
\prebreakpenalty`¹=10000
\prebreakpenalty`²=10000
\prebreakpenalty`³=10000
@@ -173,8 +173,8 @@
%%
%%\postbreakpenalty`¡=10000
%%\postbreakpenalty`¿=10000
-%%\prebreakpenalty`º=10000
-%%\prebreakpenalty`ª=10000
+%%\prebreakpenalty"BA=10000% º
+%%\prebreakpenalty"AA=10000% ª
\prebreakpenalty`™=10000
%%
%% kinsoku 半角片仮名
@@ -386,8 +386,8 @@
\inhibitxspcode`⁉=1
\inhibitxspcode`¡=2
\inhibitxspcode`¿=2
-\inhibitxspcode`ª=1
-\inhibitxspcode`º=1
+\inhibitxspcode"AA=1% ª
+\inhibitxspcode"BA=1% º
\inhibitxspcode`¹=1
\inhibitxspcode`²=1
\inhibitxspcode`³=1
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index 256b3d924b2..31214f925d6 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -20,7 +20,7 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2017/10/28u01}
-\def\ppatch@level{3}
+\def\ppatch@level{4}
\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
@@ -713,19 +713,6 @@
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
\ignorespaces
\fi}
-\def\@no@lnbk #1[#2]{%
- \ifvmode
- \@nolnerr
- \else
- \@tempskipa\lastskip
- \unskip
- \penalty #1\@getpen{#2}%
- \penalty\z@\relax %% added (2017/08/25)
- \ifdim\@tempskipa>\z@
- \hskip\@tempskipa
- \ignorespaces
- \fi
- \fi}
\gdef\@makecol{%
\setbox\@outputbox\box\@cclv%
\let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k)