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

diff --git a/src/converter.h b/src/converter.h
index 8556952a6c..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,24 +16,148 @@
 #pragma interface
 #endif
 
-#include <map>
 #include <vector>
+#include <queue>
 #include "LString.h"
+#include "support/lstrings.h"
 
 class Buffer;
 
 ///
-struct Command {
+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)
+{
+	return compare_no_case(a.prettyname(), b.prettyname()) < 0;
+}
+
+
+///
+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;
+};
+
+///////////////////////////////////////////////////////////////////////
+
+///
+class Converter {
+public:
 	///
-	Command(string const & f, string const & t, string const & c)
-		: from(f), to(t), command(c),
-		  original_dir(false), need_aux(false) {}
+	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) {}
+	///
+	void readFlags();
 	///
 	string from;
 	///
 	string to;
 	///
 	string command;
+	///
+	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?
 	bool original_dir;
 	/// This converter needs the .aux files
@@ -44,88 +168,110 @@ struct Command {
 	/// If the converter put the result in a directory, then result_file
 	/// is the name of the main file in that directory
 	string result_file;
-	///
-	bool visited;
-	///
-	std::vector<Command>::iterator previous;
+	/// Command to convert the program output to a LaTeX log file format
+	string parselog;
 };
 
+
 ///
-class Format {
+class Converters {
 public:
+	typedef std::vector<Converter> ConverterList;
 	///
-	Format() : in_degree(0) {}
+	typedef ConverterList::const_iterator const_iterator;
 	///
-	Format(string const & n);
+	typedef std::vector<int> EdgePath;
 	///
-	string name;
+	Converter const & get(int i) const {
+		return converterlist_[i];
+	}
 	///
-	string prettyname;
+	Converter const * getConverter(string const & from, string const & to);
 	///
-	string viewer;
+	int getNumber(string const & from, string const & to);
 	///
-	int in_degree;
-};
-
-///
-class Formats {
-public:
+	void add(string const & from, string const & to,
+		 string const & command, string const & flags);
+	//
+	void erase(string const & from, string const & to);
 	///
-	static
-	void Add(string const & name);
+	void sort();
 	///
-	static
-	void SetViewer(string const & name, string const & command);
+	std::vector<Format const *> const
+	getReachableTo(string const & target, bool clear_visited);
 	///
-	static
-	bool View(Buffer * buffer, string const & filename);
+	std::vector<Format const *> const
+	getReachable(string const & from, bool only_viewable,
+		     bool clear_visited);
 	///
-	static
-	Format * GetFormat(string const & name);
+	bool isReachable(string const & from, string const & to);
 	///
-	static
-	string const PrettyName(string const & name);
-private:
+	EdgePath const getPath(string const & from, string const & to);
 	///
-	static
-	std::map<string, Format> formats;
-};
-
-///
-class Converter {
-public:
+	bool usePdflatex(EdgePath const & path);
 	///
-	static
-	void Add(string const & from, string const & to,
-		 string const & command, string const & flags);
+	bool convert(Buffer const * buffer,
+		     string const & from_file, string const & to_file_base,
+		     string const & from_format, string const & to_format,
+		     string & to_file);
 	///
-	static
-	std::vector<std::pair<string, string> > const
-	GetReachable(string const & from,
-		     bool only_viewable = false);
+	bool convert(Buffer const * buffer,
+		     string const & from_file, string const & to_file_base,
+		     string const & from_format, string const & to_format);
 	///
-	static
-	bool Convert(Buffer * buffer, string const & from_file,
-		     string const & to_file, string const & using_format,
-		     string * view_file = 0);
-	static
-	string const SplitFormat(string const & str, string & format);
+	string const papersize(Buffer const * buffer);
 	///
-	static
-	string dvi_papersize(Buffer * buffer);
+	string const dvips_options(Buffer const * buffer);
 	///
-	static
-	string dvips_options(Buffer * buffer);
+	string const dvipdfm_options(Buffer const * buffer);
+	///
+	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 runLaTeX(Buffer * buffer, string const & command);
+	bool scanLog(Buffer const * buffer, string const & command,
+		     string const & filename);
 	///
-	static
-	std::vector<Command> commands;
+	bool runLaTeX(Buffer const * buffer, string const & command);
+	///
+	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 Converters converters;
+
+extern Formats system_formats;
+extern Converters system_converters;
+
 #endif