* TextMetrics: getDisplayFont() and isRTLBoundary() takes pit instead of Paragraph.

[features.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 111434b6c89bbf17559f9c54e65a820ff00803c8..f31e52fdabe56797dc04cdf14c4a290edc2b19cd 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -266,7 +266,7 @@ namespace {
 // bv functions are not yet available!
 Cursor::Cursor(BufferView & bv)
        : DocIterator(), bv_(&bv), anchor_(), x_target_(-1), textTargetOffset_(0),
-         selection_(false), mark_(false), logicalpos_(false)
+         selection_(false), mark_(false), logicalpos_(false), current_font(Font::ALL_INHERIT)
 {}
 
 
@@ -1213,7 +1213,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
                xo = targetX();
                
        // first get the current line
-       TextMetrics const & tm = bv_->textMetrics(text());
+       TextMetrics & tm = bv_->textMetrics(text());
        ParagraphMetrics const & pm = tm.parMetrics(pit());
        int row;
        if (pos() && boundary())
@@ -1237,9 +1237,9 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
                Cursor old = *this;
                // To next/previous row
                if (up)
-                       text()->editXY(*this, xo, yo - textRow().ascent() - 1);
+                       tm.editXY(*this, xo, yo - textRow().ascent() - 1);
                else
-                       text()->editXY(*this, xo, yo + textRow().descent() + 1);
+                       tm.editXY(*this, xo, yo + textRow().descent() + 1);
                clearSelection();
                
                // This happens when you move out of an inset.
@@ -1437,7 +1437,7 @@ void Cursor::noUpdate()
 
 Font Cursor::getFont() const
 {
-       // The logic here should more or less match to the Text::setCurrentFont
+       // The logic here should more or less match to the Cursor::setCurrentFont
        // logic, i.e. the cursor height should give a hint what will happen
        // if a character is entered.
        
@@ -1459,9 +1459,10 @@ Font Cursor::getFont() const
        
        // on space? Take the font before (only for RTL boundary stay)
        if (pos > 0) {
+               TextMetrics const & tm = bv().textMetrics(&text);
                if (pos == sl.lastpos()
-                               || (par.isSeparator(pos) &&
-                                               !text.isRTLBoundary(buffer(), par, pos)))
+                       || (par.isSeparator(pos) 
+                       && !tm.isRTLBoundary(sl.pit(), pos)))
                        --pos;
        }
        
@@ -1504,4 +1505,47 @@ bool notifyCursorLeaves(DocIterator const & old, Cursor & cur)
 }
 
 
+void Cursor::setCurrentFont()
+{
+       pos_type cpos = pos();
+       Paragraph & par = paragraph();
+       Text const & ctext = *text();
+       TextMetrics const & tm = bv().textMetrics(&ctext);
+
+       // are we behind previous char in fact? -> go to that char
+       if (cpos > 0 && boundary())
+               --cpos;
+
+       // find position to take the font from
+       if (cpos != 0) {
+               // paragraph end? -> font of last char
+               if (cpos == lastpos())
+                       --cpos;
+               // on space? -> look at the words in front of space
+               else if (cpos > 0 && par.isSeparator(cpos))     {
+                       // abc| def -> font of c
+                       // abc |[WERBEH], i.e. boundary==true -> font of c
+                       // abc [WERBEH]| def, font of the space
+                       if (!tm.isRTLBoundary(pit(), cpos))
+                               --cpos;
+               }
+       }
+
+       // get font
+       BufferParams const & bufparams = buffer().params();
+       current_font = par.getFontSettings(bufparams, cpos);
+       real_current_font = tm.getDisplayFont(pit(), cpos);
+
+       // special case for paragraph end
+       if (pos() == lastpos()
+           && tm.isRTLBoundary(pit(), pos())
+           && !boundary()) {
+               Language const * lang = par.getParLanguage(bufparams);
+               current_font.setLanguage(lang);
+               current_font.setNumber(Font::OFF);
+               real_current_font.setLanguage(lang);
+               real_current_font.setNumber(Font::OFF);
+       }
+}
+
 } // namespace lyx