remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index cfdf54ba016ed7ce8f37140195f0207ed20d885b..11902f1637e2ea0aa0ec5e00b7be9d990f1838d9 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -317,7 +317,7 @@ bool Converters::convert(Buffer const * buffer,
                                quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) +
                                ' ' +
                                quoteName(to_ext + ':' + to_file.toFilesystemEncoding());
-                       lyxerr[Debug::FILES]
+                       LYXERR(Debug::FILES)
                                << "No converter defined! "
                                   "I use convertDefault.py:\n\t"
                                << command << endl;
@@ -337,7 +337,10 @@ bool Converters::convert(Buffer const * buffer,
                                                        from_ascii(from_format), from_ascii(to_format)));
                return false;
        }
-       OutputParams runparams;
+
+       // buffer is only invalid for importing, and then runparams is not
+       // used anyway.
+       OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
        runparams.flavor = getFlavor(edgepath);
 
        // Some converters (e.g. lilypond) can only output files to the
@@ -361,7 +364,7 @@ bool Converters::convert(Buffer const * buffer,
                Converter const & conv = converterlist_[*cit];
                bool dummy = conv.To->dummy() && conv.to != "program";
                if (!dummy)
-                       lyxerr[Debug::FILES] << "Converting from  "
+                       LYXERR(Debug::FILES) << "Converting from  "
                               << conv.from << " to " << conv.to << endl;
                infile = outfile;
                outfile = FileName(conv.result_dir.empty()
@@ -382,22 +385,25 @@ bool Converters::convert(Buffer const * buffer,
                if (conv.latex) {
                        run_latex = true;
                        string const command = subst(conv.command, token_from, "");
-                       lyxerr[Debug::FILES] << "Running " << command << endl;
+                       LYXERR(Debug::FILES) << "Running " << command << endl;
                        if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
                } else {
                        if (conv.need_aux && !run_latex
                            && !latex_command_.empty()) {
-                               lyxerr[Debug::FILES]
+                               LYXERR(Debug::FILES)
                                        << "Running " << latex_command_
                                        << " to update aux file"<<  endl;
                                runLaTeX(*buffer, latex_command_, runparams, errorList);
                        }
 
+                       // FIXME UNICODE
                        string const infile2 = (conv.original_dir)
-                               ? infile.absFilename() : makeRelPath(infile.absFilename(), path);
+                               ? infile.absFilename() : to_utf8(makeRelPath(from_utf8(infile.absFilename()),
+                                                                            from_utf8(path)));
                        string const outfile2 = (conv.original_dir)
-                               ? outfile.absFilename() : makeRelPath(outfile.absFilename(), path);
+                               ? outfile.absFilename() : to_utf8(makeRelPath(from_utf8(outfile.absFilename()),
+                                                                             from_utf8(path)));
 
                        string command = conv.command;
                        command = subst(command, token_from, quoteName(infile2));
@@ -415,7 +421,7 @@ bool Converters::convert(Buffer const * buffer,
                                command = add_options(command,
                                                      dvipdfm_options(buffer->params()));
 
-                       lyxerr[Debug::FILES] << "Calling " << command << endl;
+                       LYXERR(Debug::FILES) << "Calling " << command << endl;
                        if (buffer)
                                buffer->message(_("Executing command: ")
                                + from_utf8(command));
@@ -426,16 +432,18 @@ 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
-                                       lyxerr[Debug::FILES]
+                                       LYXERR(Debug::FILES)
                                                << "renaming file " << outfile
                                                << " to " << real_outfile
                                                << endl;
@@ -450,7 +458,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 +473,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 +492,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;
                        }
                }
@@ -522,10 +531,10 @@ bool Converters::move(string const & fmt,
                        string const to2 = changeExtension(
                                to_base + file2.substr(base.length()),
                                to_extension);
-                       lyxerr[Debug::FILES] << "moving " << from2
+                       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));
@@ -558,7 +567,7 @@ bool Converters::formatIsUsed(string const & format)
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
                         FileName const & filename, ErrorList & errorList)
 {
-       OutputParams runparams;
+       OutputParams runparams(0);
        runparams.flavor = OutputParams::LATEX;
        LaTeX latex("", runparams, filename);
        TeXErrors terr;