Separate 'cursor inside' and 'cursor behind' cases for statusline display.

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 5ebce3813378bbe04760b322b5d64650dc9bf070..b2197fd84e41a2f5037d25e32e58b87fb1c3c4a3 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,7 +1,8 @@
 2003-01-07  João Luis Meloni Assirati <assirati@fma.if.usp.br>
+
        * math_hullinset.C: fix numbering problem of AMS gather and
-       multline environments (bugs 518 and 594). Treat gather the same
-       way as eqnarray and multline as a special case.
+         multline environments. Treat gather the same
+         way as eqnarray and multline as a special case.
 
 2002-12-18  John Levon  <levon@movementarian.org>
 

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index f76e0618fbf1fdb865b8022bbd7e092e34c40d42..44b0136ce6075e99e6c4f33a7c6a8e5c961fbd8c 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -1288,8 +1288,7 @@ string MathCursor::info() const
                os << "  ";
        }
        if (hasPrevAtom())
-               if (prevAtom()->asSymbolInset() || prevAtom()->asScriptInset())
-                       prevAtom()->infoize(os);
+               prevAtom()->infoize2(os);
        os << "                    ";
        return STRCONV(os.str());
 }

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index 823faf515fb265cdefe3bb7acce46b8f853eac39..bae365ab860d4d135627568c6196fdbb456e4659 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -282,8 +282,10 @@ public:
        virtual void mathmlize(MathMLStream &) const;
        /// write content as something readable by Octave
        virtual void octavize(OctaveStream &) const;
-       /// describe content
+       /// describe content if cursor inside
        virtual void infoize(std::ostream &) const {}
+       /// describe content if cursor behind
+       virtual void infoize2(std::ostream &) const {}
        /// plain ascii output
        virtual int ascii(std::ostream & os, int) const;
        /// linuxdoc output

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 657deb39ba0cab35691141ba117ca684cc034999..7de25d1970bd87493c15e5fc490e326e5beb5ba5 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -223,3 +223,15 @@ void MathMacro::updateExpansion() const
        expand();
        expanded_.substitute(*this);
 }
+
+
+void MathMacro::infoize(std::ostream & os) const
+{
+       os << "Macro: " << name();
+}
+
+
+void MathMacro::infoize2(std::ostream & os) const
+{
+       os << "Macro: " << name();
+}

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index f32f30896bf082cb2030267c84e7c36a30db2291..f18fdecd2cb925a4371f486486556059f4de884f 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -70,6 +70,10 @@ public:
        void mathmlize(MathMLStream &) const;
        ///
        void octavize(OctaveStream &) const;
+       ///
+       void infoize(std::ostream &) const;
+       ///
+       void infoize2(std::ostream &) const;
 
 private:
        ///

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index f531e4e62657b096f5cbe81aefa8a943ac74d3a7..9482caded57ff5e8907c692cceadf7c8dc047cfb 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -472,6 +472,11 @@ void MathScriptInset::octavize(OctaveStream & os) const
 void MathScriptInset::infoize(std::ostream & os) const
 {
        os << "Scripts";
+}
+
+
+void MathScriptInset::infoize2(std::ostream & os) const
+{
        if (limits_)
                os << (limits_ == 1 ? ", Displayed limits" : ", Inlined limits");
 }

diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h
index 5c39f638a781aa8a63e4bdbed4c2e746f7173c50..18607d91325e38d550090cc5fa262343b9f066c6 100644 (file)
--- a/src/mathed/math_scriptinset.h
+++ b/src/mathed/math_scriptinset.h
@@ -89,8 +89,10 @@ public:
        void removeScript(bool up);
        /// make sure a script is accessible
        void ensure(bool up);
-       ///
+       /// say that we have scripts
        void infoize(std::ostream & os) const;
+       /// say whether we have displayed limits
+       void infoize2(std::ostream & os) const;
        /// local dispatcher
        result_type dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
 

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 71fc0ecf16eb562f77a2e426d3a758af8533562d..c317c89077f8dd2d0e7622fbab770829739344ed 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -192,7 +192,7 @@ void MathSymbolInset::write(WriteStream & os) const
 }
 
 
-void MathSymbolInset::infoize(std::ostream & os) const
+void MathSymbolInset::infoize2(std::ostream & os) const
 {
        os << "Symbol: " << name();
 }

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index 8f59fbcfe2f66b3194c445f21a251aa07a2dab08..2f13884b3436dbb49432fa92e9ba2f4756108fbd 100644 (file)
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -57,7 +57,7 @@ public:
        ///
        void write(WriteStream & os) const;
        ///
-       void infoize(std::ostream & os) const;
+       void infoize2(std::ostream & os) const;
 
 private:
        ///