X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontList.cpp;h=efe1208f2f59ba5f0895efef18fd36d170b3e902;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=09edbefb9490dc6fef481e5af90d4de54a13edf7;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git

diff --git a/src/FontList.cpp b/src/FontList.cpp
index 09edbefb94..efe1208f2f 100644
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -4,13 +4,13 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  * \author Abdelrazak Younes
  *
  * Full author contact details are available in file CREDITS.
@@ -24,41 +24,32 @@
 
 #include <algorithm>
 
-using std::distance;
-using std::endl;
-using std::string;
-using std::ostream;
+using namespace std;
 
 namespace lyx {
 
-namespace {
-
-class matchFT
-{
-public:
-	/// used by lower_bound and upper_bound
-	int operator()(FontTable const & a, FontTable const & b) const {
-		return a.pos() < b.pos();
-	}
-};
-
-} // anon namespace
 
 FontList::iterator FontList::fontIterator(pos_type pos)
 {
-	static Font dummy;
-	FontTable search_elem(pos, dummy);
-	return lower_bound(list_.begin(), list_.end(), search_elem,
-		matchFT());
+	FontList::iterator it = list_.begin();
+	FontList::iterator end = list_.end();
+	for (; it != end; ++it) {
+		if (it->pos() >= pos)
+			break;
+	}
+	return it;
 }
 
 
 FontList::const_iterator FontList::fontIterator(pos_type pos) const
 {
-	static Font dummy;
-	FontTable search_elem(pos, dummy);
-	return lower_bound(list_.begin(), list_.end(), search_elem,
-		matchFT());
+	FontList::const_iterator it = list_.begin();
+	FontList::const_iterator end = list_.end();
+	for (; it != end; ++it) {
+		if (it->pos() >= pos)
+			break;
+	}
+	return it;
 }
 
 
@@ -136,25 +127,32 @@ void FontList::set(pos_type pos, Font const & font)
 	// in a new kernel. (Asger)
 	// Next search font table
 
-	iterator beg = list_.begin();
-	iterator it = beg;
-	iterator endit = list_.end();
-	for (; it != endit; ++it) {
-		if (it->pos() >= pos)
-			break;
-	}
-	size_t const i = distance(beg, it);
-	bool notfound = (it == endit);
+	List::iterator it = fontIterator(pos);
+	bool const found = it != list_.end();
+	if (found && it->font() == font)
+		// Font is already set.
+		return;
+
+	size_t const i = distance(list_.begin(), it);
 
-	if (!notfound && list_[i].font() == font)
+	// Is position pos a beginning of a font block?
+	bool const begin = pos == 0 || !found 
+		|| (i > 0 && list_[i - 1].pos() == pos - 1);
+
+	// Is position pos at the end of a font block?
+	bool const end = found && list_[i].pos() == pos;
+
+	if (!begin && !end) {
+		// The general case: The block is split into 3 blocks
+		list_.insert(list_.begin() + i,
+				FontTable(pos - 1, list_[i].font()));
+		list_.insert(list_.begin() + i + 1,
+				FontTable(pos, font));
 		return;
+	}
 
-	bool begin = pos == 0 || notfound ||
-		(i > 0 && list_[i - 1].pos() == pos - 1);
-	// Is position pos is a beginning of a font block?
-	bool end = !notfound && list_[i].pos() == pos;
-	// Is position pos is the end of a font block?
-	if (begin && end) { // A single char block
+	if (begin && end) {
+		// A single char block
 		if (i + 1 < list_.size() &&
 		    list_[i + 1].font() == font) {
 			// Merge the singleton block with the next block
@@ -179,36 +177,22 @@ void FontList::set(pos_type pos, Font const & font)
 		      list_[i + 1].font() == font))
 			list_.insert(list_.begin() + i + 1,
 					FontTable(pos, font));
-	} else { // The general case. The block is splitted into 3 blocks
-		list_.insert(list_.begin() + i,
-				FontTable(pos - 1, list_[i].font()));
-		list_.insert(list_.begin() + i + 1,
-				FontTable(pos, font));
 	}
 }
 
 
-FontSize FontList::highestInRange
-	(pos_type startpos, pos_type endpos, FontSize def_size) const
+FontSize FontList::highestInRange(pos_type startpos, pos_type endpos,
+	FontSize def_size) const
 {
 	if (list_.empty())
 		return def_size;
 
-	const_iterator end_it = list_.begin();
+	List::const_iterator end_it = fontIterator(endpos);
 	const_iterator const end = list_.end();
-	for (; end_it != end; ++end_it) {
-		if (end_it->pos() >= endpos)
-			break;
-	}
-
 	if (end_it != end)
 		++end_it;
 
-	FontList::const_iterator cit = list_.begin();
-	for (; cit != end; ++cit) {
-		if (cit->pos() >= startpos)
-			break;
-	}
+	List::const_iterator cit = fontIterator(startpos);
 
 	FontSize maxsize = FONT_SIZE_TINY;
 	for (; cit != end_it; ++cit) {
@@ -224,17 +208,8 @@ FontSize FontList::highestInRange
 
 bool FontList::hasChangeInRange(pos_type pos, int len) const
 {
-	// FIXME: can't we use fontIterator(pos) instead?
-	const_iterator cit = list_.begin();
-	const_iterator end = list_.end();
-	for (; cit != end; ++cit) {
-		if (cit->pos() >= pos)
-			break;
-	}
-	if (cit != end && pos + len - 1 > cit->pos())
-		return false;
-
-	return true;
+	List::const_iterator cit = fontIterator(pos);
+	return cit == list_.end() || pos + len - 1 <= cit->pos();
 }