X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fbanter-chords.ly;h=a9a5771db731c812c7f151ffa7ae480282f33549;hb=43e92a55dd6874d78abc5c32a74bd987753e26db;hp=307b8656fa154aa4d3639d7d6b901d0d32674a17;hpb=d864729ad03ef6962ae3ff3135c5a70ec248a178;p=lilypond.git

diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly
index 307b8656fa..a9a5771db7 100644
--- a/input/test/banter-chords.ly
+++ b/input/test/banter-chords.ly
@@ -1,36 +1,53 @@
-\version "1.3.2";
+\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
 % for more conventional naming, comment scm stuff out
 
+% urg, 
+% this shows a serious shortcoming with our guile approach:
+% we can't (easily) display banter/non banter chords alongside
+% eachother.  These guile lists are fixed in the guile environment
+% when this file has been parsed...
+
 % {
-#(set! pitch-names-alist
-      (append 
-      '(
-	; use these for German naming
-	((6 . 0) . ("H" ""))
-	((6 . -1) . ("B" ("feta-1" . "")))
-	)
-      pitch-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