Imported Debian patch 2.12.3-1

[lilypond.git] / lily / piano-pedal-engraver.cc

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index debc884360ada4adc1a4b66dd59e66b843d86b90..f30442db548a7fc8782055c4fce419a37dddfbbd 100644 (file)
--- 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
@@ -27,7 +27,9 @@
 #include "item.hh"
 
 #include "translator.icc"
+#include <cstring>
 
+#include <string.h>
 
 /*
   TODO:
@@ -40,7 +42,7 @@
 */
 
 /* Ugh: This declaration is duplicated in piano-pedal-performer */
-typedef enum Pedal_type {
+enum Pedal_type {
   SOSTENUTO,
   SUSTAIN,
   UNA_CORDA,
@@ -493,7 +495,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 +511,8 @@ ADD_TRANSLATOR (Piano_pedal_engraver,
                "pedalSustainStrings "
                "pedalSustainStyle "
                "pedalUnaCordaStrings "
-               "pedalUnaCordaStyle",
+               "pedalUnaCordaStyle ",
                
-               /* write */ "");
+               /* write */
+               ""
+               );