X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommandParams.cpp;h=f1804a29d9cefb8762b56064b5b86a08d86c0944;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=5ac876a43824a58cf7cc8081dfc724944a965107;hpb=2f4d0ae27ed43f639c75ad8b42abcfe920604eeb;p=lyx.git

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 5ac876a438..f1804a29d9 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -5,6 +5,7 @@
  *
  * \author Angus Leeming
  * \author Georg Baum
+ * \author Richard Heck
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,26 +14,84 @@
 
 #include "InsetCommandParams.h"
 
-#include "debug.h"
-#include "gettext.h"
+#include "InsetBibitem.h"
+#include "InsetBibtex.h"
+#include "InsetCitation.h"
+#include "InsetFloatList.h"
+#include "InsetHFill.h"
+#include "InsetHyperlink.h"
+#include "InsetInclude.h"
+#include "InsetIndex.h"
+#include "InsetLabel.h"
+#include "InsetNomencl.h"
+#include "InsetRef.h"
+#include "InsetTOC.h"
+
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/docstream.h"
 
 #include <boost/assert.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::findToken;
+ParamInfo::ParamData::ParamData(std::string const & s, bool b) :
+	name_(s), optional_(b)
+{}
+
+
+bool ParamInfo::ParamData::operator==(ParamInfo::ParamData const & rhs) const
+{
+	return name() == rhs.name() && isOptional() == rhs.isOptional();
+}
+
 
-using std::string;
-using std::endl;
-using std::ostream;
+bool ParamInfo::hasParam(std::string const & name) const
+{
+	const_iterator it = begin();
+	for (; it != end(); ++it) {
+		if (it->name() == name)
+			return true;
+	}
+	return false;
+}
 
-using support::ExceptionMessage;
-using support::WarningException;
+
+void ParamInfo::add(std::string const & name, bool opt)
+{ 
+	info_.push_back(ParamData(name, opt)); 
+}
+
+
+bool ParamInfo::operator==(ParamInfo const & rhs) const
+{
+	// the idea here is to check each ParamData for equality
+	const_iterator itL  = begin();
+	const_iterator itR  = rhs.begin();
+	const_iterator endL = end();
+	const_iterator endR = rhs.end();
+	while (true) {
+		// if they both end together, return true
+		if (itL == endL && itR == endR)
+				return true;
+		// but if one ends before the other, return false
+		if (itL == endL || itR == endR)
+			return false;
+		//check this one for equality
+		if (*itL != *itR)
+			return false;
+		// equal, so check the next one
+		++itL;
+		++itR;
+	}
+}
 
 
 InsetCommandParams::InsetCommandParams(InsetCode code)
@@ -40,8 +99,6 @@ InsetCommandParams::InsetCommandParams(InsetCode code)
 {
 	cmdName_ = getDefaultCmd(code);
 	info_ = findInfo(code, cmdName_);
-	BOOST_ASSERT(info_);
-	params_.resize(info_->n);
 }
 
 
