Trivial stuff

diff --git a/ChangeLog b/ChangeLog
index 61b5e01db8908c6ef52278e910aa6215411bdad8..b6fa9a82054fc133059b6d9ece3d94fb96928b1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-26  Erlend Aasland  <erlenda@gmail.com>
+
+       * scm/define-grobs.scm: trivial beautification
+
+       * lily/tie-performer.cc: no need to #include "pqueue.hh"
+
+       * lily/source-file.cc: put multibyte var inside #if clause
+
 2006-10-26  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/system.cc (get_paper_system): 

diff --git a/lily/source-file.cc b/lily/source-file.cc
index bb38ffdb0994879a5ad11ab1c9a9362445ec023d..310c7938d3b11011681f48af5f936571ae80e7c5 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -277,16 +277,14 @@ Source_file::get_counts (char const *pos_str0,
 
   while (left > 0)
     {
-      wchar_t multibyte[2];
-
       /*
        FIXME, this is apparently locale dependent.
       */
 #if HAVE_MBRTOWC
+      wchar_t multibyte[2];
       size_t thislen = mbrtowc (multibyte, line_chars, left, &state);
 #else
       size_t thislen = 1;
-      (void) multibyte;
 #endif /* !HAVE_MBRTOWC */
 
       /* Stop converting at invalid character;

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 28d5cb4748127f5ee2c2b266088d0e9d42ae8072..df68a638b1c0cf827123092690772ac4f8996ac0 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -10,7 +10,6 @@
 
 #include "audio-item.hh"
 #include "context.hh"
-#include "pqueue.hh"
 #include "stream-event.hh"
 #include "translator.icc"
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ea47bee0f00df6626f0a27dfa1f3abd0dc113ba2..77dc44fb4accfd195a5ff2107c9f6afc04c3edc7 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1265,7 +1265,6 @@
                                mark-interface
                                self-alignment-interface))))))
 
-
     (RepeatSlash
      . (
        (stencil . ,ly:percent-repeat-item-interface::beat-slash)
@@ -1273,6 +1272,7 @@
        (slope . 1.7)
        (meta . ((class . Item)
                 (interfaces . (percent-repeat-interface))))))
+
     (RepeatTie
      . (
        (stencil  . ,ly:tie::print)