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

[lilypond.git] / Documentation / snippets / printing-music-with-different-time-signatures.ly

diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index f4f5ec1cadcbbe65bb3bb6a800e471ba0700b950..c00d9740261c196b01ab7aecaf5390652c220534 100644 (file)
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -1,10 +1,13 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% 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.13.31"
+\version "2.18.0"
 
 \header {
-  lsrtags = "rhythms, percussion"
+  lsrtags = "contemporary-notation, percussion, real-music, really-cool, rhythms"
 
   texidoc = "
 In the following snippet, two parts have a completely different time
@@ -38,9 +41,9 @@ global = { \time 3/4 { s2.*3 } \bar "" \break { s2.*3 } }
     \remove "Timing_translator"
     \remove "Default_bar_line_engraver"
     \remove "Bar_number_engraver"
-    \override SpacingSpanner #'uniform-stretching = ##t
-    \override SpacingSpanner #'strict-note-spacing = ##t
-    proportionalNotationDuration = #(ly:make-moment 1 64)
+    \override SpacingSpanner.uniform-stretching = ##t
+    \override SpacingSpanner.strict-note-spacing = ##t
+    proportionalNotationDuration = #(ly:make-moment 1/64)
   }
   \context {
     \Staff
@@ -57,7 +60,7 @@ global = { \time 3/4 { s2.*3 } \bar "" \break { s2.*3 } }
 Bassklarinette = \new Staff \with {
   \consists "Bar_number_engraver"
   barNumberVisibility = #(every-nth-bar-number-visible 2)
-  \override BarNumber #'break-visibility = #end-of-line-invisible
+  \override BarNumber.break-visibility = #end-of-line-invisible
 } <<
   \global {
     \bar "|"
@@ -76,12 +79,12 @@ Bassklarinette = \new Staff \with {
     \bar "|"
     \time 2/4
     \tupletUp
-    \times 2/3 { ees''4 r4 d''4 ~ }
+    \tuplet 3/2 { ees''4 r4 d''4 ~ }
 
     \bar "|"
     \time 3/8
     \tupletUp
-    \times 3/4 { d''4 r4 }
+    \tuplet 4/3 { d''4 r4 }
 
     \bar "|"
     \time 2/4
@@ -153,4 +156,3 @@ Perkussion = \new StaffGroup <<
     \Perkussion
   >>
 }
-