libertine (17oct13)

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

1 files changed, 21 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/libertine/libertine.sty b/Master/texmf-dist/tex/latex/libertine/libertine.sty
index 338312f7c0b..b95bb95b1af 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}[%
-  2013/09/02 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines.] 
+  2013/10/17 (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                
@@ -364,18 +364,34 @@
           BoldItalicFont = *_RBO , % oblique to fake italic
         ] {\biolinum@base}
   \providecommand\useosf{%
+    \edef\libertine@figurestyle{OldStyle}\edef\biolinum@figurestyle{OldStyle}
     \defaultfontfeatures{
        Ligatures = TeX ,
        Extension = .otf ,
        SmallCapsFeatures={Letters=SmallCaps} 
     }
+  \iflibertine@rm
     \setmainfont
-          [ Numbers = {\libertine@figurealign,OldStyle},
+          [ Numbers = {\libertine@figurealign,\libertine@figurestyle},
             UprightFont    = *_R,
             ItalicFont     = *_RI,
             BoldFont       = *_\libertine@boldstyle, 
             BoldItalicFont = *_\libertine@boldstyle I,
           ] {\libertine@base}
+  \fi
+  \iflibertine@sf
+    \setsansfont
+          [ Numbers   = {\biolinum@figurealign, \biolinum@figurestyle} ,
+            Scale     = \LinuxBiolinumT@scale ,
+            UprightFont    = *_R ,
+            ItalicFont     = *_RI ,
+            BoldFont       = *_RB , 
+            BoldItalicFont = *_RBO , % oblique to fake italic
+          ] {\biolinum@base}
+    % grab the \sfdefault in case it changes subsequently:
+    \let\biolinum@family\sfdefault
+    \iflibertine@sfdefault\renewcommand*\familydefault{\biolinum@family}\fi
+  \fi
     \defaultfontfeatures{} 
   }
   \defaultfontfeatures{ Extension = .otf } % Don't want ligatures for mono and keyboard
@@ -412,8 +428,6 @@
   \providecommand*\libertineSB{\fontfamily{\libertine@family}\fontseries{sb}\selectfont}
   \providecommand*\libertineOsF{\fontfamily{LinuxLibertineT-\libertine@figurealign OsF}\selectfont}
   \providecommand*\libertineLF{\fontfamily{LinuxLibertineT-\libertine@figurealign LF}\selectfont}
-  \providecommand*\useosf{\edef\libertine@figurestyle{OsF}%
-     \renewcommand*{\rmdefault}{LinuxLibertineT-OsF}}
   \providecommand*\libertineDisplay{\fontfamily{LinuxLibertineDisplayT-\libertine@figurealign\libertine@figurestyle}\selectfont}
   \providecommand*\biolinum{\fontfamily{\biolinum@family}\selectfont}
   \providecommand*\biolinumOsF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign OsF}\selectfont}
@@ -424,6 +438,9 @@
   \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
   \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
   \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
+  \providecommand*\useosf{\edef\libertine@figurestyle{OsF}\edef\biolinum@figurestyle{OsF}%
+     \iflibertine@rm \renewcommand*\rmdefault{LinuxLibertineT-OsF}\fi
+     \iflibertine@sf \renewcommand*\sfdefault{LinuxBiolinumT-OsF}\fi}
 
 \fi
 \DeclareTextFontCommand{\textsu}{\sufigures}