* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 6ac7983229be4f3a93d74fb99da5140c510eff6e..31259da703fdb8f111db59c2572e4724cd3b4241 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -23,8 +23,8 @@
 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);
@@ -69,7 +69,7 @@ Accidental_interface::accurate_boxes (Grob *a, Grob**common)
       && !parens
       && scm_ilength (accs) == 1)
     {
-      if (scm_to_int (ly_car (accs)) == FLAT)
+      if (scm_to_int (scm_car (accs)) == FLAT)
        {
          Box stem = b;
          Box bulb = b;
@@ -203,18 +203,18 @@ 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);
 
   Stencil mol;
   for (SCM s = me->get_property ("accidentals");
-       scm_is_pair (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      int alteration = scm_to_int (ly_car (s));
+      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 ())
        {