unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / measure-grouping-spanner.cc

diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index cb23c7c68c90092a414cdd99ead001baa5371230..2c2299ccc2fe2083807e9f84164a714813f1f683 100644 (file)
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -1,62 +1,70 @@
-/*   
-       measure-grouping-spanner.cc -- implement Measure_grouping
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-       source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-       (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
- */
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "measure-grouping-spanner.hh"
 
 #include "output-def.hh"
 #include "spanner.hh"
-#include "lookup.hh" 
+#include "lookup.hh"
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
 
 MAKE_SCHEME_CALLBACK (Measure_grouping, print, 1);
-SCM 
+SCM
 Measure_grouping::print (SCM grob)
 {
-  Spanner * me = dynamic_cast<Spanner*> (unsmob_grob (grob));
+  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (grob));
 
   SCM which = me->get_property ("style");
   Real height = robust_scm2double (me->get_property ("height"), 1);
 
   Real t = Staff_symbol_referencer::line_thickness (me) * robust_scm2double (me->get_property ("thickness"), 1);
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT),
-                                                      X_AXIS);
+                                                        X_AXIS);
 
   Real right_point = robust_relative_extent (me->get_bound (RIGHT),
-                                            common, X_AXIS).linear_combination (CENTER);
+                                             common, X_AXIS).linear_combination (CENTER);
   Real left_point = me->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
 
-
-  
   Interval iv (left_point, right_point);
   Stencil m;
-  
+
   /*
     TODO: use line interface
-   */
+  */
   if (which == ly_symbol2scm ("bracket"))
-    {
-      m = Lookup::bracket (X_AXIS, iv, t, -height, t);
-    }
+    m = Lookup::bracket (X_AXIS, iv, t, -height, t);
   else if (which == ly_symbol2scm ("triangle"))
-    {
-      m = Lookup::triangle (iv, t, height);
-    }
+    m = Lookup::triangle (iv, t, height);
 
   m.align_to (Y_AXIS, DOWN);
   m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Measure_grouping, "measure-grouping-interface",
-              "This object indicates groups of beats. "
-              "Valid choices for @code{style} are @code{bracket} and @code{triangle}.",
-              "thickness style height");
+ADD_INTERFACE (Measure_grouping,
+               "This object indicates groups of beats.  Valid choices for"
+               " @code{style} are @code{bracket} and @code{triangle}.",
+
+               /* properties */
+               "thickness "
+               "style "
+               "height "
+              );
 
-