cjk

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

1 files changed, 9 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty
index 12cfe84bcbe..1564efdb24a 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty
@@ -3,9 +3,9 @@
 %
 % created by Werner Lemberg <wl@gnu.org>
 %
-% Version 4.8.3 (07-May-2012)
+% Version 4.8.4 (18-Apr-2015)
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
 % MA 02110-1301 USA
 
 \NeedsTeXFormat{LaTeX2e}[2001/06/01]
-\def\fileversion{4.8.3}
-\def\filedate{2012/05/07}
+\def\fileversion{4.8.4}
+\def\filedate{2015/04/18}
 \ProvidesPackage{CJK}[\filedate\space\fileversion]
 
 \RequirePackage{MULEenc}
@@ -255,7 +255,7 @@
      \def\CJKtemp{\csname\CJK@tempa\endcsname}
    \fi
 
-   \ifCJK@CJK@
+   \ifCJK@latin@
      \CJKtemp
    \else
      \expandafter\CJK@testInList\expandafter\CJK@uniPunct
@@ -847,9 +847,9 @@
 
 \let\nbs \nobreakspace
 
-\newcommand{\CJKtilde}{
+\DeclareRobustCommand{\CJKtilde}{
   \CJK@global\def~{\hspace{0.25em plus 0.125em minus 0.08em}\ignorespaces}}
-\newcommand{\standardtilde}{
+\DeclareRobustCommand{\standardtilde}{
   \CJK@global\def~{\nobreakspace{}}}
 
 
@@ -861,9 +861,9 @@
 %
 % the definitions are in MULEenc.sty also.
 
-\providecommand{\CJKspace}{
+\DeclareRobustCommand{\CJKspace}{
   \CJK@global\let\CJK@ignorespaces \@empty}
-\providecommand{\CJKnospace}{
+\DeclareRobustCommand{\CJKnospace}{
   \CJK@global\let\CJK@ignorespaces \ignorespaces}