using support::Path;
using support::prefixIs;
using support::quoteName;
+using support::removeExtension;
using support::split;
using support::subst;
using support::Systemcall;
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
string const command2 = script +
" < " + quoteName(infile2 + ".out") +
" > " + quoteName(logfile);
- one.startscript(Systemcall::Wait, command2);
- if (!scanLog(*buffer, command, FileName(makeAbsPath(logfile, path)), errorList))
+ one.startscript(Systemcall::Wait,
+ to_filesystem8bit(from_utf8(command2)));
+ if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
return false;
}
// 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;
}
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;
}
}
bool no_errors = true;
string const path = onlyPath(from.absFilename());
- string const base = onlyFilename(changeExtension(from.absFilename(), string()));
- string const to_base = changeExtension(to.absFilename(), string());
+ string const base = onlyFilename(removeExtension(from.absFilename()));
+ string const to_base = removeExtension(to.absFilename());
string const to_extension = getExtension(to.absFilename());
- vector<string> const files = dirList(
- FileName(onlyPath(from.absFilename())),
+ vector<FileName> const files = dirList(FileName(path),
getExtension(from.absFilename()));
- for (vector<string>::const_iterator it = files.begin();
- it != files.end(); ++it)
- if (prefixIs(*it, base)) {
- string const from2 = path + *it;
- string to2 = to_base + it->substr(base.length());
- to2 = changeExtension(to2, to_extension);
+ for (vector<FileName>::const_iterator it = files.begin();
+ it != files.end(); ++it) {
+ string const from2 = it->absFilename();
+ string const file2 = onlyFilename(from2);
+ if (prefixIs(file2, base)) {
+ string const to2 = changeExtension(
+ to_base + file2.substr(base.length()),
+ to_extension);
lyxerr[Debug::FILES] << "moving " << from2
<< " to " << to2 << endl;
- Mover const & mover = movers(fmt);
+ Mover const & mover = getMover(fmt);
bool const moved = copy
- ? mover.copy(FileName(from2), FileName(to2))
- : mover.rename(FileName(from2), FileName(to2));
+ ? mover.copy(*it, FileName(to2))
+ : mover.rename(*it, FileName(to2));
if (!moved && no_errors) {
Alert::error(_("Cannot convert file"),
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."),
- from_ascii(from2), from_ascii(to2)));
+ from_utf8(from2), from_utf8(to2)));
no_errors = false;
}
}
+ }
return no_errors;
}
formats.getNumber(to));
}
-
-/// The global instance
-Converters converters;
-
-// The global copy after reading lyxrc.defaults
-Converters system_converters;
-
-
} // namespace lyx