* The grand 2005-2006 replace.

[lilypond.git] / lily / easy-notation.cc

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index a786372441601d9cbfcb70efb2106f7961971d26..90e6accd98a48fafbcd64171ca90e175e0f552d8 100644 (file)
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,11 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
 
+#include <cctype>
+using namespace std;
+
 #include "text-interface.hh"
 #include "grob.hh"
 #include "output-def.hh"
@@ -16,7 +19,6 @@
 #include "font-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
-#include <cctype>
 
 MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1);
 SCM
@@ -42,27 +44,23 @@ Note_head::brew_ez_stencil (SCM smob)
       charstr = scm_makfrom0str (s);
     }
 
-  
   SCM letter
-    = Text_interface::interpret_string (me->get_layout()->self_scm (),
+    = Text_interface::interpret_string (me->layout ()->self_scm (),
                                        Font_interface::text_font_alist_chain (me),
                                        charstr);
-  
+
   Stencil l (*unsmob_stencil (letter));
   l.align_to (X_AXIS, CENTER);
   l.align_to (Y_AXIS, CENTER);
 
-  
-  l = Stencil (Box (), l.expr ()); 
+  l = Stencil (Box (), l.expr ());
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real lt = Staff_symbol_referencer::line_thickness (me);
 
   Real radius = (ss + lt) / 2.0;
-  Real stem_thick = 1.3 * lt; 
+  Real stem_thick = 1.3 * lt;
   if (Grob *stem = unsmob_grob (me->get_object ("stem")))
-    {
-      stem_thick = Stem::thickness (stem);
-    }
+    stem_thick = Stem::thickness (stem);
 
   int black = (log >= 2);
 
@@ -77,9 +75,7 @@ Note_head::brew_ez_stencil (SCM smob)
                                  SCM_BOOL_T));
   Stencil white_head;
   if (black)
-    {
-      l = l.in_color (1, 1, 1);
-    }
+    l = l.in_color (1, 1, 1);
   else
     {
       white_head = Stencil (extent,