resolve merge

[lilypond.git] / scm / chord-generic-names.scm

diff --git a/scm/chord-generic-names.scm b/scm/chord-generic-names.scm
index 190ef7d43736cc9bc173a141cdc92c9ce261030d..a30036d1afaaeca7c20becf8a5c3ebe3ecc8d4d1 100644 (file)
--- a/scm/chord-generic-names.scm
+++ b/scm/chord-generic-names.scm
@@ -1,8 +1,19 @@
-;;;; chord-generic-names.scm -- Compile chord names
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2003--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
-;;;; (c) 2003--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ;;;; NOTE: this is experimental code
@@ -10,6 +21,10 @@
 ;;;; Naming of the base chord (steps 1-5) is handled by exceptions only
 ;;;; see input/test/chord-names-dpnj.ly
 
+
+(define (default-note-namer pitch)
+ (note-name->markup pitch #f))
+
 (define (markup-or-empty-markup markup)
   "Return MARKUP if markup, else empty-markup"
   (if (markup? markup) markup empty-markup))
@@ -32,14 +47,13 @@
 
 (define-public (ugh-compat-double-plus-new-chord->markup
                style pitches bass inversion context options)
-  "Entry point for New_chord_name_engraver.
+  "Entry point for @code{New_chord_name_engraver}.
 
 FIXME: func, options/context have changed
- See
-double-plus-new-chord-name.scm for the signature of STYLE.  PITCHES,
-BASS and INVERSION are lily pitches.  OPTIONS is an alist-alist (see
-input/test/dpncnt.ly).
- "
+
+See @file{double-plus-new-chord-name.scm} for the signature of @var{style}.
+@var{pitches}, @var{bass}, and @var{inversion} are lily pitches.
+@var{options} is an alist-alist (see @file{input/test/dpncnt.ly})."
 
   (define (step-nr pitch)
     (let* ((pitch-nr (+ (* 7 (ly:pitch-octave pitch))
@@ -97,16 +111,16 @@ input/test/dpncnt.ly).
         (list (ly:context-property context 'majorSevenSymbol))
         (list (accidental->markup (step-alteration pitch))
               (make-simple-markup (number->string (step-nr pitch)))))))
-       
+
   ;; tja, kennok
   (define (make-sub->markup step->markup)
     (lambda (pitch)
       (make-line-markup (list (make-simple-markup "no")
                              (step->markup pitch)))))
-                       
+
   (define (step-based-sub->markup step->markup pitch)
     (make-line-markup (list (make-simple-markup "no") (step->markup pitch))))
-                       
+
   (define (get-full-list pitch)
     (if (<= (step-nr pitch) (step-nr (last pitches)))
        (cons pitch (get-full-list (next-third pitch)))
@@ -162,7 +176,7 @@ input/test/dpncnt.ly).
         ;; (all pitches)
         (all (append (take full (length partial-pitches))
                      (drop pitches (length partial-pitches))))
-       
+
         (highest (last all))
         (missing (list-minus full (map pitch-unalter all)))
         (consecutive (get-consecutive 1 all))
@@ -170,7 +184,7 @@ input/test/dpncnt.ly).
         (altered (filter step-even-or-altered? all))
         (cons-alt (filter step-even-or-altered? consecutive))
         (base (list-minus consecutive altered)))
-       
+
 
     (if #f (begin
             (write-me "full:" full)
@@ -192,7 +206,7 @@ input/test/dpncnt.ly).
        ;;    + subs:missing
 
        (let* ((root->markup (assoc-get
-                             'root->markup options note-name->markup))
+                             'root->markup options default-note-namer))
              (step->markup (assoc-get
                             'step->markup options step->markup-plusminus))
              (sub->markup (assoc-get
@@ -201,11 +215,11 @@ input/test/dpncnt.ly).
                              (step-based-sub->markup step->markup x))))
              (sep (assoc-get
                    'separator options (make-simple-markup "/"))))
-       
+
         (if
          (pair? full-markup)
          (make-line-markup (list (root->markup root) full-markup))
-       
+
          (make-line-markup
           (list
            (root->markup root)
@@ -230,7 +244,7 @@ input/test/dpncnt.ly).
        ;;    + 'add'
        ;;    + steps:rest
        (let* ((root->markup (assoc-get
-                             'root->markup options note-name->markup))
+                             'root->markup options default-note-namer))
              (step->markup
               (assoc-get
                ;; FIXME: ignatzek
@@ -240,11 +254,11 @@ input/test/dpncnt.ly).
                    'separator options (make-simple-markup " ")))
              (add-prefix (assoc-get 'add-prefix options
                                             (make-simple-markup " add"))))
-       
+
         (if
          (pair? full-markup)
          (make-line-markup (list (root->markup root) full-markup))
-       
+
          (make-line-markup
           (list
            (root->markup root)
@@ -252,11 +266,11 @@ input/test/dpncnt.ly).
            (make-normal-size-super-markup
             (make-line-markup
              (list
-       
+
               ;; kludge alert: omit <= 5
               ;;(markup-join (map step->markup
               ;;                        (cons (last base) cons-alt)) sep)
-       
+
               ;; This fixes:
               ;;  c     C5       -> C
               ;;  c:2   C5 2     -> C2
@@ -268,7 +282,7 @@ input/test/dpncnt.ly).
                                   (if (> (step-nr tb) 5)
                                       (cons tb cons-alt)
                                       cons-alt))) sep)
-       
+
               (if (pair? rest)
                   add-prefix
                   empty-markup)