[freetype2] master 319125d: [autofit] Prevent overlapping blue zones.

[Werner LEMBERG]

branch: master
commit 319125d4c267a0f726f1589f68fd646faa725351
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [autofit] Prevent overlapping blue zones.
    
    Problem reported as
    
      https://github.com/google/fonts/issues/632
    
    The font in question (Nunito) has values 705 and 713 for the
    reference and overshoot values, respectively, of the first blue
    zone.  Blue zone 2, however, has value 710 for both the reference
    and overshoot.  At 12ppem, reference and overshoot of blue zone 0
    becomes 8px, while blue zone 2 becomes 9px.
    
    A peculiarity of this font is that the tops of isolated vertical
    stems like `N' have a slight overshoot also.  The auto-hinter tries
    to find the nearest blue zone using the *original* coordinates.  For
    vertical stems, this is value 713.  For normal horizontal tops like
    in character `E', this is value 710.  Since value 713 is mapped to
    8px but value 710 to 9px, `N' and similar characters are one pixel
    higher than `E', which looks very bad.
    
    This commit sanitizes blue zones to avoid such a behaviour.
    
    * src/autofit/aflatin.c (af_latin_sort_blue): New function.
    (af_latin_metrics_init_blues): Sort blue values and remove overlaps.
---
 ChangeLog             | 27 +++++++++++++++
 src/autofit/aflatin.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0b71ab5..5fa1201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2017-02-13  Werner Lemberg  <address@hidden>
+
+       [autofit] Prevent overlapping blue zones.
+
+       Problem reported as
+
+         https://github.com/google/fonts/issues/632
+
+       The font in question (Nunito) has values 705 and 713 for the
+       reference and overshoot values, respectively, of the first blue
+       zone.  Blue zone 2, however, has value 710 for both the reference
+       and overshoot.  At 12ppem, reference and overshoot of blue zone 0
+       becomes 8px, while blue zone 2 becomes 9px.
+
+       A peculiarity of this font is that the tops of isolated vertical
+       stems like `N' have a slight overshoot also.  The auto-hinter tries
+       to find the nearest blue zone using the *original* coordinates.  For
+       vertical stems, this is value 713.  For normal horizontal tops like
+       in character `E', this is value 710.  Since value 713 is mapped to
+       8px but value 710 to 9px, `N' and similar characters are one pixel
+       higher than `E', which looks very bad.
+
+       This commit sanitizes blue zones to avoid such a behaviour.
+
+       * src/autofit/aflatin.c (af_latin_sort_blue): New function.
+       (af_latin_metrics_init_blues): Sort blue values and remove overlaps.
+
 2017-02-12  Alexei Podtelezhnikov  <address@hidden>
 
        * src/smooth/ftgrays.c (gray_sweep): Improve code.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 916095d..7e6e8ea 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -265,6 +265,45 @@
   }
 
 
+  void
+  af_latin_sort_blue( FT_UInt        count,
+                      AF_LatinBlue*  table )
+  {
+    FT_UInt       i, j;
+    AF_LatinBlue  swap;
+
+
+    /* we sort from bottom to top */
+    for ( i = 1; i < count; i++ )
+    {
+      for ( j = i; j > 0; j-- )
+      {
+        FT_Pos  a, b;
+
+
+        if ( table[j - 1]->flags & ( AF_LATIN_BLUE_TOP     |
+                                     AF_LATIN_BLUE_SUB_TOP ) )
+          a = table[j - 1]->ref.org;
+        else
+          a = table[j - 1]->shoot.org;
+
+        if ( table[j]->flags & ( AF_LATIN_BLUE_TOP     |
+                                 AF_LATIN_BLUE_SUB_TOP ) )
+          b = table[j]->ref.org;
+        else
+          b = table[j]->shoot.org;
+
+        if ( b >= a )
+          break;
+
+        swap         = table[j];
+        table[j]     = table[j - 1];
+        table[j - 1] = swap;
+      }
+    }
+  }
+
+
   /* Find all blue zones.  Flat segments give the reference points, */
   /* round segments the overshoot positions.                        */
 
@@ -928,6 +967,60 @@
 
     af_shaper_buf_destroy( face, shaper_buf );
 
+    /* we finally check whether blue zones are ordered; */
+    /* `ref' and `shoot' values of two blue zones must not overlap */
+    if ( axis->blue_count )
+    {
+      FT_UInt       i;
+      AF_LatinBlue  blue_sorted[AF_BLUE_STRINGSET_MAX_LEN + 2];
+
+
+      for ( i = 0; i < axis->blue_count; i++ )
+        blue_sorted[i] = &axis->blues[i];
+
+      /* sort bottoms of blue zones... */
+      af_latin_sort_blue( axis->blue_count, blue_sorted );
+
+      /* ...and adjust top values if necessary */
+      for ( i = 0; i < axis->blue_count - 1; i++ )
+      {
+        FT_Pos*  a;
+        FT_Pos*  b;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+        FT_Bool  a_is_top = 0;
+#endif
+
+
+        if ( blue_sorted[i]->flags & ( AF_LATIN_BLUE_TOP     |
+                                       AF_LATIN_BLUE_SUB_TOP ) )
+        {
+          a = &blue_sorted[i]->shoot.org;
+#ifdef FT_DEBUG_LEVEL_TRACE
+          a_is_top = 1;
+#endif
+        }
+        else
+          a = &blue_sorted[i]->ref.org;
+
+        if ( blue_sorted[i + 1]->flags & ( AF_LATIN_BLUE_TOP     |
+                                           AF_LATIN_BLUE_SUB_TOP ) )
+          b = &blue_sorted[i + 1]->shoot.org;
+        else
+          b = &blue_sorted[i + 1]->ref.org;
+
+        if ( *a > *b )
+        {
+          *a = *b;
+          FT_TRACE5(( "blue zone overlap:"
+                      " adjusting %s %d to %ld\n",
+                      a_is_top ? "overshoot" : "reference",
+                      blue_sorted[i] - axis->blues,
+                      *a ));
+        }
+      }
+    }
+
     FT_TRACE5(( "\n" ));
 
     return;