"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};
else if (name == "fontenc") {
h_fontencoding = getStringFromVector(options, ",");
- // as of version LyX 2.0 "T1" is equal to the setting "global"
- if (h_fontencoding == "T1")
+ /* 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)
h_fontencoding = "global";
+ */
options.clear();
}
; // 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 (is_known(name, known_languages))
h_language = name;
h_paperpagestyle = p.verbatim_item();
else if (t.cs() == "date") {
- if (p.verbatim_item().empty())
+ 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 not a color defined by LyX is used
- if (argument != "document_fontcolor") {
+ // 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 not a color defined by LyX is used
- if (argument != "page_backgroundcolor") {
+ // 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 = "";
}
}
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;
+}
+
// }])