resolve merge

[lilypond.git] / Documentation / web / ly-examples / theory.ly

diff --git a/Documentation/web/ly-examples/theory.ly b/Documentation/web/ly-examples/theory.ly
new file mode 100644 (file)
index 0000000..cca033a
--- /dev/null
+++ b/Documentation/web/ly-examples/theory.ly
@@ -0,0 +1,63 @@
+\version "2.14.0"
+\include "example-header.ily"
+
+#(ly:set-option 'point-and-click #f)
+
+global = {
+    \time 4/4 
+    \numericTimeSignature
+    \key c \major
+    #(set-global-staff-size 24)
+}
+
+cf = \relative c { 
+  \clef bass
+  \global
+  c4 c' b a | 
+  g a f d | 
+  e f g g, | 
+  c1 
+}
+
+upper = \relative c'' { 
+  \global
+  r4 s4 s2 | 
+  s1*2 | 
+  s2 s4 s 
+  \bar "||" 
+}
+
+bassFigures = \figuremode {
+  s1*2 | s4 <6> <6 4> <7> | s1
+}
+
+\markup { "Exercise 3: Write 8th notes against the given bass line." }
+
+\score {
+  \new PianoStaff <<
+    \new Staff { 
+      \context Voice = "added voice" \with {
+        \consists "Balloon_engraver"
+      }
+      \upper
+    }
+
+    \new Staff = lower { 
+      <<
+%      \context Voice = "cantus firmus" \with {
+%        \consists "Balloon_engraver"
+%      }
+        \context Staff = lower \cf
+        \new FiguredBass \bassFigures
+      >>
+    }
+  >>
+  \layout {}
+  %{\midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 120 4)
+    }  
+  }%}
+}
+