* lily/kpath.cc:

[lilypond.git] / lily / system-start-delimiter-engraver.cc

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index f5865c343c1277855af8cf7f02c7f384f85c2779..7e8adb3d7c98dc67868ce613750f5b2f44691fc4 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -3,7 +3,7 @@
   
   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>
   
  */
 
@@ -12,13 +12,13 @@
 #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_;
@@ -35,28 +35,28 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
   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_);
     }
   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")))
+      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 (gh_string_p (gl) && gh_equal_p (gl, scm_makfrom0str  ("bracket"))
-              && gh_string_p (my_gl) && gh_equal_p (my_gl, scm_makfrom0str  ("bracket")))
+      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
-         inf.grob_->set_grob_property ("arch-height",
-                                      gh_double2scm (gh_scm2double(inf.grob_->get_grob_property
+         inf.grob_->set_property ("arch-height",
+                                      scm_make_real (scm_to_double (inf.grob_->get_property
                                        ("arch-height"))+0.5));
        }
     }
@@ -72,22 +72,26 @@ 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
 System_start_delimiter_engraver::finalize ()
 {
-  delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (delim_);
+  if (delim_)
+    {
+      delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      
+    }
 }
 
-ENTER_DESCRIPTION(System_start_delimiter_engraver,
-/* descr */       "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner",
+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",