libertine (2apr12)

git-svn-id: svn://tug.org/texlive/trunk@25830 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 39 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/libertine/libertineotf.sty b/Master/texmf-dist/tex/latex/libertine/libertineotf.sty
index 2823fd31941..7b3effe7ede 100644
--- a/Master/texmf-dist/tex/latex/libertine/libertineotf.sty
+++ b/Master/texmf-dist/tex/latex/libertine/libertineotf.sty
@@ -1,19 +1,22 @@
-% xelatex- and lualtex-Package for libertine-otf-fonts
-%
-% $Id: libertineotf.sty 108 2011-12-11 07:50:32Z michael $
-%
+% xelatex- and lualatex-Package for libertine-otf-fonts
+
+% Current maintainer: Patrick Gundlach, patrick@gundla.ch
+% Most code is from:
 % Michael Niedermair m.g.n@gmx.de
+% Help from:
+% Herbert Voss hvoss@tug.org
 %
-% (License GPL)
+% (License LPPL)
 %
-\def\libertineVersion{5.1.3x6}%
-\def\libertineVersionDate{2011/11/12}
+\def\libertineVersion{5.13}%
+\def\libertinePackageDate{2012/04/01}
+\def\libertinePackageVersion{7}
 %
 \ProvidesPackage{libertineotf}[%
-   \libertineVersionDate\space-\space\libertineVersion:
-   Font libertine-OTF - (License GPL) Michael Niedermair]
+   \libertinePackageDate\space \libertineVersion-\libertinePackageVersion:
+   Libertine OTF (PGU)]
 %
-\RequirePackage{keyval,ifxetex,ifluatex,lettrine,calc,ifthen}
+\RequirePackage{keyval,ifxetex,ifluatex,lettrine}
 %
 \def\fxl@paramlibertine{Ligatures=TeX}
 \def\fxl@parambiolinum{Ligatures=TeX}
@@ -69,6 +72,8 @@
       BoldItalicFont=LinLibertine_RBI,
       SlantedFont=LinLibertine_aRL,
       BoldSlantedFont=LinLibertine_aBL,
+      SmallCapsFont=LinLibertine_R,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@paramlibertine
       ]{LinLibertine_R}
 \setsansfont[Extension=.otf,
@@ -77,6 +82,8 @@
       BoldItalicFont=LinBiolinum_RB,% fake
       SlantedFont=LinBiolinum_aRL,
       BoldSlantedFont=LinBiolinum_aBL,
+      SmallCapsFont=LinBiolinum_R,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@parambiolinum
       ]{LinBiolinum_R}
 \setmonofont[Extension=.otf,
@@ -94,6 +101,8 @@
       BoldItalicFont=LinLibertine_RBI,
       SlantedFont=LinLibertine_aRL,
       BoldSlantedFont=LinLibertine_aBL,
+      SmallCapsFont=LinLibertine_R,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@paramlibertine
       ]{LinLibertine_R}
 
@@ -103,6 +112,8 @@
       BoldItalicFont=LinLibertine_RZI,
       SlantedFont=LinLibertine_aRL,
       BoldSlantedFont=LinLibertine_aZL,
+      SmallCapsFont=LinLibertine_R,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@paramlibertine
       ]{LinLibertine_R}
 
@@ -114,6 +125,8 @@
       BoldItalicFont=LinLibertine_DR,%fake
       SlantedFont=LinLibertine_aDRL,
       BoldSlantedFont=LinLibertine_aDRL,%fake
+%      SmallCapsFont=LinLibertine_DR,
+%      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@paramlibertine
       ]{LinLibertine_DR}
 
@@ -123,6 +136,8 @@
       BoldItalicFont=LinBiolinum_RB,% fake
       SlantedFont=LinBiolinum_aRL,
       BoldSlantedFont=LinBiolinum_aBL,
+      SmallCapsFont=LinBiolinum_R,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@parambiolinum
       ]{LinBiolinum_R}
 
@@ -132,6 +147,8 @@
       BoldItalicFont=LinBiolinum_aUB,% fake
       SlantedFont=LinBiolinum_aUL,
       BoldSlantedFont=LinBiolinum_aULB,
+      SmallCapsFont=LinBiolinum_aU,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@parambiolinum
       ]{LinBiolinum_aU}
 
@@ -141,6 +158,8 @@
       BoldItalicFont=LinBiolinum_aWB,% fake
       SlantedFont=LinBiolinum_aWL,
       BoldSlantedFont=LinBiolinum_aWLB,
+      SmallCapsFont=LinBiolinum_aW,
+      SmallCapsFeatures={Letters=SmallCaps},
       \fxl@parambiolinum
       ]{LinBiolinum_aW}
 
@@ -155,15 +174,20 @@
       \fxl@parammono
       ]{LinMono_M}
 
+\def\lib@fxl{fxl}
+\def\lib@fxb{fxb}
+\def\lib@fxk{fxk}
+\def\lib@fxi{fxi}
 
 \newcommand*\DeclareTextGlyphY[3]{%
     % \DeclareTextGlyphY{fxl}{s_t}{64262}
     % #1=basefont #2=glyphname, #3=position
-    \ifthenelse{\equal{#1}{fxl}}{\@namedef{#1@#2}{{\libertine\char#3\relax}}}{}
-    \ifthenelse{\equal{#1}{fxb}}{\@namedef{#1@#2}{{\biolinum\char#3\relax}}}{}
-    \ifthenelse{\equal{#1}{fxk}}{\@namedef{#1@#2}{{\biolinumkey\char#3\relax}}}{}
-    \ifthenelse{\equal{#1}{fxi}}{\@namedef{#1@#2}{{\libertineInitial\char#3\relax}}}{}
-}
+    \def\lib@temp{#1}%
+    \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%
+          \ifx\lib@temp\lib@fxi \@namedef{#1@#2}{{\libertineInitial\char#3\relax}}%
+    \fi\fi\fi\fi}
 %
 \input{fxluni.inc}
 \input{fxbuni.inc}