From: fred <fred>
Date: Tue, 26 Mar 2002 21:51:37 +0000 (+0000)
Subject: lilypond-1.1.13
X-Git-Tag: release/1.5.59~2341
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8475c6eac5b53b6c72fe4e4762479a3bd9c7d654;p=lilypond.git

lilypond-1.1.13
---

diff --git a/init/lily.scm b/init/lily.scm
deleted file mode 100644
index 14ca7a7fe8..0000000000
--- a/init/lily.scm
+++ /dev/null
@@ -1,423 +0,0 @@
-; lily.scm -- implement Scheme output routines for TeX and PostScript
-;
-;  source file of the GNU LilyPond music typesetter
-; 
-; (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
-
-; TODO
-;   - naming
-;   - ready ps code (draw_bracket) vs tex/ps macros/calls (pianobrace),
-;     all preparations from ps,tex to scm
-
-;;; library funtions
-(define
-  (xnumbers->string l)
-  (string-append 
-   (map (lambda (n) (string-append (number->string n ) " ")) l)))
-
-(define
-  (numbers->string l)
-  (apply string-append 
-	 (map (lambda (n) (string-append (number->string n) " ")) l)))
-
-(define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x))
-
-(define (number->octal-string x)
-  (let* ((n (inexact->exact x))
-         (n64 (quotient n 64))
-         (n8 (quotient (- n (* n64 64)) 8)))
-    (string-append
-     (number->string n64)
-     (number->string n8)
-     (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8)))))
-
-(define (inexact->string x radix)
-  (let ((n (inexact->exact x)))
-    (number->string n radix)))
-
-
-(define
-  (control->string c)
-  (string-append
-   (string-append (number->string (car c)) " ")
-   (string-append (number->string (cadr c)) " ")))
-
-
-
-(define
-  (font i)
-  (string-append
-   "font"
-   (make-string 1 (integer->char (+ (char->integer #\A) i)))
-   ))
-
-
-
-(define (scm-scm action-name)
-  1)
-
-;;;;;;;;
-
-(define (empty) 
-  "")
-
-(define (empty1 a)
-  "")
-
-(define (empty2 a b )
-  "")
-
-
-(define emptybar empty1)
-(define setdynamic empty1)
-(define startrepeat empty1)
-(define repeatbar empty1)
-(define finishbar empty1)
-(define extender empty1)
-(define startbar empty1)
-(define repeatbarstartrepeat empty1)
-(define fatdoublebar empty1)
-(define setfinger empty1)
-
-
-(define (settext s) (text "text" s))
-(define (setnumber s) (text "number" s))
-(define (setbold s) (text "bold" s))
-(define (setitalic s) (text "italic" s))
-(define (setnumber-1 s) (text "numberj" s))
-  
-
-
-;;;;;;;; TeX
-
-(define (tex-scm action-name)
-
-  (define (unknown) 
-    "%\n\\unknown%\n")
-
-  (define (beam width slope thick)
-    (embedded-ps ((ps-scm 'beam) width slope thick)))
-
-  (define (bracket h)
-    (embedded-ps ((ps-scm 'bracket) h)))
-
-  (define (dashed-slur thick dash l)
-    (embedded-ps ((ps-scm 'dashed-slur)  thick dash l)))
-
-  (define (crescendo w h cont)
-    (embedded-ps ((ps-scm 'crescendo) w h cont)))
-
-  (define (decrescendo w h cont)
-    (embedded-ps ((ps-scm 'decrescendo) w h cont)))
-
-  (define (embedded-ps s)
-    (string-append "\\embeddedps{" s "}"))
-
-
-  (define (end-output) 
-    "\n\\EndLilyPondOutput")
-  
-  (define (experimental-on) "\\turnOnExperimentalFeatures")
-
-  (define (extender o h)
-    ((invoke-output o "invoke-dim1") "extender" h))
-
-  (define (font-switch i)
-    (string-append
-     "\\" (font i) "\n"))
-
-  (define (font-def i s)
-    (string-append
-     "\\font" (font-switch i) "=" s "\n"))
-
-  (define (generalmeter num den)
-    (string-append 
-     "\\generalmeter{" (number->string (inexact->exact num)) "}{" (number->string (inexact->exact den)) "}"))
-
-  (define (header-end) "\\turnOnPostScript")
-
-  (define (header creator generate) 
-    (string-append
-     "%created by: " creator generate "\n"))
-
-  (define (invoke-char s i)
-    (string-append 
-     "\n\\" s "{" (inexact->string i 10) "}" ))
-  (define (char i)
-    (string-append "\\show{" (inexact->string i 10) "}"))
-  
-  (define (invoke-dim1 s d)
-    (string-append
-     "\n\\" s "{" (number->dim d) "}"))
-
-  (define (lily-def key val)
-    (string-append
-     "\\def\\" key "{" val "}\n"))
-
-  (define (number->dim x)
-    (string-append 
-     (number->string (chop-decimal x)) "pt "))
-
-  (define (placebox x y s) 
-    (string-append 
-     "\\placebox{"
-     (number->dim y) "}{" (number->dim x) "}{" s "}"))
-
-  (define (pianobrace y)
-    (define step 1.0)
-    (define minht mudelapaperstaffheight)
-    (define maxht (* 6 minht))
-    (string-append
-     "{\\bracefont " (char  (/  (- (max y (- maxht step)) minht)   step)) "}"))
-  
-  (define (rulesym h w) 
-    (string-append 
-     "\\vrule height " (number->dim (/ h 2))
-     " depth " (number->dim (/ h 2))
-     " width " (number->dim w)
-     )
-    )
-
-  (define (slur l)
-    (embedded-ps ((ps-scm 'slur) l)))
-
-  (define (start-line) 
-    (string-append 
-     "\\hbox{%\n")
-    )
-
-  (define (stem kern width height depth) 
-    (string-append 
-     "\\kern" (number->dim kern)
-     "\\vrule width " (number->dim width)
-     "depth " (number->dim depth)
-     "height " (number->dim height) " "))
-
-  (define (stop-line) 
-    "}\\interscoreline")
-
-  (define (text f s)
-    (string-append "\\set" f "{" s "}"))
-
-  
-  (define (tuplet dx dy dir)
-    (embedded-ps ((ps-scm 'tuplet) dx dy dir)))
-
-  (define (volta w last)
-    (embedded-ps ((ps-scm 'volta)  w last)))
-
-  (define (maatstreep h)
-    (string-append "\\maatstreep{" (number->dim h) "}"))
-  
-  (cond ((eq? action-name 'all-definitions)
-	 `(begin
-	    (define beam ,beam)
-	    (define tuplet ,tuplet)
-	    (define bracket ,bracket)
-	    (define crescendo ,crescendo)
-	    (define volta ,volta)
-	    (define slur ,slur)
-	    (define dashed-slur ,dashed-slur) 
-	    (define decrescendo ,decrescendo) 
-	    (define empty ,empty)
-	    (define end-output ,end-output)
-	    (define font-def ,font-def)
-	    (define font-switch ,font-switch)
-	    (define generalmeter ,generalmeter)
-	    (define header-end ,header-end)
-	    (define lily-def ,lily-def)
-	    (define header ,header) 
-	    (define invoke-char ,invoke-char) 
-	    (define invoke-dim1 ,invoke-dim1)
-	    (define placebox ,placebox)
-	    (define rulesym ,rulesym)
-	    (define start-line ,start-line)
-	    (define stem ,stem)
-	    (define stop-line ,stop-line)
-	    (define text ,text)
-	    (define experimental-on  ,experimental-on)
-	    (define char  ,char)
-	    (define maatstreep ,maatstreep)
-	    (define pianobrace ,pianobrace)
-	    ))
-
-	((eq? action-name 'experimental-on) experimental-on)
-	((eq? action-name 'beam) beam)
-	((eq? action-name 'tuplet) tuplet)
-	((eq? action-name 'bracket) bracket)
-	((eq? action-name 'crescendo) crescendo)
-	((eq? action-name 'volta) volta)
-	((eq? action-name 'slur) slur)
-	((eq? action-name 'dashed-slur) dashed-slur) 
-	((eq? action-name 'decrescendo) decrescendo) 
-	((eq? action-name 'empty) empty)
-	((eq? action-name 'end-output) end-output)
-	((eq? action-name 'font-def) font-def)
-	((eq? action-name 'font-switch) font-switch)
-	((eq? action-name 'generalmeter) generalmeter)
-	((eq? action-name 'header-end) header-end)
-	((eq? action-name 'lily-def) lily-def)
-	((eq? action-name 'header) header) 
-	((eq? action-name 'invoke-char) invoke-char) 
-	((eq? action-name 'invoke-dim1) invoke-dim1)
-	((eq? action-name 'placebox) placebox)
-	((eq? action-name 'rulesym) rulesym)
-	((eq? action-name 'start-line) start-line)
-	((eq? action-name 'stem) stem)
-	((eq? action-name 'stop-line) stop-line)
-	(else (error "unknown tag -- PS-TEX " action-name))
-	)
-
-  )
-
-;;;;;;;;;;;; PS
-(define (ps-scm action-name)
-  (define (beam width slope thick)
-    (string-append
-     (numbers->string (list width slope thick)) " draw_beam " ))
-
-  (define (bracket h)
-    (invoke-dim1 "draw_bracket" h))
-
-  (define (crescendo w h cont)
-    (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
-     "draw_crescendo"))
-
-  (define (dashed-slur thick dash l)
-    (string-append 
-     (apply string-append (map control->string l)) 
-     (number->string thick) 
-     " [ "
-     (if (> 1 dash) (number->string (- (* thick dash) thick)) "0") " "
-     (number->string (* 2 thick))
-     " ] 0 draw_dashed_slur"))
-
-  (define (decrescendo w h cont)
-    (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
-     "draw_decrescendo"))
-
-  (define (empty) 
-    "\n empty\n")
-
-  (define (end-output)
-    "\nshowpage\n")
-
-  (define (experimental-on) "")
-
-  (define (font-def i s)
-    (string-append
-     "\n/" (font i) " {/" 
-     (substring s 0 (- (string-length s) 4))
-     " findfont 12 scalefont setfont} bind def\n"))
-
-  (define (font-switch i)
-    (string-append (font i) " "))
-
-  (define (generalmeter num den)
-    (string-append (number->string (inexact->exact num)) " " (number->string (inexact->exact den)) " generalmeter "))
-
-  (define (header-end) "")
-  (define (lily-def key val)
-    (string-append
-     "/" key " {" val "} bind def\n"))
-
-  (define (header creator generate) 
-    (string-append
-     "%!PS-Adobe-3.0\n"
-     "%%Creator: " creator generate "\n"))
-
-  (define (invoke-char s i)
-    (string-append 
-     "(\\" (inexact->string i 8) ") " s " " ))
-
-  (define (invoke-dim1 s d) 
-    (string-append
-     (number->string d) " " s ))
-
-  (define (placebox x y s) 
-    (string-append 
-     (number->string x) " " (number->string y) " {" s "} placebox "))
-
-  (define (rulesym x y) 
-    (string-append 
-     (number->string x) " "
-     (number->string y) " "
-     "rulesym"))
-
-  (define (slur l)
-    (string-append 
-     (apply string-append (map control->string l)) 
-     " draw_slur"))
-
-  (define (start-line) 
-    "\nstart_line {\n")
-
-  (define (stem kern width height depth) 
-    (string-append (numbers->string (list kern width height depth))
-		   "draw_stem" ))
-
-  (define (stop-line) 
-    "}\nstop_line\n")
-
-  (define (text f s)
-    (string-append "(" s ") set" f " "))
-
-
-  (define (volta w last)
-    (string-append 
-     (numbers->string (list w (inexact->exact last)))
-     "draw_volta"))
-  (define   (tuplet dx dy dir)
-    (string-append 
-     (numbers->string (list dx dy (inexact->exact dir)))
-     "draw_tuplet"))
-
-
-  (define (unknown) 
-    "\n unknown\n")
-
-
-  ; dispatch on action-name
-  (cond ((eq? action-name 'all-definitions)
-	 `(begin
-	    (define beam ,beam)
-	    (define tuplet ,tuplet)
-	    (define bracket ,bracket)
-	    (define crescendo ,crescendo)
-	    (define volta ,volta)
-	    (define slur ,slur)
-	    (define dashed-slur ,dashed-slur) 
-	    (define decrescendo ,decrescendo) 
-	    (define empty ,empty)
-	    (define end-output ,end-output)
-	    (define font-def ,font-def)
-	    (define font-switch ,font-switch)
-	    (define generalmeter ,generalmeter)
-	    (define header-end ,header-end)
-	    (define lily-def ,lily-def)
-	    (define header ,header) 
-	    (define invoke-char ,invoke-char) 
-	    (define invoke-dim1 ,invoke-dim1)
-	    (define placebox ,placebox)
-	    (define rulesym ,rulesym)
-	    (define start-line ,start-line)
-	    (define stem ,stem)
-	    (define stop-line ,stop-line)
-	    (define text ,text)
-	    ))
-	((eq? action-name 'tuplet) tuplet)
-	((eq? action-name 'beam) beam)
-	((eq? action-name 'bracket) bracket)
-	((eq? action-name 'crescendo) crescendo)
-	((eq? action-name 'volta) volta)
-	((eq? action-name 'slur) slur)
-	((eq? action-name 'dashed-slur) dashed-slur) 
-	((eq? action-name 'decrescendo) decrescendo)
-	(else (error "unknown tag -- PS-SCM " action-name))
-	)
-  )
-
-
-
diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly
deleted file mode 100644
index 45e3e12b10..0000000000
--- a/mutopia/standchen-16.ly
+++ /dev/null
@@ -1,14 +0,0 @@
-\header{
-filename =	 "standchen.ly";
-title =	 "St\"andchen (Serenade) \"Leise flehen meine Lieder\"";
-opus =	 "D. 957 No. 4";
-composer =	 "Franz Schubert (1797-1828)";
-poet= "Text by Ludwig Rellstab (1799-1860)";
-enteredby =	 "JCN";
-description = "A schubert song in 16 pt";
-copyright =	 "public domain";
-} 
-
-\version "1.0.10";
-
-\include "standchen.ly"
diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly
deleted file mode 100644
index b1327373ec..0000000000
--- a/mutopia/standchen-20.ly
+++ /dev/null
@@ -1,15 +0,0 @@
-\header{
-filename =	 "standchen.ly";
-title =	 "St\"andchen (Serenade) Leise flehen meine Lieder\"";
-opus =	 "D. 957 No. 4";
-composer =	 "Franz Schubert (1797-1828)"
-	 "Text by Ludwig Rellstab (1799-1860)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-description = "A schubert song in 20 pt";
-} 
-
-\version "1.0.10";
-
-% fool make-website
-% \include "standchen.ly";
diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
deleted file mode 100644
index abf8201317..0000000000
--- a/mutopia/standchen.ly
+++ /dev/null
@@ -1,469 +0,0 @@
-\header{
-filename =	 "standchen.ly";
-title    = "St\\\"andchen";
-subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
-opus =	 "D. 957 No. 4";
-date = "August 1828";
-composer =	 "Franz Schubert (1797-1828)";
-poet=	 "Text by Ludwig Rellstab (1799-1860)";
-enteredby =	 "JCN";
-copyright =	 "public domain";
-} 
-
-%{
- Tested Features@ multivoice accents lyrics chords piano music
-multiple \paper{}s in one \score 
-Note: Original key F.
-%}
-
-\version "1.0.10";
-
-$vocal_verse1 = \notes\relative c{
-	% ugh: treble/bass
-%	\clef treble;
-%	\clef violin;
-	\property Voice.dynamicdir=1
-	\times 2/3 { [ g''8( )as] g } c4. g8 |
-	\times 2/3 { [ f8( )g] f } c'4 f,8 r |
-	g4.-> f8 \times 2/3 { [ f( )es] d } |
-	es2 r4 |
-	% ugh: a whole should be a measure
-	%r1 |
-	R2. |
-	R2. |
-	\times 2/3 { [ g8( )as] g } es'4. g,8 |
-	\times 2/3 { [ f8( )g] f } d'4. c8 |
-	bes4. as8 \times 2/3 { [ as( )g] f } |
-	g2 r4 |
-	R2. |
-	R2. |
-	g8. b16 es4. d8 |
-	c8. g16 es4. c8 |
-	% \times 2/3 { [ as\grace( bes ] )
-%	\tiny  [as'16*1/16 bes16*1/16 ] 
-%	\normalsize \times 2/3 {  [as8 g8] as8 } c4. as8 |
-	\times 2/3 { [ as'8( )g] as } c4. as8 |
-	g2. |
-	%\times 2/3 { [ f\grace( g] )
-	\times 2/3 { [ f8( )e] f } as4. f8 |
-	%\tiny \times 2/3 {  [f`16*1/16 g16*1/16] \normalsize
-	es!2. |
-	g8. b16 es4. d8 |
-	c8. g16 e4. c8 |
-	% \times 2/3 { [ a\grace( b] )
-	\times 2/3 { [ a'!8( ) gis] a } c4. a8 |
-	g!2. |
-	% \times 2/3 { [ a\grace( b] )
-	\times 2/3 { [ d'8\f cis] d } f4. b,8 |
-	c!2. |
-}
-
-$vocal_through = \notes\relative c{
-	\property Voice.dynamicdir=1
-	g''8. g16 b8. b16 d8. d16 |
-	c4 b r |
-	g4. b8 d8. c16 |
-	b2 r4 |
-	e4. d8 \times 2/3 { [ d( )c] b } |
-	a8. b16 c4-> a8 r |
-	R2. |
-	R2. |
-	% 4 bars copied from end verse 1
-	% \times 2/3 { [ a\grace( b] )
-	\times 2/3 { [ a!8( ) gis] a } c4. a8 |
-	g!2. |
-	% \times 2/3 { [ a\grace( b] )
-	\times 2/3 { [ d'8\f cis] d } f4. b,8 |
-	c!2. ~ |
-	c4 r c |
-	as2. |
-	g |
-	e2 r4 |
-}
-
-$lyric_verse1 = \lyrics{
-% 5
-	\times 2/3 {  Lei-4 se8 } fleh-4. en8 |
-	\times 2/3 {  mei-4 ne8 } Lie-4 der8 _8 |
-	Durch4. die8 \times 2/3 {  Nacht4 zu8 } |
-	dir;2 _4 |
-	_4 _ _ |
-	_ _ _ |
-% 11
-	\times 2/3 {  In4 den8 } stil-4. len8 |
-	\times 2/3 {  Hain4 her-8 } nie-4. der8 |
-	Lieb-4. chen,8 \times 2/3 {  komm4 zu8 } |
-	mir!2 _4 |
-	_4 _ _ |
-	_ _ _ |
-% 17
-	Fl\"us-8. ternd16 schlan-4. ke8 |
-	Wip-8. fel16 rau-4. schen8 |
-	\times 2/3 {  In4 des8 } Mon-4. des8 |
-	Licht;2. |
-	\times 2/3 {  In4 des8 } Mon-4. des8 |
-	Licht;2. |
-% 23 
-	Des8. Ver-16 r\"a-4. thers8 |
-	feind-8. lich16 Lau-4. schen8 |
-	\times 2/3 {  F\"urch-4 te8 } Hol-4. de8 |
-	nicht2. |
-	\times 2/3 {  f\"urch-4 te8 } Hol-4. de8 |
-	nicht.2. |
-}
-	
-$lyric_verse2 = \lyrics{
-% 5
-	\times 2/3 {  H\"orst4 die8 } Nach-4. ti-8 
-	\times 2/3 {  gal-4 len8 } schla-4 gen?8 _8
-	ach!4. sie8 \times 2/3 {  fleh-4 en8 } 
-	dich,2 _4
-	_4 _ _ 
-	_4_ _
-
-% 11
-	\times 2/3 {  Mit4 der8 } T\"o-4. ne8
- 	\times 2/3 {  s\"u-4 "\ss{}en"8 } Kla-4. gen8
-	Fleh-4. en8 \times 2/3 {  sie4 f\"ur8 }
-	mich2 _4
-	_4_ _ 
-	_4_ _
-
-% 17
-	Sie-8. ver-16 stehn4. des8
-	Bus-8. ens16 Seh-4. nen8
-	\times 2/3 {  Ken-4 nen8 } Lieb-4. es-8 
-	schmerz,2.
-	\times 2/3 {  Ken-4 nen8 } Lieb-4. es-8 
-	schmerz.2.
-
-% 23
-	R\"uh-8. ren16 mit4. den8 
-	Sil-8. ber-16 t\"o-4. nen8
-	\times 2/3 {  jed-4 es8 } wei-4. che8 
-	Herz,2.
-	\times 2/3 {  jed-4 es8 } wei-4. che8 
-	Herz.2.
-}
-
-$lyric_through = \lyrics{
-% 37
-	La\ss8. auch16 dir8. die16 Brust8. be-16 |
-	we-4 gen _ |
-	Lieb-4. chen,8 h\"o-8. re16 |
-	mich!2 _4 |
-	Be-4. bend8 \times 2/3 {  harr'4 ich8} |
-	dir8. ent-16 ge-4 gen!8 _8 |
-	_2. |
-	_2. |
-	\times 2/3 {  Komm4 be-8 } gl\"u4. cke8 |
-	mich!2. |
-	\times 2/3 {  Komm4 be-8 } gl\"u4. cke8 |
-	mich,2. __ |
-	_2 be-4 |
-	gl\"u-2. |
-	cke2. |
-	mich!2 _4 |
-}
-
-$treble_intro = \notes\relative c{
-	\clef violin;
-	% ugh: id like to type this!
-	%r8\pp [<g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.>] |
-	r8^"\bf m\\\"assig"\pp <[g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.]> |
-	r8 <[as-. c-.> <c-. es-.> <as-. c-.> <c-. es-.> <as-. c-.]> |
-	r8 <[as-. c-.> <c-. d-.> <as-. c-.> <c-. d-.> <as-. c-.]> |
-	r8 <[g-. b-.> <b-. d-.> <g-. b-.> <b-. d-.> <g-. b-.]> |
-	\break
-}
-
-$treble_verse1 = \notes\relative c{
-%	\clef violin;
-	%5
-	r8 <[g' c> <c es> <g c> <c es> <g c]> |
-	r8 <[f c'> <c' d> <f, c'> <c' d> <f, c']> |
-	r8 <[f g b> <g b d> <f g b> <g b d> <f g b]> |
-	r8 <[es g c> <g c es> <es g c> <g c es> <es g c]> |
-	<g''4.( b,> <)f8 d>
-	  \times 2/3 { < [ f( d> <es c> <)d b] > } |
-	%10
-	<c2. es> |
-	r8 <[g, c> <c es> <g c> <c es> <g c]> |
-	r8 <[f c'> <c' d> <f, c'> <c' d> <f, c']> |
-	r8 <[f as bes> <as bes d> <f g bes> <as bes d> <f g bes]> |
-	r8 <[es g bes> <g bes es> <es g bes> <g bes es]> 
-	<{ es'~ | d4. ~ f8}{ c'~ | bes4. ~ as8 } > 
-	 \times 2/3 { < [f( as> <es g> <)d f] > } |
-	%16
-	<es2. g> |
-	r8 <[f, g> <g b> <f g> <g b> <f g]> |
-	r8 <[es g> <g c> <es g> <g c> <es g]> |
-	r8\pp <[es as c> <as c es> <es as c> <as c es> <es as c]> |
-	%20
-	r8 <[es g bes> <g bes es> <es g bes> <g bes es> <es g bes]> |
-	% \times 2/3 { [ as\grace( bes )
-	\times 2/3 { [ as'8( g as] } c4.-> ) as8 |
-	g2. |
-	r8 <[f, g> <g b> <f g> <g b> <f g]> |
-	r8 <[e g> <g c> <e g> <g c> <e g]> |
-	r8 <[f a c> <a c f> <f a c> <a c f> <f a c]> |
-	r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
-	\times 2/3 <
-	  { [ f'8\f( e f]  }
-	  {  f' e f } >
-	< {a4.- > )f8}  { a4. f8 }  > |
-}
-
-$treble_eentje = \notes \relative c'{
-	<e2 e'> <e4 g>|
-	<f2\mf as!(> <[as8.->( c> <)f16 )as]> |
-	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
-	<f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
-	<e2 g> <e4\pp g> |
-	<f2 a(> <[a8. c> <f16 )a]> |
-	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
-	<f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
-	%60
-	<e2. g> |
-}
-
-$treble_through = \notes \relative c'{
-	<e2. e'> |
-	%61
-	R2. |
-	<[g,8.\< g'> <g16 g'> <b8. b'> <\! b16\> b'16> <d8. d'> <d16 d']> |
-	< { c4( )b } { c'4( )b } > \!r |
-% ugh
-%	<g4. g> <b8 b> <[d8.-> d->> c16] |
-	<g4. g'> <b8 b'> <[ d'8.-> d,-> > c16] |
-% ugh ugh: connecting chords
-	%65
-	< { d,2.\f a'2} { e2. ~ e2 } { b'2. c,2 }> r4 |
-	\type Staff < 
-		{
-			\voiceone 
-			[a8. b16] c4-> ~ a8 r |
-			[a8. b16] c4-> ~ a8 r |
-		}
-		{ 
-			\voicetwo 
-			<d,4 f> <d2 f> |
-			<c!4 es> <c2 es> |
-		}
-	>
-	% 4 bars copied from end verse1
-	r8 <[f, a c> <a c f> <f a c> <a c f> <f a c]> |
-	%70
-	r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
-	\times 2/3 < { [ f'8\f( e f] }
-	   {  f' e f }>
-	< { a4.-> )f8 } { a4. f8 } > |
-	<e2 e'> r4 |
-	<es!2 es'! > r4 |
-	\property Voice . textstyle =  "italic"
-	<d2_"decresc." d'> r4 |
-	%75
-	<b2 b'> r4 |
-	<c2 c'> <e4\pp g> |
-
-	% four copied from begin eentje
-	<f2 as!(> <[as8.-> c> <f16 )as]> |
-	<e4. g> <[e8-. g-.(> <e-. g-.> <e-. )g-.]> |
-	<f4. g> <[b,8-. g'-.(> <d-. g-.> <f-. )g-.]> |
-	%80
-	\property Voice . textstyle =  "italic"
-	<e2._"dim." g> |
-	<g,2. e' g> |
-	<g2.-\fermata e' g> |
-}
-
-$bass_intro = \notes\relative c{
-	\clef bass;
-	\property Voice.dynamicdir=1
-%1
-	<c,2 c'> r4 |
-	<as2 as'> r4 |
-	<f2 f'> r4 |
-	<g2 g'> r4 |
-}
-
-$bass_verse1 = \notes\relative c{
-%	\clef bass;
-	\property Voice.dynamicdir=1
-%5
-	<c,2 c'> r4 |
-	<as2 as'> r4 |
-	<g2 g'> r4 |
-	<c2 c'> r4 |
-	<g8 g'> <[g'' d'> <d' f> <g, d'> <d' f> <g, d']> |
-%10
-	<c,,8 c'> <[g'' c> <c es> <g c> <c es> <g c]> |
-	<c,,2 c'> r4 |
-	<as2 as'> r4 |
-	<bes2 bes'> r4 |
-	<es,2 es'> r4 |
-%15
-	bes'8 <[bes' f'> <f' as> <bes, f'> <f' as> <bes, f']> |
-	es,8 <[bes' es> <es g> <bes es> <es g> <bes es]> |
-	<g,2 g'> r4 |
-	<c2 c'> r4 |
-	<as2 as'> r4 |
-	<es2 es'> r4 |
-	<bes'8 bes'> <[f'' bes> <bes d> <f bes> <bes d> <f bes]> |
-	<es,,8 es'> <[es'' g bes> <g bes es> <es g bes> <g bes es> <es g bes]> |
-	<g,,2 g'> r4 |
-	<c2 c'> r4 |
-	<f,2 f'> r4 |
-	<c'2 c'> r4 |
-	<g8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
-	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
-}
-
-$bass_eentje = \notes\relative c{
-	\property Voice.dynamicdir=1
-	<c,8 c'> <[c' f as!> <f as c> <c f as> <f as c> <c f as]> |
-	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
-	<g,8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
-	c,8 <[e' g> <g c> <e g> <g c> <e g]> |
-	<c,8 c'> <[c' f a> <f a c> <c f a> <f a c> <c f a]> |
-	c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
-	<g,8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
-	c,8 <[e' g> <g c> <e g> <g c> <e g]> |
-}
-
-$bass_through = \notes\relative c{
-	\property Voice.dynamicdir=1
-	%61
-	<g,8^"cresc." g'> <[g' b d> <b d f> <g b d> <as!-> b-> d->> <b d f]> |
-	<g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f]> |
-	% copied
-	<g,8 g'> <[g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f]> |
-	<g,8 g'> <[g' d' e> <d' f> <g, d'> <gis-> b-> d->> <b d f]> |
-	%65
-	<gis,8 gis'> <[d''\> e> <e b'> <d e> <e b'> <d\! e]> |
-	<a,8 a'> <[c' e> <e a> <c e> <e a> <c e]> |
-	<a,8 a'> <[a' d f> <d f a> <a d f> <d f a> <a d f]> |
-	<a,8 a'> <[a' c e> <c e a> <a c e> <c e a> <a c e]> |
-	% 4 bars copied from end verse1
-	<f,2\p f'> r4 |
-	%70
-	<c'2 c'> r4 |
-	<g8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
-	c,8\> <[c' e g> < \! e g c> <c e g> <e g c> <c e g]> |
-
-	<c,8 c'> <[c' es! g> <es g c> <c es g> <es g c> <c es g]> |
-	<f,,8 f'> <[d'' f> <f as!> <d f> <f as> <d f]> |
-	%75
-	<g,,8 g'> <[d'' f> <f g> <d f> <f g> <d f]> |
-	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
-	c,8 <[c' f> <f as> <c f> <f as> <c f]> |
-	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
-	<g,8 g'> <[g' d'> <d' f> <g, d'> <d' f> <g, d']> |
-	%80
-	c,8 <[c' e> <e g> <c e> <e g> <c e]> |
-	c,8 <[c' g> <e c> <c g> <e c> <c g]> |
-	<c,2._\fermata g' c> |
-}
-		
-global = \notes{
-	\time 3/4; 
-	\key es;
-	\skip 4 * 12;
-	\break
-	\skip 4 * 234;
-	\bar "|.";
-}
-
-
-$lyric_four = \lyrics{ 
-	_4 _ _
-	_ _ _
-	_ _ _
-	_ _ _
-}
- 
-allLyrics = {
-	\time 3/4; 
-%	\skip 4 * 12; 
-	\$lyric_four
-	\$lyric_verse1
-%	\skip 4 * 24; 
-	\$lyric_four
-	\$lyric_four
-	\$lyric_verse2
-	\$lyric_through
-}
-
-$lyric_staff = \type Lyrics = lyric<
-	\allLyrics
->
-		
-vocals = \notes{
-	\property Voice.dynamicdir=UP
-	\skip 4 * 12; 
-	\$vocal_verse1 
-	\skip 4 * 24; 
-	\$vocal_verse1
-	\$vocal_through
-}
-
-$vocal_staff = \type Staff = vocal<
-	\property Staff.instrument = "alto sax"
-	\global
-	\$vocals
->
-
-treble = {
-	\$treble_intro 
-	\$treble_verse1 
-	\$treble_eentje
-	\$treble_verse1 
-	\$treble_through
-}
-
-$treble_staff = \type Staff = treble< 
-	\global
-	\treble
->
-
-bass = {
-	\$bass_intro 
-	\$bass_verse1 
-	\$bass_eentje
-	\$bass_verse1 
-	\$bass_through
-}
-
-$bass_staff = \type Staff = bass<
-	\global
-	\bass
->
-
-$grand_staff = \type GrandStaff<
-	\$treble_staff
-	\$bass_staff
->
-
-\score{
-	% Transpose as you like for your voice
-	% Range untransposed is c' to f'' (for tenors and sopranos)
-	% To get original, \transpose d'
-	% \transpose a gives a' to d'' (for basses, who sing an octave down)
-	<
-% kjoet, but i like the original better -- jcn
-%		{ \notes \transpose a { \$vocal_staff } }
-%		\$lyric_staff
-%		{ \notes \transpose a { \$grand_staff } }
-		{ \notes { \$vocal_staff } }
-		\$lyric_staff
-		{ \notes { \$grand_staff } }
-	>
-	\paper { 
-%		\translator { \OrchestralScoreContext }
-%		\translator { \OrchestralPartStaffContext }
-		\translator { \HaraKiriStaffContext }
-	}
-	\midi{
-		\tempo 4 = 54;
-	}
-}