Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / Documentation / essay / engraving.itely

diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely
index 7001fa4f68f4ae09cc81515461293568656ca7c9..5040f2771b64d67fffad9e73b2fa46626789700a 100644 (file)
--- a/Documentation/essay/engraving.itely
+++ b/Documentation/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.19.2"
 
 @node Music engraving
 @chapter Music engraving
@@ -317,9 +317,9 @@ music = {
   \layout {
     \context {
       \Staff
-      \override NoteSpacing #'stem-spacing-correction = #0.0
-      \override NoteSpacing #'same-direction-correction = #0.0
-      \override StaffSpacing #'stem-spacing-correction = #0.0
+      \override NoteSpacing.stem-spacing-correction = #0.0
+      \override NoteSpacing.same-direction-correction = #0.0
+      \override StaffSpacing.stem-spacing-correction = #0.0
     }
   }
 }
@@ -345,7 +345,7 @@ music = {
   \layout {
     \context {
       \Staff
-      \override NoteSpacing #'stem-spacing-correction = #0.6
+      \override NoteSpacing.stem-spacing-correction = #0.6
     }
   }
 }
@@ -465,8 +465,8 @@ global = {
   <<
     \new Staff \with {
       fontSize = #-4
-      \override StaffSymbol #'staff-space = #(magstep -4)
-      \override StaffSymbol #'thickness = #(magstep -3)
+      \override StaffSymbol.staff-space = #(magstep -4)
+      \override StaffSymbol.thickness = #(magstep -3)
     }
     \relative c' {
       \global
@@ -488,7 +488,7 @@ global = {
         \clef "bass"
         <<
         {
-          \once \override DynamicText #'X-offset = #-3
+          \once \override DynamicText.X-offset = #-3
           <ees g c>2.~->^\f
           <ees g c>4.~ <ees g c>8
         } \\ {
@@ -563,9 +563,9 @@ of the three configurations should we choose for the following slur?
 @lilypond
 \relative c {
   \clef bass
-  \once \override Slur #'positions = #'(1.5 . 1)
+  \once \override Slur.positions = #'(1.5 . 1)
   e8[( f] g[ a b d,)] r4
-  \once \override Slur #'positions = #'(2 . 3)
+  \once \override Slur.positions = #'(2 . 3)
   e8[( f] g[ a b d,)] r4
   e8[( f] g[ a b d,)] r4
 }
@@ -603,7 +603,7 @@ has given each one a score in @q{ugly points}.  The first example gets
 @lilypond
 \relative c {
   \clef bass
-  \once \override Slur #'positions = #'(1.5 . 1)
+  \once \override Slur.positions = #'(1.5 . 1)
   e8[(_"15.39" f] g[ a b d,)] r4
 }
 @end lilypond
@@ -617,7 +617,7 @@ descends for a total of 13.08 ugly points:
 @lilypond
 \relative c {
   \clef bass
-  \once \override Slur #'positions = #'(2 . 3)
+  \once \override Slur.positions = #'(2 . 3)
   e8[(_"13.08" f] g[ a b d,)] r4
 }
 @end lilypond
@@ -830,7 +830,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'staff-staff-spacing #'padding = #1
+      \override StaffGrouper.staff-staff-spacing.padding = #1
     }
   }
 }
@@ -849,7 +849,7 @@ which makes the music extremely difficult to read when the upper and
 lower voices exchange positions temporarily:
 
 @lilypond
-collide = \once \override NoteColumn #'force-hshift = #0
+collide = \once \override NoteColumn.force-hshift = #0
 
 \score {
   <<
@@ -860,7 +860,7 @@ collide = \once \override NoteColumn #'force-hshift = #0
         \new Voice { \voiceTwo bes \collide bes }
       >>
     }
-    \new Lyrics \lyricsto "sample" \lyricmode { "good " " bad" }
+    \new Lyrics \lyricsto "sample" { "good " " bad" }
   >>
 }
 @end lilypond
