--- a/textrendering/textformatting/tagma/TMGLYPH.CPP	Tue May 11 17:53:33 2010 +0300
+++ b/textrendering/textformatting/tagma/TMGLYPH.CPP	Tue May 25 14:39:28 2010 +0300
@@ -463,7 +463,7 @@
 		if (CFont::CharactersJoin(
 			aDirectionality == ELeftToRight? prevChar : c,
 			aDirectionality == ELeftToRight? c : prevChar)
-			&& format.iFontSpec == prevFormat.iFontSpec)
+			&& format == prevFormat)
 			// Characters join at the beginning.
 			*output = KZeroWidthJoiner;
 		}
@@ -530,7 +530,7 @@
 			if (CFont::CharactersJoin(
 				aDirectionality == ELeftToRight? *prev : nextChar,
 				aDirectionality == ELeftToRight? nextChar : *prev)
-				&& format.iFontSpec == nextFormat.iFontSpec)
+				&& format == nextFormat)
 				// Characters join at the end.
 				*output = KZeroWidthJoiner;
 			}