X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiFontMetrics.cpp;h=5d3a0dd6721fa869bc4765b9dcc8ad63cb46ad70;hb=bd720f7277c1aed9311011faee1ac999634b6867;hp=52c31d904076fdca8af4abc5797e551ec4f32032;hpb=2ef6f885d438b6653b2ff24b4b735b8adc7ad3a8;p=lyx.git

diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index 52c31d9040..5d3a0dd672 100644
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -122,8 +122,21 @@ int GuiFontMetrics::width(docstring const & s) const
 {
 	size_t ls = s.size();
 	int w = 0;
-	for (unsigned int i = 0; i < ls; ++i)
+	for (unsigned int i = 0; i < ls; ++i) {
+		//FIXME: we need to detect surrogate pairs and act accordingly
+		/**
+		if isSurrogateBase(s[i]) {
+			docstring c = s[i];
+			if (smallcaps_shape_)
+				w += metrics_.width(toqstr(c + s[i + 1]));
+			else
+				w += smallcaps_metrics_.width(toqstr(c + s[i + 1]));
+			++i;
+		}
+		else
+		*/
 		w += width(s[i]);
+	}
 
 	return w;
 }