Fix bug 886 and others not reported related with the document paper size.

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 8408af2041399e6a2c1a960f7d155e02b4261535..4af5de3635253578a15bdc3e17f1481d8e6dbfbd 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -660,7 +660,6 @@ bool LyXText::setCursor(LCursor & cur, pit_type par, pos_type pos,
 {
        LCursor old = cur;
        setCursorIntern(cur, par, pos, setfont, boundary);
-       cur.boundary(boundary);
        return deleteEmptyParagraphMechanism(cur, old);
 }
 
@@ -693,6 +692,7 @@ void LyXText::setCursor(CursorSlice & cur, pit_type par,
 void LyXText::setCursorIntern(LCursor & cur,
        pit_type par, pos_type pos, bool setfont, bool boundary)
 {
+       cur.boundary(boundary);
        setCursor(cur.top(), par, pos, boundary);
        cur.setTargetX();
        if (setfont)
@@ -843,6 +843,7 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
                        tmpx += singleWidth(par, end - 1);
                c = end - 1;
        }
+
        // Air gap above display inset:
        if (row.pos() < end && c >= end && end < par.size()
            && par.isInset(end) && par.getInset(end)->display()) {
@@ -859,6 +860,11 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
         if (end == par.size())
                 return c - row.pos();
 
+       if (c && !par.isSeparator(c-1)) {
+               boundary = true;
+               return c - row.pos();
+       }
+
         return min(c - row.pos(), end - 1 - row.pos());
 }
 
@@ -994,7 +1000,7 @@ bool LyXText::cursorLeft(LCursor & cur)
 
 bool LyXText::cursorRight(LCursor & cur)
 {
-       if (false && cur.boundary()) {
+       if (cur.boundary()) {
                return setCursor(cur, cur.pit(), cur.pos(), true, false);
        }
 
@@ -1018,9 +1024,14 @@ bool LyXText::cursorRight(LCursor & cur)
 bool LyXText::cursorUp(LCursor & cur)
 {
        Paragraph const & par = cur.paragraph();
-       int const row = par.pos2row(cur.pos());
+       int row;
        int const x = cur.targetX();
 
+       if (cur.pos() && cur.boundary())
+               row = par.pos2row(cur.pos()-1);
+       else
+               row = par.pos2row(cur.pos());
+
        if (!cur.selection()) {
                int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
                LCursor old = cur;
@@ -1057,9 +1068,14 @@ bool LyXText::cursorUp(LCursor & cur)
 bool LyXText::cursorDown(LCursor & cur)
 {
        Paragraph const & par = cur.paragraph();
-       int const row = par.pos2row(cur.pos());
+       int row;
        int const x = cur.targetX();
 
+       if (cur.pos() && cur.boundary())
+               row = par.pos2row(cur.pos()-1);
+       else
+               row = par.pos2row(cur.pos());
+
        if (!cur.selection()) {
                int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
                LCursor old = cur;