* Painter.h:

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index f6e51c1421c0b5ba8a8273b99f878e7c6bb23428..8d2390c1fe838d4668727fd95bd46551f96e604b 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -30,27 +30,28 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::dirList;
-using lyx::support::getExtension;
-using lyx::support::isFileReadable;
-using lyx::support::libFileSearch;
-using lyx::support::libScriptSearch;
-using lyx::support::makeRelPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::Path;
-using lyx::support::prefixIs;
-using lyx::support::quoteName;
-using lyx::support::split;
-using lyx::support::subst;
-using lyx::support::Systemcall;
-
-using lyx::docstring;
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+using support::compare_ascii_no_case;
+using support::contains;
+using support::dirList;
+using support::getExtension;
+using support::isFileReadable;
+using support::libFileSearch;
+using support::libScriptSearch;
+using support::makeRelPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::Path;
+using support::prefixIs;
+using support::quoteName;
+using support::split;
+using support::subst;
+using support::Systemcall;
 
 using std::endl;
 using std::find_if;
@@ -58,6 +59,8 @@ using std::string;
 using std::vector;
 using std::distance;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 namespace {
 
@@ -301,7 +304,7 @@ bool Converters::convert(Buffer const * buffer,
                                getExtension(from_file) :
                                formats.extension(from_format);
                        string const command =
-                               lyx::support::os::python() + ' ' +
+                               support::os::python() + ' ' +
                                quoteName(libFileSearch("scripts", "convertDefault.py")) +
                                ' ' +
                                quoteName(from_ext + ':' + from_file) +
@@ -320,14 +323,21 @@ 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."),
-                                                       lyx::from_ascii(from_format), lyx::from_ascii(to_format)));
+                                                   "Define a converter in the preferences."),
+                                                       from_ascii(from_format), from_ascii(to_format)));
                return false;
        }
        OutputParams runparams;
        runparams.flavor = getFlavor(edgepath);
+
+       // Some converters (e.g. lilypond) can only output files to the
+       // current directory, so we need to change the current directory.
+       // This has the added benefit that all other files that may be
+       // generated by the converter are deleted when LyX closes and do not
+       // clutter the real working directory.
        string path = onlyPath(from_file);
        Path p(path);
+
        // empty the error list before any new conversion takes place.
        errorList.clear();
 
@@ -398,7 +408,7 @@ bool Converters::convert(Buffer const * buffer,
                        lyxerr[Debug::FILES] << "Calling " << command << endl;
                        if (buffer)
                                buffer->message(_("Executing command: ")
-                               + lyx::from_utf8(command));
+                               + from_utf8(command));
 
                        Systemcall::Starttype const type = (dummy)
                                ? Systemcall::DontWait : Systemcall::Wait;
@@ -442,9 +452,9 @@ bool Converters::convert(Buffer const * buffer,
                                } else {
 // FIXME: this should go out of here. For example, here we cannot say if
 // 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"),
-                                       lyx::from_ascii(command.substr(0, 50))));
+                                       Alert::error(_("Cannot convert file"),
+                                               bformat(_("An error occurred whilst running %1$s"),
+                                               from_ascii(command.substr(0, 50))));
                                }
                                return false;
                        }
@@ -468,7 +478,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."),
-                                               lyx::from_ascii(from), lyx::from_ascii(to)));
+                                               from_ascii(from), from_ascii(to)));
                                return false;
                        }
                }
@@ -509,7 +519,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."),
-                                               lyx::from_ascii(from2), lyx::from_ascii(to2)));
+                                               from_ascii(from2), from_ascii(to2)));
                                no_errors = false;
                        }
                }
@@ -596,7 +606,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
                docstring const str =
                        bformat(_("LaTeX did not run successfully. "
                                               "Additionally, LyX could not locate "
-                                              "the LaTeX log %1$s."), lyx::from_utf8(name));
+                                              "the LaTeX log %1$s."), from_utf8(name));
                Alert::error(_("LaTeX failed"), str);
        } else if (result & LaTeX::NO_OUTPUT) {
                Alert::warning(_("Output is empty"),
@@ -688,3 +698,6 @@ Converters converters;
 
 // The global copy after reading lyxrc.defaults
 Converters system_converters;
+
+
+} // namespace lyx