* 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.
*/
#include "MathStream.h"
#include "MathSupport.h"
-#include "debug.h"
+#include "support/debug.h"
+#include "support/lassert.h"
namespace lyx {
-using std::endl;
-using std::size_t;
+
+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_);
+}
-MathMacroArgument::MathMacroArgument(size_t n)
+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) {
- lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
- << n << endl;
+ LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: "
+ << n);
+ LASSERT(false, n = 1);
}
// The profiler tells us not to use
// 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;
}
}
-void MathMacroArgument::setNumber(std::size_t n)
+void MathMacroArgument::setNumber(int n)
{
if (n < 1 || n > 9) {
- lyxerr << "MathMacroArgument::setNumber: wrong Argument id: "
- << n << endl;
+ LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n);
+ LASSERT(false, return);
}
number_ = 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_ << "] ";