X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-engraver.cc;h=609978af4a65a604528c8bcabcfff7d6233a4b21;hb=b223cddb11343dd7321154dfe7c2b3fea7aafee0;hp=bd08ed8354e6b4a86c49563a64d2a20db2ee4613;hpb=1e1fa5221ca359326b073626168c6b7cda6453e1;p=lilypond.git

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index bd08ed8354..609978af4a 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -1,12 +1,13 @@
-/*   
+/*
   ligature-engraver.cc -- implement Ligature_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
-  
- */
+
+  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+*/
+
 #include "ligature-engraver.hh"
+
 #include "spanner.hh"
 #include "score-engraver.hh"
 #include "note-head.hh"
@@ -14,7 +15,6 @@
 #include "warn.hh"
 #include "context.hh"
 
-
 /*
  * This abstract class provides the general framework for ligatures of
  * any kind.  It cares for handling start/stop ligatures requests and
@@ -58,7 +58,7 @@
  * Mensural_ligature_engraver) to the proper translator
  * (e.g. VoiceContext) to choose between various representations.
  * Since adding/removing an engraver to a translator is a global
- * action in the paper block, you can not mix various representations
+ * action in the layout block, you cannot mix various representations
  * _within_ the same score.  Hence, for selecting a representation,
  * one would rather like to have a property that can be set e.g. for
  * several staves individually.  However, it seems that this approach
@@ -187,11 +187,11 @@ Ligature_engraver::process_music ()
 
       prev_start_req_ = reqs_drul_[START];
       ligature_ = create_ligature_spanner ();
-      brew_ligature_primitive_proc =
-	ligature_->get_property ("ligature-primitive-callback");
+      brew_ligature_primitive_proc
+	= ligature_->get_property ("ligature-primitive-callback");
       if (brew_ligature_primitive_proc == SCM_EOL)
 	{
-	  warning ("Ligature_engraver: ligature-primitive-callback undefined");
+	  programming_error ("Ligature_engraver: ligature-primitive-callback undefined");
 	}
 
       Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
@@ -273,7 +273,7 @@ Ligature_engraver::acknowledge_grob (Grob_info info)
 	{
 	  primitives_.push (info);
 	  info.grob_->set_property ("print-function",
-					 brew_ligature_primitive_proc);
+				    brew_ligature_primitive_proc);
 	}
       if (Rest::has_interface (info.grob_))
 	{
@@ -285,10 +285,10 @@ Ligature_engraver::acknowledge_grob (Grob_info info)
     }
 }
 
-ENTER_DESCRIPTION (Ligature_engraver,
-/* descr */       "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.",
-/* creats */      "",
-/* accepts */     "ligature-event",
-/* acks  */      "note-head-interface rest-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Ligature_engraver,
+		/* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.",
+		/* creats */ "",
+		/* accepts */ "ligature-event",
+		/* acks  */ "note-head-interface rest-interface",
+		/* reads */ "",
+		/* write */ "");