tex2lyx: support for the Libertine fonts

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index f138348b90111fac60d1026142a478c64c4b945f..526940a5b111b7c57985114d4f002ff6c71db8be 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -137,8 +137,8 @@ const char * const known_kurier_fonts[] = { "kurier", "kurierl",
 "kurier-condensed", "kurier-light-condensed", 0};
 
 const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
-"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
-"newcent", "tgcursor", "txtt", 0};
+"courier", "lmtt", "luximono", "fourier", "libertineMono-type1", "lmodern",
+"mathpazo", "mathptmx", "newcent", "tgcursor", "txtt", 0};
 
 const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0};
 
@@ -727,14 +727,19 @@ void Preamble::handle_package(Parser &p, string const & name,
        // sansserif fonts
        if (is_known(name, known_sans_fonts)) {
                h_font_sans = name;
-               if (options.size() == 1) {
+               if (options.size() >= 1) {
                        if (scale_as_percentage(opts, h_font_sf_scale))
                                options.clear();
                }
        }
 
-       if (name == "biolinum-type1")
+       if (name == "biolinum-type1") {
                h_font_sans = "biolinum";
+               // biolinum can have several options, e.g. [osf,scaled=0.97]
+               string::size_type pos = opts.find("osf");
+               if (pos != string::npos)
+                       h_font_osf = "true";
+       }
 
        // typewriter fonts
        if (is_known(name, known_typewriter_fonts)) {
@@ -742,13 +747,17 @@ void Preamble::handle_package(Parser &p, string const & name,
                // fourier as typewriter is handled in handling of \ttdefault
                if (name != "fourier") {
                        h_font_typewriter = name;
-                       if (options.size() == 1) {
+                       if (options.size() >= 1) {
                                if (scale_as_percentage(opts, h_font_tt_scale))
                                        options.clear();
                        }
                }
        }
 
+       if (name == "libertineMono-type1") {
+               h_font_typewriter = "libertine-mono";
+       }
+
        // font uses old-style figure
        if (name == "eco")
                h_font_osf = "true";

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 656f7b1db07433b0643e910677a42d2b775e260f..f3dd52e29b75deab1c4469166cece3fac2fe0361 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -79,13 +79,6 @@ Format LaTeX feature                        LyX feature
 459    beamer: \begin{frame},               \begin_layout Frame
        \begin{frame}[plain],                \begin_layout PlainFrame
        \begin{frame}[fragile]               \begin_layout FragileFrame
-462    New libertine LaTeX fonts:
-       \usepackage[scale|scaled|ttscale=$val]{libertineMono-type1}
-                                            \font_typewriter
-                                            \font_tt_scale
-       \usepackage[scale|scaled=$val]{biolinum-type1}
-                                            \font_sans
-                                            \font_sf_scale
 466   Powerdot updates:                     
       \pause[]                              layout Pause
       \onslide{}{}                          InsetFlex, InsetArgument

diff --git a/status.21x b/status.21x
index d9fd412c2299bf64021c4da77b4841ffd2d2458f..9c1043cd6a49d0cdd04bef73ca80f0deeddabab3 100644 (file)
--- a/status.21x
+++ b/status.21x
@@ -47,6 +47,8 @@ What's new
 
 - Support for the math font of the Iwona and Kurier font families.
 
+- Support for the Libertine fonts.
+
 
 * USER INTERFACE
 
@@ -131,7 +133,7 @@ What's new
 
 - Fix wrong test in LyX server.
 
-- Fix possible memory corruption on copying to the clipboard
+- Fix possible memory corruption on copying to the clipboard.
 
 - Fix possible memory corruption during LaTeX log file parsing.