From: hanwen <hanwen>
Date: Sun, 18 Jan 2004 21:13:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.12~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0cdcc6fd4afaf632d86994bda2c22e032d6aa47d;p=lilypond.git

*** empty log message ***
---

diff --git a/VERSION b/VERSION
index 9ae81bfaf8..791a0827c3 100644
--- 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 0ce4f1aa0a..c59b50ce81 100644
--- 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 3c207413ed..63d09e7d70 100644
--- 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)