X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetListingsParams.h;h=7388acd3c42554fca8218400f573e7b42da265b0;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=56a70d7fc83b263fc33c65173c967c88e2eeb7c8;hpb=a42d3e670b8b2d1c33cbbc146c8473bb4c001c60;p=lyx.git

diff --git a/src/insets/InsetListingsParams.h b/src/insets/InsetListingsParams.h
index 56a70d7fc8..7388acd3c4 100644
--- a/src/insets/InsetListingsParams.h
+++ b/src/insets/InsetListingsParams.h
@@ -12,10 +12,9 @@
 #ifndef INSETLISTINGSPARAMS_H
 #define INSETLISTINGSPARAMS_H
 
-#include <vector>
-#include <exception>
-#include "Lexer.h"
-#include "InsetCollapsable.h"
+#include "InsetCaptionable.h"
+
+#include <map>
 
 namespace lyx {
 
@@ -35,14 +34,16 @@ public:
 	void read(Lexer &);
 
 	/// valid parameter string
-	std::string params() const { return params_; }
-	
-	/// add key=value to params_
-	void addParam(std::string const & key, std::string const & value);
+	std::string params(std::string const & sep=",") const;
+
+	/// add key=value to params_. key_=value will be used if key=value already exists
+	/// unless replace=true.
+	void addParam(std::string const & key, std::string const & value, 
+			bool replace = false);
 
 	/// add a few parameters
 	void addParams(std::string const & par);
-	
+
 	/// set params_ with par, throw an exception if par is valid
 	void setParams(std::string const & par);
 
@@ -57,9 +58,12 @@ public:
 	/// get parameter from encoded string
 	void fromEncodedString(std::string const & par);
 
-	/// 
+	///
 	bool isInline() const { return inline_; }
 
+	///
+	bool isFloat() const;
+
 	///
 	InsetCollapsable::CollapseStatus status() const { return status_; }
 
@@ -71,39 +75,29 @@ public:
 
 	///
 	void clear() { params_.clear(); }
+	
+	/// validate parameter, return an error message
+	docstring validate() const;
 
 private:
 	/// inline or normal listings
 	bool inline_;
 
-	/// listing parameters, this will always be a *valid* string
-	/// that can be passed to listing packages.
-	std::string params_;
+	/// Do we have a param with the given \c key?
+	bool hasParam(std::string const & key) const;
+	/// return the value for the given \c key, if avaible, else empty string
+	std::string getValue(std::string const & key) const;
 
-	/// keys defined in params_ 
-	std::vector<std::string> keys_;
+	/// key-value pairs of the parameters
+	// Use a vector of pairs in order to maintain the order of insertion.
+	typedef std::vector<std::pair<std::string, std::string> > keyValuePair;
+	keyValuePair params_;
 
 	/// collapsable status
 	InsetCollapsable::CollapseStatus status_;
 };
 
 
-class invalidParam : public std::exception {
-public:
-	invalidParam(std::string const & details) :
-		details_(details)
-	{}
-
-	virtual const char * what() const throw() {
-		return details_.c_str();
-	}
-
-	virtual ~invalidParam() throw() {}
-private:
-	std::string const details_;
-};
-
-
 } // namespace lyx
 
 #endif