Thinko: dist .ihtml source files in doc directories

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 4938d139efc4bf1c233d0326d2d47d4b56ccf33e..1b90dcfed37be657483adf359f40d8687305b0d2 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -108,17 +108,14 @@ get_unicode_name (char *s,
 }
 
 Stencil
-Pango_font::pango_item_string_stencil (PangoItem const *item,
-                                      string str,
+Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item,
                                       bool tight_bbox) const
 {
   const int GLYPH_NAME_LEN = 256;
   char glyph_name[GLYPH_NAME_LEN];
-  PangoAnalysis const *pa = &(item->analysis);
-  PangoGlyphString *pgs = pango_glyph_string_new ();
 
-  pango_shape (str.c_str () + item->offset,
-              item->length, (PangoAnalysis*) pa, pgs);
+  PangoAnalysis const *pa = &(glyph_item->item->analysis);
+  PangoGlyphString *pgs = glyph_item->glyphs;
 
   PangoRectangle logical_rect;
   PangoRectangle ink_rect;
@@ -175,6 +172,13 @@ Pango_font::pango_item_string_stencil (PangoItem const *item,
       PangoGlyph pg = pgi->glyph;
       PangoGlyphGeometry ggeo = pgi->geometry;
 
+      /*
+       Zero-width characters are valid Unicode characters,
+       but glyph lookups need to be skipped.
+      */
+      if (!(pg ^ PANGO_GLYPH_EMPTY))
+       continue;
+
       glyph_name[0] = '\0';
       if (has_glyph_names)
        {
@@ -312,50 +316,44 @@ Pango_font::text_stencil (string str,
                          bool feta,
                          bool tight) const
 {
-  GList *items
-    = pango_itemize (context_,
-                    str.c_str (),
-                    0, str.length (), attribute_list_,
-                    NULL);
+  /*
+    The text assigned to a PangoLayout is automatically divided
+    into sections and reordered according to the Unicode
+    Bidirectional Algorithm, if necessary.
+  */
+  PangoLayout *layout = pango_layout_new (context_);
+  pango_layout_set_text (layout, str.c_str (), -1);
+  GSList *lines = pango_layout_get_lines (layout);
 
   Stencil dest;
-
   Real last_x = 0.0;
 
-  Direction text_dir = RIGHT;
-  for (GList *p = items; p; p = p->next)
-    {
-      PangoItem *item = (PangoItem *) p->data;
-      if (item->analysis.level == PANGO_DIRECTION_RTL)
-       text_dir = LEFT;
-    }
-
-  for (GList *ptr = items; ptr; ptr = ptr->next)
+  for (GSList *l = lines; l; l = l->next)
     {
-      PangoItem *item = (PangoItem *) ptr->data;
-
-      Stencil item_stencil = pango_item_string_stencil (item, str, tight);
+      PangoLayoutLine *line = (PangoLayoutLine *) l->data;
+      GSList *layout_runs = line->runs;
 
-      if (text_dir == RIGHT)
+      for (GSList *p = layout_runs; p; p = p->next)
        {
+         PangoGlyphItem *item = (PangoGlyphItem *) p->data;
+         Stencil item_stencil = pango_item_string_stencil (item, tight);
+
          item_stencil.translate_axis (last_x, X_AXIS);
          last_x = item_stencil.extent (X_AXIS)[RIGHT];
-       }
-      else if (text_dir == LEFT)
-       dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS);
 
 #if 0 // Check extents.
-      if (!item_stencil.extent_box ()[X_AXIS].is_empty ())
-       {
-         Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1);
-         Box empty;
-         empty.set_empty ();
-         Stencil dimless_frame (empty, frame.expr ());
-         dest.add_stencil (frame);
-       }
+         if (!item_stencil.extent_box ()[X_AXIS].is_empty ())
+           {
+             Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1);
+             Box empty;
+             empty.set_empty ();
+             Stencil dimless_frame (empty, frame.expr ());
+             dest.add_stencil (frame);
+           }
 #endif
 
-      dest.add_stencil (item_stencil);
+         dest.add_stencil (item_stencil);
+       }
     }
 
   string name = get_output_backend_name ();
@@ -395,8 +393,6 @@ Pango_font::text_stencil (string str,
       return Stencil (b, exp);
     }
 
-  g_list_free (items);
-
   return dest;
 }