From: Neil Puttock <n.puttock@gmail.com>
Date: Thu, 29 Jan 2009 22:34:28 +0000 (+0000)
Subject: LSR: Update.
X-Git-Tag: release/2.13.0-0~49
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=372acaa8583e0abc84b4fe0001435c988dffb86c;p=lilypond.git

LSR: Update.
---

diff --git a/input/lsr/aligning-objects-created-with-the--mark-command.ly b/input/lsr/aligning-objects-created-with-the--mark-command.ly
new file mode 100644
index 0000000000..8af16fdec4
--- /dev/null
+++ b/input/lsr/aligning-objects-created-with-the--mark-command.ly
@@ -0,0 +1,27 @@
+%% 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 = "text"
+
+  texidoc = "
+By default the @code{\\mark} command centers objects over a bar line. 
+This behavior can be modified to align at right or left.  
+
+"
+  doctitle = "Aligning objects created with the \\mark command"
+} % begin verbatim
+
+\relative c' {
+  c1 \mark "(Center)"
+  c1
+  \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
+  \mark "(Left)"
+  c4 c c c
+  c4 c c c
+  \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+  \mark "(Right)"
+  c1
+}
+
diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
index 08bfb23c84..6ad71e56ba 100644
--- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
+++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
@@ -13,6 +13,13 @@ cancelar.
 "
   doctitlees = "Permitir que las digitaciones se impriman dentro del pentagrama"
 
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+  texidocfr = "
+L'empilement des indications de doigté se fait par défaut à l'extérieur de la portée.  Néanmoins, il est possible d'annuler ce comportement.
+
+"
+  doctitlefr = "Impression des doigtés à l'intérieur de la portée"
+
   texidoc = "
 By default, vertically oriented fingerings are positioned outside the
 staff.  However, this behavior can be canceled.
diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
index 6d4cbc3a6e..4d02558b2d 100644
--- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
+++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
@@ -15,6 +15,18 @@ barrado, este fragmento de código cambia el barrado a pulsos de negra.
 "
   doctitlees = "Barras automáticas de dos en dos en los compases de 4/4 o de 2/2"
 
+%% Translation of GIT committish: 1154b407d42f303a024598296ad36ab6c93e2b5a
+  texidocfr = "
+Dans une métrique simple comme 4/4 ou 2/2, les croches sont ligaturées
+par défaut en deux groupes de quatre.
+
+En utilisant une macro qui modifie le comportement des ligatures 
+automatiques, voici comment obtenir des ligatures basées sur la valeur 
+d'une noire.
+
+"
+  doctitlefr = "Ligature automatique deux par deux, aussi bien en 4/4 qu'en 2/2"
+
   texidoc = "
 In a simple time signature of 2/2 or 4/4, 8th notes are beamed by
 default as two sets of four.
diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly
index 877fd09403..4cb87b8b73 100644
--- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly
+++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly
@@ -11,6 +11,15 @@ Se puede controlar con precisión la colocación de los números de digitación.
 "
   doctitlees = "Controlar la colocación de las digitaciones de acordes"
 
+
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Le positionnement des doigtés peut être contrôlé de manière très précise.
+
+"
+  doctitlefr = "Conrôle du positionnement des doigtés"
+
   texidoc = "
 The placement of fingering numbers can be controlled precisely.
 
diff --git a/input/lsr/creating-a-delayed-turn.ly b/input/lsr/creating-a-delayed-turn.ly
index 5e667425d3..a5e775b418 100644
--- a/input/lsr/creating-a-delayed-turn.ly
+++ b/input/lsr/creating-a-delayed-turn.ly
@@ -3,7 +3,20 @@
 \version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations,tweaks-and-overrides"
+texidoces = "
+La creación de un grupeto circular de anticipación entre dos notas,
+donde la nota inferior del grupeto utiliza una alteración, requiere
+varias sobreescriturasw de propiedades.  La propiedad
+@code{outside-staff-priority} se debe establecer al valor #f, pues en
+caso contrario tendría prioridad sobre la propiedad @code{avoid-slur
+property}.  El valor de @code{halign} se utiliza para colocar el
+grupeto horizontalmente.
+
+"
+
+doctitlees = "Crear un grupeto de anticipación"
+
+  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
 
   texidoc = "
 Creating a delayed turn, where the lower note of the
diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly
index c8cbd7468c..98a97047fc 100644
--- a/input/lsr/customizing-markup-fret-diagrams.ly
+++ b/input/lsr/customizing-markup-fret-diagrams.ly
@@ -12,6 +12,18 @@ diagramas de posiciones de marcado, se pueden aplicar overrides
 "
  doctitlees = "Personalizar diagramas de posiciones de marcado"
 
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Les propriétés d'un diagramme de fret sont modifiables grâce au 
+@code{'fret-diagram-details}.  Lorsqu'ils sont générés sous forme 
+de @code{\markup}, rien n'empêche de les modifier en jouant sur les 
+réglages de l'objet @code{Voice.TextScript} ou bien directement sur 
+le @qq{markup}.
+
+"
+  doctitlefr = "Personnalisation des diagrammes de fret"
+
   lsrtags = "fretted-strings,tweaks-and-overrides"
 
   texidoc = "Fret diagram properties can be set through
diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly
index cbf7067e34..9a2dd6b015 100644
--- a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly
+++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly
@@ -20,6 +20,24 @@ de las cuerdas.  Hay planes para corregir esto en un futuro.
 "
   doctitlees = "Definición de posiciones predefinidas para otros instrumentos"
 
+%% Translation of GIT committish: cd4950757ab1ab6c89805b0b7c978bfca034f940
+
+  texidocfr = "
+La liste des diagrammes standards prédéfinis pour la guitare peut être
+ augmentée d'autres définitions spécifiques à d'autres instruments.  
+Voici comment définir un nouvel accordage ainsi que quelques diagrammes 
+prédéfinis pour le @qq{cuatro vénézuélien}.
+
+Cet exemple illustre aussi la manière d'ajouter des doigtés aux 
+accords ; ils serviront de référence pour la boucle d'accord et seront 
+indiqués dans les diagrammes et le @code{TabStaff}, mais pas dans la musique. 
+
+Ces diagrammes ne peuvent pas être transposés, dans la mesure où ils 
+contiennent des informations sur les cordes.  Ceci est amené à évoluer.
+
+"
+  doctitlefr = "Création de diagrammes de fret prédéfinis pour d'autres instruments"
+
   lsrtags = "fretted-strings"
   texidoc = "Predefined fret diagrams can be added for new instruments
 in addition to the standards used for guitar.  This file shows how
diff --git a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
index 371e9e787c..cc68fe6554 100644
--- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
+++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
@@ -13,6 +13,16 @@ derecha.
 "
   doctitlees = "Digitaciones, indicación del número de cuerda y digitaciones de mano derecha"
 
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+L'exemple suivant illustre comment combiner des doigtés pour la main 
+gauche, des indications de corrde et des doigtés pour la main droite.
+
+"
+  doctitlefr = "Doigtés, indications de cordeet doigtés main droite"
+
+
   texidoc = "
 This example combines left-hand fingering, string indications, and
 right-hand fingering.
diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/input/lsr/fret-diagrams-explained-and-developed.ly
index ff25b711c1..dc50842415 100644
--- a/input/lsr/fret-diagrams-explained-and-developed.ly
+++ b/input/lsr/fret-diagrams-explained-and-developed.ly
@@ -13,15 +13,17 @@ and tweaking fret diagrams."
 <<
   \chords {
     a2 a
-    c2 c
-    d1
+    \repeat unfold 3 {
+      c c c d d
+    }
   }
   
   \new Voice = "mel" {
     \textLengthOn
     % Set global properties of fret diagram
     \override TextScript #'size = #1.2
-    \override TextScript #'fret-diagram-details #'finger-code = #'below-string
+    \override TextScript 
+      #'fret-diagram-details #'finger-code = #'below-string
     \override TextScript #'fret-diagram-details #'dot-color = #'black
     
     %% A chord for ukelele
@@ -45,6 +47,207 @@ and tweaking fret diagrams."
       }
     }
     
+      %% These chords will be in normal orientation
+
+    %% C major for guitar, barred on third fret
+    %  verbose style
+    %  roman fret label, finger labels below string, straight barre
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-lower)
+                     (finger-code . below-string)
+                     (barre-type . straight))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . arabic)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . in-dot)
+                     (fret-label-font-mag . 0.6)
+                     (fret-label-vertical-offset . 0)
+                     (label-dir . -1)
+                     (mute-string . "M")
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 4 2 5)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
+    %% simple D chord
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (string-thickness-factor . 0.3)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup  {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (top-fret-thickness . 7)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+      % These chords will be in landscape orientation
+    \override TextScript 
+       #'fret-diagram-details #'orientation = #'landscape
+
+    %% C major for guitar, barred on third fret
+    %  verbose style
+    %  roman fret label, finger labels below string, straight barre
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-lower)
+                     (finger-code . below-string)
+                     (barre-type . straight))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . arabic)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . in-dot)
+                     (fret-label-font-mag . 0.6)
+                     (fret-label-vertical-offset . 0)
+                     (label-dir . -1)
+                     (mute-string . "M")
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (place-fret 5 3 1)
+                                   (place-fret 4 5 2)
+                                   (place-fret 3 5 3)
+                                   (place-fret 2 5 4)
+                                   (place-fret 1 3 1)
+                                   (barre 4 2 5)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
+    %% simple D chord
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (top-fret-thickness . 7)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+      % These chords will be in opposing-landscape orientation
+    \override TextScript #'fret-diagram-details 
+                           #'orientation = #'opposing-landscape
+
     %% C major for guitar, barred on third fret
     %  verbose style
     %  roman fret label, finger labels below string, straight barre
