lilypond-book robustness: ensure EOL at the end of @verbatim

[lilypond.git] / Documentation / user / pitches.itely

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 9224f8e1bb04995e34361f2209c7dd1e9dc070b0..fce608a7c86883bcf1d8f37f66851cbf7af1f45c 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 

-@c \version "2.11.61"
+@c \version "2.12.0"

 
 
 @node Pitches
 
 
 @node Pitches


@@ -175,6 +175,47 @@ large intervals:
 }
 @end lilypond
 
 }
 @end lilypond
 

+When @code{\relative} blocks are nested, the innermost
+@code{\relative} block applies.
+
+@lilypond[verbatim,quote]
+\relative c' {
+  c d e f
+  \relative c'' {
+    c d e f
+  }
+}
+@end lilypond
+
+@code{\relative} has no effect on @code{\chordmode} blocks.
+
+@lilypond[verbatim,quote]
+\new Staff {
+  \relative c''' {
+    \chordmode { c1 }
+  }
+  \chordmode { c1 }
+}
+@end lilypond
+
+@code{\relative} is not allowed inside of @code{\chordmode} blocks.
+
+Music inside a @code{\transpose} block is absolute unless a
+@code{\relative} is included.
+
+@lilypond[verbatim,quote]
+\relative c' {
+  d e
+  \transpose f g {
+    d e
+    \relative c' {
+      d e
+    }
+  }
+}
+@end lilypond
+
+

 @cindex chords and relative octave entry
 @cindex relative octave entry and chords
 
 @cindex chords and relative octave entry
 @cindex relative octave entry and chords
 


@@ -238,13 +279,6 @@ Internals Reference:
 @funindex relative
 
 
 @funindex relative
 
 

-@knownissues
-
-The relative conversion will not affect @code{\transpose},
-@code{\chordmode} or @code{\relative} sections in its argument.
-To use relative mode within transposed music, an additional
-@code{\relative} must be placed inside @code{\transpose}.
-

 @c DEPRECATED
 If no @var{startpitch} is specified for @code{\relative},
 then@tie{}@code{c'} is assumed.  However, this is a deprecated
 @c DEPRECATED
 If no @var{startpitch} is specified for @code{\relative},
 then@tie{}@code{c'} is assumed.  However, this is a deprecated


@@ -406,8 +440,13 @@ any standard.
 
 There are predefined sets of note and accidental names for various
 other languages.  To use them, include the language-specific init
 
 There are predefined sets of note and accidental names for various
 other languages.  To use them, include the language-specific init

-file listed below.  For example, to use English notes names, add
-@code{@w{\include "english.ly"}} to the top of the input file.
+file listed below.  For example, to use English note names, add
+@code{@w{\include "english.ly"}} to the input file.
+
+@warning{Because some other include files (such as @code{@w{predefined-fretboards.ly}})
+use default (Nederlands) note names, the @code{@bs{}include}
+command for the language file should be placed after all other
+LilyPond distribution files.}

 
 The available language files and the note names they define are:
 
 
 The available language files and the note names they define are:
 


@@ -461,7 +500,7 @@ and the accidental suffixes they define are:
   @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
     @tab -ff/-flatflat
 @item @file{espanol.ly}
   @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
     @tab -ff/-flatflat
 @item @file{espanol.ly}

-  @tab -s @tab -b @tab -ss @tab -bb
+  @tab -s @tab -b @tab -ss/-x @tab -bb

 @item @file{italiano.ly}
   @tab -d @tab -b @tab -dd @tab -bb
 @item @file{norsk.ly}
 @item @file{italiano.ly}
   @tab -d @tab -b @tab -dd @tab -bb
 @item @file{norsk.ly}


@@ -516,6 +555,8 @@ languages, no special names have been defined yet.
   @tab -ih @tab -eh @tab -isih @tab -eseh
 @item @file{english.ly}
   @tab -qs @tab -qf @tab -tqs @tab -tqf
   @tab -ih @tab -eh @tab -isih @tab -eseh
 @item @file{english.ly}
   @tab -qs @tab -qf @tab -tqs @tab -tqf

+@item @file{espanol.ly}
+  @tab -cs @tab -cb @tab -tcs @tab -tcb

 @item @file{italiano.ly}
   @tab -sd @tab -sb @tab -dsd @tab -bsb
 @item @file{portugues.ly}
 @item @file{italiano.ly}
   @tab -sd @tab -sb @tab -dsd @tab -bsb
 @item @file{portugues.ly}


@@ -643,6 +684,9 @@ with pitch @var{frompitch} is changed to @var{topitch} and any
 other note is transposed by the same interval.  Both pitches are
 entered in absolute mode.
 
 other note is transposed by the same interval.  Both pitches are
 entered in absolute mode.
 

+@warning{Music inside a @code{@bs{}transpose} block is absolute
+unless a @code{@bs{}relative} is included in the block.}
+

 Consider a piece written in the key of D-major.  It can be
 transposed up to E-major; note that the key signature is
 automatically transposed as well.
 Consider a piece written in the key of D-major.  It can be
 transposed up to E-major; note that the key signature is
 automatically transposed as well.


@@ -729,6 +773,7 @@ see @ref{Instrument transpositions}.
 
 @seealso
 Notation Reference:
 
 @seealso
 Notation Reference:

+@ref{Relative octave entry},

 @ref{Instrument transpositions}.
 
 Snippets:
 @ref{Instrument transpositions}.
 
 Snippets:


@@ -752,7 +797,6 @@ The relative conversion will not affect @code{\transpose},
 To use relative mode within transposed music, an additional
 @code{\relative} must be placed inside @code{\transpose}.
 
 To use relative mode within transposed music, an additional
 @code{\relative} must be placed inside @code{\transpose}.
 

-

 @node Displaying pitches
 @subsection Displaying pitches
 
 @node Displaying pitches
 @subsection Displaying pitches
 


@@ -841,6 +885,16 @@ c2 c
 c2 c
 \clef tab
 c2 c
 c2 c
 \clef tab
 c2 c

+
+\break
+
+\clef G
+c2 c
+\clef F
+c2 c
+\clef C
+c2 c
+

 @end lilypond
 
 Further supported clefs are described under @ref{Mensural clefs}
 @end lilypond
 
 Further supported clefs are described under @ref{Mensural clefs}


@@ -1077,8 +1131,8 @@ playing in unison.
 \new GrandStaff <<
   \new Staff = "violin" {
     \relative c'' {
 \new GrandStaff <<
   \new Staff = "violin" {
     \relative c'' {

-      \set Staff.instrumentName = "Vln"
-      \set Staff.midiInstrument = "violin"
+      \set Staff.instrumentName = #"Vln"
+      \set Staff.midiInstrument = #"violin"

       % not strictly necessary, but a good reminder
       \transposition c'
 
       % not strictly necessary, but a good reminder
       \transposition c'
 


@@ -1089,7 +1143,7 @@ playing in unison.
   \new Staff = "clarinet" {
     \relative c'' {
       \set Staff.instrumentName = \markup { Cl (B\flat) }
   \new Staff = "clarinet" {
     \relative c'' {
       \set Staff.instrumentName = \markup { Cl (B\flat) }

-      \set Staff.midiInstrument = "clarinet"
+      \set Staff.midiInstrument = #"clarinet"

       \transposition bes
 
       \key d \major
       \transposition bes
 
       \key d \major


@@ -1104,7 +1158,7 @@ example, a clarinetist may switch from an A clarinet to a B-flat
 clarinet.
 
 @lilypond[verbatim,quote,relative=2]
 clarinet.
 
 @lilypond[verbatim,quote,relative=2]

-\set Staff.instrumentName = "Cl (A)"
+\set Staff.instrumentName = #"Cl (A)"

 \key a \major
 \transposition a
 c d e f
 \key a \major
 \transposition a
 c d e f