Angus Leeming wrote:
> Alfredo Braunstein wrote:
>
> Why is the Converter c-tor inline?
No idea. I've changed it. The same for Format.
> Do you need to #include "format.h" in
> converter.h? Can you not forward declare class Format?
Actually, this will force #including "format.h" in outside code which use
the formats object, because the extern declaration of the global object
formats is in it.
I would leave this one as is for now, if it's ok with you. (I promess to do
it soon)
>
> I would take papersize out of class Format, but still have its
> definition/declaration in format.[Ch].
>
Done.
Attached is the result.
Thanks,
Alfredo
/**
* \file format.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
*
* Full author contact details are available in file CREDITS
*/
#include "format.h"
#include "lyxrc.h"
#include "debug.h"
#include "lyx_cb.h" // for ShowMessage() ... to be removed?
#include "gettext.h"
#include "LString.h"
#include "frontends/Alert.h" //to be removed?
#include "support/filetools.h"
#include "support/path.h"
#include "support/systemcall.h"
#include "support/lyxfunctional.h"
//where to put this?
string const token_from("$$i");
string const token_path("$$p");
bool operator<(Format const & a, Format const & b)
{
// use the compare_ascii_no_case instead of compare_no_case,
// because in turkish, 'i' is not the lowercase version of 'I',
// and thus turkish locale breaks parsing of tags.
return compare_ascii_no_case(a.prettyname(), b.prettyname()) < 0;
}
Format::Format(string const & n, string const & e, string const & p,
string const & s, string const & v): name_(n),
extension_(e),
prettyname_(p),
shortcut_(s),
viewer_(v)
{};
bool Format::dummy() const
{
return extension().empty();
}
bool Format::isChildFormat() const
{
if (name_.empty())
return false;
return isdigit(name_[name_.length() - 1]);
}
string const Format::parentFormat() const
{
return name_.substr(0, name_.length() - 1);
}
// 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());
}
// FIXME: horrednously mis-named, especially given the other ::add
// function
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);
}
}
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::sort()
{
cout << "here" << endl;
std::sort(formatlist.begin(), formatlist.end());
cout << "and here " << formatlist.size() << endl;
}
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) const
{
if (filename.empty())
return false;
Format const * format = getFormat(format_name);
if (format && format->viewer().empty() &&
format->isChildFormat())
format = getFormat(format->parentFormat());
if (!format || format->viewer().empty()) {
#if USE_BOOST_FORMAT
Alert::alert(_("Cannot view file"),
boost::io::str(boost::format(_("No information for viewing %1$s"))
% prettyName(format_name)));
#else
Alert::alert(_("Cannot view file"),
_("No information for viewing ")
+ prettyName(format_name));
#endif
return false;
}
string command = format->viewer();
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
command += ' ' + lyxrc.view_dvi_paper_option;
string paper_size = papersize(buffer);
if (paper_size == "letter")
paper_size = "us";
command += ' ' + paper_size;
if (buffer->params.orientation
== BufferParams::ORIENTATION_LANDSCAPE)
command += 'r';
}
if (!contains(command, token_from))
command += ' ' + token_from;
command = subst(command, token_from,
QuoteName(OnlyFilename(filename)));
command = subst(command, token_path, QuoteName(OnlyPath(filename)));
lyxerr[Debug::FILES] << "Executing command: " << command << endl;
ShowMessage(buffer, _("Executing command:"), command);
Path p(OnlyPath(filename));
Systemcall one;
int const res = one.startscript(Systemcall::DontWait, command);
if (res) {
Alert::alert(_("Cannot view file"),
_("Error while executing"),
command.substr(0, 50));
return false;
}
return true;
}
string const Formats::prettyName(string const & name) const
{
Format const * format = getFormat(name);
if (format)
return format->prettyname();
else
return name;
}
string const Formats::extension(string const & name) const
{
Format const * format = getFormat(name);
if (format)
return format->extension();
else
return name;
}
string const 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 "letter";
}
}
Formats formats;
Formats system_formats;
// -*- C++ -*-
#ifndef FORMAT_H
#define FORMAT_H
/**
* \file format.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
*
* Full author contact details are available in file CREDITS
*/
#include "buffer.h"
#include "LString.h"
#include "support/lstrings.h"
#include <vector>
string const papersize(Buffer const * buffer) ;
class Format {
public:
///
Format(string const & n, string const & e, string const & p,
string const & s, string const & v);
///
bool dummy() const;
///
bool isChildFormat() const;
///
string const parentFormat() const;
///
string const & name() const {
return name_;
}
///
string const & extension() const {
return extension_;
}
///
string const & prettyname() const {
return prettyname_;
}
///
string const & shortcut() const {
return shortcut_;
}
///
string const & viewer() const {
return viewer_;
}
///
void setViewer(string const & v) {
viewer_ = v;
}
private:
string name_;
///
string extension_;
///
string prettyname_;
///
string shortcut_;
///
string viewer_;
};
bool operator<(Format const & a, Format const & b);
///
class Formats {
public:
///
typedef std::vector<Format> FormatList;
///
typedef FormatList::const_iterator const_iterator;
///
Format const & get(FormatList::size_type i) const {
return formatlist[i];
}
///
Format const * getFormat(string const & name) const;
///
int getNumber(string const & name) const;
///
void add(string const & name);
///
void add(string const & name, string const & extension,
string const & prettyname, string const & shortcut);
///
void erase(string const & name);
///
void sort();
///
void setViewer(string const & name, string const & command);
///
bool view(Buffer const * buffer, string const & filename,
string const & format_name) const;
///
string const prettyName(string const & name) const;
///
string const extension(string const & name) const;
///
const_iterator begin() const {
return formatlist.begin();
}
///
const_iterator end() const {
return formatlist.end();
}
///
FormatList::size_type size() const {
return formatlist.size();
}
private:
///
FormatList formatlist;
};
extern Formats formats;
extern Formats system_formats;
#endif //FORMAT_H
/**
* \file graph.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
*
* Full author contact details are available in file CREDITS
*/
#include "graph.h"
#include <queue>
int Graph::bfs_init(int s, bool clear_visited)
{
if (s < 0)
return s;
Q_ = std::queue<int>();
if (clear_visited)
fill(visited_.begin(), visited_.end(), false);
if (visited_[s] == false) {
Q_.push(s);
visited_[s] = true;
}
return s;
}
vector<int> const
Graph::getReachableTo(int target, bool clear_visited)
{
vector<int> result;
int const s = bfs_init(target, clear_visited);
if (s < 0)
return result;
while (!Q_.empty()) {
int const i = Q_.front();
Q_.pop();
if (i != s || formats.get(target).name() != "lyx") {
result.push_back(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<int> const
Graph::getReachable(int from, bool only_viewable,
bool clear_visited)
{
vector<int> result;
if (bfs_init(from, clear_visited) < 0)
return result;
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(i);
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 result;
}
bool Graph::isReachable(int from, int to)
{
if (from == to)
return true;
int const s = bfs_init(from);
if (s < 0 || to < 0)
return false;
while (!Q_.empty()) {
int const i = Q_.front();
Q_.pop();
if (i == to)
return 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;
}
Graph::EdgePath const
Graph::getPath(int from, int t)
{
EdgePath path;
if (from == t)
return path;
int const s = bfs_init(from);
if (s < 0 || t < 0)
return path;
vector<int> prev_edge(formats.size());
vector<int> prev_vertex(formats.size());
bool found = false;
while (!Q_.empty()) {
int const i = Q_.front();
Q_.pop();
if (i == t) {
found = true;
break;
}
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;
while (t != s) {
path.push_back(prev_edge[t]);
t = prev_vertex[t];
}
reverse(path.begin(), path.end());
return path;
}
void Graph::init(int size)
{
vertices_ = vector<Vertex>(size);
visited_.resize(size);
numedges_ = 0;
}
void Graph::addEdge(int s, int t)
{
vertices_[t].in_vertices.push_back(s);
vertices_[s].out_vertices.push_back(t);
vertices_[s].out_edges.push_back(numedges_++);
}
vector<Graph::Vertex> Graph::vertices_;
// -*- C++ -*-
#ifndef GRAPH_H
#define GRAPH_H
/**
* \file graph.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
*
* Full author contact details are available in file CREDITS
*/
#include "format.h"
#include "LString.h"
#include <queue>
#include <vector>
class Graph {
public:
Graph() : numedges_(0) {};
///
typedef std::vector<int> EdgePath;
///
std::vector<int> const
getReachableTo(int, bool clear_visited);
///
std::vector<int> const
getReachable(int, bool only_viewable,
bool clear_visited);
///
bool isReachable(int, int);
///
EdgePath const getPath(int, int);
///
void addEdge(int s, int t);
///
void init(int size);
private:
///
int bfs_init(int, bool clear_visited = true);
///
struct Vertex {
std::vector<int> in_vertices;
std::vector<int> out_vertices;
std::vector<int> out_edges;
};
///
static
std::vector<Vertex> vertices_;
///
std::vector<bool> visited_;
///
std::queue<int> Q_;
int numedges_;
};
#endif //GRAPH_H
Index: converter.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/converter.C,v
retrieving revision 1.64
diff -u -r1.64 converter.C
--- converter.C 2003/02/14 14:49:48 1.64
+++ converter.C 2003/02/27 12:57:39
@@ -1,16 +1,18 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file converter.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Dekel Tsur
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * 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"
@@ -37,12 +39,8 @@
#endif
using std::vector;
-using std::queue;
using std::endl;
-using std::fill;
using std::find_if;
-using std::reverse;
-using std::sort;
namespace {
@@ -50,10 +48,9 @@
string const token_base("$$b");
string const token_to("$$o");
string const token_path("$$p");
+
-//////////////////////////////////////////////////////////////////////////////
-inline
string const add_options(string const & command, string const & options)
{
string head;
@@ -63,189 +60,13 @@
} // namespace anon
-//////////////////////////////////////////////////////////////////////////////
-
-bool Format::dummy() const
-{
- return extension().empty();
-}
-
-
-bool Format::isChildFormat() const
-{
- if (name_.empty())
- return false;
- return isdigit(name_[name_.length() - 1]);
-}
-
-
-string const Format::parentFormat() const
-{
- return name_.substr(0, name_.length() - 1);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-// 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());
-}
-
-
-// FIXME: horrednously mis-named, especially given the other ::add
-// function
-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);
- }
-}
-
-
-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::sort()
-{
- std::sort(formatlist.begin(), formatlist.end());
-}
-
-
-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);
-}
+Converter::Converter(string const & f, string const & t, string const & c,
+ string const & l): from(f), to(t), command(c), flags(l),
+ From(0), To(0), latex(false),
+ original_dir(false), need_aux(false)
+{}
-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() &&
- format->isChildFormat())
- format = getFormat(format->parentFormat());
- if (!format || format->viewer().empty()) {
-#if USE_BOOST_FORMAT
- Alert::alert(_("Cannot view file"),
- boost::io::str(boost::format(_("No information for viewing %1$s"))
- % prettyName(format_name)));
-#else
- Alert::alert(_("Cannot view file"),
- _("No information for viewing ")
- + prettyName(format_name));
-#endif
- return false;
- }
-
- string command = format->viewer();
-
- if (format_name == "dvi" &&
- !lyxrc.view_dvi_paper_option.empty()) {
- 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)
- command += 'r';
- }
-
- if (!contains(command, token_from))
- command += ' ' + token_from;
-
- command = subst(command, token_from,
- QuoteName(OnlyFilename(filename)));
- command = subst(command, token_path, QuoteName(OnlyPath(filename)));
-
- lyxerr[Debug::FILES] << "Executing command: " << command << endl;
- ShowMessage(buffer, _("Executing command:"), command);
-
- Path p(OnlyPath(filename));
- Systemcall one;
- int const res = one.startscript(Systemcall::DontWait, command);
-
- if (res) {
- Alert::alert(_("Cannot view file"),
- _("Error while executing"),
- command.substr(0, 50));
- return false;
- }
- return true;
-}
-
-
-string const Formats::prettyName(string const & name) const
-{
- Format const * format = getFormat(name);
- if (format)
- return format->prettyname();
- else
- return name;
-}
-
-
-string const Formats::extension(string const & name) const
-{
- Format const * format = getFormat(name);
- if (format)
- return format->extension();
- else
- return name;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
void Converter::readFlags()
{
string flag_list(flags);
@@ -287,8 +108,8 @@
else
return i < 0;
}
+
-//////////////////////////////////////////////////////////////////////////////
class compare_Converter {
public:
@@ -303,6 +124,7 @@
};
+
Converter const * Converters::getConverter(string const & from,
string const & to)
{
@@ -406,173 +228,10 @@
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()) {
- 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<Format const *> const
-Converters::getReachable(string const & from, bool only_viewable,
- bool clear_visited)
-{
- vector<Format const *> result;
-
- if (bfs_init(from, clear_visited) < 0)
- return result;
-
- 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);
- }
- }
-
- return result;
-}
-
-
-bool Converters::isReachable(string const & from, string const & to)
-{
- if (from == to)
- return true;
-
- 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;
-
- 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;
-}
-
-
-Converters::EdgePath const
-Converters::getPath(string const & from, string const & to)
-{
- EdgePath path;
- if (from == to)
- return path;
-
- int const s = bfs_init(from);
- int t = formats.getNumber(to);
- if (s < 0 || t < 0)
- return path;
-
- vector<int> prev_edge(formats.size());
- vector<int> prev_vertex(formats.size());
-
- bool found = false;
- while (!Q_.empty()) {
- int const i = Q_.front();
- Q_.pop();
- if (i == t) {
- found = true;
- break;
- }
-
- 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;
-
- 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)
+bool Converters::usePdflatex(Graph::EdgePath const & path)
{
- for (EdgePath::const_iterator cit = path.begin();
+ for (Graph::EdgePath::const_iterator cit = path.begin();
cit != path.end(); ++cit) {
Converter const & conv = converterlist_[*cit];
if (conv.latex)
@@ -593,7 +252,7 @@
if (from_format == to_format)
return move(from_file, to_file, false);
- EdgePath edgepath = getPath(from_format, to_format);
+ Graph::EdgePath edgepath = getPath(from_format, to_format);
if (edgepath.empty()) {
return false;
}
@@ -606,7 +265,7 @@
string to_base = ChangeExtension(to_file, "");
string infile;
string outfile = from_file;
- for (EdgePath::const_iterator cit = edgepath.begin();
+ for (Graph::EdgePath::const_iterator cit = edgepath.begin();
cit != edgepath.end(); ++cit) {
Converter const & conv = converterlist_[*cit];
bool dummy = conv.To->dummy() && conv.to != "program";
@@ -794,22 +453,6 @@
}
-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());
- }
-}
-
-
bool Converters::formatIsUsed(string const & format)
{
ConverterList::const_iterator cit = converterlist_.begin();
@@ -947,32 +590,6 @@
}
-string const Converters::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 "letter";
- }
-}
-
-
string const Converters::dvips_options(Buffer const * buffer)
{
string result;
@@ -1023,14 +640,68 @@
return result;
}
+void Converters::buildGraph()
+{
+ G_.init(formats.size());
+ ConverterList::iterator beg = converterlist_.begin();
+ ConverterList::iterator end = converterlist_.end();
+ for (ConverterList::iterator it = beg; it != end ; ++it) {
+ int const s = formats.getNumber(it->from);
+ int const t = formats.getNumber(it->to);
+ G_.addEdge(s,t);
+ }
+}
+
+vector<Format const *> const
+Converters::intToFormat(std::vector<int> const & input)
+{
+ vector<Format const *> result(input.size());
+
+ vector<int>::const_iterator it = input.begin();
+ vector<int>::const_iterator end = input.end();
+ vector<Format const *>::iterator rit = result.begin();
+ for ( ; it != end; ++it, ++rit) {
+ *rit = &formats.get(*it);
+ }
+ return result;
+}
+
+vector<Format const *> const
+Converters::getReachableTo(string const & target, bool clear_visited)
+{
+ vector<int> const & reachablesto =
+ G_.getReachableTo(formats.getNumber(target), clear_visited);
-vector<Converters::Vertex> Converters::vertices_;
+ return intToFormat(reachablesto);
+}
+vector<Format const *> const
+Converters::getReachable(string const & from, bool only_viewable,
+ bool clear_visited)
+{
+ vector<int> const & reachables =
+ G_.getReachable(formats.getNumber(from),
+ only_viewable,
+ clear_visited);
+
+ 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)
+{
+ return G_.getPath(formats.getNumber(from),
+ formats.getNumber(to));
+}
/// The global instance
-Formats formats;
Converters converters;
// The global copy after reading lyxrc.defaults
-Formats system_formats;
Converters system_converters;
Index: converter.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/converter.h,v
retrieving revision 1.24
diff -u -r1.24 converter.h
--- converter.h 2003/02/13 16:52:27 1.24
+++ converter.h 2003/02/27 12:57:39
@@ -1,146 +1,31 @@
// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
#ifndef CONVERTER_H
#define CONVERTER_H
-#include <vector>
-#include <queue>
-#include "LString.h"
-#include "support/lstrings.h"
-
-class Buffer;
-
-///
-class Format {
-public:
- ///
- Format(string const & n, string const & e, string const & p,
- string const & s, string const & v) :
- name_(n), extension_(e), prettyname_(p), shortcut_(s),
- viewer_(v) {};
- ///
- bool dummy() const;
- ///
- bool isChildFormat() const;
- ///
- string const parentFormat() const;
- ///
- string const & name() const {
- return name_;
- }
- ///
- string const & extension() const {
- return extension_;
- }
- ///
- string const & prettyname() const {
- return prettyname_;
- }
- ///
- string const & shortcut() const {
- return shortcut_;
- }
- ///
- string const & viewer() const {
- return viewer_;
- }
- ///
- void setViewer(string const & v) {
- viewer_ = v;
- }
-private:
- string name_;
- ///
- string extension_;
- ///
- string prettyname_;
- ///
- string shortcut_;
- ///
- string viewer_;
-};
-
-
-inline
-bool operator<(Format const & a, Format const & b)
-{
- // use the compare_ascii_no_case instead of compare_no_case,
- // because in turkish, 'i' is not the lowercase version of 'I',
- // and thus turkish locale breaks parsing of tags.
-
- return compare_ascii_no_case(a.prettyname(), b.prettyname()) < 0;
-}
+/**
+ * \file converter.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Dekel Tsur
+ *
+ * Full author contact details are available in file CREDITS
+ */
+#include "format.h"
+#include "graph.h"
-///
-class Formats {
-public:
- ///
- typedef std::vector<Format> FormatList;
- ///
- typedef FormatList::const_iterator const_iterator;
- ///
- Format const & get(FormatList::size_type i) const {
- return formatlist[i];
- }
- ///
- Format const * getFormat(string const & name) const;
- ///
- int getNumber(string const & name) const;
- ///
- void add(string const & name);
- ///
- void add(string const & name, string const & extension,
- string const & prettyname, string const & shortcut);
- ///
- void erase(string const & name);
- ///
- void sort();
- ///
- void setViewer(string const & name, string const & command);
- ///
- bool view(Buffer const * buffer, string const & filename,
- string const & format_name) const;
- ///
- string const prettyName(string const & name) const;
- ///
- string const extension(string const & name) const;
- ///
- const_iterator begin() const {
- return formatlist.begin();
- }
- ///
- const_iterator end() const {
- return formatlist.end();
- }
- ///
- FormatList::size_type size() const {
- return formatlist.size();
- }
-private:
- ///
- FormatList formatlist;
-};
+#include <vector>
-///////////////////////////////////////////////////////////////////////
+class Buffer;
///
class Converter {
public:
///
Converter(string const & f, string const & t, string const & c,
- string const & l)
- : from(f), to(t), command(c), flags(l), From(0), To(0),
- latex(false), original_dir(false), need_aux(false) {}
+ string const & l);
///
void readFlags();
///
@@ -176,12 +61,13 @@
///
class Converters {
public:
+ ///
+ typedef std::vector<int> EdgePath; // to be removed SOON
+ ///
typedef std::vector<Converter> ConverterList;
///
typedef ConverterList::const_iterator const_iterator;
///
- typedef std::vector<int> EdgePath;
- ///
Converter const & get(int i) const {
return converterlist_[i];
}
@@ -206,9 +92,9 @@
///
bool isReachable(string const & from, string const & to);
///
- EdgePath const getPath(string const & from, string const & to);
+ Graph::EdgePath const getPath(string const & from, string const & to);
///
- bool usePdflatex(EdgePath const & path);
+ bool usePdflatex(Graph::EdgePath const & path);
///
bool convert(Buffer const * buffer,
string const & from_file, string const & to_file_base,
@@ -219,8 +105,6 @@
string const & from_file, string const & to_file_base,
string const & from_format, string const & to_format);
///
- string const papersize(Buffer const * buffer);
- ///
string const dvips_options(Buffer const * buffer);
///
string const dvipdfm_options(Buffer const * buffer);
@@ -229,8 +113,6 @@
///
void updateLast(Formats const & formats);
///
- void buildGraph();
- ///
bool formatIsUsed(string const & format);
///
const_iterator begin() const {
@@ -239,8 +121,13 @@
const_iterator end() const {
return converterlist_.end();
}
+ ///
+ void buildGraph();
private:
///
+ std::vector<Format const *> const
+ Converters::intToFormat(std::vector<int> const & input);
+ ///
bool scanLog(Buffer const * buffer, string const & command,
string const & filename);
///
@@ -250,28 +137,13 @@
///
string latex_command_;
///
- struct Vertex {
- std::vector<int> in_vertices;
- std::vector<int> out_vertices;
- std::vector<int> out_edges;
- };
- ///
- static
- std::vector<Vertex> vertices_;
- ///
- std::vector<bool> visited_;
- ///
- std::queue<int> Q_;
- ///
- int bfs_init(string const & start, bool clear_visited = true);
- ///
bool move(string const & from, string const & to, bool copy);
+ ///
+ Graph G_;
};
-extern Formats formats;
extern Converters converters;
-extern Formats system_formats;
extern Converters system_converters;
-#endif
+#endif //CONVERTER_H
Index: Makefile.am
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/Makefile.am,v
retrieving revision 1.154
diff -u -r1.154 Makefile.am
--- Makefile.am 2003/02/26 17:04:06 1.154
+++ Makefile.am 2003/02/27 12:57:39
@@ -223,7 +223,11 @@
version.C \
version.h \
vspace.C \
- vspace.h
+ vspace.h \
+ graph.C \
+ graph.h \
+ format.C \
+ format.h
lyx_main.o: lyx_main.C lyx_main.h config.h version.h \
lyxrc.h support/path.h support/filetools.h \
Index: ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/ChangeLog,v
retrieving revision 1.1053
diff -u -r1.1053 ChangeLog
--- ChangeLog 2003/02/26 19:28:37 1.1053
+++ ChangeLog 2003/02/27 12:57:51
@@ -1,3 +1,9 @@
+2003-02-26 Alfredo Braunstein <[EMAIL PROTECTED]>
+
+ * converter.[Ch]: split into itself plus...
+ * format.[Ch]: ... this ...
+ * graph.[Ch]: ... and this
+
2003-02-26 Angus Leeming <[EMAIL PROTECTED]>
* BufferView_pimpl.C (dispatch): callapse the various LFUN_XYZ_APPLY
