extern map<char, int> special_columns;
map<string, vector<string> > used_packages;
+const char * const modules_placeholder = "\001modules\001";
// needed to handle encodings with babel
bool one_language = true;
+string h_inputencoding = "auto";
+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 {
//add this to known_languages when updating to lyxformat 266:
-// "armenian"
+// "armenian" (needs special handling since not supported by standard babel)
//add these to known_languages when updating to lyxformat 268:
//"chinese-simplified", "chinese-traditional", "japanese", "korean"
// Both changes require first that support for non-babel languages (CJK,
// add turkmen for lyxformat 383
/**
* known babel language names (including synonyms)
- * not in standard babel: arabic, arabtex, belarusian, serbian-latin, thai
+ * not in standard babel: arabic, arabtex, armenian, belarusian, serbian-latin, thai
* not yet supported by LyX: kurmanji
* please keep this in sync with known_coded_languages line by line!
*/
"ngerman", "ngermanb", "norsk", "nynorsk", "polutonikogreek", "polish",
"portuges", "portuguese", "romanian", "russian", "russianb", "samin",
"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish",
-"swedish", "thai", "turkish", "ukraineb", "ukrainian", "uppersorbian",
-"UKenglish", "USenglish", "usorbian", "vietnam", "welsh", 0};
+"swedish", "thai", "turkish", "turkmen", "ukraineb", "ukrainian",
+"uppersorbian", "UKenglish", "USenglish", "usorbian", "vietnam", "welsh",
+0};
/**
* the same as known_languages with .lyx names
"ngerman", "ngerman", "norsk", "nynorsk", "polutonikogreek", "polish",
"portuguese", "portuguese", "romanian", "russian", "russian", "samin",
"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish",
-"swedish", "thai", "turkish", "ukrainian", "ukrainian", "uppersorbian",
-"uppersorbian", "english", "english", "vietnamese", "welsh", 0};
+"swedish", "thai", "turkish", "turkmen", "ukrainian", "ukrainian",
+"uppersorbian", "uppersorbian", "english", "english", "vietnamese", "welsh",
+0};
/// languages with english quotes (.lyx names)
const char * const known_english_quotes_languages[] = {"american", "bahasa",
"bahasam", "brazilian", "canadian", "chinese-simplified", "english",
"esperanto", "hebrew", "irish", "korean", "portuguese", "scottish", "thai", 0};
-//add this to known_french_quotes_languages when updating to
-//lyxformat 383: "turkmen"
/// languages with french quotes (.lyx names)
const char * const known_french_quotes_languages[] = {"albanian",
"arabic_arabi", "arabic_arabtex", "basque", "canadien", "catalan", "french",
"galician", "greek", "italian", "norsk", "nynorsk", "polutonikogreek",
-"russian", "spanish", "spanish-mexico", "turkish", "ukrainian", "vietnamese", 0};
+"russian", "spanish", "spanish-mexico", "turkish", "turkmen", "ukrainian",
+"vietnamese", 0};
/// languages with german quotes (.lyx names)
const char * const known_german_quotes_languages[] = {"austrian", "bulgarian",
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};
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
"newcent", 0};
-const char * const known_paper_sizes[] = { "a3paper", "b3paper", "a4paper",
-"b4paper", "a5paper", "b5paper", "executivepaper", "legalpaper",
-"letterpaper", 0};
+const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
+"a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
+"b3paper", "c3paper", "a4paper", "b4paper", "c4paper", "a5paper", "b5paper",
+"c5paper", "a6paper", "b6paper", "c6paper", "executivepaper", "legalpaper",
+"letterpaper", "b0j", "b1j", "b2j", "b3j", "b4j", "b5j", "b6j", 0};
const char * const known_class_paper_sizes[] = { "a4paper", "a5paper",
"executivepaper", "legalpaper", "letterpaper", 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_inputencoding = "auto";
+string h_language_package = "none";
+string h_fontencoding = "default";
string h_font_roman = "default";
string h_font_sans = "default";
string h_font_typewriter = "default";
string h_use_geometry = "false";
string h_use_amsmath = "1";
string h_use_esint = "1";
+string h_use_mhchem = "0";
+string h_use_mathdots = "0";
+string h_use_undertilde = "0";
string h_cite_engine = "basic";
string h_use_bibtopic = "false";
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";
-string h_paragraph_separation = "indent";
string h_defskip = "medskip";
string h_paragraph_indentation = "default";
string h_quotes_language = "english";
string h_listings_params;
string h_tracking_changes = "false";
string h_output_changes = "false";
+string h_html_math_output = "0";
+string h_html_css_as_file = "0";
+string h_html_be_strict = "false";
string h_margins;
while (p.good()) {
Token const & t = p.get_token();
if (t.asInput() == ",") {
- options.push_back(trim(option));
+ options.push_back(trimSpaceAndEol(option));
option.erase();
} else if (t.asInput() == "=") {
option += '=';
}
if (!option.empty())
- options.push_back(trim(option));
+ options.push_back(trimSpaceAndEol(option));
return options;
}
// 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 == "esint")
h_use_esint = "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 == "mhchem")
+ h_use_mhchem = "2";
+
+ else if (name == "mathdots")
+ h_use_mathdots = "2";
+
+ else if (name == "undertilde")
+ h_use_undertilde = "2";
+
+ 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")
- ;// ignore this
+ 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)
+ h_fontencoding = "global";
+ */
+ options.clear();
+ }
- else if (name == "inputenc") {
+ else if (name == "inputenc" || name == "luainputenc") {
// h_inputencoding is only set when there is not more than one
// inputenc option because otherwise h_inputencoding must be
// set to "auto" (the default encoding of the document language)
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 == "url")
; // ignore this
- else if (LYX_FORMAT >= 408 && name == "subscript")
+ else if (name == "subscript")
; // 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.
+ 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;
if (!h_options.empty())
os << "\\options " << h_options << "\n";
os << "\\use_default_options " << h_use_default_options << "\n"
+ << modules_placeholder
<< "\\language " << h_language << "\n"
+ << "\\language_package " << h_language_package << "\n"
<< "\\inputencoding " << h_inputencoding << "\n"
+ << "\\fontencoding " << h_fontencoding << "\n"
<< "\\font_roman " << h_font_roman << "\n"
<< "\\font_sans " << h_font_sans << "\n"
<< "\\font_typewriter " << h_font_typewriter << "\n"
<< "\\use_geometry " << h_use_geometry << "\n"
<< "\\use_amsmath " << h_use_amsmath << "\n"
<< "\\use_esint " << h_use_esint << "\n"
+ << "\\use_mhchem " << h_use_mhchem << "\n"
+ << "\\use_mathdots " << h_use_mathdots << "\n"
+ << "\\use_undertilde " << h_use_undertilde << "\n"
<< "\\cite_engine " << h_cite_engine << "\n"
<< "\\use_bibtopic " << h_use_bibtopic << "\n"
- << "\\paperorientation " << h_paperorientation << '\n';
- if (LYX_FORMAT >= 382 && !h_notefontcolor.empty())
+ << "\\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"
<< "\\paragraph_separation " << h_paragraph_separation << "\n";
- if (LYX_FORMAT < 365 || h_paragraph_separation == "skip")
+ if (h_paragraph_separation == "skip")
os << "\\defskip " << h_defskip << "\n";
else
os << "\\paragraph_indentation " << h_paragraph_indentation << "\n";
os << "\\listings_params " << h_listings_params << "\n";
os << "\\tracking_changes " << h_tracking_changes << "\n"
<< "\\output_changes " << h_output_changes << "\n"
+ << "\\html_math_output " << h_html_math_output << "\n"
+ << "\\html_css_as_file " << h_html_css_as_file << "\n"
+ << "\\html_be_strict " << h_html_be_strict << "\n"
<< "\\end_header\n\n"
<< "\\begin_body\n";
// clear preamble for subdocuments
h_preamble << t.asInput();
else if (t.cat() == catComment) {
- // regex to parse comments (currently not used)
static regex const islyxfile("%% LyX .* created this file");
static regex const usercommands("User specified LaTeX commands");
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);
p.setCatCode('@', catOther);
}
- else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
- || t.cs() == "providecommand"
+ else if (t.cs() == "newcommand" || t.cs() == "newcommandx"
+ || t.cs() == "renewcommand" || t.cs() == "renewcommandx"
+ || t.cs() == "providecommand" || t.cs() == "providecommandx"
|| t.cs() == "DeclareRobustCommand"
+ || t.cs() == "DeclareRobustCommandx"
|| t.cs() == "ProvideTextCommandDefault"
|| t.cs() == "DeclareMathAccent") {
bool star = false;
star = true;
}
string const name = p.verbatim_item();
- string const opt1 = p.getOpt();
+ string const opt1 = p.getFullOpt();
string const opt2 = p.getFullOpt();
string const body = p.verbatim_item();
// font settings
// remove leading "\"
h_font_default_family = family.erase(0,1);
}
+
+ // Add the command to the known commands
+ add_known_command(name, opt1, !opt2.empty(), from_utf8(body));
+
// only non-lyxspecific stuff
if (!in_lyx_preamble) {
ostringstream ss;
ss << '{' << name << '}' << opt1 << opt2
<< '{' << body << "}";
h_preamble << ss.str();
-
- // Add the command to the known commands
- add_known_command(name, opt1, !opt2.empty());
/*
ostream & out = in_preamble ? h_preamble : os;
out << "\\" << t.cs() << "{" << name << "}"
// options.
handle_opt(opts, known_languages, h_language);
delete_opt(opts, known_languages);
-
+
// paper orientation
if ((it = find(opts.begin(), opts.end(), "landscape")) != opts.end()) {
h_paperorientation = "landscape";
delete_opt(opts, known_class_paper_sizes);
// the remaining options
h_options = join(opts, ",");
+ // FIXME This does not work for classes that have a
+ // different name in LyX than in LaTeX
h_textclass = p.getArg('{', '}');
}
vector<string>::const_iterator it = vecnames.begin();
vector<string>::const_iterator end = vecnames.end();
for (; it != end; ++it)
- handle_package(p, trim(*it), options,
+ handle_package(p, trimSpaceAndEol(*it), options,
in_lyx_preamble);
}
else if (t.cs() == "newenvironment") {
string const name = p.getArg('{', '}');
- ostringstream ss;
- ss << "\\newenvironment{" << name << "}";
- ss << p.getOpt();
- ss << p.getOpt();
- ss << '{' << p.verbatim_item() << '}';
- ss << '{' << p.verbatim_item() << '}';
- if (!in_lyx_preamble)
- h_preamble << ss.str();
+ string const opt1 = p.getFullOpt();
+ string const opt2 = p.getFullOpt();
+ string const beg = p.verbatim_item();
+ string const end = p.verbatim_item();
+ if (!in_lyx_preamble) {
+ h_preamble << "\\newenvironment{" << name
+ << '}' << opt1 << opt2 << '{'
+ << beg << "}{" << end << '}';
+ }
+ add_known_environment(name, opt1, !opt2.empty(),
+ from_utf8(beg), from_utf8(end));
+
}
else if (t.cs() == "def") {
else if (t.cs() == "newcolumntype") {
string const name = p.getArg('{', '}');
- trim(name);
+ trimSpaceAndEol(name);
int nargs = 0;
string opts = p.getOpt();
if (!opts.empty()) {
if (name == "\\parindent" && content != "") {
if (content[0] == '0')
h_paragraph_separation = "skip";
- else if (LYX_FORMAT >= 365)
- h_paragraph_indentation = translate_len(content);
else
- h_preamble << "\\setlength{" << name
- << "}{" << content << "}";
+ h_paragraph_indentation = translate_len(content);
} else if (name == "\\parskip") {
if (content == "\\smallskipamount")
h_defskip = "smallskip";
string const color = p.getArg('{', '}');
string const space = p.getArg('{', '}');
string const value = p.getArg('{', '}');
- if (LYX_FORMAT >= 382 &&
- 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;
+ // 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 << '}'
<< '{' << arg2 << '}'
h_textclass = forceclass;
if (noweb_mode && !prefixIs(h_textclass, "literate-"))
h_textclass.insert(0, "literate-");
- FileName layoutfilename = libFileSearch("layouts", h_textclass, "layout");
- if (layoutfilename.empty()) {
- cerr << "Error: Could not find layout file for textclass \"" << h_textclass << "\"." << endl;
- exit(1);
+ tc.setName(h_textclass);
+ if (!tc.load()) {
+ cerr << "Error: Could not read layout file for textclass \"" << h_textclass << "\"." << endl;
+ exit(EXIT_FAILURE);
}
- tc.read(layoutfilename);
if (h_papersides.empty()) {
ostringstream ss;
ss << tc.sides();
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