lilypond-0.1.14

diff --git a/README b/README
index 331108b90f6f7332abea2278562b35c2717de51f..6b8828bc889e2f002c1ed3e41a897245be4735d0 100644 (file)
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ MusixTeX-fonts. Please refer to the installation instructions on how
 to obtain and install them.
 
 
-3. INSTALLATINON
+3. INSTALLATION
 
 For your convenience, a formatted copy of the INSTALL instructions are
 in the toplevel directory, as INSTALL.text

diff --git a/bin/convert-mudela.in b/bin/convert-mudela.in
index 530e7818f20b54bffe87c46736b3861046c42a65..1efde362a5740671d6c7382612ebbabb6c13b1d6 100644 (file)
--- a/bin/convert-mudela.in
+++ b/bin/convert-mudela.in
@@ -125,6 +125,12 @@ sub convert_0_1_4_to_0_1_5
     s/([<{]) *\\id (.+) (.+);/\\type $2 = $3 $1/;
 }
 
+       
+sub convert_0_1_5_to_0_1_6
+{
+    s/< *\\multi (.*);/\\multi $1 </;
+}
+       
 ###############################################################
 
 sub    last_conversion
@@ -169,7 +175,8 @@ my %minor_conversions = ("0.0.50" => \&no_conv,
                         "0.1.2" => \&no_conv,
                         "0.1.3" => \&convert_0_1_2_to_0_1_3,
                         "0.1.4" => \&no_conv,
-                        "0.1.5" => \&convert_0_1_4_to_0_1_5
+                        "0.1.5" => \&convert_0_1_4_to_0_1_5,
+                        "0.1.6" => \&convert_0_1_5_to_0_1_6
                         );
  
 

diff --git a/input/wtk1-fugue2.ly b/input/wtk1-fugue2.ly
index 92ce1d3a12c41b2bd2cf5917a5a0f17f1eda6c84..608ec4b8735aa39a3316aae8c4a8f3baad8ed50f 100644 (file)
--- a/input/wtk1-fugue2.ly
+++ b/input/wtk1-fugue2.ly
@@ -12,7 +12,7 @@ copyright             Public Domain
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "0.1.5";
+\version "0.1.6";
 
                                     % should add \need{dutch.ini} for
                                     % correct parsing of note names
@@ -157,21 +157,21 @@ bassdux =
         [F16 G] As4 [G16 F] Es4 r8 es |
         [d c g G]
 %% 30
-        < \multi 2;
-        { \stemup c2~ | c1~ | c1 }
-        { \stemdown C2~ | C1~ | C1 }
+        \multi 2 <
+               { \stemup c2~ | c1~ | c1 }
+               { \stemdown C2~ | C1~ | C1 }
         >
     }
 
         
 \score {
     \melodic \type Grandstaff < 
-       \type Staff=treble < \multi 2; 
+       \type Staff=treble  < 
                        \global 
                        \dux
                        \comes 
                  >
-       \type Staff=bass < \multi 2;
+       \type Staff=bass  <
                        \global
                        \bassdux
                  >

diff --git a/lily/VERSION b/lily/VERSION
index deb594da78b432f066b6ea9dada5a5d513b00327..7876a844d8c5263a77494217365182cfbeacdf0b 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 13
+PATCH_LEVEL = 14
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf