Transfer the setting of the current LyXView from workArea::focusInEvent() to GuiView...

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 2577abd1f823d63c01452f33c411dac08275068d..88115e5e2469d441c6d0aa91ae89f2c9922a9a2c 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -37,6 +37,7 @@
 #include "Spacing.h"
 #include "TexRow.h"
 #include "VSpace.h"
+#include "PDFOptions.h"
 
 #include "frontends/alert.h"
 #include "insets/InsetListingsParams.h"
@@ -44,6 +45,7 @@
 #include "support/convert.h"
 #include "support/filetools.h"
 #include "support/Translator.h"
+#include "support/lstrings.h"
 
 #include <boost/array.hpp>
 
@@ -63,6 +65,7 @@ using lyx::support::libFileSearch;
 using lyx::support::bformat;
 using lyx::support::rtrim;
 using lyx::support::tokenPos;
+using lyx::support::prefixIs;
 
 
 static char const * const string_paragraph_separation[] = {
@@ -290,6 +293,7 @@ public:
         * and for detached paragraphs in "indented" documents.
         */
        VSpace defskip;
+       PDFOptions pdfoptions;
 };
 
 
@@ -436,6 +440,18 @@ Spacing const & BufferParams::spacing() const
 }
 
 
+PDFOptions & BufferParams::pdfoptions()
+{
+       return pimpl_->pdfoptions;
+}
+
+
+PDFOptions const & BufferParams::pdfoptions() const
+{
+       return pimpl_->pdfoptions;
+}
+
+
 VSpace const & BufferParams::getDefSkip() const
 {
        return pimpl_->defskip;
@@ -633,6 +649,14 @@ string const BufferParams::readToken(Lexer & lex, string const & token)
                spacing().set(spacetranslator().find(nspacing), tmp_val);
        } else if (token == "\\float_placement") {
                lex >> float_placement;
+
+       } else if (prefixIs(token, "\\pdf_") || token == "\\use_hyperref") {
+               string toktmp = pdfoptions().readToken(lex, token);
+               if (!toktmp.empty()) {
+                       lyxerr << "PDFOptions::readToken(): Unknown token: " <<
+                               toktmp << endl;
+                       return toktmp;
+               }
        } else {
                lyxerr << "BufferParams::readToken(): Unknown token: " << 
                        token << endl;
@@ -694,6 +718,7 @@ void BufferParams::writeFile(ostream & os) const
        os << "\\paperfontsize " << fontsize << '\n';
 
        spacing().writeFile(os);
+       pdfoptions().writeFile(os);
 
        os << "\\papersize " << string_papersize[papersize]
           << "\n\\use_geometry " << convert<string>(use_geometry)
@@ -1095,6 +1120,34 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // The optional packages;
        docstring lyxpreamble(from_ascii(features.getPackages()));
 
+       // We try to load babel late, in case it interferes
+       // with other packages. But some packages also need babel to be loaded
+       // before, e.g. jurabib has to be called after babel.
+       // So load babel after the optional packages but before the user-defined
+       // preamble. This allows the users to redefine babel commands, e.g. to
+       // translate the word "Index" to the German "Stichwortverzeichnis".
+       // For more infos why this place was chosen, see
+       // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg128425.html
+       // if you encounter problem, you can shift babel to its old place behind
+       // the user-defined preamble
+       if (use_babel && !features.isRequired("jurabib")) {
+               // FIXME UNICODE
+               lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
+               lyxpreamble += from_utf8(features.getBabelOptions());
+       }
+
+       // PDF support.
+       // * Hyperref manual: "Make sure it comes last of your loaded
+       //   packages, to give it a fighting chance of not being over-written,
+       //   since its job is to redefine many LATEX commands."
+       // * Email from Heiko Oberdiek: "It is usually better to load babel
+       //   before hyperref. Then hyperref has a chance to detect babel.
+       // * Has to be loaded before the "LyX specific LaTeX commands" to
+       //   avoid errors with algorithm floats.
+       odocstringstream oss;
+       pdfoptions().writeLaTeX(oss);
+       lyxpreamble += oss.str();
+
        // this might be useful...
        lyxpreamble += "\n\\makeatletter\n";
 
@@ -1158,15 +1211,6 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        if (!bullets_def.empty())
                lyxpreamble += bullets_def + "}\n\n";
 
-       // We try to load babel late, in case it interferes
-       // with other packages.
-       // Jurabib has to be called after babel, though.
-       if (use_babel && !features.isRequired("jurabib")) {
-               // FIXME UNICODE
-               lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
-               lyxpreamble += from_utf8(features.getBabelOptions());
-       }
-
        lyxpreamble += "\\makeatother\n\n";
 
        int const nlines =