]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...
authorTill Paala <till.rettig@gmx.de>
Sat, 22 Nov 2008 19:55:33 +0000 (21:55 +0200)
committerTill Paala <till.rettig@gmx.de>
Sat, 22 Nov 2008 19:55:33 +0000 (21:55 +0200)
60 files changed:
Documentation/TRANSLATION
Documentation/de/translations.html.in
Documentation/es/translations.html.in
Documentation/es/user/tweaks.itely
Documentation/fr/translations.html.in
Documentation/po/de.po
Documentation/po/es.po
Documentation/po/fr.po
Documentation/po/lilypond-doc.pot
Documentation/translations.html.in
Documentation/user/lilypond-book.itely
Documentation/user/repeats.itely
Documentation/user/spacing.itely
Documentation/user/staff.itely
Documentation/user/tweaks.itely
Documentation/user/vocal.itely
buildscripts/buildlib.py
buildscripts/check_translation.py
buildscripts/html-gettext.py
buildscripts/translations-status.py
input/lsr/book-parts.ly
input/new/book-parts.ly
input/regression/musicxml/12b-Tuplets-Finale.xml
input/regression/musicxml/12c-Tuplet-Styles.xml
input/regression/musicxml/12d-Tremolo-Tuplets.xml
input/regression/musicxml/12e-Nested-Tuplets.xml
input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml [new file with mode: 0644]
input/regression/musicxml/16a-TransposingInstruments.xml
input/regression/musicxml/16b-TransposingInstruments-Full.xml
input/regression/property-nested-override.ly [new file with mode: 0644]
input/regression/repeat-percent-kerning.ly [new file with mode: 0644]
lily/accidental-engraver.cc
lily/bar-line.cc
lily/dot-configuration.cc
lily/duration-scheme.cc
lily/include/moment.hh
lily/include/percent-repeat-item.hh
lily/lily-guile.cc
lily/moment-scheme.cc
lily/moment.cc
lily/multi-measure-rest.cc
lily/percent-repeat-item.cc
lily/scale.cc
lily/stencil-scheme.cc
python/convertrules.py
python/musicexp.py
python/musicxml.py
scm/define-grob-interfaces.scm
scm/define-grob-properties.scm
scm/define-grobs.scm
scm/document-backend.scm
scm/font.scm
scm/framework-ps.scm
scm/ly-syntax-constructors.scm
scm/memory-trace.scm
scm/output-ps.scm
scripts/abc2ly.py
scripts/etf2ly.py
scripts/lilypond-invoke-editor.scm
scripts/musicxml2ly.py

index f775d7f8cdccf89f2b43e37730f5095d16e3c716..73fbb9fa1684f49f3720dc52c846378b43b5f661 100644 (file)
@@ -139,15 +139,15 @@ Word counts (excluding lilypond snippets) are given for each file.
 672   user/lilypond.tely
 91    user/notation.itely -- Musical notation
 3083  user/pitches.itely
-5148  user/rhythms.itely
+5005  user/rhythms.itely
 1110  user/expressive.itely
-556   user/repeats.itely
+555   user/repeats.itely
 1452  user/simultaneous.itely
-1603  user/staff.itely
+1633  user/staff.itely
 902   user/editorial.itely
 2443  user/text.itely
 76    user/specialist.itely -- Specialist notation
-2679  user/vocal.itely
+2678  user/vocal.itely
 1326  user/chords.itely
 702   user/piano.itely
 810   user/percussion.itely
@@ -155,19 +155,19 @@ Word counts (excluding lilypond snippets) are given for each file.
 66    user/strings.itely
 242   user/bagpipes.itely
 4240  user/ancient.itely
-5689  user/input.itely -- Input syntax
+5803  user/input.itely -- Input syntax
 2164  user/non-music.itely -- Non-musical notation
-8297  user/spacing.itely -- Spacing issues
-11296 user/changing-defaults.itely -- Changing defaults
+8444  user/spacing.itely -- Spacing issues
+11291 user/changing-defaults.itely -- Changing defaults
 5202  user/programming-interface.itely -- Interfaces for programmers
 1155  user/notation-appendices.itely -- Notation manual tables
 250   user/cheatsheet.itely -- Cheat sheet
-62080 total
+62221 total
 
 -5- Application usage
-3194  user/lilypond-book.itely -- LilyPond-book
+3202  user/lilypond-book.itely -- LilyPond-book
 1171  user/converters.itely -- Converting from other formats
-4365  total
+4373  total
 
 -6- Appendices whose translation is optional
 310   user/literature.itely
index 5df57e856c35ff9fca87fe73e95b92d2d5c95b52..31c0225a81474c9278297b5b54ad24f5ba5831da 100644 (file)
@@ -1,4 +1,4 @@
-·<p><i>Zuletzt aktualisiert am·Tue Nov 18 23:32:19 UTC 2008
+·<p><i>Zuletzt aktualisiert am·Sat Nov 22 19:18:39 UTC 2008
 </i></p>
 <html>
 <!-- This page is automatically generated by translation-status.py from
@@ -177,11 +177,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book}: Noten in den Text integrieren<br>(3194)</td>
+  <td>4 @command{lilypond-book}: Noten in den Text integrieren<br>(3202)</td>
   <td>Reinhold Kainhofer</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #33ff21">teilweise</span></td>
+  <td><span style="background-color: #39ff22">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -228,7 +228,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.2 Rhythmus<br>(5148)</td>
+  <td>1.2 Rhythmus<br>(5005)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
@@ -244,11 +244,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.4 Wiederholungszeichen<br>(556)</td>
+  <td>1.4 Wiederholungszeichen<br>(555)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #2cff20">teilweise</span></td>
+  <td><span style="background-color: #33ff21">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -260,11 +260,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.6 Notation auf Systemen<br>(1603)</td>
+  <td>1.6 Notation auf Systemen<br>(1633)</td>
   <td>Till Rettig</td>
   <td></td>
   <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #ff6f57">teilweise</span></td>
+  <td><span style="background-color: #47ff24">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
@@ -292,7 +292,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>2.1 Notation von Gesang<br>(2679)</td>
+  <td>2.1 Notation von Gesang<br>(2678)</td>
   <td></td>
   <td></td>
   <td><span style="background-color: #d0f0f8">nein</span></td>
@@ -364,23 +364,23 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>3 Allgemeine Eingabe und Ausgabe<br>(5689)</td>
+  <td>3 Allgemeine Eingabe und Ausgabe<br>(5803)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (6 %)</span></td>
+  <td><span style="background-color: #dfef77">teilweise (5 %)</span></td>
   <td><span style="background-color: #ff8353">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 Abstände<br>(8297)</td>
+  <td>4 Abstände<br>(8444)</td>
   <td>Till Rettig</td>
   <td></td>
-  <td><span style="background-color: #dfef77">teilweise (14 %)</span></td>
-  <td><span style="background-color: #f6fe3b">teilweise</span></td>
+  <td><span style="background-color: #dfef77">teilweise (3 %)</span></td>
+  <td><span style="background-color: #fff73e">teilweise</span></td>
   <td>vor-GDP</td>
  </tr>
  <tr align="left">
-  <td>5 Standardeinstellungen verändern<br>(11296)</td>
+  <td>5 Standardeinstellungen verändern<br>(11291)</td>
   <td></td>
   <td></td>
   <td><span style="background-color: #d0f0f8">nein</span></td>
index 3835e88c294e240ac63a9ffd6a3f8621be33527d..a53dc8ecf040352b5c69dd688112ce1272bd8bfd 100644 (file)
@@ -1,4 +1,4 @@
- <p><i>Actualizado en Tue Nov 18 23:32:19 UTC 2008
+ <p><i>Actualizado en Sat Nov 22 19:18:39 UTC 2008
 </i></p>
 <html>
 <!-- This page is automatically generated by translation-status.py from
@@ -169,11 +169,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book}: integrar texto y música<br>(3194)</td>
+  <td>4 @command{lilypond-book}: integrar texto y música<br>(3202)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #25fe1f">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
@@ -220,7 +220,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.2 Duraciones<br>(5148)</td>
+  <td>1.2 Duraciones<br>(5005)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
@@ -236,7 +236,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.4 Repeticiones<br>(556)</td>
+  <td>1.4 Repeticiones<br>(555)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
@@ -252,11 +252,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>post-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.6 Notación de los pentagramas<br>(1603)</td>
+  <td>1.6 Notación de los pentagramas<br>(1633)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #33ff21">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
@@ -284,7 +284,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>2.1 Música vocal<br>(2679)</td>
+  <td>2.1 Música vocal<br>(2678)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
@@ -356,7 +356,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>3 Entrada y salida generales<br>(5689)</td>
+  <td>3 Entrada y salida generales<br>(5803)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
@@ -364,15 +364,15 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 Problemas de espaciado<br>(8297)</td>
+  <td>4 Problemas de espaciado<br>(8444)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
-  <td><span style="background-color: #1fff1f">sí</span></td>
+  <td><span style="background-color: #33ff21">parcialmente</span></td>
   <td>pre-GDP</td>
  </tr>
  <tr align="left">
-  <td>5 Cambiar los valores por omisión<br>(11296)</td>
+  <td>5 Cambiar los valores por omisión<br>(11291)</td>
   <td>Francisco Vila</td>
   <td></td>
   <td><span style="background-color: #1fff1f">sí</span></td>
index 0e4e536af69dec3906648a6ef3b59ca8f3a60742..636e19a64069d5b082e6b5c3530ac4bf392bb010 100644 (file)
@@ -3389,7 +3389,7 @@ lhMusic = \relative c' {
     >>
   >>
 }
-        @end lilypond
+@end lilypond
 
 
 @node Further tweaking
index f1a87e9ea567117b4a2bd0a5631011fc553a203d..eced6e130e24c80c6a1da0dd115cd461a19c7194 100644 (file)
@@ -1,4 +1,4 @@
- <p><i>Dernière mise à jour Tue Nov 18 23:32:19 UTC 2008
+ <p><i>Dernière mise à jour Sat Nov 22 19:18:39 UTC 2008
 </i></p>
 <html>
 <!-- This page is automatically generated by translation-status.py from
@@ -182,7 +182,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book} : association musique-texte<br>(3194)</td>
+  <td>4 @command{lilypond-book} : association musique-texte<br>(3202)</td>
   <td></td>
   <td></td>
   <td><span style="background-color: #d0f0f8">non</span></td>
@@ -236,7 +236,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.2 Rythme<br>(5148)</td>
+  <td>1.2 Rythme<br>(5005)</td>
   <td>Frédéric Chiasson</td>
   <td>Valentin Villenave<br>
    Jean-Charles Malahieude</td>
@@ -254,7 +254,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.4 Répétitions et reprises<br>(556)</td>
+  <td>1.4 Répétitions et reprises<br>(555)</td>
   <td>Valentin Villenave</td>
   <td>Jean-Charles Malahieude<br>
    John Mandereau</td>
@@ -273,11 +273,11 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>1.6 Notation sur la portée<br>(1603)</td>
+  <td>1.6 Notation sur la portée<br>(1633)</td>
   <td>Valentin Villenave<br>
    Jean-Charles Malahieude</td>
   <td>John Mandereau</td>
-  <td><span style="background-color: #dfef77">partiellement (69 %)</span></td>
+  <td><span style="background-color: #dfef77">partiellement (70 %)</span></td>
   <td><span style="background-color: #ff6f57">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
@@ -308,7 +308,7 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>2.1 Musique vocale<br>(2679)</td>
+  <td>2.1 Musique vocale<br>(2678)</td>
   <td>Valentin Villenave</td>
   <td>Jean-Charles Malahieude</td>
   <td><span style="background-color: #dfef77">partiellement (56 %)</span></td>
@@ -387,25 +387,25 @@ translations.template.html.in; DO NOT EDIT !-->
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>3 Généralités en matière d'entrée et sortie<br>(5689)</td>
+  <td>3 Généralités en matière d'entrée et sortie<br>(5803)</td>
   <td>Jean-Charles Malahieude<br>
    Valentin Villenave</td>
   <td></td>
-  <td><span style="background-color: #dfef77">partiellement (6 %)</span></td>
+  <td><span style="background-color: #dfef77">partiellement (5 %)</span></td>
   <td><span style="background-color: #ff8353">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>4 Gestion de l'espace<br>(8297)</td>
+  <td>4 Gestion de l'espace<br>(8444)</td>
   <td>Frédéric Chiasson<br>
    Jean-Charles Malahieude</td>
   <td></td>
   <td><span style="background-color: #dfef77">partiellement (19 %)</span></td>
-  <td><span style="background-color: #f6fe3b">partiellement</span></td>
+  <td><span style="background-color: #fff73e">partiellement</span></td>
   <td>pré-GDP</td>
  </tr>
  <tr align="left">
-  <td>5 Modification des réglages prédéfinis<br>(11296)</td>
+  <td>5 Modification des réglages prédéfinis<br>(11291)</td>
   <td>Valentin Villenave</td>
   <td>Gilles Thibault</td>
   <td><span style="background-color: #dfef77">partiellement (33 %)</span></td>
index 7fdef5fad84f39b68c5575d5d05f1346021a396c..a558476fda34431ed08a8e35204b62a6b038f296 100644 (file)
@@ -2,13 +2,13 @@
 # Copyright (C) 2006 Han-Wen Nienhuys, Jan Nieuwenhuizen
 # This file is distributed under the same license as the lilypond package.
 # Till Rettig <till.rettig@gmx.de>, 2007,2008
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 17:44+0100\n"
+"POT-Creation-Date: 2008-11-22 20:22+0100\n"
 "PO-Revision-Date: 2008-11-10 20:02+0200\n"
 "Last-Translator: Till Rettig <till.rettig@gmx.de>\n"
 "Language-Team: de\n"
@@ -1253,6 +1253,7 @@ msgstr "Notensysteme gruppieren"
 #. @rglos in Documentation/es/user/tutorial.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tutorial.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "brace"
 msgstr "Klammer"
 
@@ -1510,7 +1511,7 @@ msgstr "unten"
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
-#. input/lsr/guitar-strum-rhythms.ly:48 (context id)
+#. input/lsr/guitar-strum-rhythms.ly:56 (context id)
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
@@ -1533,7 +1534,7 @@ msgid "text"
 msgstr "Text"
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:535 (context id)
+#. Documentation/user/staff.itely:518 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1668,7 +1669,7 @@ msgstr "eins"
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3268 (variable)
+#. Documentation/user/tweaks.itely:3468 (variable)
 #. Documentation/user/simultaneous.itely:783 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
@@ -1722,37 +1723,37 @@ msgid "SopMusic"
 msgstr "SoprNoten"
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3270 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "AltoMusic"
 msgstr "AltNoten"
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3271 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "TenorMusic"
 msgstr "TenorNoten"
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3272 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "BassMusic"
 msgstr "BassNoten"
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3273 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "VerseOne"
 msgstr "StropheEins"
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3274 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseTwo"
 msgstr "StropheZwei"
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3275 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseThree"
 msgstr "StropheDrei"
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3276 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseFour"
 msgstr "StropheVier"
 
@@ -1762,22 +1763,22 @@ msgid "Sop"
 msgstr "Top"
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3283 (context id)
-#. Documentation/user/input.itely:915 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:946 (context id)
 #, fuzzy
 msgid "Alto"
 msgstr "AltOn"
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3291 (context id)
-#. Documentation/user/input.itely:917 (context id)
+#. Documentation/user/tweaks.itely:3491 (context id)
+#. Documentation/user/input.itely:948 (context id)
 #, fuzzy
 msgid "Tenor"
 msgstr "TenorNoten"
 
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3292 (context id)
-#. Documentation/user/input.itely:922 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 #, fuzzy
 msgid "Bass"
@@ -1936,7 +1937,7 @@ msgstr "zur Standardgröße zurückgehen"
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:907 (variable)
+#. Documentation/user/input.itely:938 (variable)
 msgid "sopranoMusic"
 msgstr "SopranNoten"
 
@@ -1953,7 +1954,7 @@ msgid "sopranoWords"
 msgstr "SopranText"
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:908 (variable)
+#. Documentation/user/input.itely:939 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1968,7 +1969,7 @@ msgid "altoWords"
 msgstr "AltText"
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:909 (variable)
+#. Documentation/user/input.itely:940 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1983,7 +1984,7 @@ msgid "tenorWords"
 msgstr "TenorText"
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:910 (variable)
+#. Documentation/user/input.itely:941 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2155,17 +2156,18 @@ msgstr "Musikalische Ausdrücke ineinander verschachteln"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:564 (context id)
-#. Documentation/user/staff.itely:577 (context id)
-#. Documentation/user/staff.itely:585 (context id)
-#. Documentation/user/staff.itely:604 (context id)
-#. Documentation/user/staff.itely:617 (context id)
+#. Documentation/user/staff.itely:547 (context id)
+#. Documentation/user/staff.itely:560 (context id)
+#. Documentation/user/staff.itely:568 (context id)
+#. Documentation/user/staff.itely:587 (context id)
+#. Documentation/user/staff.itely:600 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tweaks.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ossia"
 msgstr "Ossia"
 
@@ -2393,224 +2395,224 @@ msgstr "Vierstimmige SATB-Partitur"
 msgid "Building a score from scratch"
 msgstr "Eine Partitur von Grund auf erstellen"
 
-#. Documentation/user/tweaks.itely:564 (comment)
-#. Documentation/user/tweaks.itely:690 (comment)
+#. Documentation/user/tweaks.itely:595 (comment)
+#. Documentation/user/tweaks.itely:730 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr "Dicke aller folgenden Bögen von 1.2 zu 5.0 vergrößern"
 
-#. Documentation/user/tweaks.itely:630 (comment)
-#. Documentation/user/tweaks.itely:666 (comment)
-#. Documentation/user/tweaks.itely:669 (comment)
+#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:703 (comment)
+#. Documentation/user/tweaks.itely:706 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr "Nur die Dicke des direkt folgenden Bogens vergrößern"
 
-#. Documentation/user/tweaks.itely:694 (comment)
+#. Documentation/user/tweaks.itely:734 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr "Die Dicke aller folgenden Bögen zurücksezten auf 1.2"
 
-#. Documentation/user/tweaks.itely:1302 (comment)
+#. Documentation/user/tweaks.itely:1394 (comment)
 msgid "Don't print clefs in this staff"
 msgstr "Keine Schlüssel in diesem System"
 
-#. Documentation/user/tweaks.itely:1304 (comment)
+#. Documentation/user/tweaks.itely:1396 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "Keine Taktangabe in diesem System"
 
-#. Documentation/user/tweaks.itely:1362 (comment)
+#. Documentation/user/tweaks.itely:1460 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr "Alle Schriftgrößen um ~24% verkleinern"
 
-#. Documentation/user/tweaks.itely:1418 (comment)
+#. Documentation/user/tweaks.itely:1526 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr "Die Halslänge und Linienabstand anpassen"
 
-#. Documentation/user/tweaks.itely:1828 (comment)
-#. Documentation/user/tweaks.itely:1895 (comment)
+#. Documentation/user/tweaks.itely:1956 (comment)
+#. Documentation/user/tweaks.itely:2026 (comment)
 msgid "Set details for later Text Spanner"
 msgstr "Details für späteren Text-Spanner setzen"
 
-#. Documentation/user/tweaks.itely:1831 (comment)
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2029 (comment)
 msgid "Place dynamics above staff"
 msgstr "Dynamik-Zeichen über System setzen"
 
-#. Documentation/user/tweaks.itely:1833 (comment)
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1961 (comment)
+#. Documentation/user/tweaks.itely:2033 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Beginn der Oktavierungsklammer"
 
-#. Documentation/user/tweaks.itely:1836 (comment)
-#. Documentation/user/tweaks.itely:1843 (comment)
-#. Documentation/user/tweaks.itely:1905 (comment)
-#. Documentation/user/tweaks.itely:1912 (comment)
+#. Documentation/user/tweaks.itely:1964 (comment)
+#. Documentation/user/tweaks.itely:1971 (comment)
+#. Documentation/user/tweaks.itely:2036 (comment)
+#. Documentation/user/tweaks.itely:2043 (comment)
 msgid "Add Dynamic Text"
 msgstr "Dynamik-Text hinzufügen"
 
-#. Documentation/user/tweaks.itely:1838 (comment)
-#. Documentation/user/tweaks.itely:1907 (comment)
+#. Documentation/user/tweaks.itely:1966 (comment)
+#. Documentation/user/tweaks.itely:2038 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr "Dynamic Line Spanner hinzufügen"
 
-#. Documentation/user/tweaks.itely:1840 (comment)
-#. Documentation/user/tweaks.itely:1909 (comment)
+#. Documentation/user/tweaks.itely:1968 (comment)
+#. Documentation/user/tweaks.itely:2040 (comment)
 msgid "Add Text Script"
 msgstr "Textbeschriftung hinzufügen"
 
-#. Documentation/user/tweaks.itely:1845 (comment)
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1973 (comment)
+#. Documentation/user/tweaks.itely:2045 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Ende der Oktavierungsklammer"
 
-#. Documentation/user/tweaks.itely:1900 (comment)
+#. Documentation/user/tweaks.itely:2031 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr "Nächste Ottava-Klammer unter Text-Spanner setzen"
 
-#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2093 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr "Noten spreizen um dem Text Platz zu machen"
 
-#. Documentation/user/tweaks.itely:1979 (comment)
+#. Documentation/user/tweaks.itely:2116 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr "Dieser Text ist kurz genug um ohne Kollision zu passen"
 
-#. Documentation/user/tweaks.itely:1983 (comment)
+#. Documentation/user/tweaks.itely:2120 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr "Dieser ist zu lang, darum wird der nach oben verschoben"
 
-#. Documentation/user/tweaks.itely:1987 (comment)
-#. Documentation/user/tweaks.itely:1992 (comment)
+#. Documentation/user/tweaks.itely:2124 (comment)
+#. Documentation/user/tweaks.itely:2129 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Abschalten der automatischen Vermeidung von Zusammenstößen"
 
-#. Documentation/user/tweaks.itely:1994 (comment)
+#. Documentation/user/tweaks.itely:2131 (comment)
 msgid "and turn on textLengthOn"
 msgstr "und Textlänge berücksichtigen"
 
-#. Documentation/user/tweaks.itely:1995 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "Spaces at end are honored"
 msgstr "Leerzeichen am Ende werden beachtet"
 
-#. Documentation/user/tweaks.itely:2096 (comment)
+#. Documentation/user/tweaks.itely:2239 (comment)
 msgid "Extend width by 1 staff space"
 msgstr "Breite um einen Linienabstand vergrößern"
 
-#. Documentation/user/tweaks.itely:2373 (comment)
+#. Documentation/user/tweaks.itely:2522 (comment)
 msgid "This will not work, see below:"
 msgstr "Das funktioniert nicht, siehe unten"
 
-#. Documentation/user/tweaks.itely:2377 (comment)
+#. Documentation/user/tweaks.itely:2526 (comment)
 msgid "This works:"
 msgstr "Das funktioniert:"
 
-#. Documentation/user/tweaks.itely:2422 (variable)
+#. Documentation/user/tweaks.itely:2577 (variable)
 msgid "naturalplusflat"
 msgstr "AuflösungB"
 
-#. Documentation/user/tweaks.itely:2458 (comment)
+#. Documentation/user/tweaks.itely:2618 (comment)
 msgid "Extend width by 1 unit"
 msgstr "Breite um eine Einheit vergrößern"
 
-#. Documentation/user/tweaks.itely:2460 (comment)
+#. Documentation/user/tweaks.itely:2620 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 "Dynamik-Zeichen an einer Linie ausrichten, die 2 Einheiten über dem System "
 "ist"
 
-#. Documentation/user/tweaks.itely:2745 (variable)
-#. Documentation/user/tweaks.itely:2794 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2925 (variable)
-#. Documentation/user/tweaks.itely:2987 (variable)
-#. Documentation/user/tweaks.itely:3042 (variable)
+#. Documentation/user/tweaks.itely:2924 (variable)
+#. Documentation/user/tweaks.itely:2973 (variable)
+#. Documentation/user/tweaks.itely:3034 (variable)
+#. Documentation/user/tweaks.itely:3104 (variable)
+#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3229 (variable)
 msgid "rhMusic"
 msgstr "rhNoten"
 
-#. Documentation/user/tweaks.itely:2750 (comment)
-#. Documentation/user/tweaks.itely:2799 (comment)
-#. Documentation/user/tweaks.itely:2862 (comment)
-#. Documentation/user/tweaks.itely:2934 (comment)
-#. Documentation/user/tweaks.itely:2996 (comment)
+#. Documentation/user/tweaks.itely:2929 (comment)
+#. Documentation/user/tweaks.itely:2978 (comment)
+#. Documentation/user/tweaks.itely:3041 (comment)
+#. Documentation/user/tweaks.itely:3113 (comment)
+#. Documentation/user/tweaks.itely:3178 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr "Beginn des polyphonen Abschnitts mit vier Stimmen"
 
-#. Documentation/user/tweaks.itely:2763 (variable)
-#. Documentation/user/tweaks.itely:2812 (variable)
-#. Documentation/user/tweaks.itely:2875 (variable)
-#. Documentation/user/tweaks.itely:2949 (variable)
-#. Documentation/user/tweaks.itely:3013 (variable)
-#. Documentation/user/tweaks.itely:3070 (variable)
+#. Documentation/user/tweaks.itely:2942 (variable)
+#. Documentation/user/tweaks.itely:2991 (variable)
+#. Documentation/user/tweaks.itely:3054 (variable)
+#. Documentation/user/tweaks.itely:3128 (variable)
+#. Documentation/user/tweaks.itely:3195 (variable)
+#. Documentation/user/tweaks.itely:3257 (variable)
 msgid "lhMusic"
 msgstr "lhNoten"
 
-#. Documentation/user/tweaks.itely:2772 (context id)
-#. Documentation/user/tweaks.itely:2821 (context id)
-#. Documentation/user/tweaks.itely:2884 (context id)
-#. Documentation/user/tweaks.itely:2958 (context id)
-#. Documentation/user/tweaks.itely:3022 (context id)
-#. Documentation/user/tweaks.itely:3079 (context id)
-#. Documentation/user/input.itely:928 (context id)
+#. Documentation/user/tweaks.itely:2951 (context id)
+#. Documentation/user/tweaks.itely:3000 (context id)
+#. Documentation/user/tweaks.itely:3063 (context id)
+#. Documentation/user/tweaks.itely:3137 (context id)
+#. Documentation/user/tweaks.itely:3204 (context id)
+#. Documentation/user/tweaks.itely:3266 (context id)
+#. Documentation/user/input.itely:959 (context id)
 msgid "RH"
 msgstr "RH"
 
-#. Documentation/user/tweaks.itely:2776 (context id)
-#. Documentation/user/tweaks.itely:2825 (context id)
-#. Documentation/user/tweaks.itely:2888 (context id)
-#. Documentation/user/tweaks.itely:2962 (context id)
-#. Documentation/user/tweaks.itely:3026 (context id)
-#. Documentation/user/tweaks.itely:3083 (context id)
-#. Documentation/user/input.itely:934 (context id)
+#. Documentation/user/tweaks.itely:2955 (context id)
+#. Documentation/user/tweaks.itely:3004 (context id)
+#. Documentation/user/tweaks.itely:3067 (context id)
+#. Documentation/user/tweaks.itely:3141 (context id)
+#. Documentation/user/tweaks.itely:3208 (context id)
+#. Documentation/user/tweaks.itely:3270 (context id)
+#. Documentation/user/input.itely:965 (context id)
 msgid "LH"
 msgstr "LH"
 
-#. Documentation/user/tweaks.itely:3000 (comment)
-#. Documentation/user/tweaks.itely:3057 (comment)
+#. Documentation/user/tweaks.itely:3182 (comment)
+#. Documentation/user/tweaks.itely:3244 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 "Verschiebe das c2 aus der Hauptnotenkolumne, damit Verschmelzung funktioniert"
 
-#. Documentation/user/tweaks.itely:3003 (comment)
-#. Documentation/user/tweaks.itely:3060 (comment)
+#. Documentation/user/tweaks.itely:3185 (comment)
+#. Documentation/user/tweaks.itely:3247 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr "Hals vom d2 muss nach unten, damit Verschmelzung gelingt"
 
-#. Documentation/user/tweaks.itely:3055 (comment)
+#. Documentation/user/tweaks.itely:3242 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr "c2 neu positionieren rechts von der verschmolzenen Note"
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3204 (comment)
+#. Documentation/user/tweaks.itely:3378 (comment)
+#. Documentation/user/tweaks.itely:3400 (comment)
 msgid "Visible tempo marking"
 msgstr "Sichtbare Tempo-Bezeichnung"
 
-#. Documentation/user/tweaks.itely:3189 (comment)
-#. Documentation/user/tweaks.itely:3208 (comment)
+#. Documentation/user/tweaks.itely:3382 (comment)
+#. Documentation/user/tweaks.itely:3404 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr "Unsichtbare Tempo-Bezeichnung um Fermate im MIDI zu verlängern"
 
-#. Documentation/user/tweaks.itely:3192 (comment)
-#. Documentation/user/tweaks.itely:3211 (comment)
+#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3407 (comment)
 msgid "New tempo for next section"
 msgstr "Neues Tempo im nächsten Abschnitt"
 
-#. Documentation/user/tweaks.itely:3259 (variable)
+#. Documentation/user/tweaks.itely:3459 (variable)
 msgid "emphasize"
 msgstr "emphasize"
 
-#. Documentation/user/tweaks.itely:3263 (variable)
+#. Documentation/user/tweaks.itely:3463 (variable)
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3269 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
 msgid "SopranoMusic"
 msgstr "SopranNoten"
 
-#. Documentation/user/tweaks.itely:3282 (context id)
-#. Documentation/user/input.itely:913 (context id)
+#. Documentation/user/tweaks.itely:3482 (context id)
+#. Documentation/user/input.itely:944 (context id)
 #, fuzzy
 msgid "Soprano"
 msgstr "SopranNoten"
 
-#. Documentation/user/tweaks.itely:3487 (comment)
+#. Documentation/user/tweaks.itely:3691 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr "Anordngen um Farbe von der color-notehead-Prozedur zu erhalten"
 
@@ -4179,16 +4181,16 @@ msgid "Musical notation"
 msgstr "Musikalische Notation"
 
 #. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:997 (variable)
-#. Documentation/user/input.itely:1016 (variable)
-#. Documentation/user/input.itely:1053 (variable)
-#. Documentation/user/input.itely:1068 (variable)
+#. Documentation/user/input.itely:1028 (variable)
+#. Documentation/user/input.itely:1047 (variable)
+#. Documentation/user/input.itely:1084 (variable)
+#. Documentation/user/input.itely:1099 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
 #. input/lsr/string-quartet-template-with-separate-parts.ly:98 (variable)
 #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:136 (variable)
-#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:35 (variable)
+#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:50 (variable)
 msgid "music"
 msgstr "Noten"
 
@@ -4197,7 +4199,7 @@ msgid "not strictly necessary, but a good reminder"
 msgstr "nicht unbdingt nötig, aber gut zu erinnern"
 
 #. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1100 (variable)
+#. Documentation/user/staff.itely:1084 (variable)
 msgid "clarinet"
 msgstr "Klarinette"
 
@@ -4602,64 +4604,50 @@ msgstr "Das macht es nicth rückgängig"
 msgid "this will"
 msgstr "Das schon"
 
-#. Documentation/user/rhythms.itely:1689 (comment)
-#, fuzzy
-msgid "Set default beaming for all staves"
-msgstr "für diese Taktart keine autom. Balken definiert"
-
-#. Documentation/user/rhythms.itely:1697 (comment)
-msgid "Modify beaming for just this staff"
-msgstr "Balken nur für dieses System verändern"
-
-#. Documentation/user/rhythms.itely:1703 (comment)
-#, fuzzy
-msgid "Inherit beaming from Score context"
-msgstr "Partitur-Kontext beenden"
-
-#. Documentation/user/rhythms.itely:1827 (comment)
+#. Documentation/user/rhythms.itely:1802 (comment)
 msgid "revert to non-feathered beams"
 msgstr "in nichtgespreizte Balken zurückverwandeln"
 
-#. Documentation/user/rhythms.itely:2050 (comment)
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2025 (comment)
+#. Documentation/user/rhythms.itely:2041 (comment)
 msgid "Permit first bar number to be printed"
 msgstr "Erste Taktnummer soll auch gesetzt werden"
 
-#. Documentation/user/rhythms.itely:2067 (comment)
-#. Documentation/user/rhythms.itely:2115 (comment)
+#. Documentation/user/rhythms.itely:2042 (comment)
+#. Documentation/user/rhythms.itely:2090 (comment)
 msgid "Print a bar number every second measure"
 msgstr "Jeden zweiten Takt eine Taktnummer setzen"
 
-#. Documentation/user/rhythms.itely:2083 (comment)
+#. Documentation/user/rhythms.itely:2058 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr "Taktnummern am Zeilenende verbieten und woanders erlauben"
 
-#. Documentation/user/rhythms.itely:2087 (comment)
-#. Documentation/user/rhythms.itely:2113 (comment)
+#. Documentation/user/rhythms.itely:2062 (comment)
+#. Documentation/user/rhythms.itely:2088 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr "Taktnummer um Faktor zwei vergrößern"
 
-#. Documentation/user/rhythms.itely:2091 (comment)
+#. Documentation/user/rhythms.itely:2066 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr "Einen Kasten um die folgenden Taktnummern zeichnen"
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2071 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr "Einen Kreis um die folgenden Taktnummern zeichnen"
 
-#. Documentation/user/rhythms.itely:2118 (comment)
+#. Documentation/user/rhythms.itely:2093 (comment)
 msgid "Center-align bar numbers"
 msgstr "Taktnummern zentrieren"
 
-#. Documentation/user/rhythms.itely:2121 (comment)
+#. Documentation/user/rhythms.itely:2096 (comment)
 msgid "Right-align bar numbers"
 msgstr "Taktnummern rechtsbündig"
 
-#. Documentation/user/rhythms.itely:2224 (variable)
+#. Documentation/user/rhythms.itely:2199 (variable)
 msgid "pipeSymbol"
 msgstr "pipeSymbol"
 
-#. Documentation/user/rhythms.itely:2612 (variable)
+#. Documentation/user/rhythms.itely:2587 (variable)
 msgid "MyCadenza"
 msgstr "MeineKadenz"
 
@@ -5231,7 +5219,7 @@ msgstr "Triller"
 msgid "trill"
 msgstr "Triller"
 
-#. Documentation/user/repeats.itely:298 (variable)
+#. Documentation/user/repeats.itely:299 (variable)
 #. input/lsr/volta-text-markup-using-repeatcommands.ly:21 (variable)
 msgid "voltaAdLib"
 msgstr "VoltaAdLib"
@@ -5497,24 +5485,24 @@ msgstr "Stimme"
 msgid "Writing music in parallel"
 msgstr "Musik parallel notieren"
 
-#. Documentation/user/staff.itely:1069 (variable)
-#. Documentation/user/staff.itely:1084 (variable)
-#. Documentation/user/staff.itely:1238 (variable)
+#. Documentation/user/staff.itely:1053 (variable)
+#. Documentation/user/staff.itely:1068 (variable)
+#. Documentation/user/staff.itely:1222 (variable)
 msgid "flute"
 msgstr "Flöte"
 
-#. Documentation/user/staff.itely:1189 (variable)
-#. Documentation/user/staff.itely:1210 (variable)
+#. Documentation/user/staff.itely:1173 (variable)
+#. Documentation/user/staff.itely:1194 (variable)
 msgid "oboe"
 msgstr "Oboe"
 
-#. Documentation/user/staff.itely:1259 (variable)
-#. Documentation/user/staff.itely:1275 (context id)
+#. Documentation/user/staff.itely:1243 (variable)
+#. Documentation/user/staff.itely:1259 (context id)
 msgid "piccolo"
 msgstr "Piccolo"
 
-#. Documentation/user/staff.itely:1267 (variable)
-#. Documentation/user/staff.itely:1276 (context id)
+#. Documentation/user/staff.itely:1251 (variable)
+#. Documentation/user/staff.itely:1260 (context id)
 msgid "cbassoon"
 msgstr "Ktrfgt"
 
@@ -5546,16 +5534,20 @@ msgstr "Systeme anzeigen lassen"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Instantiating new staves"
 msgstr "Neue Notensysteme erstellen"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staff"
 msgstr "System"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staves"
 msgstr "Systeme"
 
@@ -5572,11 +5564,13 @@ msgstr "Systeme gruppieren"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "bracket"
 msgstr "Klammer"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "grand staff"
 msgstr "Akkolade"
 
@@ -5586,6 +5580,8 @@ msgstr "Akkolade"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Nested staff groups"
 msgstr "Verschachtelte Notensysteme"
 
@@ -5595,6 +5591,8 @@ msgstr "Verschachtelte Notensysteme"
 #. @subsection in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @subsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @subsection in Documentation/de/user/staff.itely
 msgid "Modifying single staves"
 msgstr "Einzelne Systeme verändern"
 
@@ -5611,11 +5609,13 @@ msgstr "Das Notensystem"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "line"
 msgstr "Linie"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ledger line"
 msgstr "Hilfslinie"
 
@@ -5625,11 +5625,14 @@ msgstr "Hilfslinie"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Ossia staves"
 msgstr "Ossia-Systeme"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "Frenched staff"
 msgstr "Verkleinerte Systeme"
 
@@ -5668,21 +5671,25 @@ msgstr "Metronomangabe"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome"
 msgstr "Metronomangabe"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronomic indication"
 msgstr "Metronombezeichnung"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "tempo indication"
 msgstr "Tempobezeichnung"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome mark"
 msgstr "Metronombezeichnung"
 
