X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=0e37c5f5d9b2e139bba01288b1c83cf0eace2891;hb=10be0c43f20a27a1e6af82241ad5ec6b5cad3eca;hp=d7fb42b4a084ba1416fdc9584d6a92400e1e2556;hpb=c668ebf61151e1cdf6b583dc5ecdc8f8a0cfc678;p=lyx.git

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index d7fb42b4a0..0e37c5f5d9 100644
--- 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();
@@ -190,8 +194,7 @@ void ParagraphMetrics::dump() const
 {
 	lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
 	for (size_t i = 0; i != rows_.size(); ++i) {
-		lyxerr << "  row " << i << ":   ";
-		rows_[i].dump();
+		lyxerr << "  row " << i << ":   " << rows_[i];
 	}
 }
 
@@ -216,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);
 }