summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/kpfonts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-21 00:45:43 +0000
committerKarl Berry <karl@freefriends.org>2010-04-21 00:45:43 +0000
commit13a1b77d4429aa5a43bdecc939caeb7b3e9fb7e3 (patch)
tree0ccc056349df4ba88c6930f4e6bfe456b7e7104e /Master/texmf-dist/tex/latex/kpfonts
parentedcc3c1b2eb18211ca8dc6a19e86f8e5d397aaf1 (diff)
kpfonts 3.3 (20apr10)
git-svn-id: svn://tug.org/texlive/trunk@17947 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/kpfonts')
-rw-r--r--Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty51
1 files changed, 42 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty b/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty
index c3e49b8ad99..aa696a563cc 100644
--- a/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty
+++ b/Master/texmf-dist/tex/latex/kpfonts/kpfonts.sty
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}
%
\ProvidesPackage{kpfonts}
- [ 2010/03/03 v3.2]
+ [ 2010/04/20 v3.3]
\newif\ifkp@math \kp@mathtrue
\newif\ifkp@text \kp@texttrue
@@ -19,7 +19,8 @@
\newif\ifkp@osm
\newif\ifkp@vos
\newif\ifkp@vosm
-\newif\ifkp@light
+\newif\ifkp@lighttext
+\newif\ifkp@lightmath
\newif\ifkp@rmx
\newif\ifkp@warning \kp@warningtrue
\newif\ifkp@amsmath \kp@amsmathtrue
@@ -34,6 +35,7 @@
\newif\ifkp@sfmath
\newif\ifkp@sfmathbb
\newif\ifkp@rmmathbb
+\newif\ifkp@easyscsl
\DeclareOption{nomath} {\kp@mathfalse}
\DeclareOption{notext} {\kp@textfalse}
@@ -57,7 +59,9 @@
\DeclareOption{veryoldstyle} {\kp@vostrue\kp@Qtailtrue}
\DeclareOption{veryoldstylemath} {\kp@vosmtrue}
\DeclareOption{fullveryoldstyle} {\kp@vostrue\kp@vosmtrue\kp@Qtailtrue}
-\DeclareOption{light} {\kp@lighttrue}
+\DeclareOption{light} {\kp@lighttexttrue\kp@lightmathtrue}
+\DeclareOption{lighttext} {\kp@lighttexttrue}
+\DeclareOption{lightmath} {\kp@lightmathtrue}
\DeclareOption{rmx} {\kp@rmxtrue}
\DeclareOption{nowarning} {\kp@warningfalse}
\DeclareOption{noamsmath} {\kp@amsmathfalse}
@@ -65,6 +69,7 @@
\DeclareOption{narrowiints} {\kp@narrowiintstrue}
\DeclareOption{partialup} {\kp@partialuptrue}
\DeclareOption{largesmallcaps} {\kp@largesmallcapstrue}
+\DeclareOption{easyscsl} {\kp@easyscsltrue}
\DeclareOption{noDcommand} {\kp@Dcommandfalse}
\DeclareOption{nofligatures} {\kp@nofligaturestrue}
\DeclareOption{widermath} {\kp@widermathtrue}
@@ -86,8 +91,9 @@
\ExecuteOptions{nointlimits,sumlimits}
\ProcessOptions\relax
-\ifkp@textcomp\RequirePackage[full]{textcomp}\fi
-\ifkp@amsmath\RequirePackage{amsmath}\fi
+\ifkp@text\ifkp@textcomp\RequirePackage[full]{textcomp}\fi\fi
+\ifkp@math\ifkp@amsmath\RequirePackage{amsmath}\fi\fi
+\ifkp@text\ifkp@easyscsl\RequirePackage{ifthen}\fi\fi
\renewcommand{\bfdefault}{b}
@@ -114,8 +120,8 @@
\ifkp@sfmathbb\ifkp@rmmathbb
\kp@sfmathbbfalse\kp@rmmathbbfalse
- \PackageWarning{kpfonts}%
- {'sfmathbb' and 'rmmathbb' are incompatible and ignored}
+ \PackageError{kpfonts}%
+ {'sfmathbb' and 'rmmathbb' options are incompatible and ignored}
\fi\fi
%%%%%%%%
@@ -138,13 +144,35 @@
'Ng', 'Thorn', 'thorn' and 'eth' are unavailable.}
%%% To prevent this warning, use the 'nowarning' option %%%
\fi % end vos
+ \ifkp@easyscsl
+%%% To prevent this warning, use the 'nowarning' option %%%
+ \PackageWarning{kpfonts}%
+ {With 'easyscsl' option, don't fit together\MessageBreak
+ \textsl or \slshape and \textsc or \scshape\MessageBreak
+ with non 'kpfonts' fonts.}
+%%% To prevent this warning, use the 'nowarning' option %%%
+ \fi % end vos
\fi % end warning
%
+%%% easyscsl, courtesy from François Pétiard
+%
+ \ifkp@easyscsl
+ \renewcommand{\itshape}{\not@math@alphabet\itshape\mathit%
+ \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{%
+ \fontshape\itdefault}\selectfont}
+ \renewcommand{\scshape}{\not@math@alphabet\scshape\relax%
+ \ifthenelse{\equal{\f@shape}{\sldefault}}{\fontshape{scsl}}{%
+ \ifthenelse{\equal{\f@shape}{\itdefault}}{\fontshape{scsl}}{\fontshape\scdefault}}\selectfont}
+ \renewcommand{\slshape}{\not@math@alphabet\slshape\relax%
+ \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{%
+ \fontshape\sldefault}\selectfont}
+ \fi
+%
%%% famille, petitesmajuscules, style, f-ligatures and Q tail
%
\ifkp@rmx\def\kp@famille{x}
\else
- \ifkp@light\def\kp@famille{l}
+ \ifkp@lighttext\def\kp@famille{l}
\else\def\kp@famille{}
\fi\fi
\ifkp@vos\def\kp@style{vos}
@@ -277,7 +305,7 @@
%%% \kp@famillem \kp@stylem and \kp@widerm
%
- \ifkp@light\def\kp@famillem{l}
+ \ifkp@lightmath\def\kp@famillem{l}
\else\def\kp@famillem{}
\fi
@@ -339,11 +367,16 @@
\SetMathAlphabet{\mathrm}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
\SetMathAlphabet{\mathrm}{sf}{OT1}{jkp\kp@fligm\kp@stylem}{m}{n}
\SetMathAlphabet{\mathrm}{boldsf}{OT1}{jkp\kp@fligm\kp@stylem}{b}{n}
+
+ \DeclareSymbolFontAlphabet{\mathupright}{operators}
+ \let\mathup\mathupright
\ifkp@sfmath
\DeclareMathAlphabet{\mathbf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n}
\else
\DeclareMathAlphabet{\mathbf}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
+ \SetMathAlphabet{\mathbf}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
\fi
\SetMathAlphabet{\mathbf}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}
\SetMathAlphabet{\mathbf}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n}