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
This commit is contained in:
Uwe Stöhr 2011-10-25 15:54:53 +00:00
parent ad8c0df251
commit 999222b0c2
2 changed files with 9 additions and 5 deletions

View File

@ -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

View File

@ -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);
}
}
}