* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 2844973503097b77f92a0bc812d5c0ad4a627f96..696673d9d6ea3ed203133a0b54601f35f35e8310 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -4,6 +4,7 @@
   source file of the GNU LilyPond music typesetter
   
   (c) 2001--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  ofog
 */
 #include "font-interface.hh"
 #include "item.hh"
@@ -69,7 +70,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;
@@ -196,20 +197,23 @@ Accidental_interface::print (SCM smob)
   if (smaller)
     {
       SCM ac = Font_interface::music_font_alist_chain (me);
+      /*
+       TODO: should calc font-size by adding -2 to current font-size
+      */
       ac = scm_cons (scm_list_1 (scm_cons
                                 (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");
-       ly_c_pair_p (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));