cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 750a03936bc4ad74e10c85560b3a8f2616948591..f6e51c1421c0b5ba8a8273b99f878e7c6bb23428 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -26,6 +26,7 @@
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
+#include "support/os.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 
@@ -49,6 +50,8 @@ using lyx::support::split;
 using lyx::support::subst;
 using lyx::support::Systemcall;
 
+using lyx::docstring;
+
 using std::endl;
 using std::find_if;
 using std::string;
@@ -281,7 +284,7 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
 bool Converters::convert(Buffer const * buffer,
                         string const & from_file, string const & to_file_base,
                         string const & from_format, string const & to_format,
-                        string & to_file, bool try_default)
+                        string & to_file, ErrorList & errorList, bool try_default)
 {
        string const to_ext = formats.extension(to_format);
        to_file = changeExtension(to_file_base, to_ext);
@@ -298,15 +301,15 @@ bool Converters::convert(Buffer const * buffer,
                                getExtension(from_file) :
                                formats.extension(from_format);
                        string const command =
-                               "sh " +
-                               quoteName(libFileSearch("scripts", "convertDefault.sh")) +
+                               lyx::support::os::python() + ' ' +
+                               quoteName(libFileSearch("scripts", "convertDefault.py")) +
                                ' ' +
                                quoteName(from_ext + ':' + from_file) +
                                ' ' +
                                quoteName(to_ext + ':' + to_file);
                        lyxerr[Debug::FILES]
                                << "No converter defined! "
-                                  "I use convertDefault.sh:\n\t"
+                                  "I use convertDefault.py:\n\t"
                                << command << endl;
                        Systemcall one;
                        one.startscript(Systemcall::Wait, command);
@@ -315,16 +318,18 @@ bool Converters::convert(Buffer const * buffer,
                        }
                }
                Alert::error(_("Cannot convert file"),
-                       bformat(_("No information for converting %1$s "
-                               "format files to %2$s.\n"
-                               "Define a convertor in the preferences."),
-                       from_format, to_format));
+                            bformat(_("No information for converting %1$s "
+                                                   "format files to %2$s.\n"
+                                                   "Define a convertor in the preferences."),
+                                                       lyx::from_ascii(from_format), lyx::from_ascii(to_format)));
                return false;
        }
        OutputParams runparams;
        runparams.flavor = getFlavor(edgepath);
        string path = onlyPath(from_file);
        Path p(path);
+       // empty the error list before any new conversion takes place.
+       errorList.clear();
 
        bool run_latex = false;
        string from_base = changeExtension(from_file, "");
@@ -358,7 +363,7 @@ bool Converters::convert(Buffer const * buffer,
                        run_latex = true;
                        string const command = subst(conv.command, token_from, "");
                        lyxerr[Debug::FILES] << "Running " << command << endl;
-                       if (!runLaTeX(*buffer, command, runparams))
+                       if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
                } else {
                        if (conv.need_aux && !run_latex
@@ -366,7 +371,7 @@ bool Converters::convert(Buffer const * buffer,
                                lyxerr[Debug::FILES]
                                        << "Running " << latex_command_
                                        << " to update aux file"<<  endl;
-                               runLaTeX(*buffer, latex_command_, runparams);
+                               runLaTeX(*buffer, latex_command_, runparams, errorList);
                        }
 
                        string const infile2 = (conv.original_dir)
@@ -393,7 +398,7 @@ bool Converters::convert(Buffer const * buffer,
                        lyxerr[Debug::FILES] << "Calling " << command << endl;
                        if (buffer)
                                buffer->message(_("Executing command: ")
-                                       + command);
+                               + lyx::from_utf8(command));
 
                        Systemcall::Starttype const type = (dummy)
                                ? Systemcall::DontWait : Systemcall::Wait;
@@ -426,7 +431,7 @@ bool Converters::convert(Buffer const * buffer,
                                        " < " + quoteName(infile2 + ".out") +
                                        " > " + quoteName(logfile);
                                one.startscript(Systemcall::Wait, command2);
-                               if (!scanLog(*buffer, command, logfile))
+                               if (!scanLog(*buffer, command, logfile, errorList))
                                        return false;
                        }
 
@@ -439,7 +444,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"),
-                                               command.substr(0, 50)));
+                                       lyx::from_ascii(command.substr(0, 50))));
                                }
                                return false;
                        }
@@ -463,7 +468,7 @@ bool Converters::convert(Buffer const * buffer,
                        if (!mover.rename(from, to)) {
                                Alert::error(_("Cannot convert file"),
                                        bformat(_("Could not move a temporary file from %1$s to %2$s."),
-                                               from, to));
+                                               lyx::from_ascii(from), lyx::from_ascii(to)));
                                return false;
                        }
                }
@@ -504,7 +509,7 @@ bool Converters::move(string const & fmt,
                                        bformat(copy ?
                                                _("Could not copy a temporary file from %1$s to %2$s.") :
                                                _("Could not move a temporary file from %1$s to %2$s."),
-                                               from2, to2));
+                                               lyx::from_ascii(from2), lyx::from_ascii(to2)));
                                no_errors = false;
                        }
                }
@@ -515,11 +520,11 @@ bool Converters::move(string const & fmt,
 bool Converters::convert(Buffer const * buffer,
                         string const & from_file, string const & to_file_base,
                         string const & from_format, string const & to_format,
-                        bool try_default)
+                        ErrorList & errorList, bool try_default)
 {
        string to_file;
        return convert(buffer, from_file, to_file_base, from_format, to_format,
-                      to_file, try_default);
+                      to_file, errorList, try_default);
 }
 
 
@@ -536,7 +541,7 @@ bool Converters::formatIsUsed(string const & format)
 
 
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
-                        string const & filename)
+                        string const & filename, ErrorList & errorList)
 {
        OutputParams runparams;
        runparams.flavor = OutputParams::LATEX;
@@ -545,7 +550,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
        int const result = latex.scanLogFile(terr);
 
        if (result & LaTeX::ERRORS)
-               bufferErrors(buffer, terr);
+               bufferErrors(buffer, terr, errorList);
 
        return true;
 }
@@ -553,10 +558,10 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
 
 namespace {
 
-class showMessage : public std::unary_function<string, void>, public boost::signals::trackable {
+class showMessage : public std::unary_function<docstring, void>, public boost::signals::trackable {
 public:
        showMessage(Buffer const & b) : buffer_(b) {};
-       void operator()(string const & m) const
+       void operator()(docstring const & m) const
        {
                buffer_.message(m);
        }
@@ -568,7 +573,7 @@ private:
 
 
 bool Converters::runLaTeX(Buffer const & buffer, string const & command,
-                         OutputParams const & runparams)
+                         OutputParams const & runparams, ErrorList & errorList)
 {
        buffer.busy(true);
        buffer.message(_("Running LaTeX..."));
@@ -584,14 +589,14 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
        int const result = latex.run(terr);
 
        if (result & LaTeX::ERRORS)
-               bufferErrors(buffer, terr);
+               bufferErrors(buffer, terr, errorList);
 
        // check return value from latex.run().
        if ((result & LaTeX::NO_LOGFILE)) {
-               string const str =
+               docstring const str =
                        bformat(_("LaTeX did not run successfully. "
-                                 "Additionally, LyX could not locate "
-                                 "the LaTeX log %1$s."), name);
+                                              "Additionally, LyX could not locate "
+                                              "the LaTeX log %1$s."), lyx::from_utf8(name));
                Alert::error(_("LaTeX failed"), str);
        } else if (result & LaTeX::NO_OUTPUT) {
                Alert::warning(_("Output is empty"),