cjkpunct (14may16)

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

10 files changed, 418 insertions, 186 deletions

diff --git a/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.pdf b/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.pdf
index 77795bb9cac..024589536d6 100644
--- a/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.pdf
+++ b/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.pdf
diff --git a/Master/texmf-dist/doc/latex/cjkpunct/README b/Master/texmf-dist/doc/latex/cjkpunct/README
deleted file mode 100644
index cd85131a25f..00000000000
--- a/Master/texmf-dist/doc/latex/cjkpunct/README
+++ /dev/null
@@ -1,13 +0,0 @@
-CJKpunct is a LaTeX2e macro package to be the companion
-of CJK package by Werner Lemberg for punctuation location
-and width adjustments.
-
-This package is licensed in LPPL.
-
-If you are interested in the process of development you
-may observe
-
-    http://code.google.com/p/ctex-kit/updates/list
-
-- Sun Wenchang <sunwch@hotmail.com>
-
diff --git a/Master/texmf-dist/doc/latex/cjkpunct/README.md b/Master/texmf-dist/doc/latex/cjkpunct/README.md
new file mode 100644
index 00000000000..ccac0787cdd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjkpunct/README.md
@@ -0,0 +1,50 @@
+CJKpunct
+========
+
+`CJKpunct` is a LaTeX2e macro package to be the companion
+of `CJK` package by Werner Lemberg for punctuation location
+and width adjustments.
+
+Contributing
+------------
+
+This package is a part of the [ctex-kit](https://github.com/CTeX-org/ctex-kit) project.
+
+Issues and pull requests are welcome.
+
+Copyright and Licence
+---------------------
+
+    Copyright (C) 2003--2010 by Linbo Zhang <zlb@lsec.cc.ac.cn>
+    Copyright (C) 2003--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
+    Copyright (C) 2010 by Leo Liu <leoliu.pku@gmail.com>
+    Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+    ----------------------------------------------------------------------
+
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
+
+    This work has the LPPL maintenance status `maintained'.
+
+    The Current Maintainer of this work is Qing Lee.
+
+    This package consists of the files CJKpunct.dtx,
+                                       CJKpunct.spa,
+                                       setpunct-main.tex,
+                                       setpunct-macros.tex,
+                                       example-CJKfntef.tex,
+                                       example-gb.tex,
+                                       example-gbk.tex,
+                                       example-utf8.tex,
+                                       README.txt,
+                 and the derived files CJKpunct.sty,
+                                       CJKpunct.pdf,
+                                       CJKpunct.ins, and
+                                       README.md (this file).
diff --git a/Master/texmf-dist/doc/latex/cjkpunct/README.zh-cn.txt b/Master/texmf-dist/doc/latex/cjkpunct/README.zh-cn.txt
deleted file mode 100644
index 7a2333df6b9..00000000000
--- a/Master/texmf-dist/doc/latex/cjkpunct/README.zh-cn.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-修改 CJKpunct.spa
-
-  打开文件 setpunct\setpunct-main.tex, 
-
-  1. 根据操作系统修改 \ghostscript 的定义
-
-  2. 修改 \setpunctfamilies, 添加你所使用的CJKfamily
-
-  3. 对于miktex, 运行
-     
-        latex --enable-write18 setpunct-main
-   
-     对于texlive, 运行
-     
-        latex --shell-escape setpunct-main
-
-  4. 把文件 CJKpunct.spa 复制到 CJKpunct.sty 所在文件夹, 然后运行
-  
-        Texhash   
-
-  ------ 安装完成
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/cjkpunct/setpunct/README.txt b/Master/texmf-dist/doc/latex/cjkpunct/setpunct/README.txt
new file mode 100644
index 00000000000..69d79caba7b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjkpunct/setpunct/README.txt
@@ -0,0 +1,22 @@
+淇敼 CJKpunct.spa
+
+  鎵撳紑鏂囦欢 setpunct\setpunct-main.tex, 
+
+  1. 鏍规嵁鎿嶄綔绯荤粺淇敼 \ghostscript 鐨勫畾涔�
+
+  2. 淇敼 \setpunctfamilies, 娣诲姞浣犳墍浣跨敤鐨凜JKfamily
+
+  3. 瀵逛簬miktex, 杩愯
+     
+        latex --enable-write18 setpunct-main
+   
+     瀵逛簬texlive, 杩愯
+     
+        latex --shell-escape setpunct-main
+
+  4. 鎶婃枃浠� CJKpunct.spa 澶嶅埗鍒� CJKpunct.sty 鎵�鍦ㄦ枃浠跺す, 鐒跺悗杩愯
+  
+        Texhash   
+
+  ------ 瀹夎瀹屾垚
+ 
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/cjkpunct/setpunct/setpunct-macros.tex b/Master/texmf-dist/doc/latex/cjkpunct/setpunct/setpunct-macros.tex
index c02b653d75f..2036a0878a5 100644
--- a/Master/texmf-dist/doc/latex/cjkpunct/setpunct/setpunct-macros.tex
+++ b/Master/texmf-dist/doc/latex/cjkpunct/setpunct/setpunct-macros.tex
@@ -101,6 +101,9 @@
   \fi
   \cnta=-\temp@xwidth\relax
   \advance\cnta 100\relax
+  \ifnum\cnta<0
+    \cnta=0\relax
+  \fi
   \edef\temp@xspace{\the\cnta}}
 
 \long\def\getleftupdimen#1%%BoundingBox: #2 #3 #4 #5 {
diff --git a/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.dtx b/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.dtx
index 654f2628a76..a402c47458c 100644
--- a/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.dtx
+++ b/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.dtx
@@ -3,51 +3,148 @@
 \iffalse
 %</internal>
 %<*readme>
-
-CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
-
+CJKpunct
+========
+
+`CJKpunct` is a LaTeX2e macro package to be the companion
+of `CJK` package by Werner Lemberg for punctuation location
+and width adjustments.
+
+Contributing
+------------
+
+This package is a part of the [ctex-kit](https://github.com/CTeX-org/ctex-kit) project.
+
+Issues and pull requests are welcome.
+
+Copyright and Licence
+---------------------
+
+    Copyright (C) 2003--2010 by Linbo Zhang <zlb@lsec.cc.ac.cn>
+    Copyright (C) 2003--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
+    Copyright (C) 2010 by Leo Liu <leoliu.pku@gmail.com>
+    Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+    ----------------------------------------------------------------------
+
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
+
+    This work has the LPPL maintenance status `maintained'.
+
+    The Current Maintainer of this work is Qing Lee.
+
+    This package consists of the files CJKpunct.dtx,
+                                       CJKpunct.spa,
+                                       setpunct-main.tex,
+                                       setpunct-macros.tex,
+                                       example-CJKfntef.tex,
+                                       example-gb.tex,
+                                       example-gbk.tex,
+                                       example-utf8.tex,
+                                       README.txt,
+                 and the derived files CJKpunct.sty,
+                                       CJKpunct.pdf,
+                                       CJKpunct.ins, and
+                                       README.md (this file).
 %</readme>
 %<*internal>
 \fi
-%</internal>
-%
-%<*internal>
 \begingroup
+  \def\temp{LaTeX2e}
+\expandafter\endgroup\ifx\temp\fmtname\else
+\csname fi\endcsname
 %</internal>
 %<*batchfile>
-\input docstrip.tex
+
+\input docstrip %
+
 \keepsilent
-\usedir{tex/latex/CJK/CJKpunct}
+\askforoverwritefalse
+
 \preamble
 
- Version 4.8.1-2 (30-Aug-2008)
+    Copyright (C) 2003--2010 by Linbo Zhang <zlb@lsec.cc.ac.cn>
+    Copyright (C) 2003--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
+    Copyright (C) 2010 by Leo Liu <leoliu.pku@gmail.com>
+    Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+--------------------------------------------------------------------------
 
- This is the file CJKpunct.sty for the CJK package
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
 
- Authors:
-            Linbo Zhang (zlb@lsec.cc.ac.cn)
-            Wenchang Sun (sunwch@nankai.edu.cn)
+    This work has the LPPL maintenance status `maintained'.
 
+    The Current Maintainer of this work is Qing Lee.
+
+--------------------------------------------------------------------------
 
 \endpreamble
-\askforoverwritefalse
-\generate{\file{CJKpunct.sty}{\from{CJKpunct.dtx}{CJKpunct}}}
+\postamble
+
+    This package consists of the files CJKpunct.dtx,
+                                       CJKpunct.spa,
+                                       setpunct-main.tex,
+                                       setpunct-macros.tex,
+                                       example-CJKfntef.tex,
+                                       example-gb.tex,
+                                       example-gbk.tex,
+                                       example-utf8.tex,
+                                       README.txt,
+                 and the derived files CJKpunct.sty,
+                                       CJKpunct.pdf,
+                                       CJKpunct.ins, and
+                                       README.md (this file).
+\endpostamble
+
+\generate
+  {
+    \usedir{tex/latex/cjkpunct}
+    \file{CJKpunct.sty} {\from{\jobname.dtx}{CJKpunct}}
+    \usedir{doc/latex/cjkpunct}
+    \nopreamble\nopostamble
+    \file{README.md}    {\from{\jobname.dtx}{readme}}
+  }
 %</batchfile>
+%<batchfile>\Msg{*************************************************************}
+%<batchfile>\Msg{*}
+%<batchfile>\Msg{* To finish the installation you have to move the following}
+%<batchfile>\Msg{* files into a directory searched by LaTeX:}
+%<batchfile>\Msg{*}
+%<batchfile>\Msg{* \space\space\space  CJKpunct.sty}
+%<batchfile>\Msg{*}
+%<batchfile>\Msg{*************************************************************}
 %<batchfile>\endbatchfile
 %<*internal>
-\generate{\file{CJKpunct.ins}{\from{CJKpunct.dtx}{batchfile}}}
-\nopreamble\nopostamble
-\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
-\endgroup
+\generate{\file{CJKpunct.ins}{\from{\jobname.dtx}{batchfile}}}
+\endbatchfile
+\fi
 %</internal>
-%
 %<*driver>
-\documentclass[12pt]{ltxdoc}
+\documentclass[a4paper,12pt]{ltxdoc}
 \usepackage{xcolor}
-\usepackage[bookmarks=true,CJKbookmarks,bookmarksopen=true,dvipdfm,pdfstartview=FitH]{hyperref}
-\usepackage{CJK}
+\usepackage{CJKutf8}
 \usepackage{CJKspace}
 \usepackage{CJKpunct}
+\PassOptionsToPackage{driverfallback=dvipdfmx}{hyperref}
+\usepackage{hypdoc}
+\hypersetup{pdfencoding=unicode,bookmarksopen=true,pdfstartview=FitH}
+\AtBeginShipoutFirst{{%
+  \MakePercentComment
+  \input{zhwindowsfonts}}}
 \textheight 210mm
 \textwidth 150mm
 \oddsidemargin 0pt
@@ -93,15 +190,13 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 
 \renewcommand{\arg}[1]{{\tt\string{}\m{#1}{\tt\string}}}
 \newcommand{\m}[1]{\mbox{\color{parametercolor}$\langle$\it #1\/$\rangle$}}
-
+\setcounter{IndexColumns}{2}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
 \begin{document}
-\begin{CJK*}{GB}{gbsn}
+\begin{CJK*}{UTF8}{rm}
   \DocInput{CJKpunct.dtx}
-  \makeatletter
-  \c@IndexColumns = 2
   \PrintIndex
   \newpage
 \end{CJK*}
@@ -109,8 +204,8 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 %</driver>
 %
 %<*CJKpunct>
-\def\fileversion{4.8.1-2}
-\def\filedate{2008/08/30}
+\def\fileversion{4.8.4}
+\def\filedate{2016/05/14}
 \ProvidesPackage{CJKpunct}[\filedate\space\fileversion]
 %</CJKpunct>
 %
@@ -119,44 +214,45 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 % \makeatletter                         ^^A% To document @-cmds
 % \errorcontextlines=999                ^^A% Show up all my mistakes
 %
+% \CheckSum{936}
 % \GetFileInfo{CJKpunct.sty}
 %
-% \title{CJKpunct  使用说明}
-% \author{张林波 \quad 孙文昌}
-% \date{2008 年 8 月 12 日}
+% \title{CJKpunct 浣跨敤璇存槑}
+% \author{寮犳灄娉� \quad 瀛欐枃鏄寎
+% \date{2016 骞� 5 鏈� 14 鏃
 % \maketitle
 %
 %
 % \def\CJKpunct{{\textcolor{blue}{\texttt{CJKpunct}}}}
-% \CJKpunct\ 是一个 \LaTeX\ 宏包， 用于排版中文标点，提供多种标点样式，以实现行末对齐、
-% 标点挤压等效果。 其基本方法来自 CCT。
-% \section{调用方式}
+% \CJKpunct\ 鏄竴涓� \LaTeX\ 瀹忓寘锛� 鐢ㄤ簬鎺掔増涓枃鏍囩偣锛屾彁渚涘绉嶆爣鐐规牱寮忥紝浠ュ疄鐜拌鏈榻愩��
+% 鏍囩偣鎸ゅ帇绛夋晥鏋溿�� 鍏跺熀鏈柟娉曟潵鑷� CCT銆�
+% \section{璋冪敤鏂瑰紡}
 % \parindent 2em
 % \parskip 5pt
 % \begin{decl}
 %   \defmacro{usepackage}\{\textcolor{parametercolor}{CJKpunct}\}
 % \end{decl}
 %
-% \section{常用宏命令}
+% \section{甯哥敤瀹忓懡浠
 % \begin{decl}
 %  \defmacro{punctstyle}\arg{punct style}
 % \end{decl}
 %
-% 设置标点格式，有效值分别为
+% 璁剧疆鏍囩偣鏍煎紡锛屾湁鏁堝�煎垎鍒负
 %
 % \begin{tabular}{ll}
 %   punct style & \\
-%   \textcolor{parametercolor}{banjiao}       & 半角式 \\
-%   \textcolor{parametercolor}{quanjiao}     & 全角式\\
-%   \textcolor{parametercolor}{kaiming}      & 开明式\\
-%   \textcolor{parametercolor}{hangmobanjiao}& 行末半角式\\
-%   \textcolor{parametercolor}{CCT}          &    CCT 格式\\
-%   \textcolor{parametercolor}{plain}          &   CJK 缺省格式
+%   \textcolor{parametercolor}{banjiao}       & 鍗婅寮� \\
+%   \textcolor{parametercolor}{quanjiao}     & 鍏ㄨ寮廫\
+%   \textcolor{parametercolor}{kaiming}      & 寮�鏄庡紡\\
+%   \textcolor{parametercolor}{hangmobanjiao}& 琛屾湯鍗婅寮廫\
+%   \textcolor{parametercolor}{CCT}          &    CCT 鏍煎紡\\
+%   \textcolor{parametercolor}{plain}          &   CJK 缂虹渷鏍煎紡
 % \end{tabular}
 %
 %
-% 注意：为了得到最好的排版效果，需要制作字体相关的 CJKpunct.spa 文件。请参考
-% source/README.txt
+% 娉ㄦ剰锛氫负浜嗗緱鍒版渶濂界殑鎺掔増鏁堟灉锛岄渶瑕佸埗浣滃瓧浣撶浉鍏崇殑 CJKpunct.spa 鏂囦欢銆傝鍙傝��
+% \nolinkurl{TDS/doc/latex/cjkpunct/setpunct/README.txt}銆�
 %
 %
 % \begin{decl}
@@ -164,25 +260,25 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 %   \defmacro{CJKpunctnobreakbetweenpuncts}
 % \end{decl}
 %
-% 缺省状态下，\CJKpunct\ 禁止在相邻的标点间换行（行末半角和 CJK 缺省格式除外）。 使用
+% 缂虹渷鐘舵�佷笅锛孿CJKpunct\ 绂佹鍦ㄧ浉閭荤殑鏍囩偣闂存崲琛岋紙琛屾湯鍗婅鍜� CJK 缂虹渷鏍煎紡闄ゅ锛夈�� 浣跨敤
 %
 % \defmacro{CJKpunctallowbreakbetweenpuncts}\newline
-% 改变这一设置。注意：行末半角和 CJK 缺省格式总是允许相邻标点间换行。
+% 鏀瑰彉杩欎竴璁剧疆銆傛敞鎰忥細琛屾湯鍗婅鍜� CJK 缂虹渷鏍煎紡鎬绘槸鍏佽鐩搁偦鏍囩偣闂存崲琛屻��
 %
 % \begin{decl}
-%  \defmacro{CJKpunctsetkern}\arg{标点1}\arg{标点2}\arg{间距}
+%  \defmacro{CJKpunctsetkern}\arg{鏍囩偣1}\arg{鏍囩偣2}\arg{闂磋窛}
 % \end{decl}
 %
-%    设置标点 1 与标点 2 之间的距离。 例如，\defmacro{CJKpunctsetkern}\{：\}\{“\}\{0.4em\}
+%    璁剧疆鏍囩偣 1 涓庢爣鐐� 2 涔嬮棿鐨勮窛绂汇�� 渚嬪锛孿defmacro{CJKpunctsetkern}\{锛歕}\{鈥淺}\{0.4em\}
 %
 % \begin{decl}
 %  \defmacro{CJKpunctmapfamily}\arg{font encoding}\arg{font family}\arg{font series}\arg{font shape}
 %    \arg{punct family}
 % \end{decl}
 %
-%  缺省状态下， \CJKpunct\ 根据 CJKfamily 确定当前标点符号的实际字体。 但这对C19com等组合字体
-%  不适用。此命令提供一个解决方案：用户可以指定 \arg{font encoding}/ \arg{font family}/
-% \arg{font series}/ \arg{font shape} 所对应的标点符号字体。例如，对于C19rm, 可以做如下设置：
+%  缂虹渷鐘舵�佷笅锛� \CJKpunct\ 鏍规嵁 CJKfamily 纭畾褰撳墠鏍囩偣绗﹀彿鐨勫疄闄呭瓧浣撱�� 浣嗚繖瀵笴19com绛夌粍鍚堝瓧浣�
+%  涓嶉�傜敤銆傛鍛戒护鎻愪緵涓�涓В鍐虫柟妗堬細鐢ㄦ埛鍙互鎸囧畾 \arg{font encoding}/ \arg{font family}/
+% \arg{font series}/ \arg{font shape} 鎵�瀵瑰簲鐨勬爣鐐圭鍙峰瓧浣撱�備緥濡傦紝瀵逛簬C19rm, 鍙互鍋氬涓嬭缃細
 %
 % \begin{verbatim}
 %   \CJKpunctmapfamily{C19}{rm}{m}{n}{song}
@@ -193,9 +289,11 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 %   \CJKpunctmapfamily{C19}{rm}{bx}{it}{kai}
 % \end{verbatim}
 %
-% \section{制作 CJKpunct.spa 文件}
+% \section{鍒朵綔 CJKpunct.spa 鏂囦欢}
+%
+%  鏂囦欢 CJKpunct.spa 淇濆瓨浜嗗瓧浣撶浉鍏崇殑鏍囩偣绗﹀彿瀹藉害銆傚埗浣滄柟娉曡鍙傝��
+%  \nolinkurl{TDS/doc/latex/cjkpunct/setpunct/README.txt}銆�
 %
-%  文件 CJKpunct.spa 保存了字体相关的标点符号宽度。制作方法请参考 source/REAME.txt
 % \StopEventually{}
 %
 %
@@ -220,7 +318,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 \newcount\CJKpunct@cnte
 %    \end{macrocode}
 %
-% 为使 \CJKpunct\ 起作用，重定义一些 CJK 宏。
+% 涓轰娇 \CJKpunct\ 璧蜂綔鐢紝閲嶅畾涔変竴浜� CJK 瀹忋��
 %
 %    \begin{macrocode}
 \let\CJKo@testLastCJK\CJK@testLastCJK
@@ -239,10 +337,9 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 
 
 \let\CJKo@nobreakglue\CJK@nobreakglue
-\let\CJKoglue\CJKglue
 %    \end{macrocode}
 %
-%  \defmacro{CJKsymbol} 的定义中需要三重括号以保证兼容 CJKfntef 宏包。
+%  \defmacro{CJKsymbol} 鐨勫畾涔変腑闇�瑕佷笁閲嶆嫭鍙蜂互淇濊瘉鍏煎 CJKfntef 瀹忓寘銆�
 %
 %    \begin{macrocode}
 
@@ -251,7 +348,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
   {{{
   \ifnum\CJKpunct@lastkern>0\relax
     \ifnum\CJKpunct@lastcharclass=0\relax
-      \CJKoglue
+      \CJKglue
     \else
       \CJKpunct@ULspecials
     \fi
@@ -263,7 +360,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 \def\CJKpunct@lastkern{0}
 %    \end{macrocode}
 %
-%  标点符号的排版规则：
+%  鏍囩偣绗﹀彿鐨勬帓鐗堣鍒欙細
 %
 %    \begin{macrocode}
 \let\CJKopunctsymbol\CJKpunctsymbol
@@ -302,7 +399,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
           @lglue@\CJKpunct@currentpunct\endcsname  plus 0.1em minus 0.1 em
       \else
         \ifcsname CJKpunct@specialpunct\CJK@enc \CJKpunct@currentpunct\endcsname
-          \CJKoglue  % breakable
+          \CJKglue  % breakable
         \else
           \nobreak
         \fi
@@ -328,56 +425,29 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
   \fi}
 %    \end{macrocode}
 %
-% 设置当前 font family.
+% 璁剧疆褰撳墠 font family.
 %
 %    \begin{macrocode}
 \def\CJKpunct@setfamily{
   \ifcsname \CJK@enc @\CJK@family @\f@series @\f@shape\endcsname
     \global\edef\CJKpunct@family{\csname \CJK@enc @\CJK@family @\f@series @\f@shape\endcsname}
   \else
-    \edef\CJKpunct@family{\CJK@family}
+    \global\edef\CJKpunct@family{\CJK@family}
   \fi}
 
 \def\CJKpunctmapfamily#1#2#3#4#5{
   \expandafter\edef\csname #1@#2@#3@#4\endcsname{#5}}
 
-\CJKpunctmapfamily{C19}{rm}{m}{n}{song}
-\CJKpunctmapfamily{C19}{rm}{bx}{n}{hei}
-\CJKpunctmapfamily{C19}{rm}{m}{sl}{song}
-\CJKpunctmapfamily{C19}{rm}{bx}{sl}{hei}
-\CJKpunctmapfamily{C19}{rm}{m}{it}{kai}
-\CJKpunctmapfamily{C19}{rm}{bx}{it}{kai}
-
-\CJKpunctmapfamily{C19}{com}{m}{n}{song}
-\CJKpunctmapfamily{C19}{com}{bx}{n}{hei}
-\CJKpunctmapfamily{C19}{com}{m}{sl}{kai}
-\CJKpunctmapfamily{C19}{com}{bx}{sl}{kai}
-\CJKpunctmapfamily{C19}{com}{m}{it}{kai}
-\CJKpunctmapfamily{C19}{com}{bx}{it}{kai}
-
-\CJKpunctmapfamily{C19}{sf}{m}{n}{you}
-\CJKpunctmapfamily{C19}{sf}{bx}{n}{you}
-\CJKpunctmapfamily{C19}{sf}{m}{sl}{you}
-\CJKpunctmapfamily{C19}{sf}{bx}{sl}{you}
-\CJKpunctmapfamily{C19}{sf}{m}{it}{you}
-\CJKpunctmapfamily{C19}{sf}{bx}{it}{you}
-
-\CJKpunctmapfamily{C19}{tt}{m}{n}{fs}
-\CJKpunctmapfamily{C19}{tt}{bx}{n}{fs}
-\CJKpunctmapfamily{C19}{tt}{m}{sl}{fs}
-\CJKpunctmapfamily{C19}{tt}{bx}{sl}{fs}
-\CJKpunctmapfamily{C19}{tt}{m}{it}{fs}
-\CJKpunctmapfamily{C19}{tt}{bx}{it}{fs}
 %    \end{macrocode}
 %
-%  CJK 缺省标点符号格式
+%  CJK 缂虹渷鏍囩偣绗﹀彿鏍煎紡
 %
 %    \begin{macrocode}
 \def\CJKpunct@plainpunctsymbol#1#2{
   \CJKpunctsymbol{#2}}
 %    \end{macrocode}
 %
-% 设置标点符号边界宽度。
+% 璁剧疆鏍囩偣绗﹀彿杈圭晫瀹藉害銆�
 %
 %    \begin{macrocode}
 \def\CJKpunct@setmarginkerning{
@@ -443,7 +513,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
       \edef\CJKpunct@temp{\csname CJKpunct@pn@\CJK@enc @12\endcsname}
       \CJKpunct@cntc=0\relax
       \loop
-        \global\expandafter\edef\csname CJKpunct\CJKpunct@punctstyle
+        \global\expandafter\edef\csname CJKpunct\the\CJKpunct@cntc
           @\CJK@enc @\CJKpunct@family @kern\CJKpunct@temp @\CJKpunct@temp\endcsname{
             -0.\CJKpunct@decimal em}
         \advance \CJKpunct@cntc 1\relax
@@ -513,7 +583,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
   \fi}
 %    \end{macrocode}
 %
-%  设置相邻标点之间的距离
+%  璁剧疆鐩搁偦鏍囩偣涔嬮棿鐨勮窛绂�
 %
 %    \begin{macrocode}
 \def\CJKpunct@setkern#1#2{
@@ -535,7 +605,9 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
       \advance\CJKpunct@cnta -50\relax
     \or % banjiao
     \or % kaiming
-      \ifcsname CJKpunct@kaiming#1\endcsname
+      \ifcsname CJKpunct@kaiming\CJK@enc#1\endcsname
+        \advance\CJKpunct@cnta -\csname CJKpunct\CJKpunct@punctstyle @\CJK@enc
+          @\CJKpunct@family @roglue@#1\endcsname
         \ifcsname CJKpunct\CJKpunct@punctstyle @\CJK@enc @\CJKpunct@family @loglue@#2\endcsname
           \advance\CJKpunct@cnta -50\relax
         \fi
@@ -551,7 +623,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
   \fi}
 %    \end{macrocode}
 %
-% CJKfntef 宏包兼容命令：
+% CJKfntef 瀹忓寘鍏煎鍛戒护锛�
 %
 %    \begin{macrocode}
 
@@ -583,7 +655,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
   \fi}
 %    \end{macrocode}
 %
-%  设置相邻标点间是否允许换行（缺省不允许）。
+%  璁剧疆鐩搁偦鏍囩偣闂存槸鍚﹀厑璁告崲琛岋紙缂虹渷涓嶅厑璁革級銆�
 %
 %    \begin{macrocode}
 \def\CJKpunctallowbreakbetweenpuncts{
@@ -597,7 +669,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 \CJKpunctnobreakbetweenpuncts
 %    \end{macrocode}
 %
-% 标点符号样式：
+% 鏍囩偣绗﹀彿鏍峰紡锛�
 %
 %    \begin{macrocode}
 \def\CJKpunctstyle#1{
@@ -613,7 +685,6 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
       \let\CJKpunct@punctsymbol\CJKpunct@plainpunctsymbol
       \let\CJKsymbol\CJKosymbol
       \let\CJKpunctsymbol\CJKopunctsymbol
-      \let\CJKglue\CJKoglue
       \let\CJK@nobreakglue\CJKo@nobreakglue
       \let\CJKpunct@utfsymbol\CJKpunct@utfbsymbol
     \else
@@ -624,7 +695,6 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
       \let\CJKpunct@punctsymbol\CJKpunct@@punctsymbol
       \let\CJKsymbol\CJKpunct@CJKsymbol
       \let\CJKpunctsymbol\CJKpunct@CJKpunctsymbol
-      \let\CJKglue\relax
       \let\CJK@nobreakglue\relax
       \let\CJKpunct@utfsymbol\CJKpunct@utfasymbol
     \fi
@@ -649,7 +719,7 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
 \let\CJKnormalout\relax
 %    \end{macrocode}
 %
-% 允许用户使用 \defmacro{CJKpunctsetkern} 调整相邻标点之间的距离
+% 鍏佽鐢ㄦ埛浣跨敤 \defmacro{CJKpunctsetkern} 璋冩暣鐩搁偦鏍囩偣涔嬮棿鐨勮窛绂�
 %
 %    \begin{macrocode}
 \def\CJKpunctsetkern#1#2#3{
@@ -669,12 +739,12 @@ CJKpunct is a LaTeX package for adjust spaces around full-width punctuation.
   \global\edef\CJKpunct@char@pn{\CJKpunct@charplane/\CJKpunct@charnumber}}}
 
 %
-% 标点符号表, 不能改变顺序!!
-% pre ‘“「『〔（［｛〈《〖【
-% post  —…、。，．：；！？％〕）］｝〉》〗】’”」』
+% 鏍囩偣绗﹀彿琛�, 涓嶈兘鏀瑰彉椤哄簭!!
+% pre 鈥樷�溿�屻�庛�旓紙锛伙經銆堛�娿�栥��
+% post  鈥斺�︺�併�傦紝锛庯細锛涳紒锛燂紖銆曪級锛斤綕銆夈�嬨�椼�戔�欌�濄�嶃��
 %    \end{macrocode}
 %
-%  设置标点符号所对应 CJKplane 和 字符序号， 与编码有关。
+%  璁剧疆鏍囩偣绗﹀彿鎵�瀵瑰簲 CJKplane 鍜� 瀛楃搴忓彿锛� 涓庣紪鐮佹湁鍏炽��
 %
 %    \begin{macrocode}
 \def\CJKpunct@punctlist#1{
@@ -713,7 +783,7 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 \def\CJKpunct@totalpuncts{35}
 %    \end{macrocode}
 %
-% 恢复 CJKutf8 重定义的引号
+% 鎭㈠ CJKutf8 閲嶅畾涔夌殑寮曞彿
 %
 %    \begin{macrocode}
 \ifcsname DeclareUnicodeCharacter\endcsname
@@ -727,22 +797,22 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 \def\CJKpunct@utfasymbol#1#2{
   \CJK@punctchar{\CJK@uniPunct}{0}{#1}{#2}}
 \def\CJKpunct@utfbsymbol#1#2{
-  \ifnum #2=148
+  \ifnum #2=148 %
     \textemdash
   \else
-    \ifnum #2=166
+    \ifnum #2=166 %
       \textellipsis
     \else
-      \ifnum #2=152
+      \ifnum #2=152 %
         \textquoteleft
       \else
-        \ifnum #2=153
+        \ifnum #2=153 %
           \textquoteright
         \else
-          \ifnum #2=156
+          \ifnum #2=156 %
             \textquotedblleft
           \else
-            \ifnum #2=157
+            \ifnum #2=157 %
               \textquotedblright
             \fi
           \fi
@@ -752,7 +822,7 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
   \fi}
 %    \end{macrocode}
 %
-% 省略号和破折号：
+% 鐪佺暐鍙峰拰鐮存姌鍙凤細
 %
 %    \begin{macrocode}
 \def\CJKpunct@setspecialpunct#1#2{
@@ -765,7 +835,7 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 \CJKpunct@setspecialpunct{C10}{01/12}
 %    \end{macrocode}
 %
-%  开明式中的全角标点。
+%  寮�鏄庡紡涓殑鍏ㄨ鏍囩偣銆�
 %
 %    \begin{macrocode}
 \def\CJKpunct@setkaimingpunct#1#2{
@@ -781,7 +851,7 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 \CJKpunct@setkaimingpunct{C10}{01/218}
 %    \end{macrocode}
 %
-% 缺省标点符号宽度
+% 缂虹渷鏍囩偣绗﹀彿瀹藉害
 %
 %    \begin{macrocode}
 \def\CJKpunct@def@spaces{69,18,60,6,63,2,63,3,69,8,69,6,69,1,39,%
@@ -789,33 +859,18 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 74,26,61,3,50,3,4,8,69,6,69,2,69,38,39,4,62,2,55,5,62,7,62,16,71,9,%
 58,3,62,3,62,,,}
 %    \end{macrocode}
-
 %
-% 调入字体相关的设置
+% 璋冨叆瀛椾綋鐩稿叧鐨勮缃�
 %
 %    \begin{macrocode}
-\IfFileExists{CJKpunct.spa}{\input{CJKpunct.spa}}{}
+\InputIfFileExists{CJKpunct.spa}{}{}
 
 \endlinechar `\^^M
 %    \end{macrocode}
 %
-%
-%
 % \iffalse
 %</CJKpunct>
 % \fi
-
-
-%
-% \Finale
 %
-% \typeout{*************************************************************}
-% \typeout{*}
-% \typeout{* To finish the installation you have to move the following}
-% \typeout{* files into a directory searched by LaTeX:}
-% \typeout{*}
-% \typeout{* \space\space\space  CJKpunct.sty}
-% \typeout{*}
-% \typeout{*************************************************************}
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.ins b/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.ins
new file mode 100644
index 00000000000..724c71ab469
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cjkpunct/CJKpunct.ins
@@ -0,0 +1,111 @@
+%%
+%% This is file `CJKpunct.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% CJKpunct.dtx  (with options: `batchfile')
+%% 
+%%     Copyright (C) 2003--2010 by Linbo Zhang <zlb@lsec.cc.ac.cn>
+%%     Copyright (C) 2003--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
+%%     Copyright (C) 2010 by Leo Liu <leoliu.pku@gmail.com>
+%%     Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+%% --------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainer of this work is Qing Lee.
+%% 
+%% --------------------------------------------------------------------------
+%% 
+
+\input docstrip %
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+    Copyright (C) 2003--2010 by Linbo Zhang <zlb@lsec.cc.ac.cn>
+    Copyright (C) 2003--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
+    Copyright (C) 2010 by Leo Liu <leoliu.pku@gmail.com>
+    Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+--------------------------------------------------------------------------
+
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
+
+    This work has the LPPL maintenance status `maintained'.
+
+    The Current Maintainer of this work is Qing Lee.
+
+--------------------------------------------------------------------------
+
+\endpreamble
+\postamble
+
+    This package consists of the files CJKpunct.dtx,
+                                       CJKpunct.spa,
+                                       setpunct-main.tex,
+                                       setpunct-macros.tex,
+                                       example-CJKfntef.tex,
+                                       example-gb.tex,
+                                       example-gbk.tex,
+                                       example-utf8.tex,
+                                       README.txt,
+                 and the derived files CJKpunct.sty,
+                                       CJKpunct.pdf,
+                                       CJKpunct.ins, and
+                                       README.md (this file).
+\endpostamble
+
+\generate
+  {
+    \usedir{tex/latex/cjkpunct}
+    \file{CJKpunct.sty} {\from{\jobname.dtx}{CJKpunct}}
+    \usedir{doc/latex/cjkpunct}
+    \nopreamble\nopostamble
+    \file{README.md}    {\from{\jobname.dtx}{readme}}
+  }
+\Msg{*************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* files into a directory searched by LaTeX:}
+\Msg{*}
+\Msg{* \space\space\space  CJKpunct.sty}
+\Msg{*}
+\Msg{*************************************************************}
+\endbatchfile
+%% 
+%%     This package consists of the files CJKpunct.dtx,
+%%                                        CJKpunct.spa,
+%%                                        setpunct-main.tex,
+%%                                        setpunct-macros.tex,
+%%                                        example-CJKfntef.tex,
+%%                                        example-gb.tex,
+%%                                        example-gbk.tex,
+%%                                        example-utf8.tex,
+%%                                        README.txt,
+%%                  and the derived files CJKpunct.sty,
+%%                                        CJKpunct.pdf,
+%%                                        CJKpunct.ins, and
+%%                                        README.md (this file).
+%%
+%% End of file `CJKpunct.ins'.
diff --git a/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.spa b/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa
index e02cae56021..f5d5fef42e2 100644
--- a/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.spa
+++ b/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa
@@ -1,2 +1 @@
 \relax
-
diff --git a/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.sty b/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.sty
index 759da8b9554..f09fe245e15 100644
--- a/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.sty
+++ b/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.sty
@@ -6,17 +6,30 @@
 %%
 %% CJKpunct.dtx  (with options: `CJKpunct')
 %% 
-%%  Version 4.8.2 (06-May-2009)
+%%     Copyright (C) 2003--2010 by Linbo Zhang <zlb@lsec.cc.ac.cn>
+%%     Copyright (C) 2003--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
+%%     Copyright (C) 2010 by Leo Liu <leoliu.pku@gmail.com>
+%%     Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+%% --------------------------------------------------------------------------
 %% 
-%%  This is the file CJKpunct.sty for the CJK package
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
 %% 
-%%  Authors:
-%%             Linbo Zhang (zlb@lsec.cc.ac.cn)
-%%             Wenchang Sun (sunwch@nankai.edu.cn)
+%%     This work has the LPPL maintenance status `maintained'.
 %% 
+%%     The Current Maintainer of this work is Qing Lee.
 %% 
-\def\fileversion{4.8.2}
-\def\filedate{2009/05/06}
+%% --------------------------------------------------------------------------
+%% 
+\def\fileversion{4.8.4}
+\def\filedate{2016/05/14}
 \ProvidesPackage{CJKpunct}[\filedate\space\fileversion]
 \endlinechar \m@ne
 
@@ -122,7 +135,7 @@
   \ifcsname \CJK@enc @\CJK@family @\f@series @\f@shape\endcsname
     \global\edef\CJKpunct@family{\csname \CJK@enc @\CJK@family @\f@series @\f@shape\endcsname}
   \else
-    \edef\CJKpunct@family{\CJK@family}
+    \global\edef\CJKpunct@family{\CJK@family}
   \fi}
 
 \def\CJKpunctmapfamily#1#2#3#4#5{
@@ -193,7 +206,7 @@
       \edef\CJKpunct@temp{\csname CJKpunct@pn@\CJK@enc @12\endcsname}
       \CJKpunct@cntc=0\relax
       \loop
-        \global\expandafter\edef\csname CJKpunct\CJKpunct@punctstyle
+        \global\expandafter\edef\csname CJKpunct\the\CJKpunct@cntc
           @\CJK@enc @\CJKpunct@family @kern\CJKpunct@temp @\CJKpunct@temp\endcsname{
             -0.\CJKpunct@decimal em}
         \advance \CJKpunct@cntc 1\relax
@@ -280,7 +293,9 @@
       \advance\CJKpunct@cnta -50\relax
     \or % banjiao
     \or % kaiming
-      \ifcsname CJKpunct@kaiming#1\endcsname
+      \ifcsname CJKpunct@kaiming\CJK@enc#1\endcsname
+        \advance\CJKpunct@cnta -\csname CJKpunct\CJKpunct@punctstyle @\CJK@enc
+          @\CJKpunct@family @roglue@#1\endcsname
         \ifcsname CJKpunct\CJKpunct@punctstyle @\CJK@enc @\CJKpunct@family @loglue@#2\endcsname
           \advance\CJKpunct@cnta -50\relax
         \fi
@@ -434,22 +449,22 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 \def\CJKpunct@utfasymbol#1#2{
   \CJK@punctchar{\CJK@uniPunct}{0}{#1}{#2}}
 \def\CJKpunct@utfbsymbol#1#2{
-  \ifnum #2=148
+  \ifnum #2=148 %
     \textemdash
   \else
-    \ifnum #2=166
+    \ifnum #2=166 %
       \textellipsis
     \else
-      \ifnum #2=152
+      \ifnum #2=152 %
         \textquoteleft
       \else
-        \ifnum #2=153
+        \ifnum #2=153 %
           \textquoteright
         \else
-          \ifnum #2=156
+          \ifnum #2=156 %
             \textquotedblleft
           \else
-            \ifnum #2=157
+            \ifnum #2=157 %
               \textquotedblright
             \fi
           \fi
@@ -480,11 +495,22 @@ ff/61,ff/93,30/9,30/11,30/23,30/17,20/25,20/29,30/13,30/15,,
 37,63,4,56,2,63,5,63,6,6,6,12,11,23,50,24,54,16,71,20,69,12,76,13,%
 74,26,61,3,50,3,4,8,69,6,69,2,69,38,39,4,62,2,55,5,62,7,62,16,71,9,%
 58,3,62,3,62,,,}
-
-\IfFileExists{CJKpunct.spa}{\input{CJKpunct.spa}}{}
+\InputIfFileExists{CJKpunct.spa}{}{}
 
 \endlinechar `\^^M
-
-\endinput
+%% 
+%%     This package consists of the files CJKpunct.dtx,
+%%                                        CJKpunct.spa,
+%%                                        setpunct-main.tex,
+%%                                        setpunct-macros.tex,
+%%                                        example-CJKfntef.tex,
+%%                                        example-gb.tex,
+%%                                        example-gbk.tex,
+%%                                        example-utf8.tex,
+%%                                        README.txt,
+%%                  and the derived files CJKpunct.sty,
+%%                                        CJKpunct.pdf,
+%%                                        CJKpunct.ins, and
+%%                                        README.md (this file).
 %%
 %% End of file `CJKpunct.sty'.