From 5d87b075aeb9584d0c74eb35ba7c9b45de6ee7ff Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 8 Mar 2010 00:51:23 +0000
Subject: libertine 4.6.5 (7mar10)

git-svn-id: svn://tug.org/texlive/trunk@17369 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/libertine/libertine.sty   | 271 ++++++++++++---------
 1 file changed, 160 insertions(+), 111 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/libertine/libertine.sty')

diff --git a/Master/texmf-dist/tex/latex/libertine/libertine.sty b/Master/texmf-dist/tex/latex/libertine/libertine.sty
index 4f8c572665b..3a6dd580e56 100644
--- a/Master/texmf-dist/tex/latex/libertine/libertine.sty
+++ b/Master/texmf-dist/tex/latex/libertine/libertine.sty
@@ -1,30 +1,33 @@
 % LaTeX-Package for libertine
 %
-% $Id: libertine.sty 62 2009-05-17 14:10:04Z mgn $
+% $Id: libertine.sty 38 2010-03-07 09:01:28Z michael $
 %
 % Michael Niedermair m.g.n@gmx.de
 %
-\def\libertineVersion{4.5.1a}
-\def\libertineVersionDate{2009/05/22a}
+% (License GPL)
+%
+\def\libertineVersion{4.6.5}%
+\def\libertineVersionDate{2010/03/07}
 %
 \ProvidesPackage{libertine}[%
-   \libertineVersionDate\space-\space\libertineVersion\space-LaTeX:
-   Font libertine - (License GPL)
-   Michael Niedermair]
-\RequirePackage{keyval,calc,ifthen,xcolor,xspace}
-
-\def\fxl@scale{1}%        scale factor
-\def\fxl@default{nf}%     nf, osf, ss
-\def\fxl@debug{false}%    debug
-\def\fxl@test{false}%      test
-
+   \libertineVersionDate\space-\space\libertineVersion:
+   Font libertine - (License GPL) Michael Niedermair]
+%
+\RequirePackage{keyval,ifxetex%,ifluatex
+}
+%
+%\XeTeXtracingfonts=1
+%
+\def\fxl@scale{1}%      scale factor
+\def\fxl@default{0}%    nf, osf, ss, osfss
+%
 \define@key{fxl}{scaled}[1]{\def\fxl@scale{#1}}
-\define@key{fxl}{default}[nf]{\def\fxl@default{#1}}
-\define@key{fxl}{debug}[true]{\def\fxl@debug{#1}}
-\define@key{fxl}{test}[true]{\def\fxl@test{#1}}
-\define@key{fxl}{osf}[true]{\def\fxl@default{osf}}
-\define@key{fxl}{ss}[true]{\def\fxl@default{ss}}
-\define@key{fxl}{nf}[true]{\def\fxl@default{nf}}
+\define@key{fxl}{default}[0]{\def\fxl@default{0}}
+\define@key{fxl}{osf}[true]{\def\fxl@default{1}}
+\define@key{fxl}{ss}[true]{\def\fxl@default{2}}
+\define@key{fxl}{osfss}[true]{\def\fxl@default{3}}
+\define@key{fxl}{nf}[true]{\def\fxl@default{0}}
+
 \def\ProcessOptionsWithKV#1{%
   \let\@tempc\relax
   \let\fxl@tempa\@empty
@@ -49,98 +52,144 @@
 \AtEndOfPackage{%
   \let\@unprocessedoptions\relax
 }
-% ------------------------------------------------
-
-% default
-\ifthenelse{\equal{\fxl@default}{nf}}{%
-   \renewcommand\rmdefault{fxl}%
-   \renewcommand\sfdefault{fxb}%
-}{}
-\ifthenelse{\equal{\fxl@default}{osf}}{%
-   \renewcommand\rmdefault{fxlj}%
-   \renewcommand\sfdefault{fxbj}%
-}{}
-\ifthenelse{\equal{\fxl@default}{ss}}{%
-   \renewcommand\rmdefault{fxlo}%
-   \renewcommand\sfdefault{fxbo}%
-}{}
-
-% debug
-\ifthenelse{\equal{\fxl@debug}{true}}{
-  \typeout{------ libertine: DEBUG ---------------------------}
-  \typeout{scaled          = \fxl@scale}
-  \typeout{default         = \fxl@default}
-  \typeout{test            = \fxl@test}
-  \typeout{---------- DEBUG ----------------------------------}
-}{}%
-% ------------------------------------------------------
-\newcommand{\FontLibertine}{\fontfamily{fxl}\fontencoding{T1}\selectfont}
-\newcommand{\FontLibertineOF}{\fontfamily{fxlj}\fontencoding{T1}\selectfont}
-\newcommand{\FontLibertineFF}{\fontfamily{fxlf}\fontencoding{T1}\selectfont}
-\newcommand{\FontBiolinum}{\fontfamily{fxl}\fontencoding{T1}\selectfont}
-\newcommand{\FontBiolinumOF}{\fontfamily{fxlj}\fontencoding{T1}\selectfont}
-\newcommand{\FontBiolinumFF}{\fontfamily{fxlf}\fontencoding{T1}\selectfont}
-\newcommand{\fxlSI}[1]{{\usefont{T1}{fxl}{m}{si}\selectfont #1}}
-\newcommand{\fxlBSI}[1]{{\usefont{T1}{fxl}{b}{si}\selectfont #1}}
-
-% circle
-\newcommand{\FontLibertineCircle}{%
-   \fontfamily{fxlc}\fontencoding{U}\fontseries{m}\fontshape{n}\selectfont}
-\newcommand{\fxlcsymbol}[1]{{\FontLibertineCircle\char#1}}
-\newcommand{\fxlcnumber}[1]{\fxlcsymbol{\arabic{#1}}}
-\newenvironment{xlenumerate}[1][1]{%
-   \ifnum \@enumdepth >3 \@toodeep\else
-      \advance\@enumdepth \@ne
-      \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
-      \expandafter\def\csname p@enum\romannumeral\the\@enumdepth\endcsname{}%
-      \expandafter\def\csname labelenum\romannumeral\the\@enumdepth\endcsname{%
-      \csname theenum\romannumeral\the\@enumdepth\endcsname}%
-      \expandafter\def\csname theenum\romannumeral\the\@enumdepth\endcsname{%
-         \fxlcnumber{enum\romannumeral\the\@enumdepth}}%
-      \list{\csname label\@enumctr\endcsname}{%
-        \@nmbrlisttrue
-        \def\@listctr{\@enumctr}%
-        \setcounter{\@enumctr}{#1}%
-        \addtocounter{\@enumctr}{-1}%
-        \def\makelabel##1{\hss\llap{##1}}}
-   \fi
-}{\endlist}
-
-% ---------------------------------------------------------
-\newcommand*\DeclareTextGlyphX[5]{%
-	% \DeclareTextGlyphX{fxl}{U}{fxla7}{uniA7F1}{241}
-	% #1=basefont #2=encoding #3=fontfamily #4=glyphname, #5=position
-   \@namedef{#1@#4}{\fontfamily{#3}\fontencoding{#2}\selectfont\char#5}}
-\newcommand*\useTextGlyph[2]{%
-  {\@nameuse{#1@#2}}}
-\newcommand*\ifGylphExists[2]{%
-  \begingroup
-    \setbox0=\hbox{\@nameuse{#1@#2}}%
-    %\typeout{\string\wd0=\the\wd0}%
-    \edef\x{\endgroup
-      \ifdim\wd0>\z@
-        \noexpand\@firstoftwo
-      \else
-        \noexpand\@secondoftwo
-      \fi}%
-  \x
-}
-\input{fxl.inc}
-\input{fxb.inc}
 %
-% ------------------------------------------------
-
-% ------------------------------------------------
-\newcommand*\xllogo{%
-	\mbox{%
-	\useTextGlyph{fxl}{uniE041}%
-	\textcolor{green}{\useTextGlyph{fxl}{uniE042}}%
-	}}
-% ------------------------------------------------
-%
-% test
-\ifthenelse{\equal{\fxl@test}{true}}{
-   % ...
-}{}%
+\def\libertine@param{}
+\def\biolinum@param{}
+%
+\ifxetex
+  \RequirePackage{xltxtra}
+  % Font
+  \def\libertine@param{Mapping=tex-text,RawFeature=+liga}
+  \def\biolinum@param{Mapping=tex-text,RawFeature=+liga}
+  \ifcase\fxl@default% nf
+    \def\libertine@param{Mapping=tex-text,RawFeature=+liga}
+    \def\biolinum@param{Mapping=tex-text,RawFeature=+liga}
+  \or% osf
+    \def\libertine@param{Mapping=tex-text,RawFeature=+liga;+onum}
+    \def\biolinum@param{Mapping=tex-text,RawFeature=+liga;+onum}
+  \or% ss
+    \def\libertine@param{Mapping=tex-text,RawFeature=+liga;+ss03}
+    \def\biolinum@param{Mapping=tex-text,RawFeature=+liga;+ss03}
+  \or% osfss
+    \def\libertine@param{Mapping=tex-text,RawFeature=+liga;+onum;+ss03}
+    \def\biolinum@param{Mapping=tex-text,RawFeature=+liga;+onum;+ss03}
+  \fi
+  \setromanfont[\libertine@param]{Linux Libertine O}
+  \setsansfont[\biolinum@param]{Linux Biolinum O}
+  \newfontfamily\biolinum[\biolinum@param]{Linux Biolinum O}
+  \newfontfamily\libertine[\libertine@param]{Linux Libertine O}
+  %
+  \ProvideTextCommand{\glqq}{EU1}{\textormath{\quotedblbase}{\mbox{\quotedblbase}}}
+  \ProvideTextCommand{\grqq}{EU1}{\textormath{\textquotedblleft}{\mbox{\textquotedblleft}}}
+  %
+  \DeclareRobustCommand*\libertineGlyph[1]{{%
+    \libertine%
+    \@tempcnta=\XeTeXglyphindex "#1"\relax%
+    \ifnum\@tempcnta>0%
+      \XeTeXglyph\@tempcnta%
+    \fi
+  }}
+  \DeclareRobustCommand*\biolinumGlyph[1]{{%
+    \biolinum%
+    \@tempcnta=\XeTeXglyphindex "#1"\relax%
+    \ifnum\@tempcnta>0%
+      \XeTeXglyph\@tempcnta%
+    \fi
+  }}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%55
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%55
+\else
+%  \ifluatex
+%       \RequirePackage{luaotfload}
+%       % Font
+%       \ifcase\fxl@default% nf
+%         \def\libertine@param{+liga}
+%         \def\biolinum@param{+liga}
+%       \or% osf
+%         \def\libertine@param{+liga:+onum}
+%         \def\biolinum@param{+liga:+onum}
+%       \or% ss
+%         \def\libertine@param{+liga:+ss03}
+%         \def\biolinum@param{+liga:+ss03}
+%       \or% osfss
+%         \def\libertine@param{+liga:+onum:+ss03}
+%         \def\biolinum@param{+liga:+onum:+ss03}
+%       \fi
+%
+%       \DeclareFontFamily{T1}{libertine}{}
+%       \DeclareFontShape{T1}{libertine}{m}{n}{<-> "fxlr:\libertine@param"}{}
+%       \DeclareFontShape{T1}{libertine}{m}{it}{<-> "fxlri:\libertine@param"}{}
+%       \DeclareFontShape{T1}{libertine}{m}{sl}{<-> "fxlro:\libertine@param"}{}
+%       \DeclareFontShape{T1}{libertine}{b}{n}{<-> "fxlb:\libertine@param"}{}
+%       \DeclareFontShape{T1}{libertine}{b}{it}{<-> "fxlbi:\libertine@param"}{}
+%       \DeclareFontShape{T1}{libertine}{b}{sl}{<-> "fxlbo:\libertine@param"}{}
+%       \DeclareFontShape{T1}{libertine}{m}{sc}{<-> "fxlr:\libertine@param:+smcp"}{}
+%       \DeclareFontShape{T1}{libertine}{b}{sc}{<-> "fxlb:\libertine@param:+smcp"}{}
+%       \DeclareFontShape{T1}{libertine}{m}{ic}{<-> "fxlric:\libertine@param:+smcp"}{}
+%       \DeclareFontShape{T1}{libertine}{b}{ic}{<-> "fxlbic:\libertine@param:+smcp"}{}
+%       \DeclareFontShape{T1}{libertine}{bx}{n}{<->ssub * libertine/b/n}{}
+%       \DeclareFontShape{T1}{libertine}{bx}{it}{<->ssub * libertine/b/it}{}
+%       \DeclareFontShape{T1}{libertine}{bx}{sl}{<->ssub * libertine/b/sl}{}
+%       \DeclareFontShape{T1}{libertine}{bx}{sc}{<->ssub * libertine/b/sc}{}
+%       \DeclareFontShape{T1}{libertine}{bx}{ic}{<->ssub * libertine/b/ic}{}
+%       \def\libertine{\fontfamily{libertine}\selectfont}
+%       \renewcommand\rmdefault{libertine}%
+%
+%       \DeclareFontFamily{T1}{biolinum}{}
+%       \DeclareFontShape{T1}{biolinum}{m}{n}{<-> "fxbr:\biolinum@param"}{}
+%       \DeclareFontShape{T1}{biolinum}{m}{it}{<-> "fxbri:\biolinum@param"}{}
+%       \DeclareFontShape{T1}{biolinum}{m}{sl}{<-> "fxbro:\biolinum@param"}{}
+%       \DeclareFontShape{T1}{biolinum}{b}{n}{<-> "fxbb:\biolinum@param"}{}
+%       \DeclareFontShape{T1}{biolinum}{b}{sl}{<-> "fxbbo:\biolinum@param"}{}
+%       \DeclareFontShape{T1}{biolinum}{m}{sc}{<-> "fxbr:\biolinum@param:+smcp"}{}
+%       \DeclareFontShape{T1}{biolinum}{b}{sc}{<-> "fxbb:\biolinum@param:+smcp"}{}
+%       \DeclareFontShape{T1}{biolinum}{m}{ic}{<-> "fxbric:\biolinum@param:+smcp"}{}
+%       \DeclareFontShape{T1}{biolinum}{bx}{n}{<->ssub * biolinum/b/n}{}
+%       \DeclareFontShape{T1}{biolinum}{bx}{it}{<->ssub * biolinum/b/it}{}
+%       \DeclareFontShape{T1}{biolinum}{bx}{sc}{<->ssub * biolinum/b/sc}{}
+%       \def\biolinum{\fontfamily{biolinum}\selectfont}
+%       \renewcommand\sfdefault{biolinum}%
+%
+%  \else
+      % latex
+      %
+      \def\libertine@param{}
+      \def\biolinum@param{}
+      % ------------------------------------------------
+      % default
+      \ifcase\fxl@default% nf
+        \def\libertine@param{fxl}
+        \def\biolinum@param{fxb}
+      \or% osf
+        \def\libertine@param{fxlj}
+        \def\biolinum@param{fxbj}
+      \or% ss
+        \def\libertine@param{fxlo}
+        \def\biolinum@param{fxbo}
+      \or% osfss
+        \def\libertine@param{fxljo}
+        \def\biolinum@param{fxbjo}
+      \fi
+      \renewcommand\rmdefault{\libertine@param}%
+      \renewcommand\sfdefault{\biolinum@param}%
+      %
+      % ---------------------------------------------------------
+      \newcommand*\DeclareTextGlyphX[5]{%
+        % \DeclareTextGlyphX{fxl}{U}{fxla7}{uniA7F1}{241}
+        % #1=basefont #2=encoding #3=fontfamily #4=glyphname, #5=position
+        \@namedef{#1@#4}{\fontfamily{#3}\fontencoding{#2}\selectfont\char#5}}
+      \DeclareRobustCommand*\libertineGlyph[1]{\@nameuse{fxl@#1}}
+      \DeclareRobustCommand*\biolinumGlyph[1]{\@nameuse{fxb@#1}}
+      %
+      \input{fxl.inc}
+      \input{fxb.inc}
+      %
+      \def\libertine{\fontfamily{\libertine@param}\selectfont}
+      \def\biolinum{\fontfamily{\biolinum@param}\selectfont}
+      %
+  \fi
+%\fi
+%
+\DeclareTextCommandDefault{\texteuro}{{\libertineGlyph{Euro}}}
 %
 \endinput
-- 
cgit v1.2.3

