X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fprinting-music-with-different-time-signatures.ly;h=c00d9740261c196b01ab7aecaf5390652c220534;hb=fb0e74ded1652d8405c55a22af086f31f91b7e0e;hp=b0a4455d91bfade2636698b1b9f180ac8e989678;hpb=69f0ec479a6ade46d0a227755bb02562112c6743;p=lilypond.git

diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index b0a4455d91..c00d974026 100644
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -1,9 +1,13 @@
-%% Do not edit this file; it is auto-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.1"
+\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
@@ -11,7 +15,14 @@ signature, yet remain synchronized. The bar lines can no longer be
 printed at the @code{Score} level; to allow independent bar lines in
 each part, the @code{Default_barline_engraver} and
 @code{Timing_translator} are moved from the @code{Score} context to the
-@code{Staff} context. 
+@code{Staff} context.
+
+If bar numbers are required, the @code{Bar_number_engraver} should also
+be moved, since it relies on properties set by the
+@code{Timing_translator}; a @code{\\with} block can be used to add bar
+numbers to the relevant staff.
+
+
 
 "
   doctitle = "Printing music with different time signatures"
@@ -28,17 +39,16 @@ global = { \time 3/4 { s2.*3 } \bar "" \break { s2.*3 } }
   \context {
     \Score
     \remove "Timing_translator"
-    \remove "Time_signature_engraver"
     \remove "Default_bar_line_engraver"
-    \override SpacingSpanner #'uniform-stretching = ##t
-    \override SpacingSpanner #'strict-note-spacing = ##t
-    proportionalNotationDuration = #(ly:make-moment 1 64)
+    \remove "Bar_number_engraver"
+    \override SpacingSpanner.uniform-stretching = ##t
+    \override SpacingSpanner.strict-note-spacing = ##t
+    proportionalNotationDuration = #(ly:make-moment 1/64)
   }
   \context {
     \Staff
     \consists "Timing_translator"
     \consists "Default_bar_line_engraver"
-    \consists "Time_signature_engraver"
   }
   \context {
     \Voice
@@ -47,39 +57,43 @@ global = { \time 3/4 { s2.*3 } \bar "" \break { s2.*3 } }
   }
 }
 
-Bassklarinette = \new Staff <<
+Bassklarinette = \new Staff \with {
+  \consists "Bar_number_engraver"
+  barNumberVisibility = #(every-nth-bar-number-visible 2)
+  \override BarNumber.break-visibility = #end-of-line-invisible
+} <<
   \global {
     \bar "|"
     \clef treble
     \time 3/8
     d''4.
-    
+
     \bar "|"
     \time 3/4
     r8 des''2( c''8)
-    
+
     \bar "|"
     \time 7/8
     r4. ees''2 ~
-    
+
     \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
     e''2
-    
+
     \bar "|"
     \time 3/8
     es''4.
-    
+
     \bar "|"
     \time 3/4
     r8 d''2 r8
@@ -94,19 +108,19 @@ Perkussion = \new StaffGroup <<
       \clef percussion
       \time 3/4
       r4 c'2 ~
-      
+
       \bar "|"
       c'2.
-      
+
       \bar "|"
       R2.
-      
+
       \bar "|"
       r2 g'4 ~
-      
+
       \bar "|"
       g'2. ~
-      
+
       \bar "|"
       g'2.
     }
@@ -117,19 +131,19 @@ Perkussion = \new StaffGroup <<
       \clef percussion
       \time 3/4
       R2.
-      
+
       \bar "|"
       g'2. ~
-      
+
       \bar "|"
       g'2.
-      
+
       \bar "|"
       r4 g'2 ~
-      
+
       \bar "|"
       g'2 r4
-      
+
       \bar "|"
       g'2.
     }
@@ -142,4 +156,3 @@ Perkussion = \new StaffGroup <<
     \Perkussion
   >>
 }
-