diff options
Diffstat (limited to 'Master/texmf-dist')
3 files changed, 50 insertions, 149 deletions
diff --git a/Master/texmf-dist/tex/latex/libertine/LinuxBiolinumT.sty b/Master/texmf-dist/tex/latex/libertine/LinuxBiolinumT.sty deleted file mode 100644 index dc6ad417a66..00000000000 --- a/Master/texmf-dist/tex/latex/libertine/LinuxBiolinumT.sty +++ /dev/null @@ -1,44 +0,0 @@ -%% Generated by autoinst on 2012/11/26 -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{LinuxBiolinumT} - [2012/11/26 (autoinst) Style file for LinuxBiolinumT.] - -\RequirePackage[T1,LY1]{fontenc} -\RequirePackage{textcomp} -\IfFileExists{fontaxes.sty}{ - \RequirePackage{fontaxes} - \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 - -}{} - -\IfFileExists{xkeyval.sty}{ - \newcommand*{\LinuxBiolinumT@scale}{1} - \RequirePackage{xkeyval} - \DeclareOptionX{scaled}{\renewcommand*{\LinuxBiolinumT@scale}{##1}} -}{ - \let\DeclareOptionX\DeclareOption - \let\ExecuteOptionsX\ExecuteOptions - \let\ProcessOptionsX\ProcessOptions -} - -\DeclareOptionX{lining}{\edef\LinuxBiolinumT@figurestyle{LF}} -\DeclareOptionX{oldstyle}{\edef\LinuxBiolinumT@figurestyle{OsF}} -\DeclareOptionX{tabular}{\edef\LinuxBiolinumT@figurealign{T}} -\DeclareOptionX{proportional}{\edef\LinuxBiolinumT@figurealign{}} -\DeclareOptionX{bold}{\renewcommand*{\bfdefault}{b}} -\DeclareOptionX{regular}{\renewcommand*{\mddefault}{m}} -\ExecuteOptionsX{oldstyle,proportional,bold,regular} -\ProcessOptionsX\relax - -\renewcommand* - {\rmdefault} - {LinuxBiolinumT-\LinuxBiolinumT@figurealign\LinuxBiolinumT@figurestyle} -\renewcommand*{\familydefault}{\rmdefault} - -\endinput diff --git a/Master/texmf-dist/tex/latex/libertine/LinuxLibertineT.sty b/Master/texmf-dist/tex/latex/libertine/LinuxLibertineT.sty deleted file mode 100644 index d72b6b10265..00000000000 --- a/Master/texmf-dist/tex/latex/libertine/LinuxLibertineT.sty +++ /dev/null @@ -1,45 +0,0 @@ -%% Generated by autoinst on 2012/11/26 -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{LinuxLibertineT} - [2012/11/26 (autoinst) Style file for LinuxLibertineT.] - -\RequirePackage[T1,LY1]{fontenc} -\RequirePackage{textcomp} -\IfFileExists{fontaxes.sty}{ - \RequirePackage{fontaxes} - \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 - -}{} - -\IfFileExists{xkeyval.sty}{ - \newcommand*{\LinuxLibertineT@scale}{1} - \RequirePackage{xkeyval} - \DeclareOptionX{scaled}{\renewcommand*{\LinuxLibertineT@scale}{##1}} -}{ - \let\DeclareOptionX\DeclareOption - \let\ExecuteOptionsX\ExecuteOptions - \let\ProcessOptionsX\ProcessOptions -} - -\DeclareOptionX{lining}{\edef\LinuxLibertineT@figurestyle{LF}} -\DeclareOptionX{oldstyle}{\edef\LinuxLibertineT@figurestyle{OsF}} -\DeclareOptionX{tabular}{\edef\LinuxLibertineT@figurealign{T}} -\DeclareOptionX{proportional}{\edef\LinuxLibertineT@figurealign{}} -\DeclareOptionX{semibold}{\renewcommand*{\bfdefault}{sb}} -\DeclareOptionX{bold}{\renewcommand*{\bfdefault}{b}} -\DeclareOptionX{regular}{\renewcommand*{\mddefault}{m}} -\ExecuteOptionsX{oldstyle,proportional,bold,regular} -\ProcessOptionsX\relax - -\renewcommand* - {\rmdefault} - {LinuxLibertineT-\LinuxLibertineT@figurealign\LinuxLibertineT@figurestyle} -\renewcommand*{\familydefault}{\rmdefault} - -\endinput diff --git a/Master/texmf-dist/tex/latex/libertine/libertine.sty b/Master/texmf-dist/tex/latex/libertine/libertine.sty index cc2e23ec475..421a2d54df6 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/11/26 (Bob Tennent) Supports Libertine and Biolinum fonts for all LaTeX engines. ] + 2012/11/27 (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 @@ -130,6 +130,8 @@ \iflibertine@otf + \def\libertine@base{LinLibertine530} + \def\biolinum@base{LinBiolinum530} \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , @@ -143,7 +145,7 @@ ItalicFont = *_RI, BoldFont = *_\libertine@boldstyle, BoldItalicFont = *_\libertine@boldstyle I - ] {LinLibertine530} + ] {\libertine@base} \fi \iflibertine@sf \setsansfont @@ -153,7 +155,7 @@ ItalicFont = *_RI , BoldFont = *_RB , BoldItalicFont = *_RBO % oblique to fake italic - ] {LinBiolinum530} + ] {\biolinum@base} % grab the \sfdefault in case it changes subsequently: \let\biolinum@family\sfdefault \iflibertine@sfdefault\renewcommand*\familydefault{\biolinum@family}\fi @@ -164,28 +166,28 @@ ItalicFont = *_RI, BoldFont = *_\libertine@boldstyle, BoldItalicFont = *_\libertine@boldstyle I - ] {LinLibertine530} + ] {\libertine@base} \newfontfamily\libertineSB [ Numbers = {\libertine@figurealign,\libertine@figurestyle}, UprightFont = *_R, ItalicFont = *_RI, BoldFont = *_RZ, BoldItalicFont = *_RZI - ] {LinLibertine530} + ] {\libertine@base} \newfontfamily\libertineOsF [ Numbers = {\libertine@figurealign,OldStyle}, UprightFont = *_R, ItalicFont = *_RI, BoldFont = *_\libertine@boldstyle, BoldItalicFont = *_\libertine@boldstyle I - ] {LinLibertine530} + ] {\libertine@base} \newfontfamily\libertineLF [ Numbers = {\libertine@figurealign,Lining}, UprightFont = *_R, ItalicFont = *_RI, BoldFont = *_\libertine@boldstyle, BoldItalicFont = *_\libertine@boldstyle I - ] {LinLibertine530} + ] {\libertine@base} \newfontfamily\biolinum [ Numbers = {\biolinum@figurealign, \biolinum@figurestyle} , Scale = \LinuxBiolinumT@scale , @@ -193,7 +195,7 @@ ItalicFont = *_RI , BoldFont = *_RB , BoldItalicFont = *_RBO % oblique to fake italic - ] {LinBiolinum530} + ] {\biolinum@base} \newfontfamily\biolinumOsF [ Numbers = {\biolinum@figurealign, OldStyle} , Scale = \LinuxBiolinumT@scale , @@ -201,7 +203,7 @@ ItalicFont = *_RI , BoldFont = *_RB , BoldItalicFont = *_RBO % oblique to fake italic - ] {LinBiolinum530} + ] {\biolinum@base} \newfontfamily\biolinumLF [ Numbers = {\biolinum@figurealign} , % lnum feature missing Scale = \LinuxBiolinumT@scale , @@ -209,9 +211,9 @@ ItalicFont = *_RI , BoldFont = *_RB , BoldItalicFont = *_RBO % oblique to fake italic - ] {LinBiolinum530} + ] {\biolinum@base} - \newcommand\sufigures{\addfontfeatures{VerticalPosition=Superior}} + \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}} \else % type1 @@ -221,13 +223,13 @@ \iflibertine@rm \renewcommand*\rmdefault{\libertine@family} \fi \iflibertine@sf \renewcommand*\sfdefault{\biolinum@family} \fi \iflibertine@sfdefault \renewcommand*\familydefault{\biolinum@family} \fi - \newcommand*\libertine{\fontfamily{\libertine@family}\selectfont} - \newcommand*\libertineSB{\fontfamily{\libertine@family}\selectfont\renewcommand\bfdefault{sb}} - \newcommand*\libertineOsF{\fontfamily{LinuxLibertineT-\libertine@figurealign OsF}\selectfont} - \newcommand*\libertineLF{\fontfamily{LinuxLibertineT-\libertine@figurealign LF}\selectfont} - \newcommand*\biolinum{\fontfamily{\biolinum@family}\selectfont} - \newcommand*\biolinumOsF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign OsF}\selectfont} - \newcommand*\biolinumLF{\fontfamily{LinuxBiolinumT-\biolinum@figurealign LF}\selectfont} + \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*\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} @@ -241,17 +243,17 @@ \iflibertine@otf \iflibertine@rm - \renewcommand*\oldstylenums[1]{{\libertineOsF #1}} - \renewcommand*\liningnums[1]{{\libertineLF #1}} + \DeclareTextFontCommand{\oldstylenums}{\libertineOsF} + \DeclareTextFontCommand{\liningnums}{\libertineLF} \fi \iflibertine@sf - \newcommand*\oldstylenumsf[1]{{\biolinumOsF #1}} - \newcommand*\liningnumsf[1]{{\biolinumLF #1}} + \DeclareTextFontCommand{\oldstylenumsf}{\biolinumOsF} + \DeclareTextFontCommand{\liningnumsf}{\biolinumLF} \fi \iflibertine@rm \iflibertine@sf\else % Libertine only - \newcommand*\oldstylenumsf [1]{\textsf{\oldstylenums{#1}}} - \newcommand*\liningnumsf [1]{\textsf{\liningnums{#1}}} + \DeclareTextFontCommand{\oldstylenumsf}{\sffamily\oldstylenums} + \DeclareTextFontCommand{\liningnumsf}{\sffamily\liningnums} \fi \else \iflibertine@sf % Biolinum only @@ -261,29 +263,21 @@ \else % type1 \iflibertine@rm \iflibertine@sf % Both Libertine and Biolinum - \renewcommand*\oldstylenums [1] - {{\libertineOsF#1}} - \newcommand*\liningnums [1] - {{\libertineLF#1}} - \newcommand*\oldstylenumsf [1] - {{\biolinumOsF#1}} - \newcommand*\liningnumsf [1] - {{\biolinumLF#1}} + \DeclareTextFontCommand{\oldstylenums}{\libertineOsF} + \DeclareTextFontCommand{\liningnums}{\libertineLF} + \DeclareTextFontCommand{\oldstylenumsf}{\biolinumOsF} + \DeclareTextFontCommand{\liningnumsf}{\biolinumLF} \else % Libertine only - \renewcommand*\oldstylenums [1] - {{\libertineOsF#1}} - \newcommand*\liningnums [1] - {{\libertineLF#1}} - \newcommand*\oldstylenumsf [1]{\textsf{\oldstylenums{#1}}} - \newcommand*\liningnumsf [1]{\textsf{#1}} + \DeclareTextFontCommand{\oldstylenums}{\libertineOsF} + \DeclareTextFontCommand{\liningnums}{\libertineLF} + \DeclareTextFontCommand{\oldstylenumsf}{\sffamily\oldstylenums} + \DeclareTextFontCommand{\liningnumsf}{\sffamily} \fi \else % Biolinum only % \oldstylenums defined by \textcomp? - \newcommand*\liningnums [1]{#1} - \newcommand*\oldstylenumsf [1] - {{\biolinumOsF#1}} - \newcommand*\liningnumsf [1] - {{\biolinumLF#1}} + \DeclareTextFontCommand{\liningnums}{} + \DeclareTextFontCommand{\oldstylenumsf}{\biolinumOsF} + \DeclareTextFontCommand{\liningnumsf}{\biolinumLF} \fi \fi @@ -296,14 +290,14 @@ ItalicFont = *_RI, BoldFont = *_\libertine@boldstyle, BoldItalicFont = *_\libertine@boldstyle I - ] {LinLibertine530} + ] {\libertine@base} \newfontfamily\libertineproportional [ Numbers = {Proportional,\libertine@figurestyle}, UprightFont = *_R, ItalicFont = *_RI, BoldFont = *_\libertine@boldstyle, BoldItalicFont = *_\libertine@boldstyle I - ] {LinLibertine530} + ] {\libertine@base} \newfontfamily\biolinumtabular [ Numbers = {Monospaced,\biolinum@figurestyle}, Scale = \LinuxBiolinumT@scale , @@ -311,7 +305,7 @@ ItalicFont = *_RI, BoldFont = *_RB, BoldItalicFont = *_RBO % oblique to fake italic - ] {LinBiolinum530} + ] {\biolinum@base} \newfontfamily\biolinumproportional [ Numbers = {Proportional,\biolinum@figurestyle}, Scale = \LinuxBiolinumT@scale , @@ -319,27 +313,23 @@ ItalicFont = *_RI, BoldFont = *_RB, BoldItalicFont = *_RBO % oblique to fake italic - ] {LinBiolinum530} + ] {\biolinum@base} \iflibertine@rm - \newcommand*\tabularnums[1]{{\libertinetabular #1}} - \newcommand*\proportionalnums[1]{{\libertineproportional #1}} + \DeclareTextFontCommand{\tabularnums}{\libertinetabular} + \DeclareTextFontCommand{\proportionalnums}{\libertineproportional} \fi \iflibertine@sf - \newcommand*\tabularnumsf[1]{{\biolinumtabular #1}} - \newcommand*\proportionalnumsf[1]{{\biolinumproportional #1}} + \DeclareTextFontCommand{\tabularnumsf}{\biolinumtabular} + \DeclareTextFontCommand{\proportionalnumsf}{\biolinumproportional} \fi \else % type1 \iflibertine@rm - \newcommand*\tabularnums[1] - {{\fontfamily{LinuxLibertineT-T\libertine@figurestyle}\selectfont#1}} - \newcommand*\proportionalnums[1] - {{\fontfamily{LinuxLibertineT-\libertine@figurestyle}\selectfont#1}} + \DeclareTextFontCommand{\tabularnums}{\fontfamily{LinuxLibertineT-T\libertine@figurestyle}\selectfont} + \DeclareTextFontCommand{\proportionalnums}{\fontfamily{LinuxLibertineT-\libertine@figurestyle}\selectfont} \fi \iflibertine@sf - \newcommand*\tabularnumsf[1] - {{\fontfamily{LinuxBiolinumT-T\biolinum@figurestyle}\selectfont#1}} - \newcommand*\proportionalnumsf[1] - {{\fontfamily{LinuxBiolinumT-\biolinum@figurestyle}\selectfont#1}} + \DeclareTextFontCommand{\tabularnumsf}{\fontfamily{LinuxBiolinumT-T\biolinum@figurestyle}\selectfont} + \DeclareTextFontCommand{\proportionalnumsf}{\fontfamily{LinuxBiolinumT-\biolinum@figurestyle}\selectfont} \fi \fi @@ -347,7 +337,7 @@ \def\lib@fxl{fxl} \def\lib@fxb{fxb} - \newcommand*\DeclareTextGlyphY[3]{% + \providecommand*\DeclareTextGlyphY[3]{% % \DeclareTextGlyphY{fxl}{s_t}{64262} % #1=basefont #2=glyphname, #3=position \def\lib@temp{#1}% |