* flower

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index ded4977de0899d7d2d3ea2224c6c02d69c66070a..0a5b6fe532e60ae6375201b02ab12be6fa4cc26a 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,11 +1,10 @@
-/* 
+/*
   system-start-delimiter.cc -- implement System_start_delimiter
 
   source file of the GNU LilyPond music typesetter
 
   (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+*/
 
 #include "system-start-delimiter.hh"
 
@@ -20,52 +19,50 @@
 #include "lookup.hh"
 
 Stencil
-System_start_delimiter::staff_bracket (Grob*me, Real height)
+System_start_delimiter::staff_bracket (Grob *me, Real height)
 {
-  Real arc_height = scm_to_double (me->get_property ("arch-height")) ;
+  Real arc_height = scm_to_double (me->get_property ("arch-height"));
 
   SCM at = scm_list_n (ly_symbol2scm ("bracket"),
-                   me->get_property ("arch-angle"),
-                   me->get_property ("arch-width"),
-                   scm_make_real (arc_height),
-                   scm_make_real (height),
-                   me->get_property ("arch-thick"),
-                   me->get_property ("thickness"),
-                   SCM_UNDEFINED);
+                      me->get_property ("arch-angle"),
+                      me->get_property ("arch-width"),
+                      scm_make_real (arc_height),
+                      scm_make_real (height),
+                      me->get_property ("arch-thick"),
+                      me->get_property ("thickness"),
+                      SCM_UNDEFINED);
 
-/*
-TODO: sort this out.
-  
-Another thing:
-In system-start-delimiter.cc I see the line
+  /*
+    TODO: sort this out.
 
-  Real h = height + 2 * arc_height;
+    Another thing:
+    In system-start-delimiter.cc I see the line
+
+    Real h = height + 2 * arc_height;
 
-But I really think that you mean
+    But I really think that you mean
 
- Real h = height + 2 * arc_width;
+    Real h = height + 2 * arc_width;
 
-(arc_height changes the x-axis-size of arc ; arc_width changes the
-y-axis-size)
-Will not fix it since I'm not sure.
+    (arc_height changes the x-axis-size of arc ; arc_width changes the
+    y-axis-size)
+    Will not fix it since I'm not sure.
 
-   */
+  */
 
   Real h = height + 2 * arc_height;
-  Box b (Interval (0, 1.5), Interval (-h/2, h/2));
+  Box b (Interval (0, 1.5), Interval (-h / 2, h / 2));
   Stencil mol (b, at);
   mol.align_to (X_AXIS, CENTER);
   return mol;
 }
 
-
-
 Stencil
-System_start_delimiter::simple_bar (Grob*me, Real h) 
+System_start_delimiter::simple_bar (Grob *me, Real h)
 {
-  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ;
+  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
-  return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h/2, h/2)),
+  return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h / 2, h / 2)),
                                   lt);
 }
 
@@ -74,14 +71,14 @@ MAKE_SCHEME_CALLBACK (System_start_delimiter, after_line_breaking, 1);
 SCM
 System_start_delimiter::after_line_breaking (SCM smob)
 {
-  Grob * me = unsmob_grob (smob);
-  SCM   gl = me->get_property ("glyph");
+  Grob *me = unsmob_grob (smob);
+  SCM gl = me->get_property ("glyph");
   if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line")))
     {
       int count = 0;
 
       /*
-       Get all coordinates, to trigger Hara kiri. 
+       Get all coordinates, to trigger Hara kiri.
       */
       SCM elts = me->get_property ("elements");
       Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
@@ -90,11 +87,10 @@ System_start_delimiter::after_line_breaking (SCM smob)
          Interval v = unsmob_grob (scm_car (s))->extent (common, Y_AXIS);
 
          if (!v.is_empty ())
-           count ++;
+           count++;
        }
 
-
-      if (count <=  1)
+      if (count <= 1)
        {
          me->suicide ();
        }
@@ -102,7 +98,6 @@ System_start_delimiter::after_line_breaking (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-
 MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1);
 SCM
 System_start_delimiter::print (SCM smob)
@@ -114,19 +109,19 @@ System_start_delimiter::print (SCM smob)
   SCM s = me->get_property ("glyph");
   if (!scm_is_string (s))
     return SCM_EOL;
-  SCM gsym = scm_string_to_symbol (s) ;
+  SCM gsym = scm_string_to_symbol (s);
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   SCM elts = me->get_property ("elements");
-  Grob * common = common_refpoint_of_list (elts, me, Y_AXIS);
+  Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
 
   Interval ext;
   for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Spanner * sp = unsmob_spanner (scm_car (s));
-      if (sp &&
-         sp->get_bound (LEFT) == me->get_bound (LEFT))
+      Spanner *sp = unsmob_spanner (scm_car (s));
+      if (sp
+         && sp->get_bound (LEFT) == me->get_bound (LEFT))
        {
          Interval dims = sp->extent (common, Y_AXIS);
          if (!dims.is_empty ())
@@ -195,10 +190,8 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   return Stencil (b, stil.expr ());
 }
 
-
 ADD_INTERFACE (System_start_delimiter, "system-start-delimiter-interface",
               "The brace, bracket or bar in front of the system. "
-              "It is implemented as a spanner."
-              ,
+              "It is implemented as a spanner.",
               "collapse-height thickness "
               "arch-height arch-angle arch-thick arch-width bracket-thick glyph");