From c2c6d15fc404979ae1c8376d5e835444edca569d Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Sun, 26 Feb 2012 10:57:16 +0000
Subject: [PATCH] Local update of LSR

---
 .../snippets/alternative-bar-numbering.ly     |  2 +-
 .../snippets/alternative-breve-note.ly        |  2 +-
 ...ring-markup-on-note-heads-automatically.ly | 44 ++++++++----------
 ...creating-metronome-marks-in-markup-mode.ly |  2 +-
 .../customizing-fretboard-fret-diagrams.ly    |  6 +--
 ...-an-engraver-in-scheme-ambitus-engraver.ly | 45 +++++++++----------
 ...bracket-with-only-one-staff-in-a-system.ly |  2 +-
 .../snippets/formatting-lyrics-syllables.ly   |  2 +-
 .../snippets/glissandi-can-skip-grobs.ly      |  2 +-
 .../snippets/lyrics-old-spacing-settings.ly   |  2 +-
 Documentation/snippets/nesting-staves.ly      |  2 +-
 .../snippets/numbers-as-easy-note-heads.ly    | 32 +++++++------
 .../placement-of-right-hand-fingerings.ly     |  4 +-
 .../snippets/printing-marks-on-every-staff.ly |  2 +-
 ...ome-and-rehearsal-marks-below-the-staff.ly |  2 +-
 Documentation/snippets/strict-beat-beaming.ly |  2 +-
 .../snippets/woodwind-diagrams-key-lists.ly   |  2 +-
 17 files changed, 72 insertions(+), 83 deletions(-)

