* lily/font-select.cc (get_font_by_design_size): revert

[lilypond.git] / lily / dot-column.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index e464b52fa092c92d4dcac6a819065320eb22855d..48e325e133083c142375560f9f9cf193b9fc6dbb 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dot-column.hh"
@@ -24,7 +24,7 @@
   TODO: let Dot_column communicate with stem via Note_column.
  */
 
-MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2);
+MAKE_SCHEME_CALLBACK (Dot_column, force_shift_callback, 2);
 SCM
 Dot_column::force_shift_callback (SCM element_smob, SCM axis)
 {
@@ -42,7 +42,7 @@ Dot_column::force_shift_callback (SCM element_smob, SCM axis)
   return scm_make_real (0.0);
 }
 
-MAKE_SCHEME_CALLBACK (Dot_column,side_position, 2);
+MAKE_SCHEME_CALLBACK (Dot_column, side_position, 2);
 SCM
 Dot_column::side_position (SCM element_smob, SCM axis)
 {
@@ -231,7 +231,7 @@ SCM
 Dot_column::do_shifts (Grob*me)
 {
   Link_array<Grob> dots =
-    Pointer_group_interface__extract_grobs (me, (Grob*)0, "dots");
+    extract_grob_array (me, ly_symbol2scm ("dots"));
 
   { /*
       Trigger note collision resolution first, since that may kill off
@@ -273,7 +273,7 @@ Dot_column::do_shifts (Grob*me)
        }
       
       int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
-      dp.pos_= p;
+      dp.pos_ = p;
 
       if (dp.extremal_head_)
        dp.dir_ = to_dir (dp.dot_->get_property  ("direction"));
@@ -299,7 +299,7 @@ Dot_column::add_head (Grob * me, Grob *rh)
   Grob * d = unsmob_grob (rh->get_property ("dot"));
   if (d)
     {
-      Side_position_interface::add_support (me,rh);
+      Side_position_interface::add_support (me, rh);
 
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d);
       d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS);