upzhkinsoku (7apr18)

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

4 files changed, 14 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/generic/upzhkinsoku/README b/Master/texmf-dist/doc/generic/upzhkinsoku/README
index 1e9b4b1cb30..7645a0376c4 100644
--- a/Master/texmf-dist/doc/generic/upzhkinsoku/README
+++ b/Master/texmf-dist/doc/generic/upzhkinsoku/README
@@ -6,7 +6,7 @@ CTAN Homepage: https://ctan.org/pkg/upzhkinsoku
 
 Repository: https://github.com/Man-Ting-Fang/upzhkinsoku
 
-Version: 2018-02-04 v0.4
+Version: 2018-04-07 v0.5
 
 Copyright 2017--2018 Yue ZHANG
 
diff --git a/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.pdf b/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.pdf
index 0e4a345150d..aa7fe80f4dd 100644
--- a/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.pdf
+++ b/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.tex b/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.tex
index ca52ab21327..a6c191eddf5 100644
--- a/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.tex
+++ b/Master/texmf-dist/doc/generic/upzhkinsoku/upzhkinsoku-doc.tex
@@ -37,7 +37,7 @@
   \thanks{CTAN Homepage: \texttt{https://ctan.org/pkg/upzhkinsoku}}
   \thanks{Repository: \texttt{https://github.com/Man-Ting-Fang/upzhkinsoku}}}
 \author{Yue \textsc{Zhang}}
-\date{2018-02-04\quad v0.4}
+\date{2018-04-07\quad v0.5}
 
 \maketitle
 
diff --git a/Master/texmf-dist/tex/generic/upzhkinsoku/upzhkinsoku.sty b/Master/texmf-dist/tex/generic/upzhkinsoku/upzhkinsoku.sty
index 17b0df3ec48..9f14e317b61 100644
--- a/Master/texmf-dist/tex/generic/upzhkinsoku/upzhkinsoku.sty
+++ b/Master/texmf-dist/tex/generic/upzhkinsoku/upzhkinsoku.sty
@@ -11,7 +11,7 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
   \else
-    \ProvidesPackage{upzhkinsoku}[2018/02/04 v0.4
+    \ProvidesPackage{upzhkinsoku}[2018/04/07 v0.5
       Supplementary Chinese kinsoku for Unicode *pTeX]%
   \fi
 
@@ -44,7 +44,7 @@
 
 \def\upzhkinsoku@setpenalties{%
   \postbreakpenalty"23=10000\relax % #
-  \postbreakpenalty"24=10000\relax % $ (variable slot)
+%  \postbreakpenalty"24=10000\relax % $ (variable slot)
   \prebreakpenalty"25=10000\relax  % %
   \prebreakpenalty"26=10000\relax  % &
   \prebreakpenalty"2A=10000\relax  % *
@@ -54,6 +54,9 @@
   \postbreakpenalty"40=10000\relax % @
   \prebreakpenalty"5E=10000\relax  % ^
   \prebreakpenalty"7E=10000\relax  % ~
+  \prebreakpenalty\ucs"301E=10000\relax  % 〞
+  \postbreakpenalty\ucs"2329=10000\relax % 〈
+  \prebreakpenalty\ucs"232A=10000\relax  % 〉
   \postbreakpenalty\ucs"301A=10000\relax % 〚
   \prebreakpenalty\ucs"301B=10000\relax  % 〛
   \prebreakpenalty\ucs"00B7=10000\relax  % ·
@@ -66,11 +69,12 @@
   \prebreakpenalty\ucs"2025=0\relax      % ‥
   \prebreakpenalty\ucs"FF0F=10000\relax  % ／
   \prebreakpenalty\ucs"FF5E=10000\relax  % ～
+  \prebreakpenalty\ucs"301C=10000\relax  % 〜
 }
 \def\upzhkinsoku@setxspcodes{%
   \xspcode"21=2\relax % !
   \xspcode"23=1\relax % #
-  \xspcode"24=1\relax % $ (variable slot)
+%  \xspcode"24=1\relax % $ (variable slot)
   \xspcode"25=2\relax % %
   \xspcode"26=3\relax % &
   \xspcode"3A=2\relax % :
@@ -78,6 +82,9 @@
   \xspcode"40=1\relax % @
 }
 \def\upzhkinsoku@setinhibitxspcodes{%
+  \inhibitxspcode\ucs"301E=1\relax % 〞
+  \inhibitxspcode\ucs"2329=2\relax % 〈
+  \inhibitxspcode\ucs"232A=1\relax % 〉
   \inhibitxspcode\ucs"301A=2\relax % 〚
   \inhibitxspcode\ucs"301B=1\relax % 〛
   \inhibitxspcode\ucs"00B7=0\relax % ·
@@ -95,6 +102,7 @@
 }
 
 \def\upzhkinsoku@setwith@ascii{% variable slots
+  \prebreakpenalty"22=0\relax      % "
   \prebreakpenalty"3C=10000\relax  % <
   \prebreakpenalty"3E=10000\relax  % >
   \prebreakpenalty"5C=10000\relax  % \
@@ -110,6 +118,7 @@
   \xspcode"7D=2\relax % }
 }
 \def\upzhkinsoku@setwith@otlatin{% variable slots
+  \prebreakpenalty"22=10000\relax  % ”
   \postbreakpenalty"3C=10000\relax % ¡
   \postbreakpenalty"3E=10000\relax % ¿
   \postbreakpenalty"5C=10000\relax % “