X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fexporter.C;h=eff1172ae893d0100c3922928fae39103d2191ec;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=b204da466d4e2fec0bdf8489a539ff5772ff5510;hpb=91de22ef340abbf1e9ba7d422bcd9024fa90d63f;p=lyx.git diff --git a/src/exporter.C b/src/exporter.C index b204da466d..eff1172ae8 100644 --- a/src/exporter.C +++ b/src/exporter.C @@ -17,33 +17,130 @@ #include #include "exporter.h" + #include "buffer.h" #include "buffer_funcs.h" -#include "support/filetools.h" -#include "lyxrc.h" +#include "bufferparams.h" #include "converter.h" #include "format.h" -#include "frontends/Alert.h" #include "gettext.h" +#include "lyxrc.h" +#include "mover.h" +#include "output_plaintext.h" +#include "outputparams.h" +#include "frontends/Alert.h" +#include "support/filetools.h" +#include "support/lyxlib.h" +#include "support/package.h" -using namespace lyx::support; +#include + + +namespace lyx { + +using support::addName; +using support::bformat; +using support::changeExtension; +using support::contains; +using support::makeAbsPath; +using support::makeDisplayPath; +using support::onlyFilename; +using support::onlyPath; +using support::package; +using support::prefixIs; -using std::vector; using std::find; +using std::string; +using std::vector; +namespace Alert = frontend::Alert; +namespace fs = boost::filesystem; namespace { vector const Backends(Buffer const & buffer) { vector v; - if (buffer.params.getLyXTextClass().isTeXClassAvailable()) - v.push_back(BufferFormat(buffer)); + if (buffer.params().getLyXTextClass().isTeXClassAvailable()) { + v.push_back(bufferFormat(buffer)); + // FIXME: Don't hardcode format names here, but use a flag + if (v.back() == "latex") + v.push_back("pdflatex"); + } v.push_back("text"); + v.push_back("lyx"); return v; } + +/// ask the user what to do if a file already exists +int checkOverwrite(string const & filename) +{ + if (fs::exists(filename)) { + docstring text = bformat(_("The file %1$s already exists.\n\n" + "Do you want to over-write that file?"), + makeDisplayPath(filename)); + return Alert::prompt(_("Over-write file?"), + text, 0, 2, + _("&Over-write"), _("Over-write &all"), + _("&Cancel export")); + } + return 0; +} + + +enum CopyStatus { + SUCCESS, + FORCE, + CANCEL +}; + + +/** copy file \p sourceFile to \p destFile. If \p force is false, the user + * will be asked before existing files are overwritten. + * \return + * - SUCCESS if this file got copied + * - FORCE if subsequent calls should not ask for confirmation before + * overwriting files anymore. + * - CANCEL if the export should be cancelled + */ +CopyStatus copyFile(string const & format, + string const & sourceFile, string const & destFile, + string const & latexFile, bool force) +{ + CopyStatus ret = force ? FORCE : SUCCESS; + + // Only copy files that are in our tmp dir, all other files would + // 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), package().temp_dir())) + return ret; + + if (!force) { + switch(checkOverwrite(destFile)) { + case 0: + ret = SUCCESS; + break; + case 1: + ret = FORCE; + break; + default: + return CANCEL; + } + } + + Mover const & mover = movers(format); + if (!mover.copy(sourceFile, destFile, latexFile)) + Alert::error(_("Couldn't copy file"), + bformat(_("Copying %1$s to %2$s failed."), + makeDisplayPath(sourceFile), + makeDisplayPath(destFile))); + + return ret; +} + } //namespace anon @@ -51,17 +148,25 @@ bool Exporter::Export(Buffer * buffer, string const & format, bool put_in_tempdir, string & result_file) { string backend_format; - LatexRunParams runparams; - runparams.flavor = LatexRunParams::LATEX; + OutputParams runparams; + runparams.flavor = OutputParams::LATEX; + runparams.linelen = lyxrc.ascii_linelen; vector backends = Backends(*buffer); - if (find(backends.begin(), backends.end(), format) == backends.end()) { + // 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 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()) { for (vector::const_iterator it = backends.begin(); it != backends.end(); ++it) { - Graph::EdgePath p = - converters.getPath(*it, format); + Graph::EdgePath p = converters.getPath(*it, format); if (!p.empty()) { - if (converters.usePdflatex(p)) - runparams.flavor = LatexRunParams::PDFLATEX; + runparams.flavor = converters.getFlavor(p); backend_format = *it; break; } @@ -72,49 +177,92 @@ bool Exporter::Export(Buffer * buffer, string const & format, formats.prettyName(format))); return false; } - } else + } else { backend_format = format; + // FIXME: Don't hardcode format names here, but use a flag + if (backend_format == "pdflatex") + runparams.flavor = OutputParams::PDFLATEX; + } string filename = buffer->getLatexName(false); - if (!buffer->tmppath.empty()) - filename = AddName(buffer->tmppath, filename); - filename = ChangeExtension(filename, + filename = addName(buffer->temppath(), filename); + filename = changeExtension(filename, formats.extension(backend_format)); // Ascii backend if (backend_format == "text") - buffer->writeFileAscii(filename, lyxrc.ascii_linelen); - // Linuxdoc backend - else if (buffer->isLinuxDoc()) - buffer->makeLinuxDocFile(filename, !put_in_tempdir); + writeFileAscii(*buffer, filename, runparams); + // no backend + else if (backend_format == "lyx") + buffer->writeFile(filename); // Docbook backend - else if (buffer->isDocBook()) - buffer->makeDocBookFile(filename, !put_in_tempdir); + else if (buffer->isDocBook()) { + runparams.nice = !put_in_tempdir; + buffer->makeDocBookFile(filename, runparams); + } // LaTeX backend else if (backend_format == format) { runparams.nice = true; - buffer->makeLaTeXFile(filename, string(), runparams); - } else if (contains(buffer->filePath(), ' ')) { + if (!buffer->makeLaTeXFile(filename, string(), runparams)) + return false; + } else if (!lyxrc.tex_allows_spaces + && contains(buffer->filePath(), ' ')) { Alert::error(_("File name error"), _("The directory path to the document cannot contain spaces.")); return false; } else { runparams.nice = false; - buffer->makeLaTeXFile(filename, buffer->filePath(), runparams); + if (!buffer->makeLaTeXFile(filename, buffer->filePath(), runparams)) + return false; } - string outfile_base = (put_in_tempdir) - ? filename : buffer->getLatexName(false); - - if (!converters.convert(buffer, filename, outfile_base, - backend_format, format, result_file)) + 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, + tmp_result_file, buffer->fileName(), backend_format, format, + buffer->errorList(error_type)); + // Emit the signal to show the error list. + buffer->errors(error_type); + if (!success) return false; - if (!put_in_tempdir) - buffer->message(_("Document exported as ") - + formats.prettyName(format) - + _(" to file `") - + MakeDisplayPath(result_file) +'\''); + if (put_in_tempdir) + result_file = tmp_result_file; + else { + result_file = changeExtension(buffer->fileName(), ext); + // We need to copy referenced files (e. g. included graphics + // if format == "dvi") to the result dir. + vector const files = + runparams.exportdata->externalFiles(format); + string const dest = onlyPath(result_file); + CopyStatus status = SUCCESS; + for (vector::const_iterator it = files.begin(); + it != files.end() && status != CANCEL; ++it) { + string const fmt = + formats.getFormatFromFile(it->sourceName); + status = copyFile(fmt, it->sourceName, + makeAbsPath(it->exportName, dest), + it->exportName, status == FORCE); + } + if (status == CANCEL) { + buffer->message(_("Document export cancelled.")); + } else if (fs::exists(tmp_result_file)) { + // Finally copy the main file + status = copyFile(format, tmp_result_file, + result_file, result_file, + status == FORCE); + buffer->message(bformat(_("Document exported as %1$s " + "to file `%2$s'"), + formats.prettyName(format), + makeDisplayPath(result_file))); + } else { + // This must be a dummy converter like fax (bug 1888) + buffer->message(bformat(_("Document exported as %1$s"), + formats.prettyName(format))); + } + } + return true; } @@ -127,7 +275,7 @@ bool Exporter::Export(Buffer * buffer, string const & format, } -bool Exporter::Preview(Buffer * buffer, string const & format) +bool Exporter::preview(Buffer * buffer, string const & format) { string result_file; if (!Export(buffer, format, true, result_file)) @@ -136,7 +284,7 @@ bool Exporter::Preview(Buffer * buffer, string const & format) } -bool Exporter::IsExportable(Buffer const & buffer, string const & format) +bool Exporter::isExportable(Buffer const & buffer, string const & format) { vector backends = Backends(buffer); for (vector::const_iterator it = backends.begin(); @@ -148,7 +296,7 @@ bool Exporter::IsExportable(Buffer const & buffer, string const & format) vector const -Exporter::GetExportableFormats(Buffer const & buffer, bool only_viewable) +Exporter::getExportableFormats(Buffer const & buffer, bool only_viewable) { vector backends = Backends(buffer); vector result = @@ -161,3 +309,50 @@ Exporter::GetExportableFormats(Buffer const & buffer, bool only_viewable) } return result; } + + +ExportedFile::ExportedFile(string const & s, string const & e) : + sourceName(s), exportName(e) {} + + +bool operator==(ExportedFile const & f1, ExportedFile const & f2) +{ + return f1.sourceName == f2.sourceName && + f1.exportName == f2.exportName; + +} + + +void ExportData::addExternalFile(string const & format, + string const & sourceName, + string const & exportName) +{ + BOOST_ASSERT(support::absolutePath(sourceName)); + + // Make sure that we have every file only once, otherwise copyFile() + // would ask several times if it should overwrite a file. + vector & files = externalfiles[format]; + ExportedFile file(sourceName, exportName); + if (find(files.begin(), files.end(), file) == files.end()) + files.push_back(file); +} + + +void ExportData::addExternalFile(string const & format, + string const & sourceName) +{ + addExternalFile(format, sourceName, onlyFilename(sourceName)); +} + + +vector const +ExportData::externalFiles(string const & format) const +{ + FileMap::const_iterator cit = externalfiles.find(format); + if (cit != externalfiles.end()) + return cit->second; + return vector(); +} + + +} // namespace lyx