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 86e931e16e656817a9e6e38511c14b3e853fae77..041d14a2be70bb9e5511da721558e44bd9ce2afb 100644 (file)
--- a/input/lsr/aligning-and-centering-instrument-names.ly
+++ b/input/lsr/aligning-and-centering-instrument-names.ly
@@ -1,27 +1,27 @@
 %% 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.48"
+\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 @code{\\markup} block and use one of the following possibilites:
+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 the default behavior
   
 * 
-    Center-aligned instrument names: with the @code{\\hcenter-in #n}
-command, you
-    can place the instrument names inside a padded box (@code{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
+    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.
   
@@ -36,21 +36,21 @@ width
   line-width = #160
 }
 
-\new StaffGroup \relative <<
+\new StaffGroup \relative c' <<
   \new Staff {
-    \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
+    \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 = "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
+    \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
   }
 >>