namespace lyx {
-using support::absolutePath;
using support::addName;
using support::bformat;
using support::changeExtension;
using support::compare_ascii_no_case;
using support::contains;
using support::dirList;
+using support::FileName;
using support::getExtension;
using support::isFileReadable;
using support::libFileSearch;
using support::libScriptSearch;
+using support::makeAbsPath;
using support::makeRelPath;
using support::onlyFilename;
using support::onlyPath;
using support::Path;
using support::prefixIs;
using support::quoteName;
+using support::removeExtension;
using support::split;
using support::subst;
using support::Systemcall;
bool Converters::convert(Buffer const * buffer,
- string const & from_file, string const & to_file,
- string const & orig_from,
+ FileName const & from_file, FileName const & to_file,
+ FileName const & orig_from,
string const & from_format, string const & to_format,
ErrorList & errorList, int conversionflags)
{
- BOOST_ASSERT(absolutePath(from_file));
- BOOST_ASSERT(absolutePath(to_file));
- BOOST_ASSERT(absolutePath(orig_from));
-
if (from_format == to_format)
return move(from_format, from_file, to_file, false);
// if no special converter defined, then we take the
// default one from ImageMagic.
string const from_ext = from_format.empty() ?
- getExtension(from_file) :
+ getExtension(from_file.absFilename()) :
formats.extension(from_format);
string const to_ext = formats.extension(to_format);
string const command =
support::os::python() + ' ' +
- quoteName(libFileSearch("scripts", "convertDefault.py")) +
+ quoteName(libFileSearch("scripts", "convertDefault.py").toFilesystemEncoding()) +
' ' +
- quoteName(from_ext + ':' + from_file) +
+ quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) +
' ' +
- quoteName(to_ext + ':' + to_file);
+ quoteName(to_ext + ':' + to_file.toFilesystemEncoding());
lyxerr[Debug::FILES]
<< "No converter defined! "
"I use convertDefault.py:\n\t"
// 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);
+ string path = onlyPath(from_file.absFilename());
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, "");
- string to_base = changeExtension(to_file, "");
- string infile;
- string outfile = from_file;
+ string from_base = changeExtension(from_file.absFilename(), "");
+ string to_base = changeExtension(to_file.absFilename(), "");
+ FileName infile;
+ FileName outfile = from_file;
for (Graph::EdgePath::const_iterator cit = edgepath.begin();
cit != edgepath.end(); ++cit) {
Converter const & conv = converterlist_[*cit];
lyxerr[Debug::FILES] << "Converting from "
<< conv.from << " to " << conv.to << endl;
infile = outfile;
- outfile = conv.result_dir.empty()
- ? changeExtension(from_file, conv.To->extension())
+ outfile = FileName(conv.result_dir.empty()
+ ? changeExtension(from_file.absFilename(), conv.To->extension())
: addName(subst(conv.result_dir,
token_base, from_base),
subst(conv.result_file,
- token_base, onlyFilename(from_base)));
+ token_base, onlyFilename(from_base))));
// if input and output files are equal, we use a
// temporary file as intermediary (JMarc)
- string real_outfile;
+ FileName real_outfile;
if (outfile == infile) {
real_outfile = infile;
- outfile = addName(buffer->temppath(), "tmpfile.out");
+ outfile = FileName(addName(buffer->temppath(), "tmpfile.out"));
}
if (conv.latex) {
}
string const infile2 = (conv.original_dir)
- ? infile : makeRelPath(infile, path);
+ ? infile.absFilename() : makeRelPath(infile.absFilename(), path);
string const outfile2 = (conv.original_dir)
- ? outfile : makeRelPath(outfile, path);
+ ? outfile.absFilename() : makeRelPath(outfile.absFilename(), path);
string command = conv.command;
command = subst(command, token_from, quoteName(infile2));
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, logfile, 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);
- if (!mover.rename(from, to)) {
+ 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 Converters::move(string const & fmt,
- string const & from, string const & to, bool copy)
+ FileName const & from, FileName const & to, bool copy)
{
if (from == to)
return true;
bool no_errors = true;
- string const path = onlyPath(from);
- string const base = onlyFilename(changeExtension(from, ""));
- string const to_base = changeExtension(to, "");
- string const to_extension = getExtension(to);
-
- vector<string> files = dirList(onlyPath(from), getExtension(from));
- 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);
+ string const path = onlyPath(from.absFilename());
+ string const base = onlyFilename(removeExtension(from.absFilename()));
+ string const to_base = removeExtension(to.absFilename());
+ string const to_extension = getExtension(to.absFilename());
+
+ vector<FileName> const files = dirList(FileName(path),
+ getExtension(from.absFilename()));
+ 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(from2, to2)
- : mover.rename(from2, 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;
}
bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
- string const & filename, ErrorList & errorList)
+ FileName const & filename, ErrorList & errorList)
{
OutputParams runparams;
runparams.flavor = OutputParams::LATEX;
- LaTeX latex("", runparams, filename, "");
+ LaTeX latex("", runparams, filename);
TeXErrors terr;
int const result = latex.scanLogFile(terr);
// do the LaTeX run(s)
string const name = buffer.getLatexName();
- LaTeX latex(command, runparams, name, buffer.filePath());
+ LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
TeXErrors terr;
showMessage show(buffer);
latex.message.connect(show);
formats.getNumber(to));
}
-
-/// The global instance
-Converters converters;
-
-// The global copy after reading lyxrc.defaults
-Converters system_converters;
-
-
} // namespace lyx
projects / lyx.git / blobdiff