X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fmusic-functions.scm;h=b2db3d258fb4e2b77f102ecf4b17045bb34d3009;hb=a7075d1b868f2060b7df29dd2b53587f797e9d10;hp=cc1c3d2e8567bc28fa24381518c9d480fe927848;hpb=1efdabf3b2349ea7fa3183dca5bba5104c347c36;p=lilypond.git

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index cc1c3d2e85..b2db3d258f 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -383,7 +383,7 @@ i.e.  this is not an override"
 			;; TODO: take this from voicedGraceSettings or similar.
 			'((Voice Stem font-size -3)
 			  (Voice NoteHead font-size -3)
-                          (Voice TabNoteHead font-size -4)
+			  (Voice TabNoteHead font-size -4)
 			  (Voice Dots font-size -3)
 			  (Voice Stem length-fraction 0.8)
 			  (Voice Stem no-stem-extend #t)
@@ -480,11 +480,11 @@ OTTAVATION to `8va', or whatever appropriate."
 	    (ly:context-unset-property where 'ottavation)))
 
       (let* ((offset (* -7 octavation))
-	     (string (cdr (assoc octavation '((2 . "15ma")
-					      (1 . "8va")
-					      (0 . #f)
-					      (-1 . "8vb")
-					      (-2 . "15mb"))))))
+	     (string (assoc-get octavation '((2 . "15ma")
+					     (1 . "8va")
+					     (0 . #f)
+					     (-1 . "8vb")
+					     (-2 . "15mb")))))
 	(ly:context-set-property! context 'middleCOffset offset)
 	(ly:context-set-property! context 'ottavation string)
 	(ly:set-middle-C! context)))
@@ -625,7 +625,7 @@ inside of and outside of chord construct."
 	     (make-sequential-music
 	      (list (make-voice-props-set number)
 		    (make-simultaneous-music (car lst))))
-	     'Voice  (number->string (1+ number)))
+	     'Bottom  (number->string (1+ number)))
 	    (voicify-list (cdr lst) (1+ number)))))
 
 (define (voicify-chord ch)
@@ -671,7 +671,7 @@ inside of and outside of chord construct."
 
 "
   (let ((meta (ly:grob-property grob 'meta)))
-    (if (equal?  (cdr (assoc 'name meta)) grob-name)
+    (if (equal? (assoc-get 'name meta) grob-name)
 	(set! (ly:grob-property grob symbol) val))))
 
 
@@ -1074,15 +1074,15 @@ specifies whether accidentals should be canceled in different octaves."
 	 (need-accidental #f)
 	 (previous-alteration #f)
 	 (from-other-octaves #f)
-	 (from-same-octave (ly:assoc-get pitch-handle local-key-sig))
-	 (from-key-sig (ly:assoc-get notename local-key-sig)))
+	 (from-same-octave (assoc-get pitch-handle local-key-sig))
+	 (from-key-sig (assoc-get notename local-key-sig)))
 
     ;; If no key signature match is found from localKeySignature, we may have a custom
     ;; type with octave-specific entries of the form ((octave . pitch) alteration)
     ;; instead of (pitch . alteration).  Since this type cannot coexist with entries in
     ;; localKeySignature, try extracting from keySignature instead.
     (if (equal? from-key-sig #f)
-	(set! from-key-sig (ly:assoc-get pitch-handle key-sig)))
+	(set! from-key-sig (assoc-get pitch-handle key-sig)))
 
     ;; loop through localKeySignature to search for a notename match from other octaves
     (let loop ((l local-key-sig))
@@ -1293,6 +1293,29 @@ use GrandStaff as a context. "
 					   ,(make-accidental-rule 'same-octave 1)
 				           ,neo-modern-accidental-rule)
 				   context))
+      ((equal? style 'neo-modern-voice)
+       (set-accidentals-properties #f
+				   `(Voice ,(make-accidental-rule 'same-octave 0)
+					   ,(make-accidental-rule 'any-octave 0)
+					   ,(make-accidental-rule 'same-octave 1)
+					   ,neo-modern-accidental-rule
+				     Staff ,(make-accidental-rule 'same-octave 0)
+					   ,(make-accidental-rule 'any-octave 0)
+					   ,(make-accidental-rule 'same-octave 1)
+				      ,neo-modern-accidental-rule)
+				   '()
+				   context))
+      ((equal? style 'neo-modern-voice-cautionary)
+       (set-accidentals-properties #f
+				   `(Voice ,(make-accidental-rule 'same-octave 0))
+				   `(Voice ,(make-accidental-rule 'any-octave 0)
+					   ,(make-accidental-rule 'same-octave 1)
+					   ,neo-modern-accidental-rule
+				     Staff ,(make-accidental-rule 'same-octave 0)
+					   ,(make-accidental-rule 'any-octave 0)
+					   ,(make-accidental-rule 'same-octave 1)
+					   ,neo-modern-accidental-rule)
+				   context))
       ;; Accidentals as they were common in dodecaphonic music with no tonality.
       ;; Each note gets one accidental.
       ((equal? style 'dodecaphonic)