Merge branch 'master' into nested-bookparts

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

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 006611ef86a83845e96d38b842c4e54adb3c2de5..7c199fef71247d4aa649605d8153b8f529547f61 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.61"
+@c \version "2.11.57"
 
 @node General input and output
 @chapter General input and output
@@ -287,7 +287,7 @@ foo = @{ c4 d e d @}
 @end example
 
 This can be used later on in the file by entering @code{\foo}.  The
-name of a variable should have alphabetic characters only; no
+name of an variable should have alphabetic characters only; no
 numbers, underscores or dashes.
 
 @end itemize
@@ -373,32 +373,32 @@ Subsubtitle, centered below the subtitle.
 
 @funindex poet
 @item poet
-Name of the poet, flush-left below the subsubtitle.
-
-@funindex instrument
-@item instrument
-Name of the instrument, centered below the subsubtitle.  Also
-centered at the top of pages (other than the first page).
+Name of the poet, flush-left below the subtitle.
 
 @funindex composer
 @item composer
-Name of the composer, flush-right below the subsubtitle.
+Name of the composer, flush-right below the subtitle.
 
 @funindex meter
 @item meter
 Meter string, flush-left below the poet.
 
+@funindex opus
+@item opus
+Name of the opus, flush-right below the composer.
+
 @funindex arranger
 @item arranger
-Name of the arranger, flush-right below the composer.
+Name of the arranger, flush-right below the opus.
+
+@funindex instrument
+@item instrument
+Name of the instrument, centered below the arranger.  Also
+centered at the top of pages (other than the first page).
 
 @funindex piece
 @item piece
-Name of the piece, flush-left below the meter.
-
-@funindex opus
-@item opus
-Name of the opus, flush-right below the arranger.
+Name of the piece, flush-left below the instrument.
 
 @cindex page breaks, forcing
 @funindex breakbefore
@@ -498,14 +498,14 @@ Note that the music expression must come before the @code{\header}.
 }
 @end lilypond
 
-@funindex print-all-headers
+@funindex printallheaders
 @noindent
 You may change this behavior (and print all the headers when defining
 @code{\header} inside @code{\score}) by using
 
 @example
 \paper@{
-  print-all-headers = ##t
+  printallheaders=##t
 @}
 @end example
 
@@ -1177,34 +1177,12 @@ is known but which is not available in the editor being used, enter
 #(ly:export (ly:wide-char->utf-8 #x03BE))
 @end example
 
-as an articulation mark or within a @code{\markup} block,
 where in this example @code{x03BE} is the hexadecimal code for the
 Unicode U+03BE character, which has the Unicode name @qq{Greek Small
 Letter Xi}.  Any Unicode hexadecimal code may be substituted, and
 if all special characters are entered in this format it is not
 necessary to save the input file in UTF-8 format.
 
-Here are three ways of entering a UTF-8 code:
-
-@lilypond[quote,verbatim]
-\score {
-  \relative c'' {
-    c2^#(ly:export (ly:wide-char->utf-8 #x03EE))
-    c2_\markup { \tiny { #(ly:export (ly:wide-char->utf-8 #x03B1)) " to "
-                         #(ly:export (ly:wide-char->utf-8 #x03C9)) } }
-  }
-}
-\markup { "Copyright 2008" #(ly:export (ly:wide-char->utf-8 #x00a9)) }
-@end lilypond
-
-To enter the copyright sign in the copyright notice use:
-
-@example
-\header @{
-  copyright = \markup @{ #(ly:export (ly:wide-char->utf-8 #x00a9)) "2008" @}
-@}
-@end example
-
 @knownissues
 
 The @code{ly:export} format may be used in text within @code{\mark} or