From d80964027b03ec524debefcc6cbf4e23ed12e2e1 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sat, 5 Jan 2008 15:22:05 +0100 Subject: [PATCH] Fix makelsr.py and update LSR --- buildscripts/makelsr.py | 8 +- ...a-figured-bass-above-or-below-the-notes.ly | 3 +- input/lsr/adding-ambiti-per-voice.ly | 3 +- input/lsr/adding-an-extra-staff.ly | 3 +- .../adding-and-extra-staff-at-a-line-break.ly | 3 +- ...hen-using-tuplet-and-non-tuplet-rythms..ly | 3 +- input/lsr/adding-drum-parts.ly | 3 +- input/lsr/adding-fingerings-to-tablatures.ly | 3 +- ...g-parentheses-around-an-expressive-mark.ly | 3 +- .../lsr/adding-the-current-date-to-a-score.ly | 7 +- .../lsr/adjusting-lyrics-vertical-spacing.ly | 3 +- ...aligning-and-centering-instrument-names.ly | 3 +- input/lsr/aligning-lyrics.ly | 3 +- input/lsr/alignment-vertical-spacing.ly | 3 +- .../altering-the-number-of-stems-in-a-beam.ly | 3 +- input/lsr/ambiti-multiple-voices.ly | 3 +- input/lsr/ancient-fonts.ly | 3 +- ...modern-transcription-of-gregorian-music.ly | 51 +++ ...-modern-transcription-of-mensural-music.ly | 245 ++++++++++ input/lsr/ancient-notation.snippet-list | 8 +- input/lsr/ancient-time-signatures.ly | 3 +- ...yles-depending-on-the-step-of-the-scale.ly | 7 +- input/lsr/automatic-beam-subdivisions.ly | 3 +- ...wo-per-two-in-4-4-or-2-2-time-signature.ly | 3 +- input/lsr/beam-across-line-breaks.ly | 3 +- ...staff-lines-using-the--whiteout-command.ly | 3 +- input/lsr/breathing-sign.ly | 3 +- input/lsr/broken-crescendo-hairpin.ly | 3 +- input/lsr/caesura-railtracks-with-fermata.ly | 3 +- .../lsr/center-text-below-hairpin-dynamics.ly | 3 +- input/lsr/changing--flageolet-mark-size.ly | 3 +- ...ing-an-individual-notes-size-in-a-chord.ly | 3 +- ...hanging-properties-for-individual-grobs.ly | 3 +- ...f-a-slur-from-solid-to-dotted-or-dashed.ly | 3 +- ...names-to-german-or-semi-german-notation.ly | 3 +- .../changing-the-default-text-font-family.ly | 3 +- ...changing-the-number-of-lines-in-a-staff.ly | 3 +- input/lsr/changing-the-staff-size.ly | 3 +- ...polymetric-section-using--compressmusic.ly | 3 +- input/lsr/chant-or-psalms-notation.ly | 3 +- input/lsr/chord-name-exceptions.ly | 3 +- input/lsr/chords.snippet-list | 4 +- .../lsr/clefs-commonly-tweaked-properties.ly | 3 +- input/lsr/clip-systems.ly | 29 +- input/lsr/clusters.ly | 3 +- input/lsr/coloring-objects.ly | 3 +- .../combining-dynamics-with-markup-texts.ly | 3 +- .../combining-two-parts-on-the-same-staff.ly | 3 +- input/lsr/compound-time-signatures.ly | 3 +- ...onducting-signs,-measure-grouping-signs.ly | 3 +- input/lsr/contexts-and-engravers.snippet-list | 1 + .../controlling-tuplet-bracket-visibility.ly | 3 +- ...-a-sequence-of-notes-on-various-pitches.ly | 3 +- input/lsr/creating-blank-staves.ly | 3 +- .../creating-music-with-scheme-music-box.ly | 13 +- input/lsr/creating-text-spanners.ly | 3 +- input/lsr/custodes.ly | 3 +- input/lsr/demo-midiinstruments.ly | 3 +- input/lsr/demonstrating-all-headers.ly | 3 +- ...entals-for-each-note-including-naturals.ly | 3 +- input/lsr/drawing-boxes-around-grobs.ly | 21 +- .../drawing-circles-around-various-objects.ly | 20 +- ...editorial-and-educational-use.snippet-list | 1 + input/lsr/engravers-one-by-one.ly | 3 +- input/lsr/expressive-marks.snippet-list | 1 + input/lsr/generating-random-notes.ly | 3 +- input/lsr/glissando-contempary.ly | 3 +- input/lsr/guitar.snippet-list | 1 + ...y-customized-polymetric-time-signatures.ly | 3 +- ...to-put-ties-between-syllables-in-lyrics.ly | 3 +- ...e-fragments-above-the-staff,-as-markups.ly | 3 +- input/lsr/jazz-combo-template.ly | 266 +++++++++++ input/lsr/letter-tablature-formatting.ly | 13 +- input/lsr/line-arrows.ly | 13 +- input/lsr/makam.ly | 33 +- ...nvisible-with-the-transparent-property.ly} | 26 +- input/lsr/markup-lines.ly | 5 +- input/lsr/move-specific-text.ly | 24 + input/lsr/non-traditional-key-signatures.ly | 3 +- input/lsr/outputting-the-version-number.ly | 22 +- input/lsr/page-label.ly | 7 +- input/lsr/paper-and-layout.snippet-list | 2 +- input/lsr/percussion.snippet-list | 1 + input/lsr/piano-music.snippet-list | 6 + input/lsr/piano-template-simple.ly | 35 ++ .../piano-template-with-centered-dynamics.ly | 97 ++++ .../piano-template-with-centered-lyrics.ly | 47 ++ .../piano-template-with-melody-and-lyrics.ly | 57 +++ input/lsr/pitches.snippet-list | 5 +- ...itioning-segno-and-coda-with-line-break.ly | 3 +- ...naturals-from-being-automatically-added.ly | 3 +- ...-printed-when-the-key-signature-changes.ly | 3 +- input/lsr/proportional-strict-notespacing.ly | 35 ++ ...uoting-another-voice-with-transposition.ly | 39 ++ input/lsr/quoting-another-voice.ly | 38 ++ input/lsr/rest-styles.ly | 41 ++ input/lsr/rhythmic-slashes.ly | 3 +- input/lsr/rhythms.snippet-list | 8 +- input/lsr/score-for-diatonic-accordion.ly | 421 ++++++++++++++++++ ...template-with-notes,-lyrics,-and-chords.ly | 42 ++ ...le-staff-template-with-notes-and-chords.ly | 36 ++ ...le-staff-template-with-notes-and-lyrics.ly | 37 ++ .../single-staff-template-with-only-notes.ly | 25 ++ input/lsr/skips-in-lyric-mode-2.ly | 18 + input/lsr/skips-in-lyric-mode.ly | 15 + input/lsr/spacing.snippet-list | 1 + input/lsr/staff-notation.snippet-list | 6 +- input/lsr/string-quartet-template-simple.ly | 53 +++ ...ng-quartet-template-with-separate-parts.ly | 121 +++++ input/lsr/strings.snippet-list | 2 + input/lsr/{toc.ly => table-of-contents.ly} | 9 +- input/lsr/template.snippet-list | 17 + input/lsr/text.snippet-list | 6 +- input/lsr/three-sided-box.ly | 47 ++ input/lsr/time-signature-in-parentheses.ly | 33 ++ ...scription-of-ancient-music-with-incipit.ly | 274 ++++++++++++ ...ith-minimum-accidentals-smart-transpose.ly | 3 +- input/lsr/tweaks-and-overrides.snippet-list | 21 +- ...tweak-command-to-tweak-individual-grobs.ly | 19 +- input/lsr/utf-8.ly | 67 +++ .../vertically-aligning-ossias-and-lyrics.ly | 3 +- ...template-with-automatic-piano-reduction.ly | 99 ++++ ...rics-aligned-below-and-above-the-staves.ly | 117 +++++ input/lsr/vocal-ensemble-template.ly | 82 ++++ input/lsr/vocal-music.snippet-list | 12 +- input/lsr/volta-multi-staff.ly | 15 +- 126 files changed, 2799 insertions(+), 222 deletions(-) create mode 100644 input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly create mode 100644 input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly create mode 100644 input/lsr/jazz-combo-template.ly rename input/lsr/{making-an-object-invisibile-with-the-transparent-property.ly => making-an-object-invisible-with-the-transparent-property.ly} (62%) create mode 100644 input/lsr/move-specific-text.ly create mode 100644 input/lsr/piano-template-simple.ly create mode 100644 input/lsr/piano-template-with-centered-dynamics.ly create mode 100644 input/lsr/piano-template-with-centered-lyrics.ly create mode 100644 input/lsr/piano-template-with-melody-and-lyrics.ly create mode 100644 input/lsr/proportional-strict-notespacing.ly create mode 100644 input/lsr/quoting-another-voice-with-transposition.ly create mode 100644 input/lsr/quoting-another-voice.ly create mode 100644 input/lsr/rest-styles.ly create mode 100644 input/lsr/score-for-diatonic-accordion.ly create mode 100644 input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly create mode 100644 input/lsr/single-staff-template-with-notes-and-chords.ly create mode 100644 input/lsr/single-staff-template-with-notes-and-lyrics.ly create mode 100644 input/lsr/single-staff-template-with-only-notes.ly create mode 100644 input/lsr/skips-in-lyric-mode-2.ly create mode 100644 input/lsr/skips-in-lyric-mode.ly create mode 100644 input/lsr/string-quartet-template-simple.ly create mode 100644 input/lsr/string-quartet-template-with-separate-parts.ly rename input/lsr/{toc.ly => table-of-contents.ly} (68%) create mode 100644 input/lsr/template.snippet-list create mode 100644 input/lsr/three-sided-box.ly create mode 100644 input/lsr/time-signature-in-parentheses.ly create mode 100644 input/lsr/transcription-of-ancient-music-with-incipit.ly create mode 100644 input/lsr/utf-8.ly create mode 100644 input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly create mode 100644 input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly create mode 100644 input/lsr/vocal-ensemble-template.ly diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index 8ef81972a3..7d8120a1ea 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -61,11 +61,12 @@ def copy_ly (srcdir, name, tags): global unconverted dest = os.path.join (DEST, name) f = open (dest, 'w') + tags = ', '.join (tags) if in_dir in srcdir: h = LY_HEADER_LSR else: h = LY_HEADER_NEW - f.write (h % ', '.join (tags)) + f.write (h % vars ()) f.write (mark_verbatim_section (open (os.path.join (srcdir, name)).read ())) f.close () e = os.system('convert-ly -e ' + dest) @@ -98,11 +99,12 @@ def read_source (src): s = {} l = dict ([(tag, set()) for tag in TAGS]) for f in glob.glob (os.path.join (src, '*.ly')): + basename = os.path.basename (f) m = tags_re.search (open (f, 'r').read ()) if m: file_tags = [tag.strip() for tag in m.group (1). split(',')] - s[f] = (src, file_tags) - [l[tag].add (f) for tag in file_tags if tag in TAGS] + s[basename] = (src, file_tags) + [l[tag].add (basename) for tag in file_tags if tag in TAGS] else: notags_files.append (f) return s, l diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index d41d8e9d14..0265871468 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: chords, ancient-notation, contexts-and-engravers \version "2.11.35" diff --git a/input/lsr/adding-ambiti-per-voice.ly b/input/lsr/adding-ambiti-per-voice.ly index 2cebe099a9..f310d35521 100644 --- a/input/lsr/adding-ambiti-per-voice.ly +++ b/input/lsr/adding-ambiti-per-voice.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches, staff-notation, vocal-music \version "2.11.35" diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index 014fae6b11..166e010952 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: staff-notation, contexts-and-engravers \version "2.11.35" diff --git a/input/lsr/adding-and-extra-staff-at-a-line-break.ly b/input/lsr/adding-and-extra-staff-at-a-line-break.ly index 91f3a10647..85e847058a 100644 --- a/input/lsr/adding-and-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-and-extra-staff-at-a-line-break.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: staff-notation, contexts-and-engravers, breaks \version "2.11.35" diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly index bf2eb4ee80..ca557d5e05 100644 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, expressive-marks \version "2.11.35" diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index a76964f50d..0232ea0a39 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, percussion \version "2.11.35" diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index f4a78cf167..5ddeecf1af 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: guitar \version "2.11.35" diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark.ly b/input/lsr/adding-parentheses-around-an-expressive-mark.ly index 4d7edacceb..4106858064 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks \version "2.11.35" diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly index 31dbbb7f89..fa05766c0e 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: titles \version "2.11.35" @@ -9,7 +10,7 @@ should only use the version after a certain date. A simple solution is to enter the date manually to the @code{.ly} file. But that's very error prone. It's easy to forget updating the date. So i thought it would be useful if you can add the date on which the PDF file is -generated automatically. I did't figure it out myself, but I asked on +generated automatically. I did't figure it out myself, but I asked on lilypond-user@@gnu.org. And guess what? Someone came with an excellent solution! So thank you very much Toine Schreurs for sending this solution to the user mailing list. I post it here for future reference. @@ -18,7 +19,7 @@ The solution is to use two scheme functions called @code{strftime} and @code{localtime}, as shown in the snippet. It is a very flexible solution, you can format the date just as you like it by adapting the @code{\"%d-%m-%Y\"} string. See the Guile documentation for more -details on this format string: Formatting Calendar Time. +details on this format string: Formatting Calendar Time. " } % begin verbatim \version "2.11.35" diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index f66298ed45..8b358dea6d 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: text, vocal-music, spacing \version "2.11.35" diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index ba8415a76e..9fc74dc961 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: text, paper-and-layout, titles \version "2.11.35" diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly index 43241a4f01..4f5934b012 100644 --- a/input/lsr/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: text, vocal-music \version "2.11.35" diff --git a/input/lsr/alignment-vertical-spacing.ly b/input/lsr/alignment-vertical-spacing.ly index 0f7526c38d..648dc977ac 100644 --- a/input/lsr/alignment-vertical-spacing.ly +++ b/input/lsr/alignment-vertical-spacing.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: tweaks-and-overrides, paper-and-layout, spacing \version "2.11.35" diff --git a/input/lsr/altering-the-number-of-stems-in-a-beam.ly b/input/lsr/altering-the-number-of-stems-in-a-beam.ly index 62c0de709b..262f17cb95 100644 --- a/input/lsr/altering-the-number-of-stems-in-a-beam.ly +++ b/input/lsr/altering-the-number-of-stems-in-a-beam.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/ambiti-multiple-voices.ly b/input/lsr/ambiti-multiple-voices.ly index e1a3426842..d51a47ef22 100644 --- a/input/lsr/ambiti-multiple-voices.ly +++ b/input/lsr/ambiti-multiple-voices.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index e2938a3d60..736f8a183b 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: ancient-notation \version "2.11.35" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly new file mode 100644 index 0000000000..e9fc9368e9 --- /dev/null +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -0,0 +1,51 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: ancient-notation, template +\version "2.11.35" + +\header { texidoc = " +This example demonstrates how to do modern transcription of Gregorian +music. Gregorian music has no measure, no stems; it uses only half and +quarter noteheads, and special marks, indicating rests of different +length. +" } +% begin verbatim +\include "gregorian-init.ly" + + chant = \relative c' { + \set Score.timing = ##f + f4 a2 \divisioMinima + g4 b a2 f2 \divisioMaior + g4( f) f( g) a2 \finalis + } + + verba = \lyricmode { + Lo -- rem ip -- sum do -- lor sit a -- met + } + + \score { + \new Staff << + \new Voice = "melody" { + \chant + } + \new Lyrics = "one" \lyricsto melody \verba + >> + + \layout { + \context { + \Staff + \remove "Time_signature_engraver" + \remove "Bar_engraver" + \override Stem #'transparent = ##t + } + \context { + \Voice + \override Stem #'length = #0 + } + \context { + \Score + barAlways = ##t + } + } + } + diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly new file mode 100644 index 0000000000..58e545080c --- /dev/null +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -0,0 +1,245 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: ancient-notation, template +\version "2.11.35" + +\header { texidoc = " +When transcribing mensural music, an incipit at the beginning of the +piece is useful to indicate the original key and tempo. While today +musicians are used to bar lines in order to faster recognize rhythmic +patterns, bar lines were not yet invented during the period of mensural +music; in fact, the meter often changed after every few notes. As a +compromise, bar lines are often printed between the staves rather than +on the staves. +" } +% begin verbatim +global = { + \set Score.skipBars = ##t + + % incipit + \once \override Score.SystemStartBracket #'transparent = ##t + \override Score.SpacingSpanner #'spacing-increment = #1.0 % tight spacing + \key f \major + \time 2/2 + \once \override Staff.TimeSignature #'style = #'neomensural + \override Voice.NoteHead #'style = #'neomensural + \override Voice.Rest #'style = #'neomensural + \set Staff.printKeyCancellation = ##f + \cadenzaOn % turn off bar lines + \skip 1*10 + \once \override Staff.BarLine #'transparent = ##f + \bar "||" + \skip 1*1 % need this extra \skip such that clef change comes + % after bar line + \bar "" + + % main + \revert Score.SpacingSpanner #'spacing-increment % CHECK: no effect? + \cadenzaOff % turn bar lines on again + \once \override Staff.Clef #'full-size-change = ##t + \set Staff.forceClef = ##t + \key g \major + \time 4/4 + \override Voice.NoteHead #'style = #'default + \override Voice.Rest #'style = #'default + + % FIXME: setting printKeyCancellation back to #t must not + % occur in the first bar after the incipit. Dto. for forceClef. + % Therefore, we need an extra \skip. + \skip 1*1 + \set Staff.printKeyCancellation = ##t + \set Staff.forceClef = ##f + + \skip 1*7 % the actual music + + % let finis bar go through all staves + \override Staff.BarLine #'transparent = ##f + + % finis bar + \bar "|." +} + +discantusNotes = { + \transpose c' c'' { + \set Staff.instrumentName = "Discantus " + + % incipit + \clef "neomensural-c1" + c'1. s2 % two bars + \skip 1*8 % eight bars + \skip 1*1 % one bar + + % main + \clef "treble" + d'2. d'4 | + b e' d'2 | + c'4 e'4.( d'8 c' b | + a4) b a2 | + b4.( c'8 d'4) c'4 | + \once \override NoteHead #'transparent = ##t c'1 | + b\breve | + } +} + +discantusLyrics = \lyricmode { + % incipit + IV- + + % main + Ju -- bi -- | + la -- te De -- | + o, om -- + nis ter -- | + ra, __ om- | + "..." | + -us. | +} + +altusNotes = { + \transpose c' c'' { + \set Staff.instrumentName = "Altus " + + % incipit + \clef "neomensural-c3" + r1 % one bar + f1. s2 % two bars + \skip 1*7 % seven bars + \skip 1*1 % one bar + + % main + \clef "treble" + r2 g2. e4 fis g | % two bars + a2 g4 e | + fis g4.( fis16 e fis4) | + g1 | + \once \override NoteHead #'transparent = ##t g1 | + g\breve | + } +} + +altusLyrics = \lyricmode { + % incipit + IV- + + % main + Ju -- bi -- la -- te | % two bars + De -- o, om -- | + nis ter -- ra, | + "..." | + -us. | +} + +tenorNotes = { + \transpose c' c' { + \set Staff.instrumentName = "Tenor " + + % incipit + \clef "neomensural-c4" + r\longa % four bars + r\breve % two bars + r1 % one bar + c'1. s2 % two bars + \skip 1*1 % one bar + \skip 1*1 % one bar + + % main + \clef "treble_8" + R1 | + R1 | + R1 | + r2 d'2. d'4 b e' | % two bars + \once \override NoteHead #'transparent = ##t e'1 | + d'\breve | + } +} + +tenorLyrics = \lyricmode { + % incipit + IV- + + % main + Ju -- bi -- la -- te | % two bars + "..." | + -us. | +} + +bassusNotes = { + \transpose c' c' { + \set Staff.instrumentName = "Bassus " + + % incipit + \clef "bass" + r\maxima % eight bars + f1. s2 % two bars + \skip 1*1 % one bar + + % main + \clef "bass" + R1 | + R1 | + R1 | + R1 | + g2. e4 | + \once \override NoteHead #'transparent = ##t e1 | + g\breve | + } +} + +bassusLyrics = \lyricmode { + % incipit + IV- + + % main + Ju -- bi- | + "..." | + -us. | +} + +\score { + \new StaffGroup = choirStaff << + \new Voice = + "discantusNotes" << \global \discantusNotes >> + \new Lyrics = + "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } + \new Voice = + "altusNotes" << \global \altusNotes >> + \new Lyrics = + "altusLyrics" \lyricsto altusNotes { \altusLyrics } + \new Voice = + "tenorNotes" << \global \tenorNotes >> + \new Lyrics = + "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics } + \new Voice = + "bassusNotes" << \global \bassusNotes >> + \new Lyrics = + "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } + >> + \layout { + \context { + \Score + + % no bars in staves + \override BarLine #'transparent = ##t + + % incipit should not start with a start delimiter + \remove "System_start_delimiter_engraver" + } + \context { + \Voice + + % no slurs + \override Slur #'transparent = ##t + + % Comment in the below "\remove" command to allow line + % breaking also at those barlines where a note overlaps + % into the next bar. The command is commented out in this + % short example score, but especially for large scores, you + % will typically yield better line breaking and thus improve + % overall spacing if you comment in the following command. + %\remove "Forbid_line_break_engraver" + } + } +} + + + diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list index 55977e8b2b..88c40ece44 100644 --- a/input/lsr/ancient-notation.snippet-list +++ b/input/lsr/ancient-notation.snippet-list @@ -1,5 +1,9 @@ -ancient-fonts.ly -adding-a-figured-bass-above-or-below-the-notes.ly +transcription-of-ancient-music-with-incipit.ly chant-or-psalms-notation.ly +adding-a-figured-bass-above-or-below-the-notes.ly +ancient-notation-template----modern-transcription-of-mensural-music.ly +ancient-fonts.ly ancient-time-signatures.ly custodes.ly +ancient-notation-template----modern-transcription-of-gregorian-music.ly +rest-styles.ly diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index 6437ba88d1..d5580dcedd 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: ancient-notation \version "2.11.35" diff --git a/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly index 08d4208118..2260229344 100644 --- a/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly @@ -1,5 +1,6 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: other +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: pitches, editorial-and-educational-use \version "2.11.35" \header { texidoc = " @@ -14,7 +15,7 @@ latin note names as well). That said, if you're trying to imitate old American song books, you may also want to try LilyPond's predefined note heads styles, through -shortcut commands such as \aikenHeads or \sacredHarpHeads. +shortcut commands such as \\aikenHeads or \\sacredHarpHeads. This exemple shows different ways to obtain shape note heads, and demonstrates the ability to transpose a melody without losing the diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index a815d4f1bb..f75f4b5f9a 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms \version "2.11.35" 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 98dc02aa0d..3430ed736f 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 @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms \version "2.11.35" diff --git a/input/lsr/beam-across-line-breaks.ly b/input/lsr/beam-across-line-breaks.ly index 282a5882e7..74119e48fb 100644 --- a/input/lsr/beam-across-line-breaks.ly +++ b/input/lsr/beam-across-line-breaks.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, breaks \version "2.11.35" diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index 3c269fcfe1..831ab6655f 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: editorial-and-educational-use, text \version "2.11.35" diff --git a/input/lsr/breathing-sign.ly b/input/lsr/breathing-sign.ly index 0bdbecba69..2aeddaa0a4 100644 --- a/input/lsr/breathing-sign.ly +++ b/input/lsr/breathing-sign.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks \version "2.11.35" diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index 498b165fcb..cf5ec30ccc 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks \version "2.11.35" diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index 8b865e301e..fb1a564018 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index c69538c008..23dacce682 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks, text \version "2.11.35" diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index aca4443fbf..1d1721c22c 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks \version "2.11.35" diff --git a/input/lsr/changing-an-individual-notes-size-in-a-chord.ly b/input/lsr/changing-an-individual-notes-size-in-a-chord.ly index af3501fa01..3c23990468 100644 --- a/input/lsr/changing-an-individual-notes-size-in-a-chord.ly +++ b/input/lsr/changing-an-individual-notes-size-in-a-chord.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: simultaneous-notes, editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index 84ea3cb5bb..60c32135c2 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 072fa98791..0007aac535 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks, editorial-and-educational-use \version "2.11.35" diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index b02906396a..ab76caa884 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: chords \version "2.11.35" diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index a30a63d417..c380242d9a 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: editorial-and-educational-use, text, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index 8b8ae72d4a..bab18fe9a2 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: staff-notation \version "2.11.35" diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index fa3e93ce8b..de5478414d 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: staff-notation, tweaks-and-overrides, paper-and-layout \version "2.11.35" diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly index 0c5b6734b0..28299a46ed 100644 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, contexts-and-engravers \version "2.11.35" diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 55bac7d0a3..dba7d806d3 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, vocal-music, ancient-notation, contexts-and-engravers \version "2.11.35" diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index ce7ace9071..f5dabb4cce 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: chords \version "2.11.35" diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index be5f7f38ac..360aab0085 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -1,4 +1,6 @@ -chord-name-exceptions.ly changing-the-chord-names-to-german-or-semi-german-notation.ly adding-a-figured-bass-above-or-below-the-notes.ly +single-staff-template-with-notes-and-chords.ly clusters.ly +single-staff-template-with-notes,-lyrics,-and-chords.ly +chord-name-exceptions.ly diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly index d2e2d176a5..296318bed4 100644 --- a/input/lsr/clefs-commonly-tweaked-properties.ly +++ b/input/lsr/clefs-commonly-tweaked-properties.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches, staff-notation, editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly index 8911d5a132..b9861c292a 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.ly @@ -1,28 +1,27 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: paper-and-layout +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" +\layout { ragged-right= ##t } \header { - texidoc = "Clipping snippets from a finished score + doctitle = "Clip systems" + lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or +% "Special output" might be more adequate -jm + texidoc = " +This code shows how to clip (extracts) snippets from a full score. -Notes: +This file needs to be run separately with @code{-dclip-systems}; the +snippets page may not adequately show the results. + +The result will be files named +@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. @itemize @bullet @item If system starts and ends are included, they include extents of the System grob, eg. instrument names. -@item Grace notes at the end point of the region are not included +@item Grace notes at the end point of the region are not included. @item Regions can span multiple systems. In this case, multiple EPS files are generated. @end itemize - -This file needs to be run separately with @code{-dclip-systems}; the -collated-files.html of the regression test does not adequately show -the results. - -The result will be files named -@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. " - } % begin verbatim -\version "2.11.35" - #(ly:set-option 'clip-systems) #(set! output-count 1) diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index 85c2935ea0..8c42eee19c 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: simultaneous-notes, chords, piano-music \version "2.11.35" diff --git a/input/lsr/coloring-objects.ly b/input/lsr/coloring-objects.ly index 550544b556..3de1e2d945 100644 --- a/input/lsr/coloring-objects.ly +++ b/input/lsr/coloring-objects.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index 463296df74..6c02c82f0c 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks, text \version "2.11.35" diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index 869e018ce8..9d9d55de70 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: simultaneous-notes, text \version "2.11.35" diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index f390ab4126..a37fa3f217 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms \version "2.11.35" diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 496ddba7bd..57316830d9 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms \version "2.11.35" diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list index 1d6133f325..36426d1e60 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -2,6 +2,7 @@ creating-blank-staves.ly chant-or-psalms-notation.ly adding-a-figured-bass-above-or-below-the-notes.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 engravers-one-by-one.ly adding-and-extra-staff-at-a-line-break.ly diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index 398c86baaa..639bc03c94 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index 4c5ce87e70..84d0304039 100644 --- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index 3ca2f8f2e1..7a5d353f09 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: staff-notation, editorial-and-educational-use, contexts-and-engravers, paper-and-layout \version "2.11.35" diff --git a/input/lsr/creating-music-with-scheme-music-box.ly b/input/lsr/creating-music-with-scheme-music-box.ly index 5541ff0961..4bc08b2706 100644 --- a/input/lsr/creating-music-with-scheme-music-box.ly +++ b/input/lsr/creating-music-with-scheme-music-box.ly @@ -1,13 +1,14 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: pitches -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - -\header { texidoc = " +\header { + doctitle = "Creating music with Scheme music box" + lsrtags = "pitches" + texidoc = " This example shows prelude in C major of Bach's Well-Tempered Klavier 1, but coded using Scheme functions to avoid typing work. BROKEN (?) IN 2.11, COMMENTED OUT. -" } +" +} % begin verbatim { c'4 } diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index a5de367d7f..7654ceef87 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: expressive-marks, text, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index bc0ed14f9e..e55f023834 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: ancient-notation, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index db1a1a20e3..3a59adac2b 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: vocal-music, piano-music, strings, midi \version "2.11.35" diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index 1906c840d2..b9552e52bb 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: text, paper-and-layout, titles \version "2.11.35" diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index cbf8a8e07b..d447a6e419 100644 --- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index 6eadc848b0..d599922b42 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,14 +1,16 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: other +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - -\header { texidoc = " +\layout { ragged-right= ##t } +\header { + doctitle = "Drawing boxes around grobs" + lsrtags = "tweaks-and-overrides" + texidoc = " The @code{print-function} can be overridden to draw a box around an -arbitrary grob. -" } +arbitrary grob. +" +} % begin verbatim -\relative c'' { - +\relative c'' { \override TextScript #'stencil = #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) @@ -22,8 +24,5 @@ arbitrary grob. b8 \revert Stem #'stencil - c4. c4 \mark "F" c1 } - - diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index 82efc69677..fa2043987b 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,15 +1,17 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: other +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - -\header { texidoc = " -The \circle command allows you to draw circles around various objects -(for example fingering indications). However, some objects require -specific tweaks: rehearsal marks depend on the Score.markFormatter -context, bar numbers on the Score.BarNumber context, and so on. +\layout { ragged-right= ##t } +\header { + doctitle = "Drawing circles around various objects" + lsrtags = "tweaks-and-overrides" + texidoc = " +The @code{\circle} command allows you to draw circles around various objects, +for example fingering indications. However, some objects require +specific tweaks: rehearsal marks depend on the @code{Score.markFormatter} +context, bar numbers on the @code{Score.BarNumber} context, and so on. You can tweak the printing of your circles by setting some properties -such as #'thickness, #'circle-padding or #'font-size. +such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}. " } % begin verbatim \relative c'{ diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list index 72ddd3bb60..28e681b67a 100644 --- a/input/lsr/editorial-and-educational-use.snippet-list +++ b/input/lsr/editorial-and-educational-use.snippet-list @@ -5,6 +5,7 @@ coloring-objects.ly inserting-score-fragments-above-the-staff,-as-markups.ly rhythmic-slashes.ly changing-the-default-text-font-family.ly +three-sided-box.ly clefs-commonly-tweaked-properties.ly blanking-staff-lines-using-the--whiteout-command.ly changing-an-individual-notes-size-in-a-chord.ly diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index dc8be08d32..eaad5e72a6 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: contexts-and-engravers \version "2.11.35" diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index 69de4e9117..98eb1de0ce 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -8,5 +8,6 @@ center-text-below-hairpin-dynamics.ly adding-parentheses-around-an-expressive-mark.ly line-arrows.ly changing--flageolet-mark-size.ly +piano-template-with-centered-dynamics.ly creating-text-spanners.ly broken-crescendo-hairpin.ly diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index a1d5215322..5e699102e9 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/glissando-contempary.ly b/input/lsr/glissando-contempary.ly index 372329dc1d..b600715936 100644 --- a/input/lsr/glissando-contempary.ly +++ b/input/lsr/glissando-contempary.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches, expressive-marks \version "2.11.35" diff --git a/input/lsr/guitar.snippet-list b/input/lsr/guitar.snippet-list index 6377452c1f..f4997a5829 100644 --- a/input/lsr/guitar.snippet-list +++ b/input/lsr/guitar.snippet-list @@ -1,2 +1,3 @@ letter-tablature-formatting.ly +jazz-combo-template.ly adding-fingerings-to-tablatures.ly diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 5bb31a31bc..0d3f272704 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, percussion \version "2.11.35" diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index e8a6aa3736..c0b52ef0f2 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: text, vocal-music \version "2.11.35" diff --git a/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly index 892b747b4d..ffba893b62 100644 --- a/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: staff-notation, editorial-and-educational-use \version "2.11.35" diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly new file mode 100644 index 0000000000..00c669d5b0 --- /dev/null +++ b/input/lsr/jazz-combo-template.ly @@ -0,0 +1,266 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: pitches, piano-music, percussion, guitar, template +\version "2.11.35" + +\header { texidoc = " +This is quite an advanced template, for a jazz ensemble. Note that all +instruments are notated in \\key c \\major. This refers to the key in +concert pitch; LilyPond will automatically transpose the key if the +music is within a \\transpose section. +" } +% begin verbatim +\header { + title = "Song" + subtitle = "(tune)" + composer = "Me" + meter = "moderato" + piece = "Swing" + tagline = \markup { + \column { + "LilyPond example file by Amelie Zapf," + "Berlin 07/07/2003" + } + } + texidoc = "Jazz tune for combo + (horns, guitar, piano, bass, drums)." + } + + #(set-global-staff-size 16) + \include "english.ly" + + %%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%% + + sl = { + \override NoteHead #'style = #'slash + \override Stem #'transparent = ##t + } + nsl = { + \revert NoteHead #'style + \revert Stem #'transparent + } + cr = \override NoteHead #'style = #'cross + ncr = \revert NoteHead #'style + + %% insert chord name style stuff here. + + jzchords = { } + + + %%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%% + + global = { + \time 4/4 + } + + Key = { \key c \major } + + % ############ Horns ############ + + % ------ Trumpet ------ + trpt = \transpose c d \relative c'' { + \Key + c1 c c + } + trpharmony = \transpose c' d { + \jzchords + } + trumpet = { + \global + \set Staff.instrumentName = #"Trumpet" + \clef treble + << + \trpt + >> + } + + % ------ Alto Saxophone ------ + alto = \transpose c a \relative c' { + \Key + c1 c c + } + altoharmony = \transpose c' a { + \jzchords + } + altosax = { + \global + \set Staff.instrumentName = #"Alto Sax" + \clef treble + << + \alto + >> + } + + % ------ Baritone Saxophone ------ + bari = \transpose c a' \relative c { + \Key + c1 c \sl d4^"Solo" d d d \nsl + } + bariharmony = \transpose c' a \chordmode { + \jzchords s1 s d2:maj e:m7 + } + barisax = { + \global + \set Staff.instrumentName = #"Bari Sax" + \clef treble + << + \bari + >> + } + + % ------ Trombone ------ + tbone = \relative c { + \Key + c1 c c + } + tboneharmony = \chordmode { + \jzchords + } + trombone = { + \global + \set Staff.instrumentName = #"Trombone" + \clef bass + << + \tbone + >> + } + + % ############ Rhythm Section ############# + + % ------ Guitar ------ + gtr = \relative c'' { + \Key + c1 \sl b4 b b b \nsl c1 + } + gtrharmony = \chordmode { + \jzchords + s1 c2:min7+ d2:maj9 + } + guitar = { + \global + \set Staff.instrumentName = #"Guitar" + \clef treble + << + \gtr + >> + } + + %% ------ Piano ------ + rhUpper = \relative c'' { + \voiceOne + \Key + c1 c c + } + rhLower = \relative c' { + \voiceTwo + \Key + e1 e e + } + + lhUpper = \relative c' { + \voiceOne + \Key + g1 g g + } + lhLower = \relative c { + \voiceTwo + \Key + c1 c c + } + + PianoRH = { + \clef treble + \global + \set Staff.midiInstrument = "acoustic grand" + << + \new Voice = "one" \rhUpper + \new Voice = "two" \rhLower + >> + } + PianoLH = { + \clef bass + \global + \set Staff.midiInstrument = "acoustic grand" + << + \new Voice = "one" \lhUpper + \new Voice = "two" \lhLower + >> + } + + piano = { + << + \set PianoStaff.instrumentName = #"Piano" + \new Staff = "upper" \PianoRH + \new Staff = "lower" \PianoLH + >> + } + + % ------ Bass Guitar ------ + Bass = \relative c { + \Key + c1 c c + } + bass = { + \global + \set Staff.instrumentName = #"Bass" + \clef bass + << + \Bass + >> + } + + % ------ Drums ------ + up = \drummode { + hh4 4 hh hh 4 + hh4 4 + hh4 4 + hh4 4 + } + + down = \drummode { + bd4 s bd s bd s bd s bd s bd s + } + + drumContents = { + \global + << + \set DrumStaff.instrumentName = #"Drums" + \new DrumVoice { \voiceOne \up } + \new DrumVoice { \voiceTwo \down } + >> + } + + %%%%%%%%% It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%% + + \score { + << + \new StaffGroup = "horns" << + \new Staff = "trumpet" \trumpet + \new Staff = "altosax" \altosax + \new ChordNames = "barichords" \bariharmony + \new Staff = "barisax" \barisax + \new Staff = "trombone" \trombone + >> + + \new StaffGroup = "rhythm" << + \new ChordNames = "chords" \gtrharmony + \new Staff = "guitar" \guitar + \new PianoStaff = "piano" \piano + \new Staff = "bass" \bass + \new DrumStaff { \drumContents } + >> + >> + + \layout { + \context { \RemoveEmptyStaffContext } + \context { + \Score + \override BarNumber #'padding = #3 + \override RehearsalMark #'padding = #2 + skipBars = ##t + } + } + + \midi { } + } +% begin verbatim diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly index 1004ca11d9..0dbb16bb4c 100644 --- a/input/lsr/letter-tablature-formatting.ly +++ b/input/lsr/letter-tablature-formatting.ly @@ -1,12 +1,13 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: guitar -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" -\header { texidoc = " +\header { + doctitle = "Letter tablature formatting" + lsrtags = "guitar" + texidoc = " You can format a tablature with letters instead of numbers - so that 0->a, 1->b, 2->c, etc. -BROKEN IN 2.11, COMMENTED OUT. -" } +BROKEN IN 2.11, COMMENTED OUT." +} { c'4 } diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index 802c980564..fdbd6c2818 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,15 +1,12 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: expressive-marks +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" +\layout { ragged-right= ##t } \header { + doctitle = "Line arrows" + lsrtags = "expressive-marks" texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } % begin verbatim -\version "2.11.35" - -\paper { - ragged-right = ##t -} - \relative c'' { \override TextSpanner #'bound-padding = #1.0 \override TextSpanner #'dash-fraction = #'() diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly index 58f1e303c0..8051e13bc2 100644 --- a/input/lsr/makam.ly +++ b/input/lsr/makam.ly @@ -1,32 +1,22 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: pitches +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" +\layout { ragged-right= ##t } \header { - + doctitle = "Makam" + lsrtags = "pitches" texidoc = "Makam is Turkish type of melody that uses 1/9 tone microtonal alterations." - } % begin verbatim - -\version "2.11.35" - -%{ - -Define 1/9 alterations. - -%} - +% Define 1/9 alterations. #(define-public KOMA 1/9) #(define-public BAKIYE 4/9) #(define-public KUCUK 5/9) #(define-public BUYUKMUCENNEB 8/9) -%{ - -Define pitch names -%} +% Define pitch names makamPitchNames = #`( (c . ,(ly:make-pitch -1 0 NATURAL)) @@ -104,17 +94,10 @@ makamPitchNames = #`( ) - %% set pitch names. pitchnames = \makamPitchNames #(ly:parser-set-note-names parser makamPitchNames) -\paper -{ - ragged-right = ##t -} - - makamGlyphs = #'((1 . "accidentals.doublesharp") (8/9 . "accidentals.sharp.slashslashslash.stemstem") (5/9 . "accidentals.sharp.slashslashslash.stem") @@ -131,7 +114,6 @@ makamGlyphs = #'((1 . "accidentals.doublesharp") \relative { %{ define alteration <-> symbol mapping. The following glyphs are available. - accidentals.sharp accidentals.sharp.slashslash.stem accidentals.sharp.slashslashslash.stemstem @@ -146,7 +128,6 @@ makamGlyphs = #'((1 . "accidentals.doublesharp") accidentals.flatflat accidentals.flatflat.slash accidentals.doublesharp - %} \override Accidental #'glyph-name-alist = \makamGlyphs diff --git a/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly similarity index 62% rename from input/lsr/making-an-object-invisibile-with-the-transparent-property.ly rename to input/lsr/making-an-object-invisible-with-the-transparent-property.ly index 6ed3429d40..7d8c2c4cb3 100644 --- a/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: other +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - -\header { texidoc = " +\layout { ragged-right= ##t } +\header { + doctitle = "Making an object invisible with the transparent property" + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " Setting the @code{transparent} property will cause an object to be printed in `invisible ink': the object is not printed, but all its other behavior is retained. The object still takes up space, it takes @@ -15,11 +17,11 @@ introducing a tie in a different voice, and blanking the first up-stem in that voice, the tie appears to cross voices. " } % begin verbatim -\relative c'' { -<< { - \once \override Stem #'transparent = ##t - b8~ b8\noBeam -} \\ { - b[ g8] -} >> -} +\relative c'' << + { + \once \override Stem #'transparent = ##t + b8~ b8\noBeam + } \\ { + b[ g8] + } +>> diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 6ef4c49cb5..2455146640 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,8 +1,9 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: text +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" \header { + doctitle = "Markup lines" + lsrtags = "text" texidoc = "Text that can spread over pages is entered with the @code{\\markuplines} command." } diff --git a/input/lsr/move-specific-text.ly b/input/lsr/move-specific-text.ly new file mode 100644 index 0000000000..a5ed8a0466 --- /dev/null +++ b/input/lsr/move-specific-text.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" +% possible rename to scheme- or something like that. -gp +\header { + doctitle = "Move specific text" + lsrtags = "tweaks-and-overrides" + texidoc = "@cindex Scheme Move Text +Objects of the same type, like text, can be moved around by using some Scheme code. +" } +% begin verbatim +#(define (make-text-checker text) + (lambda (grob) (equal? text (ly:grob-property grob 'text)))) + +\score { + \relative c''' { + \stemUp + \applyOutput #'Voice + #(outputproperty-compatibility + (make-text-checker (make-simple-markup "m.d.")) + 'extra-offset '(-3.5 . -4.5)) + a^2^"m.d." + } + \layout { ragged-right = ##t} +} diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index 857460b760..ba03e67d89 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches, staff-notation \version "2.11.35" diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index dbbe219810..2fd28cb867 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,14 +1,15 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: other +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" -\header { texidoc = " -By putting the output of - @code{lilypond-version} into a lyric, it is possible to print the - version number of LilyPond in a score, or in a document generated - with @code{lilypond-book}. Another possibility is to append the - version number to the doc-string, in this manner: -" } +\header { + doctitle = "Outputting the version number" + lsrtags = "text" + texidoc = " +By putting the output of @code{lilypond-version} into a lyric or a +text markup, it is possible to print the version number of LilyPond in +a score, or in a document generated with @code{lilypond-book}. +" +} % begin verbatim \score { \context Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT @@ -16,6 +17,3 @@ By putting the output of s2 } } - - - diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index 05c30ecb5d..8be01b2f87 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,8 +1,9 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: spacing +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - +\layout { ragged-right= ##t } \header { + doctitle = "Page label" + lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, and refered to in markups." } diff --git a/input/lsr/paper-and-layout.snippet-list b/input/lsr/paper-and-layout.snippet-list index c603257756..8ebd42941e 100644 --- a/input/lsr/paper-and-layout.snippet-list +++ b/input/lsr/paper-and-layout.snippet-list @@ -1,7 +1,7 @@ creating-blank-staves.ly aligning-and-centering-instrument-names.ly -toc.ly alignment-vertical-spacing.ly demonstrating-all-headers.ly changing-the-staff-size.ly +table-of-contents.ly clip-systems.ly diff --git a/input/lsr/percussion.snippet-list b/input/lsr/percussion.snippet-list index d39f51e4b1..6e43033c71 100644 --- a/input/lsr/percussion.snippet-list +++ b/input/lsr/percussion.snippet-list @@ -1,2 +1,3 @@ +jazz-combo-template.ly adding-drum-parts.ly heavily-customized-polymetric-time-signatures.ly diff --git a/input/lsr/piano-music.snippet-list b/input/lsr/piano-music.snippet-list index e597ef9234..a737521901 100644 --- a/input/lsr/piano-music.snippet-list +++ b/input/lsr/piano-music.snippet-list @@ -1,2 +1,8 @@ +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 +piano-template-with-melody-and-lyrics.ly +jazz-combo-template.ly demo-midiinstruments.ly diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly new file mode 100644 index 0000000000..5f779a1e9d --- /dev/null +++ b/input/lsr/piano-template-simple.ly @@ -0,0 +1,35 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: piano-music, template +\version "2.11.35" + +\header { texidoc = " +Here is a simple piano staff with some notes. +" } +% begin verbatim +upper = \relative c'' { + \clef treble + \key c \major + \time 4/4 + + a b c d + } + + lower = \relative c { + \clef bass + \key c \major + \time 4/4 + + a2 c + } + + \score { + \new PianoStaff << + \set PianoStaff.instrumentName = "Piano " + \new Staff = "upper" \upper + \new Staff = "lower" \lower + >> + \layout { } + \midi { } + } + diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly new file mode 100644 index 0000000000..116eefb9ac --- /dev/null +++ b/input/lsr/piano-template-with-centered-dynamics.ly @@ -0,0 +1,97 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: expressive-marks, piano-music, template +\version "2.11.35" + +\header { 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 +right here, you don't have to do the tweaking yourself. +" } +% begin verbatim +upper = \relative c'' { + \clef treble + \key c \major + \time 4/4 + + a b c d + } + + lower = \relative c { + \clef bass + \key c \major + \time 4/4 + + a2 c + } + + dynamics = { + s2\fff\> s4 + s\!\pp + } + + pedal = { + s2\sustainDown s2\sustainUp + } + + \score { + \new PianoStaff << + \new Staff = "upper" \upper + \new Dynamics = "dynamics" \dynamics + \new Staff = "lower" << + \clef bass + \lower + >> + \new Dynamics = "pedal" \pedal + >> + \layout { + \context { + \type "Engraver_group" + \name Dynamics + \alias Voice % So that \cresc works, for example. + \consists "Output_property_engraver" + + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) + pedalSustainStrings = #'("Ped." "*Ped." "*") + pedalUnaCordaStrings = #'("una corda" "" "tre corde") + + \consists "Piano_pedal_engraver" + \consists "Script_engraver" + \consists "Dynamic_engraver" + \consists "Text_engraver" + + \override TextScript #'font-size = #2 + \override TextScript #'font-shape = #'italic + \override DynamicText #'extra-offset = #'(0 . 2.5) + \override Hairpin #'extra-offset = #'(0 . 2.5) + + \consists "Skip_event_swallow_translator" + + \consists "Axis_group_engraver" + } + \context { + \PianoStaff + \accepts Dynamics + \override VerticalAlignment #'forced-distance = #7 + } + } + } + \score { + \new PianoStaff << + \new Staff = "upper" << \upper \dynamics >> + \new Staff = "lower" << \lower \dynamics >> + \new Dynamics = "pedal" \pedal + >> + \midi { + \context { + \type "Performer_group" + \name Dynamics + \consists "Piano_pedal_performer" + } + \context { + \PianoStaff + \accepts Dynamics + } + } + } + diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly new file mode 100644 index 0000000000..00387dcd0d --- /dev/null +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -0,0 +1,47 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: text, piano-music, template +\version "2.11.35" + +\header { texidoc = " +Instead of having a full staff for the melody and lyrics, you can place +the lyrics between the piano staff (and omit the separate melody +staff). +" } +% begin verbatim +upper = \relative c'' { + \clef treble + \key c \major + \time 4/4 + + a b c d + } + + lower = \relative c { + \clef bass + \key c \major + \time 4/4 + + a2 c + } + + text = \lyricmode { + Aaa Bee Cee Dee + } + + \score { + \new GrandStaff << + \new Staff = upper { \new Voice = "singer" \upper } + \new Lyrics \lyricsto "singer" \text + \new Staff = lower { + \clef bass + \lower + } + >> + \layout { + \context { \GrandStaff \accepts "Lyrics" } + \context { \Lyrics \consists "Bar_engraver" } + } + \midi { } + } + diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly new file mode 100644 index 0000000000..daeea21fbd --- /dev/null +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -0,0 +1,57 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: vocal-music, piano-music, template +\version "2.11.35" + +\header { texidoc = " +Here is a typical song format: one staff with the melody and lyrics, +with piano accompaniment underneath. +" } +% begin verbatim +melody = \relative c'' { + \clef treble + \key c \major + \time 4/4 + + a b c d + } + + text = \lyricmode { + Aaa Bee Cee Dee + } + + upper = \relative c'' { + \clef treble + \key c \major + \time 4/4 + + a b c d + } + + lower = \relative c { + \clef bass + \key c \major + \time 4/4 + + a2 c + } + + \score { + << + \new Voice = "mel" { + \autoBeamOff + \melody + } + \new Lyrics \lyricsto mel \text + + \new PianoStaff << + \new Staff = "upper" \upper + \new Staff = "lower" \lower + >> + >> + \layout { + \context { \RemoveEmptyStaffContext } + } + \midi { } + } + diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list index 5e867af4f7..6f4dc22595 100644 --- a/input/lsr/pitches.snippet-list +++ b/input/lsr/pitches.snippet-list @@ -1,11 +1,12 @@ applying-noteheads-styles-depending-on-the-step-of-the-scale.ly glissando-contempary.ly ambiti-multiple-voices.ly -volta-multi-staff.ly -transposing-pitches-with-minimum-accidentals-smart-transpose.ly makam.ly +transposing-pitches-with-minimum-accidentals-smart-transpose.ly +jazz-combo-template.ly preventing-extra-naturals-from-being-automatically-added.ly generating-random-notes.ly +quoting-another-voice-with-transposition.ly adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly dodecaphonic-style-accidentals-for-each-note-including-naturals.ly diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index 170937ae3b..c372f48df0 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: repeats, breaks \version "2.11.35" diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly index 4075f0c482..597024dde5 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index 6354ae5bb8..edb330d0bb 100644 --- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly new file mode 100644 index 0000000000..16773f4591 --- /dev/null +++ b/input/lsr/proportional-strict-notespacing.ly @@ -0,0 +1,35 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: tweaks-and-overrides, spacing +\version "2.11.35" + +\header { texidoc = " +If @code{strict-note-spacing} is set spacing of notes is not influenced +by bars or clefs part way along the system. Rather, they are put just +before the note that occurs at the same time. This may cause +collisions. +" } +% begin verbatim +\paper { + ragged-right = ##t + indent = 0 +} +\layout { + \context { + \Score + } +} + +\relative c'' << + \override Score.SpacingSpanner #'strict-note-spacing = ##t + \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \new Staff { + c8[ c \clef alto c c \grace { d16 } c8 c] c4 c2 + \grace { c16[ c16] } + c2 } + \new Staff { + c2 \times 2/3 { c8 \clef bass cis,, c } + c4 + c1 + } +>> diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly new file mode 100644 index 0000000000..8a2e95f9a0 --- /dev/null +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -0,0 +1,39 @@ +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" +\header { + doctitle = "Quoting another voice with transposition" + lsrtags = "pitches,staff-notation" + texidoc = "Quotations take into account the transposition of both +source and target. In this example, all instruments play sounding +central C, the target is a instrument in F. The target part may be +@code{\\transpose}d. In this case, all the pitches (including the +quoted ones) will transposed as well." +} +% begin verbatim +\addQuote clarinet { + \transposition bes + d'16 d'16 d'8 + d'16 d'16 d'8 + d'16 d'16 d'8 + d'16 d'16 d'8 +} + +\addQuote sax { + \transposition es' + a8 a a a a a a a +} + +quoteTest = { + \transposition f % french horn + + g'4 + << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> + << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> +} + +<< \quoteTest + \new Staff + << \transpose c' d' \quoteTest + s4_"up 1 tone" + >> +>> diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly new file mode 100644 index 0000000000..b1c54dfb76 --- /dev/null +++ b/input/lsr/quoting-another-voice.ly @@ -0,0 +1,38 @@ +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" +\layout { ragged-right= ##t } +\header { + doctitle = "Quoting another voice" + lsrtags = "staff-notation" + texidoc = "With @code{\\quote}, fragments of previously entered +music may be quoted. @code{quotedEventTypes} will determines what +things are quoted. In this example, a 16th rest is not quoted, since +@code{rest-event} is not in @code{quotedEventTypes}." +} +% begin verbatim +quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } + +\addQuote quoteMe \quoteMe +original = \relative c'' { c8 d s2 es8 gis8 } + +<< + \new Staff { + \set Staff.instrumentName = "quoteMe" + \quoteMe + } + \new Staff { + \set Staff.instrumentName = "orig" + \original + } + \new Staff \relative c'' << + \set Staff.instrumentName = "orig+quote" + \set Staff.quotedEventTypes = #'(note-event articulation-event) + \original + \new Voice { + s4 + \set fontSize = #-4 + \override Stem #'length-fraction = #(magstep -4) + \quoteDuring #"quoteMe" { \skip 2. } + } + >> +>> diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly new file mode 100644 index 0000000000..07c229c151 --- /dev/null +++ b/input/lsr/rest-styles.ly @@ -0,0 +1,41 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: rhythms, ancient-notation, tweaks-and-overrides +\version "2.11.35" + +\header { texidoc = " +Rests may be used in various styles. + + + +" } +% begin verbatim +\layout { + indent = 0.0 + raggedright = ##t +} + +\context Staff \relative c { + \set Score.timing = ##f + \override Staff.Rest #'style = #'mensural + r\maxima^\markup \typewriter { mensural } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'neomensural + r\maxima^\markup \typewriter { neomensural } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'classical + r\maxima^\markup \typewriter { classical } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'default + r\maxima^\markup \typewriter { default } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + +} + + diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 726163f8ca..3e24677492 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: rhythms, editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index 9851075ca9..1ab9eebfb6 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -1,13 +1,17 @@ altering-the-number-of-stems-in-a-beam.ly chant-or-psalms-notation.ly -conducting-signs,-measure-grouping-signs.ly heavily-customized-polymetric-time-signatures.ly +conducting-signs,-measure-grouping-signs.ly +skips-in-lyric-mode-2.ly rhythmic-slashes.ly adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +making-an-object-invisible-with-the-transparent-property.ly automatic-beam-subdivisions.ly controlling-tuplet-bracket-visibility.ly beam-across-line-breaks.ly -adding-drum-parts.ly compound-time-signatures.ly +adding-drum-parts.ly +rest-styles.ly +skips-in-lyric-mode.ly diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly new file mode 100644 index 0000000000..a125a9dd47 --- /dev/null +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -0,0 +1,421 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: template +\version "2.11.35" + +\header { texidoc = " +A template to write score for a diatonic accordion. + +- There is a horizontal staff indicating if the accordion   must be +pushed (thick line) or pulled (thin line) + +- There is a small rhytmic staff with lyrics that describes the bass +buttons to press.   The bar-lines are made of gridlines ( Gridlines, +not a really satisfying solution, but the best I found) + +- The tabulator staff for diatonic accordions shows the geographic +position of the buttons   and not (as for every other instrument) the +pitch of the tones.   The keys on the melody-side of the accordion are +placed in three columns and about 12 rows.   In the tabulator staff +notation the   - most outer column is described with notes between +lines   - most inner column is described with notes between lines with +a cross as accidental   - middle column is described with notes on a +line, whereby the row in the middle is represented     on the middle +line in the staff. + + + +Some words to transpose piano note to the diatonic accordion. +------------------------------------------------------------ 1. Every +diatonic accordion is built for some keys only. For example    for the +key of C-major and F-major.    So it is important to transpose a piano +melody to match one of these keys.    Transpose the source code, not +only the output because    you need this code later on to translate it +once more to the tabulator staff.    This can be done with the command +'displayLilyMusic'. + +2. You have to alternate the push and pull-direction of the accordion +regularely.    If the player has a too long part to pull the accordion +gets broken.    At the other hand some harmonies are only available in +one direction (push or pull)    Considering this decide which parts of +the melody are the push-parts and whic the  pull-parts. + +3. For each pull- / or push-part translate the piano notes to the +according tabulatur representation. + +This snippet comes with a useful optional macro for the jEdit text +editor. +" } +% begin verbatim +% Created on Sat Aug 17 2007 by ak + +verse= \lyricmode { Wie gross bist du! Wie gross bist du! } + +harmonies = \new ChordNames \chordmode { + \germanChords \set chordChanges = ##t + bes8 bes8 bes8 es2 f bes1 +} + +NoStem = \override Stem #'transparent = ##t +NoNoteHead= \override NoteHead #'transparent = ##t +ZeroBeam = \override Beam #'positions = #'(0 . 0) + +staffTabLine = \new Staff \with { \remove "Time_signature_engraver" \remove "Clef_engraver" } { + \override Staff.StaffSymbol #'line-positions = #'( 0 ) +% Shows one horizontal line. The vertical line (simulating a bar-line) is simulated with a gridline + \set Staff.midiInstrument="choir aahs" + \key c \major + \relative c'' + { + % disable the following line to see the the noteheads while writing the song + \NoNoteHead + \override NoteHead #'no-ledgers = ##t + + % The beam between 8th-notes is used to draw the push-line + %How to fast write the push-lines: + % 1. write repeatedly 'c c c c c c c c |' for the whole length of the song + % 2. uncomment the line \NoNoteHead + % 3. compile + % 4. Mark the positions on which push/pull changes. + % In the score-picture click on the position the push- or pull-part starts + % (on the noteHead, the cursor will change to a hand-icon). + % The cursor in the source code will jump just at this position. + % a) If a push-part starts there, replace the 'c' by an 'e[' + % b) If a pull-part starts there, replace the 'c' by an 's' + % 5. Switch into 'overwrite-mode' by pressing the 'ins' key. + % 6. For the pull-parts overwrite the 'c' with 's' + % 7. For every push-part replace the last 'c' with 'e]' + % 8. Switch into 'insert-mode' again + % 9. At last it should look lik e.g. (s s e[ c | c c c c c c c c | c c c c c c e] s s) + % 10. re-enable the line \NoNoteHead + \autoBeamOff + \ZeroBeam + s8 s s | e[ c c c c c c e] | s s s s s + } +} + +%{ +notePush= { e f fis g a c' c' d' ees' e' f' fis' g' a' bes' c'' c'' d'' ees'' e'' f'' fis'' g'' a'' c''' c''' ees''' e''' f''' g''' a''' } +tabPush= { g f e b a d' c' bisis disis' f' e' aisis' a' g' fisis' b' c'' eisis'' cisis'' e'' d'' gisis'' g'' f'' a'' b'' bisis'' d''' c''' f''' e''' } + +notePull= { g aes bes b c' cis' d' ees' e' f' fis' g' aes' a' bes' b' c'' cis'' d'' ees'' e'' f'' g'' aes'' a'' bes'' b'' c''' cis''' d''' e''' } +tabPull= { g e f b a disis' d' bisis c' f' fisis' e' aisis' a' g' c'' b' cisis'' e'' eisis'' d'' g'' f'' gisis'' b'' a'' d''' f''' bisis'' c''' e''' } +%} + +% Accordion melody in tabulator score +% 1. Place a copy of the piano melody below +% 2. Separate piano melody into pull- and push-parts according to the staffTabLine you've already made +% 3. For each line: Double the line. Remark the 1st one (Keeps unchanged as reference) and then change the second line using the transformation paper +% or the macros 'conv2diaton push.bsh' and 'conv2diaton pull.bsh' +% Tips: +% - In jEdit Search & Replace mark the Option 'Keep Dialog' + +AccordionTabTwoCBesDur= { + % pull 1 + %8 8 8 | +8 8 8 | + % push 2 + %4 | +4 | + % pull 3 +% 2 r8 } + 2 r8 } + + AccordionTab= { \dynamicUp +% 1. Place a copy of the piano melody above +% 2. Separate piano melody into pull- and push-parts according to the staffTabLine you've already made +% 3. For each line: Double the line. Remark the 1st one (Keeps unchanged as reference) and then +% change the second line using the transformation paper +% Tips: +% - In jEdit Search & Replace mark the Option 'Keep Dialog' +% - +\AccordionTabTwoCBesDur + } + + + + \layout { + \context { + \Staff + \consists "Grid_point_engraver" + + gridInterval = #(ly:make-moment 4 4) % 4/4 - tact. How many beats per bar + + % The following line has to be adjusted O-F-T-E-N. + \override GridPoint #'Y-extent = #'(-2 . -21) + } + \context { + \ChoirStaff + \remove "System_start_delimiter_engraver" + } +} + +staffVoice = \new Staff=astaffvoice { + \time 4/4 + \set Staff.instrumentName="Voice" + \set Staff.midiInstrument="voice oohs" + \key bes \major + \partial 8*3 + \clef treble + { + \context Voice = "melodyVoi" + { 8 8 8 | 4 | 2 r8 } + \bar "|." + } +} + +staffAccordionMel = \new Staff \with { \remove "Clef_engraver" } { + #(set-accidental-style 'forget) %Set the accidentals (Vorzeichen) for each note, + %do not remember them for the rest of the measure. + \time 4/4 + \set Staff.instrumentName="Accordion" + \set Staff.midiInstrument="voice oohs" + \key c \major + \clef treble + { \AccordionTab \bar "|." } +} + + AltOn = #(define-music-function (parser location mag) (number?) + #{ \override Stem #'length = #$(* 7.0 mag) + \override NoteHead #'font-size = + #$(inexact->exact (* (/ 6.0 (log 2.0)) (log mag))) #}) + + AltOff = { + \revert Stem #'length + \revert NoteHead #'font-size + } + +BassRhytm = {s4 s8 | c2 c2 | c2 s8 } +LyricBassRhythmI= \lyricmode { c b | c } + +staffBassRhytm = \new Staff=staffbass \with { \remove "Clef_engraver" } { + % This is not a RhythmicStaff because it must be possible to append lyrics. + + \override Score.GridLine #'extra-offset = #'( 13.0 . 0.0 ) % x.y + \override Staff.StaffSymbol #'line-positions = #'( 0 ) + % Shows one horizontal line. The vertical line (simulating a bar-line) is simulated by a grid + % Search for 'grid' in this page to find all related functions + \time 4/4 + { + \context Voice = "VoiceBassRhytm" + \stemDown \AltOn #0.6 + \relative c'' + { + \BassRhytm + } + \AltOff + \bar "|." + } +} + +\new Score +\with { + \consists "Grid_line_span_engraver" %The vertical line (simulating a bar-line) in the staffBassRhytm is a gridline +} +\new ChoirStaff + << + \harmonies + \staffVoice + \context Lyrics = "lmelodyVoi" \with {alignBelowContext=astaffvoice} { \lyricsto "melodyVoi" \verse } + \staffAccordionMel + \staffTabLine + \staffBassRhytm + \context Lyrics = "lBassRhytmAboveI" \with {alignAboveContext=staffbass} \lyricsto VoiceBassRhytm \LyricBassRhythmI + >> + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% APPENDIX % +% macro 'macro_conv2diaton_push.bsh' for jedit editor % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%{ +// original saved in 'Handorg_Adria_Diaton_III.xls' +// Save this buffer, to the other recorded macros in the jedit editor +// and the macro should appear in the +// Macros menu. + +// /ak 17.8.07 This macro from converts lilypond piano notation into +// lilypond tabulator notation for the push-part (at the bottom the pull-part) of a diatonic accordion +// It replaces the piano notes of the line where the cursor is by the accordion notation + + + +// Known issues: 1) A note at the end of line is not replaced + +textArea.goToEndOfWhiteSpace(false); +textArea.goToStartOfWhiteSpace(true); + + +String firstName, lastName; + +int ReplaceTextInSelection(String sfind, String sreplace) +{ +//MsgConcat = new StringBuffer(512); +//MsgConcat.append("Ha"); + +//Macros.message(view, "On that line replace \"" + sfind + "\" by \"" + sreplace+ "\""); +SearchAndReplace.setSearchString(sfind.toString()); +SearchAndReplace.setReplaceString(sreplace.toString()); +SearchAndReplace.setBeanShellReplace(false); +SearchAndReplace.setIgnoreCase(true); +SearchAndReplace.replace(view); +SearchAndReplace.setRegexp(true); +return 1; +} + + +String smainfind; +String smainrepl; + + +// Push-part tmp +smainfind="(\\s|^|<|\\{)(c,)([^\'^is^es])"; smainrepl="$1tmpd\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis,)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des,)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d,)([^\'^is^es])"; smainrepl="$1tmpbisis-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis,)([^\'^is^es])"; smainrepl="$1tmpdisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees,)([^\'^is^es])"; smainrepl="$1tmpdisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e,)([^\'^is^es])"; smainrepl="$1tmpg$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f,)([^\'^is^es])"; smainrepl="$1tmpf$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis,)([^\'^is^es])"; smainrepl="$1tmpe$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges,)([^\'^is^es])"; smainrepl="$1tmpe$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g,)([^\'^is^es])"; smainrepl="$1tmpb$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis,)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes,)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a,)([^\'^is^es])"; smainrepl="$1tmpa$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais,)([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes,)([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b,)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(c)([^\'^is^es])"; smainrepl="$1tmpd\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d)([^\'^is^es])"; smainrepl="$1tmpbisis$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis)([^\'^is^es])"; smainrepl="$1tmpdisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees)([^\'^is^es])"; smainrepl="$1tmpdisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e)([^\'^is^es])"; smainrepl="$1tmpf\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f)([^\'^is^es])"; smainrepl="$1tmpe\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis)([^\'^is^es])"; smainrepl="$1tmpaisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges)([^\'^is^es])"; smainrepl="$1tmpaisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g)([^\'^is^es])"; smainrepl="$1tmpa\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a)([^\'^is^es])"; smainrepl="$1tmpg\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais)([^\'^is^es])"; smainrepl="$1tmpfisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes)([^\'^is^es])"; smainrepl="$1tmpfisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b)([^\'^is^es])"; smainrepl="$1tmpr$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(c\')([^\'^is^es])"; smainrepl="$1tmpb\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d\')([^\'^is^es])"; smainrepl="$1tmpeisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis\')([^\'^is^es])"; smainrepl="$1tmpcisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees\')([^\'^is^es])"; smainrepl="$1tmpcisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e\')([^\'^is^es])"; smainrepl="$1tmpe\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f\')([^\'^is^es])"; smainrepl="$1tmpd\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g\')([^\'^is^es])"; smainrepl="$1tmpg\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(as\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a\')([^\'^is^es])"; smainrepl="$1tmpf\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais\')([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes\')([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(c\'\')([^\'^is^es])"; smainrepl="$1tmpa\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d\'\')([^\'^is^es])"; smainrepl="$1tmpeisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis\'\')([^\'^is^es])"; smainrepl="$1tmpbisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees\'\')([^\'^is^es])"; smainrepl="$1tmpbisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e\'\')([^\'^is^es])"; smainrepl="$1tmpd\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f\'\')([^\'^is^es])"; smainrepl="$1tmpc\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis\'\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges\'\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g\'\')([^\'^is^es])"; smainrepl="$1tmpf\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a\'\')([^\'^is^es])"; smainrepl="$1tmpe\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); + +smainfind="(\\s|^|<|\\{)(tmp)()"; smainrepl="$1$3"; ReplaceTextInSelection( smainfind, smainrepl ); +*/ + +/* +// Pull-part tmp +smainfind="(\\s|^|<|\\{)(c,)([^\'^is^es])"; smainrepl="$1tmpa-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis,)([^\'^is^es])"; smainrepl="$1tmpdisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des,)([^\'^is^es])"; smainrepl="$1tmpdisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d,)([^\'^is^es])"; smainrepl="$1tmpd\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis,)([^\'^is^es])"; smainrepl="$1tmpbisis-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees,)([^\'^is^es])"; smainrepl="$1tmpbisis-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e,)([^\'^is^es])"; smainrepl="$1tmpc\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f,)([^\'^is^es])"; smainrepl="$1tmpf\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis,)([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges,)([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g,)([^\'^is^es])"; smainrepl="$1tmpg$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis,)([^\'^is^es])"; smainrepl="$1tmpe$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes,)([^\'^is^es])"; smainrepl="$1tmpe$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a,)([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais,)([^\'^is^es])"; smainrepl="$1tmpf$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes,)([^\'^is^es])"; smainrepl="$1tmpf$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b,)([^\'^is^es])"; smainrepl="$1tmpb$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(c)([^\'^is^es])"; smainrepl="$1tmpa$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis)([^\'^is^es])"; smainrepl="$1tmpdisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des)([^\'^is^es])"; smainrepl="$1tmpdisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d)([^\'^is^es])"; smainrepl="$1tmpd\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis)([^\'^is^es])"; smainrepl="$1tmpbisis$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees)([^\'^is^es])"; smainrepl="$1tmpbisis$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e)([^\'^is^es])"; smainrepl="$1tmpc\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f)([^\'^is^es])"; smainrepl="$1tmpf\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis)([^\'^is^es])"; smainrepl="$1tmpfisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges)([^\'^is^es])"; smainrepl="$1tmpfisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g)([^\'^is^es])"; smainrepl="$1tmpe\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis)([^\'^is^es])"; smainrepl="$1tmpaisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes)([^\'^is^es])"; smainrepl="$1tmpaisis\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a)([^\'^is^es])"; smainrepl="$1tmpa\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais)([^\'^is^es])"; smainrepl="$1tmpg\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes)([^\'^is^es])"; smainrepl="$1tmpg\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b)([^\'^is^es])"; smainrepl="$1tmpc\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(c\')([^\'^is^es])"; smainrepl="$1tmpb\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis\')([^\'^is^es])"; smainrepl="$1tmpcisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des\')([^\'^is^es])"; smainrepl="$1tmpcisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d\')([^\'^is^es])"; smainrepl="$1tmpe\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis\')([^\'^is^es])"; smainrepl="$1tmpeisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees\')([^\'^is^es])"; smainrepl="$1tmpeisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e\')([^\'^is^es])"; smainrepl="$1tmpd\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f\')([^\'^is^es])"; smainrepl="$1tmpg\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis\')([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges\')([^\'^is^es])"; smainrepl="$1tmpfisis\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g\')([^\'^is^es])"; smainrepl="$1tmpf\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a\')([^\'^is^es])"; smainrepl="$1tmpb\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais\')([^\'^is^es])"; smainrepl="$1tmpa\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes\')([^\'^is^es])"; smainrepl="$1tmpa\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b\')([^\'^is^es])"; smainrepl="$1tmpd\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(c\'\')([^\'^is^es])"; smainrepl="$1tmpf\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(cis\'\')([^\'^is^es])"; smainrepl="$1tmpbisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(des\'\')([^\'^is^es])"; smainrepl="$1tmpbisis\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(d\'\')([^\'^is^es])"; smainrepl="$1tmpc\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(dis\'\')([^\'^is^es])"; smainrepl="$1tmpeisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ees\'\')([^\'^is^es])"; smainrepl="$1tmpeisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(e\'\')([^\'^is^es])"; smainrepl="$1tmpe\'\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(f\'\')([^\'^is^es])"; smainrepl="$1tmpg\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(fis\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ges\'\')([^\'^is^es])"; smainrepl="$1tmpr-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(g\'\')([^\'^is^es])"; smainrepl="$1tmpf\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(gis\'\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(aes\'\')([^\'^is^es])"; smainrepl="$1tmpgisis\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(a\'\')([^\'^is^es])"; smainrepl="$1tmpb\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(ais\'\')([^\'^is^es])"; smainrepl="$1tmpa\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(bes\'\')([^\'^is^es])"; smainrepl="$1tmpa\'\'$3"; ReplaceTextInSelection( smainfind, smainrepl ); +smainfind="(\\s|^|<|\\{)(b\'\')([^\'^is^es])"; smainrepl="$1tmpd\'\'\'-.$3"; ReplaceTextInSelection( smainfind, smainrepl ); + +smainfind="(\\s|^|<|\\{)(tmp)()"; smainrepl="$1$3"; ReplaceTextInSelection( smainfind, smainrepl ); +*/ + + +%} + diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly new file mode 100644 index 0000000000..842a9ccd6a --- /dev/null +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -0,0 +1,42 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: vocal-music, chords, template +\version "2.11.35" + +\header { texidoc = " +This template allows you to prepare a song with melody, words, and +chords. +" } +% begin verbatim +melody = \relative c' { + \clef treble + \key c \major + \time 4/4 + + a b c d + } + + text = \lyricmode { + Aaa Bee Cee Dee + } + + harmonies = \chordmode { + a2 c2 + } + + \score { + << + \new ChordNames { + \set chordChanges = ##t + \harmonies + } + \new Voice = "one" { + \autoBeamOff + \melody + } + \new Lyrics \lyricsto "one" \text + >> + \layout { } + \midi { } + } + diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly new file mode 100644 index 0000000000..b2461661bd --- /dev/null +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -0,0 +1,36 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: chords, template +\version "2.11.35" + +\header { texidoc = " +Want to prepare a lead sheet with a melody and chords? Look no further! + +" } +% begin verbatim +melody = \relative c' { + \clef treble + \key c \major + \time 4/4 + + f4 e8[ c] d4 g | + a2 ~ a2 | + } + + harmonies = \chordmode { + c4:m f:min7 g:maj c:aug d2:dim b:sus + } + + \score { + << + \new ChordNames { + \set chordChanges = ##t + \harmonies + } + \new Staff \melody + >> + + \layout{ } + \midi { } + } + diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly new file mode 100644 index 0000000000..a2f7d6e46c --- /dev/null +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.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. +%% Tags: vocal-music, template +\version "2.11.35" + +\header { texidoc = " +This small template demonstrates a simple melody with lyrics. Cut and +paste, add notes, then words for the lyrics. This example turns off +automatic beaming, which is common for vocal parts. If you want to use +automatic beaming, you'll have to change or comment out the relevant +line. +" } +% begin verbatim +melody = \relative c' { + \clef treble + \key c \major + \time 4/4 + + a4 b c d + } + + text = \lyricmode { + Aaa Bee Cee Dee + } + + \score{ + << + \new Voice = "one" { + \autoBeamOff + \melody + } + \new Lyrics \lyricsto "one" \text + >> + \layout { } + \midi { } + } + diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly new file mode 100644 index 0000000000..97c5382489 --- /dev/null +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -0,0 +1,25 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: template +\version "2.11.35" + +\header { texidoc = " +This very simple template gives you a staff with notes, suitable for a +solo instrument or a melodic fragment. Cut and paste this into a file, +add notes, and you're finished! +" } +% begin verbatim +melody = \relative c' { + \clef treble + \key c \major + \time 4/4 + + a4 b c d + } + + \score { + \new Staff \melody + \layout { } + \midi {} + } + diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly new file mode 100644 index 0000000000..ef20dd442e --- /dev/null +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -0,0 +1,18 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: rhythms, vocal-music +\version "2.11.35" + +\header { texidoc = " +Although you can't use `s' in lyric mode (it's taken to be a literal s, +not a space) you can use either \"\" or _. + +So for example: +" } +% begin verbatim +<< + \relative c'' { a4 b c d } + \new Lyrics \lyricmode { a4 _2 gap4 } +>> + + diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly new file mode 100644 index 0000000000..415e0ae346 --- /dev/null +++ b/input/lsr/skips-in-lyric-mode.ly @@ -0,0 +1,15 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: rhythms, vocal-music +\version "2.11.35" + +\header { texidoc = " +The s syntax is only available in note mode and chord mode. In other +situations, for example, when entering lyrics, you should use the +\\skip command. +" } +% begin verbatim +<< + \relative { a'2 a1 } + \new Lyrics \lyricmode { \skip 2 bla1 } +>> diff --git a/input/lsr/spacing.snippet-list b/input/lsr/spacing.snippet-list index 1e126856ec..a0d5352384 100644 --- a/input/lsr/spacing.snippet-list +++ b/input/lsr/spacing.snippet-list @@ -2,3 +2,4 @@ alignment-vertical-spacing.ly vertically-aligning-ossias-and-lyrics.ly page-label.ly adjusting-lyrics-vertical-spacing.ly +proportional-strict-notespacing.ly diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index d3eb9091aa..078dde22be 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -1,9 +1,13 @@ creating-blank-staves.ly adding-and-extra-staff-at-a-line-break.ly changing-the-number-of-lines-in-a-staff.ly -inserting-score-fragments-above-the-staff,-as-markups.ly +time-signature-in-parentheses.ly adding-an-extra-staff.ly changing-the-staff-size.ly +quoting-another-voice-with-transposition.ly adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly +quoting-another-voice.ly +volta-multi-staff.ly +inserting-score-fragments-above-the-staff,-as-markups.ly non-traditional-key-signatures.ly diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly new file mode 100644 index 0000000000..44f861298e --- /dev/null +++ b/input/lsr/string-quartet-template-simple.ly @@ -0,0 +1,53 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: strings, template +\version "2.11.35" + +\header { texidoc = " +This template demonstrates a simple string quartet. It also uses a +\\global section for time and key signatures +" } +% begin verbatim +global= { + \time 4/4 + \key c \major + } + + violinOne = \new Voice { \relative c''{ + \set Staff.instrumentName = "Violin 1 " + + c2 d e1 + + \bar "|." }} + violinTwo = \new Voice { \relative c''{ + \set Staff.instrumentName = "Violin 2 " + + g2 f e1 + + \bar "|." }} + viola = \new Voice { \relative c' { + \set Staff.instrumentName = "Viola " + \clef alto + + e2 d c1 + + \bar "|." }} + cello = \new Voice { \relative c' { + \set Staff.instrumentName = "Cello " + \clef bass + + c2 b a1 + + \bar "|."}} + + \score { + \new StaffGroup << + \new Staff << \global \violinOne >> + \new Staff << \global \violinTwo >> + \new Staff << \global \viola >> + \new Staff << \global \cello >> + >> + \layout { } + \midi { } + } + diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly new file mode 100644 index 0000000000..459140db50 --- /dev/null +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -0,0 +1,121 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: strings, template +\version "2.11.35" + +\header { texidoc = " +The \"String quartet template\" snippet produces a nice string quartet, +but what if you needed to print parts? This new template demonstrates +how to use the \\tag feature to easily split a piece into individual +parts. + +You need to split this template into separate files; the filenames are +contained in comments at the beginning of each file. piece.ly contains +all the music definitions. The other files – score.ly, vn1.ly, vn2.ly, +vla.ly, and vlc.ly – produce the appropiate part. + + +Do not forget to remove specified comments when using separate files! +" } +% begin verbatim +%%%%% piece.ly +%%%%% (This is the global definitions file) + +global= { + \time 4/4 + \key c \major +} + +Violinone = \new Voice { \relative c''{ + \set Staff.instrumentName = "Violin 1 " + + c2 d e1 + +\bar "|." }} %********************************* +Violintwo = \new Voice { \relative c''{ + \set Staff.instrumentName = "Violin 2 " + + g2 f e1 + +\bar "|." }} %********************************* +Viola = \new Voice { \relative c' { + \set Staff.instrumentName = "Viola " + \clef alto + + e2 d c1 + +\bar "|." }} %********************************* +Cello = \new Voice { \relative c' { + \set Staff.instrumentName = "Cello " + \clef bass + + c2 b a1 + +\bar "|."}} %********************************** + +music = { + << + \tag #'score \tag #'vn1 \new Staff { << \global \Violinone >> } + \tag #'score \tag #'vn2 \new Staff { << \global \Violintwo>> } + \tag #'score \tag #'vla \new Staff { << \global \Viola>> } + \tag #'score \tag #'vlc \new Staff { << \global \Cello>> } + >> +} + +%%% These are the other files you need to save on your computer + +%%%%% score.ly +%%%%% (This is the main file) + + +%\include "piece.ly" %%% uncomment this line when using a separate file +#(set-global-staff-size 14) +\score { + \new StaffGroup \keepWithTag #'score \music + \layout { } + \midi { } +} + + +%{ Uncomment this block when using separate files + +%%%%% vn1.ly +%%%%% (This is the Violin 1 part file) + +\include "piece.ly" +\score { + \keepWithTag #'vn1 \music + \layout { } +} + + +%%%%% vn2.ly +%%%%% (This is the Violin 2 part file) + +\include "piece.ly" +\score { + \keepWithTag #'vn2 \music + \layout { } +} + + +%%%%% vla.ly +%%%%% (This is the Viola part file) + +\include "piece.ly" +\score { + \keepWithTag #'vla \music + \layout { } +} + + +%%%%% vlc.ly +%%%%% (This is the Cello part file) + +\include "piece.ly" +\score { + \keepWithTag #'vlc \music + \layout { } +} + +%} diff --git a/input/lsr/strings.snippet-list b/input/lsr/strings.snippet-list index 8eab597a2a..a0795b5bcf 100644 --- a/input/lsr/strings.snippet-list +++ b/input/lsr/strings.snippet-list @@ -1 +1,3 @@ +string-quartet-template-simple.ly +string-quartet-template-with-separate-parts.ly demo-midiinstruments.ly diff --git a/input/lsr/toc.ly b/input/lsr/table-of-contents.ly similarity index 68% rename from input/lsr/toc.ly rename to input/lsr/table-of-contents.ly index a49a6e76d6..74142e0da3 100644 --- a/input/lsr/toc.ly +++ b/input/lsr/table-of-contents.ly @@ -1,10 +1,11 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: paper-and-layout +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - +\layout { ragged-right= ##t } \header { + doctitle = "Table of contents" + lsrtags = "paper-and-layout" texidoc = "A table of contents is included using -@code{\\markuplines \\table-of-contents}. The toc items are added with +@code{\\markuplines \\table-of-contents}. The TOC items are added with the @code{\\tocItem} command." } % begin verbatim diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list new file mode 100644 index 0000000000..59b06c6130 --- /dev/null +++ b/input/lsr/template.snippet-list @@ -0,0 +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 +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 +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 +vocal-ensemble-template.ly +vocal-ensemble-template-with-automatic-piano-reduction.ly diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list index f14c2dfc89..113ffc5358 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -1,12 +1,16 @@ combining-dynamics-with-markup-texts.ly creating-text-spanners.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly center-text-below-hairpin-dynamics.ly -markup-lines.ly +piano-template-with-centered-lyrics.ly demonstrating-all-headers.ly changing-the-default-text-font-family.ly how-to-put-ties-between-syllables-in-lyrics.ly aligning-and-centering-instrument-names.ly +utf-8.ly +outputting-the-version-number.ly blanking-staff-lines-using-the--whiteout-command.ly combining-two-parts-on-the-same-staff.ly +markup-lines.ly adjusting-lyrics-vertical-spacing.ly aligning-lyrics.ly diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly new file mode 100644 index 0000000000..1617683966 --- /dev/null +++ b/input/lsr/three-sided-box.ly @@ -0,0 +1,47 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: editorial-and-educational-use +\version "2.11.35" + +\header { texidoc = " +This example shows how to add a markup command to get a three sided box +around some text (or other markup). +" } +% begin verbatim +% New command to add a three sided box, with sides north, west and south +% Based on the box-stencil command defined in scm/stencil.scm +% Note that you use ";" to comment a line in Scheme +#(define-public (NWS-box-stencil stencil thickness padding) + "Add a box around STENCIL, producing a new stencil." + (let* ((x-ext (interval-widen (ly:stencil-extent stencil 0) padding)) + (y-ext (interval-widen (ly:stencil-extent stencil 1) padding)) + (y-rule (make-filled-box-stencil (cons 0 thickness) y-ext)) + (x-rule (make-filled-box-stencil + (interval-widen x-ext thickness) (cons 0 thickness)))) +; (set! stencil (ly:stencil-combine-at-edge stencil X 1 y-rule padding)) + (set! stencil (ly:stencil-combine-at-edge stencil X -1 y-rule padding)) + (set! stencil (ly:stencil-combine-at-edge stencil Y 1 x-rule 0.0)) + (set! stencil (ly:stencil-combine-at-edge stencil Y -1 x-rule 0.0)) + stencil)) + +% The corresponding markup command, based on the \box command defined +% in scm/define-markup-commands.scm +#(define-markup-command (NWS-box layout props arg) (markup?) + "Draw a box round @var{arg}. Looks at @code{thickness}, +@code{box-padding} and @code{font-size} properties to determine line +thickness and padding around the markup." + + (let* ((th (chain-assoc-get 'thickness props 0.1)) + (size (chain-assoc-get 'font-size props 0)) + (pad (* (magstep size) + (chain-assoc-get 'box-padding props 0.2))) + (m (interpret-markup layout props arg))) + (NWS-box-stencil m th pad))) + + +% Test it: + +\relative c'{ + c^\markup{ \NWS-box ABCD } + c^\markup{\NWS-box \note #"4" #1.0 } +} diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly new file mode 100644 index 0000000000..cabd90c3fe --- /dev/null +++ b/input/lsr/time-signature-in-parentheses.ly @@ -0,0 +1,33 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: staff-notation, tweaks-and-overrides +\version "2.11.35" + +\header { texidoc = " +You may put the time signature in parentheses. +" } +% begin verbatim +tsMarkup = \markup { + \number { + \bracket \column { "2" "4" } + } +} + +\score { + \relative c'' { + +% FIXME: Gee, it doesn't work with 2.10 -vv + +%{ + + \override Staff.TimeSignature #'print-function = #Text_interface::print + \override Staff.TimeSignature #'text = #tsMarkup + +%} + + \time 2/4 + + a4 b8 c | + } +} + diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly new file mode 100644 index 0000000000..f413f8d6d5 --- /dev/null +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -0,0 +1,274 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: ancient-notation, tweaks-and-overrides +\version "2.11.35" + +\header { texidoc = " +As a workaround to get real incipits which are independent from the +main score these are included as a markup into the field normally used +for the instrument name. As for now lyrics can only be added as a +direct markup. It doesn't unfortunately conform with the spacing of the +main lyrics. +" } +% begin verbatim +global = { + \set Score.skipBars = ##t + \key g \major + \time 4/4 + + %make the staff lines invisible on staves + \override Staff.BarLine #'transparent = ##t + \skip 1*8 % the actual music + + % let finis bar go through all staves + \override Staff.BarLine #'transparent = ##f + + % finis bar + \bar "|." +} + + +discantusNotes = { + \transpose c' c'' { + \clef "treble" + d'2. d'4 | + b e' d'2 | + c'4 e'4.( d'8 c' b | + a4) b a2 | + b4.( c'8 d'4) c'4 | + \once \override NoteHead #'transparent = ##t c'1 | + b\breve | + } +} + +discantusLyrics = \lyricmode { + Ju -- bi -- | + la -- te De -- | + o, om -- + nis ter -- | + ra, __ om- | + "..." | + -us. | +} + +altusNotes = { + \transpose c' c'' { + \clef "treble" + r2 g2. e4 fis g | % two bars + a2 g4 e | + fis g4.( fis16 e fis4) | + g1 | + \once \override NoteHead #'transparent = ##t g1 | + g\breve | + } +} + +altusLyrics = \lyricmode { + Ju -- bi -- la -- te | % two bars + De -- o, om -- | + nis ter -- ra, | + "..." | + -us. | +} + +tenorNotes = { + \transpose c' c' { + \clef "treble_8" + R1 | + R1 | + R1 | + r2 d'2. d'4 b e' | % two bars + \once \override NoteHead #'transparent = ##t e'1 | + d'\breve | + } +} + +tenorLyrics = \lyricmode { + Ju -- bi -- la -- te | % two bars + "..." | + -us. +} + +bassusNotes = { + \transpose c' c' { + \clef "bass" + R1 | + R1 | + R1 | + R1 | + g2. e4 | + \once \override NoteHead #'transparent = ##t e1 | + g\breve | + } +} + +bassusLyrics = \lyricmode { + Ju -- bi- | + "..." | + -us. +} + +incipitDiscantus = \markup{ + \score{ + { + \set Staff.instrumentName="Discantus " + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural + \override Staff.TimeSignature #'style = #'neomensural + \cadenzaOn + \clef "neomensural-c1" + \key f \major + \time 2/2 + c''1._"IV-" s2 %two bars + \skip 1*8 % eight bars + } + \layout { + \context {\Voice + \remove Ligature_bracket_engraver + \consists Mensural_ligature_engraver + } + line-width=4.5\cm + } + } +} + +incipitAltus = \markup{ + \score{ + { + \set Staff.instrumentName="Altus " + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural + \override Staff.TimeSignature #'style = #'neomensural + \cadenzaOn + \clef "neomensural-c3" + \key f \major + \time 2/2 + r1 % one bar + f'1._"IV-" s2 % two bars + \skip 1*7 % seven bars + } + \layout { + \context {\Voice + \remove Ligature_bracket_engraver + \consists Mensural_ligature_engraver + } + line-width=4.5\cm + } + } +} + +incipitTenor = \markup{ + \score{ { + \set Staff.instrumentName = "Tenor " + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural + \override Staff.TimeSignature #'style = #'neomensural + \cadenzaOn + \clef "neomensural-c4" + \key f \major + \time 2/2 + r\longa % four bars + r\breve % two bars + r1 % one bar + c'1._"IV-" s2 % two bars + \skip 1 % one bar + } + \layout { + \context {\Voice + \remove Ligature_bracket_engraver + \consists Mensural_ligature_engraver + } + line-width=4.5\cm +} +} +} + +incipitBassus = \markup{ + \score{ { + \set Staff.instrumentName = "Bassus " + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural + \override Staff.TimeSignature #'style = #'neomensural + \cadenzaOn + \clef "bass" + \key f \major + \time 2/2 + % incipit + r\maxima % eight bars + f1._"IV-" s2 % two bars + } + \layout { + \context {\Voice + \remove Ligature_bracket_engraver + \consists Mensural_ligature_engraver + } + line-width=4.5\cm + } + } +} + +%StaffGroup is used instead of ChoirStaff to get bar lines between systems +\score { + << + \new StaffGroup = choirStaff << + \new Voice = + "discantusNotes" << \global + \set Staff.instrumentName=\incipitDiscantus + \discantusNotes >> + \new Lyrics = + "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } + + \new Voice = + "altusNotes" << \global + \set Staff.instrumentName=\incipitAltus + \altusNotes >> + \new Lyrics = + "altusLyrics" \lyricsto altusNotes { \altusLyrics } + + \new Voice = + "tenorNotes" << \global + \set Staff.instrumentName=\incipitTenor + \tenorNotes >> + \new Lyrics = + "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics } + + \new Voice = + "bassusNotes" << \global + \set Staff.instrumentName=\incipitBassus + \bassusNotes >> + >> + \new Lyrics = + "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } + %Keep the bass lyrics outside of the staff group to avoid bar lines + %between the lyrics. + >> + + \layout { + \context { + \Score + + % no bars in staves + \override BarLine #'transparent = ##t + } + % the next three instructions keep the lyrics between the barlines + \context { \Lyrics + \consists "Bar_engraver" + \override BarLine #'transparent = ##t } + \context { \StaffGroup \consists "Separating_line_group_engraver" } + \context { + \Voice + + % no slurs + \override Slur #'transparent = ##t + + % Comment in the below "\remove" command to allow line + % breaking also at those barlines where a note overlaps + % into the next bar. The command is commented out in this + % short example score, but especially for large scores, you + % will typically yield better line breaking and thus improve + % overall spacing if you comment in the following command. + %\remove "Forbid_line_break_engraver" + } + indent=5\cm + } +} diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 018e5f7f22..69d3e3af7a 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: pitches \version "2.11.35" diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index ef4f8126f9..74d3f91bd0 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,14 +1,23 @@ -creating-text-spanners.ly altering-the-number-of-stems-in-a-beam.ly +time-signature-in-parentheses.ly +changing-the-default-text-font-family.ly +proportional-strict-notespacing.ly +making-an-object-invisible-with-the-transparent-property.ly +transcription-of-ancient-music-with-incipit.ly +alignment-vertical-spacing.ly +custodes.ly +drawing-boxes-around-grobs.ly +move-specific-text.ly +drawing-circles-around-various-objects.ly +rest-styles.ly +creating-text-spanners.ly +using-the--tweak-command-to-tweak-individual-grobs.ly controlling-tuplet-bracket-visibility.ly caesura-railtracks-with-fermata.ly -coloring-objects.ly rhythmic-slashes.ly changing-the-staff-size.ly -changing-the-default-text-font-family.ly -vertically-aligning-ossias-and-lyrics.ly +coloring-objects.ly clefs-commonly-tweaked-properties.ly -custodes.ly -alignment-vertical-spacing.ly +vertically-aligning-ossias-and-lyrics.ly changing-an-individual-notes-size-in-a-chord.ly changing-properties-for-individual-grobs.ly diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index 8afe1490f9..0180753295 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,18 +1,15 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: other +%% Do not edit this file; it is auto-generated from input/new \version "2.11.35" - -\header { texidoc = " +\layout { ragged-right= ##t } +\header { + doctitle = "Using the @code{\tweak} command to tweak individual grobs" + lsrtags = "tweaks-and-overrides" + texidoc = " With the @code{\tweak} command, you can tune every grob directly. Here are some examples of available tweaks. - - -" } -% begin verbatim -\paper { - ragged-right = ##t +" } - +% begin verbatim { \set fingeringOrientations = #'(right) < diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly new file mode 100644 index 0000000000..292d1614e1 --- /dev/null +++ b/input/lsr/utf-8.ly @@ -0,0 +1,67 @@ +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.35" + +%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs + +%{ + +You may have to install additional fonts. + +Red Hat Fedora + + taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ + ttfonts-zh_CN fonts-ja fonts-hebrew + +Debian GNU/Linux + + apt-get install emacs-intl-fonts xfonts-intl-.* \ + ttf-kochi-gothic ttf-kochi-mincho \ + xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi +%} + +\header { + doctitle = "UTF-8" + lsrtags = "text" + texidoc = "Various scripts may be used for texts (like titles and +lyrics) introduced by entering them in UTF-8 encoding, and using a +Pango based backend. Depending on the fonts installed, this fragment +will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. + +" + +} +% begin verbatim +% end verbatim - this comment is a hack to prevent texinfo.tex +% from choking on non-European UTF-8 subsets +% Cyrillic font +bulgarian = \lyricmode { + Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. +} + +hebrew = \lyricmode { + זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. +} + +japanese = \lyricmode { + いろはにほへど ちりぬるを + わがよたれぞ つねならむ + うゐのおくや まけふこえて + あさきゆめみじ ゑひもせず +} + +% "a legal song to you" +portuguese = \lyricmode { + à vo -- cê uma can -- ção legal +} + +\paper { + ragged-right = ##t +} + +\relative { + c2 d e f g f e +} +\addlyrics { \bulgarian } +\addlyrics { \hebrew } +\addlyrics { \japanese } +\addlyrics { \portuguese } diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index df6b9d1875..b3f5caca99 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. %% Tags: vocal-music, tweaks-and-overrides, spacing \version "2.11.35" diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly new file mode 100644 index 0000000000..18f609701f --- /dev/null +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -0,0 +1,99 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: vocal-music, piano-music, template +\version "2.11.35" + +\header { texidoc = " +This template adds an automatic piano reduction to the standard SATB +vocal score demonstrated in \"Vocal ensemble template\". This +demonstrates one of the strengths of LilyPond – you can use a music +definition more than once. If you make any changes to the vocal notes +(say, tenorMusic), then the changes will also apply to the piano +reduction. +" } +% begin verbatim +global = { + \key c \major + \time 4/4 + } + + sopMusic = \relative c'' { + c4 c c8[( b)] c4 + } + sopWords = \lyricmode { + hi hi hi hi + } + + altoMusic = \relative c' { + e4 f d e + } + altoWords =\lyricmode { + ha ha ha ha + } + + tenorMusic = \relative c' { + g4 a f g + } + tenorWords = \lyricmode { + hu hu hu hu + } + + bassMusic = \relative c { + c4 c g c + } + bassWords = \lyricmode { + ho ho ho ho + } + + \score { + << + \new ChoirStaff << + \new Lyrics = sopranos { s1 } + \new Staff = women << + \new Voice = + "sopranos" { \voiceOne << \global \sopMusic >> } + \new Voice = + "altos" { \voiceTwo << \global \altoMusic >> } + >> + \new Lyrics = "altos" { s1 } + \new Lyrics = "tenors" { s1 } + \new Staff = men << + \clef bass + \new Voice = + "tenors" { \voiceOne <<\global \tenorMusic >> } + \new Voice = + "basses" { \voiceTwo <<\global \bassMusic >> } + >> + \new Lyrics = basses { s1 } + + \context Lyrics = sopranos \lyricsto sopranos \sopWords + \context Lyrics = altos \lyricsto altos \altoWords + \context Lyrics = tenors \lyricsto tenors \tenorWords + \context Lyrics = basses \lyricsto basses \bassWords + >> + \new PianoStaff << + \new Staff << + \set Staff.printPartCombineTexts = ##f + \partcombine + << \global \sopMusic >> + << \global \altoMusic >> + >> + \new Staff << + \clef bass + \set Staff.printPartCombineTexts = ##f + \partcombine + << \global \tenorMusic >> + << \global \bassMusic >> + >> + >> + >> + \layout { + \context { + % a little smaller so lyrics + % can be closer to the staff + \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) + } + } + } + diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly new file mode 100644 index 0000000000..2a62265f0f --- /dev/null +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -0,0 +1,117 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: text, vocal-music, contexts-and-engravers, template +\version "2.11.35" + +\header { texidoc = " +This template is basically the same as the simple \"Vocal ensemble\" +template, with the exception that here all the lyrics lines are placed +using alignAboveContext and alignBelowContext. +" } +% begin verbatim +global = { + \key c \major + \time 4/4 + } + + sopMusic = \relative c'' { + c4 c c8[( b)] c4 + } + sopWords = \lyricmode { + hi hi hi hi + } + + altoMusic = \relative c' { + e4 f d e + } + altoWords =\lyricmode { + ha ha ha ha + } + + tenorMusic = \relative c' { + g4 a f g + } + tenorWords = \lyricmode { + hu hu hu hu + } + + bassMusic = \relative c { + c4 c g c + } + bassWords = \lyricmode { + ho ho ho ho + } + + \score { + \new ChoirStaff << + \new Staff = women << + \new Voice = + "sopranos" { \voiceOne << \global \sopMusic >> } + \new Voice = + "altos" { \voiceTwo << \global \altoMusic >> } + >> + \new Lyrics \with {alignAboveContext=women} \lyricsto sopranos \sopWords + \new Lyrics \with {alignBelowContext=women} \lyricsto altos \altoWords + % we could remove the line about this with the line below, since we want + % the alto lyrics to be below the alto Voice anyway. + % \new Lyrics \lyricsto altos \altoWords + + \new Staff = men << + \clef bass + \new Voice = + "tenors" { \voiceOne <<\global \tenorMusic >> } + \new Voice = + "basses" { \voiceTwo <<\global \bassMusic >> } + >> + + \new Lyrics \with {alignAboveContext=men} \lyricsto tenors \tenorWords + \new Lyrics \with {alignBelowContext=men} \lyricsto basses \bassWords + % again, we could replace the line above this with the line below. + % \new Lyrics \lyricsto basses \bassWords + >> + + \layout { + \context { + % a little smaller so lyrics + % can be closer to the staff + \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) + } + } + } + + + \score { + \new ChoirStaff << + \new Staff = women << + \new Voice = + "sopranos" { \voiceOne << \global \sopMusic >> } + \new Voice = + "altos" { \voiceTwo << \global \altoMusic >> } + >> + + \new Lyrics \with {alignAboveContext=women} \lyricsto sopranos \sopWords + \new Lyrics \lyricsto altos \altoWords + + \new Staff = men << + \clef bass + \new Voice = + "tenors" { \voiceOne <<\global \tenorMusic >> } + \new Voice = + "basses" { \voiceTwo <<\global \bassMusic >> } + >> + + \new Lyrics \with {alignAboveContext=men} \lyricsto tenors \tenorWords + \new Lyrics \lyricsto basses \bassWords + >> + + \layout { + \context { + % a little smaller so lyrics + % can be closer to the staff + \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) + } + } + } + diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly new file mode 100644 index 0000000000..ad31da0ff5 --- /dev/null +++ b/input/lsr/vocal-ensemble-template.ly @@ -0,0 +1,82 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +%% Tags: vocal-music, template +\version "2.11.35" + +\header { texidoc = " +Here is a standard four-part SATB vocal score. With larger ensembles, +it's often useful to include a section which is included in all parts. +For example, the time signature and key signatures are almost always +the same for all parts. Like in the \"Hymn\" template, the four voices +are regrouped on only two staves. +" } +% begin verbatim +global = { + \key c \major + \time 4/4 + } + + sopMusic = \relative c'' { + c4 c c8[( b)] c4 + } + sopWords = \lyricmode { + hi hi hi hi + } + + altoMusic = \relative c' { + e4 f d e + } + altoWords =\lyricmode { + ha ha ha ha + } + + tenorMusic = \relative c' { + g4 a f g + } + tenorWords = \lyricmode { + hu hu hu hu + } + + bassMusic = \relative c { + c4 c g c + } + bassWords = \lyricmode { + ho ho ho ho + } + + \score { + \new ChoirStaff << + \new Lyrics = sopranos { s1 } + \new Staff = women << + \new Voice = + "sopranos" { \voiceOne << \global \sopMusic >> } + \new Voice = + "altos" { \voiceTwo << \global \altoMusic >> } + >> + \new Lyrics = "altos" { s1 } + \new Lyrics = "tenors" { s1 } + \new Staff = men << + \clef bass + \new Voice = + "tenors" { \voiceOne <<\global \tenorMusic >> } + \new Voice = + "basses" { \voiceTwo <<\global \bassMusic >> } + >> + \new Lyrics = basses { s1 } + + \context Lyrics = sopranos \lyricsto sopranos \sopWords + \context Lyrics = altos \lyricsto altos \altoWords + \context Lyrics = tenors \lyricsto tenors \tenorWords + \context Lyrics = basses \lyricsto basses \bassWords + >> + + \layout { + \context { + % a little smaller so lyrics + % can be closer to the staff + \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) + } + } + } + diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index 7ee9a8209f..0e62dde99d 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -1,7 +1,15 @@ chant-or-psalms-notation.ly +single-staff-template-with-notes-and-lyrics.ly +skips-in-lyric-mode-2.ly +vocal-ensemble-template-with-automatic-piano-reduction.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly how-to-put-ties-between-syllables-in-lyrics.ly adding-ambiti-per-voice.ly -vertically-aligning-ossias-and-lyrics.ly +piano-template-with-melody-and-lyrics.ly +single-staff-template-with-notes,-lyrics,-and-chords.ly demo-midiinstruments.ly -adjusting-lyrics-vertical-spacing.ly +vertically-aligning-ossias-and-lyrics.ly aligning-lyrics.ly +vocal-ensemble-template.ly +adjusting-lyrics-vertical-spacing.ly +skips-in-lyric-mode.ly diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index c1ca05f279..ebf8bf3aee 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,17 +1,18 @@ -%% Do not edit this file; it is auto-generated from LSR! -%% Tags: pitches, repeats +%% Do not edit this file; it is auto-generated from input/new +\version "2.11.36" +\layout { ragged-right= ##t } \header { + doctitle = "Volta multi-staff" + lsrtags = "repeats,staff-notation" texidoc = "By adding @code{Volta_engraver}, repeat brackets - can be put over staves other than the topmost one in a score." +can be put over staves other than the topmost one in a score." } % begin verbatim -\version "2.11.36" - -vmus = { +vmus = \relative c'' { \repeat volta 2 c1 \alternative { d e } } -\relative c'' << +<< \new StaffGroup << \context Staff \vmus \new Staff \vmus -- 2.39.2