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

diff --git a/src/format.C b/src/format.C
index ef0d4ad968..5215e34bb3 100644
--- a/src/format.C
+++ b/src/format.C
@@ -27,6 +27,7 @@
 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;
@@ -58,6 +59,19 @@ 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
 
 bool operator<(Format const & a, Format const & b)
@@ -70,8 +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)
 {}
 
 
@@ -109,6 +123,34 @@ 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 =
@@ -124,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(),
 			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);
 }
 
 
@@ -183,7 +224,7 @@ 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
+// the caller (this should be "utility" code)
 		Alert::error(_("Cannot view file"),
 			bformat(_("No information for viewing %1$s"),
 				prettyName(format_name)));
@@ -220,7 +261,52 @@ bool Formats::view(Buffer const & buffer, string const & filename,
 	if (res) {
 		Alert::error(_("Cannot view file"),
 			     bformat(_("An error occurred whilst running %1$s"),
-			       command.substr(0, 50)));
+			       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;