Merge remote-tracking branch 'origin/translation'

[lilypond.git] / Documentation / ly-examples / orchestra.ly

diff --git a/Documentation/ly-examples/orchestra.ly b/Documentation/ly-examples/orchestra.ly
index 219acafdc90ac8c1452f2ad018e04f848b1caa09..d784dfd6af3147c224b797ab7e7678fdb3007f31 100644 (file)
--- a/Documentation/ly-examples/orchestra.ly
+++ b/Documentation/ly-examples/orchestra.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.19.0"
 
 \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
   }
 }
 
@@ -107,10 +93,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 +118,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
@@ -285,49 +271,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'' {