@@ -50,179 +107,130 @@ InsetCommandParams::InsetCommandParams(InsetCode code,
 	: insetCode_(code), cmdName_(cmdName), preview_(false)
 {
 	info_ = findInfo(code, cmdName);
-	BOOST_ASSERT(info_);
-	params_.resize(info_->n);
 }
 
 
-//FIXME This should go into the Insets themselves...so they will tell
-//us what parameters they want.
-//Should this just vanish in favor of the two arg version, or is there
-//a reason to use it in some cases? What should happen in the single
-//arg case, then? Maybe use the default? or leave that up to the inset?
-InsetCommandParams::CommandInfo const *
-	InsetCommandParams::findInfo(InsetCode code)
+ParamInfo const & InsetCommandParams::findInfo(
+	InsetCode code, string const & cmdName)
 {
-	// No parameter may be named "preview", because that is a required
-	// flag for all commands.
-
 	switch (code) {
-	case BIBITEM_CODE: {
-		static const char * const paramnames[] = {"label", "key", ""};
-		static const bool isoptional[] = {true, false};
-		static const CommandInfo info = {2, paramnames, isoptional};
-		return &info;
-	}
-	case BIBTEX_CODE: {
-		static const char * const paramnames[] =
-				{"options", "btprint", "bibfiles", ""};
-		static const bool isoptional[] = {true, true, false};
-		static const CommandInfo info = {3, paramnames, isoptional};
-		return &info;
-	}
-	case CITE_CODE: {
-		// standard cite does only take one argument if jurabib is
-		// not used, but jurabib extends this to two arguments, so
-		// we have to allow both here. InsetCitation takes care that
-		// LaTeX output is nevertheless correct.
-		static const char * const paramnames[] =
-				{"after", "before", "key", ""};
-		static const bool isoptional[] = {true, true, false};
-		static const CommandInfo info = {3, paramnames, isoptional};
-		return &info;
-	}
-	case FLOAT_LIST_CODE: {
-		static const char * const paramnames[] = {"type", ""};
-		static const bool isoptional[] = {false};
-		static const CommandInfo info = {1, paramnames, isoptional};
-		return &info;
-	}
-	case HFILL_CODE: {
-		static const char * const paramnames[] = {""};
-		static const CommandInfo info = {0, paramnames, 0};
-		return &info;
-	}
-	case HYPERLINK_CODE: {
-		static const char * const paramnames[] =
-				{"name", "target", ""};
-		static const bool isoptional[] = {true, false};
-		static const CommandInfo info = {2, paramnames, isoptional};
-		return &info;
-	}
-	case INCLUDE_CODE: {
-		//This is only correct for the case of listings, but it'll do for now.
-		//In the other cases, this second parameter should just be empty.
-		static const char * const paramnames[] = {"filename", "lstparams", ""};
-		static const bool isoptional[] = {false, true};
-		static const CommandInfo info = {2, paramnames, isoptional};
-		return &info;
-	}
-	case INDEX_CODE: 
+	case BIBITEM_CODE:
+		return InsetBibitem::findInfo(cmdName);
+	case BIBTEX_CODE:
+		return InsetBibtex::findInfo(cmdName);
+	case CITE_CODE:
+		return InsetCitation::findInfo(cmdName);	
+	case FLOAT_LIST_CODE:
+		return InsetFloatList::findInfo(cmdName);
+	case HFILL_CODE:
+		return InsetHFill::findInfo(cmdName);
+	case HYPERLINK_CODE:
+		return InsetHyperlink::findInfo(cmdName);
+	case INCLUDE_CODE:
+		return InsetInclude::findInfo(cmdName);
 	case INDEX_PRINT_CODE:
-	case LABEL_CODE: {
-		static const char * const paramnames[] = {"name", ""};
-		static const bool isoptional[] = {false};
-		static const CommandInfo info = {1, paramnames, isoptional};
-		return &info;
-	}
-	case NOMENCL_CODE: {
-		static const char * const paramnames[] = {"prefix", "symbol", "description", ""};
-		static const bool isoptional[] = {true, false, false};
-		static const CommandInfo info = {3, paramnames, isoptional};
-		return &info;
-	}
-	case NOMENCL_PRINT_CODE: {
-		static const char * const paramnames[] = {"labelwidth", ""};
-		static const bool isoptional[] = {true};
-		static const CommandInfo info = {1, paramnames, isoptional};
-		return &info;
-	}
-	case REF_CODE: {
-		static const char * const paramnames[] =
-				{"name", "reference", ""};
-		static const bool isoptional[] = {true, false};
-		static const CommandInfo info = {2, paramnames, isoptional};
-		return &info;
-	}
-	case TOC_CODE: {
-		static const char * const paramnames[] = {"type", ""};
-		static const bool isoptional[] = {false};
-		static const CommandInfo info = {1, paramnames, isoptional};
-		return &info;
-	}
+		return InsetPrintIndex::findInfo(cmdName);
+	case LABEL_CODE:
+		return InsetLabel::findInfo(cmdName);	
+	case NOMENCL_CODE:
+		return InsetNomencl::findInfo(cmdName);
+	case NOMENCL_PRINT_CODE:
+		return InsetPrintNomencl::findInfo(cmdName);
+	case REF_CODE:
+		return InsetRef::findInfo(cmdName);
+	case TOC_CODE:
+		return InsetTOC::findInfo(cmdName);
 	default:
 		BOOST_ASSERT(false);
 	}
-	return 0;
+	static const ParamInfo pi;
+	return pi; // to silence the warning
 }
 
 
-//FIXME Will eventually call a static method, etc.
-InsetCommandParams::CommandInfo const *
-		InsetCommandParams::findInfo(InsetCode code,
-		                             std::string const &/* cmdName*/)
-{
-	return findInfo(code);
+string InsetCommandParams::getDefaultCmd(InsetCode code) {
+	switch (code) {
+		case BIBITEM_CODE: 
+			return InsetBibitem::defaultCommand();
+		case BIBTEX_CODE:
+			return InsetBibtex::defaultCommand();
+		case CITE_CODE:
+			return InsetCitation::defaultCommand();
+		case FLOAT_LIST_CODE:
+			return InsetFloatList::defaultCommand();
+		case HFILL_CODE:
+			return InsetHFill::defaultCommand();
+		case HYPERLINK_CODE:
+			return InsetHyperlink::defaultCommand();
+		case INCLUDE_CODE:
+			return InsetInclude::defaultCommand();
+		case INDEX_PRINT_CODE:
+			return InsetPrintIndex::defaultCommand();
+		case LABEL_CODE:
+			return InsetLabel::defaultCommand();
+		case NOMENCL_CODE:
+			return InsetNomencl::defaultCommand();
+		case NOMENCL_PRINT_CODE:
+			return InsetPrintNomencl::defaultCommand();
+		case REF_CODE:
+			return InsetRef::defaultCommand();
+		case TOC_CODE:
+			return InsetTOC::defaultCommand();
+		default:
+			BOOST_ASSERT(false);
+	}
+	return string(); // silence the warning
 }
 
 
-//FIXME Should call InsetBibitem::getDefaultCmd(), eg
-std::string InsetCommandParams::getDefaultCmd(InsetCode code) {
+bool InsetCommandParams::isCompatibleCommand(
+		InsetCode code, string const & s)
+{
 	switch (code) {
 		case BIBITEM_CODE: 
-			return "bibitem";
+			return InsetBibitem::isCompatibleCommand(s);
 		case BIBTEX_CODE:
-			return "bibtex"; //this is an unused dummy
+			return InsetBibtex::isCompatibleCommand(s);
 		case CITE_CODE:
-			return "cite";
+			return InsetCitation::isCompatibleCommand(s);
 		case FLOAT_LIST_CODE:
-			return "listoftables";
+			return InsetFloatList::isCompatibleCommand(s);
 		case HFILL_CODE:
-			return "hfill";
+			return InsetHFill::isCompatibleCommand(s);
 		case HYPERLINK_CODE:
-			return "href";
+			return InsetHyperlink::isCompatibleCommand(s);
 		case INCLUDE_CODE:
-			return "include";
-		case INDEX_CODE: 
-			return "index";
+			return InsetInclude::isCompatibleCommand(s);
 		case INDEX_PRINT_CODE:
-			return "printindex";
+			return InsetPrintIndex::isCompatibleCommand(s);
 		case LABEL_CODE:
-			return "label";
+			return InsetLabel::isCompatibleCommand(s);
 		case NOMENCL_CODE:
-			return "nomenclature";
+			return InsetNomencl::isCompatibleCommand(s);
 		case NOMENCL_PRINT_CODE:
-			return "printnomenclature";
+			return InsetPrintNomencl::isCompatibleCommand(s);
 		case REF_CODE:
-			return "ref";
+			return InsetRef::isCompatibleCommand(s);
 		case TOC_CODE:
-			return "tableofcontents";
+			return InsetTOC::isCompatibleCommand(s);
 		default:
 			BOOST_ASSERT(false);
 	}
-	return "";
+	return false; // silence the warning
 }
 
 
 void InsetCommandParams::setCmdName(string const & name)
 {
-	//FIXME Check command compatibility
-	cmdName_ = name;
-	CommandInfo const * const info = findInfo(insetCode_, cmdName_);
-	if (!info) {
-		lyxerr << "Command '" << name << "' is not compatible with a '" <<
-			insetType() << "' inset." << std::endl;
-		return;
+	if (!isCompatibleCommand(insetCode_, cmdName_)){
+		LYXERR0("InsetCommand: Incompatible command name " << 
+				name << ".");
+		throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
+		                       _("Incompatible command name."));
 	}
-	ParamVector params(info->n);
-	// Overtake parameters with the same name
-	for (size_t i = 0; i < info_->n; ++i) {
-		int j = findToken(info->paramnames, info_->paramnames[i]);
-		if (j >= 0)
-			params[j] = params_[i];
-	}
-	info_ = info;
-	std::swap(params, params_);
+
+	cmdName_ = name;
+	info_ = findInfo(insetCode_, cmdName_);
 }
 
 
@@ -233,9 +241,9 @@ void InsetCommandParams::read(Lexer & lex)
 		string const insetType = lex.getString();
 		InsetCode const code = insetCode(insetType);
 		if (code != insetCode_) {
-			lex.printError("InsetCommand: Attempt to change type of parameters.");
-			throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
-				from_utf8("Attempt to change type of parameters."));
+			lex.printError("InsetCommandParams: Attempt to change type of inset.");
+			throw ExceptionMessage(WarningException, _("InsetCommandParams Error: "),
+		                         _("Attempt to change type of parameters."));
 		}
 	}
 
@@ -243,25 +251,20 @@ void InsetCommandParams::read(Lexer & lex)
 		lex.next();
 		string const test = lex.getString();
 		if (test != "LatexCommand") {
-			lex.printError("InsetCommand: no LatexCommand line found.");
-			throw ExceptionMessage(WarningException, _("InsetCommand error:"),
-				from_utf8("Can't find LatexCommand line."));
+			lex.printError("InsetCommandParams: No LatexCommand line found.");
+			throw ExceptionMessage(WarningException, _("InsetCommandParams error:"),
+			                       _("Can't find LatexCommand line."));
 		}
 	}
 	lex.next();
 	cmdName_ = lex.getString();
