anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 14:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backporting tex2lyx: support for language packages

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39988 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-10-25 23:36:57 +00:00
parent 299ebef138
commit 1122af1e84
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/TODO.txt
View File

@ -93,6 +93,6 @@ Format LaTeX feature LyX feature
405 author hash \author 405 author hash \author
407 vertical offset for multirows InsetTabular 407 vertical offset for multirows InsetTabular
409 XeTeX \use_non_tex_fonts 409 XeTeX \use_non_tex_fonts
411 babel etc. \language_package 411 support for polyglossia \language_package (the cases of no package, of babel and of custom package is supported)
412 tabular* InsetTabular 412 tabular* InsetTabular

20
src/tex2lyx/preamble.cpp
View File

@ -127,6 +127,10 @@ const char * const known_polish_quotes_languages[] = {"afrikaans", "croatian",
const char * const known_swedish_quotes_languages[] = {"finnish", const char * const known_swedish_quotes_languages[] = {"finnish",
"swedish", 0}; "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 }; char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman", const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
@ -171,7 +175,7 @@ string h_textclass = "article";
string h_use_default_options = "false"; string h_use_default_options = "false";
string h_options; string h_options;
string h_language = "english"; string h_language = "english";
string h_language_package = "default"; string h_language_package = "none";
string h_fontencoding = "default"; string h_fontencoding = "default";
string h_font_roman = "default"; string h_font_roman = "default";
string h_font_sans = "default"; string h_font_sans = "default";
@ -523,7 +527,11 @@ void handle_package(Parser &p, string const & name, string const & opts,
else if (name == "mathdots") else if (name == "mathdots")
h_use_mathdots = "2"; h_use_mathdots = "2";
else if (name == "babel" && !opts.empty()) { 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 // check if more than one option was used - used later for inputenc
// in case inputenc is parsed before babel, set the encoding to auto // in case inputenc is parsed before babel, set the encoding to auto
if (options.begin() != options.end() - 1) { if (options.begin() != options.end() - 1) {
@ -536,6 +544,7 @@ void handle_package(Parser &p, string const & name, string const & opts,
handle_opt(options, known_languages, h_language); handle_opt(options, known_languages, h_language);
delete_opt(options, known_languages); delete_opt(options, known_languages);
} }
}
else if (name == "fontenc") { else if (name == "fontenc") {
h_fontencoding = getStringFromVector(options, ","); h_fontencoding = getStringFromVector(options, ",");
@ -561,6 +570,13 @@ void handle_package(Parser &p, string const & name, string const & opts,
options.clear(); 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") else if (name == "makeidx")
; // ignore this ; // ignore this