From 634c9e3423a9c23793400d1f56e98070e00b6056 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 22 Feb 2012 16:43:21 -0500
Subject: [PATCH] Minor

---
 src/hb-ot-shape-private.hh | 69 +++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh
index c716962fc..87e8ddbae 100644
--- a/src/hb-ot-shape-private.hh
+++ b/src/hb-ot-shape-private.hh
@@ -104,40 +104,49 @@ _hb_unicode_modified_combining_class (hb_unicode_funcs_t *ufuncs,
 {
   int c = hb_unicode_combining_class (ufuncs, unicode);
 
-  /* For Hebrew, we permute the "fixed-position" classes 10-25 into the order
-   * described in the SBL Hebrew manual http://www.sbl-site.org/Fonts/SBLHebrewUserManual1.5x.pdf
-   * (as recommended by http://forum.fontlab.com/archive-old-microsoft-volt-group/vista-and-diacritic-ordering-t6751.0.html)
-   */
-  static const int permuted_hebrew_classes[25 - 10 + 1] = {
-    /* 10 sheva */        22,
-    /* 11 hataf segol */  15,
-    /* 12 hataf patah */  16,
-    /* 13 hataf qamats */ 17,
-    /* 14 hiriq */        23,
-    /* 15 tsere */        18,
-    /* 16 segol */        19,
-    /* 17 patah */        20,
-    /* 18 qamats */       21,
-    /* 19 holam */        14,
-    /* 20 qubuts */       24,
-    /* 21 dagesh */       12,
-    /* 22 meteg */        25,
-    /* 23 rafe */         13,
-    /* 24 shin dot */     10,
-    /* 25 sin dot */      11,
-  };
-
-  /* Modify the combining-class to suit Arabic better.  See:
-   * http://unicode.org/faq/normalization.html#8
-   * http://unicode.org/faq/normalization.html#9
-   */
   if (unlikely (hb_in_range<int> (c, 27, 33)))
+  {
+    /* Modify the combining-class to suit Arabic better.  See:
+     * http://unicode.org/faq/normalization.html#8
+     * http://unicode.org/faq/normalization.html#9
+     */
     c = c == 33 ? 27 : c + 1;
-  /* The equivalent fix for Hebrew is more complex,
-   * see the SBL Hebrew manual.
-   */
+  }
   else if (unlikely (hb_in_range<int> (c, 10, 25)))
+  {
+    /* The equivalent fix for Hebrew is more complex.
+     *
+     * We permute the "fixed-position" classes 10-25 into the order
+     * described in the SBL Hebrew manual:
+     *
+     * http://www.sbl-site.org/Fonts/SBLHebrewUserManual1.5x.pdf
+     *
+     * (as recommended by:
+     *  http://forum.fontlab.com/archive-old-microsoft-volt-group/vista-and-diacritic-ordering-t6751.0.html)
+     *
+     * More details here:
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=662055
+     */
+    static const int permuted_hebrew_classes[25 - 10 + 1] = {
+      /* 10 sheva */        22,
+      /* 11 hataf segol */  15,
+      /* 12 hataf patah */  16,
+      /* 13 hataf qamats */ 17,
+      /* 14 hiriq */        23,
+      /* 15 tsere */        18,
+      /* 16 segol */        19,
+      /* 17 patah */        20,
+      /* 18 qamats */       21,
+      /* 19 holam */        14,
+      /* 20 qubuts */       24,
+      /* 21 dagesh */       12,
+      /* 22 meteg */        25,
+      /* 23 rafe */         13,
+      /* 24 shin dot */     10,
+      /* 25 sin dot */      11,
+    };
     c = permuted_hebrew_classes[c - 10];
+  }
 
   return c;
 }