From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Sat, 4 Nov 2006 14:55:15 +0000 (+0000)
Subject: Preparation for the nomencl inset: Add {} in InsetCommand rather than
X-Git-Tag: 1.6.10~12043
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dfee51741786227ddbf25263f9a5203864c2be44;p=features.git

Preparation for the nomencl inset: Add {} in InsetCommand rather than
InsetHFill. This is possible because InsetHFill is the only inset so
far without parameters.

	* src/insets/insetcommandparams.C
	(InsetCommandParams::getCommand): Add {} to commands without
	parameters.

	* src/insets/insethfill.[Ch]
	(InsetHFill::latex): Remove


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15736 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/insetcommandparams.C b/src/insets/insetcommandparams.C
index ab61de201c..8c7805db85 100644
--- a/src/insets/insetcommandparams.C
+++ b/src/insets/insetcommandparams.C
@@ -307,6 +307,10 @@ docstring const InsetCommandParams::getCommand() const
 		} else
 			s += '{' + params_[i] + '}';
 	}
+	if (info_->n == 0)
+		// Make sure that following stuff does not change the
+		// command name.
+		s += "{}";
 	return s;
 }
 
diff --git a/src/insets/insethfill.C b/src/insets/insethfill.C
index 20d179a485..25146edb54 100644
--- a/src/insets/insethfill.C
+++ b/src/insets/insethfill.C
@@ -47,14 +47,6 @@ docstring const InsetHFill::getScreenLabel(Buffer const &) const
 }
 
 
-int InsetHFill::latex(Buffer const &, odocstream & os,
-		      OutputParams const &) const
-{
-	os << getCommand() << "{}";
-	return 0;
-}
-
-
 int InsetHFill::plaintext(Buffer const &, odocstream & os,
 		      OutputParams const &) const
 {
diff --git a/src/insets/insethfill.h b/src/insets/insethfill.h
index dfd44cea5c..3bfa98ffc3 100644
--- a/src/insets/insethfill.h
+++ b/src/insets/insethfill.h
@@ -29,9 +29,6 @@ public:
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::HFILL_CODE; }
 	///
-	int latex(Buffer const &, odocstream &,
-		  OutputParams const &) const;
-	///
 	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const & runparams) const;
 	///