-	//FIXME
-	//check that this command is ok with the inset...
-	//so that'll be some kind of static call, depending 
-	//upon what insetType_ is.
-	//it's possible that should go into InsetCommand.cpp,
-	//or maybe it's a standalone function.
-	info_ = findInfo(insetCode_, cmdName_);
-	if (!info_) {
-		lex.printError("InsetCommand: Unknown inset name `$$Token'");
-		throw ExceptionMessage(WarningException,
-			_("Unknown inset name: "), from_utf8(insetType()));
+	if (!isCompatibleCommand(insetCode_, cmdName_)){
+		lex.printError("InsetCommandParams: Incompatible command name " + cmdName_ + ".");
+		throw ExceptionMessage(WarningException, _("InsetCommandParams Error: "),
+		                       _("Incompatible command name."));
 	}
+
+	info_ = findInfo(insetCode_, cmdName_);
 	
 	string token;
 	while (lex.isOK()) {
@@ -274,14 +277,13 @@ void InsetCommandParams::read(Lexer & lex)
 			preview_ = lex.getBool();
 			continue;
 		}
-		int const i = findToken(info_->paramnames, token);
-		if (i >= 0) {
+		if (info_.hasParam(token)) {
 			lex.next(true);
-			params_[i] = lex.getDocString();
+			params_[token] = lex.getDocString();
 		} else {
 			lex.printError("Unknown parameter name `$$Token' for command " + cmdName_);
 			throw ExceptionMessage(WarningException,
-				_("Inset Command: ") + from_ascii(cmdName_),
+				_("InsetCommandParams: ") + from_ascii(cmdName_),
 				_("Unknown parameter name: ") + from_utf8(token));
 		}
 	}
@@ -301,12 +303,18 @@ void InsetCommandParams::write(ostream & os) const
 	os << "LatexCommand " << cmdName_ << '\n';
 	if (preview_)
 		os << "preview true\n";
-	for (size_t i = 0; i < info_->n; ++i)
-		if (!params_[i].empty())
+	ParamInfo::const_iterator it  = info_.begin();
+	ParamInfo::const_iterator end = info_.end();
+	for (; it != end; ++it) {
+		std::string const & name = it->name();
+		docstring const & data = (*this)[name];
+		if (!data.empty()) {
 			// FIXME UNICODE
-			os << info_->paramnames[i] << ' '
-			   << Lexer::quoteString(to_utf8(params_[i]))
+			os << name << ' '
+			   << Lexer::quoteString(to_utf8(data))
 			   << '\n';
+		}
+	}
 }
 
 
