X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Ftest%2Fbanter-chords.ly;h=a79f52b0b8b27ea04466af6442719880be347a3d;hb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;hp=642aaa8bae5cc79cce96f21228d870d00dd2e199;hpb=305fb79f24233b261b5372168f76520f84d2ea87;p=lilypond.git

diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly
index 642aaa8bae..a79f52b0b8 100644
--- a/input/test/banter-chords.ly
+++ b/input/test/banter-chords.ly
@@ -1,9 +1,10 @@
-\version "1.3.59";
+\version "1.3.146"
+
 
 \header{
-enteredby =	 "jcn";
-copyright =	 "public domain";
-TestedFeatures =	 "Banter named chords";
+enteredby = 	 "jcn"
+copyright = 	 "public domain"
+TestedFeatures = 	 "Banter named chords"
 }
 
 % test German (Banter) naming
@@ -16,27 +17,37 @@ TestedFeatures =	 "Banter named chords";
 % when this file has been parsed...
 
 % {
-#(set! note-names-alist
-      (append 
-      '(
-	; use these for German naming
-	((6 . 0) . ("H" ""))
-	((6 . -1) . ("B" ("feta-1" . "")))
-	)
-      note-names-alist))
 
-#(set! chord-names-alist
+#(define chord::names-alist-banter '())
+#(set! chord::names-alist-banter
       (append 
       '(
-        (((0 . 0) (2 . -1) (4 . -1)) . ("m" . ("script" . "5-")))
-	; Co iso Cm5-7-
-	; urg, niet te pruimen
-        ; (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" . ("feta-1" . ".")))
-        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("" . ("script" . "o")))
+        (((0 . 0) (2 . -1) (4 . -1)) . (("m" ("5-" . (type . "super")))))
+	 Co iso Cm5-7-
+        (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("o" (type "super")))
 	)))
+
+% German note names:
+% Urg, this will break again, in time
+% Is this correct, anyway?
+
+#(define (pitch->text pitch)
+  (if (and (= (modulo (cadr pitch) 7) 6)
+	      (= (caddr pitch) -1))
+      (cons (make-string 1 (integer->char 66)) '())
+      (cons
+       (if (= (modulo (cadr pitch) 7) 6)
+	   (make-string 1 (integer->char 72))
+	   (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 65))))
+       (if (= (caddr pitch) 0)
+	   '()
+	   (list (list (string-append "accidentals-" 
+				      (number->string (caddr pitch)))
+		       '(font . "feta")))))))
+
 % }
 
-chord = \notes\transpose c''\chords{
+chord =  \notes\transpose c''\chords{
 	% dim modifier means: lower all implicit additions
 	c:dim9
 	c:dim