/// ask the user what to do if a file already exists
-int checkOverwrite(string const & filename)
+int checkOverwrite(FileName const & filename)
{
- if (fs::exists(filename)) {
+ if (fs::exists(filename.toFilesystemEncoding())) {
docstring text = bformat(_("The file %1$s already exists.\n\n"
"Do you want to over-write that file?"),
- makeDisplayPath(filename));
+ makeDisplayPath(filename.absFilename()));
return Alert::prompt(_("Over-write file?"),
text, 0, 2,
_("&Over-write"), _("Over-write &all"),
// overwrite themselves. This check could be changed to
// boost::filesystem::equivalent(sourceFile, destFile) if export to
// other directories than the document directory is desired.
- if (!prefixIs(onlyPath(sourceFile.absFilename()), package().temp_dir()))
+ if (!prefixIs(onlyPath(sourceFile.absFilename()), package().temp_dir().absFilename()))
return ret;
if (!force) {
- switch(checkOverwrite(destFile.absFilename())) {
+ switch(checkOverwrite(destFile)) {
case 0:
ret = SUCCESS;
break;
}
}
- Mover const & mover = movers(format);
+ Mover const & mover = getMover(format);
if (!mover.copy(sourceFile, destFile, latexFile))
Alert::error(_("Couldn't copy file"),
bformat(_("Copying %1$s to %2$s failed."),
bool put_in_tempdir, string & result_file)
{
string backend_format;
- OutputParams runparams;
+ OutputParams runparams(&buffer->params().encoding());
runparams.flavor = OutputParams::LATEX;
- runparams.linelen = lyxrc.ascii_linelen;
+ runparams.linelen = lyxrc.plaintext_linelen;
vector<string> backends = Backends(*buffer);
- // FIXME: Without this test export to lyx13 would be through
- // latex -> lyx -> lyx13, because the first backend below with a
- // working conversion path is used. We should replace this test and
- // the explicit loop below with a method
- // getShortestPath(vector<string> const & from, string const & to)
- // which returns the shortest path from one of the formats in 'from'
- // to 'to'.
- if (format == "lyx13x" && !converters.getPath("lyx", format).empty())
- backend_format = "lyx";
- else if (find(backends.begin(), backends.end(), format) == backends.end()) {
+ if (find(backends.begin(), backends.end(), format) == backends.end()) {
+ // Get shortest path to format
+ Graph::EdgePath path;
for (vector<string>::const_iterator it = backends.begin();
it != backends.end(); ++it) {
- Graph::EdgePath p = converters.getPath(*it, format);
- if (!p.empty()) {
- runparams.flavor = converters.getFlavor(p);
+ Graph::EdgePath p = theConverters().getPath(*it, format);
+ if (!p.empty() && (path.empty() || p.size() < path.size())) {
backend_format = *it;
- break;
+ path = p;
}
}
- if (backend_format.empty()) {
+ if (!path.empty())
+ runparams.flavor = theConverters().getFlavor(path);
+ else {
Alert::error(_("Couldn't export file"),
bformat(_("No information for exporting the format %1$s."),
formats.prettyName(format)));
filename = changeExtension(filename,
formats.extension(backend_format));
- // Ascii backend
+ // Plain text backend
if (backend_format == "text")
- writeFileAscii(*buffer, filename, runparams);
+ writePlaintextFile(*buffer, FileName(filename), runparams);
// no backend
else if (backend_format == "lyx")
- buffer->writeFile(filename);
+ buffer->writeFile(FileName(filename));
// Docbook backend
else if (buffer->isDocBook()) {
runparams.nice = !put_in_tempdir;
- buffer->makeDocBookFile(filename, runparams);
+ buffer->makeDocBookFile(FileName(filename), runparams);
}
// LaTeX backend
else if (backend_format == format) {
runparams.nice = true;
- if (!buffer->makeLaTeXFile(filename, string(), runparams))
+ if (!buffer->makeLaTeXFile(FileName(filename), string(), runparams))
return false;
} else if (!lyxrc.tex_allows_spaces
&& contains(buffer->filePath(), ' ')) {
return false;
} else {
runparams.nice = false;
- if (!buffer->makeLaTeXFile(filename, buffer->filePath(), runparams))
+ if (!buffer->makeLaTeXFile(FileName(filename), buffer->filePath(), runparams))
return false;
}
string const error_type = (format == "program")? "Build" : bufferFormat(*buffer);
string const ext = formats.extension(format);
- string const tmp_result_file = changeExtension(filename, ext);
- bool const success = converters.convert(buffer, FileName(filename),
- FileName(tmp_result_file), FileName(buffer->fileName()), backend_format, format,
+ FileName const tmp_result_file(changeExtension(filename, ext));
+ bool const success = theConverters().convert(buffer, FileName(filename),
+ tmp_result_file, FileName(buffer->fileName()), backend_format, format,
buffer->errorList(error_type));
// Emit the signal to show the error list.
- buffer->errors(error_type);
+ if (format != backend_format)
+ buffer->errors(error_type);
if (!success)
return false;
if (put_in_tempdir)
- result_file = tmp_result_file;
+ result_file = tmp_result_file.absFilename();
else {
result_file = changeExtension(buffer->fileName(), ext);
// We need to copy referenced files (e. g. included graphics
string const fmt =
formats.getFormatFromFile(it->sourceName);
status = copyFile(fmt, it->sourceName,
- FileName(makeAbsPath(it->exportName, dest)),
+ makeAbsPath(it->exportName, dest),
it->exportName, status == FORCE);
}
if (status == CANCEL) {
buffer->message(_("Document export cancelled."));
- } else if (fs::exists(tmp_result_file)) {
+ } else if (fs::exists(tmp_result_file.toFilesystemEncoding())) {
// Finally copy the main file
- status = copyFile(format, FileName(tmp_result_file),
+ status = copyFile(format, tmp_result_file,
FileName(result_file), result_file,
status == FORCE);
buffer->message(bformat(_("Document exported as %1$s "
vector<string> backends = Backends(buffer);
for (vector<string>::const_iterator it = backends.begin();
it != backends.end(); ++it)
- if (converters.isReachable(*it, format))
+ if (theConverters().isReachable(*it, format))
return true;
return false;
}
{
vector<string> backends = Backends(buffer);
vector<Format const *> result =
- converters.getReachable(backends[0], only_viewable, true);
+ theConverters().getReachable(backends[0], only_viewable, true);
for (vector<string>::const_iterator it = backends.begin() + 1;
it != backends.end(); ++it) {
vector<Format const *> r =
- converters.getReachable(*it, only_viewable, false);
+ theConverters().getReachable(*it, only_viewable, false);
result.insert(result.end(), r.begin(), r.end());
}
return result;