The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 2066b57ca2a348a4f527d288fd0a1c60a9d1ec4c
Author: Uwe Stöhr <[email protected]>
Date:   Mon Feb 11 14:22:56 2013 +0100

    tex2lyx: support for libertine

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index d4c0b03..58cf930 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -124,9 +124,9 @@ const char * const known_old_language_packages[] = 
{"french", "frenchle",
 char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
 
 const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx", 
"libertine-type1",
-"lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent", "tgbonum",
-"tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
+"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx", "libertine",
+"libertine-type1", "lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent",
+"tgbonum", "tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
 
 const char * const known_sans_fonts[] = { "avant", "berasans", 
"biolinum-type1",
 "cmbr", "cmss", "helvet", "kurier", "kurierl", "lmss", "tgadventor", 
"tgheros", 0};
@@ -678,6 +678,12 @@ void Preamble::handle_package(Parser &p, string const & 
name,
                        h_font_osf = "true";
        }
 
+       if (name == "libertine") {
+               h_font_roman = "libertine-legacy";
+               if (opts == "osf")
+                       h_font_osf = "true";
+       }
+
        if (name == "libertine-type1") {
                h_font_roman = "libertine";
                if (opts == "lining")
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index eee8571..28298b6 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -60,8 +60,6 @@ Format LaTeX feature                        LyX feature
 411    support for polyglossia              \language_package  (the cases of 
no package, of babel and of custom package is supported)
 415    undertilde.sty                       fonts
 427    tipa.sty \begin{IPA}, \textipa       InsetTIPA
-434    libertine.sty,                       \font_osf, \font_roman
-       libertine-legacy.sty
 438    \tone{51}, \tone{15}, \tone{45},     InsetTIPA
        \tone{12}, \tone{454}, \toptiebar,
        \bottomtiebar

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/Preamble.cpp |   12 +++++++++---
 src/tex2lyx/TODO.txt     |    2 --
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to