@@ -6009,6 +6016,8 @@ msgstr "Schriftarten"
 #. @unnumberedsubsubsec in Documentation/user/text.itely
 #. @node in Documentation/es/user/text.itely
 #. @unnumberedsubsubsec in Documentation/es/user/text.itely
+#. @node in Documentation/de/user/text.itely
+#. @unnumberedsubsubsec in Documentation/de/user/text.itely
 msgid "Fonts explained"
 msgstr "Was sind Schriftarten"
 
@@ -6042,7 +6051,8 @@ msgid "Specialist notation"
 msgstr "Spezielle Notation"
 
 #. Documentation/user/vocal.itely:509 (comment)
-msgid "not recommended: left aligns syllables "
+#, fuzzy
+msgid "not recommended: left aligns syllables"
 msgstr "nicht empfohlen: Silben links ausrichten"
 
 #. Documentation/user/vocal.itely:512 (comment)
@@ -6086,7 +6096,8 @@ msgid "applies to \\\"fas\\\""
 msgstr "gehört zu \\\"fas\\\""
 
 #. Documentation/user/vocal.itely:1282 (comment)
-msgid "moves the column off the left margin; "
+#, fuzzy
+msgid "moves the column off the left margin;"
 msgstr "Kolumne vom linken Rand wegbewegen"
 
 #. Documentation/user/vocal.itely:1283 (comment)
@@ -6099,11 +6110,13 @@ msgid "adds vertical spacing between verses"
 msgstr "Vertikaler Abstand zwischen Strophen"
 
 #. Documentation/user/vocal.itely:1299 (comment)
-msgid "adds horizontal spacing between columns; "
+#, fuzzy
+msgid "adds horizontal spacing between columns;"
 msgstr "Vertikaler Abstand zwischen Strophen"
 
 #. Documentation/user/vocal.itely:1300 (comment)
-msgid "if they are still too close, add more \\\" \\\" pairs  "
+#, fuzzy
+msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr "Wenn sie immer noch zu eng sind, mehr \\\" \\\"-Paare hinzufügen"
 
 #. Documentation/user/vocal.itely:1301 (comment)
@@ -6111,7 +6124,8 @@ msgid "until the result looks good"
 msgstr "bis das Resultat gut aussieht"
 
 #. Documentation/user/vocal.itely:1317 (comment)
-msgid "gives some extra space on the right margin; "
+#, fuzzy
+msgid "gives some extra space on the right margin;"
 msgstr "zusätzlichen Platz für den rechten Rand"
 
 #. Documentation/user/vocal.itely:1318 (comment)
@@ -7642,11 +7656,11 @@ msgstr "Arabische Notenbeispiele"
 msgid "Further reading"
 msgstr "Weitere Literatur"
 
-#. Documentation/user/input.itely:494 (comment)
+#. Documentation/user/input.itely:525 (comment)
 msgid "not printed"
 msgstr "nicht gedruckt"
 
-#. Documentation/user/input.itely:911 (variable)
+#. Documentation/user/input.itely:942 (variable)
 msgid "allLyrics"
 msgstr "alleText"
 
@@ -7985,43 +7999,43 @@ msgstr "Verschidene Instrumente angleichen (ii)"
 msgid "Percussion in MIDI"
 msgstr "Schlagzeug in MIDI"
 
-#. Documentation/user/spacing.itely:872 (comment)
+#. Documentation/user/spacing.itely:875 (comment)
 msgid "this does nothing"
 msgstr "Das macht gar nichts"
 
-#. Documentation/user/spacing.itely:873 (comment)
+#. Documentation/user/spacing.itely:876 (comment)
 msgid "a break here would work"
 msgstr "ein Umbruch hier würde funktionieren"
 
-#. Documentation/user/spacing.itely:874 (comment)
+#. Documentation/user/spacing.itely:877 (comment)
 msgid "as does this break"
 msgstr "wie dieser Umbruch"
 
-#. Documentation/user/spacing.itely:886 (comment)
+#. Documentation/user/spacing.itely:889 (comment)
 msgid "now the break is allowed"
 msgstr "jetzt ist der Umbruch erlaubt"
 
-#. Documentation/user/spacing.itely:1719 (comment)
+#. Documentation/user/spacing.itely:1777 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr "jetzt ist der Text näher am System"
 
-#. Documentation/user/spacing.itely:1721 (comment)
+#. Documentation/user/spacing.itely:1779 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr "indem outside-staff-priority auf Nicht-Zahl gesetzt wird,"
 
-#. Documentation/user/spacing.itely:1722 (comment)
+#. Documentation/user/spacing.itely:1780 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr " werden vertikale Zusammenstöße vermieden"
 
-#. Documentation/user/spacing.itely:1725 (comment)
+#. Documentation/user/spacing.itely:1783 (comment)
 msgid "now they will collide"
 msgstr "jetzt kollidieren sie"
 
-#. Documentation/user/spacing.itely:1750 (comment)
+#. Documentation/user/spacing.itely:1808 (comment)
 msgid "the markup is too close to the following note"
 msgstr "Beschriftung zu nah an der folgenden Note"
 
-#. Documentation/user/spacing.itely:1753 (comment)
+#. Documentation/user/spacing.itely:1811 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr "Setzen von outside-staff-horizontal-padding hilft"
 
@@ -8073,6 +8087,8 @@ msgstr "Seitenformatierung"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Vertical dimensions"
 msgstr "Vertikale Dimensionen"
 
@@ -8080,6 +8096,8 @@ msgstr "Vertikale Dimensionen"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Horizontal dimensions"
 msgstr "Horizontale Dimensionen"
 
@@ -8087,6 +8105,8 @@ msgstr "Horizontale Dimensionen"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Other layout variables"
 msgstr "Weitere Layout-Variablen"
 
@@ -8374,87 +8394,87 @@ msgstr "Abstände anzeigen lassen"
 msgid "Changing spacing"
 msgstr "Abstände verändern"
 
-#. Documentation/user/changing-defaults.itely:2002 (comment)
+#. Documentation/user/changing-defaults.itely:1990 (comment)
 msgid "increase the length of the tie"
 msgstr "Länge des Bindebogens vergrößern"
 
-#. Documentation/user/changing-defaults.itely:2011 (comment)
+#. Documentation/user/changing-defaults.itely:1999 (comment)
 msgid "increase the length of the rest bar"
 msgstr "Länge des Pausentaktes vergrößern"
 
-#. Documentation/user/changing-defaults.itely:2019 (comment)
+#. Documentation/user/changing-defaults.itely:2007 (comment)
 msgid "increase the length of the hairpin"
 msgstr "Länge der Crescendo-Klammer vergrößern"
 
-#. Documentation/user/changing-defaults.itely:2047 (comment)
+#. Documentation/user/changing-defaults.itely:2035 (comment)
 msgid "default"
 msgstr "Standard"
 
-#. Documentation/user/changing-defaults.itely:2050 (comment)
-#. Documentation/user/changing-defaults.itely:2063 (comment)
+#. Documentation/user/changing-defaults.itely:2038 (comment)
+#. Documentation/user/changing-defaults.itely:2051 (comment)
 msgid "not effective alone"
 msgstr "allein keine Wirkung"
 
-#. Documentation/user/changing-defaults.itely:2054 (comment)
-#. Documentation/user/changing-defaults.itely:2067 (comment)
+#. Documentation/user/changing-defaults.itely:2042 (comment)
+#. Documentation/user/changing-defaults.itely:2055 (comment)
 msgid "effective only when both overrides are present"
 msgstr "gilt nur, wenn beide \"override\" vorhanden sind"
 
-#. Documentation/user/changing-defaults.itely:2444 (comment)
+#. Documentation/user/changing-defaults.itely:2432 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr "Taktlinie am Ende der Zeile entfernen"
 
-#. Documentation/user/changing-defaults.itely:2490 (comment)
+#. Documentation/user/changing-defaults.itely:2478 (comment)
 msgid "Try to remove all key signatures"
 msgstr "Versuche alle Tonarten zu entfernen"
 
-#. Documentation/user/changing-defaults.itely:2909 (comment)
+#. Documentation/user/changing-defaults.itely:2897 (comment)
 msgid "move horizontally left"
 msgstr "horizontal nach links verschieben"
 
-#. Documentation/user/changing-defaults.itely:2911 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "move vertically up"
 msgstr "vertikal hochschieben"
 
-#. Documentation/user/changing-defaults.itely:2912 (comment)
+#. Documentation/user/changing-defaults.itely:2900 (comment)
 msgid "third finger"
 msgstr "dritter Finger"
 
-#. Documentation/user/changing-defaults.itely:2958 (comment)
+#. Documentation/user/changing-defaults.itely:2946 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr "RehearsalMark zentrieren über dem Schlüssel"
 
-#. Documentation/user/changing-defaults.itely:2964 (comment)
+#. Documentation/user/changing-defaults.itely:2952 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr "RehearsalMark zentrieren über der Taktart (TimeSignature)"
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2966 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr "RehearsalMark zentrieren über der Tonart (KeySignature)"
 
-#. Documentation/user/changing-defaults.itely:2985 (comment)
-#. Documentation/user/changing-defaults.itely:3001 (comment)
-#. Documentation/user/changing-defaults.itely:3008 (comment)
+#. Documentation/user/changing-defaults.itely:2973 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "RehearsalMark mit der linken Ecke von KeySignature ausrichten"
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
+#. Documentation/user/changing-defaults.itely:2978 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "RehearsalMark mit der rechten Ecke von KeySignature ausrichten"
 
-#. Documentation/user/changing-defaults.itely:3002 (comment)
+#. Documentation/user/changing-defaults.itely:2990 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr "nach rechts um 3,5 Linienabstände verschieben"
 
-#. Documentation/user/changing-defaults.itely:3009 (comment)
+#. Documentation/user/changing-defaults.itely:2997 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr "nach links um 2 Linienabstände verschieben"
 
-#. Documentation/user/changing-defaults.itely:3058 (variable)
+#. Documentation/user/changing-defaults.itely:3046 (variable)
 msgid "XinO"
 msgstr "XinO"
 
@@ -9462,7 +9482,8 @@ msgid "Cheat sheet"
 msgstr "Befehlsübersicht"
 
 #. @top in Documentation/fr/user/lilypond-learning.tely
-msgid "GNU LilyPond --- manuel d'initiation"
+#, fuzzy
+msgid "GNU LilyPond --- Manuel d'initiation"
 msgstr "GNU LilyPond -- Das Handbuch zum Lernen"
 
 #. @subsubheading in Documentation/fr/user/macros.itexi
@@ -9516,7 +9537,8 @@ msgid "Updating old files"
 msgstr "Alte Dateien aktualisieren"
 
 #. @top in Documentation/fr/user/lilypond-program.tely
-msgid "GNU LilyPond --- utilisation des programmes"
+#, fuzzy
+msgid "GNU LilyPond --- Utilisation des programmes"
 msgstr "GNU LilyPond -- Die Programmbenutzung"
 
 #. @node in Documentation/fr/user/setup.itely
@@ -9532,8 +9554,9 @@ msgid "Updating with @command{convert-ly}"
 msgstr "Dateien mit @command{convert-ly} aktualisieren"
 
 #. @top in Documentation/fr/user/lilypond.tely
-msgid "GNU LilyPond --- manuel de notation"
-msgstr ""
+#, fuzzy
+msgid "GNU LilyPond --- Manuel de notation"
+msgstr "GNU LilyPond -- Das Handbuch zum Lernen"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
@@ -9798,11 +9821,6 @@ msgstr "GNU LilyPond -- Programmbenutzung"
 msgid "GNU LilyPond -- Das Notationsprogramm"
 msgstr "GNU LilyPond -- Das Notationsprogramm"
 
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr "Klammern am Systemanfang"
-
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @section in Documentation/de/user/changing-defaults.itely
 msgid "Common properties"
@@ -10403,10 +10421,57 @@ msgstr "Balken"
 msgid "Use the macro"
 msgstr "Makro benutzen"
 
-#. input/lsr/beam-grouping-in-7-8-time.ly:30 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+#, fuzzy
+msgid "Set default beaming for all staves"
+msgstr "für diese Taktart keine autom. Balken definiert"
+
+#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+msgid "Modify beaming for just this staff"
+msgstr "Balken nur für dieses System verändern"
+
+#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+#, fuzzy
+msgid "Inherit beaming from Score context"
+msgstr "Partitur-Kontext beenden"
+
+#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+#, fuzzy
+msgid "Modify beaming for this voice only"
+msgstr "Balken nur für dieses System verändern"
+
+#. input/lsr/beam-grouping-in-7-8-time.ly:40 (comment)
 msgid "rhythm 2-3-2"
 msgstr "Rhythmus 2-3-2"
 
+#. input/lsr/book-parts.ly:21 (comment)
+msgid "book paper, which is inherited by all children bookparts"
+msgstr ""
+
+#. input/lsr/book-parts.ly:24 (comment)
+msgid "Page footer: add a different part-tagline at part last page"
+msgstr ""
+
+#. input/lsr/book-parts.ly:28 (comment)
+msgid "Copyright header field only on book first page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:32 (comment)
+msgid "Part tagline header field only on each part last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:36 (comment)
+msgid "Tagline header field only on book last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:43 (comment)
+msgid "book header, which is inherited by the first bookpart"
+msgstr ""
+
+#. input/lsr/book-parts.ly:52 (comment)
+msgid "a different page breaking function may be used on each part"
+msgstr ""
+
 #. input/lsr/breathing-signs.ly:19 (comment)
 msgid "this bar contains no \\breathe"
 msgstr "Dieser Takt hat kein \\breathe"
@@ -10497,16 +10562,16 @@ msgstr ""
 msgid "}"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:24 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:35 (comment)
 msgid "Change time signature symbol but keep 3/4 beaming"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:25 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:36 (comment)
 #, fuzzy
 msgid "due to unchanged underlying time signature"
 msgstr "aufgrund von beatLength"
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:30 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:41 (comment)
 msgid "Lose 3/4 beaming now \\time has been changed"
 msgstr ""
 
@@ -10679,58 +10744,58 @@ msgstr ""
 msgid "label below string"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:22 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:40 (comment)
 msgid "add FretBoards for the Cuatro"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:23 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:41 (comment)
 msgid "Note: This section could be put into a separate file"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:24 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:42 (comment)
 #, fuzzy
 msgid "predefined-cuatro-fretboards.ly"
 msgstr "Vordefinierte Bund-Diagramme"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:25 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:43 (comment)
 msgid "and \\included into each of your compositions"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:27 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:45 (variable)
 msgid "cuatroTuning"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:29 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:47 (variable)
 msgid "dSix"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:30 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:48 (variable)
 #, fuzzy
 msgid "dMajor"
 msgstr "Dur"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:31 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:49 (variable)
 msgid "aMajSeven"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:32 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:50 (variable)
 msgid "dMajSeven"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:33 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (variable)
 #, fuzzy
 msgid "gMajor"
 msgstr "Dur"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:56 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable)
 msgid "primerosNames"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:60 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:78 (variable)
 msgid "primeros"
 msgstr ""
 
@@ -10739,7 +10804,7 @@ msgstr ""
 msgid "baseMelody"
 msgstr "Melodie"
 
-#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:39 (comment)
+#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:37 (comment)
 msgid "Must be lower than the actual number of staff lines"
 msgstr ""
 
@@ -10976,19 +11041,19 @@ msgstr ""
 msgid "Cut here ----- End 'flamenco.ly' "
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:58 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:109 (comment)
 msgid "Example 1"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:65 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:116 (comment)
 msgid "Example 2"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:72 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:123 (comment)
 msgid "Example 3"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:86 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:137 (comment)
 msgid "Example 4"
 msgstr ""
 
@@ -11021,46 +11086,44 @@ msgstr ""
 msgid "110% of default size"
 msgstr "zur Standardgröße zurückgehen"
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:26 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:33 (comment)
+msgid "this moves them up one staff space from the default position"
+msgstr ""
+
+#. input/lsr/grid-lines--changing-their-appearance.ly:51 (comment)
 msgid "set up grids"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:28 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:53 (comment)
 msgid "set the grid interval to one quarter note"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:35 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:59 (comment)
 msgid "this moves them to the right half a staff space"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:48 (comment)
-msgid "this moves them up one staff space from the default position"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:36 (comment)
+msgid "hides staff and notes so that only the grid lines are visible"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:27 (comment)
-msgid "sets of grid"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:43 (comment)
+msgid "dummy notes to force regular note spacing"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:33 (comment)
-#, fuzzy
-msgid "lines length"
-msgstr "Zeilenlänge"
-
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:48 (comment)
-msgid "centers grid lines  horizontally below noteheads"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:59 (comment)
+msgid "center grid lines horizontally below note heads"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:62 (comment)
-#, fuzzy
-msgid "making sure the lines will be placed outside the Staff"
-msgstr "jetzt ist der Text näher am System"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:66 (comment)
+msgid "set line length and positioning:"
+msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:65 (comment)
-msgid "hides staff and notes so that only the grid lines are visible"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:67 (comment)
+msgid "two staff spaces above center line on hidden staff"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:75 (comment)
-msgid "you have to put 'dummy' notes here to force regular grid spacing..."
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:68 (comment)
+msgid "to four spaces below center line on visible staff"
 msgstr ""
 
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
@@ -11527,7 +11590,7 @@ msgstr "normal"
 msgid "TAB"
 msgstr ""
 
-#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:37 (variable)
+#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:51 (variable)
 msgid "dashPlus"
 msgstr "dashPlus"
 
@@ -11548,15 +11611,15 @@ msgstr ""
 msgid "stick"
 msgstr "Noten"
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:38 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:39 (comment)
 msgid "Permit line breaks within tuplets"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:40 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:41 (comment)
 msgid "Allow beams to be broken at line breaks"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:47 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:48 (comment)
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
@@ -11578,35 +11641,35 @@ msgstr ""
 msgid "tab"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:30 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
 msgid "Multi-measure rests by default are set under the second line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:32 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
 msgid "They can be moved with an override"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:35 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:46 (comment)
 msgid "A value of 0 is the default position;"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:36 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:47 (comment)
 msgid "the following trick moves the rest to the center line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:39 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:50 (comment)
 msgid "Multi-measure rests in odd-numbered voices are under the top line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:52 (comment)
 msgid "Multi-measure rests in even-numbered voices are under the bottom line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:54 (comment)
 msgid "They remain separated even in empty measures"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:45 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:56 (comment)
 msgid "This brings them together even though there are two voices"
 msgstr ""
 
@@ -12289,11 +12352,11 @@ msgstr ""
 msgid "(This is the Cello part file)"
 msgstr ""
 
-#. input/lsr/sub-dividing-beams.ly:49 (comment)
+#. input/lsr/sub-dividing-beams.ly:50 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr "Balkenuntergruppenlänge als Achtel definieren"
 
-#. input/lsr/sub-dividing-beams.ly:53 (comment)
+#. input/lsr/sub-dividing-beams.ly:54 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr "Balkenuntergruppenlänge als Sechszehntel definieren"
 
@@ -12427,51 +12490,51 @@ msgstr ""
 msgid "Here we go back to the normal clef:"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:22 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:34 (comment)
 msgid "The default in 3/4 time is to beam in three groups"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:23 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
 msgid "each of a quarter note length"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:27 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:39 (comment)
 msgid "No auto-beaming is defined for 12/16"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:31 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
 msgid "Change time signature symbol, but retain underlying 3/4 beaming"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment)
 msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:36 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
 msgid "are not consistent with a measureLength of 3/4, so the beams"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:37 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
 msgid "are grouped at beatLength intervals"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:41 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:53 (comment)
 msgid "Specify beams in groups of (3 3 2 3) 1/16th notes"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:42 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:54 (comment)
 msgid "3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply,"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:55 (comment)
 msgid "and beams are grouped at beatLength (1/16) intervals"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:60 (comment)
 msgid "Specify beams in groups of (3 4 2 3) 1/16th notes"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:61 (comment)
 msgid "3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies"
 msgstr ""
 
@@ -12654,6 +12717,17 @@ msgstr "Fußnoten"
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
+#~ msgid "System start delimiters"
+#~ msgstr "Klammern am Systemanfang"
+
+#, fuzzy
+#~ msgid "lines length"
+#~ msgstr "Zeilenlänge"
+
+#, fuzzy
+#~ msgid "making sure the lines will be placed outside the Staff"
+#~ msgstr "jetzt ist der Text näher am System"
+
 #, fuzzy
 #~ msgid "auto beam on 1/4 note groups"
 #~ msgstr "autom. Balken für 1/4-Notengruppen\t"
index b1919de6bf9dd8518a46a14b553477f707ddaa85..fc364aa12898a6bd1555df5a34b8d68f4ac705d4 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 17:44+0100\n"
+"POT-Creation-Date: 2008-11-22 20:22+0100\n"
 "PO-Revision-Date: 2008-11-10 17:28+0100\n"
 "Last-Translator: Francisco Vila <francisco.vila@hispalinux.es>\n"
 "Language-Team: Español\n"
@@ -1256,6 +1256,7 @@ msgstr "Grupos de pentagramas"
 #. @rglos in Documentation/es/user/tutorial.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tutorial.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "brace"
 msgstr "llave"
 
@@ -1510,7 +1511,7 @@ msgstr "inferior"
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
-#. input/lsr/guitar-strum-rhythms.ly:48 (context id)
+#. input/lsr/guitar-strum-rhythms.ly:56 (context id)
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
@@ -1533,7 +1534,7 @@ msgid "text"
 msgstr "texto"
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:535 (context id)
+#. Documentation/user/staff.itely:518 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1667,7 +1668,7 @@ msgstr "uno"
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3268 (variable)
+#. Documentation/user/tweaks.itely:3468 (variable)
 #. Documentation/user/simultaneous.itely:783 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
@@ -1719,37 +1720,37 @@ msgid "SopMusic"
 msgstr "MusicaSoprano"
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3270 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "AltoMusic"
 msgstr "MusicaAlto"
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3271 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "TenorMusic"
 msgstr "MusicaTenor"
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3272 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "BassMusic"
 msgstr "MusicaBajo"
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3273 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "VerseOne"
 msgstr "EstrofaUno"
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3274 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseTwo"
 msgstr "EstrofaDos"
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3275 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseThree"
 msgstr "EstrofaTres"
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3276 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseFour"
 msgstr "EstrofaCuatro"
 
@@ -1758,21 +1759,21 @@ msgid "Sop"
 msgstr "Soprano"
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3283 (context id)
-#. Documentation/user/input.itely:915 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:946 (context id)
 msgid "Alto"
 msgstr "Alto"
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3291 (context id)
-#. Documentation/user/input.itely:917 (context id)
+#. Documentation/user/tweaks.itely:3491 (context id)
+#. Documentation/user/input.itely:948 (context id)
 msgid "Tenor"
 msgstr "Tenor"
 
 # También Líneas divisorias. FVD
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3292 (context id)
-#. Documentation/user/input.itely:922 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 msgid "Bass"
 msgstr "Bajo"
@@ -1929,7 +1930,7 @@ msgstr "tamaño predeterminado"
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:907 (variable)
+#. Documentation/user/input.itely:938 (variable)
 msgid "sopranoMusic"
 msgstr "musicaSoprano"
 
@@ -1946,7 +1947,7 @@ msgid "sopranoWords"
 msgstr "letraSoprano"
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:908 (variable)
+#. Documentation/user/input.itely:939 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1961,7 +1962,7 @@ msgid "altoWords"
 msgstr "letraContralto"
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:909 (variable)
+#. Documentation/user/input.itely:940 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1976,7 +1977,7 @@ msgid "tenorWords"
 msgstr "letraTenor"
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:910 (variable)
+#. Documentation/user/input.itely:941 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2141,17 +2142,18 @@ msgstr "Anidado de expresiones musicales"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:564 (context id)
-#. Documentation/user/staff.itely:577 (context id)
-#. Documentation/user/staff.itely:585 (context id)
-#. Documentation/user/staff.itely:604 (context id)
-#. Documentation/user/staff.itely:617 (context id)
+#. Documentation/user/staff.itely:547 (context id)
+#. Documentation/user/staff.itely:560 (context id)
+#. Documentation/user/staff.itely:568 (context id)
+#. Documentation/user/staff.itely:587 (context id)
+#. Documentation/user/staff.itely:600 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tweaks.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ossia"
 msgstr "ossia"
 
@@ -2379,223 +2381,226 @@ msgstr "Partitura vocal a cuatro voces SATB"
 msgid "Building a score from scratch"
 msgstr "Crear una partitura partiendo de cero"
 
-#. Documentation/user/tweaks.itely:564 (comment)
-#. Documentation/user/tweaks.itely:690 (comment)
+#. Documentation/user/tweaks.itely:595 (comment)
+#. Documentation/user/tweaks.itely:730 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr "Aumentar el grosor de todas las ligaduras siguientes de 1.2 a 5.0"
 
-#. Documentation/user/tweaks.itely:630 (comment)
-#. Documentation/user/tweaks.itely:666 (comment)
-#. Documentation/user/tweaks.itely:669 (comment)
+#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:703 (comment)
+#. Documentation/user/tweaks.itely:706 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr "Aumentar solamente el grosor de la ligadura siguiente"
 
-#. Documentation/user/tweaks.itely:694 (comment)
+#. Documentation/user/tweaks.itely:734 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
-msgstr "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2"
+msgstr ""
+"Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2"
 
-#. Documentation/user/tweaks.itely:1302 (comment)
+#. Documentation/user/tweaks.itely:1394 (comment)
 msgid "Don't print clefs in this staff"
 msgstr "No imprimir la clave en este pentagrama"
 
-#. Documentation/user/tweaks.itely:1304 (comment)
+#. Documentation/user/tweaks.itely:1396 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "No imprimir el compás en este pentagrama"
 
-#. Documentation/user/tweaks.itely:1362 (comment)
+#. Documentation/user/tweaks.itely:1460 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr "Reducir el tamaño de la fuente en un 24% aprox."
 
-#. Documentation/user/tweaks.itely:1418 (comment)
+#. Documentation/user/tweaks.itely:1526 (comment)
 msgid "Reduce stem length and line spacing to match"
-msgstr "Reducir la longitud de la plica y el espaciado de la línea en coincidencia"
+msgstr ""
+"Reducir la longitud de la plica y el espaciado de la línea en coincidencia"
 
-#. Documentation/user/tweaks.itely:1828 (comment)
-#. Documentation/user/tweaks.itely:1895 (comment)
+#. Documentation/user/tweaks.itely:1956 (comment)
+#. Documentation/user/tweaks.itely:2026 (comment)
 msgid "Set details for later Text Spanner"
 msgstr "Establecer ajustes para el extensor de texto ulterior"
 
-#. Documentation/user/tweaks.itely:1831 (comment)
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2029 (comment)
 msgid "Place dynamics above staff"
 msgstr "Situar la dinámica por encima"
 
 # fuzzy. FVD
-#. Documentation/user/tweaks.itely:1833 (comment)
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1961 (comment)
+#. Documentation/user/tweaks.itely:2033 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Inicio del corchete de octava"
 
-#. Documentation/user/tweaks.itely:1836 (comment)
-#. Documentation/user/tweaks.itely:1843 (comment)
-#. Documentation/user/tweaks.itely:1905 (comment)
-#. Documentation/user/tweaks.itely:1912 (comment)
+#. Documentation/user/tweaks.itely:1964 (comment)
+#. Documentation/user/tweaks.itely:1971 (comment)
+#. Documentation/user/tweaks.itely:2036 (comment)
+#. Documentation/user/tweaks.itely:2043 (comment)
 msgid "Add Dynamic Text"
 msgstr "Añadir indicación dinámica textual"
 
-#. Documentation/user/tweaks.itely:1838 (comment)
-#. Documentation/user/tweaks.itely:1907 (comment)
+#. Documentation/user/tweaks.itely:1966 (comment)
+#. Documentation/user/tweaks.itely:2038 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr "Añadir indicación dinámica de extensión de línea"
 
-#. Documentation/user/tweaks.itely:1840 (comment)
-#. Documentation/user/tweaks.itely:1909 (comment)
+#. Documentation/user/tweaks.itely:1968 (comment)
+#. Documentation/user/tweaks.itely:2040 (comment)
 msgid "Add Text Script"
 msgstr "Guiones de texto"
 
-#. Documentation/user/tweaks.itely:1845 (comment)
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1973 (comment)
+#. Documentation/user/tweaks.itely:2045 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Detener el corchete de octava"
 
-#. Documentation/user/tweaks.itely:1900 (comment)
+#. Documentation/user/tweaks.itely:2031 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
-msgstr "Situar el corchete de octava ulterior por debajo de los extensores de texto"
+msgstr ""
+"Situar el corchete de octava ulterior por debajo de los extensores de texto"
 
-#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2093 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr "Ocasionar que las notas se espacíen para adecuarse al texto"
 
-#. Documentation/user/tweaks.itely:1979 (comment)
+#. Documentation/user/tweaks.itely:2116 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr "Este marcado es corto y cabe sin colisionar"
 
-#. Documentation/user/tweaks.itely:1983 (comment)
+#. Documentation/user/tweaks.itely:2120 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr "Este es muy largo y se desplaza hacia arriba"
 
-#. Documentation/user/tweaks.itely:1987 (comment)
-#. Documentation/user/tweaks.itely:1992 (comment)
+#. Documentation/user/tweaks.itely:2124 (comment)
+#. Documentation/user/tweaks.itely:2129 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Desactivar el detector de colisiones"
 
-#. Documentation/user/tweaks.itely:1994 (comment)
+#. Documentation/user/tweaks.itely:2131 (comment)
 msgid "and turn on textLengthOn"
 msgstr "y activar textLengthOn"
 
-#. Documentation/user/tweaks.itely:1995 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "Spaces at end are honored"
 msgstr "Los espacios al final se respetan"
 
-#. Documentation/user/tweaks.itely:2096 (comment)
+#. Documentation/user/tweaks.itely:2239 (comment)
 msgid "Extend width by 1 staff space"
 msgstr "Aumentar la anchura en un espacio de pentagrama"
 
-#. Documentation/user/tweaks.itely:2373 (comment)
+#. Documentation/user/tweaks.itely:2522 (comment)
 msgid "This will not work, see below:"
 msgstr "Esto no va a funcionar, véase más abajo:"
 
-#. Documentation/user/tweaks.itely:2377 (comment)
+#. Documentation/user/tweaks.itely:2526 (comment)
 msgid "This works:"
 msgstr "Esto sí funciona:"
 
-#. Documentation/user/tweaks.itely:2422 (variable)
+#. Documentation/user/tweaks.itely:2577 (variable)
 msgid "naturalplusflat"
 msgstr "becuadro_y_bemol"
 
-#. Documentation/user/tweaks.itely:2458 (comment)
+#. Documentation/user/tweaks.itely:2618 (comment)
 msgid "Extend width by 1 unit"
 msgstr "Aumentar la anchura en una unidad"
 
-#. Documentation/user/tweaks.itely:2460 (comment)
+#. Documentation/user/tweaks.itely:2620 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr "Alinear los matices a dos unidades por encima del pentagrama"
 
-#. Documentation/user/tweaks.itely:2745 (variable)
-#. Documentation/user/tweaks.itely:2794 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2925 (variable)
-#. Documentation/user/tweaks.itely:2987 (variable)
-#. Documentation/user/tweaks.itely:3042 (variable)
+#. Documentation/user/tweaks.itely:2924 (variable)
+#. Documentation/user/tweaks.itely:2973 (variable)
+#. Documentation/user/tweaks.itely:3034 (variable)
+#. Documentation/user/tweaks.itely:3104 (variable)
+#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3229 (variable)
 msgid "rhMusic"
 msgstr "Musica_m_der"
 
-#. Documentation/user/tweaks.itely:2750 (comment)
-#. Documentation/user/tweaks.itely:2799 (comment)
-#. Documentation/user/tweaks.itely:2862 (comment)
-#. Documentation/user/tweaks.itely:2934 (comment)
-#. Documentation/user/tweaks.itely:2996 (comment)
+#. Documentation/user/tweaks.itely:2929 (comment)
+#. Documentation/user/tweaks.itely:2978 (comment)
+#. Documentation/user/tweaks.itely:3041 (comment)
+#. Documentation/user/tweaks.itely:3113 (comment)
+#. Documentation/user/tweaks.itely:3178 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr "Inicio de la sección polifónica de cuatro voces"
 
-#. Documentation/user/tweaks.itely:2763 (variable)
-#. Documentation/user/tweaks.itely:2812 (variable)
-#. Documentation/user/tweaks.itely:2875 (variable)
-#. Documentation/user/tweaks.itely:2949 (variable)
-#. Documentation/user/tweaks.itely:3013 (variable)
-#. Documentation/user/tweaks.itely:3070 (variable)
+#. Documentation/user/tweaks.itely:2942 (variable)
+#. Documentation/user/tweaks.itely:2991 (variable)
+#. Documentation/user/tweaks.itely:3054 (variable)
+#. Documentation/user/tweaks.itely:3128 (variable)
+#. Documentation/user/tweaks.itely:3195 (variable)
+#. Documentation/user/tweaks.itely:3257 (variable)
 msgid "lhMusic"
 msgstr "Muslca_m_izq"
 
-#. Documentation/user/tweaks.itely:2772 (context id)
-#. Documentation/user/tweaks.itely:2821 (context id)
-#. Documentation/user/tweaks.itely:2884 (context id)
-#. Documentation/user/tweaks.itely:2958 (context id)
-#. Documentation/user/tweaks.itely:3022 (context id)
-#. Documentation/user/tweaks.itely:3079 (context id)
-#. Documentation/user/input.itely:928 (context id)
+#. Documentation/user/tweaks.itely:2951 (context id)
+#. Documentation/user/tweaks.itely:3000 (context id)
+#. Documentation/user/tweaks.itely:3063 (context id)
+#. Documentation/user/tweaks.itely:3137 (context id)
+#. Documentation/user/tweaks.itely:3204 (context id)
+#. Documentation/user/tweaks.itely:3266 (context id)
+#. Documentation/user/input.itely:959 (context id)
 msgid "RH"
 msgstr "MD"
 
-#. Documentation/user/tweaks.itely:2776 (context id)
-#. Documentation/user/tweaks.itely:2825 (context id)
-#. Documentation/user/tweaks.itely:2888 (context id)
-#. Documentation/user/tweaks.itely:2962 (context id)
-#. Documentation/user/tweaks.itely:3026 (context id)
-#. Documentation/user/tweaks.itely:3083 (context id)
-#. Documentation/user/input.itely:934 (context id)
+#. Documentation/user/tweaks.itely:2955 (context id)
+#. Documentation/user/tweaks.itely:3004 (context id)
+#. Documentation/user/tweaks.itely:3067 (context id)
+#. Documentation/user/tweaks.itely:3141 (context id)
+#. Documentation/user/tweaks.itely:3208 (context id)
+#. Documentation/user/tweaks.itely:3270 (context id)
+#. Documentation/user/input.itely:965 (context id)
 msgid "LH"
 msgstr "MI"
 
-#. Documentation/user/tweaks.itely:3000 (comment)
-#. Documentation/user/tweaks.itely:3057 (comment)
+#. Documentation/user/tweaks.itely:3182 (comment)
+#. Documentation/user/tweaks.itely:3244 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 "Sacar el Do blanca de la columna principal de notas para que la fusión "
 "funcione"
 
-#. Documentation/user/tweaks.itely:3003 (comment)
-#. Documentation/user/tweaks.itely:3060 (comment)
+#. Documentation/user/tweaks.itely:3185 (comment)
+#. Documentation/user/tweaks.itely:3247 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr "La plica del Re blanca debe estar hacia abajo para permitir la fusión"
 
-#. Documentation/user/tweaks.itely:3055 (comment)
+#. Documentation/user/tweaks.itely:3242 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr "Recolocar el Do blanca a la derecha de la nota fundida"
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3204 (comment)
+#. Documentation/user/tweaks.itely:3378 (comment)
+#. Documentation/user/tweaks.itely:3400 (comment)
 msgid "Visible tempo marking"
 msgstr "Indicación metronómica visible"
 
-#. Documentation/user/tweaks.itely:3189 (comment)
-#. Documentation/user/tweaks.itely:3208 (comment)
+#. Documentation/user/tweaks.itely:3382 (comment)
+#. Documentation/user/tweaks.itely:3404 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr "Indicación metronómica invisible para prolongar el calderón en el MIDI"
 
-#. Documentation/user/tweaks.itely:3192 (comment)
-#. Documentation/user/tweaks.itely:3211 (comment)
+#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3407 (comment)
 msgid "New tempo for next section"
 msgstr "Tempo nuevo para la sección siguiente"
 
-#. Documentation/user/tweaks.itely:3259 (variable)
+#. Documentation/user/tweaks.itely:3459 (variable)
 msgid "emphasize"
 msgstr "enfatizar"
 
-#. Documentation/user/tweaks.itely:3263 (variable)
+#. Documentation/user/tweaks.itely:3463 (variable)
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3269 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
 msgid "SopranoMusic"
 msgstr "musicaSoprano"
 
-#. Documentation/user/tweaks.itely:3282 (context id)
-#. Documentation/user/input.itely:913 (context id)
+#. Documentation/user/tweaks.itely:3482 (context id)
+#. Documentation/user/input.itely:944 (context id)
 msgid "Soprano"
 msgstr "Soprano"
 
-#. Documentation/user/tweaks.itely:3487 (comment)
+#. Documentation/user/tweaks.itely:3691 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr "Truco para obtener color a partir del procedimiento color-notehead"
 
