cmake: remove 2.8 warning

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index 1b2ffea0d7ddde5ef00679fd9629f3d919126717..ec61b84387ea2a5c620f8d2e1ddf380ed13a0fd2 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -24,6 +24,10 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Systemcall.h"
+#include "support/textutils.h"
+#include "support/Translator.h"
+
+#include <algorithm>
 
 // FIXME: Q_WS_MACX is not available, it's in Qt
 #ifdef USE_MACOSX_PACKAGING
@@ -100,7 +104,7 @@ bool Format::isChildFormat() const
 {
        if (name_.empty())
                return false;
-       return isdigit(name_[name_.length() - 1]);
+       return isDigitASCII(name_[name_.length() - 1]);
 }
 
 
@@ -316,14 +320,9 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
        buffer.message(_("Executing command: ") + from_utf8(command));
 
        Systemcall one;
-       int const res = one.startscript(Systemcall::DontWait, command);
+       one.startscript(Systemcall::DontWait, command);
 
-       if (res) {
-               Alert::error(_("Cannot view file"),
-                            bformat(_("An error occurred whilst running %1$s"),
-                              makeDisplayPath(command, 50)));
-               return false;
-       }
+       // we can't report any sort of error, since we aren't waiting
        return true;
 }
 
@@ -362,7 +361,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
                                prettyName(format_name)));
                return false;
        }
-       
+
        // editor is 'auto'
        if (format->editor() == "auto") {
                if (os::autoOpenFile(filename.absFileName(), os::EDIT))
@@ -388,14 +387,9 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
        buffer.message(_("Executing command: ") + from_utf8(command));
 
        Systemcall one;
-       int const res = one.startscript(Systemcall::DontWait, command);
+       one.startscript(Systemcall::DontWait, command);
 
-       if (res) {
-               Alert::error(_("Cannot edit file"),
-                            bformat(_("An error occurred whilst running %1$s"),
-                              makeDisplayPath(command, 50)));
-               return false;
-       }
+       // we can't report any sort of error, since we aren't waiting
        return true;
 }
 
@@ -420,8 +414,42 @@ string const Formats::extension(string const & name) const
 }
 
 
+namespace {
+typedef Translator<OutputParams::FLAVOR, string> FlavorTranslator;
+
+FlavorTranslator initFlavorTranslator()
+{
+       FlavorTranslator f(OutputParams::LATEX, "latex");
+       f.addPair(OutputParams::LUATEX, "luatex");
+       f.addPair(OutputParams::PDFLATEX, "pdflatex");
+       f.addPair(OutputParams::XETEX, "xetex");
+       f.addPair(OutputParams::XML, "docbook-xml");
+       f.addPair(OutputParams::HTML, "xhtml");
+       f.addPair(OutputParams::TEXT, "text");
+       return f;
+}
 
 
+FlavorTranslator const & flavorTranslator()
+{
+       static FlavorTranslator translator = initFlavorTranslator();
+       return translator;
+}
+}
+
+
+std::string flavor2format(OutputParams::FLAVOR flavor)
+{
+       return flavorTranslator().find(flavor);
+}
+
+
+/* Not currently needed, but I'll leave the code in case it is.
+OutputParams::FLAVOR format2flavor(std::string fmt)
+{
+       return flavorTranslator().find(fmt);
+} */
+
 Formats formats;
 
 Formats system_formats;