5085: Web-GSoC: Update MusicXML project description

[lilypond.git] / Documentation / snippets / combining-two-parts-on-the-same-staff.ly

diff --git a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
index dfc29f9c6048747239b2b950f4bb3d7fd64e76e0..e869f243e75e157ba830157729e0cb146bbf5db8 100644 (file)
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -1,62 +1,24 @@
-%% 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.13.1"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.19.56
+\version "2.19.56"
 
 \header {
-  lsrtags = "simultaneous-notes, text"
-
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-La herramienta de combinación de partes ( instrucción
-@code{\\partcombine}) permite la combinación de varias partes
-diferentes sobre el mismo pentagrama.  Las indicaciones textuales
-tales como \"solo\" o \"a2\" se añaden de forma predeterminada;
-para quitarlas, sencillamente establezca la propiedad
-@code{printPartCombineTexts} al valor \"falso\".  Para partituras
-vocales (como himnos), no hay necesidad de añadir los textos
-\"solo\" o \"a2\", por lo que se deben desactivar.  Sin embargo,
-podría ser mejor no usarlo si hay solos, porque éstos no se
-indicarán.  En tales casos podría ser preferible la notación
-polifónica estándar.
-
-Este fragmento de código presenta las tres formas en que se pueden
-imprimir dos partes sobre un solo pentagrama: polifonía estándar,
-@code{\\partcombine} sin textos, y @code{\\partcombine} con
-textos.
-
-"
-  doctitlees = "Combinar dos partes sobre el mismo pentagrama"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Funktion, die Stimmen kombiniert (also der @code{\\partcombine}-Befehl)
-ermöglicht die Kombination unterschiedlicher Stimmen auf einem
-System.  Textanweisungen wie \"solo\" or \"a2\" werden automatisch
-hinzugefügt.  Wenn man sie entfernen will, muss man die Eigenschaft
-@code{printPartCombineTexts} auf flasch setzen.  Für Klavierauszüge
-muss natürlich kein \"solo\"/\"a2\" usw. hinzugefügt werdne, man
-sollte sie also ausschalten.  Wenn aber Solo-Stellen in einem
-Klavierauszug oder einer Chorpartitur angezeigt werden, ist es besser,
-normale Polyphonie zu verwenden, weil so die Solostellen angezeigt
-werden, auch wenn der Text des Stimmenkombinierers ausgeschaltet ist.
-
-Der Schnipsel zeigt drei Möglichkeiten, Stimmen auf einem System zu
-kombinieren: Standardpolyphonie, @code{\\partcombine} ohne Text und
-@code{\\partcombine} mit Text.
-
-"
-  doctitlede = "Zwei Stimmen auf einem System kombinieren"
+  lsrtags = "simultaneous-notes, syntax-and-expressions, text"
 
   texidoc = "
 The part combiner tool ( @code{\\partcombine} command ) allows the
 combination of several different parts on the same staff.  Text
-directions such as \"solo\" or \"a2\" are added by default; to remove
-them, simply set the property @code{printPartCombineTexts} to
-\"false\". For vocal scores (hymns), there is no need to add
-\"solo\"/\"a2\" texts, so they should be switched off.  However, it
-might be better not to use it if there are any solos, as they won't be
-indicated.  In such cases, standard polyphonic notation may be
-preferable.
+directions such as @qq{solo} or @qq{a2} are added by default; to remove
+them, simply set the property @code{printPartCombineTexts} to @code{f}.
+For vocal scores (hymns), there is no need to add @qq{solo/a2} texts,
+so they should be switched off.  However, it might be better not to use
+it if there are any solos, as they won't be indicated.  In such cases,
+standard polyphonic notation may be preferable.
 
 This snippet presents the three ways two parts can be printed on a same
 staff: standard polyphony, @code{\\partcombine} without texts, and
@@ -69,12 +31,15 @@ staff: standard polyphony, @code{\\partcombine} without texts, and
   doctitle = "Combining two parts on the same staff"
 } % begin verbatim
 
+%% Combining pedal notes with clef changes
+
 musicUp = \relative c'' {
   \time 4/4
   a4 c4.( g8) a4 |
   g4 e' g,( a8 b) |
   c b a2.
-}
+} % begin verbatim
+
 
 musicDown = \relative c'' {
   g4 e4.( d8) c4 |
@@ -83,28 +48,26 @@ musicDown = \relative c'' {
 }
 
 \score {
-  <<
     <<
-    \new Staff {
-      \set Staff.instrumentName = "Standard polyphony  "
+    \new Staff \with { instrumentName = #"Standard polyphony" }
+
       << \musicUp \\ \musicDown >>
+
+    \new Staff \with {
+      instrumentName = #"PartCombine without text"
+      printPartCombineTexts = ##f
     }
-    \new Staff \with { printPartCombineTexts = ##f } {
-      \set Staff.instrumentName = "PartCombine without texts  "
-      \partcombine \musicUp \musicDown
-    }
-    \new Staff {
-      \set Staff.instrumentName = "PartCombine with texts  "
+
+    \partcombine \musicUp \musicDown
+
+    \new Staff \with { instrumentName = #"PartCombine with text" }
       \partcombine \musicUp \musicDown
-    }
     >>
-  >>
   \layout {
     indent = 6.0\cm
     \context {
       \Score
-      \override SystemStartBar #'collapse-height = #30
+      \override SystemStartBar.collapse-height = #30
     }
   }
 }
-