(simultaneous_relative_callback): do

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 5a7c32daae70b4ca92fabea1ccf9ebc07f910017..a0f4136a4594a709c3f6e0f7e3183b9426364e78 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -3,8 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "font-interface.hh"
 #include "item.hh"
 #include "stencil.hh"
@@ -13,6 +14,7 @@
 #include "pitch.hh"
 
 /*
+  
   TODO: insert support for smaller cautionaries, tie-break-reminders.
   Either here or in new-accidental-engraver.
 
@@ -23,17 +25,17 @@
 Stencil
 parenthesize (Grob*me, Stencil m)
 {
-  Stencil open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-leftparen"));
-  Stencil close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-rightparen"));
+  Stencil open = Font_interface::get_default_font (me)->find_by_name ("accidentals.leftparen");
+  Stencil close = Font_interface::get_default_font (me)->find_by_name ("accidentals.rightparen");
 
-  m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0,0);
-  m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0,0);
+  m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0, 0);
+  m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0, 0);
 
   return m;
 }
 
 
-MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1);
 SCM
 Accidental_interface::after_line_breaking (SCM smob)
 {
@@ -162,7 +164,7 @@ Accidental_interface::get_fontcharname (String style, int alteration)
   return style + to_string (alteration);
 }
 
-MAKE_SCHEME_CALLBACK (Accidental_interface,print,1);
+MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1);
 SCM
 Accidental_interface::print (SCM smob)
 {
@@ -203,7 +205,7 @@ Accidental_interface::print (SCM smob)
                                 (ly_symbol2scm ("font-size"),
                                  scm_int2num (-2))),
                     ac);
-      fm = select_font (me->get_paper (), ac);
+      fm = select_font (me->get_layout (), ac);
     }
   else
     fm = Font_interface::get_default_font (me);
@@ -214,7 +216,7 @@ Accidental_interface::print (SCM smob)
     {
       int alteration = scm_to_int (scm_car (s));
       String font_char = get_fontcharname (style, alteration);
-      Stencil acc (fm->find_by_name ("accidentals-" + font_char));
+      Stencil acc (fm->find_by_name ("accidentals." + font_char));
 
       if (acc.is_empty ())
        {
@@ -222,7 +224,7 @@ Accidental_interface::print (SCM smob)
        }
       else
        {
-         mol.add_at_edge (X_AXIS,  RIGHT, acc, 0.1,0);
+         mol.add_at_edge (X_AXIS,  RIGHT, acc, 0.1, 0);
        }
     }