* pl.po remerge by autotools

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index edfdf4135ba1e03ea2d295081b6db20bedf44ba8..ec61b84387ea2a5c620f8d2e1ddf380ed13a0fd2 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -24,6 +24,15 @@
 #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
+#include "support/linkback/LinkBackProxy.h"
+#endif
 
 using namespace std;
 using namespace lyx::support;
@@ -95,7 +104,7 @@ bool Format::isChildFormat() const
 {
        if (name_.empty())
                return false;
-       return isdigit(name_[name_.length() - 1]);
+       return isDigitASCII(name_[name_.length() - 1]);
 }
 
 
@@ -129,7 +138,7 @@ string Formats::getFormatFromFile(FileName const & filename) const
                return format;
 
        // try to find a format from the file extension.
-       string const ext = getExtension(filename.absFilename());
+       string const ext = getExtension(filename.absFileName());
        if (!ext.empty()) {
                // this is ambigous if two formats have the same extension,
                // but better than nothing
@@ -241,13 +250,24 @@ void Formats::setViewer(string const & name, string const & command)
 }
 
 
+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);
+}
+
+
 bool Formats::view(Buffer const & buffer, FileName const & filename,
                   string const & format_name) const
 {
        if (filename.empty() || !filename.exists()) {
                Alert::error(_("Cannot view file"),
                        bformat(_("File does not exist: %1$s"),
-                               from_utf8(filename.absFilename())));
+                               from_utf8(filename.absFileName())));
                return false;
        }
 
@@ -265,12 +285,12 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
        }
        // viewer is 'auto'
        if (format->viewer() == "auto") {
-               if (os::autoOpenFile(filename.absFilename(), os::VIEW))
+               if (os::autoOpenFile(filename.absFileName(), os::VIEW))
                        return true;
                else {
                        Alert::error(_("Cannot view file"),
                                bformat(_("Auto-view file %1$s failed"),
-                                       from_utf8(filename.absFilename())));
+                                       from_utf8(filename.absFileName())));
                        return false;
                }
        }
@@ -279,13 +299,14 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 
        if (format_name == "dvi" &&
            !lyxrc.view_dvi_paper_option.empty()) {
-               command += ' ' + lyxrc.view_dvi_paper_option;
-               string paper_size = buffer.params().paperSizeName();
-               if (paper_size == "letter")
-                       paper_size = "us";
-               command += ' ' + paper_size;
-               if (buffer.params().orientation == ORIENTATION_LANDSCAPE)
-                       command += 'r';
+               string paper_size = buffer.params().paperSizeName(BufferParams::XDVI);
+               if (!paper_size.empty()) {
+                       command += ' ' + lyxrc.view_dvi_paper_option;
+                       command += ' ' + paper_size;
+                       if (buffer.params().orientation == ORIENTATION_LANDSCAPE &&
+                           buffer.params().papersize != PAPER_CUSTOM)
+                               command += 'r';
+               }
        }
 
        if (!contains(command, token_from_format))
@@ -299,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;
 }
 
@@ -317,8 +333,20 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
        if (filename.empty() || !filename.exists()) {
                Alert::error(_("Cannot edit file"),
                        bformat(_("File does not exist: %1$s"),
-                               from_utf8(filename.absFilename())));
+                               from_utf8(filename.absFileName())));
+               return false;
+       }
+
+       // LinkBack files look like PDF, but have the .linkback extension
+       string const ext = getExtension(filename.absFileName());
+       if (format_name == "pdf" && ext == "linkback") {
+#ifdef USE_MACOSX_PACKAGING
+               return editLinkBackFile(filename.absFileName().c_str());
+#else
+               Alert::error(_("Cannot edit file"),
+                            _("LinkBack files can only be edited on Apple Mac OSX."));
                return false;
+#endif // USE_MACOSX_PACKAGING
        }
 
        Format const * format = getFormat(format_name);
@@ -333,14 +361,15 @@ 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))
+               if (os::autoOpenFile(filename.absFileName(), os::EDIT))
                        return true;
                else {
                        Alert::error(_("Cannot edit file"),
                                bformat(_("Auto-edit file %1$s failed"),
-                                       from_utf8(filename.absFilename())));
+                                       from_utf8(filename.absFileName())));
                        return false;
                }
        }
@@ -358,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;
 }
 
@@ -390,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;