From d84e3d676a91ba1cb617c2467c5775f93fd48a32 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 27 Jun 2003 22:57:16 +0000 Subject: [PATCH] (note-name->markup): don't superscript root alterations in chordnames. --- ChangeLog | 5 +++++ input/regression/glissando.ly | 4 ++-- input/test/follow-thread.ly | 2 +- input/test/gregorian-scripts.ly | 2 +- input/test/text-spanner.ly | 10 +++++----- input/test/trill.ly | 6 +++--- scm/chord-entry.scm | 8 +++++--- scm/chord-name.scm | 3 +-- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23fd4ccde6..1a7714b317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-28 Han-Wen Nienhuys + + * scm/chord-name.scm (note-name->markup): don't superscript root + alterations in chordnames. + 2003-06-23 Han-Wen Nienhuys * Documentation/user/refman.itely (Multi measure rests): more diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index b76b45bd47..4938d08cdc 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.22" \header{ @@ -19,7 +19,7 @@ The engraver does no time-keeping, so it involves some trickery to get c \glissando d, \glissando e' < { \stemUp e8 \glissando g8 } \context Voice = VB {\stemDown \repeat unfold 4 d16 } > - \property Voice.Glissando \override #'type = #'zigzag + \property Voice.Glissando \override #'style = #'zigzag c4 \glissando c,, \glissando c' \glissando d } \paper{ diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index b1a0e1fe43..a789707626 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -12,7 +12,7 @@ property @code{followVoice}. " } \context PianoStaff=ps < \property PianoStaff.followVoice = ##t \context Staff=one \context Voice { - \property Voice.VoiceFollower \set #'type = #'dashed-line + \property Voice.VoiceFollower \set #'style = #'dashed-line c'1 \translator Staff=two b2 a diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 10887beb91..2e4826059e 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -67,7 +67,7 @@ cantus = \notes \relative c' { Script \set #'padding = #0.0 % prepare TextSpanner for \episem{Initium|Finis} use - TextSpanner \set #'type = #'line + TextSpanner \set #'style = #'line TextSpanner \set #'edge-height = #'(0 . 0) TextSpanner \set #'padding = #0.5 TextSpanner \set #'edge-text = #'("" . "") diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 4cb8863551..c98ea47f4b 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.22" % TODO: check about other ottava functions. \header { texidoc = "@cindex Ottava Spanner @@ -12,14 +12,14 @@ You can make Lilypond print ottava spanners. " b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) - \property Voice.TextSpanner \revert #'type - \property Voice.TextSpanner \override #'type = #'dotted-line + \property Voice.TextSpanner \revert #'style + \property Voice.TextSpanner \override #'style = #'dotted-line a #(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) - \property Voice.TextSpanner \revert #'type - \property Voice.TextSpanner \override #'type = #'dashed-line + \property Voice.TextSpanner \revert #'style + \property Voice.TextSpanner \override #'style = #'dashed-line \property Voice.TextSpanner \override #'edge-height = #'(1 . -2) a #(ly:export (make-span-event 'TextSpanEvent START)) b c diff --git a/input/test/trill.ly b/input/test/trill.ly index a7551eb015..4378350dca 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.7.22" \header { texidoc="@cindex Trill Show trill line type. " @@ -9,13 +9,13 @@ Show trill line type. " \context RhythmicStaff \notes { \stemDown \property Voice.Stem \override #'transparent = ##t - \property Voice.TextSpanner \set #'type = #'dotted-line + \property Voice.TextSpanner \set #'style = #'dotted-line \property Voice.TextSpanner \set #'edge-height = #'(0 . 1.5) \property Voice.TextSpanner \set #'edge-text = #'("bla " . "") a#(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) %\property Voice.TextSpanner \set #'font-family = #'music - \property Voice.TextSpanner \set #'type = #'trill + \property Voice.TextSpanner \set #'style = #'trill \property Voice.TextSpanner \set #'edge-height = #'(0 . 0) \property Voice.TextSpanner \set #'edge-text = #(cons (make-musicglyph-markup "scripts-trill") "") diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm index 3475ab122c..f71ff58503 100644 --- a/scm/chord-entry.scm +++ b/scm/chord-entry.scm @@ -67,6 +67,7 @@ Entry point for the parser. (define (interpret-additions chord mods) "Interpret additions. TODO: should restrict modifier use?" + (cond ((null? mods) chord) ((ly:pitch? (car mods)) @@ -149,6 +150,8 @@ the bass specified. (set! flat-mods (cdr flat-mods)) )) + + ;; extract first number if present, and build pitch list. (if (and (pair? flat-mods) (ly:pitch? (car flat-mods)) @@ -167,13 +170,12 @@ the bass specified. (if (procedure? lead-mod) (set! base-chord (lead-mod base-chord))) - + (set! complete-chord (if start-additions (interpret-additions base-chord flat-mods) (interpret-removals base-chord flat-mods) )) - (set! complete-chord (map (lambda (x) (ly:pitch-transpose x root)) (sort complete-chord ly:pitchmarkup (ly:pitch-alteration pitch)))))) + (accidental->markup (ly:pitch-alteration pitch))))) (define-public ((chord-name->german-markup B-instead-of-Bb) pitch) -- 2.39.2