Fix #264

Use currentpoint in mark_URI input.

Conflicts:

	scm/output-ps.scm

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 c144b7b32e8c29163c6d0fefe7b0510452cc558d..45a0afca69fefad761814bf9a328a845c257db0f 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -72,6 +72,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 42ea3270953f988596151a0866fb39d35441f5a1..ad55398b0cdef9e9278bb497a819f81f7b5d0dc3 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -921,11 +921,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 8af5b3fa3dd47d1164f2148fd51e90236a7ffcdd..d3b1a326cfa4fc7a1cbc1c56ef96d6dd311e52be 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -307,12 +307,12 @@
   "\n unknown\n")
 
 (define (url-link url x y)
-  (format #f "~a ~a ~a ~a (~a) mark_URI"
-         (car x)
-         (car y)
-         (cdr x)
-         (cdr y)
-         url))
+  (format #f "~a ~a currentpoint vector_add  ~a ~a currentpoint vector_add (~a) mark_URI"
+            (car x)
+            (car y)
+            (cdr x)
+            (cdr y)
+            url))
 
 (define (utf-8-string pango-font-description string)
   (ly:warning (_ "utf-8-string encountered in PS backend")))