Adjust indentation after ff42fea8.

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 93b0461161e4513e02ae4961093a42592bdc6e6d..0e37c5f5d9b2e139bba01288b1c83cf0eace2891 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -97,13 +97,17 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
                        char_type const b[] = { static_cast<char_type>(change.type) };
                        // 1 byte is enough to encode Change::Type
                        crc.process_bytes(b, 1);
-               }                       
+               }
        }
 
        Dimension const & d = row.dimension();
        char_type const b[] = { static_cast<char_type>(row.sel_beg),
-                               static_cast<char_type>(row.sel_end),
-               row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
+                               static_cast<char_type>(row.sel_end),
+                               row.begin_margin_sel,
+                               row.end_margin_sel,
+                               reinterpret_cast<char_type const *>(&row.separator)[0],
+                               reinterpret_cast<char_type const *>(&row.separator)[1],
+                               d.wid, d.asc, d.des };
        crc.process_bytes(b, sizeof(b));
 
        return crc.checksum();
@@ -215,27 +219,15 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
        if (Inset const * inset = par_->getInset(pos))
                return insetDimension(inset).wid;
 
-       char_type c = par_->getChar(pos);
+       char_type const c = par_->getChar(pos);
 
        if (c == '\t')
                return 4 * theFontMetrics(font).width(' ');
-       
-       if (!isPrintable(c))
-               return theFontMetrics(font).width(c);
-
-       Language const * language = font.language();
-       if (language->rightToLeft()) {
-               if (language->lang() == "arabic_arabtex" ||
-                       language->lang() == "arabic_arabi" ||
-                       language->lang() == "farsi") {
-                               if (Encodings::isArabicComposeChar(c))
-                                       return 0;
-                               c = par_->transformChar(c, pos);
-               } else if (language->lang() == "hebrew" &&
-                               Encodings::isHebrewComposeChar(c)) {
-                       return 0;
-               }
-       }
+
+       // Note that this function is only called in
+       // RowPainter::paintText, and only used for characters that do
+       // not require handling of compose chars or ligatures. It can
+       // therefore be kept simple.
        return theFontMetrics(font).width(c);
 }