* lily/vaticana-ligature-engraver.cc: bugfix: another few

[lilypond.git] / lily / volta-engraver.cc

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 15fe9e9c0c1e5433b4aca179f173b58868a21b45..41757b4ef275a41c7bd2b0b8d17d0cb03bd93b25 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -3,14 +3,13 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
 #include "context.hh"
 #include "volta-bracket.hh"
-#include "item.hh"
 #include "note-column.hh"
 #include "bar-line.hh"
 #include "side-position-interface.hh"
@@ -60,8 +59,8 @@ Volta_engraver::Volta_engraver ()
 bool
 Volta_engraver::staff_eligible ()
 {
-  SCM doit =get_property ("voltaOnThisStaff");
-  if (ly_c_boolean_p (doit))
+  SCM doit = get_property ("voltaOnThisStaff");
+  if (scm_is_bool (doit))
     {
       return to_boolean (doit);
     }
@@ -83,12 +82,12 @@ Volta_engraver::staff_eligible ()
     volta engraver in score context or somesuch.
        
   */
-  if (!ly_c_pair_p (staffs))
+  if (!scm_is_pair (staffs))
     {
       programming_error ("Huh? Volta engraver can't find staffs?");
       return false;
     }
-  else if (ly_car (scm_last_pair (staffs)) != staff_)
+  else if (scm_car (scm_last_pair (staffs)) != staff_)
     {
       return false;
     }
@@ -107,21 +106,21 @@ Volta_engraver::process_music ()
     
   bool  end = false;
   start_string_ = SCM_EOL;
-  while (ly_c_pair_p (cs))
+  while (scm_is_pair (cs))
     {
-      SCM c = ly_car (cs);
+      SCM c = scm_car (cs);
 
-      if (ly_c_pair_p (c)
-         && ly_car (c) == ly_symbol2scm ("volta")
-         && ly_c_pair_p (ly_cdr (c)))
+      if (scm_is_pair (c)
+         && scm_car (c) == ly_symbol2scm ("volta")
+         && scm_is_pair (scm_cdr (c)))
        {
-         if (ly_cadr (c) ==  SCM_BOOL_F)
+         if (scm_cadr (c) ==  SCM_BOOL_F)
            end = true;
          else
-           start_string_ = ly_cadr (c);
+           start_string_ = scm_cadr (c);
        }
       
-      cs = ly_cdr (cs);
+      cs = scm_cdr (cs);
     }
 
   if (volta_span_)
@@ -143,11 +142,11 @@ Volta_engraver::process_music ()
   else if (end)
     {
       end_volta_span_ = volta_span_;
-      volta_span_ =0;
+      volta_span_ = 0;
     }
 
   if (volta_span_ && 
-      (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_)))
+      (scm_is_string (start_string_) || scm_is_pair (start_string_)))
     {
       warning (_ ("Already have a volta spanner.  Stopping that one prematurely."));
       
@@ -162,7 +161,7 @@ Volta_engraver::process_music ()
     }
 
   if (!volta_span_ && 
-      (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_)))
+      (scm_is_string (start_string_) || scm_is_pair (start_string_)))
     {
       started_mom_ = now_mom () ;
 
@@ -182,7 +181,7 @@ Volta_engraver::acknowledge_grob (Grob_info i)
       if (Note_column::has_interface (item))
        {
          if (volta_span_)
-           Volta_bracket_interface::add_column (volta_span_,item);
+           Volta_bracket_interface::add_column (volta_span_, item);
        }
       if (Bar_line::has_interface (item))
        {
@@ -235,7 +234,7 @@ Volta_engraver::stop_translation_timestep ()
       end_volta_span_->set_bound (RIGHT, ci);
     }
 
-  end_volta_span_ =0;
+  end_volta_span_ = 0;
 
   if (volta_span_ && !volta_span_->get_bound (LEFT))
     {
@@ -250,7 +249,7 @@ Volta_engraver::stop_translation_timestep ()
   TODO: should attach volta to paper-column if no bar is found.
  */
 
-ENTER_DESCRIPTION (Volta_engraver,
+ADD_TRANSLATOR (Volta_engraver,
 /* descr */       "Make volta brackets.",
 /* creats*/       "VoltaBracket",
 /* accepts */     "",