backporting tex2lyx: the font support (status entries follow at the end of the backpo...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39981 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 6d147f48438c465ae7aac3c41339e318b7ee288f..66088754620ee5a88da610196964001e34d3294d 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -19,8 +19,6 @@ Format LaTeX feature                        LyX feature
 228    draft                                InsetExternal
 231    sidewaysfigure/sidewaystable         InsetFloat
 232    bibtopic                             InsetBibTeX
-247    utopia.sty, ccfonts.sty,             font settings (header)
-       chancery.sty, beraserif.sty
 248    booktabs.sty                         InsetTabular
 254    esint.sty                            \use_esint
 266    armenian                             \language, \lang

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 3a23c575514975edc20bed4bc90a72bb6cff71c0..e2da19c951178526e919899582be4b151c8e0e21 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -49,7 +49,7 @@ const char * const modules_placeholder = "\001modules\001";
 // needed to handle encodings with babel
 bool one_language = true;
 string h_inputencoding = "auto";
-string h_paragraph_separation    = "indent";
+string h_paragraph_separation = "indent";
 
 namespace {
 
@@ -129,8 +129,9 @@ const char * const known_swedish_quotes_languages[] = {"finnish",
 
 char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
 
-const char * const known_roman_fonts[] = { "ae", "bookman", "charter",
-"cmr", "fourier", "lmodern", "mathpazo", "mathptmx", "newcent", 0};
+const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
+"ccfonts", "chancery", "charter", "cmr", "fourier", "lmodern", "mathpazo",
+"mathptmx", "newcent", "utopia", 0};
 
 const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
 "helvet", "lmss", 0};
@@ -495,10 +496,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);
+                       }
                }
        }