From 0df86f1528d4e85021fa52e5c302c2507df6a19c Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 14 Mar 2014 17:45:06 +0100 Subject: [PATCH] Run scripts/auxiliar/makelsr.py --- .../adding-timing-marks-to-long-glissandi.ly | 2 +- ...modern-transcription-of-gregorian-music.ly | 2 +- .../snippets/changing-the-tuplet-number.ly | 2 +- .../snippets/creating-a-delayed-turn.ly | 46 +++++++++++++++++++ .../editorial-annotations.snippet-list | 3 ++ Documentation/snippets/fretted-headword.ly | 2 +- .../snippets/fretted-strings.snippet-list | 3 ++ Documentation/snippets/guitar-slides.ly | 2 +- .../hammer-on-and-pull-off-using-chords.ly | 29 ++++++++++++ .../hammer-on-and-pull-off-using-voices.ly | 28 +++++++++++ .../snippets/hammer-on-and-pull-off.ly | 26 +++++++++++ Documentation/snippets/incipit.ly | 8 +--- Documentation/snippets/jazz-combo-template.ly | 2 +- ...invisible-with-the-transparent-property.ly | 2 +- .../snippets/making-glissandi-breakable.ly | 2 +- .../snippets/score-for-diatonic-accordion.ly | 2 +- Documentation/snippets/unfretted-headword.ly | 2 +- 17 files changed, 147 insertions(+), 16 deletions(-) create mode 100644 Documentation/snippets/creating-a-delayed-turn.ly create mode 100644 Documentation/snippets/hammer-on-and-pull-off-using-chords.ly create mode 100644 Documentation/snippets/hammer-on-and-pull-off-using-voices.ly create mode 100644 Documentation/snippets/hammer-on-and-pull-off.ly diff --git a/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly b/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly index 6189d3f64b..0cbcfeb719 100644 --- a/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly +++ b/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.6 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly index 92c4092291..fbab93e75f 100644 --- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/changing-the-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly index c69fc05c6b..e0257869b7 100644 --- a/Documentation/snippets/changing-the-tuplet-number.ly +++ b/Documentation/snippets/changing-the-tuplet-number.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.11 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/creating-a-delayed-turn.ly b/Documentation/snippets/creating-a-delayed-turn.ly new file mode 100644 index 0000000000..298ea0520e --- /dev/null +++ b/Documentation/snippets/creating-a-delayed-turn.ly @@ -0,0 +1,46 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.17.97 +\version "2.17.97" + +\header { + lsrtags = "editorial-annotations, expressive-marks, 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}. Changing the fractions @code{2/3} and @code{1/3} adjusts the +horizontal position. +" + doctitle = "Creating a delayed turn" +} % begin verbatim + + +\relative c'' { + c2*2/3 ( s2*1/3\turn d4) r + << + { c4.( d8) } % begin verbatim + + { s4 s\turn } + >> + \transpose c d \relative c'' << + { c4.( d8) } + { + s4 + \once \set suggestAccidentals = ##t + \once \override AccidentalSuggestion #'outside-staff-priority = ##f + \once \override AccidentalSuggestion #'avoid-slur = #'inside + \once \override AccidentalSuggestion #'font-size = #-3 + \once \override AccidentalSuggestion #'script-priority = #-1 + \single \hideNotes + b8-\turn \noBeam + s8 + } + >> +} diff --git a/Documentation/snippets/editorial-annotations.snippet-list b/Documentation/snippets/editorial-annotations.snippet-list index b2cb2d8ff9..c8d2a9a51c 100644 --- a/Documentation/snippets/editorial-annotations.snippet-list +++ b/Documentation/snippets/editorial-annotations.snippet-list @@ -20,6 +20,9 @@ drawing-circles-around-various-objects.ly embedding-native-postscript-in-a--markup-block.ly grid-lines--changing-their-appearance.ly grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +hammer-on-and-pull-off-using-chords.ly +hammer-on-and-pull-off-using-voices.ly +hammer-on-and-pull-off.ly how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly making-some-staff-lines-thicker-than-the-others.ly diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly index 43f92c152f..6b8f910d87 100644 --- a/Documentation/snippets/fretted-headword.ly +++ b/Documentation/snippets/fretted-headword.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.11 +%% Note: this file works from version 2.17.30 % INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings % % Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17" % % on melodies from Bellini's "Norma" % diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list index 9854081839..35ad8bda09 100644 --- a/Documentation/snippets/fretted-strings.snippet-list +++ b/Documentation/snippets/fretted-strings.snippet-list @@ -17,6 +17,9 @@ fretboards-alternate-tables.ly fretted-string-harmonics-in-tablature.ly guitar-slides.ly guitar-strum-rhythms.ly +hammer-on-and-pull-off-using-chords.ly +hammer-on-and-pull-off-using-voices.ly +hammer-on-and-pull-off.ly how-to-change-fret-diagram-position.ly jazz-combo-template.ly laissez-vibrer-ties.ly diff --git a/Documentation/snippets/guitar-slides.ly b/Documentation/snippets/guitar-slides.ly index 205edecfda..e2e2b802f2 100644 --- a/Documentation/snippets/guitar-slides.ly +++ b/Documentation/snippets/guitar-slides.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/hammer-on-and-pull-off-using-chords.ly b/Documentation/snippets/hammer-on-and-pull-off-using-chords.ly new file mode 100644 index 0000000000..880a2cf8fd --- /dev/null +++ b/Documentation/snippets/hammer-on-and-pull-off-using-chords.ly @@ -0,0 +1,29 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.16.0 +\version "2.16.0" + +\header { + lsrtags = "editorial-annotations, fretted-strings" + + texidoc = " +When using hammer-on or pull-off with chorded notes, only a single arc +is drawn. However @q{double arcs} are possible by setting the +@code{doubleSlurs} property to @code{#t}. + +" + doctitle = "Hammer on and pull off using chords" +} % begin verbatim + + +\new TabStaff { + \relative c' { + % chord hammer-on and pull-off + \set doubleSlurs = ##t + 8( ) + } +} diff --git a/Documentation/snippets/hammer-on-and-pull-off-using-voices.ly b/Documentation/snippets/hammer-on-and-pull-off-using-voices.ly new file mode 100644 index 0000000000..df84036ae8 --- /dev/null +++ b/Documentation/snippets/hammer-on-and-pull-off-using-voices.ly @@ -0,0 +1,28 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.16.0 +\version "2.16.0" + +\header { + lsrtags = "editorial-annotations, fretted-strings" + + texidoc = " +The arc of hammer-on and pull-off is upwards in voices one and three and +downwards in voices two and four: + +" + doctitle = "Hammer on and pull off using voices" +} % begin verbatim + + +\new TabStaff { + \relative c' { + << { \voiceOne g2( a) } + \\ { \voiceTwo a,( b) } + >> \oneVoice + } +} diff --git a/Documentation/snippets/hammer-on-and-pull-off.ly b/Documentation/snippets/hammer-on-and-pull-off.ly new file mode 100644 index 0000000000..57c830a2ce --- /dev/null +++ b/Documentation/snippets/hammer-on-and-pull-off.ly @@ -0,0 +1,26 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.16.0 +\version "2.16.0" + +\header { + lsrtags = "editorial-annotations, fretted-strings" + + texidoc = " +Hammer-on and pull-off can be obtained using slurs. + +" + doctitle = "Hammer on and pull off" +} % begin verbatim + + +\new TabStaff { + \relative c' { + d4( e\2) + a( g) + } +} diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly index 1a4328a58f..b078cc0f53 100644 --- a/Documentation/snippets/incipit.ly +++ b/Documentation/snippets/incipit.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.10 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { @@ -21,10 +21,7 @@ incipit = #(define-music-function (parser location incipit-music) (ly:music?) #{ \once \override Staff.InstrumentName.self-alignment-X = #RIGHT - \once \override Staff.InstrumentName.self-alignment-Y = #UP - \once \override Staff.InstrumentName.Y-offset = - #(lambda (grob) - (+ 4 (system-start-text::calc-y-offset grob))) + \once \override Staff.InstrumentName.self-alignment-Y = ##f \once \override Staff.InstrumentName.padding = #0.3 \once \override Staff.InstrumentName.stencil = #(lambda (grob) @@ -35,7 +32,6 @@ incipit = { { \context MensuralStaff \with { instrumentName = #instrument-name - \override VerticalAxisGroup.Y-extent = #'(-4 . 4) } $incipit-music } \layout { $(ly:grob-layout grob) diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly index 89cec8be71..4f0570da2c 100644 --- a/Documentation/snippets/jazz-combo-template.ly +++ b/Documentation/snippets/jazz-combo-template.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly index 572e39ca50..c7ad7b10a5 100644 --- a/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly +++ b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.6 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/making-glissandi-breakable.ly b/Documentation/snippets/making-glissandi-breakable.ly index fd7b1e92c1..16799a19cf 100644 --- a/Documentation/snippets/making-glissandi-breakable.ly +++ b/Documentation/snippets/making-glissandi-breakable.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.6 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly index eebc8de67a..46883755e6 100644 --- a/Documentation/snippets/score-for-diatonic-accordion.ly +++ b/Documentation/snippets/score-for-diatonic-accordion.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly index 8beaa131c5..6cc02b677d 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. -%% Note: this file works from version 2.17.24 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { -- 2.39.5