X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=2f22030495139195f2d1c20fb05755cf6663cc33;hb=52019917f411c72ffa6fd8200bc5a89d286d87be;hp=ead36182cbd820e54ecb37bfcb7a3e772330a173;hpb=322808281ff449c542295c8e07d5b6c4c950b571;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index ead36182cb..2f22030495 100644 --- 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 + _( - "
Your current settings forbid its execution.
" + "Your current preference settings forbid its execution.
" "(To change this setting, go to Preferences ▹ File "
"Handling ▹ Converters and uncheck Security ▹ "
"Forbid needauth converters.)"), 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
@@ -758,15 +761,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 +785,7 @@ FormatList const Converters::intToFormat(vector