From 352ff7859afe4aac78d964be469b9b3ce9f5d851 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 26 Mar 2008 02:01:03 -0700 Subject: [PATCH] LSR: update. --- ...ing-volta-brackets-to-additional-staves.ly | 10 +- input/lsr/ambiti-multiple-voices.ly | 12 +- input/lsr/ancient-notation.snippet-list | 1 + input/lsr/caesura-railtracks-with-fermata.ly | 25 +- .../lsr/center-text-below-hairpin-dynamics.ly | 13 +- input/lsr/changing--flageolet-mark-size.ly | 10 +- ...f-a-slur-from-solid-to-dotted-or-dashed.ly | 4 +- .../combining-dynamics-with-markup-texts.ly | 14 +- input/lsr/contemporary-glissando.ly | 18 +- input/lsr/contexts-and-engravers.snippet-list | 3 +- input/lsr/creating-text-spanners.ly | 63 +++-- ...bracket-with-only-one-staff-in-a-system.ly | 45 ++++ ...editorial-and-educational-use.snippet-list | 2 + ...e-fragments-above-the-staff,-as-markups.ly | 34 ++- ...ome-staff-lines-thicker-than-the-others.ly | 20 ++ ...che-layout-bar-lines-between-the-staves.ly | 23 ++ input/lsr/modifying-tuplet-bracket-length.ly | 30 +-- ...tting-line-breaks-within-beamed-tuplets.ly | 30 +-- ...ng-music-with-different-time-signatures.ly | 236 +++++++++--------- input/lsr/skips-in-lyric-mode-2.ly | 8 +- input/lsr/staff-notation.snippet-list | 5 +- input/lsr/three-sided-box.ly | 6 +- input/lsr/tweaks-and-overrides.snippet-list | 28 ++- 23 files changed, 357 insertions(+), 283 deletions(-) create mode 100644 input/lsr/display-bracket-with-only-one-staff-in-a-system.ly create mode 100644 input/lsr/making-some-staff-lines-thicker-than-the-others.ly create mode 100644 input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly index b4567d84cf..4e8915f53c 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -5,11 +5,11 @@ \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. +The @code{Volta_engraver} by default resides in the @code{Score} +context, and brackets for the repeat are thus normally only printed +over the topmost staff. This can be adjusted by adding the +@code{Volta_engraver} to the @code{Staff} context where you want the +brackets to appear; see also the \"Volta multi staff\" snippet. " } % begin verbatim << diff --git a/input/lsr/ambiti-multiple-voices.ly b/input/lsr/ambiti-multiple-voices.ly index 9ee2b3a5d5..6864d8d19b 100644 --- a/input/lsr/ambiti-multiple-voices.ly +++ b/input/lsr/ambiti-multiple-voices.ly @@ -16,12 +16,12 @@ ambitus per staff rather than per voice, add the } << \new Voice \relative c'' { - \voiceOne - c4 a d e f1 - } + \voiceOne + c4 a d e f1 + } \new Voice \relative c' { - \voiceTwo - es4 f g as b1 - } + \voiceTwo + es4 f g as b1 + } >> diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list index 88c40ece44..9da2dde0b7 100644 --- a/input/lsr/ancient-notation.snippet-list +++ b/input/lsr/ancient-notation.snippet-list @@ -5,5 +5,6 @@ ancient-notation-template----modern-transcription-of-mensural-music.ly ancient-fonts.ly ancient-time-signatures.ly custodes.ly +mensurstriche-layout-bar-lines-between-the-staves.ly ancient-notation-template----modern-transcription-of-gregorian-music.ly rest-styles.ly diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index 08ee89a285..9a7fbf1ac9 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -12,19 +12,16 @@ and a fermata. " } % begin verbatim { - \context Voice { - c''2. - % use some scheme code to construct the symbol - \override BreathingSign #'text = #(markup #:line - (#:musicglyph "scripts.caesura.curved" - #:translate (cons -1.75 1.6) - #:musicglyph "scripts.ufermata" - )) - \breathe c''4 - % set the breathe mark back to normal - \revert BreathingSign #'text - c''2. \breathe c''4 - \bar "|." + c''2. + % construct the symbol + \override BreathingSign #'text = \markup { + \line { + \musicglyph #"scripts.caesura.curved" \translate #'(-1.75 . 1.6) \musicglyph #"scripts.ufermata" + } } + \breathe c''4 + % set the breathe mark back to normal + \revert BreathingSign #'text + c''2. \breathe c''4 + \bar "|." } - diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index e427bfcfa9..2139970e70 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -5,11 +5,10 @@ \header { lsrtags = "expressive-marks, text" texidoc = " -This example provides a function to typeset hairpin (de)crescendo with -some additional text below it, such as \"molto\" or \"poco\". - -The example also illustrates how to use modify the way an object -normally is printed, using some Scheme code. +This example provides a function to typeset a hairpin (de)crescendo +with some additional text below it, such as \"molto\" or \"poco\".The +example also illustrates how to modify the way an object is normally +printed, using some Scheme code. " } % begin verbatim hairpinWithCenteredText = #(define-music-function @@ -27,8 +26,8 @@ hairpinWithCenteredText = #(define-music-function #}) -hairpinMolto = \hairpinWithCenteredText \markup {\italic "molto"} -hairpinMore = \hairpinWithCenteredText \markup {\bigger "moltissimo"} +hairpinMolto = \hairpinWithCenteredText \markup { \italic "molto" } +hairpinMore = \hairpinWithCenteredText \markup { \bigger "moltissimo" } \new Staff { \hairpinMolto c'2\< c'2\f diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index 22724d65b1..5bc4e29fa5 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -5,17 +5,17 @@ \header { lsrtags = "expressive-marks" texidoc = " -To make the \\flageolet circle smaller you can use the following scheme -code (found in the Lilypond-user-archive) +To make the @code{\\flageolet} circle smaller you can use the following +Scheme code. " } % begin verbatim -F = #(let ((m (make-music 'ArticulationEvent +smallFlageolet = #(let ((m (make-music 'ArticulationEvent 'articulation-type "flageolet"))) (set! (ly:music-property m 'tweaks) (acons 'font-size -3 (ly:music-property m 'tweaks))) m) -\relative c'' { d4^\flageolet_\markup {"orginal \flageolet "} d4_\flageolet - c4^\F_\markup {smaller } c4_\F +\relative c'' { d4^\flageolet_\markup { default size } d4_\flageolet + c4^\smallFlageolet_\markup { smaller } c4_\smallFlageolet } 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 b737fc83a2..5ba1747bd4 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 @@ -3,14 +3,14 @@ \version "2.11.38" \header { - lsrtags = "expressive-marks" + lsrtags = "expressive-marks, editorial-and-educational-use" texidoc = " The appearance of slurs may be changed from solid to dotted or dashed. " } % begin verbatim -\relative c'{ +\relative c' { c( d e c) | \slurDotted c( d e c) | diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index 52c146f7c4..ed927bf6bd 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -6,18 +6,16 @@ lsrtags = "expressive-marks, text" texidoc = " Some dynamics may involve text indications (such as \"più forte\", -\"piano subito\", etc.). They can be produced using a \\markup bloc. +\"piano subito\", etc.). They can be produced using a @code{\\markup} +block. " } % begin verbatim -\layout{ragged-right = ##t} +\layout { ragged-right = ##t } -piuf = \markup { \italic "molto" \dynamic "f" } +piuf = \markup { \italic "più" \dynamic "f" } -\relative c''{ +\relative c'' { + c2 c-\piuf - c - c2\< c2\! - - c2\< c2\! } diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly index 6783d4a8b2..1821f37809 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -5,19 +5,17 @@ \header { lsrtags = "expressive-marks" texidoc = " -Use a glissando without final note. Contemporary glissando ! +Use a glissando without final note. Contemporary glissando! " } % begin verbatim \relative c'' { - \override Glissando #'style = #'zigzag - \time 3/4 - c4 c - \cadenzaOn c\glissando \hideNotes c,, \unHideNotes \cadenzaOff - \bar "|" - } + \time 3/4 + \override Glissando #'style = #'zigzag + c4 c + \cadenzaOn c\glissando \hideNotes c,, \unHideNotes \cadenzaOff + \bar "|" +} \addlyrics { Use cadenzaOn glissando hideNotes } -\addlyrics { unHideNotes cadenzaOff, skip_and_\bar \skip 4 } -\layout{raggedright = ##t} -\header { tagline="" } +\addlyrics { unHideNotes cadenzaOff, skip_and_\bar \skip 4 } diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list index 0205e5c88f..0e9125fcdd 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -2,8 +2,9 @@ creating-blank-staves.ly chant-or-psalms-notation.ly adding-and-extra-staff-at-a-line-break.ly adding-an-extra-staff.ly -vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +mensurstriche-layout-bar-lines-between-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 +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly nesting-staves.ly diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 34b4f2eb78..da93b64dc3 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -5,41 +5,38 @@ \header { lsrtags = "expressive-marks, text, tweaks-and-overrides" texidoc = " -The \\startTextSpan and \\stopTextSpan -commands give you the ability to create text spanners as easily as -pedals indications or octavations. Override some properties of the -TextSpanner object to modify its output. +The @code{\\startTextSpan} and @code{\\stopTextSpan} commands give you +the ability to create text spanners as easily as pedal indications or +octavations. Override some properties of the @code{TextSpanner} object +to modify its output. " } % begin verbatim -\relative c''{ - \override TextSpanner #'edge-text = #'("bla" . "blu") - a \startTextSpan - b c - a \stopTextSpan - - \override TextSpanner #'dash-period = #2 - \override TextSpanner #'dash-fraction = #0.0 - a \startTextSpan - b c - a \stopTextSpan - - \revert TextSpanner #'style - \override TextSpanner #'style = #'dashed-line \override TextSpanner #'bound-details #'left #'text = \markup { \draw-line #'(0 . 1) } +\relative c'' { + \override TextSpanner #'edge-text = #'("bla" . "blu") + a \startTextSpan + b c + a \stopTextSpan + + \override TextSpanner #'dash-period = #2 + \override TextSpanner #'dash-fraction = #0.0 + a \startTextSpan + b c + a \stopTextSpan + + \revert TextSpanner #'style + \override TextSpanner #'style = #'dashed-line \override TextSpanner #'bound-details #'left #'text = \markup { \draw-line #'(0 . 1) } \override TextSpanner #'bound-details #'right #'text = \markup { \draw-line #'(0 . -2) } - a \startTextSpan - b c - a \stopTextSpan - - - \set Staff.middleCPosition = #-13 - - \override TextSpanner #'dash-period = #10 - \override TextSpanner #'dash-fraction = #.5 - \override TextSpanner #'thickness = #10 - a \startTextSpan - b c - a \stopTextSpan - \set Staff.middleCPosition = #-6 + a \startTextSpan + b c + a \stopTextSpan + + \set Staff.middleCPosition = #-13 + \override TextSpanner #'dash-period = #10 + \override TextSpanner #'dash-fraction = #0.5 + \override TextSpanner #'thickness = #10 + a \startTextSpan + b c + a \stopTextSpan + \set Staff.middleCPosition = #-6 } - diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly new file mode 100644 index 0000000000..ebb58b3490 --- /dev/null +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -0,0 +1,45 @@ +%% 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 = "staff-notation, tweaks-and-overrides" + texidoc = " +If there is only one staff in one of the staff types ChoirStaff, +InnerChoirStaff, InnerStaffGroup and StaffGroup, the bracket won't be +displayed as standard behaviour. This can be changed with: + + +@code{\\override [staffcontext].SystemStartBracket #'collapse-height = +#1} + + +This applies to all staff contexts with +@code{systemStartDelimiter}-property set to @code{'SystemStartBracket}. + + +For staff contexts with @code{'SystemStartBrace}, such as +@code{PianoStaff}, this tweaking can be used as well. +" } +% begin verbatim +\score { + \new StaffGroup << + % Must be one lower than your actual amount off staff lines + \override StaffGroup.SystemStartBracket #'collapse-height = #4 + \new Staff { + c'4 d' e' f' + } + >> + } + { + \new PianoStaff << + \override PianoStaff.SystemStartBrace #'collapse-height = #4 + \new Staff { + c'4 d' e' f' + } + >> + } + \layout { + ragged-right = ##t + indent = 0\cm + } diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list index b276b55f72..3600f47a4b 100644 --- a/input/lsr/editorial-and-educational-use.snippet-list +++ b/input/lsr/editorial-and-educational-use.snippet-list @@ -1,4 +1,6 @@ creating-blank-staves.ly +making-some-staff-lines-thicker-than-the-others.ly +changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly default-direction-of-stems-on-the-center-line-of-the-staff.ly changing-a-single-notes-size-in-a-chord.ly grid-lines-emphasizing-rhythms-and-notes-synchronization.ly 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 260ee09d67..dd315c926b 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 @@ -5,32 +5,30 @@ \header { lsrtags = "staff-notation" texidoc = " -The \\markup command is quite versatile. In this snippet, it contains a -\\score bloc instead of texts or marks. +The @code{\\markup} command is quite versatile. In this snippet, it +contains a @code{\\score} block instead of texts or marks. " } % begin verbatim tuning = \markup { - \score { - \new Staff \with { - \remove Time_signature_engraver - } { - \clef bass 1 - } - \layout { ragged-right = ##t } + \score { + \new Staff \with { \remove Time_signature_engraver } + { + \clef bass 1 } + \layout { ragged-right = ##t } + } } - \header { - title = "Solo Cello Suites" - subtitle = "Suite IV" - subsubtitle = \markup { "Originalstimmung:" \tuning } + title = "Solo Cello Suites" + subtitle = "Suite IV" + subsubtitle = \markup { "Originalstimmung:" \general-align #Y #CENTER \tuning } } \relative { - \time 4/8 - \times 2/3 { c'8 d e } \times 2/3 {c d e} - \times 2/3 { c8 d e } \times 2/3 {c d e} - g8 a8 g8 a - g8 a8 g8 a + \time 4/8 + \times 2/3 { c'8 d e } \times 2/3 { c d e } + \times 2/3 { c8 d e } \times 2/3 { c d e } + g8 a8 g8 a + g8 a8 g8 a } diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly new file mode 100644 index 0000000000..26b89af142 --- /dev/null +++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.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 = "staff-notation, editorial-and-educational-use" + texidoc = " +For pedagogical purposes, you may want to make one staff line thicker +(e.g. the middle line, to emphasize the line of the G clef). This can +be achieved by adding extra lines very close to the line you want to +make thicker, using the #'line-positions property in the StaffSymbol +context. +" } +% begin verbatim +\score { + \new Staff{ + \override Staff.StaffSymbol #'line-positions =#'(-4 -2 -0.2 0 0.2 2 4 ) + d'4 e' f' g' + } +} diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly new file mode 100644 index 0000000000..70a055cf84 --- /dev/null +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -0,0 +1,23 @@ +%% 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 = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides" + texidoc = " +The mensurstriche-layout where the bar lines do not show on the staves +but between staves can be achieved with a @code{StaffGroup} instead of +a @code{ChoirStaff}. The bar line on staves is blanked out with an +@code{\\override} command. +" } +% begin verbatim +global = {\override Staff.BarLine #'transparent = ##t + s1 s + %the final bar line is not interupted + \once \override Staff.BarLine #'transparent = ##f + \bar "|."} +\new StaffGroup +\relative c'' << + \new Staff {<< \global { c1 c } >>} + \new Staff {<< \global { c c } >>} +>> diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly index b43cfc9ee3..1c96371b25 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -16,22 +16,16 @@ modify what material they cover. " } % begin verbatim \new RhythmicStaff { - - % Set tuplets to be extendable .. - - \set tupletFullLength = ##t - - % .. to cover all items up to the next note - - \set tupletFullLengthNote = ##t - \time 2/4 - \times 2/3 { c4 c c } - - % .. or to cover just whitespace - - \set tupletFullLengthNote = ##f - \time 4/4 - \times 4/5 { c4 c1 } - \time 3/4 - c4 + % Set tuplets to be extendable... + \set tupletFullLength = ##t + % ...to cover all items up to the next note + \set tupletFullLengthNote = ##t + \time 2/4 + \times 2/3 { c4 c c } + % ...or to cover just whitespace + \set tupletFullLengthNote = ##f + \time 4/4 + \times 4/5 { c4 c1 } + \time 3/4 + c4 } diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index 6ca79966d4..0a003cad0b 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -10,20 +10,20 @@ may be permitted to within a beamed tuplet. Note that such off-beat tuplets have to be beamed manually. " } % begin verbatim -\relative c'' { - a8 - \repeat unfold 8 {\times 2/3 { c[ b a]}} - % Insert a manual line break within a tuplet - \times 2/3 { c[ b \bar "" \break a]} - \repeat unfold 2 {\times 2/3 { c[ b a]}} - c8 -} \layout { - \context { - \Voice - % Permit line breaks within tuplets - \remove "Forbid_line_break_engraver" - % Allow beams to be broken at line breaks - \override Beam #'breakable = ##t - } + \context { + \Voice + % Permit line breaks within tuplets + \remove "Forbid_line_break_engraver" + % Allow beams to be broken at line breaks + \override Beam #'breakable = ##t + } +} +\relative c'' { + a8 + \repeat unfold 8 { \times 2/3 { c[ b a] } } + % Insert a manual line break within a tuplet + \times 2/3 { c[ b \bar "" \break a] } + \repeat unfold 2 { \times 2/3 { c[ b a] } } + c8 } diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 782e12aa24..65c2741883 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -6,134 +6,132 @@ 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 -@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. +signature, yet remain synchronized. 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 \paper { - indent = #0 - ragged-right = ##t + indent = #0 + ragged-right = ##t } -global = { \time 3/4 { s2. * 3 } \bar "" \break { s2. * 3 }} +global = { \time 3/4 { s2.*3 } \bar "" \break { s2.*3 } } \layout { - \context { \Score - \remove "Timing_translator" - \remove "Time_signature_engraver" - \remove "Default_bar_line_engraver" - \override SpacingSpanner #'uniform-stretching = ##t - \override SpacingSpanner #'strict-note-spacing = ##t - proportionalNotationDuration = #(ly:make-moment 1 64) - } - \context { \Staff - \consists "Timing_translator" - \consists "Default_bar_line_engraver" - \consists "Time_signature_engraver" - } - \context { \Voice - \remove Forbid_line_break_engraver - tupletFullLength = ##t - } + \context { + \Score + \remove "Timing_translator" + \remove "Time_signature_engraver" + \remove "Default_bar_line_engraver" + \override SpacingSpanner #'uniform-stretching = ##t + \override SpacingSpanner #'strict-note-spacing = ##t + proportionalNotationDuration = #(ly:make-moment 1 64) + } + \context { + \Staff + \consists "Timing_translator" + \consists "Default_bar_line_engraver" + \consists "Time_signature_engraver" + } + \context { + \Voice + \remove "Forbid_line_break_engraver" + tupletFullLength = ##t + } } - -Bassklarinette = \new Staff << - \global - { - \bar "|" - \clef treble - \time 3/8 - d''4. - - \bar "|" - \time 3/4 - r8 des''2( c''8) - - \bar "|" - \time 7/8 - r4. ees''2 ~ - - \bar "|" - \time 2/4 - \tupletUp - \times 2/3 {ees''4 r4 d''4 ~} - - \bar "|" - \time 3/8 - \tupletUp - \times 3/4 {d''4 r4} - - \bar "|" - \time 2/4 - e''2 - - \bar "|" - \time 3/8 - es''4. -\bar "|" -\time 3/4 -r8 d''2 r8 -\bar "|" - } - >> -Perkussion = \new StaffGroup << - \new Staff << - \global - { - \bar "|" - \clef percussion - \time 3/4 - r4 c'2 ~ - - \bar "|" - c'2. - - \bar "|" - R2. - - \bar "|" - r2 g'4 ~ - - \bar "|" - g'2. ~ - - \bar "|" - g'2. - } - >> - \new Staff << - \global - { - \bar "|" - \clef percussion - \time 3/4 - R2. - - \bar "|" - g'2. ~ - - \bar "|" - g'2. - - \bar "|" - r4 g'2 ~ - - \bar "|" - g'2 r4 - - \bar "|" - g'2. - } - >> - >> - -\score { << \Bassklarinette \Perkussion >> - +Bassklarinette = \new Staff << + \global { + \bar "|" + \clef treble + \time 3/8 + d''4. + + \bar "|" + \time 3/4 + r8 des''2( c''8) + + \bar "|" + \time 7/8 + r4. ees''2 ~ + + \bar "|" + \time 2/4 + \tupletUp + \times 2/3 { ees''4 r4 d''4 ~ } + + \bar "|" + \time 3/8 + \tupletUp + \times 3/4 { d''4 r4 } + + \bar "|" + \time 2/4 + e''2 + + \bar "|" + \time 3/8 + es''4. + + \bar "|" + \time 3/4 + r8 d''2 r8 + \bar "|" + } +>> + +Perkussion = \new StaffGroup << + \new Staff << + \global { + \bar "|" + \clef percussion + \time 3/4 + r4 c'2 ~ + + \bar "|" + c'2. + + \bar "|" + R2. + + \bar "|" + r2 g'4 ~ + + \bar "|" + g'2. ~ + + \bar "|" + g'2. + } + >> + \new Staff << + \global { + \bar "|" + \clef percussion + \time 3/4 + R2. + + \bar "|" + g'2. ~ + + \bar "|" + g'2. + + \bar "|" + r4 g'2 ~ + + \bar "|" + g'2 r4 + + \bar "|" + g'2. + } + >> +>> + +\score { + << \Bassklarinette \Perkussion >> } - diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index 1b1e6f3868..b888a0952d 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -7,12 +7,10 @@ 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 } + \new Lyrics \lyricmode { a4 "" _ gap } >> - - diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index 72f0b3a74e..eceb129d3b 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -1,8 +1,10 @@ creating-blank-staves.ly time-signature-in-parentheses.ly +mensurstriche-layout-bar-lines-between-the-staves.ly adding-and-extra-staff-at-a-line-break.ly changing-the-number-of-lines-in-a-staff.ly incipit.ly +display-bracket-with-only-one-staff-in-a-system.ly inserting-score-fragments-above-the-staff,-as-markups.ly adding-an-extra-staff.ly changing-the-staff-size.ly @@ -11,5 +13,6 @@ adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly quoting-another-voice.ly volta-multi-staff.ly -non-traditional-key-signatures.ly nesting-staves.ly +non-traditional-key-signatures.ly +making-some-staff-lines-thicker-than-the-others.ly diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 102c02b0fd..19f72681ae 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -42,7 +42,7 @@ thickness and padding around the markup." % Test it: -\relative c'{ - c2^\markup{ \NWS-box ABCD } - c^\markup{\NWS-box \note #"4" #1.0 } +\relative c' { + c2^\markup { \NWS-box ABCD } + c^\markup { \NWS-box \note #"4" #1.0 } } diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index d0dca8d4dd..3598567b3e 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,27 +1,29 @@ -altering-the-number-of-stems-in-a-beam.ly +display-bracket-with-only-one-staff-in-a-system.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 positioning-multi--measure-rests.ly -caesura-railtracks-with-fermata.ly -changing-form-of-multi--measure-rests.ly -rhythmic-slashes.ly changing-the-staff-size.ly -changing-a-single-notes-size-in-a-chord.ly clefs-commonly-tweaked-properties.ly vertically-aligning-ossias-and-lyrics.ly changing-properties-for-individual-grobs.ly +altering-the-number-of-stems-in-a-beam.ly +mensurstriche-layout-bar-lines-between-the-staves.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 -- 2.39.2