X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConverter.cpp;h=cb98b44194f86b3eaab0c3b5f8a39183885fa364;hb=b96ce9a9c101a711ef8a1cdd5d6fe812a18966da;hp=a157c2237d6f71813a6b1b6abde1b74095f19b75;hpb=a6c6bffbed87e8b1c8099703a6e6422f8cc48c24;p=lyx.git

diff --git a/src/Converter.cpp b/src/Converter.cpp
index a157c2237d..cb98b44194 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -105,7 +105,7 @@ private:
 Converter::Converter(string const & f, string const & t,
 		     string const & c, string const & l)
 	: from_(f), to_(t), command_(c), flags_(l),
-	  From_(0), To_(0), latex_(false), xml_(false),
+	  From_(nullptr), To_(nullptr), latex_(false), xml_(false),
 	  need_aux_(false), nice_(false), need_auth_(false)
 {}
 
@@ -123,9 +123,11 @@ void Converter::readFlags()
 				"latex" : flag_value;
 		} else if (flag_name == "xml")
 			xml_ = true;
-		else if (flag_name == "needaux")
+		else if (flag_name == "needaux") {
 			need_aux_ = true;
-		else if (flag_name == "resultdir")
+			latex_flavor_ = flag_value.empty() ?
+				"latex" : flag_value;
+		} else if (flag_name == "resultdir")
 			result_dir_ = (flag_value.empty())
 				? token_base : flag_value;
 		else if (flag_name == "resultfile")
@@ -155,7 +157,7 @@ Converter const * Converters::getConverter(string const & from,
 	if (cit != converterlist_.end())
 		return &(*cit);
 	else
-		return 0;
+		return nullptr;
 }
 
 
