Merge master into nested-bookparts

[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 7db41e52f54a53e1b106a3e29adbda967d23bac5..021acafacc77edd692d6db99baa96cce62bbeb1b 100644 (file)
--- a/input/lsr/aligning-and-centering-instrument-names.ly
+++ b/input/lsr/aligning-and-centering-instrument-names.ly
@@ -1,14 +1,12 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.62"
 
 \header {
-  lsrtags = "text, paper-and-layout, titles"
-
   texidoces = "
 Los nombres de instrumento se imprimen generalmente a la izquierda de
 los pentagramas.  Para alinear los nombres de varios instrumentos
-distintos, sitúelos dentro de un bloque @code{\markup} y utilice una
+distintos, sitúelos dentro de un bloque @code{\\markup} y utilice una
 de las siguientes posiblidades:
 
 *
@@ -17,64 +15,68 @@ de las siguientes posiblidades:
   
 *
     Nombres de instrumento centrados: la utilización de la instrucción
-    @code{\hcenter-in #n} sitúa los nombres de instrumento dentro de
+    @code{\\hcenter-in #n} sitúa los nombres de instrumento dentro de
     un rectángulo separado, donde @code{n} es la anchura del
     rectángulo
   
 * 
     Nombres de instrumento alineados por la izquierda: los nombres se
     imprimen en la parte superior de un rectángulo vacío, utilizando
-    la instrucción @code{\combine} con un objeto @code{\hspace #n}.
+    la instrucción @code{\\combine} con un objeto @code{\\hspace #n}.
 
 "
   doctitlees = "Alinear y centrar los nombres de instrumento"
 
-  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 the default behavior
-  
-* 
-    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: the names are printed on top of an
-    empty box, using the @code{\\combine} command
-    with an @code{\\hspace #n} object.
-  
-
-
-"
+  lsrtags = "text, paper-and-layout, titles"
+  texidoc = "The horizontal alignment of instrument names is tweaked
+by changing the @code{Staff.InstrumentName #'self-alignment-X} property.
+The @code{\\layout} variables @code{indent} and @code{short-indent}
+define the space in which the instrument names are aligned before the
+first and the following systems, respectively."
   doctitle = "Aligning and centering instrument names"
 } % begin verbatim
+
 \paper {
-  indent = #0
-  left-margin = #30
-  line-width = #160
+  left-margin = 3\cm
 }
 
-\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
-  } 
-  \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
+\score {
+  \new StaffGroup <<
+    \new Staff {
+      \override Staff.InstrumentName #'self-alignment-X = #LEFT
+      \set Staff.instrumentName = \markup \left-column {
+        "Left aligned"
+        "instrument name"
+      }
+      \set Staff.shortInstrumentName = #"Left"
+      c''1
+      \break
+      c''1
+    }
+    \new Staff {
+      \override Staff.InstrumentName #'self-alignment-X = #CENTER
+      \set Staff.instrumentName = \markup \center-column {
+        Centered
+        "instrument name"
+      }
+      \set Staff.shortInstrumentName = #"Centered"
+      g'1
+      g'1
+    }
+    \new Staff {
+      \override Staff.InstrumentName #'self-alignment-X = #RIGHT
+      \set Staff.instrumentName = \markup \right-column {
+        "Right aligned"
+        "instrument name"
+      }
+      \set Staff.shortInstrumentName = #"Right"
+      e'1
+      e'1
+    }
+  >>
+  \layout {
+    ragged-right = ##t
+    indent = 4\cm
+    short-indent = 2\cm
   }
->>
+}