uplatex (27aug17)

git-svn-id: svn://tug.org/texlive/trunk@45141 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 61 insertions, 37 deletions

diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
index fb85607859c..3d49373049b 100644
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -22,8 +22,8 @@
 \prebreakpenalty`"=10000
 \postbreakpenalty`\#=500
 \postbreakpenalty`\$=500
-\postbreakpenalty`\%=500
-\postbreakpenalty`\&=500
+\prebreakpenalty`\%=500
+\prebreakpenalty`\&=500
 \postbreakpenalty`\`=10000
 \prebreakpenalty`'=10000
 \prebreakpenalty`)=10000
@@ -87,8 +87,8 @@
 \prebreakpenalty`＝=200
 \postbreakpenalty`＃=200
 \postbreakpenalty`＄=200
-\postbreakpenalty`％=200
-\postbreakpenalty`＆=200
+\prebreakpenalty`％=200
+\prebreakpenalty`＆=200
 \prebreakpenalty`ぁ=150
 \prebreakpenalty`ぃ=150
 \prebreakpenalty`ぅ=150
@@ -142,6 +142,7 @@
 \postbreakpenalty`¡=10000
 \postbreakpenalty`¿=10000
 \prebreakpenalty`ː=10000
+\prebreakpenalty`·=10000
 \prebreakpenalty`ª=10000
 \prebreakpenalty`º=10000
 \prebreakpenalty`¹=10000
@@ -394,8 +395,8 @@
 %%
 %% inhibitxspcode  JIS X 0212
 %%
-%%\inhibitxspcode`¡=1
-%%\inhibitxspcode`¿=1
+%%\inhibitxspcode`¡=2
+%%\inhibitxspcode`¿=2
 %%\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 0d91d1583c2..951d0c299c7 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/07/29u01}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
   {\@plIncludeInRelease{#1}[#1]}}
@@ -445,7 +445,7 @@
 \newbox\adjust@box
 \newdimen\adjust@dimen
 \def\adjustbaseline{%
-    \setbox\adjust@box\hbox{\char\euc"A1A1}%"
+    \setbox\adjust@box\hbox{\char\jis"3441}%"
     \cht\ht\adjust@box
     \cdp\dp\adjust@box
     \cwd\wd\adjust@box
@@ -641,6 +641,25 @@
          \else\tbaselineshift\fi
          \else\ybaselineshift\fi
   \vbox{\hrule\@width.3em}}
+\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
+\def\pltx@mark{\pltx@mark@}
+\let\pltx@scanstop\relax
+\long\def\pltx@cond#1\fi{%
+  #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\long\def\pltx@isletter#1{%
+  \expandafter\pltx@isletter@i#1\pltx@scanstop}
+\long\def\pltx@isletter@i#1\pltx@scanstop{%
+  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
+    {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
+\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
+  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
+    {\pltx@isletter@iii}{\pltx@isletter@iv}}
+\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
+\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
+  \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
+    \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
+      {\@firstoftwo}{\@secondoftwo}%
+  }{\@secondoftwo}}
 \InputIfFileExists{upldefs.cfg}
            {\typeout{*************************************^^J%
                      * Local config file upldefs.cfg used^^J%
@@ -701,7 +720,7 @@
     \@tempskipa\lastskip
     \unskip
     \penalty #1\@getpen{#2}%
-    \hskip\z@\relax %% added (2017/05/03)
+    \penalty\z@\relax %% added (2017/08/25)
     \ifdim\@tempskipa>\z@
       \hskip\@tempskipa
       \ignorespaces
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index 45f13f69b57..eb355c5e15c 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -15,26 +15,7 @@
 %% 
 %% File: uplfonts.dtx
 \ProvidesFile{upldefs.ltx}
-      [2016/06/29 v1.6e-u00 upLaTeX Kernel (Default settings)]
-\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
-\def\pltx@mark{\pltx@mark@}
-\let\pltx@scanstop\relax
-\long\def\pltx@cond#1\fi{%
-  #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\long\def\pltx@isletter#1{%
-  \expandafter\pltx@isletter@i#1\pltx@scanstop}
-\long\def\pltx@isletter@i#1\pltx@scanstop{%
-  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
-    {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
-\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
-  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
-    {\pltx@isletter@iii}{\pltx@isletter@iv}}
-\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
-\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
-  \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
-    \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
-      {\@firstoftwo}{\@secondoftwo}%
-  }{\@secondoftwo}}
+      [2017/08/05 v1.6h-u00 upLaTeX Kernel (Default settings)]
 \def \check@nocorr@ #1#2\nocorr#3\@nil {%
   \let \check@icl \relax% \maybe@ic から変更
   \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
index 793da2e868c..cba13346d34 100644
--- a/Master/texmf-dist/tex/uplatex/base/uptrace.sty
+++ b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
@@ -16,7 +16,7 @@
 %% File: uplfonts.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{uptrace}
-     [2017/03/05 v1.6f-u00 Standard upLaTeX package (font tracing)]
+     [2017/08/05 v1.6h-u00 Standard upLaTeX package (font tracing)]
 \RequirePackageWithOptions{tracefnt}
 \DeclareRobustCommand\selectfont{%
   \let\tmp@error@fontshape\error@fontshape
@@ -73,8 +73,6 @@
     \set@fontsize\baselinestretch\f@size\f@baselineskip
   \fi
   \size@update}
-\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
-\KanjiEncodingPair{JY2}{JT2}
 \plIncludeInRelease{2017/04/08}{\set@fontsize}
                    {Construct \ystrutbox}%
 \def\set@fontsize#1#2#3{%
@@ -145,8 +143,32 @@
     \fi
         \let\size@update\relax}}
 \plEndIncludeInRelease
-\newbox\adjust@box
-\newdimen\adjust@dimen
+\plIncludeInRelease{2017/07/29}{\adjustbaseline}
+                   {Change zenkaku reference}%
+\def\adjustbaseline{%
+    \setbox\adjust@box\hbox{\char\jis"3441}%"
+    \cht\ht\adjust@box
+    \cdp\dp\adjust@box
+    \cwd\wd\adjust@box
+    \cvs\normalbaselineskip
+    \chs\cwd
+    \cHT\cht \advance\cHT\cdp
+  \iftdir
+    \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+    \adjust@dimen\ht\adjust@box
+    \advance\adjust@dimen\dp\adjust@box
+    \advance\adjust@dimen-\cHT
+    \divide\adjust@dimen\tw@
+    \advance\adjust@dimen\cdp
+    \advance\adjust@dimen-\dp\adjust@box
+    \tbaselineshift\adjust@dimen
+    \ifnum \tracingfonts>\tw@
+      \typeout{baselineshift:\the\tbaselineshift}%
+    \fi
+  \fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\adjustbaseline}
+                   {Change zenkaku reference}%
 \def\adjustbaseline{%
     \setbox\adjust@box\hbox{\char\euc"A1A1}%"
     \cht\ht\adjust@box
@@ -164,10 +186,11 @@
     \advance\adjust@dimen\cdp
     \advance\adjust@dimen-\dp\adjust@box
     \tbaselineshift\adjust@dimen
-  \ifnum \tracingfonts>\tw@
-    \typeout{baselineshift:\the\tbaselineshift}
-  \fi
+    \ifnum \tracingfonts>\tw@
+      \typeout{baselineshift:\the\tbaselineshift}
+    \fi
   \fi}
+\plEndIncludeInRelease
 \endinput
 %%
 %% End of file `uptrace.sty'.