@@ -314,28 +322,36 @@ docstring const InsetCommandParams::getCommand() const
 {
 	docstring s = '\\' + from_ascii(cmdName_);
 	bool noparam = true;
-	for (size_t i = 0; i < info_->n; ++i) {
-		if (info_->optional[i]) {
-			if (params_[i].empty()) {
-				// We need to write this parameter even if
-				// it is empty if nonempty optional parameters
-				// follow before the next required parameter.
-				for (size_t j = i + 1; j < info_->n; ++j) {
-					if (!info_->optional[j])
-						break;
-					if (!params_[j].empty()) {
-						s += "[]";
-						noparam = false;
-						break;
-					}
-				}
-			} else {
-				s += '[' + params_[i] + ']';
+	ParamInfo::const_iterator it  = info_.begin();
+	ParamInfo::const_iterator end = info_.end();
+	for (; it != end; ++it) {
+		std::string const & name = it->name();
+		docstring const & data = (*this)[name];
+		if (!it->isOptional()) {
+			s += '{' + data + '}';
+			noparam = false;
+			continue;
+		}
+		if (!data.empty()) {
+			s += '[' + data + ']';
+			noparam = false;
+			continue;
+		}
+		// This param is therefore optional but empty.
+		// But we need to write it anyway if nonempty
+		// optional parameters follow before the next
+		// required parameter.
+		ParamInfo::const_iterator it2 = it;
+		for (++it2; it2 != end; ++it2) {
+			if (!it2->isOptional())
+				break;
+			std::string const & name2 = it2->name();
+			docstring const & data2 = (*this)[name2];
+			if (!data2.empty()) {
+				s += "[]";
 				noparam = false;
+				break;
 			}
-		} else {
-			s += '{' + params_[i] + '}';
-			noparam = false;
 		}
 	}
 	if (noparam)
@@ -346,36 +362,47 @@ docstring const InsetCommandParams::getCommand() const
 }
 
 
+namespace {
+	//predicate for what follows
+	bool paramIsNonOptional(ParamInfo::ParamData pi)
+	{
+		return !pi.isOptional();
+	}
+}
+
 docstring const InsetCommandParams::getFirstNonOptParam() const
 {
-	for (size_t i = 0; i < info_->n; ++i)
-		if (!info_->optional[i])
-			return params_[i];
-	BOOST_ASSERT(false);
-	return docstring();
+	ParamInfo::const_iterator it = 
+		find_if(info_.begin(), info_.end(), paramIsNonOptional);
+	if (it == info_.end())
+		BOOST_ASSERT(false);
+	return (*this)[it->name()];
 }
 
 
 docstring const & InsetCommandParams::operator[](string const & name) const
 {
-	int const i = findToken(info_->paramnames, name);
-	BOOST_ASSERT(i >= 0);
-	return params_[i];
+	static const docstring dummy; //so we don't return a ref to temporary
+	if (!info_.hasParam(name))
+		BOOST_ASSERT(false);
+	ParamMap::const_iterator data = params_.find(name);
+	if (data == params_.end() || data->second.empty())
+		return dummy;
+	return data->second;
 }
 
 
 docstring & InsetCommandParams::operator[](string const & name)
 {
-	int const i = findToken(info_->paramnames, name);
-	BOOST_ASSERT(i >= 0);
-	return params_[i];
+	if (!info_.hasParam(name))
+		BOOST_ASSERT(false);
+	return params_[name];
 }
 
 
 void InsetCommandParams::clear()
 {
-	for (size_t i = 0; i < info_->n; ++i)
-		params_[i].clear();
+	params_.clear();
 }