Merge master into nested-bookparts

[lilypond.git] / input / lsr / automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly

diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
index 8d008b750738ac9db970325453f7d9b909714c6b..3067c76bfcbc486c1fc51a8fd8185a7cf6c175d6 100644 (file)
--- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
+++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
@@ -1,55 +1,62 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.62"
 
 \header {
   lsrtags = "rhythms"
- texidoc = "
-In time signature 2/2 or 4/4 the beam are  @code{         _____        
- _   _  Default | | | | I want | | | |. } Use a \"macro\" with
-#(override-auto-beam-setting '.....
 
+  texidoces = "
+En un compás sencillo como 2/2 ó 4/4, las corcheas se barran de forma
+predeterminada como dos grupos de cuatro.
 
+Utilizando un macro que seobreescribe el comportamiento automático del
+barrado, este fragmento de código cambia el barrado a pulsos de negra.
 
-" }
-% begin verbatim
-% Automatic beams two per two in 4/4 or 2/2 time signature
-%           _____
-% Default   | | | | 
-%           _   _
-% I want    | | | |
+"
+  doctitlees = "Barras automáticas de dos en dos en los compases de 4/4 o de 2/2"
+
+  texidoc = "
+In a simple time signature of 2/2 or 4/4, 8th notes are beamed by
+default as two sets of four.
 
-% The good way adapted from David Bobrof
+Using a macro which overrides the autobeaming behavior, this snippet
+changes the beaming to quarter note beats. 
+
+"
+  doctitle = "Automatic beams two per two in 4/4 or 2/2 time signature"
+} % begin verbatim
+% Automatic beams two per two in 4/4 or 2/2 time signature
+%              _____
+% Default     | | | |
+%              _   _
+% Required    | | | |
 
 % macro for beamed two per two in 2/2 and 4/4 time signature
-qbeam={  
-       #(override-auto-beam-setting '(end 1 8 * *) 1 4 'Staff)
-       #(override-auto-beam-setting '(end 1 8 * *) 2 4 'Staff)
-       #(override-auto-beam-setting '(end 1 8 * *) 3 4 'Staff) 
-       }
-% other macros 
-timeFractionstyle={ \override Staff.TimeSignature #'style = #'()}
-textn = ^\markup{ without the macro }
-texty = ^\markup{ with the macro }
+qBeam = {
+  #(override-auto-beam-setting '(end 1 8 * *) 1 4 'Staff)
+  #(override-auto-beam-setting '(end 1 8 * *) 2 4 'Staff)
+  #(override-auto-beam-setting '(end 1 8 * *) 3 4 'Staff)
+}
 
 \score {
- << 
-       \new Staff << \relative c'' {  
-               \timeFractionstyle
-               \time 4/4
-                g8\textn g g g   g g g g   g g g g4  g8 g g
-                }
-               >>
-               
-       %Use the macro  
-       
-       \new Staff << \relative c'' {  
-               \timeFractionstyle
-               \time 4/4
-               \qbeam
-               g8\texty g g g   g g g g  g g g g4  g8 g g 
-                }
-        >>      
- >>
-\layout{ raggedright = ##t }
+  <<
+    \new Staff \relative c'' {
+      \time 4/4
+      g8^\markup { without the macro } g g g g g g g
+      g8 g g g4 g8 g g
+    }
+    %Use the macro
+    \new Staff \relative c'' {
+      \time 4/4
+      \qBeam
+      g8^\markup { with the macro } g g g g g g g
+      g8 g g g4 g8 g g
+    }
+  >>
+  \layout {
+    \context {
+      \Staff
+      \override TimeSignature #'style = #'()
+    }
+  }
 }