* Licence details can be found in the file COPYING.
*
* \author André Pönitz
- * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
namespace lyx {
-using std::find;
using std::istringstream;
using std::ostream;
using std::ostringstream;
namespace {
-const char * const known_languages[] = { "afrikaans", "albanian", "american",
-"arabic_arabtex", "arabic_arabi", "armenian", "austrian", "bahasa", "basque",
-"brazilian", "breton", "british", "bulgarian", "canadian", "canadien",
-"catalan", "chinese-simplified", "chinese-traditional", "croatian", "czech",
-"danish", "dutch", "english", "esperanto", "estonian", "farsi", "finnish",
-"francais", "french", "galician", "german", "greek", "hebrew", "icelandic",
-"irish", "italian", "japanese", "japanese-plain", "kazakh", "korean", "latin",
-"latvian", "lithuanian", "lowersorbian", "magyar", "naustrian", "ngerman",
-"norsk", "nynorsk ", "polish", "portuges", "romanian", "russian", "samin",
-"scottish", "serbian", "slovak", "slovene", "spanish", "swedish", "thai",
-"turkish", "ukrainian", "uppersorbian", "vietnamese", "welsh", 0};
-
-const char * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
-
-const char * const known_encodings[] = { "auto", "latin1", "latin2", "latin3",
-"latin4", "latin5", "latin9", "latin10", "iso88595", "8859-6", "iso-8859-7",
-"8859-8", "l7xen", "cp437", "cp437de", "cp850", "cp852", "cp855", "cp858",
-"cp862", "cp865", "cp866", "cp1250", "cp1251", "cp1252", "cp1255", "cp1256",
-"cp1257", "koi8-r", "koi8-u", "pt154", "pt254", "utf8", 0};
-
-const char * const known_roman_fonts[] = { "ae", "bookman", "charter",
-"cmr", "fourier", "lmodern", "mathpazo", "mathptmx", "newcent", 0};
-
-const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
-"helvet", "lmss", 0};
-
-const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
-"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
-"newcent", 0};
+const char * const known_languages[] = { "austrian", "babel", "bahasa",
+"basque", "breton", "british", "bulgarian", "catalan", "croatian", "czech",
+"danish", "dutch", "english", "esperanto", "estonian", "finnish",
+"francais", "french", "frenchb", "frenchle", "frenchpro",
+"galician", "german", "germanb", "greek", "hebcal", "hebfont",
+"hebrew", "hebrew_newcode", "hebrew_oldcode", "hebrew_p", "hyphen",
+"icelandic", "irish", "italian", "latin", "lgrcmr", "lgrcmro", "lgrcmss",
+"lgrcmtt", "lgrenc", "lgrlcmss", "lgrlcmtt", "lheclas", "lhecmr",
+"lhecmss", "lhecmtt", "lhecrml", "lheenc", "lhefr", "lheredis", "lheshold",
+"lheshscr", "lheshstk", "lsorbian", "magyar", "naustrian", "ngermanb",
+"ngerman", "norsk", "polish", "portuges", "rlbabel", "romanian",
+"russianb", "samin", "scottish", "serbian", "slovak", "slovene", "spanish",
+"swedish", "turkish", "ukraineb", "usorbian", "welsh", 0};
+
+const char * const known_french_languages[] = {"french", "frenchb", "francais",
+ "frenchle", "frenchpro", 0};
+char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
// some ugly stuff
ostringstream h_preamble;
-string h_textclass = "article";
-string h_options = string();
-string h_language = "english";
-string h_inputencoding = "auto";
-string h_font_roman = "default";
-string h_font_sans = "default";
-string h_font_typewriter = "default";
-string h_font_default_family = "default";
-string h_font_sc = "false";
-string h_font_osf = "false";
-string h_font_sf_scale = "100";
-string h_font_tt_scale = "100";
-string h_graphics = "default";
-string h_paperfontsize = "default";
-string h_spacing = "single";
-string h_papersize = "default";
-string h_use_geometry = "false";
-string h_use_amsmath = "1";
-string h_use_esint = "1";
-string h_cite_engine = "basic";
-string h_use_bibtopic = "false";
-string h_paperorientation = "portrait";
-string h_secnumdepth = "3";
-string h_tocdepth = "3";
-string h_paragraph_separation = "indent";
-string h_defskip = "medskip";
-string h_quotes_language = "english";
-string h_papercolumns = "1";
-string h_papersides = string();
-string h_paperpagestyle = "default";
-string h_tracking_changes = "false";
-string h_output_changes = "false";
-string h_use_hyperref = "false";
+string h_textclass = "article";
+string h_options = string();
+string h_language = "english";
+string h_inputencoding = "latin1";
+string h_fontscheme = "default";
+string h_graphics = "default";
+string h_paperfontsize = "default";
+string h_spacing = "single";
+string h_papersize = "default";
+string h_use_geometry = "false";
+string h_use_amsmath = "0";
+string h_cite_engine = "basic";
+string h_use_bibtopic = "false";
+string h_paperorientation = "portrait";
+string h_secnumdepth = "3";
+string h_tocdepth = "3";
+string h_paragraph_separation = "indent";
+string h_defskip = "medskip";
+string h_quotes_language = "english";
+string h_papercolumns = "1";
+string h_papersides = string();
+string h_paperpagestyle = "default";
+string h_tracking_changes = "false";
+string h_output_changes = "false";
void handle_opt(vector<string> & opts, char const * const * what, string & target)
for (; *what; ++what) {
vector<string>::iterator it = find(opts.begin(), opts.end(), *what);
- // the last language option is the document language
if (it != opts.end()) {
//cerr << "### found option '" << *what << "'\n";
target = *what;
opts.erase(it);
+ return;
}
}
}
-
/*!
* Split a package options string (keyval format) into a vector.
* Example input:
{
vector<string> options = split_options(opts);
add_package(name, options);
- size_t pos;
- string scale;
-
- // cerr << "handle_package: '" << name << "'\n";
-
- // roman fonts
- if (is_known(name, known_roman_fonts))
- h_font_roman = name;
- if (name == "fourier")
- h_font_roman = "utopia";
- if (name == "mathpazo")
- h_font_roman = "palatino";
- if (name == "mathptmx")
- h_font_roman = "times";
- // sansserif fonts
- if (is_known(name, known_sans_fonts)) {
- h_font_sans = name;
- if (!opts.empty()) {
- scale = opts;
- pos = scale.find(".", 0);
- h_font_sf_scale = scale.erase(0, pos + 1);
- }
- }
- // typewriter fonts
- if (is_known(name, known_typewriter_fonts)) {
- h_font_typewriter = name;
- if (!opts.empty()) {
- scale = opts;
- pos = scale.find(".", 0);
- h_font_tt_scale = scale.erase(0, pos + 1);
- }
- }
+ //cerr << "handle_package: '" << name << "'\n";
+ if (name == "ae")
+ h_fontscheme = "ae";
+ else if (name == "aecompl")
+ h_fontscheme = "ae";
+ else if (name == "amsmath")
+ h_use_amsmath = "1";
else if (name == "amssymb")
- h_use_amsmath = "2";
- else if (name == "esint")
- h_use_esint = "2";
+ h_use_amsmath = "1";
else if (name == "babel")
; // ignore this
else if (name == "fontenc")
; // ignore this
else if (name == "inputenc") {
- // only set when there are not more than one inputenc option
- // therefore check for the "," character
- if ((pos = opts.find(",", 0)) == string::npos)
- h_inputencoding = opts;
+ h_inputencoding = opts;
options.clear();
} else if (name == "makeidx")
; // ignore this
else if (name == "graphicx")
; // ignore this
else if (is_known(name, known_languages)) {
- h_language = name;
- h_quotes_language = name;
+ if (is_known(name, known_french_languages)) {
+ h_language = "french";
+ h_quotes_language = "french";
+ } else {
+ h_language = name;
+ h_quotes_language = name;
+ }
+
} else if (name == "natbib") {
h_cite_engine = "natbib_authoryear";
vector<string>::iterator it =
}
+
void end_preamble(ostream & os, TextClass const & /*textclass*/)
{
- os << "#LyX file created by tex2lyx 0.1.5\n"
+ os << "#LyX file created by tex2lyx 0.1.2\n"
<< "\\lyxformat 245\n"
<< "\\begin_document\n"
<< "\\begin_header\n"
- << "\\textclass " << h_textclass << "\n";
- if (!h_preamble.str().empty())
- os << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";
+ << "\\textclass " << h_textclass << "\n"
+ << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";
if (!h_options.empty())
- os << "\\options " << h_options << "\n";
+ os << "\\options " << h_options << "\n";
os << "\\language " << h_language << "\n"
<< "\\inputencoding " << h_inputencoding << "\n"
- << "\\font_roman " << h_font_roman << "\n"
- << "\\font_sans " << h_font_sans << "\n"
- << "\\font_typewriter " << h_font_typewriter << "\n"
- << "\\font_default_family " << h_font_default_family << "\n"
- << "\\font_sc " << h_font_sc << "\n"
- << "\\font_osf " << h_font_osf << "\n"
- << "\\font_sf_scale " << h_font_sf_scale << "\n"
- << "\\font_tt_scale " << h_font_tt_scale << "\n"
+ << "\\fontscheme " << h_fontscheme << "\n"
<< "\\graphics " << h_graphics << "\n"
<< "\\paperfontsize " << h_paperfontsize << "\n"
<< "\\spacing " << h_spacing << "\n"
- << "\\use_hyperref " << h_use_hyperref << "\n"
<< "\\papersize " << h_papersize << "\n"
<< "\\use_geometry " << h_use_geometry << "\n"
<< "\\use_amsmath " << h_use_amsmath << "\n"
- << "\\use_esint " << h_use_esint << "\n"
<< "\\cite_engine " << h_cite_engine << "\n"
<< "\\use_bibtopic " << h_use_bibtopic << "\n"
<< "\\paperorientation " << h_paperorientation << "\n"
} // anonymous namespace
-
TextClass const parse_preamble(Parser & p, ostream & os, string const & forceclass)
{
// initialize fixed types
t.cat() == catEnd ||
t.cat() == catAlign ||
t.cat() == catParameter)
- ;//h_preamble << t.character();
+ h_preamble << t.character();
else if (t.cat() == catSpace || t.cat() == catNewline)
- ;//h_preamble << t.asInput();
+ h_preamble << t.asInput();
else if (t.cat() == catComment)
- ;//h_preamble << t.asInput();
+ h_preamble << t.asInput();
else if (t.cs() == "pagestyle")
h_paperpagestyle = p.verbatim_item();
- else if (t.cs() == "makeatletter")
+ else if (t.cs() == "makeatletter") {
p.setCatCode('@', catLetter);
+ h_preamble << "\\makeatletter";
+ }
- else if (t.cs() == "makeatother")
+ else if (t.cs() == "makeatother") {
p.setCatCode('@', catOther);
+ h_preamble << "\\makeatother";
+ }
else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
|| t.cs() == "providecommand") {
string const opt1 = p.getOpt();
string const opt2 = p.getFullOpt();
string const body = p.verbatim_item();
- // font settings
- if (name == "\\rmdefault")
- if (is_known(body, known_roman_fonts))
- h_font_roman = body;
-
- if (name == "\\sfdefault")
- if (is_known(body, known_sans_fonts))
- h_font_sans = body;
-
- if (name == "\\ttdefault")
- if (is_known(body, known_typewriter_fonts))
- h_font_typewriter = body;
-
- if (name == "\\familydefault") {
- string family = body;
- // remove leading "\"
- h_font_default_family = family.erase(0,1);
- }
// only non-lyxspecific stuff
if ( name != "\\noun"
&& name != "\\tabularnewline"
&& name != "\\LyX"
- && name != "\\lyxline"
+ && name != "\\lyxline"
&& name != "\\lyxaddress"
&& name != "\\lyxrightaddress"
&& name != "\\lyxdot"
&& name != "\\boldsymbol"
- && name != "\\lyxarrow"
- && name != "\\rmdefault"
- && name != "\\sfdefault"
- && name != "\\ttdefault"
- && name != "\\familydefault") {
+ && name != "\\lyxarrow") {
ostringstream ss;
ss << '\\' << t.cs();
if (star)
<< opts << "{" << body << "}";
*/
}
-
}
else if (t.cs() == "documentclass") {
vector<string> opts;
split(p.getArg('[', ']'), opts, ',');
- handle_opt(opts, known_fontsizes, h_paperfontsize);
handle_opt(opts, known_languages, h_language);
+ if (is_known(h_language, known_french_languages))
+ h_language = "french";
+ handle_opt(opts, known_fontsizes, h_paperfontsize);
// delete "pt" at the end
string::size_type i = h_paperfontsize.find("pt");
if (i != string::npos)
return textclass;
}
-
// }])
*
* \author André Pönitz
* \author Jean-Marc Lasgouttes
- * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
char const * const known_latex_commands[] = { "ref", "cite", "label",
- "index", "pageref", "url", "vref", "vpageref", "prettyref",
+ "index", "printindex", "pageref", "url", "vref", "vpageref", "prettyref",
"eqref", 0 };
/*!
"small", "normalsize", "large", "Large", "LARGE", "huge", "Huge", 0};
/// the same as known_sizes with .lyx names
-char const * const known_coded_sizes[] = { "default", "tiny", "scriptsize", "footnotesize",
+char const * const known_coded_sizes[] = { "tiny", "scriptsize", "footnotesize",
"small", "normal", "large", "larger", "largest", "huge", "giant", 0};
/// LaTeX 2.09 names for font families
parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
end_inset(os);
p.skip_spaces();
- // FIXME the comment note inset has a trailing "{}" pair
- //p.skip_braces(p);
}
else if (name == "lyxgreyedout") {
Context & context)
{
LayoutPtr newlayout;
- // store the current selectlanguage to be used after \foreignlanguage
- string selectlang;
// Store the latest bibliographystyle (needed for bibtex inset)
string bibliographystyle;
bool const use_natbib = used_packages.find("natbib") != used_packages.end();
else if (t.cs() == "tableofcontents") {
p.skip_spaces();
context.check_layout(os);
- begin_inset(os, "CommandInset toc\n");
- os << "LatexCommand tableofcontents\n";
+ begin_inset(os, "LatexCommand \\tableofcontents\n");
end_inset(os);
skip_braces(p); // swallow this
}
else if (t.cs() == "listof") {
p.skip_spaces(true);
- string const name = p.verbatim_item();
- string const name2 = subst(p.verbatim_item(), "\n", " ");
+ string const name = p.get_token().asString();
if (context.textclass.floats().typeExist(name)) {
context.check_layout(os);
begin_inset(os, "FloatList ");
os << name << "\n";
end_inset(os);
- // the second argument is not needed
+ p.get_token(); // swallow second arg
} else
- handle_ert(os, "\\listof{" + name + "}{" + name2 + "}", context);
+ handle_ert(os, "\\listof{" + name + "}", context);
}
else if (t.cs() == "textrm")
eat_whitespace(p, os, context, false);
}
- else if (t.cs() == "selectlanguage") {
- context.check_layout(os);
- // save the language for the case that a \foreignlanguage is used
- selectlang = subst(p.verbatim_item(), "\n", " ");
- os << "\\lang " << selectlang << "\n";
-
- }
-
- else if (t.cs() == "foreignlanguage") {
- context.check_layout(os);
- os << "\n\\lang " << subst(p.verbatim_item(), "\n", " ") << "\n";
- os << subst(p.verbatim_item(), "\n", " ");
- // set back to last selectlanguage
- os << "\n\\lang " << selectlang << "\n";
- }
-
- else if (t.cs() == "inputencoding")
- // write nothing because this is done by LyX using the "\lang"
- // information given by selectlanguage and foreignlanguage
- subst(p.verbatim_item(), "\n", " ");
-
else if (t.cs() == "LyX" || t.cs() == "TeX"
|| t.cs() == "LaTeX") {
context.check_layout(os);
skip_braces(p);
}
- else if (t.cs() == "lyxline") {
- context.check_layout(os);
- // the argument can be omitted, is handled by LyX
- subst(p.verbatim_item(), "\n", " ");
- os << "\\lyxline\n ";
-
- }
-
else if (t.cs() == "textcompwordmark") {
context.check_layout(os);
os << "\\SpecialChar \\textcompwordmark{}\n";
else if (t.cs() == "bibliography") {
context.check_layout(os);
- begin_inset(os, "CommandInset bibtex");
- os << "\nLatexCommand bibtex";
+ begin_inset(os, "LatexCommand ");
+ os << "\\bibtex";
// Do we have a bibliographystyle set?
- if (!bibliographystyle.empty())
- os << "\noptions " << '"' << bibliographystyle << '"';
- os << "\nbibfiles " << '"' << p.verbatim_item() << '"';
- end_inset(os);
- }
-
- else if (t.cs() == "printindex") {
- context.check_layout(os);
- begin_inset(os, "CommandInset index_print\n");
- os << "LatexCommand printindex";
- end_inset(os);
- skip_braces(p);
- }
-
- else if (t.cs() == "printnomenclature") {
- context.check_layout(os);
- begin_inset(os, "CommandInset nomencl_print\n");
- os << "LatexCommand printnomenclature";
+ if (!bibliographystyle.empty()) {
+ os << '[' << bibliographystyle << ']';
+ }
+ os << '{' << p.verbatim_item() << "}\n";
end_inset(os);
- skip_braces(p);
}
else if (t.cs() == "parbox")
projects / features.git / commitdiff