summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/uplatex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-27 23:04:08 +0000
committerKarl Berry <karl@freefriends.org>2017-09-27 23:04:08 +0000
commitfddaa2393f00e1fea71a2669bd6ece044b841727 (patch)
tree99dd44553457207cd0861ac18e94a8624800617f /Master/texmf-dist/source/uplatex/base
parent370e3406b980531c0dd271e5531f39573ac3be70 (diff)
uplatex (26sep17)
git-svn-id: svn://tug.org/texlive/trunk@45414 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/uplatex/base')
-rw-r--r--Master/texmf-dist/source/uplatex/base/plcore.dtx43
-rw-r--r--Master/texmf-dist/source/uplatex/base/ujclasses.dtx9
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplvers.dtx4
3 files changed, 44 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx
index bac04240e68..d305f1403d3 100644
--- a/Master/texmf-dist/source/uplatex/base/plcore.dtx
+++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx
@@ -70,13 +70,15 @@
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(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}
+% \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B
+% $B$J$C$F$$$?%P%0$r=$@5(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2017/08/25 v1.2q pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2017/09/26 v1.2r pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -1511,12 +1513,13 @@
% $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B
%
% $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B
-% $B:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$KM>J,$J(B|\unskip|$B$rH/9T$9$k(B
-% $B$3$H$G!"%;%kMWAG$N<~0O$N(BJFM$B%0%k!=$r>C$7$^$9!#(B
+% $B%;%k$NMWAG$r(B|\mbox|$B$KF~$l!"$=$N:G=i$G(B|\inhibitglue|$B$rH/9T$7$^$9!#(B
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+% \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B
+% $B$J$C$F$$$?%P%0$r=$@5(B}
% \begin{macrocode}
%</plcore>
-%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
+%<platexrelease>\plIncludeInRelease{2017/09/26}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<*plcore|platexrelease>
\def\@tabclassz{%
@@ -1536,14 +1539,40 @@
\edef\@preamble{%
\@preamble{%
\ifcase\@chnum
- \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+ \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
\or
- \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+ \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
\or
- \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+ \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
\fi}}}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
+%<platexrelease> {Inhibit JFM glue in tabular cells}%
+%<platexrelease>\def\@tabclassz{%
+%<platexrelease> \ifcase\@lastchclass
+%<platexrelease> \@acolampacol
+%<platexrelease> \or
+%<platexrelease> \@ampacol
+%<platexrelease> \or
+%<platexrelease> \or
+%<platexrelease> \or
+%<platexrelease> \@addamp
+%<platexrelease> \or
+%<platexrelease> \@acolampacol
+%<platexrelease> \or
+%<platexrelease> \@firstampfalse\@acol
+%<platexrelease> \fi
+%<platexrelease> \edef\@preamble{%
+%<platexrelease> \@preamble{%
+%<platexrelease> \ifcase\@chnum
+%<platexrelease> \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+%<platexrelease> \or
+%<platexrelease> \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+%<platexrelease> \or
+%<platexrelease> \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+%<platexrelease> \fi}}}
+%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<platexrelease>\def\@tabclassz{%
diff --git a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
index bf9022edcae..9f8fadf4aad 100644
--- a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
@@ -100,6 +100,7 @@
% \changes{v1.7e}{2017/03/05}{\cs{frontmatter}と\cs{mainmatter}を
% 奇数ページに送るように変更}
% \changes{v1.7e-u00}{2017/03/05}{p\LaTeX{}用に追随}
+% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
% \fi
%
% \iffalse
@@ -129,7 +130,7 @@
%<11pt&bk>\ProvidesFile{utbk11.clo}
%<12pt&bk>\ProvidesFile{utbk12.clo}
%</tate>
- [2017/03/05 v1.7e-u00
+ [2017/08/31 v1.7f-u00
%<article|report|book> Standard upLaTeX class]
%<10pt|11pt|12pt> Standard upLaTeX file (size option)]
%<*driver>
@@ -621,9 +622,11 @@
% \begin{macro}{\Cvs}
% \begin{macro}{\Chs}
% 基準となる長さの設定をします。これらのパラメータは\file{uplfonts.dtx}で定義
-% されています。
+% されています。基準とする文字を「全角空白」(EUCコード\texttt{0xA1A1})から
+% 「漢」(JISコード\texttt{0x3441})へ変更しました。
+% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
% \begin{macrocode}
-\setbox0\hbox{\char\euc"A1A1}%
+\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 5d82221377b..7e4fc20d7ea 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -139,10 +139,10 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2017/07/29u01}
+ {2017/09/26u01}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{1}
+\def\ppatch@level{0}
%</plcore>
% \end{macrocode}
% \end{macro}