#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;
+
+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;
using std::vector;
using std::distance;
+namespace Alert = lyx::frontend::Alert;
+
namespace {
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) +
return true;
}
}
- Alert::error(lyx::to_utf8(_("Cannot convert file")),
- bformat(lyx::to_utf8(_("No information for converting %1$s "
+ 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));
+ "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();
lyxerr[Debug::FILES] << "Calling " << command << endl;
if (buffer)
- buffer->message(lyx::to_utf8(_("Executing command: "))
- + command);
+ buffer->message(_("Executing command: ")
+ + from_utf8(command));
Systemcall::Starttype const type = (dummy)
? Systemcall::DontWait : Systemcall::Wait;
if (res) {
if (conv.to == "program") {
- Alert::error(lyx::to_utf8(_("Build errors")),
- lyx::to_utf8(_("There were errors during the build process.")));
+ Alert::error(_("Build errors"),
+ _("There were errors during the build process."));
} 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(lyx::to_utf8(_("Cannot convert file")),
- bformat(lyx::to_utf8(_("An error occurred whilst running %1$s")),
- 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;
}
token_base, to_base);
Mover const & mover = movers(conv.from);
if (!mover.rename(from, to)) {
- Alert::error(lyx::to_utf8(_("Cannot convert file")),
- bformat(lyx::to_utf8(_("Could not move a temporary file from %1$s to %2$s.")),
- from, to));
+ Alert::error(_("Cannot convert file"),
+ bformat(_("Could not move a temporary file from %1$s to %2$s."),
+ from_ascii(from), from_ascii(to)));
return false;
}
}
? mover.copy(from2, to2)
: mover.rename(from2, to2);
if (!moved && no_errors) {
- Alert::error(lyx::to_utf8(_("Cannot convert file")),
+ Alert::error(_("Cannot convert file"),
bformat(copy ?
- lyx::to_utf8(_("Could not copy a temporary file from %1$s to %2$s.")) :
- lyx::to_utf8(_("Could not move a temporary file from %1$s to %2$s.")),
- from2, to2));
+ _("Could not copy a temporary file from %1$s to %2$s.") :
+ _("Could not move a temporary file from %1$s to %2$s."),
+ from_ascii(from2), from_ascii(to2)));
no_errors = false;
}
}
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);
}
OutputParams const & runparams, ErrorList & errorList)
{
buffer.busy(true);
- buffer.message(lyx::to_utf8(_("Running LaTeX...")));
+ buffer.message(_("Running LaTeX..."));
runparams.document_language = buffer.params().language->babel();
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
- string const str =
- bformat(lyx::to_utf8(_("LaTeX did not run successfully. "
+ docstring const str =
+ bformat(_("LaTeX did not run successfully. "
"Additionally, LyX could not locate "
- "the LaTeX log %1$s.")), name);
- Alert::error(lyx::to_utf8(_("LaTeX failed")), str);
+ "the LaTeX log %1$s."), from_utf8(name));
+ Alert::error(_("LaTeX failed"), str);
} else if (result & LaTeX::NO_OUTPUT) {
- Alert::warning(lyx::to_utf8(_("Output is empty")),
- lyx::to_utf8(_("An empty output file was generated.")));
+ Alert::warning(_("Output is empty"),
+ _("An empty output file was generated."));
}
// The global copy after reading lyxrc.defaults
Converters system_converters;
+
+
+} // namespace lyx
projects / lyx.git / blobdiff