X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fformat.C;h=5215e34bb31dc4b9a2ac4341b3c52b349349a12d;hb=530749439472bddf13d9f4ee74ee6184ef76e3f9;hp=27b6d9d3f17eb5c1b5587af8d1c6d62ab20d2dcb;hpb=315e07fabce78eaa12ebe8762090cc6222edfc4a;p=lyx.git

diff --git a/src/format.C b/src/format.C
index 27b6d9d3f1..5215e34bb3 100644
--- a/src/format.C
+++ b/src/format.C
@@ -5,31 +5,72 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-#include "config.h"
+#include <config.h>
+
 #include "format.h"
+#include "buffer.h"
+#include "bufferparams.h"
 #include "lyxrc.h"
 #include "debug.h"
-#include "lyx_cb.h" // for ShowMessage() ... to be removed?
 #include "gettext.h"
-#include "LString.h"
-#include "support/BoostFormat.h"
+#include "lyxsocket.h"
 
 #include "frontends/Alert.h" //to be removed?
 
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/lyxfunctional.h"
 
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::subst;
+using lyx::support::Systemcall;
+
+using std::string;
+using std::distance;
 
+extern LyXServerSocket * lyxsocket;
 
 namespace {
 
 string const token_from("$$i");
 string const token_path("$$p");
+string const token_socket("$$a");
+
+
+class FormatNamesEqual : public std::unary_function<Format, bool> {
+public:
+	FormatNamesEqual(string const & name)
+		: name_(name) {}
+	bool operator()(Format const & f) const
+	{
+		return f.name() == name_;
+	}
+private:
+	string name_;
+};
+
+
+class FormatExtensionsEqual : public std::unary_function<Format, bool> {
+public:
+	FormatExtensionsEqual(string const & extension)
+		: extension_(extension) {}
+	bool operator()(Format const & f) const
+	{
+		return f.extension() == extension_;
+	}
+private:
+	string extension_;
+};
 
 } //namespace anon
 
@@ -43,11 +84,8 @@ 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): name_(n),
-					    extension_(e),
-					    prettyname_(p),
-					    shortcut_(s),
-					    viewer_(v)
+	       string const & s, string const & v, string const & ed)
+	: name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v), editor_(ed)
 {}
 
 
@@ -77,7 +115,7 @@ Format const * Formats::getFormat(string const & name) const
 {
 	FormatList::const_iterator cit =
 		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
+			FormatNamesEqual(name));
 	if (cit != formatlist.end())
 		return &(*cit);
 	else
@@ -85,13 +123,41 @@ Format const * Formats::getFormat(string const & name) const
 }
 
 
+string Formats::getFormatFromFile(string const & filename) const
+{
+	if (filename.empty())
+		return string();
+
+	string const format = lyx::support::getFormatFromContents(filename);
+	if (!format.empty())
+		return format;
+
+	// try to find a format from the file extension.
+	string const ext(lyx::support::GetExtension(filename));
+        if (!ext.empty()) {
+		// this is ambigous if two formats have the same extension,
+		// but better than nothing
+		Formats::const_iterator cit =
+			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;
+			return cit->name();
+		}
+	}
+	return string();
+}
+
+
 int Formats::getNumber(string const & name) const
 {
 	FormatList::const_iterator cit =
 		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
+			FormatNamesEqual(name));
 	if (cit != formatlist.end())
-		return cit - formatlist.begin();
+		return distance(formatlist.begin(), cit);
 	else
 		return -1;
 }
@@ -100,23 +166,22 @@ int Formats::getNumber(string const & name) const
 void Formats::add(string const & name)
 {
 	if (!getFormat(name))
-		add(name, name, name, string());
+		add(name, name, name, string(), string(), string());
 }
 
 
 void Formats::add(string const & name, string const & extension,
-		  string const & prettyname, string const & shortcut)
+		  string const & prettyname, string const & shortcut,
+		  string const & viewer, string const & editor)
 {
 	FormatList::iterator it =
 		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
+			FormatNamesEqual(name));
 	if (it == formatlist.end())
 		formatlist.push_back(Format(name, extension, prettyname,
-					    shortcut, ""));
-	else {
-		string viewer = it->viewer();
-		*it = Format(name, extension, prettyname, shortcut, viewer);
-	}
+					    shortcut, viewer, editor));
+	else
+		*it = Format(name, extension, prettyname, shortcut, viewer, editor);
 }
 
 
@@ -124,7 +189,7 @@ void Formats::erase(string const & name)
 {
 	FormatList::iterator it =
 		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
+			FormatNamesEqual(name));
 	if (it != formatlist.end())
 		formatlist.erase(it);
 }
@@ -141,13 +206,13 @@ void Formats::setViewer(string const & name, string const & command)
 	add(name);
 	FormatList::iterator it =
 		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
+			FormatNamesEqual(name));
 	if (it != formatlist.end())
 		it->setViewer(command);
 }
 
 
