Update of /var/cvs/cjk/texinput
In directory genba:/tmp/cvs-serv17364/texinput
Modified Files:
CJK.sty
Log Message:
Reimplement the \CJKbold mechanism to call the last argument of
\DeclareFontShape each time the font is selected only if a CJK size
function has been used. This fixes shape declarations like the ones
in the fourier package which rely on being called only once.
* texinput/CJK.sty ([EMAIL PROTECTED]@fontshape): New macro.
([EMAIL PROTECTED], [EMAIL PROTECTED], [EMAIL PROTECTED], [EMAIL PROTECTED],
[EMAIL PROTECTED]): Define a
macro where the name is the argument of [EMAIL PROTECTED]@fontshape.
(\selectfont): Execute macro where the name is the argument of
[EMAIL PROTECTED]@fontshape only if it exists.
* doc/history.txt, doc/CJK.txt: Mention it.
Index: CJK.sty
===================================================================
RCS file: /var/cvs/cjk/texinput/CJK.sty,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** CJK.sty 25 Apr 2006 18:37:54 -0000 1.27
--- CJK.sty 1 Sep 2006 06:12:11 -0000 1.28
***************
*** 562,566 ****
! % we now define a set of new size-functions:
% `CJK', `sCJK', `CJKfixed', and `sCJKfixed' are similar to `' (empty),
% `s', `fixed', and `sfixed' except that the value of [EMAIL PROTECTED] is
--- 562,566 ----
! % we now define a set of new size functions:
% `CJK', `sCJK', `CJKfixed', and `sCJKfixed' are similar to `' (empty),
% `s', `fixed', and `sfixed' except that the value of [EMAIL PROTECTED] is
***************
*** 589,592 ****
--- 589,594 ----
% to get a different internal macro name.
+ [EMAIL PROTECTED]@[EMAIL PROTECTED]@encoding/[EMAIL PROTECTED]/[EMAIL
PROTECTED]/[EMAIL PROTECTED]
+
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@[EMAIL PROTECTED]
***************
*** 611,615 ****
[EMAIL PROTECTED]@plane\space at [EMAIL PROTECTED]
[EMAIL PROTECTED]
! \csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]
[EMAIL PROTECTED]@[EMAIL PROTECTED]
--- 613,620 ----
[EMAIL PROTECTED]@plane\space at [EMAIL PROTECTED]
[EMAIL PROTECTED]
! \csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]
! \expandafter\global\expandafter\let
! \csname [EMAIL PROTECTED]@fontshape\expandafter\endcsname
! \csname [EMAIL PROTECTED]
[EMAIL PROTECTED]@[EMAIL PROTECTED]
***************
*** 630,634 ****
#1{External\space font\space [EMAIL PROTECTED]'\space loaded\space
for\space size\MessageBreak
! <[EMAIL PROTECTED]>}}
[EMAIL PROTECTED]@[EMAIL PROTECTED]
--- 635,642 ----
#1{External\space font\space [EMAIL PROTECTED]'\space loaded\space
for\space size\MessageBreak
! <[EMAIL PROTECTED]>}
! \expandafter\global\expandafter\let
! \csname [EMAIL PROTECTED]@fontshape\expandafter\endcsname
! \csname [EMAIL PROTECTED]
[EMAIL PROTECTED]@[EMAIL PROTECTED]
***************
*** 658,662 ****
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@font
! [EMAIL PROTECTED]@correction}
% the following size functions are needed for the DNP fonts in JIS encoding.
--- 666,673 ----
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@font
! [EMAIL PROTECTED]@correction
! \expandafter\global\expandafter\let
! \csname [EMAIL PROTECTED]@fontshape\expandafter\endcsname
! \csname [EMAIL PROTECTED]
% the following size functions are needed for the DNP fonts in JIS encoding.
***************
*** 674,678 ****
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]
! \csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]
[EMAIL PROTECTED]
--- 685,692 ----
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]
! \csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]
! \expandafter\global\expandafter\let
! \csname [EMAIL PROTECTED]@fontshape\expandafter\endcsname
! \csname [EMAIL PROTECTED]
[EMAIL PROTECTED]
***************
*** 684,688 ****
[EMAIL PROTECTED]@[EMAIL PROTECTED] at [EMAIL PROTECTED]
[EMAIL PROTECTED]
! \csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]
--- 698,705 ----
[EMAIL PROTECTED]@[EMAIL PROTECTED] at [EMAIL PROTECTED]
[EMAIL PROTECTED]
! \csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]
! \expandafter\global\expandafter\let
! \csname [EMAIL PROTECTED]@fontshape\expandafter\endcsname
! \csname [EMAIL PROTECTED]
***************
*** 696,700 ****
\fi}
{\expandafter% % CJK extension
! \ifx\csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED] \relax
[EMAIL PROTECTED]
\else
--- 713,717 ----
\fi}
{\expandafter% % CJK extension
! \ifx\csname [EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED] \relax
[EMAIL PROTECTED]
\else
***************
*** 704,710 ****
% the other LaTeX2e command we must redefine is \selectfont. It will
! % now reset [EMAIL PROTECTED]@ and calls [EMAIL PROTECTED] additionally to
! % execute the loading-setting parameter of \DeclareFontShape each time
! % we switch to this font.
\DeclareRobustCommand{\selectfont}{
--- 721,728 ----
% the other LaTeX2e command we must redefine is \selectfont. It will
! % now reset [EMAIL PROTECTED]@ and calls [EMAIL PROTECTED]@fontshape
additionally
! % (if it exists) to execute the loading-setting parameter of
! % \DeclareFontShape each time we switch to this font.
! % [EMAIL PROTECTED]@fontshape has been defined by the above size
functions.
\DeclareRobustCommand{\selectfont}{
***************
*** 716,721 ****
[EMAIL PROTECTED]
[EMAIL PROTECTED]
! [EMAIL PROTECTED]@false% % CJK extension
! \csname [EMAIL PROTECTED] % CJK extension
[EMAIL PROTECTED]
[EMAIL PROTECTED]
--- 734,743 ----
[EMAIL PROTECTED]
[EMAIL PROTECTED]
! \expandafter% % CJK extension
! \ifx\csname [EMAIL PROTECTED]@fontshape\endcsname \relax
! \else
! [EMAIL PROTECTED]@false
! \csname [EMAIL PROTECTED]@fontshape\endcsname
! \fi
[EMAIL PROTECTED]
[EMAIL PROTECTED]
_______________________________________________
Cjk-commit maillist - [email protected]
http://lists.ffii.org/mailman/listinfo/cjk-commit
