From: John Mandereau Date: Wed, 2 Jan 2008 15:52:07 +0000 (+0100) Subject: Update LSR with new tags X-Git-Tag: release/2.11.38-1~135^2~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a7f76aae921157b3ebc50e40628fd911a308edf3;p=lilypond.git Update LSR with new tags --- diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index 28faf86ca3..d41d8e9d14 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: chords, ancient-notation +%% Tags: chords, ancient-notation, contexts-and-engravers \version "2.11.35" \header { texidoc = " @@ -13,7 +13,7 @@ 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. " } - +% begin verbatim bass = { \clef bass g4 b, c d e d8 c d2} continuo = \figuremode { < _ >4 < 6 >8 diff --git a/input/lsr/adding-ambiti-per-voice.ly b/input/lsr/adding-ambiti-per-voice.ly index b29df57952..2cebe099a9 100644 --- a/input/lsr/adding-ambiti-per-voice.ly +++ b/input/lsr/adding-ambiti-per-voice.ly @@ -6,7 +6,7 @@ Ambits can be added per voice. In that case, the ambitus must be moved manually to prevent collisions. " } - +% begin verbatim { \new Staff << \new Voice \with { diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index 0297bf3c84..014fae6b11 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,12 +1,12 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: staff-notation +%% Tags: staff-notation, contexts-and-engravers \version "2.11.35" \header { texidoc = " You can add (possibly temporarily) an extra staff after the beginning of a piece. " } - +% begin verbatim \score { << \new Staff \relative c''{ c1 c c c c } diff --git a/input/lsr/adding-and-extra-staff-at-a-line-break.ly b/input/lsr/adding-and-extra-staff-at-a-line-break.ly index a61bad68cb..91f3a10647 100644 --- a/input/lsr/adding-and-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-and-extra-staff-at-a-line-break.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: staff-notation +%% Tags: staff-notation, contexts-and-engravers, breaks \version "2.11.35" \header { texidoc = " @@ -10,7 +10,7 @@ workaround is to add a setting of Staff.explicitKeySignatureVisibility as is shown in the example. In version 2.10 and earlier, you have to do a similar setting for the time signatures, see the example. " } - +% begin verbatim \score { \new StaffGroup \relative c''{ \new Staff diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly index 56d25a0d66..bf2eb4ee80 100644 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -13,7 +13,7 @@ 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). " } - +% begin verbatim { r16[ g16 \times 2/3 {r16 e'8] } diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index baec437429..a76964f50d 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -9,7 +9,7 @@ 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. " } - +% begin verbatim 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} } diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index a2594022c3..f4a78cf167 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -6,7 +6,7 @@ To add fingerings to tablatures, you can use a combination of @code{\\markup} and @code{\\finger}. " } - +% begin verbatim one = \markup{ \finger "1" } two = \markup{ \finger "2" } threetwo = \markup{ \column {\finger "3" \finger "2"} } diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark.ly b/input/lsr/adding-parentheses-around-an-expressive-mark.ly index 61fac289fe..4d7edacceb 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark.ly @@ -6,7 +6,7 @@ The parenthesize function is a special tweak that encloses objects in parentheses. The associated grob is Score.ParenthesesItem. " } - +% begin verbatim \relative { c4 -\parenthesize -. diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly new file mode 100644 index 0000000000..e74bd664d5 --- /dev/null +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -0,0 +1,42 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: titles +\version "2.11.35" + +\header { texidoc = " +I often find it useful to include a date on printed music, so that I +can see if I'm using the latest version, or tell someone else that he +should only use the version after a certain date. A simple solution is +to enter the date manually to the @code{.ly} file. But that's very +error prone. It's easy to forget updating the date. So i thought it +would be useful if you can add the date on which the PDF file is +generated automatically. I did't figure it out myself, but I asked on +lilypond-user@gnu.org. And guess what? Someone came with an excellent +solution! So thank you very much Toine Schreurs for sending this +solution to the user mailing list. I post it here for future reference. + +The solution is to use two scheme functions called @code{strftime} and +@code{localtime}, as shown in the snippet. It is a very flexible +solution, you can format the date just as you like it by adapting the +@code{\"%d-%m-%Y\"} string. See the Guile documentation for more +details on this format string: Formatting Calendar Time. +" } +% begin verbatim +\version "2.11.35" +% first, define a variable to hold the formatted date: +date = #(strftime "%d-%m-%Y" (localtime (current-time))) + +% use it in the title block: +\header { + title = "Including the date!" + subtitle = \date +} +% begin verbatim +\score { + \relative c'' { + c4 c c c + } +} +% and use it in a \markup block: +\markup { + \date +} diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index fc9ace44cf..f66298ed45 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,12 +1,12 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: text, vocal-music +%% Tags: text, vocal-music, spacing \version "2.11.35" \header { texidoc = " This snippets shows you how to bring the lyrics line closer to the Staff. " } - +% begin verbatim % Default layout: \score{ << diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index fd60ca9c14..ba8415a76e 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: text +%% Tags: text, paper-and-layout, titles \version "2.11.35" \header { texidoc = " @@ -23,7 +23,7 @@ a \\markup block and use one of the following possibilites: " } - +% begin verbatim \paper{ indent = #0 left-margin = #30 diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly index 545f44e32b..43241a4f01 100644 --- a/input/lsr/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -8,7 +8,7 @@ overriding the #'self-alignment-X property of the LyricText object. #-1 is left, #0 is center and #1 is right; however, you can use #LEFT, #CENTER and #RIGHT as well. " } - +% begin verbatim \relative c'' { c1 c c} \addlyrics {\once \override LyricText #'self-alignment-X = #LEFT "This is left-aligned" diff --git a/input/lsr/alignment-vertical-spacing.ly b/input/lsr/alignment-vertical-spacing.ly new file mode 100644 index 0000000000..0f7526c38d --- /dev/null +++ b/input/lsr/alignment-vertical-spacing.ly @@ -0,0 +1,54 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: tweaks-and-overrides, paper-and-layout, spacing +\version "2.11.35" + +\header { texidoc = " +By setting properties in @code{NonMusicalPaperColumn}, vertical spacing +of alignments can be adjusted per system. + + +By setting @code{alignment-extra-space} or +@code{fixed-alignment-extra-space} an individual system may be +stretched vertically. + + +For technical reasons, @code{\\overrideProperty} has to be used for +setting properties on individual objects. @code{\\override} in a +@code{\\context} block may still be used for global overrides. +" } +% begin verbatim +#(set-global-staff-size 13) + +\relative c'' +\new StaffGroup << + \new Staff { + c1\break + c\break + c\break + } + \new Staff { + c1 c c + } + \new PianoStaff << + \new Voice { + \set PianoStaff.instrumentName = #"piano" + \set PianoStaff.shortInstrumentName = #"pn" + c1_"normal" + + \overrideProperty + #"Score.NonMusicalPaperColumn" + #'line-break-system-details + #'((fixed-alignment-extra-space . 15)) + c_"fixed-aligment-extra-space" + + \overrideProperty + #"Score.NonMusicalPaperColumn" + #'line-break-system-details + #'((alignment-extra-space . 15)) + c_"aligment-extra-space" + } + { c1 c c } + >> +>> + + diff --git a/input/lsr/altering-the-number-of-stems-in-a-beam.ly b/input/lsr/altering-the-number-of-stems-in-a-beam.ly index 21ed6bf802..62c0de709b 100644 --- a/input/lsr/altering-the-number-of-stems-in-a-beam.ly +++ b/input/lsr/altering-the-number-of-stems-in-a-beam.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: rhythms +%% Tags: rhythms, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -9,7 +9,7 @@ of four 32nds are joined, as if they were 8th notes. " } - +% begin verbatim \relative { #(override-auto-beam-setting '(end * * * *) 1 4) f32 g a b b a g f diff --git a/input/lsr/ambiti-multiple-voices.ly b/input/lsr/ambiti-multiple-voices.ly index f1a35f44e6..e1a3426842 100644 --- a/input/lsr/ambiti-multiple-voices.ly +++ b/input/lsr/ambiti-multiple-voices.ly @@ -12,7 +12,7 @@ This example uses one advanced feature, @code{ \\override Ambitus #'X-offset = #-1.0 } - +% begin verbatim This code moves the ambitus to the left. The same effect could have diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index 3b5ddc9ae2..e2938a3d60 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -8,7 +8,7 @@ LilyPond's support of ancient notation. " } - +% begin verbatim upperStaff = \context GregorianStaff = "upperStaff" << \context GregorianVoice << \set Score.timing = ##f diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index 173278526e..6437ba88d1 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -7,7 +7,7 @@ Time signatures may also be engraved in an old style. " } - +% begin verbatim \score { { \override Staff.TimeSignature #'style = #'neomensural diff --git a/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly index 1e93beee96..08d4208118 100644 --- a/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly @@ -1,6 +1,5 @@ %% 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.35" \header { texidoc = " @@ -21,7 +20,7 @@ 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. " } - +% begin verbatim fragment = { \key c \major c1 d e f g a b c diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index c90b7953ef..a815d4f1bb 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -7,7 +7,7 @@ Lilypond can subdivide beams automatically. Set the property subdivideBeams, and beams are subdivided at beat positions (as specified in beat length) " } - +% begin verbatim \relative{ b'32^"default"[ a g f c' b a g f e d' c b a g f ] \set subdivideBeams = ##t b32^"subdivision enabled"[ a g f c' b a g f e d' c b a g f ] diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index bd9d28f7be..98dc02aa0d 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -10,7 +10,7 @@ In time signature 2/2 or 4/4 the beam are @code{         _____         " } - +% begin verbatim % Automatic beams two per two in 4/4 or 2/2 time signature % _____ % Default | | | | diff --git a/input/lsr/beam-across-line-breaks.ly b/input/lsr/beam-across-line-breaks.ly index 1d2bcbe465..282a5882e7 100644 --- a/input/lsr/beam-across-line-breaks.ly +++ b/input/lsr/beam-across-line-breaks.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: rhythms +%% Tags: rhythms, breaks \version "2.11.35" \header { texidoc = " @@ -7,7 +7,7 @@ By default, beams can't be printed across line breaks. Here's a way to force the line break, by setting the @code{#'breakable} property. See also in the manual the \"Line Breaking\" and \"Manual beams\" sections. " } - +% begin verbatim \layout { ragged-right= ##t } \relative c'' { diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index da52473d23..3c269fcfe1 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -7,7 +7,7 @@ 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. " } - +% begin verbatim \paper { ragged-right = ##t diff --git a/input/lsr/breaks.snippet-list b/input/lsr/breaks.snippet-list new file mode 100644 index 0000000000..a8b1e07a22 --- /dev/null +++ b/input/lsr/breaks.snippet-list @@ -0,0 +1,3 @@ +positioning-segno-and-coda-with-line-break.ly +beam-across-line-breaks.ly +adding-and-extra-staff-at-a-line-break.ly diff --git a/input/lsr/breathing-sign.ly b/input/lsr/breathing-sign.ly index 25a9105878..0bdbecba69 100644 --- a/input/lsr/breathing-sign.ly +++ b/input/lsr/breathing-sign.ly @@ -6,7 +6,7 @@ Breathing signs are available in different tastes: commas (default), ticks, vees and `railroad tracks' (caesura). " } - +% begin verbatim { %% Modern notation: \new Staff { diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index b80ff7f387..498b165fcb 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -15,7 +15,7 @@ numbers before the \"translate\" change the x- and y-origin of the rectangle. Make sure to put the Hairpin in a lower layer than the Text Markup to actually draw the rectangle above the hairpin. " } - +% begin verbatim \score { \relative c' { diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index 4a94cd1788..8b865e301e 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: expressive-marks +%% Tags: expressive-marks, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -8,7 +8,7 @@ with a fermata sign positioned over the top of the railtracks. This snippet should present an optically pleasing combination of railtracks and a fermata. " } - +% begin verbatim { \context Voice { c''2. diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 77392f07ea..c69538c008 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -9,7 +9,7 @@ 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. " } - +% begin verbatim hairpinWithCenteredText = #(define-music-function (parser location text) (markup?) #{ diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index f15aaedc36..aca4443fbf 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -6,7 +6,7 @@ To make the \\flageolet circle smaller you can use the following scheme code (found in the Lilypond-user-archive) " } - +% begin verbatim F = #(let ((m (make-music 'ArticulationEvent 'articulation-type "flageolet"))) (set! (ly:music-property m 'tweaks) diff --git a/input/lsr/changing-an-individual-notes-size-in-a-chord.ly b/input/lsr/changing-an-individual-notes-size-in-a-chord.ly index 96b75012cd..af3501fa01 100644 --- a/input/lsr/changing-an-individual-notes-size-in-a-chord.ly +++ b/input/lsr/changing-an-individual-notes-size-in-a-chord.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: simultaneous-notes, editorial-and-educational-use +%% Tags: simultaneous-notes, editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -15,7 +15,7 @@ notehead). The code for the chord example shown: @code{} " } - +% begin verbatim \header{ title = "Modify an individual notehead's size in a chord" } diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly new file mode 100644 index 0000000000..84ea3cb5bb --- /dev/null +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -0,0 +1,54 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: tweaks-and-overrides +\version "2.11.35" + +\header { texidoc = " +The @code{\\applyOutput} command gives you the ability to tune any +layout object, in any context. It requires a Scheme function with three +arguments; advanced users can write it quite easily, whereas new users +may want to use pre-defined functions such as this snippet, or the +example in the manual. +" } +% begin verbatim +% **************************************************************** +% ly snippet: +% **************************************************************** + +\layout { + ragged-right = ##t +} + +#(define (mc-squared gr org cur) + (let* + ( + (ifs (ly:grob-interfaces gr)) + (sp (ly:grob-property gr 'staff-position)) + ) + (if (memq 'note-head-interface ifs) + (begin + (ly:grob-set-property! gr 'stencil ly:text-interface::print) + (ly:grob-set-property! gr 'font-family 'roman) + (ly:grob-set-property! gr 'text + (make-raise-markup -0.5 + (case sp + ((-5) (make-simple-markup "m")) + ((-3) (make-simple-markup "c ")) + ((-2) (make-smaller-markup (make-bold-markup "2"))) + (else (make-simple-markup "bla")) + )))) + ))) + +\context Voice \relative c' { + \stemUp + \set autoBeaming = ##f + + { 8 + + \applyOutput #'Voice #mc-squared + + } +} + +% **************************************************************** +% end ly snippet +% **************************************************************** diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 0e088db3e1..072fa98791 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -7,7 +7,7 @@ The appearance of slurs may be changed from solid to dotted or dashed. " } - +% begin verbatim \score{ \relative c'{ c( d e c) | diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index 96fa4b9a9e..b02906396a 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -10,7 +10,7 @@ The english naming of chords (default) can be changed to german " } - +% begin verbatim music = \chordmode { c1/c cis/cis b/b bis/bis bes/bes diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index 559564d9d5..a30a63d417 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,12 +1,12 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: editorial-and-educational-use, text +%% Tags: editorial-and-educational-use, text, tweaks-and-overrides \version "2.11.35" \header { texidoc = " The default font families for text can be overridden with @code{make-pango-font-tree}. " } - +% begin verbatim \paper { % change for other default global staff size. myStaffSize = #20 diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index 7b973ad378..8b8ae72d4a 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -8,7 +8,7 @@ The number of lines in a staff may changed by overriding " } - +% begin verbatim upper = \relative c'' { c1 d e f } diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index 6fb2721a96..fa3e93ce8b 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,12 +1,12 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: staff-notation +%% Tags: staff-notation, tweaks-and-overrides, paper-and-layout \version "2.11.35" \header { texidoc = " In order to change staff sizes, both @code{staff-space} and @code{fontSize} must be scaled. " } - +% begin verbatim { \new Staff \relative c'' { \dynamicDown c8 \ff c c c c c c c } } diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly index 0290a21486..0c5b6734b0 100644 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: rhythms +%% Tags: rhythms, contexts-and-engravers \version "2.11.35" \header { texidoc = " @@ -12,7 +12,7 @@ Therefore, measureLength has to be set manually, using the ly:make-moment callback. The second argument has to be the same as the second argument of \\compressMusic. " } - +% begin verbatim \layout { \context { \Score \remove "Timing_translator" diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index fa51a2c3dd..55bac7d0a3 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,12 +1,12 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: rhythms, vocal-music, ancient-notation +%% Tags: rhythms, vocal-music, ancient-notation, contexts-and-engravers \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. " } - +% begin verbatim stemon = { \override Staff.Stem #'transparent = ##f } stemoff = { \override Staff.Stem #'transparent = ##t } diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index 2fd5d21887..ce7ace9071 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -6,7 +6,7 @@ The property @code{chordNameExceptions} can used to store a list of special notations for specific chords. " } - +% begin verbatim % 7sus4 denoted with ^7 wahh chExceptionMusic = { 1-\markup { \super "7" "wahh" } diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly index 1d09848d53..d2e2d176a5 100644 --- a/input/lsr/clefs-commonly-tweaked-properties.ly +++ b/input/lsr/clefs-commonly-tweaked-properties.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: pitches, staff-notation, editorial-and-educational-use +%% Tags: pitches, staff-notation, editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -26,7 +26,7 @@ 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} - +% begin verbatim The following examples show the possibilities when setting these properties manually. On the first line, the manual changes preserve the diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly new file mode 100644 index 0000000000..8911d5a132 --- /dev/null +++ b/input/lsr/clip-systems.ly @@ -0,0 +1,87 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: paper-and-layout +\header { + texidoc = "Clipping snippets from a finished score + +Notes: + +@itemize @bullet +@item If system starts and ends are included, they include extents of the System grob, eg. instrument names. +@item Grace notes at the end point of the region are not included +@item Regions can span multiple systems. In this case, multiple EPS files are generated. +@end itemize + +This file needs to be run separately with @code{-dclip-systems}; the +collated-files.html of the regression test does not adequately show +the results. + +The result will be files named +@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. +" + +} +% begin verbatim +\version "2.11.35" + +#(ly:set-option 'clip-systems) + +#(set! output-count 1) + +origScore = \score{ + \relative { + \set Staff.instrumentName = #"bla" + c1 + d + \grace c16 + e1 + \key d\major + + f + \break \clef bass + g, + fis + } +} + +\book { + \score { + \origScore + \layout { + + %% each clip-region is a (START . END) pair + %% where both are rhythmic-locations. + + %% (make-rhythmic-locations BAR-NUMBER NUM DEN) + %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER + + clip-regions + = #(list + (cons + (make-rhythmic-location 2 0 1) + (make-rhythmic-location 4 0 1)) + + (cons + (make-rhythmic-location 0 0 1) + (make-rhythmic-location 4 0 1)) + + (cons + (make-rhythmic-location 0 0 1) + (make-rhythmic-location 6 0 1)) + ) + } + } +} + +#(set! output-count 0) +#(ly:set-option 'clip-systems #f) + +\book { + \score { \origScore } + \markup { \bold \fontsize #6 clips } + \score { + \lyrics { + \markup { from-2.0.1-to-4.0.1-clip.eps } + \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) } + } + } +} diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index 63ff3f92fc..85c2935ea0 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -6,7 +6,7 @@ Clusters are a device to denote that a complete range of notes is to be played. " } - +% begin verbatim \layout { ragged-right = ##t } diff --git a/input/lsr/coloring-objects.ly b/input/lsr/coloring-objects.ly index 0d4a918614..550544b556 100644 --- a/input/lsr/coloring-objects.ly +++ b/input/lsr/coloring-objects.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: editorial-and-educational-use +%% Tags: editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -9,7 +9,7 @@ simply overriding the #'color property and choosing your color (over 200 colors are available, see the \"List of Colors\" Appendix in the Manual). " } - +% begin verbatim \relative { \override Accidental #'color = #darkgreen \override Beam #'color = #cyan diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index a64e257f7a..463296df74 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -6,7 +6,7 @@ Some dynamics may involve text indications (such as \"più forte\", \"piano subito\", etc.). They can be produced using a \\markup bloc. " } - +% begin verbatim \layout{ragged-right = ##t} piuf = \markup { \italic "molto" \dynamic "f" } diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index 39a482fd35..869e018ce8 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -19,7 +19,7 @@ staff : standard polyphony, \\partcombine whitout texts, and " } - +% begin verbatim musicUp = { \time 4/4 \relative c'' { a4 c4.(g8) a4 | diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index a41365a722..f390ab4126 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -11,7 +11,7 @@ adapting the automatic beaming behaviour. (You can even add graphic measure groping indications, the appropriate snippet in this database.) " } - +% begin verbatim #(define (compound-time one two num) (markup #:override '(baseline-skip . 0) #:number (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)))))) diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 9221704ac5..496ddba7bd 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -9,7 +9,7 @@ signs ease reading rhythmically complex modern music. In the following example, the 9/8 measure is subdivided in 2, 2, 2 and 3. This is passed to @code{set-time-signature} as the third argument @code{(2 2 2 3)} - +% begin verbatim " } diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list new file mode 100644 index 0000000000..1d6133f325 --- /dev/null +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -0,0 +1,7 @@ +creating-blank-staves.ly +chant-or-psalms-notation.ly +adding-a-figured-bass-above-or-below-the-notes.ly +adding-an-extra-staff.ly +changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +engravers-one-by-one.ly +adding-and-extra-staff-at-a-line-break.ly diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index fbf73f6123..398c86baaa 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: rhythms +%% Tags: rhythms, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -10,7 +10,7 @@ visibility of tuplet brackets, you can set the property TupletBracket print a bracket) or #'if-no-beam (only print a bracket if there is no beam). " } - +% begin verbatim mus = \relative c'' { \times 2/3 {c16 [ d e } f8] \times 2/3 {c8 d e } diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index b04dd0b99e..4c5ce87e70 100644 --- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -11,7 +11,7 @@ functions were borrowed from the Tips and Tricks document in the manual. This example creates the rhythm used throughout Mars, from The Planets, by Gustav Holst. " } - +% begin verbatim #(define (make-note-req p d) (make-music 'NoteEvent 'duration d diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index 2f1750d020..3ca2f8f2e1 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: staff-notation, editorial-and-educational-use +%% Tags: staff-notation, editorial-and-educational-use, contexts-and-engravers, paper-and-layout \version "2.11.35" \header { texidoc = " @@ -8,11 +8,11 @@ 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}. " } - +% begin verbatim \header { tagline = "" } - +% begin verbatim #(set-global-staff-size 20) \score { diff --git a/input/lsr/creating-music-with-scheme-music-box.ly b/input/lsr/creating-music-with-scheme-music-box.ly index 03660290d3..5541ff0961 100644 --- a/input/lsr/creating-music-with-scheme-music-box.ly +++ b/input/lsr/creating-music-with-scheme-music-box.ly @@ -9,5 +9,5 @@ This example shows prelude in C major of Bach's Well-Tempered Klavier BROKEN (?) IN 2.11, COMMENTED OUT. " } - +% begin verbatim { c'4 } diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 82dd3661a3..a5de367d7f 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: expressive-marks, text +%% Tags: expressive-marks, text, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -8,7 +8,7 @@ create text spanners as easily as pedals indications or octavations. Override some properties of the TextSpanner object to modify its output. " } - +% begin verbatim \relative c''{ \override TextSpanner #'edge-text = #'("bla" . "blu") a \startTextSpan diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index 921ba67037..bc0ed14f9e 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,11 +1,11 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: ancient-notation +%% Tags: ancient-notation, tweaks-and-overrides \version "2.11.35" \header { texidoc = " Custodes may be engraved in various styles. " } - +% begin verbatim \layout { \context { \Staff diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index cf243f42b9..db1a1a20e3 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,12 +1,12 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: vocal-music, piano-music, strings +%% Tags: vocal-music, piano-music, strings, midi \version "2.11.35" \header { texidoc = " Problem: How to know which MidiInstrument would be best for your composition? Solution: A Lilypond demo file. " } - +% begin verbatim %\version "2.11.35" basemelodie = { c'4. \mf g c'16 b' c'' d'' | e'' d'' e'' f'' g''4 g'''4 r | r1 } @@ -16,7 +16,7 @@ melodie = { \tempo 4 = 150 \basemelodie } title = "Demo of all midi sounds" arranger = "Myself" } - +% begin verbatim \score { \new Staff << \new Voice { \melodie diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index 4a0101adfe..1906c840d2 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,11 +1,11 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: text +%% Tags: text, paper-and-layout, titles \version "2.11.35" \header { texidoc = " A demonstration of all headers. " } - +% begin verbatim \header { copyright = "copyright" title = "title" @@ -23,7 +23,7 @@ texidoc = "All header fields with special meanings." source = "urtext" } - +% begin verbatim \score { \relative c'' { c1 c1 c1 c1 } @@ -46,4 +46,4 @@ texidoc = "All header fields with special meanings." copyright = "localcopyright" } } - +% begin verbatim diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 34c1022392..cbf8a8e07b 100644 --- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -11,7 +11,7 @@ accidental for each note, even at natural pitches, to emphasize their new approach to music theory and language. This snippet shows how to achieve such notation rules with LilyPond. " } - +% begin verbatim % thanks to Rune Zedeler for this cool function :) webernAccidentals = { diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index c86732e513..6eadc848b0 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,13 +1,12 @@ %% 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.35" \header { texidoc = " The @code{print-function} can be overridden to draw a box around an arbitrary grob. " } - +% begin verbatim \relative c'' { \override TextScript #'stencil = diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index 810f2d6754..82efc69677 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,6 +1,5 @@ %% 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.35" \header { texidoc = " @@ -12,7 +11,7 @@ context, bar numbers on the Score.BarNumber context, and so on. You can tweak the printing of your circles by setting some properties such as #'thickness, #'circle-padding or #'font-size. " } - +% begin verbatim \relative c'{ c1 \set Score.markFormatter diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly new file mode 100644 index 0000000000..dc8be08d32 --- /dev/null +++ b/input/lsr/engravers-one-by-one.ly @@ -0,0 +1,279 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: contexts-and-engravers +\version "2.11.35" + +\header { texidoc = " +The notation problem, creating a certain symbol, is handled by plugins. +Each plugin is called an Engraver. In this example, engravers are +switched on one by one, in the following order: + +- note heads + + +- staff symbol, + + +- clef, + + +- stem, + + +- beams, slurs, accents, + + +- accidentals, bar lines, time signature, and key signature. + + + +Engravers are grouped. For example, note heads, slurs, beams etc. form +a Voice context. Engravers for key, accidental, bar, etc. form a Staff +context. + + +You may only see the first example in this document; please download +this snippet and run it from your own computer. +" } +% begin verbatim +%% sample music +topVoice = \relative c' { + \key d\major + es8([ g] a[ fis]) + b4 + b16[-. b-. b-. cis-.] + d4-> +} + +botVoice = \relative c' { + \key d\major + c8[( f] b[ a)] + es4 + es16[-. es-. es-. fis-.] + b4-> +} + +hoom = \relative c { + \key d \major + \clef bass + g8-. r + r4 + fis8-. + r8 + r4 + b'4-> +} + +pah = \relative c' { + r8 b-. + r4 + r8 g8-. + r16 g-. r8 + \clef treble + fis'4-> +} + +% +% setup for Request->Element conversion. Guru-only +% + +MyStaff =\context { + \type "Engraver_group" + \name Staff + + \description "Handles clefs, bar lines, keys, accidentals. It can contain +@code{Voice} contexts." + + + \consists "Output_property_engraver" + + \consists "Font_size_engraver" + + \consists "Volta_engraver" + \consists "Separating_line_group_engraver" + \consists "Dot_column_engraver" + + \consists "Ottava_spanner_engraver" + \consists "Rest_collision_engraver" + \consists "Piano_pedal_engraver" + \consists "Piano_pedal_align_engraver" + \consists "Instrument_name_engraver" + \consists "Grob_pq_engraver" + \consists "Forbid_line_break_engraver" + \consists "Axis_group_engraver" + + \consists "Pitch_squash_engraver" + + \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6) + extraVerticalExtent = ##f + verticalExtent = ##f + localKeySignature = #'() + + % explicitly set instrument, so we don't get + % weird effects when doing instrument names for + % piano staves + + instrumentName = #'() + shortInstrumentName = #'() + + \accepts "Voice" +} + + +MyVoice = \context { + \type "Engraver_group" + \name Voice + + \description " + Corresponds to a voice on a staff. This context handles the + conversion of dynamic signs, stems, beams, super- and subscripts, + slurs, ties, and rests. + + You have to instantiate this explicitly if you want to have + multiple voices on the same staff." + + localKeySignature = #'() + \consists "Font_size_engraver" + + % must come before all + \consists "Output_property_engraver" + \consists "Arpeggio_engraver" + \consists "Multi_measure_rest_engraver" + \consists "Text_spanner_engraver" + \consists "Grob_pq_engraver" + \consists "Note_head_line_engraver" + \consists "Glissando_engraver" + \consists "Ligature_bracket_engraver" + \consists "Breathing_sign_engraver" + % \consists "Rest_engraver" + \consists "Grace_beam_engraver" + \consists "New_fingering_engraver" + \consists "Chord_tremolo_engraver" + \consists "Percent_repeat_engraver" + \consists "Slash_repeat_engraver" + +%{ + Must come before text_engraver, but after note_column engraver. + +%} + \consists "Text_engraver" + \consists "Dynamic_engraver" + \consists "Fingering_engraver" + + \consists "Script_column_engraver" + \consists "Rhythmic_column_engraver" + \consists "Cluster_spanner_engraver" + \consists "Tie_engraver" + \consists "Tie_engraver" + \consists "Tuplet_engraver" + \consists "Note_heads_engraver" + \consists "Rest_engraver" + + \consists "Skip_event_swallow_translator" +} + + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + + +MyStaff = \context { + \MyStaff + \consists "Staff_symbol_engraver" +} + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + +MyStaff = \context { + \MyStaff + \consists "Clef_engraver" + \remove "Pitch_squash_engraver" +} + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + +MyVoice = \context { + \MyVoice + \consists "Stem_engraver" +} + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + +MyVoice = \context { + \MyVoice + \consists "Beam_engraver" +} + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + +MyVoice= \context { + \MyVoice + \consists "Phrasing_slur_engraver" + \consists "Slur_engraver" + \consists "Script_engraver" +} + + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + +MyStaff = \context { + \MyStaff + \consists "Bar_engraver" + \consists "Time_signature_engraver" +} + +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + +MyStaff = \context { + \MyStaff + \consists "Accidental_engraver" + \consists "Key_engraver" +} +\score { + \topVoice + \layout { + \context { \MyStaff } + \context { \MyVoice } + } +} + diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index c8e8d1eb58..a1d5215322 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -9,7 +9,7 @@ you might wish to specify instead, so you can obtain the same random notes each time): i.e. to get different random notes patterns, just change this number. " } - +% begin verbatim \score { { #(let ((random-state (seed->random-state (current-time)))) (ly:export diff --git a/input/lsr/glissando-contempary.ly b/input/lsr/glissando-contempary.ly index 678865550f..372329dc1d 100644 --- a/input/lsr/glissando-contempary.ly +++ b/input/lsr/glissando-contempary.ly @@ -5,7 +5,7 @@ \header { texidoc = " Use a glissando without final note. Contemporary glissando ! " } - +% begin verbatim \relative c'' { \override Glissando #'style = #'zigzag \time 3/4 @@ -18,4 +18,4 @@ Use a glissando without final note. Contemporary glissando ! \addlyrics { unHideNotes cadenzaOff, skip_and_\bar \skip 4 } \layout{raggedright = ##t} \header { tagline="" } - +% begin verbatim diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 63ce90271c..5bb31a31bc 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -7,7 +7,7 @@ Though the set-time-signature thing was not the most essential here, it has been included to show the beat of this piece (which is a template of a real balkan song!). " } - +% begin verbatim #(define (compound-time one two three four five six seven eight nine ten num) (markup #:override '(baseline-skip . 0) #:number (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)) #:vcenter "+" (#:column (three num)) #:vcenter "+" (#:column (four num)) #:vcenter "+" (#:column (five num)) #:vcenter "+" (#:column (six num)) #:vcenter "+" (#:column (seven num)) #:vcenter "+" (#:column (eight num)) #:vcenter "+" (#:column (nine num)) #:vcenter "+" (#:column (ten num)))))) diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index 2591face29..e8a6aa3736 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -5,7 +5,7 @@ \header { texidoc = " This can be achieved by separating those syllables by tildes. " } - +% begin verbatim \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 index 5594874463..892b747b4d 100644 --- a/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly @@ -6,7 +6,7 @@ The \\markup command is quite versatile. In this snippet, it contains a \\score bloc instead of texts or marks. " } - +% begin verbatim tuning = \markup { \score { \new Staff \with { @@ -24,7 +24,7 @@ tuning = \markup { subtitle = "Suite IV" subsubtitle = \markup { "Originalstimmung:" \tuning } } - +% begin verbatim \relative { \time 4/8 \times 2/3 { c'8 d e } \times 2/3 {c d e} diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index 23afdead7f..802c980564 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -3,7 +3,7 @@ \header { texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } - +% begin verbatim \version "2.11.35" \paper { diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly index c63066bbf9..58f1e303c0 100644 --- a/input/lsr/makam.ly +++ b/input/lsr/makam.ly @@ -6,7 +6,7 @@ microtonal alterations." } - +% begin verbatim \version "2.11.35" diff --git a/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly b/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly index e6ee0e6467..6ed3429d40 100644 --- a/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisibile-with-the-transparent-property.ly @@ -1,6 +1,5 @@ %% 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.35" \header { texidoc = " @@ -15,7 +14,7 @@ Normally, ties only connect two notes in the same voice. By introducing a tie in a different voice, and blanking the first up-stem in that voice, the tie appears to cross voices. " } - +% begin verbatim \relative c'' { << { \once \override Stem #'transparent = ##t diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index a1b7d5dcc6..6ef4c49cb5 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -6,7 +6,7 @@ texidoc = "Text that can spread over pages is entered with the @code{\\markuplines} command." } - +% begin verbatim #(set-default-paper-size "a6") #(define-markup-list-command (paragraph layout props args) (markup-list?) diff --git a/input/lsr/midi.snippet-list b/input/lsr/midi.snippet-list new file mode 100644 index 0000000000..8eab597a2a --- /dev/null +++ b/input/lsr/midi.snippet-list @@ -0,0 +1 @@ +demo-midiinstruments.ly diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index 044cc4d91b..857460b760 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -16,7 +16,7 @@ generating a whole-tone scale: " } - +% begin verbatim \relative c' { \new Staff { \set Staff.keySignature = diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index e613d665a4..dbbe219810 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,6 +1,5 @@ %% 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.35" \header { texidoc = " @@ -10,7 +9,7 @@ By putting the output of with @code{lilypond-book}. Another possibility is to append the version number to the doc-string, in this manner: " } - +% begin verbatim \score { \context Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly new file mode 100644 index 0000000000..cc3dcffa80 --- /dev/null +++ b/input/lsr/page-label.ly @@ -0,0 +1,48 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: spacing +\version "2.11.35" + +\header { + texidoc = "Page labels may be placed inside music or at top-level, +and refered to in markups." +} +% begin verbatim +#(set-default-paper-size "a6") + +#(define-markup-command (toc-line layout props label text) (symbol? markup?) + (interpret-markup layout props + (markup #:fill-line (text #:page-ref label "8" "?")))) + +\book { + \markup \huge \fill-line { \null "Title Page" \null } + + \pageBreak + + \label #'toc + \markup \column { + \large \fill-line { \null "Table of contents" \null } + \toc-line #'toc "Table of contents" + \toc-line #'firstScore "First Score" + \toc-line #'markA "Mark A" + \toc-line #'markB "Mark B" + \toc-line #'markC "Mark C" + \toc-line #'unknown "Unknown label" + } + + \pageBreak + + \label #'firstScore + \score { + { c'2 c' + \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA + c' c' + \pageBreak + \mark "B" \label #'markB + d' d' + d' d' + \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible + \mark "C" \label #'markC + } + \header { piece = "First score" } + } +} \ No newline at end of file diff --git a/input/lsr/paper-and-layout.snippet-list b/input/lsr/paper-and-layout.snippet-list new file mode 100644 index 0000000000..c603257756 --- /dev/null +++ b/input/lsr/paper-and-layout.snippet-list @@ -0,0 +1,7 @@ +creating-blank-staves.ly +aligning-and-centering-instrument-names.ly +toc.ly +alignment-vertical-spacing.ly +demonstrating-all-headers.ly +changing-the-staff-size.ly +clip-systems.ly diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index 18866c5a3b..170937ae3b 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: repeats +%% Tags: repeats, breaks \version "2.11.35" \header { texidoc = " @@ -9,7 +9,7 @@ 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. " } - +% begin verbatim { \clef treble \key g \major diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly index 7cf71c1119..4075f0c482 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -8,7 +8,7 @@ printed before a sharp or flat if a previous accidental on the same note needs to be canceled. To change this behavior, set the extraNatural property to \"false\" in the Staff context. " } - +% begin verbatim \relative { aeses'4 aes ais a \set Staff.extraNatural = ##f diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index bdcd003141..6354ae5bb8 100644 --- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -8,7 +8,7 @@ to cancel any accidentals from previous key signatures. This may be altered by setting to \"false\" the printKeyCancellation property in the Staff context. " } - +% begin verbatim \relative { \key d \major a b cis d diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 8c21f6f26a..726163f8ca 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: rhythms, editorial-and-educational-use +%% Tags: rhythms, editorial-and-educational-use, tweaks-and-overrides \version "2.11.35" \header { texidoc = " @@ -17,7 +17,7 @@ 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). " } - +% begin verbatim % Macro to print single slash rs = { \once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash diff --git a/input/lsr/spacing.snippet-list b/input/lsr/spacing.snippet-list new file mode 100644 index 0000000000..1e126856ec --- /dev/null +++ b/input/lsr/spacing.snippet-list @@ -0,0 +1,4 @@ +alignment-vertical-spacing.ly +vertically-aligning-ossias-and-lyrics.ly +page-label.ly +adjusting-lyrics-vertical-spacing.ly diff --git a/input/lsr/titles.snippet-list b/input/lsr/titles.snippet-list new file mode 100644 index 0000000000..11d02ab21d --- /dev/null +++ b/input/lsr/titles.snippet-list @@ -0,0 +1,3 @@ +aligning-and-centering-instrument-names.ly +demonstrating-all-headers.ly +adding-the-current-date-to-a-score.ly diff --git a/input/lsr/toc.ly b/input/lsr/toc.ly new file mode 100644 index 0000000000..e370e13960 --- /dev/null +++ b/input/lsr/toc.ly @@ -0,0 +1,31 @@ +%% Do not edit this file; it is auto-generated from LSR! +%% Tags: paper-and-layout +\version "2.11.35" + +\header { + texidoc = "A table of contents is included using +@code{\\markuplines \\table-of-contents}. The toc items are added with +the @code{\\tocItem} command." +} +% begin verbatim +#(set-default-paper-size "a6") + +\book { + \markuplines \table-of-contents + \pageBreak + + \tocItem \markup "The first score" + \score { + { + c'1 \pageBreak + \mark "A" \tocItem \markup "Mark A" + d' + } + } + \pageBreak + \tocItem \markup "The second score" + \score { + { e' } + \header { piece = "Second score" } + } +} \ No newline at end of file diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index c793818cc5..018e5f7f22 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -10,7 +10,7 @@ accidentals should be removed, as well as E-sharp (-> F), bC (-> B), bF In this manner, the most natural enharmonic notes are chosen in this example. " } - +% begin verbatim #(define (naturalise-pitch p) (let* ((o (ly:pitch-octave p)) (a (ly:pitch-alteration p)) diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list new file mode 100644 index 0000000000..ef4f8126f9 --- /dev/null +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -0,0 +1,14 @@ +creating-text-spanners.ly +altering-the-number-of-stems-in-a-beam.ly +controlling-tuplet-bracket-visibility.ly +caesura-railtracks-with-fermata.ly +coloring-objects.ly +rhythmic-slashes.ly +changing-the-staff-size.ly +changing-the-default-text-font-family.ly +vertically-aligning-ossias-and-lyrics.ly +clefs-commonly-tweaked-properties.ly +custodes.ly +alignment-vertical-spacing.ly +changing-an-individual-notes-size-in-a-chord.ly +changing-properties-for-individual-grobs.ly diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index 723a92af83..8afe1490f9 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,6 +1,5 @@ %% 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.35" \header { texidoc = " @@ -9,7 +8,7 @@ are some examples of available tweaks. " } - +% begin verbatim \paper { ragged-right = ##t } diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly index 80b6a8ca5f..4defdebc8b 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -30,7 +30,7 @@ will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. " } - +% begin verbatim % Cyrillic font bulgarian = \lyricmode { Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index cbcde48946..df6b9d1875 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -%% Tags: vocal-music +%% Tags: vocal-music, tweaks-and-overrides, spacing \version "2.11.35" \header { texidoc = " @@ -8,7 +8,7 @@ This snippet shows of to use the @code{alignBelowContext} and elements (e.g. lyrics) positioning, but also for musical contents such as ossias. " } - +% begin verbatim \paper { ragged-right = ##t } diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index 7e2e6144b1..c1ca05f279 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -4,7 +4,7 @@ texidoc = "By adding @code{Volta_engraver}, repeat brackets can be put over staves other than the topmost one in a score." } - +% begin verbatim \version "2.11.36" vmus = {