@@ -2901,7 +2906,8 @@ msgstr "la propiedad padding (relleno)"
 #. @subheading in Documentation/es/user/tweaks.itely
 #. @subheading in Documentation/de/user/tweaks.itely
 msgid "left-padding and right-padding"
-msgstr "left-padding y right-padding (relleno por la izquierda y por la derecha)"
+msgstr ""
+"left-padding y right-padding (relleno por la izquierda y por la derecha)"
 
 #. @subheading in Documentation/user/tweaks.itely
 #. @subheading in Documentation/es/user/tweaks.itely
@@ -4162,16 +4168,16 @@ msgid "Musical notation"
 msgstr "Notación musical"
 
 #. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:997 (variable)
-#. Documentation/user/input.itely:1016 (variable)
-#. Documentation/user/input.itely:1053 (variable)
-#. Documentation/user/input.itely:1068 (variable)
+#. Documentation/user/input.itely:1028 (variable)
+#. Documentation/user/input.itely:1047 (variable)
+#. Documentation/user/input.itely:1084 (variable)
+#. Documentation/user/input.itely:1099 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
 #. input/lsr/string-quartet-template-with-separate-parts.ly:98 (variable)
 #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:136 (variable)
-#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:35 (variable)
+#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:50 (variable)
 msgid "music"
 msgstr "musica"
 
@@ -4180,7 +4186,7 @@ msgid "not strictly necessary, but a good reminder"
 msgstr "no es imprescindible pero es bueno recordarlo"
 
 #. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1100 (variable)
+#. Documentation/user/staff.itely:1084 (variable)
 msgid "clarinet"
 msgstr "clarinete"
 
@@ -4552,7 +4558,8 @@ msgstr "misDuraciones"
 
 #. Documentation/user/rhythms.itely:1585 (comment)
 msgid "end 1/16 beams for all time signatures at the 1/16 moment"
-msgstr "finalizar barras de semicorchea para todos los compases en el momento 1/16"
+msgstr ""
+"finalizar barras de semicorchea para todos los compases en el momento 1/16"
 
 #. Documentation/user/rhythms.itely:1589 (comment)
 msgid "end 1/32 beams for all time signatures at the 1/16 moment"
@@ -4590,62 +4597,51 @@ msgstr "¡esto no lo devuelve a su valor anterior!"
 msgid "this will"
 msgstr "esto sí"
 
-#. Documentation/user/rhythms.itely:1689 (comment)
-msgid "Set default beaming for all staves"
-msgstr "Establecer el barrado predeterminado para todos los pentagramas"
-
-#. Documentation/user/rhythms.itely:1697 (comment)
-msgid "Modify beaming for just this staff"
-msgstr "Modificar el barrado sólo para este pentagrama"
-
-#. Documentation/user/rhythms.itely:1703 (comment)
-msgid "Inherit beaming from Score context"
-msgstr "Heredar el barrado del contexto Score"
-
-#. Documentation/user/rhythms.itely:1827 (comment)
+#. Documentation/user/rhythms.itely:1802 (comment)
 msgid "revert to non-feathered beams"
 msgstr "volver a usar barras continuas"
 
-#. Documentation/user/rhythms.itely:2050 (comment)
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2025 (comment)
+#. Documentation/user/rhythms.itely:2041 (comment)
 msgid "Permit first bar number to be printed"
 msgstr "Habilitar la impresión del número del primer compás"
 
-#. Documentation/user/rhythms.itely:2067 (comment)
-#. Documentation/user/rhythms.itely:2115 (comment)
+#. Documentation/user/rhythms.itely:2042 (comment)
+#. Documentation/user/rhythms.itely:2090 (comment)
 msgid "Print a bar number every second measure"
 msgstr "Imprimir el número de compás cada dos compases"
 
-#. Documentation/user/rhythms.itely:2083 (comment)
+#. Documentation/user/rhythms.itely:2058 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
-msgstr "No poner números de compás al final de la línea, pero sí en otros lugares"
+msgstr ""
+"No poner números de compás al final de la línea, pero sí en otros lugares"
 
-#. Documentation/user/rhythms.itely:2087 (comment)
-#. Documentation/user/rhythms.itely:2113 (comment)
+#. Documentation/user/rhythms.itely:2062 (comment)
+#. Documentation/user/rhythms.itely:2088 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr "Aumentar en 2 el tamaño del número de compás"
 
-#. Documentation/user/rhythms.itely:2091 (comment)
+#. Documentation/user/rhythms.itely:2066 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr "Pintar una caja rodeando al siguiente(s) número de compás"
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2071 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr "Rodear con un círculo el siguiente(s) número de compás"
 
-#. Documentation/user/rhythms.itely:2118 (comment)
+#. Documentation/user/rhythms.itely:2093 (comment)
 msgid "Center-align bar numbers"
 msgstr "Alinear números de compás al centro"
 
-#. Documentation/user/rhythms.itely:2121 (comment)
+#. Documentation/user/rhythms.itely:2096 (comment)
 msgid "Right-align bar numbers"
 msgstr "Alinear números de compás a la derecha"
 
-#. Documentation/user/rhythms.itely:2224 (variable)
+#. Documentation/user/rhythms.itely:2199 (variable)
 msgid "pipeSymbol"
 msgstr "simboloTubo"
 
-#. Documentation/user/rhythms.itely:2612 (variable)
+#. Documentation/user/rhythms.itely:2587 (variable)
 msgid "MyCadenza"
 msgstr "miCadencia"
 
@@ -5221,7 +5217,7 @@ msgstr "Trinos"
 msgid "trill"
 msgstr "trino"
 
-#. Documentation/user/repeats.itely:298 (variable)
+#. Documentation/user/repeats.itely:299 (variable)
 #. input/lsr/volta-text-markup-using-repeatcommands.ly:21 (variable)
 msgid "voltaAdLib"
 msgstr "voltaAdLib"
@@ -5487,24 +5483,24 @@ msgstr "parte"
 msgid "Writing music in parallel"
 msgstr "Escribir música en paralelo"
 
-#. Documentation/user/staff.itely:1069 (variable)
-#. Documentation/user/staff.itely:1084 (variable)
-#. Documentation/user/staff.itely:1238 (variable)
+#. Documentation/user/staff.itely:1053 (variable)
+#. Documentation/user/staff.itely:1068 (variable)
+#. Documentation/user/staff.itely:1222 (variable)
 msgid "flute"
 msgstr "flauta"
 
-#. Documentation/user/staff.itely:1189 (variable)
-#. Documentation/user/staff.itely:1210 (variable)
+#. Documentation/user/staff.itely:1173 (variable)
+#. Documentation/user/staff.itely:1194 (variable)
 msgid "oboe"
 msgstr "oboe"
 
-#. Documentation/user/staff.itely:1259 (variable)
-#. Documentation/user/staff.itely:1275 (context id)
+#. Documentation/user/staff.itely:1243 (variable)
+#. Documentation/user/staff.itely:1259 (context id)
 msgid "piccolo"
 msgstr "flautin"
 
-#. Documentation/user/staff.itely:1267 (variable)
-#. Documentation/user/staff.itely:1276 (context id)
+#. Documentation/user/staff.itely:1251 (variable)
+#. Documentation/user/staff.itely:1260 (context id)
 msgid "cbassoon"
 msgstr "cfagot"
 
@@ -5536,16 +5532,20 @@ msgstr "Impresión de los pentagramas"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Instantiating new staves"
 msgstr "Crear instancias de pentagramas nuevos"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staff"
 msgstr "pantagrama"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staves"
 msgstr "pentagramas"
 
@@ -5562,11 +5562,13 @@ msgstr "Agrupar pentagramas"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "bracket"
 msgstr "llave o corchete"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "grand staff"
 msgstr "sistema de piano"
 
@@ -5576,6 +5578,8 @@ msgstr "sistema de piano"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Nested staff groups"
 msgstr "Grupos de pentagramas anidados"
 
@@ -5585,6 +5589,8 @@ msgstr "Grupos de pentagramas anidados"
 #. @subsection in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @subsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @subsection in Documentation/de/user/staff.itely
 msgid "Modifying single staves"
 msgstr "Modificación de pentagramas sueltos"
 
@@ -5601,11 +5607,13 @@ msgstr "El símbolo del pentagrama"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "line"
 msgstr "línea"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ledger line"
 msgstr "línea adicional"
 
@@ -5615,11 +5623,14 @@ msgstr "línea adicional"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Ossia staves"
 msgstr "Pentagramas de Ossia"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "Frenched staff"
 msgstr "Sistemas a la francesa"
 
@@ -5658,21 +5669,25 @@ msgstr "Indicaciones metronómicas"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome"
 msgstr "metrónomo"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronomic indication"
 msgstr "indicación metronómica"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "tempo indication"
 msgstr "indicación del tempo"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome mark"
 msgstr "indicación metronómica"
 
@@ -5715,7 +5730,8 @@ msgstr "Formateo de las notas de aviso"
 
 #. Documentation/user/editorial.itely:321 (comment)
 msgid "this is deliberate nonsense; note that the stems remain black"
-msgstr "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras"
+msgstr ""
+"esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras"
 
 #. @node in Documentation/user/editorial.itely
 #. @section in Documentation/user/editorial.itely
@@ -6001,6 +6017,8 @@ msgstr "Tipografías"
 #. @unnumberedsubsubsec in Documentation/user/text.itely
 #. @node in Documentation/es/user/text.itely
 #. @unnumberedsubsubsec in Documentation/es/user/text.itely
+#. @node in Documentation/de/user/text.itely
+#. @unnumberedsubsubsec in Documentation/de/user/text.itely
 msgid "Fonts explained"
 msgstr "Explicación de las fuentes tipográficas"
 
@@ -6034,7 +6052,8 @@ msgid "Specialist notation"
 msgstr "Notación especializada"
 
 #. Documentation/user/vocal.itely:509 (comment)
-msgid "not recommended: left aligns syllables "
+#, fuzzy
+msgid "not recommended: left aligns syllables"
 msgstr "no recomendado: alinea las sílabas a la izquierda "
 
 #. Documentation/user/vocal.itely:512 (comment)
@@ -6075,7 +6094,8 @@ msgid "applies to \\\"fas\\\""
 msgstr "se aplica al \\\"fas\\\""
 
 #. Documentation/user/vocal.itely:1282 (comment)
-msgid "moves the column off the left margin; "
+#, fuzzy
+msgid "moves the column off the left margin;"
 msgstr "aleja la columna del margen izquierdo; "
 
 #. Documentation/user/vocal.itely:1283 (comment)
@@ -6088,11 +6108,13 @@ msgid "adds vertical spacing between verses"
 msgstr "añade espaciado vertical entre estrofas"
 
 #. Documentation/user/vocal.itely:1299 (comment)
-msgid "adds horizontal spacing between columns; "
+#, fuzzy
+msgid "adds horizontal spacing between columns;"
 msgstr "añade espaciado horizontal entre columnas; "
 
 #. Documentation/user/vocal.itely:1300 (comment)
-msgid "if they are still too close, add more \\\" \\\" pairs  "
+#, fuzzy
+msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr "si aún están muy juntas, añada más parejas \\\" \\\"  "
 
 #. Documentation/user/vocal.itely:1301 (comment)
@@ -6100,7 +6122,8 @@ msgid "until the result looks good"
 msgstr "hasta que el resultado resulte adecuado"
 
 #. Documentation/user/vocal.itely:1317 (comment)
-msgid "gives some extra space on the right margin; "
+#, fuzzy
+msgid "gives some extra space on the right margin;"
 msgstr "aplica más separación en el margen derecho; "
 
 #. Documentation/user/vocal.itely:1318 (comment)
@@ -6913,7 +6936,8 @@ msgstr "También define las posiciones de las dos líneas."
 
 #. Documentation/user/percussion.itely:396 (comment)
 msgid "This is neccessary; if not entered, the barline would be too short!"
-msgstr "Esto es necesario; si no se pone, la línea divisoria sería demasiado corta."
+msgstr ""
+"Esto es necesario; si no se pone, la línea divisoria sería demasiado corta."
 
 #. Documentation/user/percussion.itely:403 (comment)
 msgid "with this you load your new drum style table"
@@ -7629,11 +7653,11 @@ msgstr "Ejemplo de música árabe"
 msgid "Further reading"
 msgstr "Lecturas adicionales"
 
-#. Documentation/user/input.itely:494 (comment)
+#. Documentation/user/input.itely:525 (comment)
 msgid "not printed"
 msgstr "no impreso"
 
-#. Documentation/user/input.itely:911 (variable)
+#. Documentation/user/input.itely:942 (variable)
 msgid "allLyrics"
 msgstr "letraCompleta"
 
@@ -7973,43 +7997,44 @@ msgstr "Balance entre instrumentos (i)"
 msgid "Percussion in MIDI"
 msgstr "Percusión en MIDI"
 
-#. Documentation/user/spacing.itely:872 (comment)
+#. Documentation/user/spacing.itely:875 (comment)
 msgid "this does nothing"
 msgstr "esto no hace nada"
 
-#. Documentation/user/spacing.itely:873 (comment)
+#. Documentation/user/spacing.itely:876 (comment)
 msgid "a break here would work"
 msgstr "un salto aquí funcionaría"
 
-#. Documentation/user/spacing.itely:874 (comment)
+#. Documentation/user/spacing.itely:877 (comment)
 msgid "as does this break"
 msgstr "como por ejemplo este salto"
 
-#. Documentation/user/spacing.itely:886 (comment)
+#. Documentation/user/spacing.itely:889 (comment)
 msgid "now the break is allowed"
 msgstr "ahora se permite el salto de línea"
 
-#. Documentation/user/spacing.itely:1719 (comment)
+#. Documentation/user/spacing.itely:1777 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr "esta vez el texto estará más cerca del pentagrama"
 
-#. Documentation/user/spacing.itely:1721 (comment)
+#. Documentation/user/spacing.itely:1779 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
-msgstr "ajustando el valor de outside-staff-priority a algo que no sea un número,"
+msgstr ""
+"ajustando el valor de outside-staff-priority a algo que no sea un número,"
 
-#. Documentation/user/spacing.itely:1722 (comment)
+#. Documentation/user/spacing.itely:1780 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr "desactivamos la evitación automática de colisiones"
 
-#. Documentation/user/spacing.itely:1725 (comment)
+#. Documentation/user/spacing.itely:1783 (comment)
 msgid "now they will collide"
 msgstr "ahora se producirá la colisión"
 
-#. Documentation/user/spacing.itely:1750 (comment)
+#. Documentation/user/spacing.itely:1808 (comment)
 msgid "the markup is too close to the following note"
 msgstr "el marcado está demasiado cerca de la nota siguiente"
 
-#. Documentation/user/spacing.itely:1753 (comment)
+#. Documentation/user/spacing.itely:1811 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr "ajustar outside-staff-horizontal-padding corrige esto"
 
@@ -8061,6 +8086,8 @@ msgstr "Formateo de las páginas"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Vertical dimensions"
 msgstr "Dimensiones verticales"
 
@@ -8068,6 +8095,8 @@ msgstr "Dimensiones verticales"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Horizontal dimensions"
 msgstr "Dimensiones horizontales"
 
@@ -8075,6 +8104,8 @@ msgstr "Dimensiones horizontales"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Other layout variables"
 msgstr "Otras variables de diseño de página"
 
@@ -8362,85 +8393,87 @@ msgstr "Mostrar el espaciado"
 msgid "Changing spacing"
 msgstr "Cambiar el espaciado"
 
-#. Documentation/user/changing-defaults.itely:2002 (comment)
+#. Documentation/user/changing-defaults.itely:1990 (comment)
 msgid "increase the length of the tie"
 msgstr "aumentar la longitud de la ligadura"
 
-#. Documentation/user/changing-defaults.itely:2011 (comment)
+#. Documentation/user/changing-defaults.itely:1999 (comment)
 msgid "increase the length of the rest bar"
 msgstr "aumentar la longitud del compás en silencio"
 
-#. Documentation/user/changing-defaults.itely:2019 (comment)
+#. Documentation/user/changing-defaults.itely:2007 (comment)
 msgid "increase the length of the hairpin"
 msgstr "aumentar la longitud del regulador"
 
-#. Documentation/user/changing-defaults.itely:2047 (comment)
+#. Documentation/user/changing-defaults.itely:2035 (comment)
 msgid "default"
 msgstr "predeterminado"
 
-#. Documentation/user/changing-defaults.itely:2050 (comment)
-#. Documentation/user/changing-defaults.itely:2063 (comment)
+#. Documentation/user/changing-defaults.itely:2038 (comment)
+#. Documentation/user/changing-defaults.itely:2051 (comment)
 msgid "not effective alone"
 msgstr "no es efectivo por sí solo"
 
-#. Documentation/user/changing-defaults.itely:2054 (comment)
-#. Documentation/user/changing-defaults.itely:2067 (comment)
+#. Documentation/user/changing-defaults.itely:2042 (comment)
+#. Documentation/user/changing-defaults.itely:2055 (comment)
 msgid "effective only when both overrides are present"
 msgstr "es efectivo sólo cuando las dos sobreescrituras están presentes"
 
-#. Documentation/user/changing-defaults.itely:2444 (comment)
+#. Documentation/user/changing-defaults.itely:2432 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr "Quitar la barra de compás al final de la línea en curso"
 
-#. Documentation/user/changing-defaults.itely:2490 (comment)
+#. Documentation/user/changing-defaults.itely:2478 (comment)
 msgid "Try to remove all key signatures"
 msgstr "Intentar quitar todas las armaduras"
 
-#. Documentation/user/changing-defaults.itely:2909 (comment)
+#. Documentation/user/changing-defaults.itely:2897 (comment)
 msgid "move horizontally left"
 msgstr "desplazar a la izquierda"
 
-#. Documentation/user/changing-defaults.itely:2911 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "move vertically up"
 msgstr "desplazar hacia arriba"
 
-#. Documentation/user/changing-defaults.itely:2912 (comment)
+#. Documentation/user/changing-defaults.itely:2900 (comment)
 msgid "third finger"
 msgstr "dedo tercero"
 
-#. Documentation/user/changing-defaults.itely:2958 (comment)
+#. Documentation/user/changing-defaults.itely:2946 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr "la RehearsalMark se centra sobre la clave"
 
-#. Documentation/user/changing-defaults.itely:2964 (comment)
+#. Documentation/user/changing-defaults.itely:2952 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr "la RehearsalMark se centra sobre el compás"
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2966 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr "la RehearsalMark se centra sobre la armadura"
 
-#. Documentation/user/changing-defaults.itely:2985 (comment)
-#. Documentation/user/changing-defaults.itely:3001 (comment)
-#. Documentation/user/changing-defaults.itely:3008 (comment)
-msgid "The RehearsalMark will be aligned with the left edge of the KeySignature"
+#. Documentation/user/changing-defaults.itely:2973 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
+msgid ""
+"The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la izquierda con la armadura"
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
-msgid "The RehearsalMark will be aligned with the right edge of the KeySignature"
+#. Documentation/user/changing-defaults.itely:2978 (comment)
+msgid ""
+"The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la derecha con la armadura"
 
-#. Documentation/user/changing-defaults.itely:3002 (comment)
+#. Documentation/user/changing-defaults.itely:2990 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr "y se desplaza 3.5 espacios a la derecha"
 
-#. Documentation/user/changing-defaults.itely:3009 (comment)
+#. Documentation/user/changing-defaults.itely:2997 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr "y se desplaza 2 espacios a la izquierda"
 
-#. Documentation/user/changing-defaults.itely:3058 (variable)
+#. Documentation/user/changing-defaults.itely:3046 (variable)
 msgid "XinO"
 msgstr "X_O"
 
@@ -9452,8 +9485,9 @@ msgid "Cheat sheet"
 msgstr "Hoja de referencia rápida"
 
 #. @top in Documentation/fr/user/lilypond-learning.tely
-msgid "GNU LilyPond --- manuel d'initiation"
-msgstr ""
+#, fuzzy
+msgid "GNU LilyPond --- Manuel d'initiation"
+msgstr "GNU LilyPond: Manual de utilización del programa"
 
 #. @subsubheading in Documentation/fr/user/macros.itexi
 #. @subsubheading in Documentation/de/user/macros.itexi
@@ -9506,7 +9540,8 @@ msgid "Updating old files"
 msgstr "Actualizar archivos antiguos"
 
 #. @top in Documentation/fr/user/lilypond-program.tely
-msgid "GNU LilyPond --- utilisation des programmes"
+#, fuzzy
+msgid "GNU LilyPond --- Utilisation des programmes"
 msgstr "GNU LilyPond --- utilisation des programmes"
 
 #. @node in Documentation/fr/user/setup.itely
@@ -9522,8 +9557,9 @@ msgid "Updating with @command{convert-ly}"
 msgstr "Actualizar ficheros con @command{convert-ly}"
 
 #. @top in Documentation/fr/user/lilypond.tely
-msgid "GNU LilyPond --- manuel de notation"
-msgstr ""
+#, fuzzy
+msgid "GNU LilyPond --- Manuel de notation"
+msgstr "GNU LilyPond: Referencia de la notación"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
@@ -9791,11 +9827,6 @@ msgstr ""
 msgid "GNU LilyPond -- Das Notationsprogramm"
 msgstr ""
 
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr "Delimitadores del comienzo de un sistema"
-
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @section in Documentation/de/user/changing-defaults.itely
 msgid "Common properties"
@@ -9983,11 +10014,13 @@ msgstr "la RehearsalMark se centra sobre la armadura"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:65 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:77 (comment)
-msgid "the RehearsalMark will be aligned with the left edge of the KeySignature"
+msgid ""
+"the RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la izquierda con la armadura"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:71 (comment)
-msgid "the RehearsalMark will be aligned with the right edge of the KeySignature"
+msgid ""
+"the RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "la RehearsalMark se alinea por la derecha con la armadura"
 
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:78 (comment)
@@ -10273,7 +10306,8 @@ msgstr "sin ligaduras de expresión"
 #. input/lsr/incipit.ly:274 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:280 (comment)
 msgid "Comment in the below \\\"\\remove\\\" command to allow line"
-msgstr "Quite el comentario de la instrucción \\\"\\remove\\\" de abajo para permitir"
+msgstr ""
+"Quite el comentario de la instrucción \\\"\\remove\\\" de abajo para permitir"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:264 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:281 (comment)
@@ -10283,13 +10317,16 @@ msgstr "los saltos de línea también en aquellas barras donde"
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:265 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:282 (comment)
 msgid "into the next bar.  The command is commented out in this"
-msgstr "se superpone una nota con el siguiente compás. La instrucción es un comentario en esta"
+msgstr ""
+"se superpone una nota con el siguiente compás. La instrucción es un "
+"comentario en esta"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:266 (comment)
 #. input/lsr/incipit.ly:277 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:283 (comment)
 msgid "short example score, but especially for large scores, you"
-msgstr "partitura corta de ejemplo, pero especialmente para partituras extensas,"
+msgstr ""
+"partitura corta de ejemplo, pero especialmente para partituras extensas,"
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:267 (comment)
 #. input/lsr/incipit.ly:278 (comment)
@@ -10301,7 +10338,8 @@ msgstr "probablemente consiga unos saltos de línea mejores y así mejorar"
 #. input/lsr/incipit.ly:279 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:285 (comment)
 msgid "overall spacing if you comment in the following command."
-msgstr "el espaciado general si elimina el comentario de la instrucción siguiente."
+msgstr ""
+"el espaciado general si elimina el comentario de la instrucción siguiente."
 
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:269 (comment)
 #. input/lsr/incipit.ly:280 (comment)
@@ -10346,10 +10384,55 @@ msgstr "barraNegras"
 msgid "Use the macro"
 msgstr "Usar el macro"
 
-#. input/lsr/beam-grouping-in-7-8-time.ly:30 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+msgid "Set default beaming for all staves"
+msgstr "Establecer el barrado predeterminado para todos los pentagramas"
+
+#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+msgid "Modify beaming for just this staff"
+msgstr "Modificar el barrado sólo para este pentagrama"
+
+#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+msgid "Inherit beaming from Score context"
+msgstr "Heredar el barrado del contexto Score"
+
+#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+#, fuzzy
+msgid "Modify beaming for this voice only"
+msgstr "Modificar el barrado sólo para este pentagrama"
+
+#. input/lsr/beam-grouping-in-7-8-time.ly:40 (comment)
 msgid "rhythm 2-3-2"
 msgstr "ritmo 2-3-2"
 
+#. input/lsr/book-parts.ly:21 (comment)
+msgid "book paper, which is inherited by all children bookparts"
+msgstr ""
+
+#. input/lsr/book-parts.ly:24 (comment)
+msgid "Page footer: add a different part-tagline at part last page"
+msgstr ""
+
+#. input/lsr/book-parts.ly:28 (comment)
+msgid "Copyright header field only on book first page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:32 (comment)
+msgid "Part tagline header field only on each part last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:36 (comment)
+msgid "Tagline header field only on book last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:43 (comment)
+msgid "book header, which is inherited by the first bookpart"
+msgstr ""
+
+#. input/lsr/book-parts.ly:52 (comment)
+msgid "a different page breaking function may be used on each part"
+msgstr ""
+
 #. input/lsr/breathing-signs.ly:19 (comment)
 msgid "this bar contains no \\breathe"
 msgstr "este compás no tiene ningún \\breathe"
@@ -10370,11 +10453,14 @@ msgstr ""
 
 #. input/lsr/breathing-signs.ly:26 (comment)
 msgid "rvarcomma and lvarcomma are variations of the default rcomma and lcomma"
-msgstr "rvarcomma y lvarcomma son variantes de las rcomma y lcomma predeterminadas"
+msgstr ""
+"rvarcomma y lvarcomma son variantes de las rcomma y lcomma predeterminadas"
 
 #. input/lsr/breathing-signs.ly:27 (comment)
 msgid "N.B.: must use Staff context here, since we start a Voice below"
-msgstr "Nota: aquí hay que usar el contexto de Staff pues iniciamos una Voice más abajo"
+msgstr ""
+"Nota: aquí hay que usar el contexto de Staff pues iniciamos una Voice más "
+"abajo"
 
 #. input/lsr/breathing-signs.ly:31 (comment)
 msgid "vee"
@@ -10434,15 +10520,15 @@ msgstr ""
 msgid "}"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:24 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:35 (comment)
 msgid "Change time signature symbol but keep 3/4 beaming"
 msgstr "Cambio de compás manterniendo el barrado de 3/4"
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:25 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:36 (comment)
 msgid "due to unchanged underlying time signature"
 msgstr "a causa de que el compás subyacente no ha cambiado"
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:30 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:41 (comment)
 msgid "Lose 3/4 beaming now \\time has been changed"
 msgstr "Perder el barrado de 3/4 ahora que se ha cambiado el \\time"
 
@@ -10468,7 +10554,8 @@ msgstr "cambiaMusicaExcepciones"
 
 #. input/lsr/chord-name-exceptions.ly:31 (comment)
 msgid "Convert music to list and prepend to existing exceptions."
-msgstr "Convertir la música en una lista y añadirla a las excepciones existentes."
+msgstr ""
+"Convertir la música en una lista y añadirla a las excepciones existentes."
 
 #. input/lsr/chord-name-exceptions.ly:32 (variable)
 msgid "chExceptions"
@@ -10496,7 +10583,8 @@ msgstr "(make-rhythmic-locations NUM-COMPAS NUMERADOR DENOMINADOR)"
 
 #. input/lsr/clip-systems.ly:59 (comment)
 msgid "means NUM/DEN whole-notes into bar numbered BAR-NUMBER"
-msgstr "significa NUMERADOR/DENOMINADOR redondas en el compás número NUM-COMPAS"
+msgstr ""
+"significa NUMERADOR/DENOMINADOR redondas en el compás número NUM-COMPAS"
 
 #. input/lsr/coloring-notes-depending-on-their-pitch.ly:13 (comment)
 msgid "Association list of pitches to colors."
@@ -10574,7 +10662,9 @@ msgstr "tamaño 1.0"
 #. input/lsr/customizing-markup-fret-diagrams.ly:45 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:50 (comment)
 msgid "roman fret label, finger labels below string, straight barre"
-msgstr "leyenda de posición en romana, leyendas de dedos debajo de las cuerdas, cejilla recta"
+msgstr ""
+"leyenda de posición en romana, leyendas de dedos debajo de las cuerdas, "
+"cejilla recta"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:47 (comment)
 msgid "standard size"
@@ -10586,7 +10676,9 @@ msgstr "orientación apaisada, números arábigos, M para cuerda muda"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:67 (comment)
 msgid "no barre, fret label down or left, small mute label font"
-msgstr "sin cejilla, leyenda de posición abajo o izquierda, fuente pequeña de indicación de cuerda muda"
+msgstr ""
+"sin cejilla, leyenda de posición abajo o izquierda, fuente pequeña de "
+"indicación de cuerda muda"
 
 #. input/lsr/customizing-markup-fret-diagrams.ly:88 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:96 (comment)
@@ -10601,55 +10693,56 @@ msgstr "puntos mayores, centrados, menos trastes"
 msgid "label below string"
 msgstr "leyenda debajo de la cuerda"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:22 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:40 (comment)
 msgid "add FretBoards for the Cuatro"
 msgstr "añadir FretBoards para el cuatro venezolano"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:23 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:41 (comment)
 msgid "Note: This section could be put into a separate file"
 msgstr "Nota: esta sección se puede poner en un archivo aparte"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:24 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:42 (comment)
 msgid "predefined-cuatro-fretboards.ly"
 msgstr "posiciones-predefinidas-del-cuatro.ly"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:25 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:43 (comment)
 msgid "and \\included into each of your compositions"
 msgstr "e incluirse en todas sus composiciones con \\include"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:27 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:45 (variable)
 msgid "cuatroTuning"
 msgstr "afinacionCuatro"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:29 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:47 (variable)
 msgid "dSix"
 msgstr "sextaRe"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:30 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:48 (variable)
 msgid "dMajor"
 msgstr "reMayor"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:31 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:49 (variable)
 msgid "aMajSeven"
 msgstr "laSeptMayor"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:32 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:50 (variable)
 msgid "dMajSeven"
 msgstr "reSeptMayor"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:33 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (variable)
 msgid "gMajor"
 msgstr "solMayor"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
-msgstr "fin del potencial archivo de inclusión /posiciones-predefinidas-del-cuatro.ly"
+msgstr ""
+"fin del potencial archivo de inclusión /posiciones-predefinidas-del-cuatro.ly"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:56 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable)
 msgid "primerosNames"
 msgstr "nombresPrimeros"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:60 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:78 (variable)
 msgid "primeros"
 msgstr "primeros"
 
@@ -10657,7 +10750,7 @@ msgstr "primeros"
 msgid "baseMelody"
 msgstr "melodiaBase"
 
-#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:39 (comment)
+#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:37 (comment)
 msgid "Must be lower than the actual number of staff lines"
 msgstr "debe ser menor que el número real de líneas de la pauta"
 
@@ -10868,19 +10961,19 @@ msgstr "cabezasSi"
 msgid "Cut here ----- End 'flamenco.ly' "
 msgstr "Cortar por aquí ----- Final 'flamenco.ly' "
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:58 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:109 (comment)
 msgid "Example 1"
 msgstr "Ejemplo 1"
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:65 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:116 (comment)
 msgid "Example 2"
 msgstr "Ejemplo 2"
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:72 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:123 (comment)
 msgid "Example 3"
 msgstr "Ejemplo 3"
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:86 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:137 (comment)
 msgid "Example 4"
 msgstr "Ejemplo 4"
 
@@ -10898,7 +10991,8 @@ msgstr ""
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:37 (comment)
 msgid "A chord for ukelele, with formatting defined in definition string"
-msgstr "Acorde para el ukelele, con el formato definido en la cadena de definición"
+msgstr ""
+"Acorde para el ukelele, con el formato definido en la cadena de definición"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:38 (comment)
 msgid "1.2 * size, 4 strings, 4 frets, fingerings below string"
@@ -10906,7 +11000,9 @@ msgstr "1.2 * tamaño, 4 cuerdas, 4 trastes, digitación debajo de las cuerdas"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:39 (comment)
 msgid "dot radius .35 of fret spacing, dot position 0.55 of fret spacing"
-msgstr "redio del punto .35 del espacio de traste, posición del punto 0.55 del espacio de traste"
+msgstr ""
+"redio del punto .35 del espacio de traste, posición del punto 0.55 del "
+"espacio de traste"
 
 #. input/lsr/fret-diagrams-explained-and-developed.ly:52 (comment)
 #. input/lsr/fret-diagrams-explained-and-developed.ly:72 (comment)
@@ -10914,45 +11010,49 @@ msgstr "redio del punto .35 del espacio de traste, posición del punto 0.55 del
 msgid "110% of default size"
 msgstr "110% del tamaño predeterminado"
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:26 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:33 (comment)
+msgid "this moves them up one staff space from the default position"
+msgstr "moverlas hacia arriba un espacio de pentagrama desde la posición de"
+
+#. input/lsr/grid-lines--changing-their-appearance.ly:51 (comment)
 msgid "set up grids"
 msgstr "establecer rejillas"
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:28 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:53 (comment)
 msgid "set the grid interval to one quarter note"
 msgstr "establecer intervalo de rejilla a una negra"
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:35 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:59 (comment)
 msgid "this moves them to the right half a staff space"
 msgstr "moverlas a la derecha medio espacio de pentagrama"
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:48 (comment)
-msgid "this moves them up one staff space from the default position"
-msgstr "moverlas hacia arriba un espacio de pentagrama desde la posición de"
-
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:27 (comment)
-msgid "sets of grid"
-msgstr "rejilla predeterminada "
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:36 (comment)
+msgid "hides staff and notes so that only the grid lines are visible"
+msgstr "ocultar pentagrama y notas para que sólo se vea la rejilla"
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:33 (comment)
-msgid "lines length"
-msgstr "longitud de las líneas"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:43 (comment)
+#, fuzzy
+msgid "dummy notes to force regular note spacing"
+msgstr ""
+"hay que poner aquí notas falsas para forzar el espaciado regular de la "
+"rejilla..."
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:48 (comment)
-msgid "centers grid lines  horizontally below noteheads"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:59 (comment)
+#, fuzzy
+msgid "center grid lines horizontally below note heads"
 msgstr "centrar las líneas de rejilla horizontalmente bajo las cabezas"
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:62 (comment)
-msgid "making sure the lines will be placed outside the Staff"
-msgstr "asegurar que las líneas se sitúen fuera del pentagrama"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:66 (comment)
+msgid "set line length and positioning:"
+msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:65 (comment)
-msgid "hides staff and notes so that only the grid lines are visible"
-msgstr "ocultar pentagrama y notas para que sólo se vea la rejilla"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:67 (comment)
+msgid "two staff spaces above center line on hidden staff"
+msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:75 (comment)
-msgid "you have to put 'dummy' notes here to force regular grid spacing..."
-msgstr "hay que poner aquí notas falsas para forzar el espaciado regular de la rejilla..."
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:68 (comment)
+msgid "to four spaces below center line on visible staff"
+msgstr ""
 
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
 msgid "drum"
@@ -10966,7 +11066,9 @@ msgstr "Solución 1: usar un marcado sencillo con un valor concreto de halign"
 msgid ""
 "Drawback: It's a markup, not a dynamic command, so \\dynamicDown etc. will "
 "have no effect"
-msgstr "Inconveniente: es un marcado, no una instrucción de matiz dinámico por lo que \\dynamicDown etc. no funcionan"
+msgstr ""
+"Inconveniente: es un marcado, no una instrucción de matiz dinámico por lo "
+"que \\dynamicDown etc. no funcionan"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:56 (variable)
 msgid "semppMarkup"
@@ -10977,8 +11079,8 @@ msgid ""
 "Solution 2: Using a dynamic script and shifting with \\once\\override ... "
 "#'X-offset = .."
 msgstr ""
-"Solución 2: usar una indicación de dinámica y desplazarla con \\once\\override ... "
-"#'X-offset = .."
+"Solución 2: usar una indicación de dinámica y desplazarla con \\once"
+"\\override ... #'X-offset = .."
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:59 (comment)
 msgid "Drawback: \\once\\override needed for every invocation"
@@ -10992,11 +11094,16 @@ msgstr "semppK"
 msgid ""
 "Solution 3: Padding the dynamic script so the center-alignment puts it to "
 "the correct position"
-msgstr "Solución 3: aplicar relleno a la indicación dinámica para que  el center-alignment lo ponga en la posición correcta"
+msgstr ""
+"Solución 3: aplicar relleno a la indicación dinámica para que  el center-"
+"alignment lo ponga en la posición correcta"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:63 (comment)
-msgid "Drawback: the padding really reserves the space, nothing else can be there"
-msgstr "Inconveniente: el relleno reserva el espacio realmente, no puede haber nada más aquí"
+msgid ""
+"Drawback: the padding really reserves the space, nothing else can be there"
+msgstr ""
+"Inconveniente: el relleno reserva el espacio realmente, no puede haber nada "
+"más aquí"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:64 (variable)
 msgid "semppT"
@@ -11004,17 +11111,24 @@ msgstr "semppT"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:72 (comment)
 msgid "Solution 4: Dynamic, setting the dimensions of the additional text to 0"
-msgstr "Solución 4: indicación dinámica, fijando a 0 las dimensiones del texto adicional"
+msgstr ""
+"Solución 4: indicación dinámica, fijando a 0 las dimensiones del texto "
+"adicional"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:73 (comment)
 msgid ""
 "Drawback: To lilypond \\\"sempre\\\" has no extent, so it might put other "
 "stuff there => collisions"
