From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 1 Feb 2007 23:57:13 +0000 (+0100)
Subject: Fix #264
X-Git-Tag: release/2.11.15-2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=34141471a3a50d637a22d19da0c8645bae59fdc2;p=lilypond.git

Fix #264

Use currentpoint in mark_URI input.
---

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 8864569af1..2df5913acc 100644
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -13,11 +13,8 @@
 
 % llx lly urx ury URI
 /mark_URI
-% It's possible to eliminate the coordinate variables by doing [ /Rect [ 7 3
-% roll.  That is, however, kind of ugly.  It would be nice if this procedure
-% were only included when PDF marks are enabled.
 {
-    /command exch def
+    /uri exch def
     /ury exch def
     /urx exch def
     /lly exch def
@@ -30,7 +27,7 @@
         /Action
 	    <<
 		/Subtype /URI
-		/URI command
+		/URI uri
 	    >>
         /Subtype /Link
     /ANN
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index a2e128d5f0..42ce759bb7 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -89,6 +89,7 @@ the PDF backend."
 	 (yextent (ly:stencil-extent stil Y))
 	 (old-expr (ly:stencil-expr stil))
 	 (url-expr (list 'url-link url `(quote ,xextent) `(quote ,yextent))))
+
     (ly:stencil-add (ly:make-stencil url-expr xextent yextent) stil)))
 
 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index c4bfa93d18..681c2c7b08 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -920,11 +920,14 @@ use GrandStaff as a context. "
 				   '(Staff (any-octave . 0) (same-octave . 1)
 					   GrandStaff (any-octave . 0) (same-octave . 1))
 				   pcontext))
+      
       ;; do not set localKeySignature when a note alterated differently from
       ;; localKeySignature is found.
       ;; Causes accidentals to be printed at every note instead of
       ;; remembered for the duration of a measure.
-      ;; accidentals not being remembered, causing accidentals always to be typeset relative to the time signature
+      ;; accidentals not being remembered, causing accidentals always to
+      ;; be typeset relative to the time signature
+      
       ((equal? style 'forget)
        (set-accidentals-properties '()
 				   '(Staff (same-octave . -1))
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 1a136ba772..46eb2ed892 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -264,7 +264,7 @@
   "\n unknown\n")
 
 (define (url-link url x y)
-  (ly:format "~a ~a ~a ~a (~a) mark_URI"
+  (ly:format "~a ~a currentpoint vector_add  ~a ~a currentpoint vector_add (~a) mark_URI"
 	     (car x)
 	     (car y)
 	     (cdr x)