* lily/bar-line.cc (compound_barline): fix : for staff without

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 8de4544957dc6674dc527dd79febb56e9b0e3a16..6c177a779f4aa211427b506d15b2567b4cd00649 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -1,14 +1,15 @@
 /*
   accidental.cc -- implement Accidental_interface
 
-  (c) 2001--2004 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
   
- */
+  (c) 2001--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 #include "font-interface.hh"
 #include "item.hh"
 #include "stencil.hh"
 #include "accidental-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "pitch.hh"
 
 /*
@@ -19,8 +20,6 @@
   accidental-placement.cc
 
 */
-
-
 Stencil
 parenthesize (Grob*me, Stencil m)
 {
@@ -60,13 +59,12 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
   if (to_boolean (a->get_property ("cautionary")))
     {
       SCM cstyle = a->get_property ("cautionary-style");
-      parens = is_equal (cstyle, ly_symbol2scm ("parentheses"));
-
+      parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
     }
 
   SCM accs = a->get_property ("accidentals");
   SCM scm_style = a->get_property ("style");
-  if (!is_symbol (scm_style)
+  if (!ly_c_symbol_p (scm_style)
       && !parens
       && scm_ilength (accs) == 1)
     {
@@ -175,13 +173,13 @@ Accidental_interface::print (SCM smob)
   if (caut)
     {
       SCM cstyle = me->get_property ("cautionary-style");
-      parens = is_equal (cstyle, ly_symbol2scm ("parentheses"));
-      smaller = is_equal (cstyle, ly_symbol2scm ("smaller"));
+      parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+      smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller"));
     }
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (is_symbol (scm_style))
+  if (ly_c_symbol_p (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -196,11 +194,11 @@ Accidental_interface::print (SCM smob)
   Font_metric *fm = 0;
   if (smaller)
     {
-      SCM ac = Font_interface::text_font_alist_chain (me);
-      ac = scm_cons (scm_cons (scm_cons
-                            (ly_symbol2scm ("font-size"),
-                             scm_int2num (-2)), SCM_EOL),
-                   ac);
+      SCM ac = Font_interface::music_font_alist_chain (me);
+      ac = scm_cons (scm_list_1 (scm_cons
+                                (ly_symbol2scm ("font-size"),
+                                 scm_int2num (-2))),
+                    ac);
       fm = select_font (me->get_paper (), ac);
     }
   else
@@ -208,7 +206,7 @@ Accidental_interface::print (SCM smob)
 
   Stencil mol;
   for (SCM s = me->get_property ("accidentals");
-       is_pair (s); s = ly_cdr (s))
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
       int alteration = ly_scm2int (ly_car (s));
       String font_char = get_fontcharname (style, alteration);