X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCiteEnginesList.h;h=ad703325c61161a431f999c1d8d2080f599b0a74;hb=dab71087cf2954b77d3d2c0e67b868f9be82fba9;hp=f1fc04b442b9edf0f739a17981b906b1934ddaeb;hpb=ff93aea509686ed32ef15bd74244de067c4fbd9e;p=lyx.git

diff --git a/src/CiteEnginesList.h b/src/CiteEnginesList.h
index f1fc04b442..ad703325c6 100644
--- a/src/CiteEnginesList.h
+++ b/src/CiteEnginesList.h
@@ -22,8 +22,7 @@ namespace lyx {
 
 /**
  *  This class represents a particular LyX "cite engine", which defines the features
- * of a particular citation backend such as natbib or biblatex. In that sense, it is more like
- *  a LaTeX package, where a layout file corresponds to a LaTeX class.
+ *  of a particular citation backend such as natbib or biblatex.
  *
  *  In general, a given cite engine can be used with any document class. That said,
  *  one cite engine may `require' another, or it may `exclude' some other cite engine.
@@ -51,11 +50,10 @@ public:
 	///
 	LyXCiteEngine(std::string const & name, std::string const & id,
 		      std::vector<std::string> const & enginetypes,
+		      std::string const & cfm,
 		      std::vector<std::string> const & defaultbiblios,
 		      std::string const & description,
-		      std::vector<std::string> const & packagelist,
-		      std::vector<std::string> const & requires,
-		      std::vector<std::string> const & excludes);
+		      std::vector<std::string> const & packagelist);
 	/// whether the required packages are available
 	bool isAvailable() const;
 	/// the missing prerequisites, if any
@@ -67,6 +65,8 @@ public:
 	///
 	std::string const & getFilename() const { return filename_; }
 	///
+	std::string const & getCiteFramework() const { return cite_framework_; }
+	///
 	std::vector<std::string> const & getEngineType() const { return engine_types_; }
 	///
 	bool hasEngineType(CiteEngineType const &) const;
@@ -80,18 +80,7 @@ public:
 	std::vector<std::string> const & getPackageList() const
 		{ return package_list_; }
 	///
-	std::vector<std::string> const & getRequiredEngines() const
-		{ return required_engines_; }
-	/// Engines this one excludes: the list should be treated disjunctively
-	std::vector<std::string> const & getExcludedEngines() const
-		{ return excluded_engines_; }
-	/// \return true if the engine is compatible with this one, i.e.,
-	/// it does not exclude us and we do not exclude it.
-	/// this will also return true if cename is unknown and we do not
-	/// exclude it, since in that case we cannot check its exclusions.
-	bool isCompatible(std::string const & cename) const;
-	///
-	static bool areCompatible(std::string const & eng1, std::string const & eng2);
+	bool required(std::string const p) const;
 private:
 	/// what appears in the ui
 	std::string name_;
@@ -102,18 +91,16 @@ private:
 	std::string filename_;
 	/// the engine type(s)
 	std::vector<std::string> engine_types_;
+	/// cite framework (bibtex, biblatex)
+	std::string cite_framework_;
 	/// default bibliography styles
 	std::vector<std::string> default_biblios_;
 	/// a short description for use in the ui
 	std::string description_;
 	/// the LaTeX packages on which this depends, if any
 	std::vector<std::string> package_list_;
-	/// Engines this one requires: at least one
-	std::vector<std::string> required_engines_;
-	/// Engines this one excludes: none of these
-	std::vector<std::string> excluded_engines_;
 	// these are mutable because they are used to cache the results
-	// or an otherwise const operation.
+	// of an otherwise const operation.
 	///
 	mutable bool checked_;
 	///
@@ -160,13 +147,13 @@ public:
 	void operator=(CiteEnginesList const &);
 	/// add an engine to the list
 	void addCiteEngine(std::string const &, std::string const &,
-		std::vector<std::string> const &, std::vector<std::string> const &,
-		std::string const &, std::vector<std::string> const &,
-		std::vector<std::string> const &, std::vector<std::string> const &);
+		std::vector<std::string> const &, std::string const &,
+		std::vector<std::string> const &, std::string const &,
+		std::vector<std::string> const &);
 	///
 	std::vector<LyXCiteEngine> englist_;
 };
 
 extern CiteEnginesList theCiteEnginesList;
-}
+} // namespace lyx
 #endif