Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / ledger-line-engraver.cc

diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index c2a8335e6f9f639a9b8cbf8d1685c54d324707a7..550dc5a014ed95ec97da52e2ac4a6a96b7965050 100644 (file)
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -3,16 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "spanner.hh"
 #include "engraver.hh"
+#include "staff-symbol.hh"
 
-/*
-  TODO: should sync with Staff_symbol_engraver.
-*/
 class Ledger_line_engraver : public Engraver
 {
   Spanner *span_;
@@ -22,8 +20,13 @@ public:
 
 protected:
   virtual void finalize ();
-  virtual void process_music ();
-  virtual void acknowledge_grob (Grob_info);
+  void process_music ();
+
+  DECLARE_ACKNOWLEDGER (ledgered);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
+
+  void start_spanner ();
+  void stop_spanner ();
 };
 
 Ledger_line_engraver::Ledger_line_engraver ()
@@ -31,35 +34,74 @@ Ledger_line_engraver::Ledger_line_engraver ()
   span_ = 0;
 }
 
+void
+Ledger_line_engraver::start_spanner ()
+{
+  assert (!span_);
+  span_ = make_spanner ("LedgerLineSpanner", SCM_EOL);
+
+  span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+}
+
 void
 Ledger_line_engraver::process_music ()
 {
+  /*
+    Need to do this, otherwise the first note might miss ledgers. 
+  */
   if (!span_)
-    {
-      span_ = make_spanner ("LedgerLineSpanner", SCM_EOL);
-
-      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-    }
+    start_spanner ();
 }
 
 void
 Ledger_line_engraver::finalize ()
+{
+  stop_spanner ();
+}
+
+void
+Ledger_line_engraver::stop_spanner ()
 {
   if (span_)
-    span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+    {
+      span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      Pointer_group_interface::set_ordered (span_, ly_symbol2scm ("elements"), false);
+      span_ = 0;
+    }
 }
 
 void
-Ledger_line_engraver::acknowledge_grob (Grob_info s)
+Ledger_line_engraver::acknowledge_staff_symbol (Grob_info s)
 {
-  if (!to_boolean (s.grob_->get_property ("no-ledgers")))
-    Pointer_group_interface::add_grob (span_, ly_symbol2scm ("note-heads"),
-                                      s.grob_);
+  Spanner *sym = dynamic_cast<Spanner *> (s.grob ());
+
+  if (!span_
+      || (span_->get_bound (LEFT) != sym->get_bound (LEFT)
+         && sym->get_bound (LEFT)))
+    {
+      stop_spanner ();
+      start_spanner ();
+    }
 }
+
+void
+Ledger_line_engraver::acknowledge_ledgered (Grob_info s)
+{
+  if (span_)
+    {
+      if (!to_boolean (s.grob ()->get_property ("no-ledgers")))
+       Pointer_group_interface::add_grob (span_, ly_symbol2scm ("note-heads"),
+                                          s.grob ());
+    }
+}
+
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
+ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
 ADD_TRANSLATOR (Ledger_line_engraver,
                "Creates the spanner to draw ledger lines, and notices objects that need ledger lines",
-               /* creats*/ "LedgerLineSpanner",
-               /* accepts */ "",
-               /* acks  */ "ledgered-interface", // ledgered-interface? 
-               /* reads */ "",
+               /* create */ "LedgerLineSpanner",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "")