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

diff --git a/ChangeLog b/ChangeLog
index 9fb50003f54f9ea54e80e38f8428c7aa0a8cab7d..d867e35077c99c3472eb1ca3cd03f463ae319d61 100644 (file)
--- 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 (file)
index 0000000..9fb5000
--- /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 9b18ae90d88febe785f407d82b935d8d6ebde474..f0e4122f1889392ba5a420b4378af3a6a9a77f9d 100644 (file)
--- 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 6e97eedf8f08dc0d1fe46452a0d12b71669fe1ee..951f50359dce9d8061e155d8078daf462f87a1ad 100644 (file)
--- 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 3044ea03892f4edaeb5918e2c75ed3b00b1496b9..59c1ad287b392cbce1308910ed32b83abc028202 100644 (file)
--- 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{')