Fix #264

Use currentpoint in mark_URI input.

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 8864569af1a0b191e04ecf0a500cefc76b214f99..2df5913accf0d072761995820353bc41245e4eca 100644 (file)
--- 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 a2e128d5f0b0d966ab605dfc922d192ade1e3011..42ce759bb7c31cea59d90456db7e45c97d933511 100644 (file)
--- 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 c4bfa93d18afb11f0c915049a8628745dde136f3..681c2c7b082bcc6719601d03f054e9f72aeaab50 100644 (file)
--- 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 1a136ba772b2f14dbd6c843daeffcf842386245d..46eb2ed892ce93d7f4761e1b02d0152572106947 100644 (file)
--- 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)