From 60896529f0deb02414706a5702303a1e0db6d762 Mon Sep 17 00:00:00 2001
From: Asger Ottar Alstrup <alstrup@lyx.org>
Date: Sun, 27 Jul 2003 11:16:25 +0000
Subject: [PATCH] Optimise rowBreakPoint and setHeightOfRow as well.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7378 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog |  2 ++
 src/text.C    | 98 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index cafaf963bf..a8ea20e2b9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,8 @@
 
 	* text.C (fill): Optimise algorithm to exploit that we can reuse
 	the LyXFont for many characters.
+	(setHeightOfRow): Same thing.
+	(rowBreakPoint): Same thing.
 
 2003-07-26  Asger Alstrup  <alstrup@local>
 
diff --git a/src/text.C b/src/text.C
index 8faf098024..179c6db01d 100644
--- a/src/text.C
+++ b/src/text.C
@@ -817,6 +817,11 @@ pos_type LyXText::rowBreakPoint(Row const & row) const
 	bool fullrow = false;
 
 	pos_type i = pos;
+
+	// We re-use the font resolution for the entire font span when possible
+	LyXFont font = getFont(bv()->buffer(), pit, i);
+	lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+
 	for (; i < last; ++i) {
 		if (pit->isNewline(i)) {
 			point = i;
@@ -838,7 +843,27 @@ pos_type LyXText::rowBreakPoint(Row const & row) const
 				thiswidth = left_margin - x;
 			thiswidth += singleWidth(pit, i, c);
 		} else {
-			thiswidth = singleWidth(pit, i, c);
+			// Manual inlined optimised version of common case of "thiswidth = singleWidth(pit, i, c);"
+			if (IsPrintable(c)) {
+				if (pos > endPosOfFontSpan) {
+					// We need to get the next font
+					font = getFont(bv()->buffer(), pit, i);
+					endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+				}
+				if (! font.language()->RightToLeft()) {
+					thiswidth = font_metrics::width(c, font);
+				} else {
+					// Fall-back to normal case
+					thiswidth = singleWidth(pit, i, c);
+					// And flush font cache
+					endPosOfFontSpan = 0;
+				}
+			} else {
+				// Fall-back to normal case
+				thiswidth = singleWidth(pit, i, c);
+				// And flush font cache
+				endPosOfFontSpan = 0;
+			}
 		}
 
 		x += thiswidth;
@@ -1098,32 +1123,59 @@ void LyXText::setHeightOfRow(RowList::iterator rit)
 	int maxwidth = 0;
 
 	if (!pit->empty()) {
+		// We re-use the font resolution for the entire font span when possible
+		LyXFont font = getFont(bv()->buffer(), pit, rit->pos());
+		lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(rit->pos());
+
+		// Optimisation
+		Paragraph const & par = *pit;
+
 		// Check if any insets are larger
 		for (pos_type pos = rit->pos(); pos <= pos_end; ++pos) {
-			if (pit->isInset(pos)) {
-				LyXFont const & tmpfont = getFont(bv()->buffer(), pit, pos);
-				InsetOld * tmpinset = pit->getInset(pos);
-				if (tmpinset) {
-#if 1 // this is needed for deep update on initialitation
-#warning inset->update FIXME
-					//tmpinset->update(bv());
-					Dimension dim;
-					MetricsInfo mi(bv(), tmpfont, workWidth());
-					tmpinset->metrics(mi, dim);
-					maxwidth += dim.wid;
-					maxasc = max(maxasc, dim.asc);
-					maxdesc = max(maxdesc, dim.des);
-#else
-					maxwidth += tmpinset->width();
-					maxasc = max(maxasc, tmpinset->ascent());
-					maxdesc = max(maxdesc, tmpinset->descent());
-#endif
+			// Manual inlined optimised version of common case of "maxwidth += singleWidth(pit, pos);"
+			char const c = par.getChar(pos);
+
+			if (IsPrintable(c)) {
+				if (pos > endPosOfFontSpan) {
+					// We need to get the next font
+					font = getFont(bv()->buffer(), pit, pos);
+					endPosOfFontSpan = par.getEndPosOfFontSpan(pos);
+				}
+				if (! font.language()->RightToLeft()) {
+					maxwidth += font_metrics::width(c, font);
+				} else {
+					// Fall-back to normal case
+					maxwidth += singleWidth(pit, pos, c);
+					// And flush font cache
+					endPosOfFontSpan = 0;
 				}
 			} else {
-				// Manual inlined optimised version of common case of "maxwidth += singleWidth(pit, pos);"
-				char const c = pit->getChar(pos);
-				maxwidth += singleWidth(pit, pos, c);
-				
+				// Special handling of insets - are any larger?
+				if (par.isInset(pos)) {
+					LyXFont const tmpfont = getFont(bv()->buffer(), pit, pos);
+					InsetOld const * tmpinset = par.getInset(pos);
+					if (tmpinset) {
+#if 1 // this is needed for deep update on initialitation
+#warning inset->update FIXME
+						//tmpinset->update(bv());
+						Dimension dim;
+						MetricsInfo mi(bv(), tmpfont, workWidth());
+						tmpinset->metrics(mi, dim);
+						maxwidth += dim.wid;
+						maxasc = max(maxasc, dim.asc);
+						maxdesc = max(maxdesc, dim.des);
+#else
+						maxwidth += tmpinset->width();
+						maxasc = max(maxasc, tmpinset->ascent());
+						maxdesc = max(maxdesc, tmpinset->descent());
+#endif
+					} 
+				} else {
+					// Fall-back to normal case
+					maxwidth += singleWidth(pit, pos, c);
+					// And flush font cache
+					endPosOfFontSpan = 0;
+				}
 			}
 		}
 	}