*** empty log message ***

diff --git a/VERSION b/VERSION
index 9ae81bfaf81895fa9fbc20eb873d8f79f7d12219..791a0827c3a949924de21aecbc05335ee452efc2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=11
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=12
+MY_PATCH_LEVEL=
 

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 0ce4f1aa0a0bf8456ebbe4193058b9ed2351ba75..c59b50ce81e748a575b6803c489f357c05040af9 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -63,6 +63,7 @@ Staff_symbol_referencer::get_position (Grob*me)
        - st->relative_coordinate (c, Y_AXIS);
 
       p += 2.0 * y / Staff_symbol::staff_space (st);
+      return p;
     }
 
   return robust_scm2double ( me->get_grob_property ("staff-position"), p);

diff --git a/scm/lily.scm b/scm/lily.scm
index 3c207413ed08e857b8cc7508a13bab985cc2aec2..63d09e7d70e495c15edaf815dc8dabc98977f2ba 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -311,7 +311,6 @@ L1 is copied, L2 not.
 ;;  output
 (use-modules (scm output-tex)
             (scm output-ps)
-            (scm output-ascii-script)
             (scm output-sketch)
             (scm output-sodipodi)
             (scm output-pdftex)