*
* \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 "bufferview_funcs.h"
-#include "LaTeX.h"
-#include "lyx_cb.h" // ShowMessage()
-#include "gettext.h"
-#include "BufferView.h"
+#include "buffer_funcs.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 <cctype>
+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 {
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
original_dir(false), need_aux(false)
{}
+
void Converter::readFlags()
{
string flag_list(flags);
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 (edgepath.empty()) {
return false;
}
+ LatexRunParams runparams;
+ runparams.flavor = usePdflatex(edgepath) ?
+ LatexRunParams::PDFLATEX : LatexRunParams::LATEX;
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) {
run_latex = true;
string command = subst(conv.command, token_from, "");
lyxerr[Debug::FILES] << "Running " << command << endl;
- if (!runLaTeX(buffer, command))
+ 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_);
+ runLaTeX(*buffer, latex_command_, runparams);
}
string infile2 = (conv.original_dir)
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;
int res;
- if (conv.original_dir && buffer) {
+ if (conv.original_dir) {
Path p(buffer->filePath());
res = one.startscript(type, command);
} else
res = one.startscript(type, command);
if (!real_outfile.empty()) {
- if (!lyx::rename(outfile, real_outfile))
+ if (!rename(outfile, real_outfile))
res = -1;
else
lyxerr[Debug::FILES]
" < " + QuoteName(infile2 + ".out") +
" > " + QuoteName(logfile);
one.startscript(Systemcall::Wait, command2);
- if (!scanLog(buffer, command, logfile))
+ if (!scanLog(*buffer, command, logfile))
return false;
}
token_base, from_base);
string to = subst(conv.result_dir,
token_base, to_base);
- if (!lyx::rename(from, to)) {
+ if (!rename(from, to)) {
Alert::error(_("Cannot convert file"),
bformat(_("Could not move a temporary file from %1$s to %2$s."),
from, to));
lyxerr[Debug::FILES] << "moving " << from2
<< " to " << to2 << endl;
bool const moved = (copy)
- ? lyx::copy(from2, to2)
- : lyx::rename(from2, to2);
+ ? lyx::support::copy(from2, to2)
+ : rename(from2, to2);
if (!moved && no_errors) {
Alert::error(_("Cannot convert file"),
bformat(_("Could not move a temporary file from %1$s to %2$s."),
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,
}
-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;
-
- BufferView * bv = buffer->getUser();
- LaTeX latex("", filename, "");
+ LatexRunParams runparams;
+ runparams.flavor = LatexRunParams::LATEX;
+ LaTeX latex("", runparams, filename, "");
TeXErrors terr;
int result = latex.scanLogFile(terr);
- if (bv && (result & LaTeX::ERRORS))
- bv->showErrorList();
+
+ if (result & LaTeX::ERRORS)
+ bufferErrors(buffer, terr);
return true;
}
+namespace {
-bool Converters::runLaTeX(Buffer const * buffer, string const & command)
-{
- if (!buffer)
- return false;
+class showMessage : public boost::signals::trackable {
+public:
+ showMessage(Buffer const & b) : buffer_(b) {};
+ void operator()(string const & m)
+ {
+ buffer_.message(m);
+ }
+private:
+ Buffer const & buffer_;
+};
- BufferView * bv = buffer->getUser();
+}
- if (bv) {
- bv->owner()->busy(true);
- bv->owner()->message(_("Running LaTeX..."));
- // all the autoinsets have already been removed
- }
+
+bool Converters::runLaTeX(Buffer const & buffer, string const & command,
+ LatexRunParams const & runparams)
+{
+ buffer.busy(true);
+ buffer.message(_("Running LaTeX..."));
// do the LaTeX run(s)
- string name = buffer->getLatexName();
- LaTeX latex(command, name, buffer->filePath());
+ 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)) {
- //show errors
- bv->showErrorList();
- }
+ 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
+
+std::vector<Format const *> const
Converters::intToFormat(std::vector<int> const & input)
{
vector<Format const *> result(input.size());
return intToFormat(reachablesto);
}
+
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),
return intToFormat(reachables);
}
+
bool Converters::isReachable(string const & from, string const & to)
{
return G_.isReachable(formats.getNumber(from),
formats.getNumber(to));
}
+
Graph::EdgePath const
Converters::getPath(string const & from, string const & to)
{
formats.getNumber(to));
}
+
/// The global instance
Converters converters;
projects / lyx.git / blobdiff