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;
quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) +
' ' +
quoteName(to_ext + ':' + to_file.toFilesystemEncoding());
- lyxerr[Debug::FILES]
+ LYXERR(Debug::FILES)
<< "No converter defined! "
"I use convertDefault.py:\n\t"
<< command << endl;
from_ascii(from_format), from_ascii(to_format)));
return false;
}
- OutputParams runparams;
+
+ // buffer is only invalid for importing, and then runparams is not
+ // used anyway.
+ OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
runparams.flavor = getFlavor(edgepath);
// Some converters (e.g. lilypond) can only output files to the
// 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.absFilename());
- Path p(path);
+ string const path(onlyPath(from_file.absFilename()));
+ // Prevent the compiler from optimizing away p
+ FileName pp(path);
+ support::Path p(pp);
// empty the error list before any new conversion takes place.
errorList.clear();
Converter const & conv = converterlist_[*cit];
bool dummy = conv.To->dummy() && conv.to != "program";
if (!dummy)
- lyxerr[Debug::FILES] << "Converting from "
+ LYXERR(Debug::FILES) << "Converting from "
<< conv.from << " to " << conv.to << endl;
infile = outfile;
outfile = FileName(conv.result_dir.empty()
if (conv.latex) {
run_latex = true;
string const command = subst(conv.command, token_from, "");
- lyxerr[Debug::FILES] << "Running " << command << endl;
+ LYXERR(Debug::FILES) << "Running " << command << endl;
if (!runLaTeX(*buffer, command, runparams, errorList))
return false;
} else {
if (conv.need_aux && !run_latex
&& !latex_command_.empty()) {
- lyxerr[Debug::FILES]
+ LYXERR(Debug::FILES)
<< "Running " << latex_command_
<< " to update aux file"<< endl;
runLaTeX(*buffer, latex_command_, runparams, errorList);
}
+ // FIXME UNICODE
string const infile2 = (conv.original_dir)
- ? infile.absFilename() : makeRelPath(infile.absFilename(), path);
+ ? infile.absFilename() : to_utf8(makeRelPath(from_utf8(infile.absFilename()),
+ from_utf8(path)));
string const outfile2 = (conv.original_dir)
- ? outfile.absFilename() : makeRelPath(outfile.absFilename(), path);
+ ? outfile.absFilename() : to_utf8(makeRelPath(from_utf8(outfile.absFilename()),
+ from_utf8(path)));
string command = conv.command;
command = subst(command, token_from, quoteName(infile2));
command = add_options(command,
dvipdfm_options(buffer->params()));
- lyxerr[Debug::FILES] << "Calling " << command << endl;
+ LYXERR(Debug::FILES) << "Calling " << command << endl;
if (buffer)
buffer->message(_("Executing command: ")
+ from_utf8(command));
Systemcall one;
int res;
if (conv.original_dir) {
- Path p(buffer->filePath());
- res = one.startscript(type, command);
+ FileName path(buffer->filePath());
+ support::Path p(path);
+ 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
- lyxerr[Debug::FILES]
+ LYXERR(Debug::FILES)
<< "renaming file " << outfile
<< " to " << real_outfile
<< endl;
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);
+ 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> files = dirList(onlyPath(from.absFilename()), 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);
- lyxerr[Debug::FILES] << "moving " << from2
+ 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(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;
}
bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
- string const & filename, ErrorList & errorList)
+ FileName const & filename, ErrorList & errorList)
{
- OutputParams runparams;
+ OutputParams runparams(0);
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