#include "support/Translator.h"
#include <algorithm>
+#include <functional>
#include <map>
#include <ctime>
string const token_path_format("$$p");
string const token_socket_format("$$a");
-
-class FormatNamesEqual : public unary_function<Format, bool> {
-public:
- FormatNamesEqual(string const & name)
- : name_(name)
- {}
- bool operator()(Format const & f) const
- {
- return f.name() == name_;
- }
-private:
- string name_;
-};
-
-
-class FormatExtensionsEqual : public unary_function<Format, bool> {
-public:
- FormatExtensionsEqual(string const & extension)
- : extension_(extension)
- {}
- bool operator()(Format const & f) const
- {
- return f.hasExtension(extension_);
- }
-private:
- string extension_;
-};
-
-
-class FormatMimeEqual : public unary_function<Format, bool> {
-public:
- FormatMimeEqual(string const & mime)
- : mime_(mime)
- {}
- bool operator()(Format const & f) const
- {
- // The test for empty mime strings is needed since we allow
- // formats with empty mime types.
- return f.mime() == mime_ && !mime_.empty();
- }
-private:
- string mime_;
-};
-
-
} // namespace
+
bool Format::formatSorter(Format const * lhs, Format const * rhs)
{
return compare_locale(translateIfPossible(lhs->prettyname()),
}
+namespace {
+
+std::function<bool (Format const &)> FormatNameIs(string const & name)
+{
+ return [name](Format const & f){ return f.name() == name; };
+}
+
+}
+
// This method should return a reference, and throw an exception
// if the format named name cannot be found (Lgb)
Format const * Formats::getFormat(string const & name) const
{
FormatList::const_iterator cit =
find_if(formatlist_.begin(), formatlist_.end(),
- FormatNamesEqual(name));
+ FormatNameIs(name));
if (cit != formatlist_.end())
return &(*cit);
else
- return 0;
+ return nullptr;
+}
+
+
+Format * Formats::getFormat(string const & name)
+{
+ FormatList::iterator it =
+ find_if(formatlist_.begin(), formatlist_.end(),
+ FormatNameIs(name));
+
+ if (it != formatlist_.end())
+ return &(*it);
+
+ return nullptr;
}
mime != "text/plain") {
Formats::const_iterator cit =
find_if(formatlist_.begin(), formatlist_.end(),
- FormatMimeEqual(mime));
+ [mime](Format const & f){ return f.mime() == mime; });
if (cit != formatlist_.end()) {
LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: "
<< mime << " -> " << cit->name());
// but better than nothing
Formats::const_iterator cit =
find_if(formatlist_.begin(), formatlist_.end(),
- FormatExtensionsEqual(ext));
+ [ext](Format const & f){ return f.hasExtension(ext); });
if (cit != formatlist_.end()) {
LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: "
<< ext << " -> " << cit->name());
{
FormatList::const_iterator cit =
find_if(formatlist_.begin(), formatlist_.end(),
- FormatNamesEqual(name));
- if (cit != formatlist_.end())
- return distance(formatlist_.begin(), cit);
- else
+ FormatNameIs(name));
+ if (cit == formatlist_.end())
return -1;
+
+ return distance(formatlist_.begin(), cit);
}
string const & viewer, string const & editor,
string const & mime, int flags)
{
- FormatList::iterator it =
- find_if(formatlist_.begin(), formatlist_.end(),
- FormatNamesEqual(name));
- if (it == formatlist_.end())
- formatlist_.push_back(Format(name, extensions, prettyname,
- shortcut, viewer, editor, mime, flags));
+ Format * format = getFormat(name);
+ if (format)
+ *format = Format(name, extensions, prettyname, shortcut, viewer,
+ editor, mime, flags);
else
- *it = Format(name, extensions, prettyname, shortcut, viewer,
- editor, mime, flags);
+ formatlist_.push_back(Format(name, extensions, prettyname,
+ shortcut, viewer, editor, mime, flags));
}
{
FormatList::iterator it =
find_if(formatlist_.begin(), formatlist_.end(),
- FormatNamesEqual(name));
+ FormatNameIs(name));
if (it != formatlist_.end())
formatlist_.erase(it);
}
void Formats::setViewer(string const & name, string const & command)
{
add(name);
- FormatList::iterator it =
- find_if(formatlist_.begin(), formatlist_.end(),
- FormatNamesEqual(name));
- if (it != formatlist_.end())
- it->setViewer(command);
+ Format * format = getFormat(name);
+ if (format)
+ format->setViewer(command);
+ else
+ LYXERR0("Unable to set viewer for non-existent format: " << name);
}
void Formats::setEditor(string const & name, string const & command)
{
add(name);
- FormatList::iterator it =
- find_if(formatlist_.begin(), formatlist_.end(),
- FormatNamesEqual(name));
- if (it != formatlist_.end())
- it->setEditor(command);
+ Format * format = getFormat(name);
+ if (format)
+ format->setEditor(command);
+ else
+ LYXERR0("Unable to set editor for non-existent format: " << name);
}
// by the caller (this should be "utility" code)
Alert::error(_("Cannot view file"),
bformat(_("No information for viewing %1$s"),
- prettyName(format_name)));
+ translateIfPossible(prettyName(format_name))));
return false;
}
// viewer is 'auto'
string command = format->viewer();
+ // Escape backslashes if not already in double or single quotes.
+ // We cannot simply quote the whole command as there may be arguments.
+ if (contains(command, '\\')) {
+ bool inquote1 = false;
+ bool inquote2 = false;
+ string::iterator cit = command.begin();
+ for (; cit != command.end(); ++cit) {
+ switch (*cit) {
+ case '"':
+ inquote1 = !inquote1;
+ break;
+ case '\'':
+ inquote2 = !inquote2;
+ break;
+ case '\\':
+ if (!inquote1 && !inquote2)
+ cit = ++command.insert(cit, '\\');
+ break;
+ }
+ }
+ }
+
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
string paper_size = buffer.params().paperSizeName(BufferParams::XDVI);
// be done by the caller (this should be "utility" code)
Alert::error(_("Cannot edit file"),
bformat(_("No information for editing %1$s"),
- prettyName(format_name)));
+ translateIfPossible(prettyName(format_name))));
return false;
}
f.addPair(OutputParams::LUATEX, "luatex");
f.addPair(OutputParams::PDFLATEX, "pdflatex");
f.addPair(OutputParams::XETEX, "xetex");
- f.addPair(OutputParams::XML, "docbook-xml");
+ f.addPair(OutputParams::DOCBOOK5, "docbook-xml");
f.addPair(OutputParams::HTML, "xhtml");
f.addPair(OutputParams::TEXT, "text");
f.addPair(OutputParams::LYX, "lyx");
projects / lyx.git / blobdiff