* lily/cluster-engraver.cc (try_music): react to busy-playing-event

* scripts/convert-ly.py (conv): add warning about
set-global-staff-size.

* scripts/convert-ly.py (conv): add raggedlastbottom rule
(conv): warn for TextSpanner split.
(conv): warn for textheight.

diff --git a/ChangeLog b/ChangeLog
index 8426c200123581b3f7ae6fa735b4e8c51d20ba58..511e2f38497bbd32f6c615fed9ead8f98768d2ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * input/example-[1-3].ly: simplify.
+
+       * lily/cluster-engraver.cc (try_music): react to busy-playing-event
+
        * scm/output-ps.scm (new-text): new function. Use glyphshow to
        show glyphs.
 

diff --git a/input/example-1.ly b/input/example-1.ly
index aa76e9d10a0f119acfcdf514625de05f7c9e2971..c990518a64d73d06e5b6e06e3845b53cd3e75961 100644 (file)
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -5,7 +5,7 @@
 % Type:
 %
 %     lilypond example-1
-%     xdvi example-1     # or your dvi viewer here
+%     xpdf example-1     # or your PDF viewer here
 %
 
 %%
@@ -13,10 +13,6 @@
 %% user-manual.
 %% 
 
-\score { 
-  \context Voice \relative c {
-    c' d e f g a b c
-  }
-  \layout {  }  
-  \midi { }
+\relative {
+  c d e f g a b c
 }

diff --git a/input/example-2.ly b/input/example-2.ly
index fac5a5b11e9330ac742f80e95c0dfb6a93a850c5..8a1f59f39a3510b3f90cac03d2e11b7e96e7a73b 100644 (file)
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -4,7 +4,7 @@
 % Type:
 %
 %     lilypond example-2
-%     xdvi example-2     # or your dvi viewer here
+%     xpdf example-2     # or your PDF viewer here
 %
 
 %%
@@ -12,10 +12,6 @@
 %% user-manual.
 %% 
 
-\score { 
-  \context Voice \relative c {
-    a''2 ~ a4( e8[ )e] a,16[ a a a]
-  }
-  \layout {  }  
-  \midi { }
+\relative {
+  a'2 ~ a4( e8[ )e] a,16[ a a a]
 }

diff --git a/input/example-3.ly b/input/example-3.ly
index 6a9ca22806958a98a2dc94827d029e49b8b4bfbc..6e1c6b3172adc1e3b88acfede1dfa63f882a35e7 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,30 +1,26 @@
-#(ly:set-option 'old-relative)
 \version "2.4.0"
 
-one = \relative c{
-       c'' d e f
+one = \relative {
+       c' d e f
 }
 
-two = \relative c{
+two = \relative {
        \clef "bass"
-       c'2 g2
+       c2 g2
 }
 
-\score{
-       <<
-               \one
-               \two
-       >>
-       \layout{}
-       \midi{}
-}
+<<
+  \new Staff \one
+  \new Staff \two
+>>
+
 
 % A full example with two staves
 %
 % Type:
 %
 %     lilypond example-3
-%     xdvi example-3     # or your dvi viewer here
+%     xpdf example-3     # or your PDF viewer here
 
 %%
 %% For learning LilyPond, please read the tutorial, included in the

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 0730c28b2840b860ae31ed37d9b2da641ad28984..542863a376967cd68121d8eed06e0e1fbf49cf80 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -28,7 +28,7 @@ private:
 
   void typeset_grobs ();
   Spanner *spanner_;
-  Spanner * finished_spanner_ ;
+  Spanner *finished_spanner_ ;
 };
 
 Cluster_spanner_engraver::Cluster_spanner_engraver ()
@@ -62,6 +62,9 @@ Cluster_spanner_engraver::try_music (Music *m)
       cluster_notes_.push (m);
       return true;
     }
+  else if (m->is_mus_type ("busy-playing-event"))
+    return cluster_notes_.size ();
+  
   return false;
 }
 
@@ -109,9 +112,7 @@ void
 Cluster_spanner_engraver::stop_translation_timestep ()
 {
   typeset_grobs ();
-
   cluster_notes_.clear ();
-  
 }
 
 void
@@ -127,7 +128,7 @@ Cluster_spanner_engraver::acknowledge_grob (Grob_info info)
 ENTER_DESCRIPTION (Cluster_spanner_engraver,
 /* descr */    "Engraves a cluster using Spanner notation ",
 /* creats*/    "ClusterSpanner ClusterSpannerBeacon",
-/* accepts */  "cluster-note-event",
+/* accepts */  "cluster-note-event busy-playing-event",
 /* acks  */    "note-column-interface",
 /* reads */    "",
 /* write */    "");