From: Jan Nieuwenhuizen Date: Tue, 12 Sep 2000 12:26:09 +0000 (+0200) Subject: patch::: 1.3.85.jcn2 X-Git-Tag: release/1.3.86~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ed40b69f7dccdd6adffb5b24f6f156190404bd25;p=lilypond.git patch::: 1.3.85.jcn2 --- diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 8ef54580a1..d10bc35310 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -29,6 +29,8 @@ list is alphabetically ordered. TeX titling and lytodvi.sh @item @email{foka@@debian.org, Anthony Fok}, debian package: debian/* +@item @email{jlhamm@@pacificnet.net, James Hammons}, + american chord names, gnu-windows testing @item @email{bjoern.jacke@@gmx.de, Bjoern Jacke} german glossary stuff. @item @email{nj104@@cus.cam.ac.uk, Neil Jerram}. diff --git a/VERSION b/VERSION index 7ed1603d18..bb87c38926 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=85 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 9aa0536f44..bb344b2256 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,3 +1,9 @@ +%{ + See scm/chord-names.scm: chord::names-alist-american + James Hammons +%} + +\include "english.ly" #(set! chord::names-alist-american (append '( @@ -9,8 +15,8 @@ chord = \notes\transpose c''\chords{ \property ChordNames.chordNameStyle = "american" c -c:m -c:m5- +cs:m +df:m5- c:5^3 c:4^3 c:5+ @@ -30,6 +36,7 @@ c:9^7 c:6.9^7 c:9 c:7+.9 +c:m7.9 } \score{ diff --git a/scm/chord-names.scm b/scm/chord-names.scm index 70285815a7..ce6e539944 100644 --- a/scm/chord-names.scm +++ b/scm/chord-names.scm @@ -67,47 +67,50 @@ chord::names-alist-banter)) +;; NOTE: Duplicates of chord names defined elsewhere occur in this list +;; in order to prevent spurious superscripting of various chord names, +;; such as maj7, maj9, etc. +;; +;; See input/test/american-chords.ly +;; +;; James Hammons, + (define chord::names-alist-american '()) (set! chord::names-alist-american (append '( (((0 . 0)) . #f) (((0 . 0) (2 . 0)) . #f) + ;; Root-fifth chord + (((0 . 0) (4 . 0)) . ("5")) + ;; Common triads (((0 . 0) (2 . -1)) . ("m")) - (((0 . 0) (2 . -1) (4 . -1)) . ("dim")) - (((0 . 0) (4 . 0)) . (("5" (type . "super")))) (((0 . 0) (3 . 0) (4 . 0)) . ("sus")) - (((0 . 0) (2 . -1) (4 . -1)) . (("o" (type . "super")))) - - (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("o7" (type . "super")))) + (((0 . 0) (2 . -1) (4 . -1)) . ("dim")) +;Alternate: (((0 . 0) (2 . -1) (4 . -1)) . (("o" (type . "super")))) + (((0 . 0) (2 . 0) (4 . 1)) . ("aug")) +;Alternate: (((0 . 0) (2 . 0) (4 . 1)) . ("+")) + (((0 . 0) (1 . 0) (4 . 0)) . ("2")) + ;; Common seventh chords + (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("o" (type . "super")) "7")) + (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) . ("maj7")) + (((0 . 0) (2 . -1) (4 . 0) (6 . -1)) . ("m7")) + (((0 . 0) (2 . 0) (4 . 0) (6 . -1)) . ("7")) + (((0 . 0) (2 . -1) (4 . 0) (6 . 0)) . ("m(maj7)")) ;jazz: the delta, see jazz-chords.ly ;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("N" (type . "super") (style . "msam") (size . -3)))) - - ;(((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (("x7" (type . "super")))) - ; slashed o - (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (("o" (type . "super")) ("/" (size . -2) (offset . (-0.58 . 0.5))) ("7" (type . "super")))) - - (((0 . 0) (2 . 0) (4 . 1)) . ("aug")) - (((0 . 0) (2 . 0) (4 . 1) (6 . -1)) . (("aug" ("7" (type . "super"))))) - - (((0 . 0) (2 . 0) (4 . -1) (6 . 0)) . (("maj7" (type . "super")) ("accidentals--1" (font . "feta") (type . "super")) ("5" (type . "super")))) - - (((0 . 0) (3 . 0) (4 . 0) (6 . -1)) . (("7sus4" (type . "super")))) - - (((0 . 0) (2 . 0) (4 . 0) (5 . 0)) . (("maj6" (type . "super")))) - ;; dont need this? - ;(((0 . 0) (2 . -1) (4 . 0) (5 . 0)) . ("m6" . "")) - - ;; c = 0, d = 1 - ;;(((0 . 0) (2 . 0) (4 . 0) (8 . 0)) . ("add9" . "")) - ;;(((0 . 0) (2 . 0) (4 . 0) (1 . 0)) . ("" . (("script" . "add9")))) - - ;; we don't want the '/no7' - ;;(((0 . 0) (2 . 0) (4 . 0) (5 . 0) (8 . 0)) . ("6/9" . "")) - ;;(((0 . 0) (2 . 0) (4 . 0) (5 . 0) (1 . 0)) . (("script" . "6/9")))) - - ;;already have this? - ;;(((0 . 0) (2 . 0) (4 . 0) (6 . 0) (1 . 0)) . ("maj9" . "")) + (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (("o" (type . "super")) ("/" (size . -2) (offset . (-0.58 . 0.5))) "7")) ; slashed o + (((0 . 0) (2 . 0) (4 . 1) (6 . -1)) . ("aug7")) + (((0 . 0) (2 . 0) (4 . -1) (6 . 0)) . (("maj7") ("accidentals--1" (font . "feta") (type . "super")) ("5"))) + (((0 . 0) (3 . 0) (4 . 0) (6 . -1)) . ("7sus4")) + ;; Common ninth chords + (((0 . 0) (2 . 0) (4 . 0) (5 . 0) (1 . 0)) . ("6/9")) ;; we don't want the '/no7' + (((0 . 0) (2 . 0) (4 . 0) (5 . 0)) . ("maj6")) + (((0 . 0) (2 . -1) (4 . 0) (5 . 0)) . ("m6")) + (((0 . 0) (2 . 0) (4 . 0) (1 . 0)) . ("add9")) + (((0 . 0) (2 . 0) (4 . 0) (6 . 0) (1 . 0)) . ("maj9")) + (((0 . 0) (2 . 0) (4 . 0) (6 . -1) (1 . 0)) . ("9")) + (((0 . 0) (2 . -1) (4 . 0) (6 . -1) (1 . 0)) . ("m9")) ) chord::names-alist-american)) @@ -125,7 +128,8 @@ '() (list (list (string-append "accidentals-" (number->string (caddr pitch))) - '(font . "feta")))))) + ;; Keep accidentals from being too large + '(font . "feta") '(type . "super") ))))) (define (step->text pitch) (string-append