From 8f8142eeb6b103d466ca6e76c88c5474477e9b6a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Nov 2011 22:55:02 +0000 Subject: everysel (29oct11) git-svn-id: svn://tug.org/texlive/trunk@24467 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ms/everysel.sty | 45 +++++++++++++++++------------ 1 file changed, 27 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ms') diff --git a/Master/texmf-dist/tex/latex/ms/everysel.sty b/Master/texmf-dist/tex/latex/ms/everysel.sty index 4bfc0791e17..8c81b819902 100644 --- a/Master/texmf-dist/tex/latex/ms/everysel.sty +++ b/Master/texmf-dist/tex/latex/ms/everysel.sty @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{everysel} - [2009/05/30 v1.1 EverySelectfont Package (MS)] + [2011/10/28 v1.2 EverySelectfont Package (MS)] %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -44,23 +44,6 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -%% -%% ==================================================================== -%% @LaTeX-style-file{ -%% author = {Martin Schr\"oder}, -%% version = "1.1", -%% date = "30 May 2009", -%% filename = "everysel.sty", -%% address = {Martin Schr\"oder -%% Barmer Stra\"se 14 -%% 44137 Dortmund -%% Germany}, -%% telephone = "+49-231-1206574", -%% email = "martin@oneiros.de", -%% docstring = "LaTeX package which provides hooks into -%% \cs{selectfont}." -%% } -%% ==================================================================== \newcommand{\@EverySelectfont@EveryHook}{} \newcommand{\@EverySelectfont@AtNextHook}{} \newcommand*{\EverySelectfont}[1] @@ -68,6 +51,7 @@ \newcommand*{\AtNextSelectfont}[1] {\g@addto@macro\@EverySelectfont@AtNextHook{#1}} \newcommand*{\@EverySelectfont@Init}{% + \message{ABD: EverySelectfont initializing macros}% \@ifpackageloaded{tracefnt}{% \expandafter\CheckCommand\csname selectfont \endcsname{% \ifx\f@linespread\baselinestretch \else @@ -82,6 +66,22 @@ \enc@update }% }{% + \@ifpackageloaded{CJK}{% + \expandafter\CheckCommand\csname selectfont \endcsname{% + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip \fi + \xdef\font@name{% + \csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \expandafter\ifx\csname CJK@\curr@fontshape\endcsname \relax + \else + \CJK@bold@false + \csname CJK@\curr@fontshape\endcsname + \fi + \size@update + \enc@update}% + }{% \expandafter\CheckCommand\csname selectfont \endcsname{% \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi @@ -93,6 +93,7 @@ \enc@update }% }% + }% \DeclareRobustCommand{\selectfont}% {% \ifx\f@linespread\baselinestretch \else @@ -112,6 +113,14 @@ \ifnum \tracingfonts>\tw@ \@font@info{Switching to \font@name}\fi}% }{}% + \@ifpackageloaded{CJK}{% + \EverySelectfont{% + \expandafter\ifx\csname CJK@\curr@fontshape\endcsname \relax + \else + \CJK@bold@false + \csname CJK@\curr@fontshape\endcsname + \fi}% + }{}% \let\@EverySelectfont@Init\undefined } \AtBeginDocument{\@EverySelectfont@Init} -- cgit v1.2.3