diff --git a/Documentation/snippets/alternative-bar-numbering.ly b/Documentation/snippets/alternative-bar-numbering.ly
index 506cafae60..0184686e61 100644
--- a/Documentation/snippets/alternative-bar-numbering.ly
+++ b/Documentation/snippets/alternative-bar-numbering.ly
@@ -8,7 +8,7 @@
 \version "2.15.24"
 
 \header {
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
 
   texidoces = "
 Se pueden seleccionar dos métodos alternativos para la numeración de
diff --git a/Documentation/snippets/alternative-breve-note.ly b/Documentation/snippets/alternative-breve-note.ly
index e33972c63e..7b90b4982a 100644
--- a/Documentation/snippets/alternative-breve-note.ly
+++ b/Documentation/snippets/alternative-breve-note.ly
@@ -7,7 +7,7 @@
 %% Note: this file works from version 2.14.0
 \version "2.14.0"
 \header {
-%% Translation of GIT committish: 8ce3514638c8b32b917b5b10ec5350d400249072
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 Este código muestra cómo usar la forma alternativa de la breve con dos
 líneas verticales a los lados de la cabeza, en lugar de una sola
diff --git a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
index ce227d016e..74cab448cd 100644
--- a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
+++ b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
@@ -4,8 +4,8 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% Note: this file works from version 2.15.31
+\version "2.15.31"
 
 \header {
   lsrtags = "text, tweaks-and-overrides, contexts-and-engravers"
@@ -25,29 +25,23 @@ been shifted via @code{force-hshift}.
 #(define (Text_align_engraver ctx)
   (let ((scripts '())
         (note-column #f))
-
-    `((acknowledgers
-       (note-column-interface
-        . ,(lambda (trans grob source)
-             ;; cache NoteColumn in this Voice context
-             (set! note-column grob)))
-
-       (text-script-interface
-        . ,(lambda (trans grob source)
-             ;; whenever a TextScript is acknowledged,
-             ;; add it to `scripts' list
-             (set! scripts (cons grob scripts)))))
-
-      (stop-translation-timestep
-       . ,(lambda (trans)
-            ;; if any TextScript grobs exist,
-            ;; set NoteColumn as X-parent
-            (and (pair? scripts)
-                 (for-each (lambda (script)
-                             (set! (ly:grob-parent script X) note-column))
-                           scripts))
-            ;; clear scripts ready for next timestep
-            (set! scripts '()))))))
+    (make-engraver
+     (acknowledgers
+      ((note-column-interface trans grob source)
+       ;; cache NoteColumn in this Voice context
+       (set! note-column grob))
+      ((text-script-interface trans grob source)
+       ;; whenever a TextScript is acknowledged,
+       ;; add it to `scripts' list
+       (set! scripts (cons grob scripts))))
+     ((stop-translation-timestep trans)
+      ;; if any TextScript grobs exist,
+      ;; set NoteColumn as X-parent
+      (for-each (lambda (script)
+		  (set! (ly:grob-parent script X) note-column))
+		scripts)
+      ;; clear scripts ready for next timestep
+      (set! scripts '())))))
 
 \layout {
   \context {
diff --git a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
index 77af8a9290..927eabde3a 100644
--- a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
+++ b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
@@ -27,7 +27,7 @@ aber sie ändern nicht das Tempo für die MIDI-Ausgabe.
 
   doctitlede = "Eine Metronombezeichnung als Textbeschriftung erstellen"
 
-%% Translation of GIT committish: 99dc90bbc369722cf4d3bb9f30b7288762f2167f6
+%% Translation of GIT committish: af3df3b7c6e062635bdccb739be41962969806a0
   texidocfr = "
 Vous pouvez créer des indications de tempo sous la forme d'étiquettes
 textuelles -- des objets @code{markup} -- notamment des équivalences.
diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index b208a61ca7..9219df9c54 100644
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -35,12 +35,12 @@ weggelassen werden kann.
 "
   doctitlede = "Bunddiagramme anpassen"
 
-%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd
+%% Translation of GIT committish: af01b3b78afa2e7c3c60e7280ee0b6382135bd35
   texidocfr = "
 Les propriétés d'un diagramme de fret sont définies par les
-@code{fret-diagram-details}.  En matière de diagramme FretBoards, les
+@code{'fret-diagram-details}.  En matière de diagramme de fret, les
 adaptations s'appliquent à l'objet @code{FretBoards.FretBoard}.  Un
-@code{FretBoard} est comparable à un @code{Voice}@tie{}: il s'agit
+@code{FretBoards} est comparable à un @code{Voice}@tie{}: il s'agit
 d'un contexte du plus bas niveau, et il n'est donc pas primordial de
 l'instancier de manière explicite pour adapter ses propriétés.
 
diff --git a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
index bf498a657a..025b32766b 100644
--- a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
+++ b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
@@ -4,8 +4,8 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% Note: this file works from version 2.15.31
+\version "2.15.31"
 
 \header {
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
@@ -42,10 +42,6 @@ Esto es básicamente una reescritura en Scheme del código de
 %%% Grob utilities
 %%%
 %%% These are literal rewrites of some C++ methods used by the ambitus engraver.
-#(define (ly:event::in-event-class event class-name)
-   "Check if @var{event} the given class.
-Rewrite of @code{Stream_event::internal_in_event_class} from @file{lily/stream-event.cc}."
-   (memq class-name (ly:make-event-class (ly:event-property event 'class))))
 
 #(define (ly:separation-item::add-conditional-item grob grob-item)
    "Add @var{grob-item} to the array of conditional elements of @var{grob}.
@@ -209,7 +205,7 @@ position of middle C and key signature from @var{translator}'s context."
    ;; Get the event that caused the note-grob creation
    ;; and check that it is a note-event.
    (let ((note-event (ly:grob-property note-grob 'cause)))
-     (if (ly:event::in-event-class note-event 'note-event)
+     (if (ly:in-event-class? note-event 'note-event)
          ;; get the pitch from the note event
          (let ((pitch (ly:event-property note-event 'pitch)))
            ;; if this pitch is lower than the current ambitus lower
@@ -313,23 +309,24 @@ position of middle C and key signature from @var{translator}'s context."
    (lambda (context)
      (let ((ambitus #f))
        ;; when music is processed: make the ambitus object, if not already built
-       `((process-music . ,(lambda (translator)
-                             (if (not ambitus)
-                                 (set! ambitus (make-ambitus translator)))))
-         ;; set the ambitus clef and key signature state
-         (stop-translation-timestep . ,(lambda (translator)
-                                         (if ambitus
-                                             (initialize-ambitus-state ambitus translator))))
-         ;; when a note-head grob is built, update the ambitus notes
-         (acknowledgers
-          (note-head-interface . ,(lambda (engraver grob source-engraver)
-                                    (if ambitus
-                                        (update-ambitus-notes ambitus grob)))))
-         ;; finally, typeset the ambitus according to its upper and lower notes
-         ;; (if any).
-         (finalize . ,(lambda (translator)
-                        (if ambitus
-                            (typeset-ambitus ambitus translator))))))))
+       (make-engraver
+	((process-music translator)
+	 (if (not ambitus)
+	     (set! ambitus (make-ambitus translator))))
+	;; set the ambitus clef and key signature state
+	((stop-translation-timestep translator)
+	 (if ambitus
+	     (initialize-ambitus-state ambitus translator)))
+	;; when a note-head grob is built, update the ambitus notes
+	(acknowledgers
+          ((note-head-interface engraver grob source-engraver)
+	   (if ambitus
+	       (update-ambitus-notes ambitus grob))))
+	;; finally, typeset the ambitus according to its upper and lower notes
+	;; (if any).
+	((finalize translator)
+	 (if ambitus
+	     (typeset-ambitus ambitus translator)))))))
 
 %%%
 %%% Example
diff --git a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
index e9725f3db6..c9552557c9 100644
--- a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
+++ b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
@@ -40,7 +40,7 @@ wie das zweite Beispiel zeigt.
 "
   doctitlede = "Klammer anzeigen wenn nur ein System gesetzt wird"
 
-%% Translation of GIT committish: 99dc90bbc369722cf4d3bb9f30b7288762f2167f6
+%% Translation of GIT committish: af3df3b7c6e062635bdccb739be41962969806a0
   texidocfr = "
 Lorsque, dans des regoupements de type @code{ChoirStaff} ou
 @code{StaffGroup}, une seule portée est active, aucune indication n'est
diff --git a/Documentation/snippets/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly
index 4fe20bb404..bccc3ef2ba 100644
--- a/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@ -7,7 +7,7 @@
 \version "2.14.0"
 
 \header {
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 Es posible usar el modo de marcado para dar formato a sílabas
 individuales dentro de la letra.
diff --git a/Documentation/snippets/glissandi-can-skip-grobs.ly b/Documentation/snippets/glissandi-can-skip-grobs.ly
index 2fc0072f30..91455572a5 100644
--- a/Documentation/snippets/glissandi-can-skip-grobs.ly
+++ b/Documentation/snippets/glissandi-can-skip-grobs.ly
@@ -8,7 +8,7 @@
 \version "2.15.12"
 
 \header {
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 Los objetos gráficos de columna de nota (los grobs @code{NoteColumn})
 pueden ser sobrepasados por los glissandos.
diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly
index 1a01a29521..c8691340ef 100644
--- a/Documentation/snippets/lyrics-old-spacing-settings.ly
+++ b/Documentation/snippets/lyrics-old-spacing-settings.ly
@@ -8,7 +8,7 @@
 \version "2.14.0"
 
 \header {
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 El motor de espaciado vertical cambió en la versión 2.14.  Esto puede
 hacer que se altere el espaciado de la letra de las canciones.  Es
diff --git a/Documentation/snippets/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly
index 273caf791c..f1169e155c 100644
--- a/Documentation/snippets/nesting-staves.ly
+++ b/Documentation/snippets/nesting-staves.ly
@@ -44,7 +44,7 @@ die gesamte Gruppe.  Die Möglichkeiten der Anfangsklammer sind: @code{SystemSta
 "
   doctitlede = "Systeme schachteln"
 
-%% Translation of GIT committish: 99dc90bbc369722cf4d3bb9f30b7288762f2167f6
+%% Translation of GIT committish: af3df3b7c6e062635bdccb739be41962969806a0
   texidocfr = "
 La propriété @code{systemStartDelimiterHierarchy} permet de créer des
 regroupements imbriqués complexes.  La commande
diff --git a/Documentation/snippets/numbers-as-easy-note-heads.ly b/Documentation/snippets/numbers-as-easy-note-heads.ly
index 7dd3cc616e..30ea77e487 100644
--- a/Documentation/snippets/numbers-as-easy-note-heads.ly
+++ b/Documentation/snippets/numbers-as-easy-note-heads.ly
@@ -4,8 +4,8 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% Note: this file works from version 2.15.31
+\version "2.15.31"
 
 \header {
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
@@ -62,21 +62,19 @@ object it sees.
 
 
 #(define Ez_numbers_engraver
-   (list
-    (cons 'acknowledgers
-          (list
-           (cons 'note-head-interface
-                 (lambda (engraver grob source-engraver)
-                   (let* ((context (ly:translator-context engraver))
-                          (tonic-pitch (ly:context-property context 'tonic))
-                          (tonic-name (ly:pitch-notename tonic-pitch))
-                          (grob-pitch
-                           (ly:event-property (event-cause grob) 'pitch))
-                          (grob-name (ly:pitch-notename grob-pitch))
-                          (delta (modulo (- grob-name tonic-name) 7))
-                          (note-names
-                           (make-vector 7 (number->string (1+ delta)))))
-                     (ly:grob-set-property! grob 'note-names note-names))))))))
+   (make-engraver
+    (acknowledgers
+     ((note-head-interface engraver grob source-engraver)
+      (let* ((context (ly:translator-context engraver))
+	     (tonic-pitch (ly:context-property context 'tonic))
+	     (tonic-name (ly:pitch-notename tonic-pitch))
+	     (grob-pitch
+	      (ly:event-property (event-cause grob) 'pitch))
+	     (grob-name (ly:pitch-notename grob-pitch))
+	     (delta (modulo (- grob-name tonic-name) 7))
+	     (note-names
+	      (make-vector 7 (number->string (1+ delta)))))
+	(ly:grob-set-property! grob 'note-names note-names))))))
 
 #(set-global-staff-size 26)
 
diff --git a/Documentation/snippets/placement-of-right-hand-fingerings.ly b/Documentation/snippets/placement-of-right-hand-fingerings.ly
index 343e6c5efb..108976ad0d 100644
--- a/Documentation/snippets/placement-of-right-hand-fingerings.ly
+++ b/Documentation/snippets/placement-of-right-hand-fingerings.ly
@@ -29,11 +29,11 @@ das folgende Beispiel zeigt:
 "
   doctitlede = "Positionierung von Fingersatz der rechten Hand"
 
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+%% Translation of GIT committish: af01b3b78afa2e7c3c60e7280ee0b6382135bd35
   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.
+l'exemple suivant.  N'oubliez pas le construction de type accord.
 
 "
   doctitlefr = "Positionnement des doigtés main droite"
diff --git a/Documentation/snippets/printing-marks-on-every-staff.ly b/Documentation/snippets/printing-marks-on-every-staff.ly
index 2273efe107..8a3d47ccbd 100644
--- a/Documentation/snippets/printing-marks-on-every-staff.ly
+++ b/Documentation/snippets/printing-marks-on-every-staff.ly
@@ -9,7 +9,7 @@
 \header {
   lsrtags = "text"
 
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 Aunque normalmente las marcas de ensayo textuales sólo se imprimen
 sobre el pentagrama superior, también se pueden imprimir en otro
diff --git a/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
index ada34d8dd1..9d5e2017e1 100644
--- a/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
+++ b/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
@@ -32,7 +32,7 @@ von @code{MetronomeMark} oder @code{RehearsalMark} entsprechend verändert werde
 "
   doctitlede = "Metronom- und Übungszeichen unter das System setzen"
 
-%% Translation of GIT committish: 99dc90bbc369722cf4d3bb9f30b7288762f2167f6
+%% Translation of GIT committish: af3df3b7c6e062635bdccb739be41962969806a0
   texidocfr = "
 Les indications de tempo et les marques de repère s'impriment par défaut
 au-dessus de la portée.  Le fait de régler en conséquence la propriété
diff --git a/Documentation/snippets/strict-beat-beaming.ly b/Documentation/snippets/strict-beat-beaming.ly
index c01801d55e..a8d971ca62 100644
--- a/Documentation/snippets/strict-beat-beaming.ly
+++ b/Documentation/snippets/strict-beat-beaming.ly
@@ -8,7 +8,7 @@
 \version "2.15.28"
 
 \header {
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 Se puede hacer que las barras secundarias apunten en la dirección del
 pulso o fracción a que pertenecen.  La primera barra evita los
diff --git a/Documentation/snippets/woodwind-diagrams-key-lists.ly b/Documentation/snippets/woodwind-diagrams-key-lists.ly
index 0f492428d0..22dea409c0 100644
--- a/Documentation/snippets/woodwind-diagrams-key-lists.ly
+++ b/Documentation/snippets/woodwind-diagrams-key-lists.ly
@@ -8,7 +8,7 @@
 \version "2.14.0"
 
 \header {
-%%%    Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
+%%%    Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
 
   texidoces = "
 
-- 
2.39.2