* scm/backend-library.scm: update email address.

* scm/define-grobs.scm (all-grob-descriptions): use callback to
calc dot count.

* scm/output-lib.scm (string-number::calc-text): new function.
(note-head::calc-duration-log): new function.

* scm/output-lib.scm (fingering::calc-text): new function.

diff --git a/ChangeLog b/ChangeLog
index d560201a60dcb5ec7436da2584af44fae2b6048a..1a1f05cebdcfd51c832f3cb938f97d84d7181191 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-04  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scm/backend-library.scm: update email address.
+
        * Documentation/topdocs/NEWS.tely (Top): add duration-log override
        example.
 

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index c0f5b5ba5dc4a4eea99bf03664e17a190dc3419e..aa432017db6301e658dd77d65822f229333d6a8b 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
 ;; backend helpers.

diff --git a/scm/c++.scm b/scm/c++.scm
index 61fb34e7826130dc4b9ce6865ea20a18aba7f137..adc21cea2301769664b8cdc1cd20e78a0f09d2af 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;; Note: this file can't be used without LilyPond executable
 

diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 2783f32a86970021996b9cc2ee562e9972f7bd6b..b3cdb56946627a20df319b4ade4ecc6188066fc9 100644 (file)
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index bdef88a47644f0aef4e3186778a4200ce2536c12..fe4ba7ab12305dc9e126abfc13e203f9bfbe4e97 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -3,7 +3,7 @@
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define (natural-chord-alteration p)
   "Return the natural alteration for step P."

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index e55c2fb8c0958420101d12db9c43278c67a83f0c..85e4ece2bad3659527b75f3700da859ff786da36 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
 

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 6ab1b55cce9efdbaa82182e06b518ba8369a1b64..5876ae40e91abcf857ecb4840d1d66f3495bfda3 100644 (file)
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 5ad1fad253d32089ab922561f217078bae87c72a..7f46e9890b63b8d6c533f0671486149b5dee2db6 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (define-grob-property symbol type? description)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3d2f9614ee2c0ba624bbea2e67f10eea949f9350..b818532294b9d122d1b4f86203d24eb5f36f4f9c 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index c98fe803c1b426c8fd0306cabea61f988dc0f1d0..a601bd02607929a074df878481b05fbd5de83db8 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
 

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 5fa2b1e74d8194fc27d4e92a53e0cefc46540b59..09f2a14b96b8650903e2e8f7460799ca80617ccf 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (music-property-description symbol type? description)

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 375a1568c043a8b10abcc3e46c137824d4709c63..fb0cc99d258917ff97fe15f00a8821a40721d249 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; TODO: should link back into user manual.

diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index f71689d3c0a9965e8ee88a4cdef6a942736e7df6..6b22d7f300a4aebe842db28dae3220e7a4b3ede7 100644 (file)
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (interface-doc-string interface grob-description)

