X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-engraver.cc;h=fe568a5fd50bbbd7057371a1a2c67fc8b85916e0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1410905f6582cad724ab6180936133558545338a;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 1410905f65..fe568a5fd5 100644
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 #include "engraver.hh"
 
 #include "axis-group-interface.hh"
-#include "bar-line.hh"
 #include "context.hh"
 #include "grob-array.hh"
 #include "international.hh"
@@ -83,14 +82,14 @@ Volta_engraver::process_music ()
       SCM c = scm_car (cs);
 
       if (scm_is_pair (c)
-	  && scm_car (c) == ly_symbol2scm ("volta")
-	  && scm_is_pair (scm_cdr (c)))
-	{
-	  if (scm_cadr (c) == SCM_BOOL_F)
-	    end = true;
-	  else
-	    start_string_ = scm_cadr (c);
-	}
+          && scm_car (c) == ly_symbol2scm ("volta")
+          && scm_is_pair (scm_cdr (c)))
+        {
+          if (scm_cadr (c) == SCM_BOOL_F)
+            end = true;
+          else
+            start_string_ = scm_cadr (c);
+        }
 
       cs = scm_cdr (cs);
     }
@@ -100,8 +99,8 @@ Volta_engraver::process_music ()
       SCM l (get_property ("voltaSpannerDuration"));
       Moment now = now_mom ();
 
-      bool early_stop = unsmob_moment (l)
-	&& *unsmob_moment (l) <= now - started_mom_;
+      bool early_stop = Moment::is_smob (l)
+                        && *Moment::unsmob (l) <= now - started_mom_;
 
       end = end || early_stop;
     }
@@ -121,11 +120,11 @@ Volta_engraver::process_music ()
       warning (_ ("already have a volta spanner, ending that one prematurely"));
 
       if (end_volta_bracket_)
-	{
-	  warning (_ ("also already have an ended spanner"));
-	  warning (_ ("giving up"));
-	  return;
-	}
+        {
+          warning (_ ("also already have an ended spanner"));
+          warning (_ ("giving up"));
+          return;
+        }
 
       end_volta_bracket_ = volta_bracket_;
       volta_bracket_ = 0;
@@ -141,7 +140,7 @@ Volta_engraver::process_music ()
       volta_bracket_->set_property ("text", start_string_);
 
       if (!volta_spanner_)
-	volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
+        volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
 
       Axis_group_interface::add_element (volta_spanner_, volta_bracket_);
     }
@@ -162,7 +161,7 @@ Volta_engraver::acknowledge_bar_line (Grob_info i)
 void
 Volta_engraver::stop_translation_timestep ()
 {
-  Grob *cc = unsmob_grob (get_property ("currentCommandColumn"));
+  Grob *cc = Grob::unsmob (get_property ("currentCommandColumn"));
   Item *ci = dynamic_cast<Item *> (cc);
 
   if (end_volta_bracket_ && !end_volta_bracket_->get_bound (RIGHT))
@@ -174,7 +173,7 @@ Volta_engraver::stop_translation_timestep ()
   if (end_volta_bracket_ && !volta_bracket_)
     {
       for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s))
-	Side_position_interface::add_support (volta_spanner_, unsmob_grob (scm_car (s)));
+        Side_position_interface::add_support (volta_spanner_, Grob::unsmob (scm_car (s)));
       volta_spanner_ = 0;
     }
 
@@ -192,18 +191,18 @@ Volta_engraver::stop_translation_timestep ()
 */
 ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
 ADD_TRANSLATOR (Volta_engraver,
-		/* doc */
-		"Make volta brackets.",
+                /* doc */
+                "Make volta brackets.",
 
-		/* create */
-		"VoltaBracket "
-		"VoltaBracketSpanner ",
+                /* create */
+                "VoltaBracket "
+                "VoltaBracketSpanner ",
 
-		/* read */
-		"repeatCommands "
-		"voltaSpannerDuration "
-		"stavesFound ",
+                /* read */
+                "repeatCommands "
+                "voltaSpannerDuration "
+                "stavesFound ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );