From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 27 Feb 2005 19:04:05 +0000 (+0000)
Subject: * scm/page-layout.scm (TAGLINE): add www.lilypond.org with URL to
X-Git-Tag: release/2.5.14~72
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=822d24d83e62ebf23bf06a42544a973561211f27;p=lilypond.git

* scm/page-layout.scm (TAGLINE): add www.lilypond.org with URL to
tagline.

* scm/output-tex.scm (url-link): stub.

* scm/output-ps.scm (url-link): new function.
---

diff --git a/ChangeLog b/ChangeLog
index 76c70f9821..85847b670e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-02-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scm/page-layout.scm (TAGLINE): add www.lilypond.org with URL to
+	tagline.
+	
+	* scm/output-tex.scm (url-link): stub.
+
+	* scm/output-ps.scm (url-link): new function.
+
 	* lily/lily-parser-scheme.cc (LY_DEFINE): deprecate
 	ly:set-point-and-click
 
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 7e63d7a602..a0e31e79de 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -12,16 +12,38 @@
 @macro inputfileref{DIR,NAME}
 @uref{../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
+@macro usermanref{NAME}
+@inforef{\NAME\,,../../user/out-www/lilypond/index}@c
+@end macro
 @end ifhtml
 
 @ifnothtml
 @macro inputfileref{DIR,NAME}
 @file{\DIR\/\NAME\}@c
 @end macro
+@macro usermanref{NAME}
+See user manual, \NAME\
+@end macro
 @end ifnothtml
 
+
+
 @itemize @bullet
 
+@item
+Point and click editing is now supported in the PS/PDF backend as
+well.
+See
+@ifhtml
+@uref{../../user/out-www/lilypond/Point-and-click.html,Point and click}
+@end ifhtml
+@ifnothtml
+the section Point and click in he user manual. 
+@end ifnothtml
+
+
+
+
 @item
 With the new @code{tieWaitForNote} property, arpeggios may be written
 out using ties, for example,
diff --git a/Documentation/user/point-and-click.itely b/Documentation/user/point-and-click.itely
index df12403bdd..0e81969711 100644
--- a/Documentation/user/point-and-click.itely
+++ b/Documentation/user/point-and-click.itely
@@ -64,6 +64,7 @@ gvim --remote +:@var{line}:norm@var{column} @var{file}
 @end example
 
 @item nedit
+this will invoke
 @example
   nc -noask +@var{line} @var{file}'
 @end example
diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index c7c0956e44..35e8b3bb1f 100644
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -7,8 +7,9 @@
 {pop} {userdict /pdfmark /cleartomark load put} ifelse
 
 
-% llx lly urx ury command
-/mark_file_line
+
+% llx lly urx ury URI
+/mark_URI
 {
     /command exch def
     /ury exch def
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 9492d14b27..dbcc1556e3 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -16,6 +16,20 @@
   "Stencil as markup"
   stil)
 
+
+(def-markup-command (with-url layout props url arg) (string? markup?)
+  "Insert a link to @var{url} in the output."
+  (let*
+      ((stil (interpret-markup layout props arg))
+       (xextent (ly:stencil-extent stil X))
+       (yextent (ly:stencil-extent stil X))
+       (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)))
+
 (def-markup-command (score layout props score) (ly:score?)
   "Inline an image of music."
   (let* ((systems (ly:score-embedded-format score layout)))
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index cd11700e75..01a73c12e0 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -222,7 +222,7 @@
 	 )
 
     (if location
-	(format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_file_line\n"
+	(format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_URI\n"
 		(+ (car offset) (car x-ext))
 		(+ (cdr offset) (car y-ext))
 		(+ (car offset) (cdr x-ext))
@@ -232,6 +232,14 @@
 		(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))
diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index ccd3792fa1..8e77e50ece 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -69,6 +69,8 @@
 (define (unknown) 
   "%\n\\unknown\n")
 
+(define (url-link url x y)
+  "")
 
 
 (define (blank)
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index d576e20ab4..f65c8744dc 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -30,7 +30,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define TAGLINE
-  (string-append "Engraved by LilyPond (version " (lilypond-version) ")"))
+  (make-line-markup
+   (list 
+    (make-simple-markup (string-append "Engraved by LilyPond " (lilypond-version)))
+    (make-simple-markup "-")
+    (make-with-url-markup "http://lilypond.org"
+			  (make-typewriter-markup (make-simple-markup "www.lilypond.org"))
+			  
+			  ))))
 
 (define (page-headfoot layout scopes number sym sepsym dir last?)
   "Create a stencil including separating space."