Merge branch 'master' into dev/texi2html

[lilypond.git] / input / lsr / aligning-and-centering-instrument-names.ly

diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly
index 586103c4a0de81a63b92d5e352ac6f3d9b1ee9f8..041d14a2be70bb9e5511da721558e44bd9ce2afb 100644 (file)
--- a/input/lsr/aligning-and-centering-instrument-names.ly
+++ b/input/lsr/aligning-and-centering-instrument-names.ly
@@ -1,55 +1,56 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.51"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
- texidoc = "
-Instrument names are generally printed at the left side of the staves.
-To align the names of several different intruments, you can put them in
-a \\markup block and use one of the following possibilites:
 
+  texidoc = "
+Instrument names are generally printed to the left of the staves. To
+align the names of several different intruments, put them in a
+@code{\\markup} block and use one of the following possibilites:
 
 * 
-    Right-aligned instrument names: this is LilyPond's default behavior
+    Right-aligned instrument names: this is the default behavior
   
 * 
-    Center-aligned instrument names: with the \\hcenter-in #n syntax, you
-    can place the instrument names inside a padded box (n being the width
-    of the box)
+    Center-aligned instrument names: using the @code{\\hcenter-in #n}
+command
+    places the instrument names inside a padded box, with @code{n} being
+the width
+    of the box
   
 * 
-    Left-aligned instrument names: you have to print the names on top of an
-    empty box, using the \\combine command
-    with a \\hspace #n object.
+    Left-aligned instrument names: the names are printed on top of an
+    empty box, using the @code{\\combine} command
+    with an @code{\\hspace #n} object.
   
 
-" }
-% begin verbatim
-\paper{ 
-  indent = #0 
+
+"
+  doctitle = "Aligning and centering instrument names"
+} % begin verbatim
+\paper {
+  indent = #0
   left-margin = #30
   line-width = #160
 }
 
-\new StaffGroup \relative
-<<
+\new StaffGroup \relative c' <<
   \new Staff {
-    \set Staff.instrumentName = "blabla"
-    c1^"default" c1 \break 
-    \set Staff.instrumentName = \markup { \hcenter-in #10 "blabla" }
-    c1^"centered" c1 \break 
-    \set Staff.instrumentName = \markup {\combine \hspace #8 "blabla" }
-    c1^"left-aligned" c1 
-    
+    \set Staff.instrumentName = #"Piccolo"
+    c1^"default" | c \break
+    \set Staff.instrumentName = \markup { \hcenter-in #10 Piccolo }
+    c1^"centered" | c \break
+    \set Staff.instrumentName = \markup { \combine \hspace #8 Piccolo }
+    c1^"left-aligned" | c
   } 
   \new Staff {
-    \set Staff.instrumentName = "blo"
-    c1 c1 \break 
-    \set Staff.instrumentName = \markup { \hcenter-in #10 "blo" }
-    c1 c1 \break 
-    \set Staff.instrumentName = \markup {\combine \hspace #8 "blo" }
-    c1 c1 
-  } 
-  
+    \set Staff.instrumentName = #"Flute"
+    c1 | c \break
+    \set Staff.instrumentName = \markup { \hcenter-in #10 Flute }
+    c1 | c \break
+    \set Staff.instrumentName = \markup { \combine \hspace #8 Flute }
+    c1 | c
+  }
 >>