Further to r26743, add CustomPars and ForcePlain layout tags to InsetLayout,

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 1f7d0db19686464135593a3d64b471b0eeb35ce6..dfeed2c9faa1de81463e9c98213f1cf7b38386e7 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -84,8 +84,11 @@ static char const * const string_footnotekinds[] = {
 
 
 static char const * const tex_graphics[] = {
-       "default", "dvips", "dvitops", "emtex",
-       "ln", "oztex", "textures", "none", ""
+       "default", "dvialw", "dvilaser", "dvipdf", "dvipdfm", "dvipdfmx",
+       "dvips", "dvipsone", "dvitops", "dviwin", "dviwindo", "dvi2ps", "emtex",
+       "ln", "oztex", "pctexhp", "pctexps", "pctexwin", "pctex32", "pdftex",
+       "psprint", "pubps", "tcidvi", "textures", "truetex", "vtex", "xdvi",
+       "xetex", "none", ""
 };
 
 
@@ -1031,10 +1034,15 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                // with language options, not in the class options, see
                // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
                size_t japan = language_options.str().find("japanese");
-               // japan = string::npos when not found
+               // if Latvian or Lithuanian is used, babel must directly be loaded
+               // with language options, not in the class options, see
+               // http://bugzilla.lyx.org/show_bug.cgi?id=5323
+               size_t latvian = language_options.str().find("latvian");
+               size_t lithu = language_options.str().find("lithuanian");
                if (lyxrc.language_global_options
                        && !language_options.str().empty()
-                       && viet == string::npos && japan == string::npos)
+                       && viet == string::npos && japan == string::npos
+                       && latvian == string::npos && lithu == string::npos)
                        clsoptions << language_options.str() << ',';
        }
 
@@ -1868,8 +1876,14 @@ string BufferParams::babelCall(string const & lang_opts) const
        // language options, see
        // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
        size_t japan = lang_opts.find("japanese");
-       // japan = string::npos when not found
-       if (!lyxrc.language_global_options || viet != string::npos || japan != string::npos)
+       // If Latvian or Lithuanian is used, babel must directly be loaded with
+       // the language options, see
+       // http://bugzilla.lyx.org/show_bug.cgi?id=5323
+       size_t latvian = lang_opts.find("latvian");
+       size_t lithu = lang_opts.find("lithuanian");
+       if (!lyxrc.language_global_options || viet != string::npos
+               || japan != string::npos || latvian != string::npos
+               || lithu != string::npos)
                return "\\usepackage[" + lang_opts + "]{babel}";
        return lang_pack;
 }