@@ -238,11 +240,9 @@ void Converters::erase(string const & from, string const & to)
 // a list (instead of a vector), but this will cause other problems).
 void Converters::update(Formats const & formats)
 {
-	ConverterList::iterator it = converterlist_.begin();
-	ConverterList::iterator end = converterlist_.end();
-	for (; it != end; ++it) {
-		it->setFrom(formats.getFormat(it->from()));
-		it->setTo(formats.getFormat(it->to()));
+	for (auto & cv : converterlist_) {
+		cv.setFrom(formats.getFormat(cv.from()));
+		cv.setTo(formats.getFormat(cv.to()));
 	}
 }
 
@@ -262,10 +262,9 @@ void Converters::updateLast(Formats const & formats)
 OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
 					   Buffer const * buffer)
 {
-	for (Graph::EdgePath::const_iterator cit = path.begin();
-	     cit != path.end(); ++cit) {
-		Converter const & conv = converterlist_[*cit];
-		if (conv.latex()) {
+	for (auto const & edge : path) {
+		Converter const & conv = converterlist_[edge];
+		if (conv.latex() || conv.need_aux()) {
 			if (conv.latex_flavor() == "latex")
 				return OutputParams::LATEX;
 			if (conv.latex_flavor() == "xelatex")
@@ -287,9 +286,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
 
 string Converters::getHyperrefDriver(Graph::EdgePath const & path)
 {
-	for (Graph::EdgePath::const_iterator cit = path.begin();
-	     cit != path.end(); ++cit) {
-		Converter const & conv = converterlist_[*cit];
+	for (auto const & edge : path) {
+		Converter const & conv = converterlist_[edge];
 		if (!conv.hyperref_driver().empty())
 			return conv.hyperref_driver();
 	}
@@ -402,7 +400,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 			 FileName const & from_file, FileName const & to_file,
 			 FileName const & orig_from,
 			 string const & from_format, string const & to_format,
-			 ErrorList & errorList, int conversionflags)
+			 ErrorList & errorList, int conversionflags, bool includeall)
 {
 	if (from_format == to_format)
 		return move(from_format, from_file, to_file, false) ?
@@ -470,23 +468,27 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 
 	// buffer is only invalid for importing, and then runparams is not
 	// used anyway.
-	OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
+	OutputParams runparams(buffer ? &buffer->params().encoding() : nullptr);
 	runparams.flavor = getFlavor(edgepath, buffer);
 
 	if (buffer) {
+		BufferParams const & bp = buffer->params();
 		runparams.use_japanese =
-			(buffer->params().bufferFormat() == "latex"
-			 || suffixIs(buffer->params().bufferFormat(), "-ja"))
-			&& buffer->params().encoding().package() == Encoding::japanese;
-		runparams.use_indices = buffer->params().use_indices;
-		runparams.bibtex_command = buffer->params().bibtexCommand();
-		runparams.index_command = (buffer->params().index_command == "default") ?
-			string() : buffer->params().index_command;
-		runparams.document_language = buffer->params().language->babel();
-		runparams.main_fontenc = buffer->params().main_font_encoding();
-		runparams.only_childbibs = !buffer->params().useBiblatex()
-				&& !buffer->params().useBibtopic()
-				&& buffer->params().multibib == "child";
+			(bp.bufferFormat() == "latex"
+			 || suffixIs(bp.bufferFormat(), "-ja"))
+			&& bp.encoding().package() == Encoding::japanese;
+		runparams.use_indices = bp.use_indices;
+		runparams.bibtex_command = bp.bibtexCommand();
+		runparams.index_command = (bp.index_command == "default") ?
+			string() : bp.index_command;
+		runparams.document_language = bp.language->babel();
+		runparams.xindy_language = bp.language->xindy();
+		// Some macros rely on font encoding
+		runparams.main_fontenc = bp.main_font_encoding();
+		runparams.only_childbibs = !bp.useBiblatex()
+				&& !bp.useBibtopic()
+				&& bp.multibib == "child";
+		runparams.includeall = includeall;
 	}
 
 	// Some converters (e.g. lilypond) can only output files to the
@@ -509,9 +511,8 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 	string to_base = changeExtension(to_file.absFileName(), "");
 	FileName infile;
 	FileName outfile = from_file;
-	for (Graph::EdgePath::const_iterator cit = edgepath.begin();
-	     cit != edgepath.end(); ++cit) {
-		Converter const & conv = converterlist_[*cit];
+	for (auto const & edge : edgepath) {
+		Converter const & conv = converterlist_[edge];
 		bool dummy = conv.To()->dummy() && conv.to() != "program";
 		if (!dummy) {
 			LYXERR(Debug::FILES, "Converting from  "
@@ -581,7 +582,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 
 		if (conv.latex()) {
 			// We are not importing, we have a buffer
-			LATTEST(buffer);
+			LASSERT(buffer, return FAILURE);
 			run_latex = true;
 			string command = conv.command();
 			command = subst(command, token_from, "");
@@ -599,7 +600,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 		} else {
 			if (conv.need_aux() && !run_latex) {
 				// We are not importing, we have a buffer
-				LATTEST(buffer);
+				LASSERT(buffer, return FAILURE);
 				string command;
 				switch (runparams.flavor) {
 				case OutputParams::DVILUATEX:
@@ -708,8 +709,8 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 						" > " + quoteName(logfile);
 					res = one.startscript(starttype,
 						to_filesystem8bit(from_utf8(command2)),
-						buffer->filePath(),
-						buffer->layoutPos());
+						buffer ? buffer->filePath() : string(),
+						buffer ? buffer->layoutPos() : string());
 					if (res == Systemcall::KILLED) {
 						frontend::Alert::warning(
 							_("Converter killed"),
@@ -717,7 +718,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
 								from_utf8(command)));
 						return KILLED;
 					}
-					if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
+					if (buffer && !scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
 						return FAILURE;
 				}
 			}
@@ -792,9 +793,8 @@ bool Converters::move(string const & fmt,
 	string const to_extension = getExtension(to.absFileName());
 
 	support::FileNameList const files = FileName(path).dirList(getExtension(from.absFileName()));
-	for (support::FileNameList::const_iterator it = files.begin();
-	     it != files.end(); ++it) {
-		string const from2 = it->absFileName();
+	for (auto const & f : files) {
+		string const from2 = f.absFileName();
 		string const file2 = onlyFileName(from2);
 		if (prefixIs(file2, base)) {
 			string const to2 = changeExtension(
@@ -804,8 +804,8 @@ bool Converters::move(string const & fmt,
 
 			Mover const & mover = getMover(fmt);
 			bool const moved = copy
-				? mover.copy(*it, FileName(to2))
-				: mover.rename(*it, FileName(to2));
+				? mover.copy(f, FileName(to2))
+				: mover.rename(f, FileName(to2));
 			if (!moved && no_errors) {
 				Alert::error(_("Cannot convert file"),
 					bformat(copy ?
@@ -822,10 +822,8 @@ bool Converters::move(string const & fmt,
 
 bool Converters::formatIsUsed(string const & format)
 {
-	ConverterList::const_iterator cit = converterlist_.begin();
-	ConverterList::const_iterator end = converterlist_.end();
-	for (; cit != end; ++cit) {
-		if (cit->from() == format || cit->to() == format)
+	for (auto const & cvt : converterlist_) {
+		if (cvt.from() == format || cvt.to() == format)
 			return true;
 	}
 	return false;
@@ -835,7 +833,7 @@ bool Converters::formatIsUsed(string const & format)
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
 			 FileName const & filename, ErrorList & errorList)
 {
-	OutputParams runparams(0);
+	OutputParams runparams(nullptr);
 	runparams.flavor = OutputParams::LATEX;
 	LaTeX latex("", runparams, filename);
 	TeXErrors terr;
@@ -858,7 +856,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
 	string const name = buffer.latexName();
 	LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
 	            buffer.filePath(), buffer.layoutPos(),
-	            buffer.isClone(), buffer.lastPreviewError());
+	            buffer.isClone(), buffer.freshStartRequired());
 	TeXErrors terr;
 	// The connection closes itself at the end of the scope when latex is
 	// destroyed. One cannot close (and destroy) buffer while the converter is
@@ -877,6 +875,15 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
 	if (result & LaTeX::ERRORS)
 		buffer.bufferErrors(terr, errorList);
 
+	if ((result & LaTeX::UNDEF_CIT) || (result & LaTeX::UNDEF_UNKNOWN_REF)) {
+		buffer.bufferRefs(terr, errorList);
+		if (errorList.empty())
+			errorList.push_back(ErrorItem(_("Undefined reference"),
+				_("Undefined references or citations were found during the build.\n"
+				  "Please check the warnings in the LaTeX log (Document > LaTeX Log)."),
+				&buffer));
+	}
+
 	if (!errorList.empty()) {
 	  // We will show the LaTeX Errors GUI later which contains
 	  // specific error messages so it would be repetitive to give
@@ -905,6 +912,8 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
 	int const ERROR_MASK =
 			LaTeX::NO_LOGFILE |
 			LaTeX::ERRORS |
+			LaTeX::UNDEF_CIT |
+			LaTeX::UNDEF_UNKNOWN_REF |
 			LaTeX::NO_OUTPUT;
 
 	return (result & ERROR_MASK) == 0 ? SUCCESS : FAILURE;
@@ -919,11 +928,9 @@ void Converters::buildGraph()
 	// 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 = theFormats().getNumber(it->from());
-		int const to   = theFormats().getNumber(it->to());
+	for (auto const & cvt : converterlist_) {
+		int const from = theFormats().getNumber(cvt.from());
+		int const to   = theFormats().getNumber(cvt.to());
 		LASSERT(from >= 0, continue);
 		LASSERT(to >= 0, continue);
 		G_.addEdge(from, to);
@@ -961,10 +968,8 @@ FormatList const Converters::getReachable(string const & from,
 {
 	set<int> excluded_numbers;
 
-	set<string>::const_iterator sit = excludes.begin();
-	set<string>::const_iterator const end = excludes.end();
-	for (; sit != end; ++sit)
-		excluded_numbers.insert(theFormats().getNumber(*sit));
+	for (auto const & ex : excludes)
+		excluded_numbers.insert(theFormats().getNumber(ex));
 
 	vector<int> const & reachables =
 		G_.getReachable(theFormats().getNumber(from),