hopefully fix tex2lyx linking.

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index a8fd1f2828bb1923f7050c5701d6f162500e84fa..29ebe338c2f4edcae906f7ae502651f816c5560a 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -18,6 +18,7 @@
 #include "gettext.h"
 #include "lyxsocket.h"
 
+#include "frontends/Application.h"
 #include "frontends/Alert.h" //to be removed?
 
 #include "support/filetools.h"
@@ -27,25 +28,27 @@
 
 #include <boost/filesystem/operations.hpp>
 
-using lyx::support::absolutePath;
-using lyx::support::bformat;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::libScriptSearch;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyPath;
-using lyx::support::quoteName;
-using lyx::support::subst;
-using lyx::support::Systemcall;
-using lyx::support::token;
+
+namespace lyx {
+
+using support::absolutePath;
+using support::bformat;
+using support::compare_ascii_no_case;
+using support::contains;
+using support::libScriptSearch;
+using support::makeDisplayPath;
+using support::onlyPath;
+using support::quoteName;
+using support::subst;
+using support::Systemcall;
+using support::token;
 
 using std::string;
 using std::distance;
 
+namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
-namespace os = lyx::support::os;
-
-extern LyXServerSocket * lyxsocket;
+namespace os = support::os;
 
 namespace {
 
@@ -93,9 +96,9 @@ bool operator<(Format const & a, Format const & b)
 
 Format::Format(string const & n, string const & e, string const & p,
               string const & s, string const & v, string const & ed,
-               bool d)
+               int flags)
        : name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v),
-         editor_(ed), document_(d)
+         editor_(ed), flags_(flags)
 {}
 
 
@@ -138,12 +141,12 @@ string Formats::getFormatFromFile(string const & filename) const
        if (filename.empty())
                return string();
 
-       string const format = lyx::support::getFormatFromContents(filename);
+       string const format = support::getFormatFromContents(filename);
        if (!format.empty())
                return format;
 
        // try to find a format from the file extension.
-       string const ext(lyx::support::getExtension(filename));
+       string const ext(support::getExtension(filename));
        if (!ext.empty()) {
                // this is ambigous if two formats have the same extension,
                // but better than nothing
@@ -162,7 +165,7 @@ string Formats::getFormatFromFile(string const & filename) const
 
 namespace {
 
-string fixCommand(string const & cmd, string const & ext, 
+string fixCommand(string const & cmd, string const & ext,
                  os::auto_open_mode mode)
 {
        // configure.py says we do not want a viewer/editor
@@ -209,24 +212,25 @@ int Formats::getNumber(string const & name) const
 void Formats::add(string const & name)
 {
        if (!getFormat(name))
-               add(name, name, name, string(), string(), string(), true);
+               add(name, name, name, string(), string(), string(),
+                   Format::document);
 }
 
 
 void Formats::add(string const & name, string const & extension,
                  string const & prettyname, string const & shortcut,
-                 string const & viewer, string const & editor, bool document)
+                  string const & viewer, string const & editor,
+                  int flags)
 {
        FormatList::iterator it =
                find_if(formatlist.begin(), formatlist.end(),
                        FormatNamesEqual(name));
        if (it == formatlist.end())
                formatlist.push_back(Format(name, extension, prettyname,
-                                           shortcut, viewer, editor,
-                                           document));
+                                           shortcut, viewer, editor, flags));
        else
                *it = Format(name, extension, prettyname, shortcut, viewer,
-                            editor, document);
+                            editor, flags);
 }
 
 
@@ -264,7 +268,7 @@ bool Formats::view(Buffer const & buffer, string const & filename,
        if (filename.empty() || !fs::exists(filename)) {
                Alert::error(_("Cannot view file"),
                        bformat(_("File does not exist: %1$s"),
-                               filename));
+                               from_utf8(filename)));
                return false;
        }
 
@@ -287,7 +291,7 @@ bool Formats::view(Buffer const & buffer, string const & filename,
                else {
                        Alert::error(_("Cannot view file"),
                                bformat(_("Auto-view file %1$s failed"),
-                                       filename));
+                                       from_utf8(filename)));
                        return false;
                }
        }
@@ -310,9 +314,9 @@ bool Formats::view(Buffer const & buffer, string const & filename,
 
        command = subst(command, token_from, quoteName(filename));
        command = subst(command, token_path, quoteName(onlyPath(filename)));
-       command = subst(command, token_socket, quoteName(lyxsocket->address()));
+       command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
        lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-       buffer.message(_("Executing command: ") + command);
+       buffer.message(_("Executing command: ") + from_utf8(command));
 
        Systemcall one;
        int const res = one.startscript(Systemcall::DontWait, command);
@@ -334,7 +338,7 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
        if (filename.empty() || !fs::exists(filename)) {
                Alert::error(_("Cannot edit file"),
                        bformat(_("File does not exist: %1$s"),
-                               filename));
+                               from_utf8(filename)));
                return false;
        }
 
@@ -357,7 +361,7 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
                else {
                        Alert::error(_("Cannot edit file"),
                                bformat(_("Auto-edit file %1$s failed"),
-                                       filename));
+                                       from_utf8(filename)));
                        return false;
                }
        }
@@ -369,9 +373,9 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
 
        command = subst(command, token_from, quoteName(filename));
        command = subst(command, token_path, quoteName(onlyPath(filename)));
-       command = subst(command, token_socket, quoteName(lyxsocket->address()));
+       command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
        lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-       buffer.message(_("Executing command: ") + command);
+       buffer.message(_("Executing command: ") + from_utf8(command));
 
        Systemcall one;
        int const res = one.startscript(Systemcall::DontWait, command);
@@ -386,13 +390,13 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
 }
 
 
-string const Formats::prettyName(string const & name) const
+docstring const Formats::prettyName(string const & name) const
 {
        Format const * format = getFormat(name);
        if (format)
-               return format->prettyname();
+               return from_utf8(format->prettyname());
        else
-               return name;
+               return from_utf8(name);
 }
 
 
@@ -411,3 +415,6 @@ string const Formats::extension(string const & name) const
 Formats formats;
 
 Formats system_formats;
+
+
+} // namespace lyx