preamble.cpp: addition to r21970: ad support for the two possible font options

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21993 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 803d637e2126d82880054a855bd9beee3b66e298..b2ad48c85697509f985703fae5f7050acc366ce5 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -203,8 +203,12 @@ void handle_package(string const & name, string const & opts)
        // roman fonts
        if (is_known(name, known_roman_fonts))
                h_font_roman = name;
-       if (name == "fourier")
+       if (name == "fourier") {
                h_font_roman = "utopia";
+               // when font uses real small capitals
+               if (opts == "expert")
+                       h_font_sc = "true";
+       }
        if (name == "mathpazo")
                h_font_roman = "palatino";
        if (name == "mathptmx")
@@ -214,7 +218,7 @@ void handle_package(string const & name, string const & opts)
                h_font_sans = name;
                if (!opts.empty()) {
                        scale = opts;
-                       pos = scale.find(".", 0);
+                       pos = scale.find(".");
                        h_font_sf_scale = scale.erase(0, pos + 1);
                }
        }
@@ -223,10 +227,13 @@ void handle_package(string const & name, string const & opts)
                h_font_typewriter = name;
                if (!opts.empty()) {
                        scale = opts;
-                       pos = scale.find(".", 0);
+                       pos = scale.find(".");
                        h_font_tt_scale = scale.erase(0, pos + 1);
                }
        }
+       // font uses old-style figure
+       if (name == "eco")
+               h_font_osf = "true";
 
        else if (name == "amsmath" || name == "amssymb")
                h_use_amsmath = "1";