-msgstr "Inconveniente: para lilypond \\\"sempre\\\" no tiene dimensiones, lo que podría dar lugar a colisiones"
+msgstr ""
+"Inconveniente: para lilypond \\\"sempre\\\" no tiene dimensiones, lo que "
+"podría dar lugar a colisiones"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:74 (comment)
-msgid "Drawback: Also, there seems to be some spacing, so it's not exactly the "
-msgstr "Inconveniente: asimismo, parece haber algo de espacio, por lo que no es exactamente"
+msgid ""
+"Drawback: Also, there seems to be some spacing, so it's not exactly the "
+msgstr ""
+"Inconveniente: asimismo, parece haber algo de espacio, por lo que no es "
+"exactamente"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:75 (comment)
 msgid "same alignment as without the additional text"
@@ -11026,7 +11140,9 @@ msgstr "semppM"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:78 (comment)
 msgid "Solution 5: Dynamic with explicit shifting inside the scheme function"
-msgstr "Solución 5: indicación dinámica con desplazamiento explícito dentro de la función de Scheme"
+msgstr ""
+"Solución 5: indicación dinámica con desplazamiento explícito dentro de la "
+"función de Scheme"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:79 (variable)
 msgid "semppG"
@@ -11036,7 +11152,9 @@ msgstr "semppG"
 msgid ""
 "Solution 6: Dynamic with explicit alignment. This has only effect, if one "
 "sets X-offset!"
-msgstr "Solución 6: indicación dinámica con alineación explícita. ¡Sólo tiene efecto si se fija X-offset!"
+msgstr ""
+"Solución 6: indicación dinámica con alineación explícita. ¡Sólo tiene efecto "
+"si se fija X-offset!"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:86 (comment)
 msgid "Drawback: One needs to set DynamicText #'X-offset!"
@@ -11046,7 +11164,9 @@ msgstr "Inconveniente: ¡Hay que fijar DynamicText #'X-offset!"
 msgid ""
 "Drawback: Aligned at the right edge of the additional text, not at the "
 "center of pp"
-msgstr "Inconveniente: alineado con el borde derecho del texto adicional, no con el centro del pp"
+msgstr ""
+"Inconveniente: alineado con el borde derecho del texto adicional, no con el "
+"centro del pp"
 
 #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:88 (variable)
 msgid "semppMII"
@@ -11115,7 +11235,9 @@ msgstr "bassusIncipit"
 #. input/lsr/incipit.ly:251 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:258 (comment)
 msgid "Keep the bass lyrics outside of the staff group to avoid bar lines"
-msgstr "Mantener la letra del bajo fuera del grupo de pentagrama para evitar las barras de compás"
+msgstr ""
+"Mantener la letra del bajo fuera del grupo de pentagrama para evitar las "
+"barras de compás"
 
 #. input/lsr/incipit.ly:252 (comment)
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:259 (comment)
@@ -11128,7 +11250,9 @@ msgstr "si barras de compás sobre los pentagramas"
 
 #. input/lsr/incipit.ly:260 (comment)
 msgid "the next three instructions keep the lyrics between the bar lines"
-msgstr "las tres instrucciones siguientes mantienen la letra entre las barras de compás"
+msgstr ""
+"las tres instrucciones siguientes mantienen la letra entre las barras de "
+"compás"
 
 #. input/lsr/incipit.ly:275 (comment)
 msgid "breaking also at those bar lines where a note overlaps"
@@ -11380,7 +11504,7 @@ msgstr "posNormal"
 msgid "TAB"
 msgstr "TAB"
 
-#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:37 (variable)
+#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:51 (variable)
 msgid "dashPlus"
 msgstr "dashPlus"
 
@@ -11400,15 +11524,15 @@ msgstr "... o para cubrir sólo el espacio vacio"
 msgid "stick"
 msgstr "baqueta"
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:38 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:39 (comment)
 msgid "Permit line breaks within tuplets"
 msgstr "Permitir saltos de línea dentro de grupos especiales"
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:40 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:41 (comment)
 msgid "Allow beams to be broken at line breaks"
 msgstr "Permitir romper barras en saltos de línea"
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:47 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:48 (comment)
 msgid "Insert a manual line break within a tuplet"
 msgstr "Insertar salto de línea manual dentro de un grupo especial"
 
@@ -11428,35 +11552,39 @@ msgstr "modificar el contexto PianoStaff para que acepte el contexto Dynamics"
 msgid "tab"
 msgstr "tab"
 
-#. input/lsr/positioning-multi--measure-rests.ly:30 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
 msgid "Multi-measure rests by default are set under the second line"
-msgstr "Los silencios multicompás se sitúan de forma predeterminada bajo la segunda línea"
+msgstr ""
+"Los silencios multicompás se sitúan de forma predeterminada bajo la segunda "
+"línea"
 
-#. input/lsr/positioning-multi--measure-rests.ly:32 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
 msgid "They can be moved with an override"
 msgstr "Se pueden mover con un override"
 
-#. input/lsr/positioning-multi--measure-rests.ly:35 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:46 (comment)
 msgid "A value of 0 is the default position;"
 msgstr "Un valor de cero es la posición predeterminada;"
 
-#. input/lsr/positioning-multi--measure-rests.ly:36 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:47 (comment)
 msgid "the following trick moves the rest to the center line"
 msgstr "el truco siguiente mueve el silencio a la línea central"
 
-#. input/lsr/positioning-multi--measure-rests.ly:39 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:50 (comment)
 msgid "Multi-measure rests in odd-numbered voices are under the top line"
-msgstr "Los silencios multicompás de las voces impares están bajo la línea superior"
+msgstr ""
+"Los silencios multicompás de las voces impares están bajo la línea superior"
 
-#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:52 (comment)
 msgid "Multi-measure rests in even-numbered voices are under the bottom line"
-msgstr "Los silencios multicompás de las voces pares están bajo la línea inferior"
+msgstr ""
+"Los silencios multicompás de las voces pares están bajo la línea inferior"
 
-#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:54 (comment)
 msgid "They remain separated even in empty measures"
 msgstr "Siguen estando separados incluso en compases vacíos"
 
-#. input/lsr/positioning-multi--measure-rests.ly:45 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:56 (comment)
 msgid "This brings them together even though there are two voices"
 msgstr "Así los juntamos incluso si hay dos voces"
 
@@ -11472,7 +11600,8 @@ msgstr ""
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:35 (comment)
 msgid "Set coda sign as rehearsal mark and adjust size if needed"
-msgstr "Fijar llamada de coda como letra de ensayo y ajustar tamaño si es necesario"
+msgstr ""
+"Fijar llamada de coda como letra de ensayo y ajustar tamaño si es necesario"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:42 (comment)
 msgid "Should Coda be on anew line?"
@@ -11498,7 +11627,8 @@ msgstr "¡Aquí comienzan los trucos!"
 msgid ""
 "\\cadenzaOn will suppress the bar count and \\stopStaff removes the staff "
 "lines."
-msgstr "\\cadenzaOn suprime la cuenta de compases y \\stopStaff quita el pentagrama"
+msgstr ""
+"\\cadenzaOn suprime la cuenta de compases y \\stopStaff quita el pentagrama"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:58 (comment)
 msgid "Some examples of possible text-displays "
@@ -11554,7 +11684,9 @@ msgstr ""
 msgid ""
 "Move text to the desired position and tweak spacing for optimum text "
 "alignment"
-msgstr "Mover el texto a la posición deseada y ajustar el espacio para una alineación óptima"
+msgstr ""
+"Mover el texto a la posición deseada y ajustar el espacio para una "
+"alineación óptima"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:75 (comment)
 msgid "\\once \\override TextScript #'extra-offset = #'( 8 . -5.5 )"
@@ -11586,13 +11718,16 @@ msgstr "¡Mostraos, clave y armadura!"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:99 (comment)
 msgid "Set coda sign as rehearsal mark and adjust size and position"
-msgstr "Fijar el signo de coda como letra de enzayo y ajustar el tamaño y posición"
+msgstr ""
+"Fijar el signo de coda como letra de enzayo y ajustar el tamaño y posición"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:101 (comment)
 msgid ""
 "Put the coda sign ontop of the (treble-)clef dependend on coda's line-"
 "position"
-msgstr "Poner el signo de coda encima de la clave dependiendo de la line-position de la coda"
+msgstr ""
+"Poner el signo de coda encima de la clave dependiendo de la line-position de "
+"la coda"
 
 #. input/lsr/positioning-segno-and-coda-with-line-break.ly:103 (comment)
 msgid "Coda NOT on new line, use this:"
@@ -11644,7 +11779,9 @@ msgstr "original"
 
 #. input/lsr/removing-the-first-empty-line.ly:43 (comment)
 msgid "To use the setting globally, uncomment the following line:"
-msgstr "Para usar el ajuste de forma global, quite el comentario de la líne siguiente:"
+msgstr ""
+"Para usar el ajuste de forma global, quite el comentario de la líne "
+"siguiente:"
 
 #. input/lsr/removing-the-first-empty-line.ly:44 (comment)
 msgid "\\override VerticalAxisGroup #'remove-first = ##t"
@@ -11652,7 +11789,8 @@ msgstr ""
 
 #. input/lsr/removing-the-first-empty-line.ly:53 (comment)
 msgid "To use the setting globally, comment this line,"
-msgstr "Para usar el ajuste globalmente, haga un comentario de la línea siguiente:"
+msgstr ""
+"Para usar el ajuste globalmente, haga un comentario de la línea siguiente:"
 
 #. input/lsr/removing-the-first-empty-line.ly:54 (comment)
 msgid "uncomment the line in the \\layout block above"
@@ -11706,11 +11844,16 @@ msgstr "lineaTablatura"
 msgid ""
 "Shows one horizontal line. The vertical line (simulating a bar-line) is "
 "simulated with a gridline"
-msgstr "Muestra una línea horizontal. La línea horizontal (que simula una divisoria) se simula con una línea de rejilla"
+msgstr ""
+"Muestra una línea horizontal. La línea horizontal (que simula una divisoria) "
+"se simula con una línea de rejilla"
 
 #. input/lsr/score-for-diatonic-accordion.ly:83 (comment)
-msgid "disable the following line to see the the noteheads while writing the song "
-msgstr "Deshabilite la línea siguiente para ver las cabezas mientras escribe la canción"
+msgid ""
+"disable the following line to see the the noteheads while writing the song "
+msgstr ""
+"Deshabilite la línea siguiente para ver las cabezas mientras escribe la "
+"canción"
 
 #. input/lsr/score-for-diatonic-accordion.ly:87 (comment)
 msgid "The beam between 8th-notes is used to draw the push-line"
@@ -11721,7 +11864,8 @@ msgid "How to fast write the push-lines: "
 msgstr "Cuán rápido escribir las líneas de cerrar:"
 
 #. input/lsr/score-for-diatonic-accordion.ly:89 (comment)
-msgid "1. write repeatedly 'c c c c c c c c |' for the whole length of the song "
+msgid ""
+"1. write repeatedly 'c c c c c c c c |' for the whole length of the song "
 msgstr "1. escribir repetidamente 'c c c c c c c c |' en toda la canción"
 
 #. input/lsr/score-for-diatonic-accordion.ly:90 (comment)
@@ -11737,8 +11881,11 @@ msgid "4. Mark the positions on which push/pull changes. "
 msgstr "4. Marcar las posiciones en las que cambia el abrir o cerrar"
 
 #. input/lsr/score-for-diatonic-accordion.ly:93 (comment)
-msgid "In the score-picture click on the position the push- or pull-part starts "
-msgstr "En la imagen de la partitura pulse sobre la posición en que inician las partes de abrir o cerrar"
+msgid ""
+"In the score-picture click on the position the push- or pull-part starts "
+msgstr ""
+"En la imagen de la partitura pulse sobre la posición en que inician las "
+"partes de abrir o cerrar"
 
 #. input/lsr/score-for-diatonic-accordion.ly:94 (comment)
 msgid "(on the noteHead, the cursor will change to a hand-icon)."
@@ -11754,7 +11901,8 @@ msgstr "a) Si en ese lugar empieza una parte de cerrar, cambie la 'c' por 'e['"
 
 #. input/lsr/score-for-diatonic-accordion.ly:97 (comment)
 msgid "b) If a pull-part starts there, replace the 'c' by an 's'"
-msgstr "b) Si en ese lugar empieza una parte de abrir, cambie la 'c' por una 's'"
+msgstr ""
+"b) Si en ese lugar empieza una parte de abrir, cambie la 'c' por una 's'"
 
 #. input/lsr/score-for-diatonic-accordion.ly:98 (comment)
 msgid "5. Switch into 'overwrite-mode' by pressing the 'ins' key. "
@@ -11776,7 +11924,9 @@ msgstr "8. Pase de nuevo al modo de inserción"
 msgid ""
 "9. At last it should look lik e.g. (s s e[ c | c c c c c c c c | c c c c c c "
 "e] s s)"
-msgstr "9. Al final se verá como p.ej. (s s e[ c | c c c c c c c c | c c c c c c e] s s)"
+msgstr ""
+"9. Al final se verá como p.ej. (s s e[ c | c c c c c c c c | c c c c c c e] "
+"s s)"
 
 #. input/lsr/score-for-diatonic-accordion.ly:103 (comment)
 msgid "10. re-enable the line \\NoNoteHead"
@@ -11795,16 +11945,18 @@ msgstr "1. Ponga debajo una copia de la melodía de piano"
 msgid ""
 "2. Separate piano melody into pull- and push-parts according to the "
 "staffTabLine you've already made      "
-msgstr "2. Separe la melodía de piano en partes de abrir y de cerrar de acuerdo con la staffTabLine que ha preparado"
+msgstr ""
+"2. Separe la melodía de piano en partes de abrir y de cerrar de acuerdo con "
+"la staffTabLine que ha preparado"
 
 #. input/lsr/score-for-diatonic-accordion.ly:116 (comment)
 msgid ""
 "3. For each line: Double the line. Remark the 1st one (Keeps unchanged as "
 "reference) and then change the second line using the transformation paper"
 msgstr ""
-"3. Para cada línea; duplique la línea. Marque la primera como comentario "
-"(la conserva intacta como referencia) y luego cambie la segunda línea "
-"usando el papel de transformación"
+"3. Para cada línea; duplique la línea. Marque la primera como comentario (la "
+"conserva intacta como referencia) y luego cambie la segunda línea usando el "
+"papel de transformación"
 
 #. input/lsr/score-for-diatonic-accordion.ly:117 (comment)
 msgid "or the macros 'conv2diaton push.bsh' and 'conv2diaton pull.bsh' "
@@ -11857,8 +12009,8 @@ msgid ""
 "3. For each line: Double the line. Remark the 1st one (Keeps unchanged as "
 "reference) and then "
 msgstr ""
-"3. Para cada línea: duplique la línea. marque la primera como comentario "
-"(la conserva intacta como referencia) y después"
+"3. Para cada línea: duplique la línea. marque la primera como comentario (la "
+"conserva intacta como referencia) y después"
 
 #. input/lsr/score-for-diatonic-accordion.ly:136 (comment)
 msgid "change the second line using the transformation paper"
@@ -11909,7 +12061,8 @@ msgid "staffBassRhytm"
 msgstr "duracionesPentagramaBajo"
 
 #. input/lsr/score-for-diatonic-accordion.ly:200 (comment)
-msgid "This is not a RhythmicStaff  because it must be possible to append lyrics."
+msgid ""
+"This is not a RhythmicStaff  because it must be possible to append lyrics."
 msgstr "Esto no es un RhythmicStaff porque se debe poder aplicar letra."
 
 #. input/lsr/score-for-diatonic-accordion.ly:202 (comment)
@@ -11921,12 +12074,14 @@ msgid ""
 "Shows one horizontal line. The vertical line (simulating a bar-line) is "
 "simulated by a grid"
 msgstr ""
-"Muestra una línea horizontal. La línea vertical (que simula una divisoria) está "
-"simulada por una rejilla"
+"Muestra una línea horizontal. La línea vertical (que simula una divisoria) "
+"está simulada por una rejilla"
 
 #. input/lsr/score-for-diatonic-accordion.ly:205 (comment)
 msgid "Search for 'grid' in this page to find all related functions "
-msgstr "Busque por el término 'grid' en esta página para hallar todas las funciones relacionadas"
+msgstr ""
+"Busque por el término 'grid' en esta página para hallar todas las funciones "
+"relacionadas"
 
 #. input/lsr/score-for-diatonic-accordion.ly:208 (context id)
 msgid "VoiceBassRhytm"
@@ -11936,7 +12091,9 @@ msgstr "DuracionesVozBajo"
 msgid ""
 "The vertical line (simulating a bar-line) in the staffBassRhytm is a "
 "gridline "
-msgstr "La línea vertical (que simula una divisoria) en el duracionesPentagramaBajo es una línea de rejilla"
+msgstr ""
+"La línea vertical (que simula una divisoria) en el duracionesPentagramaBajo "
+"es una línea de rejilla"
 
 #. input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly:24 (comment)
 msgid "Define the fret diagrams to be used"
@@ -12066,12 +12223,13 @@ msgid ""
 "\\include \\\"piece.ly\\\"             %%% uncomment this line when using a "
 "separate file"
 msgstr ""
-"\\include \\\"piece.ly\\\"             %%% quite la marca de comentario de esta línea si "
-"está usando un archivo aparte"
+"\\include \\\"piece.ly\\\"             %%% quite la marca de comentario de "
+"esta línea si está usando un archivo aparte"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:122 (comment)
 msgid "{ Uncomment this block when using separate files"
-msgstr "{ Quite la marca de comentario de este bloque si está usando archivos aparte"
+msgstr ""
+"{ Quite la marca de comentario de este bloque si está usando archivos aparte"
 
 #. input/lsr/string-quartet-template-with-separate-parts.ly:124 (comment)
 msgid "vn1.ly"
@@ -12105,11 +12263,11 @@ msgstr ""
 msgid "(This is the Cello part file)"
 msgstr "(Este es el archivo de particella del cello)"
 
-#. input/lsr/sub-dividing-beams.ly:49 (comment)
+#. input/lsr/sub-dividing-beams.ly:50 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr "Fijar la longitud del subgrupo de barras a una corchea"
 
-#. input/lsr/sub-dividing-beams.ly:53 (comment)
+#. input/lsr/sub-dividing-beams.ly:54 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr "Fijar la longitud del subgrupo de barras a una semicorchea"
 
@@ -12119,7 +12277,9 @@ msgstr "ignorar"
 
 #. input/lsr/three-sided-box.ly:16 (comment)
 msgid "New command to add a three sided box, with sides north, west and south"
-msgstr "Instrucción nueva para añadir una caja con tres lados apuntando al norte, oeste y sur"
+msgstr ""
+"Instrucción nueva para añadir una caja con tres lados apuntando al norte, "
+"oeste y sur"
 
 #. input/lsr/three-sided-box.ly:17 (comment)
 msgid "Based on the box-stencil command defined in scm/stencil.scm"
@@ -12131,7 +12291,9 @@ msgstr "Observe que utilizamos \\\";\\\" para comentar una línea en Scheme"
 
 #. input/lsr/three-sided-box.ly:32 (comment)
 msgid "The corresponding markup command, based on the \\box command defined "
-msgstr "La instrucción de marcado correspondiente, basada en la instrucción \\box definida"
+msgstr ""
+"La instrucción de marcado correspondiente, basada en la instrucción \\box "
+"definida"
 
 #. input/lsr/three-sided-box.ly:33 (comment)
 msgid "in scm/define-markup-commands.scm"
@@ -12190,12 +12352,17 @@ msgid "incipitBassus"
 msgstr ""
 
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:226 (comment)
-msgid "StaffGroup is used instead of ChoirStaff to get bar lines between systems"
-msgstr "StaffGroup se usa en lugar de ChoirStaff para tener líneas divisorias entre los sistemas"
+msgid ""
+"StaffGroup is used instead of ChoirStaff to get bar lines between systems"
+msgstr ""
+"StaffGroup se usa en lugar de ChoirStaff para tener líneas divisorias entre "
+"los sistemas"
 
 #. input/lsr/transcription-of-ancient-music-with-incipit.ly:269 (comment)
 msgid "the next three instructions keep the lyrics between the barlines"
-msgstr "las tres instrucciones siguientes hacen que la letra no choque con las divisorias"
+msgstr ""
+"las tres instrucciones siguientes hacen que la letra no choque con las "
+"divisorias"
 
 #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:131 (variable)
 msgid "naturalizeMusic"
@@ -12233,51 +12400,54 @@ msgstr "la relación normal entre notas y claves:"
 msgid "Here we go back to the normal clef:"
 msgstr "Aquí volvemos a la clave normal:"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:22 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:34 (comment)
 msgid "The default in 3/4 time is to beam in three groups"
 msgstr "De forma predeterminada, en 3/4 el barrado se hace en tres grupos"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:23 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
 msgid "each of a quarter note length"
 msgstr "de una negra de longitud cada uno"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:27 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:39 (comment)
 msgid "No auto-beaming is defined for 12/16"
 msgstr "No hay ningún barrado automático definido para 12/16"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:31 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
 msgid "Change time signature symbol, but retain underlying 3/4 beaming"
 msgstr "Cambiar el símbolo de compás, manteniendo el barrado subyacente de 3/4"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment)
 msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8"
-msgstr "El agrupamiento predeterminado de (1 1 1) y beatLength de 1/8 del compás 3/4"
+msgstr ""
+"El agrupamiento predeterminado de (1 1 1) y beatLength de 1/8 del compás 3/4"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:36 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
 msgid "are not consistent with a measureLength of 3/4, so the beams"
-msgstr "no son consistentes con una longitud de compás measureLength de 3/4, por ello las barras"
+msgstr ""
+"no son consistentes con una longitud de compás measureLength de 3/4, por "
+"ello las barras"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:37 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
 msgid "are grouped at beatLength intervals"
 msgstr "se agrupan a intervalos de beatLength"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:41 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:53 (comment)
 msgid "Specify beams in groups of (3 3 2 3) 1/16th notes"
 msgstr "Especificar barras en grupos de (3 3 2 3) semicorcheas"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:42 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:54 (comment)
 msgid "3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply,"
 msgstr "3+3+2+3=11, y 11*1/16<>3/4, así que no es de aplicación beatGrouping"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:55 (comment)
 msgid "and beams are grouped at beatLength (1/16) intervals"
 msgstr "y las barras se agrupan a intervalos de beatLength (semicorcheas)"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:60 (comment)
 msgid "Specify beams in groups of (3 4 2 3) 1/16th notes"
 msgstr "Especificat barras en grupos de (3 4 2 3) semicorcheas"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:61 (comment)
 msgid "3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies"
 msgstr "3+4+2+3=12, y 12*1/16=3/4, así pues beatGrouping es de aplicación"
 
@@ -12295,7 +12465,9 @@ msgstr "cabezasNormales"
 
 #. input/lsr/utf-8.ly:34 (comment)
 msgid "end verbatim - this comment is a hack to prevent texinfo.tex"
-msgstr "final del bloque literal. Este comentario es un truco para evitar que texinfo.tex"
+msgstr ""
+"final del bloque literal. Este comentario es un truco para evitar que "
+"texinfo.tex"
 
 #. input/lsr/utf-8.ly:35 (comment)
 msgid "from choking on non-European UTF-8 subsets"
@@ -12404,11 +12576,15 @@ msgstr "esté más cerca del pentagrama"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:73 (comment)
 msgid "we could remove the line about this with the line below, since we want"
-msgstr "podríamos quitar la línea anterior y sustituirla por la siguiente, pues queremos"
+msgstr ""
+"podríamos quitar la línea anterior y sustituirla por la siguiente, pues "
+"queremos"
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:74 (comment)
 msgid "the alto lyrics to be below the alto Voice anyway."
-msgstr "que la letra de la contralto esté debajo de la voz de contralto de todas formas."
+msgstr ""
+"que la letra de la contralto esté debajo de la voz de contralto de todas "
+"formas."
 
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:75 (comment)
 msgid "\\new Lyrics \\lyricsto altos \\altoWords"
@@ -12445,3 +12621,14 @@ msgstr "Notas al pie"
 msgid "Table of Contents"
 msgstr "Índice general"
 
+#~ msgid "System start delimiters"
+#~ msgstr "Delimitadores del comienzo de un sistema"
+
+#~ msgid "sets of grid"
+#~ msgstr "rejilla predeterminada "
+
+#~ msgid "lines length"
+#~ msgstr "longitud de las líneas"
+
+#~ msgid "making sure the lines will be placed outside the Staff"
+#~ msgstr "asegurar que las líneas se sitúen fuera del pentagrama"
index c83cbeb470242c7ed30f19c471d7da837766ba92..dba2faaaf1ab8abf21ff555e23bc2a317df07327 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 17:44+0100\n"
+"POT-Creation-Date: 2008-11-22 20:22+0100\n"
 "PO-Revision-Date: 2008-11-09 13:14+0100\n"
 "Last-Translator: Jean-Charles Malahieude <lolyfan-AT-wanadoo-DOT-fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
@@ -1265,6 +1265,7 @@ msgstr "Regroupements de portées"
 #. @rglos in Documentation/es/user/tutorial.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tutorial.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "brace"
 msgstr "accolade"
 
@@ -1519,7 +1520,7 @@ msgstr "inferieur"
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
-#. input/lsr/guitar-strum-rhythms.ly:48 (context id)
+#. input/lsr/guitar-strum-rhythms.ly:56 (context id)
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
@@ -1542,7 +1543,7 @@ msgid "text"
 msgstr "texte"
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:535 (context id)
+#. Documentation/user/staff.itely:518 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1675,7 +1676,7 @@ msgstr "un"
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3268 (variable)
+#. Documentation/user/tweaks.itely:3468 (variable)
 #. Documentation/user/simultaneous.itely:783 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
@@ -1727,37 +1728,37 @@ msgid "SopMusic"
 msgstr "SopMusique"
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3270 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "AltoMusic"
 msgstr "AltoMusique"
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3271 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "TenorMusic"
 msgstr "TenorMusique"
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3272 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "BassMusic"
 msgstr "BasseMusique"
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3273 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "VerseOne"
 msgstr "CoupletUn"
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3274 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseTwo"
 msgstr "CoupletDeux"
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3275 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseThree"
 msgstr "CoupletTrois"
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3276 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseFour"
 msgstr "CoupletQuatre"
 
@@ -1766,20 +1767,20 @@ msgid "Sop"
 msgstr "Sop"
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3283 (context id)
-#. Documentation/user/input.itely:915 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:946 (context id)
 msgid "Alto"
 msgstr "Alto"
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3291 (context id)
-#. Documentation/user/input.itely:917 (context id)
+#. Documentation/user/tweaks.itely:3491 (context id)
+#. Documentation/user/input.itely:948 (context id)
 msgid "Tenor"
 msgstr "Tenor"
 
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3292 (context id)
-#. Documentation/user/input.itely:922 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 msgid "Bass"
 msgstr "Basse"
@@ -1934,7 +1935,7 @@ msgstr "retour à la taille par défaut"
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:907 (variable)
+#. Documentation/user/input.itely:938 (variable)
 msgid "sopranoMusic"
 msgstr "sopranoMusique"
 
@@ -1951,7 +1952,7 @@ msgid "sopranoWords"
 msgstr "sopranoParoles"
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:908 (variable)
+#. Documentation/user/input.itely:939 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1966,7 +1967,7 @@ msgid "altoWords"
 msgstr "altoParoles"
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:909 (variable)
+#. Documentation/user/input.itely:940 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1981,7 +1982,7 @@ msgid "tenorWords"
 msgstr "tenorParoles"
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:910 (variable)
+#. Documentation/user/input.itely:941 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2146,17 +2147,18 @@ msgstr "Expressions musicales imbriquées"
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:564 (context id)
-#. Documentation/user/staff.itely:577 (context id)
-#. Documentation/user/staff.itely:585 (context id)
-#. Documentation/user/staff.itely:604 (context id)
-#. Documentation/user/staff.itely:617 (context id)
+#. Documentation/user/staff.itely:547 (context id)
+#. Documentation/user/staff.itely:560 (context id)
+#. Documentation/user/staff.itely:568 (context id)
+#. Documentation/user/staff.itely:587 (context id)
+#. Documentation/user/staff.itely:600 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tweaks.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ossia"
 msgstr "ossia"
 
@@ -2384,223 +2386,223 @@ msgstr "Partition pour chœur à quatre voix mixtes"
 msgid "Building a score from scratch"
 msgstr "Écriture d'une partition à partir de zéro"
 
-#. Documentation/user/tweaks.itely:564 (comment)
-#. Documentation/user/tweaks.itely:690 (comment)
+#. Documentation/user/tweaks.itely:595 (comment)
+#. Documentation/user/tweaks.itely:730 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr "L'épaisseur de toutes les liaisons à venir passe de 1,2 à 5,0"
 
-#. Documentation/user/tweaks.itely:630 (comment)
-#. Documentation/user/tweaks.itely:666 (comment)
-#. Documentation/user/tweaks.itely:669 (comment)
+#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:703 (comment)
+#. Documentation/user/tweaks.itely:706 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr "Épaississement de la prochaine liaison seulement"
 
-#. Documentation/user/tweaks.itely:694 (comment)
+#. Documentation/user/tweaks.itely:734 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr "Retour à l'épaisseur par défaut de 1,2 pour les prochaines liaisons"
 
-#. Documentation/user/tweaks.itely:1302 (comment)
+#. Documentation/user/tweaks.itely:1394 (comment)
 msgid "Don't print clefs in this staff"
 msgstr "pas de clef pour cette portée"
 
-#. Documentation/user/tweaks.itely:1304 (comment)
+#. Documentation/user/tweaks.itely:1396 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr "pas de métrique pour cette portée"
 
-#. Documentation/user/tweaks.itely:1362 (comment)
+#. Documentation/user/tweaks.itely:1460 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr "Réduction d'environ 24 % de toutes les tailles de fonte"
 
-#. Documentation/user/tweaks.itely:1418 (comment)
+#. Documentation/user/tweaks.itely:1526 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 "Réduction de la taille des hampes et de l'interligne pour ne pas déborder"
 
-#. Documentation/user/tweaks.itely:1828 (comment)
-#. Documentation/user/tweaks.itely:1895 (comment)
+#. Documentation/user/tweaks.itely:1956 (comment)
+#. Documentation/user/tweaks.itely:2026 (comment)
 msgid "Set details for later Text Spanner"
 msgstr "Réglage des détails du texte avec extension"
 
-#. Documentation/user/tweaks.itely:1831 (comment)
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2029 (comment)
 msgid "Place dynamics above staff"
 msgstr "Positionnement des nuances au-dessus de la portée"
 
-#. Documentation/user/tweaks.itely:1833 (comment)
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1961 (comment)
+#. Documentation/user/tweaks.itely:2033 (comment)
 msgid "Start Ottava Bracket"
 msgstr "Début du crochet d'octavation"
 
-#. Documentation/user/tweaks.itely:1836 (comment)
-#. Documentation/user/tweaks.itely:1843 (comment)
-#. Documentation/user/tweaks.itely:1905 (comment)
-#. Documentation/user/tweaks.itely:1912 (comment)
+#. Documentation/user/tweaks.itely:1964 (comment)
+#. Documentation/user/tweaks.itely:1971 (comment)
+#. Documentation/user/tweaks.itely:2036 (comment)
+#. Documentation/user/tweaks.itely:2043 (comment)
 msgid "Add Dynamic Text"
 msgstr "Ajout d'une nuance textuelle"
 
-#. Documentation/user/tweaks.itely:1838 (comment)
-#. Documentation/user/tweaks.itely:1907 (comment)
+#. Documentation/user/tweaks.itely:1966 (comment)
+#. Documentation/user/tweaks.itely:2038 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr "Ajout d'une nuance graphique"
 
-#. Documentation/user/tweaks.itely:1840 (comment)
-#. Documentation/user/tweaks.itely:1909 (comment)
+#. Documentation/user/tweaks.itely:1968 (comment)
+#. Documentation/user/tweaks.itely:2040 (comment)
 msgid "Add Text Script"
 msgstr "Ajout d'un commentaire textuel"
 
-#. Documentation/user/tweaks.itely:1845 (comment)
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1973 (comment)
+#. Documentation/user/tweaks.itely:2045 (comment)
 msgid "Stop Ottava Bracket"
 msgstr "Fin du crochet d'octavation"
 
-#. Documentation/user/tweaks.itely:1900 (comment)
+#. Documentation/user/tweaks.itely:2031 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr "Positionnement du crochet d'octavation sous le texte avec extension"
 
-#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2093 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr "Force les notes à s'espacer selon le texte"
 
-#. Documentation/user/tweaks.itely:1979 (comment)
+#. Documentation/user/tweaks.itely:2116 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr "Ce morceau de texte est assez court pour ne pas faire de collision"
 
-#. Documentation/user/tweaks.itely:1983 (comment)
+#. Documentation/user/tweaks.itely:2120 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr "Celui-ci est trop long pour tenir, il est déplacé vers le haut"
 
-#. Documentation/user/tweaks.itely:1987 (comment)
-#. Documentation/user/tweaks.itely:1992 (comment)
+#. Documentation/user/tweaks.itely:2124 (comment)
+#. Documentation/user/tweaks.itely:2129 (comment)
 msgid "Turn off collision avoidance"
 msgstr "Désactivation du processus d'évitement de collision"
 
-#. Documentation/user/tweaks.itely:1994 (comment)
+#. Documentation/user/tweaks.itely:2131 (comment)
 msgid "and turn on textLengthOn"
 msgstr "activation de textLengthOn"
 
-#. Documentation/user/tweaks.itely:1995 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "Spaces at end are honored"
 msgstr "Les espaces de la fin sont pris en compte"
 
-#. Documentation/user/tweaks.itely:2096 (comment)
+#. Documentation/user/tweaks.itely:2239 (comment)
 msgid "Extend width by 1 staff space"
 msgstr "Élargissement d'un espace"
 
-#. Documentation/user/tweaks.itely:2373 (comment)
+#. Documentation/user/tweaks.itely:2522 (comment)
 msgid "This will not work, see below:"
 msgstr "La commande suivante est sans résultat ; voir plus loin."
 
-#. Documentation/user/tweaks.itely:2377 (comment)
+#. Documentation/user/tweaks.itely:2526 (comment)
 msgid "This works:"
 msgstr "Celle-ci produit le résultat escompté"
 
-#. Documentation/user/tweaks.itely:2422 (variable)
+#. Documentation/user/tweaks.itely:2577 (variable)
 msgid "naturalplusflat"
 msgstr "becarreplusbemol"
 
-#. Documentation/user/tweaks.itely:2458 (comment)
+#. Documentation/user/tweaks.itely:2618 (comment)
 msgid "Extend width by 1 unit"
 msgstr "Élargissement d'une unité"
 
-#. Documentation/user/tweaks.itely:2460 (comment)
+#. Documentation/user/tweaks.itely:2620 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 "Alignement des nuances sur une ligne de base à 2 unités au-dessus de la "
 "portée"
 
-#. Documentation/user/tweaks.itely:2745 (variable)
-#. Documentation/user/tweaks.itely:2794 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2925 (variable)
-#. Documentation/user/tweaks.itely:2987 (variable)
-#. Documentation/user/tweaks.itely:3042 (variable)
+#. Documentation/user/tweaks.itely:2924 (variable)
+#. Documentation/user/tweaks.itely:2973 (variable)
+#. Documentation/user/tweaks.itely:3034 (variable)
+#. Documentation/user/tweaks.itely:3104 (variable)
+#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3229 (variable)
 msgid "rhMusic"
 msgstr "mdMusique"
 
-#. Documentation/user/tweaks.itely:2750 (comment)
-#. Documentation/user/tweaks.itely:2799 (comment)
-#. Documentation/user/tweaks.itely:2862 (comment)
-#. Documentation/user/tweaks.itely:2934 (comment)
-#. Documentation/user/tweaks.itely:2996 (comment)
+#. Documentation/user/tweaks.itely:2929 (comment)
+#. Documentation/user/tweaks.itely:2978 (comment)
+#. Documentation/user/tweaks.itely:3041 (comment)
+#. Documentation/user/tweaks.itely:3113 (comment)
+#. Documentation/user/tweaks.itely:3178 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr "Début d'une section polyphonique de quatre voix"
 
-#. Documentation/user/tweaks.itely:2763 (variable)
-#. Documentation/user/tweaks.itely:2812 (variable)
-#. Documentation/user/tweaks.itely:2875 (variable)
-#. Documentation/user/tweaks.itely:2949 (variable)
-#. Documentation/user/tweaks.itely:3013 (variable)
-#. Documentation/user/tweaks.itely:3070 (variable)
+#. Documentation/user/tweaks.itely:2942 (variable)
+#. Documentation/user/tweaks.itely:2991 (variable)
+#. Documentation/user/tweaks.itely:3054 (variable)
+#. Documentation/user/tweaks.itely:3128 (variable)
+#. Documentation/user/tweaks.itely:3195 (variable)
+#. Documentation/user/tweaks.itely:3257 (variable)
 msgid "lhMusic"
 msgstr "mgMusique"
 
-#. Documentation/user/tweaks.itely:2772 (context id)
-#. Documentation/user/tweaks.itely:2821 (context id)
-#. Documentation/user/tweaks.itely:2884 (context id)
-#. Documentation/user/tweaks.itely:2958 (context id)
-#. Documentation/user/tweaks.itely:3022 (context id)
-#. Documentation/user/tweaks.itely:3079 (context id)
-#. Documentation/user/input.itely:928 (context id)
+#. Documentation/user/tweaks.itely:2951 (context id)
+#. Documentation/user/tweaks.itely:3000 (context id)
+#. Documentation/user/tweaks.itely:3063 (context id)
+#. Documentation/user/tweaks.itely:3137 (context id)
+#. Documentation/user/tweaks.itely:3204 (context id)
+#. Documentation/user/tweaks.itely:3266 (context id)
+#. Documentation/user/input.itely:959 (context id)
 msgid "RH"
 msgstr "MD"
 
