From 57221c9ee7a758169c9e2fe4805f0ed3598f50d5 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Tue, 1 Jan 2008 19:13:32 +0100 Subject: [PATCH] Deeply revise input/lsr structure, generation and compilation input/lsr has no more subdirectories, and snippets are glued into a single Texinfo document. More precisely, what is in this huge commit: - buildscripts/makelsr.py is rewritten, - input/new/*.ly are not compiled any more, - tags are changed to match existing LSR tags (excepted 'other'), - lys-to-tely.py is changed to fit more usages, e.g. generating input/lsr/*.itely, - makefiles, buildscripts, documentation index, snippets linked from docs are changed accordingly. --- Documentation/index.html.in | 4 +- Documentation/topdocs/NEWS.tely | 2 +- Documentation/user/lilypond-book.itely | 4 +- Documentation/user/macros.itexi | 6 +- Documentation/user/pitches.itely | 22 +-- buildscripts/add_html_footer.py | 2 +- buildscripts/lys-to-tely.py | 104 +++++------ buildscripts/makelsr.py | 168 ++++++++++-------- input/lsr/GNUmakefile | 35 ++-- ...a-figured-bass-above-or-below-the-notes.ly | 3 +- .../{staff => }/adding-ambiti-per-voice.ly | 3 +- .../lsr/{staff => }/adding-an-extra-staff.ly | 3 +- .../adding-and-extra-staff-at-a-line-break.ly | 3 +- ...hen-using-tuplet-and-non-tuplet-rythms..ly | 3 +- input/lsr/{rhythms => }/adding-drum-parts.ly | 3 +- .../adding-fingerings-to-tablatures.ly | 3 +- ...g-parentheses-around-an-expressive-mark.ly | 3 +- .../adjusting-lyrics-vertical-spacing.ly | 3 +- ...aligning-and-centering-instrument-names.ly | 3 +- input/lsr/{text => }/aligning-lyrics.ly | 3 +- .../altering-the-number-of-stems-in-a-beam.ly | 3 +- .../{pitches => }/ambiti-multiple-voices.ly | 3 +- input/lsr/{ancient => }/ancient-fonts.ly | 3 +- input/lsr/ancient-notation-intro.itely | 5 + input/lsr/ancient-notation.snippet-list | 5 + .../{ancient => }/ancient-time-signatures.ly | 3 +- input/lsr/ancient/AAA-intro.ly | 17 -- input/lsr/ancient/GNUmakefile | 12 -- input/lsr/ancient/SConscript | 5 - ...a-figured-bass-above-or-below-the-notes.ly | 31 ---- input/lsr/ancient/chant-or-psalms-notation.ly | 25 --- ...yles-depending-on-the-step-of-the-scale.ly | 4 +- .../automatic-beam-subdivisions.ly | 3 +- ...wo-per-two-in-4-4-or-2-2-time-signature.ly | 3 +- input/lsr/bagpipes-intro.itely | 5 + input/lsr/bagpipes.snippet-list | 1 + input/lsr/bagpipes/AAA-intro.ly | 17 -- input/lsr/bagpipes/GNUmakefile | 12 -- input/lsr/bagpipes/SConscript | 5 - .../{rhythms => }/beam-across-line-breaks.ly | 3 +- ...staff-lines-using-the--whiteout-command.ly | 3 +- input/lsr/{expressive => }/breathing-sign.ly | 3 +- .../broken-crescendo-hairpin.ly | 3 +- .../caesura-railtracks-with-fermata.ly | 3 +- .../center-text-below-hairpin-dynamics.ly | 3 +- .../changing--flageolet-mark-size.ly | 3 +- ...ing-an-individual-notes-size-in-a-chord.ly | 3 +- ...f-a-slur-from-solid-to-dotted-or-dashed.ly | 3 +- ...names-to-german-or-semi-german-notation.ly | 3 +- .../changing-the-default-text-font-family.ly | 45 +++++ ...changing-the-number-of-lines-in-a-staff.ly | 3 +- .../{staff => }/changing-the-staff-size.ly | 3 +- ...polymetric-section-using--compressmusic.ly | 3 +- .../{rhythms => }/chant-or-psalms-notation.ly | 3 +- .../lsr/{chords => }/chord-name-exceptions.ly | 3 +- input/lsr/chords-intro.itely | 5 + input/lsr/chords.snippet-list | 4 + input/lsr/chords/AAA-intro.ly | 17 -- input/lsr/chords/GNUmakefile | 12 -- input/lsr/chords/SConscript | 5 - .../clefs-commonly-tweaked-properties.ly | 3 +- input/lsr/{chords => }/clusters.ly | 3 +- input/lsr/{editorial => }/coloring-objects.ly | 3 +- .../combining-dynamics-with-markup-texts.ly | 3 +- .../combining-two-parts-on-the-same-staff.ly | 3 +- .../{rhythms => }/compound-time-signatures.ly | 3 +- ...onducting-signs,-measure-grouping-signs.ly | 3 +- .../controlling-tuplet-bracket-visibility.ly | 3 +- ...-a-sequence-of-notes-on-various-pitches.ly | 3 +- .../{editorial => }/creating-blank-staves.ly | 3 +- .../creating-music-with-scheme-music-box.ly | 3 +- .../lsr/{text => }/creating-text-spanners.ly | 3 +- input/lsr/{ancient => }/custodes.ly | 3 +- .../lsr/{strings => }/demo-midiinstruments.ly | 3 +- .../{text => }/demonstrating-all-headers.ly | 3 +- ...entals-for-each-note-including-naturals.ly | 3 +- .../{other => }/drawing-boxes-around-grobs.ly | 4 +- .../drawing-circles-around-various-objects.ly | 4 +- .../editorial-and-educational-use-intro.itely | 5 + ...editorial-and-educational-use.snippet-list | 10 ++ input/lsr/editorial/AAA-intro.ly | 17 -- input/lsr/editorial/GNUmakefile | 12 -- input/lsr/editorial/SConscript | 5 - ...yles-depending-on-the-step-of-the-scale.ly | 47 ----- ...staff-lines-using-the--whiteout-command.ly | 17 -- input/lsr/expressive-marks-intro.itely | 5 + input/lsr/expressive-marks.snippet-list | 12 ++ input/lsr/expressive/AAA-intro.ly | 17 -- input/lsr/expressive/GNUmakefile | 12 -- input/lsr/expressive/SConscript | 5 - ...hen-using-tuplet-and-non-tuplet-rythms..ly | 24 --- .../center-text-below-hairpin-dynamics.ly | 34 ---- ...f-a-slur-from-solid-to-dotted-or-dashed.ly | 27 --- .../lsr/expressive/creating-text-spanners.ly | 42 ----- .../{pitches => }/generating-random-notes.ly | 3 +- input/lsr/glissando-contempary.ly | 21 +++ input/lsr/guitar-intro.itely | 5 + input/lsr/guitar.snippet-list | 2 + input/lsr/guitar/AAA-intro.ly | 17 -- input/lsr/guitar/GNUmakefile | 16 -- input/lsr/guitar/SConscript | 4 - ...y-customized-polymetric-time-signatures.ly | 3 +- ...to-put-ties-between-syllables-in-lyrics.ly | 11 ++ ...e-fragments-above-the-staff,-as-markups.ly | 34 ++++ .../letter-tablature-formatting.ly | 3 +- input/lsr/{expressive => }/line-arrows.ly | 3 +- input/lsr/{pitches => }/makam.ly | 3 +- ...nvisibile-with-the-transparent-property.ly | 4 +- input/lsr/{text => }/markup-lines.ly | 3 +- .../non-traditional-key-signatures.ly | 3 +- input/lsr/other-intro.itely | 5 + input/lsr/other.snippet-list | 6 + input/lsr/other/GNUmakefile | 15 -- input/lsr/other/SConscript | 4 - .../outputting-the-version-number.ly | 4 +- input/lsr/percussion-intro.itely | 5 + input/lsr/percussion.snippet-list | 2 + input/lsr/percussion/AAA-intro.ly | 17 -- input/lsr/percussion/GNUmakefile | 12 -- input/lsr/percussion/SConscript | 5 - input/lsr/percussion/adding-drum-parts.ly | 45 ----- input/lsr/piano-music-intro.itely | 5 + input/lsr/piano-music.snippet-list | 2 + input/lsr/piano/AAA-intro.ly | 17 -- input/lsr/piano/GNUmakefile | 12 -- input/lsr/piano/SConscript | 5 - input/lsr/pitches-intro.itely | 5 + input/lsr/pitches.snippet-list | 15 ++ input/lsr/pitches/AAA-intro.ly | 17 -- input/lsr/pitches/GNUmakefile | 12 -- input/lsr/pitches/SConscript | 5 - input/lsr/pitches/adding-ambiti-per-voice.ly | 26 --- ...yles-depending-on-the-step-of-the-scale.ly | 47 ----- .../clefs-commonly-tweaked-properties.ly | 78 -------- ...itioning-segno-and-coda-with-line-break.ly | 110 ++++++++++++ ...naturals-from-being-automatically-added.ly | 3 +- ...-printed-when-the-key-signature-changes.ly | 3 +- input/lsr/repeats-intro.itely | 5 + input/lsr/repeats.snippet-list | 2 + input/lsr/repeats/AAA-intro.ly | 17 -- input/lsr/repeats/GNUmakefile | 12 -- input/lsr/repeats/SConscript | 5 - input/lsr/repeats/volta-multi-staff.ly | 23 --- input/lsr/{editorial => }/rhythmic-slashes.ly | 3 +- input/lsr/rhythms-intro.itely | 5 + input/lsr/rhythms.snippet-list | 13 ++ input/lsr/rhythms/AAA-intro.ly | 20 --- input/lsr/rhythms/GNUmakefile | 12 -- input/lsr/rhythms/SConscript | 5 - input/lsr/rhythms/rhythmic-slashes.ly | 43 ----- input/lsr/simultaneous-notes-intro.itely | 5 + input/lsr/simultaneous-notes.snippet-list | 3 + input/lsr/simultaneous/AAA-intro.ly | 17 -- input/lsr/simultaneous/GNUmakefile | 12 -- input/lsr/simultaneous/SConscript | 5 - ...ing-an-individual-notes-size-in-a-chord.ly | 28 --- input/lsr/simultaneous/clusters.ly | 22 --- input/lsr/snippets.tely | 88 +++++++++ input/lsr/staff-notation-intro.itely | 5 + input/lsr/staff-notation.snippet-list | 9 + input/lsr/staff/AAA-intro.ly | 17 -- input/lsr/staff/GNUmakefile | 12 -- input/lsr/staff/SConscript | 5 - .../clefs-commonly-tweaked-properties.ly | 78 -------- input/lsr/staff/creating-blank-staves.ly | 43 ----- .../staff/non-traditional-key-signatures.ly | 26 --- input/lsr/strings-intro.itely | 5 + input/lsr/strings.snippet-list | 1 + input/lsr/strings/AAA-intro.ly | 17 -- input/lsr/strings/GNUmakefile | 12 -- input/lsr/strings/SConscript | 5 - input/lsr/text-intro.itely | 5 + input/lsr/text.snippet-list | 13 ++ input/lsr/text/AAA-intro.ly | 17 -- input/lsr/text/GNUmakefile | 12 -- input/lsr/text/SConscript | 5 - .../combining-dynamics-with-markup-texts.ly | 20 --- .../combining-two-parts-on-the-same-staff.ly | 74 -------- ...ith-minimum-accidentals-smart-transpose.ly | 3 +- ...tweak-command-to-tweak-individual-grobs.ly | 4 +- input/lsr/{text => }/utf-8.ly | 3 +- .../vertically-aligning-ossias-and-lyrics.ly | 34 ++++ input/lsr/vocal-music-intro.itely | 5 + input/lsr/vocal-music.snippet-list | 7 + input/lsr/vocal/AAA-intro.ly | 17 -- input/lsr/vocal/GNUmakefile | 12 -- input/lsr/vocal/SConscript | 5 - input/lsr/{pitches => }/volta-multi-staff.ly | 3 +- input/new/GNUmakefile | 21 +-- input/new/ancient-notation/GNUmakefile | 2 +- input/new/bagpipes/GNUmakefile | 2 +- input/new/chords/GNUmakefile | 2 +- .../editorial-and-educational-use/GNUmakefile | 2 +- input/new/expressive-marks/GNUmakefile | 2 +- input/new/guitar/GNUmakefile | 2 +- input/new/other/GNUmakefile | 2 +- input/new/paper-and-layout/GNUmakefile | 2 +- input/new/parts/GNUmakefile | 2 +- input/new/percussion/GNUmakefile | 2 +- input/new/piano-music/GNUmakefile | 2 +- input/new/pitches/GNUmakefile | 2 +- input/new/real-music/GNUmakefile | 2 +- input/new/repeats/GNUmakefile | 2 +- input/new/rhythms/GNUmakefile | 2 +- input/new/schemelanguage/GNUmakefile | 2 +- input/new/simultaneous-notes/GNUmakefile | 2 +- input/new/spacing/GNUmakefile | 2 +- input/new/staff-notation/GNUmakefile | 2 +- input/new/strings/GNUmakefile | 2 +- input/new/text/GNUmakefile | 2 +- input/new/vocal-music/GNUmakefile | 2 +- make/lysdoc-rules.make | 2 +- 212 files changed, 894 insertions(+), 1631 deletions(-) rename input/lsr/{chords => }/adding-a-figured-bass-above-or-below-the-notes.ly (91%) rename input/lsr/{staff => }/adding-ambiti-per-voice.ly (80%) rename input/lsr/{staff => }/adding-an-extra-staff.ly (80%) rename input/lsr/{staff => }/adding-and-extra-staff-at-a-line-break.ly (92%) rename input/lsr/{rhythms => }/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly (89%) rename input/lsr/{rhythms => }/adding-drum-parts.ly (93%) rename input/lsr/{guitar => }/adding-fingerings-to-tablatures.ly (86%) rename input/lsr/{expressive => }/adding-parentheses-around-an-expressive-mark.ly (77%) rename input/lsr/{text => }/adjusting-lyrics-vertical-spacing.ly (87%) rename input/lsr/{text => }/aligning-and-centering-instrument-names.ly (94%) rename input/lsr/{text => }/aligning-lyrics.ly (86%) rename input/lsr/{rhythms => }/altering-the-number-of-stems-in-a-beam.ly (82%) rename input/lsr/{pitches => }/ambiti-multiple-voices.ly (92%) rename input/lsr/{ancient => }/ancient-fonts.ly (98%) create mode 100644 input/lsr/ancient-notation-intro.itely create mode 100644 input/lsr/ancient-notation.snippet-list rename input/lsr/{ancient => }/ancient-time-signatures.ly (72%) delete mode 100644 input/lsr/ancient/AAA-intro.ly delete mode 100644 input/lsr/ancient/GNUmakefile delete mode 100644 input/lsr/ancient/SConscript delete mode 100644 input/lsr/ancient/adding-a-figured-bass-above-or-below-the-notes.ly delete mode 100644 input/lsr/ancient/chant-or-psalms-notation.ly rename input/lsr/{other => }/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly (93%) rename input/lsr/{rhythms => }/automatic-beam-subdivisions.ly (89%) rename input/lsr/{rhythms => }/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly (93%) create mode 100644 input/lsr/bagpipes-intro.itely create mode 100644 input/lsr/bagpipes.snippet-list delete mode 100644 input/lsr/bagpipes/AAA-intro.ly delete mode 100644 input/lsr/bagpipes/GNUmakefile delete mode 100644 input/lsr/bagpipes/SConscript rename input/lsr/{rhythms => }/beam-across-line-breaks.ly (83%) rename input/lsr/{text => }/blanking-staff-lines-using-the--whiteout-command.ly (77%) rename input/lsr/{expressive => }/breathing-sign.ly (93%) rename input/lsr/{expressive => }/broken-crescendo-hairpin.ly (93%) rename input/lsr/{expressive => }/caesura-railtracks-with-fermata.ly (90%) rename input/lsr/{text => }/center-text-below-hairpin-dynamics.ly (91%) rename input/lsr/{expressive => }/changing--flageolet-mark-size.ly (86%) rename input/lsr/{editorial => }/changing-an-individual-notes-size-in-a-chord.ly (84%) rename input/lsr/{editorial => }/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly (73%) rename input/lsr/{chords => }/changing-the-chord-names-to-german-or-semi-german-notation.ly (91%) create mode 100644 input/lsr/changing-the-default-text-font-family.ly rename input/lsr/{staff => }/changing-the-number-of-lines-in-a-staff.ly (84%) rename input/lsr/{staff => }/changing-the-staff-size.ly (81%) rename input/lsr/{rhythms => }/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly (92%) rename input/lsr/{rhythms => }/chant-or-psalms-notation.ly (84%) rename input/lsr/{chords => }/chord-name-exceptions.ly (89%) create mode 100644 input/lsr/chords-intro.itely create mode 100644 input/lsr/chords.snippet-list delete mode 100644 input/lsr/chords/AAA-intro.ly delete mode 100644 input/lsr/chords/GNUmakefile delete mode 100644 input/lsr/chords/SConscript rename input/lsr/{editorial => }/clefs-commonly-tweaked-properties.ly (95%) rename input/lsr/{chords => }/clusters.ly (74%) rename input/lsr/{editorial => }/coloring-objects.ly (87%) rename input/lsr/{expressive => }/combining-dynamics-with-markup-texts.ly (78%) rename input/lsr/{simultaneous => }/combining-two-parts-on-the-same-staff.ly (94%) rename input/lsr/{rhythms => }/compound-time-signatures.ly (92%) rename input/lsr/{rhythms => }/conducting-signs,-measure-grouping-signs.ly (89%) rename input/lsr/{rhythms => }/controlling-tuplet-bracket-visibility.ly (91%) rename input/lsr/{pitches => }/creating-a-sequence-of-notes-on-various-pitches.ly (95%) rename input/lsr/{editorial => }/creating-blank-staves.ly (87%) rename input/lsr/{pitches => }/creating-music-with-scheme-music-box.ly (78%) rename input/lsr/{text => }/creating-text-spanners.ly (92%) rename input/lsr/{ancient => }/custodes.ly (87%) rename input/lsr/{strings => }/demo-midiinstruments.ly (98%) rename input/lsr/{text => }/demonstrating-all-headers.ly (91%) rename input/lsr/{pitches => }/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly (93%) rename input/lsr/{other => }/drawing-boxes-around-grobs.ly (85%) rename input/lsr/{other => }/drawing-circles-around-various-objects.ly (90%) create mode 100644 input/lsr/editorial-and-educational-use-intro.itely create mode 100644 input/lsr/editorial-and-educational-use.snippet-list delete mode 100644 input/lsr/editorial/AAA-intro.ly delete mode 100644 input/lsr/editorial/GNUmakefile delete mode 100644 input/lsr/editorial/SConscript delete mode 100644 input/lsr/editorial/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly delete mode 100644 input/lsr/editorial/blanking-staff-lines-using-the--whiteout-command.ly create mode 100644 input/lsr/expressive-marks-intro.itely create mode 100644 input/lsr/expressive-marks.snippet-list delete mode 100644 input/lsr/expressive/AAA-intro.ly delete mode 100644 input/lsr/expressive/GNUmakefile delete mode 100644 input/lsr/expressive/SConscript delete mode 100644 input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly delete mode 100644 input/lsr/expressive/center-text-below-hairpin-dynamics.ly delete mode 100644 input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly delete mode 100644 input/lsr/expressive/creating-text-spanners.ly rename input/lsr/{pitches => }/generating-random-notes.ly (92%) create mode 100644 input/lsr/glissando-contempary.ly create mode 100644 input/lsr/guitar-intro.itely create mode 100644 input/lsr/guitar.snippet-list delete mode 100644 input/lsr/guitar/AAA-intro.ly delete mode 100644 input/lsr/guitar/GNUmakefile delete mode 100644 input/lsr/guitar/SConscript rename input/lsr/{rhythms => }/heavily-customized-polymetric-time-signatures.ly (94%) create mode 100644 input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly create mode 100644 input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly rename input/lsr/{guitar => }/letter-tablature-formatting.ly (76%) rename input/lsr/{expressive => }/line-arrows.ly (91%) rename input/lsr/{pitches => }/makam.ly (98%) rename input/lsr/{other => }/making-an-object-invisibile-with-the-transparent-property.ly (88%) rename input/lsr/{text => }/markup-lines.ly (95%) rename input/lsr/{pitches => }/non-traditional-key-signatures.ly (90%) create mode 100644 input/lsr/other-intro.itely create mode 100644 input/lsr/other.snippet-list delete mode 100644 input/lsr/other/GNUmakefile delete mode 100644 input/lsr/other/SConscript rename input/lsr/{other => }/outputting-the-version-number.ly (86%) create mode 100644 input/lsr/percussion-intro.itely create mode 100644 input/lsr/percussion.snippet-list delete mode 100644 input/lsr/percussion/AAA-intro.ly delete mode 100644 input/lsr/percussion/GNUmakefile delete mode 100644 input/lsr/percussion/SConscript delete mode 100644 input/lsr/percussion/adding-drum-parts.ly create mode 100644 input/lsr/piano-music-intro.itely create mode 100644 input/lsr/piano-music.snippet-list delete mode 100644 input/lsr/piano/AAA-intro.ly delete mode 100644 input/lsr/piano/GNUmakefile delete mode 100644 input/lsr/piano/SConscript create mode 100644 input/lsr/pitches-intro.itely create mode 100644 input/lsr/pitches.snippet-list delete mode 100644 input/lsr/pitches/AAA-intro.ly delete mode 100644 input/lsr/pitches/GNUmakefile delete mode 100644 input/lsr/pitches/SConscript delete mode 100644 input/lsr/pitches/adding-ambiti-per-voice.ly delete mode 100644 input/lsr/pitches/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly delete mode 100644 input/lsr/pitches/clefs-commonly-tweaked-properties.ly create mode 100644 input/lsr/positioning-segno-and-coda-with-line-break.ly rename input/lsr/{pitches => }/preventing-extra-naturals-from-being-automatically-added.ly (83%) rename input/lsr/{pitches => }/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly (85%) create mode 100644 input/lsr/repeats-intro.itely create mode 100644 input/lsr/repeats.snippet-list delete mode 100644 input/lsr/repeats/AAA-intro.ly delete mode 100644 input/lsr/repeats/GNUmakefile delete mode 100644 input/lsr/repeats/SConscript delete mode 100644 input/lsr/repeats/volta-multi-staff.ly rename input/lsr/{editorial => }/rhythmic-slashes.ly (92%) create mode 100644 input/lsr/rhythms-intro.itely create mode 100644 input/lsr/rhythms.snippet-list delete mode 100644 input/lsr/rhythms/AAA-intro.ly delete mode 100644 input/lsr/rhythms/GNUmakefile delete mode 100644 input/lsr/rhythms/SConscript delete mode 100644 input/lsr/rhythms/rhythmic-slashes.ly create mode 100644 input/lsr/simultaneous-notes-intro.itely create mode 100644 input/lsr/simultaneous-notes.snippet-list delete mode 100644 input/lsr/simultaneous/AAA-intro.ly delete mode 100644 input/lsr/simultaneous/GNUmakefile delete mode 100644 input/lsr/simultaneous/SConscript delete mode 100644 input/lsr/simultaneous/changing-an-individual-notes-size-in-a-chord.ly delete mode 100644 input/lsr/simultaneous/clusters.ly create mode 100644 input/lsr/snippets.tely create mode 100644 input/lsr/staff-notation-intro.itely create mode 100644 input/lsr/staff-notation.snippet-list delete mode 100644 input/lsr/staff/AAA-intro.ly delete mode 100644 input/lsr/staff/GNUmakefile delete mode 100644 input/lsr/staff/SConscript delete mode 100644 input/lsr/staff/clefs-commonly-tweaked-properties.ly delete mode 100644 input/lsr/staff/creating-blank-staves.ly delete mode 100644 input/lsr/staff/non-traditional-key-signatures.ly create mode 100644 input/lsr/strings-intro.itely create mode 100644 input/lsr/strings.snippet-list delete mode 100644 input/lsr/strings/AAA-intro.ly delete mode 100644 input/lsr/strings/GNUmakefile delete mode 100644 input/lsr/strings/SConscript create mode 100644 input/lsr/text-intro.itely create mode 100644 input/lsr/text.snippet-list delete mode 100644 input/lsr/text/AAA-intro.ly delete mode 100644 input/lsr/text/GNUmakefile delete mode 100644 input/lsr/text/SConscript delete mode 100644 input/lsr/text/combining-dynamics-with-markup-texts.ly delete mode 100644 input/lsr/text/combining-two-parts-on-the-same-staff.ly rename input/lsr/{pitches => }/transposing-pitches-with-minimum-accidentals-smart-transpose.ly (96%) rename input/lsr/{other => }/using-the--tweak-command-to-tweak-individual-grobs.ly (82%) rename input/lsr/{text => }/utf-8.ly (95%) create mode 100644 input/lsr/vertically-aligning-ossias-and-lyrics.ly create mode 100644 input/lsr/vocal-music-intro.itely create mode 100644 input/lsr/vocal-music.snippet-list delete mode 100644 input/lsr/vocal/AAA-intro.ly delete mode 100644 input/lsr/vocal/GNUmakefile delete mode 100644 input/lsr/vocal/SConscript rename input/lsr/{pitches => }/volta-multi-staff.ly (83%) diff --git a/Documentation/index.html.in b/Documentation/index.html.in index 7a8ab6ce85..adc9705778 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -101,7 +101,9 @@ href="user/lilypond-program/index.html">Application Usage (AU) in PDF)
(how to install and run the program) -
  • Snippets +
  • Snippets +(in one big page, +in PDF)
    (Short tricks, tips, and examples) diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 649635328e..8224a13663 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -163,7 +163,7 @@ page. fractions. This allows some forms of microtonal music. For example, Turkish makam music uses 1/9th tone alterations. -@lilypondfile{pitches/makam.ly} +@lilypondfile{makam.ly} diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index f32e2d8844..ee36826148 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -666,10 +666,10 @@ example, the music will be interpreted in relative mode, but the verbatim quote will not show the @code{relative} block. @example -\relative c' { % begin verbatim +\relative c' @{ % begin verbatim c4 e2 g4 f2 e % end verbatim -} +@} @end example @item texidoc diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 5a98638c2b..2d4a79c4dc 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -83,7 +83,7 @@ @c usage: @lsr{ancient,custodes.ly} @macro lsr{DIR,TEXT} @ifhtml -@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}} +@uref{source/input/lsr/snippets/\DIR\.html#\TEXT\,@file{\DIR\/\TEXT\}} @end ifhtml @ifnothtml @file{\DIR\/\TEXT\} @@ -92,10 +92,10 @@ @macro lsrdir{DIR} @ifhtml -@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/} +@uref{source/input/lsr/snippets\DIR\.html,\DIR\} @end ifhtml @ifnothtml -@file{\DIR\} +\DIR\ @end ifnothtml @end macro diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely index 20cb604b8d..832b295d9c 100644 --- a/Documentation/user/pitches.itely +++ b/Documentation/user/pitches.itely @@ -312,12 +312,12 @@ Micro tones are also exported to the MIDI file. @commonprop @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/preventing-extra-naturals-from-being-automatically-added.ly} +{preventing-extra-naturals-from-being-automatically-added.ly} @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly} +{dodecaphonic-style-accidentals-for-each-note-including-naturals.ly} -@lilypondfile[lilyquote,ragged-right,texidoc]{pitches/makam.ly} +@lilypondfile[lilyquote,ragged-right,texidoc]{makam.ly} @seealso @@ -633,7 +633,7 @@ musicInBflat = @{ e4 @dots{} @} @commonprop @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/transposing-pitches-with-minimum-accidentals-smart-transpose.ly} +{transposing-pitches-with-minimum-accidentals-smart-transpose.ly} @seealso @@ -770,7 +770,7 @@ For example, @commonprop @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/clefs-commonly-tweaked-properties.ly} +{clefs-commonly-tweaked-properties.ly} @seealso @@ -835,13 +835,13 @@ fis @commonprop @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly} +{preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly} @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/non-traditional-key-signatures.ly} +{non-traditional-key-signatures.ly} @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly} +{dodecaphonic-style-accidentals-for-each-note-including-naturals.ly} @seealso @@ -1711,10 +1711,10 @@ printed if they are not part of the key signature. @commonprop @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/adding-ambiti-per-voice.ly} +{adding-ambiti-per-voice.ly} @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/ambiti-multiple-voices.ly} +{ambiti-multiple-voices.ly} @seealso @@ -1820,7 +1820,7 @@ c8 d4 e8 a2 g1 @commonprop @lilypondfile[lilyquote,ragged-right,texidoc] -{pitches/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly} +{applying-noteheads-styles-depending-on-the-step-of-the-scale.ly} @seealso diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py index d46685da43..b410b2a39e 100644 --- a/buildscripts/add_html_footer.py +++ b/buildscripts/add_html_footer.py @@ -87,7 +87,7 @@ def build_pages_dict (filelist): def source_links_replace (m, source_val): return 'href="' + os.path.join (source_val, m.group (1)) + '"' -splitted_docs_re = re.compile ('Documentation/user/out-www/(lilypond|music-glossary|lilypond-program|lilypond-learning)/') +splitted_docs_re = re.compile ('(input/lsr/out-www/snippets|Documentation/user/out-www/(lilypond|music-glossary|lilypond-program|lilypond-learning))/') # On systems without symlinks (e.g. Windows), docs are not very usable # Get rid of symlinks references here diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py index 9150acfe39..a9186627d8 100644 --- a/buildscripts/lys-to-tely.py +++ b/buildscripts/lys-to-tely.py @@ -4,64 +4,41 @@ ''' TODO: - * Add @nodes, plit at sections? - * Less kludged first introduction file - * include *.texi files for text at start of section? + * Add @nodes, split at sections? ''' import sys import os -import string import getopt program_name = 'lys-to-tely' +include_snippets = '@lysnippets' def help (): - sys.stdout.write (r"""Usage: lys-to-tely [OPTIONS]... LY-FILE... + sys.stdout.write (r"""Usage: %(program_name)s [OPTIONS]... LY-FILE... Construct tely doc from LY-FILEs. Options: -h, --help print this help -o, --output=NAME write tely doc to NAME -t, --title=TITLE set tely doc title TITLE - -""") + --template=TEMPLATE use TEMPLATE as Texinfo template file, + instead of standard template; TEMPLATE should contain a command + '%(include_snippets)s' to tell where to insert LY-FILEs. When this option + is used, NAME and TITLE are ignored +""" % vars ()) sys.exit (0) -(options, files) = getopt.getopt(sys.argv[1:], 'hn:t:', [ - 'help', 'name=', 'title=']) - -name="ly-doc" -title="Ly Doc" -for opt in options: - o = opt[0] - a = opt[1] - if o == '-h' or o == '--help': - help () - elif o == '-n' or o == '--name': - name = a - elif o == '-t' or o == '--title': - title = a - else: - raise 'unknown opt ', o - -def strip_extension (f, ext): - (p, e) = os.path.splitext (f) - if e == ext: - e = '' - return p + e +(options, files) = getopt.getopt (sys.argv[1:], 'hn:t:', + ['help', 'name=', 'title=', 'template=']) -if files: - dir = os.path.dirname (name) - if not dir: - dir = "." - name = strip_extension (os.path.basename (name), ".tely") - - s = '''\input texinfo -@setfilename %s.info -@settitle %s +name = "ly-doc" +title = "Ly Doc" +template = '''\input texinfo +@setfilename %%(name)s.info +@settitle %%(name)s @documentencoding utf-8 @iftex @@ -69,32 +46,56 @@ if files: @end iftex @finalout @c we do not want black boxes. - + @c fool ls-latex @ignore @author Han-Wen Nienhuys and Jan Nieuwenhuizen -@title %s +@title %%(title)s @end ignore @node Top, , , (dir) -''' % (name, title, title) - def name2line (n): - # UGR - s = r""" +%s + +@bye +''' % include_snippets + +for opt in options: + o = opt[0] + a = opt[1] + if o == '-h' or o == '--help': + help () + elif o == '-n' or o == '--name': + name = a + elif o == '-t' or o == '--title': + title = a + elif o == '--template': + template = open (a, 'r').read () + else: + raise 'unknown opt ', o + +def name2line (n): + # UGR + s = r""" @ifhtml @html @end html @end ifhtml -""" % n - - s += "\n\n@lilypondfile[printfilename,texidoc]{%s}" % n - return s + +@lilypondfile[printfilename,texidoc]{%s}""" % (n, n) + return s + +if files: + dir = os.path.dirname (name) or "." +# don't strip .tely extension, input/lsr uses .itely + name = os.path.basename (name) + template = template % vars () + files.sort () - s = s + string.join (map (lambda x: name2line (x), files), "\n") - s = s + '\n@bye\n' - f = "%s/%s.tely" % (dir, name) + s = "\n".join (map (name2line, files)) + s = template.replace (include_snippets, s, 1) + f = "%s/%s" % (dir, name) sys.stderr.write ("%s: writing %s..." % (program_name, f)) h = open (f, "w") h.write (s) @@ -104,4 +105,3 @@ else: # not Unix philosophy, but hey, at least we notice when # we don't distribute any .ly files. sys.stderr.write ("No files specified. Doing nothing") - diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index 2da2280e55..c4f512ae51 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -1,84 +1,108 @@ #!/usr/bin/python + import sys import os -import os.path -import shutil +import glob -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']) +USAGE = ''' Usage: makelsr.py LSR_SNIPPETS_DIR +This script must be run from top of the source tree; +it updates snippets input/lsr with snippets in input/new or LSR_SNIPPETS_DIR. +''' + +LY_HEADER = '''%%%% Do not edit this file; it is auto-generated from LSR! +%%%% Tags: %s +''' +DEST = os.path.join ('input', 'lsr') +NEW_LYS = os.path.join ('input', 'new') + +TAGS = [] +# NR 1 +TAGS.extend (['pitches', 'rhythms', 'expressive-marks', +'repeats', 'simultaneous-notes', 'staff-notation', 'editorial-and-educational-use', 'text']) +# NR 2 +TAGS.extend (['vocal-music', 'chords', 'piano-music', +'percussion', 'guitar', 'strings', 'bagpipes', 'ancient-notation']) +TAGS.append ('other') -# -#dirs.extend(['real-music']) -#dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other','nonmusic','engravers','instrument'] -notsafe=[] +def exit_with_usage (n=0): + sys.stderr.write (USAGE) + sys.exit (n) try: in_dir = sys.argv[1] except: - print "Please specify input_file." - sys.exit() - -def copy_with_warning(src, dest): - msg = '%% Do not edit this file; it is auto-generated from LSR!\n' - open (dest, 'w').write( msg + open (src).read() ) - - -def copy_dir_with_test(srcdir, destdir): - global notsafe - global notconvert - if not(os.path.exists(srcdir)): - return - file_names = os.listdir (srcdir) - for file in file_names: - if (file.endswith ('.ly')): - src = os.path.join (srcdir, file) - destname = file.replace (';', '-') - dest = os.path.join (destdir, destname) - copy_with_warning(src, dest) - os.system('convert-ly -e ' + dest) - if os.path.exists( dest + '~' ): - os.remove( dest + '~' ) - # the -V seems to make unsafe snippets fail nicer/sooner. - s = os.system('nice lilypond -V -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest) - #s = os.system('nice lilypond -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest) - if s: - notsafe.append(dest) - - -for dir in dirs: - srcdir = os.path.join (in_dir, dir) - destdir = os.path.join ('input', 'lsr', dir) - if not(os.path.isdir(destdir)): - print "Please run this script from the head of the source tree," - print " and/or check that you have the right categories." - sys.exit() - - ## clean out existing files - file_names = os.listdir (destdir) - for file in file_names: - if (file.endswith ('.ly')): - os.remove( os.path.join(destdir,file) ) - ## copy in new files from LSR download - copy_dir_with_test( srcdir, destdir ) - ## copy in new files in source tree - copy_dir_with_test( os.path.join ('input', 'new', dir), destdir ) - - -file=open("lsr-unsafe.txt", 'w') -for s in notsafe: - file.write(s+'\n') -file.close() - -print -print -print "Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!" -print " xargs git-diff < lsr-unsafe.txt" -print + exit_with_usage (2) + +if not (os.path.isdir (DEST) and os.path.isdir (NEW_LYS)): + exit_with_usage (3) + +unsafe = [] +unconverted = [] + +def copy_ly (srcdir, name, tags): + global unsafe + global unconverted + dest = os.path.join (DEST, name) + f = open (dest, 'w') + f.write (LY_HEADER % ', '.join (tags)) + f.write (open (os.path.join (srcdir, name)).read ()) + f.close () + e = os.system('convert-ly -e ' + dest) + if e: + unconverted.append (dest) + if os.path.exists (dest + '~'): + os.remove (dest + '~') + # -V seems to make unsafe snippets fail nicer/sooner + e = os.system ('nice lilypond -V -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest) + if e: + unsafe.append (dest) + +def read_source (src): + s = {} + l = {} + for tag in TAGS: + srcdir = os.path.join (src, tag) + l[tag] = set (map (os.path.basename, glob.glob (os.path.join (srcdir, '*.ly')))) + for f in l[tag]: + if f in s.keys (): + s[f][1].append (tag) + else: + s[f] = (srcdir, [tag]) + return s, l + +def dump_file_list (file, list): + f = open (file, 'w') + f.write ('\n'.join (list) + '\n') + +## clean out existing lys and generated files +map (os.remove, glob.glob (os.path.join (DEST, '*.ly')) + + glob.glob (os.path.join (DEST, '*.snippet-list'))) + +# read LSR source +snippets, tag_lists = read_source (in_dir) +# read input/new +s, l = read_source (NEW_LYS) +snippets.update (s) +for t in TAGS: + tag_lists[t].update (l[t]) + +for (name, (srcdir, tags)) in snippets.items (): + copy_ly (srcdir, name, tags) + +for (tag, file_set) in tag_lists.items (): + dump_file_list (os.path.join (DEST, tag + '.snippet-list'), file_set) + +if unconverted: + sys.stderr.write ('These files could not be converted successfully by convert-ly:\n') + sys.stderr.write ('\n'.join (unconverted)) + +dump_file_list ('lsr-unsafe.txt', unsafe) +sys.stderr.write (''' + +Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY! + xargs git-diff < lsr-unsafe.txt + +''') diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index a6291b915c..6092e6058a 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -1,21 +1,28 @@ -depth = ../../ +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 - -### FIXME: temporary template for creating other dirs. -### will be removed once everything else is stable. -SUBDIRS += null +# urg, can't name itely templates foo.itely.in because of standard rule STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc +LOCALSTEPMAKE_TEMPLATES=lilypond ly EXTRA_DIST_FILES=README + include $(depth)/make/stepmake.make -TITLE=LilyPond Examples +IN_ITELY_FILES = $(call src-wildcard,*-intro.itely) +GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely) + +$(outdir)/%.itely: %-intro.itely %.snippet-list + xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$@ --template=$< < $*.snippet-list + +$(outdir)/snippets.texi: snippets.tely $(GENERATED_ITELY_FILES) + $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< + +$(outdir)/snippets-big-page.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES) + $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< + + +$(outdir)/snippets/index.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) + mkdir -p $(dir $@) + $(MAKEINFO) -I$(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< +local-WWW: $(outdir)/snippets.pdf $(outdir)/snippets/index.html $(outdir)/snippets-big-page.html diff --git a/input/lsr/chords/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly similarity index 91% rename from input/lsr/chords/adding-a-figured-bass-above-or-below-the-notes.ly rename to input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index 1b2a10e884..28faf86ca3 100644 --- a/input/lsr/chords/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: chords, ancient-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/staff/adding-ambiti-per-voice.ly b/input/lsr/adding-ambiti-per-voice.ly similarity index 80% rename from input/lsr/staff/adding-ambiti-per-voice.ly rename to input/lsr/adding-ambiti-per-voice.ly index 55e5167e8d..b29df57952 100644 --- a/input/lsr/staff/adding-ambiti-per-voice.ly +++ b/input/lsr/adding-ambiti-per-voice.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches, staff-notation, vocal-music \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/staff/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly similarity index 80% rename from input/lsr/staff/adding-an-extra-staff.ly rename to input/lsr/adding-an-extra-staff.ly index fedfc8947d..0297bf3c84 100644 --- a/input/lsr/staff/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: staff-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/staff/adding-and-extra-staff-at-a-line-break.ly b/input/lsr/adding-and-extra-staff-at-a-line-break.ly similarity index 92% rename from input/lsr/staff/adding-and-extra-staff-at-a-line-break.ly rename to input/lsr/adding-and-extra-staff-at-a-line-break.ly index f46bfe0b90..a61bad68cb 100644 --- a/input/lsr/staff/adding-and-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-and-extra-staff-at-a-line-break.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: staff-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly similarity index 89% rename from input/lsr/rhythms/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly rename to input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly index 7bd7544869..56d25a0d66 100644 --- a/input/lsr/rhythms/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms, expressive-marks \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly similarity index 93% rename from input/lsr/rhythms/adding-drum-parts.ly rename to input/lsr/adding-drum-parts.ly index 9c4edf7469..baec437429 100644 --- a/input/lsr/rhythms/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms, percussion \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/guitar/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly similarity index 86% rename from input/lsr/guitar/adding-fingerings-to-tablatures.ly rename to input/lsr/adding-fingerings-to-tablatures.ly index 648bf8204e..a2594022c3 100644 --- a/input/lsr/guitar/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: guitar \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/expressive/adding-parentheses-around-an-expressive-mark.ly b/input/lsr/adding-parentheses-around-an-expressive-mark.ly similarity index 77% rename from input/lsr/expressive/adding-parentheses-around-an-expressive-mark.ly rename to input/lsr/adding-parentheses-around-an-expressive-mark.ly index 700416d65d..61fac289fe 100644 --- a/input/lsr/expressive/adding-parentheses-around-an-expressive-mark.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/text/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly similarity index 87% rename from input/lsr/text/adjusting-lyrics-vertical-spacing.ly rename to input/lsr/adjusting-lyrics-vertical-spacing.ly index b4d91102a3..fc9ace44cf 100644 --- a/input/lsr/text/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text, vocal-music \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/text/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly similarity index 94% rename from input/lsr/text/aligning-and-centering-instrument-names.ly rename to input/lsr/aligning-and-centering-instrument-names.ly index 4918f421d8..fd60ca9c14 100644 --- a/input/lsr/text/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/text/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly similarity index 86% rename from input/lsr/text/aligning-lyrics.ly rename to input/lsr/aligning-lyrics.ly index 26e8cd6149..545f44e32b 100644 --- a/input/lsr/text/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text, vocal-music \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/altering-the-number-of-stems-in-a-beam.ly b/input/lsr/altering-the-number-of-stems-in-a-beam.ly similarity index 82% rename from input/lsr/rhythms/altering-the-number-of-stems-in-a-beam.ly rename to input/lsr/altering-the-number-of-stems-in-a-beam.ly index d4be7969b1..21ed6bf802 100644 --- a/input/lsr/rhythms/altering-the-number-of-stems-in-a-beam.ly +++ b/input/lsr/altering-the-number-of-stems-in-a-beam.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/pitches/ambiti-multiple-voices.ly b/input/lsr/ambiti-multiple-voices.ly similarity index 92% rename from input/lsr/pitches/ambiti-multiple-voices.ly rename to input/lsr/ambiti-multiple-voices.ly index 5b7984ccba..f1a35f44e6 100644 --- a/input/lsr/pitches/ambiti-multiple-voices.ly +++ b/input/lsr/ambiti-multiple-voices.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/ancient/ancient-fonts.ly b/input/lsr/ancient-fonts.ly similarity index 98% rename from input/lsr/ancient/ancient-fonts.ly rename to input/lsr/ancient-fonts.ly index c4d25d92f8..3b5ddc9ae2 100644 --- a/input/lsr/ancient/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: ancient-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/ancient-notation-intro.itely b/input/lsr/ancient-notation-intro.itely new file mode 100644 index 0000000000..52a221029e --- /dev/null +++ b/input/lsr/ancient-notation-intro.itely @@ -0,0 +1,5 @@ +@node Ancient notation +@unnumbered Ancient notation + +@lysnippets + diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list new file mode 100644 index 0000000000..55977e8b2b --- /dev/null +++ b/input/lsr/ancient-notation.snippet-list @@ -0,0 +1,5 @@ +ancient-fonts.ly +adding-a-figured-bass-above-or-below-the-notes.ly +chant-or-psalms-notation.ly +ancient-time-signatures.ly +custodes.ly diff --git a/input/lsr/ancient/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly similarity index 72% rename from input/lsr/ancient/ancient-time-signatures.ly rename to input/lsr/ancient-time-signatures.ly index 0b6aa6e8c4..173278526e 100644 --- a/input/lsr/ancient/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: ancient-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/ancient/AAA-intro.ly b/input/lsr/ancient/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/ancient/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/ancient/GNUmakefile b/input/lsr/ancient/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/ancient/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/ancient/SConscript b/input/lsr/ancient/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/ancient/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -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 deleted file mode 100644 index 1b2a10e884..0000000000 --- a/input/lsr/ancient/adding-a-figured-bass-above-or-below-the-notes.ly +++ /dev/null @@ -1,31 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -When writing a figured bass, here's a way to specify if you want your -figures to be placed above or below the bass notes, by defining the -BassFigureAlignmentPositioning #'direction property (exclusively in a -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 -whole score. -" } - -bass = { \clef bass g4 b, c d e d8 c d2} -continuo = \figuremode { - < _ >4 < 6 >8 - \once \override Staff.BassFigureAlignmentPositioning #'direction = #CENTER - <5/> < _ >4 - \override Staff.BassFigureAlignmentPositioning #'direction = #UP - < _+ > < 6 > - \set Staff.useBassFigureExtenders = ##t - \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN - < 4 >4. < 4 >8 < _+ >4 - } -\score { - << \new Staff = bassStaff \bass - \context Staff = bassStaff \continuo >> -} - diff --git a/input/lsr/ancient/chant-or-psalms-notation.ly b/input/lsr/ancient/chant-or-psalms-notation.ly deleted file mode 100644 index 2e46df65bc..0000000000 --- a/input/lsr/ancient/chant-or-psalms-notation.ly +++ /dev/null @@ -1,25 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -This form of notation is used for the chant of the Psalms, where verses -aren't always the same length. -" } - -stemon = { \override Staff.Stem #'transparent = ##f } -stemoff = { \override Staff.Stem #'transparent = ##t } - -\score { -\new Staff \with {\remove "Time_signature_engraver" } -{ - \key g \minor - \set Score.timing = ##f - \stemoff a'\breve bes'4 g'4 - \stemon a'2 \bar "||" - \stemoff a'\breve g'4 a'4 - \stemon f'2 \bar "||" - \stemoff a'\breve^\markup { \italic flexe } - \stemon g'2 \bar "||" -} -\layout { raggedright = ##t} -} diff --git a/input/lsr/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly similarity index 93% rename from input/lsr/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly rename to input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly index 8ce0c479e6..1e93beee96 100644 --- a/input/lsr/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly @@ -1,5 +1,7 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: other %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.11.35" \header { texidoc = " The shapeNoteStyles property gives you the ability to define various diff --git a/input/lsr/rhythms/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly similarity index 89% rename from input/lsr/rhythms/automatic-beam-subdivisions.ly rename to input/lsr/automatic-beam-subdivisions.ly index cae8469d14..c90b7953ef 100644 --- a/input/lsr/rhythms/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly similarity index 93% rename from input/lsr/rhythms/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly rename to input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index 874177acc4..bd9d28f7be 100644 --- a/input/lsr/rhythms/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/bagpipes-intro.itely b/input/lsr/bagpipes-intro.itely new file mode 100644 index 0000000000..64b7a08658 --- /dev/null +++ b/input/lsr/bagpipes-intro.itely @@ -0,0 +1,5 @@ +@node Bagpipes +@unnumbered Bagpipes + +@lysnippets + diff --git a/input/lsr/bagpipes.snippet-list b/input/lsr/bagpipes.snippet-list new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/input/lsr/bagpipes.snippet-list @@ -0,0 +1 @@ + diff --git a/input/lsr/bagpipes/AAA-intro.ly b/input/lsr/bagpipes/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/bagpipes/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/bagpipes/GNUmakefile b/input/lsr/bagpipes/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/bagpipes/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/bagpipes/SConscript b/input/lsr/bagpipes/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/bagpipes/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/rhythms/beam-across-line-breaks.ly b/input/lsr/beam-across-line-breaks.ly similarity index 83% rename from input/lsr/rhythms/beam-across-line-breaks.ly rename to input/lsr/beam-across-line-breaks.ly index b6f672c7bc..1d2bcbe465 100644 --- a/input/lsr/rhythms/beam-across-line-breaks.ly +++ b/input/lsr/beam-across-line-breaks.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/text/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly similarity index 77% rename from input/lsr/text/blanking-staff-lines-using-the--whiteout-command.ly rename to input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index ff9215bf64..da52473d23 100644 --- a/input/lsr/text/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: editorial-and-educational-use, text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/expressive/breathing-sign.ly b/input/lsr/breathing-sign.ly similarity index 93% rename from input/lsr/expressive/breathing-sign.ly rename to input/lsr/breathing-sign.ly index f2602b560c..25a9105878 100644 --- a/input/lsr/expressive/breathing-sign.ly +++ b/input/lsr/breathing-sign.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/expressive/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly similarity index 93% rename from input/lsr/expressive/broken-crescendo-hairpin.ly rename to input/lsr/broken-crescendo-hairpin.ly index 2464e39f6b..b80ff7f387 100644 --- a/input/lsr/expressive/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/expressive/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly similarity index 90% rename from input/lsr/expressive/caesura-railtracks-with-fermata.ly rename to input/lsr/caesura-railtracks-with-fermata.ly index 4f59a536eb..4a94cd1788 100644 --- a/input/lsr/expressive/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/text/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly similarity index 91% rename from input/lsr/text/center-text-below-hairpin-dynamics.ly rename to input/lsr/center-text-below-hairpin-dynamics.ly index 1100ec7660..77392f07ea 100644 --- a/input/lsr/text/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks, text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/expressive/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly similarity index 86% rename from input/lsr/expressive/changing--flageolet-mark-size.ly rename to input/lsr/changing--flageolet-mark-size.ly index 0022d32263..f15aaedc36 100644 --- a/input/lsr/expressive/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/editorial/changing-an-individual-notes-size-in-a-chord.ly b/input/lsr/changing-an-individual-notes-size-in-a-chord.ly similarity index 84% rename from input/lsr/editorial/changing-an-individual-notes-size-in-a-chord.ly rename to input/lsr/changing-an-individual-notes-size-in-a-chord.ly index 95a924b136..96b75012cd 100644 --- a/input/lsr/editorial/changing-an-individual-notes-size-in-a-chord.ly +++ b/input/lsr/changing-an-individual-notes-size-in-a-chord.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: simultaneous-notes, editorial-and-educational-use \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/editorial/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly similarity index 73% rename from input/lsr/editorial/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly rename to input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 51f7bc520d..0e088db3e1 100644 --- a/input/lsr/editorial/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks, editorial-and-educational-use \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/chords/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly similarity index 91% rename from input/lsr/chords/changing-the-chord-names-to-german-or-semi-german-notation.ly rename to input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index 0e3f15df4a..96fa4b9a9e 100644 --- a/input/lsr/chords/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: chords \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly new file mode 100644 index 0000000000..559564d9d5 --- /dev/null +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -0,0 +1,45 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: editorial-and-educational-use, text +\version "2.11.35" + +\header { texidoc = " +The default font families for text can be overridden with +@code{make-pango-font-tree}. +" } + +\paper { + % change for other default global staff size. + myStaffSize = #20 + %{ + run + lilypond -dshow-available-fonts blabla + to show all fonts available in the process log. + %} + + #(define fonts + (make-pango-font-tree "Times New Roman" + "Nimbus Sans" + "Luxi Mono" +;; "Helvetica" +;; "Courier" + (/ myStaffSize 20))) +} + +\relative { + c'^\markup { + roman: foo \bold bla \italic bar \italic \bold baz + } + c'_\markup { + \override #'(font-family . sans) + { + sans: foo \bold bla \italic bar \italic \bold baz + } + } + c'^\markup { + \override #'(font-family . typewriter) + { + mono: foo \bold bla \italic bar \italic \bold baz + } + } +} + diff --git a/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly similarity index 84% rename from input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly rename to input/lsr/changing-the-number-of-lines-in-a-staff.ly index 2da5aa4606..7b973ad378 100644 --- a/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: staff-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/staff/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly similarity index 81% rename from input/lsr/staff/changing-the-staff-size.ly rename to input/lsr/changing-the-staff-size.ly index 252ff41d76..6fb2721a96 100644 --- a/input/lsr/staff/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: staff-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly similarity index 92% rename from input/lsr/rhythms/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly rename to input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly index b3497969e8..0290a21486 100644 --- a/input/lsr/rhythms/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly similarity index 84% rename from input/lsr/rhythms/chant-or-psalms-notation.ly rename to input/lsr/chant-or-psalms-notation.ly index 2e46df65bc..fa51a2c3dd 100644 --- a/input/lsr/rhythms/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms, vocal-music, ancient-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/chords/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly similarity index 89% rename from input/lsr/chords/chord-name-exceptions.ly rename to input/lsr/chord-name-exceptions.ly index e3ae4a9c4c..2fd5d21887 100644 --- a/input/lsr/chords/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: chords \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/chords-intro.itely b/input/lsr/chords-intro.itely new file mode 100644 index 0000000000..c9980477ef --- /dev/null +++ b/input/lsr/chords-intro.itely @@ -0,0 +1,5 @@ +@node Chords +@unnumbered Chords + +@lysnippets + diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list new file mode 100644 index 0000000000..be5f7f38ac --- /dev/null +++ b/input/lsr/chords.snippet-list @@ -0,0 +1,4 @@ +chord-name-exceptions.ly +changing-the-chord-names-to-german-or-semi-german-notation.ly +adding-a-figured-bass-above-or-below-the-notes.ly +clusters.ly diff --git a/input/lsr/chords/AAA-intro.ly b/input/lsr/chords/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/chords/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/chords/GNUmakefile b/input/lsr/chords/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/chords/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/chords/SConscript b/input/lsr/chords/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/chords/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/editorial/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly similarity index 95% rename from input/lsr/editorial/clefs-commonly-tweaked-properties.ly rename to input/lsr/clefs-commonly-tweaked-properties.ly index b4b9c6c8a7..1d09848d53 100644 --- a/input/lsr/editorial/clefs-commonly-tweaked-properties.ly +++ b/input/lsr/clefs-commonly-tweaked-properties.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches, staff-notation, editorial-and-educational-use \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/chords/clusters.ly b/input/lsr/clusters.ly similarity index 74% rename from input/lsr/chords/clusters.ly rename to input/lsr/clusters.ly index a86eca9e3c..63ff3f92fc 100644 --- a/input/lsr/chords/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: simultaneous-notes, chords, piano-music \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/editorial/coloring-objects.ly b/input/lsr/coloring-objects.ly similarity index 87% rename from input/lsr/editorial/coloring-objects.ly rename to input/lsr/coloring-objects.ly index 94e3e2f028..0d4a918614 100644 --- a/input/lsr/editorial/coloring-objects.ly +++ b/input/lsr/coloring-objects.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: editorial-and-educational-use \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/expressive/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly similarity index 78% rename from input/lsr/expressive/combining-dynamics-with-markup-texts.ly rename to input/lsr/combining-dynamics-with-markup-texts.ly index c068e95e2d..a64e257f7a 100644 --- a/input/lsr/expressive/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks, text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/simultaneous/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly similarity index 94% rename from input/lsr/simultaneous/combining-two-parts-on-the-same-staff.ly rename to input/lsr/combining-two-parts-on-the-same-staff.ly index 7e059fd634..39a482fd35 100644 --- a/input/lsr/simultaneous/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: simultaneous-notes, text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly similarity index 92% rename from input/lsr/rhythms/compound-time-signatures.ly rename to input/lsr/compound-time-signatures.ly index 58e7ef6f7e..a41365a722 100644 --- a/input/lsr/rhythms/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly similarity index 89% rename from input/lsr/rhythms/conducting-signs,-measure-grouping-signs.ly rename to input/lsr/conducting-signs,-measure-grouping-signs.ly index 658bc82fe4..9221704ac5 100644 --- a/input/lsr/rhythms/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly similarity index 91% rename from input/lsr/rhythms/controlling-tuplet-bracket-visibility.ly rename to input/lsr/controlling-tuplet-bracket-visibility.ly index 48aff64b34..fbf73f6123 100644 --- a/input/lsr/rhythms/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/pitches/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly similarity index 95% rename from input/lsr/pitches/creating-a-sequence-of-notes-on-various-pitches.ly rename to input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index 05df751a33..b04dd0b99e 100644 --- a/input/lsr/pitches/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/editorial/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly similarity index 87% rename from input/lsr/editorial/creating-blank-staves.ly rename to input/lsr/creating-blank-staves.ly index df6579acad..2f1750d020 100644 --- a/input/lsr/editorial/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: staff-notation, editorial-and-educational-use \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/pitches/creating-music-with-scheme-music-box.ly b/input/lsr/creating-music-with-scheme-music-box.ly similarity index 78% rename from input/lsr/pitches/creating-music-with-scheme-music-box.ly rename to input/lsr/creating-music-with-scheme-music-box.ly index 2d493f3f21..03660290d3 100644 --- a/input/lsr/pitches/creating-music-with-scheme-music-box.ly +++ b/input/lsr/creating-music-with-scheme-music-box.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches %% Do not edit this file; it is auto-generated from LSR! \version "2.11.35" diff --git a/input/lsr/text/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly similarity index 92% rename from input/lsr/text/creating-text-spanners.ly rename to input/lsr/creating-text-spanners.ly index e9234128cb..82dd3661a3 100644 --- a/input/lsr/text/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks, text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/ancient/custodes.ly b/input/lsr/custodes.ly similarity index 87% rename from input/lsr/ancient/custodes.ly rename to input/lsr/custodes.ly index b4b695e5be..921ba67037 100644 --- a/input/lsr/ancient/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: ancient-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/strings/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly similarity index 98% rename from input/lsr/strings/demo-midiinstruments.ly rename to input/lsr/demo-midiinstruments.ly index d37c3a3156..cf243f42b9 100644 --- a/input/lsr/strings/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: vocal-music, piano-music, strings \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/text/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly similarity index 91% rename from input/lsr/text/demonstrating-all-headers.ly rename to input/lsr/demonstrating-all-headers.ly index f0c899498b..4a0101adfe 100644 --- a/input/lsr/text/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/pitches/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly similarity index 93% rename from input/lsr/pitches/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly rename to input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 80e342eb34..34c1022392 100644 --- a/input/lsr/pitches/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/other/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly similarity index 85% rename from input/lsr/other/drawing-boxes-around-grobs.ly rename to input/lsr/drawing-boxes-around-grobs.ly index 2c8d1e9483..c86732e513 100644 --- a/input/lsr/other/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,5 +1,7 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: other %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.11.35" \header { texidoc = " The @code{print-function} can be overridden to draw a box around an diff --git a/input/lsr/other/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly similarity index 90% rename from input/lsr/other/drawing-circles-around-various-objects.ly rename to input/lsr/drawing-circles-around-various-objects.ly index 8409531e81..810f2d6754 100644 --- a/input/lsr/other/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,5 +1,7 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: other %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.11.35" \header { texidoc = " The \circle command allows you to draw circles around various objects diff --git a/input/lsr/editorial-and-educational-use-intro.itely b/input/lsr/editorial-and-educational-use-intro.itely new file mode 100644 index 0000000000..d014a36d8a --- /dev/null +++ b/input/lsr/editorial-and-educational-use-intro.itely @@ -0,0 +1,5 @@ +@node Editorial and educational use +@unnumbered Editorial and educational use + +@lysnippets + diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list new file mode 100644 index 0000000000..72ddd3bb60 --- /dev/null +++ b/input/lsr/editorial-and-educational-use.snippet-list @@ -0,0 +1,10 @@ +creating-blank-staves.ly +applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +coloring-objects.ly +inserting-score-fragments-above-the-staff,-as-markups.ly +rhythmic-slashes.ly +changing-the-default-text-font-family.ly +clefs-commonly-tweaked-properties.ly +blanking-staff-lines-using-the--whiteout-command.ly +changing-an-individual-notes-size-in-a-chord.ly diff --git a/input/lsr/editorial/AAA-intro.ly b/input/lsr/editorial/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/editorial/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/editorial/GNUmakefile b/input/lsr/editorial/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/editorial/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/editorial/SConscript b/input/lsr/editorial/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/editorial/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/editorial/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/editorial/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly deleted file mode 100644 index 91fa6e39e7..0000000000 --- a/input/lsr/editorial/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +++ /dev/null @@ -1,47 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The shapeNoteStyles property gives you the ability to define various -note heads styles for each step of the scale (as defined by the key -signature or the \"tonic\" property). - -This property requires a set of symbols, which can be purely arbitrary -(geometrical expressions such as triangle, cross, xcircle etc. are -allowed) or based on old American engraving tradition (you can use some -latin note names as well). - -That said, if you're trying to imitate old American song books, you may -also want to try LilyPond's predefined note heads styles, through -shortcut commands such as \\aikenHeads or \\sacredHarpHeads. - -This exemple shows different ways to obtain shape note heads, and -demonstrates the ability to transpose a melody without losing the -correspondance between harmonic functions and note heads styles. -" } - -fragment = { - \key c \major - c1 d e f g a b c - \break -} - -\relative { - \set shapeNoteStyles = ##(do re mi fa #f la ti) - \fragment -} - -% temporary change help LSR integration -gp -%{ -\transpose c d - \relative { - \set shapeNoteStyles = ##(do re mi fa #f la ti) - \fragment -} - -\relative { - \set shapeNoteStyles = ##(cross triangle fa #f mensural xcircle diamond) - \fragment -} -%} - diff --git a/input/lsr/editorial/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/editorial/blanking-staff-lines-using-the--whiteout-command.ly deleted file mode 100644 index ff9215bf64..0000000000 --- a/input/lsr/editorial/blanking-staff-lines-using-the--whiteout-command.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The \\whiteout command underlays a white box under a markup. Since -staff lines are in a lower layer than most other grobs, this white box -will not overlap any other grob. -" } - -\paper -{ - ragged-right = ##t -} -{ - \override TextScript #'extra-offset = #'(2 . 4) - c'4-\markup { \whiteout \pad-markup #0.5 foo } c -} diff --git a/input/lsr/expressive-marks-intro.itely b/input/lsr/expressive-marks-intro.itely new file mode 100644 index 0000000000..6b6550dd36 --- /dev/null +++ b/input/lsr/expressive-marks-intro.itely @@ -0,0 +1,5 @@ +@node Expressive marks +@unnumbered Expressive marks + +@lysnippets + diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list new file mode 100644 index 0000000000..69de4e9117 --- /dev/null +++ b/input/lsr/expressive-marks.snippet-list @@ -0,0 +1,12 @@ +combining-dynamics-with-markup-texts.ly +glissando-contempary.ly +breathing-sign.ly +changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +caesura-railtracks-with-fermata.ly +adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +center-text-below-hairpin-dynamics.ly +adding-parentheses-around-an-expressive-mark.ly +line-arrows.ly +changing--flageolet-mark-size.ly +creating-text-spanners.ly +broken-crescendo-hairpin.ly diff --git a/input/lsr/expressive/AAA-intro.ly b/input/lsr/expressive/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/expressive/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/expressive/GNUmakefile b/input/lsr/expressive/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/expressive/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/expressive/SConscript b/input/lsr/expressive/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/expressive/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly deleted file mode 100644 index 7bd7544869..0000000000 --- a/input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ /dev/null @@ -1,24 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -LilyPond syntax can involve many unusual placements for parentheses, -brackets etc., which might sometimes have to be interleaved.For -example, when entering a manual beam, the left square bracket has to be -placed after the starting note and its duration, not before. Similarly, -the right square bracket should directly follow the note which is to be -at the end of the requested beaming, even if this note happens to be -inside a tuplet section. This snippet demonstrates how to superpose -manual beaming, manual slurs, ties, and phrasing slurs, while using -tuplet sections (enclosed with curly braces). -" } - -{ - r16[ g16 \times 2/3 {r16 e'8] } - - g16( a \times 2/3 {b d e') } - - g8[( a \times 2/3 {b d') e'~]} - - \times 4/5 {e'32\( a b d' e'} a'4.\) -} diff --git a/input/lsr/expressive/center-text-below-hairpin-dynamics.ly b/input/lsr/expressive/center-text-below-hairpin-dynamics.ly deleted file mode 100644 index 1100ec7660..0000000000 --- a/input/lsr/expressive/center-text-below-hairpin-dynamics.ly +++ /dev/null @@ -1,34 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -This example provides a function to typeset hairpin (de)crescendo with -some additional text below it, such as \"molto\" or \"poco\". - -The example also illustrates how to use modify the way an object -normally is printed, using some Scheme code. -" } - -hairpinWithCenteredText = #(define-music-function - (parser location text) (markup?) -#{ -\override Voice.Hairpin #'stencil = #(lambda (grob) - (ly:stencil-aligned-to - (ly:stencil-combine-at-edge - (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER) - Y - DOWN - (ly:stencil-aligned-to (ly:text-interface::print grob) X CENTER)) - X LEFT)) -\override Voice.Hairpin #'text = $text -#}) - - -hairpinMolto = \hairpinWithCenteredText \markup {\italic "molto"} -hairpinMore = \hairpinWithCenteredText \markup {\bigger "moltissimo"} - -\new Staff { - \hairpinMolto c'2\< c'2\f - \hairpinMore c'2\< c'2\f -} - diff --git a/input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly deleted file mode 100644 index 51f7bc520d..0000000000 --- a/input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ /dev/null @@ -1,27 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The appearance of slurs may be changed from solid to dotted or dashed. - - -" } - -\score{ - \relative c'{ - c( d e c) | - \slurDotted - c( d e c) | - \slurSolid - c( d e c) | - \slurDashed - c( d e c) | - \slurSolid - c( d e c) | - } - \layout{ raggedright=##t } -} - - - - diff --git a/input/lsr/expressive/creating-text-spanners.ly b/input/lsr/expressive/creating-text-spanners.ly deleted file mode 100644 index e9234128cb..0000000000 --- a/input/lsr/expressive/creating-text-spanners.ly +++ /dev/null @@ -1,42 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The \\startTextSpan and \\stopTextSpan commands give you the ability to -create text spanners as easily as pedals indications or octavations. -Override some properties of the TextSpanner object to modify its -output. -" } - -\relative c''{ - \override TextSpanner #'edge-text = #'("bla" . "blu") - a \startTextSpan - b c - a \stopTextSpan - - \override TextSpanner #'dash-period = #2 - \override TextSpanner #'dash-fraction = #0.0 - a \startTextSpan - b c - a \stopTextSpan - - \revert TextSpanner #'style - \override TextSpanner #'style = #'dashed-line \override TextSpanner #'bound-details #'left #'text = \markup { \draw-line #'(0 . 1) } - \override TextSpanner #'bound-details #'right #'text = \markup { \draw-line #'(0 . -2) } - - a \startTextSpan - b c - a \stopTextSpan - - - \set Staff.middleCPosition = #-13 - - \override TextSpanner #'dash-period = #10 - \override TextSpanner #'dash-fraction = #.5 - \override TextSpanner #'thickness = #10 - a \startTextSpan - b c - a \stopTextSpan - \set Staff.middleCPosition = #-6 -} - diff --git a/input/lsr/pitches/generating-random-notes.ly b/input/lsr/generating-random-notes.ly similarity index 92% rename from input/lsr/pitches/generating-random-notes.ly rename to input/lsr/generating-random-notes.ly index 806a24df64..c8e8d1eb58 100644 --- a/input/lsr/pitches/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/glissando-contempary.ly b/input/lsr/glissando-contempary.ly new file mode 100644 index 0000000000..678865550f --- /dev/null +++ b/input/lsr/glissando-contempary.ly @@ -0,0 +1,21 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches, expressive-marks +\version "2.11.35" + +\header { texidoc = " +Use a glissando without final note. Contemporary glissando ! +" } + +\relative c'' { + \override Glissando #'style = #'zigzag + \time 3/4 + c4 c + \cadenzaOn c\glissando \hideNotes c,, \unHideNotes \cadenzaOff + \bar "|" + } + +\addlyrics { Use cadenzaOn glissando hideNotes } +\addlyrics { unHideNotes cadenzaOff, skip_and_\bar \skip 4 } +\layout{raggedright = ##t} +\header { tagline="" } + diff --git a/input/lsr/guitar-intro.itely b/input/lsr/guitar-intro.itely new file mode 100644 index 0000000000..931ad7a54e --- /dev/null +++ b/input/lsr/guitar-intro.itely @@ -0,0 +1,5 @@ +@node Guitar +@unnumbered Guitar + +@lysnippets + diff --git a/input/lsr/guitar.snippet-list b/input/lsr/guitar.snippet-list new file mode 100644 index 0000000000..6377452c1f --- /dev/null +++ b/input/lsr/guitar.snippet-list @@ -0,0 +1,2 @@ +letter-tablature-formatting.ly +adding-fingerings-to-tablatures.ly diff --git a/input/lsr/guitar/AAA-intro.ly b/input/lsr/guitar/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/guitar/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/guitar/GNUmakefile b/input/lsr/guitar/GNUmakefile deleted file mode 100644 index 43325ab698..0000000000 --- a/input/lsr/guitar/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/guitar/SConscript b/input/lsr/guitar/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/guitar/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/rhythms/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly similarity index 94% rename from input/lsr/rhythms/heavily-customized-polymetric-time-signatures.ly rename to input/lsr/heavily-customized-polymetric-time-signatures.ly index 8f3963d725..63ce90271c 100644 --- a/input/lsr/rhythms/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms, percussion \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly new file mode 100644 index 0000000000..2591face29 --- /dev/null +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -0,0 +1,11 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text, vocal-music +\version "2.11.35" + +\header { texidoc = " +This can be achieved by separating those syllables by tildes. +" } + +\lyrics { + wa~o~a +} diff --git a/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly new file mode 100644 index 0000000000..5594874463 --- /dev/null +++ b/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly @@ -0,0 +1,34 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: staff-notation, editorial-and-educational-use +\version "2.11.35" + +\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/guitar/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly similarity index 76% rename from input/lsr/guitar/letter-tablature-formatting.ly rename to input/lsr/letter-tablature-formatting.ly index 5d497fb67c..1004ca11d9 100644 --- a/input/lsr/guitar/letter-tablature-formatting.ly +++ b/input/lsr/letter-tablature-formatting.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: guitar %% Do not edit this file; it is auto-generated from LSR! \version "2.11.35" diff --git a/input/lsr/expressive/line-arrows.ly b/input/lsr/line-arrows.ly similarity index 91% rename from input/lsr/expressive/line-arrows.ly rename to input/lsr/line-arrows.ly index aec41cb3bc..23afdead7f 100644 --- a/input/lsr/expressive/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: expressive-marks \header { texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } diff --git a/input/lsr/pitches/makam.ly b/input/lsr/makam.ly similarity index 98% rename from input/lsr/pitches/makam.ly rename to input/lsr/makam.ly index a11903fce8..c63066bbf9 100644 --- a/input/lsr/pitches/makam.ly +++ b/input/lsr/makam.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \header { texidoc = "Makam is Turkish type of melody that uses 1/9 tone diff --git a/input/lsr/other/making-an-object-invisibile-with-the-transparent-property.ly b/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly similarity index 88% rename from input/lsr/other/making-an-object-invisibile-with-the-transparent-property.ly rename to input/lsr/making-an-object-invisibile-with-the-transparent-property.ly index e38331e2c3..e6ee0e6467 100644 --- a/input/lsr/other/making-an-object-invisibile-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly @@ -1,5 +1,7 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: other %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.11.35" \header { texidoc = " Setting the @code{transparent} property will cause an object to be diff --git a/input/lsr/text/markup-lines.ly b/input/lsr/markup-lines.ly similarity index 95% rename from input/lsr/text/markup-lines.ly rename to input/lsr/markup-lines.ly index 4432ea2d86..a1b7d5dcc6 100644 --- a/input/lsr/text/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text \version "2.11.35" \header { diff --git a/input/lsr/pitches/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly similarity index 90% rename from input/lsr/pitches/non-traditional-key-signatures.ly rename to input/lsr/non-traditional-key-signatures.ly index 81d3333bc7..044cc4d91b 100644 --- a/input/lsr/pitches/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches, staff-notation \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/other-intro.itely b/input/lsr/other-intro.itely new file mode 100644 index 0000000000..795a15b8e3 --- /dev/null +++ b/input/lsr/other-intro.itely @@ -0,0 +1,5 @@ +@node Other +@unnumbered Other + +@lysnippets + diff --git a/input/lsr/other.snippet-list b/input/lsr/other.snippet-list new file mode 100644 index 0000000000..ac51e07a1f --- /dev/null +++ b/input/lsr/other.snippet-list @@ -0,0 +1,6 @@ +applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +using-the--tweak-command-to-tweak-individual-grobs.ly +drawing-circles-around-various-objects.ly +making-an-object-invisibile-with-the-transparent-property.ly +drawing-boxes-around-grobs.ly +outputting-the-version-number.ly diff --git a/input/lsr/other/GNUmakefile b/input/lsr/other/GNUmakefile deleted file mode 100644 index 3819fda13a..0000000000 --- a/input/lsr/other/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/other/SConscript b/input/lsr/other/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/lsr/other/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/lsr/other/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly similarity index 86% rename from input/lsr/other/outputting-the-version-number.ly rename to input/lsr/outputting-the-version-number.ly index 4d4ec62ddc..e613d665a4 100644 --- a/input/lsr/other/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,5 +1,7 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: other %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.11.35" \header { texidoc = " By putting the output of diff --git a/input/lsr/percussion-intro.itely b/input/lsr/percussion-intro.itely new file mode 100644 index 0000000000..9c2c6fdb12 --- /dev/null +++ b/input/lsr/percussion-intro.itely @@ -0,0 +1,5 @@ +@node Percussion +@unnumbered Percussion + +@lysnippets + diff --git a/input/lsr/percussion.snippet-list b/input/lsr/percussion.snippet-list new file mode 100644 index 0000000000..d39f51e4b1 --- /dev/null +++ b/input/lsr/percussion.snippet-list @@ -0,0 +1,2 @@ +adding-drum-parts.ly +heavily-customized-polymetric-time-signatures.ly diff --git a/input/lsr/percussion/AAA-intro.ly b/input/lsr/percussion/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/percussion/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/percussion/GNUmakefile b/input/lsr/percussion/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/percussion/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/percussion/SConscript b/input/lsr/percussion/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/percussion/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/percussion/adding-drum-parts.ly b/input/lsr/percussion/adding-drum-parts.ly deleted file mode 100644 index 9c4edf7469..0000000000 --- a/input/lsr/percussion/adding-drum-parts.ly +++ /dev/null @@ -1,45 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/piano-music-intro.itely b/input/lsr/piano-music-intro.itely new file mode 100644 index 0000000000..3cd0e85431 --- /dev/null +++ b/input/lsr/piano-music-intro.itely @@ -0,0 +1,5 @@ +@node Piano +@unnumbered Piano + +@lysnippets + diff --git a/input/lsr/piano-music.snippet-list b/input/lsr/piano-music.snippet-list new file mode 100644 index 0000000000..e597ef9234 --- /dev/null +++ b/input/lsr/piano-music.snippet-list @@ -0,0 +1,2 @@ +clusters.ly +demo-midiinstruments.ly diff --git a/input/lsr/piano/AAA-intro.ly b/input/lsr/piano/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/piano/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/piano/GNUmakefile b/input/lsr/piano/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/piano/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/piano/SConscript b/input/lsr/piano/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/piano/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/pitches-intro.itely b/input/lsr/pitches-intro.itely new file mode 100644 index 0000000000..2d65d94355 --- /dev/null +++ b/input/lsr/pitches-intro.itely @@ -0,0 +1,5 @@ +@node Pitches +@unnumbered Pitches + +@lysnippets + diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list new file mode 100644 index 0000000000..5e867af4f7 --- /dev/null +++ b/input/lsr/pitches.snippet-list @@ -0,0 +1,15 @@ +applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +glissando-contempary.ly +ambiti-multiple-voices.ly +volta-multi-staff.ly +transposing-pitches-with-minimum-accidentals-smart-transpose.ly +makam.ly +preventing-extra-naturals-from-being-automatically-added.ly +generating-random-notes.ly +adding-ambiti-per-voice.ly +clefs-commonly-tweaked-properties.ly +dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +creating-music-with-scheme-music-box.ly +creating-a-sequence-of-notes-on-various-pitches.ly +non-traditional-key-signatures.ly diff --git a/input/lsr/pitches/AAA-intro.ly b/input/lsr/pitches/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/pitches/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/pitches/GNUmakefile b/input/lsr/pitches/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/pitches/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/pitches/SConscript b/input/lsr/pitches/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/pitches/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/pitches/adding-ambiti-per-voice.ly b/input/lsr/pitches/adding-ambiti-per-voice.ly deleted file mode 100644 index 55e5167e8d..0000000000 --- a/input/lsr/pitches/adding-ambiti-per-voice.ly +++ /dev/null @@ -1,26 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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 = # 2.0 - \voiceOne - c4 a d e f1 - } - \new Voice \with { - \consists "Ambitus_engraver" - } \relative c' { - \voiceTwo - es4 f g as b1 - } ->> - -} diff --git a/input/lsr/pitches/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/pitches/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly deleted file mode 100644 index 91fa6e39e7..0000000000 --- a/input/lsr/pitches/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +++ /dev/null @@ -1,47 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The shapeNoteStyles property gives you the ability to define various -note heads styles for each step of the scale (as defined by the key -signature or the \"tonic\" property). - -This property requires a set of symbols, which can be purely arbitrary -(geometrical expressions such as triangle, cross, xcircle etc. are -allowed) or based on old American engraving tradition (you can use some -latin note names as well). - -That said, if you're trying to imitate old American song books, you may -also want to try LilyPond's predefined note heads styles, through -shortcut commands such as \\aikenHeads or \\sacredHarpHeads. - -This exemple shows different ways to obtain shape note heads, and -demonstrates the ability to transpose a melody without losing the -correspondance between harmonic functions and note heads styles. -" } - -fragment = { - \key c \major - c1 d e f g a b c - \break -} - -\relative { - \set shapeNoteStyles = ##(do re mi fa #f la ti) - \fragment -} - -% temporary change help LSR integration -gp -%{ -\transpose c d - \relative { - \set shapeNoteStyles = ##(do re mi fa #f la ti) - \fragment -} - -\relative { - \set shapeNoteStyles = ##(cross triangle fa #f mensural xcircle diamond) - \fragment -} -%} - diff --git a/input/lsr/pitches/clefs-commonly-tweaked-properties.ly b/input/lsr/pitches/clefs-commonly-tweaked-properties.ly deleted file mode 100644 index b4b9c6c8a7..0000000000 --- a/input/lsr/pitches/clefs-commonly-tweaked-properties.ly +++ /dev/null @@ -1,78 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The command @code{\\clef \"treble_8\"} is equivalent to setting -@code{clefGlyph}, @code{clefPosition} (which controls the Y position of -the clef), @code{middleCPosition} and @code{clefOctavation}. A clef is -printed when any of these properties are changed. - - -Note that changing the glyph, the position of the clef, or the -octavation, does not in itself change the position of subsequent notes -on the staff: the position of middle C must also be specified to do -this. The positional parameters are relative to the staff centre line, -positive numbers displacing upwards, counting 1 for each line and -space. The clefOctavation value would normally be set to 7, -7, 15 or --15, but other values are not invalid. - - -When a clef change takes place at a line break the new clef symbol is -printed at both the end of the previous line and the beginning of the -new line by default. If the warning clef at the end of the previous -line in not required it can be suppressed by setting the -explicitClefVisibility Staff property to the value @code{ -end-of-line-invisible: \\set Staff.explicitClefVisibility = -#end-of-line-invisible } The default behaviour can be recovered with -@code{\\unset Staff.explicitClefVisibility} - - -The following examples show the possibilities when setting these -properties manually. On the first line, the manual changes preserve the -standard relative positioning of clefs and notes, whereas on the second -line, they do not. -" } - -{ - % The default treble clef - c'4 - % The standard bass clef - \set Staff.clefGlyph = #"clefs.F" - \set Staff.clefPosition = #2 - \set Staff.middleCPosition = #6 - c'4 - % The baritone clef - \set Staff.clefGlyph = #"clefs.C" - \set Staff.clefPosition = #4 - \set Staff.middleCPosition = #4 - c'4 - % The standard choral tenor clef - \set Staff.clefGlyph = #"clefs.G" - \set Staff.clefPosition = #-2 - \set Staff.clefOctavation = #-7 - \set Staff.middleCPosition = #1 - c'4 - % A non-standard clef - \set Staff.clefPosition = #0 - \set Staff.clefOctavation = #0 - \set Staff.middleCPosition = #-4 - c'4 \break - - % The following clef changes do not preserve - % the normal relationship between notes and clefs: - - \set Staff.clefGlyph = #"clefs.F" - \set Staff.clefPosition = #2 - c'4 - \set Staff.clefGlyph = #"clefs.G" - c'4 - \set Staff.clefGlyph = #"clefs.C" - c'4 - \set Staff.clefOctavation = #7 - c'4 - \set Staff.clefOctavation = #0 - \set Staff.clefPosition = #0 - c'4 - \set Staff.middleCPosition = #4 - c'4 - } diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly new file mode 100644 index 0000000000..18866c5a3b --- /dev/null +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -0,0 +1,110 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: repeats +\version "2.11.35" + +\header { texidoc = " +If you want to place an exiting segno sign and add text like \"D.S. al +Coda\" next to it where usually the staff lines are you can use this +snippet. The coda will resume in a new line. Theres a variation +documented in this snippet, where the coda will remain on the same +line. +" } + +{ + \clef treble + \key g \major + \time 4/4 + \relative c'' { + \repeat unfold 2 { + | c4 c c c + } + + % Set segno sign as rehearsal mark and adjust size if needed + % \once \override Score.RehearsalMark #'font-size = #3 + \mark \markup { \musicglyph #"scripts.segno" } + \repeat unfold 2 { + | c4 c c c + } + + % Set coda sign as rehearsal mark and adjust size if needed + \once \override Score.RehearsalMark #'font-size = #4 + \mark \markup { \musicglyph #"scripts.coda" } + \repeat unfold 2 { + | c4 c c c + } + + % Should Coda be on anew line? + % Coda NOT on new line: use \nobreak + % Coda on new line: DON'T use \nobreak + % \noBreak + + \bar "||" + + % Set segno sign as rehearsal mark and adjust size if needed + \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible + % \once \override Score.RehearsalMark #'font-size = #3 + \mark \markup { \musicglyph #"scripts.segno" } + + % Here begins the trickery! + % \cadenzaOn will suppress the bar count and \stopStaff removes the staff lines. + \cadenzaOn + \stopStaff + % Some examples of possible text-displays + + % text line-aligned + % ================== + % Move text to the desired position + % \once \override TextScript #'extra-offset = #'( 2 . -3.5 ) + % | s1*0^\markup { D.S. al Coda } } + + % text center-aligned + % ==================== + % Move text to the desired position + % \once \override TextScript #'extra-offset = #'( 6 . -5.0 ) + % | s1*0^\markup { \center-align { D.S. "al Coda" } } + + % text and symbols center-aligned + % =============================== + % Move text to the desired position and tweak spacing for optimum text alignment + \once \override TextScript #'extra-offset = #'( 8 . -5.5 ) + \once \override TextScript #'word-space = #1.5 + | s1*0^\markup { \center-align { "D.S. al Coda" \line { \musicglyph #"scripts.coda" \musicglyph #"scripts.tenuto" \musicglyph #"scripts.coda"} } } + + % Increasing the unfold counter will expand the staff-free space + \repeat unfold 4 { + s4 s4 s4 s4 + \bar "" + } + % Resume bar count and show staff lines again + \startStaff + \cadenzaOff + + % Should Coda be on new line? + % Coda NOT on new line: DON'T use \break + % Coda on new line: use \break + \break + + % Show up, you clef and key! + \once \override Staff.KeySignature #'break-visibility = #end-of-line-invisible + \once \override Staff.Clef #'break-visibility = #end-of-line-invisible + + % Set coda sign as rehearsal mark and adjust size and position + + % Put the coda sign ontop of the (treble-)clef dependend on coda's line-position + + % Coda NOT on new line, use this: + % \once \override Score.RehearsalMark #'extra-offset = #'( -2 . 1.75 ) + + % Coda on new line, use this: + \once \override Score.RehearsalMark #'extra-offset = #'( -8.42 . 1.75 ) + + \once \override Score.RehearsalMark #'font-size = #5 + \mark \markup { \musicglyph #"scripts.coda" } + + % The coda + \repeat unfold 5 { + | c4 c c c + } + \bar"|." + } +} diff --git a/input/lsr/pitches/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly similarity index 83% rename from input/lsr/pitches/preventing-extra-naturals-from-being-automatically-added.ly rename to input/lsr/preventing-extra-naturals-from-being-automatically-added.ly index ffba267f9c..7cf71c1119 100644 --- a/input/lsr/pitches/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/pitches/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly similarity index 85% rename from input/lsr/pitches/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly rename to input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index 863b573d36..bdcd003141 100644 --- a/input/lsr/pitches/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/repeats-intro.itely b/input/lsr/repeats-intro.itely new file mode 100644 index 0000000000..bda677755a --- /dev/null +++ b/input/lsr/repeats-intro.itely @@ -0,0 +1,5 @@ +@node Repeats +@unnumbered Repeats + +@lysnippets + diff --git a/input/lsr/repeats.snippet-list b/input/lsr/repeats.snippet-list new file mode 100644 index 0000000000..893f00a661 --- /dev/null +++ b/input/lsr/repeats.snippet-list @@ -0,0 +1,2 @@ +positioning-segno-and-coda-with-line-break.ly +volta-multi-staff.ly diff --git a/input/lsr/repeats/AAA-intro.ly b/input/lsr/repeats/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/repeats/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/repeats/GNUmakefile b/input/lsr/repeats/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/repeats/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/repeats/SConscript b/input/lsr/repeats/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/repeats/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/repeats/volta-multi-staff.ly b/input/lsr/repeats/volta-multi-staff.ly deleted file mode 100644 index 83afb06f71..0000000000 --- a/input/lsr/repeats/volta-multi-staff.ly +++ /dev/null @@ -1,23 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\header { - texidoc = "By adding @code{Volta_engraver}, repeat brackets - can be put over staves other than the topmost one in a score." -} - -\version "2.11.36" - -vmus = { - \repeat volta 2 c1 \alternative { d e } -} - -\relative c'' << - \new StaffGroup << - \context Staff \vmus - \new Staff \vmus - >> - \new StaffGroup << - \new Staff \with { \consists Volta_engraver } - \vmus - \new Staff \vmus - >> ->> diff --git a/input/lsr/editorial/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly similarity index 92% rename from input/lsr/editorial/rhythmic-slashes.ly rename to input/lsr/rhythmic-slashes.ly index 3383d7e216..8c21f6f26a 100644 --- a/input/lsr/editorial/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: rhythms, editorial-and-educational-use \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/rhythms-intro.itely b/input/lsr/rhythms-intro.itely new file mode 100644 index 0000000000..a250e5b398 --- /dev/null +++ b/input/lsr/rhythms-intro.itely @@ -0,0 +1,5 @@ +@node Rhythms +@unnumbered Rhythms + +@lysnippets + diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list new file mode 100644 index 0000000000..9851075ca9 --- /dev/null +++ b/input/lsr/rhythms.snippet-list @@ -0,0 +1,13 @@ +altering-the-number-of-stems-in-a-beam.ly +chant-or-psalms-notation.ly +conducting-signs,-measure-grouping-signs.ly +heavily-customized-polymetric-time-signatures.ly +rhythmic-slashes.ly +adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +automatic-beam-subdivisions.ly +controlling-tuplet-bracket-visibility.ly +beam-across-line-breaks.ly +adding-drum-parts.ly +compound-time-signatures.ly diff --git a/input/lsr/rhythms/AAA-intro.ly b/input/lsr/rhythms/AAA-intro.ly deleted file mode 100644 index a252d0994c..0000000000 --- a/input/lsr/rhythms/AAA-intro.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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. - -@ifhtml -Also available as a @uref{collated-files.pdf,PDF} -@end ifhtml -"} - -% make sure .png is generated. -\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } - diff --git a/input/lsr/rhythms/GNUmakefile b/input/lsr/rhythms/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/rhythms/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/rhythms/SConscript b/input/lsr/rhythms/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/rhythms/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/rhythms/rhythmic-slashes.ly b/input/lsr/rhythms/rhythmic-slashes.ly deleted file mode 100644 index 3383d7e216..0000000000 --- a/input/lsr/rhythms/rhythmic-slashes.ly +++ /dev/null @@ -1,43 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -In \"simple\" lead-sheets, sometimes no actual notes are written, -instead only \"rhythmic patterns\" and chords above the measures are -noted giving the structure of a song. Such a feature is for example -useful while creating/transcribing the structure of a song and also -when sharing lead sheets with guitarists or jazz musicians. - -The standard support for this is described in section \"Measure -repeats\", but then the first beat has to be an ordinary note or rest. - -This example shows two solutions to this problem, by redefining -ordinary rests to be printed as slashes. (If the duration of each beat -is not a quarter note, replace the r4 in the definitions by a rest of -the appropriate duration). -" } - -% Macro to print single slash -rs = { -\once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash -\once \override Rest #'thickness = #'0.48 -\once \override Rest #'slope = #'1.7 -r4 -} - - -% Function to print a specified number of slashes -comp = #(define-music-function (parser location count) ( integer?) -#{ -\override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash -\override Rest #'thickness = #'0.48 -\override Rest #'slope = #'1.7 -\repeat unfold $count { r4 } -\revert Rest #'stencil -#}) - -\score{ -\relative c'{ - c d e f | \rs \rs \rs \rs | \comp #4 | -} -} diff --git a/input/lsr/simultaneous-notes-intro.itely b/input/lsr/simultaneous-notes-intro.itely new file mode 100644 index 0000000000..321010ab4c --- /dev/null +++ b/input/lsr/simultaneous-notes-intro.itely @@ -0,0 +1,5 @@ +@node Simultaneous notes +@unnumbered Simultaneous notes + +@lysnippets + diff --git a/input/lsr/simultaneous-notes.snippet-list b/input/lsr/simultaneous-notes.snippet-list new file mode 100644 index 0000000000..bbc27d213f --- /dev/null +++ b/input/lsr/simultaneous-notes.snippet-list @@ -0,0 +1,3 @@ +clusters.ly +changing-an-individual-notes-size-in-a-chord.ly +combining-two-parts-on-the-same-staff.ly diff --git a/input/lsr/simultaneous/AAA-intro.ly b/input/lsr/simultaneous/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/simultaneous/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/simultaneous/GNUmakefile b/input/lsr/simultaneous/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/simultaneous/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/simultaneous/SConscript b/input/lsr/simultaneous/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/simultaneous/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/simultaneous/changing-an-individual-notes-size-in-a-chord.ly b/input/lsr/simultaneous/changing-an-individual-notes-size-in-a-chord.ly deleted file mode 100644 index 95a924b136..0000000000 --- a/input/lsr/simultaneous/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.35" - -\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/simultaneous/clusters.ly b/input/lsr/simultaneous/clusters.ly deleted file mode 100644 index a86eca9e3c..0000000000 --- a/input/lsr/simultaneous/clusters.ly +++ /dev/null @@ -1,22 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/snippets.tely b/input/lsr/snippets.tely new file mode 100644 index 0000000000..0f31dcb42b --- /dev/null +++ b/input/lsr/snippets.tely @@ -0,0 +1,88 @@ +\input texinfo @c -*- coding: utf-8; mode: texinfo; -*- +@setfilename snippets.info +@settitle LilyPond snippets +@documentencoding UTF-8 +@documentlanguage en + +@iftex +@afourpaper +@end iftex + +@finalout + +@node Top +@top LilyPond examples + +This document shows LilyPond snippets from the +@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. + +Snippets are grouped by tags; many tags match a section of LilyPond +notation manual. + +In the HTML version of this document, you can click on the file name +or figure for each example to see the corresponding input file. + +@lilypond[ragged-right] +\score { + \context Lyrics { + \override Score.RehearsalMark #'self-alignment-X = #LEFT + \override Score.RehearsalMark #'font-size = #-1 + \mark #(ly:export (string-append + "This document is for LilyPond version " (lilypond-version) ".")) + s2 + } + \layout { + indent = 0.0\pt + } +} +@end lilypond + +@c maybe generate/update @menu and @includes automatically? --jm +@menu +Musical notation +* Pitches:: +* Rhythms:: +* Expressive marks:: +* Repeats:: +* Simultaneous notes:: +* Staff notation:: +* Editorial and educational use:: +* Text:: + +Specialist notation +* Vocal music:: +* Chords:: +* Piano:: +* Percussion:: +* Guitar:: +* Strings:: +@c * Bagpipes:: +* Ancient notation:: + +Other collections +* Other:: +@end menu + +@contents + +@include pitches.itely +@include rhythms.itely +@include expressive-marks.itely +@include repeats.itely +@include simultaneous-notes.itely +@include staff-notation.itely +@include editorial-and-educational-use.itely +@include text.itely + +@include vocal-music.itely +@include chords.itely +@include piano-music.itely +@include percussion.itely +@include guitar.itely +@include strings.itely +@c @include bagpipes.itely +@include ancient-notation.itely + +@include other.itely + +@bye diff --git a/input/lsr/staff-notation-intro.itely b/input/lsr/staff-notation-intro.itely new file mode 100644 index 0000000000..4a2103d87e --- /dev/null +++ b/input/lsr/staff-notation-intro.itely @@ -0,0 +1,5 @@ +@node Staff notation +@unnumbered Staff notation + +@lysnippets + diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list new file mode 100644 index 0000000000..d3eb9091aa --- /dev/null +++ b/input/lsr/staff-notation.snippet-list @@ -0,0 +1,9 @@ +creating-blank-staves.ly +adding-and-extra-staff-at-a-line-break.ly +changing-the-number-of-lines-in-a-staff.ly +inserting-score-fragments-above-the-staff,-as-markups.ly +adding-an-extra-staff.ly +changing-the-staff-size.ly +adding-ambiti-per-voice.ly +clefs-commonly-tweaked-properties.ly +non-traditional-key-signatures.ly diff --git a/input/lsr/staff/AAA-intro.ly b/input/lsr/staff/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/staff/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/staff/GNUmakefile b/input/lsr/staff/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/staff/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/staff/SConscript b/input/lsr/staff/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/staff/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/staff/clefs-commonly-tweaked-properties.ly b/input/lsr/staff/clefs-commonly-tweaked-properties.ly deleted file mode 100644 index b4b9c6c8a7..0000000000 --- a/input/lsr/staff/clefs-commonly-tweaked-properties.ly +++ /dev/null @@ -1,78 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The command @code{\\clef \"treble_8\"} is equivalent to setting -@code{clefGlyph}, @code{clefPosition} (which controls the Y position of -the clef), @code{middleCPosition} and @code{clefOctavation}. A clef is -printed when any of these properties are changed. - - -Note that changing the glyph, the position of the clef, or the -octavation, does not in itself change the position of subsequent notes -on the staff: the position of middle C must also be specified to do -this. The positional parameters are relative to the staff centre line, -positive numbers displacing upwards, counting 1 for each line and -space. The clefOctavation value would normally be set to 7, -7, 15 or --15, but other values are not invalid. - - -When a clef change takes place at a line break the new clef symbol is -printed at both the end of the previous line and the beginning of the -new line by default. If the warning clef at the end of the previous -line in not required it can be suppressed by setting the -explicitClefVisibility Staff property to the value @code{ -end-of-line-invisible: \\set Staff.explicitClefVisibility = -#end-of-line-invisible } The default behaviour can be recovered with -@code{\\unset Staff.explicitClefVisibility} - - -The following examples show the possibilities when setting these -properties manually. On the first line, the manual changes preserve the -standard relative positioning of clefs and notes, whereas on the second -line, they do not. -" } - -{ - % The default treble clef - c'4 - % The standard bass clef - \set Staff.clefGlyph = #"clefs.F" - \set Staff.clefPosition = #2 - \set Staff.middleCPosition = #6 - c'4 - % The baritone clef - \set Staff.clefGlyph = #"clefs.C" - \set Staff.clefPosition = #4 - \set Staff.middleCPosition = #4 - c'4 - % The standard choral tenor clef - \set Staff.clefGlyph = #"clefs.G" - \set Staff.clefPosition = #-2 - \set Staff.clefOctavation = #-7 - \set Staff.middleCPosition = #1 - c'4 - % A non-standard clef - \set Staff.clefPosition = #0 - \set Staff.clefOctavation = #0 - \set Staff.middleCPosition = #-4 - c'4 \break - - % The following clef changes do not preserve - % the normal relationship between notes and clefs: - - \set Staff.clefGlyph = #"clefs.F" - \set Staff.clefPosition = #2 - c'4 - \set Staff.clefGlyph = #"clefs.G" - c'4 - \set Staff.clefGlyph = #"clefs.C" - c'4 - \set Staff.clefOctavation = #7 - c'4 - \set Staff.clefOctavation = #0 - \set Staff.clefPosition = #0 - c'4 - \set Staff.middleCPosition = #4 - c'4 - } diff --git a/input/lsr/staff/creating-blank-staves.ly b/input/lsr/staff/creating-blank-staves.ly deleted file mode 100644 index df6579acad..0000000000 --- a/input/lsr/staff/creating-blank-staves.ly +++ /dev/null @@ -1,43 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -To create blank staves, you must generate empty measures, removing also -from the @code{Score} context the @code{Bar_number_engraver}, and from -the @code{Staff} context the @code{Time_signature_engraver}, the -@code{Clef_engraver} and the @code{Bar_engraver}. -" } - -\header { - tagline = "" -} - -#(set-global-staff-size 20) - -\score { - { - \repeat unfold 12 { s1 \break } - } - \layout { - indent = 0\in - \context { - \Staff - \remove Time_signature_engraver - \remove Clef_engraver - \remove Bar_engraver - } - \context { - \Score - \remove Bar_number_engraver - } - } -} - -\paper { - #(set-paper-size "letter") - raggedlastbottom = ##f - linewidth = 7.5\in - leftmargin = 0.5\in - bottommargin = 0.25\in - topmargin = 0.25\in -} diff --git a/input/lsr/staff/non-traditional-key-signatures.ly b/input/lsr/staff/non-traditional-key-signatures.ly deleted file mode 100644 index 81d3333bc7..0000000000 --- a/input/lsr/staff/non-traditional-key-signatures.ly +++ /dev/null @@ -1,26 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The commonly used @code{\\key} command sets the context property -Staff.keySignature. However, non-standard key signatures can be -specified by setting this property directly. The format of this command -is a list: @code{ \\set Staff.keySignature = - #'((octave . step) . alter) } where, for each element in the list, -octave specifies the octave (0 being the octave from middle C to the B -above), step specifies the note within the octave (0 means C and 6 -means B), and alter is ,SHARP ,FLAT ,DOUBLE-SHARP etc. (Note the -leading comma.) Here is an example of a possible key signature for -generating a whole-tone scale: - - -" } - -\relative c' { - \new Staff { - \set Staff.keySignature = - #`(((0 . 3) . ,SHARP) ((0 . 5) . ,FLAT) ((0 . 6) . ,FLAT)) - c d e fis aes bes c2 - } - } - diff --git a/input/lsr/strings-intro.itely b/input/lsr/strings-intro.itely new file mode 100644 index 0000000000..316fef7cb6 --- /dev/null +++ b/input/lsr/strings-intro.itely @@ -0,0 +1,5 @@ +@node Strings +@unnumbered Strings + +@lysnippets + diff --git a/input/lsr/strings.snippet-list b/input/lsr/strings.snippet-list new file mode 100644 index 0000000000..8eab597a2a --- /dev/null +++ b/input/lsr/strings.snippet-list @@ -0,0 +1 @@ +demo-midiinstruments.ly diff --git a/input/lsr/strings/AAA-intro.ly b/input/lsr/strings/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/strings/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/strings/GNUmakefile b/input/lsr/strings/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/strings/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/strings/SConscript b/input/lsr/strings/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/strings/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/text-intro.itely b/input/lsr/text-intro.itely new file mode 100644 index 0000000000..29a4f45e0f --- /dev/null +++ b/input/lsr/text-intro.itely @@ -0,0 +1,5 @@ +@node Text +@unnumbered Text + +@lysnippets + diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list new file mode 100644 index 0000000000..8c5a4fdf85 --- /dev/null +++ b/input/lsr/text.snippet-list @@ -0,0 +1,13 @@ +combining-dynamics-with-markup-texts.ly +creating-text-spanners.ly +center-text-below-hairpin-dynamics.ly +markup-lines.ly +demonstrating-all-headers.ly +changing-the-default-text-font-family.ly +how-to-put-ties-between-syllables-in-lyrics.ly +aligning-and-centering-instrument-names.ly +utf-8.ly +blanking-staff-lines-using-the--whiteout-command.ly +combining-two-parts-on-the-same-staff.ly +adjusting-lyrics-vertical-spacing.ly +aligning-lyrics.ly diff --git a/input/lsr/text/AAA-intro.ly b/input/lsr/text/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/text/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/text/GNUmakefile b/input/lsr/text/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/text/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/text/SConscript b/input/lsr/text/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/text/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/text/combining-dynamics-with-markup-texts.ly b/input/lsr/text/combining-dynamics-with-markup-texts.ly deleted file mode 100644 index c068e95e2d..0000000000 --- a/input/lsr/text/combining-dynamics-with-markup-texts.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -Some dynamics may involve text indications (such as \"più forte\", -\"piano subito\", etc.). They can be produced using a \\markup bloc. -" } - -\layout{ragged-right = ##t} - -piuf = \markup { \italic "molto" \dynamic "f" } - -\relative c''{ - c-\piuf - c - c2\< c2\! - - c2\< c2\! -} - diff --git a/input/lsr/text/combining-two-parts-on-the-same-staff.ly b/input/lsr/text/combining-two-parts-on-the-same-staff.ly deleted file mode 100644 index 7e059fd634..0000000000 --- a/input/lsr/text/combining-two-parts-on-the-same-staff.ly +++ /dev/null @@ -1,74 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -The part combiner tool ( \\partcombine command ) allows you to combine -different parts on a same Staff. You can choose whether you want or -don't want to add texts such as \"solo\" or \"a2\", by defining the -printPartCombineTexts property. - -For vocal scores (hymns), there is no need to add \"solo\"/\"a2\" -texts, so they should be switched off. However, you'd better not use it -if there are any solos, as they won't be indicated. In such cases, you -may simply want to use standard LilyPond polyphony. - -This snippet presents the three ways two parts can be printed on a same -staff : standard polyphony, \\partcombine whitout texts, and -\\partcombine with texts. - - -" } - -musicUp = { \time 4/4 - \relative c'' { - a4 c4.(g8) a4 | - g4 e' g,( a8 b) | - c b a2. - } -} - -musicDown = { - \relative c'' { - g4 e4.(d8) c4 | - r2 g'4( f8 e) | - d2 a - } -} -\score{ - \new Staff { - \set Staff.instrumentName = "Standard polyphony " - << \musicUp \\ \musicDown >> - } - \layout{ - indent = 6.0\cm - } -} - -\score{ - \context Staff { - \set Staff.instrumentName = "PartCombine without texts " - \partcombine \musicUp \musicDown - } - \layout{ - indent = 6.0\cm - \context { - \Voice - printPartCombineTexts = ##f - } - } -} - -\score{ - \context Staff { - \set Staff.instrumentName = "PartCombine with texts " - \partcombine \musicUp \musicDown - } - \layout{ - indent = 6.0\cm - \context { - \Voice - printPartCombineTexts = ##t - } - } -} - diff --git a/input/lsr/pitches/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly similarity index 96% rename from input/lsr/pitches/transposing-pitches-with-minimum-accidentals-smart-transpose.ly rename to input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 59272727e9..c793818cc5 100644 --- a/input/lsr/pitches/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches \version "2.11.35" \header { texidoc = " diff --git a/input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly similarity index 82% rename from input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly rename to input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index ac7e06ef8d..723a92af83 100644 --- a/input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,5 +1,7 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: other %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.23" +\version "2.11.35" \header { texidoc = " With the @code{\tweak} command, you can tune every grob directly. Here diff --git a/input/lsr/text/utf-8.ly b/input/lsr/utf-8.ly similarity index 95% rename from input/lsr/text/utf-8.ly rename to input/lsr/utf-8.ly index ac56b70039..80b6a8ca5f 100644 --- a/input/lsr/text/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: text \version "2.11.35" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly new file mode 100644 index 0000000000..cbcde48946 --- /dev/null +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -0,0 +1,34 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: vocal-music +\version "2.11.35" + +\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/vocal-music-intro.itely b/input/lsr/vocal-music-intro.itely new file mode 100644 index 0000000000..4a3866cca1 --- /dev/null +++ b/input/lsr/vocal-music-intro.itely @@ -0,0 +1,5 @@ +@node Vocal music +@unnumbered Vocal music + +@lysnippets + diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list new file mode 100644 index 0000000000..7ee9a8209f --- /dev/null +++ b/input/lsr/vocal-music.snippet-list @@ -0,0 +1,7 @@ +chant-or-psalms-notation.ly +how-to-put-ties-between-syllables-in-lyrics.ly +adding-ambiti-per-voice.ly +vertically-aligning-ossias-and-lyrics.ly +demo-midiinstruments.ly +adjusting-lyrics-vertical-spacing.ly +aligning-lyrics.ly diff --git a/input/lsr/vocal/AAA-intro.ly b/input/lsr/vocal/AAA-intro.ly deleted file mode 100644 index ccd27af3c5..0000000000 --- a/input/lsr/vocal/AAA-intro.ly +++ /dev/null @@ -1,17 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\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/vocal/GNUmakefile b/input/lsr/vocal/GNUmakefile deleted file mode 100644 index a3f0b2bfde..0000000000 --- a/input/lsr/vocal/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ - -depth = ../../../ - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc - -EXTRA_DIST_FILES= - -include $(depth)/make/stepmake.make - -TITLE=Sample snippets from LSR - diff --git a/input/lsr/vocal/SConscript b/input/lsr/vocal/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/lsr/vocal/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/lsr/pitches/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly similarity index 83% rename from input/lsr/pitches/volta-multi-staff.ly rename to input/lsr/volta-multi-staff.ly index 83afb06f71..7e2e6144b1 100644 --- a/input/lsr/pitches/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,4 +1,5 @@ -%% Do not edit this file; it is auto-generated from LSR! +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: pitches, repeats \header { texidoc = "By adding @code{Volta_engraver}, repeat brackets can be put over staves other than the topmost one in a score." diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile index 09ed37c3e8..24e4bb0472 100644 --- a/input/new/GNUmakefile +++ b/input/new/GNUmakefile @@ -1,30 +1,21 @@ depth = ../../ # NR 1 -SUBDIRS = pitches rhythms expressive repeats simultaneous staff editorial text +SUBDIRS = pitches rhythms expressive-marks repeats simultaneous-notes staff-notation editorial-and-educational-use text # NR 2 -SUBDIRS += vocal chords piano percussion guitar strings bagpipes ancient +SUBDIRS += vocal-music chords piano-music percussion guitar strings bagpipes ancient-notation SUBDIRS += other # old -SUBDIRS += connecting contemporary education -SUBDIRS += parts spacing scheme -SUBDIRS += engravers nonmusic instrument -SUBDIRS += real-music +SUBDIRS += parts spacing schemelanguage +SUBDIRS += real-music paper-and-layout -### FIXME: temporary template for creating other dirs. -### will be removed once everything else is stable. -SUBDIRS += null - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc +STEPMAKE_TEMPLATES=documentation EXTRA_DIST_FILES=README -include $(depth)/make/stepmake.make - -TITLE=LilyPond Examples +include $(depth)/make/stepmake.make diff --git a/input/new/ancient-notation/GNUmakefile b/input/new/ancient-notation/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/ancient-notation/GNUmakefile +++ b/input/new/ancient-notation/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/bagpipes/GNUmakefile b/input/new/bagpipes/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/bagpipes/GNUmakefile +++ b/input/new/bagpipes/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/chords/GNUmakefile b/input/new/chords/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/chords/GNUmakefile +++ b/input/new/chords/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/editorial-and-educational-use/GNUmakefile b/input/new/editorial-and-educational-use/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/editorial-and-educational-use/GNUmakefile +++ b/input/new/editorial-and-educational-use/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/expressive-marks/GNUmakefile b/input/new/expressive-marks/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/expressive-marks/GNUmakefile +++ b/input/new/expressive-marks/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/guitar/GNUmakefile b/input/new/guitar/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/guitar/GNUmakefile +++ b/input/new/guitar/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/other/GNUmakefile b/input/new/other/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/other/GNUmakefile +++ b/input/new/other/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/paper-and-layout/GNUmakefile b/input/new/paper-and-layout/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/paper-and-layout/GNUmakefile +++ b/input/new/paper-and-layout/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/parts/GNUmakefile b/input/new/parts/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/parts/GNUmakefile +++ b/input/new/parts/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/percussion/GNUmakefile b/input/new/percussion/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/percussion/GNUmakefile +++ b/input/new/percussion/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/piano-music/GNUmakefile b/input/new/piano-music/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/piano-music/GNUmakefile +++ b/input/new/piano-music/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/pitches/GNUmakefile b/input/new/pitches/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/pitches/GNUmakefile +++ b/input/new/pitches/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/real-music/GNUmakefile b/input/new/real-music/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/real-music/GNUmakefile +++ b/input/new/real-music/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/repeats/GNUmakefile b/input/new/repeats/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/repeats/GNUmakefile +++ b/input/new/repeats/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/rhythms/GNUmakefile b/input/new/rhythms/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/rhythms/GNUmakefile +++ b/input/new/rhythms/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/schemelanguage/GNUmakefile b/input/new/schemelanguage/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/schemelanguage/GNUmakefile +++ b/input/new/schemelanguage/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/simultaneous-notes/GNUmakefile b/input/new/simultaneous-notes/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/simultaneous-notes/GNUmakefile +++ b/input/new/simultaneous-notes/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/spacing/GNUmakefile b/input/new/spacing/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/spacing/GNUmakefile +++ b/input/new/spacing/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/staff-notation/GNUmakefile b/input/new/staff-notation/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/staff-notation/GNUmakefile +++ b/input/new/staff-notation/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/strings/GNUmakefile b/input/new/strings/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/strings/GNUmakefile +++ b/input/new/strings/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/text/GNUmakefile b/input/new/text/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/text/GNUmakefile +++ b/input/new/text/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/input/new/vocal-music/GNUmakefile b/input/new/vocal-music/GNUmakefile index b83142b2e5..eb18cb2518 100644 --- a/input/new/vocal-music/GNUmakefile +++ b/input/new/vocal-music/GNUmakefile @@ -1,4 +1,4 @@ -depth = ../../../ +depth = ../../.. STEPMAKE_TEMPLATES=documentation diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index 21c675e848..b465501883 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -1,4 +1,4 @@ $(outdir)/collated-files.tely: $(LY_FILES) $(OUT_LY_FILES) - $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$(outdir)/collated-files --title="$(TITLE)" $^ + $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$(outdir)/collated-files.tely --title="$(TITLE)" $^ -- 2.39.5