diff options
author | Karl Berry <karl@freefriends.org> | 2015-06-18 23:16:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-06-18 23:16:06 +0000 |
commit | 0dab54f456cb3cdc9da2762f1fa4ca773990d91c (patch) | |
tree | 07800ae737fd590124b595c59dcabe83c033ccd7 /Master | |
parent | 81ccdf4899b67502d2a5ad912bd16bb44bff6caf (diff) |
nfssext-cfr (18jun15)
git-svn-id: svn://tug.org/texlive/trunk@37601 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/nfssext-cfr/README | 28 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf | bin | 159104 -> 155942 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty | 31 |
4 files changed, 78 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/README b/Master/texmf-dist/doc/latex/nfssext-cfr/README index df00bf87912..10ba8c96609 100644 --- a/Master/texmf-dist/doc/latex/nfssext-cfr/README +++ b/Master/texmf-dist/doc/latex/nfssext-cfr/README @@ -1,8 +1,26 @@ -nfssext-cfr.sty is an extension of Philipp Lehman's nfssext.sty. nfssext.sty provides commands which enable one to specify font features not covered by the New Font Selection Scheme of LaTeX-2e. nfssext-cfr.sty provides additional commands, further extending the facilities offered by NFSS. +nfssext-cfr.sty is an extension of Philipp Lehman's nfssext.sty. nfssext.sty +provides commands which enable one to specify font features not covered by +the New Font Selection Scheme of LaTeX-2e. nfssext-cfr.sty provides +additional commands, further extending the facilities offered by NFSS. -nfssext-cfr.sty is required by various font support packages I've written. It is being released separately to avoid unnecessary duplication and confusion. At least, I hope it will remove at least one source of unnecessary confusion. I have no reason to think it will avoid any of the others. +nfssext-cfr.sty is required by various font support packages I've written. +It is being released separately to avoid unnecessary duplication and +confusion. At least, I hope it will remove at least one source of unnecessary +confusion. I have no reason to think it will avoid any of the others. -The code is highly experimental. It works for me. So far. If you discover problems, please let me know. If you know how to fix them, even better. +The code is somewhat experimental. It works for me. So far. If you discover +problems, please let me know. If you know how to fix them, even better. -- Clea F. Rees (cfrees <at> imapmail <dot> org) -2008/12/21 +The 2010 update includes an attempt to improve the behaviour of \ofstyle, and to +add support for microtype. I didn't publish this at the time because I wanted +to test it first. I have just discovered that I am still using a local copy. +Insofar as one person can test something, I figure that 5 years ought to be +enough to pick up the most obvious problems. However, your kilometres may, as +always, vary. + +There should be no changes for the end user except that in certain cases it is +possible that line-breaks may be altered if microtype is in use due to the +enhanced support included for variant font families. + +- Clea F. Rees (ReesC21 <at> cardiff <dot> ac <dot> uk) +2015/06/18 diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf Binary files differindex f9043a1f623..6aa283e0eed 100644 --- a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf +++ b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex index c1dd9873df1..3fb1e071c3c 100644 --- a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex +++ b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex @@ -1,32 +1,50 @@ +% !TEX TS-program = pdflatex +% !TEX encoding = UTF-8 Unicode +% arara: pdflatex: { synctex: true } +\pdfminorversion=7 \documentclass[pagesize=auto, fontsize=14pt, DIV=11]{scrartcl} \usepackage{fixltx2e} -\usepackage{etex} -\usepackage{lmodern} -\usepackage[T1]{fontenc} +\usepackage{cfr-lm} \usepackage{textcomp} \usepackage{microtype} -\usepackage{hyperref} -\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}} +\newcommand*{\mail}[1]{\texttt{#1}} \newcommand*{\pkg}[1]{\mbox{\textsf{#1}}} \addtokomafont{title}{\rmfamily} \title{The \pkg{nfssext-cfr} package} -\author{Clea F. Rees\thanks{\mail{cfrees@imapmail.org}}} -\date{2008/12/21} +\author{Clea F. Rees\thanks{\mail{ReesC21 <at> cardiff <dot> ac <dot> uk}}} +\date{2010/07/17} \begin{document} -\maketitle +\maketitle\thispagestyle{empty} \noindent -\pkg{nfssext-cfr.sty} is an extension of Philipp Lehman's \pkg{nfssext.sty}\@. \pkg{nfssext.sty} provides commands which enable one to specify font features not covered by the New Font Selection Scheme of \LaTeXe\@. \pkg{nfssext-cfr.sty} provides additional commands, further extending the facilities offered by NFSS. - -\pkg{nfssext-cfr.sty} is required by various font support packages I've written. It is being released separately to avoid unnecessary duplication and confusion. At least, I hope it will remove at least one source of unnecessary confusion. I have no reason to think it will avoid any of the others. - -The code is highly experimental. It works for me. So far. If you discover problems, please let me know. If you know how to fix them, even better. +\pkg{nfssext-cfr} is an extension of Philipp Lehman's \pkg{nfssext}\@. +\pkg{nfssext} provides commands which enable one to specify font features not covered by the New Font Selection Scheme of \LaTeXe\@. +\pkg{nfssext-cfr} provides additional commands, further extending the facilities offered by NFSS. + +\pkg{nfssext-cfr} is required by various font support packages I've written. +It is being released separately to avoid unnecessary duplication and confusion. +At least, I hope it will remove at least one source of unnecessary confusion. +I have no reason to think it will avoid any of the others. + +The code is somewhat experimental. +It works for me. +So far. +If you discover problems, please let me know. +If you know how to fix them, even better. + +The 2010 update includes an attempt to improve the behaviour of \verb|\ofstyle|, and to add support for \pkg{microtype}. +I didn't publish this at the time because I wanted to test it first. +I have just discovered that I am still using a local copy. +Insofar as one person can test something, I figure that 5 years ought to be enough to pick up the most obvious problems. +However, your kilometres may, as always, vary. + +There should be no changes for the end user except that in certain cases it is possible that line-breaks may be altered if \pkg{microtype} is in use due to the enhanced support included for variant font families. \end{document} 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 c508efaf359..e5217b92a24 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 2008 Clea F. Rees +%% Additions and changes are copyright 2010 Clea F. Rees %% Code from nfssext.sty copyright 2003 Philipp Lehman (see below) % % This work may be distributed and/or modified under the @@ -27,13 +27,13 @@ % nfssext.sty is included in the files for tutorials 3, 5 and 6. % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{nfssext-cfr}[2008/11/08 specially mangled by cfr; based on 2003/03/14 v1.2 Experimental NFSS Extensions] -%:cfr-added +\ProvidesPackage{nfssext-cfr}[2010/07/17 specially mangled by cfr; based on 2003/03/14 v1.2 Experimental NFSS Extensions] +%:cfr-added: use ifthen \RequirePackage{ifthen} %:end-added \newcommand*{\exfs@tempa}{} \newcommand*{\exfs@tempb}{} -%:cfr-added +%:cfr-added: extra variable (\exfs@tempf) \newcommand*{\exfs@tempf}{} %:end-added \newcommand*{\exfs@try@family}[2][]{% @@ -81,7 +81,7 @@ \exfs@tempa} %:end-added \def\exfs@get@base#1#2#3#4\@nil{#1#2#3} -%:cfr-added +%:cfr-added:more \exfs@ commands (get@variants, next, shift, first, part, second) \def\exfs@get@variants#1#2#3#4\@nil{#4} \def\exfs@next#1#2\@nil{#1} \def\exfs@shift#1#2\@nil{#2} @@ -119,7 +119,7 @@ \edef\exfs@tempq{\exfs@tempf}% \addedtrue \else - \gdef\set{0,1,2,a,d,e,f,h,j,l,p,q,s,t,v,w}% + \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 @@ -212,6 +212,10 @@ \DeclareRobustCommand{\ltstyle}{% \not@math@alphabet\ltstyle\relax \exfs@merge@families{l}} +%let's hope there aren't any fonts with a light family *and* an outline/openface/blank version +\DeclareRobustCommand{\ofstyle}{% + \not@math@alphabet\ofstyle\relax + \exfs@merge@families{l}} \DeclareRobustCommand{\altstyle}{% alternative style \not@math@alphabet\altstyle\relax \exfs@merge@families{a}} @@ -507,7 +511,7 @@ %\DeclareRobustCommand{\scshape}{% % \not@math@alphabet\scshape\relax % \exfs@merge@shape{\scdefault}{\itdefault}{\sidefault}} -%:cfr-altered +%:cfr-altered: \scshape \DeclareRobustCommand{\scshape}{% \not@math@alphabet\scshape\relax \def\tempu{u}% @@ -543,6 +547,7 @@ %:families \DeclareTextFontCommand{\textti}{\tistyle} \DeclareTextFontCommand{\textlt}{\ltstyle} +\DeclareTextFontCommand{\textof}{\ofstyle} % open-face (or outline or blank) style \DeclareTextFontCommand{\textalt}{\altstyle} % alternative style \DeclareTextFontCommand{\textreg}{\regstyle} % ``regular'' style \DeclareTextFontCommand{\emboss}{\embossstyle} @@ -613,4 +618,16 @@ \selectfont\char\exfs@tempa \endgroup \fi} +%:add microtype hooks +%:partly from microtype docs; partly from MinionPro package +\def\nfssextcfr@MT@Hook{% +% \DeclareMicrotypeVariants{x,j,w,a,d,0,1}% this is the default declaration according to the docs +% \DeclareMicrotypeVariants*{2,e,h,l}% this should *append* the variants (what do I use 'f' for? better take it out...) + \DeclareMicrotypeVariants*{2,2d,2dj,2j,dj,e,h,l}% is this necessary or would the previous line be enough? + } +\@ifpackageloaded{microtype}{% + \nfssextcfr@MT@Hook}{% + \@ifundefined{Microtype@Hook}{% + \let\Microtype@Hook\nfssextcfr@MT@Hook}{% MinionPro has \global before this + \g@addto@macro\Microtype@Hook{\nfssextcfr@MT@Hook}}} \endinput |