-#. Documentation/user/tweaks.itely:2776 (context id)
-#. Documentation/user/tweaks.itely:2825 (context id)
-#. Documentation/user/tweaks.itely:2888 (context id)
-#. Documentation/user/tweaks.itely:2962 (context id)
-#. Documentation/user/tweaks.itely:3026 (context id)
-#. Documentation/user/tweaks.itely:3083 (context id)
-#. Documentation/user/input.itely:934 (context id)
+#. Documentation/user/tweaks.itely:2955 (context id)
+#. Documentation/user/tweaks.itely:3004 (context id)
+#. Documentation/user/tweaks.itely:3067 (context id)
+#. Documentation/user/tweaks.itely:3141 (context id)
+#. Documentation/user/tweaks.itely:3208 (context id)
+#. Documentation/user/tweaks.itely:3270 (context id)
+#. Documentation/user/input.itely:965 (context id)
 msgid "LH"
 msgstr "MG"
 
-#. Documentation/user/tweaks.itely:3000 (comment)
-#. Documentation/user/tweaks.itely:3057 (comment)
+#. Documentation/user/tweaks.itely:3182 (comment)
+#. Documentation/user/tweaks.itely:3244 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr "Déplace le do2 pour que la fusion puisse fonctionner"
 
-#. Documentation/user/tweaks.itely:3003 (comment)
-#. Documentation/user/tweaks.itely:3060 (comment)
+#. Documentation/user/tweaks.itely:3185 (comment)
+#. Documentation/user/tweaks.itely:3247 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr "La hampe du ré2 ira vers le bas pour permettre la fusion"
 
-#. Documentation/user/tweaks.itely:3055 (comment)
+#. Documentation/user/tweaks.itely:3242 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr "Repositionnement du do2 à droite de la note fusionnée"
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3204 (comment)
+#. Documentation/user/tweaks.itely:3378 (comment)
+#. Documentation/user/tweaks.itely:3400 (comment)
 msgid "Visible tempo marking"
 msgstr "Indication de tempo visible"
 
-#. Documentation/user/tweaks.itely:3189 (comment)
-#. Documentation/user/tweaks.itely:3208 (comment)
+#. Documentation/user/tweaks.itely:3382 (comment)
+#. Documentation/user/tweaks.itely:3404 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr "Indication de tempo invisible ; utilisée pour le MIDI"
 
-#. Documentation/user/tweaks.itely:3192 (comment)
-#. Documentation/user/tweaks.itely:3211 (comment)
+#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3407 (comment)
 msgid "New tempo for next section"
 msgstr "Nouveau tempo pour la section suivante"
 
-#. Documentation/user/tweaks.itely:3259 (variable)
+#. Documentation/user/tweaks.itely:3459 (variable)
 msgid "emphasize"
 msgstr "emphase"
 
-#. Documentation/user/tweaks.itely:3263 (variable)
+#. Documentation/user/tweaks.itely:3463 (variable)
 msgid "normal"
 msgstr "normal"
 
-#. Documentation/user/tweaks.itely:3269 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
 msgid "SopranoMusic"
 msgstr "sopranoMusique"
 
-#. Documentation/user/tweaks.itely:3282 (context id)
-#. Documentation/user/input.itely:913 (context id)
+#. Documentation/user/tweaks.itely:3482 (context id)
+#. Documentation/user/input.itely:944 (context id)
 msgid "Soprano"
 msgstr "Soprano"
 
-#. Documentation/user/tweaks.itely:3487 (comment)
+#. Documentation/user/tweaks.itely:3691 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr "Arranger pour obtenir une couleur par la procédure color-notehead"
 
@@ -4166,16 +4168,16 @@ msgid "Musical notation"
 msgstr "Notation musicale générale"
 
 #. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:997 (variable)
-#. Documentation/user/input.itely:1016 (variable)
-#. Documentation/user/input.itely:1053 (variable)
-#. Documentation/user/input.itely:1068 (variable)
+#. Documentation/user/input.itely:1028 (variable)
+#. Documentation/user/input.itely:1047 (variable)
+#. Documentation/user/input.itely:1084 (variable)
+#. Documentation/user/input.itely:1099 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
 #. input/lsr/string-quartet-template-with-separate-parts.ly:98 (variable)
 #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:136 (variable)
-#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:35 (variable)
+#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:50 (variable)
 msgid "music"
 msgstr "musique"
 
@@ -4184,7 +4186,7 @@ msgid "not strictly necessary, but a good reminder"
 msgstr "pas strictement nécessaire, mais en pense-bête"
 
 #. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1100 (variable)
+#. Documentation/user/staff.itely:1084 (variable)
 msgid "clarinet"
 msgstr "clarinette"
 
@@ -4594,62 +4596,50 @@ msgstr "ceci n'est pas en concordance"
 msgid "this will"
 msgstr "ceci est conforme"
 
-#. Documentation/user/rhythms.itely:1689 (comment)
-msgid "Set default beaming for all staves"
-msgstr "définition des règles de ligature pour toutes les portées"
-
-#. Documentation/user/rhythms.itely:1697 (comment)
-msgid "Modify beaming for just this staff"
-msgstr "changement des règles de ligature seulement pour cette portée"
-
-#. Documentation/user/rhythms.itely:1703 (comment)
-msgid "Inherit beaming from Score context"
-msgstr "héritage des règles de ligature du contexte Score"
-
-#. Documentation/user/rhythms.itely:1827 (comment)
+#. Documentation/user/rhythms.itely:1802 (comment)
 msgid "revert to non-feathered beams"
 msgstr "retour à des liens de croches rectilignes"
 
-#. Documentation/user/rhythms.itely:2050 (comment)
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2025 (comment)
+#. Documentation/user/rhythms.itely:2041 (comment)
 msgid "Permit first bar number to be printed"
 msgstr "Le numéro de la première mesure est imprimé"
 
-#. Documentation/user/rhythms.itely:2067 (comment)
-#. Documentation/user/rhythms.itely:2115 (comment)
+#. Documentation/user/rhythms.itely:2042 (comment)
+#. Documentation/user/rhythms.itely:2090 (comment)
 msgid "Print a bar number every second measure"
 msgstr "Affichage du numéro toutes les deux mesures"
 
-#. Documentation/user/rhythms.itely:2083 (comment)
+#. Documentation/user/rhythms.itely:2058 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr "Affichage du numéro à chaque mesure, hormis en fin de ligne"
 
-#. Documentation/user/rhythms.itely:2087 (comment)
-#. Documentation/user/rhythms.itely:2113 (comment)
+#. Documentation/user/rhythms.itely:2062 (comment)
+#. Documentation/user/rhythms.itely:2088 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr "Augmentation de la taille des numéros de mesure au double"
 
-#. Documentation/user/rhythms.itely:2091 (comment)
+#. Documentation/user/rhythms.itely:2066 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr "Numéros de mesure encadrés dans un rectangle"
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2071 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr "Numéros de mesure encadrés dans un cercle"
 
-#. Documentation/user/rhythms.itely:2118 (comment)
+#. Documentation/user/rhythms.itely:2093 (comment)
 msgid "Center-align bar numbers"
 msgstr "Alignement au centre des numéros de mesure"
 
-#. Documentation/user/rhythms.itely:2121 (comment)
+#. Documentation/user/rhythms.itely:2096 (comment)
 msgid "Right-align bar numbers"
 msgstr "Alignement à droite des numéros de mesure"
 
-#. Documentation/user/rhythms.itely:2224 (variable)
+#. Documentation/user/rhythms.itely:2199 (variable)
 msgid "pipeSymbol"
 msgstr "pipeSymbole"
 
-#. Documentation/user/rhythms.itely:2612 (variable)
+#. Documentation/user/rhythms.itely:2587 (variable)
 msgid "MyCadenza"
 msgstr "MaCadence"
 
@@ -5221,7 +5211,7 @@ msgstr "Trilles"
 msgid "trill"
 msgstr "trille"
 
-#. Documentation/user/repeats.itely:298 (variable)
+#. Documentation/user/repeats.itely:299 (variable)
 #. input/lsr/volta-text-markup-using-repeatcommands.ly:21 (variable)
 msgid "voltaAdLib"
 msgstr "voltaAdLib"
@@ -5487,24 +5477,24 @@ msgstr "partie"
 msgid "Writing music in parallel"
 msgstr "Saisie la musique en parallèle"
 
-#. Documentation/user/staff.itely:1069 (variable)
-#. Documentation/user/staff.itely:1084 (variable)
-#. Documentation/user/staff.itely:1238 (variable)
+#. Documentation/user/staff.itely:1053 (variable)
+#. Documentation/user/staff.itely:1068 (variable)
+#. Documentation/user/staff.itely:1222 (variable)
 msgid "flute"
 msgstr "flute"
 
-#. Documentation/user/staff.itely:1189 (variable)
-#. Documentation/user/staff.itely:1210 (variable)
+#. Documentation/user/staff.itely:1173 (variable)
+#. Documentation/user/staff.itely:1194 (variable)
 msgid "oboe"
 msgstr "hautbois"
 
-#. Documentation/user/staff.itely:1259 (variable)
-#. Documentation/user/staff.itely:1275 (context id)
+#. Documentation/user/staff.itely:1243 (variable)
+#. Documentation/user/staff.itely:1259 (context id)
 msgid "piccolo"
 msgstr "piccolo"
 
-#. Documentation/user/staff.itely:1267 (variable)
-#. Documentation/user/staff.itely:1276 (context id)
+#. Documentation/user/staff.itely:1251 (variable)
+#. Documentation/user/staff.itely:1260 (context id)
 msgid "cbassoon"
 msgstr "cbasson"
 
@@ -5536,16 +5526,20 @@ msgstr "Gravure des portées"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Instantiating new staves"
 msgstr "Initialisation de nouvelles portées"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staff"
 msgstr "portée"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staves"
 msgstr "portées"
 
@@ -5562,11 +5556,13 @@ msgstr "Regroupement de portées"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "bracket"
 msgstr "crochet"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "grand staff"
 msgstr "système"
 
@@ -5576,6 +5572,8 @@ msgstr "système"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Nested staff groups"
 msgstr "Imbrication de regroupements de portées"
 
@@ -5585,6 +5583,8 @@ msgstr "Imbrication de regroupements de portées"
 #. @subsection in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @subsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @subsection in Documentation/de/user/staff.itely
 msgid "Modifying single staves"
 msgstr "Modification de portées individuelles"
 
@@ -5601,11 +5601,13 @@ msgstr "Symbole de la portée"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "line"
 msgstr "ligne"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ledger line"
 msgstr "ligne supplémentaire"
 
@@ -5615,11 +5617,14 @@ msgstr "ligne supplémentaire"
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Ossia staves"
 msgstr "Portées d'ossia"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "Frenched staff"
 msgstr "Portée à la française"
 
@@ -5658,21 +5663,25 @@ msgstr "Indications métronomiques"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome"
 msgstr "métronome"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronomic indication"
 msgstr "indication métronomique"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "tempo indication"
 msgstr "indication du tempo"
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome mark"
 msgstr "marque métronomique"
 
@@ -5999,6 +6008,8 @@ msgstr "Fontes"
 #. @unnumberedsubsubsec in Documentation/user/text.itely
 #. @node in Documentation/es/user/text.itely
 #. @unnumberedsubsubsec in Documentation/es/user/text.itely
+#. @node in Documentation/de/user/text.itely
+#. @unnumberedsubsubsec in Documentation/de/user/text.itely
 msgid "Fonts explained"
 msgstr "Tout savoir sur les fontes"
 
@@ -6032,7 +6043,8 @@ msgid "Specialist notation"
 msgstr "Notation spécialisée"
 
 #. Documentation/user/vocal.itely:509 (comment)
-msgid "not recommended: left aligns syllables "
+#, fuzzy
+msgid "not recommended: left aligns syllables"
 msgstr "peu recommandable : les paroles sont alignées à gauche"
 
 #. Documentation/user/vocal.itely:512 (comment)
@@ -6073,7 +6085,8 @@ msgid "applies to \\\"fas\\\""
 msgstr "s'applique à \\\"fas\\\""
 
 #. Documentation/user/vocal.itely:1282 (comment)
-msgid "moves the column off the left margin; "
+#, fuzzy
+msgid "moves the column off the left margin;"
 msgstr "décalage par rapport à la marge de gauche"
 
 #. Documentation/user/vocal.itely:1283 (comment)
@@ -6086,11 +6099,13 @@ msgid "adds vertical spacing between verses"
 msgstr "ajout d'espace vertical entre les couplets"
 
 #. Documentation/user/vocal.itely:1299 (comment)
-msgid "adds horizontal spacing between columns; "
+#, fuzzy
+msgid "adds horizontal spacing between columns;"
 msgstr "ajout d'espace horizontal entre les colonnes"
 
 #. Documentation/user/vocal.itely:1300 (comment)
-msgid "if they are still too close, add more \\\" \\\" pairs  "
+#, fuzzy
+msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr ""
 "si elles sont toujours trop proches, ajouter d'autres paires de \\\" \\\""
 
@@ -6099,7 +6114,8 @@ msgid "until the result looks good"
 msgstr "jusqu'à ce que le résultat soit acceptable."
 
 #. Documentation/user/vocal.itely:1317 (comment)
-msgid "gives some extra space on the right margin; "
+#, fuzzy
+msgid "gives some extra space on the right margin;"
 msgstr "décalage par rapport à la marge de droite"
 
 #. Documentation/user/vocal.itely:1318 (comment)
@@ -7628,11 +7644,11 @@ msgstr "Exemple concret de musique arabe"
 msgid "Further reading"
 msgstr "Autres sources d'information"
 
-#. Documentation/user/input.itely:494 (comment)
+#. Documentation/user/input.itely:525 (comment)
 msgid "not printed"
 msgstr "non imprimé"
 
-#. Documentation/user/input.itely:911 (variable)
+#. Documentation/user/input.itely:942 (variable)
 msgid "allLyrics"
 msgstr "tuttiParoles"
 
@@ -7971,43 +7987,43 @@ msgstr "Égalisation de plusieurs instruments (ii)"
 msgid "Percussion in MIDI"
 msgstr "MIDI et percussions"
 
-#. Documentation/user/spacing.itely:872 (comment)
+#. Documentation/user/spacing.itely:875 (comment)
 msgid "this does nothing"
 msgstr "ceci est sans effet"
 
-#. Documentation/user/spacing.itely:873 (comment)
+#. Documentation/user/spacing.itely:876 (comment)
 msgid "a break here would work"
 msgstr "une rupture serait ici acceptée"
 
-#. Documentation/user/spacing.itely:874 (comment)
+#. Documentation/user/spacing.itely:877 (comment)
 msgid "as does this break"
 msgstr "à l'instar de celle-ci"
 
-#. Documentation/user/spacing.itely:886 (comment)
+#. Documentation/user/spacing.itely:889 (comment)
 msgid "now the break is allowed"
 msgstr "le saut de ligne est maintenant autorisé"
 
-#. Documentation/user/spacing.itely:1719 (comment)
+#. Documentation/user/spacing.itely:1777 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr "cette fois, le texte est plus proche de la portée"
 
-#. Documentation/user/spacing.itely:1721 (comment)
+#. Documentation/user/spacing.itely:1779 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr "definir outside-staff-priority à autre chose qu'un nombre"
 
-#. Documentation/user/spacing.itely:1722 (comment)
+#. Documentation/user/spacing.itely:1780 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr "désactive l'évitement automatique de collision"
 
-#. Documentation/user/spacing.itely:1725 (comment)
+#. Documentation/user/spacing.itely:1783 (comment)
 msgid "now they will collide"
 msgstr "il y a maintenant chevauchement"
 
-#. Documentation/user/spacing.itely:1750 (comment)
+#. Documentation/user/spacing.itely:1808 (comment)
 msgid "the markup is too close to the following note"
 msgstr "le texte est trop proche de la note qui suit"
 
-#. Documentation/user/spacing.itely:1753 (comment)
+#. Documentation/user/spacing.itely:1811 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr "définir outside-staff-horizontal-padding règle le problème"
 
@@ -8059,6 +8075,8 @@ msgstr "Mise en forme de la page"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Vertical dimensions"
 msgstr "Dimensionnement vertical"
 
@@ -8066,6 +8084,8 @@ msgstr "Dimensionnement vertical"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Horizontal dimensions"
 msgstr "Dimensionnement horizontal"
 
@@ -8073,6 +8093,8 @@ msgstr "Dimensionnement horizontal"
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Other layout variables"
 msgstr "Autres variables de mise en forme"
 
@@ -8360,87 +8382,87 @@ msgstr "Mise en évidence de l'espacement"
 msgid "Changing spacing"
 msgstr "Modification de l'espacement"
 
-#. Documentation/user/changing-defaults.itely:2002 (comment)
+#. Documentation/user/changing-defaults.itely:1990 (comment)
 msgid "increase the length of the tie"
 msgstr "augmentation de la longueur de la liaison"
 
-#. Documentation/user/changing-defaults.itely:2011 (comment)
+#. Documentation/user/changing-defaults.itely:1999 (comment)
 msgid "increase the length of the rest bar"
 msgstr "augmentation de la longueur de la mesure de silence"
 
-#. Documentation/user/changing-defaults.itely:2019 (comment)
+#. Documentation/user/changing-defaults.itely:2007 (comment)
 msgid "increase the length of the hairpin"
 msgstr "augmentation de la longueur du soufflet"
 
-#. Documentation/user/changing-defaults.itely:2047 (comment)
+#. Documentation/user/changing-defaults.itely:2035 (comment)
 msgid "default"
 msgstr "comportement par défaut"
 
-#. Documentation/user/changing-defaults.itely:2050 (comment)
-#. Documentation/user/changing-defaults.itely:2063 (comment)
+#. Documentation/user/changing-defaults.itely:2038 (comment)
+#. Documentation/user/changing-defaults.itely:2051 (comment)
 msgid "not effective alone"
 msgstr "ne fonctionne pas tout seul"
 
-#. Documentation/user/changing-defaults.itely:2054 (comment)
-#. Documentation/user/changing-defaults.itely:2067 (comment)
+#. Documentation/user/changing-defaults.itely:2042 (comment)
+#. Documentation/user/changing-defaults.itely:2055 (comment)
 msgid "effective only when both overrides are present"
 msgstr "effectivité si les deux modifications sont explicitées"
 
-#. Documentation/user/changing-defaults.itely:2444 (comment)
+#. Documentation/user/changing-defaults.itely:2432 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr "Suppression de la barre de mesure à la fin de la ligne en cours"
 
-#. Documentation/user/changing-defaults.itely:2490 (comment)
+#. Documentation/user/changing-defaults.itely:2478 (comment)
 msgid "Try to remove all key signatures"
 msgstr "Tentative de suppression de toutes les armures"
 
-#. Documentation/user/changing-defaults.itely:2909 (comment)
+#. Documentation/user/changing-defaults.itely:2897 (comment)
 msgid "move horizontally left"
 msgstr "déplacement vers la droite"
 
-#. Documentation/user/changing-defaults.itely:2911 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "move vertically up"
 msgstr "déplacement vers le haut"
 
-#. Documentation/user/changing-defaults.itely:2912 (comment)
+#. Documentation/user/changing-defaults.itely:2900 (comment)
 msgid "third finger"
 msgstr "troisième doigt"
 
-#. Documentation/user/changing-defaults.itely:2958 (comment)
+#. Documentation/user/changing-defaults.itely:2946 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr "Pour centrer le repère au-dessus de la clef"
 
-#. Documentation/user/changing-defaults.itely:2964 (comment)
+#. Documentation/user/changing-defaults.itely:2952 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr "Pour centrer le repère au-dessus de la métrique"
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2966 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr "Pour centrer le repère au-dessus de l'armure"
 
-#. Documentation/user/changing-defaults.itely:2985 (comment)
-#. Documentation/user/changing-defaults.itely:3001 (comment)
-#. Documentation/user/changing-defaults.itely:3008 (comment)
+#. Documentation/user/changing-defaults.itely:2973 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr "Pour aligner le repère sur le coin gauche de l'armure"
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
+#. Documentation/user/changing-defaults.itely:2978 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr "Pour aligner le repère sur le coin droit de l'armure"
 
-#. Documentation/user/changing-defaults.itely:3002 (comment)
+#. Documentation/user/changing-defaults.itely:2990 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr "puis décaler vers la droite de 3,5 espaces"
 
-#. Documentation/user/changing-defaults.itely:3009 (comment)
+#. Documentation/user/changing-defaults.itely:2997 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr "puis décaler vers la gauche de 2 espaces"
 
-#. Documentation/user/changing-defaults.itely:3058 (variable)
+#. Documentation/user/changing-defaults.itely:3046 (variable)
 msgid "XinO"
 msgstr "XdansO"
 
@@ -9447,7 +9469,8 @@ msgid "Cheat sheet"
 msgstr "Aide-mémoire"
 
 #. @top in Documentation/fr/user/lilypond-learning.tely
-msgid "GNU LilyPond --- manuel d'initiation"
+#, fuzzy
+msgid "GNU LilyPond --- Manuel d'initiation"
 msgstr "GNU LilyPond --- manuel d'initiation"
 
 #. @subsubheading in Documentation/fr/user/macros.itexi
@@ -9501,8 +9524,9 @@ msgid "Updating old files"
 msgstr "Mise à jour d'anciens fichiers"
 
 #. @top in Documentation/fr/user/lilypond-program.tely
-msgid "GNU LilyPond --- utilisation des programmes"
-msgstr ""
+#, fuzzy
+msgid "GNU LilyPond --- Utilisation des programmes"
+msgstr "GNU LilyPond --- Utilisation du programme"
 
 #. @node in Documentation/fr/user/setup.itely
 #. @subsection in Documentation/fr/user/setup.itely
@@ -9517,8 +9541,9 @@ msgid "Updating with @command{convert-ly}"
 msgstr "Mise à jour avec @command{convert-ly}"
 
 #. @top in Documentation/fr/user/lilypond.tely
-msgid "GNU LilyPond --- manuel de notation"
-msgstr ""
+#, fuzzy
+msgid "GNU LilyPond --- Manuel de notation"
+msgstr "GNU LilyPond --- manuel d'initiation"
 
 #. @node in Documentation/fr/user/repeats.itely
 #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely
@@ -9783,11 +9808,6 @@ msgstr "GNU LilyPond --- utilisation du programme"
 msgid "GNU LilyPond -- Das Notationsprogramm"
 msgstr ""
 
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr "Délimitations en début de système"
-
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @section in Documentation/de/user/changing-defaults.itely
 msgid "Common properties"
@@ -10389,10 +10409,55 @@ msgstr "Barres de ligature"
 msgid "Use the macro"
 msgstr ""
 
-#. input/lsr/beam-grouping-in-7-8-time.ly:30 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+msgid "Set default beaming for all staves"
+msgstr "définition des règles de ligature pour toutes les portées"
+
+#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+msgid "Modify beaming for just this staff"
+msgstr "changement des règles de ligature seulement pour cette portée"
+
+#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+msgid "Inherit beaming from Score context"
+msgstr "héritage des règles de ligature du contexte Score"
+
+#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+#, fuzzy
+msgid "Modify beaming for this voice only"
+msgstr "changement des règles de ligature seulement pour cette portée"
+
+#. input/lsr/beam-grouping-in-7-8-time.ly:40 (comment)
 msgid "rhythm 2-3-2"
 msgstr "subdivision 2-3-2"
 
+#. input/lsr/book-parts.ly:21 (comment)
+msgid "book paper, which is inherited by all children bookparts"
+msgstr ""
+
+#. input/lsr/book-parts.ly:24 (comment)
+msgid "Page footer: add a different part-tagline at part last page"
+msgstr ""
+
+#. input/lsr/book-parts.ly:28 (comment)
+msgid "Copyright header field only on book first page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:32 (comment)
+msgid "Part tagline header field only on each part last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:36 (comment)
+msgid "Tagline header field only on book last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:43 (comment)
+msgid "book header, which is inherited by the first bookpart"
+msgstr ""
+
+#. input/lsr/book-parts.ly:52 (comment)
+msgid "a different page breaking function may be used on each part"
+msgstr ""
+
 #. input/lsr/breathing-signs.ly:19 (comment)
 msgid "this bar contains no \\breathe"
 msgstr ""
@@ -10481,17 +10546,17 @@ msgstr ""
 msgid "}"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:24 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:35 (comment)
 #, fuzzy
 msgid "Change time signature symbol but keep 3/4 beaming"
 msgstr "la métrique change mais on garde les règles de ligatures en 3/4"
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:25 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:36 (comment)
 #, fuzzy
 msgid "due to unchanged underlying time signature"
 msgstr "car la durée de pulsation n'a pas changée"
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:30 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:41 (comment)
 #, fuzzy
 msgid "Lose 3/4 beaming now \\time has been changed"
 msgstr ""
@@ -10667,58 +10732,58 @@ msgstr ""
 msgid "label below string"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:22 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:40 (comment)
 msgid "add FretBoards for the Cuatro"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:23 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:41 (comment)
 msgid "Note: This section could be put into a separate file"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:24 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:42 (comment)
 #, fuzzy
 msgid "predefined-cuatro-fretboards.ly"
 msgstr "Tablatures prédéfinies"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:25 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:43 (comment)
 msgid "and \\included into each of your compositions"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:27 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:45 (variable)
 msgid "cuatroTuning"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:29 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:47 (variable)
 msgid "dSix"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:30 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:48 (variable)
 #, fuzzy
 msgid "dMajor"
 msgstr "majeur"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:31 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:49 (variable)
 msgid "aMajSeven"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:32 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:50 (variable)
 msgid "dMajSeven"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:33 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (variable)
 #, fuzzy
 msgid "gMajor"
 msgstr "majeur"
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:56 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable)
 msgid "primerosNames"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:60 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:78 (variable)
 msgid "primeros"
 msgstr ""
 
@@ -10727,7 +10792,7 @@ msgstr ""
 msgid "baseMelody"
 msgstr "melodie"
 
-#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:39 (comment)
+#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:37 (comment)
 msgid "Must be lower than the actual number of staff lines"
 msgstr ""
 
@@ -10962,19 +11027,19 @@ msgstr ""
 msgid "Cut here ----- End 'flamenco.ly' "
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:58 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:109 (comment)
 msgid "Example 1"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:65 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:116 (comment)
 msgid "Example 2"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:72 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:123 (comment)
 msgid "Example 3"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:86 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:137 (comment)
 msgid "Example 4"
 msgstr ""
 
@@ -11007,46 +11072,44 @@ msgstr ""
 msgid "110% of default size"
 msgstr "retour à la taille par défaut"
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:26 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:33 (comment)
+msgid "this moves them up one staff space from the default position"
+msgstr ""
+
+#. input/lsr/grid-lines--changing-their-appearance.ly:51 (comment)
 msgid "set up grids"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:28 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:53 (comment)
 msgid "set the grid interval to one quarter note"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:35 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:59 (comment)
 msgid "this moves them to the right half a staff space"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:48 (comment)
-msgid "this moves them up one staff space from the default position"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:36 (comment)
+msgid "hides staff and notes so that only the grid lines are visible"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:27 (comment)
-msgid "sets of grid"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:43 (comment)
+msgid "dummy notes to force regular note spacing"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:33 (comment)
-#, fuzzy
-msgid "lines length"
-msgstr "Longueur de ligne"
-
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:48 (comment)
-msgid "centers grid lines  horizontally below noteheads"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:59 (comment)
+msgid "center grid lines horizontally below note heads"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:62 (comment)
-#, fuzzy
-msgid "making sure the lines will be placed outside the Staff"
-msgstr "cette fois, le texte est plus proche de la portée"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:66 (comment)
+msgid "set line length and positioning:"
+msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:65 (comment)
-msgid "hides staff and notes so that only the grid lines are visible"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:67 (comment)
+msgid "two staff spaces above center line on hidden staff"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:75 (comment)
-msgid "you have to put 'dummy' notes here to force regular grid spacing..."
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:68 (comment)
+msgid "to four spaces below center line on visible staff"
 msgstr ""
 
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
@@ -11514,7 +11577,7 @@ msgstr "normal"
 msgid "TAB"
 msgstr ""
 
-#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:37 (variable)
+#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:51 (variable)
 msgid "dashPlus"
 msgstr ""
 
@@ -11535,15 +11598,15 @@ msgstr ""
 msgid "stick"
 msgstr "musique"
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:38 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:39 (comment)
 msgid "Permit line breaks within tuplets"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:40 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:41 (comment)
 msgid "Allow beams to be broken at line breaks"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:47 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:48 (comment)
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
@@ -11565,35 +11628,35 @@ msgstr ""
 msgid "tab"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:30 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
 msgid "Multi-measure rests by default are set under the second line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:32 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
 msgid "They can be moved with an override"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:35 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:46 (comment)
 msgid "A value of 0 is the default position;"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:36 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:47 (comment)
 msgid "the following trick moves the rest to the center line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:39 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:50 (comment)
 msgid "Multi-measure rests in odd-numbered voices are under the top line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:52 (comment)
 msgid "Multi-measure rests in even-numbered voices are under the bottom line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:54 (comment)
 msgid "They remain separated even in empty measures"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:45 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:56 (comment)
 msgid "This brings them together even though there are two voices"
 msgstr ""
 
@@ -12275,11 +12338,11 @@ msgstr ""
 msgid "(This is the Cello part file)"
 msgstr ""
 
-#. input/lsr/sub-dividing-beams.ly:49 (comment)
+#. input/lsr/sub-dividing-beams.ly:50 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr "Subdivision des ligatures à la croche"
 
-#. input/lsr/sub-dividing-beams.ly:53 (comment)
+#. input/lsr/sub-dividing-beams.ly:54 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr "Subdivision des ligatures à la double-croche"
 
@@ -12413,52 +12476,52 @@ msgstr ""
 msgid "Here we go back to the normal clef:"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:22 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:34 (comment)
 msgid "The default in 3/4 time is to beam in three groups"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:23 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
 msgid "each of a quarter note length"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:27 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:39 (comment)
 msgid "No auto-beaming is defined for 12/16"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:31 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
 #, fuzzy
 msgid "Change time signature symbol, but retain underlying 3/4 beaming"
 msgstr "la métrique change mais on garde les règles de ligatures en 3/4"
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment)
 msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:36 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
 msgid "are not consistent with a measureLength of 3/4, so the beams"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:37 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
 msgid "are grouped at beatLength intervals"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:41 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:53 (comment)
 msgid "Specify beams in groups of (3 3 2 3) 1/16th notes"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:42 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:54 (comment)
 msgid "3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply,"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:55 (comment)
 msgid "and beams are grouped at beatLength (1/16) intervals"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:60 (comment)
 msgid "Specify beams in groups of (3 4 2 3) 1/16th notes"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:61 (comment)
 msgid "3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies"
 msgstr ""
 
@@ -12641,6 +12704,17 @@ msgstr "Notes de bas de page"
 msgid "Table of Contents"
 msgstr "Table des matières"
 
+#~ msgid "System start delimiters"
+#~ msgstr "Délimitations en début de système"
+
+#, fuzzy
+#~ msgid "lines length"
+#~ msgstr "Longueur de ligne"
+
+#, fuzzy
+#~ msgid "making sure the lines will be placed outside the Staff"
+#~ msgstr "cette fois, le texte est plus proche de la portée"
+
 #~ msgid "auto beam on 1/4 note groups"
 #~ msgstr "ligature automatique par noire"
 
index 99f1b6ed87981c6a36c9d6fdd9a3c17405f7d169..cad7e9bbaa1c40346bdd40feff7c347a68d10149 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 17:44+0100\n"
+"POT-Creation-Date: 2008-11-22 20:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1247,6 +1247,7 @@ msgstr ""
 #. @rglos in Documentation/es/user/tutorial.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tutorial.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "brace"
 msgstr ""
 
@@ -1501,7 +1502,7 @@ msgstr ""
 #. input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly:50 (context id)
 #. input/lsr/demo-midiinstruments.ly:28 (variable)
 #. input/lsr/formatting-lyrics-syllables.ly:28 (context id)
-#. input/lsr/guitar-strum-rhythms.ly:48 (context id)
+#. input/lsr/guitar-strum-rhythms.ly:56 (context id)
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:29 (variable)
 #. input/lsr/piano-template-with-melody-and-lyrics.ly:28 (variable)
 #. input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly:28 (variable)
@@ -1524,7 +1525,7 @@ msgid "text"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:443 (context id)
-#. Documentation/user/staff.itely:535 (context id)
+#. Documentation/user/staff.itely:518 (context id)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:102 (comment)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
@@ -1657,7 +1658,7 @@ msgstr ""
 
 #. Documentation/user/fundamental.itely:1242 (variable)
 #. Documentation/user/fundamental.itely:2646 (variable)
-#. Documentation/user/tweaks.itely:3268 (variable)
+#. Documentation/user/tweaks.itely:3468 (variable)
 #. Documentation/user/simultaneous.itely:783 (variable)
 #. Documentation/user/percussion.itely:497 (variable)
 #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:46 (variable)
@@ -1709,37 +1710,37 @@ msgid "SopMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1298 (variable)
-#. Documentation/user/tweaks.itely:3270 (variable)
+#. Documentation/user/tweaks.itely:3470 (variable)
 msgid "AltoMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1299 (variable)
-#. Documentation/user/tweaks.itely:3271 (variable)
+#. Documentation/user/tweaks.itely:3471 (variable)
 msgid "TenorMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1300 (variable)
-#. Documentation/user/tweaks.itely:3272 (variable)
+#. Documentation/user/tweaks.itely:3472 (variable)
 msgid "BassMusic"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1301 (variable)
-#. Documentation/user/tweaks.itely:3273 (variable)
+#. Documentation/user/tweaks.itely:3473 (variable)
 msgid "VerseOne"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1303 (variable)
-#. Documentation/user/tweaks.itely:3274 (variable)
+#. Documentation/user/tweaks.itely:3474 (variable)
 msgid "VerseTwo"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1305 (variable)
-#. Documentation/user/tweaks.itely:3275 (variable)
+#. Documentation/user/tweaks.itely:3475 (variable)
 msgid "VerseThree"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1307 (variable)
-#. Documentation/user/tweaks.itely:3276 (variable)
+#. Documentation/user/tweaks.itely:3476 (variable)
 msgid "VerseFour"
 msgstr ""
 
@@ -1748,20 +1749,20 @@ msgid "Sop"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1315 (context id)
-#. Documentation/user/tweaks.itely:3283 (context id)
-#. Documentation/user/input.itely:915 (context id)
+#. Documentation/user/tweaks.itely:3483 (context id)
+#. Documentation/user/input.itely:946 (context id)
 msgid "Alto"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1323 (context id)
-#. Documentation/user/tweaks.itely:3291 (context id)
-#. Documentation/user/input.itely:917 (context id)
+#. Documentation/user/tweaks.itely:3491 (context id)
+#. Documentation/user/input.itely:948 (context id)
 msgid "Tenor"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:1324 (context id)
-#. Documentation/user/tweaks.itely:3292 (context id)
-#. Documentation/user/input.itely:922 (context id)
+#. Documentation/user/tweaks.itely:3492 (context id)
+#. Documentation/user/input.itely:953 (context id)
 #. input/lsr/jazz-combo-template.ly:227 (variable)
 msgid "Bass"
 msgstr ""
@@ -1916,7 +1917,7 @@ msgstr ""
 
 #. Documentation/user/fundamental.itely:2420 (variable)
 #. Documentation/user/fundamental.itely:2647 (variable)
-#. Documentation/user/input.itely:907 (variable)
+#. Documentation/user/input.itely:938 (variable)
 msgid "sopranoMusic"
 msgstr ""
 
@@ -1933,7 +1934,7 @@ msgid "sopranoWords"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:2654 (variable)
-#. Documentation/user/input.itely:908 (variable)
+#. Documentation/user/input.itely:939 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:44 (variable)
 #. input/lsr/vocal-ensemble-template.ly:48 (variable)
@@ -1948,7 +1949,7 @@ msgid "altoWords"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:2659 (variable)
-#. Documentation/user/input.itely:909 (variable)
+#. Documentation/user/input.itely:940 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
 #. input/lsr/vocal-ensemble-template.ly:55 (variable)
@@ -1963,7 +1964,7 @@ msgid "tenorWords"
 msgstr ""
 
 #. Documentation/user/fundamental.itely:2664 (variable)
-#. Documentation/user/input.itely:910 (variable)
+#. Documentation/user/input.itely:941 (variable)
 #. input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly:65 (variable)
 #. input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:58 (variable)
 #. input/lsr/vocal-ensemble-template.ly:62 (variable)
@@ -2128,17 +2129,18 @@ msgstr ""
 
 #. @rglos in Documentation/user/fundamental.itely
 #. @rglos in Documentation/user/tweaks.itely
-#. Documentation/user/staff.itely:564 (context id)
-#. Documentation/user/staff.itely:577 (context id)
-#. Documentation/user/staff.itely:585 (context id)
-#. Documentation/user/staff.itely:604 (context id)
-#. Documentation/user/staff.itely:617 (context id)
+#. Documentation/user/staff.itely:547 (context id)
+#. Documentation/user/staff.itely:560 (context id)
+#. Documentation/user/staff.itely:568 (context id)
+#. Documentation/user/staff.itely:587 (context id)
+#. Documentation/user/staff.itely:600 (context id)
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/fr/user/fundamental.itely
 #. @rglos in Documentation/es/user/fundamental.itely
 #. @rglos in Documentation/es/user/tweaks.itely
 #. @rglos in Documentation/es/user/staff.itely
 #. @rglos in Documentation/de/user/tweaks.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ossia"
 msgstr ""
 
