Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly

diff --git a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
index 5a058474277d6584a3e55d3ce1f49635e63e964c..e2952812867b581419080b6307dd990ac50cc379 100644 (file)
--- a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
+++ b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
@@ -24,11 +24,10 @@ sections (enclosed within curly braces).
   doctitle = "Adding beams slurs ties etc. when using tuplet and non-tuplet rhythms"
 } % begin verbatim
 
-
 {
-  r16[ g16 \times 2/3 { r16 e'8] }
-  g16( a \times 2/3 { b d e') }
-  g8[( a \times 2/3 { b d') e'] ~ }
+  r16[ g16 \tuplet 3/2 { r16 e'8] }
+  g16( a \tuplet 3/2 { b d e') }
+  g8[( a \tuplet 3/2 { b d') e'] ~ }
   \time 2/4
-  \times 4/5 { e'32\( a b d' e' } a'4.\)
+  \tuplet 5/4 { e'32\( a b d' e' } a'4.\)
 }