Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / inserting-score-fragments-above-a-staff,-as-markups.ly

diff --git a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
index 72b12d14c76287e9a6f6bc744b23c484a31d8620..571723635ff6d111ddb4af432905613293f1767e 100644 (file)
--- a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
+++ b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
@@ -1,10 +1,13 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.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.13.20"
+\version "2.17.11"
 
 \header {
-  lsrtags = "staff-notation"
+  lsrtags = "real-music, staff-notation"
 
   texidoc = "
 The @code{\\markup} command is quite versatile.  In this snippet, it
@@ -14,6 +17,7 @@ contains a @code{\\score} block instead of texts or marks.
   doctitle = "Inserting score fragments above a staff as markups"
 } % begin verbatim
 
+
 tuning = \markup {
   \score {
     \new Staff \with { \remove "Time_signature_engraver" }
@@ -35,9 +39,8 @@ tuning = \markup {
 
 \relative c'' {
   \time 4/8
-  \times 2/3 { c8 d e } \times 2/3 { c d e }
-  \times 2/3 { c8 d e } \times 2/3 { c d e }
+  \tuplet 3/2 { c8 d e } \tuplet 3/2 { c d e }
+  \tuplet 3/2 { c8 d e } \tuplet 3/2 { c d e }
   g8 a g a
   g8 a g a
 }
-