@@ -2366,220 +2368,220 @@ msgstr ""
 msgid "Building a score from scratch"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:564 (comment)
-#. Documentation/user/tweaks.itely:690 (comment)
+#. Documentation/user/tweaks.itely:595 (comment)
+#. Documentation/user/tweaks.itely:730 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:630 (comment)
-#. Documentation/user/tweaks.itely:666 (comment)
-#. Documentation/user/tweaks.itely:669 (comment)
+#. Documentation/user/tweaks.itely:664 (comment)
+#. Documentation/user/tweaks.itely:703 (comment)
+#. Documentation/user/tweaks.itely:706 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:694 (comment)
+#. Documentation/user/tweaks.itely:734 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1302 (comment)
+#. Documentation/user/tweaks.itely:1394 (comment)
 msgid "Don't print clefs in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1304 (comment)
+#. Documentation/user/tweaks.itely:1396 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1362 (comment)
+#. Documentation/user/tweaks.itely:1460 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1418 (comment)
+#. Documentation/user/tweaks.itely:1526 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1828 (comment)
-#. Documentation/user/tweaks.itely:1895 (comment)
+#. Documentation/user/tweaks.itely:1956 (comment)
+#. Documentation/user/tweaks.itely:2026 (comment)
 msgid "Set details for later Text Spanner"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1831 (comment)
-#. Documentation/user/tweaks.itely:1898 (comment)
+#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2029 (comment)
 msgid "Place dynamics above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1833 (comment)
-#. Documentation/user/tweaks.itely:1902 (comment)
+#. Documentation/user/tweaks.itely:1961 (comment)
+#. Documentation/user/tweaks.itely:2033 (comment)
 msgid "Start Ottava Bracket"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1836 (comment)
-#. Documentation/user/tweaks.itely:1843 (comment)
-#. Documentation/user/tweaks.itely:1905 (comment)
-#. Documentation/user/tweaks.itely:1912 (comment)
+#. Documentation/user/tweaks.itely:1964 (comment)
+#. Documentation/user/tweaks.itely:1971 (comment)
+#. Documentation/user/tweaks.itely:2036 (comment)
+#. Documentation/user/tweaks.itely:2043 (comment)
 msgid "Add Dynamic Text"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1838 (comment)
-#. Documentation/user/tweaks.itely:1907 (comment)
+#. Documentation/user/tweaks.itely:1966 (comment)
+#. Documentation/user/tweaks.itely:2038 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1840 (comment)
-#. Documentation/user/tweaks.itely:1909 (comment)
+#. Documentation/user/tweaks.itely:1968 (comment)
+#. Documentation/user/tweaks.itely:2040 (comment)
 msgid "Add Text Script"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1845 (comment)
-#. Documentation/user/tweaks.itely:1914 (comment)
+#. Documentation/user/tweaks.itely:1973 (comment)
+#. Documentation/user/tweaks.itely:2045 (comment)
 msgid "Stop Ottava Bracket"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1900 (comment)
+#. Documentation/user/tweaks.itely:2031 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1959 (comment)
+#. Documentation/user/tweaks.itely:2093 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1979 (comment)
+#. Documentation/user/tweaks.itely:2116 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1983 (comment)
+#. Documentation/user/tweaks.itely:2120 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1987 (comment)
-#. Documentation/user/tweaks.itely:1992 (comment)
+#. Documentation/user/tweaks.itely:2124 (comment)
+#. Documentation/user/tweaks.itely:2129 (comment)
 msgid "Turn off collision avoidance"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1994 (comment)
+#. Documentation/user/tweaks.itely:2131 (comment)
 msgid "and turn on textLengthOn"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:1995 (comment)
+#. Documentation/user/tweaks.itely:2132 (comment)
 msgid "Spaces at end are honored"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2096 (comment)
+#. Documentation/user/tweaks.itely:2239 (comment)
 msgid "Extend width by 1 staff space"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2373 (comment)
+#. Documentation/user/tweaks.itely:2522 (comment)
 msgid "This will not work, see below:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2377 (comment)
+#. Documentation/user/tweaks.itely:2526 (comment)
 msgid "This works:"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2422 (variable)
+#. Documentation/user/tweaks.itely:2577 (variable)
 msgid "naturalplusflat"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2458 (comment)
+#. Documentation/user/tweaks.itely:2618 (comment)
 msgid "Extend width by 1 unit"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2460 (comment)
+#. Documentation/user/tweaks.itely:2620 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2745 (variable)
-#. Documentation/user/tweaks.itely:2794 (variable)
-#. Documentation/user/tweaks.itely:2855 (variable)
-#. Documentation/user/tweaks.itely:2925 (variable)
-#. Documentation/user/tweaks.itely:2987 (variable)
-#. Documentation/user/tweaks.itely:3042 (variable)
+#. Documentation/user/tweaks.itely:2924 (variable)
+#. Documentation/user/tweaks.itely:2973 (variable)
+#. Documentation/user/tweaks.itely:3034 (variable)
+#. Documentation/user/tweaks.itely:3104 (variable)
+#. Documentation/user/tweaks.itely:3169 (variable)
+#. Documentation/user/tweaks.itely:3229 (variable)
 msgid "rhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2750 (comment)
-#. Documentation/user/tweaks.itely:2799 (comment)
-#. Documentation/user/tweaks.itely:2862 (comment)
-#. Documentation/user/tweaks.itely:2934 (comment)
-#. Documentation/user/tweaks.itely:2996 (comment)
+#. Documentation/user/tweaks.itely:2929 (comment)
+#. Documentation/user/tweaks.itely:2978 (comment)
+#. Documentation/user/tweaks.itely:3041 (comment)
+#. Documentation/user/tweaks.itely:3113 (comment)
+#. Documentation/user/tweaks.itely:3178 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2763 (variable)
-#. Documentation/user/tweaks.itely:2812 (variable)
-#. Documentation/user/tweaks.itely:2875 (variable)
-#. Documentation/user/tweaks.itely:2949 (variable)
-#. Documentation/user/tweaks.itely:3013 (variable)
-#. Documentation/user/tweaks.itely:3070 (variable)
+#. Documentation/user/tweaks.itely:2942 (variable)
+#. Documentation/user/tweaks.itely:2991 (variable)
+#. Documentation/user/tweaks.itely:3054 (variable)
+#. Documentation/user/tweaks.itely:3128 (variable)
+#. Documentation/user/tweaks.itely:3195 (variable)
+#. Documentation/user/tweaks.itely:3257 (variable)
 msgid "lhMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2772 (context id)
-#. Documentation/user/tweaks.itely:2821 (context id)
-#. Documentation/user/tweaks.itely:2884 (context id)
-#. Documentation/user/tweaks.itely:2958 (context id)
-#. Documentation/user/tweaks.itely:3022 (context id)
-#. Documentation/user/tweaks.itely:3079 (context id)
-#. Documentation/user/input.itely:928 (context id)
+#. Documentation/user/tweaks.itely:2951 (context id)
+#. Documentation/user/tweaks.itely:3000 (context id)
+#. Documentation/user/tweaks.itely:3063 (context id)
+#. Documentation/user/tweaks.itely:3137 (context id)
+#. Documentation/user/tweaks.itely:3204 (context id)
+#. Documentation/user/tweaks.itely:3266 (context id)
+#. Documentation/user/input.itely:959 (context id)
 msgid "RH"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:2776 (context id)
-#. Documentation/user/tweaks.itely:2825 (context id)
-#. Documentation/user/tweaks.itely:2888 (context id)
-#. Documentation/user/tweaks.itely:2962 (context id)
-#. Documentation/user/tweaks.itely:3026 (context id)
-#. Documentation/user/tweaks.itely:3083 (context id)
-#. Documentation/user/input.itely:934 (context id)
+#. Documentation/user/tweaks.itely:2955 (context id)
+#. Documentation/user/tweaks.itely:3004 (context id)
+#. Documentation/user/tweaks.itely:3067 (context id)
+#. Documentation/user/tweaks.itely:3141 (context id)
+#. Documentation/user/tweaks.itely:3208 (context id)
+#. Documentation/user/tweaks.itely:3270 (context id)
+#. Documentation/user/input.itely:965 (context id)
 msgid "LH"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3000 (comment)
-#. Documentation/user/tweaks.itely:3057 (comment)
+#. Documentation/user/tweaks.itely:3182 (comment)
+#. Documentation/user/tweaks.itely:3244 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3003 (comment)
-#. Documentation/user/tweaks.itely:3060 (comment)
+#. Documentation/user/tweaks.itely:3185 (comment)
+#. Documentation/user/tweaks.itely:3247 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3055 (comment)
+#. Documentation/user/tweaks.itely:3242 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3185 (comment)
-#. Documentation/user/tweaks.itely:3204 (comment)
+#. Documentation/user/tweaks.itely:3378 (comment)
+#. Documentation/user/tweaks.itely:3400 (comment)
 msgid "Visible tempo marking"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3189 (comment)
-#. Documentation/user/tweaks.itely:3208 (comment)
+#. Documentation/user/tweaks.itely:3382 (comment)
+#. Documentation/user/tweaks.itely:3404 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3192 (comment)
-#. Documentation/user/tweaks.itely:3211 (comment)
+#. Documentation/user/tweaks.itely:3385 (comment)
+#. Documentation/user/tweaks.itely:3407 (comment)
 msgid "New tempo for next section"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3259 (variable)
+#. Documentation/user/tweaks.itely:3459 (variable)
 msgid "emphasize"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3263 (variable)
+#. Documentation/user/tweaks.itely:3463 (variable)
 msgid "normal"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3269 (variable)
+#. Documentation/user/tweaks.itely:3469 (variable)
 msgid "SopranoMusic"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3282 (context id)
-#. Documentation/user/input.itely:913 (context id)
+#. Documentation/user/tweaks.itely:3482 (context id)
+#. Documentation/user/input.itely:944 (context id)
 msgid "Soprano"
 msgstr ""
 
-#. Documentation/user/tweaks.itely:3487 (comment)
+#. Documentation/user/tweaks.itely:3691 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr ""
 
@@ -4145,16 +4147,16 @@ msgid "Musical notation"
 msgstr ""
 
 #. Documentation/user/pitches.itely:668 (variable)
-#. Documentation/user/input.itely:997 (variable)
-#. Documentation/user/input.itely:1016 (variable)
-#. Documentation/user/input.itely:1053 (variable)
-#. Documentation/user/input.itely:1068 (variable)
+#. Documentation/user/input.itely:1028 (variable)
+#. Documentation/user/input.itely:1047 (variable)
+#. Documentation/user/input.itely:1084 (variable)
+#. Documentation/user/input.itely:1099 (variable)
 #. input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly:29 (variable)
 #. input/lsr/controlling-tuplet-bracket-visibility.ly:20 (variable)
 #. input/lsr/letter-tablature-formatting.ly:25 (variable)
 #. input/lsr/string-quartet-template-with-separate-parts.ly:98 (variable)
 #. input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:136 (variable)
-#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:35 (variable)
+#. input/lsr/vertically-aligned-dynamics-and-textscripts.ly:50 (variable)
 msgid "music"
 msgstr ""
 
@@ -4163,7 +4165,7 @@ msgid "not strictly necessary, but a good reminder"
 msgstr ""
 
 #. Documentation/user/pitches.itely:1052 (context id)
-#. Documentation/user/staff.itely:1100 (variable)
+#. Documentation/user/staff.itely:1084 (variable)
 msgid "clarinet"
 msgstr ""
 
@@ -4566,62 +4568,50 @@ msgstr ""
 msgid "this will"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:1689 (comment)
-msgid "Set default beaming for all staves"
-msgstr ""
-
-#. Documentation/user/rhythms.itely:1697 (comment)
-msgid "Modify beaming for just this staff"
-msgstr ""
-
-#. Documentation/user/rhythms.itely:1703 (comment)
-msgid "Inherit beaming from Score context"
-msgstr ""
-
-#. Documentation/user/rhythms.itely:1827 (comment)
+#. Documentation/user/rhythms.itely:1802 (comment)
 msgid "revert to non-feathered beams"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2050 (comment)
-#. Documentation/user/rhythms.itely:2066 (comment)
+#. Documentation/user/rhythms.itely:2025 (comment)
+#. Documentation/user/rhythms.itely:2041 (comment)
 msgid "Permit first bar number to be printed"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2067 (comment)
-#. Documentation/user/rhythms.itely:2115 (comment)
+#. Documentation/user/rhythms.itely:2042 (comment)
+#. Documentation/user/rhythms.itely:2090 (comment)
 msgid "Print a bar number every second measure"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2083 (comment)
+#. Documentation/user/rhythms.itely:2058 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2087 (comment)
-#. Documentation/user/rhythms.itely:2113 (comment)
+#. Documentation/user/rhythms.itely:2062 (comment)
+#. Documentation/user/rhythms.itely:2088 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2091 (comment)
+#. Documentation/user/rhythms.itely:2066 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2096 (comment)
+#. Documentation/user/rhythms.itely:2071 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2118 (comment)
+#. Documentation/user/rhythms.itely:2093 (comment)
 msgid "Center-align bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2121 (comment)
+#. Documentation/user/rhythms.itely:2096 (comment)
 msgid "Right-align bar numbers"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2224 (variable)
+#. Documentation/user/rhythms.itely:2199 (variable)
 msgid "pipeSymbol"
 msgstr ""
 
-#. Documentation/user/rhythms.itely:2612 (variable)
+#. Documentation/user/rhythms.itely:2587 (variable)
 msgid "MyCadenza"
 msgstr ""
 
@@ -5193,7 +5183,7 @@ msgstr ""
 msgid "trill"
 msgstr ""
 
-#. Documentation/user/repeats.itely:298 (variable)
+#. Documentation/user/repeats.itely:299 (variable)
 #. input/lsr/volta-text-markup-using-repeatcommands.ly:21 (variable)
 msgid "voltaAdLib"
 msgstr ""
@@ -5459,24 +5449,24 @@ msgstr ""
 msgid "Writing music in parallel"
 msgstr ""
 
-#. Documentation/user/staff.itely:1069 (variable)
-#. Documentation/user/staff.itely:1084 (variable)
-#. Documentation/user/staff.itely:1238 (variable)
+#. Documentation/user/staff.itely:1053 (variable)
+#. Documentation/user/staff.itely:1068 (variable)
+#. Documentation/user/staff.itely:1222 (variable)
 msgid "flute"
 msgstr ""
 
-#. Documentation/user/staff.itely:1189 (variable)
-#. Documentation/user/staff.itely:1210 (variable)
+#. Documentation/user/staff.itely:1173 (variable)
+#. Documentation/user/staff.itely:1194 (variable)
 msgid "oboe"
 msgstr ""
 
-#. Documentation/user/staff.itely:1259 (variable)
-#. Documentation/user/staff.itely:1275 (context id)
+#. Documentation/user/staff.itely:1243 (variable)
+#. Documentation/user/staff.itely:1259 (context id)
 msgid "piccolo"
 msgstr ""
 
-#. Documentation/user/staff.itely:1267 (variable)
-#. Documentation/user/staff.itely:1276 (context id)
+#. Documentation/user/staff.itely:1251 (variable)
+#. Documentation/user/staff.itely:1260 (context id)
 msgid "cbassoon"
 msgstr ""
 
@@ -5508,16 +5498,20 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Instantiating new staves"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staff"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "staves"
 msgstr ""
 
@@ -5534,11 +5528,13 @@ msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "bracket"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "grand staff"
 msgstr ""
 
@@ -5548,6 +5544,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Nested staff groups"
 msgstr ""
 
@@ -5557,6 +5555,8 @@ msgstr ""
 #. @subsection in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @subsection in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @subsection in Documentation/de/user/staff.itely
 msgid "Modifying single staves"
 msgstr ""
 
@@ -5573,11 +5573,13 @@ msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "line"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "ledger line"
 msgstr ""
 
@@ -5587,11 +5589,14 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely
 #. @node in Documentation/es/user/staff.itely
 #. @unnumberedsubsubsec in Documentation/es/user/staff.itely
+#. @node in Documentation/de/user/staff.itely
+#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
 msgid "Ossia staves"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "Frenched staff"
 msgstr ""
 
@@ -5630,21 +5635,25 @@ msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronomic indication"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "tempo indication"
 msgstr ""
 
 #. @rglos in Documentation/user/staff.itely
 #. @rglos in Documentation/es/user/staff.itely
+#. @rglos in Documentation/de/user/staff.itely
 msgid "metronome mark"
 msgstr ""
 
@@ -5971,6 +5980,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/text.itely
 #. @node in Documentation/es/user/text.itely
 #. @unnumberedsubsubsec in Documentation/es/user/text.itely
+#. @node in Documentation/de/user/text.itely
+#. @unnumberedsubsubsec in Documentation/de/user/text.itely
 msgid "Fonts explained"
 msgstr ""
 
@@ -6004,7 +6015,7 @@ msgid "Specialist notation"
 msgstr ""
 
 #. Documentation/user/vocal.itely:509 (comment)
-msgid "not recommended: left aligns syllables "
+msgid "not recommended: left aligns syllables"
 msgstr ""
 
 #. Documentation/user/vocal.itely:512 (comment)
@@ -6045,7 +6056,7 @@ msgid "applies to \\\"fas\\\""
 msgstr ""
 
 #. Documentation/user/vocal.itely:1282 (comment)
-msgid "moves the column off the left margin; "
+msgid "moves the column off the left margin;"
 msgstr ""
 
 #. Documentation/user/vocal.itely:1283 (comment)
@@ -6058,11 +6069,11 @@ msgid "adds vertical spacing between verses"
 msgstr ""
 
 #. Documentation/user/vocal.itely:1299 (comment)
-msgid "adds horizontal spacing between columns; "
+msgid "adds horizontal spacing between columns;"
 msgstr ""
 
 #. Documentation/user/vocal.itely:1300 (comment)
-msgid "if they are still too close, add more \\\" \\\" pairs  "
+msgid "if they are still too close, add more \\\" \\\" pairs"
 msgstr ""
 
 #. Documentation/user/vocal.itely:1301 (comment)
@@ -6070,7 +6081,7 @@ msgid "until the result looks good"
 msgstr ""
 
 #. Documentation/user/vocal.itely:1317 (comment)
-msgid "gives some extra space on the right margin; "
+msgid "gives some extra space on the right margin;"
 msgstr ""
 
 #. Documentation/user/vocal.itely:1318 (comment)
@@ -7595,11 +7606,11 @@ msgstr ""
 msgid "Further reading"
 msgstr ""
 
-#. Documentation/user/input.itely:494 (comment)
+#. Documentation/user/input.itely:525 (comment)
 msgid "not printed"
 msgstr ""
 
-#. Documentation/user/input.itely:911 (variable)
+#. Documentation/user/input.itely:942 (variable)
 msgid "allLyrics"
 msgstr ""
 
@@ -7938,43 +7949,43 @@ msgstr ""
 msgid "Percussion in MIDI"
 msgstr ""
 
-#. Documentation/user/spacing.itely:872 (comment)
+#. Documentation/user/spacing.itely:875 (comment)
 msgid "this does nothing"
 msgstr ""
 
-#. Documentation/user/spacing.itely:873 (comment)
+#. Documentation/user/spacing.itely:876 (comment)
 msgid "a break here would work"
 msgstr ""
 
-#. Documentation/user/spacing.itely:874 (comment)
+#. Documentation/user/spacing.itely:877 (comment)
 msgid "as does this break"
 msgstr ""
 
-#. Documentation/user/spacing.itely:886 (comment)
+#. Documentation/user/spacing.itely:889 (comment)
 msgid "now the break is allowed"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1719 (comment)
+#. Documentation/user/spacing.itely:1777 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1721 (comment)
+#. Documentation/user/spacing.itely:1779 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1722 (comment)
+#. Documentation/user/spacing.itely:1780 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1725 (comment)
+#. Documentation/user/spacing.itely:1783 (comment)
 msgid "now they will collide"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1750 (comment)
+#. Documentation/user/spacing.itely:1808 (comment)
 msgid "the markup is too close to the following note"
 msgstr ""
 
-#. Documentation/user/spacing.itely:1753 (comment)
+#. Documentation/user/spacing.itely:1811 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr ""
 
@@ -8026,6 +8037,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Vertical dimensions"
 msgstr ""
 
@@ -8033,6 +8046,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Horizontal dimensions"
 msgstr ""
 
@@ -8040,6 +8055,8 @@ msgstr ""
 #. @unnumberedsubsubsec in Documentation/user/spacing.itely
 #. @node in Documentation/es/user/spacing.itely
 #. @unnumberedsubsubsec in Documentation/es/user/spacing.itely
+#. @node in Documentation/de/user/spacing.itely
+#. @unnumberedsubsubsec in Documentation/de/user/spacing.itely
 msgid "Other layout variables"
 msgstr ""
 
@@ -8327,87 +8344,87 @@ msgstr ""
 msgid "Changing spacing"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2002 (comment)
+#. Documentation/user/changing-defaults.itely:1990 (comment)
 msgid "increase the length of the tie"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2011 (comment)
+#. Documentation/user/changing-defaults.itely:1999 (comment)
 msgid "increase the length of the rest bar"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2019 (comment)
+#. Documentation/user/changing-defaults.itely:2007 (comment)
 msgid "increase the length of the hairpin"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2047 (comment)
+#. Documentation/user/changing-defaults.itely:2035 (comment)
 msgid "default"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2050 (comment)
-#. Documentation/user/changing-defaults.itely:2063 (comment)
+#. Documentation/user/changing-defaults.itely:2038 (comment)
+#. Documentation/user/changing-defaults.itely:2051 (comment)
 msgid "not effective alone"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2054 (comment)
-#. Documentation/user/changing-defaults.itely:2067 (comment)
+#. Documentation/user/changing-defaults.itely:2042 (comment)
+#. Documentation/user/changing-defaults.itely:2055 (comment)
 msgid "effective only when both overrides are present"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2444 (comment)
+#. Documentation/user/changing-defaults.itely:2432 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2490 (comment)
+#. Documentation/user/changing-defaults.itely:2478 (comment)
 msgid "Try to remove all key signatures"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2909 (comment)
+#. Documentation/user/changing-defaults.itely:2897 (comment)
 msgid "move horizontally left"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2911 (comment)
+#. Documentation/user/changing-defaults.itely:2899 (comment)
 msgid "move vertically up"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2912 (comment)
+#. Documentation/user/changing-defaults.itely:2900 (comment)
 msgid "third finger"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2958 (comment)
+#. Documentation/user/changing-defaults.itely:2946 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment)
 msgid "the RehearsalMark will be centered above the Clef"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2964 (comment)
+#. Documentation/user/changing-defaults.itely:2952 (comment)
 #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment)
 msgid "the RehearsalMark will be centered above the TimeSignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2978 (comment)
+#. Documentation/user/changing-defaults.itely:2966 (comment)
 msgid "The RehearsalMark will be centered above the KeySignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2985 (comment)
-#. Documentation/user/changing-defaults.itely:3001 (comment)
-#. Documentation/user/changing-defaults.itely:3008 (comment)
+#. Documentation/user/changing-defaults.itely:2973 (comment)
+#. Documentation/user/changing-defaults.itely:2989 (comment)
+#. Documentation/user/changing-defaults.itely:2996 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:2990 (comment)
+#. Documentation/user/changing-defaults.itely:2978 (comment)
 msgid ""
 "The RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:3002 (comment)
+#. Documentation/user/changing-defaults.itely:2990 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:3009 (comment)
+#. Documentation/user/changing-defaults.itely:2997 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr ""
 
-#. Documentation/user/changing-defaults.itely:3058 (variable)
+#. Documentation/user/changing-defaults.itely:3046 (variable)
 msgid "XinO"
 msgstr ""
 
@@ -9414,7 +9431,7 @@ msgid "Cheat sheet"
 msgstr ""
 
 #. @top in Documentation/fr/user/lilypond-learning.tely
-msgid "GNU LilyPond --- manuel d'initiation"
+msgid "GNU LilyPond --- Manuel d'initiation"
 msgstr ""
 
 #. @subsubheading in Documentation/fr/user/macros.itexi
@@ -9468,7 +9485,7 @@ msgid "Updating old files"
 msgstr ""
 
 #. @top in Documentation/fr/user/lilypond-program.tely
-msgid "GNU LilyPond --- utilisation des programmes"
+msgid "GNU LilyPond --- Utilisation des programmes"
 msgstr ""
 
 #. @node in Documentation/fr/user/setup.itely
@@ -9484,7 +9501,7 @@ msgid "Updating with @command{convert-ly}"
 msgstr ""
 
 #. @top in Documentation/fr/user/lilypond.tely
-msgid "GNU LilyPond --- manuel de notation"
+msgid "GNU LilyPond --- Manuel de notation"
 msgstr ""
 
 #. @node in Documentation/fr/user/repeats.itely
@@ -9750,11 +9767,6 @@ msgstr ""
 msgid "GNU LilyPond -- Das Notationsprogramm"
 msgstr ""
 
-#. @node in Documentation/de/user/staff.itely
-#. @unnumberedsubsubsec in Documentation/de/user/staff.itely
-msgid "System start delimiters"
-msgstr ""
-
 #. @node in Documentation/de/user/changing-defaults.itely
 #. @section in Documentation/de/user/changing-defaults.itely
 msgid "Common properties"
@@ -10306,10 +10318,54 @@ msgstr ""
 msgid "Use the macro"
 msgstr ""
 
-#. input/lsr/beam-grouping-in-7-8-time.ly:30 (comment)
+#. input/lsr/beam-endings-in-score-context.ly:19 (comment)
+msgid "Set default beaming for all staves"
+msgstr ""
+
+#. input/lsr/beam-endings-in-score-context.ly:27 (comment)
+msgid "Modify beaming for just this staff"
+msgstr ""
+
+#. input/lsr/beam-endings-in-score-context.ly:33 (comment)
+msgid "Inherit beaming from Score context"
+msgstr ""
+
+#. input/lsr/beam-endings-in-score-context.ly:39 (comment)
+msgid "Modify beaming for this voice only"
+msgstr ""
+
+#. input/lsr/beam-grouping-in-7-8-time.ly:40 (comment)
 msgid "rhythm 2-3-2"
 msgstr ""
 
+#. input/lsr/book-parts.ly:21 (comment)
+msgid "book paper, which is inherited by all children bookparts"
+msgstr ""
+
+#. input/lsr/book-parts.ly:24 (comment)
+msgid "Page footer: add a different part-tagline at part last page"
+msgstr ""
+
+#. input/lsr/book-parts.ly:28 (comment)
+msgid "Copyright header field only on book first page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:32 (comment)
+msgid "Part tagline header field only on each part last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:36 (comment)
+msgid "Tagline header field only on book last page."
+msgstr ""
+
+#. input/lsr/book-parts.ly:43 (comment)
+msgid "book header, which is inherited by the first bookpart"
+msgstr ""
+
+#. input/lsr/book-parts.ly:52 (comment)
+msgid "a different page breaking function may be used on each part"
+msgstr ""
+
 #. input/lsr/breathing-signs.ly:19 (comment)
 msgid "this bar contains no \\breathe"
 msgstr ""
@@ -10394,15 +10450,15 @@ msgstr ""
 msgid "}"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:24 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:35 (comment)
 msgid "Change time signature symbol but keep 3/4 beaming"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:25 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:36 (comment)
 msgid "due to unchanged underlying time signature"
 msgstr ""
 
-#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:30 (comment)
+#. input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly:41 (comment)
 msgid "Lose 3/4 beaming now \\time has been changed"
 msgstr ""
 
@@ -10561,55 +10617,55 @@ msgstr ""
 msgid "label below string"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:22 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:40 (comment)
 msgid "add FretBoards for the Cuatro"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:23 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:41 (comment)
 msgid "Note: This section could be put into a separate file"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:24 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:42 (comment)
 msgid "predefined-cuatro-fretboards.ly"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:25 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:43 (comment)
 msgid "and \\included into each of your compositions"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:27 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:45 (variable)
 msgid "cuatroTuning"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:29 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:47 (variable)
 msgid "dSix"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:30 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:48 (variable)
 msgid "dMajor"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:31 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:49 (variable)
 msgid "aMajSeven"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:32 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:50 (variable)
 msgid "dMajSeven"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:33 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (variable)
 msgid "gMajor"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:51 (comment)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:56 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable)
 msgid "primerosNames"
 msgstr ""
 
-#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:60 (variable)
+#. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:78 (variable)
 msgid "primeros"
 msgstr ""
 
@@ -10617,7 +10673,7 @@ msgstr ""
 msgid "baseMelody"
 msgstr ""
 
-#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:39 (comment)
+#. input/lsr/display-bracket-with-only-one-staff-in-a-system.ly:37 (comment)
 msgid "Must be lower than the actual number of staff lines"
 msgstr ""
 
@@ -10828,19 +10884,19 @@ msgstr ""
 msgid "Cut here ----- End 'flamenco.ly' "
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:58 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:109 (comment)
 msgid "Example 1"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:65 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:116 (comment)
 msgid "Example 2"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:72 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:123 (comment)
 msgid "Example 3"
 msgstr ""
 
-#. input/lsr/flat-flags-and-beam-nibs.ly:86 (comment)
+#. input/lsr/flat-flags-and-beam-nibs.ly:137 (comment)
 msgid "Example 4"
 msgstr ""
 
@@ -10872,44 +10928,44 @@ msgstr ""
 msgid "110% of default size"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:26 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:33 (comment)
+msgid "this moves them up one staff space from the default position"
+msgstr ""
+
+#. input/lsr/grid-lines--changing-their-appearance.ly:51 (comment)
 msgid "set up grids"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:28 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:53 (comment)
 msgid "set the grid interval to one quarter note"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:35 (comment)
+#. input/lsr/grid-lines--changing-their-appearance.ly:59 (comment)
 msgid "this moves them to the right half a staff space"
 msgstr ""
 
-#. input/lsr/grid-lines--changing-their-appearance.ly:48 (comment)
-msgid "this moves them up one staff space from the default position"
-msgstr ""
-
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:27 (comment)
-msgid "sets of grid"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:36 (comment)
+msgid "hides staff and notes so that only the grid lines are visible"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:33 (comment)
-msgid "lines length"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:43 (comment)
+msgid "dummy notes to force regular note spacing"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:48 (comment)
-msgid "centers grid lines  horizontally below noteheads"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:59 (comment)
+msgid "center grid lines horizontally below note heads"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:62 (comment)
-msgid "making sure the lines will be placed outside the Staff"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:66 (comment)
+msgid "set line length and positioning:"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:65 (comment)
-msgid "hides staff and notes so that only the grid lines are visible"
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:67 (comment)
+msgid "two staff spaces above center line on hidden staff"
 msgstr ""
 
-#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:75 (comment)
-msgid "you have to put 'dummy' notes here to force regular grid spacing..."
+#. input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly:68 (comment)
+msgid "to four spaces below center line on visible staff"
 msgstr ""
 
 #. input/lsr/heavily-customized-polymetric-time-signatures.ly:55 (variable)
@@ -11338,7 +11394,7 @@ msgstr ""
 msgid "TAB"
 msgstr ""
 
-#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:37 (variable)
+#. input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly:51 (variable)
 msgid "dashPlus"
 msgstr ""
 
@@ -11358,15 +11414,15 @@ msgstr ""
 msgid "stick"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:38 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:39 (comment)
 msgid "Permit line breaks within tuplets"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:40 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:41 (comment)
 msgid "Allow beams to be broken at line breaks"
 msgstr ""
 
-#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:47 (comment)
+#. input/lsr/permitting-line-breaks-within-beamed-tuplets.ly:48 (comment)
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
@@ -11386,35 +11442,35 @@ msgstr ""
 msgid "tab"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:30 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
 msgid "Multi-measure rests by default are set under the second line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:32 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
 msgid "They can be moved with an override"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:35 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:46 (comment)
 msgid "A value of 0 is the default position;"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:36 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:47 (comment)
 msgid "the following trick moves the rest to the center line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:39 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:50 (comment)
 msgid "Multi-measure rests in odd-numbered voices are under the top line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:41 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:52 (comment)
 msgid "Multi-measure rests in even-numbered voices are under the bottom line"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:43 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:54 (comment)
 msgid "They remain separated even in empty measures"
 msgstr ""
 
-#. input/lsr/positioning-multi--measure-rests.ly:45 (comment)
+#. input/lsr/positioning-multi--measure-rests.ly:56 (comment)
 msgid "This brings them together even though there are two voices"
 msgstr ""
 
@@ -12057,11 +12113,11 @@ msgstr ""
 msgid "(This is the Cello part file)"
 msgstr ""
 
-#. input/lsr/sub-dividing-beams.ly:49 (comment)
+#. input/lsr/sub-dividing-beams.ly:50 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr ""
 
-#. input/lsr/sub-dividing-beams.ly:53 (comment)
+#. input/lsr/sub-dividing-beams.ly:54 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr ""
 
@@ -12186,51 +12242,51 @@ msgstr ""
 msgid "Here we go back to the normal clef:"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:22 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:34 (comment)
 msgid "The default in 3/4 time is to beam in three groups"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:23 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
 msgid "each of a quarter note length"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:27 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:39 (comment)
 msgid "No auto-beaming is defined for 12/16"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:31 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
 msgid "Change time signature symbol, but retain underlying 3/4 beaming"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:35 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment)
 msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:36 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
 msgid "are not consistent with a measureLength of 3/4, so the beams"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:37 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
 msgid "are grouped at beatLength intervals"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:41 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:53 (comment)
 msgid "Specify beams in groups of (3 3 2 3) 1/16th notes"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:42 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:54 (comment)
 msgid "3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply,"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:43 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:55 (comment)
 msgid "and beams are grouped at beatLength (1/16) intervals"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:60 (comment)
 msgid "Specify beams in groups of (3 4 2 3) 1/16th notes"
 msgstr ""
 
-#. input/lsr/using-beatlength-and-beatgrouping.ly:49 (comment)
+#. input/lsr/using-beatlength-and-beatgrouping.ly:61 (comment)
 msgid "3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies"
 msgstr ""
 
index 2fcff01051fcb0d74884e7fe1d1b9d9b617f592b..640aedd9c68cd90eef6a6529af09d2759c7366ab 100644 (file)
@@ -38,7 +38,7 @@ translations.template.html.in; DO NOT EDIT !-->
   is finished.
 </p>
 
- <p><i>Last updated Tue Nov 18 23:32:19 UTC 2008
+ <p><i>Last updated Sat Nov 22 19:18:39 UTC 2008
 </i></p>
 <table align="center" border="2">
  <tr align="center">
@@ -267,16 +267,16 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>4 @command{lilypond-book}: Integrating text and music<br>(3194)</td>
+  <td>4 @command{lilypond-book}: Integrating text and music<br>(3202)</td>
   <td>   <span style="background-color: #d0f0f8">not translated</span><br>
   </td>
   <td>Reinhold Kainhofer<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #33ff21">partially up to date</span><br>
+   <span style="background-color: #39ff22">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #25fe1f">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -353,7 +353,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>1.2 Rhythms<br>(5148)</td>
+  <td>1.2 Rhythms<br>(5005)</td>
   <td>Frédéric Chiasson<br>
    <small>Valentin Villenave<br>
    Jean-Charles Malahieude</small><br>
@@ -387,7 +387,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>1.4 Repeats<br>(556)</td>
+  <td>1.4 Repeats<br>(555)</td>
   <td>Valentin Villenave<br>
    <small>Jean-Charles Malahieude<br>
    John Mandereau</small><br>
@@ -396,7 +396,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #2cff20">partially up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
@@ -422,20 +422,20 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>1.6 Staff notation<br>(1603)</td>
+  <td>1.6 Staff notation<br>(1633)</td>
   <td>Valentin Villenave<br>
    Jean-Charles Malahieude<br>
    <small>John Mandereau</small><br>
-   <span style="background-color: #dfef77">partially translated (69 %)</span><br>
+   <span style="background-color: #dfef77">partially translated (70 %)</span><br>
    <span style="background-color: #ff6f57">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #ff6f57">partially up to date</span><br>
+   <span style="background-color: #47ff24">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
@@ -487,7 +487,7 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>2.1 Vocal music<br>(2679)</td>
+  <td>2.1 Vocal music<br>(2678)</td>
   <td>Valentin Villenave<br>
    <small>Jean-Charles Malahieude</small><br>
    <span style="background-color: #dfef77">partially translated (56 %)</span><br>
@@ -630,14 +630,14 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>3 General input and output<br>(5689)</td>
+  <td>3 General input and output<br>(5803)</td>
   <td>Jean-Charles Malahieude<br>
    Valentin Villenave<br>
-   <span style="background-color: #dfef77">partially translated (6 %)</span><br>
+   <span style="background-color: #dfef77">partially translated (5 %)</span><br>
    <span style="background-color: #ff8353">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #dfef77">partially translated (6 %)</span><br>
+   <span style="background-color: #dfef77">partially translated (5 %)</span><br>
    <span style="background-color: #ff8353">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
@@ -646,23 +646,23 @@ translations.template.html.in; DO NOT EDIT !-->
   </td>
  </tr>
  <tr align="left">
-  <td>4 Spacing issues<br>(8297)</td>
+  <td>4 Spacing issues<br>(8444)</td>
   <td>Frédéric Chiasson<br>
    Jean-Charles Malahieude<br>
    <span style="background-color: #dfef77">partially translated (19 %)</span><br>
