libertine (23jul13)

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

15 files changed, 738 insertions, 1028 deletions

diff --git a/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-Sup.fd b/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-Sup.fd
index fc17c056751..6cf751ba782 100644
--- a/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-Sup.fd
@@ -33,4 +33,7 @@
 \DeclareFontShape{LY1}{LinuxLibertineMonoT-Sup}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-Sup/m/it
 }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-Sup}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-Sup/b/n }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-Sup}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-Sup/b/it }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-Sup}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-Sup/b/it }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-TLF.fd b/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-TLF.fd
index dc2404c8131..899f6eb985c 100644
--- a/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertine/LY1LinuxLibertineMonoT-TLF.fd
@@ -33,4 +33,13 @@
 \DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-TLF/m/it
 }{}
+
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{bx}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{bx}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{LY1}{LinuxLibertineMonoT-TLF}{bx}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-Sup.fd b/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-Sup.fd
index adea1464099..8ae6ea0acfa 100644
--- a/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-Sup.fd
@@ -33,4 +33,7 @@
 \DeclareFontShape{OT1}{LinuxLibertineMonoT-Sup}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-Sup/m/it
 }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-Sup}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-Sup/b/n }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-Sup}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-Sup/b/it }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-Sup}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-Sup/b/it }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-TLF.fd b/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-TLF.fd
index d2a31141c3f..d59c08ef342 100644
--- a/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertine/OT1LinuxLibertineMonoT-TLF.fd
@@ -33,4 +33,10 @@
 \DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-TLF/m/it
 }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{bx}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{bx}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{OT1}{LinuxLibertineMonoT-TLF}{bx}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-Sup.fd b/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-Sup.fd
index 0131389f2cb..bcf7a26798a 100644
--- a/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-Sup.fd
@@ -33,4 +33,7 @@
 \DeclareFontShape{T1}{LinuxLibertineMonoT-Sup}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-Sup/m/it
 }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-Sup}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-Sup/b/n }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-Sup}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-Sup/b/it }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-Sup}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-Sup/b/it }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-TLF.fd b/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-TLF.fd
index 985bfa510b0..0155a5e799d 100644
--- a/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertine/T1LinuxLibertineMonoT-TLF.fd
@@ -33,4 +33,10 @@
 \DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-TLF/m/it
 }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{bx}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{bx}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{T1}{LinuxLibertineMonoT-TLF}{bx}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/TS1LinuxLibertineMonoT-TLF.fd b/Master/texmf-dist/tex/latex/libertine/TS1LinuxLibertineMonoT-TLF.fd
index 61cf9c385ba..700c887660f 100644
--- a/Master/texmf-dist/tex/latex/libertine/TS1LinuxLibertineMonoT-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertine/TS1LinuxLibertineMonoT-TLF.fd
@@ -33,4 +33,10 @@
 \DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{m}{sl}{
     <-> ssub * LinuxLibertineMonoT-TLF/m/it
 }{}
+\DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{sb}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{sb}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{sb}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{bx}{n}{ <-> ssub * LinuxLibertineMonoT-TLF/b/n }{}
+\DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{bx}{it}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
+\DeclareFontShape{TS1}{LinuxLibertineMonoT-TLF}{bx}{sl}{ <-> ssub * LinuxLibertineMonoT-TLF/b/it }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/biolinum-type1.sty b/Master/texmf-dist/tex/latex/libertine/biolinum-type1.sty
index b0f3a3dd562..3cb9ceaa0b3 100644
--- a/Master/texmf-dist/tex/latex/libertine/biolinum-type1.sty
+++ b/Master/texmf-dist/tex/latex/libertine/biolinum-type1.sty
@@ -1,165 +1,16 @@
 \ProvidesPackage{biolinum-type1}[%
-  2013/02/13 (Bob Tennent) Supports Biolinum type 1 fonts.] 
+  2013/02/14 (Bob Tennent)  Compatibility style file for Linux Biolinum. ] 
 
-\RequirePackage{xkeyval,textcomp}
+\PackageWarningNoLine{biolinum-type1}{%
+ *****************************************\MessageBreak
+  The biolinum-type1 package is obsolete. \MessageBreak
+  For new documents, please use           \MessageBreak
+  \@spaces\string\usepackage[type1]{biolinum} \MessageBreak
+ *****************************************}
 
-\newif\iflibertine@sfdefault \libertine@sfdefaultfalse
-\newif\ifbiolinum@lining \biolinum@liningtrue            % NEW
-\newif\ifbiolinum@tabular \biolinum@tabulartrue          % NEW
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{biolinum}}
+\ProcessOptions\relax
 
