Misc cleanups.

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 91232d5b31c8e02b6f90c73bffff5039806f303b..36cf898af86257bc4dd0c85d94ac1ba089c8b61d 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -208,20 +208,22 @@ provide_context_info (vector<Grob_info> primitives)
       int prefix_set = scm_to_int (primitive->get_property ("prefix-set"));
 
       if (prefix_set & PES_OR_FLEXA)
-       if (!i) // ligature may not start with 2nd head of pes or flexa
-         primitive->warning (_ ("cannot apply `\\~' on first head of ligature"));
-       else if (pitch > prev_pitch) // pes
-         {
-           prev_context_info |= PES_LOWER;
-           context_info |= PES_UPPER;
-         }
-       else if (pitch < prev_pitch) // flexa
-         {
-           prev_context_info |= FLEXA_LEFT;
-           context_info |= FLEXA_RIGHT;
-         }
-       else // (pitch == prev_pitch)
-         primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
+       {
+         if (!i) // ligature may not start with 2nd head of pes or flexa
+           primitive->warning (_ ("cannot apply `\\~' on first head of ligature"));
+         else if (pitch > prev_pitch) // pes
+           {
+             prev_context_info |= PES_LOWER;
+             context_info |= PES_UPPER;
+           }
+         else if (pitch < prev_pitch) // flexa
+           {
+             prev_context_info |= FLEXA_LEFT;
+             context_info |= FLEXA_RIGHT;
+           }
+         else // (pitch == prev_pitch)
+           primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
+       }
       if (prev_prefix_set & DEMINUTUM)
        context_info |= AFTER_DEMINUTUM;
 

diff --git a/lily/misc.cc b/lily/misc.cc
index 3b9d87da162859c339b6a5a66548bd6a17e4d572..85db2468cd3f51116640e95bc62c3433fb31c1b9 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -53,7 +53,7 @@ peak_around (Real epsilon,  Real threshold, Real x)
 {
   if (x < 0)
     return 1.0;
-  return max (- epsilon * (x - threshold) / ((x + epsilon)  * threshold), 0.0);
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
 /*

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index faa078fdf24c2063ac87a1a3940d21ce83334921..b3021cbcb78b73bb9181d9ca1470b6418878326c 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -41,7 +41,7 @@
 */
 
 /* Ugh: This declaration is duplicated in piano-pedal-performer */
-typedef enum Pedal_type {
+enum Pedal_type {
   SOSTENUTO,
   SUSTAIN,
   UNA_CORDA,