X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroArgument.cpp;h=d3a16ff8d9af6ab88e87236d0bdac06a14b5d487;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=b7a0273266322c57b2da3e2ade0a697f02aafa57;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/MathMacroArgument.cpp
index b7a0273266..d3a16ff8d9 100644
--- a/src/mathed/MathMacroArgument.cpp
+++ b/src/mathed/MathMacroArgument.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,16 +15,50 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
-#include "debug.h"
+#include "support/debug.h"
+#include "support/lassert.h"
 
 
 namespace lyx {
 
-MathMacroArgument::MathMacroArgument(size_t n)
+
+Inset * InsetMathHash::clone() const
+{
+	return new InsetMathHash(*this);
+}
+
+
+void InsetMathHash::write(WriteStream & os) const
+{
+	os << str_;
+}
+
+
+void InsetMathHash::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+	metricsStrRedBlack(mi, dim, str_);
+}
+
+
+void InsetMathHash::draw(PainterInfo & pi, int x, int y) const
+{
+	drawStrRed(pi, x, y, str_);
+}
+
+
+void InsetMathHash::normalize(NormalStream & os) const
+{
+	os << "[hash " << str_ << "] ";
+}
+
+
+MathMacroArgument::MathMacroArgument(int n)
 	: number_(n)
 {
 	if (n < 1 || n > 9) {
-		LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: " << n);
+		LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: "
+		        << n);
+		LASSERT(false, n = 1);
 	}
 
 	// The profiler tells us not to use
@@ -32,7 +66,6 @@ MathMacroArgument::MathMacroArgument(size_t n)
 	// so we do the conversion of n to ASCII manually.
 	// This works because 1 <= n <= 9.
 	str_.resize(2);
-	str_[0] = '#';
 	str_[1] = '0' + n;
 }
 
@@ -43,10 +76,11 @@ Inset * MathMacroArgument::clone() const
 }
 
 
-void MathMacroArgument::setNumber(size_t n)
+void MathMacroArgument::setNumber(int n)
 {
 	if (n < 1 || n > 9) {
 		LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n);
+		LASSERT(false, return);
 	}
 
 	number_ = n;
@@ -54,25 +88,6 @@ void MathMacroArgument::setNumber(size_t n)
 }
 
 
-void MathMacroArgument::write(WriteStream & os) const
-{
-	os << str_;
-}
-
-
-void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-	mathed_string_dim(mi.base.font, str_, dim);
-}
-
-
-void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
-{
-	drawStrRed(pi, x, y, str_);
-	setPosCache(pi, x, y);
-}
-
-
 void MathMacroArgument::normalize(NormalStream & os) const
 {
 	os << "[macroarg " << str_ << "] ";