Do not open or close branches after doc settings

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index ead36182cbd820e54ecb37bfcb7a3e772330a173..104ad0a42c49eea8281ea69da72c5c80ae7d5b33 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -134,7 +134,7 @@ void Converter::readFlags()
                        need_auth_ = true;
        }
        if (!result_dir_.empty() && result_file_.empty())
-               result_file_ = "index." + formats.extension(to_);
+               result_file_ = "index." + theFormats().extension(to_);
        //if (!contains(command, token_from))
        //      latex = true;
 }
@@ -168,8 +168,8 @@ int Converters::getNumber(string const & from, string const & to) const
 void Converters::add(string const & from, string const & to,
                     string const & command, string const & flags)
 {
-       formats.add(from);
-       formats.add(to);
+       theFormats().add(from);
+       theFormats().add(to);
        ConverterList::iterator it = find_if(converterlist_.begin(),
                                             converterlist_.end(),
                                             ConverterEqual(from , to));
@@ -293,10 +293,10 @@ bool Converters::checkAuth(Converter const & conv, string const & doc_fname)
              from_utf8(conv.command()), from_utf8(conv.from()),
              from_utf8(conv.to()));
        if (lyxrc.use_converter_needauth_forbidden) {
-               frontend::Alert::warning(
+               frontend::Alert::error(
                    _("An external converter is disabled for security reasons"),
                    security_warning + _(
-                   "<p>Your current settings forbid its execution.</p>"
+                   "<p><b>Your current preference settings forbid its execution.</b></p>"
                    "<p>(To change this setting, go to <i>Preferences &#x25b9; File "
                    "Handling &#x25b9; Converters</i> and uncheck <i>Security &#x25b9; "
                    "Forbid needauth converters</i>.)"), false);
@@ -350,8 +350,8 @@ bool Converters::convert(Buffer const * buffer,
                        // default one from ImageMagic.
                        string const from_ext = from_format.empty() ?
                                getExtension(from_file.absFileName()) :
-                               formats.extension(from_format);
-                       string const to_ext = formats.extension(to_format);
+                               theFormats().extension(from_format);
+                       string const to_ext = theFormats().extension(to_format);
                        string const command =
                                os::python() + ' ' +
                                quoteName(libFileSearch("scripts", "convertDefault.py").toFilesystemEncoding()) +
@@ -402,6 +402,9 @@ bool Converters::convert(Buffer const * buffer,
                runparams.index_command = (buffer->params().index_command == "default") ?
                        string() : buffer->params().index_command;
                runparams.document_language = buffer->params().language->babel();
+               runparams.only_childbibs = !buffer->params().useBiblatex()
+                               && !buffer->params().useBibtopic()
+                               && buffer->params().multibib == "child";
        }
 
        // Some converters (e.g. lilypond) can only output files to the
@@ -460,16 +463,20 @@ bool Converters::convert(Buffer const * buffer,
                        return false;
 
                if (conv.latex()) {
+                       // We are not importing, we have a buffer
+                       LATTEST(buffer);
                        run_latex = true;
                        string command = conv.command();
                        command = subst(command, token_from, "");
-                       command = subst(command, token_latex_encoding, buffer ?
-                               buffer->params().encoding().latexName() : string());
+                       command = subst(command, token_latex_encoding,
+                                       buffer->params().encoding().latexName());
                        LYXERR(Debug::FILES, "Running " << command);
                        if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
                } else {
                        if (conv.need_aux() && !run_latex) {
+                               // We are not importing, we have a buffer
+                               LATTEST(buffer);
                                string command;
                                switch (runparams.flavor) {
                                case OutputParams::DVILUATEX:
@@ -758,15 +765,15 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 void Converters::buildGraph()
 {
        // clear graph's data structures
-       G_.init(formats.size());
+       G_.init(theFormats().size());
        // each of the converters knows how to convert one format to another
        // so, for each of them, we create an arrow on the graph, going from
        // the one to the other
        ConverterList::iterator it = converterlist_.begin();
        ConverterList::iterator const end = converterlist_.end();
        for (; it != end ; ++it) {
-               int const from = formats.getNumber(it->from());
-               int const to   = formats.getNumber(it->to());
+               int const from = theFormats().getNumber(it->from());
+               int const to   = theFormats().getNumber(it->to());
                LASSERT(from >= 0, continue);
                LASSERT(to >= 0, continue);
                G_.addEdge(from, to);
@@ -782,7 +789,7 @@ FormatList const Converters::intToFormat(vector<int> const & input)
        vector<int>::const_iterator const end = input.end();
        FormatList::iterator rit = result.begin();
        for ( ; it != end; ++it, ++rit) {
-               *rit = &formats.get(*it);
+               *rit = &theFormats().get(*it);
        }
        return result;
 }
@@ -792,7 +799,7 @@ FormatList const Converters::getReachableTo(string const & target,
                bool const clear_visited)
 {
        vector<int> const & reachablesto =
-               G_.getReachableTo(formats.getNumber(target), clear_visited);
+               G_.getReachableTo(theFormats().getNumber(target), clear_visited);
 
        return intToFormat(reachablesto);
 }
@@ -807,10 +814,10 @@ FormatList const Converters::getReachable(string const & from,
        set<string>::const_iterator sit = excludes.begin();
        set<string>::const_iterator const end = excludes.end();
        for (; sit != end; ++sit)
-               excluded_numbers.insert(formats.getNumber(*sit));
+               excluded_numbers.insert(theFormats().getNumber(*sit));
 
        vector<int> const & reachables =
-               G_.getReachable(formats.getNumber(from),
+               G_.getReachable(theFormats().getNumber(from),
                                only_viewable,
                                clear_visited,
                                excluded_numbers);
@@ -821,15 +828,15 @@ FormatList const Converters::getReachable(string const & from,
 
 bool Converters::isReachable(string const & from, string const & to)
 {
-       return G_.isReachable(formats.getNumber(from),
-                             formats.getNumber(to));
+       return G_.isReachable(theFormats().getNumber(from),
+                             theFormats().getNumber(to));
 }
 
 
 Graph::EdgePath Converters::getPath(string const & from, string const & to)
 {
-       return G_.getPath(formats.getNumber(from),
-                         formats.getNumber(to));
+       return G_.getPath(theFormats().getNumber(from),
+                         theFormats().getNumber(to));
 }