Merge branch 'master' into translation

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

diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 1b7a04bd03a18ad5cb45cfd1df856fd46a91000b..76cffd15c2407804b79c06f639e86d11cb63acf4 100644 (file)
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     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
 
 @node General input and output
 @chapter General input and output


@@ -504,7 +504,6 @@ after the entire command.
 
 @end itemize
 
 
 @end itemize
 

-

 @seealso
 Learning Manual:
 @rlearning{How LilyPond input files work}.
 @seealso
 Learning Manual:
 @rlearning{How LilyPond input files work}.


@@ -711,6 +710,7 @@ Notation Reference:
 Installed Files:
 @file{ly/titling-init.ly}.
 
 Installed Files:
 @file{ly/titling-init.ly}.
 

+

 @node Default layout of headers and footers
 @unnumberedsubsubsec Default layout of headers and footers
 
 @node Default layout of headers and footers
 @unnumberedsubsubsec Default layout of headers and footers
 


@@ -1014,6 +1014,7 @@ Notation Reference:
 @ref{Title blocks explained},
 @ref{Default layout of book and score title blocks}.
 
 @ref{Title blocks explained},
 @ref{Default layout of book and score title blocks}.
 

+

 @node Creating footnotes
 @subsection Creating footnotes
 
 @node Creating footnotes
 @subsection Creating footnotes
 


@@ -1052,10 +1053,10 @@ footnote is being attached to:
 \book {
   \header { tagline = ##f }
   \relative c' {
 \book {
   \header { tagline = ##f }
   \relative c' {

-    \footnote #'(0.5 . -2) #'NoteHead
+    <>\footnote #'(0.5 . -2) #'NoteHead

       \markup { The first note }
     a'4 b8
       \markup { The first note }
     a'4 b8

-    \footnote #'(0.5 . 1) #'NoteHead
+    <>\footnote #'(0.5 . 1) #'NoteHead

       \markup { The third note }
     e c4 d4
   }
       \markup { The third note }
     e c4 d4
   }


@@ -1070,9 +1071,9 @@ the note to which the footnote is being attached as a @code{TextScript}:
   \header { tagline = ##f }
   \relative c' {
     <
   \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
   }
 }
     >1
   }
 }


@@ -1089,25 +1090,25 @@ relative position of the footnotes to the tagline and copyright.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {

-    \footnote #'(-3 . 0) #'DynamicText
+    <>\footnote #'(-3 . 0) #'DynamicText

       \markup { \bold Forte }
 
       \markup { \bold Forte }
 

-    \footnote #'(0 . 1.5) #'Slur
+    <>\footnote #'(0 . 1.5) #'Slur

       \markup { A slur }
     a'4\f(
 
       \markup { A slur }
     a'4\f(
 

-    \footnote #'(0 . -2) #'Beam
+    <>\footnote #'(0 . -2) #'Beam

       \markup { Beam }
     b8)[ e]
 
       \markup { Beam }
     b8)[ e]
 

-    \footnote #'(1 . -1) #'Stem
+    <>\footnote #'(1 . -1) #'Stem

       \markup  { \teeny { This is a stem } }
     c4
 
       \markup  { \teeny { This is a stem } }
     c4
 

-    \footnote #'(0 . 0.5) #'AccidentalCautionary
+    <>\footnote #'(0 . 0.5) #'AccidentalCautionary

       \markup \italic { A cautionary accidental }
 
       \markup \italic { A cautionary accidental }
 

-    \footnote #'(0.5 . -0.5) #'TextScript
+    <>\footnote #'(0.5 . -0.5) #'TextScript

       \markup \italic { Slow Down }
     dis?4_"rit."
   }
       \markup \italic { Slow Down }
     dis?4_"rit."
   }


@@ -1139,20 +1140,20 @@ annotated, the @samp{(x . y)} position of the indicator and two
 or grob and the second is the footnote at the bottom of the page.
 
 Like automatic footnotes, manual @code{\footnote} commands must come
 or grob and the second is the footnote at the bottom of the page.
 
 Like automatic footnotes, manual @code{\footnote} commands must come

