resolve merge

[lilypond.git] / input / regression / instrument-name-hara-kiri.ly

diff --git a/input/regression/instrument-name-hara-kiri.ly b/input/regression/instrument-name-hara-kiri.ly
index 55b209d3499ac4ba23b78535a697bdc65bef8671..f402271b2fcd9f0db10d6371de47cd5944c9de65 100644 (file)
--- a/input/regression/instrument-name-hara-kiri.ly
+++ b/input/regression/instrument-name-hara-kiri.ly
@@ -1,21 +1,18 @@
+\version "2.14.0"
 
 \header {
+  texidoc = "Instrument names are removed when the staves are
+killed off.
 
-  texidoc = "@code{PianoStaff.instrument} and
-@code{PianoStaff.instr} are removed when the staves are killed off.
-
-In this example, the 2nd staff (marked by the barnumber 2) disappears
-as does the instrument name.  "
-
+In this example, the second staff (marked by the bar number 2)
+disappears, as does the instrument name."
 }
-
-\version "2.12.0"
         
-  \new PianoStaff <<
-    \new Staff {
-      \override Staff.VerticalAxisGroup #'remove-empty = ##t  
-      \set PianoStaff.instrumentName ="up" 
-      \set PianoStaff.shortInstrumentName ="u"
-      c'1\break R
-    }
-  >>
+\new PianoStaff <<
+  \new Staff {
+    \override Staff.VerticalAxisGroup #'remove-empty = ##t  
+    \set PianoStaff.instrumentName = #"up" 
+    \set PianoStaff.shortInstrumentName = #"u"
+    c'1\break R
+  }
+>>