Run scripts/auxiliar/update-with-convert-ly.sh

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

diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely
index f32934303c63476390c85c0d3c2e89462a31985d..412813cd0a5b5ab48db709ef0b79c1f54867cfe1 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.17.11"
+@c \version "2.19.21"
 
 @node Music engraving
 @chapter Music engraving
@@ -447,15 +447,11 @@ magnified by 236% to print at the same size as the previous example:
 At smaller sizes, LilyPond uses proportionally heavier lines so the
 music will still read well.
 
-@ignore
 This also allows staves of different sizes to coexist peacefully when
 used together on the same page:
 
-@c TODO: are the stems in this example the right thickness? How should
-@c line weights be scaled for small staves?
-
 @c Grieg's Violin Sonata Op. 45
-@lilypond[indent=1.5cm]
+@lilypond[indent=1.5\cm]
 global = {
   \time 6/8
   \key c \minor
@@ -464,9 +460,7 @@ global = {
 \score {
   <<
     \new Staff \with {
-      fontSize = #-4
-      \override StaffSymbol.staff-space = #(magstep -4)
-      \override StaffSymbol.thickness = #(magstep -3)
+      \magnifyStaff #2/3
     }
     \relative c' {
       \global
@@ -503,7 +497,7 @@ global = {
   >>
 }
 @end lilypond
-@end ignore
+
 
 @node Why work so hard?
 @unnumberedsubsec Why work so hard?
@@ -628,7 +622,7 @@ it is the most attractive of the three configurations, so LilyPond
 selects this one:
 
 @lilypond
-\relative c {
+\relative {
   \clef bass
   e8[(_"12.04" f] g[ a b d,)] r4
 }
@@ -744,10 +738,10 @@ For our comparison we selected Bach's Fugue in G minor from the
 Well-Tempered Clavier, Book I, BWV 861, whose opening subject is
 
 @lilypond
-\relative c' {
+\relative {
   \key g \minor
   \clef "treble_8"
-  r8 d ees g, fis4 g
+  r8 d' ees g, fis4 g
   r8 a16 bes c8 bes16 a bes8
 }
 @end lilypond
@@ -860,7 +854,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
@@ -1038,12 +1032,12 @@ nature of music notation:
 
 @lilypond[quote,fragment]
 <<
-  \new Staff \relative c'' {
+  \new Staff \relative {
     \key g \major
     \time 3/4
-    d4 g,8 a b c d4 g, g
+    d''4 g,8 a b c d4 g, g
   }
-  \new Staff \relative c' {
+  \new Staff \relative {
     \clef "bass"
     \key g \major
     <g b d>2 a4 b2.
@@ -1105,7 +1099,7 @@ consider a more complicated musical example:
     }
   >>
   \new Staff = "LH" <<
-    \new Voice = "III" \relative c' {
+    \new Voice = "III" \relative {
       \time 2/4
       \clef "bass"
       g4 \stopStaff s
@@ -1168,6 +1162,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 +1195,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 +1227,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 +1256,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"
     }
@@ -1375,7 +1373,7 @@ chord has all directions up (right).
     \context {
       \Score
       \override SpacingSpanner.spacing-increment = #3
-      \override TimeSignature.transparent = ##t
+      \hide TimeSignature
     }
   }
 }
@@ -1484,9 +1482,9 @@ By adding chord names and lyrics we obtain a lead sheet.
 <<
    \chords { c2 c f2 c }
    \new Staff
-   \relative c' {
+   \relative {
      \time 2/4
-     c4 c g' g a a g2
+     c'4 c g' g a a g2
    }
    \addlyrics { twin -- kle twin -- kle lit -- tle star }
 >>
@@ -1576,8 +1574,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.
@@ -1660,9 +1658,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 "|."
 }
 
@@ -1671,7 +1669,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
@@ -1679,7 +1677,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
@@ -1690,7 +1688,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