]> git.donarmstrong.com Git - lilypond.git/commitdiff
LSR: update.
authorGraham Percival <graham@percival-music.ca>
Thu, 24 Apr 2008 07:59:14 +0000 (00:59 -0700)
committerGraham Percival <graham@percival-music.ca>
Thu, 24 Apr 2008 07:59:14 +0000 (00:59 -0700)
30 files changed:
input/lsr/adding-fingerings-to-tablatures.ly [deleted file]
input/lsr/adding-text-indications-to-metronome-marks.ly [new file with mode: 0644]
input/lsr/adjusting-lyrics-vertical-spacing.ly
input/lsr/breathing-signs.ly
input/lsr/caesura-railtracks-with-fermata.ly
input/lsr/clusters.ly
input/lsr/contexts-and-engravers.snippet-list
input/lsr/controlling-the-placement-of-chord-fingerings.ly
input/lsr/creating-simultaneous-rehearsal-marks.ly [new file with mode: 0644]
input/lsr/demo-midiinstruments.ly
input/lsr/editorial-and-educational-use.snippet-list
input/lsr/expressive-marks.snippet-list
input/lsr/fretted-strings.snippet-list
input/lsr/jazz-combo-template.ly
input/lsr/keyboards.snippet-list
input/lsr/letter-tablature-formatting.ly
input/lsr/piano-template-simple.ly
input/lsr/piano-template-with-centered-dynamics.ly
input/lsr/piano-template-with-centered-lyrics.ly
input/lsr/piano-template-with-melody-and-lyrics.ly
input/lsr/pitches.snippet-list
input/lsr/staff-notation.snippet-list
input/lsr/string-quartet-template-simple.ly
input/lsr/string-quartet-template-with-separate-parts.ly
input/lsr/template.snippet-list
input/lsr/text.snippet-list
input/lsr/tweaks-and-overrides.snippet-list
input/lsr/unfretted-strings.snippet-list
input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
input/lsr/vocal-music.snippet-list

diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly
deleted file mode 100644 (file)
index 47aec01..0000000
+++ /dev/null
@@ -1,26 +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.11.38"
-
-\header {
-  lsrtags = "guitar"
-
-  texidoc = "
-To add fingerings to tablatures, you can use a combination of
-@code{\\markup} and @code{\\finger}. 
-
-"
-  doctitle = "Adding fingerings to tablatures"
-} % begin verbatim
-one = \markup { \finger "1" }
-two = \markup { \finger "2" }
-threeTwo = \markup { \column { \finger "3" \finger "2" } }
-threeFour = \markup { \column { \finger "3" \finger "4" } }
-
-\score {      
-  \context TabStaff {
-    \stemUp
-    e8\4^\one b\2 <e, g\3 e'\1>^>[ b\2 e\4] 
-    <a\3 fis'\1>^>^\threeTwo[ b\2 e\4]
-  }
-}
diff --git a/input/lsr/adding-text-indications-to-metronome-marks.ly b/input/lsr/adding-text-indications-to-metronome-marks.ly
new file mode 100644 (file)
index 0000000..1c39226
--- /dev/null
@@ -0,0 +1,61 @@
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.11.43"
+\header {
+  lsrtags = "expressive-marks,text,tweaks-and-overrides"
+  texidoc = "
+Using Scheme code to override the stencil for @code{MetronomeMark}
+objects, this example allows the creation of metronome marks which include
+text directions.  The function @code{\tempoChangeMarkup} is called with three
+strings: the text label, note duration, and beats per minute.  To print the
+new metronome mark, this is followed by the standard @code{\tempo} command.
+"
+  doctitle = "Adding text indications to metronome marks"
+} % begin verbatim
+
+% Thanks to Alexander Kobel for this snippet
+
+tempoMarkLabelSize = #0
+tempoMarkNoteSize = #-6
+
+#(define (tempoChangeMarkupFactory grob label noteValue tempo)
+ (interpret-markup
+  (ly:grob-layout grob)
+  (ly:grob-alist-chain grob (ly:output-def-lookup (ly:grob-layout grob) 'text-font-defaults))
+  (markup
+   #:fontsize tempoMarkLabelSize #:italic #:concat (label (if (string-null? label) "(" " (" ))
+   #:hspace -1
+   #:fontsize tempoMarkNoteSize #:general-align Y DOWN #:note noteValue UP
+   #:fontsize tempoMarkLabelSize #:italic #:concat( "= " tempo ")" )
+  )
+ ))
+
+#(define (tempoChangeStencil label noteValue tempo)
+ (lambda (grob)
+  (tempoChangeMarkupFactory grob label noteValue tempo)
+ ))
+
+tempoChangeMarkup = #(define-music-function (parser location label noteValue tempo) (string? string? string?)
+       #{
+         \once \override Score.MetronomeMark #'stencil = #(tempoChangeStencil $label $noteValue $tempo)
+       #})
+
+\relative c' {
+  \time 4/4
+  \clef treble
+  % initialize the override
+  \tempoChangeMarkup #"Moderato" #"4" #"63"
+  % markup is printed
+  \tempo 4 = 63
+  c4 d e f
+  g a b c
+  \time 6/4
+  \mark \default
+  \tempoChangeMarkup #"presto" #"2." #"90"
+  \tempo 2. = 90
+  c2. g \break
+  e \tempoChangeMarkup #"handling collision with RehearsalMark" #"4" #"120" \tempo 4 = 120 c
+  \time 4/4
+  \mark \default
+  c1
+}
index 33f4dd9eb8754964830b94fe06788406a650b862..3f74e2ab70b9e271fa0686e0f6cf2713df522de5 100644 (file)
@@ -16,10 +16,8 @@ staff.
 <<
   \new Staff \new Voice = melody \relative c '{ c4 d e f g f e d c1 }
   \new Lyrics \lyricsto melody { aa aa aa aa aa aa aa aa aa }
