// 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};
"ifcancel", "ifcolortbl", "ifeurosym", "ifmarginnote", "ifmmode", "ifpdf",
"ifsidecap", "ifupgreek", 0};
+const char * const known_basic_colors[] = {"blue", "black", "cyan", "green",
+"magenta", "red", "white", "yellow", 0};
+
+const char * const known_basic_color_codes[] = {"#0000ff", "#000000", "#00ffff", "#00ff00",
+"#ff00ff", "#ff0000", "#ffffff", "#ffff00", 0};
+
/// conditional commands with three arguments like \@ifundefined{}{}{}
const char * const known_if_3arg_commands[] = {"@ifundefined", "IfFileExists",
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";
// 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);
+ }
}
}
if (name == "eco")
h_font_osf = "true";
+ // after the detection and handling of special cases, we can remove the
+ // fonts, otherwise they would appear in the preamble, see bug #7856
+ if (is_known(name, known_roman_fonts) || is_known(name, known_sans_fonts)
+ || is_known(name, known_typewriter_fonts))
+ ;
+
else if (name == "amsmath" || name == "amssymb")
h_use_amsmath = "2";
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") {
* but this makes the document less portable, so I skip it:
if (h_fontencoding == lyxrc.fontenc)
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")
; // Ignore this, the geometry settings are made by the \geometry
// command. This command is handled below.
+ else if (name == "rotfloat")
+ ; // ignore this
+
+ else if (name == "wrapfig")
+ ; // ignore this
+
+ else if (name == "subfig")
+ ; // ignore this
+
else if (is_known(name, known_languages))
h_language = name;
else if (t.cs() == "pagestyle")
h_paperpagestyle = p.verbatim_item();
+ else if (t.cs() == "date") {
+ string argument = p.getArg('{', '}');
+ if (argument.empty())
+ h_suppress_date = "true";
+ else
+ h_preamble << t.asInput() << '{' << argument << '}';
+ }
+
+ else if (t.cs() == "color") {
+ string argument = p.getArg('{', '}');
+ // check the case that a standard color is used
+ if (is_known(argument, known_basic_colors))
+ h_fontcolor = color2code(argument);
+ // check the case that LyX's document_fontcolor is defined
+ // but not used for \color
+ if (argument != "document_fontcolor"
+ && !is_known(argument, known_basic_colors)) {
+ h_preamble << t.asInput() << '{' << argument << '}';
+ // the color might already be set because \definecolor
+ // is parsed before this
+ h_fontcolor = "";
+ }
+ }
+
+ else if (t.cs() == "pagecolor") {
+ string argument = p.getArg('{', '}');
+ // check the case that a standard color is used
+ if (is_known(argument, known_basic_colors))
+ h_backgroundcolor = color2code(argument);
+ // check the case that LyX's page_backgroundcolor is defined
+ // but not used for \pagecolor
+ if (argument != "page_backgroundcolor"
+ && !is_known(argument, known_basic_colors)) {
+ h_preamble << t.asInput() << '{' << argument << '}';
+ // the color might already be set because \definecolor
+ // is parsed before this
+ h_backgroundcolor = "";
+ }
+ }
+
else if (t.cs() == "makeatletter") {
// LyX takes care of this
p.setCatCode('@', catLetter);
// 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;
+ // test for case
+ //\@ifundefined{showcaptionsetup}{}{%
+ // \PassOptionsToPackage{caption=false}{subfig}}
+ // that LyX uses for subfloats
+ } else if (arg1 == "showcaptionsetup" && arg2.empty()
+ && arg3 == "%\n \\PassOptionsToPackage{caption=false}{subfig}") {
+ ; // do nothing
} else if (!in_lyx_preamble) {
h_preamble << t.asInput()
<< '{' << arg1 << '}'
return language;
}
+
+/// translates a color name to a LyX color code
+string color2code(string const & name)
+{
+ char const * const * where = is_known(name, known_basic_colors);
+ if (where)
+ return known_basic_color_codes[where - known_basic_colors];
+ return name;
+}
+
// }])
projects / lyx.git / blobdiff