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

[lilypond.git] / Documentation / learning / common-notation.itely

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index 3b7d55e94eeea78b2f283bd3d3b907595d2ed4c1..51a2056aa30fc80adc9478e7ab69e46f9d9dc75b 100644 (file)
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.19.2"
+@c \version "2.19.21"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -97,8 +97,8 @@ read, since they help to keep things organized.
 
 @c This example deliberately produces a warning
 @lilypond[verbatim,quote]
-\relative g' {
-  g1 | e1 | c2. c' | g4 c g e | c4 r r2 |
+\relative {
+  g'1 | e1 | c2. c' | g4 c g e | c4 r r2 |
 }
 @end lilypond
 
@@ -765,9 +765,9 @@ following example, three sequences (all containing two separate
 notes) are combined simultaneously:
 
 @lilypond[verbatim,quote]
-\relative c'' {
+\relative {
   <<
-    { a2 g }
+    { a'2 g }
     { f2 e }
     { d2 b }
   >>
@@ -796,8 +796,8 @@ expression, but as it begins with a single note it will be set
 out on a single staff.
 
 @lilypond[verbatim,quote]
-\relative c'' {
-  c2 <<c e>> |
+\relative {
+  c''2 <<c e>> |
   << { e2 f } { c2 <<b d>> } >> |
 }
 @end lilypond
@@ -833,9 +833,9 @@ staff is marked by adding @code{\new Staff} before it.  These
 and @code{>>}:
 
 @lilypond[verbatim,quote]
-\relative c'' {
+\relative {
   <<
-    \new Staff { \clef "treble" c4 }
+    \new Staff { \clef "treble" c''4 }
     \new Staff { \clef "bass" c,,4 }
   >>
 }
@@ -863,9 +863,9 @@ is because scores with transposing instruments are more common
 than polyrhythmic scores.
 
 @lilypond[verbatim,quote]
-\relative c'' {
+\relative {
   <<
-    \new Staff { \clef "treble" \key d \major \time 3/4 c4 }
+    \new Staff { \clef "treble" \key d \major \time 3/4 c''4 }
     \new Staff { \clef "bass" c,,4 }
   >>
 }
@@ -907,9 +907,9 @@ inserted inside a @code{PianoStaff}:
 Here is a small example:
 
 @lilypond[verbatim,quote]
-\relative c'' {
+\relative {
   \new PianoStaff <<
-    \new Staff { \time 2/4 c4 e | g g, | }
+    \new Staff { \time 2/4 c''4 e | g g, | }
     \new Staff { \clef "bass" c,,4 c' | e c | }
   >>
 }
@@ -1023,10 +1023,10 @@ Here is the start of the melody to a nursery
 rhyme, @notation{Girls and boys come out to play}:
 
 @lilypond[verbatim,quote]
-\relative c'' {
+\relative {
   \key g \major
   \time 6/8
-  d4 b8 c4 a8 | d4 b8 g4
+  d''4 b8 c4 a8 | d4 b8 g4
 }
 @end lilypond
 
@@ -1036,10 +1036,10 @@ separating each syllable with a space.
 
 @lilypond[verbatim,quote]
 <<
-  \relative c'' {
+  \relative {
     \key g \major
     \time 6/8
-    d4 b8 c4 a8 | d4 b8 g4
+    d''4 b8 c4 a8 | d4 b8 g4
   }
   \addlyrics {
     Girls and boys come out to play,
@@ -1070,10 +1070,10 @@ shine as bright as day}.  Let's extend it:
 
 @lilypond[verbatim,quote]
 <<
-  \relative c'' {
+  \relative {
     \key g \major
     \time 6/8
-    d4 b8 c4 a8 | d4 b8 g4 g8 |
+    d''4 b8 c4 a8 | d4 b8 g4 g8 |
     a4 b8 c b a | d4 b8 g4. |
   }
   \addlyrics {
@@ -1092,10 +1092,10 @@ to add a slur across them, for details, see @ref{Ties and slurs}:
 
 @lilypond[verbatim,quote]
 <<
-  \relative c'' {
+  \relative {
     \key g \major
     \time 6/8
-    d4 b8 c4 a8 | d4 b8 g4 g8 |
+    d''4 b8 c4 a8 | d4 b8 g4 g8 |
     a4 b8 c( b) a | d4 b8 g4. |
   }
   \addlyrics {
@@ -1113,10 +1113,10 @@ manual beams}.
 
 @lilypond[verbatim,quote]
 <<
-  \relative c'' {
+  \relative {
     \key g \major
     \time 6/8
-    d4 b8 c4 a8 | d4 b8 g4 g8 |
+    d''4 b8 c4 a8 | d4 b8 g4 g8 |
     a4 b8 c([ b]) a | d4 b8 g4. |
   }
   \addlyrics {
@@ -1132,10 +1132,10 @@ that should be included in the melisma:
 
 @lilypond[verbatim,quote]
 <<
-  \relative c'' {
+  \relative {
     \key g \major
     \time 6/8
-    d4 b8 c4 a8 | d4 b8 g4 g8 |
+    d''4 b8 c4 a8 | d4 b8 g4 g8 |
     a4 b8 c[ b] a | d4 b8 g4. |
   }
   \addlyrics {
@@ -1154,10 +1154,10 @@ first three bars of @notation{Dido's Lament}, from Purcell's
 
 @lilypond[verbatim,quote]
 <<
-  \relative c'' {
+  \relative {
     \key g \minor
     \time 3/2
-    g2 a bes | bes2( a) b2 |
+    g'2 a bes | bes2( a) b2 |
     c4.( bes8 a4. g8 fis4.) g8 | fis1
   }
   \addlyrics {
@@ -1204,11 +1204,11 @@ Here's an example from Rossini's @notation{Figaro}, where
 @c but the example is long enough to avoid looking strange.
 @lilypond[verbatim,quote,noragged-right]
 <<
-  \relative c' {
+  \relative {
     \clef "bass"
     \key c \major
     \time 6/8
-    c4.~ 8 d b | c8([ d]) b c d b | c8
+    c'4.~ 8 d b | c8([ d]) b c d b | c8
   }
   \addlyrics {
     Lar -- go_al fac -- to -- tum del -- la cit -- tà
@@ -1314,13 +1314,13 @@ later by placing a backslash in front of the name
 
 @lilypond[verbatim,quote]
 violin = \new Staff {
-  \relative c'' {
-    a4 b c b
+  \relative {
+    a'4 b c b
   }
 }
 
 cello = \new Staff {
-  \relative c {
+  \relative {
     \clef "bass"
     e2 d
   }
@@ -1472,10 +1472,10 @@ of errors.  With @code{\relative}, the previous example is much
 easier to read and type:
 
 @lilypond[verbatim,quote]
-\relative c'' {
+\relative {
   \key a \major
   \time 6/8
-  cis8. d16 cis8 e4 e8 |
+  cis''8. d16 cis8 e4 e8 |
   b8. cis16 b8 d4 d8 |
 }
 @end lilypond
@@ -1496,7 +1496,7 @@ using @code{\relative} inside of @code{\relative}, the outer and
 inner relative sections are independent:
 
 @lilypond[verbatim,quote]
-\relative c { c'4 \relative c'' { f g } c }
+\relative { c'4 \relative { f'' g } c }
 @end lilypond
 
 @funindex \absolute
@@ -1505,7 +1505,7 @@ mark the absolute music explicitly with @code{\absolute} to stop
 it from becoming part of the relative music:
 
 @lilypond[verbatim,quote]
-\relative c { c'4 \absolute { f'' g'' } c }
+\relative { c'4 \absolute { f'' g'' } c }
 @end lilypond
 
 @node After the tutorial