release commit

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

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 16125602b9acd44440c359d4725912db9cc88d0c..38d990c90a3bfa62da01025d089d22db7301738f 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -186,7 +186,7 @@ trebleVerseOne =  \notes\relative c{
        < {a4.- > )f8}  { a'4. f8 }  > |
 }
 
-trebleEentje =  \notes \relative c'{
+trebleEentje =  \notes \relative c' \context Voice {
        \stemBoth
        <e2 e'> r4 |
        <f2\mf as!\(> <as8.->( c> <f16 \))as> |
@@ -316,11 +316,11 @@ bassEentje =  \notes\relative c{
 bassThrough =  \notes\relative c{
        \dynamicUp
        %61
-       <g,8^"cresc." g'> [<g' b d> <b d f> <g b d> <as!-> b-> d->> <b d f>] |
-       <g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f>] |
+       <g,8^"cresc." g'> [<g' b d> <b d f> <g b d> <as!-> b-> d-> > <b d f>] |
+       <g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d-> > <b d f>] |
        % copied
-       <g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d->> <b d f>] |
-       <g,8 g'> [<g' d'> <d' f> <g, d'> <gis-> b-> d->> <b d f>] |
+       <g,8 g'> [<g' d'> <d' f> <g, d'> <as-> b-> d-> > <b d f>] |
+       <g,8 g'> [<g' d'> <d' f> <g, d'> <gis-> b-> d-> > <b d f>] |
        %65
        <gis,8 gis'> [<d''\> e> <e b'> <d e> <e b'> <d\! e>] |
        <a,8 a'> [<c' e> <e a> <c e> <e a> <c e>] |

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index bd09d8331c58c38a86334e1bbd9fdd238db66d05..0359cf93cc40f84ce3fab07fcc545a7bda5b0803 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
@@ -10,6 +10,8 @@ ritenuto = \textscript #'(italic  "rit.")
 
 #(define italic-bf '((font-shape . italic) (font-series . bold)))
 
+%{
+ 
 %% burp
 %% the very idea of a style sheet, is that it's easy to override
 %#(define (set-style! sheet name style)
@@ -29,7 +31,7 @@ ritenuto = \textscript #'(italic  "rit.")
                                         (font-shape . upright)
                                         (font-relative-size . 3)))
   
-  
+%}  
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
@@ -55,7 +57,7 @@ stopGraceMusic= \sequential {
 }
 
 \paper{
-    #(define fonts my-sheet)
+%    #(define fonts my-sheet)
     \translator {
         \ScoreContext
         skipBars = ##t
@@ -63,7 +65,7 @@ stopGraceMusic= \sequential {
         %% try to mimic Breitkopf
         RehearsalMark \override #'padding = #1
         MultiMeasureRest \override #'padding = #0.5
-        MultiMeasureRest \override #'number-threshold = #1
+        restNumberThreshold = #1
         
         Beam \override #'thickness = #0.6
         Beam \override #'space-function = #(lambda (beam mult) 0.8)

diff --git a/ly/script-init.ly b/ly/script-init.ly
index 4f5a205dc199926b265e190da3792f75e12447fe..a1ac9851811de004d5969295b9edd4c64b41946d 100644 (file)
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -9,10 +9,6 @@ dashLarger= "accent"
 dashDot= "staccato"
 dashUnderscore = "portato"
 
-
-#(display set-mus-properties!)
-#(display make-articulation)
-
 thumb = #(make-articulation "thumb")
 accent = #(make-articulation "accent")
 marcato = #(make-articulation "marcato")

diff --git a/scm/music-types.scm b/scm/music-types.scm
index a2795ad7b9ffd6bc22d045e6a50d28c7a1d8ef8c..9effc7b93798b457aacd30ef07a1fe2266480439 100644 (file)
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -242,7 +242,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
      . (
        (description . "Start or end phrasing slur. Syntax NOTE \\(  and \\) NOTE")
        (internal-class-name . "Event")
-       (types . (general-music span-event phrasing-slur-event slur-event))
+       (types . (general-music span-event phrasing-slur-event))
        ))
     (PropertySet
      . (

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 0209abeabad793a3ee9568df188f17bb062baff7..910d57d5a7cb8daa4829214bc955bf3fa36dcf19 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1074,8 +1074,8 @@ if 1:
 
 if 1:
        def conv(str):
-               str = re.sub (r'<<' '< <', str)
-               str = re.sub (r'>>' '> >', str)
+               str = re.sub (r'<<', '< <', str)
+               str = re.sub (r'>>', '> >', str)
 
                return str