From fd5ae9599ad674db14a3730f2a07e11e0407b182 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 5 Jul 2012 10:30:41 +0200
Subject: [PATCH] [autofit] Improve output of debugging information.

* src/autofit/afhints.c (af_glyph_hints_dump_segments): Print more
data; report no data.
(af_glyph_hints_dump_edges): Report no data.
---
 ChangeLog             |  8 +++++
 src/autofit/afhints.c | 72 ++++++++++++++++++++++++++-----------------
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cd220901..5927fa59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-05  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve output of debugging information.
+
+	* src/autofit/afhints.c (af_glyph_hints_dump_segments): Print more
+	data; report no data.
+	(af_glyph_hints_dump_edges): Report no data.
+
 2012-07-04  Werner Lemberg  <wl@gnu.org>
 
 	Fix Savannah bug #36091.
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 6dec087ad..fa6f497b9 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -246,28 +246,39 @@
     for ( dimension = 1; dimension >= 0; dimension-- )
     {
       AF_AxisHints  axis     = &hints->axis[dimension];
+      AF_Point      points   = hints->points;
+      AF_Edge       edges    = axis->edges;
       AF_Segment    segments = axis->segments;
       AF_Segment    limit    = segments + axis->num_segments;
       AF_Segment    seg;
 
 
-      printf ( "Table of %s segments:\n",
-               dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
-      printf ( "  [ index |  pos  |  dir  | link | serif |"
-               " height | extra |    flags    ]\n" );
+      printf( "Table of %s segments:\n",
+              dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
+      if (axis->num_segments)
+        printf( "  [ index |  pos  |  dir  | from"
+                " |  to  | link | serif | edge"
+                " | height | extra |    flags    ]\n" );
+      else
+        printf( "  (none)\n" );
 
       for ( seg = segments; seg < limit; seg++ )
       {
-        printf ( "  [ %5d | %5.2g | %5s | %4d | %5d | %6d | %5d | %11s ]\n",
-                 seg - segments,
-                 dimension == AF_DIMENSION_HORZ ? (int)seg->first->ox / 64.0
-                                                : (int)seg->first->oy / 64.0,
-                 af_dir_str( (AF_Direction)seg->dir ),
-                 AF_INDEX_NUM( seg->link, segments ),
-                 AF_INDEX_NUM( seg->serif, segments ),
-                 seg->height,
-                 seg->height - ( seg->max_coord - seg->min_coord ),
-                 af_edge_flags_to_string( (AF_Edge_Flags)seg->flags ) );
+        printf( "  [ %5d | %5.2g | %5s | %4d"
+                " | %4d | %4d | %5d | %4d"
+                " | %6d | %5d | %11s ]\n",
+                seg - segments,
+                dimension == AF_DIMENSION_HORZ ? (int)seg->first->ox / 64.0
+                                               : (int)seg->first->oy / 64.0,
+                af_dir_str( (AF_Direction)seg->dir ),
+                AF_INDEX_NUM( seg->first, points ),
+                AF_INDEX_NUM( seg->last, points ),
+                AF_INDEX_NUM( seg->link, segments ),
+                AF_INDEX_NUM( seg->serif, segments ),
+                AF_INDEX_NUM( seg->edge, edges ),
+                seg->height,
+                seg->height - ( seg->max_coord - seg->min_coord ),
+                af_edge_flags_to_string( (AF_Edge_Flags)seg->flags ) );
       }
       printf( "\n" );
     }
@@ -363,24 +374,27 @@
        *  note: AF_DIMENSION_HORZ corresponds to _vertical_ edges
        *        since they have a constant X coordinate.
        */
-      printf ( "Table of %s edges:\n",
-               dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
-      printf ( "  [ index |  pos  |  dir  | link |"
-               " serif | blue | opos  |  pos  |    flags    ]\n" );
+      printf( "Table of %s edges:\n",
+              dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
+      if ( axis->num_edges )
+        printf( "  [ index |  pos  |  dir  | link"
+                " | serif | blue | opos  |  pos  |    flags    ]\n" );
+      else
+        printf( "  (none)\n" );
 
       for ( edge = edges; edge < limit; edge++ )
       {
-        printf ( "  [ %5d | %5.2g | %5s | %4d |"
-                 " %5d |   %c  | %5.2f | %5.2f | %11s ]\n",
-                 edge - edges,
-                 (int)edge->opos / 64.0,
-                 af_dir_str( (AF_Direction)edge->dir ),
-                 AF_INDEX_NUM( edge->link, edges ),
-                 AF_INDEX_NUM( edge->serif, edges ),
-                 edge->blue_edge ? 'y' : 'n',
-                 edge->opos / 64.0,
-                 edge->pos / 64.0,
-                 af_edge_flags_to_string( (AF_Edge_Flags)edge->flags ) );
+        printf( "  [ %5d | %5.2g | %5s | %4d"
+                " | %5d |   %c  | %5.2f | %5.2f | %11s ]\n",
+                edge - edges,
+                (int)edge->opos / 64.0,
+                af_dir_str( (AF_Direction)edge->dir ),
+                AF_INDEX_NUM( edge->link, edges ),
+                AF_INDEX_NUM( edge->serif, edges ),
+                edge->blue_edge ? 'y' : 'n',
+                edge->opos / 64.0,
+                edge->pos / 64.0,
+                af_edge_flags_to_string( (AF_Edge_Flags)edge->flags ) );
       }
       printf( "\n" );
     }