X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-engraver.cc;h=fd141ed3710d38ca0227352311a8d3ccb4cfad63;hb=2fade2d686600c3dee0395f37d1e894747ae1052;hp=353ea91d56d8791bb1677448efd15997872f26ef;hpb=744614ec4497e540fbaa6ad9bf6e842f4b99442a;p=lilypond.git

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 353ea91d56..fd141ed371 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>,
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>,
                  Erik Sandberg <mandolaerik@gmail.com>
 
   Chris Jackson <chris@fluffhouse.org.uk> - extended to support
@@ -28,6 +28,7 @@
 
 #include "translator.icc"
 
+#include <string.h>
 
 /*
   TODO:
@@ -40,7 +41,7 @@
 */
 
 /* Ugh: This declaration is duplicated in piano-pedal-performer */
-typedef enum Pedal_type {
+enum Pedal_type {
   SOSTENUTO,
   SUSTAIN,
   UNA_CORDA,
@@ -298,7 +299,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
       if (!mixed)
 	{
 	  if (!p->start_ev_)
-	    p->event_drul_[STOP]->origin ()->warning (_f (cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
 	  else
 	    s = scm_cadr (strings);
 	  p->start_ev_ = p->event_drul_[START];
@@ -309,7 +310,7 @@ Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed)
       if (!mixed)
 	{
 	  if (!p->start_ev_)
-	    p->event_drul_[STOP]->origin ()->warning (_f (cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
 	  else
 	    s = scm_caddr (strings);
 	  p->start_ev_ = 0;
@@ -344,7 +345,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed)
 {
   if (!p->bracket_ && p->event_drul_[STOP])
     {
-      string msg = _f (cannot find start of piano pedal bracket: `%s'", p->type_->base_name_.c_str ());
+      string msg = _f ("cannot find start of piano pedal bracket: `%s'", p->type_->base_name_.c_str ());
       p->event_drul_[STOP]->origin ()->warning (msg);
       p->event_drul_[STOP] = 0;
     }
@@ -493,7 +494,6 @@ Piano_pedal_engraver::typeset_all (Pedal_info *p)
 ADD_ACKNOWLEDGER (Piano_pedal_engraver, note_column);
 
 ADD_TRANSLATOR (Piano_pedal_engraver,
-
 		/* doc */
 		"Engrave piano pedal symbols and brackets.",
 
@@ -510,6 +510,8 @@ ADD_TRANSLATOR (Piano_pedal_engraver,
 		"pedalSustainStrings "
 		"pedalSustainStyle "
 		"pedalUnaCordaStrings "
-		"pedalUnaCordaStyle",
+		"pedalUnaCordaStyle ",
 		
-		/* write */ "");
+		/* write */
+		""
+		);