#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 "lyx_cb.h" // ShowMessage()
#include "gettext.h"
-#include "BufferView.h"
#include "debug.h"
#include "frontends/Alert.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;
return head + ' ' + options + ' ' + tail;
}
+
+string const dvipdfm_options(BufferParams const & bp)
+{
+ string result;
+
+ if (bp.papersize2 != VM_PAPER_CUSTOM) {
+ string const paper_size = bp.paperSizeName();
+ if (paper_size != "b5" && paper_size != "foolscap")
+ result = "-p "+ paper_size;
+
+ if (bp.orientation == ORIENTATION_LANDSCAPE)
+ result += " -l";
+ }
+
+ return result;
+}
+
} // namespace anon
int const i = compare_ascii_no_case(a.From->prettyname(),
b.From->prettyname());
if (i == 0)
- return compare_ascii_no_case(a.To->prettyname(), b.To->prettyname())
- < 0;
+ return compare_ascii_no_case(a.To->prettyname(),
+ b.To->prettyname()) < 0;
else
return i < 0;
}
-
class compare_Converter {
public:
compare_Converter(string const & f, string const & t)
if (conv.from == "dvi" && conv.to == "ps")
command = add_options(command,
- dvips_options(buffer));
+ buffer->params.dvips_options());
else if (conv.from == "dvi" && prefixIs(conv.to, "pdf"))
command = add_options(command,
- dvipdfm_options(buffer));
+ dvipdfm_options(buffer->params));
lyxerr[Debug::FILES] << "Calling " << command << endl;
if (buffer)
- ShowMessage(buffer, _("Executing command:"), command);
-
+ buffer->message(_("Executing command: ") + command);
Systemcall::Starttype type = (dummy)
? Systemcall::DontWait : Systemcall::Wait;
Systemcall one;
bool Converters::convert(Buffer const * buffer,
- string const & from_file, string const & to_file_base,
- string const & from_format, string const & to_format)
+ string const & from_file, string const & to_file_base,
+ string const & from_format, string const & to_format)
{
string to_file;
return convert(buffer, from_file, to_file_base, from_format, to_format,
if (!buffer)
return false;
- BufferView * bv = buffer->getUser();
LatexRunParams runparams;
runparams.flavor = LatexRunParams::LATEX;
LaTeX latex("", runparams, filename, "");
TeXErrors terr;
int result = latex.scanLogFile(terr);
- if (bv && (result & LaTeX::ERRORS))
- parseErrors(*buffer, terr);
+ if (result & LaTeX::ERRORS)
+ bufferErrors(*buffer, terr);
return true;
}
+namespace {
+
+class showMessage : public boost::signals::trackable {
+public:
+ showMessage(Buffer const * b) : buffer_(b) {};
+ void operator()(string m)
+ {
+ buffer_->message(m);
+ }
+private:
+ Buffer const * buffer_;
+};
+
+}
bool Converters::runLaTeX(Buffer const * buffer, string const & command,
LatexRunParams const & runparams)
{
+ // when is this needed?
if (!buffer)
return false;
- BufferView * bv = buffer->getUser();
-
- if (bv) {
- bv->owner()->busy(true);
- bv->owner()->message(_("Running LaTeX..."));
- // all the autoinsets have already been removed
- }
+ buffer->busy(true);
+ buffer->message(_("Running LaTeX..."));
// do the LaTeX run(s)
string name = buffer->getLatexName();
LaTeX latex(command, runparams, name, buffer->filePath());
TeXErrors terr;
- int result = latex.run(terr,
- bv ? &bv->owner()->getLyXFunc() : 0);
+ showMessage show(buffer);
+ latex.message.connect(show);
+ int result = latex.run(terr);
- if (bv && (result & LaTeX::ERRORS))
- parseErrors(*buffer, terr);
+ if (result & LaTeX::ERRORS)
+ bufferErrors(*buffer, terr);
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
- string str = bformat(_("LaTeX did not run successfully. Additionally, LyX "
- "could not locate the LaTeX log %1$s."), name);
+ string str = bformat(_("LaTeX did not run successfully. "
+ "Additionally, LyX could not locate "
+ "the LaTeX log %1$s."), name);
Alert::error(_("LaTeX failed"), str);
} else if (result & LaTeX::NO_OUTPUT) {
Alert::warning(_("Output is empty"),
- _("An empty output file was generated."));
+ _("An empty output file was generated."));
}
- if (bv)
- bv->owner()->busy(false);
+
+ buffer->busy(false);
int const ERROR_MASK =
LaTeX::NO_LOGFILE |
}
-string const Converters::dvips_options(Buffer const * buffer)
-{
- string result;
- if (!buffer)
- return result;
-
- if (buffer->params.use_geometry
- && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM
- && !lyxrc.print_paper_dimension_flag.empty()
- && !buffer->params.paperwidth.empty()
- && !buffer->params.paperheight.empty()) {
- // using a custom papersize
- result = lyxrc.print_paper_dimension_flag;
- result += ' ' + buffer->params.paperwidth;
- result += ',' + buffer->params.paperheight;
- } else {
- string const paper_option = papersize(buffer);
- if (paper_option != "letter" ||
- buffer->params.orientation != BufferParams::ORIENTATION_LANDSCAPE) {
- // dvips won't accept -t letter -t landscape. In all other
- // cases, include the paper size explicitly.
- result = lyxrc.print_paper_flag;
- result += ' ' + paper_option;
- }
- }
- if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE &&
- buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM)
- result += ' ' + lyxrc.print_landscape_flag;
- return result;
-}
-
-
-string const Converters::dvipdfm_options(Buffer const * buffer)
-{
- string result;
- if (!buffer)
- return result;
-
- if (buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) {
- string const paper_size = papersize(buffer);
- if (paper_size != "b5" && paper_size != "foolscap")
- result = "-p "+ paper_size;
-
- if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- result += " -l";
- }
-
- return result;
-}
-
void Converters::buildGraph()
{
vector<Format const *> const
Converters::getReachable(string const & from, bool only_viewable,
- bool clear_visited)
+ bool clear_visited)
{
vector<int> const & reachables =
G_.getReachable(formats.getNumber(from),
projects / lyx.git / blobdiff