From 275fe97ee7f8c1656fd7e11245a7931420729401 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Tue, 2 Jun 2009 14:07:12 +0300 Subject: [PATCH] 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. --- ps/music-drawing-routines.ps | 14 ++++++++------ scm/output-ps.scm | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index 1807e47dc4..8fd31f3587 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -228,14 +228,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 6b2e3cff6b..b2c047a651 100644 --- 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 -- 2.39.2