tex2lyx: fix handling of fourier: Utopia as roman font can be combined with any other...

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

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 203d85bc255043b543121c3380b86f2e534267e1..c48f4b72fbbd5e29dd64e69c772e8f64f532fcdc 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -19,7 +19,7 @@ Format LaTeX feature                        LyX feature
 228    draft                                InsetExternal
 231    sidewaysfigure/sidewaystable         InsetFloat
 232    bibtopic                             InsetBibTeX
-247    utopia.sty, ccfonts.sty,             font settings (header)
+247    ccfonts.sty,   font settings (header)
        chancery.sty, beraserif.sty
 248    booktabs.sty                         InsetTabular
 254    esint.sty                            \use_esint

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 1b161addb5cb70a66e621cc1a3cfc6381c3c768f..47f9e4b5e022e35a4fda137b42af56f209cdfd81 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -503,10 +503,14 @@ void handle_package(Parser &p, string const & name, string const & opts,
 
        // typewriter fonts
        if (is_known(name, known_typewriter_fonts)) {
-               h_font_typewriter = name;
-               if (!opts.empty()) {
-                       scale = opts;
-                       h_font_tt_scale = scale_as_percentage(scale);
+               // fourier can be set as roman font _only_
+               // fourier as typewriter is handled in handling of \ttdefault
+               if (name != "fourier") {
+                       h_font_typewriter = name;
+                       if (!opts.empty()) {
+                               scale = opts;
+                               h_font_tt_scale = scale_as_percentage(scale);
+                       }
                }
        }