X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConverter.cpp;h=465e256bbda339bb2c5bd6def33b69505612687d;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=f10d563fc2d52ae496c4d2a0a777530d439ebdac;hpb=306b136cc005a1aeb9a6861ee0ac6fe2a2dd53e3;p=lyx.git

diff --git a/src/Converter.cpp b/src/Converter.cpp
index f10d563fc2..465e256bbd 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -29,6 +29,7 @@
 #include "support/FileNameList.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
@@ -338,7 +339,9 @@ bool Converters::convert(Buffer const * buffer,
 	runparams.flavor = getFlavor(edgepath, buffer);
 
 	if (buffer) {
-		runparams.use_japanese = buffer->params().bufferFormat() == "platex";
+		runparams.use_japanese =
+			buffer->params().bufferFormat() == "latex"
+			&& buffer->params().encoding().package() == Encoding::japanese;
 		runparams.use_indices = buffer->params().use_indices;
 		runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
 			string() : buffer->params().bibtex_command;
@@ -629,7 +632,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
 namespace {
 
 class ShowMessage
-	: public boost::signals::trackable {
+	: public boost::signals2::trackable {
 public:
 	ShowMessage(Buffer const & b) : buffer_(b) {}
 	void operator()(docstring const & msg) const { buffer_.message(msg); }
@@ -707,6 +710,8 @@ void Converters::buildGraph()
 	for (; it != end ; ++it) {
 		int const from = formats.getNumber(it->from());
 		int const to   = formats.getNumber(it->to());
+		LASSERT(from >= 0, continue);
+		LASSERT(to >= 0, continue);
 		G_.addEdge(from, to);
 	}
 }