* lily/lexer.ll: change is_string -> ly_c_string_p

[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 2b509be6acd2ee164bda439bf5882bcc6febf305..b5988eac2ab31cff528bcc6ac8c0383b248ed19a 100644 (file)
--- 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--2002 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,12 +18,12 @@
 class System_start_delimiter_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(System_start_delimiter_engraver);
+  TRANSLATOR_DECLARATIONS (System_start_delimiter_engraver);
 
 protected:
   Spanner * delim_;
   virtual void acknowledge_grob (Grob_info);
-  virtual void initialize ();
+  virtual void process_music ();
   virtual void finalize ();
 };
 
@@ -33,31 +32,31 @@ protected:
 void
 System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Staff_symbol::has_interface (inf.grob_l_))
+  if (Staff_symbol::has_interface (inf.grob_))
     {
       /*
        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_l_);
+      Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"),  inf.grob_);
     }
-  else if (System_start_delimiter::has_interface (inf.grob_l_))
+  else if (System_start_delimiter::has_interface (inf.grob_))
     {
-      SCM gl = inf.grob_l_->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_symbol_p (gl) && gl  == ly_symbol2scm ("brace")
-         && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
-       inf.grob_l_->translate_axis (-0.8, X_AXIS); // ugh
-      else if (gh_symbol_p (gl) && gl  == ly_symbol2scm ("bracket")
-              && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
+      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_l_->translate_axis ( -0.8, X_AXIS); // ugh
-         inf.grob_l_->set_grob_property ("arch-height",
-           gh_double2scm(gh_scm2double(inf.grob_l_->get_grob_property
+         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));
        }
     }
@@ -69,27 +68,31 @@ System_start_delimiter_engraver::System_start_delimiter_engraver ()
 }
 
 void
-System_start_delimiter_engraver::initialize ()
+System_start_delimiter_engraver::process_music ()
 {
-  SCM delim_name =get_property ("SystemStartDelimiter");
-  delim_ = new Spanner (internal_get_property (delim_name));
-
-  delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-
+  if (!delim_)
+    {
+      SCM delim_name =get_property ("systemStartDelimiter");
+      delim_ = make_spanner_from_properties (get_parent_context (), delim_name);
 
-  announce_grob (delim_,0);
+      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")));
+      typeset_grob (delim_);
+    }
 }
 
-ENTER_DESCRIPTION(System_start_delimiter_engraver,
-/* descr */       "creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner",
+ENTER_DESCRIPTION (System_start_delimiter_engraver,
+/* descr */       "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner",
 /* creats*/       "SystemStartBar SystemStartBrace SystemStartBracket",
-/* acks  */       "system-start-delimiter-interface staff-symbol-interface",
-/* reads */       "",
+/* accepts */     "",
+/* acks  */      "system-start-delimiter-interface staff-symbol-interface",
+/* reads */       "systemStartDelimiter",
 /* write */       "");