#endif
#include <queue>
-#include <stack>
-#include <algorithm>
-#include <stdio.h>
#include "converter.h"
#include "lyxrc.h"
#include "support/syscall.h"
#include "support/path.h"
-#include "debug.h"
#include "buffer.h"
-
#include "bufferview_funcs.h"
#include "LaTeX.h"
#include "LyXView.h"
#include "minibuffer.h"
#include "lyx_gui_misc.h"
-#include "lyx_cb.h"
+#include "lyx_cb.h" // ShowMessage()
using std::map;
using std::vector;
using std::queue;
using std::pair;
-using std::sort;
-using std::stack;
using std::endl;
+using std::find;
+using std::find_if;
//////////////////////////////////////////////////////////////////////////////
map<string, Format> Formats::formats;
vector<Command> Converter::commands;
+string Converter::latex_command;
-//////////////////////////////////////////////////////////////////////////////
-
-Format::Format(string const & n)
- : name(n), in_degree(0)
+inline
+string const add_options(string const & command, string const & options)
{
- struct Item {
- char const * name;
- char const * prettyname;
- };
- Item items[] = {
- { "tex", "LaTeX" },
- { "dvi", "DVI" },
- { "ps", "PostScript" },
- { "txt", "Ascii" },
- { "html", "HTML" },
- { "pdf", "PDF" },
- { 0, 0}
- };
-
- prettyname = n;
- for (int i = 0; items[i].name != 0; ++i)
- if (items[i].name == n) {
- prettyname = items[i].prettyname;
- break;
- }
+ string head;
+ string tail = split(command, head, ' ');
+ return head + ' ' + options + ' ' + tail;
}
+//////////////////////////////////////////////////////////////////////////////
void Formats::Add(string const & name)
{
if (formats.find(name) == formats.end())
- formats[name] = Format(name);
+ formats[name] = Format(name, name, name, string());
+}
+
+
+void Formats::Add(string const & name, string const & extension,
+ string const & prettyname, string const & shortcut)
+{
+ formats[name] = Format(name, extension, prettyname, shortcut);
}
void Formats::SetViewer(string const & name, string const & command)
{
+
+ string command2 = command;
+ if (!contains(command2,"$$FName"))
+ command2 += " $$FName";
+
Add(name);
- Format * f = GetFormat(name);
- if (!f->viewer.empty())
- lyxerr << "Error: a viewer for " << name
- << " is already defined!" << endl;
- else
- f->viewer = command;
+ GetFormat(name)->viewer = command2;
}
-bool Formats::View(string const & filename)
+bool Formats::View(Buffer const * buffer, string const & filename,
+ string const & format_name)
{
- string extension = GetExtension(filename);
- Format * format = GetFormat(extension);
+ if (filename.empty())
+ return false;
+
+ Format const * format = GetFormat(format_name);
if (!format || format->viewer.empty()) {
WriteAlert(_("Can not view file"),
_("No information for viewing ")
- + Formats::PrettyName(extension));
+ + Formats::PrettyName(format_name));
return false;
}
string command = format->viewer;
- command = subst(command, "$$FName", filename);
-#ifndef __EMX__
- command += " &";
-#else
- // OS/2 cmd.exe has another use for '&'
- // This is not NLS safe, but it's OK, I think.
- string sh = OnlyFilename(GetEnvPath("EMXSHELL"));
- if (sh.empty()) {
- // COMSPEC is set, unless user unsets
- sh = OnlyFilename(GetEnvPath("COMSPEC"));
- if (sh.empty())
- sh = "cmd.exe";
- }
- sh = lowercase(sh);
- if (contains(sh, "cmd.exe")
- || contains(sh, "4os2.exe"))
- command = "start /min/n " + command;
- else
- command += " &";
-#endif
- lyxerr << "Executing command: " << command << endl;
- //ShowMessage(buffer, _("Executing command:"), command);
+
+ if (format_name == "dvi" &&
+ !lyxrc.view_dvi_paper_option.empty()) {
+ string options = lyxrc.view_dvi_paper_option;
+ options += " " + Converter::dvi_papersize(buffer);
+ if (buffer->params.orientation
+ == BufferParams::ORIENTATION_LANDSCAPE)
+ options += 'r';
+ command = add_options(command, options);
+ }
+
+ string command2 = subst(command, "$$FName", OnlyFilename(filename));
+ lyxerr << "Executing command: " << command2 << endl;
+ ShowMessage(buffer, _("Executing command:"), command2);
+
+ command = subst(command, "$$FName", QuoteName(filename));
Systemcalls one;
- int res = one.startscript(Systemcalls::System, command);
+ int res = one.startscript(Systemcalls::SystemDontWait, command);
if (res) {
WriteAlert(_("Can not view file"),
return 0;
}
+
string const Formats::PrettyName(string const & name)
{
- string format;
- Converter::SplitFormat(name, format);
- Format * f = GetFormat(format);
- if (f)
- return f->prettyname;
+ Format const * format = GetFormat(name);
+ if (format)
+ return format->prettyname;
else
- return format;
+ return name;
}
+string const Formats::Extension(string const & name)
+{
+ Format const * format = GetFormat(name);
+ if (format)
+ return format->extension;
+ else
+ return name;
+}
+
//////////////////////////////////////////////////////////////////////////////
+
+class compare_Command {
+public:
+ compare_Command(Command const & c) : com(c) {}
+ bool operator()(Command const & c) {
+ return c.from == com.from && c.to == com.to;
+ }
+private:
+ Command com;
+};
+
+
void Converter::Add(string const & from, string const & to,
string const & command, string const & flags)
{
- for (vector<Command>::const_iterator cit = commands.begin();
- cit != commands.end(); ++cit)
- if ((*cit).from == from && (*cit).to == to) {
- lyxerr << "Error: Convertor from " << from
- << " to " << to
- << " already exists!" << endl;
- return;
- }
- bool original_dir = flags == "origdir";
- commands.push_back(Command(from, to, command, original_dir));
-
Formats::Add(from);
Formats::Add(to);
- ++Formats::GetFormat(to)->in_degree;
+ Command Com(Formats::GetFormat(from), Formats::GetFormat(to), command);
+ vector<Command>::iterator it = find_if(commands.begin(),
+ commands.end(),
+ compare_Command(Com));
+
+ if (command.empty() || command == "none") {
+ if (it != commands.end())
+ commands.erase(it);
+ return;
+ }
+
+
+ // Read the flags
+ string flag_list(flags);
+ while (!flag_list.empty()) {
+ string flag_name, flag_value;
+ flag_list = split(flag_list, flag_value, ',');
+ flag_value = split(flag_value, flag_name, '=');
+ if (flag_name == "*") {
+ if (it != commands.end()) {
+ Com = *it;
+ Com.command = command;
+ }
+ }
+ else if (flag_name == "latex")
+ Com.latex = true;
+ else if (flag_name == "originaldir")
+ Com.original_dir = true;
+ else if (flag_name == "needaux")
+ Com.need_aux = true;
+ else if (flag_name == "resultdir")
+ Com.result_dir = (flag_value.empty())
+ ? "$$BaseName" : flag_value;
+ else if (flag_name == "resultfile")
+ Com.result_file = flag_value;
+ else if (flag_name == "parselog")
+ Com.parselog = flag_value;
+ else if (flag_name == "disable") {
+ while (!flag_value.empty()) {
+ string tmp;
+ flag_value = split(flag_value, tmp, '&');
+ Com.disable.push_back(tmp);
+ }
+ }
+ }
+ if (!Com.result_dir.empty() && Com.result_file.empty())
+ Com.result_file = "index." + to;
+ //if (!contains(command, "$$FName"))
+ // Com.latex = true;
+
+ if (Com.latex && (latex_command.empty() || to == "dvi"))
+ latex_command = command;
+ // If we have both latex & pdflatex, we set latex_command to latex.
+ // The latex_command is used to update the .aux file when running
+ // a converter that uses it.
+
+ if (it != commands.end()) {
+ *it = Com;
+ return;
+ }
+ commands.push_back(Com);
}
-vector< pair<string,string> > const
-Converter::GetReachable(string const & from, bool only_viewable)
+inline
+bool enable(vector<Command>::iterator it, string const & from)
{
- vector< pair<string,string> > result;
- Format * format = Formats::GetFormat(from);
+ return find((*it).disable.begin(), (*it).disable.end(), from)
+ == (*it).disable.end();
+}
+
+
+vector<FormatPair> const
+Converter::GetReachable(string const & from, string const & stop_format,
+ bool only_viewable)
+{
+ vector<FormatPair> result;
+ Format const * format = Formats::GetFormat(from);
if (!format)
return result;
- int sort_start = 0;
- if (!only_viewable || !format->viewer.empty()) {
- result.push_back(pair<string,string>(from, format->prettyname));
- sort_start = 1;
- }
+ if (!only_viewable || !format->viewer.empty())
+ result.push_back(FormatPair(format, 0, ""));
queue< vector<Command>::iterator > Q;
for (vector<Command>::iterator it = commands.begin();
it != commands.end(); ++it)
- if ((*it).from == from) {
+ if ((*it).from->name == from && enable(it, from)
+ && (*it).to->name != stop_format) {
Q.push(it);
(*it).visited = true;
} else
while (!Q.empty()) {
vector<Command>::iterator it = Q.front();
- format = Formats::GetFormat((*it).to);
- string name = format->name;
- string prettyname = format->prettyname;
- if (format->in_degree > 1) {
- name += ":" + (*it).from;
- string tmp;
- split((*it).command, tmp, ' ');
- prettyname += _("(using ") + tmp + ")";
- }
- if (!only_viewable || !format->viewer.empty())
- result.push_back(pair<string,string>(name, prettyname));
Q.pop();
+ if (!only_viewable || !(*it).to->viewer.empty())
+ result.push_back(FormatPair((*it).to, (*it).from,
+ (*it).command));
for (vector<Command>::iterator it2 = commands.begin();
it2 != commands.end(); ++it2)
- if (!(*it2).visited && (*it).to == (*it2).from) {
+ if (!(*it2).visited && (*it).to == (*it2).from &&
+ enable(it2, from) &&
+ (*it2).to->name != stop_format) {
Q.push(it2);
(*it2).visited = true;
}
}
- sort(result.begin() + sort_start, result.end());
return result;
}
-bool Converter::convert(Buffer * buffer, string const & from_file,
- string const & to_format)
-
+bool Converter::IsReachable(string const & from, string const & to)
{
- string format;
- string using_format = SplitFormat(to_format, format);
- string from_format = GetExtension(from_file);
- if (from_format == format)
+ if (from == to)
return true;
queue< vector<Command>::iterator > Q;
for (vector<Command>::iterator it = commands.begin();
it != commands.end(); ++it)
- if ((*it).from == from_format) {
+ if ((*it).from->name == from && enable(it, from)) {
+ Q.push(it);
+ (*it).visited = true;
+ } else
+ (*it).visited = false;
+
+ while (!Q.empty()) {
+ vector<Command>::iterator it = Q.front();
+ Q.pop();
+ if ((*it).to->name == to)
+ return true;
+ for (vector<Command>::iterator it2 = commands.begin();
+ it2 != commands.end(); ++it2)
+ if (!(*it2).visited && (*it).to == (*it2).from &&
+ enable(it2, from)) {
+ Q.push(it2);
+ (*it2).visited = true;
+ }
+ }
+ return false;
+}
+
+
+bool Converter::Convert(Buffer const * buffer,
+ string const & from_file, string const & to_file_base,
+ string const & from_format, string const & to_format,
+ string const & using_format, string & to_file)
+{
+ to_file = ChangeExtension(to_file_base,
+ Formats::Extension(to_format));
+
+ if (from_format == to_format)
+ if (from_file != to_file)
+ return lyx::rename(from_file, to_file);
+ else
+ return true;
+
+ queue< vector<Command>::iterator > Q;
+ for (vector<Command>::iterator it = commands.begin();
+ it != commands.end(); ++it)
+ if ((*it).from->name == from_format && enable(it, from_format)) {
Q.push(it);
(*it).visited = true;
(*it).previous = commands.end();
vector<Command>::iterator it;
while (!Q.empty()) {
it = Q.front();
- if ((*it).to == format &&
- (using_format.empty() || using_format == (*it).from)) {
+ if ((*it).to->name == to_format &&
+ (using_format.empty() || using_format == (*it).from->name)) {
found = true;
break;
}
Q.pop();
for (vector<Command>::iterator it2 = commands.begin();
it2 != commands.end(); ++it2)
- if (!(*it2).visited && (*it).to == (*it2).from) {
+ if (!(*it2).visited && (*it).to == (*it2).from &&
+ enable(it2, from_format)) {
Q.push(it2);
(*it2).visited = true;
(*it2).previous = it;
return false;
}
- stack< vector<Command>::iterator > S;
+ vector< vector<Command>::iterator > S;
while (it != commands.end()) {
- S.push(it);
+ S.push_back(it);
it = (*it).previous;
}
- //Path p(OnlyPath(buffer->fileName()));
- Path p(OnlyPath(from_file));
-
- string basename = ChangeExtension(from_file, "");
- while (!S.empty()) {
- it = S.top();
- S.pop();
+ string path = OnlyPath(from_file);
+ Path p(path);
+
+ bool run_latex = false;
+ string from_base = ChangeExtension(from_file, "");
+ string to_base = ChangeExtension(to_file, "");
+ string infile;
+ string outfile = from_file;
+ for (vector< vector<Command>::iterator >::reverse_iterator rit =
+ S.rbegin(); rit != S.rend(); ++rit) {
+ it = *rit;
lyxerr << "Converting from "
- << (*it).from << " to " << (*it).to << endl;
-
- if ((*it).from == "tex" &&
- ( (*it).to == "dvi" || (*it).to == "pdf") ) {
- lyxrc.pdf_mode = (*it).to == "pdf";
+ << (*it).from->name << " to " << (*it).to->name << endl;
+ infile = outfile;
+ outfile = (*it).result_dir.empty()
+ ? ChangeExtension(from_file, (*it).to->extension)
+ : AddName(subst((*it).result_dir,
+ "$$BaseName", from_base),
+ subst((*it).result_file,
+ "$$BaseName", OnlyFilename(from_base)));
+
+ if ((*it).latex) {
+ lyxrc.pdf_mode = (*it).to->name == "pdf";
+ lyxerr << "Running " << (*it).command << endl;
+ run_latex = true;
if (!runLaTeX(buffer, (*it).command))
return false;
} else {
- string infile = ChangeExtension(from_file, (*it).from);
- if (!(*it).original_dir)
- infile = OnlyFilename(infile);
- string outfile = ChangeExtension(infile, (*it).to);
+ if ((*it).need_aux && !run_latex
+ && !latex_command.empty()) {
+ lyxerr << "Running " << latex_command
+ << " to update aux file"<< endl;
+ runLaTeX(buffer, latex_command);
+ }
+
+ string infile2 = ((*it).original_dir)
+ ? infile : MakeRelPath(infile, path);
+ string outfile2 = ((*it).original_dir)
+ ? outfile : MakeRelPath(outfile, path);
string command = (*it).command;
- command = subst(command, "$$FName", infile);
- command = subst(command, "$$BaseName", basename);
- command = subst(command, "$$OutName", outfile);
+ command = subst(command, "$$FName", QuoteName(infile2));
+ command = subst(command, "$$BaseName", QuoteName(from_base));
+ command = subst(command, "$$OutName", QuoteName(outfile2));
+
+ if (!(*it).parselog.empty())
+ command += " 2> " + QuoteName(infile2 + ".out");
+
+ if ((*it).from->name == "dvi" && (*it).to->name == "ps")
+ command = add_options(command,
+ dvips_options(buffer));
+
lyxerr << "Calling " << command << endl;
- ShowMessage(buffer, _("Executing command:"), command);
+ if (buffer)
+ ShowMessage(buffer, _("Executing command:"), command);
Systemcalls one;
int res;
- if ((*it).original_dir) {
+ if ((*it).original_dir && buffer) {
Path p(buffer->filepath);
res = one.startscript(Systemcalls::System, command);
} else
res = one.startscript(Systemcalls::System, command);
+
+ if (!(*it).parselog.empty()) {
+ string const logfile = infile2 + ".log";
+ string const command2 = (*it).parselog +
+ " < " + QuoteName(infile2 + ".out") +
+ " > " + QuoteName(logfile);
+ one.startscript(Systemcalls::System, command2);
+ if (!scanLog(buffer, command, logfile))
+ return false;
+ }
+
if (res) {
- WriteAlert(_("Can not convert file"),
- "Error while executing",
- command.substr(0, 50));
+ if ((*it).to->name == "program")
+ WriteAlert(_("There were errors during the Build process."),
+ _("You should try to fix them."));
+ else
+ WriteAlert(_("Can not convert file"),
+ "Error while executing",
+ command.substr(0, 50));
return false;
}
}
}
+ if (!(*it).result_dir.empty()) {
+ to_file = AddName(subst((*it).result_dir,
+ "$$BaseName", to_base),
+ subst((*it).result_file,
+ "$$BaseName", OnlyFilename(to_base)));
+ if (from_base != to_base) {
+ string from = subst((*it).result_dir,
+ "$$BaseName", from_base);
+ string to = subst((*it).result_dir,
+ "$$BaseName", to_base);
+ return lyx::rename(from, to);
+ }
+ } else if (outfile != to_file)
+ if ((*it).latex)
+ return lyx::copy(outfile, to_file);
+ else
+ return lyx::rename(outfile, to_file);
+
return true;
}
+bool Converter::Convert(Buffer const * buffer,
+ string const & from_file, string const & to_file_base,
+ string const & from_format, string const & to_format,
+ string const & using_format)
+{
+ string to_file;
+ return Convert(buffer, from_file, to_file_base, from_format, to_format,
+ using_format, to_file);
+}
+
+
string const Converter::SplitFormat(string const & str, string & format)
{
string using_format = split(str, format, ':');
}
-bool Converter::runLaTeX(Buffer * buffer, string const & command)
+bool Converter::scanLog(Buffer const * buffer, string const & command,
+ string const & filename)
{
-
+ if (!buffer)
+ return false;
+
BufferView * bv = buffer->getUser();
+ bool need_redraw = false;
+ if (bv) {
+ ProhibitInput(bv);
+ // Remove all error insets
+ need_redraw = bv->removeAutoInsets();
+ }
+
+ LaTeX latex("", filename, "");
+ TeXErrors terr;
+ int result = latex.scanLogFile(terr);
+ if (bv) {
+ if ((result & LaTeX::ERRORS)) {
+ // Insert all errors as errors boxes
+ bv->insertErrors(terr);
+ need_redraw = true;
+ }
+ if (need_redraw) {
+ bv->redraw();
+ bv->fitCursor(bv->text);
+ }
+ AllowInput(bv);
+ }
+
+ if ((result & LaTeX::ERRORS)) {
+ int num_errors = latex.getNumErrors();
+ string s;
+ string t;
+ if (num_errors == 1) {
+ s = _("One error detected");
+ t = _("You should try to fix it.");
+ } else {
+ s = tostr(num_errors);
+ s += _(" errors detected.");
+ t = _("You should try to fix them.");
+ }
+ string head;
+ split(command, head, ' ');
+ WriteAlert(_("There were errors during running of ") + head,
+ s, t);
+ return false;
+ } else if (result & LaTeX::NO_OUTPUT) {
+ string const s = _("The operation resulted in");
+ string const t = _("an empty file.");
+ WriteAlert(_("Resulting file is empty"), s, t);
+ return false;
+ }
+ return true;
+}
- if (!bv->text) return 0;
- ProhibitInput(bv);
+bool Converter::runLaTeX(Buffer const * buffer, string const & command)
+{
+ if (!buffer)
+ return false;
+ BufferView * bv = buffer->getUser();
string name = buffer->getLatexName();
+ bool need_redraw = false;
- bv->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));
+ if (bv) {
+ ProhibitInput(bv);
+ bv->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));
+ // Remove all error insets
+ need_redraw = bv->removeAutoInsets();
+ }
- // Remove all error insets
- bool a = bv->removeAutoInsets();
// do the LaTex run(s)
TeXErrors terr;
LaTeX latex(command, name, buffer->filepath);
int result = latex.run(terr,
- bv->owner()->getMiniBuffer()); // running latex
+ bv ? bv->owner()->getMiniBuffer() : 0);
+
- if ((result & LaTeX::ERRORS)) {
- // Insert all errors as errors boxes
- bv->insertErrors(terr);
- }
+ if (bv) {
+ if ((result & LaTeX::ERRORS)) {
+ // Insert all errors as errors boxes
+ bv->insertErrors(terr);
+ need_redraw = true;
+ }
- // if we removed error insets before we ran LaTeX or if we inserted
- // error insets after we ran LaTeX this must be run:
- if (a || (result & LaTeX::ERRORS)){
- bv->redraw();
- bv->fitCursor();
- //bv->updateScrollbar();
- }
+ // if we removed error insets before we ran LaTeX or if we inserted
+ // error insets after we ran LaTeX this must be run:
+ if (need_redraw) {
+ bv->redraw();
+ bv->fitCursor(bv->text);
+ }
+ }
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
}
WriteAlert(_("There were errors during the LaTeX run."),
s, t);
+ } else if (result & LaTeX::NO_OUTPUT) {
+ string const s = _("The operation resulted in");
+ string const t = _("an empty file.");
+ WriteAlert(_("Resulting file is empty"), s, t);
}
- AllowInput(bv);
+
+ if (bv)
+ AllowInput(bv);
- return (result & (LaTeX::NO_LOGFILE | LaTeX::ERRORS)) == 0;
+ int const ERROR_MASK =
+ LaTeX::NO_LOGFILE |
+ LaTeX::ERRORS |
+ LaTeX::NO_OUTPUT;
+
+ return (result & ERROR_MASK) == 0;
+
+}
+
+
+string const Converter::dvi_papersize(Buffer const * buffer)
+{
+ char real_papersize = buffer->params.papersize;
+ if (real_papersize == BufferParams::PAPER_DEFAULT)
+ real_papersize = lyxrc.default_papersize;
+
+ switch (real_papersize) {
+ case BufferParams::PAPER_A3PAPER:
+ return "a3";
+ case BufferParams::PAPER_A4PAPER:
+ return "a4";
+ case BufferParams::PAPER_A5PAPER:
+ return "a5";
+ case BufferParams::PAPER_B5PAPER:
+ return "b5";
+ case BufferParams::PAPER_EXECUTIVEPAPER:
+ return "foolscap";
+ case BufferParams::PAPER_LEGALPAPER:
+ return "legal";
+ case BufferParams::PAPER_USLETTER:
+ default:
+ return "us";
+ }
+}
+
+string const Converter::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 paper_option = dvi_papersize(buffer);
+ if (paper_option == "us")
+ paper_option = "letter";
+ 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)
+ result += ' ' + lyxrc.print_landscape_flag;
+ return result;
}
+
+void Converter::init()
+{
+}
projects / lyx.git / blobdiff