Grand fixcc.py run on all .hh .cc files.

[lilypond.git] / lily / note-head.cc

diff --git a/lily/note-head.cc b/lily/note-head.cc
index aeb7b4a19bd395bb730178820fcf5c8d150127df..614ba547ad42d27fd46622ca75084ac18a1f2c08 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -21,7 +21,7 @@
 
 #include <cmath>
 #include <cctype>
-#include <algorithm>           //  min, max
+#include <algorithm>            //  min, max
 
 using namespace std;
 
@@ -45,7 +45,7 @@ internal_print (Grob *me, string *font_char)
     {
       SCM gn = me->get_property ("glyph-name");
       if (scm_is_string (gn))
-       suffix = ly_scm2string (gn);
+        suffix = ly_scm2string (gn);
     }
 
   Font_metric *fm = Font_interface::get_default_font (me);
@@ -61,20 +61,19 @@ internal_print (Grob *me, string *font_char)
 
       Grob *stem = unsmob_grob (me->get_object ("stem"));
       Direction stem_dir = stem ? get_grob_direction (stem) : CENTER;
-      
+
       if (stem_dir == CENTER)
-       programming_error ("must have stem dir for note head");
-      
-      idx_directed = idx_either =
-       prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
+        programming_error ("must have stem dir for note head");
+
+      idx_directed = idx_either
+                     = prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
       out = fm->find_by_name (idx_directed);
     }
 
-
   if (out.is_empty ())
     {
       me->warning (_f ("none of note heads `%s' or `%s' found",
-                      idx_symmetric.c_str (), idx_directed.c_str ()));
+                       idx_symmetric.c_str (), idx_directed.c_str ()));
       out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL);
     }
   else
@@ -84,7 +83,7 @@ internal_print (Grob *me, string *font_char)
 }
 
 /*
-  TODO: make stem X-parent of notehead. 
+  TODO: make stem X-parent of notehead.
  */
 MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1);
 SCM
@@ -126,7 +125,7 @@ Note_head::include_ledger_line_height (SCM smob)
       // the interval between the note and the first ledger line, not
       // the whole interval between the note and the staff.
       Interval iv (min (0.0, lines[UP] - my_ext[DOWN] + 1),
-                  max (0.0, lines[DOWN] - my_ext[UP] - 1));
+                   max (0.0, lines[DOWN] - my_ext[UP] - 1));
       return ly_interval2scm (iv);
     }
 
@@ -137,8 +136,8 @@ Real
 Note_head::stem_attachment_coordinate (Grob *me, Axis a)
 {
   Offset off = robust_scm2offset (me->get_property ("stem-attachment"),
-                                 Offset (0,0));
-  
+                                  Offset (0, 0));
+
   return off [a];
 }
 
@@ -146,22 +145,22 @@ Offset
 Note_head::get_stem_attachment (Font_metric *fm, string key)
 {
   Offset att;
-  
+
   int k = fm->name_to_index (key);
   if (k >= 0)
     {
       Box b = fm->get_indexed_char_dimensions (k);
       Offset wxwy = fm->attachment_point (key);
-      for (int i = X_AXIS ; i < NO_AXES; i++)
-       {
-         Axis a = Axis (i);
-         
-         Interval v = b[a];
-         if (!v.is_empty ())
-           {
-             att[a] = (2 * (wxwy[a] - v.center ()) / v.length ());
-           }
-       }
+      for (int i = X_AXIS; i < NO_AXES; i++)
+        {
+          Axis a = Axis (i);
+
+          Interval v = b[a];
+          if (!v.is_empty ())
+            {
+              att[a] = (2 * (wxwy[a] - v.center ()) / v.length ());
+            }
+        }
     }
 
   return att;
@@ -171,7 +170,7 @@ MAKE_SCHEME_CALLBACK (Note_head, calc_stem_attachment, 1);
 SCM
 Note_head::calc_stem_attachment (SCM smob)
 {
-  Grob *me  = unsmob_grob (smob);
+  Grob *me = unsmob_grob (smob);
   Font_metric *fm = Font_interface::get_default_font (me);
   string key;
   internal_print (me, &key);
@@ -179,17 +178,16 @@ Note_head::calc_stem_attachment (SCM smob)
   return ly_offset2scm (get_stem_attachment (fm, key));
 }
 
-
 ADD_INTERFACE (Note_head,
-              "A note head.  There are many possible values for"
-              " @code{style}.  For a complete list, see"
-              " @ruser{Note head styles}.",
-
-              /* properties */
-              "note-names "
-              "accidental-grob "
-              "glyph-name "
-              "stem-attachment "
-              "style "
-              );
+               "A note head.  There are many possible values for"
+               " @code{style}.  For a complete list, see"
+               " @ruser{Note head styles}.",
+
+               /* properties */
+               "note-names "
+               "accidental-grob "
+               "glyph-name "
+               "stem-attachment "
+               "style "
+              );