From e998c0423caa969efddabc99c75adffdcff3d0e4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 13 Jun 2003 19:27:05 +0000 Subject: [PATCH] (set-chord-name-style): remove set-chord-name-style. Use \property chordNameFunction. --- ChangeLog | 9 +++++---- Documentation/user/appendices.itely | 4 ---- VERSION | 2 +- scm/chord-ignatzek-names.scm | 2 +- scm/chord-name.scm | 15 ++++++++++----- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 841ca088be..766b812a61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,10 +8,10 @@ * Documentation/user/refman.itely (Vocal music): update documentation. * scm/define-translator-properties.scm (chordNoteNamer): remove - chordNameStyle + chordNameStyle, use chordNameFunction * scm/chord-name.scm (set-chord-name-style): remove - set-chord-name-style. + set-chord-name-style. Use \property chordNameFunction. 2003-06-12 Han-Wen Nienhuys @@ -226,10 +226,12 @@ aid in future changes to input/test/ files. 2003-05-28 Graham Percival + * Documentation/user/refman.itely: fixed build problem (missing file) caused by previous renaming. 2003-05-28 Graham Percival + * input/test/[a,b]*.ly: added texinfo index and added comments to aid in future changes to input/test/ files. * input/test/bar-number-every-5-reset.ly: renamed to @@ -243,9 +245,8 @@ to Voice. * lily/glissando-engraver.cc (acknowledge_grob): new file: split - out note-line and glissando functionality. + out note-line and glissando functionality. - * lily/line-spanner.cc (brew_molecule): cleanup. 2003-05-27 Jan Nieuwenhuizen diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely index 86c0a5fe29..753c719c85 100644 --- a/Documentation/user/appendices.itely +++ b/Documentation/user/appendices.itely @@ -2,16 +2,12 @@ @appendix Reference manual details @menu -* Lyrics mode definition:: * American Chords :: * Jazz chords:: * MIDI instruments:: * The Feta font:: @end menu -@node Lyrics mode definition -@section Lyrics mode definition - @node American Chords @section American Chords diff --git a/VERSION b/VERSION index aeaa3315de..3b850fc6dc 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=7 -PATCH_LEVEL=20 +PATCH_LEVEL=21 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm index 48f5152380..120bd68127 100644 --- a/scm/chord-ignatzek-names.scm +++ b/scm/chord-ignatzek-names.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000--2003 Han-Wen Nienhuys +;;; (c) 2000--2003 Han-Wen Nienhuys ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 1e308e0a2a..790f20c882 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -4,7 +4,8 @@ ;;; source file of the GNU LilyPond music typesetter ;;; ;;; (c) 2000--2003 Jan Nieuwenhuizen -;;; Han-Wen Nienhuys +;;; +;;; Han-Wen Nienhuys (define (natural-chord-alteration p) "Return the natural alteration for step P." @@ -77,13 +78,17 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -(define-public (sequential-music-to-chord-exceptions seq omit-root) +;; fixme we should standardize on omit-root (or the other one.) +;; perhaps the default should also be reversed --hwn +(define-public (sequential-music-to-chord-exceptions seq . rest) "Transform sequential music SEQ of type <>-\markup{ foobar } to (cons CDE-PITCHES FOOBAR-MARKUP), or to (cons DE-PITCHES -FOOBAR-MARKUP) if OMIT-ROOT. +FOOBAR-MARKUP) if OMIT-ROOT is given and non-false. " + (define (chord-to-exception-entry m) (let* ((elts (ly:get-mus-property m 'elements)) + (omit-root (and (pair? rest) (car rest))) (pitches (map (lambda (x) (ly:get-mus-property x 'pitch)) (filter-list (lambda (y) (memq 'note-event @@ -91,6 +96,7 @@ FOOBAR-MARKUP) if OMIT-ROOT. elts))) (sorted (sort pitches ly:pitch ..., @@ -103,8 +109,7 @@ FOOBAR-MARKUP) if OMIT-ROOT. (lambda (y) (memq 'text-script-event (ly:get-mus-property y 'types))) elts))) - ;;(text (if (null? texts) #f (if (= length texts) 1) - ;; (car texts) (reverse texts)))) + (text (if (null? texts) #f (if omit-root (car texts) texts)))) (cons (if omit-root (cdr normalized) normalized) text))) -- 2.39.2