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 3870c1f55260abfa79b51cc91628f36fdcb3a4e7..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", ""
 };
 
 
@@ -917,8 +920,14 @@ void BufferParams::validate(LaTeXFeatures & features) const
                }
        }
 
-       if (pdfoptions().use_hyperref)
+       if (pdfoptions().use_hyperref) {
                features.require("hyperref");
+               // due to interferences with babel and hyperref, the color package has to
+               // be loaded after hyperref when hyperref is used with the colorlinks
+               // option, see http://bugzilla.lyx.org/show_bug.cgi?id=5291
+               if (pdfoptions().colorlinks)
+                       features.require("color");
+       }
 
        if (language->lang() == "vietnamese")
                features.require("vietnamese");
@@ -1025,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() << ',';
        }
 
@@ -1249,23 +1263,30 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                texrow.newline();
        }
 
-       // If we use hyperref, jurabib, japanese, or vietnamese, we have to call babel here.
+       // Now insert the LyX specific LaTeX commands...
+       docstring lyxpreamble;
+
+       // due to interferences with babel and hyperref, the color package has to
+       // be loaded (when it is not already loaded) before babel when hyperref
+       // is used with the colorlinks option, see
+       // http://bugzilla.lyx.org/show_bug.cgi?id=5291
+       // we decided therefore to load color always before babel, see
+       // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html
+       lyxpreamble += from_ascii(features.getColorOptions());
+       
+       // If we use hyperref, jurabib, japanese, or vietnamese, we have to call babel before them.
        if (use_babel
                && (features.isRequired("jurabib")
                        || features.isRequired("hyperref")
                        || features.isRequired("vietnamese")
                        || features.isRequired("japanese") ) ) {
-               // FIXME UNICODE
-               os << from_utf8(babelCall(language_options.str()))
-                  << '\n'
-                  << from_utf8(features.getBabelOptions());
-               texrow.newline();
+                               // FIXME UNICODE
+                               lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
+                               lyxpreamble += from_utf8(features.getBabelOptions()) + '\n';
        }
 
-       // Now insert the LyX specific LaTeX commands...
-
        // The optional packages;
-       docstring lyxpreamble(from_ascii(features.getPackages()));
+       lyxpreamble += from_ascii(features.getPackages());
 
        // Line spacing
        lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace")));
@@ -1284,7 +1305,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref"));
                lyxpreamble += oss.str();
        }
-
+       
        // Will be surrounded by \makeatletter and \makeatother when needed
        docstring atlyxpreamble;
 
@@ -1367,8 +1388,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        else
                lyxpreamble += '\n' + atlyxpreamble;
 
-       // We try to load babel late, in case it interferes
-       // with other packages.
+       // We try to load babel late, in case it interferes with other packages.
        // Jurabib and Hyperref have to be called after babel, though.
        if (use_babel && !features.isRequired("jurabib")
            && !features.isRequired("hyperref")
@@ -1856,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;
 }