X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-engraver.cc;h=2ed07e3e836fc410e2cddb846b332b9e2d3bab2a;hb=d84eb031543189fa253a1705c312a16a66af9c16;hp=18b895660fa079c07523a31a1d4ea45802f3f0b3;hpb=0676d3a1212eebee7c2015822ea1cdc9f8a1d8fc;p=lilypond.git

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 18b895660f..2ed07e3e83 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -217,19 +217,16 @@ Figured_bass_engraver::listen_bass_figure (Stream_event *ev)
 void
 Figured_bass_engraver::center_continuations (vector<Spanner *> const &consecutive_lines)
 {
-  if (consecutive_lines.size () == 2)
-    {
-      vector<Grob *> left_figs;
-      for (vsize j = consecutive_lines.size (); j--;)
-        left_figs.push_back (consecutive_lines[j]->get_bound (LEFT));
+  vector<Grob *> left_figs;
+  for (vsize j = consecutive_lines.size (); j--;)
+    left_figs.push_back (consecutive_lines[j]->get_bound (LEFT));
 
-      SCM ga = Grob_array::make_array ();
-      unsmob_grob_array (ga)->set_array (left_figs);
+  SCM ga = Grob_array::make_array ();
+  unsmob<Grob_array> (ga)->set_array (left_figs);
 
-      for (vsize j = consecutive_lines.size (); j--;)
-        consecutive_lines[j]->set_object ("figures",
-                                          unsmob_grob_array (ga)->smobbed_copy ());
-    }
+  for (vsize j = consecutive_lines.size (); j--;)
+    consecutive_lines[j]->set_object ("figures",
+                                      unsmob<Grob_array> (ga)->smobbed_copy ());
 }
 
 void
@@ -410,7 +407,7 @@ void
 Figured_bass_engraver::create_grobs ()
 {
   Grob *muscol
-    = dynamic_cast<Item *> (unsmob_grob (get_property ("currentMusicalColumn")));
+    = unsmob<Item> (get_property ("currentMusicalColumn"));
   if (!alignment_)
     {
       alignment_ = make_spanner ("BassFigureAlignment", SCM_EOL);
@@ -436,7 +433,7 @@ Figured_bass_engraver::create_grobs ()
               Align_interface::add_element (alignment_, group.group_);
             }
 
-          if (scm_memq (group.number_, get_property ("implicitBassFigures")) != SCM_BOOL_F)
+          if (scm_is_true (scm_memq (group.number_, get_property ("implicitBassFigures"))))
             {
               item->set_property ("transparent", SCM_BOOL_T);
               item->set_property ("implicit", SCM_BOOL_T);