Merge with master

[lilypond.git] / lily / dots-engraver.cc

diff --git a/lily/dots-engraver.cc b/lily/dots-engraver.cc
index 1b34354e43e755354dea27365f352abc399d0bf5..16a5b0a29052added4ee785540438be093ed4f90 100644 (file)
--- a/lily/dots-engraver.cc
+++ b/lily/dots-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2007 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
@@ -37,11 +37,14 @@ Dots_engraver::acknowledge_rhythmic_head (Grob_info gi)
   if (unsmob_grob (note->get_object ("dot")))
     return;
 
-  Duration dur = *unsmob_duration (cause->get_property ("duration"));
-  if (dur.dot_count ())
+  
+  Duration *dur = unsmob_duration (cause->get_property ("duration"));
+  if (dur && dur->dot_count ())
     {
       Item *d = make_item ("Dots", note->self_scm ());
       Rhythmic_head::set_dots (note, d);
+
+      d->set_property ("dot-count", scm_from_int (dur->dot_count ()));
       d->set_parent (note, Y_AXIS);
     }
 }
@@ -55,9 +58,6 @@ ADD_TRANSLATOR(Dots_engraver,
               /* create */
               "Dots ",
 
-              /*acc*/
-              "",
-
               /*r*/
               "" ,