X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=0578026be334ca5dec3dd82682f4c979bacec5e1;hb=bca1b63d89e27b31b089ab48c63368640084b3a6;hp=747dd88ada8e5824d29ced4da4a50e1d938c6a1c;hpb=a7018252b75316b7855f04c51be2342dc269f96c;p=lyx.git

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 747dd88ada..0578026be3 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -23,6 +23,7 @@
 #include "LaTeX.h"
 #include "LyXRC.h"
 #include "Mover.h"
+#include "OutputParams.h"
 #include "ParagraphList.h"
 #include "Session.h"
 
@@ -258,28 +259,28 @@ void Converters::updateLast(Formats const & formats)
 }
 
 
-OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
+Flavor Converters::getFlavor(Graph::EdgePath const & path,
 					   Buffer const * buffer) const
 {
 	for (auto const & edge : path) {
 		Converter const & conv = converterlist_[edge];
 		if (conv.latex() || conv.need_aux()) {
 			if (conv.latex_flavor() == "latex")
-				return OutputParams::LATEX;
+				return Flavor::LaTeX;
 			if (conv.latex_flavor() == "xelatex")
-				return OutputParams::XETEX;
+				return Flavor::XeTeX;
 			if (conv.latex_flavor() == "lualatex")
-				return OutputParams::LUATEX;
+				return Flavor::LuaTeX;
 			if (conv.latex_flavor() == "dvilualatex")
-				return OutputParams::DVILUATEX;
+				return Flavor::DviLuaTeX;
 			if (conv.latex_flavor() == "pdflatex")
-				return OutputParams::PDFLATEX;
+				return Flavor::PdfLaTeX;
 		}
 		if (conv.docbook())
-			return OutputParams::DOCBOOK5;
+			return Flavor::DocBook5;
 	}
 	return buffer ? buffer->params().getOutputFlavor()
-		      : OutputParams::LATEX;
+		      : Flavor::LaTeX;
 }
 
 
@@ -477,7 +478,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 			 || suffixIs(bp.bufferFormat(), "-ja"))
 			&& bp.encoding().package() == Encoding::japanese;
 		runparams.use_indices = bp.use_indices;
-		runparams.bibtex_command = bp.bibtexCommand();
+		runparams.bibtex_command = bp.bibtexCommand(true);
 		runparams.index_command = (bp.index_command == "default") ?
 			string() : bp.index_command;
 		runparams.document_language = bp.language->lang();
@@ -601,16 +602,16 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 				LASSERT(buffer, return FAILURE);
 				string command;
 				switch (runparams.flavor) {
-				case OutputParams::DVILUATEX:
+				case Flavor::DviLuaTeX:
 					command = dvilualatex_command_;
 					break;
-				case OutputParams::LUATEX:
+				case Flavor::LuaTeX:
 					command = lualatex_command_;
 					break;
-				case OutputParams::PDFLATEX:
+				case Flavor::PdfLaTeX:
 					command = pdflatex_command_;
 					break;
-				case OutputParams::XETEX:
+				case Flavor::XeTeX:
 					command = xelatex_command_;
 					break;
 				default:
@@ -832,7 +833,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
 			 FileName const & filename, ErrorList & errorList)
 {
 	OutputParams runparams(nullptr);
-	runparams.flavor = OutputParams::LATEX;
+	runparams.flavor = Flavor::LaTeX;
 	LaTeX latex("", runparams, filename);
 	TeXErrors terr;
 	int const result = latex.scanLogFile(terr);
@@ -852,7 +853,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
 
 	// do the LaTeX run(s)
 	string const name = buffer.latexName();
-	LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
+	LaTeX latex(command, runparams, makeAbsPath(name),
 	            buffer.filePath(), buffer.layoutPos(),
 	            buffer.isClone(), buffer.freshStartRequired());
 	TeXErrors terr;