diff --git a/scm/document-functions.scm b/scm/document-functions.scm
index 2c6bbfcd098778a57025631338ae00f2e601fda5..5515b1312e1861940d2e09003d0d755a878b07bf 100644 (file)
--- a/scm/document-functions.scm
+++ b/scm/document-functions.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (use-modules

diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index 6837ba5c9d0a8354b1143db3819478b92feb036a..c2257640a97ef323e9f50f01969cef425ceb8244 100644 (file)
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (doc-markup-function func)

diff --git a/scm/document-music.scm b/scm/document-music.scm
index 6070cf769257a616d98313fceca5ce0ac0f0d6e3..d6bd4e1c59c3b836a38221628a16ad79e1de3e8f 100644 (file)
--- a/scm/document-music.scm
+++ b/scm/document-music.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (music-props-doc)

diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index 9b4d7a23f6e252cb611cba3d34511b9c3f982b48..47848728972c5beec4663ea975a04dc8d5be4ddb 100644 (file)
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (engraver-makes-grob? name-symbol grav)

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index b159daeb4e6cd7b79b9d1baac7bf89c1a0e39422..6143f60993cf5ccf5a2ef0b01db4a49a01bcaede 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;; File entry point for generated documentation

diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index 859032cc422c661461a7c5921b5443e54d198e2f..ce91651e7785234fcec35d80698aae021d1a1d11 100644 (file)
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (use-modules (oop goops)

diff --git a/scm/file-cache.scm b/scm/file-cache.scm
index 3868c40dd5d9d7151c16f472eccddd1b2d32a789..332f9bab107ef7af33d8ee9604bb3c1b0f593439 100644 (file)
--- a/scm/file-cache.scm
+++ b/scm/file-cache.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2005--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define cache-hash-tab  (make-hash-table 11))

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 643a979642a860e2381377c43b068c1e6160a5d6..ad5125d3dd549258a74abcc1df0b0af199ffd871 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-eps))
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 60e241ac16d0770cb275ffdc3991de09bdadb33a..10934b84e86812e3d2e4c97c568386c350578686 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 001da511130b6f488819fc7aaeb3d0c317b1f5d2..83c64820e566d0b1cc48d1514d121d81a410ecc3 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-tex)
   #:export (output-framework-tex       

diff --git a/scm/framework-texstr.scm b/scm/framework-texstr.scm
index 88bc25a228e0200c6ce9e18e3aba338b02c1d7b0..5078b35b9d53dc7845675a9487769bd97817c806 100644 (file)
--- a/scm/framework-texstr.scm
+++ b/scm/framework-texstr.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-texstr)
   #:export (output-framework-tex       

diff --git a/scm/layout-page-dump.scm b/scm/layout-page-dump.scm
index edb2780a5330b742479138a72f98e323362bb86d..50815ac2ef8c833603eb91f223ac8b120e53fdf2 100644 (file)
--- a/scm/layout-page-dump.scm
+++ b/scm/layout-page-dump.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;    2006 Nicolas Sceaux <nicolas.sceaux@free.fr>
 
 (define-module (scm layout-page-dump)

diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 6328b8d1229bed22826dd1dcefab752a8cd07c59..e370a171323254050179f6e777eea2bece37b859 100644 (file)
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
 ;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;         Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;         Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm layout-page-layout)
   #:use-module (srfi srfi-1)

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index acb29bb8530a25702fbfe01f305d0fb48feeb217..492e38d5ecfc0cf99e56897f95965aca95e6c4f4 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -4,7 +4,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define-public X 0)
@@ -391,6 +391,13 @@ found."
 ;;
 
 
+(define-public (string-encode-integer i)
+  (cond
+   ((= i  0) "o")
+   ((< i 0)   (string-append "n" (string-encode-integer (- i))))
+   (else (string-append
+         (make-string 1 (integer->char (+ 65 (modulo i 26))))
+         (string-encode-integer (quotient i 26))))))
 
 (define-public (ly:numbers->string lst)
   (string-join (map ly:number->string lst) " "))

diff --git a/scm/lily.scm b/scm/lily.scm
index 5c7e09cab9ff537e7aa76f2b6247095af10d4a66..8385bbdd00918d6b224b096b0ee8c6798f76c676 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define (define-scheme-options)

