*
* \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 "format.h"
#include "buffer.h"
-#include "buffer_funcs.h"
+#include "bufferparams.h"
#include "lyxrc.h"
#include "debug.h"
#include "gettext.h"
-#include "LString.h"
+#include "lyxsocket.h"
#include "frontends/Alert.h" //to be removed?
-#include "support/lstrings.h"
#include "support/filetools.h"
#include "support/path.h"
#include "support/systemcall.h"
-#include "support/lyxfunctional.h"
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+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;
+
+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_;
+};
} //namespace anon
}
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)
+ : name_(n), extension_(e), prettyname_(p),shortcut_(s), viewer_(v)
{}
{
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
{
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;
}
{
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, ""));
{
FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
- lyx::compare_memfun(&Format::name, name));
+ FormatNamesEqual(name));
if (it != formatlist.end())
formatlist.erase(it);
}
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())
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
command += ' ' + lyxrc.view_dvi_paper_option;
- string paper_size = buffer->params.paperSizeName();
+ 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';
}
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);
+ buffer.message(_("Executing command: ") + command);
Path p(OnlyPath(filename));
Systemcall one;