release commit

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index ffba22d269fdeefbf97f961d4836afa8b48d7be1..f59c1778ca9debed9d15aa993504e2c80b0c9839 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -1908,7 +1908,7 @@ section.  @aref{functional harmony}.
     \clef treble
     \context Voice
     \partial 4 << c g e >>4 |
-    << c a f >> << b g d >> << c2 g e >>
+    << c a f >> << b g d >> << c g e >>2
   }
   \property Score.LyricText \set #'font-style = #'large
   \addlyrics
@@ -1942,13 +1942,13 @@ Consonances:
 \property Score.barNonAuto = ##t
 \property Score.TextScript \set #'font-style = #'large
 \context Voice \notes\relative c'' {
-  <<g1 g>>_"unisone  " s
-  <<g1 b>>_"third  " s
-  <<g1 c>>_"fourth  " s
-  <<g1 d'>>_"fifth  " s
-  <<g1 e'>>_"sixth  " s
-  <<g1 g'>>_"octave  " s
-  <<g1 b'>>_"decime" s s
+  <<g g>>1_"unisone  " s
+  <<g b>>_"third  " s
+  <<g c>>_"fourth  " s
+  <<g d'>>_"fifth  " s
+  <<g e'>>_"sixth  " s
+  <<g g'>>_"octave  " s
+  <<g b'>>_"decime" s s
 }
 @end lilypond
 
@@ -1958,9 +1958,9 @@ Dissonances:
 \property Score.barNonAuto = ##t
 \property Score.TextScript \set #'font-style = #'large
 \context Voice  \notes\relative c'' {
-  <<g1 a>>_"second  " s s
-  <<g1 f'>>_"seventh  " s s
-  <<g1 a'>>_"ninth" s s
+  <<g a>>1_"second  " s s
+  <<g f'>>_"seventh  " s s
+  <<g a'>>_"ninth" s s
 }
 @end lilypond
 
@@ -2024,7 +2024,7 @@ of such two forms an octave.
 \context Staff \notes\relative c'' {
   << g c >>^"perfect" s
   << g cis >>^"augm"  s
-  << gd' >>^"perfect"  s
+  << g d' >>^"perfect"  s
   << g des' >> ^"dim" s
   << gis es' >>^"dimin"  s
   << g! es' >>^"minor"  s
@@ -2074,7 +2074,7 @@ The difference between an interval and an octave.
 \property Score.barNonAuto = ##t
 \property Score.TextScript \set #'font-style = #'large
 \context Staff \notes\relative c'' {
-  << g  a >>1_"second  s s << g' a, >>_"seventh " s s \bar "||"
+  << g  a >>1_"second " s s << g' a, >>_"seventh " s s \bar "||"
   << g, b >>_"third  " s s << g' b, >>_"sixth  " s s \bar "||"
   << g, c >>_"fourth  " s s << g' c, >>_"fifth  " s s \bar "||"
 }

diff --git a/VERSION b/VERSION
index ec9b80877670e1f2f47bda574075a8ef2e0081f9..dceff6e1c3adf88c09b6f146173fd37d2a8b1e7c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=7
-PATCH_LEVEL=6
+PATCH_LEVEL=7
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/aclocal.m4 b/aclocal.m4
index d9e1e9e964d3506d8a42214414986e9a3b2df388..198b6ba44dc7cd1f8387fa1f39021f0e3cff76f8 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 dnl aclocal.m4   -*-shell-script-*-
 dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /users/hanwen/usr/src/lilypond/stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 

diff --git a/buildscripts/new-chords.py b/buildscripts/new-chords.py
index eb9656a8d1dc129066ab426cdca6c9ecee486794..73b0d11d7e8e23576421cf1343f594e83b97c1f8 100644 (file)
--- a/buildscripts/new-chords.py
+++ b/buildscripts/new-chords.py
@@ -143,7 +143,7 @@ for a in files:
        if re.search (str, marker_str):
                continue
        
-       str = sub_chords (str)  + marker_str
+       str = sub_chords (str)  + marker_str + '\n'
 
        if edit:
                open (a + '.NEW', 'w').write (str)

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 8320ee47cc71917f8d463c46e077442436dbecde..ac833a82945140144a070fe9a2de9c7a9861c832 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -2,8 +2,8 @@
 
 $(outdir)/%.png: $(outdir)/%.ps
        gs -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$(name-stem)-page%d.png" -r90 -dNOPAUSE $< -c quit
-
        -mv $(name-stem)-page*.png $(outdir)/
+       rm -f $@
        ln -s $(name-stem)-page1.png $@
 
 $(outdir)/%.ly.txt: %.ly