Merge with master

[lilypond.git] / lily / figured-bass-engraver.cc

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index a300df86d496d3ef10cf6889226370303ab2ad05..5fe9624041c428109284624d048d73f217c3c476 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -129,15 +129,26 @@ Figured_bass_engraver::start_translation_timestep ()
   new_events_.clear ();
   for (vsize i = 0; i < groups_.size (); i++)
     groups_[i].current_event_ = 0;
+
   continuation_ = false;
+
+  
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Figured_bass_engraver, rest);
 void
 Figured_bass_engraver::listen_rest (Stream_event *ev)
 {
-  new_event_found_ = true;
-  ASSIGN_EVENT_ONCE (rest_event_, ev);
+  if (to_boolean (get_property ("ignoreFiguredBassRest")))
+    {
+      new_event_found_ = true;
+
+      /*
+       No ASSIGN_EVENT_ONCE() ; otherwise we get warnings about
+       polyphonic rests.
+       */
+      rest_event_ = ev;
+    }
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Figured_bass_engraver, bass_figure);
@@ -148,20 +159,22 @@ Figured_bass_engraver::listen_bass_figure (Stream_event *ev)
   Moment stop  = now_mom () + get_event_length (ev);
   stop_moment_ = max (stop_moment_, stop);
 
-  SCM fig = ev->get_property ("figure");
-  for (vsize i = 0; i < groups_.size (); i++)
+  if (to_boolean (get_property ("useBassFigureExtenders")))
     {
-      if (!groups_[i].current_event_
-         && ly_is_equal (groups_[i].number_, fig))
+      SCM fig = ev->get_property ("figure");
+      for (vsize i = 0; i < groups_.size (); i++)
        {
-         groups_[i].current_event_ = ev;
-         groups_[i].force_no_continuation_
-           = to_boolean (ev->get_property ("no-continuation"));
-         continuation_ = true;
-         return; 
+         if (!groups_[i].current_event_
+             && ly_is_equal (groups_[i].number_, fig))
+           {
+             groups_[i].current_event_ = ev;
+             groups_[i].force_no_continuation_
+               = to_boolean (ev->get_property ("no-continuation"));
+             continuation_ = true;
+             return; 
+           }
        }
-    }
-  
+    }  
   new_events_.push_back (ev);
 }
 
@@ -273,6 +286,9 @@ Figured_bass_engraver::add_brackets ()
 void
 Figured_bass_engraver::process_music ()
 {
+  if (alignment_ && !to_boolean (get_property ("useBassFigureExtenders")))
+    clear_spanners ();
+        
   if (rest_event_)
     {
       clear_spanners ();
@@ -340,7 +356,7 @@ Figured_bass_engraver::process_music ()
       vector<int> junk_continuations;
       for (vsize i = 0; i < groups_.size(); i++)
        {
-               Figure_group &group = groups_[i];
+         Figure_group &group = groups_[i];
 
          if (group.is_continuation ())
            {
@@ -475,8 +491,6 @@ ADD_TRANSLATOR (Figured_bass_engraver,
                "BassFigureContinuation "
                "BassFigureLine "
                ,
-               /* accept */
-               "bass-figure-event rest-event",
 
                /* read */
                "figuredBassAlterationDirection "
@@ -484,6 +498,7 @@ ADD_TRANSLATOR (Figured_bass_engraver,
                "figuredBassFormatter "
                "implicitBassFigures "
                "useBassFigureExtenders "
+               "ignoreFiguredBassRest "
                ,
 
                /* write */