Provide proper fallback if a bibliography processor is not found

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index 09fb33bf2827c475c6338ec6fc77f4ec9b304cc4..da9345716561850912ff4e3d35e52c959e310de2 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -102,7 +102,7 @@ private:
 };
 
 
-} //namespace anon
+} // namespace
 
 bool Format::formatSorter(Format const * lhs, Format const * rhs)
 {
@@ -172,9 +172,9 @@ void Format::setExtensions(string const & e)
 Format const * Formats::getFormat(string const & name) const
 {
        FormatList::const_iterator cit =
-               find_if(formatlist.begin(), formatlist.end(),
+               find_if(formatlist_.begin(), formatlist_.end(),
                        FormatNamesEqual(name));
-       if (cit != formatlist.end())
+       if (cit != formatlist_.end())
                return &(*cit);
        else
                return 0;
@@ -232,7 +232,7 @@ string guessFormatFromContents(FileName const & fn)
        static string const zipStamp = "PK";
 
        // ZIP containers (koffice, openoffice.org etc).
-       static string const nonzipStamp = "\008\0\0\0mimetypeapplication/";
+       static string const nonzipStamp = "\010\0\0\0mimetypeapplication/";
 
        // compress
        static string const compressStamp = "\037\235";
@@ -397,7 +397,7 @@ string guessFormatFromContents(FileName const & fn)
        return string();
 }
 
-}
+} // namespace
 
 
 string Formats::getFormatFromFile(FileName const & filename) const
@@ -431,9 +431,9 @@ string Formats::getFormatFromFile(FileName const & filename) const
                                if (!mime.empty() && mime != "application/octet-stream" &&
                                    mime != "text/plain") {
                                        Formats::const_iterator cit =
-                                               find_if(formatlist.begin(), formatlist.end(),
+                                               find_if(formatlist_.begin(), formatlist_.end(),
                                                        FormatMimeEqual(mime));
-                                       if (cit != formats.end()) {
+                                       if (cit != formatlist_.end()) {
                                                LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: "
                                                        << mime << " -> " << cit->name());
                                                // See special eps/ps handling below
@@ -469,9 +469,9 @@ string Formats::getFormatFromFile(FileName const & filename) const
                }
 
                if (isZippedFileFormat(format) && !ext.empty()) {
-                       string const & fmt_name = formats.getFormatFromExtension(ext);
+                       string const & fmt_name = getFormatFromExtension(ext);
                        if (!fmt_name.empty()) {
-                               Format const * p_format = formats.getFormat(fmt_name);
+                               Format const * p_format = getFormat(fmt_name);
                                if (p_format && p_format->zippedNative())
                                        return p_format->name();
                        }
@@ -500,9 +500,9 @@ string Formats::getFormatFromExtension(string const & ext) const
                // this is ambigous if two formats have the same extension,
                // but better than nothing
                Formats::const_iterator cit =
-                       find_if(formatlist.begin(), formatlist.end(),
+                       find_if(formatlist_.begin(), formatlist_.end(),
                                FormatExtensionsEqual(ext));
-               if (cit != formats.end()) {
+               if (cit != formatlist_.end()) {
                        LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: "
                                << ext << " -> " << cit->name());
                        return cit->name();
@@ -577,8 +577,8 @@ static string fixCommand(string const & cmd, string const & ext,
 
 void Formats::setAutoOpen()
 {
-       FormatList::iterator fit = formatlist.begin();
-       FormatList::iterator const fend = formatlist.end();
+       FormatList::iterator fit = formatlist_.begin();
+       FormatList::iterator const fend = formatlist_.end();
        for ( ; fit != fend ; ++fit) {
                fit->setViewer(fixCommand(fit->viewer(), fit->extension(), os::VIEW));
                fit->setEditor(fixCommand(fit->editor(), fit->extension(), os::EDIT));
@@ -589,10 +589,10 @@ void Formats::setAutoOpen()
 int Formats::getNumber(string const & name) const
 {
        FormatList::const_iterator cit =
-               find_if(formatlist.begin(), formatlist.end(),
+               find_if(formatlist_.begin(), formatlist_.end(),
                        FormatNamesEqual(name));
-       if (cit != formatlist.end())
-               return distance(formatlist.begin(), cit);
+       if (cit != formatlist_.end())
+               return distance(formatlist_.begin(), cit);
        else
                return -1;
 }
@@ -612,10 +612,10 @@ void Formats::add(string const & name, string const & extensions,
                  string const & mime, int flags)
 {
        FormatList::iterator it =
-               find_if(formatlist.begin(), formatlist.end(),
+               find_if(formatlist_.begin(), formatlist_.end(),
                        FormatNamesEqual(name));
-       if (it == formatlist.end())
-               formatlist.push_back(Format(name, extensions, prettyname,
+       if (it == formatlist_.end())
+               formatlist_.push_back(Format(name, extensions, prettyname,
                                            shortcut, viewer, editor, mime, flags));
        else
                *it = Format(name, extensions, prettyname, shortcut, viewer,
@@ -626,16 +626,16 @@ void Formats::add(string const & name, string const & extensions,
 void Formats::erase(string const & name)
 {
        FormatList::iterator it =
-               find_if(formatlist.begin(), formatlist.end(),
+               find_if(formatlist_.begin(), formatlist_.end(),
                        FormatNamesEqual(name));
-       if (it != formatlist.end())
-               formatlist.erase(it);
+       if (it != formatlist_.end())
+               formatlist_.erase(it);
 }
 
 
 void Formats::sort()
 {
-       std::sort(formatlist.begin(), formatlist.end());
+       std::sort(formatlist_.begin(), formatlist_.end());
 }
 
 
@@ -643,9 +643,9 @@ void Formats::setViewer(string const & name, string const & command)
 {
        add(name);
        FormatList::iterator it =
-               find_if(formatlist.begin(), formatlist.end(),
+               find_if(formatlist_.begin(), formatlist_.end(),
                        FormatNamesEqual(name));
-       if (it != formatlist.end())
+       if (it != formatlist_.end())
                it->setViewer(command);
 }
 
@@ -654,9 +654,9 @@ void Formats::setEditor(string const & name, string const & command)
 {
        add(name);
        FormatList::iterator it =
-               find_if(formatlist.begin(), formatlist.end(),
+               find_if(formatlist_.begin(), formatlist_.end(),
                        FormatNamesEqual(name));
-       if (it != formatlist.end())
+       if (it != formatlist_.end())
                it->setEditor(command);
 }
 
@@ -680,7 +680,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 // 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'
@@ -697,6 +697,28 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 
        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);
@@ -762,7 +784,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 // 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;
        }
 
@@ -846,6 +868,7 @@ FlavorTranslator initFlavorTranslator()
        f.addPair(OutputParams::XML, "docbook-xml");
        f.addPair(OutputParams::HTML, "xhtml");
        f.addPair(OutputParams::TEXT, "text");
+       f.addPair(OutputParams::LYX, "lyx");
        return f;
 }
 
@@ -856,7 +879,7 @@ FlavorTranslator const & flavorTranslator()
        return translator;
 }
 
-}
+} // namespace
 
 
 std::string flavor2format(OutputParams::FLAVOR flavor)
@@ -871,9 +894,4 @@ OutputParams::FLAVOR format2flavor(std::string fmt)
        return flavorTranslator().find(fmt);
 } */
 
-Formats formats;
-
-Formats system_formats;
-
-
 } // namespace lyx