X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparenthesis-engraver.cc;h=d3382070e0af877b9e41cb565668b26bdc4aa657;hb=dd237d4df77489170dc5c204a9ba58819a904dfa;hp=01ea191cb34360b173330480b3668b62a6b2cbde;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc
index 01ea191cb3..d3382070e0 100644
--- a/lily/parenthesis-engraver.cc
+++ b/lily/parenthesis-engraver.cc
@@ -3,18 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
 #include "engraver.hh"
 
-#include "warn.hh"
-#include "simple-closure.hh"
-#include "music.hh"
-#include "grob.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
+#include "simple-closure.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
@@ -26,26 +25,24 @@ protected:
   DECLARE_ACKNOWLEDGER (grob);
 };
 
-Parenthesis_engraver::Parenthesis_engraver()
+Parenthesis_engraver::Parenthesis_engraver ()
 {
 }
 
 void
 Parenthesis_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Music *music = info.music_cause ())
+  if (Stream_event *ev = info.event_cause ())
     {
-      if (to_boolean (music->get_property ("parenthesize")))
+      if (to_boolean (ev->get_property ("parenthesize")))
 	{
 	  if (Item *victim = dynamic_cast<Item*> (info.grob ()))
 	    {
 	      Engraver *eng = dynamic_cast<Engraver*> (info.origin_translator ());
-	      Item *paren = make_item_from_properties (eng,
-						       ly_symbol2scm ("ParenthesesItem"),
-						       victim->self_scm (),
-						       "ParenthesesItem");
-
+	      Item *paren = eng->make_item ("ParenthesesItem", victim->self_scm ());
 	      Pointer_group_interface::add_grob (paren, ly_symbol2scm ("elements"), victim);
+
+	      paren->set_parent (victim, Y_AXIS);
 	      
 	      Real size = robust_scm2double (paren->get_property ("font-size"), 0.0)
 		+ robust_scm2double (victim->get_property ("font-size"), 0.0);
@@ -67,11 +64,16 @@ Parenthesis_engraver::acknowledge_grob (Grob_info info)
 
 ADD_ACKNOWLEDGER (Parenthesis_engraver, grob);
 ADD_TRANSLATOR (Parenthesis_engraver,
-		/* doc */ "Parenthesize objects whose music cause has the @code{parenthesize} "
-		"property.",
+		/* doc */
+		"Parenthesize objects whose music cause has the"
+		" @code{parenthesize} property.",
 		
 		/* create */
 		"ParenthesesItem ",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);