Merge branch 'master' into translation

[lilypond.git] / Documentation / notation / input.itely

diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 8c6c1639d3c7d7024d1df1e9dca32052a52f61c2..76cffd15c2407804b79c06f639e86d11cb63acf4 100644 (file)
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.32"
+@c \version "2.15.39"
 
 @node General input and output
 @chapter General input and output
@@ -1053,10 +1053,10 @@ footnote is being attached to:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \footnote #'(0.5 . -2) #'NoteHead
+    <>\footnote #'(0.5 . -2) #'NoteHead
       \markup { The first note }
     a'4 b8
-    \footnote #'(0.5 . 1) #'NoteHead
+    <>\footnote #'(0.5 . 1) #'NoteHead
       \markup { The third note }
     e c4 d4
   }
@@ -1071,9 +1071,9 @@ the note to which the footnote is being attached as a @code{TextScript}:
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\footnote #'(1 . -1.25) "Here is a C"
-    es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" }
-    g-\footnote #'(2 . 3) \markup { \bold "This is a G" }
+    c\footnote #'(1 . -1.25) "Here is a C"
+    es\footnote #'(2 . -0.25) \markup { \italic "An E-flat" }
+    g\footnote #'(2 . 3) \markup { \bold "This is a G" }
     >1
   }
 }
@@ -1090,25 +1090,25 @@ relative position of the footnotes to the tagline and copyright.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    \footnote #'(-3 . 0) #'DynamicText
+    <>\footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    \footnote #'(0 . 1.5) #'Slur
+    <>\footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    \footnote #'(0 . -2) #'Beam
+    <>\footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    \footnote #'(1 . -1) #'Stem
+    <>\footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    \footnote #'(0 . 0.5) #'AccidentalCautionary
+    <>\footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    \footnote #'(0.5 . -0.5) #'TextScript
+    <>\footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1147,13 +1147,13 @@ Like automatic footnotes, manual @code{\footnote} commands must come
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4-\footnote
+    a'4\footnote
           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e-\footnote
+    e\footnote
           \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
+    d\p\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1165,10 +1165,10 @@ To annotate chorded notes with manual footnotes:
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\footnote "1" #'(1 . -1.25) "1. C"
-    es-\footnote
+    c\footnote "1" #'(1 . -1.25) "1. C"
+    es\footnote
        \markup { \bold "b" } #'(2 . -0.25) "b. E-flat"
-    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
+    g\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1185,37 +1185,37 @@ the relative position of the footnotes to the tagline and copyright
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \footnote
+    <>\footnote
       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    \footnote
+    <>\footnote
       \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    \footnote
+    <>\footnote
       \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    \footnote
+    <>\footnote
       \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    \footnote
+    <>\footnote
       \markup \concat \teeny { "sharp (v)" }
           #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    \footnote
+    <>\footnote
       \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    \footnote
+    <>\footnote
       \markup { \teeny \musicglyph #"rests.4" }
           #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }
@@ -2145,8 +2145,8 @@ The default output formats for the printed score are Portable
 Document Format (PDF) and PostScript (PS).  Scalable Vector
 Graphics (SVG), Encapsulated PostScript (EPS) and Portable
 Network Graphics (PNG) output formats are also available through
-command line options, see @rprogram{Command line options for
-lilypond}.
+command line options, see
+@rprogram{Basic command line options for LilyPond}.
 
 
 @node Replacing the notation font