X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fbeam-auto-override.ly;h=31ad673196eb97cf6da7b005127cc1116eef18f1;hb=56f77a28d7c1d9723899f90889016ce4978d890c;hp=fe4d9439b9972a6137ac647eb03b2c3c5e5dd21c;hpb=955f829883aa125b2b633b1e71f6256da5b773fa;p=lilypond.git

diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index fe4d9439b9..31ad673196 100644
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,21 +1,22 @@
-#(ly:set-option 'old-relative)
-\version "1.9.0"
+
+%% ugh
+%% \version "2.7.39"
+
 \header {
 
     texidoc = "@cindex Auto Beaming Override
 
-This shows how auto-beaming settings can be overridden.
-
-The auto-beamer will only engrave beams that end when:
+The auto-beamer, which can be overridden, will only engrave beams 
+that end before encountering of 
 @itemize @bullet
-@item  a rest is encountered
+@item a rest,
 @item
- another beam (entered manually) is encountered
+ an other, manually entered beam, or
 @item
- there's a 'gap' in the beam note's durations
+ a bar line. 
 @end itemize
 
-The beam will be ended also when now % beamAutoEnd = 0.
+The @code{autoBeaming} can also be turned off.
 
 "
 
@@ -23,32 +24,32 @@ The beam will be ended also when now % beamAutoEnd = 0.
 
 %% TODO: check doc string. -hw
 
-\score{
-    \notes \relative c''{
-    	\time 2/4
-	% one beam per measure
-      	c8 c c c
-      	c16 c c c c c c c
-	% from here on consider ending beam every 1/4 note
-	#(override-auto-beam-setting '(end * * * *) 1 4)
-
-      	c8 c c c
-	% manually override autobeam with weird beaming
-      	c8  c-[ c] c
-      	c8 c c r
-      	c8 c c4
-      	r8 c c c
-	% no autobeaming
-	\property Voice.autoBeaming = ##f
-      	c8 c c c
-    }
-    \paper{
-      	\translator{
-	    \VoiceContext
-	    autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 2)
-	}
-    }
-\paper{raggedright = ##t}
+\layout{ragged-right = ##t}
+\relative c''{
+  %% This has now (2.5.21) changed, (end * * * *) no longer
+  %% masks the default config entry ('(end * * 2 4) 1 4))
+  %% rather than masking by override:
+  %% #(override-auto-beam-setting '(end * * * *) 1 2)
+  %% revert the config file setting.
+  #(revert-auto-beam-setting '(end * * 2 4) 1 4)
+  \time 2/4
+  
+  %% one beam per measure
+  c8 c c c
+  c16 c c c c c c c
+  
+  %% from here on consider ending beam every 1/4 note
+  #(override-auto-beam-setting '(end * * * *) 1 4)
+
+  c8 c c c
+  %% manually override autobeam with weird beaming
+  c8  c[ c] c
+  c8 c c r
+  c8 c c4
+  r8 c c c
+  %% no autobeaming
+  \set autoBeaming = ##f
+  c8 c c c
 }