->>
 
 % Reducing the minimum space below the staff and above the lyrics:
-<<
   \new Staff \with {
     \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 4) }
   \new Voice = melody \relative c' { c4 d e f g f e d c1 }
index 0d7773da519ef003ab99c7a92009dc6f05b88836..acf02a240d44834d3943f357e9231b4e400b8545 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "expressive-marks"
+  lsrtags = "winds"
 
   texidoc = "
 Breathing signs are available in different tastes: commas (default),
index 58bde649d28938c44abf949384c7020ae9a02ae4..88f92be783f082c01bc9138f6b275e261591cd65 100644 (file)
@@ -12,7 +12,7 @@ snippet should present an optically pleasing combination of railtracks
 and a fermata.
 
 "
-  doctitle = "Caesura (\"railtracks\") with fermata"
+  doctitle = "Caesura \"railtracks\" with fermata"
 } % begin verbatim
 {
   c''2.
index 7ea8b1311abc078cb132954f4094109bfac29743..2a06f69aae88e52c99c37aaf11a0abe529f4dab3 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "simultaneous-notes, chords, piano-music"
+  lsrtags = "simultaneous-notes, chords"
 
   texidoc = "
 Clusters are a device to denote that a complete range of notes is to be
index b7fe708ac2bf3b0020cadf585dec1f34de089b2e..670a7a75febc7101cca765da73e4205fe7bbed2c 100644 (file)
@@ -3,9 +3,9 @@ chant-or-psalms-notation.ly
 adding-a-figured-bass-above-or-below-the-notes.ly
 adding-an-extra-staff-at-a-line-break.ly
 adding-an-extra-staff.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
-changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
+changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 engravers-one-by-one.ly
 use-square-bracket-at-the-start-of-a-staff-group.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 nesting-staves.ly
index 3f75c81c5b73a5b41e0daf702b53dfce6555107d..e3875b3004d42afe7a82933306affd08b83ff91f 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use, chords, piano-music"
+  lsrtags = "editorial-and-educational-use, chords"
 
   texidoc = "
 The placement of fingering numbers can be controlled precisely.
diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly
new file mode 100644 (file)
index 0000000..b7b5238
--- /dev/null
@@ -0,0 +1,42 @@
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.11.39"
+\header {
+  lsrtags = "expressive-marks,text,tweaks-and-overrides"
+  texidoc = "
+Unlike text scripts, rehearsal marks cannot be stacked at a particular point
+in a score: only one @code{RehearsalMark} object is created.  Using an
+invisible measure and bar line, an extra rehearsal mark can be added, giving
+the appearance of two marks in the same column.
+
+This method may also prove useful for placing rehearsal marks at both the
+end of one system and the start of the following system.
+"
+  doctitle = "Creating simultaneous rehearsal marks"
+} % begin verbatim
+
+% Thanks to Risto Vääräniemi for this snippet
+
+\paper { ragged-right = ##t }
+
+{
+  \key a \major
+  \set Score.markFormatter = #format-mark-box-letters
+  \once \override Score.RehearsalMark #'outside-staff-priority = #5000
+  \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
+  \once \override Score.RehearsalMark #'break-align-symbols = #'(key-signature)
+  \mark \markup { \bold "Senza denti" }
+  
+  % the hidden measure and bar line
+  \once \override Score.TimeSignature #'stencil = ##f
+  \time 1/16
+  s16 \bar ""
+  
+  \time 4/4
+  \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
+  \once \override Score.RehearsalMark #'break-align-symbols = #'(bar-line)
+  \mark \markup { \box \bold "Intro" }
+  d'1
+  \mark \default
+  d'
+}
index cbe518e31eda253e58226bf4a08f3c8d867314e7..bc0f57e1d080fd6c2d7c6c5ee5ba7a964c38965c 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "vocal-music, piano-music, strings, midi"
+  lsrtags = "vocal-music, midi"
 
   texidoc = "
 Problem: How to know which @code{midiInstrument} would be best for your
index c9059cf44a9ecc1e2a1296cc08d7fe5a6efd19bd..bfee2c190ed172a17ad798127f9034a69e38d6d5 100644 (file)
@@ -5,8 +5,8 @@ changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 embedding-native-postscript-in-a--markup-block.ly
 default-direction-of-stems-on-the-center-line-of-the-staff.ly
 changing-a-single-notes-size-in-a-chord.ly
+grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
 controlling-the-placement-of-chord-fingerings.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 blanking-staff-lines-using-the--whiteout-command.ly
-grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
 grid-lines-changing-their-appearance.ly
index 377c8ad9405be61155aa646b87d37ed3a2f4424e..ea288f41e9f8c88225156f1eeb2e59efd297fa68 100644 (file)
@@ -3,12 +3,13 @@ creating-text-spanners.ly
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 caesura-railtracks-with-fermata.ly
-piano-template-with-centered-dynamics.ly
 creating-real-parenthesized-dynamics.ly
-breathing-signs.ly
-contemporary-glissando.ly
 center-text-below-hairpin-dynamics.ly
+contemporary-glissando.ly
 adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
+adding-text-indications-to-metronome-marks.ly
 line-arrows.ly
 changing--flageolet-mark-size.ly
+piano-template-with-centered-dynamics.ly
+creating-simultaneous-rehearsal-marks.ly
 broken-crescendo-hairpin.ly
index f4997a58293e054af52b5ee2c02c95eb1ab30438..0a2dfd735cef3fe79e2f74c217a55b0d7092fcb2 100644 (file)
@@ -1,3 +1 @@
 letter-tablature-formatting.ly
-jazz-combo-template.ly
-adding-fingerings-to-tablatures.ly
index eae94a0668fc057a76929de15473016204d01cfa..334b6b64992510b36f607c8dc069981487365692 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "piano-music, percussion, guitar, template"
+  lsrtags = "percussion, template"
 
   texidoc = "
 This is quite an advanced template, for a jazz ensemble. Note that all
index b8794af1b1e6bcac4097da0f6548c8fbd6be2a92..2da59b2fd4983ea5e5b27c5ae8b99b11435f1a6a 100644 (file)
@@ -1,9 +1 @@
 piano-template-with-centered-dynamics.ly
-clusters.ly
-piano-template-with-centered-lyrics.ly
-vocal-ensemble-template-with-automatic-piano-reduction.ly
-piano-template-simple.ly
-controlling-the-placement-of-chord-fingerings.ly
-piano-template-with-melody-and-lyrics.ly
-jazz-combo-template.ly
-demo-midiinstruments.ly
index 2da9341fa101da36364f67df5feff24b04aa1b73..3fb01d3934945689d4bb8fe8f4cb101d458f4792 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "guitar"
+  lsrtags = "fretted-strings"
   texidoc = "
 You can format a tablature with letters instead of numbers - so that
 0->a, 1->b, 2->c, etc. 
index 45e792f4a7d33aa9a014186a097252c2a8a10e88..f34bda65ceac745fdb41264b9c95527757b0955d 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "piano-music, template"
+  lsrtags = "template"
 
   texidoc = "
 Here is a simple piano staff with some notes.
index 2770aab1f02f9b04208d4b7e8a905ba5a87224b7..0be31bf8d57374aec8ae2bc11ff60ea449d03c4e 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "expressive-marks,piano-music,template"
+  lsrtags = "expressive-marks,keyboards,template"
   texidoc = "
 Many piano scores have the dynamics centered between the two staves.
 This requires a bit of tweaking to implement, but since the template is
index a5d3a616d49558a457ff9ed3c7c796c58324f617..6f4e52f401bc595c6e9da5646248e32f3d19b170 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "text, piano-music, template"
+  lsrtags = "text, template"
 
   texidoc = "
 Instead of having a full staff for the melody and lyrics, you can place
index 33fab5110d721255fbd70cf242469774d2bb8404..32d1b69646b97481d7240da8b923a244c5978202 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "vocal-music, piano-music, template"
+  lsrtags = "vocal-music, template"
 
   texidoc = "
 Here is a typical song format: one staff with the melody and lyrics,
index 79ff81c7b6c097fd842af14b98ecdfede566a12f..26494a9118682a7c824ac62e6f5551010732f1bb 100644 (file)
@@ -5,8 +5,8 @@ transposing-pitches-with-minimum-accidentals-smart-transpose.ly
 ottava-text.ly
 tweaking-clef-properties.ly
 preventing-extra-naturals-from-being-automatically-added.ly
-generating-random-notes.ly
 ambitus-with-multiple-voices.ly
+generating-random-notes.ly
 dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
 preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
 quoting-another-voice-with-transposition.ly
index 19c71d7ed92a4ad5d65c17302a4290c59c0f6eb1..e6594271f734626e20bedb928d1da3acb56a21ac 100644 (file)
@@ -10,10 +10,10 @@ tweaking-clef-properties.ly
 adding-an-extra-staff.ly
 changing-the-staff-size.ly
 use-square-bracket-at-the-start-of-a-staff-group.ly
+quoting-another-voice-with-transposition.ly
 quoting-another-voice.ly
 volta-multi-staff.ly
 inserting-score-fragments-above-a-staff,-as-markups.ly
-quoting-another-voice-with-transposition.ly
 nesting-staves.ly
 non-traditional-key-signatures.ly
 making-some-staff-lines-thicker-than-the-others.ly
index 50296ef2fcd886137bf9e6d5764b37de6e7711e6..caa7ce9eee264bf4f5f1369a1f29074250c6a4ab 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "strings, template"
+  lsrtags = "template"
 
   texidoc = "
 This template demonstrates a simple string quartet. It also uses a
index b4555721644e0862a8f0cfab785303031d054c3b..70dba3f78400de3c9d1ff90ab99b6c6cf90ed4fb 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "strings, template"
+  lsrtags = "template"
 
   texidoc = "
 The \"String quartet template\" snippet produces a nice string quartet,
index 59b06c613003f94fdd4a141e68e2a39f338babca..8af6644e5a99342e8f7792020acffb241f94ab88 100644 (file)
@@ -1,17 +1,17 @@
 piano-template-with-centered-dynamics.ly
 single-staff-template-with-notes-and-lyrics.ly
 single-staff-template-with-only-notes.ly
-piano-template-with-centered-lyrics.ly
+jazz-combo-template.ly
 score-for-diatonic-accordion.ly
 piano-template-simple.ly
-string-quartet-template-with-separate-parts.ly
-ancient-notation-template----modern-transcription-of-gregorian-music.ly
 ancient-notation-template----modern-transcription-of-mensural-music.ly
-piano-template-with-melody-and-lyrics.ly
+ancient-notation-template----modern-transcription-of-gregorian-music.ly
+single-staff-template-with-notes-and-chords.ly
 string-quartet-template-simple.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
-single-staff-template-with-notes-and-chords.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
-jazz-combo-template.ly
+piano-template-with-melody-and-lyrics.ly
+string-quartet-template-with-separate-parts.ly
 vocal-ensemble-template.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+piano-template-with-centered-lyrics.ly
 vocal-ensemble-template-with-automatic-piano-reduction.ly
index 7db660c0a0d24f53539ae003f586b9cb940b5f76..95284862b9606d2e977d0624a6101244bc0e5555 100644 (file)
@@ -1,22 +1,24 @@
 creating-text-spanners.ly
 creating-real-parenthesized-dynamics.ly
-ottava-text.ly
 embedding-native-postscript-in-a--markup-block.ly
 center-text-below-hairpin-dynamics.ly
 demonstrating-all-headers.ly
 printing-marks-at-the-end-of-a-line-or-a-score.ly
 changing-the-default-text-font-family.ly
-how-to-put-ties-between-syllables-in-lyrics.ly
+combining-two-parts-on-the-same-staff.ly
 aligning-and-centering-instrument-names.ly
 outputting-the-version-number.ly
 formatting-lyrics-syllables.ly
-combining-two-parts-on-the-same-staff.ly
+adding-text-indications-to-metronome-marks.ly
+how-to-put-ties-between-syllables-in-lyrics.ly
 combining-dynamics-with-markup-texts.ly
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 aligning-marks-with-various-notation-objects.ly
 markup-lines.ly
-piano-template-with-centered-lyrics.ly
+ottava-text.ly
+creating-simultaneous-rehearsal-marks.ly
 three-sided-box.ly
+piano-template-with-centered-lyrics.ly
 utf-8.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 printing-marks-on-every-staff.ly
index 7bc391a24776558c582d984787f2f29956af7e03..b612a394831e75ad0d221738d491402a9365cffe 100644 (file)
@@ -1,5 +1,5 @@
 display-bracket-with-only-one-staff-in-a-system.ly
-time-signature-in-parentheses.ly
+rhythmic-slashes.ly
 changing-the-default-text-font-family.ly
 drawing-boxes-around-grobs.ly
 manually-controlling-beam-positions.ly
@@ -21,9 +21,11 @@ making-an-object-invisible-with-the-transparent-property.ly
 transcription-of-ancient-music-with-incipit.ly
 alignment-vertical-spacing.ly
 drawing-circles-around-various-objects.ly
+adding-text-indications-to-metronome-marks.ly
 creating-text-spanners.ly
 caesura-railtracks-with-fermata.ly
 changing-form-of-multi--measure-rests.ly
-rhythmic-slashes.ly
+time-signature-in-parentheses.ly
 changing-a-single-notes-size-in-a-chord.ly
+creating-simultaneous-rehearsal-marks.ly
 nesting-staves.ly
index a0795b5bcf71d2991c4d430eaabea0b211e62fdc..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
@@ -1,3 +1 @@
-string-quartet-template-simple.ly
-string-quartet-template-with-separate-parts.ly
-demo-midiinstruments.ly
+
index 423e9b3e2f3745e8d69b0d17073d32f472ff17b2..0b827bbedca61c8e9d6171e704edd1544843e3c9 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "vocal-music, piano-music, template"
+  lsrtags = "vocal-music, template"
 
   texidoc = "
 This template adds an automatic piano reduction to the standard SATB
index ff05030f7569e6050d0b15016b6e0daab22e5b0c..ff4d5a6c04057569191c8282dfcbe02443d916a0 100644 (file)
@@ -2,16 +2,16 @@ chant-or-psalms-notation.ly
 single-staff-template-with-notes-and-lyrics.ly
 adding-ambitus-per-voice.ly
 skips-in-lyric-mode-2.ly
+skips-in-lyric-mode.ly
 vocal-ensemble-template-with-automatic-piano-reduction.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+ambitus-with-multiple-voices.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
-piano-template-with-melody-and-lyrics.ly
+vertically-aligning-ossias-and-lyrics.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
-ambitus-with-multiple-voices.ly
-demo-midiinstruments.ly
 formatting-lyrics-syllables.ly
-vertically-aligning-ossias-and-lyrics.ly
+piano-template-with-melody-and-lyrics.ly
 aligning-lyrics.ly
 vocal-ensemble-template.ly
 adjusting-lyrics-vertical-spacing.ly
-skips-in-lyric-mode.ly
+demo-midiinstruments.ly