X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=82083f464894c734703f40a3c166d26a60cb91e9;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=563e7218c08a60cb994b896757686e6bf4ac80be;hpb=a3765e1d290e5e49093e7ca7791bf3fe20be1726;p=lilypond.git

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 563e7218c0..82083f4648 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  grob-pq-engraver.cc -- implement Grob_pq_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2001--2007  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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "context.hh"
@@ -18,7 +29,7 @@ struct Grob_pq_entry
 };
 
 bool
-operator< (Grob_pq_entry const &a, Grob_pq_entry const &b)
+operator < (Grob_pq_entry const &a, Grob_pq_entry const &b)
 {
   return a.end_ < b.end_;
 }
@@ -33,7 +44,7 @@ protected:
   void start_translation_timestep ();
   void stop_translation_timestep ();
   void process_acknowledged ();
-  
+
   vector<Grob_pq_entry> started_now_;
 };
 
@@ -48,11 +59,12 @@ Grob_pq_engraver::initialize ()
 }
 
 LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
-	   2, 0, 0, (SCM a, SCM b),
-	   "Compare 2 grob priority queue entries. Internal")
+           2, 0, 0, (SCM a, SCM b),
+           "Compare two grob priority queue entries."
+           "  This is an internal function.")
 {
-  if (Moment::compare (*unsmob_moment (scm_car (a)),
-		       *unsmob_moment (scm_car (b))) < 0)
+  if (Moment::compare (*Moment::unsmob (scm_car (a)),
+                       *Moment::unsmob (scm_car (b))) < 0)
     return SCM_BOOL_T;
   else
     return SCM_BOOL_F;
@@ -70,7 +82,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
       Moment l = get_event_length (ev, n);
 
       if (!l.to_bool ())
-	return;
+        return;
 
       Moment end = n + l;
 
@@ -91,8 +103,8 @@ Grob_pq_engraver::process_acknowledged ()
   for (vsize i = 0; i < started_now_.size (); i++)
     {
       *tail = scm_acons (started_now_[i].end_.smobbed_copy (),
-			 started_now_[i].grob_->self_scm (),
-			 SCM_EOL);
+                         started_now_[i].grob_->self_scm (),
+                         SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
 
@@ -109,7 +121,7 @@ Grob_pq_engraver::stop_translation_timestep ()
   Moment now = now_mom ();
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
+  while (scm_is_pair (busy) && *Moment::unsmob (scm_caar (busy)) == now)
     busy = scm_cdr (busy);
 
 }
@@ -121,11 +133,11 @@ Grob_pq_engraver::start_translation_timestep ()
 
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now)
+  while (scm_is_pair (busy) && *Moment::unsmob (scm_caar (busy)) < now)
     {
       /*
-	The grob-pq-engraver is not water tight, and stuff like
-	tupletSpannerDuration confuses it.
+        The grob-pq-engraver is not water tight, and stuff like
+        tupletSpannerDuration confuses it.
       */
       busy = scm_cdr (busy);
     }
@@ -137,8 +149,16 @@ Grob_pq_engraver::start_translation_timestep ()
 #include "translator.icc"
 ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
+                /* doc */
+                "Administrate when certain grobs (e.g., note heads) stop"
+                " playing.",
+
+                /* create */
+                "",
+
+                /* read */
+                "busyGrobs ",
 
-		/* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
-		/* create */ "",
-		/* read */ "busyGrobs",
-		/* write */ "busyGrobs");
+                /* write */
+                "busyGrobs "
+               );