-   <span style="background-color: #f6fe3b">partially up to date</span><br>
+   <span style="background-color: #fff73e">partially up to date</span><br>
   </td>
   <td>Till Rettig<br>
-   <span style="background-color: #dfef77">partially translated (14 %)</span><br>
-   <span style="background-color: #f6fe3b">partially up to date</span><br>
+   <span style="background-color: #dfef77">partially translated (3 %)</span><br>
+   <span style="background-color: #fff73e">partially up to date</span><br>
   </td>
   <td>Francisco Vila<br>
    <span style="background-color: #1fff1f">translated</span><br>
-   <span style="background-color: #1fff1f">up to date</span><br>
+   <span style="background-color: #33ff21">partially up to date</span><br>
   </td>
  </tr>
  <tr align="left">
-  <td>5 Changing defaults<br>(11296)</td>
+  <td>5 Changing defaults<br>(11291)</td>
   <td>Valentin Villenave<br>
    <small>Gilles Thibault</small><br>
    <span style="background-color: #dfef77">partially translated (33 %)</span><br>
index 2a426ceddd7ce658aa337c3e32f725296cca6687..34ebeab922260505c74f22cea8e360239100267b 100644 (file)
@@ -205,7 +205,7 @@ or
 \lilypond@{ YOUR LILYPOND CODE @}
 @end example
 
-Additionally, @code{\lilypondversion} displays the the current version
+Additionally, @code{\lilypondversion} displays the current version
 of lilypond.
 Running @command{lilypond-book} yields a file that can be further
 processed with @LaTeX{}. 
@@ -394,7 +394,7 @@ or
 @@lilypondfile[options,go,here]@{@var{filename}@}
 @end example
 
-Additionally, @code{@@lilypondversion} displays the the current version
+Additionally, @code{@@lilypondversion} displays the current version
 of lilypond.
 
 When @command{lilypond-book} is run on it, this results in a Texinfo
@@ -465,7 +465,7 @@ To include separate files, say
 <lilypondfile @var{option1} @var{option2} ...>@var{filename}</lilypondfile>
 @end example
 
-Additionally, @code{<lilypondversion/>} displays the the current version
+Additionally, @code{<lilypondversion/>} displays the current version
 of lilypond.
 
 
@@ -659,7 +659,7 @@ source file contain a comment containing @samp{begin verbatim} (without
 quotes), quoting the source in the verbatim block will start after the
 last occurrence of such a comment; similarly, quoting the source verbatim
 will stop just before the first occurrence of a comment containing
-@samp{end verbatim}, it there is any.  In the following source file
+@samp{end verbatim}, if there is any.  In the following source file
 example, the music will be interpreted in relative mode, but the
 verbatim quote will not show the @code{relative} block, i.e.
 
@@ -971,7 +971,7 @@ If you use the same filename extension for the input file than the
 extension @command{lilypond-book} uses for the output file, and if the
 input file is in the same directory as @command{lilypond-book} working
 directory, you must use @code{--output} option to make
-@command{lilypond-book} running, otherwise the will exit with an error
+@command{lilypond-book} running, otherwise it will exit with an error
 message like @qq{Output would overwrite input file}.
 
 
index 751a9cd1aa149cf0fa69f0c0b355f63a234dc6fe..21efda6142184bb6e5a2769d445e8ecf8c45e2b4 100644 (file)
@@ -293,7 +293,7 @@ b1
 Text can be included with the volta bracket.  The text can be a
 number or numbers or markup text, see @ref{Formatting text}.  The
 simplest way to use markup text is to define the markup first,
-then include the the markup in a Scheme list.
+then include the markup in a Scheme list.
 
 @lilypond[verbatim,quote]
 voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
index baabf804dc706ac7161d2a3ae3971cb5faa8b962..f7234ac0980f97c476fdfbebf491deffc6ccdebd 100644 (file)
@@ -1503,20 +1503,29 @@ example @code{NonMusicalPaperColumn} overrides with the special
 To understand how each of these different settings work, we begin
 by looking at an example that includes no overrides at all.
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      s1 * 6 \break
-      s1 * 6 \break
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new Staff {
-    \repeat unfold 18 { d'4 d'4 d'4 d'4 }
+@c \book { } is required in these examples to ensure the spacing
+@c overrides can be seen between systems. -np
+
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          s1*5 \break
+          s1*5 \break
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new Staff {
+        \repeat unfold 15 { d'4 d' d' d' }
+      }
+    >>
   }
->>
+}
 @end lilypond
 
 This score isolates line- and page-breaking information in a dedicated
@@ -1530,26 +1539,32 @@ the vertical startpoint of each system explicitly, we can set
 the @code{Y-offset} pair in the @code{line-break-system-details}
 attribute of the @code{NonMusicalPaperColumn} grob:
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 0))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 40))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 80))
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new Staff {
-    \repeat unfold 18 { d'4 d'4 d'4 d'4 }
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 0))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 40))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 80))
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new Staff {
+        \repeat unfold 15 { d'4 d' d' d' }
+      }
+    >>
   }
->>
+}
 @end lilypond
 
 Note that @code{line-break-system-details} takes an associative list of
@@ -1562,29 +1577,35 @@ explicitly, we can also set the vertical startpoint of each staff
 within each system manually.  We do this using the @code{alignment-offsets}
 subproperty of @code{line-break-system-details}.
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 20)
-          (alignment-offsets . (0 -15)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 60)
-          (alignment-offsets . (0 -15)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 100)
-          (alignment-offsets . (0 -15)))
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new Staff {
-    \repeat unfold 18 { d'4 d'4 d'4 d'4 }
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 20)
+                                           (alignment-offsets . (0 -15)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 60)
+                                           (alignment-offsets . (0 -15)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 100)
+                                           (alignment-offsets . (0 -15)))
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new Staff {
+        \repeat unfold 15 { d'4 d' d' d' }
+      }
+    >>
   }
->>
+}
 @end lilypond
 
 Note that here we assign two different values to the
@@ -1597,34 +1618,36 @@ additional spacing parameters (including, for example, a corresponding
 every system and every staff.  Finally, note that @code{alignment-offsets}
 specifies the vertical positioning of staves but not of staff groups.
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details #'((Y-offset . 0)
-        (alignment-offsets . (0 -30 -40)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details #'((Y-offset . 60)
-        (alignment-offsets . (0 -10 -20)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details #'((Y-offset . 100)
-        (alignment-offsets . (0 -10, -40)))
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new StaffGroup <<
-    \new Staff {
-      \repeat unfold 18 { d'4 d'4 d'4 d'4 }
-    }
-    \new Staff {
-      \repeat unfold 18 { e'4 e'4 e'4 e'4 }
-    }
-  >>
->>
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 0)
+                                           (alignment-offsets . (0 -30 -40)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 60)
+                                           (alignment-offsets . (0 -10 -20)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 100)
+                                           (alignment-offsets . (0 -10 -40)))
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new StaffGroup <<
+        \new Staff { \repeat unfold 15 { d'4 d' d' d' } }
+        \new Staff { \repeat unfold 15 { e'4 e' e' e' } }
+      >>
+    >>
+  }
+}
 @end lilypond
 
 Some points to consider:
index 146bc526c1d29e0c9677514ff1135bd029a1e8a1..4c8a0ecad6cbea8329d028ba383423a134f8177c 100644 (file)
@@ -13,9 +13,9 @@
 
 @lilypondfile[quote]{staff-headword.ly}
 
-This section explains how to influence the staff appearance, print
-scores with more than one staff, and how to apply specific
-performance marks to single staves.
+This section explains how to influence the appearance of staves,
+how to print scores with more than one staff, and how to add tempo
+indications and cue notes to staves.
 
 @menu
 * Displaying staves::
@@ -62,9 +62,10 @@ The basic staff context is @code{Staff}:
 \new Staff { c4 d e f }
 @end lilypond
 
-@code{DrumStaff} creates a five-line staff set up for a
-typical drum set.  It uses different names for each instrument.
-The instrument names are set using the @code{\drummode} command.
+The @code{DrumStaff} context creates a five-line staff set up for
+a typical drum set.  Each instrument is shown with a different
+symbol.  The instruments are entered in drum mode following a
+@code{\drummode} command, with each instrument specified by name.
 For details, see @ref{Percussion staves}.
 
 @lilypond[verbatim,quote]
@@ -73,14 +74,6 @@ For details, see @ref{Percussion staves}.
 }
 @end lilypond
 
-@c FIXME: remove when mentioned in NR 2.8
-@code{GregorianTranscriptionStaff} creates a staff to notate
-modern Gregorian chant.  It does not show bar lines.
-
-@lilypond[verbatim,quote,relative=2]
-\new GregorianTranscriptionStaff { c4 d e f e d }
-@end lilypond
-
 @code{RhythmicStaff} creates a single-line staff that only
 displays the rhythmic values of the input.  Real durations are
 preserved. For details, see @ref{Showing melody rhythms}.
@@ -100,6 +93,13 @@ There are two staff contexts specific for the notation of ancient
 music: @code{MensuralStaff} and @code{VaticanaStaff}.  They are
 described in @ref{Pre-defined contexts}.
 
+The @code{GregorianTranscriptionStaff} context creates a staff to
+notate modern Gregorian chant.  It does not show bar lines.
+
+@lilypond[verbatim,quote,relative=2]
+\new GregorianTranscriptionStaff { c4 d e f e d }
+@end lilypond
+
 New single staff contexts may be defined.  For details, see
 @ref{Defining new contexts}.
 
@@ -235,7 +235,6 @@ New staff group contexts may be defined.  For details, see
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {mensurstriche-layout-bar-lines-between-the-staves.ly}
-@c FIXME: move to NR 2.8.x when sectioning is ready
 
 
 @seealso
@@ -386,7 +385,9 @@ thickness.
 @end lilypond
 
 Ledger line thickness can be set independently of staff line
-thickness.
+thickness.  In the example the two numbers are factors multiplying
+the staff line thickness and the staff line spacing.  The two
+contributions are added to give the ledger line thickness.
 
 @lilypond[verbatim,quote,relative=1]
 \new Staff \with {
@@ -502,7 +503,7 @@ staff in the appropriate location:
 @end lilypond
 
 @noindent
-However, the above example is usually not the desired result.  To
+However, the above example is not what is usually desired.  To
 create ossia staves that are above the original staff, have no
 time signature or clef, and have a smaller font size, tweaks must
 be used.  The Learning Manual describes a specific technique to
@@ -671,8 +672,9 @@ block.  In orchestral scores, this style is known as @q{Frenched
 Score}.  By default, this command hides and removes all empty
 staves in a score except for those in the first system.
 
-@warning{An empty staff may only include multi-measure rests,
-skips, spacer rests, or a combination of these elements.}
+@warning{A staff is considered empty when it contains only
+multi-measure rests, skips, spacer rests, or a combination of these
+elements.}
 
 @lilypond[verbatim,quote,ragged-right]
 \layout {
@@ -1022,7 +1024,7 @@ Internals Reference:
 @cindex fragments
 @cindex cue notes
 
-It is very common for one voice to double the some of the music from
+It is very common for one voice to double some of the music from
 another voice.  For example, the first and second violins may play the
 same notes during a passage of music.  In LilyPond this is accomplished
 by letting one voice @emph{quote} the other voice without having to
index 7fc49398fc5839eb081ba44d300113809374cd07..cdb5568f8ef622b09b328c5aca5d37a767244d4c 100644 (file)
@@ -578,7 +578,7 @@ at first, so we can be sure the command is working.  We get:
 @end example
 
 Don't forget the @code{#'} preceding the
-property name and and @code{#} preceding the new value!
+property name and a @code{#} preceding the new value!
 
 The final question is, @q{Where should this command be
 placed?}  While you are unsure and learning, the best
@@ -3319,7 +3319,7 @@ and blanking the first up-stem in that voice, the tie appears to
 cross voices:
 
 @cindex Stem, example of overriding
-@cindex transparent propery, example
+@cindex transparent property, example
 
 @lilypond[quote,fragment,relative=2,verbatim]
 <<
index 85b636eecac6a3091808232b336d2dc9a1783d4b..16274e366be5025d2f6724f2b23129f673ff1d09 100644 (file)
@@ -627,7 +627,7 @@ single syllable; such vocalises are called melismas, or melismata.
 @c it might be better to present it first - vv
 
 You can define melismata entirely in the lyrics, by entering @code{_}
-for every extra note that has to be added to the the melisma.
+for every extra note that has to be added to the melisma.
 
 @c FIXME: clarify: __ is used to crate a lyric extender,
 @c _ is used to add a note to a melisma, so both __ and _ are needed.
index 11dbf96a164dc9a3faa7c54fbb36bd5616bc929d..cd99586ff81038832afcae4b9c31468cde8766b5 100644 (file)
@@ -2,6 +2,7 @@
 
 import subprocess
 import re
+import sys
 
 verbose = False
 
@@ -18,13 +19,13 @@ def read_pipe (command):
         error = code + ' ' + error
     return (output, error)
 
-revision_re = re.compile ('GIT [Cc]ommittish: ([a-f0-9]+)')
+revision_re = re.compile ('GIT [Cc]ommittish:\s+([a-f0-9]+)')
 vc_diff_cmd = 'git diff %(color_flag)s %(revision)s HEAD -- %(original)s | cat'
 
-def check_translated_doc (original, translated_contents, color=False):
+def check_translated_doc (original, translated_file, translated_contents, color=False):
     m = revision_re.search (translated_contents)
     if not m:
-        sys.stderr.write ('error: ' + translated + \
+        sys.stderr.write ('error: ' + translated_file + \
                           ": no 'GIT committish: <hash>' found.\nPlease check " + \
                           'the whole file against the original in English, then ' + \
                           'fill in HEAD committish in the header.\n')
index 4f6ef6a62908b8bcaff37d427416249cfcaa0f71..090b1fbe8a73811af2dd98c0d2c74f2078ca6aa3 100755 (executable)
@@ -36,7 +36,11 @@ def do_file (file_name, lang_codes, buildlib):
     
     original = dir_lang (file_name, '', lang_dir_index)
     translated_contents = open (file_name).read ()
-    (diff_string, error) = buildlib.check_translated_doc (original, translated_contents, color=use_colors and not update_mode)
+    (diff_string, error) \
+        = buildlib.check_translated_doc (original,
+                                         file_name,
+                                         translated_contents,
+                                         color=use_colors and not update_mode)
 
     if error:
         sys.stderr.write ('warning: %s: %s' % (file_name, error))
index aaa8888a3fdac88bcc92052a88a52aa34d17c0ab..6920e50d2232ae679234b40ddbefb66f266ad89d 100644 (file)
@@ -29,37 +29,42 @@ my_gettext = langdefs.translation[lang]
 html_codes = ((' -- ', ' &ndash; '),
               (' --- ', ' &mdash; '),
               ("'", '&rsquo;'))
-html2texi = {'command':
-                 (re.compile (r'<samp><span class="command">(.*?)</span></samp>'),
-                  r'@command{\1}'),
-             'code':
-                 (re.compile (r'<code>(.*?)</code>'),
-                  r'@code{\1}')
-             }
-texi2html = {'command':
-                 (re.compile (r'@command{(.*?)}'),
-                  r'<samp><span class="command">\1</span></samp>'),
-             'code':
-                 (re.compile (r'@code{(.*?)}'),
-                  r'<code>\1</code>')
-             }
+texi_html_conversion = {
+    'command': {
+        'html2texi':
+            (re.compile (r'(?:<samp><span class="command">|<code>)(.*?)(?:</span></samp>|</code>)'),
+             r'@command{\1}'),
+        'texi2html':
+            (re.compile (r'@command{(.*?)}'),
+             r'<code>\1</code>'),
+        },
+    'code': {
+        'html2texi':
+            (re.compile (r'<code>(.*?)</code>'),
+             r'@code{\1}'),
+        'texi2html':
+            (re.compile (r'@code{(.*?)}'),
+             r'<code>\1</code>'),
+        },
+    }
+
 whitespaces = re.compile (r'\s+')
 
 
 def _ (s):
     if not s:
         return ''
-    s = whitespaces.sub (' ', s)
+    str = whitespaces.sub (' ', s)
     for c in html_codes:
-        s = s.replace (c[1], c[0])
-    for u in html2texi.values():
-        s = u[0].sub (u[1], s)
-    s = my_gettext (s)
-    for u in texi2html.values():
-        s = u[0].sub (u[1], s)
+        str = str.replace (c[1], c[0])
+    for command in texi_html_conversion:
+        d = texi_html_conversion[command]
+        str = d['html2texi'][0].sub (d['html2texi'][1], str)
+        str = my_gettext (str)
+        str = d['texi2html'][0].sub (d['texi2html'][1], str)
     for c in html_codes:
-        s = s.replace (c[0], c[1])
-    return s
+        str = str.replace (c[0], c[1])
+    return str
 
 link_re =  re.compile (r'<link rel="(up|prev|next)" (.*?) title="([^"]*?)">')
 
@@ -72,27 +77,28 @@ makeinfo_title_re = re.compile (r'<title>([^<]*?) - ([^<]*?)</title>')
 def makeinfo_title_gettext (m):
     return '<title>' + _ (m.group (1)) + ' - ' + m.group (2) + '</title>'
 
-texi2html_title_re = re.compile (r'<title>(.+?): ([A-Z\d.]+ |)(.+?)</title>')
+texi2html_title_re = re.compile (r'<title>(.+): ([A-Z\d.]+ |)(.+?)</title>')
 
 def texi2html_title_gettext (m):
     return '<title>' + _ (m.group (1)) + double_punct_char_separator + ': ' \
         + m.group (2) + _ (m.group (3)) + '</title>'
 
-a_href_re = re.compile ('(?s)<a ([^>]*?href="[\\w.#-_]+"[^>]*>(?:<code>|))\
-(Appendix |)([A-Z0-9.]+ | (?:&lt;){1,2} |&nbsp;[^:<]+?:&nbsp;|&nbsp;|)\
-(.+?)(</code>| (?:&gt;){1,2} |&nbsp;|)</a>:?')
+a_href_re = re.compile ('(?s)<a (?P<attributes>[^>]*?href="[\\w.#-_]+"[^>]*>)(?P<code><code>)?\
+(?P<appendix>Appendix )?(?P<leading>[A-Z0-9.]+ | (?:&lt;){1,2} |&nbsp;[^:]+?:&nbsp;|&nbsp;|)\
+(?P<name>.+?)(?P<end_code>(?(code)</code>|))(?P<trailing>| (?:&gt;){1,2} |&nbsp;|)</a>:?')
 
 def a_href_gettext (m):
     s = ''
     if m.group(0)[-1] == ':':
         s = double_punct_char_separator + ':'
     t = ''
-    if m.group (2):
-        t = _ (m.group (2))
-    return '<a ' + m.group (1) + t + m.group (3) + _ (m.group (4)) + \
-        m.group (5) + '</a>' + s
+    if m.group ('appendix'):
+        t = _ (m.group ('appendix'))
+    return '<a ' + m.group ('attributes') + (m.group ('code') or '') + \
+        t + m.group ('leading') + _ (m.group ('name')) + \
+        m.group ('end_code') + m.group ('trailing') + '</a>' + s
 
-h_re = re.compile (r'<h(\d)( class="\w+"|)>\s*(Appendix |)([A-Z\d.]+ |)?([^<]+)\s*</h\1>')
+h_re = re.compile (r'<h(\d)( class="\w+"|)>\s*(Appendix |)([A-Z\d.]+ |)(.+?)\s*</h\1>')
 
 def h_gettext (m):
     if m.group (3):
index 4180ea86722c925bc4250e61311a4832735a0c34..c93199354f524f0296690ec90ba4bbbe08785817 100755 (executable)
@@ -247,7 +247,7 @@ class TranslatedTelyDocument (TelyDocument):
 
         ## calculate how much the file is outdated
         (diff_string, error) = \
-            buildlib.check_translated_doc (masterdocument.filename, self.contents)
+            buildlib.check_translated_doc (masterdocument.filename, self.filename, self.contents)
         if error:
             sys.stderr.write ('warning: %s: %s' % (self.filename, error))
             self.uptodate_percentage = None
index 7c3095dc007c30509bf9f6d737717fca3a82f90c..8cd6e3a05758594d2c8c3f91f1834fc5c1137ca4 100644 (file)
@@ -4,7 +4,7 @@
 
 \header {
   lsrtags = "paper-and-layout"
-  texidocs = "@code{\\bookpart} can be used to split a book into
+  texidoc = "@code{\\bookpart} can be used to split a book into
 several parts.
 Each part last page can be affected by @code{ragged-bottom-last}.
 Header and footer markups can detect a part last page, and make the
index 5da8877624a7042cb8eea318d7f7962c03e8f1ec..abb56b8460149ee984b0ccbc9a228c8a0572865e 100644 (file)
@@ -2,7 +2,7 @@
 
 \header {
   lsrtags = "paper-and-layout"
-  texidocs = "@code{\\bookpart} can be used to split a book into
+  texidoc = "@code{\\bookpart} can be used to split a book into
 several parts.
 Each part last page can be affected by @code{ragged-bottom-last}.
 Header and footer markups can detect a part last page, and make the
index 14d586a62e8c68bfd32a88ef0f3eb0dd58e87ed7..47f36b1af4c3848330a6760cf52b6ff2d47e0d8b 100644 (file)
@@ -6,7 +6,8 @@
     <miscellaneous>
       <miscellaneous-field name="description">Some tuplets (3:2, 3:2, 3:2, 4:2, 
           4:1, 7:3, 6:2) with the default tuplet bracket displaying the number 
-          of actual notes played.</miscellaneous-field>
+          of actual notes played. The second tuplet does not have a number 
+          attribute set.</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
         </time-modification>
         <stem>up</stem>
         <notations>
-          <tuplet number="1" placement="above" type="start"/>
+          <tuplet placement="above" type="start"/>
         </notations>
       </note>
       <note>
         </time-modification>
         <stem>up</stem>
         <notations>
-          <tuplet number="1" type="stop"/>
+          <tuplet type="stop"/>
         </notations>
       </note>
       <note>
         </time-modification>
         <stem>down</stem>
         <notations>
-          <tuplet bracket="no" number="1" placement="above" type="start"/>
+          <tuplet number="1" placement="above" type="start"/>
         </notations>
       </note>
       <note>
index c8e063c2a27973a1c63341a28fb1f64c139861e6..6b55d4d8aba5c2fff69341523fd0d5aff2e1c316 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Different tuplet styles:\r
-          default, none, x:y, x:y-note; Each with bracket, slur and none.\r
-          Finally, non-standard 4:3 and 17:2 tuplets are given.</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>408</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" show-number="none" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" show-number="none" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="3">\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" show-number="none" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="4">\r
-      <print new-system="yes">\r
-        <system-layout>\r
-          <system-distance>114</system-distance>\r
-        </system-layout>\r
-      </print>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>204</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <beam number="1">begin</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>204</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <beam number="1">end</beam>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Different tuplet styles:
+          default, none, x:y, x:y-note; Each with bracket, slur and none.
+          Finally, non-standard 4:3 and 17:2 tuplets are given.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>408</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>5</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes">
+        <system-layout>
+          <system-distance>114</system-distance>
+        </system-layout>
+      </print>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" placement="below" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>204</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>204</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index 7a7792dfdd56c131519b92a6c57f242526be5c66..eee4d0f27fd682200fb3d9a1769fc2f0d45d154e 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Tremolo tuplets are tuplets on \r
-          single notes with a tremolo ornament. The application shall correctly\r
-          import these notes with 2/3 or their time...</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>36</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time>\r
-          <beats>3</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="3">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>72</duration>\r
-        <voice>1</voice>\r
-        <type>half</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>6</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="4">\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <direction placement="below">\r
-        <direction-type>\r
-          <dynamics>\r
-            <fp/>\r
-          </dynamics>\r
-        </direction-type>\r
-      </direction>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>72</duration>\r
-        <voice>1</voice>\r
-        <type>half</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>6</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="5">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>72</duration>\r
-        <voice>1</voice>\r
-        <type>half</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>6</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tremolo tuplets are tuplets on 
+          single notes with a tremolo ornament. The application shall correctly
+          import these notes with 2/3 or their time...</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>36</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <dynamics>
+            <fp/>
+          </dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index c1a57feb07b812527206238bc42ca4a1af406e37..b85c0296d04592686ded1dc3852317f16952bfb1 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Tuplets can be nested. Here \r
-          there is a 5:2 tuplet inside a 3:2 tuple (all consisting of written\r
-          eighth notes).</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-      <score-instrument id="P1-I1">\r
-        <instrument-name>Acoustic Grand Piano</instrument-name>\r
-      </score-instrument>\r
-      <midi-instrument id="P1-I1">\r
-        <midi-channel>1</midi-channel>\r
-        <midi-program>1</midi-program>\r
-      </midi-instrument>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>30</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time>\r
-          <beats>2</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="2" placement="below" type="start">\r
-            <tuplet-actual>\r
-              <tuplet-number>5</tuplet-number>\r
-              <tuplet-type>eighth</tuplet-type>\r
-            </tuplet-actual>\r
-            <tuplet-normal>\r
-              <tuplet-number>2</tuplet-number>\r
-              <tuplet-type>eighth</tuplet-type>\r
-            </tuplet-normal>\r
-          </tuplet>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="2" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tuplets can be nested. Here 
+          there is a 5:2 tuplet inside a 3:2 tuple (all consisting of written
+          eighth notes).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+      <score-instrument id="P1-I1">
+        <instrument-name>Acoustic Grand Piano</instrument-name>
+      </score-instrument>
+      <midi-instrument id="P1-I1">
+        <midi-channel>1</midi-channel>
+        <midi-program>1</midi-program>
+      </midi-instrument>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>30</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet bracket="yes" number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet bracket="yes" number="2" placement="below" type="start">
+            <tuplet-actual>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>2</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="2" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml b/input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml
new file mode 100644 (file)
index 0000000..a0810b4
--- /dev/null
@@ -0,0 +1,615 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Displaying tuplet note types,
+          that might not coincide with the displayed note. The first two tuplets 
+          take the type from the note, the second two from the 
+          &lt;time-modification> element, the remaining pair of tuplets from the 
+          &lt;tuplet> notation element. The tuplets in measure 3 specify both 
+          a number of notes and a type inside the &lt;tuplet-actual> and 
+          &lt;tuplet-normal> elements, the ones in measure 4 specify only a 
+          note type (but no number), and the ones in measure 5 specify only a 
+          number of tuplet-notes (but no type, which is deduced from the 
+          note's type). The first tuplet of measures 3-5 uses 
+          'display-type="actual"', the second one 'display-type="both"'.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>408</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-type>half</tuplet-type>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>16th</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-type>half</tuplet-type>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-type>16th</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index 82cb627510077e0a793ea17c4b36b6d7f5ee5b96..bbd3ef8c6b48161fdc606c0a665a7000051d08ea 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Transposing instruments: Trumpet \r
-          in Bb, Horn in Eb, Piano; All of them show the C major scale (the \r
-          trumpet with 2 sharp, the horn with 3 sharp).</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name>Trumpet in Bb</part-name>\r
-      <part-abbreviation>Bb Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P2">\r
-      <part-name>Horn in Eb</part-name>\r
-      <part-abbreviation>Hn.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P3">\r
-      <part-name>Piano</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-1</diatonic>\r
-          <chromatic>-2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <alter>1</alter>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P2">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>3</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-5</diatonic>\r
-          <chromatic>-9</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P3">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Transposing instruments: Trumpet 
+          in Bb, Horn in Eb, Piano; All of them show the C major scale (the 
+          trumpet with 2 sharp, the horn with 3 sharp).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Trumpet in Bb</part-name>
+      <part-abbreviation>Bb Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Horn in Eb</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Piano</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P2">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-5</diatonic>
+          <chromatic>-9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index 84e1e484fe14faa0072f33f3afcff8f5d71e9beb..6a090be0e5fdd2bc5e5428ccc9cd6f0cb86b370b 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Various transposition. Each\r
-          part plays a c'', just displayed in different display pitches.\r
-          The second-to-last staff uses a transposition where the displayed c'\r
-          is an actual f''' concert pitch. The final staff is an untransposed\r
-          instrument.</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name>Clarinet in Eb</part-name>\r
-      <part-abbreviation>Eb Cl.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P2">\r
-      <part-name>Clarinet in Bb</part-name>\r
-      <part-abbreviation>Bb Cl.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P3">\r
-      <part-name>Clarinet in A</part-name>\r
-      <part-abbreviation>A Cl.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P4">\r
-      <part-name>Horn in F</part-name>\r
-      <part-abbreviation>Hn.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P5">\r
-      <part-name>Horn in Eb</part-name>\r
-      <part-abbreviation>Hn.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P6">\r
-      <part-name>Piccolo Trumpet in A</part-name>\r
-      <part-abbreviation>Picc.Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P7">\r
-      <part-name>Trumpet in Bb</part-name>\r
-      <part-abbreviation>Bb Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P8">\r
-      <part-name>Trumpet in C</part-name>\r
-      <part-abbreviation>C Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P9">\r
-      <part-name>Trumpet in D</part-name>\r
-      <part-abbreviation>D Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P10">\r
-      <part-name>displayed c'=fis'''</part-name>\r
-    </score-part>\r
-    <score-part id="P11">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>4</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>2</diatonic>\r
-          <chromatic>3</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P2">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>3</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-1</diatonic>\r
-          <chromatic>-2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P3">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>-2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-2</diatonic>\r
-          <chromatic>-3</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <alter>-1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P4">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-4</diatonic>\r
-          <chromatic>-7</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P5">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>4</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-5</diatonic>\r
-          <chromatic>-9</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P6">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>-2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>5</diatonic>\r
-          <chromatic>9</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <alter>-1</alter>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P7">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>3</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-1</diatonic>\r
-          <chromatic>-2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P8">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>1</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P9">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>-1</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>1</diatonic>\r
-          <chromatic>2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <alter>-1</alter>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P10">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>7</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>F</sign>\r
-          <line>4</line>\r
-          <clef-octave-change>-1</clef-octave-change>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>3</diatonic>\r
-          <chromatic>6</chromatic>\r
-          <octave-change>3</octave-change>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <alter>1</alter>\r
-          <octave>1</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P11">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>1</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Various transposition. Each
+          part plays a c'', just displayed in different display pitches.
+          The second-to-last staff uses a transposition where the displayed c'
+          is an actual f''' concert pitch. The final staff is an untransposed
+          instrument.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Clarinet in Eb</part-name>
+      <part-abbreviation>Eb Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Clarinet in Bb</part-name>
+      <part-abbreviation>Bb Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Clarinet in A</part-name>
+      <part-abbreviation>A Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P4">
+      <part-name>Horn in F</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P5">
+      <part-name>Horn in Eb</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P6">
+      <part-name>Piccolo Trumpet in A</part-name>
+      <part-abbreviation>Picc.Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P7">
+      <part-name>Trumpet in Bb</part-name>
+      <part-abbreviation>Bb Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P8">
+      <part-name>Trumpet in C</part-name>
+      <part-abbreviation>C Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P9">
+      <part-name>Trumpet in D</part-name>
+      <part-abbreviation>D Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P10">
+      <part-name>displayed c'=fis'''</part-name>
+    </score-part>
+    <score-part id="P11">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>4</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>2</diatonic>
+          <chromatic>3</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P2">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-2</diatonic>
+          <chromatic>-3</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P4">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-4</diatonic>
+          <chromatic>-7</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P5">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>4</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-5</diatonic>
+          <chromatic>-9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P6">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>5</diatonic>
+          <chromatic>9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P7">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P8">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P9">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-1</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>1</diatonic>
+          <chromatic>2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P10">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>7</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          <clef-octave-change>-1</clef-octave-change>
+        </clef>
+        <transpose>
+          <diatonic>3</diatonic>
+          <chromatic>6</chromatic>
+          <octave-change>3</octave-change>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>1</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P11">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/property-nested-override.ly b/input/regression/property-nested-override.ly
new file mode 100644 (file)
index 0000000..710822b
--- /dev/null
@@ -0,0 +1,20 @@
+\version "2.11.64"
+\header {
+  texidoc = "Nested properties may be overridden using Scheme list
+syntax.  This test performs two property overrides: the first
+measure uses standard @code{\\override} syntax; the second uses a
+list.
+"
+}
+
+\relative c' {
+  \once \override TextSpanner #'bound-details #'left #'text = #"foo"
+  c4\startTextSpan
+  \once \override Tie #'details #'note-head-gap = #3
+  c4 ~ c c\stopTextSpan
+  
+  \once \override TextSpanner #'(bound-details left text) = #"foo"
+  c4\startTextSpan
+  \once \override Tie #'(details note-head-gap) = #3
+  c4 ~ c c\stopTextSpan
+}
diff --git a/input/regression/repeat-percent-kerning.ly b/input/regression/repeat-percent-kerning.ly
new file mode 100644 (file)
index 0000000..530fb1a
--- /dev/null
@@ -0,0 +1,21 @@
+\version "2.11.65"
+\header {
+  texidoc = "The positioning of dots and slashes in percent repeat
+glyphs can be altered using @code{dot-negative-kern} and
+@code{slash-negative-kern}."
+}
+
+<<
+  \new Staff {
+    \set Staff.instrumentName = #"(default)"
+    \repeat percent 2 { c'1 }
+    \repeat percent 2 { d'1 e' }
+  }
+  \new Staff {
+    \override PercentRepeat #'dot-negative-kern = #1.1
+    \repeat percent 2 { c'1 }
+    \override DoublePercentRepeat #'dot-negative-kern = #0
+    \override DoublePercentRepeat #'slash-negative-kern = #1
+    \repeat percent 2 { d'1 e' }
+  }
+>>
index c7440e51543393c2dde6dfd750bac6fd04bcd2c3..f2b5833d595aa646ca797ffa52ec57e202995a80 100644 (file)
@@ -262,8 +262,8 @@ LY_DEFINE (ly_find_accidentals_simple, "ly:find-accidentals-simple", 5, 0, 0,
           " key signature.  The @var{laziness} is the number of bars for which reminder"
           " accidentals are used (ie. if @var{laziness} is zero, we only cancel accidentals"
           " in the same bar; if @var{laziness} is three, we cancel accidentals up to three"
-          " bars after they first appear.  @var{octaveness} is either "
-          " @code{'same-octave} or @code{'any-octave} and it specifies whether "
+          " bars after they first appear.  @var{octaveness} is either"
+          " @code{'same-octave} or @code{'any-octave} and it specifies whether"
           " accidentals should be canceled in different octaves.")
 {
   LY_ASSERT_TYPE (unsmob_pitch, pitch_scm, 2);
index a7a50a85317ef36b78d44931211b2cbb89ec6d3a..304d541666a734396143dc6a8a433e3fa576f61d 100644 (file)
@@ -337,14 +337,14 @@ ADD_INTERFACE (Bar_line,
               " is a string which specifies the kind of bar line to print."
               "  Options are @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:},"
               " @code{:|.:}, @code{||}, @code{|.}, @code{.|}, @code{.|.},"
-              " @code{|.|}, @code{:} and @code{\"dashed\"}.\n"
+              " @code{|.|}, @code{:} and @code{dashed}.\n"
               "\n"
               "These produce, respectively, a right repeat, a left repeat,"
               " a thick double repeat, a thin-thick-thin double repeat,"
               " a thin-thick double repeat, a double bar, a start bar,"
               " an end bar, a thick double bar, a thin-thick-thin bar,"
-              " a dotted bar and a dashed bar. "
-              " In addition, there is an option"
+              " a dotted bar and a dashed bar."
+              "  In addition, there is an option"
               " @code{||:} which is equivalent to @code{|:} except at line"
               " breaks, where it produces a double bar (@code{||}) at the"
               " end of the line and a repeat sign (@code{|:}) at the"
@@ -367,5 +367,3 @@ ADD_INTERFACE (Bar_line,
               "bar-size "
               "bar-extent "
               );
-
-
index c4cf852d1a7a154d254b4d315745eeafbf5aae15..584273df8b40ccf93ba85d44d9903bafc0894a1f 100644 (file)
@@ -48,7 +48,7 @@ Dot_configuration::print () const
   for (Dot_configuration::const_iterator i (begin ());
        i != end (); i++)
     printf ("%d, ", i->first);
-  printf ("} \n");
+  printf ("}\n");
 }
 
 /*
index d37147558112e5d64442d7a2fa44b7538341fe07..5bc12ea0731eebd694ee0caa4f1f3dc89e8b4b4c 100644 (file)
@@ -134,5 +134,5 @@ LY_DEFINE (ly_duration_factor, "ly:duration-factor",
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   Rational r = unsmob_duration (dur)->factor ();
-  return scm_cons (scm_from_int (r.num ()), scm_from_int (r.den ()));
+  return scm_cons (scm_from_int64 (r.num ()), scm_from_int64 (r.den ()));
 }
index a3b7544762b31079f3a8c005937d37ef33c3405f..a73b9961d1746ccc26dbe531fc7c43fa24f777ce 100644 (file)
@@ -41,8 +41,8 @@ public:
   void set_infinite (int k);
 
   bool to_bool () const;
-  int den () const;
-  int num () const;
+  I64 den () const;
+  I64 num () const;
   /*
     Deliver a copy of THIS as a smobified SCM
   */
index 990a31873df92696d4ebbb3e4de45e8d67537e28..be3f06247bdf261d2aad2b41c131269bab49f6c0 100644 (file)
@@ -18,7 +18,7 @@ public:
   DECLARE_GROB_INTERFACE();
   DECLARE_SCHEME_CALLBACK (beat_slash, (SCM));
   DECLARE_SCHEME_CALLBACK (double_percent, (SCM));
-  static Stencil x_percent (Grob *, int, Real, Real);
+  static Stencil x_percent (Grob *, int);
   static Stencil brew_slash (Grob *);
 };
 
index 9c88983e4c88586d90fc52f643feacaefd6af3c4..7c052876389b2ded1a402b2ed21bc2303cc196a8 100644 (file)
@@ -561,16 +561,16 @@ robust_scm2int (SCM k, int o)
 SCM
 ly_rational2scm (Rational r)
 {
-  return scm_divide (scm_from_long_long (r.numerator ()),
-                    scm_from_long_long (r.denominator ()));
+  return scm_divide (scm_from_int64 (r.numerator ()),
+                    scm_from_int64 (r.denominator ()));
 }
 
 
 Rational
 ly_scm2rational (SCM r)
 {
-  return Rational (scm_to_long_long (scm_numerator (r)),
-                  scm_to_long_long (scm_denominator (r)));
+  return Rational (scm_to_int64 (scm_numerator (r)),
+                  scm_to_int64 (scm_denominator (r)));
 }
 
 Rational
index 85155034c597bc6c3bd187d2960832a27f4b4387..89c69fa76df0ed4e6a7bc9cdf71017db4e88d04f 100644 (file)
@@ -111,7 +111,7 @@ LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
 
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->grace_part_.numerator ());
+  return scm_from_int64 (ma->grace_part_.numerator ());
 }
 
 LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
@@ -121,7 +121,7 @@ LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
   LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->grace_part_.denominator ());
+  return scm_from_int64 (ma->grace_part_.denominator ());
 }
 LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
           1, 0, 0, (SCM mom),
@@ -130,7 +130,7 @@ LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
   LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->main_part_.numerator ());
+  return scm_from_int64 (ma->main_part_.numerator ());
 }
 
 LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
@@ -140,7 +140,7 @@ LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
   LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->main_part_.denominator ());
+  return scm_from_int64 (ma->main_part_.denominator ());
 }
 
 LY_DEFINE (ly_moment_less_p, "ly:moment<?",
index 7516bf20e1a786eda78b6a4e3ce926e29b7df4e0..c9b3bd4250438b7ae09251f0ab17269d8db57ca4 100644 (file)
@@ -60,10 +60,10 @@ SCM
 Moment::as_scheme () const
 {
   return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
-                    scm_from_int (main_part_.num ()),
-                    scm_from_int (main_part_.den ()),
-                    scm_from_int (grace_part_.num ()),
-                    scm_from_int (grace_part_.den ()));
+                    scm_from_int64 (main_part_.num ()),
+                    scm_from_int64 (main_part_.den ()),
+                    scm_from_int64 (grace_part_.num ()),
+                    scm_from_int64 (grace_part_.den ()));
 }
 
 SCM