@@ -67,6 +270,7 @@ and tweaking fret diagrams."
     }
     
     %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
     %  verbose style
     c'2^\markup {
       % 110% of default size
@@ -79,7 +283,6 @@ and tweaking fret diagrams."
                      (fret-label-vertical-offset . 0)
                      (label-dir . -1)
                      (mute-string . "M")
-                     (orientation . landscape)
                      (xo-font-magnification . 0.4)
                      (xo-padding . 0.3))) {
           \fret-diagram-verbose #'((mute 6)
@@ -88,17 +291,53 @@ and tweaking fret diagrams."
                                    (place-fret 3 5 3)
                                    (place-fret 2 5 4)
                                    (place-fret 1 3 1)
+                                   (barre 4 2 5)
                                    (barre 5 1 3))
         }
       }
     }
     
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
     %% simple D chord
-    d'1^\markup {
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup {
       \override #'(fret-diagram-details . (
                    (finger-code . below-string)
                    (dot-radius . 0.35)
                    (dot-position . 0.5)
+                   (top-fret-thickness . 7)
                    (fret-count . 3))) {
         \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
       }
diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list
index b6814c4603..d6f0217428 100644
--- a/input/lsr/pitches.snippet-list
+++ b/input/lsr/pitches.snippet-list
@@ -12,5 +12,6 @@ ottava-text.ly
 preventing-extra-naturals-from-being-automatically-added.ly
 preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
 quoting-another-voice-with-transposition.ly
+separating-key-cancellations-from-key-signature-changes.ly
 transposing-pitches-with-minimum-accidentals-smart-transpose.ly
 tweaking-clef-properties.ly
diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly
index 614a80484e..f3ca23da19 100644
--- a/input/lsr/placement-of-right-hand-fingerings.ly
+++ b/input/lsr/placement-of-right-hand-fingerings.ly
@@ -13,6 +13,17 @@ propiedad específica, como se muestra en el ejemplo siguiente.
 "
   doctitlees = "Posicionamiento de digitaciones de mano derecha"
 
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Vous disposez d'une propriété spécifique qui permet de contrôler plus 
+finement le positionnement des doigtés main droite, comme l'indique 
+l'exemple suivant.
+
+"
+  doctitlefr = "Positionnement des doigtés main droite"
+
+
   texidoc = "
 It is possible to exercise greater control over the placement of
 right-hand fingerings by setting a specific property, as demonstrated
diff --git a/input/lsr/polyphony-in-tablature.ly b/input/lsr/polyphony-in-tablature.ly
index e3b2b63c84..d718fd1433 100644
--- a/input/lsr/polyphony-in-tablature.ly
+++ b/input/lsr/polyphony-in-tablature.ly
@@ -12,6 +12,15 @@ en una pauta normal.
 "
   doctitlees = "Polifonía en tablaturas"
 
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Une section polyphonique s'obtient dans un @code{TabStaff} de la
+même manière que dans une portée normale.
+
+"
+  doctitlefr = "Polyphonie en mode tablature"
+
   texidoc = "
 Polyphony is created the same way in a @code{TabStaff} as in a regular
 staff.
