resolve merge

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

diff --git a/input/regression/instrument-name-volta.ly b/input/regression/instrument-name-volta.ly
new file mode 100644 (file)
index 0000000..2249670
--- /dev/null
+++ b/input/regression/instrument-name-volta.ly
@@ -0,0 +1,40 @@
+\version "2.14.0"
+
+\header {
+  texidoc = "Moving the @code{Volta_engraver} to the @code{Staff}
+context does not affect @code{InstrumentName} alignment."
+}
+
+testMusik =  \relative c'' {
+  \repeat volta 2 {
+    c1 \break
+  } \alternative {
+    { c1 \break }
+    { c1 \break }
+  }
+}
+
+\score {
+  \new Staff \relative c' {
+    \set Staff.shortInstrumentName = #"Instr."
+    \repeat volta 2 {
+      c1 \break
+    }
+    \alternative {
+      { c1 \break }
+      { c1 \break }
+    }
+  }
+}
+\layout {
+  ragged-right = ##t
+  short-indent = 5\mm
+  \context {
+    \Score
+    \remove "Volta_engraver"
+  }
+  \context {
+    \Staff
+    \consists "Volta_engraver"
+  }
+}