anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 01:22:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx/preamble.cpp:

Browse Source 
- support for url, varioref, prettyref
- reduce the sometimes huge amount of whitespace in the preamble after importing files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30068 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-06-12 11:58:41 +00:00
parent 345e954e94
commit 8673417a51
1 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/tex2lyx/preamble.cpp
View File

@ -256,20 +256,28 @@ void handle_package(Parser &p, string const & name, string const & opts,
string scale; string scale;
// roman fonts // roman fonts
if (is_known(name, known_roman_fonts)) if (is_known(name, known_roman_fonts)) {
h_font_roman = name; h_font_roman = name;
p.skip_spaces();
}
if (name == "fourier") { if (name == "fourier") {
h_font_roman = "utopia"; h_font_roman = "utopia";
// when font uses real small capitals // when font uses real small capitals
if (opts == "expert") if (opts == "expert")
h_font_sc = "true"; h_font_sc = "true";
p.skip_spaces();
} }
if (name == "mathpazo")
h_font_roman = "palatino";
if (name == "mathptmx") if (name == "mathpazo") {
h_font_roman = "palatino";
p.skip_spaces();
}
if (name == "mathptmx") {
h_font_roman = "times"; h_font_roman = "times";
p.skip_spaces();
}
// sansserif fonts // sansserif fonts
if (is_known(name, known_sans_fonts)) { if (is_known(name, known_sans_fonts)) {
@ -278,7 +286,9 @@ void handle_package(Parser &p, string const & name, string const & opts,
scale = opts; scale = opts;
h_font_sf_scale = scale_as_percentage(scale); h_font_sf_scale = scale_as_percentage(scale);
} }
p.skip_spaces();
} }
// typewriter fonts // typewriter fonts
if (is_known(name, known_typewriter_fonts)) { if (is_known(name, known_typewriter_fonts)) {
h_font_typewriter = name; h_font_typewriter = name;
@ -286,13 +296,19 @@ void handle_package(Parser &p, string const & name, string const & opts,
scale = opts; scale = opts;
h_font_tt_scale = scale_as_percentage(scale); h_font_tt_scale = scale_as_percentage(scale);
} }
p.skip_spaces();
} }
// font uses old-style figure
if (name == "eco")
h_font_osf = "true";
else if (name == "amsmath" || name == "amssymb") // font uses old-style figure
if (name == "eco") {
h_font_osf = "true";
p.skip_spaces();
}
else if (name == "amsmath" || name == "amssymb") {
h_use_amsmath = "2"; h_use_amsmath = "2";
p.skip_spaces();
}
else if (name == "babel" && !opts.empty()) { else if (name == "babel" && !opts.empty()) {
// check if more than one option was used - used later for inputenc // check if more than one option was used - used later for inputenc
@ -321,9 +337,10 @@ void handle_package(Parser &p, string const & name, string const & opts,
h_language = "ukrainian"; h_language = "ukrainian";
h_quotes_language = h_language; h_quotes_language = h_language;
} }
p.skip_spaces();
} }
else if (name == "fontenc") else if (name == "fontenc")
; // ignore this p.skip_spaces(); // ignore this
else if (name == "inputenc") { else if (name == "inputenc") {
// only set when there is not more than one inputenc // only set when there is not more than one inputenc
@ -341,27 +358,39 @@ void handle_package(Parser &p, string const & name, string const & opts,
if (!options.empty()) if (!options.empty())
p.setEncoding(options.back()); p.setEncoding(options.back());
options.clear(); options.clear();
p.skip_spaces();
} }
else if (name == "makeidx") else if (name == "makeidx")
; // ignore this p.skip_spaces(); // ignore this
else if (name == "prettyref")
p.skip_spaces(); // ignore this
else if (name == "varioref")
p.skip_spaces(); // ignore this
else if (name == "verbatim") else if (name == "verbatim")
; // ignore this p.skip_spaces(); // ignore this
else if (name == "color") else if (name == "url")
p.skip_spaces(); // ignore this
else if (name == "color") {
// with the following command this package is only loaded when needed for // with the following command this package is only loaded when needed for
// undefined colors, since we only support the predefined colors // undefined colors, since we only support the predefined colors
h_preamble << "\\@ifundefined{definecolor}\n {\\usepackage{color}}{}\n"; h_preamble << "\\@ifundefined{definecolor}\n {\\usepackage{color}}{}\n";
p.skip_spaces();
}
else if (name == "graphicx") else if (name == "graphicx")
; // ignore this p.skip_spaces(); // ignore this
else if (name == "setspace") else if (name == "setspace")
; // ignore this p.skip_spaces(); // ignore this
else if (name == "geometry") else if (name == "geometry")
; // Ignore this, the geometry settings are made by the \geometry p.skip_spaces(); // Ignore this, the geometry settings are made by the \geometry
// command. This command is handled below. // command. This command is handled below.
else if (is_known(name, known_languages)) { else if (is_known(name, known_languages)) {
@ -378,7 +407,9 @@ void handle_package(Parser &p, string const & name, string const & opts,
else else
h_language = name; h_language = name;
h_quotes_language = h_language; h_quotes_language = h_language;
p.skip_spaces();
} }
else if (name == "natbib") { else if (name == "natbib") {
h_cite_engine = "natbib_authoryear"; h_cite_engine = "natbib_authoryear";
vector<string>::iterator it = vector<string>::iterator it =
@ -392,9 +423,14 @@ void handle_package(Parser &p, string const & name, string const & opts,
options.erase(it); options.erase(it);
} }
} }
p.skip_spaces();
} }
else if (name == "jurabib")
else if (name == "jurabib") {
h_cite_engine = "jurabib"; h_cite_engine = "jurabib";
p.skip_spaces();
}
else if (!in_lyx_preamble) { else if (!in_lyx_preamble) {
if (options.empty()) if (options.empty())
h_preamble << "\\usepackage{" << name << "}"; h_preamble << "\\usepackage{" << name << "}";