-bool Formats::view(Buffer const * buffer, string const & filename,
+bool Formats::view(Buffer const & buffer, string const & filename,
 		   string const & format_name) const
 {
 	if (filename.empty())
@@ -159,17 +224,11 @@ bool Formats::view(Buffer const * buffer, string const & filename,
 		format = getFormat(format->parentFormat());
 	if (!format || format->viewer().empty()) {
 // I believe this is the wrong place to show alerts, it should be done by
-// the caller (this should be "utility" code
-#if USE_BOOST_FORMAT
-		Alert::error(_("Cannot view file"),
-			     boost::io::str(boost::format(_("No information for viewing %1$s"))
-			   % prettyName(format_name)));
-#else
+// the caller (this should be "utility" code)
 		Alert::error(_("Cannot view file"),
-			     _("No information for viewing ")
-			     + prettyName(format_name));
-#endif
-			   return false;
+			bformat(_("No information for viewing %1$s"),
+				prettyName(format_name)));
+		return false;
 	}
 
 	string command = format->viewer();
@@ -177,12 +236,11 @@ bool Formats::view(Buffer const * buffer, string const & filename,
 	if (format_name == "dvi" &&
 	    !lyxrc.view_dvi_paper_option.empty()) {
 		command += ' ' + lyxrc.view_dvi_paper_option;
-		string paper_size = papersize(buffer);
+		string paper_size = buffer.params().paperSizeName();
 		if (paper_size == "letter")
 			paper_size = "us";
 		command += ' ' + paper_size;
-		if (buffer->params.orientation
-		    == BufferParams::ORIENTATION_LANDSCAPE)
+		if (buffer.params().orientation == ORIENTATION_LANDSCAPE)
 			command += 'r';
 	}
 
@@ -192,24 +250,63 @@ bool Formats::view(Buffer const * buffer, string const & filename,
 	command = subst(command, token_from,
 			QuoteName(OnlyFilename(filename)));
 	command = subst(command, token_path, QuoteName(OnlyPath(filename)));
-
+	command = subst(command, token_socket, QuoteName(lyxsocket->address()));
 	lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-	ShowMessage(buffer, _("Executing command:"), command);
+	buffer.message(_("Executing command: ") + command);
 
 	Path p(OnlyPath(filename));
 	Systemcall one;
 	int const res = one.startscript(Systemcall::DontWait, command);
 
 	if (res) {
-#if USE_BOOST_FORMAT
 		Alert::error(_("Cannot view file"),
-			     boost::io::str(boost::format(_("An error occurred whilst running %1$s"))
-			   % command.substr(0, 50)));
-#else
-		Alert::error(_("Cannot view file"),
-			     _("An error occurred whilst running ")
-			     + command.substr(0, 50));
-#endif
+			     bformat(_("An error occurred whilst running %1$s"),
+			       MakeDisplayPath(command, 50)));
+		return false;
+	}
+	return true;
+}
+
+
+bool Formats::edit(Buffer const & buffer, string const & filename,
+		         string const & format_name) const
+{
+	if (filename.empty())
+		return false;
+
+	Format const * format = getFormat(format_name);
+	if (format && format->editor().empty() &&
+	    format->isChildFormat())
+		format = getFormat(format->parentFormat());
+	if (!format || format->editor().empty()) {
+// I believe this is the wrong place to show alerts, it should 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)));
+		return false;
+	}
+
+	string command = format->editor();
+
+	if (!contains(command, token_from))
+		command += ' ' + token_from;
+
+	command = subst(command, token_from,
+			QuoteName(OnlyFilename(filename)));
+	command = subst(command, token_path, QuoteName(OnlyPath(filename)));
+	command = subst(command, token_socket, QuoteName(lyxsocket->address()));
+	lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
+	buffer.message(_("Executing command: ") + command);
+
+	Path p(OnlyPath(filename));
+	Systemcall one;
+	int const res = 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;
 	}
 	return true;
@@ -236,30 +333,6 @@ string const Formats::extension(string const & name) const
 }
 
 
-string const papersize(Buffer const * buffer)
-{
-	char real_papersize = buffer->params.papersize;
-	if (real_papersize == BufferParams::PAPER_DEFAULT)
-		real_papersize = lyxrc.default_papersize;
-
-	switch (real_papersize) {
-	case BufferParams::PAPER_A3PAPER:
-		return "a3";
-	case BufferParams::PAPER_A4PAPER:
-		return "a4";
-	case BufferParams::PAPER_A5PAPER:
-		return "a5";
-	case BufferParams::PAPER_B5PAPER:
-		return "b5";
-	case BufferParams::PAPER_EXECUTIVEPAPER:
-		return "foolscap";
-	case BufferParams::PAPER_LEGALPAPER:
-		return "legal";
-	case BufferParams::PAPER_USLETTER:
-	default:
-		return "letter";
-	}
-}
 
 
 Formats formats;