Fix 541.

The x_offset and y_offset fields in PangoGlyphGeometry should not
be included in the advance. That is, they only affect the position
of their glyph.
(cherry picked from commit 8c4f3056c4217dc3b7f0c077c3f0e3673b5f90ee)

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 762657508449c1ef4cff795575fc9be9dc26f26b..9f28bf95f13f7997a3aaba873f698d799f4105ec 100644 (file)
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -224,14 +224,16 @@ gsave
 grestore
 } bind def
 
-/print_glyphs % dx dy glyph print_glyphs
+/print_glyphs % w dx dy glyph print_glyphs
 {
        {
-               currentpoint %dx dy glyph x0 y0
-               3 2 roll %dx dy x0 y0 glyph
-               glyphshow % dx dy x0 y0
-               moveto % dx dy
-               rmoveto
+               currentpoint %w dx dy glyph x0 y0
+               5 2 roll %w x0 y0 dx dy glyph
+               3 1 roll %w x0 y0 glyph dx dy
+               rmoveto %w x0 y0 glyph
+               glyphshow %w x0 y0
+               moveto %w
+               0 rmoveto
        }repeat
 }bind def
 %end music-drawing-routines.ps

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 6b2e3cff6bc9e98c8ce6f942599a44bced56ea89..b2c047a6517656f7d0726c5b651bccf45fbb57f2 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -136,8 +136,8 @@
 
   (define (glyph-spec w x y g)
     (let ((prefix (if (string? g) "/" "")))
-      (ly:format "~4f ~4f ~a~a"
-                (+ w x)  y
+      (ly:format "~4f ~4f ~4f ~a~a"
+                w x y
                 prefix g)))
   
   (ly:format