X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter-engraver.cc;h=bf6daa8b9e8ea4e45e2ff65cedbae4a7ed88a497;hb=da18ce55e6c6755ba018ec35a8ce8d59c9dde1e0;hp=10bab1bb73ad3c3161f3973281f3ac84c063f405;hpb=42392675026a0d14bda19d0a279a6762e4e84cf4;p=lilypond.git

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index 10bab1bb73..bf6daa8b9e 100644
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -1,64 +1,58 @@
-/*   
+/*
   system-start-delimiter-engraver.cc -- implement System_start_delimiter_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "system-start-delimiter.hh"
 #include "engraver.hh"
 #include "staff-symbol.hh"
 #include "group-interface.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "spanner.hh"
 
 class System_start_delimiter_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(System_start_delimiter_engraver);
+  TRANSLATOR_DECLARATIONS (System_start_delimiter_engraver);
 
 protected:
-  Spanner * delim_;
+  Spanner *delim_;
   virtual void acknowledge_grob (Grob_info);
   virtual void process_music ();
   virtual void finalize ();
 };
 
-
-
 void
 System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Staff_symbol::has_interface (inf.grob_))
+  if (Staff_symbol::has_interface (inf.grob ()))
     {
       /*
-	don't add as Axis_group_interface::add_element (delim_,),
+	don't add as Axis_group_interface::add_element (delim_, ),
 	because that would set the parent as well */
-	  
-      Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"),  inf.grob_);
+
+      Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"), inf.grob ());
     }
-  else if (System_start_delimiter::has_interface (inf.grob_))
+  else if (System_start_delimiter::has_interface (inf.grob ()))
     {
-      SCM gl = inf.grob_->get_grob_property ("glyph");
-      SCM my_gl = delim_->get_grob_property ("glyph");
+      SCM gl = inf.grob ()->get_property ("glyph");
+      SCM my_gl = delim_->get_property ("glyph");
 
       /*
 	UGH UGH
-       */
-      if (gh_string_p (gl) && gh_equal_p (gl, scm_makfrom0str  ("brace"))
-	  && gh_string_p (my_gl) && gh_equal_p (my_gl, scm_makfrom0str  ("bracket")))
-	inf.grob_->translate_axis (-0.8, X_AXIS); // ugh
-      else if (gh_string_p (gl) && gh_equal_p (gl, scm_makfrom0str  ("bracket"))
-	       && gh_string_p (my_gl) && gh_equal_p (my_gl, scm_makfrom0str  ("bracket")))
-       {
-         inf.grob_->translate_axis ( -0.8, X_AXIS); // ugh
-         inf.grob_->set_grob_property ("arch-height",
-				       gh_double2scm (gh_scm2double(inf.grob_->get_grob_property
-                                       ("arch-height"))+0.5));
-       }
+      */
+      if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("brace"))
+	  && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
+	inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
+      else if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("bracket"))
+	       && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
+	{
+	  inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
+	}
     }
 }
 
@@ -72,11 +66,11 @@ System_start_delimiter_engraver::process_music ()
 {
   if (!delim_)
     {
-      SCM delim_name =get_property ("systemStartDelimiter");
-      delim_ = internal_make_spanner (delim_name);
+      SCM delim_name = get_property ("systemStartDelimiter");
+      delim_ = make_spanner_from_properties (this, delim_name, SCM_EOL,
+					     ly_symbol2string (delim_name).to_str0 ());
 
       delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-      announce_grob (delim_, SCM_EOL);
     }
 }
 void
@@ -85,14 +79,13 @@ System_start_delimiter_engraver::finalize ()
   if (delim_)
     {
       delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-      typeset_grob (delim_);
     }
 }
 
-ENTER_DESCRIPTION(System_start_delimiter_engraver,
-/* descr */       "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner",
-/* creats*/       "SystemStartBar SystemStartBrace SystemStartBracket",
-/* accepts */     "",
-/* acks  */      "system-start-delimiter-interface staff-symbol-interface",
-/* reads */       "systemStartDelimiter",
-/* write */       "");
+ADD_TRANSLATOR (System_start_delimiter_engraver,
+		/* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar, Brace, Bracket@} spanner",
+		/* creats*/ "SystemStartBar SystemStartBrace SystemStartBracket",
+		/* accepts */ "",
+		/* acks  */ "system-start-delimiter-interface staff-symbol-interface",
+		/* reads */ "systemStartDelimiter",
+		/* write */ "");