From c5a2a3c0b1c6bf4cad76b4e7f7b42ec7c1b4acdd Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 15 Feb 2003 22:58:00 +0000 Subject: [PATCH] * scm/chords-ignatzek.scm (ignatzek-chord-names): robustness fix. * scm/chords-ignatzek.scm: new file. --- ChangeLog | 2 ++ scm/chords-ignatzek.scm | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 023168325a..4704ad34bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-02-15 Han-Wen Nienhuys + * scm/chords-ignatzek.scm (ignatzek-chord-names): robustness fix. + * lily/include/*.hh: string() -> to_string() * scm/chords-ignatzek.scm: new file. diff --git a/scm/chords-ignatzek.scm b/scm/chords-ignatzek.scm index b13952d47f..5f91a2981d 100644 --- a/scm/chords-ignatzek.scm +++ b/scm/chords-ignatzek.scm @@ -163,9 +163,10 @@ work than classifying the pitches." (define (filter-main-name p) "The main name: don't print anything for natural 5 or 3." (if - (and (is-natural-alteration? p) + (or (not (ly:pitch? p)) + (and (is-natural-alteration? p) (or (= (pitch-step p) 5) - (= (pitch-step p) 3))) + (= (pitch-step p) 3)))) '() (list (name-step p)) )) @@ -329,6 +330,7 @@ work than classifying the pitches." ;; etc. are named by the top pitch, without any further ;; alterations. (if (and + (ly:pitch? main-name) (= 7 (pitch-step main-name)) (is-natural-alteration? main-name) (pair? (remove-uptil-step 7 alterations)) -- 2.39.2