Fix nasty memory bug signalled by valgrind while looking at another bug.

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index ccaf5ab3c0db14d922565518efa2ac1a1cd994d0..e6ad5962d523d3850bd8025645c3c15b855d694b 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -14,37 +14,28 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "LyXRC.h"
-#include "debug.h"
-#include "gettext.h"
 #include "ServerSocket.h"
 
-#include "frontends/Application.h"
 #include "frontends/alert.h" //to be removed?
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Systemcall.h"
 
-using std::find_if;
-using std::string;
-using std::distance;
+#include <algorithm>
 
+// FIXME: Q_WS_MACX is not available, it's in Qt
+#ifdef USE_MACOSX_PACKAGING
+#include "support/linkback/LinkBackProxy.h"
+#endif
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
-using support::absolutePath;
-using support::bformat;
-using support::compare_ascii_no_case;
-using support::contains;
-using support::FileName;
-using support::libScriptSearch;
-using support::makeDisplayPath;
-using support::onlyPath;
-using support::quoteName;
-using support::subst;
-using support::Systemcall;
-using support::token;
+namespace lyx {
 
 namespace Alert = frontend::Alert;
 namespace os = support::os;
@@ -56,7 +47,7 @@ string const token_path_format("$$p");
 string const token_socket_format("$$a");
 
 
-class FormatNamesEqual : public std::unary_function<Format, bool> {
+class FormatNamesEqual : public unary_function<Format, bool> {
 public:
        FormatNamesEqual(string const & name)
                : name_(name) {}
@@ -69,7 +60,7 @@ private:
 };
 
 
-class FormatExtensionsEqual : public std::unary_function<Format, bool> {
+class FormatExtensionsEqual : public unary_function<Format, bool> {
 public:
        FormatExtensionsEqual(string const & extension)
                : extension_(extension) {}
@@ -145,7 +136,7 @@ string Formats::getFormatFromFile(FileName const & filename) const
                return format;
 
        // try to find a format from the file extension.
-       string const ext = support::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
@@ -153,9 +144,8 @@ string Formats::getFormatFromFile(FileName const & filename) const
                        find_if(formatlist.begin(), formatlist.end(),
                                FormatExtensionsEqual(ext));
                if (cit != formats.end()) {
-                       LYXERR(Debug::GRAPHICS)
-                               << "\twill guess format from file extension: "
-                               << ext << " -> " << cit->name() << std::endl;
+                       LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: "
+                               << ext << " -> " << cit->name());
                        return cit->name();
                }
        }
@@ -258,13 +248,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;
        }
 
@@ -282,12 +283,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;
                }
        }
@@ -296,13 +297,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))
@@ -311,7 +313,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
        command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
        command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
        command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
-       LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
+       LYXERR(Debug::FILES, "Executing command: " << command);
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));
 
@@ -334,8 +336,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);
@@ -350,14 +364,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;
                }
        }
@@ -370,7 +385,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
        command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
        command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
        command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
-       LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
+       LYXERR(Debug::FILES, "Executing command: " << command);
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));