*** empty log message ***

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index fa8e70768f553065a41de13ebb7d9f91ccc5d435..61f7df05c5dede746f106193998ec34b71711937 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -36,8 +36,8 @@ Note_column::shift_compare (Grob *const &p1, Grob *const &p2)
   SCM s1 = p1->get_property ("horizontal-shift");
   SCM s2 = p2->get_property ("horizontal-shift");
 
-  int h1 = (scm_is_number (s1))? scm_to_int (s1) :0;
-  int h2 = (scm_is_number (s2)) ? scm_to_int (s2):0;
+  int h1 = (scm_is_number (s1)) ? scm_to_int (s1) : 0;
+  int h2 = (scm_is_number (s2)) ? scm_to_int (s2) : 0;
   return h1 - h2;
 }
 
@@ -75,7 +75,7 @@ Note_column::dir (Grob *me)
   else if (scm_is_pair (me->get_property ("note-heads")))
     return (Direction)sign (head_positions_interval (me).center ());
 
-  programming_error ("Note column without heads and stem!");
+  programming_error ("note column without heads and stem");
   return CENTER;
 }
 
@@ -112,7 +112,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
 
   if (both)
-    me->warning ("Can't have rests and note heads together on a stem.");
+    me->warning (_ ("can't have note heads and rests together on a stem"));
   else
     Axis_group_interface::add_element (me, h);
 }
@@ -139,12 +139,11 @@ Note_column::set_dotcol (Grob *me, Grob *d)
   Axis_group_interface::add_element (me, d);
 }
 
-
 Grob *
 Note_column::first_head (Grob *me)
 {
   Grob *st = get_stem (me);
-  return st? Stem::first_head (st): 0;
+  return st ? Stem::first_head (st) : 0;
 }
 
 /*