diff --git a/scm/markup.scm b/scm/markup.scm
index a98ba122db072d329bcc29e65eff99ecbeb9f0f0..268efaf879e971ef69c0a0292cbf40c83d244235 100644 (file)
--- a/scm/markup.scm
+++ b/scm/markup.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 "
 Internally markup is stored as lists, whose head is a function.

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index ff0e768c0a0e4a9f74a6e2635661b3179e19e1bc..86d2f2e0ddd5a509acc3e900ed40ac46e511225d 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; (use-modules (ice-9 optargs)) 
 

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 7eeefa3bad4adf6a2cb56f898d32d08e0e6e3141..7281fee947a87e0dbb79956746ee14499c402785 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -3,10 +3,37 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; general
+
+(define-public (make-stencil-boxer thickness padding callback)
+
+  "Return function that adds a box around the grob passed as argument."
+  (lambda (grob)
+    
+    (box-stencil (callback grob) thickness padding)))
+
+(define-public (make-stencil-circler thickness padding callback)
+  "Return function that adds a circle around the grob passed as argument."
+  
+  (lambda (grob) (circle-stencil (callback grob) thickness padding)))
+
+(define-public (print-circled-text-callback grob)
+  (let* ((text (ly:grob-property grob 'text))
+        
+        (layout (ly:grob-layout grob))
+        (defs (ly:output-def-lookup layout 'text-font-defaults))
+        (props (ly:grob-alist-chain grob defs))
+        (circle (ly:text-interface::interpret-markup
+                 layout props (make-circle-markup text))))
+    circle))
+
+
 (define-public (event-cause grob)
   (let*
       ((cause (ly:grob-property  grob 'cause)))
@@ -17,19 +44,7 @@
      (else #f))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; note heads
-
-(define-public (note-head::calc-duration-log grob)
-  (ly:duration-log
-   (ly:event-property (event-cause grob) 'duration)))
-
-(define-public (dots::calc-dot-count grob)
-  (ly:duration-dot-count
-   (ly:event-property (event-cause grob) 'duration)))
-
-;; The TabNoteHead stem attachment function.
-(define (note-head::calc-tablature-stem-attachment grob)
-  (cons 0.0 1.35))
+;; tablature
 
 ;; The TabNoteHead tablatureFormat callback.
 ;; Compute the text grob-property
@@ -74,33 +89,21 @@
 (define-public (four-string-banjo tuning)
   (reverse (cdr (reverse tuning))))
 
-;;; end of tablature functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; note heads
 
-(define-public (make-stencil-boxer thickness padding callback)
+(define-public (note-head::calc-duration-log grob)
+  (ly:duration-log
+   (ly:event-property (event-cause grob) 'duration)))
 
-  "Return function that adds a box around the grob passed as argument."
-  (lambda (grob)
-    
-    (box-stencil (callback grob) thickness padding)))
+(define-public (dots::calc-dot-count grob)
+  (ly:duration-dot-count
+   (ly:event-property (event-cause grob) 'duration)))
 
-(define-public (make-stencil-circler thickness padding callback)
-  "Return function that adds a circle around the grob passed as argument."
-  (lambda (grob) (circle-stencil (callback grob) thickness padding)))
+(define (note-head::calc-tablature-stem-attachment grob)
+  (cons 0.0 1.35))
 
-(define-public (arg->string arg)
-  (cond ((number? arg) (ly:inexact->string arg 10))
-       ((string? arg) (string-append "\"" arg "\""))
-       ((symbol? arg) (string-append "\"" (symbol->string arg) "\""))))
 
-(define-public (print-circled-text-callback grob)
-  (let* ((text (ly:grob-property grob 'text))
-        
-        (layout (ly:grob-layout grob))
-        (defs (ly:output-def-lookup layout 'text-font-defaults))
-        (props (ly:grob-alist-chain grob defs))
-        (circle (ly:text-interface::interpret-markup
-                 layout props (make-circle-markup text))))
-    circle))
 
 ;; silly, use alist? 
 (define-public (note-head::calc-glyph-name grob)
@@ -151,13 +154,9 @@ centered, X==1 is at the right, X == -1 is at the left."
 
   '(1.0 . 0.0))
 
-(define-public (string-encode-integer i)
-  (cond
-   ((= i  0) "o")
-   ((< i 0)   (string-append "n" (string-encode-integer (- i))))
-   (else (string-append
-         (make-string 1 (integer->char (+ 65 (modulo i 26))))
-         (string-encode-integer (quotient i 26))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; bar numbers
 
 (define-public ((every-nth-bar-number-visible n) barnum) (= 0 (modulo barnum n)))
 
@@ -169,7 +168,9 @@ centered, X==1 is at the right, X == -1 is at the left."
 
 (define-public (first-bar-number-invisible barnum) (> barnum 1))
 
-;; See documentation of ly:item::visibility-lambda-
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; break visibility
+
 (define-public begin-of-line-visible
   #(#f #f #t))
 (define-public end-of-line-visible

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index f5dcc38a59becef440da81678c497bd47d1abca7..a50f82d639da8dfd80e8e15be14d738e9d6a4643 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
 ;;;;       input/test/title-markup.ly

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 0f36375f0db97f49dbeabc7f5593e56415f37bcf..3a3e023ebe77e302b0c65341a7763cc7ce91cb65 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 ;; The public interface is tight.

diff --git a/scm/output-texstr.scm b/scm/output-texstr.scm
index 35ed35e3b31d05c3f76f727764867cad9d7845cb..81303dc0cace8d595283b9e45050266113e74e93 100644 (file)
--- a/scm/output-texstr.scm
+++ b/scm/output-texstr.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm output-texstr))
 (define this-module (current-module))

diff --git a/scm/paper.scm b/scm/paper.scm
index 5cd99e70cdbda708e8809f464d54a18d40bace43..666745faf4c8b6097543525681fbbc6b1071be12 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables

diff --git a/scm/parser-clef.scm b/scm/parser-clef.scm
index 85d6e6de5f7aec06674c4cb2c1b47ad6662a3e9c..0095d29e81c08a652a0dbccadf225c6ae8976ccb 100644 (file)
--- a/scm/parser-clef.scm
+++ b/scm/parser-clef.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 ;; (name . (glyph clef-position octavation))

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index bd9ce0f720f0cd5e65a0f43063bc25951427fb29..2fd78599ee0d4bd98c3c799cc654058b90c18067 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006    Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006    Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; todo: figure out how to make module,
 ;; without breaking nested ly scopes

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 5a664e2d9b4e9f966734519303e98c5cf3754b7c..31161e25cf0ff78491ff0448e8196eac5f42c6d0 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (map
  (lambda (sym)

diff --git a/scm/script.scm b/scm/script.scm
index 5b24e0455e837313962aabc5a97f90922c27cecd..733380dbd6644f373047fa8e4bd5b37c334fe603 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (set! default-script-alist
       (append 

diff --git a/scm/standalone.scm b/scm/standalone.scm
index e7a1e2b290829db385f9a18ba53bfbe07e7b3ca3..681a49d04297727f11ff25c2ac8a757e7d755811 100644 (file)
--- a/scm/standalone.scm
+++ b/scm/standalone.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define standalone (not (defined? 'ly:gulp-file)))
 ;;(write standalone (current-error-port))

diff --git a/scm/stencil.scm b/scm/stencil.scm
index 567e0a3099a9c1bbb63a129b48793834ca7bf73c..f39328984ba3c2c64f646cd61dba1358a5e8809d 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (stack-stencils axis dir padding stils)
   "Stack stencils STILS in direction AXIS, DIR, using PADDING."

diff --git a/scm/titling.scm b/scm/titling.scm
index f6ac5f0b124ecc84f08a0023a9da150116f70cbd..7eae28e66df9e78300e7f694de1a4783626b0d42 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
 ;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;          Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (layout-extract-page-properties layout)
   (list (append `((line-width . ,(ly:paper-get-number

diff --git a/scm/to-xml.scm b/scm/to-xml.scm
index dd9e5bfca7ec5a38ae198763fd8afc9fcf7dd507..5f2828a3704089de71308354bbc80c975d98d4a6 100644 (file)
--- a/scm/to-xml.scm
+++ b/scm/to-xml.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (use-modules (ice-9 regex)

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 96a5c7ec27b2c7f1bab4268337b5a3127e3984e8..0bf05bca5714b96739ae18d7b034c5ec1ec9897c 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; metronome marks