*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 293cc67b1dd91d4e5ea02b758549c145ee2bed10..b3316b63de355fc440f7a7ab7d141f32d0be111b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/part-combiner.scm (make-autochange-music): switch rests
+       before switched notes too.
+
        * lily/figured-bass-engraver.cc (process_music): change calling
        convention.
 

diff --git a/VERSION b/VERSION
index 19131d29c27d3bbe569f7e2cbef425e81b23559c..c71b24e8d63b4d28f36dc43d4cd844c79daa58ad 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
 PATCH_LEVEL=30
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index f2182e2eb549d5011ae2db982bf8216fe5b7f6f3..2b935037ddb4e1ad6c18c4be9e69468b842bafaa 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -66,7 +66,6 @@ print_break_nodes (Array<Break_node> const & arr)
   This algorithms is adapted from the OSU Tech report on breaking lines.
 
   this function is longish, but not very complicated.
-  
  */
 Array<Column_x_positions>
 Gourlay_breaking::do_solve () const
@@ -81,8 +80,7 @@ Gourlay_breaking::do_solve () const
   optimal_paths.push (first_node);
 
   Real worst_force = 0.0;
-  
-  for (int break_idx=1; break_idx< breaks.size (); break_idx++) 
+  for (int break_idx = 1; break_idx< breaks.size (); break_idx++) 
     {
       /*
        start with a short line, add measures. At some point 

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 2b16efe8b66b1f6a7a54dadc6fdae313912e2add..9acbc8dc0a03ecbacfc9bf5f97eba35d5468ef58 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -16,10 +16,8 @@
 #include "stencil.hh"
 #include "warn.hh"
 
-
 #include "ly-smobs.icc"
 
-
 SCM
 Stencil::smobbed_copy () const
 {

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index e825cc02e30e8dfbc8c1194c00f1fdb475d2b3e7..52c86ed58a37b6e4be43bb4c4000836a60b5e17e 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -50,11 +50,11 @@
                (font-load-command (car x) (cdr x)))
              (map cdr font-name-alist))))
 
-
-
+;;
 ;; urg, how can exp be #unspecified?  -- in sketch output
 ;;
 ;; set! returns #<unspecified>  --hwn
+;;
 (define (fontify name-mag-pair exp)
   (string-append (select-font name-mag-pair)
                 exp))