resolve merge

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

diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
deleted file mode 100644 (file)
index a6b5ff8..0000000
--- a/input/manual/simultaneous-headword.ly
+++ /dev/null
@@ -1,313 +0,0 @@
-\version "2.12.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
-}
-
-\layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
-}
-
-% NR 1.5 Simultaneous notes
-
-% L. v. Beethoven, Op. 111
-% Piano sonata 32
-% Movt II - Arietta - Adagio molto semplice e cantabile
-% measures 108 - 118
-
-\layout {
-   \context {
-      \Score
-      \override SpacingSpanner #'base-shortest-duration =
-         #(ly:make-moment 1 18)
-      \override NonMusicalPaperColumn #'line-break-system-details =
-         #'((alignment-offsets . (0 -12)))
-   }
-}
-
-trillflat =
-  \once \override TrillSpanner #'(bound-details left text) =
-    #(markup #:translate-scaled '(-0.05 . -1)
-             #:concat (#:musicglyph "scripts.trill"
-                       #:translate '(-0.5 . 1.9) #:fontsize -7 #:flat))
-
-
-\new PianoStaff <<
-
-   % RH
-   \new Staff <<
-      \clef treble
-      \key c \major
-      \time 9/16
-      \set Score.currentBarNumber = #108
-
-      % RH voice 1
-      \new Voice {
-
-         \voiceOne
-         s4.
-         s8.
-
-         |
-
-         s4.
-         a''8 \p \> [ (
-         g''16 ] )
-
-         |
-
-         g''4.
-         af''8 [ (
-         g''16 ] )
-
-         |
-
-         g''8. [
-         g''8.
-         g''8. \pp ]
-
-         |
-
-         g''8. [
-         af''8.
-         af''8. ]
-
-         |
-
-         af''8. [
-         af''8.
-         af''8. ]
-
-         |
-         \break
-
-         \trillflat
-         af''4. \startTrillSpan
-         ~
-         af''8.
-         ~
-
-         |
-
-         af''4.
-         ~
-         af''8.
-         ~
-
-         |
-
-         \oneVoice
-         <af'' d''>8. [
-         a''8. \p \<
-         bf''8. ]
-         ~
-
-         |
-
-         bf''8. [
-         b''8.
-         c'''8. ]
-         ~
-
-         \bar "||"
-
-         \key ef \major
-         c'''8. [
-         cs'''8. \f ] \stopTrillSpan
-         r8.
-
-      }
-
-      % RH voice 2
-      \new Voice {
-         \voiceTwo
-         \override Voice.TrillSpanner #'direction = #down
-         d''4. \f \startTrillSpan
-         ~
-         d''8.
-         ~
-
-         |
-
-         d''4.
-         ~
-         d''8.
-         ~
-
-         |
-
-         d''8. \stopTrillSpan
-         \trillflat
-         d''4. \startTrillSpan
-         ~
-
-         |
-
-         d''4.
-         ~
-         d''8.
-         ~
-
-         |
-
-         d''4.
-         ~
-         d''8.
-         ~
-
-         |
-
-         d''4.
-         ~
-         d''8. \stopTrillSpan
-         ~
-
-         |
-
-         \trillflat
-         d''4. \startTrillSpan
-         ~
-         d''8.
-         ~
-
-         |
-
-         d''4.
-         ~
-         d''8.
-         ~
-
-         |
-
-         \once \override NoteColumn #'ignore-collision = ##t
-         \once \override NoteHead #'transparent = ##t
-         \once \override Dots #'transparent = ##t
-         \once \override Stem #'transparent = ##t
-         d''8. \stopTrillSpan
-         s4.
-
-         |
-
-         s8.
-         s8.
-
-      }
-
-   >>
-
-   % LH staff
-   \new Staff {
-      \clef bass
-      \key c \major
-      \time 9/16
-      
-      r8.
-      r8.
-      <c! c,!>8 [ (
-      <g, g,,>16 ] )
-
-      |
-
-      <g, g,,>4.
-      \clef treble
-      c''8 [ (
-      b'16 ] )
-
-      |
-
-      b'4.
-      c''8 [ (
-      b'16 ] )
-
-      |
-
-      b'8. [
-      b'8.
-      b'8. ]
-
-      |
-
-      b'8. [
-      bf'8. ]
-      \clef bass
-      <f f,>8 [ (
-      <bf, bf,,>16 ] )
-
-      |
-
-      <bf, bf,,>4.
-      \clef treble
-      f'8 [ (
-      bf16 ] )
-
-      |
-
-      <<
-
-         \new Voice {
-            \voiceOne
-            \override Voice.TrillSpanner #'direction = #up
-            f'4. \startTrillSpan
-            ~
-            f'8.
-            ~
-
-            |
-
-            f'4.
-            ~
-            f'8.
-            ~
-
-            |
-
-            f'8. \stopTrillSpan
-         }
-
-         \new Voice {
-            \voiceTwo
-            \override Voice.TrillSpanner #'direction = #down
-            bf8. [
-            bf8.
-            bf8. ]
-
-            |
-
-            bf8. [
-            bf8.
-            bf8. ]
-
-            |
-
-            bf8.
-         }
-
-      >>
-
-      \oneVoice
-      r8.
-      r8.
-
-      |
-
-      r8.
-      r8.
-      r8.
-      \clef bass
-
-      |
-
-      \key ef \major
-      r8.
-      r8.
-      r8.
-         
-   }
-   
->>