amend d4f58c96b5d

avoid having to validate the whole buffer just for this information

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index efa6492863a31ee618730d3e524a84462d9882ff..ac2cca9a063fb0f884f294b86d407dbb1fa76190 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1888,6 +1888,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
                runparams.use_CJK = features.mustProvide("CJK");
                runparams.use_memindex = features.isProvided("memoir-idx");
        }
+       params().use_memindex = features.isProvided("memoir-idx");
        LYXERR(Debug::OUTFILE, "  Buffer validation done.");
 
        bool const output_preamble =

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index a81d9af866c7ae3d4bd80421c0b8e46d7736b359..c5b1027518a8ed358b06b85041d7f9a97fa8cfab 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -413,6 +413,7 @@ BufferParams::BufferParams()
        use_bibtopic = false;
        multibib = string();
        use_indices = false;
+       use_memindex = false;
        save_transient_properties = true;
        track_changes = false;
        output_changes = false;

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 72d2117193ff4f929fbf4348d552032bd49739e3..d88c54e1af49e5be6ab40dc6320caea7257ae763 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -454,6 +454,8 @@ public:
        std::string multibib;
        /// Split the index?
        bool use_indices;
+       /// do we use the memoir way to split indexes?
+       mutable bool use_memindex;
        /// Save transient properties?
        bool save_transient_properties;
        /// revision tracking for this buffer ? (this is a transient property)

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 21c193839898dc3d6f31d3c17c6b516b08dac052..1a90f5b32512b2a7dffe2bd3955f81f8ae7a5dd4 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -503,6 +503,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                && !bp.useBibtopic()
                                && bp.multibib == "child";
                runparams.includeall = includeall;
+               runparams.use_memindex = bp.use_memindex;
        }
 
        // Some converters (e.g. lilypond) can only output files to the
@@ -556,15 +557,6 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                                   "tmpfile.out"));
                }
 
-               if (buffer && buffer->params().use_indices && conv.latex()) {
-                       // We need to validate the buffer to get access to features.
-                       // FIXME Not nice that we need to do this here.
-                       LYXERR(Debug::OUTFILE, "  Validating buffer...");
-                       LaTeXFeatures features(*buffer, buffer->params(), runparams);
-                       buffer->validate(features);
-                       runparams.use_memindex = features.isProvided("memoir-idx");
-               }
-
                if (buffer && buffer->params().use_minted
                    && lyxrc.pygmentize_command.empty() && conv.latex()) {
                        bool dowarn = false;