@@ -129,13 +129,14 @@ Moment::operator %= (Moment const &src)
   grace_part_ %= src.main_part_;
 }
 
-int
+I64
 Moment::den () const
 {
+  /* TODO: ensure MSB == 0 here */
   return main_part_.den ();
 }
 
-int
+I64
 Moment::num () const
 {
   return main_part_.num ();
index d16a11e3dbddd9ba2655f44a7c79e67809477f37..d5b490d1e9701489547beb32be3606b7240d0944 100644 (file)
@@ -47,7 +47,7 @@ Multi_measure_rest::percent (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
-  Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
+  Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
 
   // ugh copy & paste.
 
index b0c86c45b46060154ffd6f8af538cb82d69940fb..a38f77cb9d5010f50665bc007bf7808741bd8ba7 100644 (file)
@@ -26,17 +26,17 @@ Percent_repeat_item_interface::brew_slash (Grob *me)
   return m;
 }
 
-/*
-  todo: use grob props for dot_neg_kern, slash_neg_kern?
-*/
 Stencil
-Percent_repeat_item_interface::x_percent (Grob *me, int count,
-                                         Real dot_neg_kern,
-                                         Real slash_neg_kern)
+Percent_repeat_item_interface::x_percent (Grob *me, int count)
 {
   Stencil m;
   Stencil s = brew_slash (me);
 
+  Real dot_neg_kern =
+    robust_scm2double (me->get_property ("dot-negative-kern"), 0.75);
+  Real slash_neg_kern =
+    robust_scm2double (me->get_property ("slash-negative-kern"), 1.6);
+
   for (int i = count; i--;)
     m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern);
   Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
@@ -47,6 +47,7 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count,
   m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern);
   m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern);
 
+  m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
   return m;
 }
 
@@ -55,8 +56,7 @@ SCM
 Percent_repeat_item_interface::double_percent (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  Stencil m = x_percent (me, 2, 0.75, 1.6);
-  m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
+  Stencil m = x_percent (me, 2);
   return m.smobbed_copy ();
 }
 
@@ -74,6 +74,8 @@ ADD_INTERFACE (Percent_repeat_item_interface,
               "Repeats that look like percent signs.",
               
               /* properties */
+              "dot-negative-kern "
+              "slash-negative-kern "
               "slope "
               "thickness "
               );
index aa17285510e531d1823baa63a7d7fd87c0fee48a..924208486c5c7668c42b4f8bc72f3f82cec3c4a1 100644 (file)
@@ -18,9 +18,9 @@
 */
 LY_DEFINE (ly_make_scale, "ly:make-scale",
           1, 0, 0, (SCM steps),
-          "Create a scale. "
-          "The argument is a vector of rational numbers, each of which "
-          "represents the number of tones of a pitch above the tonic.")
+          "Create a scale."
+          "  The argument is a vector of rational numbers, each of which"
+          " represents the number of tones of a pitch above the tonic.")
 {
   bool type_ok = scm_is_vector (steps);
 
index de39fca5c340ca19e20cfaf14a41e9b4a0d12761..36f13e783cef0214e869ccea045f1f7594f77138 100644 (file)
@@ -341,11 +341,11 @@ LY_DEFINE (ly_round_filled_box, "ly:round-filled-box",
 }
 
 LY_DEFINE (ly_round_filled_polygon, "ly:round-filled-polygon",
-           2, 0, 0,
-           (SCM points, SCM blot),
-           "Make a @code{Stencil} object that prints a black polygon with "
-           "corners at the points defined by @var{points} (list of coordinate "
-           "pairs) and roundness @var{blot}.")
+          2, 0, 0,
+          (SCM points, SCM blot),
+          "Make a @code{Stencil} object that prints a black polygon with"
+          " corners at the points defined by @var{points} (list of coordinate"
+          pairs) and roundness @var{blot}.")
 {
   SCM_ASSERT_TYPE (scm_ilength (points) > 0, points, SCM_ARG1, __FUNCTION__, "list of coordinate pairs");
   LY_ASSERT_TYPE (scm_is_number, blot, 2);
index c0ae536a02846e054145a0fc47ede441d1a93371..2384699ceafb5c0c9b243d6f41362a361c8c4832 100644 (file)
@@ -2823,7 +2823,7 @@ def conv (str):
     str = re.sub (r"\\bigger", r"\\larger", str)
     return str
 
-@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup, \n\
+@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup,\n\
 InnerStaffGroup -> StaffGroup, InnerChoirStaff -> ChoirStaff")
 def conv (str):
     str = re.sub (r'systemSeparatorMarkup', r'system-separator-markup', str)
index c0b298f36797fd9a775c0afb588c77ea9bff4a37..6909adcdf86ca16d9abad67387d95a98966bbedb 100644 (file)
@@ -452,7 +452,68 @@ class RelativeMusic (MusicWrapper):
         relative_pitches = prev_relative_pitches
 
 class TimeScaledMusic (MusicWrapper):
+    def __init__ (self):
+        MusicWrapper.__init__ (self)
+        self.numerator = 1
+        self.denominator = 1
+        self.display_number = "actual" # valid values "actual" | "both" | None
+        # Display the basic note length for the tuplet:
+        self.display_type = None       # value values "actual" | "both" | None
+        self.display_bracket = "bracket" # valid values "bracket" | "curved" | None
+        self.actual_type = None   # The actually played unit of the scaling
+        self.normal_type = None   # The basic unit of the scaling
+        self.display_numerator = None
+        self.display_denominator = None
+
     def print_ly (self, func):
+        if self.display_bracket == None:
+            func ("\\once \\override TupletBracket #'stencil = ##f")
+            func.newline ()
+        elif self.display_bracket == "curved":
+            warning (_ ("Tuplet brackets of curved shape are not correctly implemented"))
+            func ("\\once \\override TupletBracket #'stencil = #ly:slur::print")
+            func.newline ()
+
+        base_number_function = {None: "#f", 
+             "actual": "tuplet-number::calc-denominator-text", 
+             "both": "tuplet-number::calc-fraction-text"}.get (self.display_number, None)
+        # If we have non-standard numerator/denominator, use our custom function
+        if self.display_number == "actual" and self.display_denominator:
+            base_number_function = "(tuplet-number::non-default-tuplet-denominator-text %s)" % self.display_denominator
+        elif self.display_number == "both" and (self.display_denominator or self.display_numerator):
+            if self.display_numerator:
+                num = self.display_numerator
+            else:
+                num = "#f"
+            if self.display_denominator:
+                den = self.display_denominator
+            else:
+                den = "#f"
+            base_number_function = "(tuplet-number::non-default-tuplet-fraction-text %s %s)" % (den, num)
+
+
+        if self.display_type == "actual" and self.normal_type:
+            # Obtain the note duration in scheme-mode, i.e. \longa as \\longa
+            base_duration = self.normal_type.ly_expression (None, True)
+            func ("\\once \\override TupletNumber #'text = #(tuplet-number::append-note-wrapper %s \"%s\")" %
+                (base_number_function, base_duration))
+            func.newline ()
+        elif self.display_type == "both": # TODO: Implement this using actual_type and normal_type!
+            warning (_ ("Tuplet brackets displaying both note durations are not implemented, using default"))
+            if self.display_number == None:
+                func ("\\once \\override TupletNumber #'stencil = ##f")
+                func.newline ()
+            elif self.display_number == "both":
+                func ("\\once \\override TupletNumber #'text = #%s" % base_number_function)
+                func.newline ()
+        else:
+            if self.display_number == None:
+                func ("\\once \\override TupletNumber #'stencil = ##f")
+                func.newline ()
+            elif self.display_number == "both":
+                func ("\\once \\override TupletNumber #'text = #%s" % base_number_function)
+                func.newline ()
+
         func ('\\times %d/%d ' %
            (self.numerator, self.denominator))
         func.add_factor (Rational (self.numerator, self.denominator))
index 588a469f970ea537749a3c27bbc4942a9fe65616..0c062648129914461a0cfbaa7a640573bd81129f 100644 (file)
@@ -401,6 +401,14 @@ class Note (Measure_element):
            return 3
         else:
             return None
+    
+    def get_duration_info (self):
+        log = self.get_duration_log ()
+        if log != None:
+            dots = len (self.get_typed_children (Dot))
+            return (log, dots)
+        else:
+            return None
 
     def get_factor (self):
         return 1
@@ -528,6 +536,13 @@ class Musicxml_voice:
             return self._lyrics
 
 
+def graces_to_aftergraces (pending_graces):
+    for gr in pending_graces:
+        gr._when = gr._prev_when
+        gr._measure_position = gr._prev_measure_position
+        gr._after_grace = True
+
+
 class Part (Music_xml_node):
     def __init__ (self):
         Music_xml_node.__init__ (self)
@@ -540,7 +555,7 @@ class Part (Music_xml_node):
             n = n._parent
 
         return n.get_named_child ('part-list')
-        
+       
     def interpret (self):
        """Set durations and starting points."""
         """The starting point of the very first note is 0!"""
@@ -615,10 +630,7 @@ class Part (Music_xml_node):
                    if n.get_name() == 'backup':
                        dur = - dur
                         # reset all graces before the backup to after-graces:
-                        for n in pending_graces:
-                            n._when = n._prev_when
-                            n._measure_position = n._prev_measure_position
-                            n._after_grace = True
+                        graces_to_aftergraces (pending_graces)
                         pending_graces = []
                    if n.get_maybe_exist_typed_child (Grace):
                        dur = Rational (0)
@@ -630,7 +642,7 @@ class Part (Music_xml_node):
 
                         rest._is_whole_measure = True
 
-                if (dur > Rational (0) 
+                if (dur > Rational (0)
                     and n.get_maybe_exist_typed_child (Chord)):
                     now = last_moment
                     measure_position = last_measure_position
@@ -676,10 +688,7 @@ class Part (Music_xml_node):
                         n.instrument_name = part_list.get_instrument (instrument.id)
 
             # reset all graces at the end of the measure to after-graces:
-            for n in pending_graces:
-                n._when = n._prev_when
-                n._measure_position = n._prev_measure_position
-                n._after_grace = True
+            graces_to_aftergraces (pending_graces)
             pending_graces = []
             # Incomplete first measures are not padded, but registered as partial
             if is_first_measure:
@@ -854,6 +863,16 @@ class Time_modification(Music_xml_node):
        a = self.get_maybe_exist_named_child ('normal-notes')
        return (int(a.get_text ()), int (b.get_text ()))
 
+    def get_normal_type (self):
+        tuplet_type = self.get_maybe_exist_named_child ('normal-type')
+        if tuplet_type:
+            dots = self.get_named_children ('normal-dot')
+            log = musicxml_duration_to_log (tuplet_type.get_text ().strip ())
+            return (log , len (dots))
+        else:
+            return None
+
+
 class Accidental (Music_xml_node):
     def __init__ (self):
        Music_xml_node.__init__ (self)
@@ -876,7 +895,40 @@ class Wedge (Music_xml_spanner):
     pass
 
 class Tuplet (Music_xml_spanner):
-    pass
+    def duration_info_from_tuplet_note (self, tuplet_note):
+        tuplet_type = tuplet_note.get_maybe_exist_named_child ('tuplet-type')
+        if tuplet_type:
+            dots = tuplet_note.get_named_children ('tuplet-dot')
+            log = musicxml_duration_to_log (tuplet_type.get_text ().strip ())
+            return (log, len (dots))
+        else:
+            return None
+
+    # Return tuplet note type as (log, dots)
+    def get_normal_type (self):
+        tuplet = self.get_maybe_exist_named_child ('tuplet-normal')
+        if tuplet:
+            return self.duration_info_from_tuplet_note (tuplet)
+        else:
+            return None
+
+    def get_actual_type (self):
+        tuplet = self.get_maybe_exist_named_child ('tuplet-actual')
+        if tuplet:
+            return self.duration_info_from_tuplet_note (tuplet)
+        else:
+            return None
+
+    def get_tuplet_note_count (self, tuplet_note):
+        if tuplet_note:
+            tuplet_nr = tuplet_note.get_maybe_exist_named_child ('tuplet-number')
+            if tuplet_nr: 
+                return int (tuplet_nr.get_text ())
+        return None
+    def get_normal_nr (self):
+        return self.get_tuplet_note_count (self.get_maybe_exist_named_child ('tuplet-normal'))
+    def get_actual_nr (self):
+        return self.get_tuplet_note_count (self.get_maybe_exist_named_child ('tuplet-actual'))
 
 class Bracket (Music_xml_spanner):
     pass
index b5ffda6574faa9f1fc4ed998284a1b62448b7e08..7185bd20d30e1aa5633761efcbeef44db1363430 100644 (file)
@@ -124,7 +124,7 @@ note)."
 (ly:add-interface
  'percent-repeat-interface
  "Beat, Double and single measure repeats."
- '(slope thickness))
+ '(dot-negative-kern slash-negative-kern slope thickness))
 
 (ly:add-interface
  'piano-pedal-interface
index ed1837c8c6329cce8ab341579435b3dd5eec873e..619adf31067cd52fc07bc2ba2c9ed8b6d795169f 100644 (file)
@@ -1,4 +1,4 @@
-;;;; grob-property-description.scm -- part of generated backend documentation
+;;;; define-grob-properties.scm -- part of generated backend documentation
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
@@ -168,6 +168,9 @@ other object.  Otherwise, it determines whether the object is placed
 be used: @code{#UP}=@code{1}, @code{#DOWN}=@code{-1},
 @code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}.")
      (dot-count ,integer? "The number of dots.")
+     (dot-negative-kern ,number? "The space to remove between a dot
+a and slash in percent repeat glyphs.  Larger values bring the two
+elements closer together.")
      (dot-placement-list ,list? "List 
 consisting of @code{(@var{description} @var{string-number} 
 @var{fret-number} @var{finger-number})} 
@@ -566,6 +569,9 @@ is placed vertically.")
 @code{direction-source} with this to get the direction of this
 object.")
      (size ,number? "Size of object, relative to standard size.")
+     (slash-negative-kern ,number? "The space to remove between
+slashes in percent repeat glyphs.  Larger values bring the two
+elements closer together.")
      (slope ,number? "The slope of this object.")
      (slur-padding ,number? "Extra distance between slur and script.")
      (space-alist ,list? "A table that specifies distances between
index aa3b6ee197082361a0576ef3e67930849c2151a7..0c1df0a25714540f03ea860347b8b274114c8c4d 100644 (file)
        (X-offset . ,(grob::calc-property-by-copy 'X-offset)) 
        (Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) 
        (meta . ((class . Item)
-                (interfaces . (text-interface
+                (interfaces . (balloon-interface
+                               text-interface
                                font-interface))))))
     (BarLine
      . (
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
 
-       (self-alignment-X . 1)
+       (self-alignment-X . ,RIGHT)
 
        ;; want the bar number before the clef at line start. 
        (break-align-symbols . (left-edge staff-bar))
                        (first-note . (minimum-fixed-space . 0.0))
                        (right-edge . (extra-space . 0.1))))
        (meta . ((class . Item)
-                (interfaces
-                 . (custos-interface
-                    staff-symbol-referencer-interface
-                    font-interface
-                    break-aligned-interface))))))
+                (interfaces  . (custos-interface
+                                staff-symbol-referencer-interface
+                                font-interface
+                                break-aligned-interface))))))
 
     (DotColumn
      . (
        (stencil . ,ly:percent-repeat-item-interface::double-percent)
        (non-musical . #t)
        (slope . 1.0)
+       (dot-negative-kern . 0.75)
+       (slash-negative-kern . 1.6)
        (font-encoding . fetaMusic)
        (width . 2.0)
        (thickness . 0.48)
        (shortest-duration-space . 1.6)
        (meta . ((class . Spanner)
                 (interfaces . (grace-spacing-interface
-                               
                                spacing-options-interface
                                spanner-interface))))))
+
     (GridPoint
      . (
        (X-extent . (0 . 0))
        (meta . ((class . Spanner)
                 (interfaces . (system-start-text-interface
                                side-position-interface
+                               self-alignment-interface
                                font-interface))))))
 
     (InstrumentSwitch
        (extra-spacing-width . (+inf.0 . -inf.0))
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
+                               self-alignment-interface
                                text-interface
                                font-interface))))))
 
        (meta . ((class . Item)
                 (interfaces . (key-cancellation-interface
                                key-signature-interface
+                               staff-symbol-referencer-interface
                                font-interface
                                break-aligned-interface))))))
 
        (non-musical . #t)
        (meta . ((class . Item)
                 (interfaces . (key-signature-interface
+                               staff-symbol-referencer-interface
                                font-interface
                                break-aligned-interface))))))
     
        (stencil . ,ly:multi-measure-rest::percent)
        (slope . 1.0)
        (thickness . 0.48)
+       (dot-negative-kern . 0.75)
        (font-encoding . fetaMusic)
        (meta . ((class . Spanner)
                 (interfaces . (multi-measure-rest-interface
                                font-interface
-                               percent-repeat-interface
-                               ))))))
+                               percent-repeat-interface))))))
 
     (PercentRepeatCounter
      . (
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
        (stencil . ,ly:separation-item::print)
        (meta . ((class . Item)
-                (interfaces . (
-                               separation-item-interface))))))
+                (interfaces . (separation-item-interface))))))
 
     (Slur
-     . ((details . ,default-slur-details)
+     . (
+       (details . ,default-slur-details)
        (control-points . ,ly:slur::calc-control-points)
        (direction . ,ly:slur::calc-direction)
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        
        (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((class . Spanner)
-                (interfaces . (
-                               spacing-options-interface                               
+                (interfaces . (spacing-options-interface
                                spacing-spanner-interface))))))
 
     (SpanBar
        (stem-attachment . (0.0 . 1.35))
        (font-series . bold)
        (meta . ((class . Item)
-                (interfaces
-                 . (rhythmic-head-interface
-                    font-interface rhythmic-grob-interface
-                    note-head-interface
-                    staff-symbol-referencer-interface
-                    text-interface))))))
+                (interfaces  . (rhythmic-head-interface
+                                font-interface
+                                rhythmic-grob-interface
+                                note-head-interface
+                                staff-symbol-referencer-interface
+                                text-interface))))))
 
     (TextScript
      . (
                                   ))
                          (right . ((Y . 0)
                                    (padding . 0.25)
-                                  ))
+                                   ))
                          ))
        (stencil . ,ly:line-spanner::print)
 
        (meta . ((class . Spanner)
                 (interfaces . (line-spanner-interface
+                               line-interface
                                side-position-interface
                                font-interface))))))
 
index 8d7bb3bc25c001b99634efb1e47298ebd6843bf3..dcaf5dcee19e61cea710a611e6e68fe617bb538f 100644 (file)
@@ -120,9 +120,9 @@ node."
            engraver-list))
        "."
 
-       "\n\nStandard settings: \n\n"
+       "\n\nStandard settings:\n\n"
        (grob-alist->texi description)
-       "\n\nThis object supports the following interface(s): \n"
+       "\n\nThis object supports the following interface(s):\n"
        (human-listify ifacedoc)
        "."))))
 
index eefc1c26ee9627316e43e11e09101d9e4ceebbe2..65ee3fec13c6c751b24e03785130eeb77822ebd7 100644 (file)
@@ -34,7 +34,7 @@
 (define-method (display (leaf <Font-tree-leaf>) port)
   (map (lambda (x) (display x port))
        (list
-       "#<Font-size-family: \n"
+       "#<Font-size-family:\n"
        (slot-ref leaf 'default-size) 
        (slot-ref leaf 'size-vector)
        "#>"
@@ -47,7 +47,7 @@
      (display x port))
 
    (list
-    "Font_node { \nqual: "
+    "Font_node {\nqual: "
     (font-qualifier node)
     "(def: "
     (font-default node)
@@ -59,7 +59,7 @@
      (display "=" port)
      (display (cdr x) port))
    (hash-table->alist (font-children node)))
-  (display "} } \n"))
+  (display "} }\n"))
 
 
 (define default-qualifier-order
index c7214da3c597d25c5dcf49210a1f90efe829ab1c..7486d5f64c32d8e10d747cef728f43f4d4562430 100644 (file)
     "set-ps-scale-to-lily-scale "
     "\n"))
   (ly:outputter-dump-stencil outputter page)
-  (ly:outputter-dump-string outputter "stroke grestore \nshowpage\n"))
+  (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n"))
 
 (define (supplies-or-needs paper load-fonts?)
   (define (extract-names font)
 
       (if (not embed)
          (begin
-           (set! embed "% failed \n")
+           (set! embed "% failed\n")
            (ly:warning (_ "cannot extract file matching ~a from ~a") name filename)))
       embed))
 
 
     (display header port)
     (write-preamble paper load-fonts port)
-    (display "gsave set-ps-scale-to-lily-scale \n" port)
+    (display "gsave set-ps-scale-to-lily-scale\n" port)
     (ly:outputter-dump-stencil outputter dump-me)
     (display "stroke grestore\n%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)))
index 584dd6b3e17943623010c56e969c406ca94d3674..ee798233611a6a65361f1fae414962848a9f3cfa 100644 (file)
                  ((PropertySet) (list 'value (car args)))
                  ((PropertyUnset) '())
                  ((OverrideProperty) (list 'grob-value (car args)
-                                           'grob-property-path (cdr args)
+                                           'grob-property-path (if (list? (cadr args))
+                                                                   (cadr args)
+                                                                   (cdr args))
                                            'pop-first #t))
                  ((RevertProperty)
                   (if (list? (car args))
index 0b636377cceb580f793aa39d68e4141bf12a6963..39bedc18047c8b6f1e37dfeb7460727217bd216f 100644 (file)
         (format graph-out "~a ~a\n" time mem)
         (if stack
             (begin
-              (format stacks-out "~5a t = ~5a - delta-mem: ~15a - ~a \n" i
+              (format stacks-out "~5a t = ~5a - delta-mem: ~15a - ~a\n" i
                       time
                       (- mem last-mem) proc)
               (do
index 9274279a2cf732f61d2db234c88b5d9c586e7bfe..da3c25a211ad7127a1baed82e3f8bcc4cec44648 100644 (file)
              (list r g b)))
 
 ;; restore color from stack
-(define (resetcolor) "grestore \n")
+(define (resetcolor) "grestore\n")
 
 ;; rotation around given point
 (define (setrotation ang x y)
index 749baed3c84f3cc0914d591c9cd2ca4ad2dc3f0f..f272b8f299db6335c9adc7ea713e85e0f4b28c76 100644 (file)
@@ -216,7 +216,7 @@ def dump_slyrics (outf):
             m = k
         for i in range (len(slyrics[voice_idx_dict[k]])):
             l= alphabet(i)
-            outf.write ("\nwords%sV%s = \lyricmode {" % (m, l))
+            outf.write ("\nwords%sV%s = \\lyricmode {" % (m, l))
             outf.write ("\n" + slyrics [voice_idx_dict[k]][i])
             outf.write ("\n}")
 
@@ -254,7 +254,7 @@ def try_parse_q(a):
         denominator=array2[0]
         perminute=array2[1]
         duration = str (int (denominator) / int (numerator))
-        midi_specs = ' '.join(["    \n\t\t\context {\n\t\t \Score tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t }\n"])
+        midi_specs = ' '.join(["\n\t\t\\context {\n\t\t \\Score tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t }\n"])
     else:
         sys.stderr.write("abc2ly: Warning, unable to parse Q specification: %s\n" % a)
 
@@ -282,7 +282,7 @@ def dump_score (outf):
 
         l = ord( 'A' )
         for lyrics in slyrics [voice_idx_dict[k]]:
-            outf.write ("\n\t\\addlyrics { \n")
+            outf.write ("\n\t\\addlyrics {\n")
             if re.match('[1-9]',k):
                 m = alphabet (int (k))
             else:
@@ -650,12 +650,12 @@ def try_parse_header_line (ln, state):
             if a == 'C':
                 if not state.common_time:
                     state.common_time = 1
-                    voices_append (" \\override Staff.TimeSignature #\'style = #'C\n")
+                    voices_append (" \\override Staff.TimeSignature #'style = #'C\n")
                 a = '4/4'
             if a == 'C|':
                 if not state.common_time:
                     state.common_time = 1
-                    voices_append ("\\override Staff.TimeSignature #\'style = #'C\n")
+                    voices_append ("\\override Staff.TimeSignature #'style = #'C\n")
                 a = '2/2'
             if not length_specified:
                 set_default_len_from_time_sig (a)
@@ -779,7 +779,7 @@ def duration_to_lilypond_duration  (multiply_tup, defaultlen, dots):
             base = '\\breve'
             dots = 1
         if (multiply_tup[0] / multiply_tup[1]) == 4:
-            base = '\longa'
+            base = '\\longa'
     return '%s%s' % ( base, '.'* dots)
 
 class Parser_state:
index 39a6fba4abf08c2cc1a68c05aa95769539df7ec3..c23075055dd0f8a1a8949c75bd1f7d9f24ad51ae 100644 (file)
@@ -508,7 +508,7 @@ class Frame:
         if left[0]:
             str = str + rational_to_lily_skip (left)
 
-        str = str + '  | \n'
+        str = str + '  |\n'
         return str
         
 def encodeint (i):
@@ -615,7 +615,7 @@ class Staff:
                     fr = m.frames[x]
                 except IndexError:
                     sys.stderr.write ("Skipping nonexistent frame %d\n" % x)
-                    laystr = laystr + "%% non existent frame %d (skipped) \n" % x
+                    laystr = laystr + "%% non existent frame %d (skipped)\n" % x
                 if fr:
                     first_frame = fr
                     if gap <> (0,1):
index d847be27e9c0475e1063e1755e0b1166b686b930..194d51fa491eb6c696a2e71eee1fccc6da689b48 100644 (file)
@@ -42,7 +42,7 @@
     (define-public (_ x) x))
 
 (define (show-version port)
-  (format port "~a (GNU LilyPond) ~a \n" PROGRAM-NAME TOPLEVEL-VERSION))
+  (format port "~a (GNU LilyPond) ~a\n" PROGRAM-NAME TOPLEVEL-VERSION))
 
 (define (show-help port)
   (format port (_ "Usage: lilypond-invoke-editor [textedit://]FILE:LINE:CHAR:COLUMN
index e2a54008e321eef92b447d57d51f77a525eb710b..326a6d62eb12cc6a8ca87464bc7bc4d87c5b31a3 100644 (file)
@@ -44,6 +44,7 @@ def error_message (str):
 
 needed_additional_definitions = []
 additional_definitions = {
+
   "snappizzicato": """#(define-markup-command (snappizzicato layout props) ()
   (interpret-markup layout props
     (markup #:stencil
@@ -54,6 +55,7 @@ additional_definitions = {
             (list 'draw-line 0.1 0 0.1 0 1)
             '(-0.1 . 0.1) '(0.1 . 1)))
         0.7 X))))""",
+
   "eyeglasses": """eyeglassesps = #"0.15 setlinewidth
       -0.9 0 translate
       1.1 1.1 scale
@@ -72,7 +74,33 @@ additional_definitions = {
       3.30 2.00 lineto
       3.42 2.26 3.80 2.40 3.65 1.70 curveto
       stroke"
-eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }"""
+eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }""",
+
+  "tuplet-note-wrapper": """      % a formatter function, which is simply a wrapper around an existing 
+      % tuplet formatter function. It takes the value returned by the given
+      % function and appends a note of given length. 
+  #(define-public ((tuplet-number::append-note-wrapper function note) grob)
+    (let* ((txt (if function (function grob) #f)))
+      (if txt 
+        (markup txt #:fontsize -5 #:note note UP)
+        (markup #:fontsize -5 #:note note UP)
+      )
+    )
+  )""",
+
+  "tuplet-non-default-denominator": """#(define ((tuplet-number::non-default-tuplet-denominator-text denominator) grob)
+  (number->string (if denominator 
+                      denominator 
+                      (ly:event-property (event-cause grob) 'denominator))))
+""",
+
+  "tuplet-non-default-fraction": """#(define ((tuplet-number::non-default-tuplet-fraction-text denominator numerator) grob)
+    (let* ((ev (event-cause grob))
+           (den (if denominator denominator (ly:event-property ev 'denominator)))
+           (num (if numerator numerator (ly:event-property ev 'numerator))))
+       (format "~a:~a" den num)))
+"""
+
 }
 
 def round_to_two_digits (val):
@@ -446,24 +474,27 @@ def extract_score_structure (part_list, staffinfo):
 
 
 def musicxml_duration_to_lily (mxl_note):
-    d = musicexp.Duration ()
     # if the note has no Type child, then that method returns None. In that case,
     # use the <duration> tag instead. If that doesn't exist, either -> Error
-    d.duration_log = mxl_note.get_duration_log ()
-    if d.duration_log == None:
-        if mxl_note._duration > 0:
-            return rational_to_lily_duration (mxl_note._duration)
-        else:
-            mxl_note.message (_ ("Encountered note at %s without type and duration (=%s)") % (mxl_note.start, mxl_note._duration) )
-            return None
-    else:
-        d.dots = len (mxl_note.get_typed_children (musicxml.Dot))
+    dur = mxl_note.get_duration_info ()
+    if dur:
+        d = musicexp.Duration ()
+        d.duration_log = dur[0]
+        d.dots = dur[1]
         # Grace notes by specification have duration 0, so no time modification 
         # factor is possible. It even messes up the output with *0/1
         if not mxl_note.get_maybe_exist_typed_child (musicxml.Grace):
             d.factor = mxl_note._duration / d.get_length ()
         return d
 
+    else:
+        if mxl_note._duration > 0:
+            return rational_to_lily_duration (mxl_note._duration)
+        else:
+            mxl_note.message (_ ("Encountered note at %s without type and duration (=%s)") % (mxl_note.start, mxl_note._duration) )
+            return None
+
+
 def rational_to_lily_duration (rational_len):
     d = musicexp.Duration ()
 
@@ -593,6 +624,68 @@ def group_repeats (music_list):
     return music_list
 
 
+# Extract the settings for tuplets from the <notations><tuplet> and the 
+# <time-modification> elements of the note:
+def musicxml_tuplet_to_lily (tuplet_elt, time_modification):
+    tsm = musicexp.TimeScaledMusic ()
+    fraction = (1,1)
+    if time_modification:
+        fraction = time_modification.get_fraction ()
+    tsm.numerator = fraction[0]
+    tsm.denominator  = fraction[1]
+
+
+    normal_type = tuplet_elt.get_normal_type ()
+    if not normal_type and time_modification:
+        normal_type = time_modification.get_normal_type ()
+    if not normal_type and time_modification:
+        note = time_modification.get_parent ()
+        if note:
+            normal_type = note.get_duration_info ()
+    if normal_type:
+        normal_note = musicexp.Duration ()
+        (normal_note.duration_log, normal_note.dots) = normal_type
+        tsm.normal_type = normal_note
+
+    actual_type = tuplet_elt.get_actual_type ()
+    if actual_type:
+        actual_note = musicexp.Duration ()
+        (actual_note.duration_log, actual_note.dots) = normal_type
+        tsm.actual_type = actual_note
+
+    # Obtain non-default nrs of notes from the tuplet object!
+    tsm.display_numerator = tuplet_elt.get_normal_nr ()
+    tsm.display_denominator = tuplet_elt.get_actual_nr ()
+
+    print ("num: %s, den: %s" % (tsm.display_numerator, tsm.display_denominator))
+
+
+    if hasattr (tuplet_elt, 'bracket') and tuplet_elt.bracket == "no":
+        tsm.display_bracket = None
+    elif hasattr (tuplet_elt, 'line-shape') and getattr (tuplet_elt, 'line-shape') == "curved":
+        tsm.display_bracket = "curved"
+    else:
+        tsm.display_bracket = "bracket"
+
+    display_values = {"none": None, "actual": "actual", "both": "both"}
+    if hasattr (tuplet_elt, "show-number"):
+        tsm.display_number = display_values.get (getattr (tuplet_elt, "show-number"), "actual")
+    if tsm.display_number == "actual" and tsm.display_denominator:
+        print "Add denom-function\n";
+        needed_additional_definitions.append ("tuplet-non-default-denominator")
+    elif tsm.display_number == "both" and (tsm.display_numerator or tsm.display_denominator):
+        print "Add fraction-function\n";
+        needed_additional_definitions.append ("tuplet-non-default-fraction")
+    else:
+        print "No display-function, display_number=%s, den=%s\n" % (tsm.display_number, tsm.display_denominator);
+
+    if hasattr (tuplet_elt, "show-type"):
+        if getattr (tuplet_elt, "show-type") == "actual":
+            needed_additional_definitions.append ("tuplet-note-wrapper")
+        tsm.display_type = display_values.get (getattr (tuplet_elt, "show-type"), None)
+
+    return tsm
+
 
 def group_tuplets (music_list, events):
 
@@ -606,25 +699,28 @@ def group_tuplets (music_list, events):
     brackets = {}
 
     j = 0
-    for (ev_chord, tuplet_elt, fraction) in events:
+    for (ev_chord, tuplet_elt, time_modification) in events:
         while (j < len (music_list)):
             if music_list[j] == ev_chord:
                 break
             j += 1
-        nr = tuplet_elt.number
+        nr = 0
+        if hasattr (tuplet_elt, 'number'):
+            nr = getattr (tuplet_elt, 'number')
         if tuplet_elt.type == 'start':
-            tuplet_info = [j, None, fraction]
+            tuplet_object = musicxml_tuplet_to_lily (tuplet_elt, time_modification)
+            tuplet_info = [j, None, tuplet_object]
             indices.append (tuplet_info)
             brackets[nr] = tuplet_info
         elif tuplet_elt.type == 'stop':
             bracket_info = brackets.get (nr, None)
             if bracket_info:
-                bracket_info[1] = j
+                bracket_info[1] = j # Set the ending position to j
                 del brackets[nr]
 
     new_list = []
     last = 0
-    for (i1, i2, frac) in indices:
+    for (i1, i2, tsm) in indices:
         if i1 > i2:
             continue
 
@@ -633,12 +729,8 @@ def group_tuplets (music_list, events):
         last = i2 + 1
         seq.elements = music_list[i1:last]
 
-        tsm = musicexp.TimeScaledMusic ()
         tsm.element = seq
 
-        tsm.numerator = frac[0]
-        tsm.denominator  = frac[1]
-
         new_list.append (tsm)
 
     new_list.extend (music_list[last:])
@@ -1996,12 +2088,8 @@ def musicxml_voice_to_lily_voice (voice):
         #    accidental-mark | other-notation
         for notations in notations_children:
             for tuplet_event in notations.get_tuplets():
-                mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
-                frac = (1,1)
-                if mod:
-                    frac = mod.get_fraction ()
-
-                tuplet_events.append ((ev_chord, tuplet_event, frac))
+                time_mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
+                tuplet_events.append ((ev_chord, tuplet_event, time_mod))
 
             # First, close all open slurs, only then start any new slur
             # TODO: Record the number of the open slur to dtermine the correct