-\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@sfdefaulttrue\fi
-}
-\DeclareOptionX{lining}[true]{%
-\@nameuse{biolinum@lining#1}
-\ifbiolinum@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{nf}[true]{%
-\@nameuse{biolinum@lining#1}
-\ifbiolinum@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{lf}[true]{%
-\@nameuse{biolinum@lining#1}
-\ifbiolinum@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{oldstyle}[true]{%
-\@nameuse{if#1}%
-  \biolinum@liningfalse
-\else
-  \biolinum@liningtrue
-\fi
-\ifbiolinum@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{osf}[true]{%
-\@nameuse{if#1}%
-  \biolinum@liningfalse
-\else
-  \biolinum@liningtrue
-\ifbiolinum@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{biolinum@tabular#1}
-\ifbiolinum@tabular\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{t}[true]{%
-\@nameuse{biolinum@tabular#1}
-\ifbiolinum@tabular\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{proportional}[true]{%
-\@nameuse{if#1}%
-  \biolinum@tabularfalse
-\else
-  \biolinum@tabulartrue
-\fi
-\ifbiolinum@tabular\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{p}[true]{%
-\@nameuse{if#1}%
-  \biolinum@tabularfalse
-\else
-  \biolinum@tabulartrue
-\fi
-\ifbiolinum@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
-}
-
-
-\providecommand*{\LinuxBiolinumT@scale}{1}
-\DeclareOptionX{scaled}{\renewcommand*{\LinuxBiolinumT@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\LinuxBiolinumT@scale}{#1}}
-
-\ProcessOptionsX\relax
-
-  \ifbiolinum@lining
-    \def\biolinum@figurestyle{LF} 
-  \else
-    \def\biolinum@figurestyle{OsF} 
-  \fi
-  \ifbiolinum@tabular
-    \def\biolinum@figurealign{T} 
-  \else
-    \def\biolinum@figurealign{} 
-  \fi
-
-
-  \RequirePackage{fontenc,fontaxes}
-
-% Set main and/or sans fonts:
-
-  \def\biolinum@family{LinuxBiolinumT-\biolinum@figurealign\biolinum@figurestyle}
-
-  \renewcommand*\sfdefault{\biolinum@family} 
-  \iflibertine@sfdefault \renewcommand*\familydefault{\biolinum@family} \fi
-  \providecommand*\biolinum{\fontfamily{\biolinum@family}\selectfont}
-  \providecommand*\biolinumOsF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign OsF}\selectfont}
-  \providecommand*\biolinumLF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign LF}\selectfont}
-
-  \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
-  \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
-  \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
-
-\DeclareTextFontCommand{\textsu}{\sufigures}
-\let\textsuperior\textsu
-
-% Define \oldstylenums[f] and \liningnums[f]
-
-    % \oldstylenums defined by \textcomp?
-    \DeclareTextFontCommand{\liningnums}{}
-    \DeclareTextFontCommand{\oldstylenumsf}{\biolinumOsF}
-    \DeclareTextFontCommand{\liningnumsf}{\biolinumLF}
-
-% Define \tabularnums[f] and \proportionalnums[f]
-
-    \DeclareTextFontCommand{\tabularnumsf}{\fontfamily{LinuxBiolinumT-T\biolinum@figurestyle}\selectfont}
-    \DeclareTextFontCommand{\proportionalnumsf}{\fontfamily{LinuxBiolinumT-\biolinum@figurestyle}\selectfont}
+\RequirePackage[type1]{biolinum}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/biolinum.sty b/Master/texmf-dist/tex/latex/libertine/biolinum.sty
new file mode 100644
index 00000000000..5deb286d7ed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertine/biolinum.sty
@@ -0,0 +1,305 @@
+\ProvidesPackage{biolinum}[%
+  2013/07/20 (Bob Tennent) Supports Biolinum fonts for all LaTeX engines.] 
+
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+
+\newif\iflibertine@otf
+\ifxetex
+  \libertine@otftrue
+\else\ifluatex
+  \libertine@otftrue
+\else  % [pdf]LaTeX
+  \libertine@otffalse
+\fi\fi
+
+\newif\iflibertine@sfdefault \libertine@sfdefaultfalse
+\newif\ifbiolinum@lining \biolinum@liningtrue            % NEW
+\newif\ifbiolinum@tabular \biolinum@tabulartrue          % NEW
+
+\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@sfdefaulttrue\fi
+}
+\DeclareOptionX{type1}[true]{%
+\@nameuse{if#1}\libertine@otffalse\fi
+}
+\DeclareOptionX{nofontspec}[true]{%
+\@nameuse{if#1}\libertine@otffalse\fi
+}
+\DeclareOptionX{lining}[true]{%
+\@nameuse{biolinum@lining#1}
+\ifbiolinum@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{nf}[true]{%
+\@nameuse{biolinum@lining#1}
+\ifbiolinum@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{lf}[true]{%
+\@nameuse{biolinum@lining#1}
+\ifbiolinum@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{oldstyle}[true]{%
+\@nameuse{if#1}%
+  \biolinum@liningfalse
+\else
+  \biolinum@liningtrue
+\fi
+\ifbiolinum@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{osf}[true]{%
+\@nameuse{if#1}%
+  \biolinum@liningfalse
+\else
+  \biolinum@liningtrue
+\ifbiolinum@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{biolinum@tabular#1}
+\ifbiolinum@tabular\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{t}[true]{%
+\@nameuse{biolinum@tabular#1}
+\ifbiolinum@tabular\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{proportional}[true]{%
+\@nameuse{if#1}%
+  \biolinum@tabularfalse
+\else
+  \biolinum@tabulartrue
+\fi
+\ifbiolinum@tabular\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{p}[true]{%
+\@nameuse{if#1}%
+  \biolinum@tabularfalse
+\else
+  \biolinum@tabulartrue
+\fi
+\ifbiolinum@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
+}
+
+\newcommand*{\LinuxBiolinumT@scale}{1}
+\DeclareOptionX{scaled}{\renewcommand*{\LinuxBiolinumT@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\LinuxBiolinumT@scale}{#1}}
+
+\ProcessOptionsX\relax
+
+\iflibertine@otf
+  \ifbiolinum@lining
+    \def\biolinum@figurestyle{}  % lnum feature missing in RB (and hence RBO)
+  \else
+    \def\biolinum@figurestyle{OldStyle}
+  \fi
+  \ifbiolinum@tabular
+    \def\biolinum@figurealign{Monospaced} 
+  \else
+    \def\biolinum@figurealign{Proportional} 
+  \fi
+
+\else % type1
+
+  \ifbiolinum@lining
+    \def\biolinum@figurestyle{LF} 
+  \else
+    \def\biolinum@figurestyle{OsF} 
+  \fi
+  \ifbiolinum@tabular
+    \def\biolinum@figurealign{T} 
+  \else
+    \def\biolinum@figurealign{} 
+  \fi
+\fi
+
+
+\iflibertine@otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,fontaxes}
+\fi
+
+% Set sans fonts:
+
+\iflibertine@otf
+
+  \def\biolinum@base{LinBiolinum}
+  \ifxetex\XeTeXtracingfonts=1\fi
+  \defaultfontfeatures{
+     Ligatures = TeX ,
+     Extension = .otf ,
+     SmallCapsFeatures={Letters=SmallCaps} 
+  }
+    \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
+  \newfontfamily\biolinum
+        [ Numbers   = {\biolinum@figurealign, \biolinum@figurestyle} ,
+          Scale     = \LinuxBiolinumT@scale ,
+          UprightFont    = *_R ,
+          ItalicFont     = *_RI ,
+          BoldFont       = *_RB , 
+          BoldItalicFont = *_RBO,   % oblique to fake italic
+        ] {\biolinum@base}
+  \newfontfamily\biolinumOsF
+        [ Numbers   = {\biolinum@figurealign, OldStyle} ,
+          Scale     = \LinuxBiolinumT@scale ,
+          UprightFont    = *_R ,
+          ItalicFont     = *_RI ,
+          BoldFont       = *_RB , 
+          BoldItalicFont = *_RBO , % oblique to fake italic
+        ] {\biolinum@base}
+  \newfontfamily\biolinumLF
+        [ Numbers   = {\biolinum@figurealign} , % lnum feature missing
+          Scale     = \LinuxBiolinumT@scale ,
+          UprightFont    = *_R ,
+          ItalicFont     = *_RI ,
+          BoldFont       = *_RB , 
+          BoldItalicFont = *_RBO , % oblique to fake italic
+        ] {\biolinum@base}
+  \defaultfontfeatures{ Extension = .otf } % Don't want ligatures for keyboard
+  \newfontface\biolinumkey{\biolinum@base _K}
+
+  \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+
+\else % type1
+
+  \def\biolinum@family{LinuxBiolinumT-\biolinum@figurealign\biolinum@figurestyle}
+  \def\sfdefault{\biolinum@family} 
+  \iflibertine@sfdefault\edef\familydefault{\sfdefault}\fi
+
+  \providecommand*\biolinum{\fontfamily{\biolinum@family}\selectfont}
+  \providecommand*\biolinumOsF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign OsF}\selectfont}
+  \providecommand*\biolinumLF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign LF}\selectfont}
+
+  \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+  \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+  \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
+
+\fi
+\DeclareTextFontCommand{\textsu}{\sufigures}
+\let\textsuperior\textsu
+
+% Define \oldstylenums[f] and \liningnums[f]
+
+\iflibertine@otf
+\else % type1
+    % \oldstylenums defined by \textcomp?
+    \DeclareTextFontCommand{\liningnums}{}
+    \DeclareTextFontCommand{\oldstylenumsf}{\biolinumOsF}
+    \DeclareTextFontCommand{\liningnumsf}{\biolinumLF}
+\fi
+
+% Define \tabularnums[f] and \proportionalnums[f]
+
+\iflibertine@otf
+  \newfontfamily\biolinumtabular
+    [ Numbers = {Monospaced,\biolinum@figurestyle},
+      Scale     = \LinuxBiolinumT@scale ,
+      UprightFont    = *_R,
+      ItalicFont     = *_RI,
+      BoldFont       = *_RB,
+      BoldItalicFont = *_RBO , % oblique to fake italic
+    ] {\biolinum@base}
+  \newfontfamily\biolinumproportional
+    [ Numbers = {Proportional,\biolinum@figurestyle},
+      Scale     = \LinuxBiolinumT@scale ,
+      UprightFont    = *_R,
+      ItalicFont     = *_RI,
+      BoldFont       = *_RB,
+      BoldItalicFont = *_RBO , % oblique to fake italic
+    ] {\biolinum@base}
+    \DeclareTextFontCommand{\tabularnumsf}{\biolinumtabular}
+    \DeclareTextFontCommand{\proportionalnumsf}{\biolinumproportional}
+\else % type1
+    \DeclareTextFontCommand{\tabularnumsf}{\fontfamily{LinuxBiolinumT-T\biolinum@figurestyle}\selectfont}
+    \DeclareTextFontCommand{\proportionalnumsf}{\fontfamily{LinuxBiolinumT-\biolinum@figurestyle}\selectfont}
+\fi
+
+\iflibertine@otf
+  \def\lib@fxb{LinBiolinum_R}
+  \def\lib@fxk{LinBiolinum_K}
+
+  \providecommand*\DeclareTextGlyphY[3]{%
+      % \DeclareTextGlyphY{fxl}{s_t}{64262}
+      % #1=basefont #2=glyphname, #3=position
+      \def\lib@temp{#1}%
+        \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}
+  %
+  \input{LinBiolinum_R}
+  \input{LinBiolinum_K}
+  %
+  \DeclareRobustCommand*\biolinumGlyph[1]{\@nameuse{LinBiolinum_R@#1}}
+  \DeclareRobustCommand*\biolinumKeyGlyph[1]{\@nameuse{LinBiolinum_K@#1}}
+  \input{LKey}
+
+\else %type1
+  
+\fi
+
+
+\iflibertine@otf
+% turn off defaults in case other fonts are selected:
+  \defaultfontfeatures{}
+\fi
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/libertine-type1.sty b/Master/texmf-dist/tex/latex/libertine/libertine-type1.sty
index 019ef5a0f61..c40a7991b80 100644
--- a/Master/texmf-dist/tex/latex/libertine/libertine-type1.sty
+++ b/Master/texmf-dist/tex/latex/libertine/libertine-type1.sty
@@ -1,149 +1,16 @@
 \ProvidesPackage{libertine-type1}[%
-  2013/02/13 (Bob Tennent) Supports Libertine type 1 fonts.] 
+   2013/02/14 (Bob Tennent)  Compatibility style file for Linux Libertine. ] 
 
-\RequirePackage{xkeyval,textcomp}
-
-\newif\iflibertine@lining \libertine@liningtrue          % NEW
-\newif\iflibertine@tabular \libertine@tabulartrue        % NEW
-\newif\iflibertine@semibold \libertine@semiboldfalse
-
-\def\libertine@newfigdefaults{%
 \PackageWarningNoLine{libertine-type1}{%
-  ****************************************\MessageBreak
-   Figure defaults are now: lining, tabular; \MessageBreak
-   for options, see the documentation. \MessageBreak
-  ****************************************}
-}
-\DeclareOptionX{lining}[true]{%
-\@nameuse{libertine@lining#1}
-\iflibertine@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{nf}[true]{%
-\@nameuse{libertine@lining#1}
-\iflibertine@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{lf}[true]{%
-\@nameuse{libertine@lining#1}
-\iflibertine@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{oldstyle}[true]{%
-\@nameuse{if#1}%
-  \libertine@liningfalse
-\else
-  \libertine@liningtrue
-\fi
-\iflibertine@lining\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{osf}[true]{%
-\@nameuse{if#1}%
-  \libertine@liningfalse
-\else
-  \libertine@liningtrue
-\iflibertine@lining\libertine@newfigdefaults\fi
-\fi
-}
-\DeclareOptionX{tabular}[true]{%
-\@nameuse{libertine@tabular#1}
-\iflibertine@tabular\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{t}[true]{%
-\@nameuse{libertine@tabular#1}
-\iflibertine@tabular\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{proportional}[true]{%
-\@nameuse{if#1}%
-  \libertine@tabularfalse
-\else
-  \libertine@tabulartrue
-\fi
-\iflibertine@tabular\libertine@newfigdefaults\fi
-}
-\DeclareOptionX{p}[true]{%
-\@nameuse{if#1}%
-  \libertine@tabularfalse
-\else
-  \libertine@tabulartrue
-\fi
-\iflibertine@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
-}
-
-\providecommand*{\LinuxLibertineT@scale}{1}  
-\providecommand*{\LinuxLibertineDisplayT@scale}{1} 
-\providecommand*{\LinuxLibertineInitialsT@scale}{1}  
-
-\ProcessOptionsX\relax
-
-  \iflibertine@lining
-    \def\libertine@figurestyle{LF} 
-  \else
-    \def\libertine@figurestyle{OsF} 
-  \fi
-  \iflibertine@tabular
-    \def\libertine@figurealign{T} 
-  \else
-    \def\libertine@figurealign{} 
-  \fi
-  \iflibertine@semibold
-    \renewcommand*{\bfdefault}{sb} 
-  \else
-    \renewcommand*{\bfdefault}{b} 
-  \fi
-
-
-  \RequirePackage{fontenc,fontaxes}
-
-% Set main and/or sans and mono fonts:
-
-  \def\libertine@family{LinuxLibertineT-\libertine@figurealign\libertine@figurestyle}
-
-  \renewcommand*\rmdefault{\libertine@family} 
-  \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*\libertineInitial{\fontfamily{LinuxLibertineInitialsT-\libertine@figurealign\libertine@figurestyle}\selectfont}
-
-  \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
-  \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
-  \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
-
-\DeclareTextFontCommand{\textsu}{\sufigures}
-\let\textsuperior\textsu
-
-% Define \oldstylenums[f] and \liningnums[f]
-
-      \DeclareTextFontCommand{\oldstylenums}{\libertineOsF}
-      \DeclareTextFontCommand{\liningnums}{\libertineLF}
-      \DeclareTextFontCommand{\oldstylenumsf}{\sffamily\oldstylenums}
-      \DeclareTextFontCommand{\liningnumsf}{\sffamily}
-
-% Define \tabularnums[f] and \proportionalnums[f]
-
-    \DeclareTextFontCommand{\tabularnums}{\fontfamily{LinuxLibertineT-T\libertine@figurestyle}\selectfont}
-    \DeclareTextFontCommand{\proportionalnums}{\fontfamily{LinuxLibertineT-\libertine@figurestyle}\selectfont}
+ ******************************************\MessageBreak
+  The libertine-type1 package is obsolete. \MessageBreak
+  For new documents, please use            \MessageBreak
+  \@spaces\string\usepackage[type1]{libertineRoman} \MessageBreak
+ ******************************************}
 
-  \def\lib@ini{LinLibertine_I}
-  \providecommand*\DeclareTextGlyphY[3]{%
-      % \DeclareTextGlyphY{fxl}{s_t}{64262}
-      % #1=basefont #2=glyphname, #3=position
-      \def\lib@temp{#1}%
-      \ifx\lib@temp\lib@ini \@namedef{#1@#2}{{\libertineInitial\char#3\relax}}\else%
-      \fi}
-  %
-  \input{LinLibertine_I}
-  %
-  \DeclareRobustCommand*\libertineInitialGlyph[1]{\@nameuse{LinLibertine_I@#1}}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{libertineRoman}}
+\ProcessOptions\relax
 
+\RequirePackage[type1]{libertineRoman}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/libertine.sty b/Master/texmf-dist/tex/latex/libertine/libertine.sty
index c849b6f6409..64d7faca695 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/02/13 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines.] 
+  2013/07/21 (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                
@@ -191,7 +191,7 @@
 \@nameuse{libertine@semibold#1}
 }
 \DeclareOptionX{bold}[true]{%
-\@nameuse{if#1}libertine@semiboldfalse\else\libertine@semiboldtrue\fi
+\@nameuse{if#1}\libertine@semiboldfalse\else\libertine@semiboldtrue\fi
 }
 
 \newcommand*{\LinuxLibertineT@scale}{1}  
@@ -256,9 +256,9 @@
     \def\biolinum@figurealign{} 
   \fi
   \iflibertine@semibold
-    \renewcommand*{\bfdefault}{sb} 
+    \def\bfseries@rm{sb}
   \else
-    \renewcommand*{\bfdefault}{b} 
+    \def\bfseries@rm{b}
   \fi
 \fi
 
@@ -266,6 +266,7 @@
 \iflibertine@otf
   \RequirePackage{fontspec}
 \else
+  \RequirePackage{mweights}
   \RequirePackage{fontenc,fontaxes}
 \fi
 
@@ -388,13 +389,12 @@
 
   \def\libertine@family{LinuxLibertineT-\libertine@figurealign\libertine@figurestyle}
   \def\biolinum@family{LinuxBiolinumT-\biolinum@figurealign\biolinum@figurestyle}
-
-  \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
+  \iflibertine@rm \def\rmdefault{\libertine@family} \fi
+  \iflibertine@sf \def\sfdefault{\biolinum@family} \fi 
+  \iflibertine@sfdefault\edef\familydefault{\sfdefault}\fi
+  \iflibertine@tt \def\ttdefault{LinuxLibertineMonoT-TLF} \fi
   \providecommand*\libertine{\fontfamily{\libertine@family}\selectfont}
-  \providecommand*\libertineSB{\fontfamily{\libertine@family}\selectfont\renewcommand\bfdefault{sb}}
+  \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*\libertineDisplay{\fontfamily{LinuxLibertineDisplayT-\libertine@figurealign\libertine@figurestyle}\selectfont}
@@ -550,8 +550,8 @@
 \fi
 
 
-% turn off defaults in case other fonts are selected:
 \iflibertine@otf
+% turn off defaults in case other fonts are selected:
   \defaultfontfeatures{}
 \fi
 
diff --git a/Master/texmf-dist/tex/latex/libertine/libertineMono-type1.sty b/Master/texmf-dist/tex/latex/libertine/libertineMono-type1.sty
deleted file mode 100644
index a18bd4e9496..00000000000
--- a/Master/texmf-dist/tex/latex/libertine/libertineMono-type1.sty
+++ /dev/null
@@ -1,21 +0,0 @@
-\ProvidesPackage{libertineMono-type1}[%
-  2013/02/13 (Bob Tennent) Supports Libertine Mono type 1 fonts.] 
-
-\RequirePackage{xkeyval,textcomp}
-
-\providecommand*{\LinuxLibertineMonoT@scale}{1}  
-\DeclareOptionX{ttscaled}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
-\DeclareOptionX{ttscale}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
-\DeclareOptionX{scaled}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
-
-\ProcessOptionsX\relax
-
-  \RequirePackage{fontenc}
-
-% Set mono fonts:
-
-  \renewcommand*\ttdefault{LinuxLibertineMonoT-TLF} 
-  \providecommand*\libmono{\fontfamily{LinuxLibertineMonoT-TLF}\selectfont}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/libertineMono.sty b/Master/texmf-dist/tex/latex/libertine/libertineMono.sty
new file mode 100644
index 00000000000..9038f8a88cd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertine/libertineMono.sty
@@ -0,0 +1,70 @@
+\ProvidesPackage{libertineMono}[%
+  2013/07/19 (Bob Tennent) Supports Libertine Mono fonts for all LaTeX engines.] 
+
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+
+\newif\iflibertine@otf
+\ifxetex
+  \libertine@otftrue
+\else\ifluatex
+  \libertine@otftrue
+\else  % [pdf]LaTeX
+  \libertine@otffalse
+\fi\fi
+
+\DeclareOptionX{type1}[true]{%
+\@nameuse{if#1}\libertine@otffalse\fi
+}
+\DeclareOptionX{nofontspec}[true]{%
+\@nameuse{if#1}\libertine@otffalse\fi
+}
+
+\newcommand*{\LinuxLibertineMonoT@scale}{1}  
+\DeclareOptionX{ttscaled}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
+\DeclareOptionX{ttscale}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\LinuxLibertineMonoT@scale}{#1}}
+
+\ProcessOptionsX\relax
+
+\iflibertine@otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{mweights}
+  \RequirePackage{fontenc,fontaxes}
+\fi
+
+% Set mono fonts:
+
+\iflibertine@otf
+
+  \def\libertine@base{LinLibertine}
+  \defaultfontfeatures{ Extension = .otf } % Don't want ligatures for mono 
+    \setmonofont 
+          [ Scale = \LinuxLibertineMonoT@scale,
+            UprightFont    = *_M, 
+            ItalicFont     = *_MO, % oblique to fake italic
+            BoldFont       = *_MB,   % fontforge 
+            BoldItalicFont = *_MBO,  % fontforge
+          ] {\libertine@base}
+  \newfontfamily\libmono
+          [ Scale = \LinuxLibertineMonoT@scale,
+            UprightFont    = *_M, 
+            ItalicFont     = *_MO, % oblique to fake italic
+            BoldFont       = *_MB,   % fontforge 
+            BoldItalicFont = *_MBO,  % fontforge
+          ] {\libertine@base}
+
+\else % type1
+
+  \def\ttdefault{LinuxLibertineMonoT-TLF} 
+  \providecommand*\libmono{\fontfamily{LinuxLibertineMonoT-TLF}\selectfont}
+
+\fi
+
+\iflibertine@otf
+% turn off defaults in case other fonts are selected:
+  \defaultfontfeatures{}
+\fi
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/libertineRoman.sty b/Master/texmf-dist/tex/latex/libertine/libertineRoman.sty
new file mode 100644
index 00000000000..7cbebc0c7d1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertine/libertineRoman.sty
@@ -0,0 +1,297 @@
+\ProvidesPackage{libertineRoman}[%
+  2013/07/19 (Bob Tennent) Supports Libertine Roman fonts for all LaTeX engines.] 
+
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+
+\newif\iflibertine@otf
+\ifxetex
+  \libertine@otftrue
+\else\ifluatex
+  \libertine@otftrue
+\else  % [pdf]LaTeX
+  \libertine@otffalse
+\fi\fi
+
+\newif\iflibertine@lining \libertine@liningtrue          % NEW
+\newif\iflibertine@tabular \libertine@tabulartrue        % NEW
+\newif\iflibertine@semibold \libertine@semiboldfalse
+
+\def\libertine@newfigdefaults{%
+\PackageWarningNoLine{libertine}{%
+  ****************************************\MessageBreak
+   Figure defaults are now: lining, tabular; \MessageBreak
+   for options, see the documentation. \MessageBreak
+  ****************************************}
+}
+\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}
+\iflibertine@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{nf}[true]{%
+\@nameuse{libertine@lining#1}
+\iflibertine@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{lf}[true]{%
+\@nameuse{libertine@lining#1}
+\iflibertine@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{oldstyle}[true]{%
+\@nameuse{if#1}%
+  \libertine@liningfalse
+\else
+  \libertine@liningtrue
+\fi
+\iflibertine@lining\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{osf}[true]{%
+\@nameuse{if#1}%
+  \libertine@liningfalse
+\else
+  \libertine@liningtrue
+\iflibertine@lining\libertine@newfigdefaults\fi
+\fi
+}
+\DeclareOptionX{tabular}[true]{%
+\@nameuse{libertine@tabular#1}
+\iflibertine@tabular\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{t}[true]{%
+\@nameuse{libertine@tabular#1}
+\iflibertine@tabular\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{proportional}[true]{%
+\@nameuse{if#1}%
+  \libertine@tabularfalse
+\else
+  \libertine@tabulartrue
+\fi
+\iflibertine@tabular\libertine@newfigdefaults\fi
+}
+\DeclareOptionX{p}[true]{%
+\@nameuse{if#1}%
+  \libertine@tabularfalse
+\else
+  \libertine@tabulartrue
+\fi
+\iflibertine@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} 
+\newcommand*{\LinuxLibertineInitialsT@scale}{1}  
+
+\ProcessOptionsX\relax
+
+\iflibertine@otf
+  \iflibertine@lining
+    \def\libertine@figurestyle{Lining}
+  \else
+    \def\libertine@figurestyle{OldStyle}
+  \fi
+  \iflibertine@tabular
+    \def\libertine@figurealign{Monospaced} 
+  \else
+    \def\libertine@figurealign{Proportional} 
+  \fi
+  \iflibertine@semibold
+     \def\libertine@boldstyle{RZ} 
+  \else
+    \def\libertine@boldstyle{RB} 
+  \fi
+
+\else % type1
+
+  \iflibertine@lining
+    \def\libertine@figurestyle{LF} 
+  \else
+    \def\libertine@figurestyle{OsF} 
+  \fi
+  \iflibertine@tabular
+    \def\libertine@figurealign{T} 
+  \else
+    \def\libertine@figurealign{} 
+  \fi
+  \iflibertine@semibold
+    \def\bfseries@rm{sb}
+  \else
+    \def\bfseries@rm{b}
+  \fi
+\fi
+
+
+\iflibertine@otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{mweights}
+  \RequirePackage{fontenc,fontaxes}
+\fi
+
+% Set main and/or sans and mono fonts:
+
+\iflibertine@otf
+
+  \def\libertine@base{LinLibertine}
+  \ifxetex\XeTeXtracingfonts=1\fi
+  \defaultfontfeatures{
+     Ligatures = TeX ,
+     Extension = .otf ,
+     SmallCapsFeatures={Letters=SmallCaps} 
+  }
+    \setmainfont
+          [ Numbers = {\libertine@figurealign,\libertine@figurestyle},
+            UprightFont    = *_R,
+            ItalicFont     = *_RI,
+            BoldFont       = *_\libertine@boldstyle, 
+            BoldItalicFont = *_\libertine@boldstyle I,
+          ] {\libertine@base}
+  \newfontfamily\libertine
+        [ Numbers = {\libertine@figurealign,\libertine@figurestyle},
+          UprightFont    = *_R,
+          ItalicFont     = *_RI,
+          BoldFont       = *_\libertine@boldstyle, 
+          BoldItalicFont = *_\libertine@boldstyle I,
+        ] {\libertine@base}
+  \newfontfamily\libertineSB
+        [ Numbers = {\libertine@figurealign,\libertine@figurestyle},
+          UprightFont    = *_R,
+          ItalicFont     = *_RI,
+          BoldFont       = *_RZ, 
+          BoldItalicFont = *_RZI,
+        ] {\libertine@base}
+  \newfontfamily\libertineOsF
+        [ Numbers = {\libertine@figurealign,OldStyle},
+          UprightFont    = *_R,
+          ItalicFont     = *_RI,
+          BoldFont       = *_\libertine@boldstyle, 
+          BoldItalicFont = *_\libertine@boldstyle I,
+        ] {\libertine@base}
+  \newfontfamily\libertineLF
+        [ Numbers = {\libertine@figurealign,Lining},
+          UprightFont    = *_R,
+          ItalicFont     = *_RI,
+          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}
+  \newfontface\libertineInitial{\libertine@base _I}
+
+  \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+
+\else % type1
+
+  \edef\libertine@family{LinuxLibertineT-\libertine@figurealign\libertine@figurestyle}
+
+  \def\rmdefault{\libertine@family} 
+  \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*\libertineInitial{\fontfamily{LinuxLibertineInitialsT-\libertine@figurealign\libertine@figurestyle}\selectfont}
+
+  \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+  \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+  \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
+
+\fi
+\DeclareTextFontCommand{\textsu}{\sufigures}
+\let\textsuperior\textsu
+
+% Define \oldstylenums[f] and \liningnums[f]
+
+\iflibertine@otf
+      \DeclareTextFontCommand{\oldstylenumsf}{\sffamily\oldstylenums}
+      \DeclareTextFontCommand{\liningnumsf}{\sffamily\liningnums}
+\else % type1
+      \DeclareTextFontCommand{\oldstylenums}{\libertineOsF}
+      \DeclareTextFontCommand{\liningnums}{\libertineLF}
+      \DeclareTextFontCommand{\oldstylenumsf}{\sffamily\oldstylenums}
+      \DeclareTextFontCommand{\liningnumsf}{\sffamily}
+\fi
+
+% Define \tabularnums[f] and \proportionalnums[f]
+
+\iflibertine@otf
+  \newfontfamily\libertinetabular
+    [ Numbers = {Monospaced,\libertine@figurestyle},
+      UprightFont = *_R,
+      ItalicFont = *_RI,
+      BoldFont = *_\libertine@boldstyle,
+      BoldItalicFont = *_\libertine@boldstyle I ,
+    ] {\libertine@base}
+  \newfontfamily\libertineproportional
+    [ Numbers = {Proportional,\libertine@figurestyle},
+      UprightFont    = *_R,
+      ItalicFont     = *_RI,
+      BoldFont       = *_\libertine@boldstyle, 
+      BoldItalicFont = *_\libertine@boldstyle I,
+    ] {\libertine@base}
+    \DeclareTextFontCommand{\tabularnums}{\libertinetabular}
+    \DeclareTextFontCommand{\proportionalnums}{\libertineproportional}
+\else % type1
+    \DeclareTextFontCommand{\tabularnums}{\fontfamily{LinuxLibertineT-T\libertine@figurestyle}\selectfont}
+    \DeclareTextFontCommand{\proportionalnums}{\fontfamily{LinuxLibertineT-\libertine@figurestyle}\selectfont}
+\fi
+
+\iflibertine@otf
+  \def\lib@fxl{LinLibertine_R}
+  \def\lib@fxi{LinLibertine_I}
+
+  \providecommand*\DeclareTextGlyphY[3]{%
+      % \DeclareTextGlyphY{fxl}{s_t}{64262}
+      % #1=basefont #2=glyphname, #3=position
+      \def\lib@temp{#1}%
+      \ifx\lib@temp\lib@fxl \@namedef{#1@#2}{{\libertine\char#3\relax}}\else%
+            \ifx\lib@temp\lib@fxi \@namedef{#1@#2}{{\libertineInitial\char#3\relax}}\else%
+      \fi\fi}
+  %
+  \input{LinLibertine_R}
+  \input{LinLibertine_I}
+  %
+  \DeclareRobustCommand*\libertineGlyph[1]{\@nameuse{LinLibertine_R@#1}}
+  \DeclareRobustCommand*\libertineInitialGlyph[1]{\@nameuse{LinLibertine_I@#1}}
+
+\else %type1
+  
+  \def\lib@ini{LinLibertine_I}
+  \providecommand*\DeclareTextGlyphY[3]{%
+      % \DeclareTextGlyphY{fxl}{s_t}{64262}
+      % #1=basefont #2=glyphname, #3=position
+      \def\lib@temp{#1}%
+      \ifx\lib@temp\lib@ini \@namedef{#1@#2}{{\libertineInitial\char#3\relax}}\else%
+      \fi}
+  %
+  \input{LinLibertine_I}
+  %
+  \DeclareRobustCommand*\libertineInitialGlyph[1]{\@nameuse{LinLibertine_I@#1}}
+
+\fi
+
+\iflibertine@otf
+% turn off defaults in case other fonts are selected:
+  \defaultfontfeatures{}
+\fi
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertine/mt-EBGaramond.cfg b/Master/texmf-dist/tex/latex/libertine/mt-EBGaramond.cfg
deleted file mode 100644
index 8277bcd2295..00000000000
--- a/Master/texmf-dist/tex/latex/libertine/mt-EBGaramond.cfg
+++ /dev/null
@@ -1,695 +0,0 @@
-%% microtype configuration file for EBGaramond.
-%% Created by Georg Duffner, based on the files 
-%% mt-LatinModernRoman.cfg and mt-pad.cfg which
-%% are provided with the “microtype” package by 
-%% R Schlicht
-%%  ------------------------------------------------------------------------ 
-%%
-\ProvidesFile
-  {mt-EBGaramond.cfg}[2012/05/05 v1.0 microtype config. file: EB Garamond]
-
-%%% -----------------------------------------------------------------------
-%%% INHERITANCE
-
-% for xetex (EU1) and luatex (EU2)
-\DeclareCharacterInheritance
-   { encoding = {EU1,EU2},
-     family   = EB Garamond }
-   { A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǻ,Ȁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ặ,/Adieresis.deu,%
-     А,Ӑ,Ӓ, % cyrillic 
-     Α % greek
-     },
-     Æ = {Ǽ,%
-     Ӕ  % cyrillic
-     },
-     B = {Ḃ,Ḅ,Ḇ,%
-     В, % cyrillic
-     Β  % greek
-     }, %฿
-     C = {Ç,Ć,Ĉ,Ċ,Č,Ḉ,%
-     С, % cyrillic
-     /uni03F9 % greek lunate Sigma
-     },
-     D = {Ð,Ď,Đ,Ḍ,Ḏ,Ḋ,Ḑ,Ḓ},
-     E = {È,É,Ê,Ë,Ē,Ĕ,Ė,Ę,Ě,Ȅ,Ȩ,Ȇ,Ḕ,Ḗ,Ḙ,Ḛ,Ḝ,Ẹ,Ẻ,Ẽ,Ế,Ề,Ể,Ễ,Ệ,%
-     Е,Ѐ,Ё,Ӗ, % cyrillic
-     Ε  % greek
-     },
-     F = {Ḟ},
-     G = {Ĝ,Ğ,Ġ,Ģ,Ǧ,Ǵ,Ḡ},
-     H = {Ĥ,Ħ,Ḥ,Ḧ,Ḫ,Ḩ,%
-     Н, % cyrillic
-     Η  % greek
-     },
-     I = {Ì,Í,Î,Ï,Ĩ,Ī,Ĭ,Į,İ,Ȉ,Ỉ,Ị,Ḭ,%
-     І,Ї,Ӏ, % cyrillic
-     Ι  % greek
-     },
-     J = {Ĵ,
-     Ј  % cyrillic
-     },
-     K = {Ķ,Ǩ,Ḱ,Ḳ,Ḵ,
-     К,Ќ, % cyrillic
-     Κ  % greek
-     },
-     L = {Ĺ,Ļ,Ł,Ḷ,Ľ,Ŀ,Ḹ,Ḻ,Ḽ},
-     M = {Ḿ,Ṁ,Ṃ,%
-     М, % cyrillic
-     Μ  % greek
-     },
-     N = {Ñ,Ń,Ņ,Ň,Ṅ,Ṇ,Ṉ,Ṋ,
-     Ν  % greek
-     },
-     O = {Ò,Ó,Ô,Õ,Ö,Ō,Ŏ,Ő,Ǒ,Ǫ,Ǭ,Ȍ,Ȏ,Ȫ,Ȭ,Ȯ,Ȱ,Ṍ,Ṏ,Ṑ,Ṓ,Ọ,Ỏ,Ố,Ồ,Ổ,Ỗ,Ộ,Ớ,Ờ,Ở,Ỡ,Ơ,/Odieresis.deu,%
-     О, % cyrillic
-     Ο  % greek
-     },
-     P = {%
-     Ρ  % greek
-     },
-     R = {Ŕ,Ŗ,Ř,Ȑ,Ȓ,Ṙ,Ṛ,Ṝ,Ṟ},
-     S = {Ś,Ŝ,Ş,Š,Ș,Ṡ,Ṣ,Ṥ,Ṧ,Ṩ,
-     Ѕ  % cyrillic
-     },
-     T = {Ţ,Ť,Ț,Ṭ,Ṯ,Ṱ,Ṫ,%
-     Т, % cyrillic
-     Τ  % greek
-     },
-     U = {Ù,Ú,Û,Ü,Ũ,Ū,Ŭ,Ů,Ű,Ų,Ǔ,Ǖ,Ǘ,Ǚ,Ǜ,Ȕ,Ȗ,Ṳ,Ṵ,Ṷ,Ṹ,Ṻ,Ụ,Ủ,Ứ,Ừ,Ử,Ữ,Ự,/Udieresis.deu},
-     V = {Ṽ,Ṿ,/U.LAT},
-     W = {Ŵ,Ẁ,Ẃ,Ẅ,Ẇ,Ẉ},
-     X = {Ẋ,Ẍ,
-     Х, % cyrillic
-     Χ  % greek
-     },
-     Y = {Ý,Ŷ,Ÿ,Ȳ,Ẏ,Ỳ,Ỵ,Ỷ,Ỹ,%
-     Ү  % cyrillic
-     },
-     Z = {Ź,Ż,Ž,Ẑ,Ẓ,Ẕ,%
-     Ζ  % greek
-     },%
-%%% Latin lowercase %%%
-     a = {à,á,â,ã,ä,å,ā,ă,ą,ǎ,ǟ,ǡ,ȧ,ǻ,ȁ,ȃ,ḁ,ạ,ả,ầ,ấ,ẩ,ẫ,ậ,ắ,ằ,ẳ,ẵ,ặ}, 
-     b = {ḃ,ḅ,ḇ},
-     c = {ç,ć,ĉ,ċ,č,ḉ},
-     d = {đ,ď,ḋ,ḍ,ḏ,ḑ,ḓ},
-     e = {è,é,ê,ë,ē,ĕ,ė,ę,ě,ȅ,ȩ,ȇ,ḕ,ḗ,ḙ,ḛ,ḝ,ẹ,ẻ,ẽ,ề,ế,ể,ễ,ệ},
-     f = {ḟ,ff,/f.long,/f.DEU,/f_f},
-     fl = {ffl,/longs_l,/longs_longs_l,/f_l},
-     fi = {ffi,/longs_i,/longs_longs_i,/f_i},
-     /f.short = {/f_f.short},
-     g = {ĝ,ğ,ġ,ģ,ǧ,ǵ,ḡ},
-     h = {ĥ,ħ,ȟ,ḣ,ḥ,ḧ,ḩ,ḫ,ẖ},
-     i = {ı,ì,í,î,ȉ,ǐ,ï,į,ī,ị,ĩ,ḭ,ḯ,ỉ,ȋ,ĭ,/i.TRK},
-     j = {ĵ,ǰ},
-     k = {ķ,ǩ,ḱ,ḳ,ḵ},
-     l = {ĺ,ļ,ł,ḷ,ḹ,ľ,ḽ},
-     m = {ḿ,ṁ,ṃ},
-     n = {ñ,ń,ņ,ň,ǹ,ṅ,ṇ,ṉ,ṋ},
-     o = {ò,ó,ô,õ,ö,ō,ŏ,ő,ǒ,ǫ,ǭ,ȍ,ȏ,ȫ,ȭ,ȯ,ȱ,ṍ,ṏ,ṑ,ṓ,ọ,ỏ,ồ,ố,ổ,ỗ,ộ,ớ,ờ,ở,ỡ,ợ,ø},
-     p = {ṕ,ṗ},
-     r = {ŕ,ŗ,ř,ȑ,ṛ,ṙ,ṝ,ṟ},
-     s = {ś,ŝ,ş,š,ș,ṡ,ṣ,ṥ,ṧ,ṩ},
-     t = {ţ,ț,ṭ,ṯ,ẗ,ť,ṱ},
-     u = {ù,ú,û,ü,ũ,ū,ŭ,ů,ű,ų,ǔ,ǖ,ǘ,ǚ,ǜ,ȕ,ȗ,ṳ,ṵ,ṷ,ṹ,ṻ,ụ,ủ,ứ,ừ,ử,ữ,ự,/u.LATmedi},
-     w = {ŵ,ẁ,ẃ,ẅ,ẇ,ẉ,ẘ},
-     x = {ẋ,ẍ},
-     y = {ý,ÿ,ŷ,ȳ,ẏ,ẙ,ỳ,ỵ,ỷ,ỹ},
-     z = {ź,ż,ž,ẑ,ẓ,ẕ},
-%%% Smallcaps %%%
-     /a.sc = {/A.sc},
-     /ae.sc = {/AE.sc},
-     /d.sc = {/D.sc},
-     /f.sc = {/F.sc},
-     /g.sc = {/G.sc},
-     /j.sc = {/J.sc},
-     /l.sc = {/L.sc},
-     /o.sc = {/O.sc},
-     /oe.sc = {/OE.sc},
-     /q.sc = {/Q.sc},
-     /r.sc = {/R.sc},
-     /t.sc = {/T.sc},
-     /y.sc = {/Y.sc}, 
-   }
-
-%%% -----------------------------------------------------------------------
-%%% PROTRUSION
-\SetProtrusion
-   [ name     = EBGaramond-default ]
-   {  }
-   {
-     A = {50,50},
-%     Æ = {50,  },
-     C = {50,  },
-     D = {  ,50},
-     F = {  ,50},
-     G = {50,  },
-     J = {50,  },
-     K = {  ,50},
-     L = {  ,50},
-     O = {50,50},
-%     Π= {50,  },
-     Q = {50,70},
-     T = {50,50},
-     V = {50,50},
-     W = {50,50},
-     X = {50,50},
-     Y = {50,50},
-     k = {  ,50},
-     p = {50,50},
-     q = {50,  },
-     r = {  ,50},
-     t = {  ,70},
-     v = {50,50},
-     w = {50,50},
-     x = {50,50},
-     y = {  ,50},
-%     þ = {  ,50},
-
-%     /one.lnum   = {150,150},
-%     /two.lnum   = {50,50},
-%     /three.lnum = {50,50},
-%     /four.lnum  = {50,50},
-%     /five.lnum  = {50,50},
-%     /six.lnum   = {50,50},
-%     /seven.lnum = {50,80},
-%     /nine.lnum  = {50,50},
-     . = { ,700},
-    {,}= { ,500},
-     : = { ,500},
-     ; = { ,300},
-     ! = { ,100},
-     ? = { ,100},
-     @ = {50,50},
-     ~ = {200,250},
-     & = {50,100},
-    \% = {50,50},
-     * = {300,300},
-     + = {300,300},
-     - = {300,500},  % /hyphen
-%     – = {300,300},  % /endash
-%     — = {200,200},  % /emdash
-%     _ = {100,100},  % /underscore
-     / = {100,200},
-%     /backslash     = {100,200},
-%     ' = {400,500}, % /quotesingle
-%     ‘ = {400,400},  ’ = {300,500},
-%     “ = {400,400},  ” = {300,500},
-%     ‚ = {400,400},  „ = {400,400},
-%     ‹ = {400,400},  › = {300,500},
-%     « = {300,300},  » = {200,400},
-%     ¡ = {100,   },  ¿ = {100,   },
-     ( = {100,   },  ) = {   ,200},
-%     <  = {200,100}, > = {100,200},	
-%     /braceleft = {400,200}, /braceright = {200,400},
-%%    /angleleft = {400,   }, /angleright = {   ,400},
-%     † = {100,100},
-%     ‡ = { 80, 80},
-%     • = {   ,100},
-%     · = {300,400}, % / periodcentered
-%      ℃ = { 80,   },
-%%    ₡ = { 50,   },
-%     ° = {400,400},
-%     ™ = {100,100},
-%     © = {100,100},
-%     ® = {100,100},
-%     ª = {200,200},
-%     º = {200,200},
-%     ¹ = {200,200},
-%     ² = {200,200},
-%     ³ = {200,200},
-%     ¬ = {200,   },
-%     /paragraph = {   ,100},
-%     − = {300,300}, % minus
-%     ± = {150,200},
-%     × = {100,150},
-%     ÷ = {150,200},
-%     € = { 50,100},
-     1 = {100,100},
-     3 = { 50,   },
-     4 = { 50,   },
-     7 = { 50, 80},
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-it ]
-   {  }
-   {
-     A = {50,  },
-%     Æ = {50,  },
-     B = {50,  },
-     C = {100, },
-     D = {50,50},
-     E = {50,  },
-     F = {100, },
-     G = {100, },
-     H = {50,  },
-     I = {50,  },
-%     IJ = {50,  },  % IJ
-     J = {50,  },
-     K = {50,  },
-     L = {50,  },
-     O = {100, },
-%     Π= {100, },
-     P = {50,  },
-     Q = {100, },
-     R = {50,  },
-     S = {50,  },
-     $ = {50,  },
-     T = {100, },
-     U = {50,  },
-     V = {100, },
-     W = {100, },
-     f = { ,-100},
-%     /f.short     = { ,-50},
-%     /longs.short = { ,-40},
-%     /one.lnum    = {150, },
-%     /two.lnum    = {50,  },
-%     /four.lnum   = {150, },
-%     /seven.lnum  = {100, },
-     . = { ,500},
-    {,}= { ,500},
-     : = { ,300},
-     ; = { ,300},
-     & = {50,50},
-    \% = {100, },
-     * = {500,100},
-     + = {250,200},
-     @ = {50,50},
-     ~ = {200,150},
-     ( = {200, },     ) = {  ,200},
-     / = {100,200},
-%     /backslash         = {100,200},
-     - = {300,400},   % hyphen
-%     – = {300,300},   % endash
-%     — = {200,200},   % emdash
-%     _ = {100,100},   % underscore
-%     ‘ = {800,200},   ’ = {800,200},
-%     “ = {700,200},   ” = {700,200},
-%     ‚ = {500,500},   „ = {400,400},
-%     ‹ = {500,400},   › = {300,500},
-%     « = {300,300},   » = {200,400},
-%     ¡ = {100,   },   ¿ = {200,   },
-%     /braceleft   = {400,100},   /braceright    = {200,200},
-%     < = {300,100},   > = {200,100}
-   }
-   
-
-%%% LuaTeX and XeTeX
-\SetProtrusion
-   [ name     = EBGaramond-EU
-     load     = EBGaramond-default ]
-   { encoding = {EU1,EU2},
-     family   = EB Garamond }
-   {
-     Æ = {50,  },
-     Π= {50,  },
-     þ = {  ,50},
-
-     1 = {100,100},
-     3 = { 50,   },
-     4 = { 50,   },
-     7 = { 50, 80},
-
-     /one.lnum   = {150,150},
-     /two.lnum   = {50,50},
-     /three.lnum = {50,50},
-     /four.lnum  = {50,50},
-     /five.lnum  = {50,50},
-     /six.lnum   = {50,50},
-     /seven.lnum = {50,80},
-     /nine.lnum  = {50,50},
-
-     – = {300,300},  % /endash
-     — = {200,200},  % /emdash
-     _ = {100,100},  % /underscore
-
-     /backslash     = {100,200},
-     ' = {400,500}, % /quotesingle
-     ‘ = {400,400},  ’ = {300,500},
-     “ = {400,400},  ” = {300,500},
-     ‚ = {400,400},  „ = {400,400},
-     ‹ = {400,400},  › = {300,500},
-     « = {300,300},  » = {200,400},
-     ¡ = {100,   },  ¿ = {100,   },
-
-     <  = {200,100}, > = {100,200},	
-     /braceleft = {400,200}, /braceright = {200,400},
-%    /angleleft = {400,   }, /angleright = {   ,400},
-     † = {100,100},
-     ‡ = { 80, 80},
-     • = {   ,100},
-     · = {300,400}, % / periodcentered
-      ℃ = { 80,   },
-%    ₡ = { 50,   },
-     ° = {400,400},
-     ™ = {100,100},
-     © = {100,100},
-     ® = {100,100},
-     ª = {200,200},
-     º = {200,200},
-     ¹ = {200,200},
-     ² = {200,200},
-     ³ = {200,200},
-     ¬ = {200,   },
-     /paragraph = {   ,100},
-     − = {300,300}, % minus
-     ± = {150,200},
-     × = {100,150},
-     ÷ = {150,200},
-     € = { 50,100},
-
-     Γ = {   ,150}, % /Gamma
-     Δ = {100,100}, % /Delta
-     Θ = { 50, 50}, % /Theta
-     Λ = {100,100}, % /Lambda
-%    Ξ = {,},       % /Xi
-%    Π = {,},       % /Pi
-     Σ = { 50, 50}, % /Sigma
-     Υ = {100,100}, % /Upsilon
-     Φ = { 50, 50}, % /Phi
-     Ψ = { 50, 50}, % /Psi
-%    Ω = {,},       % /Omega   
-     /a.sc = {50,50},
-     /ae.sc = {50,  },
-     /d.sc = {  ,50},
-     /f.sc = {  ,50},
-     /g.sc = {50,  },
-     /j.sc = {50,  },
-     /l.sc = {  ,50},
-     /o.sc = {50,50},
-     /oe.sc = {50,  },
-     /q.sc = {50,70},
-     /r.sc = {  , 0},
-     /t.sc = {50,50},
-     /y.sc = {50,50}, 
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-it-EU,
-     load     = EBGaramond-it ]
-   { encoding = {EU1,EU2},
-     family   = EB Garamond,
-     shape    = {it,sl} }
-   {
-     Æ = {50,  },
-     IJ = {50,  },  % IJ
-     Π= {100, },
-     /f.short     = { ,-50},
-     /longs.short = { ,-40},
-     /one.lnum    = {150, },
-     /two.lnum    = {50,  },
-     /four.lnum   = {150, },
-     /seven.lnum  = {100, },
-     – = {300,300},   % endash
-     — = {200,200},   % emdash
-     _ = {100,100},   % underscore
-     ‘ = {800,200},   ’ = {800,200},
-     “ = {700,200},   ” = {700,200},
-     ‚ = {500,500},   „ = {400,400},
-     ‹ = {500,400},   › = {300,500},
-     « = {300,300},   » = {200,400},
-     ¡ = {100,   },   ¿ = {200,   },
-     /braceleft   = {400,100},   /braceright    = {200,200},
-     < = {300,100},   > = {200,100}
-   }
-   
-%%% pdfTeX encodings
-
-\SetProtrusion
-   [ name     = EBGaramond-OT1-OsF,
-     load     = EBGaramond-default ]
-   { encoding = OT1,
-     family   = {EBGaramond-OsF,EBGaramond-TOsF} }
-   {
-     \AE = {50,  },
-     \OE = {50,  },
-     1 = {100,100},
-     3 = { 50,   },
-     4 = { 50,   },
-     7 = { 50, 80},
-     \textendash = {300,300},  % /endash
-     \textemdash = {200,200},  % /emdash
-     \textunderscore = {100,100},  % /underscore
-     \textbackslash = {100,200},
-     \textquoteleft = {400,400},  \textquoteright = {300,500},
-     \textquotedblleft = {400,400},  \textquotedblright = {300,500},
-     \textexclamdown = {100,   },  \textquestiondown = {100,   },
-     \textless  = {200,100}, \textgreater = {100,200},	
-     \textbraceleft = {400,200}, \textbraceright = {200,400},
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-T1-OsF,
-     load     = EBGaramond-OT1-OsF ]
-   { encoding = {T1,LY1},
-     family   = {EBGaramond-OsF,EBGaramond-TOsF} }
-   {
-     \TH = {  ,50},
-     \quotesinglbase   = {400,400},   \quotedblbase      = {400,400},
-     \guilsinglleft    = {400,400},   \guilsinglright    = {300,500},
-     \guillemotleft    = {300,300},   \guillemotright    = {200,400},
-     \textexclamdown   = {100,   },   \textquestiondown  = {100,   },
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-OT1-LF,
-     load     = EBGaramond-default ]
-   { encoding = OT1,
-     family   = {EBGaramond-LF,EBGaramond-TLF} }
-   {
-     \AE = {50,  },
-     \OE = {50,  },
-     1   = {150,150},
-     2   = {50,50},
-     3   = {50,50},
-     4   = {50,50},
-     5   = {50,50},
-     6   = {50,50},
-     7   = {50,80},
-     8   = {50,50},
-     \textendash = {300,300},  % /endash
-     \textemdash = {200,200},  % /emdash
-     \textunderscore = {100,100},  % /underscore
-     \textbackslash = {100,200},
-     \textquoteleft = {400,400},  \textquoteright = {300,500},
-     \textquotedblleft = {400,400},  \textquotedblright = {300,500},
-     \textexclamdown = {100,   },  \textquestiondown = {100,   },
-     \textless  = {200,100}, \textgreater = {100,200},	
-     \textbraceleft = {400,200}, \textbraceright = {200,400},
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-T1-LF,
-     load     = EBGaramond-OT1-LF ]
-   { encoding = {T1,LY1},
-     family   = {EBGaramond-LF,EBGaramond-TLF} }
-   {
-     \TH = {  ,50},
-     \quotesinglbase   = {400,400},   \quotedblbase      = {400,400},
-     \guilsinglleft    = {400,400},   \guilsinglright    = {300,500},
-     \guillemotleft    = {300,300},   \guillemotright    = {200,400},
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-it-OT1-OsF,
-     load     = EBGaramond-it   ]
-   { encoding = OT1,
-     family   = {EBGaramond-OsF,EBGaramond-TOsF},
-     shape    = {it,sl}  }
-   {
-   \AE = {50,  },
-   \OE = {100, },
-%     1 = {150, },
-%     2 = {50,  },
-%     4 = {150, },
-%     7 = {100, },
-     \textendash       = {300,300},   \textemdash        = {200,200},
-     \textunderscore = {100,100},  % /underscore
-     \textbackslash = {100,200},
-     \textquoteleft = {400,400},  \textquoteright = {300,500},
-     \textquotedblleft = {400,400},  \textquotedblright = {300,500},
-     \textexclamdown = {100,   },  \textquestiondown = {200,   },
-     \textless  = {300,100}, \textgreater = {200,100},	
-     \textbraceleft = {400,100}, \textbraceright = {200,200},
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-it-T1-OsF,
-     load     = EBGaramond-it-OT1-OsF   ]
-   { encoding = {T1,LY1},
-     family   = {EBGaramond-OsF,EBGaramond-TOsF},
-     shape    = {it,sl}  }
-   {
-     156 = {50,  },  % IJ
-     \quotesinglbase   = {500,500},   \quotedblbase      = {400,400},
-     \guilsinglleft    = {500,400},   \guilsinglright    = {300,500},
-     \guillemotleft    = {300,300},   \guillemotright    = {200,400},
-  }
-
-\SetProtrusion
-   [ name     = EBGaramond-it-OT1-LF,
-     load     = EBGaramond-it   ]
-   { encoding = OT1,
-     family   = {EBGaramond-LF,EBGaramond-TLF},
-     shape    = {it,sl}  }
-   {
-     \AE = {50,  },
-     \OE = {100, },
-     1   = {150, },
-     2   = {50,  },
-     4   = {150, },
-     7   = {100, },
-     \textendash       = {300,300},   \textemdash        = {200,200},
-     \textunderscore = {100,100},  % /underscore
-     \textbackslash = {100,200},
-     \textquoteleft = {400,400},  \textquoteright = {300,500},
-     \textquotedblleft = {400,400},  \textquotedblright = {300,500},
-     \textexclamdown = {100,   },  \textquestiondown = {200,   },
-     \textless  = {300,100}, \textgreater = {200,100},	
-     \textbraceleft = {400,100}, \textbraceright = {200,200},
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-it-T1-LF,
-     load     = EBGaramond-it-OT1-LF   ]
-   { encoding = {T1,LY1},
-     family   = {EBGaramond-LF,EBGaramond-TLF},
-     shape    = {it,sl}  }
-   {
-     156 = {50,  },  % IJ
-     \quotesinglbase   = {500,500},   \quotedblbase      = {400,400},
-     \guilsinglleft    = {500,400},   \guilsinglright    = {300,500},
-     \guillemotleft    = {300,300},   \guillemotright    = {200,400},
-  }
-
-\SetProtrusion
-   [ name     = EBGaramond-sc-OT1,
-     load     = EBGaramond-default ]
-   { encoding = OT1,
-     family   = {EBGaramond-LF,EBGaramond-OsF,EBGaramond-Sup,EBGaramond-TLF,EBGaramond-TOsF},
-     shape    = sc }
-   {
-     a = {50,50},
-   \ae = {50,  },
-     d = {  ,50},
-     f = {  ,50},
-     g = {50,  },
-     j = {50,  },
-     l = {  ,50},
-%   013 = {  ,50}, % fl
-     o = {50,50},
-   \oe = {50,  },
-     q = {50,70},
-     r = {  , 0},
-     t = {50,50},
-     y = {50,50}
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-sc-T1,
-     load     = EBGaramond-default     ]
-   { encoding = {T1,LY1},
-     family   = {EBGaramond-LF,EBGaramond-OsF,EBGaramond-Sup,EBGaramond-TLF,EBGaramond-TOsF},
-     shape    = sc }
-   {
-     a = {50,50},
-   \ae = {50,  },
-     d = {  ,50},
-     f = {  ,50},
-     g = {50,  },
-     j = {50,  },
-     l = {  ,50},
-%   029 = {  ,50}, % fl
-     o = {50,50},
-   \oe = {50,  },
-     q = {50,70},
-     r = {  , 0},
-     t = {50,50},
-     y = {50,50}
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-textcomp ]
-   { encoding = TS1,
-     family   = {EBGaramond-LF,EBGaramond-OsF,EBGaramond-TLF,EBGaramond-TOsF} }
-   {
-%     \textquotestraightbase    = {400,400},
-%     \textquotestraightdblbase = {400,400},
-%     \texttwelveudash          = {200,200},
-%     \textthreequartersemdash  = {150,150},
-     \textquotesingle          = {400,500},
-%     \textasteriskcentered     = {300,300},
-     \textthreeoldstyle        = { 50,   },
-     \textfouroldstyle         = { 50,   },
-     \textsevenoldstyle        = { 50, 80},
-     \textminus                = {300,300},
-%     \textlbrackdbl            = {100,   },
-%     \textrbrackdbl            = {   ,100},
-%     \texttildelow             = {200,250},
-     \textdagger               = {100,100},
-     \textdaggerdbl            = { 80, 80},
-     \textbullet               = {   ,100},
-     \textcelsius              = { 80,   },
-%     \textflorin               = {   ,100},
-%     \textcolonmonetary        = { 50,   },
-     \texttrademark            = {100,100},
-     \textcopyright            = {100,100},
-     \textordfeminine          = {200,200},
-     \textlnot                 = {200,   },
-     \textregistered           = {100,100},
-     \textdegree               = {400,400},
-     \textpm                   = {150,200},
-     \texttwosuperior          = {200,200},
-     \textthreesuperior        = {200,200},
-     \textparagraph            = {   ,100},
-     \textperiodcentered       = {300,400},
-     \textonesuperior          = {200,200},
-     \textordmasculine         = {200,200},
-     \texteuro                 = { 50,100},
-     \texttimes                = {100,150},
-     \textdiv                  = {150,200}
-   }
-
-\SetProtrusion
-   [ name     = EBGaramond-textcomp-it ]
-   { encoding = TS1,
-     family   = {EBGaramond-LF,EBGaramond-OsF,EBGaramond-TLF,EBGaramond-TOsF},
-     shape    = {it,sl} }
-   {
-%     \textquotestraightbase    = {400,400},
-%     \textquotestraightdblbase = {300,400},
-%     \texttwelveudash          = {200,200},
-%     \textthreequartersemdash  = {150,150},
-     \textquotesingle          = {800,100},
-%     \textasteriskcentered     = {500,100},
-     \textoneoldstyle          = {100,   },
-     \texttwooldstyle          = { 50,   },
-     \textfouroldstyle         = { 50,100},
-     \textsevenoldstyle        = { 50,   },
-     \textminus                = {300,300},
-%     \textlbrackdbl            = {100,   },
-%     \textrbrackdbl            = {   ,100},
-%     \texttildelow             = {200,250},
-     \textdagger               = {200,100},
-     \textdaggerdbl            = { 80, 80},
-     \textbullet               = {300,   },
-     \textcelsius              = {200,   },
-%     \textflorin               = {100,   },
-%     \textcolonmonetary        = {100,   },
-     \texttrademark            = {200,   },
-     \textcopyright            = {200,100},
-     \textlnot                 = {300,   },
-     \textregistered           = {200,100},
-     \textdegree               = {500,100},
-     \textpm                   = {200,150},
-     \textonesuperior          = {300,100},
-     \texttwosuperior          = {300,   },
-     \textthreesuperior        = {300,   },
-     \textperiodcentered       = {300,400},
-     \texteuro                 = {100,   },
-     \texttimes                = {200,100},
-     \textdiv                  = {200,200}
-   }
-
-\endinput