X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.h;h=0f507af1ac66fde8c46f878cb98d21dff8b7f0d2;hb=98c966c64594611e469313314abd1e59524adb4a;hp=fc84a7550d4af08f3ded1d9fbab8d6209a321935;hpb=7ec7c9da44662529e8a0ad4d60836df43a059ecd;p=lyx.git

diff --git a/src/converter.h b/src/converter.h
index fc84a7550d..0f507af1ac 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -16,54 +16,146 @@
 #pragma interface
 #endif
 
-#include <map>
 #include <vector>
+#include <queue>
 #include "LString.h"
+#include "support/lstrings.h"
 
 class Buffer;
 
 ///
 class Format {
 public:
-	///
-	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) {};
+		name_(n), extension_(e), prettyname_(p), shortcut_(s),
+		viewer_(v) {};
 	///
-	string name;
+	bool dummy() const;
 	///
-	string extension;
+	bool isChildFormat() const;
 	///
-	string prettyname;
+	string const parentFormat() const;
 	///
-	string shortcut;
+	string const & name() const {
+		return name_;
+	}
 	///
-	string viewer;
+	string const & extension() const {
+		return extension_;
+	}
 	///
-	bool dummy() const;
+	string const & prettyname() const {
+		return prettyname_;
+	}
+	///
+	string const & shortcut() const {
+		return shortcut_;
+	}
 	///
-	string const getname() const {
-		return name;
+	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)
+{
+	return compare_no_case(a.prettyname(), b.prettyname()) < 0;
+}
+
+
 ///
-struct Command {
+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;
 	///
-	Command(Format const * f, Format const * t, string const & c)
-		: from(f), to(t), command(c), importer(false), 
+	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;
+};
+
+///////////////////////////////////////////////////////////////////////
+
+///
+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) {}
 	///
-	Format const * from;
+	void readFlags();
+	///
+	string from;
 	///
-	Format const * to;
+	string to;
 	///
 	string command;
-	/// The converter is used for importing
-	bool importer;
+	///
+	string flags;
+	///
+	Format const * From;
+	///
+	Format const * To;
+
 	/// The converter is latex or its derivatives
 	bool latex;
 	/// Do we need to run the converter in the original directory?
@@ -78,118 +170,108 @@ struct Command {
 	string result_file;
 	/// Command to convert the program output to a LaTeX log file format
 	string parselog;
-	/// Backends in which the converter is not used
-	std::vector<string> disable;
-
-	/// Used by the BFS algorithm
-	bool visited;
-	/// Used by the BFS algorithm
-	std::vector<Command>::iterator previous;
 };
 
-class FormatPair {
-public:
-	///
-	Format const * format;
-	///
-	Format const * from;
-	///
-	string command;
-	///
-	FormatPair(Format const * f1, Format const * f2, string c)
-		: format(f1), from(f2), command(c) {}
-};
 
 ///
-class Formats {
+class Converters {
 public:
-        ///
-        typedef std::map<string, Format> FormatList;
-	///
-	void Add(string const & name);
+	typedef std::vector<Converter> ConverterList;
 	///
-	void Add(string const & name, string const & extension, 
-		 string const & prettyname, string const & shortcut);
+	typedef ConverterList::const_iterator const_iterator;
 	///
-	void SetViewer(string const & name, string const & command);
+	typedef std::vector<int> EdgePath;
 	///
-	bool View(Buffer const * buffer, string const & filename,
-		  string const & format_name);
+	Converter const & get(int i) const {
+		return converterlist_[i];
+	}
 	///
-	Format * GetFormat(string const & name);
+	Converter const * getConverter(string const & from, string const & to);
 	///
-	string const PrettyName(string const & name);
+	int getNumber(string const & from, string const & to);
 	///
-	string const Extension(string const & name);
+	void add(string const & from, string const & to,
+		 string const & command, string const & flags);
+	//
+	void erase(string const & from, string const & to);
 	///
-	std::vector<Format> const GetAllFormats() const;
-private:
+	void sort();
 	///
-	FormatList formats;
-};
-
-///
-class Converter {
-public:
+	std::vector<Format const *> const
+	getReachableTo(string const & target, bool clear_visited);
 	///
-	static
-	void Add(string const & from, string const & to,
-		 string const & command, string const & flags);
+	std::vector<Format const *> const
+	getReachable(string const & from, bool only_viewable,
+		     bool clear_visited);
 	///
-	static
-	std::vector<FormatPair> const GetReachableTo(string const & target);
+	bool isReachable(string const & from, string const & to);
 	///
-	static
-	std::vector<FormatPair> const
-	GetReachable(string const & from, bool only_viewable);
+	EdgePath const getPath(string const & from, string const & to);
 	///
-	static
-	bool IsReachable(string const & from, string const & to);
+	bool usePdflatex(EdgePath const & path);
 	///
-	static
-	bool Convert(Buffer const * buffer,
+	bool 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);
+		     string & to_file);
 	///
-	static
-	bool Convert(Buffer const * buffer,
+	bool 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());
+		     string const & from_format, string const & to_format);
 	///
-	static
-	string const SplitFormat(string const & str, string & format);
+	string const papersize(Buffer const * buffer);
 	///
-	static
-	string const dvi_papersize(Buffer const * buffer);
-	///
-	static
 	string const dvips_options(Buffer const * buffer);
 	///
-	static
-	void init();
+	string const dvipdfm_options(Buffer const * buffer);
 	///
-	static
-	std::vector<Command> const GetAllCommands();
+	void update(Formats const & formats);
+	///
+	void updateLast(Formats const & formats);
+	///
+	void buildGraph();
+	///
+	bool formatIsUsed(string const & format);
+	///
+	const_iterator begin() const {
+		return converterlist_.begin();
+	}
+	const_iterator end() const {
+		return converterlist_.end();
+	}
 private:
 	///
-	static
-	bool scanLog(Buffer const * buffer, string const & command, 
+	bool scanLog(Buffer const * buffer, string const & command,
 		     string const & filename);
 	///
-	static
 	bool runLaTeX(Buffer const * buffer, string const & command);
 	///
-	static
-	std::vector<Command> commands;
+	ConverterList converterlist_;
+	///
+	string latex_command_;
+	///
+	struct Vertex {
+		std::vector<int> in_vertices;
+		std::vector<int> out_vertices;
+		std::vector<int> out_edges;
+	};
 	///
 	static
-	string latex_command;
+	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);
 };
 
 extern Formats formats;
-extern Formats system_formats;
+extern Converters converters;
 
+extern Formats system_formats;
+extern Converters system_converters;
 
 #endif