From cbba908afd1193cb7d0796608fb3f2b4bf207334 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:41:30 +0000 Subject: [PATCH] lilypond-1.2.13 --- TODO | 7 ++----- input/test/staff-size.ly | 4 ++-- lily/repeat-engraver.cc | 13 ++++++++++++- mutopia/F.Schubert/standchen.ly | 14 +++++++------- mutopia/N.W.Gade/score.ly | 8 ++++---- scripts/abc2ly.py | 3 ++- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/TODO b/TODO index 2dfc2ce715..bb0eb7d535 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,5 @@ -*-outline-layout:(2 (-1 -1 0 :) 0);outline-stylish-prefixes:nil -*- - * GNU LilyPond TODO Features you cannot find in the documentation as working, should be mentioned here. This is an assorted collection of stuff that will be @@ -11,11 +10,11 @@ Grep -i for TODO, FIXME and ugh/ugr/urg. .* TODO . * use Rhythmic_head::position_i () for all Staff_referenced -. * make diff and make release should leave junk in out/, not in ../test/ +. * .po -> .pot. . * setting indent to 0 with \shape fails +. * hara kiri _8 clef. . * junk -M ? . * mudela-book doco -. * Depracate Wordwrap . * rerun profile . * fix or replace feta-accordion.mf . * fix configure with CFLAGS or LDFLAGS, try: @@ -25,8 +24,6 @@ Grep -i for TODO, FIXME and ugh/ugr/urg. . * Break_req handling is silly (break_forbid () + \break fucks up.) . * script engraver -. * HaraKiriStaffContext removes bar lines and doesn't remove - staff margin text on removed staff lines. . * Chords: . * Bass/inversion pitch when not part of Chord Sometimes a series of changing chords will be blocked out over a static tone diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index f88298c981..0e07435b25 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -4,12 +4,12 @@ \property Staff.fontSize = "-1" \property Voice.fontSize = "-1" - \property Voice . dynamicDir = \up \stemdown + \property Voice . dynamicDirection = \up \stemdown %\key gis; c8 d [e f g a] b c \ff } -\context Staff = VB { \property Voice . dynamicDir = \down c,,4 \ff c c c } +\context Staff = VB { \property Voice . dynamicDirection = \down c,,4 \ff c c c } > \paper { linewidth = -1.; } diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc index 6a92623f1c..c716bb1243 100644 --- a/lily/repeat-engraver.cc +++ b/lily/repeat-engraver.cc @@ -101,8 +101,19 @@ Repeat_engraver::queue_events () becel.append (c); last_number = volta_number; volta_number ++; + Scalar l (get_property ("voltaSpannerDuration", 0)); + if (l.length_i ()) // voltaSpannerDuration OK? + { + + Moment vSD_mom = l.to_rat(); + if ( vSD_mom < i->car_->length_mom() ) // terminate volta early ? + { + vSD_mom += walk_mom; + c->last_b_ = true; + becel.append (new Bar_create_event (vSD_mom, "stop")); + } + } } - // should think about voltaSpannerDuration walk_mom += i->car_->length_mom(); if (i->next_) diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index cca8558307..51b3ba5798 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -19,7 +19,7 @@ Note: Original key F. \version "1.2.0"; vocalVerse = \notes\relative c''{ - \property Voice.dynamicDir=1 + \property Voice.dynamicDirection=1 \times 2/3 { [ g8( )as] g } c4. g8 | \times 2/3 { [ f8( )g] f } c'4 f,8 r | g4.-> f8 \times 2/3 { [ f( )es] d } | @@ -48,7 +48,7 @@ vocalVerse = \notes\relative c''{ } vocalThrough = \notes\relative c{ - \property Voice.dynamicDir=1 + \property Voice.dynamicDirection=1 g''8. g16 b8. b16 d8. d16 | c4 b r | g4. b8 d8. c16 | @@ -215,7 +215,7 @@ trebleThrough = \notes \relative c'{ } bassIntro = \notes\relative c{ - \property Voice.dynamicDir=1 + \property Voice.dynamicDirection=1 %1 r4 | r4 | @@ -225,7 +225,7 @@ bassIntro = \notes\relative c{ bassVerseOne = \notes\relative c{ % \clef bass; - \property Voice.dynamicDir=1 + \property Voice.dynamicDirection=1 %5 r4 | r4 | @@ -256,7 +256,7 @@ bassVerseOne = \notes\relative c{ } bassEentje = \notes\relative c{ - \property Voice.dynamicDir=1 + \property Voice.dynamicDirection=1 [ ] | c,8 [ ] | [ ] | @@ -268,7 +268,7 @@ bassEentje = \notes\relative c{ } bassThrough = \notes\relative c{ - \property Voice.dynamicDir=1 + \property Voice.dynamicDirection=1 %61 [ b-> d->> ] | [ b-> d->> ] | @@ -326,7 +326,7 @@ vocals = \notes{ \property Voice.noAutoBeaming = "1" \property Staff.automaticMelismata=1 - \property Voice.dynamicDir = \up + \property Voice.dynamicDirection = \up \skip 4 * 12; \vocalVerse \skip 4 * 24; diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly index 67ace5a781..9daff0680a 100644 --- a/mutopia/N.W.Gade/score.ly +++ b/mutopia/N.W.Gade/score.ly @@ -56,12 +56,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \property Staff.instr = "Cor." \context Voice = corI < \globalNoKey - \stemup \property Voice.dynamicDir = \up + \stemup \property Voice.dynamicDirection = \up \property Voice.articulationScriptVerticalDirection = \up \corI > \context Voice = corII { - \stemdown \property Voice.dynamicDir = \down + \stemdown \property Voice.dynamicDirection = \down \property Voice.articulationScriptVerticalDirection = \down \corII } @@ -71,12 +71,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \property Staff.instr = "Trp." \context Voice = trpI < \globalNoKey - \stemup \property Voice.dynamicDir = \up + \stemup \property Voice.dynamicDirection = \up \property Voice.articulationScriptVerticalDirection = \up \trpI > \context Voice = trpII { - \stemdown \property Voice.dynamicDir = \down + \stemdown \property Voice.dynamicDirection = \down \property Voice.articulationScriptVerticalDirection = \down \trpII } diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 2fb57404e6..4a5cb5d446 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -505,12 +505,13 @@ def try_parse_header_line (ln, state): if g == 'K': # KEY a = check_clef(a) if a: - __main__.global_key =compute_key (a)# ugh. m = re.match ('^([^ \t]*) *(.*)$', a) # seperate clef info if m: + __main__.global_key =compute_key (m.group(1))# ugh. voices_append ('\\key %s;' % lily_key(m.group(1))) check_clef(m.group(2)) else: + __main__.global_key =compute_key (a)# ugh. voices_append ('\\key %s;' % lily_key(a)) if g == 'O': # Origin header ['origin'] = a -- 2.39.5