X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter-engraver.cc;h=b5988eac2ab31cff528bcc6ac8c0383b248ed19a;hb=ba858880848d6aca1de4401d185860eb2017a01c;hp=a6955147cbadc6e8af2ec8092ab860210025f295;hpb=7249d131a7b58117ad502f17975af50ea4144a05;p=lilypond.git

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index a6955147cb..b5988eac2a 100644
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -3,11 +3,10 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-
 #include "system-start-delimiter.hh"
 #include "engraver.hh"
 #include "staff-symbol.hh"
@@ -19,78 +18,81 @@
 class System_start_delimiter_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  System_start_delimiter_engraver();
+  TRANSLATOR_DECLARATIONS (System_start_delimiter_engraver);
 
 protected:
   Spanner * delim_;
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_creation_processing ();
-  virtual void do_removal_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_music ();
+  virtual void finalize ();
 };
 
-ADD_THIS_TRANSLATOR(System_start_delimiter_engraver);
+
 
 void
-System_start_delimiter_engraver::acknowledge_element (Score_element_info inf)
+System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Staff_symbol::has_interface (inf.elem_l_))
+  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_element (delim_, "elements", inf.elem_l_);
+      Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"),  inf.grob_);
     }
-  else if (System_start_delimiter::has_interface (inf.elem_l_))
+  else if (System_start_delimiter::has_interface (inf.grob_))
     {
-      SCM gl = inf.elem_l_->get_elt_property ("glyph");
-      SCM my_gl = delim_->get_elt_property ("glyph");
+      SCM gl = inf.grob_->get_property ("glyph");
+      SCM my_gl = delim_->get_property ("glyph");
 
       /*
 	UGH UGH
        */
-      if (gh_symbol_p (gl) && gl  == ly_symbol2scm ("brace")
-	  && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
-	inf.elem_l_->translate_axis ( -paper_l ()->get_var ("staffspace"), X_AXIS); // ugh
+      if (ly_c_string_p (gl) && is_equal (gl, scm_makfrom0str  ("brace"))
+	  && ly_c_string_p (my_gl) && is_equal (my_gl, scm_makfrom0str  ("bracket")))
+	inf.grob_->translate_axis (-0.8, X_AXIS); // ugh
+      else if (ly_c_string_p (gl) && is_equal (gl, scm_makfrom0str  ("bracket"))
+	       && ly_c_string_p (my_gl) && is_equal (my_gl, scm_makfrom0str  ("bracket")))
+       {
+         inf.grob_->translate_axis ( -0.8, X_AXIS); // ugh
+         inf.grob_->set_property ("arch-height",
+				       scm_make_real (ly_scm2double (inf.grob_->get_property
+                                       ("arch-height"))+0.5));
+       }
     }
-
 }
 
-System_start_delimiter_engraver::System_start_delimiter_engraver()
+System_start_delimiter_engraver::System_start_delimiter_engraver ()
 {
   delim_ = 0;
 }
 
 void
-System_start_delimiter_engraver::do_creation_processing()
+System_start_delimiter_engraver::process_music ()
 {
-  delim_ = new Spanner (get_property ("SystemStartDelimiter"));
-  System_start_delimiter::set_interface (delim_);
-  delim_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));
-
-  /*
-    You can't override the glyph using \property, you must do it in
-    the predefined context (ie. \translator { ... } )
-   */
-  SCM s = get_property ("systemStartDelimiterGlyph");
-  if (gh_symbol_p (s))
+  if (!delim_)
     {
-      delim_->set_elt_property ("glyph", s);
-    }
+      SCM delim_name =get_property ("systemStartDelimiter");
+      delim_ = make_spanner_from_properties (get_parent_context (), delim_name);
 
-  announce_element (delim_,0);
+      delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      announce_grob (delim_, SCM_EOL);
+    }
 }
-
 void
-System_start_delimiter_engraver::do_removal_processing ()
+System_start_delimiter_engraver::finalize ()
 {
-  // ugh, should have naming without bracket
-  SCM collapse = get_property ("bracketCollapseHeight");
-  if (gh_number_p (collapse))
-    delim_->set_elt_property ("collapse-height", collapse);
-      
-  delim_->set_bound (RIGHT, unsmob_element (get_property ("currentCommandColumn")));
-  typeset_element (delim_);
+  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 */       "");