Merge commit 'ce4b499'

[lilypond.git] / input / regression / tag-filter.ly

diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly
index e7d59152769cf167db7f2a059251720ac0ca6ce2..be07a42e3886053e5c863bdab949ed784d8d56f3 100644 (file)
--- a/input/regression/tag-filter.ly
+++ b/input/regression/tag-filter.ly
@@ -1,8 +1,8 @@
 
-\version "1.9.3"
+\version "2.10.0"
 \header {
 
-texidoc = "The @code{\\tag} command marks music expressions with a
+  texidoc = "The @code{\\tag} command marks music expressions with a
 name. These tagged expressions can be filtered out later. This
 mechanism can be used to make different versions of the same music. In
 this example, the top stave displays the music expression with all
@@ -11,43 +11,43 @@ notes and fingerings, but the score has not."
 
 }
 
-\paper { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 common =
-\notes \relative c''  {
-
-    c1
-    \relative c' <
-       \tag #'part <
-         R1 \\
-         {
-             \property Voice.fontSize = #-1
-             c4_"cue" f2 g4 } 
-        >
-       \tag #'score R1
-     >
-    c1-\tag #'part ^4
+\relative c''  {
+
+  c1
+  \relative c' <<
+    \tag #'part <<
+      R1 \\
+      {
+       \set fontSize = #-1
+       c4_"cue" f2 g4 } 
+    >>
+    \tag #'score R1
+  >>
+  c1-\tag #'part ^4
 }
 
 
-\score {
-    \notes \simultaneous { 
-    \new Staff {
-       \property Staff.instrument = #"both"
-       \common
-       }
-    \new Staff {
-       \property Staff.instrument = #"part"
-       \apply #(remove-tag 'score) \common
-       }
-    \new Staff {
-       \property Staff.instrument = #"score"
-       \apply #(remove-tag 'part) \common
-       }
-    }
+
+\simultaneous { 
+  \new Staff {
+    \set Staff.instrumentName = #"both"
+    \common
+  }
+  \new Staff {
+    \set Staff.instrumentName = #"part"
+    \keepWithTag #'part \common
+  }
+  \new Staff {
+    \set Staff.instrumentName = #"score"
+    \keepWithTag #'score \common
+  }
 }
 
 
 
 
 
+