cjkpunct (14may16)

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

7 files changed, 75 insertions, 36 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/CJKpunct.spa b/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.spa
deleted file mode 100644
index e02cae56021..00000000000
--- a/Master/texmf-dist/doc/latex/cjkpunct/CJKpunct.spa
+++ /dev/null
@@ -1,2 +0,0 @@
-\relax
-
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 {