Add predefined mandolin fretboards to lilypond.

[lilypond.git] / scm / music-functions.scm

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 25b223bbe9826016cf692c5e3c4f14624aa72176..31b6c8ad3c48d3861b3ffe500b8a1c6d2f627d76 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1004,14 +1004,14 @@ then revert skipTypesetting."
       (equal? laziness #t)
       (<= bar-number (+ (cadr alteration-def) laziness))))
 
-(define (accidental-voided? alteration-def)
-  "Checks an alteration entry for being voided.
+(define (accidental-invalid? alteration-def)
+  "Checks an alteration entry for being invalid.
 
-Non-key alterations are voided when tying into the next bar or when
-there is a clef change, since neither repetition nor cancellation can
-be omitted when the same note occurs again.
+Non-key alterations are invalidated when tying into the next bar or
+when there is a clef change, since neither repetition nor cancellation
+can be omitted when the same note occurs again.
 
-Returns @code{#f} or the reason for the voiding, a symbol."
+Returns @code{#f} or the reason for the invalidation, a symbol."
   (let* ((def (if (pair? alteration-def)
                  (car alteration-def)
                  alteration-def)))
@@ -1083,7 +1083,7 @@ specifies whether accidentals should be canceled in different octaves."
      (from-key-sig
       (set! previous-alteration from-key-sig)))
 
-    (if (accidental-voided? previous-alteration)
+    (if (accidental-invalid? previous-alteration)
        (set! need-accidental #t)
 
        (let* ((prev-alt (extract-alteration previous-alteration))
@@ -1393,7 +1393,7 @@ Entries that conform with the current key signature are not invalidated."
           (lambda (entry)
             (let* ((localalt (key-entry-alteration entry))
                    (localoct (key-entry-octave entry)))
-              (if (or (accidental-voided? localalt)
+              (if (or (accidental-invalid? localalt)
                       (not localoct)
                       (= localalt
                          (key-entry-alteration