Typo fixes: backslash, join one set of comments.

The backslash was doing nothing.  Nick said this was ok.

It's confusing having two of those almost-identical comments
indented, and two non-indented.  They all fit within 80 chars.

Relax; I'm not going to go on a stylistic editing spree right
before 2.14.  These are (I think) the only changes I'll be making
on master without more discussion.

diff --git a/lily/include/gregorian-ligature.hh b/lily/include/gregorian-ligature.hh
index 98c5cbe5d5acbc796d5b6551296badccaf9a8a51..5414a5c69a0a796738954b61b847f720a30f7892 100644 (file)
--- a/lily/include/gregorian-ligature.hh
+++ b/lily/include/gregorian-ligature.hh
@@ -61,14 +61,10 @@ public:
  * These definitions may be extended by more specific Gregorian
  * ligatures such as vaticana-ligature.hh.
  */
-#define PES_LOWER 0x0001 // this is a head before "\~" in an
-                        // ascending melody
-#define PES_UPPER 0x0002 // this is a head after "\~" in an
-                        // ascending melody
-#define FLEXA_LEFT 0x0004 // this is a head before "\~" in a
-// descending melody
-#define FLEXA_RIGHT 0x0008 // this is a head after "\~" in a
-// descending melody
+#define PES_LOWER 0x0001 // this is a head before "\~" in an ascending melody
+#define PES_UPPER 0x0002 // this is a head after "\~" in an ascending melody
+#define FLEXA_LEFT 0x0004 // this is a head before "\~" in a descending melody
+#define FLEXA_RIGHT 0x0008 // this is a head after "\~" in a descending melody
 #define AFTER_DEMINUTUM 0x0020 // previous head was a deminutum
 
 #endif /* GREGORIAN_LIGATURE_HH */

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 312db5c9cca41f4e98b7f31868c446c9c6b6cec3..cf6af128f31cb6b7e6a795d66d59f25688193ca9 100644 (file)
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -51,7 +51,7 @@ public:
   static Interval extent_in_staff (Grob *); 
 };
 
-int compare_position (Grob *const &, Grob *const &);\
+int compare_position (Grob *const &, Grob *const &);
 bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */