#include <boost/filesystem/operations.hpp>
-using lyx::support::AddName;
+using lyx::support::addName;
using lyx::support::bformat;
-using lyx::support::ChangeExtension;
+using lyx::support::changeExtension;
using lyx::support::contains;
-using lyx::support::MakeAbsPath;
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
-using lyx::support::OnlyPath;
+using lyx::support::makeAbsPath;
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
+using lyx::support::onlyPath;
using lyx::support::package;
using lyx::support::prefixIs;
vector<string> const Backends(Buffer const & buffer)
{
vector<string> 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;
}
if (fs::exists(filename)) {
string text = bformat(_("The file %1$s already exists.\n\n"
"Do you want to over-write that file?"),
- MakeDisplayPath(filename));
+ makeDisplayPath(filename));
return Alert::prompt(_("Over-write file?"),
- text, 0, 2,
- _("&Over-write"), _("Over-write &all"),
- _("&Cancel export"));
+ text, 0, 2,
+ _("&Over-write"), _("Over-write &all"),
+ _("&Cancel export"));
}
return 0;
}
* - CANCEL if the export should be cancelled
*/
CopyStatus copyFile(string const & format,
- string const & sourceFile, string const & destFile,
- string const & latexFile, bool force)
+ string const & sourceFile, string const & destFile,
+ string const & latexFile, bool force)
{
CopyStatus ret = force ? FORCE : SUCCESS;
// 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()))
+ if (!prefixIs(onlyPath(sourceFile), package().temp_dir()))
return ret;
if (!force) {
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)));
+ bformat(_("Copying %1$s to %2$s failed."),
+ makeDisplayPath(sourceFile),
+ makeDisplayPath(destFile)));
return ret;
}
runparams.flavor = OutputParams::LATEX;
runparams.linelen = lyxrc.ascii_linelen;
vector<string> 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<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()) {
for (vector<string>::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()) {
runparams.flavor = converters.getFlavor(p);
backend_format = *it;
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);
- filename = AddName(buffer->temppath(), filename);
- filename = ChangeExtension(filename,
+ filename = addName(buffer->temppath(), filename);
+ filename = changeExtension(filename,
formats.extension(backend_format));
// Ascii backend
if (backend_format == "text")
writeFileAscii(*buffer, filename, runparams);
+ // no backend
+ else if (backend_format == "lyx")
+ buffer->writeFile(filename);
// Linuxdoc backend
else if (buffer->isLinuxDoc()) {
runparams.nice = !put_in_tempdir;
if (!put_in_tempdir) {
string const tmp_result_file = result_file;
- result_file = ChangeExtension(buffer->fileName(),
- formats.extension(format));
+ result_file = changeExtension(buffer->fileName(),
+ formats.extension(format));
// We need to copy referenced files (e. g. included graphics
// if format == "dvi") to the result dir.
vector<ExportedFile> const files =
runparams.exportdata->externalFiles(format);
- string const dest = OnlyPath(result_file);
+ string const dest = onlyPath(result_file);
CopyStatus status = SUCCESS;
for (vector<ExportedFile>::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);
+ 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);
+ result_file, result_file,
+ status == FORCE);
buffer->message(bformat(_("Document exported as %1$s "
- "to file `%2$s'"),
- formats.prettyName(format),
- MakeDisplayPath(result_file)));
+ "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)));
+ buffer->message(bformat(_("Document exported as %1$s"),
+ formats.prettyName(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))
}
-bool Exporter::IsExportable(Buffer const & buffer, string const & format)
+bool Exporter::isExportable(Buffer const & buffer, string const & format)
{
vector<string> backends = Backends(buffer);
for (vector<string>::const_iterator it = backends.begin();
vector<Format const *> const
-Exporter::GetExportableFormats(Buffer const & buffer, bool only_viewable)
+Exporter::getExportableFormats(Buffer const & buffer, bool only_viewable)
{
vector<string> backends = Backends(buffer);
vector<Format const *> result =
string const & sourceName,
string const & exportName)
{
- BOOST_ASSERT(lyx::support::AbsolutePath(sourceName));
+ BOOST_ASSERT(lyx::support::absolutePath(sourceName));
// Make sure that we have every file only once, otherwise copyFile()
// would ask several times if it should overwrite a file.
void ExportData::addExternalFile(string const & format,
string const & sourceName)
{
- addExternalFile(format, sourceName, OnlyFilename(sourceName));
+ addExternalFile(format, sourceName, onlyFilename(sourceName));
}