The branch, master, has been updated. - Log -----------------------------------------------------------------
commit e74b088c266c815b3b71910e6c642eba2d431816 Author: Juergen Spitzmueller <[email protected]> Date: Thu Nov 22 08:51:40 2012 +0100 Revert "Support for the new libertine package" This reverts commit ecbed31e805018b573e59170c65fddde7da32f75. This package does not make sense for us. It is just a portmanteau package that loads libertine-type1 and biolinum-type1. Using this package directly results in option clashes if libertine and biolinum are both selected. Sorry for the noise. diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx index d2c3142..cbe1652 100644 --- a/lib/doc/LaTeXConfig.lyx +++ b/lib/doc/LaTeXConfig.lyx @@ -309,7 +309,7 @@ Biolinum Found: \begin_inset Info type "package" -arg "libertine" +arg "biolinum-type1" \end_inset @@ -318,13 +318,13 @@ arg "libertine" \begin_layout Description CTAN: \family typewriter -fonts/libertine/ +fonts/biolinum-type1/ \end_layout \begin_layout Description Notes: The \family sans -libertine +biolinum-type1 \family default package provides support for the \emph on @@ -341,23 +341,27 @@ Libertine Biolinum \emph default supports Old Style Figures, which will be automatically activated if those - figures are available and requested for the font. + figures are available and requested for the roman font. An older version of the font is provided by the package \family sans -biolinum-type1 +libertine-legacy \family default (found: \begin_inset Info type "package" -arg "biolinum-type1" +arg "libertine" \end_inset ). - It is selected automatically if the -\family sans -libertine -\family default - package is not available. + If you only have this package, you will need to set the roman font to +\emph on +Libertine +\emph default + and the Sans Serif font to +\emph on +Standard +\emph default + in order to get Biolinum. \end_layout \begin_layout Subsection @@ -741,7 +745,7 @@ Libertine Found: \begin_inset Info type "package" -arg "libertine" +arg "libertine-type1" \end_inset @@ -750,36 +754,30 @@ arg "libertine" \begin_layout Description CTAN: \family typewriter -fonts/libertine/ +fonts/libertine-type1/ \end_layout \begin_layout Description Notes: The -\family typewriter -libertine +\family sans +libertine-type1 \family default package provides support for the \emph on Libertine \emph default roman family of fonts. - An older versions of the package, libertine-type1 (found: + An older version of the package, +\family sans +libertine-legacy +\family default + (found: \begin_inset Info type "package" -arg "libertine-type1" +arg "libertine" \end_inset -) is also supported and used as a fallback, as well as the even older package - also called -\family typewriter -libertine -\family default - (for which, however, old style figures cannot be supported properly due - to option conflicts with the new -\family typewriter -libertine -\family default - package). +), is also supported and used as a fallback. \end_layout \begin_layout Subsection diff --git a/lib/latexfonts b/lib/latexfonts index f7c73b3..9f86ed6 100644 --- a/lib/latexfonts +++ b/lib/latexfonts @@ -135,17 +135,8 @@ Font libertine Family rm OsfOption lining OsfDefault 1 - Package libertine - PackageOption rm - AltFonts libertine-type1,libertine-legacy -EndFont - -AltFont libertine-type1 - GuiName "Libertine" - Family rm - OsfOption lining - OsfDefault 1 Package libertine-type1 + AltFonts libertine-legacy EndFont AltFont libertine-legacy @@ -406,16 +397,6 @@ Font biolinum Family sf OsfOption lining OsfDefault 1 - Package libertine - PackageOption sf - AltFonts biolinum-type1 -EndFont - -Font biolinum-type1 - GuiName "Biolinum" - Family sf - OsfOption lining - OsfDefault 1 Package biolinum-type1 EndFont ----------------------------------------------------------------------- Summary of changes: lib/doc/LaTeXConfig.lyx | 54 ++++++++++++++++++++++------------------------ lib/latexfonts | 21 +----------------- 2 files changed, 27 insertions(+), 48 deletions(-) hooks/post-receive -- The LyX Source Repository