@@ -1087,20 +1087,20 @@ consider a more complicated musical example:
     \new Voice = "I" \relative c''' {
       \time 3/4
       \voiceOne
-      \times 6/7 { g8 g g g g g g }
+      \tuplet 7/6 { g8 g g g g g g }
       \oneVoice
       r4 <b,, fis' g bes> r4\fermata
     }
     \new Voice = "II" \relative c' {
       \voiceTwo
       c4
-      \times 4/5 {
+      \tuplet 5/4 {
         <c ees>8 f g
         \change Staff = "LH" \oneVoice
         \stemUp g,( c}
       r4
-      \override Stem #'cross-staff = ##t
-      \override Stem #'length = #12
+      \override Stem.cross-staff = ##t
+      \override Stem.length = #12
       <fis, b>) r\fermata
     }
   >>
@@ -1168,6 +1168,7 @@ heads, the @code{Note_heads_engraver}.
       \remove "Phrasing_slur_engraver"
       \remove "Slur_engraver"
       \remove "Script_engraver"
+      \remove "New_fingering_engraver"
       \remove "Beam_engraver"
       \remove "Auto_beam_engraver"
     }
@@ -1200,6 +1201,7 @@ Then a @code{Staff_symbol_engraver} adds the staff,
       \remove "Phrasing_slur_engraver"
       \remove "Slur_engraver"
       \remove "Script_engraver"
+      \remove "New_fingering_engraver"
       \remove "Beam_engraver"
       \remove "Auto_beam_engraver"
     }
@@ -1231,6 +1233,7 @@ the @code{Clef_engraver} defines a reference point for the staff,
       \remove "Phrasing_slur_engraver"
       \remove "Slur_engraver"
       \remove "Script_engraver"
+      \remove "New_fingering_engraver"
       \remove "Beam_engraver"
       \remove "Auto_beam_engraver"
     }
@@ -1259,6 +1262,7 @@ and the @code{Stem_engraver} adds stems.
       \remove "Phrasing_slur_engraver"
       \remove "Slur_engraver"
       \remove "Script_engraver"
+      \remove "New_fingering_engraver"
       \remove "Beam_engraver"
       \remove "Auto_beam_engraver"
     }
@@ -1368,14 +1372,14 @@ chord has all directions up (right).
 \score {
   \relative c' {
     \stemDown <e g b>4_>-\arpeggio
-    \override Arpeggio #'direction = #RIGHT
+    \override Arpeggio.direction = #RIGHT
     \stemUp <e g b>4^>-\arpeggio
   }
   \layout {
     \context {
       \Score
-      \override SpacingSpanner #'spacing-increment = #3
-      \override TimeSignature #'transparent = ##t
+      \override SpacingSpanner.spacing-increment = #3
+      \hide TimeSignature
     }
   }
 }
@@ -1401,12 +1405,12 @@ fragment = {
 <<
    \new Staff \fragment
    \new Staff \with {
-      \override Beam #'beam-thickness = #0.3
-      \override Stem #'thickness = #0.5
-      \override Bar #'thickness = #3.6
-      \override Tie #'thickness = #2.2
-      \override StaffSymbol #'thickness = #3.0
-      \override Tie #'extra-offset = #'(0 .  0.3)
+      \override Beam.beam-thickness = #0.3
+      \override Stem.thickness = #0.5
+      \override Bar.thickness = #3.6
+      \override Tie.thickness = #2.2
+      \override StaffSymbol.thickness = #3.0
+      \override Tie.extra-offset = #'(0 .  0.3)
       }
       \fragment
 >>
@@ -1441,12 +1445,12 @@ note head symbol is changed during the music fragment.
   \set autoBeaming = ##f
   \time 2/4
   <d f g>4
-  \once \override NoteHead #'stencil = #note-head::brew-ez-stencil
-  \once \override NoteHead #'font-size = #-7
-  \once \override NoteHead #'font-family = #'sans
-  \once \override NoteHead #'font-series = #'bold
+  \once \override NoteHead.stencil = #note-head::brew-ez-stencil
+  \once \override NoteHead.font-size = #-7
+  \once \override NoteHead.font-family = #'sans
+  \once \override NoteHead.font-series = #'bold
   <d f g>4
-  \once \override NoteHead #'style = #'cross
+  \once \override NoteHead.style = #'cross
   <d f g>4
   \applyOutput #'Voice #mc-squared
   <d f g>4
@@ -1508,7 +1512,7 @@ following example combines some more exotic constructs.
       \time 4/8
       \key c \minor
       << {
-        \revert Stem #'direction
+        \revert Stem.direction
         \change Staff = down
         \set subdivideBeams = ##t
         g16.[
@@ -1525,7 +1529,7 @@ following example combines some more exotic constructs.
         \set followVoice = ##t
         c'''32([ b''16 a''16 gis''16 g''32)]
       } \\ {
-        s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d'']
+        s4 \tuplet 3/2 { d'16[ f' g'] } as'32[ b''32 e'' d'']
       } \\ {
         s4 \autoBeamOff d''8.. f''32
       } \\ {
@@ -1537,30 +1541,27 @@ following example combines some more exotic constructs.
       \clef bass
       \key c \minor
       \set subdivideBeams = ##f
-      \override Stem  #'french-beaming = ##t
-      \override Beam  #'beam-thickness = #0.3
-      \override Stem  #'thickness = #4.0
+      \override Stem.french-beaming = ##t
+      \override Beam.beam-thickness = #0.3
+      \override Stem.thickness = #4.0
       g'16[ b16 fis16 g16]
       << \makeClusters {
         as16 <as b>
         <g b>
         <g cis>
       } \\ {
-        \override Staff.Arpeggio  #'arpeggio-direction =#down
+        \override Staff.Arpeggio.arpeggio-direction =#down
         <cis, e, gis, b, cis>4\arpeggio
       }
     >> }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     \context {
       \Staff
-      \consists Horizontal_bracket_engraver
+      \consists "Horizontal_bracket_engraver"
     }
   }
 }
