summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/libertine/libertine.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/libertine/libertine.sty')
-rw-r--r--Master/texmf-dist/tex/latex/libertine/libertine.sty69
1 files changed, 55 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/libertine/libertine.sty b/Master/texmf-dist/tex/latex/libertine/libertine.sty
index 59dddb0e6d5..ca1d2eeea82 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/01 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines. ]
+ 2012/12/06 (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
@@ -17,6 +17,7 @@
\newif\iflibertine@sf \libertine@sffalse
\newif\iflibertine@rm \libertine@rmfalse
+\newif\iflibertine@tt \libertine@ttfalse
\newif\iflibertine@sfdefault \libertine@sfdefaultfalse
\newif\iflibertine@lining \libertine@liningfalse
\newif\ifbiolinum@lining \biolinum@liningfalse
@@ -26,10 +27,14 @@
\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}
@@ -39,6 +44,7 @@
\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}
@@ -52,9 +58,13 @@
\DeclareOptionX{bold}{\libertine@semiboldfalse}
\newcommand*{\LinuxLibertineT@scale}{1} % not adjustable
+\newcommand*{\LinuxLibertineDisplayT@scale}{1} % not adjustable
\newcommand*{\LinuxBiolinumT@scale}{1}
+\newcommand*{\LinuxLibertineMonoT@scale}{1}
\DeclareOptionX{scaled}{\renewcommand*{\LinuxBiolinumT@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\LinuxBiolinumT@scale}{#1}}
+\DeclareOptionX{ttscaled}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
+\DeclareOptionX{ttscale}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
\ExecuteOptionsX{oldstyle,proportional,bold}
\ProcessOptionsX\relax
@@ -126,7 +136,7 @@
\libertine@rmtrue\libertine@sftrue % both false -> both true
\fi\fi
-% Set main and/or sans fonts:
+% Set main and/or sans and mono fonts:
\iflibertine@otf
@@ -188,6 +198,13 @@
BoldFont = *_\libertine@boldstyle,
BoldItalicFont = *_\libertine@boldstyle I
] {\libertine@base}
+ \newfontfamily\libertineDisplay
+ [ Numbers = {\libertine@figurealign,\libertine@figurestyle},
+ UprightFont = *_DR,
+ ItalicFont = *_RI,
+ BoldFont = *_\libertine@boldstyle,
+ BoldItalicFont = *_\libertine@boldstyle I
+ ] {\libertine@base}
\newfontfamily\biolinum
[ Numbers = {\biolinum@figurealign, \biolinum@figurestyle} ,
Scale = \LinuxBiolinumT@scale ,
@@ -212,8 +229,25 @@
BoldFont = *_RB ,
BoldItalicFont = *_RBO % oblique to fake italic
] {\biolinum@base}
- \defaultfontfeatures{ Extension = .otf } % Don't want ligatures
+ \defaultfontfeatures{ Extension = .otf } % Don't want ligatures for mono and keyboard
+ \iflibertine@tt
+ \setmonofont
+ [ UprightFont = *_M,
+ ItalicFont = *_MO, % oblique to fake italic
+ BoldFont = *_MB, % fontforge
+ BoldItalicFont = *_MBO, % fontforge
+ Scale = \LinuxLibertineMonoT@scale,
+ ] {\libertine@base}
+ \fi
+ \newfontfamily\libmono
+ [ UprightFont = *_M,
+ ItalicFont = *_MO, % oblique to fake italic
+ BoldFont = *_MB, % fontforge
+ BoldItalicFont = *_MBO, % fontforge
+ Scale = \LinuxLibertineMonoT@scale,
+ ] {\libertine@base}
\newfontfamily\biolinumkey{\biolinum@base _K}
+ \newfontfamily\libertineInitial{\libertine@base _I}
\providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
@@ -225,13 +259,16 @@
\iflibertine@rm \renewcommand*\rmdefault{\libertine@family} \fi
\iflibertine@sf \renewcommand*\sfdefault{\biolinum@family} \fi
\iflibertine@sfdefault \renewcommand*\familydefault{\biolinum@family} \fi
+ \iflibertine@tt \renewcommand*\ttdefault{LinuxLibertineMonoT-TLF} \fi
\providecommand*\libertine{\fontfamily{\libertine@family}\selectfont}
\providecommand*\libertineSB{\fontfamily{\libertine@family}\selectfont\renewcommand\bfdefault{sb}}
\providecommand*\libertineOsF{\fontfamily{LinuxLibertineT-\libertine@figurealign OsF}\selectfont}
\providecommand*\libertineLF{\fontfamily{LinuxLibertineT-\libertine@figurealign LF}\selectfont}
+ \providecommand*\libertineDisplay{\fontfamily{LinuxLibertineDisplayT-\libertine@figurealign\libertine@figurestyle}\selectfont}
\providecommand*\biolinum{\fontfamily{\biolinum@family}\selectfont}
\providecommand*\biolinumOsF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign OsF}\selectfont}
\providecommand*\biolinumLF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign LF}\selectfont}
+ \providecommand*\libmono{\fontfamily{LinuxLibertineMonoT-TLF}\selectfont}
\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
\fa@naming@exception{figures}{{superior}{tabular}}{Sup}
@@ -336,9 +373,10 @@
\fi
\iflibertine@otf
- \def\lib@fxl{fxl}
- \def\lib@fxb{fxb}
- \def\lib@fxk{fxk}
+ \def\lib@fxl{LinLibertine_R}
+ \def\lib@fxb{LinBiolinum_R}
+ \def\lib@fxk{LinBiolinum_K}
+ \def\lib@fxi{LinLibertine_I}
\providecommand*\DeclareTextGlyphY[3]{%
% \DeclareTextGlyphY{fxl}{s_t}{64262}
@@ -347,16 +385,19 @@
\ifx\lib@temp\lib@fxl \@namedef{#1@#2}{{\libertine\char#3\relax}}\else%
\ifx\lib@temp\lib@fxb \@namedef{#1@#2}{{\biolinum\char#3\relax}}\else%
\ifx\lib@temp\lib@fxk \@namedef{#1@#2}{{\biolinumkey\char#3\relax}}\else%
- \fi\fi\fi}
+ \ifx\lib@temp\lib@fxi \@namedef{#1@#2}{{\libertineInitial\char#3\relax}}\else%
+ \fi\fi\fi\fi}
%
- \input{fxluni.inc}
- \input{fxbuni.inc}
- \input{fxkuni.inc}
+ \input{LinLibertine_R}
+ \input{LinBiolinum_R}
+ \input{LinBiolinum_K}
+ \input{LinLibertine_I}
%
- \DeclareRobustCommand*\libertineGlyph[1]{\@nameuse{fxl@#1}}
- \DeclareRobustCommand*\biolinumGlyph[1]{\@nameuse{fxb@#1}}
- \DeclareRobustCommand*\biolinumKeyGlyph[1]{\@nameuse{fxk@#1}}
- \input{LKey.inc}
+ \DeclareRobustCommand*\libertineGlyph[1]{\@nameuse{LinLibertine_R@#1}}
+ \DeclareRobustCommand*\biolinumGlyph[1]{\@nameuse{LinBiolinum_R@#1}}
+ \DeclareRobustCommand*\biolinumKeyGlyph[1]{\@nameuse{LinBiolinum_K@#1}}
+ \DeclareRobustCommand*\libertineInitialGlyph[1]{\@nameuse{LinLibertine_I@#1}}
+ \input{LKey}
\fi