X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=18dddd33dc3869effef6c00e4a194c8a0b7067af;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=200e0a5a0714d68799a82ee226e8e019234e18d6;hpb=979fdf74564c6cbbb832090b8f9c8f84532b8f54;p=lyx.git

diff --git a/src/converter.C b/src/converter.C
index 200e0a5a07..18dddd33dc 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -426,12 +426,14 @@ bool Converters::convert(Buffer const * buffer,
 			int res;
 			if (conv.original_dir) {
 				Path p(buffer->filePath());
-				res = one.startscript(type, command);
+				res = one.startscript(type,
+					to_filesystem8bit(from_utf8(command)));
 			} else
-				res = one.startscript(type, command);
+				res = one.startscript(type,
+					to_filesystem8bit(from_utf8(command)));
 
 			if (!real_outfile.empty()) {
-				Mover const & mover = movers(conv.to);
+				Mover const & mover = getMover(conv.to);
 				if (!mover.rename(outfile, real_outfile))
 					res = -1;
 				else
@@ -450,7 +452,8 @@ bool Converters::convert(Buffer const * buffer,
 				string const command2 = script +
 					" < " + quoteName(infile2 + ".out") +
 					" > " + quoteName(logfile);
-				one.startscript(Systemcall::Wait, command2);
+				one.startscript(Systemcall::Wait,
+					to_filesystem8bit(from_utf8(command2)));
 				if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
 					return false;
 			}
@@ -464,7 +467,7 @@ bool Converters::convert(Buffer const * buffer,
 // it is a document (.lyx) or something else. Same goes for elsewhere.
 					Alert::error(_("Cannot convert file"),
 						bformat(_("An error occurred whilst running %1$s"),
-						from_ascii(command.substr(0, 50))));
+						from_utf8(command.substr(0, 50))));
 				}
 				return false;
 			}
@@ -483,11 +486,11 @@ bool Converters::convert(Buffer const * buffer,
 					    token_base, from_base);
 			string const to = subst(conv.result_dir,
 					  token_base, to_base);
-			Mover const & mover = movers(conv.from);
+			Mover const & mover = getMover(conv.from);
 			if (!mover.rename(FileName(from), FileName(to))) {
 				Alert::error(_("Cannot convert file"),
 					bformat(_("Could not move a temporary directory from %1$s to %2$s."),
-						from_ascii(from), from_ascii(to)));
+						from_utf8(from), from_utf8(to)));
 				return false;
 			}
 		}
@@ -525,7 +528,7 @@ bool Converters::move(string const & fmt,
 			lyxerr[Debug::FILES] << "moving " << from2
 					     << " to " << to2 << endl;
 
-			Mover const & mover = movers(fmt);
+			Mover const & mover = getMover(fmt);
 			bool const moved = copy
 				? mover.copy(*it, FileName(to2))
 				: mover.rename(*it, FileName(to2));
@@ -697,12 +700,4 @@ Converters::getPath(string const & from, string const & to)
 			  formats.getNumber(to));
 }
 
-
-/// The global instance
-Converters converters;
-
-// The global copy after reading lyxrc.defaults
-Converters system_converters;
-
-
 } // namespace lyx