From 11bb2a121bdee78da22db2ce792f21d636411b3a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 1 Mar 2005 16:18:58 +0000
Subject: [PATCH] * scm/output-gnome.scm (grob-cause): Add parameter.

* scm/lily.scm (ly:all-stencil-expressions): Add url-link.
* scm/output-ps.scm (url-link): Move.
(white-text): Warn user about brokenness.
---
 ChangeLog            |  6 ++++++
 scm/lily.scm         |  1 +
 scm/output-gnome.scm |  2 +-
 scm/output-ps.scm    | 39 ++++++++++++++++++++-------------------
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b03f96716..6c386c18b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* scm/output-gnome.scm (grob-cause): Add parameter.
+
+	* scm/lily.scm (ly:all-stencil-expressions): Add url-link.
+	* scm/output-ps.scm (url-link): Move.
+	(white-text): Warn user about brokenness.
+
 	* Documentation/topdocs/NEWS.tely: Be more accurate and respectful
 	wrt ghostscript.
 
diff --git a/scm/lily.scm b/scm/lily.scm
index 5721296ab7..6a6c8c6474 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -139,6 +139,7 @@ predicates. Print a message at LOCATION if any predicate failed."
     repeat-slash
     round-filled-box
     text
+    url-link
     white-dot
     white-text
     embedded-ps
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index aa73c2ab44..0c0c0ce80d 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -338,7 +338,7 @@ lilypond -fgnome input/simple-song.ly
 		  (ly:font-glyph-name-to-charcode font (caddr x))))))
    x-y-named-glyphs))
 
-(define (grob-cause grob)
+(define (grob-cause offset grob)
   grob)
 
 ;; WTF is this in every backend?
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index fbdffd487b..b96b6a0398 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -235,14 +235,6 @@
 		(caddr location))
 	"")))
 
-(define (url-link url x y)
-  (format "~a ~a ~a ~a (~a) mark_URI"
-	  (car x)
-	  (car y)
-	  (cdr x)
-	  (cdr y)
-	  url))
-
 ;; WTF is this in every backend?
 (define (horizontal-line x1 x2 th)
   (draw-line th x1 0 x2 0))
@@ -305,6 +297,23 @@
 	      (string-append "/" (symbol->string sym) " glyphshow")))
 	out-vec))))))
 
+(define (unknown) 
+  "\n unknown\n")
+
+(define (url-link url x y)
+  (format "~a ~a ~a ~a (~a) mark_URI"
+	  (car x)
+	  (car y)
+	  (cdr x)
+	  (cdr y)
+	  url))
+
+(define (white-dot x y radius)
+  (string-append
+   " "
+   (ly:numbers->string
+    (list x y radius)) " draw_white_dot"))
+
 ;; FIXME: BARF helvetica?
 (define (white-text scale s)
   (let ((mystring (string-append
@@ -313,20 +322,12 @@
 		   " draw_white_text")))
     mystring
 
-
-    ;; FIXME: broken with user install of GS 8.x
+    ;; FIXME
+    (ly:warn "FIXME: white-text broken for Han-Wen's $HOME install of GS 8.x")
+    
     ""
     ))
 
-(define (unknown) 
-  "\n unknown\n")
-
-(define (white-dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_white_dot"))
-
 (define (zigzag-line centre? zzw zzh thick dx dy)
   (string-append
    (if centre? "true" "false") " "
-- 
2.39.5