#include "debug.h"
#include "format.h"
#include "gettext.h"
+#include "language.h"
#include "LaTeX.h"
+#include "mover.h"
#include "frontends/Alert.h"
using lyx::support::Path;
using lyx::support::prefixIs;
using lyx::support::QuoteName;
-using lyx::support::rename;
using lyx::support::split;
using lyx::support::subst;
using lyx::support::Systemcall;
formats.extension(to_format));
if (from_format == to_format)
- return move(from_file, to_file, false);
+ return move(from_format, from_file, to_file, false);
Graph::EdgePath edgepath = getPath(from_format, to_format);
if (edgepath.empty()) {
}
OutputParams runparams;
runparams.flavor = getFlavor(edgepath);
-
string path = OnlyPath(from_file);
Path p(path);
res = one.startscript(type, command);
if (!real_outfile.empty()) {
- if (!rename(outfile, real_outfile))
+ Mover const & mover = movers(conv.to);
+ if (!mover.rename(outfile, real_outfile))
res = -1;
else
lyxerr[Debug::FILES]
if (conv.To->dummy())
return true;
-
if (!conv.result_dir.empty()) {
to_file = AddName(subst(conv.result_dir, token_base, to_base),
subst(conv.result_file,
token_base, from_base);
string to = subst(conv.result_dir,
token_base, to_base);
- if (!rename(from, to)) {
+ Mover const & mover = movers(conv.from);
+ 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));
}
return true;
} else
- return move(outfile, to_file, conv.latex);
+ return move(conv.to, outfile, to_file, conv.latex);
}
-// If from = /path/file.ext and to = /path2/file2.ext2 then this method
-// moves each /path/file*.ext file to /path2/file2*.ext2'
-bool Converters::move(string const & from, string const & to, bool copy)
+bool Converters::move(string const & fmt,
+ string const & from, string const & to, bool copy)
{
if (from == to)
return true;
to2 = ChangeExtension(to2, to_extension);
lyxerr[Debug::FILES] << "moving " << from2
<< " to " << to2 << endl;
- bool const moved = (copy)
- ? lyx::support::copy(from2, to2)
- : rename(from2, to2);
+
+ Mover const & mover = movers(fmt);
+ bool const moved = copy
+ ? mover.copy(from2, to2)
+ : mover.rename(from2, to2);
if (!moved && no_errors) {
Alert::error(_("Cannot convert file"),
- bformat(_("Could not move a temporary file from %1$s to %2$s."),
+ 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));
no_errors = false;
}
buffer.busy(true);
buffer.message(_("Running LaTeX..."));
+ runparams.document_language = buffer.params().language->babel();
+
// do the LaTeX run(s)
string name = buffer.getLatexName();
LaTeX latex(command, runparams, name, buffer.filePath());