* scripts/lilypond-book.py: Resurrect HTML links to .ly source.

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 79260eed7b45ef3a0390bddcac4039203410cf5b..ead6669ac3be0ca9be69ee643bf08828db7986a6 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,8 +25,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);
@@ -48,7 +50,7 @@ Accidental_interface::after_line_breaking (SCM smob)
 }
 
 Array<Box>
-Accidental_interface::accurate_boxes (Grob *a,Grob**common)
+Accidental_interface::accurate_boxes (Grob *a, Grob**common)
 {
   Box b;
   b[X_AXIS] = a->extent (a, X_AXIS);
@@ -65,11 +67,11 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
 
   SCM accs = a->get_property ("accidentals");
   SCM scm_style = a->get_property ("style");
-  if (!ly_c_symbol_p (scm_style)
+  if (!scm_is_symbol (scm_style)
       && !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;
@@ -180,7 +182,7 @@ Accidental_interface::print (SCM smob)
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (ly_c_symbol_p (scm_style))
+  if (scm_is_symbol (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -196,22 +198,25 @@ 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));
+      Stencil acc (fm->find_by_name ("accidentals." + font_char));
 
       if (acc.is_empty ())
        {