The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 37137f43f4ace0d5e6bf90fdb0815753ad301178 Author: Juergen Spitzmueller <[email protected]> Date: Fri Aug 17 14:11:02 2012 +0200 Support for the libertine font (#3881) diff --git a/development/FORMAT b/development/FORMAT index fac656b..d69da59 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -11,6 +11,10 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx. ----------------------- +2012-08-17 Jürgen Spitzmüller <[email protected]> + * Format incremented to 434 + Support for the libertine LaTeX font. + 2012-06-22 Uwe Stöhr <[email protected]> * Format incremented to 433 switch the Armenian language support from ArmTeX to XeTeX/polyglossia diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index 90bc64f..efbc0d7 100644 --- a/lib/chkconfig.ltx +++ b/lib/chkconfig.ltx @@ -359,6 +359,7 @@ \TestPackage{eco} \TestPackage{feyn} \TestPackage{fourier} +\TestPackage{libertine} \TestPackage{lmodern} \TestPackage{luximono} \TestPackage{tipa} diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx index 804be2f..d13259f 100644 --- a/lib/doc/LaTeXConfig.lyx +++ b/lib/doc/LaTeXConfig.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 413 +\lyxformat 433 \begin_document \begin_header \textclass article @@ -28,15 +28,21 @@ \use_hyperref false \papersize default \use_geometry false -\use_amsmath 0 -\use_esint 0 -\use_mathdots 0 -\use_mhchem 0 +\use_package amsmath 0 +\use_package amssymb 0 +\use_package esint 0 +\use_package mathdots 0 +\use_package mathtools 0 +\use_package mhchem 0 +\use_package undertilde 0 \cite_engine basic +\cite_engine_type numerical +\biblio_style plain \use_bibtopic false \use_indices false \paperorientation portrait \suppress_date false +\justification true \use_refstyle 0 \index Index \shortcut idx @@ -583,6 +589,35 @@ luximono \end_layout \begin_layout Subsection +Libertine +\end_layout + +\begin_layout Description +Found: +\begin_inset Info +type "package" +arg "libertine" +\end_inset + + +\end_layout + +\begin_layout Description +CTAN: +\family sans +fonts/libertine-legacy/ +\end_layout + +\begin_layout Description +Notes: The +\family sans +libertine(-legacy) +\family default + package provides support for the Libertine roman and the Biolinum sans + serif families of fonts. +\end_layout + +\begin_layout Subsection psnfss \end_layout diff --git a/lib/latexfonts b/lib/latexfonts index 72743c9..7fad86e 100644 --- a/lib/latexfonts +++ b/lib/latexfonts @@ -101,6 +101,13 @@ Font cmr OsfPackage eco EndFont +Font libertine + GuiName "Libertine" + Family rm + OsfOption osf + Package libertine +EndFont + Font lmodern GuiName "Latin Modern Roman" Family rm diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index cb702d8..bc0c5b3 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -825,6 +825,25 @@ def revert_armenian(document): document.header[i] = "\\use_non_tex_fonts false" +def revert_libertine(document): + " Revert native libertine font definition to LaTeX " + + if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1: + i = find_token(document.header, "\\font_roman libertine", 0) + if i != -1: + osf = False + j = find_token(document.header, "\\font_osf true", 0) + if j != -1: + osf = True + preamble = "\\usepackage" + if osf: + preamble += "[osf]" + preamble += "{libertine}" + add_to_preamble(document, [preamble]) + document.header[i] = "\\font_roman default" + document.header[j] = "\\font_osf false" + + ## # Conversion hub # @@ -850,10 +869,12 @@ convert = [ [430, [convert_listoflistings]], [431, [convert_use_amssymb]], [432, []], - [433, [convert_armenian]] + [433, [convert_armenian]], + [434, []] ] revert = [ + [433, [revert_libertine]], [432, [revert_armenian]], [431, [revert_languages, revert_ancientgreek]], [430, [revert_use_amssymb]], diff --git a/src/version.h b/src/version.h index d6977a5..ead5f99 100644 --- a/src/version.h +++ b/src/version.h @@ -30,8 +30,8 @@ extern char const * const lyx_version_info; // Do not remove the comment below, so we get merge conflict in // independent branches. Instead add your own. -#define LYX_FORMAT_LYX 433 // uwestoehr: Armenian support via polyglossia/XeTeX -#define LYX_FORMAT_TEX2LYX 433 // uwestoehr: Armenian support via polyglossia/XeTeX +#define LYX_FORMAT_LYX 434 // spitz: support for the libertine font +#define LYX_FORMAT_TEX2LYX 434 // spitz: support for the libertine font #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX #ifndef _MSC_VER ----------------------------------------------------------------------- Summary of changes: development/FORMAT | 4 ++++ lib/chkconfig.ltx | 1 + lib/doc/LaTeXConfig.lyx | 45 ++++++++++++++++++++++++++++++++++++++++----- lib/latexfonts | 7 +++++++ lib/lyx2lyx/lyx_2_1.py | 23 ++++++++++++++++++++++- src/version.h | 4 ++-- 6 files changed, 76 insertions(+), 8 deletions(-) hooks/post-receive -- The LyX Source Repository
