lilypond-1.2.13

diff --git a/TODO b/TODO
index 2dfc2ce715447232edda964ac7fc00eeb35c1778..bb0eb7d53570cef63f0b290aac7042a256f612ab 100644 (file)
--- 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 f88298c98176ec09b7cf2402a332b6ee4791dbc4..0e07435b2589fdbbaaea65eb7ad357baf5b6b5df 100644 (file)
--- 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 6a92623f1cc57a70dcb9a7e571dd3abc11ffb398..c716bb1243136106ff84e3cb6fa652a7374899d6 100644 (file)
--- 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 cca8558307061fe8a203bc8963fe92fa4d084624..51b3ba5798f0d5ec938a4ff277789e6748e27336 100644 (file)
--- 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
        <c,2 c'> r4 |
        <as2 as'> r4 |
@@ -225,7 +225,7 @@ bassIntro = \notes\relative c{
 
 bassVerseOne = \notes\relative c{
 %      \clef bass;
-       \property Voice.dynamicDir=1
+       \property Voice.dynamicDirection=1
 %5
        <c,2 c'> r4 |
        <as2 as'> r4 |
@@ -256,7 +256,7 @@ bassVerseOne = \notes\relative c{
 }
 
 bassEentje = \notes\relative c{
-       \property Voice.dynamicDir=1
+       \property Voice.dynamicDirection=1
        <c,8 c'> [<c' f as!> <f as c> <c f as> <f as c> <c f as>] |
        c,8 [<c' e g> <e g c> <c e g> <e g c> <c e g>] |
        <g,8 g'> [<d'' g> <g b> <d g> <g b> <d g>] |
@@ -268,7 +268,7 @@ bassEentje = \notes\relative c{
 }
 
 bassThrough = \notes\relative c{
-       \property Voice.dynamicDir=1
+       \property Voice.dynamicDirection=1
        %61
        <g,8^"cresc." g'> [<g' b d> <b d f> <g b d> <as!-> b-> d->> <b d f>] |
        <g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f>] |
@@ -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 67ace5a781e7265c597e07b9a85dbeb2e4ee1fe0..9daff0680a7ab89fd7a663a3784e54ef2d9e31c0 100644 (file)
--- 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 2fb57404e6924213d2242e6e8ce024675ef12615..4a5cb5d44641c7792b7fc5fe16b516ac108bc09b 100644 (file)
--- 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