LSR: Update.

diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely
index 80fd9506d0088af3358b7e543f41205ca7a4d621..dbc2f1914a733454e8b7f2156e32bca2bad54878 100644 (file)
--- a/Documentation/de/user/editorial.itely
+++ b/Documentation/de/user/editorial.itely
@@ -196,7 +196,7 @@ Fingersatzanweisungen können manuell oberhalb des Systems gesetzt werden, siehe
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 @seealso
 Notationsreferenz:

diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely
index 5daefd4b89b55cf5d7343f6476f8b85b3d8e7f9c..6d6b581b94f7f0288d1622892dc0a5cea794aacf 100644 (file)
--- a/Documentation/es/user/editorial.itely
+++ b/Documentation/es/user/editorial.itely
@@ -200,7 +200,7 @@ and placement}.
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso

diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/user/editorial.itely
index 0440dfeb9a3ca80ae5d821b6b4b0ded05a468caa..a473c00e3db7f5310f46a1fd28f0935dfb3625df 100644 (file)
--- a/Documentation/fr/user/editorial.itely
+++ b/Documentation/fr/user/editorial.itely
@@ -156,7 +156,7 @@ d'indiquer des doigtés très proches des têtes de notes.
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index 1e2773553622ea4f4a3d26335f4bc2d98bbcd59f..ec0748740e926c53154ec8e73e98f3ce2bba9f21 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -195,7 +195,7 @@ staff, see @ref{Direction and placement}.
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{avoiding-collisions-of-chord-fingering-with-beams.ly}
+{avoiding-collisions-with-chord-fingerings.ly}
 
 
 @seealso

diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
index 631d4fb6fc06dc533b74aa58c60d63610b0c4779..7ab5021104d91022fc59c1103a8d4bf4e392d9b6 100644 (file)
--- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
+++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
@@ -22,7 +22,6 @@ truco se aplique a toda la partitura.
   doctitlees = "Añadir un bajo cifrado encima o debajo de las notas"
   
   doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes"
-  
 
   texidoc = "
 When writing a figured bass, here's a way to specify if you want your

diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly
index 41127f6e3282fdfbdccf0776fe8c72cba078b132..80aeac3c941fdcb1e7baca144a6885ad25b9c0c0 100644 (file)
--- a/input/lsr/adding-drum-parts.ly
+++ b/input/lsr/adding-drum-parts.ly
@@ -17,6 +17,20 @@ de líneas.
 "
   doctitlees = "Escritura de partes de percusión"
 
+  texidocfr = "
+Grâce à la puissance des outils préconfigurés tels que la fonction
+@code{\\drummode} et le contexte @code{DrumStaff}, la saisie de 
+parties pour percussions est extrêmement simplifiée : chaque composant
+d'une batterie trouve sa place sur une portée dédiée (avec une clef 
+spécifique) et les têtes de note sont spécifiques à chaque élément.  
+Il est également possible d'affecter un symbole particulier à chaque 
+élément, tout comme de restreindre le nombre de lignes de la portée.
+
+"
+
+  doctitlefr = "Ajout de parties de batterie"
+
+
   texidoc = "
 Using the powerful pre-configured tools such as the @code{\\drummode}
 function and the @code{DrumStaff} context, inputting drum parts is

diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly
index 83e15bd307bf9baaa29b86cf4a1ac6b8c6325da0..7e2aa72d20b67c414b924645a2e872d6b7f650f9 100644 (file)
--- a/input/lsr/adjusting-lyrics-vertical-spacing.ly
+++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly
@@ -12,6 +12,14 @@ letra más cerca del pentagrama.
 "
   doctitlees = "Ajuste del especiado vertical de la letra"
 
+  texidocfr = "
+Cet extrait illustre la manière de rapprocher la ligne de paroles 
+de la portée.
+
+"
+  doctitlefr = "Ajustement de l'espacement vertical des paroles"
+
+
   texidoc = "
 This snippet shows how to bring the lyrics line closer to the staff.
 

diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly
index 2f1f606a5bcdcdae058226513d4e8ab480caf23f..a175e5936f093a857a485df99695ea19f8f263fc 100644 (file)
--- a/input/lsr/ancient-fonts.ly
+++ b/input/lsr/ancient-fonts.ly
@@ -13,6 +13,13 @@ antigua.
 
   doctitlees = "Tipografía de música antigua"
 
+  texidocfr ="
+Voici comment graver la plupart, sinon tous les symboles que
+LilyPond prend en charge en matière de musique ancienne.
+
+"
+  doctitlefr = "Gravure de musique ancienne"
+
   texidoc = "
 Shown here are many (all?) of the symbols that are included in
 LilyPond's support for ancient notation.

diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
index b0462e0b32b8a1060b0125e12302d16dd24e77b9..d0d09ef503878d5884926ecc7fa09b7fa908b3ee 100644 (file)
--- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
+++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
@@ -30,6 +30,19 @@ ein Kompromiss werden die Notenlinien nicht auf dem System, sondern
 zwischen den Systemen geschrieben.
 "
 
+  texidocfr = "
+Lorsque l'on transcrit de la musique mensurale, il est d'usage 
+d'indiquer en début de partition,  par un « incipit », les tonalité 
+et tempo originaux.  De nos jours, les musiciens ont l'habitude de 
+voir des barres de mesure qui les aide à appréhender la structure 
+rythmique.  Ces barres n'existaient pas du temps où ces œuvres ont 
+été écrites ; en fait, la métrique évoluait au fil de la pièce.  Un 
+compromis consiste à imprimer des barres de mesure entre les portées 
+plutôt que sur la portée elle-même.
+
+"
+  doctitle = "Exemples de notation ancienne -- transcription moderne de musique mensurale"
+
   texidoc = "
 When transcribing mensural music, an incipit at the beginning of the
 piece is useful to indicate the original key and tempo. While today

diff --git a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly
deleted file mode 100644 (file)
index bdae18c..0000000
--- a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly
+++ /dev/null
@@ -1,57 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.0"
-
-\header {
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
-
-  texidoces = "
-Las digitaciones y los números de cuerda aplicados a notas
-individuales evitan a las barras automáticamente, pero de forma
-predeterminada esto no es cierto para las digitaciones y números
-de cuerda que se aplican a notas concretas de acordes.  El ejemplo
-siguiente muestra cómo se puede sobreescribir este comportamiento
-predeterminado:
-
-"
-  doctitlees = "Evitar colisiones entre digitaciones de acordes y barras de corchea"
-
-  texidoc = "
-Fingerings and string numbers applied to individual notes will
-automatically avoid beams, but this is not true by default for
-fingerings and string numbers applied to the individual notes of
-chords.  The following example shows how this default behavior can be
-overridden:   
-
-"
-  doctitle = "Avoiding collisions of chord fingering with beams"
-  texidocfr = "
-Les doigtés et les numéros de cordes attachés à des notes seules
-évitent automatiquement les barres de ligature, mais ce n'est pas le
-cas par défaut pour les doigtés ou numéros de cordes attachés aux
-notes d'un accord. L'exemple qui suit montre comment ce comportement
-par défaut peut être corrigé.
-"
-  doctitlefr = "Éviter les collisions entre les doigtés d'accords et les ligatures"
-} % begin verbatim
-
-\relative c' {
-  \set fingeringOrientations = #'(up)
-  \set stringNumberOrientations = #'(up)
-  \set strokeFingerOrientations = #'(up)
-  
-  % Default behavior
-  r8
-  <f c'-5>8
-  <f c'\5>8
-  <f c'-\rightHandFinger #2 >8
-  
-  % Corrected to avoid collisions
-  r8
-  \override Fingering #'add-stem-support = ##t
-  <f c'-5>8
-  \override StringNumber #'add-stem-support = ##t
-  <f c'\5>8
-  \override StrokeFinger #'add-stem-support = ##t
-  <f c'-\rightHandFinger #2 >8
-}

diff --git a/input/lsr/avoiding-collisions-with-chord-fingerings.ly b/input/lsr/avoiding-collisions-with-chord-fingerings.ly
new file mode 100644 (file)
index 0000000..4ce8094
--- /dev/null
+++ b/input/lsr/avoiding-collisions-with-chord-fingerings.ly
@@ -0,0 +1,38 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.12.0"
+
+\header {
+  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
+
+  texidoc = "
+Fingerings and string numbers applied to individual notes will
+automatically avoid beams and stems, but this is not true by default
+for fingerings and string numbers applied to the individual notes of
+chords.  The following example shows how this default behavior can be
+overridden.
+
+"
+  doctitle = "Avoiding collisions with chord fingerings"
+} % begin verbatim
+
+\relative c' {
+  \set fingeringOrientations = #'(up)
+  \set stringNumberOrientations = #'(up)
+  \set strokeFingerOrientations = #'(up)
+  
+  % Default behavior
+  r8
+  <f c'-5>8
+  <f c'\5>8
+  <f c'-\rightHandFinger #2 >8
+  
+  % Corrected to avoid collisions
+  r8
+  \override Fingering #'add-stem-support = ##t
+  <f c'-5>8
+  \override StringNumber #'add-stem-support = ##t
+  <f c'\5>8
+  \override StrokeFinger #'add-stem-support = ##t
+  <f c'-\rightHandFinger #2 >8
+}

diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list
index 6d057c919209c1d7768912b0282627bbd9788475..5e3faa93877a7ebe010fc9afb0665364ab8fffbb 100644 (file)
--- a/input/lsr/chords.snippet-list
+++ b/input/lsr/chords.snippet-list
@@ -1,6 +1,6 @@
 adding-a-figured-bass-above-or-below-the-notes.ly
 adding-bar-lines-to-chordnames-context.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 changing-chord-separator.ly
 changing-the-chord-names-to-german-or-semi-german-notation.ly
 changing-the-positions-of-figured-bass-alterations.ly

diff --git a/input/lsr/creating-a-delayed-turn.ly b/input/lsr/creating-a-delayed-turn.ly
index b1a6a07f3b81da2d0945333b856ac331c2c2c902..5e667425d3725a083ee7c4dc744728b14f59f552 100644 (file)
--- a/input/lsr/creating-a-delayed-turn.ly
+++ b/input/lsr/creating-a-delayed-turn.ly
@@ -3,12 +3,15 @@
 \version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
-  texidoc = "Creating a delayed turn, where the lower note of the
-  turn uses the accidental, requires several overrides.  The
-  @code{outside-staff-priority} property must be set to #f, as otherwise
-  this would take precedence over the @code{avoid-slur property}.  The
-  value of @code{halign} is used to position the turn horizontally."
+  lsrtags = "expressive-marks, editorial-annotations,tweaks-and-overrides"
+
+  texidoc = "
+Creating a delayed turn, where the lower note of the
+turn uses the accidental, requires several overrides.  The
+@code{outside-staff-priority} property must be set to @code{#f},
+as otherwise this would take precedence over the
+@code{avoid-slur property}.  The value of @code{halign} is used
+to position the turn horizontally."
 
   doctitle = "Creating a delayed turn"
 } % begin verbatim

diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list
index c60e130f8f8cefd2556584badc634b309ac2a02f..884345679d93a9d5510424fe5a3a50029f460842 100644 (file)
--- a/input/lsr/editorial-annotations.snippet-list
+++ b/input/lsr/editorial-annotations.snippet-list
@@ -2,7 +2,7 @@ adding-fingerings-to-a-score.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 analysis-brackets-above-the-staff.ly
 applying-note-head-styles-depending-on-the-step-of-the-scale.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 changing-a-single-notes-size-in-a-chord.ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly

diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly
index cf3999b27259daf5aa63078c78a3d40586d93664..772c4dad1d8e96d986dcab6bb4b0c19a5c9a6ab0 100644 (file)
--- a/input/lsr/non-traditional-key-signatures.ly
+++ b/input/lsr/non-traditional-key-signatures.ly
@@ -72,6 +72,10 @@ Alternatively, for each item in the list, using the more concise format
 all octaves.
 
 
+For microtonal scales where a \"sharp\" is not 100 cents, @code{alter}
+refers to the alteration as a proportion of a 200-cent whole tone.
+
+
 Here is an example of a possible key signature for generating a
 whole-tone scale: 
 

diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index dc88624aeee98a59ae4c9deea7097a15da741945..75d487975c7cc2fdc394d12b4fcf7ef3c323679f 100644 (file)
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -2,7 +2,7 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 adding-drum-parts.ly
 automatic-beam-subdivisions.ly
 automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 beam-endings-in-score-context.ly
 beam-grouping-in-7-8-time.ly
 beams-across-line-breaks.ly

diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index e8d93d9e411c5d5b2f987377e6343462b3e6fa45..0c246b2e1466eec2650d35131d343ad790e2bdae 100644 (file)
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -1,5 +1,5 @@
 analysis-brackets-above-the-staff.ly
-avoiding-collisions-of-chord-fingering-with-beams.ly
+avoiding-collisions-with-chord-fingerings.ly
 caesura-railtracks-with-fermata.ly
 changing-a-single-notes-size-in-a-chord.ly
 changing-form-of-multi--measure-rests.ly

diff --git a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
index 4493628a99cf6b73e4a8e920593b9d13f746de0c..28143c8faa7789a6ea934985d7d4b7e564436d9a 100644 (file)
--- a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
+++ b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
@@ -5,6 +5,15 @@
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
 
+  texidocfr = "
+Lorsqu'il est impossible d'obtenir facilement une allure particulière
+pour les têtes de note en recourant à la technique du @code{\\markup}, un
+code Postscript peut vous tirer d'embarras.  Voici comment générer des
+têtes ressemblant à des parallélogrammes.
+
+"
+  doctitlefr = "Utilisation de Postscript pour générer des têtes de note à l'allure particulière"
+
   texidoc = "
 When a note head with a special shape cannot easily be generated with
 graphic markup, PostScript code can be used to generate the shape. 

diff --git a/input/new/creating-a-delayed-turn.ly b/input/new/creating-a-delayed-turn.ly
index fe417be0f263ca6d26ab953892d3cc0af8fa4e08..16df65b6069cd1e7cf91132bed83c67f930cd4d9 100644 (file)
--- a/input/new/creating-a-delayed-turn.ly
+++ b/input/new/creating-a-delayed-turn.ly
@@ -1,8 +1,7 @@
 \version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, 
-tweaks-and-overrides"
+  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
 
   texidoc = "
 Creating a delayed turn, where the lower note of the

diff --git a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.ly b/input/texidocs/using-postscript-to-generate-special-note-head-shapes.ly
deleted file mode 100644 (file)
index a018ea1..0000000
--- a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.ly
+++ /dev/null
@@ -1,9 +0,0 @@
-  texidocfr = "
-Lorsqu'il est impossible d'obtenir facilement une allure particulière 
-pour les têtes de note en recourant à la technique du @code{\\markup}, un
-code Postscript peut vous tirer d'embarras.  Voici comment générer des
-têtes ressemblant à des parallélogrammes.
-
-"
-  doctitlefr = "Utilisation de Postscript pour générer des têtes de note à 
-l'allure particulière"

diff --git a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc b/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
new file mode 100644 (file)
index 0000000..8007f8e
--- /dev/null
+++ b/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
@@ -0,0 +1,8 @@
+  texidocfr = "
+Lorsqu'il est impossible d'obtenir facilement une allure particulière
+pour les têtes de note en recourant à la technique du @code{\\markup}, un
+code Postscript peut vous tirer d'embarras.  Voici comment générer des
+têtes ressemblant à des parallélogrammes.
+
+"
+  doctitlefr = "Utilisation de Postscript pour générer des têtes de note à l'allure particulière"