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 586103c4a0de81a63b92d5e352ac6f3d9b1ee9f8..021acafacc77edd692d6db99baa96cce62bbeb1b 100644 (file)
--- a/input/lsr/aligning-and-centering-instrument-names.ly
+++ b/input/lsr/aligning-and-centering-instrument-names.ly
@@ -1,55 +1,82 @@
-%% 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.38"
+\version "2.11.62"
 
 \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:
-
+  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
+de las siguientes posiblidades:
 
-* 
-    Right-aligned instrument names: this is LilyPond's default behavior
+*
+    Nombres de instrumento alineados por la derecha: es el
+    comportamiento predeterminado
   
-* 
-    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)
+*
+    Nombres de instrumento centrados: la utilización de la instrucción
+    @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
   
 * 
-    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.
-  
+    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}.
 
-" }
-% begin verbatim
-\paper{ 
-  indent = #0 
-  left-margin = #30
-  line-width = #160
+"
+  doctitlees = "Alinear y centrar los nombres de instrumento"
+
+  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 {
+  left-margin = 3\cm
 }
 
-\new StaffGroup \relative
-<<
-  \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 
-    
-  } 
-  \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 
-  } 
-  
->>
+\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
+  }
+}