-@emph{after} the grob that the footnote is annotating and attached as a
+@emph{before} the grob that the footnote is annotating and attached as a

 @code{TextScript}:
 
 @lilypond[verbatim,quote,ragged-right,papersize=a8]
 \book {
   \header { tagline = ##f }
   \relative c' {
 @code{TextScript}:
 
 @lilypond[verbatim,quote,ragged-right,papersize=a8]
 \book {
   \header { tagline = ##f }
   \relative c' {

-    a'4-\footnote
+    a'4\footnote

           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
           "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
           \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
   }
 }
 @end lilypond


@@ -1164,10 +1165,10 @@ To annotate chorded notes with manual footnotes:
   \header { tagline = ##f }
   \relative c' {
     <
   \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"
        \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
   }
 }
     >1
   }
 }


@@ -1184,37 +1185,37 @@ the relative position of the footnotes to the tagline and copyright
 \book {
   \header { tagline = ##f }
   \relative c' {
 \book {
   \header { tagline = ##f }
   \relative c' {

-    \footnote
+    <>\footnote

       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
       \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(
 
       \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]
 
       \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
 
       \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 }
 
       \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
       \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 }
       \markup { \teeny \musicglyph #"rests.4" }
           #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }


@@ -1428,10 +1429,9 @@ Dots can be added to fill the line between an item and its page number:
 }
 @end lilypond
 
 }
 @end lilypond
 

-

 @seealso
 @seealso

-Init files: @file{../ly/toc-init.ly}.
-
+Installed Files:
+@file{ly/toc-init.ly}.

 
 @predefined
 @funindex \table-of-contents
 
 @predefined
 @funindex \table-of-contents


@@ -1814,19 +1814,18 @@ Notation Reference:
 @ref{Automatic part combining},
 @ref{Including LilyPond files}.
 
 @ref{Automatic part combining},
 @ref{Including LilyPond files}.
 

-

 @ignore
 @c This warning is more general than this placement implies.
 @c Rests are not merged whether or not they come from tagged sections.
 @c Should be deleted?  -td
 
 @knownissues
 @ignore
 @c This warning is more general than this placement implies.
 @c Rests are not merged whether or not they come from tagged sections.
 @c Should be deleted?  -td
 
 @knownissues

-

 Multiple rests are not merged if you create a score with more
 than one tagged section at the same place.
 
 @end ignore
 
 Multiple rests are not merged if you create a score with more
 than one tagged section at the same place.
 
 @end ignore
 

+

 @node Using global settings
 @unnumberedsubsubsec Using global settings
 
 @node Using global settings
 @unnumberedsubsubsec Using global settings
 


@@ -1854,6 +1853,7 @@ Learning Manual:
 Notation Reference:
 @ref{Including LilyPond files}.
 
 Notation Reference:
 @ref{Including LilyPond files}.
 

+

 @node Special characters
 @subsection Special characters
 
 @node Special characters
 @subsection Special characters
 


@@ -2042,7 +2042,6 @@ Installed Files:
 @file{ly/text-replacements.ly}.
 
 
 @file{ly/text-replacements.ly}.
 
 

-

 @node Controlling output
 @section Controlling output
 
 @node Controlling output
 @section Controlling output
 


@@ -2146,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
 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
 
 
 @node Replacing the notation font


@@ -2179,7 +2178,8 @@ existing @code{fonts} directory to @code{fonts_orig} and the
 reverse the process.
 
 @seealso
 reverse the process.
 
 @seealso

-Learning Manual: @rlearning{Other sources of information}.
+Learning Manual:
+@rlearning{Other sources of information}.

 
 @knownissues
 Gonville cannot be used to typeset @q{Ancient Music} notation and it is
 
 @knownissues
 Gonville cannot be used to typeset @q{Ancient Music} notation and it is