* scm/output-ps.scm (offset-add): Remove.

* scm/lily-library.scm (offset-flip-y): New function.
* scm/framework-gnome.scm (tweak): Use it.

* scm/lily.scm (ly:all-stencil-expressions): Add url-link.
* scm/output-ps.scm (url-link): Move.
(white-text): Warn user about brokenness.

diff --git a/ChangeLog b/ChangeLog
index 6c386c18b795c8f2fed72fff522d19bdbfa06fe5..49822590118afc811b2b911ecf2f55d347b986e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/output-ps.scm (offset-add): Remove.
+
+       * scm/lily-library.scm (offset-flip-y): New function.
+       * scm/framework-gnome.scm (tweak): Use it.
+
        * scm/output-gnome.scm (grob-cause): Add parameter.
 
        * scm/lily.scm (ly:all-stencil-expressions): Add url-link.

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index b22eb5cc956e4f1c9394d6f59bf0e3b0e9142314..17d95d8819d354d81b06875c5ffc3cf23cd6e7b3 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -227,13 +227,13 @@
   (let* ((grob (hashq-ref (item-grobs go) item #f))
         (extra-offset (ly:grob-property grob 'extra-offset))
         (origin (if (null? extra-offset) '(0 . 0)
-                    (cons (car extra-offset)
-                          (- 0 (cdr extra-offset))))))
+                    (offset-flip-y extra-offset))))
     
     (if grob
-       (ly:insert-tweak grob  (list tweak-grob-property
-                                    'extra-offset
-                                    (offset-add origin offset))))))
+       (ly:insert-tweak
+        grob (list tweak-grob-property
+                   'extra-offset
+                   (offset-flip-y (offset-add origin offset)))))))
 
 (define-method (save-tweaks (go <gnome-outputter>))
   (let* ((dumper (ly:make-dumper))

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index c8789d199e5cf8e4641464da1c9f79f4a434f13f..85bf5db019dbe36baf5f627ed9d8dce96469551a 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -232,6 +232,9 @@ found."
   (cons (+ (car a) (car b))
        (+ (cdr a) (cdr b)))) 
 
+(define-public (offset-flip-y o)
+  (cons (car o) (- (cdr o))))
+
 (define-public (ly:list->offsets accum coords)
   (if (null? coords)
       accum

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index b96b6a03982828feaef315469a19a157e372bd61..b8a4a9bf71cee5a5fef6bd9bb611b346c91874d2 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -68,10 +68,6 @@
 (define (escape-parentheses s)
   (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
 
-(define (offset-add a b)
-  (cons (+ (car a) (car b))
-       (+ (cdr a) (cdr b))))
-
 (define (ps-encoding text)
   (escape-parentheses text))