X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fly-examples%2Forchestra.ly;h=20dad7f93f3396ac0ab3c754b51309fdc96cbd94;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=219acafdc90ac8c1452f2ad018e04f848b1caa09;hpb=522f419e3ed3e09ecf834bbb5315ac1777ab13e0;p=lilypond.git

diff --git a/Documentation/ly-examples/orchestra.ly b/Documentation/ly-examples/orchestra.ly
index 219acafdc9..20dad7f93f 100644
--- a/Documentation/ly-examples/orchestra.ly
+++ b/Documentation/ly-examples/orchestra.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.19.46"
 
 \header {
   tagline = ##f
@@ -13,20 +13,6 @@
   line-width = 158\mm
 }
 
-%% markups
-#(define-markup-list-command (paragraph layout props args) (markup-list?)
-  (let ((indent (chain-assoc-get 'par-indent props 2)))
-  (interpret-markup-list layout props
-  (make-justified-lines-markup-list (cons (make-hspace-markup indent)
-  args)))))
-
-#(define-markup-command (vspace layout props amount) (number?)
-  "This produces a invisible object taking vertical space."
-  (let ((amount (* amount 3.0)))
-    (if (> amount 0)
-        (ly:make-stencil "" (cons -1 1) (cons 0 amount))
-        (ly:make-stencil "" (cons -1 1) (cons amount amount)))))
-
 %% text defs
 presto = \markup { \bold \italic "Presto" }
 div = \markup { \bold "Div." }
@@ -41,23 +27,23 @@ naturale = \markup { \bold \italic "Naturale" }
 moltocr = {
   \set crescendoText = \markup { \italic "Molto cresc." }
   \set crescendoSpanner = #'text
-  \override DynamicTextSpanner #'style = #'dotted-line
+  \override DynamicTextSpanner.style = #'dotted-line
 }
 offCr = {
   \unset crescendoText
   \unset crescendoSpanner
-  \revert DynamicTextSpanner #'style
+  \revert DynamicTextSpanner.style
 }
 
 %% Layout for piano dynamics
 \layout {
   \context {
     \Voice
-    \override Glissando #'breakable = ##t
-    \override TextSpanner #'breakable = ##t
-    \override DynamicLineSpanner #'breakable = ##t
-    \override DynamicTextSpanner #'breakable = ##t
-    \override TrillSpanner #'breakable = ##t
+    \override Glissando.breakable = ##t
+    \override TextSpanner.breakable = ##t
+    \override DynamicLineSpanner.breakable = ##t
+    \override DynamicTextSpanner.breakable = ##t
+    \override TrillSpanner.breakable = ##t
   }
 }
 
@@ -99,7 +85,6 @@ offCr = {
   \context {
     \type "Engraver_group"
     \name "MarkLine"
-    \consists "Output_property_engraver"
     \consists "Axis_group_engraver"
     \consists "Mark_engraver"
     \consists "Metronome_mark_engraver"
@@ -107,10 +92,10 @@ offCr = {
     \consists "Text_engraver"
     \consists "Text_spanner_engraver"
     \consists "Font_size_engraver"
-    \override VerticalAxisGroup #'staff-affinity = #DOWN
-    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #2
-    \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #5
-    \override TextSpanner #'breakable = ##t
+    \override VerticalAxisGroup.staff-affinity = #DOWN
+    \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.padding = #2
+    \override VerticalAxisGroup.nonstaff-unrelatedstaff-spacing.padding = #5
+    \override TextSpanner.breakable = ##t
   }
   \context {
     \Score
@@ -132,8 +117,8 @@ offCr = {
   \context {
     \MarkLine
     \name "SmallMarkLine"
-    \override MetronomeMark #'outside-staff-priority = #800
-    \override RehearsalMark #'outside-staff-priority = #1200
+    \override MetronomeMark.outside-staff-priority = #800
+    \override RehearsalMark.outside-staff-priority = #1200
   }
   \context {
     \Score
@@ -180,19 +165,19 @@ modern =
     R1*9/8 |
   }
 
-  flutes = \relative c'''' {
+  flutes = \relative {
     \clef treble \key ees \minor \time 6/8
     R2.
-    <ges, c,>16(\mf\< <ees bes> <c ges> <ees bes> <ges c,> <bes ees,>) <c ges>( <bes ees,> <ges c,> <bes ees,> <c ges> <ees bes>) |
+    <ges'' c,>16(\mf\< <ees bes> <c ges> <ees bes> <ges c,> <bes ees,>) <c ges>( <bes ees,> <ges c,> <bes ees,> <c ges> <ees bes>) |
     <ges c,>8-.->\!\ff \offCr r r r4 r8 | R2. |
     \time 9/8
     R1*9/8 |
   }
 
-  oboes = \relative c''' {
+  oboes = \relative {
     \clef treble \key ees \minor \time 6/8
     R2. |
-    <ges, c,>4(\mf\< <bes ees,>8 <c ges>4 <ees bes>8) |
+    <ges' c,>4(\mf\< <bes ees,>8 <c ges>4 <ees bes>8) |
     <ges c,>-.->\!\ff \offCr r r r4 r8 | R2. |
     \time 9/8
     R1*9/8 |
@@ -208,9 +193,9 @@ modern =
     R1*9/8 |
   }
 
-  bassoons = \relative c, {
+  bassoons = \relative {
     \clef bass \key ees \minor \time 6/8
-    <ees bes'>4.\pp\< c'^"a2" |
+    <ees, bes'>4.\pp\< c'^"a2" |
     bes8-. bes-. bes-. ges-. ges-. ges-. |
     ees-.->\!\ff \offCr <ees bes'>4\pp ~ <ees bes'>4. ~ | <ees bes'>2. |
     \time 9/8
@@ -257,7 +242,7 @@ R2. |
     R1*9/8 |
   }
 
-  trombones = \relative c' {
+  trombones = \relative {
     \clef tenor \key ees \minor \time 6/8
     r4 r8 <ges c>4.\mp\< ~ |
     <ges c>8-. <ges c>-. <ges c>-. <ges c>-. <ges c>-. <ges c>-. |
@@ -266,16 +251,16 @@ R2. |
     R1*9/8 |
   }
 
-  tuba = \relative c,, {
+  tuba = \relative {
     \clef bass \key ees \minor \time 6/8
-    <ees' ees'>4.(\pp\< <c c'> |
+    <ees, ees'>4.(\pp\< <c c'> |
     <bes bes'>8-.) <bes bes'>-. <bes bes'>-. <ges ges'>-. <ges ges'>-. <ges ges'>-. |
     <ees ees'>-.->\!\ff \offCr r r r4 r8 | R2. |
     \time 9/8
     R1*9/8 |
   }
 
-  timpani = \relative c {
+  timpani = \relative {
     \clef bass \key ees \minor \time 6/8
     ees8\< ees ees ees ees ees |
     bes bes bes bes bes bes |
@@ -285,49 +270,49 @@ R2. |
     ees r r r4 r8 r4 r8 |
   }
 
-  trian = \relative c' {
+  trian = {
     \clef percussion \time 6/8
     R2.*4 |
     \time 9/8
     R1*9/8 |
   }
 
-  cym = \relative c' {
+  cym = {
     \clef percussion \time 6/8
     R2.*4 |
     \time 9/8
     R1*9/8 |
   }
 
-  tamt = \relative c' {
+  tamt = {
     \clef percussion \time 6/8
 R2. |
     r4 r8 r c4\mf\<^"*" ~ |
-    c8\!\ff r r r4 r8 | R2. |
+    8\!\ff r r r4 r8 | R2. |
     \time 9/8
     R1*9/8 |
   }
 
-  tamb = \relative c' {
+  tamb = {
     \clef percussion \time 6/8
     R2.*4 |
     \time 9/8
     R1*9/8 |
   }
 
-  snare = \relative c' {
+  snare = {
     \clef percussion \time 6/8
     R2.*4 |
     \time 9/8
-    c8\pp c c c c c c c c |
+    c8\pp 8 8 8 8 8 8 8 8 |
   }
 
-  bsdrum = \relative c' {
+  bsdrum = {
     \clef percussion \time 6/8
-    c2.:32\pp\< ~ | c: ~ |
-    c8\!\ff \offCr r r r4 r8 | R2. |
+    c2.:32\pp\< ~ | 2.: ~ |
+    8\!\ff \offCr r r r4 r8 | R2. |
     \time 9/8
-    c2.:32\pp ~ c4.: |
+    2.:32\pp ~ 4.: |
   }
 
   harprh = \relative c'' {
@@ -351,25 +336,25 @@ R2. |
   }
 
 
-  violinI = \relative c'''' {
+  violinI = \relative {
     \clef treble \key ees \minor \time 6/8
-    ges,,16(\pp\< ees c ees ges bes) c( bes ges bes c ees) |
+    ges'16(\pp\< ees c ees ges bes) c( bes ges bes c ees) |
     ges( ees c ees ges bes) c( bes ges bes c ees) |
     ges8-.->\!\ff \offCr r r r4 r8 | R2. |
     \time 9/8
     R1*9/8 |
   }
 
-  violinII = \relative c''' {
+  violinII = \relative {
     \clef treble \key ees \minor \time 6/8
-    c,,16(\pp\< bes ges bes c ees) ges( ees c ees ges bes) |
+    c'16(\pp\< bes ges bes c ees) ges( ees c ees ges bes) |
     c( bes ges bes c ees) ges( ees c ees ges bes) |
     c8-.->\!\ff \offCr r r r4 r8 | R2. |
     \time 9/8
     r4 r8 \repeat tremolo 6 { c,,32->\pp^\pont e } r4 r8 |
   }
 
-  viola = \relative c {
+  viola = \relative {
     \clef alto \key ees \minor \time 6/8
     <ees bes'>8-.\pp\< <ees bes'>-. <ees bes'>-. <ges c>-. <ges c>-. <ges c>-. |
     <bes ees>-. <bes ees>-. <bes ees>-. <c ges'>-. <c ges'>-. <c ges'>-. |
@@ -378,7 +363,7 @@ R2. |
     \repeat tremolo 12 { ges,32->^\pont bes } \repeat tremolo 6 {ges->( bes) } |
   }
 
-  cello = \relative c {
+  cello = \relative {
     \clef bass \key ees \minor \time 6/8
     <c ges'>8-.\pp\< <c ges'>-. <c ges'>-. <bes ees>-. <bes ees>-. <bes ees>-. |
     <c ges'>-. <c ges'>-. <c ges'>-. <c ges'>-. <c ges'>-. <c ges'>-. |