Merge commit 'origin/dev/jneeman' into systems-per-page

[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 5be6b6f2c2db730389bd4baa77e2d514ecd9f71e..2782d7aa42ccf3bee57d5b1f907a37f6af807911 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,6 +1,6 @@
 %% 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.53"
+\version "2.13.0"
 
 \header {
   lsrtags = "rhythms"
@@ -15,6 +15,18 @@ barrado, este fragmento de código cambia el barrado a pulsos de negra.
 "
   doctitlees = "Barras automáticas de dos en dos en los compases de 4/4 o de 2/2"
 
+%% Translation of GIT committish: 1154b407d42f303a024598296ad36ab6c93e2b5a
+  texidocfr = "
+Dans une métrique simple comme 4/4 ou 2/2, les croches sont ligaturées
+par défaut en deux groupes de quatre.
+
+En utilisant une macro qui modifie le comportement des ligatures 
+automatiques, voici comment obtenir des ligatures basées sur la valeur 
+d'une noire.
+
+"
+  doctitlefr = "Ligature automatique deux par deux, aussi bien en 4/4 qu'en 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.
@@ -25,6 +37,7 @@ 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     | | | |
@@ -40,17 +53,21 @@ qBeam = {
 
 \score {
   <<
-    \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
+    \new Staff {
+      \relative c'' {
+        \time 4/4
+        g8-"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
+    \new Staff {
+      \relative c'' {
+        \time 4/4
+        \qBeam
+        g8-"with the macro" g g g g g g g
+        g8 g g g4 g8 g g
+      }
     }
   >>
   \layout {