From 6609078a568d073a2de29f9a22ebd45bd30cc5f0 Mon Sep 17 00:00:00 2001
From: Mats Bengtsson <mats.bengtsson@s3.kth.se>
Date: Wed, 18 Aug 1999 17:28:18 -0700
Subject: [PATCH] patch::: 1.2.1.mb1: Re: forceHorizontalShift problem

---
Generated by (address unknown) using package-diff 0.62,
>From = lilypond-1.2.1, To = lilypond-1.2.1.mb1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.2.1.mb1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure --state
1.2.1
1.2.1.mb1
++state
---
 ChangeLog              |  3 +++
 ChangeLog.orig         | 26 ++++++++++++++++++++++++++
 VERSION                |  2 +-
 flower/scalar.cc       |  2 +-
 scripts/mudela-book.py |  2 +-
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 ChangeLog.orig

diff --git a/ChangeLog b/ChangeLog
index 9fb50003f5..d867e35077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+pl 1.mb1
+       - bf, scalar.cc: ".3" now detected as numerical
+       
 pl 0.uu1
 	- refman updates by Werner & Mats
 	- now use ChangeLog for changes.
diff --git a/ChangeLog.orig b/ChangeLog.orig
new file mode 100644
index 0000000000..9fb50003f5
--- /dev/null
+++ b/ChangeLog.orig
@@ -0,0 +1,26 @@
+pl 0.uu1
+	- refman updates by Werner & Mats
+	- now use ChangeLog for changes.
+	
+pl 0.jcn2
+	- po fixes
+
+pl 0.jcn1
+	- gcc-2.95 nitpicks
+	- added pointers to mailing lists in toplevel docs
+
+0.mb2
+	- configure: more robust detection of Guile
+	- Midi_note_off: revert to fixed note-off velocity. Fixes
+	  problem with notes that never stop.
+	- Decreased breakable_column_space_strength
+	- Added a few TODO
+	- bf: "harmonic" and "cross" note heads also for half and 
+	  whole notes.
+	- linewidth and textheight set independent of the font size.
+	- bf, titledefs.tex: opus and piece are not repeated for 
+	  every piece unless they are explicitly set again.
+
+0.mb1
+  	- Changed dynamicDir to dynamicDirection.
+  	- refman and tutorial corrections.
diff --git a/VERSION b/VERSION
index 9b18ae90d8..f0e4122f18 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=1
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/flower/scalar.cc b/flower/scalar.cc
index 6e97eedf8f..951f50359d 100644
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -55,7 +55,7 @@ Scalar::isnum_b () const
   if (length_i ())
     {
       long l =0;
-      conv = sscanf (strh_.ch_C (), "%ld", &l);
+      conv = sscanf (strh_.ch_C (), "%lf", &l);
     }
   return length_i () && conv;
 }
diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py
index 3044ea0389..59c1ad287b 100644
--- a/scripts/mudela-book.py
+++ b/scripts/mudela-book.py
@@ -324,7 +324,7 @@ class Mudela_output:
         self.file.write("\\paper {"
                         + "\\paper_%s " % s
                         + linewidth_str
-                        + "castingalgorithm = \Gourlay; \n}")
+                        + "castingalgorithm = \Gourlay; \n}\n")
                         #+ "castingalgorithm = \Wordwrap; indent = 2.\cm; \n}")
         if self.code_type == 'CONTEXT':
             self.file.write('\\score{\n\\notes\\relative c{')
-- 
2.39.5