* lily/system.cc (output_lines): revert uniquify_list() patch,

strange side effects seen.

* lily/line-spanner.cc (dashed_line_molecule): return nothing if
dash-period < 0.

diff --git a/ChangeLog b/ChangeLog
index 2b5848984e5c31e16243a8615a88984dcc40320a..a4aa798f51a441e505c29d813a70e351c4a429d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-01-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/system.cc (output_lines): revert uniquify_list() patch,
+       strange side effects seen.
+       
+       * lily/line-spanner.cc (dashed_line_molecule): return nothing if
+       dash-period < 0.
+
        * scm/midi.scm (instrument-equalizer-alist): fix equalizer setting
        for flute. 
 

diff --git a/VERSION b/VERSION
index 9f53de19eda4a5000a6645a2816ac494ccaf3abe..f7a5644825c29fc7a8bef64bf0972f5a1055e679 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=9
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=10
+MY_PATCH_LEVEL=
 

diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 99c5bcb5bcb58d6f7ffde743afd9548c3abb329b..d8f1ea70116d3f4d7104503d3c2ac23e65bb0604 100644 (file)
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,30 +1,30 @@
 \version "2.1.7"
-
-\header {
-  texidoc = "Popsong format: chords, melody and lyrics."
+\header
+{
+    texidoc = "Popsong format: chords, melody and lyrics."
 }
 
-melody = \notes \relative c' {
-  a b c d
+melody = \notes \relative c'
+{
+    a b c d
 }
 
 text = \lyrics {
-  Aaa Bee Cee Dee
+    Aaa Bee Cee Dee
 }
 
 accompaniment = \chords {
-  a2 c2
+    a2 c2
 }
 
 \score {
   <<
     \context ChordNames \accompaniment
-    \addlyrics
-      \context Staff = one {
-        \autoBeamOff
+    \context Voice = one {
+       \autoBeamOff
         \melody
-      }
-      \context Lyrics \text
+    }
+    \newaddlyrics "one" \new LyricsVoice \text
   >>
   \paper { }
   \midi  { }

diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly
index 9d879732bbd43666ef17b74b82ee56dbe1a7a679..05c7d0e1e828b855598719da83ea30a3d115d50b 100644 (file)
--- a/input/template/melody-lyrics.ly
+++ b/input/template/melody-lyrics.ly
@@ -14,12 +14,11 @@ text = \lyrics {
 
 \score {
   <<
-    \addlyrics
-      \context Staff = one {
-        \property Staff.autoBeaming = ##f
-        \melody
+      \context Voice = one {
+         \property Staff.autoBeaming = ##f
+         \melody
       }
-      \context Lyrics \text
+      \newaddlyrics \new Lyrics \text
   >>
   \paper { }
   \midi  { }

diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index cd84ccfcd935257037a92407b0856cc79f4ce69b..b4e757ed8ecf2c2a58f9e952ec10cdf4aef99392 100644 (file)
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -18,9 +18,10 @@ text = \lyrics {
 
 \score {
   \context GrandStaff <<
-    \addlyrics
-      \context Staff = upper \upper
-      \context Lyrics \text
+    \context Staff = upper {
+       \context Voice = singer \upper
+    }
+    \newaddlyrics "singer" \new LyricsVoice \text
     \context Staff = lower <<
       \clef bass
       \lower

diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index 5870d37ea3f87dea591ff10a85b04872492cac47..d12b369614337609883cce3da44b3dca54730bc1 100644 (file)
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -23,23 +23,22 @@ lower = \notes\relative c {
 
 \score {
   <<
-    \addlyrics
-      \context Staff = mel {
-        \autoBeamOff
-        \melody
+      \context Voice = mel {
+         \autoBeamOff
+         \melody
       }
-      \context Lyrics \text
+      \newaddlyrics mel \new LyricsVoice \text
 
-    \context PianoStaff <<
-      \context Staff = upper \upper
-      \context Staff = lower <<
-       \clef bass
-       \lower
+      \context PianoStaff <<
+         \context Staff = upper \upper
+         \context Staff = lower <<
+             \clef bass
+             \lower
+         >>
       >>
-    >>
   >>
   \paper {
-    \translator { \RemoveEmptyStaffContext }
+      \translator { \RemoveEmptyStaffContext }
   }  
   \midi { }  
 }

diff --git a/input/template/satb.ly b/input/template/satb.ly
index 96c216288bb6515e8971094d3e76538ee25a28a6..beb970281cb84ddb21d4385d77d420b2621aed50 100644 (file)
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -20,24 +20,25 @@ bassWords = \lyrics { ho4 ho ho ho }
 
 \score { \notes
          \context StaffGroup <<
-         \context Lyrics = sopLyrs { s1 }
-         \context Staff = women { s1 }
-         \context Lyrics = altoLyrs { s1 }
-         \context Lyrics = tenorLyrs { s1 }
-         \context Staff = men {\clef bass s1 }
-         \context Lyrics = bassLyrs { s1 }
-         \addlyrics
-               \context Staff = women \context Voice = VA { \voiceOne \sopMusic }
-               \context Lyrics = sopLyrs { \sopWords}
-         \addlyrics
-               \context Staff = women \context Voice = VB { \voiceTwo \altoMusic }
-               \context Lyrics = altoLyrs { \altoWords}
-         \addlyrics
-               \context Staff = men \context Voice = VA { \voiceOne \tenorMusic }
-               \context Lyrics = tenorLyrs { \tenorWords}
-         \addlyrics
-               \context Staff = men  \context Voice = VB { \voiceTwo \bassMusic }
-               \context Lyrics = bassLyrs { \bassWords}
+             \context LyricsVoice = sopranos { s1 }
+             \context Staff = women <<
+                 \context Voice = sopranos { \voiceOne \sopMusic }
+                 \context Voice = altos { \voiceTwo \altoMusic }
+             >>
+             \context LyricsVoice = altos { s1 }
+             \context LyricsVoice = tenors { s1 }
+             \context Staff = men <<
+                 \clef bass
+                 \context Voice = tenors { \voiceOne \tenorMusic }
+                 \context Voice = basses { \voiceTwo \bassMusic }
+             >>
+             \context LyricsVoice = basses { s1 }
+
+             
+             \context LyricsVoice = sopranos \newaddlyrics sopranos \sopWords
+             \context LyricsVoice = altos \newaddlyrics altos \altoWords
+             \context LyricsVoice = tenors \newaddlyrics tenors \tenorWords
+             \context LyricsVoice = basses \newaddlyrics basses \bassWords
          
          >>
   \paper {

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index ba96f5dcfd2fe4e9a3a41d5af5450f40d9bbdb1d..c47196d1f558429790ad89eb97ea75d8a2612af3 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -45,6 +45,7 @@ dashed_line_molecule (Grob *me, Real thick, Offset from, Offset to)
       SCM s = me->get_grob_property ("dash-fraction");
       if (gh_number_p (s))
        fraction = gh_scm2double (s);
+
       fraction = (fraction >? 0) <? 1.0;
 
       Real period = Staff_symbol_referencer::staff_space (me);
@@ -52,6 +53,9 @@ dashed_line_molecule (Grob *me, Real thick, Offset from, Offset to)
       if (gh_number_p (s))
        period *= gh_scm2double (s);
 
+      if (period < 0)
+       return Molecule ();
+       
       return Lookup::dashed_line (thick, from, to, period, fraction);
     }
   else

diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc
index 03b8a537ea55588bd8403c7725673cbfa5cf1e2f..7e89576738633dbb3d7026c4f27ea6f008067d59 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -167,15 +167,18 @@ New_lyric_combine_music_iterator::find_thread ()
          Translator_group *t = report_to ();
          while (t && t->daddy_trans_)
            t = t->daddy_trans_;
-      
-         Translator_group* voice = find_context_below (t, "Voice", ly_scm2string (voice_name));
+
+         String name =  ly_scm2string (voice_name);
+         Translator_group* voice = find_context_below (t, "Voice", name);
          Translator_group *thread = 0;
          if (voice)
            thread = find_context_below (voice, "Thread", "");
+         else
+           get_music ()->origin ()->warning (_f("Cannot find Voice: %s\n", name.to_str0())); 
 
          if (thread)
            music_context_ = thread;
-      
+           
          if (lyrics_context_ && voice)
            lyrics_context_->set_property ("associatedVoiceContext",  voice->self_scm ());
        }

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index dec5000b2a944e299345ba9c74321544de2bfeff..47e6977ff827ff89a35c1296223a2312b5adc89a 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -101,7 +101,6 @@ Staff_symbol_referencer::callback (SCM element_smob, SCM)
 {
   Grob *me = unsmob_grob (element_smob);
 
-  
   SCM pos = me->get_grob_property ("staff-position");
   Real off =0.0;
   if (gh_number_p (pos))

diff --git a/lily/system.cc b/lily/system.cc
index ff5239153c4ae652c5fba8faf4f129832de07c76..ff2f5a878e61a21bcafb5ac17a052838e8ae4c2f 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -176,7 +176,11 @@ System::output_lines ()
   for (int i=0; i < broken_intos_.size (); i++)
     {
       SCM al = broken_intos_[i]->get_grob_property ("all-elements");
-      al  = uniquify_list (al); 
+
+      /*
+       don't do this: strange side effects.
+       */
+      //      al  = uniquify_list (al); 
     }
   
 
@@ -191,7 +195,8 @@ System::output_lines ()
 
       if (verbose_global_b)
        progress_indication ("[");
-      system->post_processing (i+1 == broken_intos_.size ());
+      bool last = i+1 == broken_intos_.size ();
+      system->post_processing (last);
 
       if (verbose_global_b)
        {

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index e9d4e2bc772381a34939bd50643c4b5debfe1c4f..6549ca6c037f19b5b3ff6768862a4e3253b6ac4a 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -150,7 +150,8 @@ square of the inner notes involved.")
 
 (grob-property-description 'control-points list? "List of 4 offsets (number-pairs) that form control points for the  tie/slur shape.")
 (grob-property-description 'damping integer? "amount of beam slope damping should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams .")
-(grob-property-description 'dash-period number? "the length of one dash + white space.")
+(grob-property-description 'dash-period number? "the length of one dash + white space. If negative, no line is drawn at all."
+)
 (grob-property-description 'dash-fraction number? "Size of the dashes, relative to dash-period. Should be between 0.0 (no line) and 1.0 (continuous line).")
 (grob-property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.")
 (grob-property-description 'descendens boolean? "is this neume of a descendent type?.")