diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty index e5217b92a24..03d19d2e595 100644 --- a/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty +++ b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty @@ -1,5 +1,5 @@ %% nfssext-cfr.sty -%% Additions and changes are copyright 2010 Clea F. Rees +%% Additions and changes are copyright 2017 Clea F. Rees %% Code from nfssext.sty copyright 2003 Philipp Lehman (see below) % % This work may be distributed and/or modified under the @@ -11,23 +11,27 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is Clea F. Rees. % % This work consists of the file nfssext-cfr.sty. % -% The file nfssext-cfr.sty is a derived work under the terms of the -% LPPL. It is based on version 1.2 of nfssext.sty which is part of The -% Font Installation Guide by Philipp Lehman. A copy of the The Font -% Installation Guide, including the unmodified version of nfssext.sty -% is available from +% The file nfssext-cfr.sty is a derived work under the terms of the +% LPPL. It is based on version 1.2 of nfssext.sty which is part of The +% Font Installation Guide by Philipp Lehman. A copy of the The Font +% Installation Guide, including the unmodified version of nfssext.sty +% is available from % http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=fontinstallationguide. % nfssext.sty is part of the included archive figuide-examples.tar.gz % which consists of examples and templates released under the LPPL. % nfssext.sty is included in the files for tutorials 3, 5 and 6. % +% 2017-03-28: modify \tmstyle and \tvstyle to unmerge sans and other +% typewriter before mergining appropriate variant +% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{nfssext-cfr}[2010/07/17 specially mangled by cfr; based on 2003/03/14 v1.2 Experimental NFSS Extensions] +\RequirePackage{svn-prov} +\ProvidesPackageSVN{$Id: nfssext-cfr.sty 6140 2017-03-28 18:07:31Z cfrees $}[\revinfo{} specially mangled by cfr; based on 2003/03/14 v1.2 Experimental NFSS Extensions] %:cfr-added: use ifthen \RequirePackage{ifthen} %:end-added @@ -122,7 +126,7 @@ \gdef\set{0,1,2,a,d,e,f,h,j,l,p,q,s,t,v,w}% these are the variants to consider - the order here and in the font name is crucial \ifx\tempo\exfs@tempf \@for \xx:=\set \do {% - % check whether there are variants left - if not set the ``next variant'' to empty + % check whether there are variants left - if not set the ``next variant'' to empty \ifx\tempa\@empty \let\exfs@tempn\@empty \else @@ -186,7 +190,7 @@ \fi \fi \fi - \fi + \fi }% \fi \fi @@ -238,12 +242,16 @@ \DeclareRobustCommand{\swashstyle}{% an attempt to improve on \swstyle \not@math@alphabet\swashstyle\relax \exfs@merge@families{w}} -\DeclareRobustCommand{\tmstyle}{% monowidth typewriter - \not@math@alphabet\tmstyle\relax - \exfs@merge@families{t}} -\DeclareRobustCommand{\tvstyle}{% variable width typewriter - \not@math@alphabet\tvstyle\relax - \exfs@merge@families{v}} +\DeclareRobustCommand{\tmstyle}{% monowidth typewriter + \not@math@alphabet\tmstyle\relax + \exfs@unmerge@families{s}% + \exfs@unmerge@families{v}% + \exfs@merge@families{t}} +\DeclareRobustCommand{\tvstyle}{% variable width typewriter + \not@math@alphabet\tvstyle\relax + \exfs@unmerge@families{s}% + \exfs@unmerge@families{t}% + \exfs@merge@families{v}} %:cfr-added - unmerge families \newcounter{taken}% \newcommand*\exfs@unmerge@families[1]{% @@ -435,7 +443,7 @@ \newcommand*{\uxdefault}{ux} \DeclareRobustCommand{\uxwidth}{% \not@math@alphabet\uxwidth\relax - \exfs@merge@width{\uxdefault}} + \exfs@merge@width{\uxdefault}} %:cfr-added merge weight changes into series \newcommand*{\exfs@merge@weight}[1]{% \edef\exfs@tempg{#1}% |