#include <config.h>
#include "converter.h"
-#include "graph.h"
-#include "format.h"
-#include "lyxrc.h"
+
#include "buffer.h"
-#include "bufferparams.h"
#include "buffer_funcs.h"
-#include "bufferview_funcs.h"
-#include "errorlist.h"
-#include "LaTeX.h"
-#include "gettext.h"
+#include "bufferparams.h"
#include "debug.h"
+#include "format.h"
+#include "gettext.h"
+#include "LaTeX.h"
#include "frontends/Alert.h"
-#include "frontends/LyXView.h"
#include "support/filetools.h"
-#include "support/lyxfunctional.h"
#include "support/lyxlib.h"
#include "support/path.h"
-#include "support/tostr.h"
#include "support/systemcall.h"
-#include <boost/signals/signal1.hpp>
-#include <boost/signals/trackable.hpp>
-
-#include <cctype>
-
-using namespace lyx::support;
-
-#ifndef CXX_GLOBAL_CSTD
-using std::isdigit;
-#endif
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::DirList;
+using lyx::support::GetExtension;
+using lyx::support::LibScriptSearch;
+using lyx::support::MakeRelPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::prefixIs;
+using lyx::support::QuoteName;
+using lyx::support::rename;
+using lyx::support::split;
+using lyx::support::subst;
+using lyx::support::Systemcall;
-using std::vector;
using std::endl;
using std::find_if;
+using std::string;
+using std::vector;
+using std::distance;
+
namespace {
return result;
}
+
+class ConverterEqual : public std::binary_function<string, string, bool> {
+public:
+ ConverterEqual(string const & from, string const & to)
+ : from_(from), to_(to) {}
+ bool operator()(Converter const & c) const {
+ return c.from == from_ && c.to == to_;
+ }
+private:
+ string const from_;
+ string const to_;
+};
+
} // namespace anon
Converter::Converter(string const & f, string const & t, string const & c,
string const & l): from(f), to(t), command(c), flags(l),
- From(0), To(0), latex(false),
+ From(0), To(0), latex(false), xml(false),
original_dir(false), need_aux(false)
{}
flag_value = split(flag_value, flag_name, '=');
if (flag_name == "latex")
latex = true;
+ else if (flag_name == "xml")
+ xml = true;
else if (flag_name == "originaldir")
original_dir = true;
else if (flag_name == "needaux")
}
-class compare_Converter {
-public:
- compare_Converter(string const & f, string const & t)
- : from(f), to(t) {}
- bool operator()(Converter const & c) {
- return c.from == from && c.to == to;
- }
-private:
- string const & from;
- string const & to;
-};
-
-
-
Converter const * Converters::getConverter(string const & from,
- string const & to)
+ string const & to) const
{
ConverterList::const_iterator cit =
find_if(converterlist_.begin(), converterlist_.end(),
- compare_Converter(from, to));
+ ConverterEqual(from, to));
if (cit != converterlist_.end())
return &(*cit);
else
}
-int Converters::getNumber(string const & from, string const & to)
+int Converters::getNumber(string const & from, string const & to) const
{
ConverterList::const_iterator cit =
find_if(converterlist_.begin(), converterlist_.end(),
- compare_Converter(from, to));
+ ConverterEqual(from, to));
if (cit != converterlist_.end())
- return cit - converterlist_.begin();
+ return distance(converterlist_.begin(), cit);
else
return -1;
}
formats.add(to);
ConverterList::iterator it = find_if(converterlist_.begin(),
converterlist_.end(),
- compare_Converter(from, to));
+ ConverterEqual(from , to));
Converter converter(from, to, command, flags);
if (it != converterlist_.end() && !flags.empty() && flags[0] == '*') {
{
ConverterList::iterator it = find_if(converterlist_.begin(),
converterlist_.end(),
- compare_Converter(from, to));
+ ConverterEqual(from, to));
if (it != converterlist_.end())
converterlist_.erase(it);
}
}
-bool Converters::usePdflatex(Graph::EdgePath const & path)
+OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
{
for (Graph::EdgePath::const_iterator cit = path.begin();
cit != path.end(); ++cit) {
Converter const & conv = converterlist_[*cit];
if (conv.latex)
- return contains(conv.to, "pdf");
+ if (contains(conv.to, "pdf"))
+ return OutputParams::PDFLATEX;
+ if (conv.xml)
+ return OutputParams::XML;
}
- return false;
+ return OutputParams::LATEX;
}
if (edgepath.empty()) {
return false;
}
- LatexRunParams runparams;
- runparams.flavor = usePdflatex(edgepath) ?
- LatexRunParams::PDFLATEX : LatexRunParams::LATEX;
+ OutputParams runparams;
+ runparams.flavor = getFlavor(edgepath);
string path = OnlyPath(from_file);
Path p(path);
string real_outfile;
if (outfile == infile) {
real_outfile = infile;
- outfile = AddName(buffer->tmppath, "tmpfile.out");
+ outfile = AddName(buffer->temppath(), "tmpfile.out");
}
if (conv.latex) {
if (conv.from == "dvi" && conv.to == "ps")
command = add_options(command,
- buffer->params.dvips_options());
+ buffer->params().dvips_options());
else if (conv.from == "dvi" && prefixIs(conv.to, "pdf"))
command = add_options(command,
- dvipdfm_options(buffer->params));
+ dvipdfm_options(buffer->params()));
lyxerr[Debug::FILES] << "Calling " << command << endl;
- buffer->message(_("Executing command: ") + command);
+ if (buffer)
+ buffer->message(_("Executing command: ")
+ + command);
Systemcall::Starttype type = (dummy)
? Systemcall::DontWait : Systemcall::Wait;
bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
string const & filename)
{
- LatexRunParams runparams;
- runparams.flavor = LatexRunParams::LATEX;
+ OutputParams runparams;
+ runparams.flavor = OutputParams::LATEX;
LaTeX latex("", runparams, filename, "");
TeXErrors terr;
int result = latex.scanLogFile(terr);
namespace {
-class showMessage : public boost::signals::trackable {
+class showMessage : public std::unary_function<string, void>, public boost::signals::trackable {
public:
showMessage(Buffer const & b) : buffer_(b) {};
- void operator()(string const & m)
+ void operator()(string const & m) const
{
buffer_.message(m);
}
bool Converters::runLaTeX(Buffer const & buffer, string const & command,
- LatexRunParams const & runparams)
+ OutputParams const & runparams)
{
buffer.busy(true);
buffer.message(_("Running LaTeX..."));
projects / lyx.git / blobdiff