diff options
author | Karl Berry <karl@freefriends.org> | 2013-01-29 23:19:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-01-29 23:19:21 +0000 |
commit | a25a8c55b8a289c149be5c0fcda73a387a52ef66 (patch) | |
tree | 08054c4261f361b9c6893a300f9b89f133b54945 /Master/texmf-dist/tex | |
parent | 322b1150e389c596e83a390c1f68359d7ee269db (diff) |
libertine
git-svn-id: svn://tug.org/texlive/trunk@28978 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/libertine/libertine.sty | 220 |
1 files changed, 176 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/latex/libertine/libertine.sty b/Master/texmf-dist/tex/latex/libertine/libertine.sty index 79c3185e3fe..0d51d92dba7 100644 --- a/Master/texmf-dist/tex/latex/libertine/libertine.sty +++ b/Master/texmf-dist/tex/latex/libertine/libertine.sty @@ -1,5 +1,5 @@ \ProvidesPackage{libertine}[% - 2012/12/27 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines.] + 2013/01/25 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines.] % with (partial) compatibilty with libertine-type1, biolinum-type1, % libertine, libertine-legacy and libertineotf packages @@ -15,47 +15,184 @@ \libertine@otffalse \fi\fi -\newif\iflibertine@sf \libertine@sffalse -\newif\iflibertine@rm \libertine@rmfalse -\newif\iflibertine@tt \libertine@ttfalse +\newif\iflibertine@sf \libertine@sftrue +\newif\iflibertine@rm \libertine@rmtrue +\newif\iflibertine@tt \libertine@tttrue % NEW \newif\iflibertine@sfdefault \libertine@sfdefaultfalse -\newif\iflibertine@lining \libertine@liningfalse -\newif\ifbiolinum@lining \biolinum@liningfalse -\newif\iflibertine@tabular \libertine@tabularfalse -\newif\ifbiolinum@tabular \biolinum@tabularfalse +\newif\iflibertine@lining \libertine@liningtrue % NEW +\newif\ifbiolinum@lining \biolinum@liningtrue % NEW +\newif\iflibertine@tabular \libertine@tabulartrue % NEW +\newif\ifbiolinum@tabular \biolinum@tabulartrue % NEW \newif\iflibertine@semibold \libertine@semiboldfalse -\DeclareOptionX{biolinum}{\libertine@sftrue} -\DeclareOptionX{sf}{\libertine@sftrue} -\DeclareOptionX{ss}{\libertine@sftrue} -\DeclareOptionX{libertine}{\libertine@rmtrue} -\DeclareOptionX{rm}{\libertine@rmtrue} -\DeclareOptionX{tt}{\libertine@tttrue} -\DeclareOptionX{mono}{\libertine@tttrue} -\DeclareOptionX{sfdefault}{\libertine@sftrue\libertine@sfdefaulttrue} -\DeclareOptionX{type1}{\libertine@otffalse} -\DeclareOptionX{nofontspec}{\libertine@otffalse} -\DeclareOptionX{lining}{\libertine@liningtrue\biolinum@liningtrue} -\DeclareOptionX{nf}{\libertine@liningtrue\biolinum@liningtrue} -\DeclareOptionX{lf}{\libertine@liningtrue\biolinum@liningtrue} -\DeclareOptionX{oldstyle}{\libertine@liningfalse\biolinum@liningfalse} -\DeclareOptionX{osf}{\libertine@liningfalse\biolinum@liningfalse} -\DeclareOptionX{sflining}{\biolinum@liningtrue} -\DeclareOptionX{sflf}{\biolinum@liningtrue} -\DeclareOptionX{sfoldstyle}{\biolinum@liningfalse} -\DeclareOptionX{sfosf}{\biolinum@liningfalse} -\DeclareOptionX{osfss}{\biolinum@liningfalse} -\DeclareOptionX{tabular}{\libertine@tabulartrue\biolinum@tabulartrue} -\DeclareOptionX{t}{\libertine@tabulartrue\biolinum@tabulartrue} -\DeclareOptionX{proportional}{\libertine@tabularfalse\biolinum@tabularfalse} -\DeclareOptionX{p}{\libertine@tabularfalse\biolinum@tabularfalse} -\DeclareOptionX{sftabular}{\biolinum@tabulartrue} -\DeclareOptionX{sft}{\biolinum@tabulartrue} -\DeclareOptionX{sfproportional}{\biolinum@tabularfalse} -\DeclareOptionX{sfp}{\biolinum@tabularfalse} -\DeclareOptionX{semibold}{\libertine@semiboldtrue} -\DeclareOptionX{sb}{\libertine@semiboldtrue} -\DeclareOptionX{bold}{\libertine@semiboldfalse} +\DeclareOptionX{biolinum}[true]{% +\@nameuse{if#1} + \libertine@sftrue\libertine@rmfalse +\fi +} +\DeclareOptionX{sf}[true]{% +\@nameuse{if#1} + \libertine@sftrue\libertine@rmfalse +\fi +} +\DeclareOptionX{ss}[true]{% +\@nameuse{if#1} + \libertine@sftrue\libertine@rmfalse +\fi +} +\DeclareOptionX{libertine}[true]{% +\@nameuse{if#1} + \libertine@rmtrue\libertine@sffalse +\fi +} +\DeclareOptionX{rm}[true]{% +\@nameuse{if#1} + \libertine@rmtrue\libertine@sffalse +\fi +} +\DeclareOptionX{tt}[true]{% +\@nameuse{libertine@tt#1} +\iflibertine@tt\PackageWarningNoLine{libertine}{% + *******************************************\MessageBreak + LibertineMono is now activated by default.\MessageBreak + *******************************************} +\fi +} +\DeclareOptionX{mono}[true]{% +\@nameuse{libertine@tt#1} +\iflibertine@tt\PackageWarningNoLine{libertine}{% + *******************************************\MessageBreak + LibertineMono is now activated by default.\MessageBreak + *******************************************} +\fi +} +\def\libertine@newfigdefaults{% +\PackageWarningNoLine{libertine}{% + ****************************************\MessageBreak + Figure defaults are now: lining, tabular; \MessageBreak + for options, see the documentation. \MessageBreak + ****************************************} +} +\DeclareOptionX{sfdefault}[true]{% +\@nameuse{if#1}\libertine@sftrue\libertine@sfdefaulttrue\fi +} +\DeclareOptionX{type1}[true]{% +\@nameuse{if#1}\libertine@otffalse\fi +} +\DeclareOptionX{nofontspec}[true]{% +\@nameuse{if#1}\libertine@otffalse\fi +} +\DeclareOptionX{lining}[true]{% +\@nameuse{libertine@lining#1} +\@nameuse{biolinum@lining#1} +\iflibertine@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{nf}[true]{% +\@nameuse{libertine@lining#1} +\@nameuse{biolinum@lining#1} +\iflibertine@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{lf}[true]{% +\@nameuse{libertine@lining#1} +\@nameuse{biolinum@lining#1} +\iflibertine@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{oldstyle}[true]{% +\@nameuse{if#1}% + \libertine@liningfalse\biolinum@liningfalse +\else + \libertine@liningtrue\biolinum@liningtrue +\fi +\iflibertine@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{osf}[true]{% +\@nameuse{if#1}% + \libertine@liningfalse\biolinum@liningfalse +\else + \libertine@liningtrue\biolinum@liningtrue +\iflibertine@lining\libertine@newfigdefaults\fi +\fi +} +\DeclareOptionX{sflining}[true]{% +\@nameuse{\biolinum@lining#1} +\ifbiolinum@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{sflf}[true]{% +\@nameuse{\biolinum@lining#1} +\ifbiolinum@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{sfoldstyle}[true]{% +\@nameuse{if#1}\biolinum@liningfalse\else\biolinum@liningtrue\fi +\ifbiolinum@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{sfosf}[true]{% +\@nameuse{if#1}\biolinum@liningfalse\else\biolinum@liningtrue\fi +\ifbiolinum@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{osfss}[true]{% +\@nameuse{if#1}\biolinum@liningfalse\else\biolinum@liningtrue\fi +\ifbiolinum@lining\libertine@newfigdefaults\fi +} +\DeclareOptionX{tabular}[true]{% +\@nameuse{libertine@tabular#1} +\@nameuse{biolinum@tabular#1} +\iflibertine@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{t}[true]{% +\@nameuse{libertine@tabular#1} +\@nameuse{biolinum@tabular#1} +\iflibertine@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{proportional}[true]{% +\@nameuse{if#1}% + \libertine@tabularfalse\biolinum@tabularfalse +\else + \libertine@tabulartrue\biolinum@tabulartrue +\fi +\iflibertine@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{p}[true]{% +\@nameuse{if#1}% + \libertine@tabularfalse\biolinum@tabularfalse +\else + \libertine@tabulartrue\biolinum@tabulartrue +\fi +\iflibertine@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{sftabular}[true]{% +\@nameuse{biolinum@tabular#1} +\ifbiolinum@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{sft}[true]{% +\@nameuse{biolinum@tabular#1} +\ifbiolinum@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{sfproportional}[true]{% +\@nameuse{if#1}% + \biolinum@tabularfalse +\else + \biolinum@tabulartrue +\fi +\ifbiolinum@tabular\libertine@newfigdefaults\fi +} +\DeclareOptionX{sfp}[true]{% +\@nameuse{if#1}% + \biolinum@tabularfalse +\else + \biolinum@tabulartrue +\fi +\ifbiolinum@tabular\libertine@newfigdefaults\fi +} + +\DeclareOptionX{semibold}[true]{% +\@nameuse{libertine@semibold#1} +} +\DeclareOptionX{sb}[true]{% +\@nameuse{libertine@semibold#1} +} +\DeclareOptionX{bold}[true]{% +\@nameuse{if#1}libertine@semiboldfalse\else\libertine@semiboldtrue\fi +} \newcommand*{\LinuxLibertineT@scale}{1} \newcommand*{\LinuxLibertineDisplayT@scale}{1} @@ -67,7 +204,6 @@ \DeclareOptionX{ttscaled}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}} \DeclareOptionX{ttscale}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}} -\ExecuteOptionsX{oldstyle,proportional,bold} \ProcessOptionsX\relax \iflibertine@otf @@ -133,10 +269,6 @@ \RequirePackage{fontenc,fontaxes} \fi -\iflibertine@rm\else\iflibertine@sf\else - \libertine@rmtrue\libertine@sftrue % both false -> both true -\fi\fi - % Set main and/or sans and mono fonts: \iflibertine@otf |