diff --git a/input/lsr/positioning-text-markups-inside-slurs.ly b/input/lsr/positioning-text-markups-inside-slurs.ly
index b65c7d0a07..414ad47c10 100644
--- a/input/lsr/positioning-text-markups-inside-slurs.ly
+++ b/input/lsr/positioning-text-markups-inside-slurs.ly
@@ -5,6 +5,15 @@
 \header {
   lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
 
+  texidoces = "
+
+Los elementos de marcado de texto deben tener la propiedad
+@code{outside-staff-priority} establecida al valor falso para que se
+impriman por dentro de las ligaduras de expresión.
+
+"
+  doctitlees = "Situar los elementos de marcado de texto por dentro de las ligaduras"
+
   texidoc = "
 Text markups need to have the @code{outside-staff-priority} property
 set to false in order to be printed inside slurs. 
diff --git a/input/lsr/printing-the-bar-number-for-the-first-measure.ly b/input/lsr/printing-the-bar-number-for-the-first-measure.ly
new file mode 100644
index 0000000000..757e2ea43e
--- /dev/null
+++ b/input/lsr/printing-the-bar-number-for-the-first-measure.ly
@@ -0,0 +1,26 @@
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.12.1"
+
+\header {
+  lsrtags = "rhythms"
+
+  texidoc = "
+By default, the first bar number in a score is suppressed if it is
+less than or equal to `1'.  By setting @code{barNumberVisibility}
+to @code{all-bar-numbers-visible}, any bar number can be printed
+for the first measure and all subsequent measures.  Note that an
+empty bar line must be inserted before the first note for this to
+work.
+
+"
+  doctitle = "Printing the bar number for the first measure"
+} % begin verbatim
+
+
+\relative c' {
+  \set Score.barNumberVisibility = #all-bar-numbers-visible
+  \bar ""
+  c1 d e f \break
+  g1 e d c
+}
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index 75d487975c..03efe3e1f3 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -32,6 +32,7 @@ permitting-line-breaks-within-beamed-tuplets.ly
 positioning-multi--measure-rests.ly
 printing-metronome-and-rehearsal-marks-below-the-staff.ly
 printing-music-with-different-time-signatures.ly
+printing-the-bar-number-for-the-first-measure.ly
 rest-styles.ly
 reverting-default-beam-endings.ly
 rhythmic-slashes.ly
diff --git a/input/lsr/separating-key-cancellations-from-key-signature-changes.ly b/input/lsr/separating-key-cancellations-from-key-signature-changes.ly
new file mode 100644
index 0000000000..03f1136a9a
--- /dev/null
+++ b/input/lsr/separating-key-cancellations-from-key-signature-changes.ly
@@ -0,0 +1,37 @@
+%% 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 = "pitches, tweaks-and-overrides"
+
+  texidoc = "
+By default, the accidentals used for key cancellations are placed
+adjacent to those for key signature changes.  This behavior can be
+changed by overriding the @code{'break-align-orders} property of the
+@code{BreakAlignment} grob.
+
+
+The value of @code{'break-align-orders} is a vector of length 3, with
+quoted lists of breakable items as elements.  This example only
+modifies the second list, moving @code{key-cancellation} before
+@code{staff-bar}; by modifying the second list, break alignment
+behavior only changes in the middle of a system, not at the beginning
+or the end. 
+
+"
+  doctitle = "Separating key cancellations from key signature changes"
+} % begin verbatim
+
+\new Staff {
+  \override Score.BreakAlignment #'break-align-orders =
+    #'#((left-edge ambitus breathing-sign clef staff-bar key-cancellation key-signature time-signature custos)
+        (left-edge ambitus breathing-sign clef key-cancellation staff-bar key-signature staff time-signature custos)
+        (left-edge ambitus breathing-sign clef key-cancellation key-signature staff-bar time-signature custos))
+
+  \key des \major
+  c'1
+  \bar "||"
+  \key bes \major
+  c'1
+}
diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly
index 602dcc865f..21e2ee4a6e 100644
--- a/input/lsr/stem-and-beam-behavior-in-tablature.ly
+++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly
@@ -12,6 +12,17 @@ poner horizontales, como se muestra en este ejemplo.
 
 "
   doctitlees = "Comportamiento de las plicas y las barras de corchea en tablaturas"
+
+%% Translation of GIT committish: cd4950757ab1ab6c89805b0b7c978bfca034f940
+
+  texidocfr = "
+La direction des hampes se gère dans les tablatures tout comme en 
+notation traditionnelle.  Les ligatures peuvent être mises à l'horizontale 
+comme le montre cet exemple.
+
+"
+  doctitlefr = "Hampes et ligatures en mode tablature"
+
   texidoc = "
 The direction of stems is controlled the same way in tablature as in
 traditional notation. Beams can be made horizontal, as shown in this
diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list
index 748af521de..a2f03bba54 100644
--- a/input/lsr/text.snippet-list
+++ b/input/lsr/text.snippet-list
@@ -1,6 +1,7 @@
 adjusting-lyrics-vertical-spacing.ly
 aligning-and-centering-instrument-names.ly
 aligning-marks-with-various-notation-objects.ly
+aligning-objects-created-with-the--mark-command.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 center-text-below-hairpin-dynamics.ly
 changing-the-default-text-font-family.ly
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index 0c246b2e14..fdd1591de6 100644
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -38,6 +38,7 @@ proportional-strict-notespacing.ly
 removing-the-first-empty-line.ly
 rest-styles.ly
 rhythmic-slashes.ly
+separating-key-cancellations-from-key-signature-changes.ly
 suppressing-warnings-for-clashing-note-columns.ly
 time-signature-in-parentheses.ly
 transcription-of-ancient-music-with-incipit.ly