*** empty log message ***

[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 81dd379dae6f2f4d4e84dfdf454b76cb7d572144..a5f3624d28aa47fac75ba6cafc5239e3fdf5ffcb 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -1,18 +1,17 @@
-/*   
+/*
   system-start-delimiter-engraver.cc -- implement System_start_delimiter_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 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
@@ -21,24 +20,22 @@ public:
   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_))
     {
       /*
-       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_))
     {
@@ -47,18 +44,18 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
 
       /*
        UGH UGH
-       */
-      if (ly_c_string_p (gl) && ly_c_equal_p (gl, scm_makfrom0str  ("brace"))
-         && ly_c_string_p (my_gl) && ly_c_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 (ly_c_string_p (gl) && ly_c_equal_p (gl, scm_makfrom0str  ("bracket"))
-              && ly_c_string_p (my_gl) && ly_c_equal_p (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));
-       }
+      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_property ("arch-height",
+                                  scm_make_real (scm_to_double (inf.grob_->get_property
+                                                                ("arch-height")) + 0.5));
+       }
     }
 }
 
@@ -72,11 +69,11 @@ System_start_delimiter_engraver::process_music ()
 {
   if (!delim_)
     {
-      SCM delim_name =get_property ("systemStartDelimiter");
-      delim_ = make_spanner_from_properties (this, delim_name, SCM_EOL);
+      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")));
-      
     }
 }
 void
@@ -85,14 +82,13 @@ System_start_delimiter_engraver::finalize ()
   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",
-/* 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 */ "");