* do not ignore "requires" field in MathMacro

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index c49673cf4ca9a57b250d3018cc3170a955cb08c0..2589298f17018f648bbdbf4805566bb8263311fa 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -24,11 +24,11 @@
 #include "FuncRequest.h"
 #include "Language.h"
 #include "lfuns.h"
-#include "LyXFont.h"
+#include "Font.h"
 #include "LyXFunc.h" // only for setMessage()
 #include "LyXRC.h"
 #include "Row.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParIterator.h"
@@ -1233,8 +1233,8 @@ Encoding const * Cursor::getEncoding() const
                if (operator[](s).text())
                        break;
        CursorSlice const & sl = operator[](s);
-       LyXText const & text = *sl.text();
-       LyXFont font = text.getPar(sl.pit()).getFont(
+       Text const & text = *sl.text();
+       Font font = text.getPar(sl.pit()).getFont(
                bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
        return font.language()->encoding();
 }
@@ -1264,7 +1264,7 @@ void Cursor::noUpdate()
 }
 
 
-LyXFont Cursor::getFont() const
+Font Cursor::getFont() const
 {
        // HACK. far from being perfect...
        int s = 0;
@@ -1274,8 +1274,8 @@ LyXFont Cursor::getFont() const
                if (operator[](s).text())
                        break;
        CursorSlice const & sl = operator[](s);
-       LyXText const & text = *sl.text();
-       LyXFont font = text.getPar(sl.pit()).getFont(
+       Text const & text = *sl.text();
+       Font font = text.getPar(sl.pit()).getFont(
                bv().buffer()->params(),
                sl.pos(),
                outerFont(sl.pit(), text.paragraphs()));
@@ -1329,7 +1329,7 @@ void Cursor::fixIfBroken()
 
 bool Cursor::isRTL() const
 {
-       return top().paragraph().isRightToLeftPar(bv().buffer()->params());
+       return innerParagraph().isRightToLeftPar(bv().buffer()->params());
 }