#include <boost/filesystem/operations.hpp>
-using lyx::support::AddName;
-using lyx::support::bformat;
-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::package;
-using lyx::support::prefixIs;
+
+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::find;
using std::string;
using std::vector;
+namespace Alert = frontend::Alert;
namespace fs = boost::filesystem;
namespace {
{
vector<string> v;
if (buffer.params().getLyXTextClass().isTeXClassAvailable()) {
- v.push_back(BufferFormat(buffer));
+ v.push_back(bufferFormat(buffer));
// FIXME: Don't hardcode format names here, but use a flag
if (v.back() == "latex")
v.push_back("pdflatex");
int checkOverwrite(string const & filename)
{
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));
+ 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"),
// 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) {
if (!mover.copy(sourceFile, destFile, latexFile))
Alert::error(_("Couldn't copy file"),
bformat(_("Copying %1$s to %2$s failed."),
- MakeDisplayPath(sourceFile),
- MakeDisplayPath(destFile)));
+ makeDisplayPath(sourceFile),
+ makeDisplayPath(destFile)));
return ret;
}
}
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
// no backend
else if (backend_format == "lyx")
buffer->writeFile(filename);
- // Linuxdoc backend
- else if (buffer->isLinuxDoc()) {
- runparams.nice = !put_in_tempdir;
- buffer->makeLinuxDocFile(filename, runparams);
- }
// Docbook backend
else if (buffer->isDocBook()) {
runparams.nice = !put_in_tempdir;
buffer->makeLaTeXFile(filename, buffer->filePath(), runparams);
}
- if (!converters.convert(buffer, filename, filename,
- backend_format, format, result_file))
+ string const error_type = (format == "program")? "Build" : bufferFormat(*buffer);
+ bool const success = converters.convert(buffer, filename, filename,
+ backend_format, format, result_file,
+ buffer->errorList(error_type));
+ // Emit the signal to show the error list.
+ buffer->errors(error_type);
+ if (!success)
return false;
if (!put_in_tempdir) {
string const tmp_result_file = result_file;
- result_file = ChangeExtension(buffer->fileName(),
+ 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),
+ makeAbsPath(it->exportName, dest),
it->exportName, status == FORCE);
}
if (status == CANCEL) {
result_file, result_file,
status == FORCE);
buffer->message(bformat(_("Document exported as %1$s "
- "to file `%2$s'"),
+ "to file `%2$s'"),
formats.prettyName(format),
- MakeDisplayPath(result_file)));
+ makeDisplayPath(result_file)));
} else {
// This must be a dummy converter like fax (bug 1888)
buffer->message(bformat(_("Document exported as %1$s"),
}
-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(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));
}
return cit->second;
return vector<ExportedFile>();
}
+
+
+} // namespace lyx