"tgbonum", "tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum-type1",
-"cmbr", "cmss", "helvet", "kurier", "kurierl", "lmss", "tgadventor", "tgheros", 0};
+"cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier",
+"kurierc", "kurierl", "kurierlc", "lmss", "tgadventor", "tgheros", 0};
const char * const known_kurier_fonts[] = { "kurier", "kurierl",
"kurier-condensed", "kurier-light-condensed", 0};
const char * const known_lyx_packages[] = {"amsbsy", "amsmath", "amssymb",
"amstext", "amsthm", "array", "babel", "booktabs", "calc", "CJK", "color",
"float", "fontspec", "graphicx", "hhline", "ifthen", "longtable", "makeidx",
-"multirow", "nomencl", "pdfpages", "refstyle", "rotating", "rotfloat", "splitidx",
-"setspace", "subscript", "textcomp", "tipa", "tipx", "tone", "ulem", "url",
-"varioref", "verbatim", "wrapfig", "xunicode", 0};
+"multirow", "nomencl", "pdfpages", "prettyref", "refstyle", "rotating",
+"rotfloat", "splitidx", "setspace", "subscript", "textcomp", "tipa", "tipx",
+"tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xunicode", 0};
// used for the handling of \newindex
int index_number = 0;
h_use_geometry = "false";
h_use_default_options = "false";
h_use_hyperref = "false";
- h_use_refstyle = "0";
+ h_use_refstyle = false;
h_use_packages["amsmath"] = "1";
h_use_packages["amssymb"] = "0";
+ h_use_packages["cancel"] = "0";
h_use_packages["esint"] = "1";
h_use_packages["mhchem"] = "0";
h_use_packages["mathdots"] = "0";
|| is_known(name, known_typewriter_fonts) || is_known(name, known_math_fonts))
;
- else if (name == "amsmath" || name == "amssymb" ||
+ else if (name == "amsmath" || name == "amssymb" || name == "cancel" ||
name == "esint" || name == "mhchem" || name == "mathdots" ||
name == "mathtools" || name == "stackrel" ||
name == "stmaryrd" || name == "undertilde")
}
else if (name == "CJKutf8") {
- h_inputencoding = "UTF8";
+ h_inputencoding = "utf8-cjk";
p.setEncoding("UTF-8");
registerAutomaticallyLoadedPackage("CJKutf8");
}
// 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)
- // Therefore check for the "," character.
+ // Therefore check that exactly one option is passed to inputenc.
// It is also only set when there is not more than one babel
// language option.
- if (opts.find(",") == string::npos && one_language == true)
- h_inputencoding = opts;
- if (!options.empty())
- p.setEncoding(options.back(), Encoding::inputenc);
- options.clear();
+ if (!options.empty()) {
+ string const encoding = options.back();
+ Encoding const * const enc = encodings.fromLaTeXName(
+ encoding, Encoding::inputenc, true);
+ if (!enc)
+ cerr << "Unknown encoding " << encoding << ". Ignoring." << std::endl;
+ else {
+ if (!enc->unsafe() && options.size() == 1 && one_language == true)
+ h_inputencoding = enc->name();
+ p.setEncoding(enc->iconvName());
+ }
+ options.clear();
+ }
}
else if (name == "srcltx") {
h_language_package = "\\usepackage{" + name + "}";
}
- else if (name == "prettyref")
- ; // ignore this FIXME: Use the package separator mechanism instead
-
else if (name == "lyxskak") {
// ignore this and its options
const char * const o[] = {"ps", "mover", 0};
if (name == "splitidx")
h_use_indices = "true";
if (name == "refstyle")
- h_use_refstyle = "1";
+ h_use_refstyle = true;
+ else if (name == "prettyref")
+ h_use_refstyle = false;
if (!in_lyx_preamble) {
h_preamble << package_beg_sep << name
<< package_mid_sep << "\\usepackage{"
string const name = p.verbatim_item();
string const body1 = p.verbatim_item();
string const body2 = p.verbatim_item();
- // store the in_lyx_preamble setting
- bool const was_in_lyx_preamble = in_lyx_preamble;
- if (name == "subref"
- || name == "thmref"
- || name == "lemref") {
- p.skip_spaces();
- preamble.registerAutomaticallyLoadedPackage("refstyle");
- in_lyx_preamble = true;
- }
// only non-lyxspecific stuff
- if (!in_lyx_preamble) {
+ if (in_lyx_preamble &&
+ (name == "subref" || name == "thmref" || name == "lemref"))
+ p.skip_spaces();
+ else {
ostringstream ss;
ss << '\\' << t.cs();
ss << '{' << name << '}'
<< '{' << body2 << '}';
h_preamble << ss.str();
}
- // restore the in_lyx_preamble setting
- in_lyx_preamble = was_in_lyx_preamble;
}
else if (t.cs() == "AtBeginDocument") {
string const name = p.verbatim_item();
- // store the in_lyx_preamble setting
- bool const was_in_lyx_preamble = in_lyx_preamble;
- if (name == "\\providecommand\\partref[1]{\\ref{part:#1}}"
+ // only non-lyxspecific stuff
+ if (in_lyx_preamble &&
+ (name == "\\providecommand\\partref[1]{\\ref{part:#1}}"
|| name == "\\providecommand\\chapref[1]{\\ref{chap:#1}}"
|| name == "\\providecommand\\secref[1]{\\ref{sec:#1}}"
|| name == "\\providecommand\\subref[1]{\\ref{sub:#1}}"
|| name == "\\providecommand\\lemref[1]{\\ref{lem:#1}}"
|| name == "\\providecommand\\thmref[1]{\\ref{thm:#1}}"
|| name == "\\providecommand\\corref[1]{\\ref{cor:#1}}"
- || name == "\\providecommand\\propref[1]{\\ref{prop:#1}}") {
+ || name == "\\providecommand\\propref[1]{\\ref{prop:#1}}"))
p.skip_spaces();
- preamble.registerAutomaticallyLoadedPackage("refstyle");
- in_lyx_preamble = true;
- }
- // only non-lyxspecific stuff
- if (!in_lyx_preamble) {
+ else {
ostringstream ss;
ss << '\\' << t.cs();
ss << '{' << name << '}';
h_preamble << ss.str();
}
- // restore the in_lyx_preamble setting
- in_lyx_preamble = was_in_lyx_preamble;
}
else if (t.cs() == "newcommand" || t.cs() == "newcommandx"
p.skip_spaces();
in_lyx_preamble = true;
}
- if (name == "\\bfdefault")
- // LyX re-adds this if a kurier font is used
- if (is_known(h_font_sans, known_kurier_fonts) && body == "b") {
- p.skip_spaces();
- in_lyx_preamble = true;
- }
// remove the lyxdot definition that is re-added by LyX
// if necessary
in_lyx_preamble = was_in_lyx_preamble;
}
- else if (t.cs() == "edef"){
- // we only support this for kurier fonts
- string const command = p.next_token().asInput();
- p.get_token();
- if (command == "\\sfdefault") {
- p.getArg('{', '}');
- if (h_font_sans == "kurier")
- h_font_sans = "kurier-condensed";
- if (h_font_sans == "kurierl")
- h_font_sans = "kurier-light-condensed";
- p.skip_spaces();
- }
- else
- h_preamble << "\\edef" << command << "{" << p.getArg('{', '}') << "}\n";
- }
-
else if (t.cs() == "documentclass") {
vector<string>::iterator it;
vector<string> opts = split_options(p.getArg('[', ']'));
else if (t.cs() == "inputencoding") {
string const encoding = p.getArg('{','}');
- h_inputencoding = encoding;
- p.setEncoding(encoding, Encoding::inputenc);
+ Encoding const * const enc = encodings.fromLaTeXName(
+ encoding, Encoding::inputenc, true);
+ if (!enc)
+ cerr << "Unknown encoding " << encoding << ". Ignoring." << std::endl;
+ else {
+ if (!enc->unsafe())
+ h_inputencoding = enc->name();
+ p.setEncoding(enc->iconvName());
+ }
}
else if (t.cs() == "newenvironment") {