From: Uwe Stöhr Date: Tue, 25 Oct 2011 15:54:53 +0000 (+0000) Subject: tex2lyx: fix handling of fourier: Utopia as roman font can be combined with any other... X-Git-Tag: 2.1.0beta1~2502 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=999222b0c26546e4744bedb54b67f4e99b1c81ca;p=features.git tex2lyx: fix handling of fourier: Utopia as roman font can be combined with any other tt font, not only with tt-fourier 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 203d85bc25..c48f4b72fb 100644 --- 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 1b161addb5..47f9e4b5e0 100644 --- 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); + } } }