From 0639a872a6401bc905cb3ebd0278f0a1e27519d3 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sun, 23 Mar 2008 15:52:20 +0100 Subject: [PATCH] Update LSR --- input/lsr/adding-ambiti-per-voice.ly | 2 +- ...hen-using-tuplet-and-non-tuplet-rythms..ly | 12 ++-- input/lsr/adding-drum-parts.ly | 15 ++-- ...gerings-to-a-score-using-markup-objects.ly | 15 ++++ input/lsr/adding-fingerings-to-a-score.ly | 13 ++++ input/lsr/adding-fingerings-to-chords.ly | 15 ++++ ...und-an-expressive-mark-or-chordal-note.ly} | 8 ++- ...ing-volta-brackets-to-additional-staves.ly | 20 ++++++ ...ngerings-to-be-printed-inside-the-staff.ly | 16 +++++ input/lsr/anaylsis-brackets.ly | 25 +++++++ ...yles-depending-on-the-step-of-the-scale.ly | 25 +++---- ...staff-lines-using-the--whiteout-command.ly | 6 +- input/lsr/breathing-sign.ly | 2 +- input/lsr/broken-crescendo-hairpin.ly | 2 +- .../changing-form-of-multi--measure-rests.ly | 22 ++++++ .../changing-the-size-of-layout-objects.ly | 19 +++++ input/lsr/changing-the-size-of-note-heads.ly | 24 +++++++ ...polymetric-section-using--compressmusic.ly | 47 ++++++------ input/lsr/chant-or-psalms-notation.ly | 22 +++--- input/lsr/chords.snippet-list | 2 + input/lsr/coloring-elements-of-notation.ly | 19 +++++ input/lsr/contexts-and-engravers.snippet-list | 5 +- ...lling-the-placement-of-chord-fingerings.ly | 24 +++++++ .../controlling-tuplet-bracket-visibility.ly | 6 +- ...-a-sequence-of-notes-on-various-pitches.ly | 14 ++-- .../creating-real-parenthesized-dynamics.ly | 25 +++---- ...f-stems-on-the-center-line-of-the-staff.ly | 18 +++++ ...entals-for-each-note-including-naturals.ly | 20 +++--- ...editorial-and-educational-use.snippet-list | 29 ++++++-- input/lsr/expressive-marks.snippet-list | 7 +- ...s;-adding-vertical-lines-between-staves.ly | 42 +++++++++++ .../grid-lines;-changing-their-appearance.ly | 51 +++++++++++++ ...izing-rhythms-and-notes-synchronization.ly | 72 +++++++++++++++++++ input/lsr/hiding-notes.ly | 22 ++++++ input/lsr/how-to-add-thumb-fingerings.ly | 15 ++++ .../manually-controlling-beam-positions.ly | 19 ++--- input/lsr/ottava-text.ly | 4 +- input/lsr/piano-music.snippet-list | 2 + input/lsr/pitches.snippet-list | 4 +- input/lsr/positioning-multi--measure-rests.ly | 43 +++++++++++ ...naturals-from-being-automatically-added.ly | 7 ++ ...ng-music-with-different-time-signatures.ly | 12 ++-- ...utting-parentheses-around-a-single-note.ly | 20 ++++++ ...ing-parentheses-around-non-note-objects.ly | 14 ++++ input/lsr/repeats.snippet-list | 2 + input/lsr/rest-styles.ly | 50 ++++++------- input/lsr/rgb-colors.ly | 27 +++++++ input/lsr/rhythmic-slashes.ly | 25 ++++--- input/lsr/rhythms.snippet-list | 2 + input/lsr/shortening-volta-brackets.ly | 22 ++++++ input/lsr/skips-in-lyric-mode-2.ly | 8 +-- input/lsr/skips-in-lyric-mode.ly | 10 +-- input/lsr/spacing.snippet-list | 10 +-- input/lsr/square-balloons.ly | 18 +++++ input/lsr/staff-notation.snippet-list | 10 +-- input/lsr/strings.snippet-list | 1 + input/lsr/template.snippet-list | 14 ++-- input/lsr/text.snippet-list | 15 ++-- input/lsr/tweaks-and-overrides.snippet-list | 29 ++++---- input/lsr/vocal-music.snippet-list | 14 ++-- 60 files changed, 837 insertions(+), 226 deletions(-) create mode 100644 input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly create mode 100644 input/lsr/adding-fingerings-to-a-score.ly create mode 100644 input/lsr/adding-fingerings-to-chords.ly rename input/lsr/{adding-parentheses-around-an-expressive-mark.ly => adding-parentheses-around-an-expressive-mark-or-chordal-note.ly} (58%) create mode 100644 input/lsr/adding-volta-brackets-to-additional-staves.ly create mode 100644 input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly create mode 100644 input/lsr/anaylsis-brackets.ly create mode 100644 input/lsr/changing-form-of-multi--measure-rests.ly create mode 100644 input/lsr/changing-the-size-of-layout-objects.ly create mode 100644 input/lsr/changing-the-size-of-note-heads.ly create mode 100644 input/lsr/coloring-elements-of-notation.ly create mode 100644 input/lsr/controlling-the-placement-of-chord-fingerings.ly create mode 100644 input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly create mode 100644 input/lsr/grid-lines;-adding-vertical-lines-between-staves.ly create mode 100644 input/lsr/grid-lines;-changing-their-appearance.ly create mode 100644 input/lsr/grid-lines;-emphasizing-rhythms-and-notes-synchronization.ly create mode 100644 input/lsr/hiding-notes.ly create mode 100644 input/lsr/how-to-add-thumb-fingerings.ly create mode 100644 input/lsr/positioning-multi--measure-rests.ly create mode 100644 input/lsr/putting-parentheses-around-a-single-note.ly create mode 100644 input/lsr/putting-parentheses-around-non-note-objects.ly create mode 100644 input/lsr/rgb-colors.ly create mode 100644 input/lsr/shortening-volta-brackets.ly create mode 100644 input/lsr/square-balloons.ly diff --git a/input/lsr/adding-ambiti-per-voice.ly b/input/lsr/adding-ambiti-per-voice.ly index 7f896f243e..b4d3e34c11 100644 --- a/input/lsr/adding-ambiti-per-voice.ly +++ b/input/lsr/adding-ambiti-per-voice.ly @@ -21,6 +21,6 @@ manually to prevent collisions. \consists "Ambitus_engraver" } \relative c' { \voiceTwo - es4 f g as b1 + es4 f g as b1 } >> 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 d7b5bcf838..899d2503f5 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 @@ -12,13 +12,13 @@ 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 combine -manual beaming, manual slurs, ties, and phrasing slurs with tuplet -sections (enclosed with curly braces). +manual beaming, manual slurs, ties and phrasing slurs with tuplet +sections (enclosed within curly braces). " } % begin verbatim { - 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.\) + 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/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index 2e43f205b2..42b4a22122 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -12,12 +12,12 @@ clef symbol) and have noteheads 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} } +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 { + \repeat volta 2 { << \new DrumStaff \with { drumStyleTable = #timbales-style @@ -29,8 +29,8 @@ timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r >> \new DrumStaff << \set Staff.instrumentName = "drums" - \new DrumVoice {\stemUp \drh } - \new DrumVoice {\stemDown \drl } + \new DrumVoice { \stemUp \drh } + \new DrumVoice { \stemDown \drl } >> >> } @@ -39,7 +39,6 @@ timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r \context { \Score tempoWholesPerMinute = #(ly:make-moment 120 4) - } } + } } - diff --git a/input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly b/input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly new file mode 100644 index 0000000000..c0137ff812 --- /dev/null +++ b/input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly @@ -0,0 +1,15 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Fingerings can be entered as markup objects, for example to specify +fingering changes on a single note. +" } +% begin verbatim +\relative c'' { + c4-1 d-2 f-4 + c^\markup { \finger "2 - 3" } +} diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/input/lsr/adding-fingerings-to-a-score.ly new file mode 100644 index 0000000000..27fbc6f01a --- /dev/null +++ b/input/lsr/adding-fingerings-to-a-score.ly @@ -0,0 +1,13 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Fingering instructions can be entered using a simple syntax. +" } +% begin verbatim +\relative c'' { + c4-1 d-2 f-4 e-3 +} diff --git a/input/lsr/adding-fingerings-to-chords.ly b/input/lsr/adding-fingerings-to-chords.ly new file mode 100644 index 0000000000..a30a2d147c --- /dev/null +++ b/input/lsr/adding-fingerings-to-chords.ly @@ -0,0 +1,15 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, chords, piano-music" + texidoc = " +Fingerings for chords can be obtained by adding them to individual +pitches. +" } +% begin verbatim +\relative c'{ + < c-1 e-2 g-3 b-5 >2 + < d-1 f-2 a-3 c-5 > +} diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly similarity index 58% rename from input/lsr/adding-parentheses-around-an-expressive-mark.ly rename to input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly index 7341d4f224..0e699bed67 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly @@ -5,13 +5,15 @@ \header { lsrtags = "expressive-marks" texidoc = " -The parenthesize function is a special tweak that encloses objects in -parentheses. The associated grob is Score.ParenthesesItem. +The @code{\\parenthesize} function is a special tweak that encloses +objects in parentheses. The associated grob is +@code{Score.ParenthesesItem}. " } % begin verbatim \relative { - c4 -\parenthesize -. + c2-\parenthesize -> \override ParenthesesItem #'padding = #0.1 + \override ParenthesesItem #'font-size = #-4 } diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly new file mode 100644 index 0000000000..b4567d84cf --- /dev/null +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -0,0 +1,20 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "repeats" + texidoc = " +The @code{Volta_engraver} by default resides in the Score context, and +brackets for the repeat are thus normally only printed over the topmost +staff. This can be adjusted by adding @code{Volta_engraver} to the +Staff context where you want the brackets to appear; see also the +\"Volta multi staff\" snippet. +" } +% begin verbatim +<< + \new Staff { \repeat volta 2 { c'1 } \alternative { c' } } + \new Staff { \repeat volta 2 { c'1 } \alternative { c' } } + \new Staff \with { \consists Volta_engraver } { c'2 g' e' a' } + \new Staff { \repeat volta 2 { c'1 } \alternative { c' } } + >> diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly new file mode 100644 index 0000000000..5e91f03137 --- /dev/null +++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly @@ -0,0 +1,16 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, spacing" + texidoc = " +By default, fingering numbers will be printed outside the staff. +However, this behavior can be cancelled. +" } +% begin verbatim +\relative c' { + 2 + \once \override Fingering #'staff-padding = #'() + +} diff --git a/input/lsr/anaylsis-brackets.ly b/input/lsr/anaylsis-brackets.ly new file mode 100644 index 0000000000..177a005887 --- /dev/null +++ b/input/lsr/anaylsis-brackets.ly @@ -0,0 +1,25 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Brackets can be used in musical analysis to indicate the structure of +the pieces. As demonstrated in the second measure, such analysis +brackets can be nested. +" } +% begin verbatim +\layout { + \context { + \Staff \consists "Horizontal_bracket_engraver" + } +} +\relative c'' { + c2\startGroup + d\stopGroup + c4\startGroup\startGroup + d4\stopGroup + e4\startGroup + d4\stopGroup\stopGroup +} diff --git a/input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly index b43eedbbd9..2691f1e935 100644 --- a/input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly @@ -5,18 +5,19 @@ \header { lsrtags = "pitches, editorial-and-educational-use" texidoc = " -The shapeNoteStyles property gives you the ability to define various -notehead 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 notehead styles, through shortcut -commands such as \\aikenHeads or \\sacredHarpHeads. This example shows -different ways to obtain shape noteheads, and demonstrates the ability -to transpose a melody without losing the correspondence between -harmonic functions and notehead styles. +The @code{shapeNoteStyles} property gives you the ability to define +various notehead 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 @code{triangle}, @code{cross}, @code{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 notehead +styles, through shortcut commands such as @code{\\aikenHeads} or +@code{\\sacredHarpHeads}. This example shows different ways to obtain +shape noteheads, and demonstrates the ability to transpose a melody +without losing the correspondence between harmonic functions and +notehead styles. " } % begin verbatim fragment = { 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 02b1350a43..5161cd6a5b 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -5,9 +5,9 @@ \header { lsrtags = "editorial-and-educational-use, text" 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. +The @code{\\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 { diff --git a/input/lsr/breathing-sign.ly b/input/lsr/breathing-sign.ly index f8d87e3870..07846dce76 100644 --- a/input/lsr/breathing-sign.ly +++ b/input/lsr/breathing-sign.ly @@ -6,7 +6,7 @@ lsrtags = "expressive-marks" texidoc = " Breathing signs are available in different tastes: commas (default), -ticks, vees and `railroad tracks' (caesura). +ticks, vees and \"railroad tracks\" (caesura). " } % begin verbatim { diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index eebe31d36f..373bc05069 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -21,7 +21,7 @@ Make sure to put the Hairpin in a lower layer than the Text Markup to actually draw the rectangle above the hairpin. " } % begin verbatim -% Version specific to 2.10; fails under 2.11 -np +% Version specific to 2.10; fails under 2.11 due to rest position -np \score { diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly new file mode 100644 index 0000000000..bf9a0eba4b --- /dev/null +++ b/input/lsr/changing-form-of-multi--measure-rests.ly @@ -0,0 +1,22 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.42" +\layout { ragged-right= ##t } +\header { + doctitle = "Changing form of multi-measure rests" + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " +If there are 10 or fewer measures of rest, LilyPond prints +a series of longa and breve rests (called in German +Kirchenpausen - church rests) within the staff and +prints a simple line otherwise. This default number of 10 +may be changed by an override: +"} +% begin verbatim +\relative c'' { +\compressFullBarRests +R1*2 | R1*5 | R1*9 +\override MultiMeasureRest #'expand-limit = 3 +R1*2 | R1*5 | R1*9 +} + diff --git a/input/lsr/changing-the-size-of-layout-objects.ly b/input/lsr/changing-the-size-of-layout-objects.ly new file mode 100644 index 0000000000..3fca93714a --- /dev/null +++ b/input/lsr/changing-the-size-of-layout-objects.ly @@ -0,0 +1,19 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, tweaks-and-overrides" + texidoc = " +The @code{font-size} property can be set directly, so that only certain +layout objects are affected. +" } +% begin verbatim +\relative c'' { + \set fontSize = #3 + c4.-> d8---3 + \override NoteHead #'font-size = #-4 + c4.-> d8---3 + \override Script #'font-size = #3 + c4.-> d8---3 +} diff --git a/input/lsr/changing-the-size-of-note-heads.ly b/input/lsr/changing-the-size-of-note-heads.ly new file mode 100644 index 0000000000..62e27e0cd7 --- /dev/null +++ b/input/lsr/changing-the-size-of-note-heads.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +It is possible to change the fontsize of noteheads. +" } +% begin verbatim +\relative c'' { +% \huge + c4.-> d8---3 +% \large + c4.-> d8---3 +% \normalsize + c4.-> d8---3 +% \small + c4.-> d8---3 +% \tiny + c4.-> d8---3 +% \normalsize + c2 +} 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 bfbd90f128..da81799a09 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 @@ -15,31 +15,32 @@ as the second argument of @code{\\compressMusic}. " } % begin verbatim \layout { - \context { \Score + \context { + \Score \remove "Timing_translator" \remove "Default_bar_line_engraver" - } - \context { - \Staff - \consists "Timing_translator" - \consists "Default_bar_line_engraver" - } + } + \context { + \Staff + \consists "Timing_translator" + \consists "Default_bar_line_engraver" + } } << - \new Staff { - \compressMusic #'(8 . 5) { - \time 6/8 - \set Timing.measureLength = #(ly:make-moment 3 5) - b8 b b b b b - \time 2/4 - \set Timing.measureLength = #(ly:make-moment 2 5) - b4 b - } - } - \new Staff { - \clef bass - \time 2/4 - c2 d e f } - >> - + \new Staff { + \compressMusic #'(8 . 5) { + \time 6/8 + \set Timing.measureLength = #(ly:make-moment 3 5) + b8 b b b b b + \time 2/4 + \set Timing.measureLength = #(ly:make-moment 2 5) + b4 b + } + } + \new Staff { + \clef bass + \time 2/4 + c2 d e f + } +>> diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 3e9fe60b52..d1abd7876b 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -13,15 +13,15 @@ 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 "||" - } + \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 "||" + } } diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index 360aab0085..be81952a4e 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -1,6 +1,8 @@ +adding-fingerings-to-chords.ly changing-the-chord-names-to-german-or-semi-german-notation.ly adding-a-figured-bass-above-or-below-the-notes.ly single-staff-template-with-notes-and-chords.ly +controlling-the-placement-of-chord-fingerings.ly clusters.ly single-staff-template-with-notes,-lyrics,-and-chords.ly chord-name-exceptions.ly diff --git a/input/lsr/coloring-elements-of-notation.ly b/input/lsr/coloring-elements-of-notation.ly new file mode 100644 index 0000000000..93dccdc03b --- /dev/null +++ b/input/lsr/coloring-elements-of-notation.ly @@ -0,0 +1,19 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Individual objects may be assigned colors. Several pre-defined colors +are available; they are exhaustively listed in the Notation Reference. +" } +% begin verbatim +\relative c'' { + \override NoteHead #'color = #red + c4 c + \override NoteHead #'color = #(x11-color 'LimeGreen) + d + \override Stem #'color = #blue + e +} diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list index 0205e5c88f..abd1093a81 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -1,9 +1,10 @@ creating-blank-staves.ly chant-or-psalms-notation.ly -adding-and-extra-staff-at-a-line-break.ly +adding-a-figured-bass-above-or-below-the-notes.ly +square-balloons.ly adding-an-extra-staff.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly engravers-one-by-one.ly -adding-a-figured-bass-above-or-below-the-notes.ly +adding-and-extra-staff-at-a-line-break.ly nesting-staves.ly diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly new file mode 100644 index 0000000000..ae8917ca0d --- /dev/null +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, chords, piano-music" + texidoc = " +The placement of fingering numbers can be controlled precisely. +" } +% begin verbatim +\relative c'{ + \set fingeringOrientations = #'(left) + 4 + \set fingeringOrientations = #'(down) + + \set fingeringOrientations = #'(right) + + \set fingeringOrientations = #'(up) + + \set fingeringOrientations = #'(left down) + 2 + \set fingeringOrientations = #'(up right down) + +} diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index c1d37bea8d..54853bdb5e 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -14,14 +14,14 @@ print a bracket), @code{##f} (never print a bracket) or " } % begin verbatim mus = \relative c'' { - \times 2/3 {c16 [ d e } f8] - \times 2/3 {c8 d e } + \times 2/3 { c16[ d e } f8] + \times 2/3 { c8 d e } \times 2/3 { c4 d e } } \new Voice \relative c'{ << \mus s4^"default" >> - \override TupletBracket #'bracket-visibility = #'if-no-beam + \override TupletBracket #'bracket-visibility = #'if-no-beam << \mus s4^"'if-no-beam" >> \override TupletBracket #'bracket-visibility = ##t << \mus s4^"#t" >> 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 09670d3234..726cf8422a 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 @@ -52,12 +52,10 @@ rhythm = #(define-music-function (parser location note) (ly:music?) )))) \score { - \new Staff { - \time 5/4 - - \rhythm c' - \rhythm c'' - \rhythm g - } + \new Staff { + \time 5/4 + \rhythm c' + \rhythm c'' + \rhythm g + } } - diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly index 87a0b64fd5..6406707e90 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -5,26 +5,27 @@ \header { lsrtags = "expressive-marks, text" texidoc = " -Although the easiest way to add parenthesis to a dynamic mark is to use -a \\markup block, this method has a downside: the created objects will -behave like text markups, and not like dynamics. +Although the easiest way to add parentheses to a dynamic mark is to use +a @code{\\markup} block, this method has a downside: the created +objects will behave like text markups, and not like dynamics. However, it is possible to create a similar object using the equivalent Scheme code (as described in \"Markup programmer interface\"), combined -with the make-dynamic-script function. This way, the markup will be -regarded as a dynamic, and therefore will remain compatible with -commands such as \\dynamicUp or \\dynamicDown. +with the @code{make-dynamic-script} function. This way, the markup will +be regarded as a dynamic, and therefore will remain compatible with +commands such as @code{\\dynamicUp} or @code{\\dynamicDown}. " } % begin verbatim \paper { ragged-right = ##t } -parenF = #(make-dynamic-script (markup #:line(#:normal-text #:italic -#:fontsize 2 "(" #:hspace -0.8 #:dynamic "f" #:normal-text #:italic -#:fontsize 2 ")" ))) +parenF = #(make-dynamic-script (markup #:line (#:normal-text #:italic + #:fontsize 2 "(" #:hspace -0.8 #:dynamic "f" #:normal-text #:italic + #:fontsize 2 ")" + ))) -\score -{ - { c''\parenF c'' c'' \dynamicUp c''\parenF } +\score { + { c''\parenF c'' c'' \dynamicUp c''\parenF } } + diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly new file mode 100644 index 0000000000..2a889932d5 --- /dev/null +++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly @@ -0,0 +1,18 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +The direction of stems on the center line of the staff can be changed, +as demonstrated in this example. +" } +% begin verbatim +\relative c'' { + a b c b + \override Stem #'neutral-direction = #up + a b c b + \override Stem #'neutral-direction = #down + a b c b +} 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 89a58b9b36..e26193bc03 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 @@ -5,8 +5,8 @@ \header { lsrtags = "pitches" texidoc = " -In early XXth century works, starting with Schönberg, Berg and Webern -(the \"second\" Viennese school), every pitch in the twelve-tone scale +In early 20th century works, starting with Schönberg, Berg and Webern +(the \"Second\" Viennese school), every pitch in the twelve-tone scale has to be regarded as equal, without any hierarchy such as the classical (tonal) degrees. Therefore, these composers print one accidental for each note, even at natural pitches, to emphasize their @@ -15,16 +15,13 @@ achieve such notation rules with LilyPond. " } % begin verbatim webernAccidentals = { - % the 5s are just "a value different from any accidental" - \set Staff.keySignature = #'((0 . 5) (1 . 5) (2 . 5) (3 . 5) - (4 . 5) (5 . 5) (6 . 5)) - \set Staff.extraNatural = ##f - #(set-accidental-style 'forget) + % the 5s are just "a value different from any accidental" + \set Staff.keySignature = #'((0 . 5) (1 . 5) (2 . 5) (3 . 5) + (4 . 5) (5 . 5) (6 . 5)) + \set Staff.extraNatural = ##f + #(set-accidental-style 'forget) } -\layout { - \context { \Staff \remove "Key_engraver" } -} \score { { \webernAccidentals @@ -32,4 +29,7 @@ webernAccidentals = { c' dis' cis' cis' c' c' dis' des' } + \layout { + \context { \Staff \remove "Key_engraver" } + } } diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list index 05f5d94ace..6b73eaba9c 100644 --- a/input/lsr/editorial-and-educational-use.snippet-list +++ b/input/lsr/editorial-and-educational-use.snippet-list @@ -1,10 +1,29 @@ -creating-blank-staves.ly -forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +adding-fingerings-to-chords.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly -coloring-objects.ly +putting-parentheses-around-a-single-note.ly changing-the-default-text-font-family.ly -changing-a-single-notes-size-in-a-chord.ly -three-sided-box.ly +changing-the-size-of-note-heads.ly +grid-lines;-adding-vertical-lines-between-staves.ly +creating-blank-staves.ly +grid-lines;-changing-their-appearance.ly +coloring-objects.ly +allowing-fingerings-to-be-printed-inside-the-staff.ly +default-direction-of-stems-on-the-center-line-of-the-staff.ly clefs-commonly-tweaked-properties.ly blanking-staff-lines-using-the--whiteout-command.ly +forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +changing-the-size-of-layout-objects.ly +adding-fingerings-to-a-score-using-markup-objects.ly +controlling-the-placement-of-chord-fingerings.ly +rgb-colors.ly applying-notehead-styles-depending-on-the-step-of-the-scale.ly +adding-fingerings-to-a-score.ly +anaylsis-brackets.ly +how-to-add-thumb-fingerings.ly +square-balloons.ly +changing-a-single-notes-size-in-a-chord.ly +putting-parentheses-around-non-note-objects.ly +three-sided-box.ly +hiding-notes.ly +grid-lines;-emphasizing-rhythms-and-notes-synchronization.ly +coloring-elements-of-notation.ly diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index 14cfe8f7ef..31278914d3 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -1,13 +1,14 @@ combining-dynamics-with-markup-texts.ly creating-text-spanners.ly -adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +breathing-sign.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly caesura-railtracks-with-fermata.ly -breathing-sign.ly +adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly creating-real-parenthesized-dynamics.ly +putting-parentheses-around-non-note-objects.ly center-text-below-hairpin-dynamics.ly contemporary-glissando.ly -adding-parentheses-around-an-expressive-mark.ly +adding-parentheses-around-an-expressive-mark-or-chordal-note.ly line-arrows.ly changing--flageolet-mark-size.ly piano-template-with-centered-dynamics.ly diff --git a/input/lsr/grid-lines;-adding-vertical-lines-between-staves.ly b/input/lsr/grid-lines;-adding-vertical-lines-between-staves.ly new file mode 100644 index 0000000000..2540365daf --- /dev/null +++ b/input/lsr/grid-lines;-adding-vertical-lines-between-staves.ly @@ -0,0 +1,42 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Vertical lines can be drawn between staves synchronized with the notes. +" } +% begin verbatim +\layout { + \context { + \Staff + \consists "Grid_point_engraver" + % sets up grids + gridInterval = #(ly:make-moment 1 4) + % this sets the grid interval to 1 quarternote (crotchet) + } +} + +\new Score \with { + \consists "Grid_line_span_engraver" + %% by default this centers grid lines horizontally below and to the + % left side of the notehead, the grid lines extend from + % the middle lines of each staff +} + +\new ChoirStaff << + \new Staff { + \relative c'' { + \stemUp + c4. d8 e8 f g4 + } + } + \new Staff { + \clef bass + \relative c { + \stemDown + c4 g' f e + } + } +>> diff --git a/input/lsr/grid-lines;-changing-their-appearance.ly b/input/lsr/grid-lines;-changing-their-appearance.ly new file mode 100644 index 0000000000..4bfc039009 --- /dev/null +++ b/input/lsr/grid-lines;-changing-their-appearance.ly @@ -0,0 +1,51 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Grid lines can look differently, by modifying some of their properties +using the @code{\\override} command. +" } +% begin verbatim +\layout { + \context { + \Staff + \consists "Grid_point_engraver" + % sets up grids + gridInterval = #(ly:make-moment 1 4) + % this sets the grid interval to 1 quarternote (crotchet) + } +} + +\new Score \with { + \consists "Grid_line_span_engraver" + \override NoteColumn #'X-offset = #-0.5 + % this moves them to the right half a staff space +} + +\new ChoirStaff << + \new Staff { + \relative c'' { + \stemUp + c'4. d8 e8 f g4 + } + } + \new Staff { + \relative c { + \override Score.GridLine #'extra-offset = #'( 0.0 . 1.0 ) + % this moves them up one staff space from the default position + \stemDown + \clef bass + \once \override Score.GridLine #'thickness = #5.0 + c4 + \once \override Score.GridLine #'thickness = #1.0 + g' + \once \override Score.GridLine #'thickness = #3.0 + f + \once \override Score.GridLine #'thickness = #5.0 + e + } + } +>> diff --git a/input/lsr/grid-lines;-emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines;-emphasizing-rhythms-and-notes-synchronization.ly new file mode 100644 index 0000000000..b1c6c95869 --- /dev/null +++ b/input/lsr/grid-lines;-emphasizing-rhythms-and-notes-synchronization.ly @@ -0,0 +1,72 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Regular vertical lines can be drawn between staves to show notes +synchronization; however, in case of monophonic music, you may want to +make the second stave invisible, and make the lines shorter like in +this snippet. +" } +% begin verbatim +%% sets of grid +\layout { + \context { + \Staff + \consists "Grid_point_engraver" + gridInterval = #(ly:make-moment 1 8) +%% lines length + \override GridPoint #'Y-extent = #'(6 . 0) + } + \context { + \StaffGroup + \remove "System_start_delimiter_engraver" + } +} + +\layout { + ragged-right = ##t +} +\new Score +\with { + \consists "Grid_line_span_engraver" +%% centers grid lines horizontally below noteheads + \override NoteColumn #'X-offset = #-0.5 +} + +\new ChoirStaff << + \new Staff + { + \time 12/8 + \stemUp + \relative { + c'4. d8 e8 f g4 f8 e8.[ d16 c8] } + } + \new Staff + { +%% making sure the lines will be placed outside the Staff + \override Score.GridLine #'extra-offset = #'( 0.0 . -4.0 ) + +%% hides staff and notes so that only the grid lines are visible + \override NoteHead #'transparent = ##t + \override NoteHead #'no-ledgers = ##t + \override Stem #'transparent = ##t + \override Beam #'transparent = ##t + \override Staff.BarLine #'transparent = ##t + \override Staff.StaffSymbol #'line-count = #0 + \override Staff.TimeSignature #'transparent = ##t + \override Staff.Clef #'transparent = ##t + +% you have to put 'dummy' notes here to force regular grid spacing... + \once \override Score.GridLine #'thickness = #4.0 + c8 c8 c8 + \once \override Score.GridLine #'thickness = #3.0 + c8 c8 c8 + \once \override Score.GridLine #'thickness = #4.0 + c8 c8 c8 + \once \override Score.GridLine #'thickness = #3.0 + c8 c8 c8 + } +>> diff --git a/input/lsr/hiding-notes.ly b/input/lsr/hiding-notes.ly new file mode 100644 index 0000000000..abd116aa18 --- /dev/null +++ b/input/lsr/hiding-notes.ly @@ -0,0 +1,22 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, spacing" + texidoc = " +In the following examples, some notes are hidden: although they are +made transparent, they still take vertical and horizontal space. +" } +% begin verbatim +\relative c'' { + c4 d + \hideNotes + e f + \unHideNotes + g a + \hideNotes + b + \unHideNotes + c +} diff --git a/input/lsr/how-to-add-thumb-fingerings.ly b/input/lsr/how-to-add-thumb-fingerings.ly new file mode 100644 index 0000000000..cddb30a769 --- /dev/null +++ b/input/lsr/how-to-add-thumb-fingerings.ly @@ -0,0 +1,15 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, strings" + texidoc = " +Special scripts can be entered for thumb fingerings (for example in +cello music). +" } +% begin verbatim +\relative c'' { + a2_\thumb + +} diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index cef8e0f13c..a57f8575b2 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -12,17 +12,12 @@ Beam positions may be controlled manually, by overriding the " } % begin verbatim -\score { - \context Voice \relative c { - %% from upper staffline (position 4) to centre (position 0) - \override Beam #'positions = #'(2 . 0) - c'8[ c] - - %% from center to one above centre (position 2) - \override Beam #'positions = #'(0 . 1) - c[ c] - } - +\relative c { + % from upper staffline (position 4) to centre (position 0) + \override Beam #'positions = #'(2 . 0) + c'8[ c] + % from centre to one above centre (position 2) + \override Beam #'positions = #'(0 . 1) + c[ c] } - diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index 76eba09c80..d601cb6656 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -5,9 +5,9 @@ \header { lsrtags = "pitches, text" texidoc = " -Internally, the set-octavation function sets the properties +Internally, the @code{set-octavation} function sets the properties @code{ottavation} (e.g., to @code{\"8va\"} or @code{\"8vb\"}) and -@code{middleCPosition}. To override the text of the bracket, set +@code{middleCPosition}. To override the text of the bracket, set @code{ottavation} after invoking @code{set-octavation}, like in the following example. diff --git a/input/lsr/piano-music.snippet-list b/input/lsr/piano-music.snippet-list index a737521901..a748489e74 100644 --- a/input/lsr/piano-music.snippet-list +++ b/input/lsr/piano-music.snippet-list @@ -3,6 +3,8 @@ clusters.ly piano-template-with-centered-lyrics.ly vocal-ensemble-template-with-automatic-piano-reduction.ly piano-template-simple.ly +controlling-the-placement-of-chord-fingerings.ly +adding-fingerings-to-chords.ly piano-template-with-melody-and-lyrics.ly jazz-combo-template.ly demo-midiinstruments.ly diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list index 9f3eea8056..3c0c7d9105 100644 --- a/input/lsr/pitches.snippet-list +++ b/input/lsr/pitches.snippet-list @@ -1,6 +1,6 @@ makam.ly ambiti-multiple-voices.ly -applying-notehead-styles-depending-on-the-step-of-the-scale.ly +dodecaphonic-style-accidentals-for-each-note-including-naturals.ly transposing-pitches-with-minimum-accidentals-smart-transpose.ly ottava-text.ly preventing-extra-naturals-from-being-automatically-added.ly @@ -8,7 +8,7 @@ generating-random-notes.ly quoting-another-voice-with-transposition.ly adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly -dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +applying-notehead-styles-depending-on-the-step-of-the-scale.ly preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly creating-a-sequence-of-notes-on-various-pitches.ly non-traditional-key-signatures.ly diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly new file mode 100644 index 0000000000..ecd9a9087c --- /dev/null +++ b/input/lsr/positioning-multi--measure-rests.ly @@ -0,0 +1,43 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.42" +\layout { ragged-right= ##t } +\header { + doctitle = "Positioning multi-measure rests" + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " +Unlike ordinary rests, there is no predefined command +to change the vertical position on the staff of a multi-measure +rest symbol of either form by attaching it to a note. However, +in polyphonic music multi-measure rests in odd-numbered and +even-numbered voices are vertically separated. The positioning +of multi-measure rests can be controlled as follows: + "} +% begin verbatim +\relative c'' { +% Multi-measure rests by default are set under the 2nd line +R1 +% They can be moved with an override +\override MultiMeasureRest #'staff-position = #-2 +R1 +% A value of 0 is the default position; +% the following trick moves the rest to the center line +\override MultiMeasureRest #'staff-position = #-0.01 +R1 +% Multimeasure rests in odd-numbered voices are under the top line +<< {R1} \\ {a1} >> +% Multi-measure rests in even-numbered voices are under the bottom line +<< {c1} \\ {R1} >> +% They remain separated even in empty bars +<< {R1} \\ {R1} >> +% This brings them together even though there are two voices +\compressFullBarRests +<< + \revert MultiMeasureRest #'staff-position + {R1*3} +\\ + \revert MultiMeasureRest #'staff-position + {R1*3} +>> +} + 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 fbf165b75c..b27a9ef5fe 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -4,6 +4,13 @@ \header { lsrtags = "pitches" + + texidocfr = " +En accord avec les règles standards de l'écriture musicale, on grave +un bécarre avant un dièse ou un bémol si on a besoin d'annuler une +altération précédente. Pour modifier ce comportement, assignez la propriété +@code{extraNatural} du contexte @code{Staff} à la valeur @code{##f} (faux). +" texidoc = " In accordance with standard typesetting rules, a natural sign is printed before a sharp or flat if a previous accidental on the same diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index b62b3081bb..782e12aa24 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -6,13 +6,11 @@ lsrtags = "rhythms, percussion" texidoc = " In the following snippet, two parts have a completely different time -signature, and yet keep synchronized. - -This can be achieved with the \\compressMusic command, as demonstrated -here. - -The barlines can't be printed at the Score level anymore, so you have -to remove the Barline_engraver and put it in the Staff context. +signature, and yet keep synchronized. This can be achieved with the +@code{\\compressMusic} command, as demonstrated here. The barlines +can't be printed at the @code{Score} level anymore, so you have to +remove the @code{Barline_engraver} and put it in the @code{Staff} +context. " } % begin verbatim % Thanks to Adam James Wilson for this snippet diff --git a/input/lsr/putting-parentheses-around-a-single-note.ly b/input/lsr/putting-parentheses-around-a-single-note.ly new file mode 100644 index 0000000000..ec706f9613 --- /dev/null +++ b/input/lsr/putting-parentheses-around-a-single-note.ly @@ -0,0 +1,20 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +Objects may be parenthesized by prefixing @code{\\parenthesize} to the +music event: in other words, the note has to be put after the +@code{\\parenthesize} command. + +This only functions inside chords; to parenthesize a single note it +must be enclosed with @code{ as if it is a chord.} +" } +% begin verbatim +\relative c'' { + a4 + < \parenthesize b > + c d +} diff --git a/input/lsr/putting-parentheses-around-non-note-objects.ly b/input/lsr/putting-parentheses-around-non-note-objects.ly new file mode 100644 index 0000000000..33d8019195 --- /dev/null +++ b/input/lsr/putting-parentheses-around-non-note-objects.ly @@ -0,0 +1,14 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "expressive-marks, editorial-and-educational-use" + texidoc = " +Various objects may be parenthesized as well as notes: in this example, +the articulation mark is printed between parentheses. +" } +% begin verbatim +\relative c' { + < c d g >2-\parenthesize -. d +} diff --git a/input/lsr/repeats.snippet-list b/input/lsr/repeats.snippet-list index 893f00a661..dc08d0bc1a 100644 --- a/input/lsr/repeats.snippet-list +++ b/input/lsr/repeats.snippet-list @@ -1,2 +1,4 @@ positioning-segno-and-coda-with-line-break.ly +adding-volta-brackets-to-additional-staves.ly volta-multi-staff.ly +shortening-volta-brackets.ly diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly index 62cf4a07e8..8fbb70722a 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -12,31 +12,31 @@ Rests may be used in various styles. " } % begin verbatim \layout { - indent = 0.0 - raggedright = ##t + indent = 0.0 + \context { + \Staff + \remove Time_signature_engraver + } } -\context Staff \relative c { - \set Score.timing = ##f - \override Staff.Rest #'style = #'mensural - r\maxima^\markup \typewriter { mensural } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar "" - - \override Staff.Rest #'style = #'neomensural - r\maxima^\markup \typewriter { neomensural } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar "" - - \override Staff.Rest #'style = #'classical - r\maxima^\markup \typewriter { classical } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \bar "" - - \override Staff.Rest #'style = #'default - r\maxima^\markup \typewriter { default } - r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - +\relative c { + \set Score.timing = ##f + \override Staff.Rest #'style = #'mensural + r\maxima^\markup \typewriter { mensural } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'neomensural + r\maxima^\markup \typewriter { neomensural } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'classical + r\maxima^\markup \typewriter { classical } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 + \bar "" + + \override Staff.Rest #'style = #'default + r\maxima^\markup \typewriter { default } + r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 } - - diff --git a/input/lsr/rgb-colors.ly b/input/lsr/rgb-colors.ly new file mode 100644 index 0000000000..3bfad3ae53 --- /dev/null +++ b/input/lsr/rgb-colors.ly @@ -0,0 +1,27 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use" + texidoc = " +In addition to the built-in x11-color system, it is possible to get +exact RGB colors by specifying the amounts of red, green and blue. +" } +% begin verbatim +\relative c''{ + \override Staff.StaffSymbol #'color = #(x11-color 'SlateBlue2) + \set Staff.instrumentName = \markup { + \with-color #(x11-color 'navy) "Clarinet" + } + + %black +% \override Stem #'color = #(rgb-color 0 0 0) + gis8 a + % white +% \override Stem #'color = #(rgb-color 1 1 1) + gis8 a + % dark blue +% \override Stem #'color = #(rgb-color 0 0 0.5) + gis4 a +} diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 6cd245fe0c..9cfdbdf9ed 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -7,17 +7,15 @@ 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 +notated 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). +when sharing lead sheets with guitarists or jazz musicians. The +standard support for this using @code{\\repeat percent} is unsuitable +here since 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 @code{r4} in the definitions with a rest of +the appropriate duration). " } % begin verbatim % Macro to print single slash @@ -28,7 +26,6 @@ rs = { r4 } - % Function to print a specified number of slashes comp = #(define-music-function (parser location count) ( integer?) #{ @@ -41,7 +38,9 @@ comp = #(define-music-function (parser location count) ( integer?) ) \score{ - \relative c'{ - c d e f | \rs \rs \rs \rs | \comp #4 | + \relative c' { + c d e f | + \rs \rs \rs \rs | + \comp #4 | } } diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index 8192c81307..9f01dad3d5 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -7,6 +7,7 @@ skips-in-lyric-mode-2.ly chant-or-psalms-notation.ly controlling-tuplet-bracket-visibility.ly heavily-customized-polymetric-time-signatures.ly +positioning-multi--measure-rests.ly using-ties-with-arpeggios.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly compound-time-signatures.ly @@ -17,6 +18,7 @@ making-an-object-invisible-with-the-transparent-property.ly changing-the-tuplet-number.ly entering-several-tuplets-using-only-one--times-command.ly conducting-signs,-measure-grouping-signs.ly +changing-form-of-multi--measure-rests.ly rhythmic-slashes.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly permitting-line-breaks-within-beamed-tuplets.ly diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly new file mode 100644 index 0000000000..6d705270e4 --- /dev/null +++ b/input/lsr/shortening-volta-brackets.ly @@ -0,0 +1,22 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "repeats" + texidoc = " +By default, the volta brackets will be drawn over all of the +alternative music, but it is possible to shorten them by setting +@code{voltaSpannerDuration}. In the next example, the bracket only +lasts one measure, which is a duration of 3/4. +" } +% begin verbatim +\relative c'' { + \time 3/4 + c c c + \set Score.voltaSpannerDuration = #(ly:make-moment 3 4) + \repeat volta 5 { d d d } + \alternative { { e e e f f f } + { g g g } + } +} diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index 5fc4d1e221..1b1e6f3868 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -7,14 +7,12 @@ texidoc = " Although you can't use @code{s} in @code{\\lyricmode} (it's taken to be a literal \"s\", not a space) you can use either @code{\"\"} or -@code{_}. - -So for example: +@code{_} .So for example: " } % begin verbatim << - \relative c'' { a4 b c d } - \new Lyrics \lyricmode { a4 _2 gap4 } + \relative c'' { a4 b c d } + \new Lyrics \lyricmode { a4 _2 gap4 } >> diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly index 9c5cc3cb80..9cfed3b470 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -5,12 +5,12 @@ \header { lsrtags = "rhythms, vocal-music" texidoc = " -The s syntax is only available in note mode and chord mode. In other -situations, for example, when entering lyrics, you should use the -\\skip command. +The @code{s} syntax for skips is only available in note mode and chord +mode. In other situations, for example, when entering lyrics, you +should use the @code{\\skip} command. " } % begin verbatim << - \relative { a'2 a1 } - \new Lyrics \lyricmode { \skip 2 bla1 } + \relative { a'1 a } + \new Lyrics \lyricmode { \skip 1 bla1 } >> diff --git a/input/lsr/spacing.snippet-list b/input/lsr/spacing.snippet-list index 1762bd4f7b..1162bcea96 100644 --- a/input/lsr/spacing.snippet-list +++ b/input/lsr/spacing.snippet-list @@ -1,6 +1,8 @@ -vertically-aligning-ossias-and-lyrics.ly -adjusting-lyrics-vertical-spacing.ly -alignment-vertical-spacing.ly -page-label.ly vertically-centered-dynamics-and-textscripts.ly proportional-strict-notespacing.ly +vertically-aligning-ossias-and-lyrics.ly +allowing-fingerings-to-be-printed-inside-the-staff.ly +hiding-notes.ly +page-label.ly +alignment-vertical-spacing.ly +adjusting-lyrics-vertical-spacing.ly diff --git a/input/lsr/square-balloons.ly b/input/lsr/square-balloons.ly new file mode 100644 index 0000000000..fe98385d03 --- /dev/null +++ b/input/lsr/square-balloons.ly @@ -0,0 +1,18 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.38" + +\header { + lsrtags = "editorial-and-educational-use, text, contexts-and-engravers" + texidoc = " +Elements of notation can be marked and named with the help of a square +balloon. The primary purpose of this feature is to explain notation. +" } +% begin verbatim +\new Voice \with { \consists "Balloon_engraver" } + \relative c''{ + \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" } + a4 + 2. +} + diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index 72f0b3a74e..5e49716177 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -1,15 +1,15 @@ creating-blank-staves.ly -time-signature-in-parentheses.ly +incipit.ly adding-and-extra-staff-at-a-line-break.ly changing-the-number-of-lines-in-a-staff.ly -incipit.ly -inserting-score-fragments-above-the-staff,-as-markups.ly +time-signature-in-parentheses.ly adding-an-extra-staff.ly changing-the-staff-size.ly -quoting-another-voice-with-transposition.ly +quoting-another-voice.ly adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly -quoting-another-voice.ly volta-multi-staff.ly +inserting-score-fragments-above-the-staff,-as-markups.ly +quoting-another-voice-with-transposition.ly non-traditional-key-signatures.ly nesting-staves.ly diff --git a/input/lsr/strings.snippet-list b/input/lsr/strings.snippet-list index a0795b5bcf..ad0a0dce0a 100644 --- a/input/lsr/strings.snippet-list +++ b/input/lsr/strings.snippet-list @@ -1,3 +1,4 @@ string-quartet-template-simple.ly +how-to-add-thumb-fingerings.ly string-quartet-template-with-separate-parts.ly demo-midiinstruments.ly diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list index 8af6644e5a..59b06c6130 100644 --- a/input/lsr/template.snippet-list +++ b/input/lsr/template.snippet-list @@ -1,17 +1,17 @@ piano-template-with-centered-dynamics.ly single-staff-template-with-notes-and-lyrics.ly single-staff-template-with-only-notes.ly -jazz-combo-template.ly +piano-template-with-centered-lyrics.ly score-for-diatonic-accordion.ly piano-template-simple.ly -ancient-notation-template----modern-transcription-of-mensural-music.ly +string-quartet-template-with-separate-parts.ly ancient-notation-template----modern-transcription-of-gregorian-music.ly -single-staff-template-with-notes-and-chords.ly +ancient-notation-template----modern-transcription-of-mensural-music.ly +piano-template-with-melody-and-lyrics.ly string-quartet-template-simple.ly single-staff-template-with-notes,-lyrics,-and-chords.ly -piano-template-with-melody-and-lyrics.ly -string-quartet-template-with-separate-parts.ly -vocal-ensemble-template.ly +single-staff-template-with-notes-and-chords.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly -piano-template-with-centered-lyrics.ly +jazz-combo-template.ly +vocal-ensemble-template.ly vocal-ensemble-template-with-automatic-piano-reduction.ly diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list index b7e9f28d22..9699027b38 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -1,19 +1,20 @@ combining-dynamics-with-markup-texts.ly creating-text-spanners.ly -creating-real-parenthesized-dynamics.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly markup-lines.ly +square-balloons.ly center-text-below-hairpin-dynamics.ly -ottava-text.ly +piano-template-with-centered-lyrics.ly demonstrating-all-headers.ly -utf-8.ly changing-the-default-text-font-family.ly -combining-two-parts-on-the-same-staff.ly +creating-real-parenthesized-dynamics.ly +how-to-put-ties-between-syllables-in-lyrics.ly aligning-and-centering-instrument-names.ly -vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +utf-8.ly outputting-the-version-number.ly blanking-staff-lines-using-the--whiteout-command.ly formatting-lyrics-syllables.ly -how-to-put-ties-between-syllables-in-lyrics.ly -piano-template-with-centered-lyrics.ly +combining-two-parts-on-the-same-staff.ly +ottava-text.ly adjusting-lyrics-vertical-spacing.ly aligning-lyrics.ly diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index cf8c291fed..eaf6e5ffca 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,26 +1,29 @@ -altering-the-number-of-stems-in-a-beam.ly time-signature-in-parentheses.ly -vertically-centered-dynamics-and-textscripts.ly -proportional-strict-notespacing.ly changing-the-default-text-font-family.ly -transcription-of-ancient-music-with-incipit.ly -alignment-vertical-spacing.ly +drawing-boxes-around-grobs.ly manually-controlling-beam-positions.ly custodes.ly -drawing-boxes-around-grobs.ly move-specific-text.ly -drawing-circles-around-various-objects.ly -making-an-object-invisible-with-the-transparent-property.ly rest-styles.ly -creating-text-spanners.ly using-the--tweak-command-to-tweak-individual-grobs.ly controlling-tuplet-bracket-visibility.ly -caesura-railtracks-with-fermata.ly -rhythmic-slashes.ly -changing-the-staff-size.ly -changing-a-single-notes-size-in-a-chord.ly +positioning-multi--measure-rests.ly coloring-objects.ly +changing-the-staff-size.ly clefs-commonly-tweaked-properties.ly vertically-aligning-ossias-and-lyrics.ly +changing-the-size-of-layout-objects.ly changing-properties-for-individual-grobs.ly +altering-the-number-of-stems-in-a-beam.ly +vertically-centered-dynamics-and-textscripts.ly +proportional-strict-notespacing.ly +making-an-object-invisible-with-the-transparent-property.ly +transcription-of-ancient-music-with-incipit.ly +alignment-vertical-spacing.ly +drawing-circles-around-various-objects.ly +creating-text-spanners.ly +caesura-railtracks-with-fermata.ly +changing-form-of-multi--measure-rests.ly +rhythmic-slashes.ly +changing-a-single-notes-size-in-a-chord.ly nesting-staves.ly diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index 398c1df27a..b581d4eae0 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -1,17 +1,17 @@ chant-or-psalms-notation.ly single-staff-template-with-notes-and-lyrics.ly skips-in-lyric-mode-2.ly -skips-in-lyric-mode.ly -aligning-lyrics.ly +ambiti-multiple-voices.ly +vocal-ensemble-template-with-automatic-piano-reduction.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly how-to-put-ties-between-syllables-in-lyrics.ly adding-ambiti-per-voice.ly -vertically-aligning-ossias-and-lyrics.ly +piano-template-with-melody-and-lyrics.ly single-staff-template-with-notes,-lyrics,-and-chords.ly -vocal-ensemble-template-with-automatic-piano-reduction.ly +demo-midiinstruments.ly formatting-lyrics-syllables.ly -piano-template-with-melody-and-lyrics.ly -ambiti-multiple-voices.ly +vertically-aligning-ossias-and-lyrics.ly +aligning-lyrics.ly vocal-ensemble-template.ly adjusting-lyrics-vertical-spacing.ly -demo-midiinstruments.ly +skips-in-lyric-mode.ly -- 2.39.5