* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#pragma implementation
#endif
-#include <queue>
+#include <cctype>
#include "converter.h"
#include "lyxrc.h"
#include "bufferview_funcs.h"
#include "LaTeX.h"
#include "LyXView.h"
-#include "minibuffer.h"
#include "lyx_gui_misc.h"
#include "lyx_cb.h" // ShowMessage()
+#include "support/lyxfunctional.h"
+#include "frontends/Alert.h"
+#include "gettext.h"
+#include "BufferView.h"
+#include "debug.h"
-using std::map;
using std::vector;
using std::queue;
-using std::pair;
using std::endl;
-using std::find;
+using std::fill;
using std::find_if;
+using std::reverse;
+using std::sort;
-//////////////////////////////////////////////////////////////////////////////
+namespace {
+
+string const token_from("$$i");
+string const token_base("$$b");
+string const token_to("$$o");
-vector<Command> Converter::commands;
-string Converter::latex_command;
+//////////////////////////////////////////////////////////////////////////////
-static inline
+inline
string const add_options(string const & command, string const & options)
{
string head;
return head + ' ' + options + ' ' + tail;
}
-//////////////////////////////////////////////////////////////////////////////
+} // namespace anon
+//////////////////////////////////////////////////////////////////////////////
bool Format::dummy() const
{
- return extension.empty();
+ return extension().empty();
}
-void Formats::Add(string const & name)
+bool Format::isChildFormat() const
{
- if (formats.find(name) == formats.end())
- formats[name] = Format(name, name, name, "", "");
+ if (name_.empty())
+ return false;
+ return isdigit(name_[name_.length() - 1]);
}
-void Formats::Add(string const & name, string const & extension,
- string const & prettyname, string const & shortcut)
+string const Format::parentFormat() const
{
+ return name_.substr(0, name_.length() - 1);
+}
- if (prettyname.empty()) {
- FormatList::iterator it = formats.find(name);
- if (it != formats.end())
- formats.erase(it);
- return;
+//////////////////////////////////////////////////////////////////////////////
+
+// This method should return a reference, and throw an exception
+// if the format named name cannot be found (Lgb)
+Format const * Formats::getFormat(string const & name) const
+{
+ FormatList::const_iterator cit =
+ find_if(formatlist.begin(), formatlist.end(),
+ lyx::compare_memfun(&Format::name, name));
+ if (cit != formatlist.end())
+ return &(*cit);
+ else
+ return 0;
+}
+
+
+int Formats::getNumber(string const & name) const
+{
+ FormatList::const_iterator cit =
+ find_if(formatlist.begin(), formatlist.end(),
+ lyx::compare_memfun(&Format::name, name));
+ if (cit != formatlist.end())
+ return cit - formatlist.begin();
+ else
+ return -1;
+}
+
+
+void Formats::add(string const & name)
+{
+ if (!getFormat(name))
+ add(name, name, name, string());
+}
+
+
+void Formats::add(string const & name, string const & extension,
+ string const & prettyname, string const & shortcut)
+{
+ FormatList::iterator it =
+ find_if(formatlist.begin(), formatlist.end(),
+ lyx::compare_memfun(&Format::name, name));
+ if (it == formatlist.end())
+ formatlist.push_back(Format(name, extension, prettyname,
+ shortcut, ""));
+ else {
+ string viewer = it->viewer();
+ *it = Format(name, extension, prettyname, shortcut, viewer);
}
+}
+
- string const old_viewer = formats[name].viewer;
- formats[name] = Format(name, extension, prettyname, shortcut,
- old_viewer);
+void Formats::erase(string const & name)
+{
+ FormatList::iterator it =
+ find_if(formatlist.begin(), formatlist.end(),
+ lyx::compare_memfun(&Format::name, name));
+ if (it != formatlist.end())
+ formatlist.erase(it);
}
-void Formats::SetViewer(string const & name, string const & command)
+void Formats::sort()
{
- string command2 = command;
- if (!command2.empty() && !contains(command2,"$$FName"))
- command2 += " $$FName";
+ std::sort(formatlist.begin(), formatlist.end());
+}
+
- Add(name);
- GetFormat(name)->viewer = command2;
+void Formats::setViewer(string const & name, string const & command)
+{
+ add(name);
+ FormatList::iterator it =
+ find_if(formatlist.begin(), formatlist.end(),
+ lyx::compare_memfun(&Format::name, name));
+ if (it != formatlist.end())
+ it->setViewer(command);
}
-bool Formats::View(Buffer const * buffer, string const & filename,
- string const & format_name)
+bool Formats::view(Buffer const * buffer, string const & filename,
+ string const & format_name) const
{
if (filename.empty())
return false;
- Format const * format = GetFormat(format_name);
- if (!format || format->viewer.empty()) {
- WriteAlert(_("Can not view file"),
+ Format const * format = getFormat(format_name);
+ if (format && format->viewer().empty() &&
+ format->isChildFormat())
+ format = getFormat(format->parentFormat());
+ if (!format || format->viewer().empty()) {
+ Alert::alert(_("Cannot view file"),
_("No information for viewing ")
- + PrettyName(format_name));
+ + prettyName(format_name));
return false;
}
- string command = format->viewer;
+ string command = format->viewer();
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
- string options = lyxrc.view_dvi_paper_option;
- options += " " + Converter::dvi_papersize(buffer);
+ command += " " + lyxrc.view_dvi_paper_option;
+ string paper_size = converters.papersize(buffer);
+ if (paper_size == "letter")
+ paper_size = "us";
+ command += " " + paper_size;
if (buffer->params.orientation
== BufferParams::ORIENTATION_LANDSCAPE)
- options += 'r';
- command = add_options(command, options);
+ command += 'r';
}
- string command2 = subst(command, "$$FName", OnlyFilename(filename));
- lyxerr << "Executing command: " << command2 << endl;
- ShowMessage(buffer, _("Executing command:"), command2);
+ command += " " + QuoteName(OnlyFilename((filename)));
+
+ lyxerr[Debug::FILES] << "Executing command: " << command << endl;
+ ShowMessage(buffer, _("Executing command:"), command);
- command = subst(command, "$$FName", QuoteName(filename));
+ Path p(OnlyPath(filename));
Systemcalls one;
- int res = one.startscript(Systemcalls::SystemDontWait, command);
+ int const res = one.startscript(Systemcalls::DontWait, command);
if (res) {
- WriteAlert(_("Can not view file"),
+ Alert::alert(_("Cannot view file"),
_("Error while executing"),
command.substr(0, 50));
return false;
}
-// This method should return a reference, and throw an exception
-// if the format named name cannot be found (Lgb)
-Format * Formats::GetFormat(string const & name)
+string const Formats::prettyName(string const & name) const
{
- FormatList::iterator it = formats.find(name);
- if (it != formats.end())
- return &it->second;
+ Format const * format = getFormat(name);
+ if (format)
+ return format->prettyname();
else
- return 0;
+ return name;
}
-string const Formats::PrettyName(string const & name)
+string const Formats::extension(string const & name) const
{
- Format const * format = GetFormat(name);
+ Format const * format = getFormat(name);
if (format)
- return format->prettyname;
+ return format->extension();
else
return name;
}
+//////////////////////////////////////////////////////////////////////////////
-string const Formats::Extension(string const & name)
+void Converter::readFlags()
{
- Format const * format = GetFormat(name);
- if (format)
- return format->extension;
- else
- return name;
+ 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 == "latex")
+ latex = true;
+ else if (flag_name == "originaldir")
+ original_dir = true;
+ else if (flag_name == "needaux")
+ need_aux = true;
+ else if (flag_name == "resultdir")
+ result_dir = (flag_value.empty())
+ ? token_base : flag_value;
+ else if (flag_name == "resultfile")
+ result_file = flag_value;
+ else if (flag_name == "parselog")
+ parselog = flag_value;
+ }
+ if (!result_dir.empty() && result_file.empty())
+ result_file = "index." + formats.extension(to);
+ //if (!contains(command, token_from))
+ // latex = true;
}
-vector<Format>
-const Formats::GetAllFormats() const
+bool operator<(Converter const & a, Converter const & b)
{
- vector<Format> result;
- for (FormatList::const_iterator cit = formats.begin();
- cit != formats.end(); ++cit)
- result.push_back(cit->second);
- return result;
+ int const i = compare_no_case(a.From->prettyname(),
+ b.From->prettyname());
+ if (i == 0)
+ return compare_no_case(a.To->prettyname(), b.To->prettyname())
+ < 0;
+ else
+ return i < 0;
}
-
//////////////////////////////////////////////////////////////////////////////
-// Instead of storing an object we could just store an const reference.
-// _but_ that is not guaranteed to work in all cases. (Lgb)
-class compare_Command {
+class compare_Converter {
public:
- compare_Command(Command const & c) : com(c) {}
- bool operator()(Command const & c) {
- return c.from == com.from && c.to == com.to;
+ 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:
- Command com;
+ string const & from;
+ string const & to;
};
-void Converter::Add(string const & from, string const & to,
- string const & command, string const & flags)
+Converter const * Converters::getConverter(string const & from,
+ string const & to)
{
- formats.Add(from);
- formats.Add(to);
- Command Com(formats.GetFormat(from), formats.GetFormat(to), command);
- vector<Command>::iterator it = find_if(commands.begin(),
- commands.end(),
- compare_Command(Com));
+ ConverterList::const_iterator cit =
+ find_if(converterlist_.begin(), converterlist_.end(),
+ compare_Converter(from, to));
+ if (cit != converterlist_.end())
+ return &(*cit);
+ else
+ return 0;
+}
- if (command.empty() || command == "none") {
- if (it != commands.end())
- commands.erase(it);
- return;
- }
+int Converters::getNumber(string const & from, string const & to)
+{
+ ConverterList::const_iterator cit =
+ find_if(converterlist_.begin(), converterlist_.end(),
+ compare_Converter(from, to));
+ if (cit != converterlist_.end())
+ return cit - converterlist_.begin();
+ else
+ return -1;
+}
- // 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 == "importer")
- Com.importer = true;
- 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;
+void Converters::add(string const & from, string const & to,
+ string const & command, string const & flags)
+{
+ formats.add(from);
+ formats.add(to);
+ ConverterList::iterator it = find_if(converterlist_.begin(),
+ converterlist_.end(),
+ compare_Converter(from, to));
+
+ Converter converter(from, to, command, flags);
+ if (it != converterlist_.end() && !flags.empty() && flags[0] == '*') {
+ converter = *it;
+ converter.command = command;
+ converter.flags = flags;
+ }
+ converter.readFlags();
+
+ if (converter.latex && (latex_command_.empty() || to == "dvi"))
+ latex_command_ = subst(command, token_from, "");
// 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;
+ if (it == converterlist_.end()) {
+ converterlist_.push_back(converter);
+ } else {
+ converter.From = it->From;
+ converter.To = it->To;
+ *it = converter;
}
- commands.push_back(Com);
}
-static inline
-bool enable(vector<Command>::iterator it, string const & from)
+void Converters::erase(string const & from, string const & to)
{
- return find(it->disable.begin(), it->disable.end(), from)
- == it->disable.end();
+ ConverterList::iterator it = find_if(converterlist_.begin(),
+ converterlist_.end(),
+ compare_Converter(from, to));
+ if (it != converterlist_.end())
+ converterlist_.erase(it);
}
-vector<FormatPair> const
-Converter::GetReachableTo(string const & target)
+// This method updates the pointers From and To in all the converters.
+// The code is not very efficient, but it doesn't matter as the number
+// of formats and converters is small.
+// Furthermore, this method is called only on startup, or after
+// adding/deleting a format in FormPreferences (the latter calls can be
+// eliminated if the formats in the Formats class are stored using a map or
+// a list (instead of a vector), but this will cause other problems).
+void Converters::update(Formats const & formats)
{
- vector<FormatPair> result;
+ ConverterList::iterator it = converterlist_.begin();
+ ConverterList::iterator end = converterlist_.end();
+ for (; it != end; ++it) {
+ it->From = formats.getFormat(it->from);
+ it->To = formats.getFormat(it->to);
+ }
+}
+
- queue< vector<Command>::iterator > Q;
- for (vector<Command>::iterator it = commands.begin();
- it != commands.end(); ++it)
- if (it->to->name == target && it->importer) {
- Q.push(it);
- it->visited = true;
- } else
- it->visited = false;
+// This method updates the pointers From and To in the last converter.
+// It is called when adding a new converter in FormPreferences
+void Converters::updateLast(Formats const & formats)
+{
+ if (converterlist_.begin() != converterlist_.end()) {
+ ConverterList::iterator it = converterlist_.end() - 1;
+ it->From = formats.getFormat(it->from);
+ it->To = formats.getFormat(it->to);
+ }
+}
+
+
+void Converters::sort()
+{
+ std::sort(converterlist_.begin(), converterlist_.end());
+}
+
+
+int Converters::bfs_init(string const & start, bool clear_visited)
+{
+ int const s = formats.getNumber(start);
+ if (s < 0)
+ return s;
+
+ Q_ = queue<int>();
+ if (clear_visited)
+ fill(visited_.begin(), visited_.end(), false);
+ if (visited_[s] == false) {
+ Q_.push(s);
+ visited_[s] = true;
+ }
+ return s;
+}
+
+
+vector<Format const *> const
+Converters::getReachableTo(string const & target, bool clear_visited)
+{
+ vector<Format const *> result;
+ int const s = bfs_init(target, clear_visited);
+ if (s < 0)
+ return result;
- while (!Q.empty()) {
- vector<Command>::iterator it = Q.front();
- Q.pop();
- result.push_back(FormatPair(it->from, 0, ""));
- for (vector<Command>::iterator it2 = commands.begin();
- it2 != commands.end(); ++it2)
- if (!it2->visited && it->from == it2->to &&
- it2->importer) {
- Q.push(it2);
- it2->visited = true;
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
+ if (i != s || target != "lyx") {
+ result.push_back(&formats.get(i));
+ }
+
+ vector<int>::iterator it = vertices_[i].in_vertices.begin();
+ vector<int>::iterator end = vertices_[i].in_vertices.end();
+ for (; it != end; ++it) {
+ if (!visited_[*it]) {
+ visited_[*it] = true;
+ Q_.push(*it);
}
+ }
}
return result;
}
-vector<FormatPair> const
-Converter::GetReachable(string const & from, bool only_viewable)
+vector<Format const *> const
+Converters::getReachable(string const & from, bool only_viewable,
+ bool clear_visited)
{
- vector<FormatPair> result;
- Format const * format = formats.GetFormat(from);
- if (!format)
+ vector<Format const *> result;
+
+ if (bfs_init(from, clear_visited) < 0)
return result;
- 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->name == from && enable(it, from)
- && !it->importer) {
- Q.push(it);
- it->visited = true;
- } else
- it->visited = false;
-
- while (!Q.empty()) {
- vector<Command>::iterator it = Q.front();
- 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 &&
- enable(it2, from) && !it2->importer) {
- Q.push(it2);
- it2->visited = true;
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
+ Format const & format = formats.get(i);
+ if (format.name() == "lyx")
+ continue;
+ if (!only_viewable || !format.viewer().empty() ||
+ format.isChildFormat())
+ result.push_back(&format);
+
+ vector<int>::const_iterator cit =
+ vertices_[i].out_vertices.begin();
+ vector<int>::const_iterator end =
+ vertices_[i].out_vertices.end();
+ for (; cit != end; ++cit)
+ if (!visited_[*cit]) {
+ visited_[*cit] = true;
+ Q_.push(*cit);
}
}
}
-bool Converter::IsReachable(string const & from, string const & to)
+bool Converters::isReachable(string const & from, string const & to)
{
if (from == to)
return true;
- queue< vector<Command>::iterator > Q;
- for (vector<Command>::iterator it = commands.begin();
- it != commands.end(); ++it)
- 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)
+ int const s = bfs_init(from);
+ int const t = formats.getNumber(to);
+ if (s < 0 || t < 0)
+ return false;
+
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
+ if (i == t)
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;
+
+ vector<int>::const_iterator cit =
+ vertices_[i].out_vertices.begin();
+ vector<int>::const_iterator end =
+ vertices_[i].out_vertices.end();
+ for (; cit != end; ++cit) {
+ if (!visited_[*cit]) {
+ visited_[*cit] = true;
+ Q_.push(*cit);
}
+ }
}
+
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)
+Converters::EdgePath const
+Converters::getPath(string const & from, string const & to)
{
- to_file = ChangeExtension(to_file_base,
- formats.Extension(to_format));
+ EdgePath path;
+ if (from == to)
+ return path;
- if (from_format == to_format)
- if (from_file != to_file)
- return lyx::rename(from_file, to_file);
- else
- return true;
+ int const s = bfs_init(from);
+ int t = formats.getNumber(to);
+ if (s < 0 || t < 0)
+ return path;
- 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();
- } else
- it->visited = false;
-
- if (Q.empty()) {
- WriteAlert(_("Can not convert file"),
- ("Unknown format ") + from_format);
- return false;
- }
+ vector<int> prev_edge(formats.size());
+ vector<int> prev_vertex(formats.size());
bool found = false;
- vector<Command>::iterator it;
- while (!Q.empty()) {
- it = Q.front();
- if (it->to->name == to_format &&
- (using_format.empty() || using_format == it->from->name)) {
+ while (!Q_.empty()) {
+ int const i = Q_.front();
+ Q_.pop();
+ if (i == t) {
found = true;
break;
}
- Q.pop();
- for (vector<Command>::iterator it2 = commands.begin();
- it2 != commands.end(); ++it2)
- if (!it2->visited && it->to == it2->from &&
- enable(it2, from_format)) {
- Q.push(it2);
- it2->visited = true;
- it2->previous = it;
+
+ vector<int>::const_iterator beg =
+ vertices_[i].out_vertices.begin();
+ vector<int>::const_iterator cit = beg;
+ vector<int>::const_iterator end =
+ vertices_[i].out_vertices.end();
+ for (; cit != end; ++cit)
+ if (!visited_[*cit]) {
+ int const j = *cit;
+ visited_[j] = true;
+ Q_.push(j);
+ int const k = cit - beg;
+ prev_edge[j] = vertices_[i].out_edges[k];
+ prev_vertex[j] = i;
}
}
+ if (!found)
+ return path;
- if (!found) {
- WriteAlert(_("Can not convert file"),
- _("No information for converting from ")
- + formats.PrettyName(from_format) + _(" to ")
- + formats.PrettyName(to_format));
- return false;
+ while (t != s) {
+ path.push_back(prev_edge[t]);
+ t = prev_vertex[t];
+ }
+ reverse(path.begin(), path.end());
+ return path;
+}
+
+
+bool Converters::usePdflatex(EdgePath const & path)
+{
+ for (EdgePath::const_iterator cit = path.begin();
+ cit != path.end(); ++cit) {
+ Converter const & conv = converterlist_[*cit];
+ if (conv.latex)
+ return contains(conv.to, "pdf");
}
+ return false;
+}
+
- vector< vector<Command>::iterator > S;
- while (it != commands.end()) {
- S.push_back(it);
- it = it->previous;
+bool Converters::convert(Buffer const * buffer,
+ string const & from_file, string const & to_file_base,
+ string const & from_format, string const & to_format,
+ string & to_file)
+{
+ to_file = ChangeExtension(to_file_base,
+ formats.extension(to_format));
+
+ if (from_format == to_format)
+ return move(from_file, to_file, false);
+
+ EdgePath edgepath = getPath(from_format, to_format);
+ if (edgepath.empty()) {
+ Alert::alert(_("Cannot convert file"),
+ _("No information for converting from ")
+ + formats.prettyName(from_format) + _(" to ")
+ + formats.prettyName(to_format));
+ return false;
}
string path = OnlyPath(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;
- bool dummy = it->to->dummy() && it->to->name != "program";
+ for (EdgePath::const_iterator cit = edgepath.begin();
+ cit != edgepath.end(); ++cit) {
+ Converter const & conv = converterlist_[*cit];
+ bool dummy = conv.To->dummy() && conv.to != "program";
if (!dummy)
- lyxerr << "Converting from "
- << it->from->name << " to " << it->to->name << endl;
+ lyxerr[Debug::FILES] << "Converting from "
+ << conv.from << " to " << conv.to << 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;
+ outfile = conv.result_dir.empty()
+ ? ChangeExtension(from_file, conv.To->extension())
+ : AddName(subst(conv.result_dir,
+ token_base, from_base),
+ subst(conv.result_file,
+ token_base, OnlyFilename(from_base)));
+
+ if (conv.latex) {
run_latex = true;
- if (!runLaTeX(buffer, it->command))
+ string command = subst(conv.command, token_from, "");
+ lyxerr[Debug::FILES] << "Running " << command << endl;
+ if (!runLaTeX(buffer, command))
return false;
} else {
- if (it->need_aux && !run_latex
- && !latex_command.empty()) {
- lyxerr << "Running " << latex_command
- << " to update aux file"<< endl;
- runLaTeX(buffer, latex_command);
+ if (conv.need_aux && !run_latex
+ && !latex_command_.empty()) {
+ lyxerr[Debug::FILES]
+ << "Running " << latex_command_
+ << " to update aux file"<< endl;
+ runLaTeX(buffer, latex_command_);
}
- string infile2 = (it->original_dir)
+ string infile2 = (conv.original_dir)
? infile : MakeRelPath(infile, path);
- string outfile2 = (it->original_dir)
+ string outfile2 = (conv.original_dir)
? outfile : MakeRelPath(outfile, path);
- string command = it->command;
- command = subst(command, "$$FName", QuoteName(infile2));
- command = subst(command, "$$BaseName", QuoteName(from_base));
- command = subst(command, "$$OutName", QuoteName(outfile2));
+ string command = conv.command;
+ command = subst(command, token_from, QuoteName(infile2));
+ command = subst(command, token_base, QuoteName(from_base));
+ command = subst(command, token_to, QuoteName(outfile2));
- if (!it->parselog.empty())
+ if (!conv.parselog.empty())
command += " 2> " + QuoteName(infile2 + ".out");
- if (it->from->name == "dvi" && it->to->name == "ps")
+ if (conv.from == "dvi" && conv.to == "ps")
command = add_options(command,
dvips_options(buffer));
+ else if (conv.from == "dvi" && prefixIs(conv.to, "pdf"))
+ command = add_options(command,
+ dvipdfm_options(buffer));
- lyxerr << "Calling " << command << endl;
+ lyxerr[Debug::FILES] << "Calling " << command << endl;
if (buffer)
ShowMessage(buffer, _("Executing command:"), command);
Systemcalls::Starttype type = (dummy)
- ? Systemcalls::SystemDontWait : Systemcalls::System;
+ ? Systemcalls::DontWait : Systemcalls::Wait;
Systemcalls one;
int res;
- if (it->original_dir && buffer) {
- Path p(buffer->filepath);
+ if (conv.original_dir && buffer) {
+ Path p(buffer->filePath());
res = one.startscript(type, command);
} else
res = one.startscript(type, command);
- if (!it->parselog.empty()) {
+ if (!conv.parselog.empty()) {
string const logfile = infile2 + ".log";
- string const command2 = it->parselog +
+ string const command2 = conv.parselog +
" < " + QuoteName(infile2 + ".out") +
" > " + QuoteName(logfile);
- one.startscript(Systemcalls::System, command2);
+ one.startscript(Systemcalls::Wait, command2);
if (!scanLog(buffer, command, logfile))
return false;
}
if (res) {
- if (it->to->name == "program")
- WriteAlert(_("There were errors during the Build process."),
+ if (conv.to == "program")
+ Alert::alert(_("There were errors during the Build process."),
_("You should try to fix them."));
else
- WriteAlert(_("Can not convert file"),
+ Alert::alert(_("Cannot convert file"),
"Error while executing",
command.substr(0, 50));
return false;
}
}
- if (it->to->dummy())
+ Converter const & conv = converterlist_[edgepath.back()];
+ if (conv.To->dummy())
return true;
- if (!it->result_dir.empty()) {
- to_file = AddName(subst(it->result_dir,
- "$$BaseName", to_base),
- subst(it->result_file,
- "$$BaseName", OnlyFilename(to_base)));
+ if (!conv.result_dir.empty()) {
+ to_file = AddName(subst(conv.result_dir, token_base, to_base),
+ subst(conv.result_file,
+ token_base, 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);
+ string from = subst(conv.result_dir,
+ token_base, from_base);
+ string to = subst(conv.result_dir,
+ token_base, to_base);
if (!lyx::rename(from, to)) {
- WriteAlert(_("Error while trying to move directory:"),
+ Alert::alert(_("Error while trying to move directory:"),
from, ("to ") + to);
return false;
}
}
- } else if (outfile != to_file) {
- bool moved = (it->latex)
- ? lyx::copy(outfile, to_file)
- : lyx::rename(outfile, to_file);
- if (!moved) {
- WriteAlert(_("Error while trying to move file:"),
- outfile, _("to ") + to_file);
- return false;
- }
- }
+ return true;
+ } else
+ return move(outfile, to_file, conv.latex);
+}
+
+// If from = /path/file.ext and to = /path2/file2.ext2 then this method
+// moves each /path/file*.ext file to /path2/file2*.ext2'
+bool Converters::move(string const & from, string const & to, bool copy)
+{
+ if (from == to)
+ return true;
- return true;
+ bool no_errors = true;
+ string const path = OnlyPath(from);
+ string const base = OnlyFilename(ChangeExtension(from, ""));
+ string const to_base = ChangeExtension(to, "");
+ string const to_extension = GetExtension(to);
+
+ vector<string> files = DirList(OnlyPath(from), GetExtension(from));
+ for (vector<string>::const_iterator it = files.begin();
+ it != files.end(); ++it)
+ if (prefixIs(*it, base)) {
+ string from2 = path + *it;
+ string to2 = to_base + it->substr(base.length());
+ to2 = ChangeExtension(to2, to_extension);
+ lyxerr[Debug::FILES] << "moving " << from2
+ << " to " << to2 << endl;
+ bool moved = (copy)
+ ? lyx::copy(from2, to2)
+ : lyx::rename(from2, to2);
+ if (!moved && no_errors) {
+ Alert::alert(_("Error while trying to move file:"),
+ from2, _("to ") + to2);
+ no_errors = false;
+ }
+ }
+ return no_errors;
}
-bool Converter::Convert(Buffer const * buffer,
+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 & using_format)
+ string const & from_format, string const & to_format)
{
string to_file;
- return Convert(buffer, from_file, to_file_base, from_format, to_format,
- using_format, to_file);
+ return convert(buffer, from_file, to_file_base, from_format, to_format,
+ to_file);
+}
+
+
+void Converters::buildGraph()
+{
+ vertices_ = vector<Vertex>(formats.size());
+ visited_.resize(formats.size());
+
+ for (ConverterList::iterator it = converterlist_.begin();
+ it != converterlist_.end(); ++it) {
+ int const s = formats.getNumber(it->from);
+ int const t = formats.getNumber(it->to);
+ vertices_[t].in_vertices.push_back(s);
+ vertices_[s].out_vertices.push_back(t);
+ vertices_[s].out_edges.push_back(it - converterlist_.begin());
+ }
}
-string const Converter::SplitFormat(string const & str, string & format)
+bool Converters::formatIsUsed(string const & format)
{
- string const using_format = split(str, format, ':');
- if (format.empty())
- format = "dvi";
- return using_format;
+ ConverterList::const_iterator cit = converterlist_.begin();
+ ConverterList::const_iterator end = converterlist_.end();
+ for (; cit != end; ++cit) {
+ if (cit->from == format || cit->to == format)
+ return true;
+ }
+ return false;
}
-bool Converter::scanLog(Buffer const * buffer, string const & command,
+bool Converters::scanLog(Buffer const * buffer, string const & command,
string const & filename)
{
if (!buffer)
BufferView * bv = buffer->getUser();
bool need_redraw = false;
if (bv) {
- ProhibitInput(bv);
+ bv->owner()->prohibitInput();
// Remove all error insets
need_redraw = bv->removeAutoInsets();
}
}
if (need_redraw) {
bv->redraw();
- bv->fitCursor(bv->text);
+ bv->fitCursor();
}
- AllowInput(bv);
+ bv->owner()->allowInput();
}
if ((result & LaTeX::ERRORS)) {
}
string head;
split(command, head, ' ');
- WriteAlert(_("There were errors during running of ") + head,
+ Alert::alert(_("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);
+ Alert::alert(_("Resulting file is empty"), s, t);
return false;
}
return true;
}
-bool Converter::runLaTeX(Buffer const * buffer, string const & command)
+bool Converters::runLaTeX(Buffer const * buffer, string const & command)
{
if (!buffer)
return false;
bool need_redraw = false;
if (bv) {
- ProhibitInput(bv);
- bv->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));
+ bv->owner()->prohibitInput();
+ bv->owner()->message(_("Running LaTeX..."));
// Remove all error insets
need_redraw = bv->removeAutoInsets();
}
// do the LaTex run(s)
TeXErrors terr;
- LaTeX latex(command, name, buffer->filepath);
+ LaTeX latex(command, name, buffer->filePath());
int result = latex.run(terr,
- bv ? bv->owner()->getMiniBuffer() : 0);
+ bv ? bv->owner()->getLyXFunc() : 0);
if (bv) {
// error insets after we ran LaTeX this must be run:
if (need_redraw) {
bv->redraw();
- bv->fitCursor(bv->text);
+ bv->fitCursor();
}
}
// check return value from latex.run().
if ((result & LaTeX::NO_LOGFILE)) {
- WriteAlert(_("LaTeX did not work!"),
+ Alert::alert(_("LaTeX did not work!"),
_("Missing log file:"), name);
} else if ((result & LaTeX::ERRORS)) {
int num_errors = latex.getNumErrors();
s += _(" errors detected.");
t = _("You should try to fix them.");
}
- WriteAlert(_("There were errors during the LaTeX run."),
+ Alert::alert(_("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);
+ Alert::alert(_("Resulting file is empty"), s, t);
}
if (bv)
- AllowInput(bv);
+ bv->owner()->allowInput();
int const ERROR_MASK =
LaTeX::NO_LOGFILE |
}
-string const Converter::dvi_papersize(Buffer const * buffer)
+string const Converters::papersize(Buffer const * buffer)
{
char real_papersize = buffer->params.papersize;
if (real_papersize == BufferParams::PAPER_DEFAULT)
return "legal";
case BufferParams::PAPER_USLETTER:
default:
- return "us";
+ return "letter";
}
}
-string const Converter::dvips_options(Buffer const * buffer)
+string const Converters::dvips_options(Buffer const * buffer)
{
string result;
if (!buffer)
result += ' ' + buffer->params.paperwidth;
result += ',' + buffer->params.paperheight;
} else {
- string paper_option = dvi_papersize(buffer);
- if (paper_option == "us")
- paper_option = "letter";
+ 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
result += ' ' + paper_option;
}
}
- if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
+ if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE &&
+ buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM)
result += ' ' + lyxrc.print_landscape_flag;
return result;
}
-void Converter::init()
+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";
+ }
-vector<Command> const Converter::GetAllCommands()
-{
- vector<Command> result;
- for (vector<Command>::iterator it = commands.begin();
- it != commands.end(); ++it)
- result.push_back(*it);
return result;
}
+vector<Converters::Vertex> Converters::vertices_;
+
+
/// The global instance
Formats formats;
+Converters converters;
-// The global copy of the system lyxrc entries (everything except preferences)
+// The global copy after reading lyxrc.defaults
Formats system_formats;
+Converters system_converters;
projects / lyx.git / blobdiff