From 4ed5d7710416aff0a9e68f0d751b4e15c30fdf92 Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Sun, 30 Sep 2012 11:02:50 +0100 Subject: [PATCH] MakeLSR run with LSR tarball --- Documentation/snippets/adding-drum-parts.ly | 2 +- .../snippets/arabic-improvisation.ly | 2 +- .../center-text-below-hairpin-dynamics.ly | 56 ++++++++++++++----- ...ng-midi-output-to-one-channel-per-voice.ly | 2 +- ...efined-fretboards-for-other-instruments.ly | 2 +- .../snippets/displaying-complex-chords.ly | 2 +- .../snippets/drawing-boxes-around-grobs.ly | 2 +- .../snippets/generating-random-notes.ly | 2 +- ...y-customized-polymetric-time-signatures.ly | 2 +- ...ove-and-below-the-same-barline-method-2.ly | 4 +- ...f-spoken-parts-with-a-cross-on-the-stem.ly | 2 +- Documentation/snippets/markup-lines.ly | 2 +- .../snippets/recorder-fingering-chart.ly | 2 +- Documentation/snippets/screech-and-boink.ly | 2 +- Documentation/snippets/slides-in-tablature.ly | 4 +- Documentation/snippets/table-of-contents.ly | 2 +- .../tweaking-grace-layout-within-music.ly | 2 +- Documentation/snippets/unfretted-headword.ly | 2 +- 18 files changed, 61 insertions(+), 33 deletions(-) diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly index a0b3264d0f..eff1c44caa 100644 --- a/Documentation/snippets/adding-drum-parts.ly +++ b/Documentation/snippets/adding-drum-parts.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "percussion, preparing-parts, really-simple, rhythms, specific-notation" diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly index b4354ab717..7427da160f 100644 --- a/Documentation/snippets/arabic-improvisation.ly +++ b/Documentation/snippets/arabic-improvisation.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "world-music" diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly index 4f2eb36926..edf4c835fa 100644 --- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly +++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "expressive-marks, really-cool, scheme-language, text" @@ -12,28 +12,51 @@ texidoc = " This example provides a function to typeset a hairpin (de)crescendo with some additional text below it, such as @qq{molto} or @qq{poco}. -The example also illustrates how to modify the way an object is -normally printed, using some Scheme code. +The added text will change the direction according to the direction of +the hairpin. The Hairpin is aligned to DynamicText. The example also +illustrates how to modify the way an object is normally printed, using +some Scheme code. " doctitle = "Center text below hairpin dynamics" } % begin verbatim - hairpinWithCenteredText = #(define-music-function (parser location text) (markup?) #{ - \override Voice.Hairpin #'stencil = #(lambda (grob) - (ly:stencil-aligned-to - (ly:stencil-combine-at-edge - (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER) - Y DOWN - (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER)) - X LEFT)) + \once \override Voice.Hairpin #'after-line-breaking = + #(lambda (grob) + (let* ((stencil (ly:hairpin::print grob)) + (par-y (ly:grob-parent grob Y)) + (dir (ly:grob-property par-y 'direction)) + (new-stencil (ly:stencil-aligned-to + (ly:stencil-combine-at-edge + (ly:stencil-aligned-to stencil X CENTER) + Y dir + (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER)) + X LEFT)) + (staff-space (ly:output-def-lookup (ly:grob-layout grob) 'staff-space)) + (staff-line-thickness (ly:output-def-lookup (ly:grob-layout grob) 'line-thickness)) + (grob-name (lambda (x) (assq-ref (ly:grob-property x 'meta) 'name))) + (par-x (ly:grob-parent grob X)) + (dyn-text (eq? (grob-name par-x) 'DynamicText )) + (dyn-text-stencil-x-length (if dyn-text + (interval-length (ly:stencil-extent (ly:grob-property par-x 'stencil) X)) + 0)) + (x-shift (if dyn-text (- (+ staff-space dyn-text-stencil-x-length) (* 0.5 staff-line-thickness)) 0))) + + (ly:grob-set-property! grob 'Y-offset 0) + (ly:grob-set-property! grob 'stencil + (ly:stencil-translate-axis + new-stencil + x-shift X)))) #}) -hairpinMolto = \hairpinWithCenteredText \markup { \italic molto } -hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo } +hairpinMolto = +\hairpinWithCenteredText \markup { \italic molto } + +hairpinMore = +\hairpinWithCenteredText \markup { \larger moltissimo } \layout { ragged-right = ##f } @@ -41,5 +64,10 @@ hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo } \hairpinMolto c2\< c\f \hairpinMore - c2\< c\f + c2\ppppp\< c\f + \break + \hairpinMolto + c2^\< c\f + \hairpinMore + c2\ppppp\< c\f } diff --git a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly index aded2070cb..7afdeeeff8 100644 --- a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly +++ b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "contexts-and-engravers, midi, real-music" diff --git a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly index 6045697b5a..36a93e92c8 100644 --- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly +++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "fretted-strings" diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly index 160093aac7..d30bb52bcd 100644 --- a/Documentation/snippets/displaying-complex-chords.ly +++ b/Documentation/snippets/displaying-complex-chords.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "chords, simultaneous-notes, workaround" diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly index 2bddbf518c..38613fa15e 100644 --- a/Documentation/snippets/drawing-boxes-around-grobs.ly +++ b/Documentation/snippets/drawing-boxes-around-grobs.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides" diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly index 2093009521..bea3ff4fa6 100644 --- a/Documentation/snippets/generating-random-notes.ly +++ b/Documentation/snippets/generating-random-notes.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "pitches, really-cool, scheme-language" diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly index e85878da1e..795a27de58 100644 --- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly +++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "contemporary-notation, percussion, real-music, rhythms" diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly index 80a56e227e..8abdbaa318 100644 --- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly +++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly @@ -30,7 +30,7 @@ independently of the other. \new Staff { << \new Voice \with { - \consists "Mark_engraver" + \consists Mark_engraver \consists "Staff_collecting_engraver" } { c4 d e f @@ -38,7 +38,7 @@ independently of the other. c4 d e f } \new Voice \with { - \consists "Mark_engraver" + \consists Mark_engraver \consists "Staff_collecting_engraver" \override RehearsalMark #'direction = #DOWN } diff --git a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly index 8618782bb1..b91c71b072 100644 --- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "contemporary-notation, editorial-annotations, vocal-music, workaround" diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly index 474f13f19d..46455f148e 100644 --- a/Documentation/snippets/markup-lines.ly +++ b/Documentation/snippets/markup-lines.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "text" diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly index dbe8cfa9d0..bdf5692816 100644 --- a/Documentation/snippets/recorder-fingering-chart.ly +++ b/Documentation/snippets/recorder-fingering-chart.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "winds" diff --git a/Documentation/snippets/screech-and-boink.ly b/Documentation/snippets/screech-and-boink.ly index 2bb83f3239..107c4fd771 100644 --- a/Documentation/snippets/screech-and-boink.ly +++ b/Documentation/snippets/screech-and-boink.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "headword" diff --git a/Documentation/snippets/slides-in-tablature.ly b/Documentation/snippets/slides-in-tablature.ly index 970380d2f3..46b6e6a416 100644 --- a/Documentation/snippets/slides-in-tablature.ly +++ b/Documentation/snippets/slides-in-tablature.ly @@ -21,12 +21,12 @@ slides = { c'8\3(\glissando d'8\3) c'8\3\glissando d'8\3 \hideNotes - \grace { g16\3\glissando } + \grace { g16\glissando } \unHideNotes c'4\3 \afterGrace d'4\3\glissando { \stemDown \hideNotes - g16\3 } + g16 } \unHideNotes } diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly index 51542ae679..ea6bf4b609 100644 --- a/Documentation/snippets/table-of-contents.ly +++ b/Documentation/snippets/table-of-contents.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "paper-and-layout" diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly index 2afa28fc4d..089c99cde3 100644 --- a/Documentation/snippets/tweaking-grace-layout-within-music.ly +++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly index 17ec6b723e..eb7d328427 100644 --- a/Documentation/snippets/unfretted-headword.ly +++ b/Documentation/snippets/unfretted-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.0" \header { lsrtags = "headword" -- 2.39.5