resolve merge

[lilypond.git] / input / manual / wind-headword.ly

diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly
deleted file mode 100644 (file)
index 6d8fa0a..0000000
--- a/input/manual/wind-headword.ly
+++ /dev/null
@@ -1,46 +0,0 @@
-\version "2.12.0"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 2.whatever  Wind 
-
-% Tchaikovsky
-% Nutcracker Suite, VII Dance of the Merlitons
-\score {
-  \new StaffGroup <<
-    \new Staff \relative c'' {
-      \set Staff.instrumentName = "Flauto I,II"
-      \once \override Score.RehearsalMark #'self-alignment-X = #-1
-      \once \override Score.RehearsalMark #'break-align-symbols =
-#'(time-signature)
-      \once \override Score.TimeSignature
-#'break-align-anchor-alignment = #LEFT
-      \once \override Score.RehearsalMark #'padding = #4
-      \mark \markup \large \bold {Moderato assai}
-      \key d \major
-      \time 2/4
-      \compressFullBarRests
-      R2*2
-      <d a>16-.\p <cis g>-. <d a>-. <cis g>-. <d a>8-. <cis g>-.
-      <e a,>-.\< <d a>32( <fis d> <a fis> <d a> <fis d>4--)\mf
-      <g d>16-. <fis cis>-. <g d>-. <fis cis>-.
-        <e b>(\> <d a>) <a fis>-. <fis d>-.\!
-      <d bes>4--\sf \acciaccatura {<d' bes>8} <cis a>4--\mf
-    }
-    \new Staff \relative c' {
-      \set Staff.instrumentName = "Flauto III"
-      \key d \major
-      \time 2/4
-      \compressFullBarRests
-      R2*2_\markup{Gr.Fl.}
-      fis16-.\p e-. fis-. e-. fis8-. e-.
-      g8-.\< fis32( a d fis a4--)\mf
-      b16-. a-. b-. a-. g(\> fis) d-. a-.\!
-      g4--\sf \acciaccatura fis'8 g4--\mf
-    }
-  >>
-}
-