@@ -1579,8 +1580,8 @@ therefore be easily embedded in other text-based formats such as
 @command{lilypond-book} program, included with LilyPond, the input
 fragments can be replaced by music images in the resulting PDF or HTML
 output files.  Another example is the third-party OOoLilyPond extension
-for OpenOffice.org, which makes it extremely easy to embed musical
-examples in documents.
+for OpenOffice.org or LibreOffice, which makes it extremely easy to
+embed musical examples in documents.
 
 For more examples of LilyPond in action, full documentation, and the
 software itself, see our main website: www.lilypond.org.
@@ -1663,9 +1664,9 @@ partI = \relative c' {
   fis8 d' ees g, fis4 g
   r8 a16 bes c8 bes16 a d8 r r4
   r2 r8 d16 ees f8 ees16 d
-  ees4 ~ ees16 d c bes a4 r8 ees'16 d
+  ees4 ~ 16 d c bes a4 r8 ees'16 d
   c8 d16 ees d8 e16 fis g8 fis16 g a4 ~
-  a8 d, g f ees d c bes
+  8 d, g f ees d c bes
   a2 g\fermata \bar "|."
 }
 
@@ -1674,7 +1675,7 @@ partII = \relative c' {
   d4 r4 r8 d'16 c bes8 c16 d
   ees8 d c ees a, r r4
   r8 fis16 g a8 g16 fis g2 ~
-  g2 r8 d' ees g,
+  2 r8 d' ees g,
   fis4 g r8 a16 bes c8 bes16 a
   bes4. <g b>8 <a c> r <d, g> r
   <ees g>4 <d fis> d2
@@ -1682,7 +1683,7 @@ partII = \relative c' {
 partIII = \relative c' {
   \voiceOne
   r2 r8 d ees g, fis4 g r8 a16 bes c8 bes16 a
-  bes2 ~ bes8 b16 a g8 a16 b
+  bes2 ~ 8 b16 a g8 a16 b
   c4 r r2
   R1
   r8 d ees g, fis4 g
@@ -1693,7 +1694,7 @@ partIV = \relative c {
   d4 r r2
   r8 d ees g, fis4 a
   d,8 d'16 c bes8 c16 d ees2 ~
-  ees8 ees16 d c8 d16 ees fis,8 a16 g fis8 g16 a
+  8 ees16 d c8 d16 ees fis,8 a16 g fis8 g16 a
   d,8 d'16 c bes8 c16 d ees8 c a fis'
   g f ees d c bes a g
   c a d d, g2\fermata
@@ -1727,7 +1728,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'staff-staff-spacing #'padding = #1
+      \override StaffGrouper.staff-staff-spacing.padding = #1
     }
   }
 }