// needed to handle encodings with babel
bool one_language = true;
string h_inputencoding = "auto";
-string h_paragraph_separation = "indent";
+string h_paragraph_separation = "indent";
+
+// necessary to avoid that our preamble stuff is added at each tex2lyx run
+// which would pollute the preamble when doing roundtrips
+bool ifundefined_color_set = false;
namespace {
const char * const known_swedish_quotes_languages[] = {"finnish",
"swedish", 0};
+/// known language packages from the times before babel
+const char * const known_old_language_packages[] = {"french", "frenchle",
+"frenchpro", "german", "ngerman", "pmfrench", 0};
+
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};
string h_use_default_options = "false";
string h_options;
string h_language = "english";
-string h_language_package = "default";
+string h_language_package = "none";
string h_fontencoding = "default";
string h_font_roman = "default";
string h_font_sans = "default";
string h_paperorientation = "portrait";
string h_suppress_date = "false";
string h_use_refstyle = "0";
+string h_backgroundcolor;
+string h_boxbgcolor;
+string h_fontcolor;
string h_notefontcolor;
string h_secnumdepth = "3";
string h_tocdepth = "3";
// 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);
+ }
}
}
else if (name == "undertilde")
h_use_undertilde = "2";
- else if (name == "babel" && !opts.empty()) {
- // check if more than one option was used - used later for inputenc
- // in case inputenc is parsed before babel, set the encoding to auto
- if (options.begin() != options.end() - 1) {
- one_language = false;
- h_inputencoding = "auto";
+ else if (name == "babel") {
+ h_language_package = "default";
+ // we have to do nothing if babel is loaded without any options, otherwise
+ // we would pollute the preamble with this call in every roundtrip
+ if (!opts.empty()) {
+ // check if more than one option was used - used later for inputenc
+ // in case inputenc is parsed before babel, set the encoding to auto
+ if (options.begin() != options.end() - 1) {
+ one_language = false;
+ h_inputencoding = "auto";
+ }
+ // babel takes the last language of the option of its \usepackage
+ // call as document language. If there is no such language option, the
+ // last language in the documentclass options is used.
+ handle_opt(options, known_languages, h_language);
+ delete_opt(options, known_languages);
}
- // babel takes the last language of the option of its \usepackage
- // call as document language. If there is no such language option, the
- // last language in the documentclass options is used.
- handle_opt(options, known_languages, h_language);
- delete_opt(options, known_languages);
}
else if (name == "fontenc") {
h_fontencoding = getStringFromVector(options, ",");
- /* We could do the following for better round trip support,
- * but this makes the document less portable, so I skip it:
- if (h_fontencoding == lyxrc.fontenc)
+ // as of version LyX 2.0 "T1" is equal to the setting "global"
+ if (h_fontencoding == "T1")
h_fontencoding = "global";
- */
options.clear();
}
options.clear();
}
+ else if (is_known(name, known_old_language_packages)) {
+ // known language packages from the times before babel
+ // if they are found and not also babel, they will be used as
+ // cutom language package
+ h_language_package = "\\usepackage{" + name + "}";
+ }
+
else if (name == "makeidx")
; // ignore this
else if (name == "color") {
// with the following command this package is only loaded when needed for
// undefined colors, since we only support the predefined colors
- h_preamble << "\\@ifundefined{definecolor}\n {\\usepackage{color}}{}\n";
+ // only add it if not yet added
+ if (!ifundefined_color_set)
+ h_preamble << "\\@ifundefined{definecolor}\n {\\usepackage{color}}{}\n";
}
else if (name == "graphicx")
else if (name == "setspace")
; // ignore this
+#if 0
+ // do not ignore as long as we don't support all commands (e.g. \xout is missing)
+ else if (name == "ulem")
+ ; // ignore this
+#endif
+
else if (name == "geometry")
; // Ignore this, the geometry settings are made by the \geometry
// command. This command is handled below.
<< "\\paperorientation " << h_paperorientation << '\n'
<< "\\suppress_date " << h_suppress_date << '\n'
<< "\\use_refstyle " << h_use_refstyle << '\n';
+ if (!h_fontcolor.empty())
+ os << "\\fontcolor " << h_fontcolor << '\n';
if (!h_notefontcolor.empty())
os << "\\notefontcolor " << h_notefontcolor << '\n';
+ if (!h_backgroundcolor.empty())
+ os << "\\backgroundcolor " << h_backgroundcolor << '\n';
+ if (!h_boxbgcolor.empty())
+ os << "\\boxbgcolor " << h_boxbgcolor << '\n';
os << h_margins
<< "\\secnumdepth " << h_secnumdepth << "\n"
<< "\\tocdepth " << h_tocdepth << "\n"
else if (t.cs() == "pagestyle")
h_paperpagestyle = p.verbatim_item();
+ else if (t.cs() == "date") {
+ if (p.verbatim_item().empty())
+ h_suppress_date = "true";
+ }
+
else if (t.cs() == "makeatletter") {
// LyX takes care of this
p.setCatCode('@', catLetter);
string const color = p.getArg('{', '}');
string const space = p.getArg('{', '}');
string const value = p.getArg('{', '}');
- if (color == "note_fontcolor" && space == "rgb") {
+ if (color == "document_fontcolor" && space == "rgb") {
+ RGBColor c(RGBColorFromLaTeX(value));
+ h_fontcolor = X11hexname(c);
+ } else if (color == "note_fontcolor" && space == "rgb") {
RGBColor c(RGBColorFromLaTeX(value));
h_notefontcolor = X11hexname(c);
+ } else if (color == "page_backgroundcolor" && space == "rgb") {
+ RGBColor c(RGBColorFromLaTeX(value));
+ h_backgroundcolor = X11hexname(c);
+ } else if (color == "shadecolor" && space == "rgb") {
+ RGBColor c(RGBColorFromLaTeX(value));
+ h_boxbgcolor = X11hexname(c);
} else {
h_preamble << "\\definecolor{" << color
<< "}{" << space << "}{" << value
string const arg1 = p.verbatim_item();
string const arg2 = p.verbatim_item();
string const arg3 = p.verbatim_item();
- if (!in_lyx_preamble) {
+ // test case \@ifundefined{date}{}{\date{}}
+ if (arg1 == "date" && arg2.empty() && arg3 == "\\date{}") {
+ h_suppress_date = "true";
+ // test case \@ifundefined{definecolor}{\usepackage{color}}{}
+ // because we could pollute the preamble with it in roundtrips
+ } else if (arg1 == "definecolor" && arg2 == "\\usepackage{color}"
+ && arg3.empty()) {
+ ifundefined_color_set = true;
+ } else if (!in_lyx_preamble) {
h_preamble << t.asInput()
<< '{' << arg1 << '}'
<< '{' << arg2 << '}'
projects / lyx.git / blobdiff