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::libScriptSearch;
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
+using lyx::support::onlyPath;
using lyx::support::Path;
-using lyx::support::QuoteName;
+using lyx::support::quoteName;
using lyx::support::subst;
using lyx::support::Systemcall;
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)
}
+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 =
void Formats::add(string const & name, string const & extension,
- string const & prettyname, string const & shortcut,
- string const & viewer, string const & editor)
+ string const & prettyname, string const & shortcut,
+ string const & viewer, string const & editor)
{
FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
bool Formats::view(Buffer const & buffer, string const & filename,
- string const & format_name) const
+ string const & format_name) const
{
if (filename.empty())
return false;
return false;
}
- string command = format->viewer();
+ string command = libScriptSearch(format->viewer());
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
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()));
+ 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));
+ Path p(onlyPath(filename));
Systemcall one;
int const res = one.startscript(Systemcall::DontWait, command);
if (res) {
Alert::error(_("Cannot view file"),
bformat(_("An error occurred whilst running %1$s"),
- MakeDisplayPath(command, 50)));
+ makeDisplayPath(command, 50)));
return false;
}
return true;
bool Formats::edit(Buffer const & buffer, string const & filename,
- string const & format_name) const
+ string const & format_name) const
{
if (filename.empty())
return false;
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()));
+ 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));
+ 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)));
+ makeDisplayPath(command, 50)));
return false;
}
return true;