const char * const known_languages[] = { "austrian", "babel", "bahasa",
"basque", "breton", "british", "bulgarian", "catalan", "croatian", "czech",
-"danish", "dutch", "english", "esperanto", "estonian", "finnish", "francais",
-"frenchb", "galician", "german", "germanb", "greek", "hebcal", "hebfont",
+"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",
"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
string h_paperfontsize = "default";
string h_spacing = "single";
string h_papersize = "default";
-string h_paperpackage = "none";
string h_use_geometry = "false";
string h_use_amsmath = "0";
string h_cite_engine = "basic";
string h_paragraph_separation = "indent";
string h_defskip = "medskip";
string h_quotes_language = "english";
-string h_quotes_times = "2";
string h_papercolumns = "1";
string h_papersides = string();
string h_paperpagestyle = "default";
add_package(name, options);
//cerr << "handle_package: '" << name << "'\n";
- if (name == "a4wide") {
- h_papersize = "a4paper";
- h_paperpackage = "widemarginsa4";
- } else if (name == "ae")
+ if (name == "ae")
h_fontscheme = "ae";
else if (name == "aecompl")
h_fontscheme = "ae";
; // ignore this
else if (name == "verbatim")
; // 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, LyXTextClass const & /*textclass*/)
{
os << "#LyX file created by tex2lyx 0.1.2\n"
- << "\\lyxformat 241\n"
+ << "\\lyxformat 245\n"
<< "\\begin_document\n"
<< "\\begin_header\n"
<< "\\textclass " << h_textclass << "\n"
<< "\\paperfontsize " << h_paperfontsize << "\n"
<< "\\spacing " << h_spacing << "\n"
<< "\\papersize " << h_papersize << "\n"
- << "\\paperpackage " << h_paperpackage << "\n"
<< "\\use_geometry " << h_use_geometry << "\n"
<< "\\use_amsmath " << h_use_amsmath << "\n"
<< "\\cite_engine " << h_cite_engine << "\n"
<< "\\paragraph_separation " << h_paragraph_separation << "\n"
<< "\\defskip " << h_defskip << "\n"
<< "\\quotes_language " << h_quotes_language << "\n"
- << "\\quotes_times " << h_quotes_times << "\n"
<< "\\papercolumns " << h_papercolumns << "\n"
<< "\\papersides " << h_papersides << "\n"
<< "\\paperpagestyle " << h_paperpagestyle << "\n"
vector<string> opts;
split(p.getArg('[', ']'), opts, ',');
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");