Norwegian Intro.lyx: - fix image paths to make it compilable

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 3b5a45bc02bc95d99efe072d94a9d217c01fa127..d277d96c063d0d3b92a8bde97ab23fddb667d237 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -32,6 +32,7 @@
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "IndicesList.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -124,7 +125,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 349;  // jspitzm: initial XeTeX support
+int const LYX_FORMAT = 352;  // jspitzm: splitindex support
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -523,6 +524,7 @@ int Buffer::readHeader(Lexer & lex)
        params().clearLayoutModules();
        params().clearRemovedModules();
        params().pdfoptions().clear();
+       params().indiceslist().clear();
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -1589,7 +1591,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                                LYXERR0("Branch " << branchName << " does not exist.");
                                dr.setError(true);
                                docstring const msg = 
-                                       bformat(_("Branch \%1$s\" does not exist."), branchName);
+                                       bformat(_("Branch \"%1$s\" does not exist."), branchName);
                                dr.setMessage(msg);
                        } else {
                                branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
@@ -2654,14 +2656,20 @@ string Buffer::bufferFormat() const
 
 string Buffer::getDefaultOutputFormat() const
 {
+       if (!params().defaultOutputFormat.empty()
+           && params().defaultOutputFormat != "default")
+               return params().defaultOutputFormat;
        typedef vector<Format const *> Formats;
        Formats formats = exportableFormats(true);
        if (isDocBook()
            || isLiterate()
            || params().useXetex
-           || params().encoding().package() == Encoding::japanese)
+           || params().encoding().package() == Encoding::japanese) {
+               if (formats.empty())
+                       return string();
                // return the first we find
                return formats.front()->name();
+       }
        return lyxrc.default_view_format;
 }