From: Graham Percival Date: Sat, 1 Dec 2007 06:42:15 +0000 (-0800) Subject: LSR: automatic update. (setting up NR 2) X-Git-Tag: release/2.11.36-1~47 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c9de870087706b3aac339ca8bec31295c846ea14;p=lilypond.git LSR: automatic update. (setting up NR 2) --- diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index d2c63f1692..2da2280e55 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -8,6 +8,10 @@ dirs = [] # NR 1 dirs.extend(['pitches', 'rhythms', 'expressive', 'repeats', 'simultaneous', 'staff', 'editorial', 'text']) +# NR 2 +dirs.extend(['vocal', 'chords', 'piano', +'percussion', 'guitar', 'strings', 'bagpipes', 'ancient']) + # diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index a3e8a73f38..a6291b915c 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -2,24 +2,20 @@ depth = ../../ # NR 1 SUBDIRS = pitches rhythms expressive repeats simultaneous staff editorial text +# NR 2 +SUBDIRS += vocal chords piano percussion guitar strings bagpipes ancient -SUBDIRS += real-music +SUBDIRS += other ### FIXME: temporary template for creating other dirs. ### will be removed once everything else is stable. SUBDIRS += null -# old stuffs -SUBDIRS += ancient chords connecting contemporary education expressive -SUBDIRS += guitar parts repeats spacing staff text vocal scheme other -SUBDIRS += engravers nonmusic instrument - STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc EXTRA_DIST_FILES=README include $(depth)/make/stepmake.make - TITLE=LilyPond Examples diff --git a/input/lsr/ancient/AAA-intro.ly b/input/lsr/ancient/AAA-intro.ly index 4997892c3c..9a05820556 100644 --- a/input/lsr/ancient/AAA-intro.ly +++ b/input/lsr/ancient/AAA-intro.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.0" \header{ texidoc = " diff --git a/input/lsr/ancient/GNUmakefile b/input/lsr/ancient/GNUmakefile index 3819fda13a..a3f0b2bfde 100644 --- a/input/lsr/ancient/GNUmakefile +++ b/input/lsr/ancient/GNUmakefile @@ -1,15 +1,12 @@ + depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - EXTRA_DIST_FILES= include $(depth)/make/stepmake.make -TITLE=Advanced snippets +TITLE=Sample snippets from LSR + diff --git a/input/lsr/ancient/SConscript b/input/lsr/ancient/SConscript index f72bfffc28..cb39d4eab0 100644 --- a/input/lsr/ancient/SConscript +++ b/input/lsr/ancient/SConscript @@ -1,4 +1,5 @@ # -*-python-*- Import ('env', 'collate') -collate (title = 'Advanced snippets') +collate (title = 'Sample snippets from LSR') + diff --git a/input/lsr/ancient/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/ancient/adding-a-figured-bass-above-or-below-the-notes.ly index acb771e151..8da9162ff7 100644 --- a/input/lsr/ancient/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/ancient/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.12" \header { texidoc = " When writing a figured bass, here's a way to specify if you want your @@ -9,7 +9,7 @@ Staff context). Choices are #UP (or #1), #CENTER (or #0) and #DOWN (or #-1). As you can see here, this property can be changed as many times as you -wish. Use \once \override if you dont want the tweak to apply to the +wish. Use \\once \\override if you dont want the tweak to apply to the whole score. " } diff --git a/input/lsr/ancient/ancient-accidentals.ly b/input/lsr/ancient/ancient-accidentals.ly deleted file mode 100644 index 7f046dedc4..0000000000 --- a/input/lsr/ancient/ancient-accidentals.ly +++ /dev/null @@ -1,24 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Accidentals are available in different ancient styles, which all are -collected here. - - -" } - -\relative c'' { - \time 5/4 - \override Staff.Accidental #'glyph-name-alist = #standard-alteration-glyph-name-alist - cisis^\markup { \typewriter default } cis c ces ceses - \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist - cisis^\markup { \typewriter hufnagel } cis c ces ceses - \override Staff.Accidental #'glyph-name-alist = #alteration-medicaea-glyph-name-alist - cisis^\markup { \typewriter medicaea } cis c ces ceses - \override Staff.Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist - cisis^\markup { \typewriter vaticana } cis c ces ceses - \override Staff.Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist - cisis^\markup { \typewriter mensural } cis c ces ceses -} - diff --git a/input/lsr/ancient/ancient-fonts.ly b/input/lsr/ancient/ancient-fonts.ly index f2b29cb7ed..5347e731cc 100644 --- a/input/lsr/ancient/ancient-fonts.ly +++ b/input/lsr/ancient/ancient-fonts.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.12" \header { texidoc = " Here are shown many (all?) of the symbols that are included in @@ -16,8 +16,8 @@ upperStaff = \context GregorianStaff = "upperStaff" << \override Staff.StaffSymbol #'line-count = #4 \transpose c c { - \override Staff.KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist - \override Staff.Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist + \override Staff.KeySignature #'style = #'vaticana + \override Staff.Accidental #'style = #'vaticana \override NoteHead #'style = #'vaticana.punctum \key es \major \clef "vaticana-fa2" @@ -57,8 +57,8 @@ upperStaff = \context GregorianStaff = "upperStaff" << \override NoteHead #'style = #'vaticana.cephalicus es f - \override Staff.KeySignature #'glyph-name-alist = #alteration-medicaea-glyph-name-alist - \override Staff.Accidental #'glyph-name-alist = #alteration-medicaea-glyph-name-alist + \override Staff.KeySignature #'style = #'medicaea + \override Staff.Accidental #'style = #'medicaea \override Staff.Custos #'style = #'medicaea \override NoteHead #'style = #'medicaea.punctum \clef "medicaea-fa2" @@ -80,8 +80,8 @@ upperStaff = \context GregorianStaff = "upperStaff" << \override NoteHead #'style = #'medicaea.rvirga e! des! ces! - \override Staff.KeySignature #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist - \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist + \override Staff.KeySignature #'style = #'hufnagel + \override Staff.Accidental #'style = #'hufnagel \override Staff.Custos #'style = #'hufnagel \override NoteHead #'style = #'hufnagel.punctum \clef "hufnagel-fa2" @@ -257,8 +257,8 @@ lowerStaff = \context MensuralStaff = "lowerStaff" << \accepts MensuralVoice \consists Custos_engraver \override TimeSignature #'style = #'mensural - \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist - \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist + \override KeySignature #'style = #'mensural + \override Accidental #'style = #'mensural \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 \override Custos #'neutral-direction = #-1 @@ -275,8 +275,8 @@ lowerStaff = \context MensuralStaff = "lowerStaff" << \remove Time_signature_engraver \override StaffSymbol #'thickness = #2.0 \override StaffSymbol #'line-count = #4 - \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist - \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist + \override KeySignature #'style = #'vaticana + \override Accidental #'style = #'vaticana \override Custos #'style = #'vaticana \override Custos #'neutral-position = #4 \override Custos #'neutral-direction = #-1 diff --git a/input/lsr/ancient/custodes.ly b/input/lsr/ancient/custodes.ly deleted file mode 100644 index e37c9f03e5..0000000000 --- a/input/lsr/ancient/custodes.ly +++ /dev/null @@ -1,35 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Custodes may be engraved in various styles. -" } - -\layout { - \context { - \Staff - \consists Custos_engraver - } - ragged-right = ##t -} - -{ - \override Staff.Custos #'neutral-position = #4 - - \override Staff.Custos #'style = #'hufnagel - c'1^"hufnagel" - \break < d' a' f''>1 - - \override Staff.Custos #'style = #'medicaea - c'1^"medicaea" - \break < d' a' f''>1 - - \override Staff.Custos #'style = #'vaticana - c'1^"vaticana" - \break < d' a' f''>1 - - \override Staff.Custos #'style = #'mensural - c'1^"mensural" - \break < d' a' f''>1 -} - diff --git a/input/lsr/ancient/demonstrating-lilypond-support-for-figured-bass.ly b/input/lsr/ancient/demonstrating-lilypond-support-for-figured-bass.ly deleted file mode 100644 index 6f31a6ada4..0000000000 --- a/input/lsr/ancient/demonstrating-lilypond-support-for-figured-bass.ly +++ /dev/null @@ -1,28 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This snippet shows LilyPond's \"limited support\" (says the -Documentation) for figured bass... well, maybe not so limited after -all; moreover, though there are numerous BassFigure objects you can -always use text markups instead to get precisely what you need. - -You can find all of these examples in the manual; read the \"Figured -bass\" section to learn how to add a figured bass with simple but -powerful notation. -" } - -{ - << - \new Voice { \clef bass dis4 c d ais g fis e a r gis d b, f,! e c c c1} - \figures { - < 6 >4 < 7\+ >8 < 6+ [_!] > - < 6 >4 <6 5 [3+] > - < _ >4 < 6 5/>4 - <4- 6+ 7!> <5++> <3--> <7/> r <6\+ 5/> - < [4 6] 8 [_! 12] > < 5 \markup { \number 6 \super (1) } > - \set useBassFigureExtenders = ##t - <4 6> <3 6> <3 7> - } - >> -} diff --git a/input/lsr/ancient/gregorian-scripts.ly b/input/lsr/ancient/gregorian-scripts.ly deleted file mode 100644 index 667aa64507..0000000000 --- a/input/lsr/ancient/gregorian-scripts.ly +++ /dev/null @@ -1,29 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Here is demonstrated a preliminary support of Gregorian Scripts: - -ictus, circulus, semicirculus, accentus, episem. -" } - -\include "gregorian-init.ly" - -\score { - \context VaticanaVoice { - \override Script #'padding = #-0.5 - { - a\ictus - a\circulus - a\semicirculus - a\accentus - \[ a \episemInitium \pes b \flexa a \episemFinis \] - } - } - \layout { - line-width = 70.0 - width = 60.0 - indent = 0.0 - ragged-right = ##t - } -} diff --git a/input/lsr/ancient/mensural-ligatures.ly b/input/lsr/ancient/mensural-ligatures.ly deleted file mode 100644 index 999a947eea..0000000000 --- a/input/lsr/ancient/mensural-ligatures.ly +++ /dev/null @@ -1,85 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -In mensural ligatures, notes with ancient durations are printed in a -tight manner. -" } - -% Note that the horizontal alignment of the fermatas is related to the -% graphical width of the ligatures rather than the musical moment in time. -% This is intended behaviour. - -voice = \transpose c c' { - \set Score.timing = ##f - \set Score.defaultBarType = "empty" - g\longa c\breve a\breve f\breve d'\longa^\fermata - \bar "|" - \[ - g\longa c\breve a\breve f\breve d'\longa^\fermata - \] - \bar "|" - e1 f1 a\breve g\longa^\fermata - \bar "|" - \[ - e1 f1 a\breve g\longa^\fermata - \] - \bar "|" - e1 f1 a\breve g\longa^\fermata - \bar "||" -} - -\paper { - line-thickness = \staff-space / 5.0 -} -\score { - \context ChoirStaff << - \new MensuralStaff << - \context MensuralVoice << - \voice - >> - >> - \new Staff << - \context Voice << - \voice - >> - >> - >> - \layout { - \context { - \Voice - \name MensuralVoice - \alias Voice - \remove Ligature_bracket_engraver - \consists Mensural_ligature_engraver - \override NoteHead #'style = #'mensural - } - \context { - \Staff - \name MensuralStaff - \alias Staff - \accepts MensuralVoice - \consists Custos_engraver - \override TimeSignature #'style = #'mensural - \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist - \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist - \override Custos #'style = #'mensural - \override Custos #'neutral-position = #3 - \override Custos #'neutral-direction = #-1 - clefGlyph = #"clefs.petrucci-g" - clefPosition = #-2 - clefOctavation = #-0 - } - \context { - \RemoveEmptyStaffContext - \accepts MensuralVoice - } - \context { - \Score - \accepts MensuralStaff - } - } -} - - - diff --git a/input/lsr/ancient/mensural-note-heads.ly b/input/lsr/ancient/mensural-note-heads.ly deleted file mode 100644 index 7fdee4643c..0000000000 --- a/input/lsr/ancient/mensural-note-heads.ly +++ /dev/null @@ -1,18 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Mensural notes may also have note heads. -" } - -\score { - { - \relative c'' { - \override NoteHead #'style = #'mensural - c\maxima*1/8 - c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 - } - } -} - - diff --git a/input/lsr/ancient/vaticana-ligatures.ly b/input/lsr/ancient/vaticana-ligatures.ly deleted file mode 100644 index db1ae38a35..0000000000 --- a/input/lsr/ancient/vaticana-ligatures.ly +++ /dev/null @@ -1,48 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Vaticana ligature uses four staff lines, special clef, and calligraphic -notes. -" } - -\include "gregorian-init.ly" - -cantus = \context VaticanaVoice = "cantus" { - \clef "vaticana-fa2" - \[ f\melisma \quilisma g \auctum \descendens a\melismaEnd \] - \[ \virga a\melisma g \pes a \inclinatum f \inclinatum d - c \pes d \quilisma e \pes f \virga g - a \flexa f \pes g \inclinatum f \inclinatum e\melismaEnd \] - \[ d\melisma \quilisma e f \flexa e \pes f\melismaEnd \] - \[ e\melisma \flexa d\melismaEnd \] -} - -verba = \context Lyrics = "verba" \lyricmode { - Al- le- lu- ia. -} - -\paper { - % linethickness = \staffspace / 7.0 -} - -\score { - << - \cantus - \lyricsto "cantus" \verba - >> - \layout { - linewidth = 137.0 \mm - width = 137.0 \mm - indent = 0.0 - raggedright = ##t - packed = ##t - \context { - \Score - \remove Bar_number_engraver - timing = ##f - barAlways = ##t - } - } -} - diff --git a/input/lsr/chords/AAA-intro.ly b/input/lsr/chords/AAA-intro.ly index 4997892c3c..9a05820556 100644 --- a/input/lsr/chords/AAA-intro.ly +++ b/input/lsr/chords/AAA-intro.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.0" \header{ texidoc = " diff --git a/input/lsr/chords/GNUmakefile b/input/lsr/chords/GNUmakefile index 43325ab698..a3f0b2bfde 100644 --- a/input/lsr/chords/GNUmakefile +++ b/input/lsr/chords/GNUmakefile @@ -4,13 +4,9 @@ depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - EXTRA_DIST_FILES= include $(depth)/make/stepmake.make -TITLE=Advanced snippets +TITLE=Sample snippets from LSR + diff --git a/input/lsr/chords/SConscript b/input/lsr/chords/SConscript index f72bfffc28..cb39d4eab0 100644 --- a/input/lsr/chords/SConscript +++ b/input/lsr/chords/SConscript @@ -1,4 +1,5 @@ # -*-python-*- Import ('env', 'collate') -collate (title = 'Advanced snippets') +collate (title = 'Sample snippets from LSR') + diff --git a/input/lsr/chords/changing-an-individual-notes-size-in-a-chord.ly b/input/lsr/chords/changing-an-individual-notes-size-in-a-chord.ly deleted file mode 100644 index a7f03331bf..0000000000 --- a/input/lsr/chords/changing-an-individual-notes-size-in-a-chord.ly +++ /dev/null @@ -1,28 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Individual noteheads in a chord can be modified with the @code{\tweak} -command inside a chord, by altering the @code{'font-size} property. - - -Inside the chord (within the brackets @code{< >}), before the note to -be altered, place the @code{\tweak} command, followed by -@code{#'font-size} and define the proper size like @code{#-2} (a tiny -notehead). - - -The code for the chord example shown: @code{} -" } - -\header{ - title = "Modify an individual notehead's size in a chord" -} - -Notes = \relative { - <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup{A tiny e}_\markup{A big c} -} - -\score{ - \Notes -} diff --git a/input/lsr/chords/chord-name-exceptions.ly b/input/lsr/chords/chord-name-exceptions.ly index 8ca99fa48f..ee969ff492 100644 --- a/input/lsr/chords/chord-name-exceptions.ly +++ b/input/lsr/chords/chord-name-exceptions.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.12" \header { texidoc = " The property @code{chordNameExceptions} can used to store a list of diff --git a/input/lsr/chords/chord-name-major7.ly b/input/lsr/chords/chord-name-major7.ly deleted file mode 100644 index 47743bc355..0000000000 --- a/input/lsr/chords/chord-name-major7.ly +++ /dev/null @@ -1,12 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The layout of the major 7 can be tuned with @code{majorSevenSymbol} -" } - -\chords { - c:7+ - \set majorSevenSymbol = \markup { "j7" } - c:7+ -} diff --git a/input/lsr/chords/customising-the-chord-naming-function-for-jazz.ly b/input/lsr/chords/customising-the-chord-naming-function-for-jazz.ly deleted file mode 100644 index 0f078997f0..0000000000 --- a/input/lsr/chords/customising-the-chord-naming-function-for-jazz.ly +++ /dev/null @@ -1,155 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Chord names are generated from a list pitches. The functions which -construct these names can be customised. Here are shown Jazz chords, -following Ignatzek (pp. 17-18, 1995) and an alternative Jazz chord -notation. - - -Chords following Banter (1987) can also be printed from this snippet, -but are turned off for brevity. - - - -" } - -chs = \transpose c' c' -{ - 1 - % m = minor triad - - \break - - - % triangle = maj - - \break - - - - \break - % 6 = major triad with added sixth - % m6 = minor triad with added sixth - - \break - - - - \break - - - - \break - - - - \break - - - - \break - - - - \break - - - - \break - - % add9 - -} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% alternate Jazz notation - -efullmusicJazzAlt = -{ - 1-\markup { "+" } - -\markup { \normal-size-super - % \override #'(font-family . math) "N" } - \override #'(font-family . math) "M" } - %%c:3.5.7 = \markup { \override #'(font-family . math) "M" } - %%c:3.5.7 = \markup { \normal-size-super "maj7" } - - -\markup { \super "o" } % should be $\circ$ ? - -\markup { \super \combine "o" "/" } - -\markup { \super "o7" } -} - -efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f) - -epartialmusicJazzAlt = { - 1-\markup { \normal-size-super "2" } - -\markup { "m" } - -\markup { \normal-size-super "sus4" } - -\markup { \normal-size-super "5" } - - %% TODO, partial exceptions - -\markup { "m" }-\markup { \normal-size-super "sus4" } - -\markup { "m" }-\markup { \normal-size-super "sus2" } -} - -epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f) - -jazzAltProperties = \sequential { - \set majorSevenSymbol = #whiteTriangleMarkup - \set chordNameSeparator = #(make-simple-markup "/") - \set chordNameExceptionsFull = #efullJazzAlt - \set chordNameExceptionsPartial = #epartialJazzAlt - \set chordNameFunction = #jazz-chord-names -} - -banterProperties = \sequential { - \set chordNameFunction = #banter-chord-names -} - -\score{ - << - \new ChordNames { - \set ChordNames.instrumentName = #"Ignatzek (default)" - \set ChordNames.shortInstrumentName = #"Def" - \chs - } - - \new ChordNames { - \jazzAltProperties - \set ChordNames.instrumentName = #"Alternative" - \set ChordNames.shortInstrumentName = #"Alt" - \chs - } - -%{ - - %% This is the Banter (1987) style. It gives exceedingly - %% verbose (wide) names, making the output file take up to 4 pages. - %% (FIXME: how big is is now?) - %% Turned off by default. - - %% FIXME: use smaller font for Banter (or remove some esoteric - %% chords). - - \new ChordNames { - \banterProperties - \set ChordNames.instrumentName = #"Banter" - \set ChordNames.shortInstrumentName = #"Ban" - \chs - } -%} - - \new Staff \transpose c c' { \chs } - >> - \layout { - indent = 3.\cm - \context { - \ChordNames - \consists Instrument_name_engraver - } - } -} - - diff --git a/input/lsr/chords/inserting-a--markup-when-using-chordmode.ly b/input/lsr/chords/inserting-a--markup-when-using-chordmode.ly deleted file mode 100644 index da6982ecfa..0000000000 --- a/input/lsr/chords/inserting-a--markup-when-using-chordmode.ly +++ /dev/null @@ -1,19 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -A way to insert a \markup @{ . . . @}string in \chords @{ . . . @}. -" } - -% Note what happens if \hspace #-2 is deleted or set to +n. -% If "tacet" instead of "Tacet" a little bit of "C" peeks around the \whiteout. -CMString = { -\markup { \whiteout { \hspace #-2 "Tacet" } } } -CMStringX = #(append (sequential-music-to-chord-exceptions CMString #t) - ignatzekExceptions) -<< { \chords { c1 - \set chordNameExceptions = #CMStringX c - \unset chordNameExceptions c } - } { \relative c'' { c c c } } >> - - - diff --git a/input/lsr/chords/volta-brackets-over-chord-names.ly b/input/lsr/chords/volta-brackets-over-chord-names.ly deleted file mode 100644 index ee84586117..0000000000 --- a/input/lsr/chords/volta-brackets-over-chord-names.ly +++ /dev/null @@ -1,22 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Volta brackets can be placed over chord names. Just set the -voltaOnThisStaff property to \"true\" for the ChordNames context and to -\"false\" for the topmost ordinary Staff context. -" } - -\score { << - \new ChordNames \with { - voltaOnThisStaff = ##t - } \chordmode { - c1 c - } - \new Staff \with { - voltaOnThisStaff = ##f - } - { - \repeat volta 2 { c'1 } \alternative { c' } - } ->> } diff --git a/input/lsr/connecting/AAA-intro.ly b/input/lsr/connecting/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/connecting/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/connecting/GNUmakefile b/input/lsr/connecting/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/connecting/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/connecting/SConscript b/input/lsr/connecting/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/connecting/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/connecting/altering-the-number-of-stems-in-a-beam.ly b/input/lsr/connecting/altering-the-number-of-stems-in-a-beam.ly deleted file mode 100644 index 84fcf71788..0000000000 --- a/input/lsr/connecting/altering-the-number-of-stems-in-a-beam.ly +++ /dev/null @@ -1,21 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -You can alter the number of stems in a beam. In this example, two sets -of four 32nds are joined, as if they were 8th notes. - - - -" } - -\relative { - #(override-auto-beam-setting '(end * * * *) 1 4) - f32 g a b b a g f - - f32 g a - \set stemRightBeamCount = #1 b - \set stemLeftBeamCount = #1 b - a g f -} - diff --git a/input/lsr/connecting/alternating-beam-directions.ly b/input/lsr/connecting/alternating-beam-directions.ly deleted file mode 100644 index bc44f35551..0000000000 --- a/input/lsr/connecting/alternating-beam-directions.ly +++ /dev/null @@ -1,32 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The eighth notes may be seemingly attached to different - beams, and the corresponding notes connected by ties. - Such a situation may occur, for example, in the cello suites. -" } - -wipeNote = { - \once \override NoteHead #'transparent = ##t - \once \override Stem #'transparent = ##t -} -\layout { raggedright = ##t } - - -\relative c''<< { - c8[~ - \wipeNote - c8 - c8~ - \wipeNote - c - c]~ - \wipeNote - c\noBeam -}\\ - { s8 c8 [ s c s c] } - - ->> - diff --git a/input/lsr/connecting/automatic-beam-subdivisions.ly b/input/lsr/connecting/automatic-beam-subdivisions.ly deleted file mode 100644 index 95e8c64699..0000000000 --- a/input/lsr/connecting/automatic-beam-subdivisions.ly +++ /dev/null @@ -1,18 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Lilypond can subdivide beams automatically. Set the property -subdivideBeams, and beams are subdivided at beat positions (as -specified in beat length) -" } - -\relative{ b'32^"default"[ a g f c' b a g f e d' c b a g f ] - \set subdivideBeams = ##t - b32^"subdivision enabled"[ a g f c' b a g f e d' c b a g f ] - \set Score.beatLength = #(ly:make-moment 1 8) - b32^"beatLength 1 8"[ a g f c' b a g f e d' c b a g f ] - \set Score.beatLength = #(ly:make-moment 1 16) - b32^"beatLength 1 16"[ a g f c' b a g f e d' c b a g f ] - } - diff --git a/input/lsr/connecting/beam-across-line-breaks.ly b/input/lsr/connecting/beam-across-line-breaks.ly deleted file mode 100644 index b75eb47e6f..0000000000 --- a/input/lsr/connecting/beam-across-line-breaks.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -By default, beams can't be printed across line breaks. Here's a way to -force the line break, by setting the @code{#'breakable} property. See -also in the manual the \"Line Breaking\" and \"Manual beams\" sections. -" } - -\layout { ragged-right= ##t } - -\relative c'' { - \override Score.Beam #'breakable = ##t - \time 3/16 c16-[ d e \break f-] -} diff --git a/input/lsr/connecting/controlling-manually-beam-positions.ly b/input/lsr/connecting/controlling-manually-beam-positions.ly deleted file mode 100644 index 68d693a01e..0000000000 --- a/input/lsr/connecting/controlling-manually-beam-positions.ly +++ /dev/null @@ -1,25 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Beam positions may be controlled manually, by overriding the -@code{positions} setting of the @code{Beam} grob. - - - -" } - -\score { - \context Voice \relative c { - %% from upper staffline (position 4) to centre (position 0) - \override Beam #'positions = #'(2 . 0) - c'8[ c] - - %% from center to one above centre (position 2) - \override Beam #'positions = #'(0 . 1) - c[ c] - } - -} - - diff --git a/input/lsr/connecting/fine-tuning-manual-beaming.ly b/input/lsr/connecting/fine-tuning-manual-beaming.ly deleted file mode 100644 index 9bd538713b..0000000000 --- a/input/lsr/connecting/fine-tuning-manual-beaming.ly +++ /dev/null @@ -1,22 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -By setting the @code{#'beaming} property, it is possible to override -beaming rules. You may preferably want to use @code{\once} when doing -so, as this property cannot be shared between objects. -" } - -\layout{ - ragged-right = ##t -} - -\relative c'' { - c32[ c - \once \override Stem - #'beaming = #(cons (list 1 2) (list 0 2 4)) - c - \once \override Stem - #'beaming = #(cons (list 0 2 4) (list 0 1 4)) - c c c] -} diff --git a/input/lsr/connecting/how-to-define-autobeamsettings-in-the--layout-block.ly b/input/lsr/connecting/how-to-define-autobeamsettings-in-the--layout-block.ly deleted file mode 100644 index c8ee049897..0000000000 --- a/input/lsr/connecting/how-to-define-autobeamsettings-in-the--layout-block.ly +++ /dev/null @@ -1,40 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If you need to modify the automatic beaming behaviour (see \"Setting -automatic beam behavior\") in the \layout bloc, here is a simple way to -do it. - - -" } - -\layout { - \context { - \DrumStaff - % set the beam division after 1/4 and after 3/4 (after 2/4 is default) - autoBeamSettings = #(cons (cons '(end * * * *) (ly:make-moment 1 4)) - - (cons (cons '(end * * * *) (ly:make-moment 3 4)) - default-auto-beam-settings) - ) - } - } - - up = \drummode {hh8 hh hh hh hh hh hh hh} %%No manual beaming indication, as you can see - - - down = \drummode { - \override Beam #'positions = #'(-5 . -5) - bd8. bd16 sn16 bd8 bd16 r8 bd8 sn16 bd8. - } - - \new DrumStaff { - - << - \new DrumVoice { \voiceOne \up } - - \new DrumVoice { \voiceTwo \down } ->> - - } diff --git a/input/lsr/connecting/how-to-improve-automatic-beam-groups-when-frequently-using--time.ly b/input/lsr/connecting/how-to-improve-automatic-beam-groups-when-frequently-using--time.ly deleted file mode 100644 index 220a8a701a..0000000000 --- a/input/lsr/connecting/how-to-improve-automatic-beam-groups-when-frequently-using--time.ly +++ /dev/null @@ -1,36 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Groups of beamed notes can be made by setting the subdivideBeams -property. However, if you have \"\time\"-statements inside your score, -you'll need to set the beatLength again after each \time-statement -(that has a denominator that is not 8). - -This happens because the \"\time\"-statements reset the -beatLength-value to the denominator of the time signature. So, if -you have many meter-changes, you can use the following function named -\"\timenb #X #Y\" instead of \"\time X/Y\". -" } - -% timenb sets TIMEesignature and measure length, but Not Beatlength -timenb = #(define-music-function (parser location x y ) (integer? integer?) #{ - \set Staff.timeSignatureFraction = #(cons $x $y) - \set Score.measureLength = #(ly:make-moment $x $y) -#}) - -\new Staff { - \relative c'' - { - \set Score.beatLength = #(ly:make-moment 1 8) - \set subdivideBeams = ##t - - \timenb #3 #8 c16.[ c32 c16. c32 c16. c32] | - \timenb #5 #8 d8[ d] d16.[ d32 d16. d32 d8] | - \timenb #3 #4 e8[ e16. e32] e16.[ e32 e16. e32] e16.[ f32 f8] | - \timenb #2 #4 - g16.[ g32 g16. g32] g16.[ g32 g16. g32] | - - } -} - diff --git a/input/lsr/connecting/laissez-vibrer-ties.ly b/input/lsr/connecting/laissez-vibrer-ties.ly deleted file mode 100644 index 354fb49d3d..0000000000 --- a/input/lsr/connecting/laissez-vibrer-ties.ly +++ /dev/null @@ -1,28 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Laissez vibrer ties should avoid dots and staff lines, similar to -normal ties. They have fixed size. Their formatting can be tuned with -@code{tie-configuration} -" } - -\paper { - ragged-right = ##t -} - -\relative { - \laissezVibrer r4 - \laissezVibrer r - \laissezVibrer r - 4.\laissezVibrer r - - 4\laissezVibrer r - \override LaissezVibrerTieColumn #'tie-configuration - = #'((-7 . -1) - (-5 . -1) - (-3 . 1) - (-1 . 1)) - 4\laissezVibrer r -} - diff --git a/input/lsr/connecting/overriding-the-automatic-beamer.ly b/input/lsr/connecting/overriding-the-automatic-beamer.ly deleted file mode 100644 index b2b79313ba..0000000000 --- a/input/lsr/connecting/overriding-the-automatic-beamer.ly +++ /dev/null @@ -1,47 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The auto-beamer, which can be overridden, will only engrave beams that -end before encountering of - - -* a rest, - -* another, manually entered beam, or - -* a bar line. - - - -The @code{autoBeaming} can also be turned off. - - - -" } - -\score{ - \relative c''{ - #(override-auto-beam-setting '(end * * * *) 1 2) - \time 2/4 - % one beam per measure - c8 c c c - c16 c c c c c c c - % from here on consider ending beam every 1/4 note - #(override-auto-beam-setting '(end * * * *) 1 4) - - c8 c c c - % manually override autobeam with weird beaming - c8 c[ c] c - c8 c c r - c8 c c4 - r8 c c c - % no autobeaming - \set autoBeaming = ##f - c8 c c c - } - -} - - - diff --git a/input/lsr/connecting/short-tremolos.ly b/input/lsr/connecting/short-tremolos.ly deleted file mode 100644 index 26722f39fd..0000000000 --- a/input/lsr/connecting/short-tremolos.ly +++ /dev/null @@ -1,16 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Short tremolos (involving eighth notes or shorter durations) can be -obtained; in such a case only one beam is connected to the stems. -" } - -\layout { ragged-right = ##t } - -\context Staff \relative c' { - \repeat "tremolo" 2 { c32 e32 } - \stemDown - \repeat "tremolo" 2 { c32 e32 } -} - diff --git a/input/lsr/contemporary/AAA-intro.ly b/input/lsr/contemporary/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/contemporary/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/contemporary/GNUmakefile b/input/lsr/contemporary/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/contemporary/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/contemporary/SConscript b/input/lsr/contemporary/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/contemporary/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/contemporary/clusters.ly b/input/lsr/contemporary/clusters.ly deleted file mode 100644 index 52d0286e3c..0000000000 --- a/input/lsr/contemporary/clusters.ly +++ /dev/null @@ -1,22 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Clusters are a device to denote that a complete range of notes is to be -played. -" } - -\layout { - ragged-right = ##t -} - -fragment = \relative c' { - c4 f4 4 - 8 a4 c2 4 e4 - c4 -} - -<< - \new Staff \fragment - \new Staff \makeClusters \fragment ->> diff --git a/input/lsr/contemporary/coloring-objects.ly b/input/lsr/contemporary/coloring-objects.ly deleted file mode 100644 index c1c591b35e..0000000000 --- a/input/lsr/contemporary/coloring-objects.ly +++ /dev/null @@ -1,26 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -LilyPond gives you the ability to assign different colors to any grob -in your score, such as NoteHeads, Alterations, Beams and so on, by -simply overriding the #'color property and choosing your color (over -200 colors are available, see the \"List of Colors\" Appendix in the -Manual). -" } - -\relative { - \override Accidental #'color = #darkgreen - \override Beam #'color = #cyan - \override NoteHead #'color = #darkyellow - c4 - \override NoteHead #'color = #red - f - \override NoteHead #'color = #darkmagenta - g - \override NoteHead #'color = #darkblue - b - \override NoteHead #'color = #green - \override Stem #'color = #blue - e8 es d dis e4 r -} diff --git a/input/lsr/contemporary/compound-time-signatures.ly b/input/lsr/contemporary/compound-time-signatures.ly deleted file mode 100644 index 9352433704..0000000000 --- a/input/lsr/contemporary/compound-time-signatures.ly +++ /dev/null @@ -1,26 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Odd 20th century time signatures (such as \"5/8\") can often be played -as compound time signatures (e.g. \"3/8 + 2/8\"), which combine two or -more inequal metrics. LilyPond can make such musics quite easy to read -and play, by explicitly printing the compound time signatures and -adapting the automatic beaming behaviour. (You can even add graphic -measure groping indications, the appropriate snippet in this database.) - -" } - -#(define (compound-time one two num) - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)))))) - - -\relative { - %% compound time signature hack - \time 5/8 - \override Staff.TimeSignature #'stencil = #ly:text-interface::print - \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8" ) - #(override-auto-beam-setting '(end 1 8 5 8) 1 4) - c8 d e fis gis | c fis, gis e d | c8 d e4 gis8 -} diff --git a/input/lsr/contemporary/double-glissando.ly b/input/lsr/contemporary/double-glissando.ly deleted file mode 100644 index 0d9a391ed5..0000000000 --- a/input/lsr/contemporary/double-glissando.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -To make double-glissandi, i.e. to connect chords with glissando lines, -you have to create another voice, then attach a glissando to it. -" } - -{\clef bass -<< { % New voice ( = \voiceOne) without stems or beams - - \override Stem #'stencil = ##f - \override Beam #'stencil = ##f - - % Attach glissando to noteheads - e8 \glissando fis - - } \\ { % Original voice with chords rearranged so that glissando is attached to a & b - \glissando -} >>} diff --git a/input/lsr/contemporary/feathered-beams.ly b/input/lsr/contemporary/feathered-beams.ly deleted file mode 100644 index cc3a4c71ac..0000000000 --- a/input/lsr/contemporary/feathered-beams.ly +++ /dev/null @@ -1,58 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Feathered beams can be obtained by setting the @code{#'grow-direction} -property; you may also want to use @code{\featherDurations} to adjust -note durations. (See also in the manual : \"Feathered beams\") -" } - -\score{ -\relative c'' -<< -\new Staff { -% Turn on feathered beams: -\override Beam #'grow-direction = #LEFT - -% Illustration of feathered beams and the \featherDurations -% function. - - -% Example of a beamed sequence: -bes32\p\>[ ges d' bes, c' ges a ges \!] - -% When the factor is 4/4=1, you get the same as without \featherDurations -\featherDurations #(ly:make-moment 4 4) -{ bes32\p\>[ ges d' bes, c' ges a ges \!] } - -% When the factor is >1, you get a ritardando-like placement of the -% notes (and sound in the MIDI output). -\featherDurations #(ly:make-moment 6 4) -{ bes32\p\>[ ges d' bes, c' ges a ges \!] } - -% When the factor is <1, you get accelerando, i.e. you should -% really only use if when \override Beam #'grow-direction = #RIGHT -\featherDurations #(ly:make-moment 3 4) -{ bes32\p\>[ ges d' bes, c' ges a ges \!] } - -% Revert back to ordinary beams: -\revert Beam #'grow-direction -bes32\p\>[ ges d' bes, c' ges a ges \!] - -% Get a single feathered beam, using \once \override: -\once \override Beam #'grow-direction = #LEFT -bes32\p\>[ ges d' bes, c' ges a ges \!] -bes32\p\>[ ges d' bes, c' ges a ges \!] - -% The \featherDurations function just adjusts the durations -% of the notes and can be used without % feathered beams: -\featherDurations #(ly:make-moment 6 4) -{ bes32\p\>[ ges d' bes, c' ges a ges \!] } - -} - -% Reference rhythm to compare to: -\new Staff \repeat unfold 64 { c32 } - >> -} - diff --git a/input/lsr/contemporary/glissando-written-out-in-small-notes.ly b/input/lsr/contemporary/glissando-written-out-in-small-notes.ly deleted file mode 100644 index 1211d7c245..0000000000 --- a/input/lsr/contemporary/glissando-written-out-in-small-notes.ly +++ /dev/null @@ -1,35 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Sometimes a glissando is written out in smaller notes. This example -shows how to do this. -" } - -\relative c' { - \clef treble - \key c \major - \time 3/8 - - fis16.[-> a64 g] - - % Make tuplet markings invisible - \once \override TupletBracket #'number-visibility = ##f - \once \override TupletBracket #'bracket-visibility = ##f - - % Prepare for small notes - \override NoteHead #'font-size = #-4 - \override Accidental #'font-size = #-4 - - % Force stem direction down - \stemDown - - % Tuplet with small notes - \times 3/42 { fis8[( g gis a bes b c cis d dis e f fis g gis a bes! b c cis d] } - - % Restore normal note size - \revert NoteHead #'font-size - \revert Accidental #'font-size - - es32.[) fis,,64] -} diff --git a/input/lsr/contemporary/graphic-measure-grouping-indications-for-conductors.ly b/input/lsr/contemporary/graphic-measure-grouping-indications-for-conductors.ly deleted file mode 100644 index 84b220c991..0000000000 --- a/input/lsr/contemporary/graphic-measure-grouping-indications-for-conductors.ly +++ /dev/null @@ -1,29 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -In 20th century music, time signatures tend to change frequently and to -be more complex. Therefore, printing graphic indications (such as -brackets and triangles) above the top staff has become quite useful, if -not essential, to conductors or even players. LilyPond is able to do -that easily with its integrated Measure_grouping_engraver. - -Beware: you can no longer use the \time command; use instead the -#(set-time-signature x x '(x x)) function, which is quite more -powerful, especially for compound time signatures such as 5/8. -" } - -\new Staff \with { - \consists "Measure_grouping_engraver" - } - -\relative c' { - #(set-time-signature 2 4 '(2 2)) - c8 a'4 a8~ - #(set-time-signature 5 8 '(3 2)) - a8 bes4 r8 bes8-> - #(set-time-signature 2 4 '(2 2)) - c,8 g'4 g8~ - #(set-time-signature 5 8 '(3 2)) - g8 a4 g a4.-> -} diff --git a/input/lsr/contemporary/non-traditional-key-signatures-scordatura.ly b/input/lsr/contemporary/non-traditional-key-signatures-scordatura.ly deleted file mode 100644 index 8778f5251c..0000000000 --- a/input/lsr/contemporary/non-traditional-key-signatures-scordatura.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -You can get any key signature you want by manually setting the -Staff.keySignature property. -" } - -\relative c' -\new Staff { - \set Staff.keySignature = #`(((1 . 2) . ,SHARP) ((0 . 3) . ,FLAT)) - f8 a c e - \set Staff.keySignature = #`(((1 . 2) . ,FLAT) ((0 . 4) . ,DOUBLE-SHARP)) - e a, g a -} diff --git a/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly b/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly deleted file mode 100644 index 616c959cfb..0000000000 --- a/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly +++ /dev/null @@ -1,46 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -In XXth century music, where time signatures tend to change a lot, it -is sometimes recommended to put the time signatures on top of the score -(or above each StaffGroup in case of an orchestral score). This can be -achieved by creating a dummy staff which only contains the -Time-signature-engraver). In this specific example, a separate -identifier is used to define every time signature change, which allows -not to bother entering them again when typing the actual music (careful -though: it makes getting lost easier!). - -Notice the overriding of the X-offset property: a specific trick to -make the time signatures aligned with the barlines, thanks to Han-Wen. -" } - -\layout{ - \context { - \type "Engraver_group" - \consists "Time_signature_engraver" - \consists "Axis_group_engraver" - \name "TimeSig" - \override TimeSignature #'font-size = #3 - \override TimeSignature #'break-align-symbol = ##f - \override TimeSignature #'X-offset - = #ly:self-alignment-interface::x-aligned-on-self - \override TimeSignature #'self-alignment-X = #0 - } - \context { - \Score \accepts TimeSig - } - - \context { \Staff - \remove "Time_signature_engraver" - } -} - -timeSignatures = { \time 2/4 s2 \time 3/4 s2. \time 4/4 s1 } -\score { - -<< \new TimeSig \timeSignatures - \new Staff \relative { c'2 c2. c1 } - \new Staff { a2 a2. a1} - >> -} diff --git a/input/lsr/education/AAA-intro.ly b/input/lsr/education/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/education/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/education/GNUmakefile b/input/lsr/education/GNUmakefile deleted file mode 100644 index 3819fda13a..0000000000 --- a/input/lsr/education/GNUmakefile +++ /dev/null @@ -1,15 +0,0 @@ -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/education/SConscript b/input/lsr/education/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/education/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/education/heavily-customized-polymetric-time-signatures.ly b/input/lsr/education/heavily-customized-polymetric-time-signatures.ly deleted file mode 100644 index fdac8aee5b..0000000000 --- a/input/lsr/education/heavily-customized-polymetric-time-signatures.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Though the set-time-signature thing was not the most essential here, it -has been included to show the beat of this piece (which is a template -of a real balkan song!). -" } - -#(define (compound-time one two three four five six seven eight nine ten num) - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)) #:vcenter "+" (#:column (three num)) #:vcenter "+" (#:column (four num)) #:vcenter "+" (#:column (five num)) #:vcenter "+" (#:column (six num)) #:vcenter "+" (#:column (seven num)) #:vcenter "+" (#:column (eight num)) #:vcenter "+" (#:column (nine num)) #:vcenter "+" (#:column (ten num)))))) - - -melody = -{ \relative c'' { - \set Staff.instrumentName = "Bb Sop." - \key g \major \time 25/8 - \override Staff.TimeSignature #'stencil = #ly:text-interface::print - \override Staff.TimeSignature #'text = #(compound-time "3" "2" "2" "3" "2" "2" "2" "3" "2" "2" "8" ) - c8[ c c] d4 c8[ c] b[ c b] a4 g fis8[ e d c] b'[ c d] e4-^ fis8[ g] | \break - c,4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break } -} -drum = { - \new DrumStaff \drummode - { - \bar "|:" bd4. ^\markup { "Drums" } sn4 bd \bar ":" sn4. bd4 sn \bar ":" - bd sn bd4. sn4 bd \bar ":|" - } -} - -{ - \melody - \drum -} diff --git a/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly deleted file mode 100644 index 0f253f0599..0000000000 --- a/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -For pedagogical purposes, you may want to make one staff line thicker -(e.g. the middle line, to emphasize the line of the G clef). This can -be achieved by adding extra lines very close to the line you want to -make thicker, using the #'line-positions property in the StaffSymbol -context. -" } - -\score { - \new Staff{ - \override Staff.StaffSymbol #'line-positions =#'(-4 -2 -0.2 0 0.2 2 4 ) - d'4 e' f' g' - } -} diff --git a/input/lsr/education/putting-parentheses-around-a-note.ly b/input/lsr/education/putting-parentheses-around-a-note.ly deleted file mode 100644 index cdc3348e4c..0000000000 --- a/input/lsr/education/putting-parentheses-around-a-note.ly +++ /dev/null @@ -1,14 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -As children do not always have hands large enough, say, to plays -octavas when studying piano, or anything else, it can be useful to add -parentheses around a low note for example. In this snippet, the -\"parenthesized\" note is made a bit smaller using the \tweak command -on the #'font-size property. -" } - -{ \clef bass -< f \parenthesize \tweak #'font-size #-1 f, >2 -} diff --git a/input/lsr/education/using-grid-lines-to-emphasize-rhythms-and-notes-synchronization.ly b/input/lsr/education/using-grid-lines-to-emphasize-rhythms-and-notes-synchronization.ly deleted file mode 100644 index 9c7e873e49..0000000000 --- a/input/lsr/education/using-grid-lines-to-emphasize-rhythms-and-notes-synchronization.ly +++ /dev/null @@ -1,69 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Regular vertical lines can be drawn between staves to show notes -synchronization; however, in case of monophonic music, you may want to -make the second stave invisible, and make the lines shorter like in -this snippet. -" } - -%% sets of grid -\layout { - \context { - \Staff - \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 8) -%% lines length - \override GridPoint #'Y-extent = #'(6 . 0) - } - \context { - \StaffGroup - \remove "System_start_delimiter_engraver" - } -} - -\layout { - ragged-right = ##t -} -\new Score -\with { - \consists "Grid_line_span_engraver" -%% centers grid lines horizontally below noteheads - \override NoteColumn #'X-offset = #-0.5 -} - -\new ChoirStaff << - \new Staff - { - \time 12/8 - \stemUp - \relative { - c'4. d8 e8 f g4 f8 e8.[ d16 c8] } - } - \new Staff - { -%% making sure the lines will be placed outside the Staff - \override Score.GridLine #'extra-offset = #'( 0.0 . -4.0 ) - -%% hides staff and notes so that only the grid lines are visible - \override NoteHead #'transparent = ##t - \override NoteHead #'no-ledgers = ##t - \override Stem #'transparent = ##t - \override Beam #'transparent = ##t - \override Staff.BarLine #'transparent = ##t - \override Staff.StaffSymbol #'line-count = #0 - \override Staff.TimeSignature #'transparent = ##t - \override Staff.Clef #'transparent = ##t - -% you have to put 'dummy' notes here to force regular grid spacing... - \once \override Score.GridLine #'thickness = #4.0 - c8 c8 c8 - \once \override Score.GridLine #'thickness = #3.0 - c8 c8 c8 - \once \override Score.GridLine #'thickness = #4.0 - c8 c8 c8 - \once \override Score.GridLine #'thickness = #3.0 - c8 c8 c8 - } ->> diff --git a/input/lsr/education/white-text-on-black-background.ly b/input/lsr/education/white-text-on-black-background.ly deleted file mode 100644 index af22af8b2a..0000000000 --- a/input/lsr/education/white-text-on-black-background.ly +++ /dev/null @@ -1,11 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If you want to print some white text on black background, here's the -trick: -" } - -{ - g1^\markup { \combine \filled-box #'(-.3 . 6.8) #'(-.3 . 1.8) #0 \with-color #white White} -} diff --git a/input/lsr/engravers/AAA-intro.ly b/input/lsr/engravers/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/engravers/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/engravers/GNUmakefile b/input/lsr/engravers/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/engravers/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/engravers/SConscript b/input/lsr/engravers/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/engravers/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/engravers/engravers-one-by-one.ly b/input/lsr/engravers/engravers-one-by-one.ly deleted file mode 100644 index c950efe0ac..0000000000 --- a/input/lsr/engravers/engravers-one-by-one.ly +++ /dev/null @@ -1,278 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The notation problem, creating a certain symbol, is handled by plugins. -Each plugin is called an Engraver. In this example, engravers are -switched on one by one, in the following order: - -- note heads - - -- staff symbol, - - -- clef, - - -- stem, - - -- beams, slurs, accents, - - -- accidentals, bar lines, time signature, and key signature. - - - -Engravers are grouped. For example, note heads, slurs, beams etc. form -a Voice context. Engravers for key, accidental, bar, etc. form a Staff -context. - - -You may only see the first example in this document; please download -this snippet and run it from your own computer. -" } - -%% sample music -topVoice = \relative c' { - \key d\major - es8([ g] a[ fis]) - b4 - b16[-. b-. b-. cis-.] - d4-> -} - -botVoice = \relative c' { - \key d\major - c8[( f] b[ a)] - es4 - es16[-. es-. es-. fis-.] - b4-> -} - -hoom = \relative c { - \key d \major - \clef bass - g8-. r - r4 - fis8-. - r8 - r4 - b'4-> -} - -pah = \relative c' { - r8 b-. - r4 - r8 g8-. - r16 g-. r8 - \clef treble - fis'4-> -} - -% -% setup for Request->Element conversion. Guru-only -% - -MyStaff =\context { - \type "Engraver_group" - \name Staff - - \description "Handles clefs, bar lines, keys, accidentals. It can contain -@code{Voice} contexts." - - - \consists "Output_property_engraver" - - \consists "Font_size_engraver" - - \consists "Volta_engraver" - \consists "Separating_line_group_engraver" - \consists "Dot_column_engraver" - - \consists "Ottava_spanner_engraver" - \consists "Rest_collision_engraver" - \consists "Piano_pedal_engraver" - \consists "Piano_pedal_align_engraver" - \consists "Instrument_name_engraver" - \consists "Grob_pq_engraver" - \consists "Forbid_line_break_engraver" - \consists "Axis_group_engraver" - - \consists "Pitch_squash_engraver" - - \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6) - extraVerticalExtent = ##f - verticalExtent = ##f - localKeySignature = #'() - - % explicitly set instrument, so we don't get - % weird effects when doing instrument names for - % piano staves - - instrumentName = #'() - shortInstrumentName = #'() - - \accepts "Voice" -} - - -MyVoice = \context { - \type "Engraver_group" - \name Voice - - \description " - Corresponds to a voice on a staff. This context handles the - conversion of dynamic signs, stems, beams, super- and subscripts, - slurs, ties, and rests. - - You have to instantiate this explicitly if you want to have - multiple voices on the same staff." - - localKeySignature = #'() - \consists "Font_size_engraver" - - % must come before all - \consists "Output_property_engraver" - \consists "Arpeggio_engraver" - \consists "Multi_measure_rest_engraver" - \consists "Text_spanner_engraver" - \consists "Grob_pq_engraver" - \consists "Note_head_line_engraver" - \consists "Glissando_engraver" - \consists "Ligature_bracket_engraver" - \consists "Breathing_sign_engraver" - % \consists "Rest_engraver" - \consists "Grace_beam_engraver" - \consists "New_fingering_engraver" - \consists "Chord_tremolo_engraver" - \consists "Percent_repeat_engraver" - \consists "Slash_repeat_engraver" - -%{ - Must come before text_engraver, but after note_column engraver. - -%} - \consists "Text_engraver" - \consists "Dynamic_engraver" - \consists "Fingering_engraver" - - \consists "Script_column_engraver" - \consists "Rhythmic_column_engraver" - \consists "Cluster_spanner_engraver" - \consists "Tie_engraver" - \consists "Tie_engraver" - \consists "Tuplet_engraver" - \consists "Note_heads_engraver" - \consists "Rest_engraver" - - \consists "Skip_event_swallow_translator" -} - - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - - -MyStaff = \context { - \MyStaff - \consists "Staff_symbol_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyStaff = \context { - \MyStaff - \consists "Clef_engraver" - \remove "Pitch_squash_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyVoice = \context { - \MyVoice - \consists "Stem_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyVoice = \context { - \MyVoice - \consists "Beam_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyVoice= \context { - \MyVoice - \consists "Phrasing_slur_engraver" - \consists "Slur_engraver" - \consists "Script_engraver" -} - - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyStaff = \context { - \MyStaff - \consists "Bar_engraver" - \consists "Time_signature_engraver" -} - -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - -MyStaff = \context { - \MyStaff - \consists "Accidental_engraver" - \consists "Key_engraver" -} -\score { - \topVoice - \layout { - \context { \MyStaff } - \context { \MyVoice } - } -} - diff --git a/input/lsr/engravers/removing-time-signature-and-bar-lines.ly b/input/lsr/engravers/removing-time-signature-and-bar-lines.ly deleted file mode 100644 index 9d73b4012d..0000000000 --- a/input/lsr/engravers/removing-time-signature-and-bar-lines.ly +++ /dev/null @@ -1,27 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Engravers can be removed one by one. Here, the time signature and bar -lines have been removed. - - -" } - -\score { - \relative c'' { - a b c d - d c b a - } - \layout { - raggedright = ##t - \context { - \Staff - whichBar = #"" - \remove "Time_signature_engraver" - } - } -} - - - diff --git a/input/lsr/guitar/AAA-intro.ly b/input/lsr/guitar/AAA-intro.ly index 4997892c3c..9a05820556 100644 --- a/input/lsr/guitar/AAA-intro.ly +++ b/input/lsr/guitar/AAA-intro.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.0" \header{ texidoc = " diff --git a/input/lsr/guitar/faking-a-hammer-in-tablatures.ly b/input/lsr/guitar/faking-a-hammer-in-tablatures.ly deleted file mode 100644 index 70afad63a6..0000000000 --- a/input/lsr/guitar/faking-a-hammer-in-tablatures.ly +++ /dev/null @@ -1,19 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -A hammer in tablature can be faked with slurs. -" } - -\score{ -\context TabStaff - << - \relative c''{ - c(d) - d(d) - d(c) - } - >> -} - -%%some weird letters are displayed in the Staff; can't reproduce it at home... --vv diff --git a/input/lsr/guitar/fret-diagrams.ly b/input/lsr/guitar/fret-diagrams.ly deleted file mode 100644 index fefae6ce38..0000000000 --- a/input/lsr/guitar/fret-diagrams.ly +++ /dev/null @@ -1,59 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This snippets shows many possibilities for obtaining and tweaking fret -diagrams. -" } - -\paper { - - %% stretch to prevent diagrams from colliding. - line-width = 18.0 \cm -} - - -<< - \chords {s2 c c c d} - - \new Voice =mel { - - %% A chord for ukelele - a'2 ^\markup - \override #'(string-count . 4) { - \override #'(dot-color . white) { - \fret-diagram #"4-2-2;3-1-1;2-o;1-o;"}} - - %% C major for guitar, barred on third fret - c' ^\markup - \override #'(number-type . roman-lower) { % lower-case roman numeral fret label - \override #'(size . 1.1) { % 110% of default size - \override #'(finger-code . below-string) { % string labels below strings - \override #'(barre-type . straight) { % straight barre - \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}} - %% C major for guitar, barred on third fret - c' ^\markup - \override #'(number-type . arabic) { % lower-case roman numeral fret label - \override #'(dot-color . white) { % white dots - \override #'(finger-code . in-dot) { % string labels in dots - \override #'(barre-type . curved) { % straight barre - \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}} - %% C major for guitar, barred on third fret - c' ^\markup - \override #'(number-type . roman-upper) { % upper-case roman numeral fret label - \override #'(label-dir . -1) { % label fret at left side of diagram - \override #'(finger-code . in-dot) { % string labels in dots - \override #'(barre-type . curved) { % curved barre - \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}} - - %% simple D chord - - d' ^\markup - \override #'(finger-code . below-string) { - \override #'(dot-radius . 0.35) { - \override #'(dot-position . 0.5) { - \override #'(fret-count . 5) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }}}} - - } ->> diff --git a/input/lsr/guitar/guitar-string-number.ly b/input/lsr/guitar/guitar-string-number.ly deleted file mode 100644 index 6ac7b2a0f8..0000000000 --- a/input/lsr/guitar/guitar-string-number.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -String numbers can be added to chords. They use the same positioning -mechanism as finger instructions. -" } - -\paper { - ragged-right = ##t -} - -\relative { - - c4 - \set fingeringOrientations = #'(down left up) - \set stringNumberOrientations = #'(down right up) - - -} diff --git a/input/lsr/instrument/AAA-intro.ly b/input/lsr/instrument/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/instrument/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/instrument/GNUmakefile b/input/lsr/instrument/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/instrument/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/instrument/SConscript b/input/lsr/instrument/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/instrument/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/instrument/adding-drum-parts.ly b/input/lsr/instrument/adding-drum-parts.ly deleted file mode 100644 index 5bf80e3e3b..0000000000 --- a/input/lsr/instrument/adding-drum-parts.ly +++ /dev/null @@ -1,45 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -LilyPond makes drums input quite easy, with powerful pre-configured -tools such as the \drummode function and the DrumStaff context: drums -are placed to their own staff positions (with a special clef symbol) -and have note heads according to the drum. You can easily attach an -extra symbol to the drum, and restrict the number of lines. -" } - -drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } -drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } -timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb} } - -\score { - \repeat "volta" 2 { - << - \new DrumStaff \with { - drumStyleTable = #timbales-style - \override StaffSymbol #'line-count = #2 - \override BarLine #'bar-size = #2 - } << - \set Staff.instrumentName = "timbales" - \timb - >> - \new DrumStaff << - \set Staff.instrumentName = "drums" - \new DrumVoice {\stemUp \drh } - \new DrumVoice {\stemDown \drl } - >> - >> - } - \layout {} - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 120 4) - } - } - - -} - diff --git a/input/lsr/instrument/score-for-diatonic-accordion.ly b/input/lsr/instrument/score-for-diatonic-accordion.ly deleted file mode 100644 index 9ead0e537b..0000000000 --- a/input/lsr/instrument/score-for-diatonic-accordion.ly +++ /dev/null @@ -1,419 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\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. -" } - -% 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/nonmusic/AAA-intro.ly b/input/lsr/nonmusic/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/nonmusic/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/nonmusic/GNUmakefile b/input/lsr/nonmusic/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/nonmusic/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/nonmusic/SConscript b/input/lsr/nonmusic/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/nonmusic/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/nonmusic/aligning-and-centering-instrument-names.ly b/input/lsr/nonmusic/aligning-and-centering-instrument-names.ly deleted file mode 100644 index 50bd9c546d..0000000000 --- a/input/lsr/nonmusic/aligning-and-centering-instrument-names.ly +++ /dev/null @@ -1,52 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Instrument names are generally printed at the left side of the staves. -To align the names of several different intruments, you can put them in -a \markup block and use one of the following possibilites: - - -* - Right-aligned instrument names: this is LilyPond's default behavior - -* - Center-aligned instrument names: with the \hcenter-in #n syntax, you - can place the instrument names inside a padded box (n being the width - of the box) - -* - Left-aligned instrument names: you have to print the names on top of an - empty box, using the \combine command - with a \hspace #n object. - - -" } - -\paper{ - indent = #0 - left-margin = #30 - line-width = #160 -} - -\new StaffGroup \relative -<< - \new Staff { - \set Staff.instrumentName = "blabla" - c1^"default" c1 \break - \set Staff.instrumentName = \markup { \hcenter-in #10 "blabla" } - c1^"centered" c1 \break - \set Staff.instrumentName = \markup {\combine \hspace #8 "blabla" } - c1^"left-aligned" c1 - - } - \new Staff { - \set Staff.instrumentName = "blo" - c1 c1 \break - \set Staff.instrumentName = \markup { \hcenter-in #10 "blo" } - c1 c1 \break - \set Staff.instrumentName = \markup {\combine \hspace #8 "blo" } - c1 c1 - } - ->> diff --git a/input/lsr/nonmusic/all-headers.ly b/input/lsr/nonmusic/all-headers.ly deleted file mode 100644 index abfeee42c3..0000000000 --- a/input/lsr/nonmusic/all-headers.ly +++ /dev/null @@ -1,48 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -A demonstration of all headers. -" } - -\header { -copyright = "copyright" -title = "title" -subtitle = "subtitle" -composer = "composer" -arranger = "arranger" -instrument = "instrument" -metre = "metre" -opus = "opus" -piece = "piece" -poet = "poet" -texidoc = "All header fields with special meanings." - copyright = "public domain" - enteredby = "jcn" - source = "urtext" - -} - - -\score { - \relative c'' { c1 c1 c1 c1 } -} - -\score { - \relative c'' { c1 c1 c1 c1 } - - \header { - - title = "localtitle" - subtitle = "localsubtitle" - composer = "localcomposer" - arranger = "localarranger" - instrument = "localinstrument" - metre = "localmetre" - opus = "localopus" - piece = "localpiece" - poet = "localpoet" - copyright = "localcopyright" - } -} - diff --git a/input/lsr/nonmusic/clip-systems.ly b/input/lsr/nonmusic/clip-systems.ly deleted file mode 100644 index 66e8e79428..0000000000 --- a/input/lsr/nonmusic/clip-systems.ly +++ /dev/null @@ -1,86 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\header { - texidoc = "Clipping snippets from a finished score - -Notes: - -@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 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}. -" - -} - -\version "2.11.23" - -#(ly:set-option 'clip-systems) - -#(set! output-count 1) - -origScore = \score{ - \relative { - \set Staff.instrumentName = #"bla" - c1 - d - \grace c16 - e1 - \key d\major - - f - \break \clef bass - g, - fis - } -} - -\book { - \score { - \origScore - \layout { - - %% each clip-region is a (START . END) pair - %% where both are rhythmic-locations. - - %% (make-rhythmic-locations BAR-NUMBER NUM DEN) - %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER - - clip-regions - = #(list - (cons - (make-rhythmic-location 2 0 1) - (make-rhythmic-location 4 0 1)) - - (cons - (make-rhythmic-location 0 0 1) - (make-rhythmic-location 4 0 1)) - - (cons - (make-rhythmic-location 0 0 1) - (make-rhythmic-location 6 0 1)) - ) - } - } -} - -#(set! output-count 0) -#(ly:set-option 'clip-systems #f) - -\book { - \score { \origScore } - \markup { \bold \fontsize #6 clips } - \score { - \lyrics { - \markup { from-2.0.1-to-4.0.1-clip.eps } - \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) } - } - } -} diff --git a/input/lsr/nonmusic/modifying-default-font-properties-for-piece-titles.ly b/input/lsr/nonmusic/modifying-default-font-properties-for-piece-titles.ly deleted file mode 100644 index 667bbbebf6..0000000000 --- a/input/lsr/nonmusic/modifying-default-font-properties-for-piece-titles.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If you have multiple pieces (e.g. Kyrie, Gloria, Credo, etc. in masses) -in a large work, you can use multiple \score parts and use the piece -header field to supply a title for each of the pieces. However, the -font is very small. You can either directly put the markup into the -piece=... header field, or better re-define the scoreTitleMarkup -function in the \paper section. -" } - -\header { - title = "Formatting of piece headers" -} -\paper { - scoreTitleMarkup = \markup { \column { - \on-the-fly #print-all-headers { \bookTitleMarkup \hspace #1 } - \fill-line { - \fontsize #3 \bold \fromproperty #'header:piece - \fromproperty #'header:opus - } - }} -} - -\markup { \fill-line { -\justify-string #"If you have multiple pieces in a large work, you can use multiple score parts and use the piece header field to supply a title for each of the pieces. However, the font is very small. You can either directly put the markup into the piece=... header field, or better re-define the scoreTitleMarkup function in the paper section."} } - -\score { - \context Staff << { c'1 | R1 } >> - \header{ piece="Piece 1" } -} - -\score { - \context Staff << { c'1 | R1 } >> - \header{ piece="Piece 2" } -} - diff --git a/input/lsr/nonmusic/printing-the-full-title-on-several-scores-in-the-same-file..ly b/input/lsr/nonmusic/printing-the-full-title-on-several-scores-in-the-same-file..ly deleted file mode 100644 index e61902d921..0000000000 --- a/input/lsr/nonmusic/printing-the-full-title-on-several-scores-in-the-same-file..ly +++ /dev/null @@ -1,47 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -By default, only the piece and opus fields from the \header@{...@} -block are typeset above each separate score, if you have multiple -\score@{...@} blocks in your input file. - -As is mentioned in the manual, you can change this by setting the paper -variable printallheaders, so that the full title is printed over each -score. The corresponding \header@{...@} block should then be included -within the corresponding \score@{...@} block, otherwise you will get -an additional title (the title for the full book) above the first -individual score title. This example shows how to get rid of the extra -book level title. Note that a top level \header@{...@} block is useful -if some titling information is the same for all scores and you do not -want to repeat the information several times in the input file. - - -" } - -\header{ - composer = "The One and Only" -} - - - -\score{ -{c' d' e' f'} -\header{ - title = "First piece" -} -} - -\score{ -{c' d' e' f'} -\header{ - title = "Second piece" -} -} - -\paper{ - printallheaders=##t - bookTitleMarkup = ##f -} - - diff --git a/input/lsr/nonmusic/toc.ly b/input/lsr/nonmusic/toc.ly deleted file mode 100644 index 8b988ea4b7..0000000000 --- a/input/lsr/nonmusic/toc.ly +++ /dev/null @@ -1,30 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.26" - -\header { - texidoc = "A table of contents is included using -@code{\\markuplines \\table-of-contents}. The toc items are added with -the @code{\\tocItem} command." -} - -#(set-default-paper-size "a6") - -\book { - \markuplines \table-of-contents - \pageBreak - - \tocItem \markup "The first score" - \score { - { - c'1 \pageBreak - \mark "A" \tocItem \markup "Mark A" - d' - } - } - \pageBreak - \tocItem \markup "The second score" - \score { - { e' } - \header { piece = "Second score" } - } -} \ No newline at end of file diff --git a/input/lsr/parts/AAA-intro.ly b/input/lsr/parts/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/parts/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/parts/GNUmakefile b/input/lsr/parts/GNUmakefile deleted file mode 100644 index 3819fda13a..0000000000 --- a/input/lsr/parts/GNUmakefile +++ /dev/null @@ -1,15 +0,0 @@ -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/parts/SConscript b/input/lsr/parts/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/parts/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/parts/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/parts/display-bracket-with-only-one-staff-in-a-system.ly deleted file mode 100644 index e73d2592bb..0000000000 --- a/input/lsr/parts/display-bracket-with-only-one-staff-in-a-system.ly +++ /dev/null @@ -1,42 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If there is only one staff in one of the staff types ChoirStaff, -InnerChoirStaff, InnerStaffGroup and StaffGroup, the bracket won't be -displayed as standard behaviour. This can be changed with: - - -@code{\override [staffcontext].SystemStartBracket #'collapse-height = -#1} - - -This applies to all staff contexts with -@code{systemStartDelimiter}-property set to @code{'SystemStartBracket}. - - -For staff contexts with @code{'SystemStartBrace}, such as -@code{PianoStaff}, this tweaking can be used as well. -" } - -\score { - \new StaffGroup << - % Must be one lower than your actual amount off staff lines - \override StaffGroup.SystemStartBracket #'collapse-height = #4 - \new Staff { - c'4 d' e' f' - } - >> - } - { - \new PianoStaff << - \override PianoStaff.SystemStartBrace #'collapse-height = #4 - \new Staff { - c'4 d' e' f' - } - >> - } - \layout { - ragged-right = ##t - indent = 0\cm - } diff --git a/input/lsr/parts/forcing-visibility-of-systems-with-multi-bar-rests-when-using--removeemptystaffcontext.ly b/input/lsr/parts/forcing-visibility-of-systems-with-multi-bar-rests-when-using--removeemptystaffcontext.ly deleted file mode 100644 index 638bbd7ba0..0000000000 --- a/input/lsr/parts/forcing-visibility-of-systems-with-multi-bar-rests-when-using--removeemptystaffcontext.ly +++ /dev/null @@ -1,90 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -In an orchestral score, you may find it useful to hide multi-bar rests -using @code{\RemoveEmptyStaffContext} to produce a \"Frenched\" score, -but this can prove problematic when you want to make such bars visible. - - -For example, imagine you are using a @code{PianoStaff} for a harp part. -When there is music in one stave, you will want both staves to be -visible. Of course, adding hidden notes to the invisible staff will -make the stave visible, but this is a rather ugly kludge. - - -A more elegant solution is to use the property -@code{keepAliveInterfaces}. This determines which items of musical -output are interesting enough to keep a bar visible when -@code{remove-empty} is set. By default, it looks like this: - - -@code{keepAliveInterfaces = #'( - rhythmic-grob-interface - lyric-interface - stanza-number-interface - percent-repeat-interface)} - - -If you insert @code{multi-measure-rest-interface} into this list, -multi-bar rests count as interesting items. You can then create macros -to switch this behaviour on and off as required: - - -@code{showMultiRests = @{ \set Staff.keepAliveInterfaces = #'( - rhythmic-grob-interface - multi-measure-rest-interface - lyric-interface - stanza-number-interface - percent-repeat-interface) @}} - - -@code{hideMultiRests = \unset Staff.keepAliveInterfaces} - - -For this to work successfully, you must place these macros carefully, -otherwise they tend to interfere with the visibility of other hidden -staves. -" } - -showMultiRests = { \set Staff.keepAliveInterfaces = #'( - rhythmic-grob-interface - multi-measure-rest-interface - lyric-interface - stanza-number-interface - percent-repeat-interface) -} -hideMultiRests = \unset Staff.keepAliveInterfaces -one = { \repeat unfold 4 { a1 b c' d' \break } - R1 \showMultiRests R R \hideMultiRests R \break %Macro positioning is critical - overrides are inside each system, - R1*4 \break %i.e. after first rest and before last - R -} -two = { \override MultiMeasureRest #'color = #red - R1*4 - R1 \showMultiRests R R \hideMultiRests R - R1*4 - R - R1 \showMultiRests R R R - R R R \hideMultiRests R - R1*4 -} -three = { \override MultiMeasureRest #'color = #blue - R1*4 - R - R1 \showMultiRests R R \hideMultiRests R - R1*4 - R1 \showMultiRests R R \hideMultiRests R - R1*4 - R1 \showMultiRests R R R -} -\score { - \new StaffGroup << - \context Staff = one \one - \context Staff = two \two - \context Staff = three \three - >> - \layout { - \context { \RemoveEmptyStaffContext } - } -} diff --git a/input/lsr/parts/hiding-staves-with-rests-only-for-some-all-voices.ly b/input/lsr/parts/hiding-staves-with-rests-only-for-some-all-voices.ly deleted file mode 100644 index 0c4e926f6b..0000000000 --- a/input/lsr/parts/hiding-staves-with-rests-only-for-some-all-voices.ly +++ /dev/null @@ -1,76 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If you have a choir score, or an orchestral score, where some voices -are quiet for a long time, you might want to hide staves containing -nothing (or only multi-measure rests). By default, lilypond will show -all staves, even if they only contain rests. To change this into what -is sometimes called a \"French Score\" style, simply add the -\RemoveEmptyStaffContext variable, in a \context block, to your \layout. - -The first system would still show all staves for all voices. To force -this setting to also apply to the first system of a score, set -#'remove-first of VerticalAxisGroup to ##t. - -If only one staff is displayed, the choir or the StaffGroup bracket -would also be hidden, so you will probably need to set -#'collapse-height of SystemStartBracket to #1 (or anything smaller than -5, which is the usual number of lines in a staff, see also snippet -\"Display bracket with only one stave in the system\"). - -If you have some voices where you still want to display all (even -empty) staves, you need to set the remove-empty property of the -VerticalAxisGroup to true for that one staff only. You can do this in -the \with section of the staff (in this example, the alto staff will -never erase empty lines, while the soprano staff will). -" } - -sop = \relative c'' { - R1*2 |\break - c4 c c c | R1 |\break - R1*2 | \break - R1*2 |\break - c4 c c c | R1 \bar"|." -} - -alt = \relative c'' { - g4 g g g | R1 | \break | - R1*2 | \break - R1*2 | \break - g4 g g g | R1 | \break | - g4 g g g | R1 \bar"|." -} - -\layout { - \context { - % add the RemoveEmptyStaffContext that erases rest-only staves - \RemoveEmptyStaffContext - } - \context { - \Score - % Remove all-rest staves also in the first system - \override VerticalAxisGroup #'remove-first = ##t - } - \context { - \ChoirStaff - % If only one non-empty staff in a system exists, still print the backet - \override SystemStartBracket #'collapse-height = #1 - } -} - -\score{ - \context ChoirStaff << - \context Staff=soprano << - \sop - \set Staff.shortInstrumentName = "S" - >> - % never remove empty staves from the alto staff: - \context Staff=alto \with { \override VerticalAxisGroup #'remove-empty = ##f } - << - \alt - \set Staff.shortInstrumentName = "A" - >> - >> -} - diff --git a/input/lsr/parts/quote-transposition.ly b/input/lsr/parts/quote-transposition.ly deleted file mode 100644 index 022b537c15..0000000000 --- a/input/lsr/parts/quote-transposition.ly +++ /dev/null @@ -1,45 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\header -{ - - 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. " - -} - -\version "2.11.23" - -\layout { ragged-right = ##t } - - -\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/parts/quote.ly b/input/lsr/parts/quote.ly deleted file mode 100644 index 3a482829f7..0000000000 --- a/input/lsr/parts/quote.ly +++ /dev/null @@ -1,42 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\header -{ - - 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 rests is not quoted, since -@code{rest-event} is not in @code{quotedEventTypes}." - -} -\version "2.11.23" -\layout { - ragged-right = ##t -} - - -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/parts/rehearsal-mark-numbers.ly b/input/lsr/parts/rehearsal-mark-numbers.ly deleted file mode 100644 index 3af997e061..0000000000 --- a/input/lsr/parts/rehearsal-mark-numbers.ly +++ /dev/null @@ -1,30 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Marks can be printed as numbers. - - -By setting @code{markFormatter} we may choose a different style of mark -printing. Also, marks can be specified manually, with a markup -argument. -" } - -\paper { - ragged-right = ##t -} - -\relative c''{ - \set Score.markFormatter = #format-mark-numbers - c1 | \mark \markup { \musicglyph #"scripts.coda" } - c1 | \mark \default - c1 | \mark \default - \set Score.markFormatter - = #(lambda (mark context) - (make-box-markup (format-mark-numbers mark context))) - c1 | \mark \default - \set Score.markFormatter - = #(lambda (mark context) - (make-circle-markup (format-mark-numbers mark context))) - c1 | \mark \default -} diff --git a/input/lsr/parts/tag-filter.ly b/input/lsr/parts/tag-filter.ly deleted file mode 100644 index 8e455070b5..0000000000 --- a/input/lsr/parts/tag-filter.ly +++ /dev/null @@ -1,48 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The @code{\tag} command marks music expressions with a name. These -tagged expressions can be filtered out later. This mechanism can be -used to make different versions of the same music. In this example, the -top stave displays the music expression with all tags included. The -bottom two staves are filtered: the part has cue notes and fingerings, -but the score has not. -" } - -\layout { - ragged-right= ##t -} - -common = -\relative c'' { - c1 - \relative c' << - \tag #'part << - R1 \\ - { - \set fontSize = #-1 - c4_"cue" f2 g4 } - >> - \tag #'score R1 - >> - c1-\tag #'part ^4 -} - - -\simultaneous { - \new Staff { - \set Staff.instrumentName = #"both" - \common - } - \new Staff { - \set Staff.instrumentName = #"part" - \keepWithTag #'part \common - } - \new Staff { - \set Staff.instrumentName = #"score" - \keepWithTag #'score \common - } -} - - diff --git a/input/lsr/parts/tempo-mark-scheme-function.ly b/input/lsr/parts/tempo-mark-scheme-function.ly deleted file mode 100644 index 67864ceab0..0000000000 --- a/input/lsr/parts/tempo-mark-scheme-function.ly +++ /dev/null @@ -1,25 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This is a Scheme function which prints a tempo mark such as - Fast (♩= 222) -" } - -tempoMark = - #(define-music-function (parser location prependText notevalue appendText) (string? string? string?) - #{ - \mark \markup - { \line { $prependText " (" \fontsize #-2 \general-align #Y #DOWN \note #$notevalue #1 $appendText ) } } - #}) - -theMusic = -{ - \once \override Score.RehearsalMark #'self-alignment-X = #-1 - \time 4/4 \tempoMark "Fast" "4" "= 220-222" s1 -} - -\score -{ - \theMusic -} diff --git a/input/lsr/parts/transposing-and-naming-instrument-groups.ly b/input/lsr/parts/transposing-and-naming-instrument-groups.ly deleted file mode 100644 index bb62d3f75f..0000000000 --- a/input/lsr/parts/transposing-and-naming-instrument-groups.ly +++ /dev/null @@ -1,160 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -In an orchestral score (Beethoven's Coriolan overture), there are -different instrument groups, and some of the instruments may be -transposed. Instruments are indicated either with a long or short name. - - -" } - -\header { - title = "Ouvertûre" - subtitle = "Zu Heinrich Joseph v. Collins Trauerspiel" - subsubtitle = \markup { \large \bold "Coriolan" } - opus = "Op. 62" - piece = \markup { \large Allegro con brio } - composer = "Ludwig van Beethoven (1770-1827)" -} - -#(set-global-staff-size 16) - -raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat } - -flauti = \relative c' { - \set Staff.instrumentName = #"2 Flauti " - \set Staff.shortInstrumentName = #"Fl. " - \time 4/4 - c1 - \break c -% \break c -% \break c - \bar"|." -} - -oboi = \relative c' { - \set Staff.instrumentName = #"2 Oboi " - \set Staff.shortInstrumentName = #"Ob. " - c1 c -} - -clarinetti = \relative c' { - \set Staff.instrumentName = \markup { \column { "Clarinetti " -\line { "in B" \raisedFlat } } } - \set Staff.shortInstrumentName = \markup { \smaller { "Cl(B" -\raisedFlat ") " } } - - c1 c -} - -fagotti = \relative c { - \set Staff.instrumentName = #"2 Fagotti " - \set Staff.shortInstrumentName = #"Fg. " - \clef bass - c1 c -} - -corni = \relative c' { - \set Staff.instrumentName = \markup { \column { "Corni " \line { -"in E" \raisedFlat } } } - \set Staff.shortInstrumentName = \markup { \smaller { "Cor(E" -\raisedFlat ") " } } - c1 c -} - -trombe = \relative c' { - \set Staff.instrumentName = \markup \column { "2 Trombe " "(C) " } - \set Staff.shortInstrumentName = \markup \column { "Tbe. " "(C) " } - c1 c -} - -timpani = \relative c { - \set Staff.instrumentName = \markup \column { "Timpani " "(C-G) " } - \set Staff.shortInstrumentName = #"Timp. " - \clef bass - c1 c -} - -violinoI = \relative c' { - \set Staff.instrumentName = #"Violino I " - \set Staff.shortInstrumentName = #"Vl. I " - c1 c -} - -violinoII = \relative c' { - \set Staff.instrumentName = #"Violino II " - \set Staff.shortInstrumentName = #"Vl. II " - c1 c -} - -viola = \relative c' { - \set Staff.instrumentName = #"Viola " - \set Staff.shortInstrumentName = #"Vla. " - \clef alto - c1 c -} - -violoncello = \relative c { - \set Staff.instrumentName = \markup \column { "Violoncello " "e" -"Contrabasso " } - \set Staff.shortInstrumentName = \markup \column { "Vc. " "Cb. " } - \clef bass - c1 c -} - - -\paper { - indent=10.0\mm - line-width=150.0\mm - ragged-bottom = ##t -} - -#(set-global-staff-size 16) -\book { - \score { - << \override Score.VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 6) - \new StaffGroup = "legni" << - \new Staff = "flauti" \flauti - \new Staff = "oboi" \oboi - \new Staff = "clarinetti" \clarinetti - \new Staff = "fagotti" \fagotti - >> - \new StaffGroup = "ottoni" << - \new Staff = "corni" \corni - \new Staff = "trombe" \trombe - >> - \new StaffGroup = "timpani" << - \new Staff = "timpani" \timpani - { - \skip 1 - % Hmm: this forces a staff-bracket, that's good! - % However, I can't find where is decided on staff-bracket yes/no - } - >> - \new StaffGroup = "archi" << - \new GrandStaff = "violini" << - \new Staff = "violinoI" \violinoI - \new Staff = "violinoII" \violinoII - >> - \new Staff = "viola" \viola - \new Staff = "violoncello" \violoncello - >> - >> - \layout { - \context { - \RemoveEmptyStaffContext - } - \context { - \Score - \override TimeSignature #'style = #'C - } - } - } - % this is ignored? - \paper { - indent=10.0\mm - line-width=150.0\mm - } -} - diff --git a/input/lsr/real-music/AAA-intro.ly b/input/lsr/real-music/AAA-intro.ly deleted file mode 100644 index 93c62a94e3..0000000000 --- a/input/lsr/real-music/AAA-intro.ly +++ /dev/null @@ -1,16 +0,0 @@ -\version "2.10.0" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/real-music/GNUmakefile b/input/lsr/real-music/GNUmakefile deleted file mode 100644 index 3819fda13a..0000000000 --- a/input/lsr/real-music/GNUmakefile +++ /dev/null @@ -1,15 +0,0 @@ -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/real-music/SConscript b/input/lsr/real-music/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/real-music/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/real-music/creating-music-with-scheme.ly b/input/lsr/real-music/creating-music-with-scheme.ly deleted file mode 100644 index 9f85797483..0000000000 --- a/input/lsr/real-music/creating-music-with-scheme.ly +++ /dev/null @@ -1,93 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This example shows prelude in C major of WTK1, but coded using Scheme -functions to avoid typing work. -" } - -\version "2.11.23" - -\include "deutsch.ly" -#(define (transform music) - (let* ((es (ly:music-property music 'elements)) - (n (ly:music-property music 'name))) - (if (not (equal? n 'SequentialMusic)) - (ly:warning "transform needs SequentialMusic, got ~a" n) - (begin - (let recurse ((elts es)) - (if (not (equal? elts '())) - (begin - ((trans (ly:music-property (cadr elts) 'elements)) (car -elts)) - (set-cdr! elts (cddr elts)) - (recurse (cdr elts)) - ))))) - music - )) - -#(define ((trans pitches) music) - (let* ((es (ly:music-property music 'elements)) - (e (ly:music-property music 'element)) - (p (ly:music-property music 'pitch))) - - (if (pair? es) - (ly:music-set-property! - music 'elements - (map (trans pitches) es))) - - (if (ly:music? e) - (ly:music-set-property! - music 'element - ((trans pitches) e))) - - (if (ly:pitch? p) - (let* ((o (ly:pitch-octave p)) - (n (ly:pitch-notename p)) - (i (+ (* 7 o) n)) - (pes (ly:music-property (list-ref pitches i) 'elements)) - (pnew (ly:music-property (car pes) 'pitch)) - ) - (ly:music-set-property! music 'pitch pnew) - )) - music)) - - - - - - - -pat = \transpose c c' \repeat unfold 2 { - << { \context Staff = "up" {r8 e16 f g e f g } } - { \context Staff = "down" << - \context Voice = "vup" { \stemUp \tieUp r16 d8.~d4 } - \context Voice = "vdwn" { \stemDown c2 } - >> } - >> -} - -enda = { r8 f,16 a, c f c a, \stemUp c \change Staff = down - a, f, a, f, d, f, d, \change Staff = up \stemNeutral - r8 g16 h d' f' d' h d' h g h d f e\prall d 1^\fermata \bar -"|." -} -endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar -"|."} -endc = {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } - -\score { - \transpose c c' \context PianoStaff << - \new Staff = "up" { \clef "G" } - \new Staff = "down" { \clef "F" } - { \applyMusic #transform { - \pat {c e g c' e' } - \pat {c d a d' f' } - } - % Etc, we get the idea now - } - >> -} - - - diff --git a/input/lsr/real-music/inserting-score-fragments-above-the-staff,-as-markups.ly b/input/lsr/real-music/inserting-score-fragments-above-the-staff,-as-markups.ly deleted file mode 100644 index 375486fac2..0000000000 --- a/input/lsr/real-music/inserting-score-fragments-above-the-staff,-as-markups.ly +++ /dev/null @@ -1,33 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The \\markup command is quite versatile. In this snippet, it contains a -\\score bloc instead of texts or marks. -" } - -tuning = \markup { - \score { - \new Staff \with { - \remove Time_signature_engraver - } { - \clef bass 1 - } - \layout { ragged-right = ##t } - } -} - - -\header { - title = "Solo Cello Suites" - subtitle = "Suite IV" - subsubtitle = \markup { "Originalstimmung:" \tuning } -} - -\relative { - \time 4/8 - \times 2/3 { c'8 d e } \times 2/3 {c d e} - \times 2/3 { c8 d e } \times 2/3 {c d e} - g8 a8 g8 a - g8 a8 g8 a -} diff --git a/input/lsr/real-music/score-for-diatonic-accordion.ly b/input/lsr/real-music/score-for-diatonic-accordion.ly deleted file mode 100644 index 9ead0e537b..0000000000 --- a/input/lsr/real-music/score-for-diatonic-accordion.ly +++ /dev/null @@ -1,419 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\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. -" } - -% 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/scheme/AAA-intro.ly b/input/lsr/scheme/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/scheme/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/scheme/GNUmakefile b/input/lsr/scheme/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/scheme/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/scheme/SConscript b/input/lsr/scheme/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/scheme/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/scheme/adding-extra-fingering-with-scheme.ly b/input/lsr/scheme/adding-extra-fingering-with-scheme.ly deleted file mode 100644 index b63679e702..0000000000 --- a/input/lsr/scheme/adding-extra-fingering-with-scheme.ly +++ /dev/null @@ -1,42 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -You can add various stuff to notes using @code{make-music}. In this -example, an extra fingering is attached to a note. - - -In general, first do a @code{display} of the music you want to create, -then write a function that will structure the music for you. - - -" } - -#(define (make-text-script x) - (make-music 'TextScriptEvent - 'direction DOWN - 'text (make-simple-markup x))) - -#(define (add-text-script m x) - (if (equal? (ly:music-property m 'name) 'EventChord) - (set! (ly:music-property m 'elements) - (cons (make-text-script x) - (ly:music-property m 'elements))) - (let ((es (ly:music-property m 'elements)) - (e (ly:music-property m 'element))) - (map (lambda (y) (add-text-script y x)) es) - (if (ly:music? e) - (add-text-script e x)))) - m) - -addScript = -#(define-music-function (parser location script music ) - ( string? ly:music? ) - (add-text-script music script)) - -\score { - { - \addScript "6" { c'4-3 } - } -} - diff --git a/input/lsr/scheme/adding-staccato-dots.ly b/input/lsr/scheme/adding-staccato-dots.ly deleted file mode 100644 index 08f19ae10f..0000000000 --- a/input/lsr/scheme/adding-staccato-dots.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Using @code{make-music}, you can add various stuff to notes. In this -example staccato dots are added to the notes. For this simple case, it -is not necessary to use scm constructs. - - -" } - -#(define (make-script x) - (make-music 'ArticulationEvent - 'articulation-type x)) - -#(define (add-script m x) - (if - (equal? (ly:music-property m 'name) 'EventChord) - (set! (ly:music-property m 'elements) - (cons (make-script x) - (ly:music-property m 'elements)))) - m) - -#(define (add-staccato m) - (add-script m "staccato")) - -addStacc = -#(define-music-function (parser location music) - (ly:music?) - (music-map add-staccato music)) - -\score { - \relative c'' { - a b \addStacc { c c } - } - \layout{ ragged-right = ##t } -} - diff --git a/input/lsr/scheme/automatically-durations-diminution.ly b/input/lsr/scheme/automatically-durations-diminution.ly deleted file mode 100644 index bd4447e5a2..0000000000 --- a/input/lsr/scheme/automatically-durations-diminution.ly +++ /dev/null @@ -1,29 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If you want to see what a piece looks like twice faster, or slower, -without having to correct every duration manually, here is an easy way -to do it. -" } - -\paper { indent = 0 } - - -music = {a4. b4 c b8 a g a4 b8 a} - -looksFaster = #(define-music-function (parser location music) - (ly:music?) - (let ((new-music (ly:music-deep-copy music))) - (shift-duration-log new-music 1 0) - new-music)) - -looksSlower = #(define-music-function (parser location music) - (ly:music?) - (let ((new-music (ly:music-deep-copy music))) - (shift-duration-log new-music -1 0) - new-music)) - -\score { \new Voice { \time 7/8 \music -\break \looksFaster { \time 7/16 \music } -\break \looksSlower { \time 7/4 \music }}} diff --git a/input/lsr/scheme/changing-properties-for-individual-grobs.ly b/input/lsr/scheme/changing-properties-for-individual-grobs.ly deleted file mode 100644 index 28520366df..0000000000 --- a/input/lsr/scheme/changing-properties-for-individual-grobs.ly +++ /dev/null @@ -1,53 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The @code{\applyOutput} command gives you the ability to tune any -layout object, in any context. It requires a Scheme function with three -arguments; advanced users can write it quite easily, whereas new users -may want to use pre-defined functions such as this snippet, or the -example in the manual. -" } - -% **************************************************************** -% ly snippet: -% **************************************************************** - -\layout { - ragged-right = ##t -} - -#(define (mc-squared gr org cur) - (let* - ( - (ifs (ly:grob-interfaces gr)) - (sp (ly:grob-property gr 'staff-position)) - ) - (if (memq 'note-head-interface ifs) - (begin - (ly:grob-set-property! gr 'stencil ly:text-interface::print) - (ly:grob-set-property! gr 'font-family 'roman) - (ly:grob-set-property! gr 'text - (make-raise-markup -0.5 - (case sp - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla")) - )))) - ))) - -\context Voice \relative c' { - \stemUp - \set autoBeaming = ##f - - { 8 - - \applyOutput #'Voice #mc-squared - - } -} - -% **************************************************************** -% end ly snippet -% **************************************************************** diff --git a/input/lsr/scheme/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/scheme/creating-a-sequence-of-notes-on-various-pitches.ly deleted file mode 100644 index daaa0c9884..0000000000 --- a/input/lsr/scheme/creating-a-sequence-of-notes-on-various-pitches.ly +++ /dev/null @@ -1,61 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -In music that contains many occurrences of the same sequence of notes -at different pitches, you can use the following music function. It -takes a note, of which the pitch is used. The supporting Scheme -functions were borrowed from the Tips and Tricks document in the manual. - -This example creates the rhythm used throughout Mars, from The Planets, -by Gustav Holst. -" } - -#(define (make-note-req p d) - (make-music 'NoteEvent - 'duration d - 'pitch p)) - -#(define (make-note p d) - (make-music 'EventChord - 'elements (list (make-note-req p d)))) - -#(define (seq-music-list elts) - (make-music 'SequentialMusic - 'elements elts)) - -#(define (make-triplet elt) - (make-music 'TimeScaledMusic - 'denominator 3 - 'numerator 2 - 'element elt)) - - -rhythm = #(define-music-function (parser location note) (ly:music?) - "Make the rhythm in Mars (the Planets) at the given note's pitch" - (let* ((p (ly:music-property - (car (ly:music-property note 'elements)) - 'pitch))) - (seq-music-list (list - (make-triplet (seq-music-list (list - (make-note p (ly:make-duration 3 0 2 3)) - (make-note p (ly:make-duration 3 0 2 3)) - (make-note p (ly:make-duration 3 0 2 3)) - ))) - (make-note p (ly:make-duration 2 0)) - (make-note p (ly:make-duration 2 0)) - (make-note p (ly:make-duration 3 0)) - (make-note p (ly:make-duration 3 0)) - (make-note p (ly:make-duration 2 0)) - )))) - -\score { - \new Staff { - \time 5/4 - - \rhythm c' - \rhythm c'' - \rhythm g - } -} - diff --git a/input/lsr/scheme/creating-music-with-scheme.ly b/input/lsr/scheme/creating-music-with-scheme.ly deleted file mode 100644 index 9f85797483..0000000000 --- a/input/lsr/scheme/creating-music-with-scheme.ly +++ /dev/null @@ -1,93 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This example shows prelude in C major of WTK1, but coded using Scheme -functions to avoid typing work. -" } - -\version "2.11.23" - -\include "deutsch.ly" -#(define (transform music) - (let* ((es (ly:music-property music 'elements)) - (n (ly:music-property music 'name))) - (if (not (equal? n 'SequentialMusic)) - (ly:warning "transform needs SequentialMusic, got ~a" n) - (begin - (let recurse ((elts es)) - (if (not (equal? elts '())) - (begin - ((trans (ly:music-property (cadr elts) 'elements)) (car -elts)) - (set-cdr! elts (cddr elts)) - (recurse (cdr elts)) - ))))) - music - )) - -#(define ((trans pitches) music) - (let* ((es (ly:music-property music 'elements)) - (e (ly:music-property music 'element)) - (p (ly:music-property music 'pitch))) - - (if (pair? es) - (ly:music-set-property! - music 'elements - (map (trans pitches) es))) - - (if (ly:music? e) - (ly:music-set-property! - music 'element - ((trans pitches) e))) - - (if (ly:pitch? p) - (let* ((o (ly:pitch-octave p)) - (n (ly:pitch-notename p)) - (i (+ (* 7 o) n)) - (pes (ly:music-property (list-ref pitches i) 'elements)) - (pnew (ly:music-property (car pes) 'pitch)) - ) - (ly:music-set-property! music 'pitch pnew) - )) - music)) - - - - - - - -pat = \transpose c c' \repeat unfold 2 { - << { \context Staff = "up" {r8 e16 f g e f g } } - { \context Staff = "down" << - \context Voice = "vup" { \stemUp \tieUp r16 d8.~d4 } - \context Voice = "vdwn" { \stemDown c2 } - >> } - >> -} - -enda = { r8 f,16 a, c f c a, \stemUp c \change Staff = down - a, f, a, f, d, f, d, \change Staff = up \stemNeutral - r8 g16 h d' f' d' h d' h g h d f e\prall d 1^\fermata \bar -"|." -} -endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar -"|."} -endc = {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } - -\score { - \transpose c c' \context PianoStaff << - \new Staff = "up" { \clef "G" } - \new Staff = "down" { \clef "F" } - { \applyMusic #transform { - \pat {c e g c' e' } - \pat {c d a d' f' } - } - % Etc, we get the idea now - } - >> -} - - - diff --git a/input/lsr/scheme/displaying-the-version-number-with-conditionals-if-then-using-scheme.ly b/input/lsr/scheme/displaying-the-version-number-with-conditionals-if-then-using-scheme.ly deleted file mode 100644 index ecacbf48b3..0000000000 --- a/input/lsr/scheme/displaying-the-version-number-with-conditionals-if-then-using-scheme.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Thanks to its implementation of GUILE, LilyPond makes high level -functionalities relatively easy to accomplish. - -In this example, the title will mention the current version (i.e. the -version the snippet was compiled with, regardless which \version was -originally used). -" } - -#(if (not (defined? 'pieceTagLine)) - (define pieceTagLine (string-append "You are running version " (lilypond-version)))) - -\header{ - title = \pieceTagLine -} - -{ c'4 } diff --git a/input/lsr/scheme/engraving-music-using-scheme-expressions.ly b/input/lsr/scheme/engraving-music-using-scheme-expressions.ly deleted file mode 100644 index c7b1e3bd62..0000000000 --- a/input/lsr/scheme/engraving-music-using-scheme-expressions.ly +++ /dev/null @@ -1,30 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -You can engrave music using just Scheme expressions. Although those -expressions reflect the inner mechanism of LilyPond, they are rather -clumsy to use, so avoid them, if possible. -" } - -#(define (make-note-req p d) - (make-music 'NoteEvent - 'duration d - 'pitch p)) - -#(define (make-note elts) - (make-music 'EventChord - 'elements elts)) - -#(define (seq-music-list elts) - (make-music 'SequentialMusic - 'elements elts)) - -fooMusic = #(seq-music-list - (list (make-note (list (make-note-req (ly:make-pitch 1 0 0) (ly:make-duration 2 0)))) - (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0)))))) - -\score { \fooMusic -} - - diff --git a/input/lsr/scheme/engraving-symmetric-or-palindromical-music.ly b/input/lsr/scheme/engraving-symmetric-or-palindromical-music.ly deleted file mode 100644 index 4c02be5ce8..0000000000 --- a/input/lsr/scheme/engraving-symmetric-or-palindromical-music.ly +++ /dev/null @@ -1,47 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Symmetric, or palindromical music can be produced, first, by printing -some music, and second, by printing the same music applying a Scheme -function to reverse the syntax. - - -" } - -#(define (reverse-music music) - (let* ((elements (ly:music-property music 'elements)) - (reversed (reverse elements)) - (e (ly:music-property music 'element)) - (span-dir (ly:music-property music 'span-direction))) - - (ly:music-set-property! music 'elements reversed) - - (if (ly:music? e) - (ly:music-set-property! - music 'element - (reverse-music e))) - - (if (ly:dir? span-dir) - (ly:music-set-property! music 'span-direction (- span-dir))) - - (map reverse-music reversed) - - music)) - -reverseMusic = -#(define-music-function (parser location m) (ly:music?) - (reverse-music m) - ) - -music = \relative c'' { c4 d4( e4 f4 } - -\score { -\context Voice { - \music - \reverseMusic \music - } - \layout { ragged-right = ##t} -} - - diff --git a/input/lsr/scheme/generating-random-notes.ly b/input/lsr/scheme/generating-random-notes.ly deleted file mode 100644 index b51fc6c362..0000000000 --- a/input/lsr/scheme/generating-random-notes.ly +++ /dev/null @@ -1,25 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This Scheme-based snippet allows you to generate 256 random notes based -on the current time (or any randomish number you might wish to specify -instead, so you can obtain the same random notes each time): i.e. to -get different random notes patterns, just change this number. -" } - -\score { -{ #(let ((random-state (seed->random-state (current-time)))) - (ly:export - (make-music 'SequentialMusic 'elements - (map (lambda x - (let ((idx (random 12 random-state))) - (make-music 'EventChord - 'elements (list (make-music 'NoteEvent - 'duration (ly:make-duration 2 0 1 1) - 'pitch (ly:make-pitch (quotient idx 7) - (remainder idx 7) - 0)))))) - (make-list 256))))) - } -} diff --git a/input/lsr/scheme/integrating-lilypond-expressions-inside-scheme-functions.ly b/input/lsr/scheme/integrating-lilypond-expressions-inside-scheme-functions.ly deleted file mode 100644 index cdb5f8f9ff..0000000000 --- a/input/lsr/scheme/integrating-lilypond-expressions-inside-scheme-functions.ly +++ /dev/null @@ -1,39 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -It is possible to use fragments of LilyPond syntax inside Scheme, by -putting them between #@{ and #@}. In this example, three functions are -defined to apply different paddings on the TextScript markups, using -native LilyPond commands such as \"\override TextScript #'padding\". -" } - -\layout { ragged-right = ##t } - -withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?) - #{ \override TextScript #'padding = #$padding - $music - \revert TextScript #'padding #}) - -withPaddingB = #(define-music-function (parser location padding music) (number? ly:music?) - #{ \override TextScript #'padding = #$(* padding 2) - $music - \revert TextScript #'padding #}) - -withPaddingC = #(define-music-function (parser location padding music) (number? ly:music?) - #{ \override TextScript #'padding = #(+ 1 $(* padding 2)) - $music - \revert TextScript #'padding #}) - -{ - c'^"1" - \withPaddingA #2 - { c'^"2" c'^"3"} - c'^"4" - \withPaddingB #2 - { c'^"5" c'^"6"} - c'^"7" - \withPaddingC #2 - { c'^"8" c'^"9"} - c'^"10" -} diff --git a/input/lsr/scheme/move-specific-text.ly b/input/lsr/scheme/move-specific-text.ly deleted file mode 100644 index 281f8bc0c8..0000000000 --- a/input/lsr/scheme/move-specific-text.ly +++ /dev/null @@ -1,21 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! - -\version "2.11.23" -% possible rename to scheme- or something like that. -gp -\header { texidoc = "@cindex Scheme Move Text -Objects, like text, can be moved around by using some Scheme code. -" } - -#(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/scheme/transpose-pitches-with-minimum-accidentals.ly b/input/lsr/scheme/transpose-pitches-with-minimum-accidentals.ly deleted file mode 100644 index 155f125310..0000000000 --- a/input/lsr/scheme/transpose-pitches-with-minimum-accidentals.ly +++ /dev/null @@ -1,74 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -There is a way to enforce enharmonic modifications for notes in order -to have the minimum number of accidentals. In that case, ``Double -accidentals should be removed, as well as E-sharp (-> F), bC (-> B), bF -(-> E), B-sharp (-> C).'', as proposed by a request for a new feature. -In this manner, the most natural enharmonic notes are chosen in this -example. -" } - -#(define (naturalise-pitch p) - (let* ((o (ly:pitch-octave p)) - (a (ly:pitch-alteration p)) - (n (ly:pitch-notename p))) - - (cond - ((and (> a 1) (or (eq? n 6) (eq? n 2))) - (set! a (- a 2)) - (set! n (+ n 1))) - ((and (< a -1) (or (eq? n 0) (eq? n 3))) - (set! a (+ a 2)) - (set! n (- n 1)))) - - (cond - ((> a 2) (set! a (- a 4)) (set! n (+ n 1))) - ((< a -2) (set! a (+ a 4)) (set! n (- n 1)))) - - (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7)))) - (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7)))) - - (ly:make-pitch o n a))) - -#(define (naturalise music) - (let* ((es (ly:music-property music 'elements)) - (e (ly:music-property music 'element)) - (p (ly:music-property music 'pitch))) - - (if (pair? es) - (ly:music-set-property! - music 'elements - (map (lambda (x) (naturalise x)) es))) - - (if (ly:music? e) - (ly:music-set-property! - music 'element - (naturalise e))) - - (if (ly:pitch? p) - (begin - (set! p (naturalise-pitch p)) - (ly:music-set-property! music 'pitch p))) - - music)) - -music = \relative c' { c4 d e f g a b c } - -naturaliseMusic = -#(define-music-function (parser location m) - (ly:music?) - (naturalise m)) - -\score { - \context Staff { - \transpose c ais \music - \naturaliseMusic \transpose c ais \music - \transpose c deses \music - \naturaliseMusic \transpose c deses \music - } - \layout { ragged-right = ##t} -} - - diff --git a/input/lsr/spacing/AAA-intro.ly b/input/lsr/spacing/AAA-intro.ly deleted file mode 100644 index 4997892c3c..0000000000 --- a/input/lsr/spacing/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header{ -texidoc = " -@unnumbered Introduction - -This document shows examples from the -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. - -In the web version of this document, you can click on the file name -or figure for each example to see the corresponding input file." -} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/spacing/GNUmakefile b/input/lsr/spacing/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/spacing/GNUmakefile +++ /dev/null @@ -1,16 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Advanced snippets diff --git a/input/lsr/spacing/SConscript b/input/lsr/spacing/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/spacing/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/spacing/alignment-order.ly b/input/lsr/spacing/alignment-order.ly deleted file mode 100644 index 54ba9e15b3..0000000000 --- a/input/lsr/spacing/alignment-order.ly +++ /dev/null @@ -1,33 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This snippet shows of to use the @code{alignBelowContext} and -@code{alignAboveContext} properties, which may be needed for text -elements (e.g. lyrics) positioning, but also for musical contents such -as ossias. -" } - -\paper { - ragged-right = ##t -} - -\relative << - \new Staff = "1" { c4 c s2 } - \new Staff = "2" { c4 c s2 } - \new Staff = "3" { c4 c s2 } - { \skip 2 - << - \lyrics { - \set alignBelowContext = #"1" - below8 first staff - } - \new Staff { - \set Staff.alignAboveContext = #"3" - \times 4/6 { - \override TextScript #'padding = #3 - c8^"this" d_"staff" e^"above" d_"last" e^"staff" f - } - } - >> } ->> diff --git a/input/lsr/spacing/alignment-vertical-spacing.ly b/input/lsr/spacing/alignment-vertical-spacing.ly deleted file mode 100644 index cb08ce1ead..0000000000 --- a/input/lsr/spacing/alignment-vertical-spacing.ly +++ /dev/null @@ -1,53 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -By setting properties in @code{NonMusicalPaperColumn}, vertical spacing -of alignments can be adjusted per system. - - -By setting @code{alignment-extra-space} or -@code{fixed-alignment-extra-space} an individual system may be -stretched vertically. - - -For technical reasons, @code{\overrideProperty} has to be used for -setting properties on individual objects. @code{\override} in a -@code{\context} block may still be used for global overrides. -" } - -#(set-global-staff-size 13) - -\relative c'' -\new StaffGroup << - \new Staff { - c1\break - c\break - c\break - } - \new Staff { - c1 c c - } - \new PianoStaff << - \new Voice { - \set PianoStaff.instrumentName = #"piano" - \set PianoStaff.shortInstrumentName = #"pn" - c1_"normal" - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((fixed-alignment-extra-space . 15)) - c_"fixed-aligment-extra-space" - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((alignment-extra-space . 15)) - c_"aligment-extra-space" - } - { c1 c c } - >> ->> - - diff --git a/input/lsr/spacing/displaying-the-exact-extent-of-a-system.ly b/input/lsr/spacing/displaying-the-exact-extent-of-a-system.ly deleted file mode 100644 index 01c99d9925..0000000000 --- a/input/lsr/spacing/displaying-the-exact-extent-of-a-system.ly +++ /dev/null @@ -1,24 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -If you want to see exactly what amount of space takes your system, you -can display it by overriding the #'stencil property in the System -context: as you can see here, the system size is determined by -including every postscript element such as slurs or key symbol. -" } - -\layout { - \context { - \Score - \override System #'stencil = #box-grob-stencil - } -} - -\new Voice -{ - \unset Staff.minimumVerticalExtent - \override Score.RehearsalMark #'font-size = #20 - - \slurDown c4 ( g4 c''4) -} diff --git a/input/lsr/spacing/drawing-skyline-outline.ly b/input/lsr/spacing/drawing-skyline-outline.ly deleted file mode 100644 index c6754ed27b..0000000000 --- a/input/lsr/spacing/drawing-skyline-outline.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -By setting the Scheme property 'debug-skylines, you can turn your score -into a nice funky artwork :-) More seriously, drawing this skyline can -be helpful to debug spacing and collision issues. (Still, it does make -your score pretty; so just try it, no matter how much you really need -to...) -" } - -#(ly:set-option 'debug-skylines #t) -\book { - \score { - { - a,,1 | a'4 b' c'' d'' \break - \repeat unfold 2 {a' b' c'' d''} | b''''1 - } - } -} diff --git a/input/lsr/spacing/page-label.ly b/input/lsr/spacing/page-label.ly deleted file mode 100644 index d2ea23efd9..0000000000 --- a/input/lsr/spacing/page-label.ly +++ /dev/null @@ -1,47 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.26" - -\header { - texidoc = "Page labels may be placed inside music or at top-level, -and refered to in markups." -} - -#(set-default-paper-size "a6") - -#(define-markup-command (toc-line layout props label text) (symbol? markup?) - (interpret-markup layout props - (markup #:fill-line (text #:page-ref label "8" "?")))) - -\book { - \markup \huge \fill-line { \null "Title Page" \null } - - \pageBreak - - \label #'toc - \markup \column { - \large \fill-line { \null "Table of contents" \null } - \toc-line #'toc "Table of contents" - \toc-line #'firstScore "First Score" - \toc-line #'markA "Mark A" - \toc-line #'markB "Mark B" - \toc-line #'markC "Mark C" - \toc-line #'unknown "Unknown label" - } - - \pageBreak - - \label #'firstScore - \score { - { c'2 c' - \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA - c' c' - \pageBreak - \mark "B" \label #'markB - d' d' - d' d' - \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible - \mark "C" \label #'markC - } - \header { piece = "First score" } - } -} \ No newline at end of file diff --git a/input/lsr/spacing/page-spacing.ly b/input/lsr/spacing/page-spacing.ly deleted file mode 100644 index 4e2a98829f..0000000000 --- a/input/lsr/spacing/page-spacing.ly +++ /dev/null @@ -1,83 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -By setting properties in @code{NonMusicalPaperColumn}, vertical spacing -of page layout can be adjusted. - - -For technical reasons, @code{overrideProperty} has to be used for -setting properties on individual objects. @code{\override} may still be -used for global overrides. - - -By setting @code{annotate-spacing}, we can see the effect of each -property. -" } - -#(set-global-staff-size 11) - - \book { - \score { - \relative c'' \new PianoStaff << - \new Voice { - c1_"followed by default spacing" - \break - c - \break - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((Y-extent . (-30 . 10))) - c_"Big bounding box (property Y-extent)" - \break - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((refpoint-Y-extent . (-37 . -10))) - c_\markup { - \column { - "Refpoints further apart (property refpoint-Y-extent)." - "Stretchable space runs between refpoints" } } - \break - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((next-padding . 10)) - c_"Followed by padding, ie unstretchable space (property next-padding)." - \break - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((next-space . 20)) - c_"Followed by stretchable space (property next-space)" - \break - c - \break - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((bottom-space . 25.0)) - c_"25 staff space to the bottom of the page (property bottom-space)." - \break - } - { c1 c c c c c c c } - >> - } - - \paper { - ragged-last-bottom = ##f - annotate-spacing = ##t - between-system-space = 1.0 - #(set! text-font-defaults - (acons - 'font-size 6 - text-font-defaults)) - } -} - diff --git a/input/lsr/spacing/proportional-spacing.ly b/input/lsr/spacing/proportional-spacing.ly deleted file mode 100644 index 1c0c797b8e..0000000000 --- a/input/lsr/spacing/proportional-spacing.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Proportional notation can be created by setting -@code{proportionalNotationDuration}. Notes will be spaced proportional -to the distance for the given duration. -" } - -\paper { - ragged-right = ##t -} - -\relative c'' -<< - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) - \new Staff { c8[ c c c c c] c4 c2 r2 } - \new Staff { c2 \times 2/3 { c8 c c } c4 c1 } ->> - diff --git a/input/lsr/spacing/proportional-strict-grace-notes.ly b/input/lsr/spacing/proportional-strict-grace-notes.ly deleted file mode 100644 index 548c5634fd..0000000000 --- a/input/lsr/spacing/proportional-strict-grace-notes.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -With @code{strict-note-spacing} spacing for grace notes (even multiple -ones) is floating as well. -" } - -\paper { - ragged-right = ##t - indent = 0 -} - -\relative c'' -{ - \override Score.SpacingSpanner #'strict-note-spacing = ##t - \set Score.proportionalNotationDuration = #(ly:make-moment 1 12) - c8[ \grace { c16[ c] } c8 c8 c8] - c2 -} diff --git a/input/lsr/spacing/proportional-strict-notespacing.ly b/input/lsr/spacing/proportional-strict-notespacing.ly deleted file mode 100644 index dab47a3ab9..0000000000 --- a/input/lsr/spacing/proportional-strict-notespacing.ly +++ /dev/null @@ -1,33 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\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. -" } - -\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/spacing/setting-the-extent-of-objects.ly b/input/lsr/spacing/setting-the-extent-of-objects.ly deleted file mode 100644 index 7c5d3bc9df..0000000000 --- a/input/lsr/spacing/setting-the-extent-of-objects.ly +++ /dev/null @@ -1,24 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -The object may be extended to larger sized by overriding their -properties. The lyrics in this example have an extent of -@code{(-10,10)}, which is why they are spaced so widely. - - - -" } - -\score { - \context Lyrics \lyricmode { - foo -- - - \override LyricText #'X-extent = #'(-10.0 . 10.0) - bar baz - } - \layout { raggedright = ##t} -} - - - diff --git a/input/lsr/vocal/AAA-intro.ly b/input/lsr/vocal/AAA-intro.ly index 4997892c3c..9a05820556 100644 --- a/input/lsr/vocal/AAA-intro.ly +++ b/input/lsr/vocal/AAA-intro.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.10.0" \header{ texidoc = " diff --git a/input/lsr/vocal/GNUmakefile b/input/lsr/vocal/GNUmakefile index 43325ab698..a3f0b2bfde 100644 --- a/input/lsr/vocal/GNUmakefile +++ b/input/lsr/vocal/GNUmakefile @@ -4,13 +4,9 @@ depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -## Hmm, would this work? No -- if we really want examples, move -## to other dir (input/) comes to mind. -## examples = font20 ancient-font -## LOCALSTEPMAKE_TEMPLATES += ly mutopia - EXTRA_DIST_FILES= include $(depth)/make/stepmake.make -TITLE=Advanced snippets +TITLE=Sample snippets from LSR + diff --git a/input/lsr/vocal/SConscript b/input/lsr/vocal/SConscript index f72bfffc28..cb39d4eab0 100644 --- a/input/lsr/vocal/SConscript +++ b/input/lsr/vocal/SConscript @@ -1,4 +1,5 @@ # -*-python-*- Import ('env', 'collate') -collate (title = 'Advanced snippets') +collate (title = 'Sample snippets from LSR') + diff --git a/input/lsr/vocal/adding-ambiti-per-voice.ly b/input/lsr/vocal/adding-ambiti-per-voice.ly deleted file mode 100644 index 3e7b0c3c7d..0000000000 --- a/input/lsr/vocal/adding-ambiti-per-voice.ly +++ /dev/null @@ -1,24 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Ambits can be added per voice. In that case, the ambitus must be moved -manually to prevent collisions. -" } - -\new Staff << - \new Voice \with { - \consists "Ambitus_engraver" - } \relative c'' { - \override Ambitus #'X-offset = # 1.0 - \voiceOne - c4 a d e f2 - } - \new Voice \with { - \consists "Ambitus_engraver" - } \relative c' { - \voiceTwo - es4 f g as b2 - } ->> - diff --git a/input/lsr/vocal/aligning-lyrics.ly b/input/lsr/vocal/aligning-lyrics.ly deleted file mode 100644 index ab75df3f83..0000000000 --- a/input/lsr/vocal/aligning-lyrics.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -You can specify different horizontal alignment for your lyrics, by -overriding the #'self-alignment-X property of the LyricText object. #-1 -is left, #0 is center and #1 is right; however, you can use #LEFT, -#CENTER and #RIGHT as well. -" } - -\relative c'' { -c1 c c} -\addlyrics {\once \override LyricText #'self-alignment-X = #LEFT "This is left-aligned" -\once \override LyricText #'self-alignment-X = #CENTER "This is centered" -\once \override LyricText #'self-alignment-X = #1 "this is right-aligned" } diff --git a/input/lsr/vocal/ambitus.ly b/input/lsr/vocal/ambitus.ly deleted file mode 100644 index 58bcdfec9a..0000000000 --- a/input/lsr/vocal/ambitus.ly +++ /dev/null @@ -1,31 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -Ambituses indicate pitch ranges for voices. - - -Accidentals only show up if they're not part of key signature. -@code{AmbitusNoteHead} grobs also have ledger lines. -" } - -\layout { - ragged-right = ##t - \context { - \Voice - \consists Ambitus_engraver - } -} - -\relative -<< - \new Staff { - \time 2/4 c4 f' - } - \new Staff \relative { - \time 2/4 - \key d \major - cis as' - } ->> - diff --git a/input/lsr/vocal/displaying-bar-lines-on-lyrics.ly b/input/lsr/vocal/displaying-bar-lines-on-lyrics.ly deleted file mode 100644 index 6cae98d426..0000000000 --- a/input/lsr/vocal/displaying-bar-lines-on-lyrics.ly +++ /dev/null @@ -1,41 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -You can move @code{Bar_engraver} and @code{Span_bar_engraver} to a -different engraving context, if you want, for example, bar lines on -lyrics. -" } - -\score { - \relative c' \context ChoirStaff << - \new Staff { c1 c1 c1} - \lyricmode << - \new Lyrics { bla1 die bla } - >> - \new Staff { c1 c1 c1} - >> - - - \layout { - raggedright = ##t - \context { - \Lyrics - \consists Bar_engraver - - - %% need procedure, since lyrics doesn't have a staff_sym engraver. - \override BarLine #'bar-size-procedure = #(lambda (x) 3.0) - } - \context{ - \ChoirStaff - \remove "Span_bar_engraver" - } - \context { - \Staff - \remove "Bar_engraver" - } - } -} - - diff --git a/input/lsr/vocal/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/vocal/how-to-put-ties-between-syllables-in-lyrics.ly deleted file mode 100644 index 0b28b59bef..0000000000 --- a/input/lsr/vocal/how-to-put-ties-between-syllables-in-lyrics.ly +++ /dev/null @@ -1,10 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This can be achieved by separating those syllables by tildes. -" } - -\lyrics { - wa~o~a -} diff --git a/input/lsr/vocal/lyric-combine.ly b/input/lsr/vocal/lyric-combine.ly deleted file mode 100644 index e80eea8850..0000000000 --- a/input/lsr/vocal/lyric-combine.ly +++ /dev/null @@ -1,37 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -With the @code{\lyricsto} mechanism, individual lyric lines can be -associated with one melody line. For each lyric line, they can be tuned -whether to follow melismata or not. -" } - -<< - \new Voice = "bla" \relative c'' { - \autoBeamOff - c2( d4) e8[ c b c] f4 - } - \lyricsto "bla" \new Lyrics { - bla ab blob blob - } - \lyricsto "bla" \new Lyrics { - bla - - \set ignoreMelismata = ##t - - blob - - %% note: effect of ignoreMelismata delayed one time step. - \unset ignoreMelismata - blob - - blob - } - - \lyricsto "bla" \new Lyrics { - nes ted lyrics voice with more words than no tes - } ->> - - diff --git a/input/lsr/vocal/vertical-brace-spanning-several-lyrics-lines.ly b/input/lsr/vocal/vertical-brace-spanning-several-lyrics-lines.ly deleted file mode 100644 index db0baa6cec..0000000000 --- a/input/lsr/vocal/vertical-brace-spanning-several-lyrics-lines.ly +++ /dev/null @@ -1,37 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" - -\header { texidoc = " -This example shows a trick to insert a vertical brace when going from -several stanzas into a common ending in the lyrics. (An alternative is -of course to just skip the brace, especially if you add a line break -instead). -" } - -% Replace brace150 by whatever between brace0 and brace575 that is of a -% suitable size. -leftbrace = \markup {\override #'(font-encoding . fetaBraces) \lookup #"brace200" } - -% In some versions earlier than 20.10.20, the argument to \rotate was -% erroneously treated as radians instead of degrees, i.e. #3.14 was -% needed instead of #180 -rightbrace = \markup {\rotate #180 \leftbrace } - - -lyricsbeforebrace = \lyricmode {Here is some ly -- rics } - -lyricsfrombrace = \lyricmode { \markup{\rightbrace Here} comes some more } - - -melody = \relative c'{ c d e f g f e d c e d f g } - - -\score{ -<< - \new Voice = m \melody - \new Lyrics \lyricsto m \lyricsbeforebrace - \new Lyrics \lyricsto m { \lyricsbeforebrace \lyricsfrombrace } - \new Lyrics \lyricsto m \lyricsbeforebrace ->> -} - diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile index 48159de4db..f620cfe5e8 100644 --- a/input/new/GNUmakefile +++ b/input/new/GNUmakefile @@ -2,9 +2,14 @@ depth = ../../ # NR 1 SUBDIRS = pitches rhythms expressive repeats simultaneous staff editorial text +# NR 2 +SUBDIRS += vocal chords piano percussion guitar strings bagpipes ancient +SUBDIRS += other + +# old SUBDIRS += ancient chords connecting contemporary education expressive SUBDIRS += guitar parts repeats spacing staff text vocal scheme other SUBDIRS += engravers nonmusic instrument