Somewhat better behaviour for Umlauts in math

[lyx.git] / src / mathed / math_cursor.h

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index b15fef5dc7812bb82f264b7eb0683d199d2e881d..c518bc44194add29326c2e9ce2428e3667b7dc7a 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -124,8 +124,10 @@ public:
        bool toggleLimits();
        /// interpret name a name of a macro
        void macroModeClose();
-       ///
+       /// are we currently typing the name of a macro?
        bool inMacroMode() const;
+       /// are we currently typing '#1' or '#2' or...?
+       bool inMacroArgMode() const;
        
        // Local selection methods
        ///
@@ -160,8 +162,8 @@ public:
        void breakLine();
        /// read contents of line into an array
        void readLine(MathArray & ar) const;
-       ///
-       MathTextCodes getLastCode() const;
+       /// remove this as soon as LyXFunc::getStatus is "localized"
+       MathTextCodes getLastCode() const { return lastcode_; }
        ///
        void pullArg(bool goright);
        ///
@@ -182,7 +184,7 @@ public:
        row_type gridRow() const;
 
        /// make sure cursor position is valid
-       void normalize() const;
+       void normalize();
        ///
        UpdatableInset * asHyperActiveInset() const;
 
@@ -229,12 +231,18 @@ public:
        /// reference to the last item of the path, i.e. "The Cursor"
        MathCursorPos const & cursor() const;
 
+       /// describe the situation
+       string info() const;
        /// dump selection information for debugging
        void seldump(char const * str) const;
        /// dump selection information for debugging
        void dump(char const * str) const;
        ///
        void stripFromLastEqualSign();
+       /// moves on 
+       void setSelection(cursor_type const & where, size_type n);
+       ///
+       void insert(char);
 
        ///
        friend class Selection;
@@ -256,7 +264,7 @@ private:
        ///
        string macroName() const;
        ///
-       int macroNamePos() const;
+       MathInset::difference_type macroNamePos() const;
        ///
        void insert(char, MathTextCodes t);
        /// can we enter the inset?