*
* \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 "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;
+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;
-#ifndef CXX_GLOBAL_CSTD
-using std::isdigit;
-#endif
-
-using std::vector;
using std::endl;
using std::find_if;
+using std::string;
+using std::vector;
+
namespace {
int const i = compare_ascii_no_case(a.From->prettyname(),
b.From->prettyname());
if (i == 0)
- return compare_ascii_no_case(a.To->prettyname(),
+ return compare_ascii_no_case(a.To->prettyname(),
b.To->prettyname()) < 0;
else
return i < 0;
string real_outfile;
if (outfile == infile) {
real_outfile = infile;
- outfile = AddName(buffer->tmppath, "tmpfile.out");
+ outfile = AddName(buffer->temppath(), "tmpfile.out");
}
if (conv.latex) {
run_latex = true;
string command = subst(conv.command, token_from, "");
lyxerr[Debug::FILES] << "Running " << command << endl;
- if (!runLaTeX(buffer, command, runparams))
+ if (!runLaTeX(*buffer, command, runparams))
return false;
} else {
if (conv.need_aux && !run_latex
lyxerr[Debug::FILES]
<< "Running " << latex_command_
<< " to update aux file"<< endl;
- runLaTeX(buffer, latex_command_, runparams);
+ runLaTeX(*buffer, latex_command_, runparams);
}
string infile2 = (conv.original_dir)
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;
- if (buffer)
- buffer->message(_("Executing command: ") + command);
+ buffer->message(_("Executing command: ") + command);
+
Systemcall::Starttype type = (dummy)
? Systemcall::DontWait : Systemcall::Wait;
Systemcall one;
int res;
- if (conv.original_dir && buffer) {
+ if (conv.original_dir) {
Path p(buffer->filePath());
res = one.startscript(type, command);
} else
" < " + QuoteName(infile2 + ".out") +
" > " + QuoteName(logfile);
one.startscript(Systemcall::Wait, command2);
- if (!scanLog(buffer, command, logfile))
+ if (!scanLog(*buffer, command, logfile))
return false;
}
}
-bool Converters::scanLog(Buffer const * buffer, string const & /*command*/,
+bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
string const & filename)
{
- if (!buffer)
- return false;
-
LatexRunParams runparams;
runparams.flavor = LatexRunParams::LATEX;
LaTeX latex("", runparams, filename, "");
int result = latex.scanLogFile(terr);
if (result & LaTeX::ERRORS)
- bufferErrors(*buffer, terr);
+ bufferErrors(buffer, terr);
return true;
}
class showMessage : public boost::signals::trackable {
public:
- showMessage(Buffer const * b) : buffer_(b) {};
- void operator()(string m)
+ showMessage(Buffer const & b) : buffer_(b) {};
+ void operator()(string const & m)
{
- buffer_->message(m);
+ buffer_.message(m);
}
private:
- Buffer const * buffer_;
+ Buffer const & buffer_;
};
}
-bool Converters::runLaTeX(Buffer const * buffer, string const & command,
+
+bool Converters::runLaTeX(Buffer const & buffer, string const & command,
LatexRunParams const & runparams)
{
- // when is this needed?
- if (!buffer)
- return false;
-
- buffer->busy(true);
- buffer->message(_("Running LaTeX..."));
+ buffer.busy(true);
+ buffer.message(_("Running LaTeX..."));
// do the LaTeX run(s)
- string name = buffer->getLatexName();
- LaTeX latex(command, runparams, name, buffer->filePath());
+ string name = buffer.getLatexName();
+ LaTeX latex(command, runparams, name, buffer.filePath());
TeXErrors terr;
showMessage show(buffer);
latex.message.connect(show);
int result = latex.run(terr);
if (result & LaTeX::ERRORS)
- bufferErrors(*buffer, terr);
+ bufferErrors(buffer, terr);
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
_("An empty output file was generated."));
}
-
- buffer->busy(false);
+
+ buffer.busy(false);
int const ERROR_MASK =
LaTeX::NO_LOGFILE |