From 1bafd95e83267f9e55b47de90fa004d4db84971d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 May 2016 22:02:50 +0000 Subject: cjkpunct (14may16) git-svn-id: svn://tug.org/texlive/trunk@41119 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa | 1 + Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.sty | 66 ++++++++++++++++------- 2 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa (limited to 'Master/texmf-dist/tex/latex/cjkpunct') diff --git a/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa b/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa new file mode 100644 index 00000000000..f5d5fef42e2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cjkpunct/CJKpunct.spa @@ -0,0 +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 +%% Copyright (C) 2003--2010 by Wenchang Sun +%% Copyright (C) 2010 by Leo Liu +%% Copyright (C) 2016 by Qing Lee +%% -------------------------------------------------------------------------- %% -%% 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'. -- cgit v1.2.3