Fix bug 2029 (RtL space width)

[lyx.git] / src / text.C

diff --git a/src/text.C b/src/text.C
index 95e8dccc9d5b4de611058517c535b78790cc6b5d..ddd41bbe46c1fc24c78dca944228eb34393d63fc 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -152,10 +152,8 @@ int numberOfHfills(Paragraph const & par, Row const & row)
 
 
 void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
-       string const & token, LyXFont & font)
+       string const & token, LyXFont & font, Change & change)
 {
-       static Change change;
-
        BufferParams const & bp = buf.params();
 
        if (token[0] != '\\') {
@@ -346,10 +344,11 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
        lex.nextToken();
        string token = lex.getString();
        LyXFont font;
+       Change change;
 
        while (lex.isOK()) {
 
-               readParToken(buf, par, lex, token, font);
+               readParToken(buf, par, lex, token, font, change);
 
                lex.nextToken();
                token = lex.getString();
@@ -592,14 +591,12 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
                   && !isFirstInSequence(pit, pars_)))
            && align == LYX_ALIGN_BLOCK
            && !par.params().noindent()
+           // in some insets, paragraphs are never indented
+           && !(par.inInset() && par.inInset()->neverIndent())
            // display style insets are always centered, omit indentation
            && !(!par.empty()
                    && par.isInset(pos)
                    && par.getInset(pos)->display())
-           // in charstyles, tabulars and ert paragraphs are never indented!
-           && ((par.ownerCode() != InsetBase::TEXT_CODE || isMainText())
-                   && par.ownerCode() != InsetBase::ERT_CODE
-                   && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
            && (par.layout() != tclass.defaultLayout()
                || bv()->buffer()->params().paragraph_separation ==
                   BufferParams::PARSEP_INDENT))
@@ -1898,12 +1895,13 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const
                X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
        }
 
-       if (!above && !below && &par1.getRow(beg.pos(), end.boundary())
+       if (!above && !below && &par1.getRow(beg.pos(), beg.boundary())
            == &par2.getRow(end.pos(), end.boundary()))
        {
                // paint only one rectangle
-               pi.pain.fillRectangle(x + x1, y1, X2 - x1, y2 - y1,
-                                     LColor::selection);
+               int const b( !isRTL(par1) ? x + x1 : x + X1 );
+               int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 );
+               pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection);
                return;
        }
 
@@ -1988,8 +1986,6 @@ void LyXText::write(Buffer const & buf, std::ostream & os) const
 
 bool LyXText::read(Buffer const & buf, LyXLex & lex)
 {
-       static Change current_change;
-
        Paragraph::depth_type depth = 0;
 
        while (lex.isOK()) {
@@ -2129,7 +2125,10 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
        
        // see correction above
        if (boundary_correction)
-               x += singleWidth(par, ppos);
+               if (getFont(par, ppos).isRightToLeft())
+                       x -= singleWidth(par, ppos);
+               else
+                       x += singleWidth(par, ppos);
 
        return int(x);
 }