From e34672b1842ce9e87edeeee53e497d2218cc1fe9 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Fri, 19 Sep 2008 19:34:31 +0100 Subject: [PATCH] LSR: Update. --- ...aligning-and-centering-instrument-names.ly | 97 +++++++++---------- ...ing-marks-with-various-notation-objects.ly | 35 +++---- input/lsr/changing-stanza-fonts.ly | 31 ++++++ input/lsr/chant-or-psalms-notation.ly | 2 +- input/lsr/chords.snippet-list | 1 + input/lsr/displaying-complex-chords.ly | 30 ++++++ input/lsr/fine-tuning-pedal-brackets.ly | 28 +++--- input/lsr/paper-and-layout.snippet-list | 6 +- input/lsr/rhythms.snippet-list | 5 +- input/lsr/simultaneous-notes.snippet-list | 5 +- input/lsr/staff-notation.snippet-list | 1 + input/lsr/stemlets.ly | 40 ++++++++ input/lsr/tick-bar-lines.ly | 43 ++++++++ input/lsr/vocal-music.snippet-list | 1 + 14 files changed, 234 insertions(+), 91 deletions(-) create mode 100644 input/lsr/changing-stanza-fonts.ly create mode 100644 input/lsr/displaying-complex-chords.ly create mode 100644 input/lsr/stemlets.ly create mode 100644 input/lsr/tick-bar-lines.ly diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index 7db41e52f5..cc150346d8 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,10 +1,8 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.57" +\version "2.11.59" \header { - lsrtags = "text, paper-and-layout, titles" - texidoces = " Los nombres de instrumento se imprimen generalmente a la izquierda de los pentagramas. Para alinear los nombres de varios instrumentos @@ -29,52 +27,53 @@ de las siguientes posiblidades: " doctitlees = "Alinear y centrar los nombres de instrumento" - texidoc = " -Instrument names are generally printed to the left of the staves. To -align the names of several different intruments, put them in a -@code{\\markup} block and use one of the following possibilites: - -* - Right-aligned instrument names: this is the default behavior - -* - Center-aligned instrument names: using the @code{\\hcenter-in #n} -command - places the instrument names inside a padded box, with @code{n} being -the width - of the box - -* - Left-aligned instrument names: the names are printed on top of an - empty box, using the @code{\\combine} command - with an @code{\\hspace #n} object. - - - -" + lsrtags = "text, paper-and-layout, titles" + texidoc = "The horizontal alignment of instrument names is tweaked +by changing the @code{Staff.InstrumentName #'self-alignment-X} property. +The @code{\\layout} variables @code{indent} and @code{short-indent} +define the space in which the instrument names are aligned before the +first and the following systems, respectively." doctitle = "Aligning and centering instrument names" } % begin verbatim -\paper { - indent = #0 - left-margin = #30 - line-width = #160 -} -\new StaffGroup \relative c' << - \new Staff { - \set Staff.instrumentName = #"Piccolo" - c1^"default" | c \break - \set Staff.instrumentName = \markup { \hcenter-in #10 Piccolo } - c1^"centered" | c \break - \set Staff.instrumentName = \markup { \combine \hspace #8 Piccolo } - c1^"left-aligned" | c - } - \new Staff { - \set Staff.instrumentName = #"Flute" - c1 | c \break - \set Staff.instrumentName = \markup { \hcenter-in #10 Flute } - c1 | c \break - \set Staff.instrumentName = \markup { \combine \hspace #8 Flute } - c1 | c +\paper { left-margin = 3\cm } +\score { + \new StaffGroup << + \new Staff { + \override Staff.InstrumentName #'self-alignment-X = #LEFT + \set Staff . instrumentName = \markup \left-column { + "Left aligned" + "instrument name" + } + \set Staff.shortInstrumentName = #"Left" + c''1 + \break + c''1 + } + \new Staff { + \override Staff.InstrumentName #'self-alignment-X = #CENTER + \set Staff.instrumentName = \markup \center-column { + "Centered" + "instrument name" + } + \set Staff.shortInstrumentName = #"Centered" + g'1 + g'1 + } + \new Staff { + \override Staff.InstrumentName #'self-alignment-X = #RIGHT + \set Staff.instrumentName = \markup \right-column { + "Right aligned" + "instrument name" + } + \set Staff.shortInstrumentName = #"Right" + e'1 + e'1 + } + >> + \layout { + ragged-right = ##t + indent = 4\cm + short-indent = 2\cm } ->> +} diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly index 6b79863544..7fd019f805 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -1,10 +1,8 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.57" +\version "2.11.59" \header { - lsrtags = "text" - texidoces = " Si están especificadas, las marcas de texto se pueden alinear con objetos de notación distintos a las líneas divisorias. Entre estos @@ -20,25 +18,20 @@ debe hacer este ajuste para todos los pentagramas). " doctitlees = "Alinear marcas con varios objetos de notación" - texidoc = " -If specified, text marks may be aligned with notation objects other -than bar lines. These objects include @code{ambitus}, + lsrtags = "text" + texidoc = "If specified, text marks may be aligned with notation +objects other than bar lines. These objects include @code{ambitus}, @code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar}, @code{left-edge}, @code{key-cancellation}, @code{key-signature}, and @code{time-signature}. - - In such cases, text marks will be horizontally centered above the -object. However this can be changed, as demonstrated on the second line -of this example (in a score with multiple staves, this setting should -be done for all the staves). - - - -" +object. However this can be changed, as demonstrated on the second +line of this example (in a score with multiple staves, this setting +should be done for all the staves)." doctitle = "Aligning marks with various notation objects" } % begin verbatim + \relative c' { e1 @@ -47,7 +40,7 @@ be done for all the staves). \key a \major \clef treble \mark "↓" - e + e1 % the RehearsalMark will be centered above the TimeSignature \override Score.RehearsalMark #'break-align-symbols = #'(time-signature) @@ -66,22 +59,22 @@ be done for all the staves). e1 \break - e + e1 % the RehearsalMark will be aligned with the left edge of the KeySignature \once \override Score.KeySignature #'break-align-anchor-alignment = #LEFT \mark "↓" \key a \major - e + e1 % the RehearsalMark will be aligned with the right edge of the KeySignature \once \override Score.KeySignature #'break-align-anchor-alignment = #RIGHT \key a \major \mark "↓" - e + e1 % the RehearsalMark will be aligned with the left edge of the KeySignature - % and then shifted right by 1 unit. + % and then shifted right by one unit. \once \override Score.KeySignature #'break-align-anchor = #1 \key a \major \mark "↓" diff --git a/input/lsr/changing-stanza-fonts.ly b/input/lsr/changing-stanza-fonts.ly new file mode 100644 index 0000000000..b3a8947c38 --- /dev/null +++ b/input/lsr/changing-stanza-fonts.ly @@ -0,0 +1,31 @@ +%% 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.57" + +\header { + lsrtags = "vocal-music" + + texidoc = " +Fonts can be changed independently for each stanza, including the font +used for printing the stanza number. + +" + doctitle = "Changing stanza fonts" +} % begin verbatim + +\new Voice { + \time 3/4 + g2 e4 + a2 f4 + g2. +} +\addlyrics { + \set stanza = #"1. " + Hi, my name is Bert. +} +\addlyrics { + \override StanzaNumber #'font-name = #"DejaVu" + \set stanza = #"2. " + \override LyricText #'font-family = #'typewriter + Oh, ché -- ri, je t'aime +} diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index fd64ab9233..9dc4399906 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -26,7 +26,7 @@ stemOff = { \override Staff.Stem #'transparent = ##t } \new Staff \with { \remove "Time_signature_engraver" } { \key g \minor - \set Score.timing = ##f + \cadenzaOn \stemOff a'\breve bes'4 g'4 \stemOn a'2 \bar "||" \stemOff a'\breve g'4 a'4 diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index 7bb5cb7ca8..18025abeb4 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -9,6 +9,7 @@ chord-name-exceptions.ly controlling-the-placement-of-chord-fingerings.ly changing-the-chord-names-to-german-or-semi-german-notation.ly single-staff-template-with-notes,-lyrics,-and-chords.ly +displaying-complex-chords.ly single-staff-template-with-notes-and-chords.ly manually-break-figured-bass-extenders-for-only-some-numbers.ly adding-bar-lines-to-chordnames-context.ly diff --git a/input/lsr/displaying-complex-chords.ly b/input/lsr/displaying-complex-chords.ly new file mode 100644 index 0000000000..7490cca3d9 --- /dev/null +++ b/input/lsr/displaying-complex-chords.ly @@ -0,0 +1,30 @@ +%% 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.57" + +\header { + lsrtags = "simultaneous-notes, chords" + + texidoc = " +Here is a way to display a chord where the same note is played twice +with different accidentals. + +" + doctitle = "Displaying complex chords" +} % begin verbatim + +fixA = { + \once \override Stem #'length = #9 + \once \override Accidental #'extra-offset = #'(0.3 . 0) +} +fixB = { + \once \override NoteHead #'extra-offset = #'(1.7 . 0) + \once \override Stem #'rotation = #'(45 0 0) + \once \override Stem #'extra-offset = #'(-0.2 . -0.2) + \once \override Stem #'flag-style = #'no-flag + \once \override Accidental #'extra-offset = #'(3.1 . 0) +} + +\relative c' { + << { \fixA 8 } \\ { \voiceThree \fixB dis } >> s +} diff --git a/input/lsr/fine-tuning-pedal-brackets.ly b/input/lsr/fine-tuning-pedal-brackets.ly index 9fe1d8204a..54aceb27d1 100644 --- a/input/lsr/fine-tuning-pedal-brackets.ly +++ b/input/lsr/fine-tuning-pedal-brackets.ly @@ -1,21 +1,23 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.57" +\version "2.11.59" \header { lsrtags = "keyboards, tweaks-and-overrides" - - texidoc = " -For fine-tuning the appearance of a pedal bracket, the properties -@code{edge-width}, @code{edge-height}, and @code{shorten-pair} of -@code{PianoPedalBracket} objects can be modified. For example, the -bracket may be extended to the right edge of the note head: - -" + texidoc = "The appearance of pedal brackets may be altered in +different ways, using the relevant properties as shown in the +following example." doctitle = "Fine-tuning pedal brackets" } % begin verbatim + +\paper { ragged-right = ##f } \relative c'' { - \override Staff.PianoPedalBracket #'shorten-pair = #'(0 . -1.0) - c4\sostenutoOn d e c, - f4 g a2\sostenutoOff + c2\sostenutoOn c + c2\sostenutoOff c + \once \override Staff.PianoPedalBracket #'shorten-pair = #'(-7 . -2) + c2\sostenutoOn c + c2\sostenutoOff c + \once \override Staff.PianoPedalBracket #'edge-height = #'(0 . 3) + c2\sostenutoOn c + c2\sostenutoOff c } diff --git a/input/lsr/paper-and-layout.snippet-list b/input/lsr/paper-and-layout.snippet-list index 8ebd42941e..a4b5326451 100644 --- a/input/lsr/paper-and-layout.snippet-list +++ b/input/lsr/paper-and-layout.snippet-list @@ -1,7 +1,7 @@ creating-blank-staves.ly -aligning-and-centering-instrument-names.ly -alignment-vertical-spacing.ly demonstrating-all-headers.ly changing-the-staff-size.ly -table-of-contents.ly clip-systems.ly +aligning-and-centering-instrument-names.ly +alignment-vertical-spacing.ly +table-of-contents.ly diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index 3280f1f75f..cc06084166 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -1,4 +1,5 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +printing-music-with-different-time-signatures.ly beams-across-line-breaks.ly manually-controlling-beam-positions.ly multi--measure-rest-markup.ly @@ -27,6 +28,6 @@ rhythmic-slashes.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly three-sided-box.ly merging-multi-measure-rests-in-a-polyphonic-part.ly -printing-music-with-different-time-signatures.ly -engraving-ties-manually.ly skips-in-lyric-mode.ly +engraving-ties-manually.ly +stemlets.ly diff --git a/input/lsr/simultaneous-notes.snippet-list b/input/lsr/simultaneous-notes.snippet-list index 5afee46b94..ca4e093f94 100644 --- a/input/lsr/simultaneous-notes.snippet-list +++ b/input/lsr/simultaneous-notes.snippet-list @@ -1,7 +1,8 @@ -forcing-horizontal-shift-of-notes.ly -additional-voices-to-avoid-collisions.ly changing-partcombine-texts.ly +additional-voices-to-avoid-collisions.ly +forcing-horizontal-shift-of-notes.ly changing-a-single-notes-size-in-a-chord.ly combining-two-parts-on-the-same-staff.ly clusters.ly suppressing-warnings-for-clashing-note-columns.ly +displaying-complex-chords.ly diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index cffd42852f..8dd9c8ddb9 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -21,5 +21,6 @@ use-square-bracket-at-the-start-of-a-staff-group.ly quoting-another-voice-with-transposition.ly letter-tablature-formatting.ly inserting-score-fragments-above-a-staff,-as-markups.ly +tick-bar-lines.ly volta-below-chords.ly nesting-staves.ly diff --git a/input/lsr/stemlets.ly b/input/lsr/stemlets.ly new file mode 100644 index 0000000000..e9d0478a4c --- /dev/null +++ b/input/lsr/stemlets.ly @@ -0,0 +1,40 @@ +%% 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.57" + +\header { + lsrtags = "rhythms" + + texidoc = " +In some notational conventions beams are allowed to extend over rests. +Depending on preference, these beams may drop 'stemlets' to help the +eye appreciate the rhythm better, and in some modern music the rest +itself is omitted and only the stemlet remains. + + +This snippet shows a progression from traditional notation, to beams +over the rest, to stemlets over the rest, to stemlets alone. Stemlets +are generated by overriding the @code{'stemlet-length} property of +@code{Stem}, while rests are hidden by setting @code{'transparent = +##t}. + + +Some @code{\\markup} elements are included in the source to highlight +the different notations. + +" + doctitle = "Stemlets" +} % begin verbatim +\paper { ragged-right = ##f } + +{ + c'16^\markup { traditional } d' r f' + g'16[^\markup { beams over rests } f' r d'] + + % N.B. use Score.Stem to set for the whole score. + \override Staff.Stem #'stemlet-length = #0.75 + + c'16[^\markup { stemlets over rests } d' r f'] + g'16[^\markup { stemlets and no rests } f' \once \override Rest #'transparent = ##t r d'] +} + diff --git a/input/lsr/tick-bar-lines.ly b/input/lsr/tick-bar-lines.ly new file mode 100644 index 0000000000..735368cb32 --- /dev/null +++ b/input/lsr/tick-bar-lines.ly @@ -0,0 +1,43 @@ +%% 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.57" + +\header { + lsrtags = "staff-notation" + + texidoc = " +'Tick' bar lines are often used in music where the bar line is used +only for coordination and is not meant to imply any rhythmic stress. + +This snippet uses overrides for the @code{'bar-size} and +@code{'extra-offset} properties of @code{BarLine} to +determine, respectively, the tick size and its vertical placement. + +" + doctitle = "Tick bar lines" +} % begin verbatim +{ + % Use 'bar-size to control the height of the tick, + % and 'extra-offset to determine its position. + % + % With 'extra-offset set to zero, the tick will be + % centered around the middle line of the staff. + % + % Replace Staff.BarLine with Score.BarLine to + % apply the method to the whole score. + + \override Staff.BarLine #'bar-size = #1 + \override Staff.BarLine #'extra-offset = #'(0 . 2) + + c'4 d' e' f' + g'4 f' e' d' + c'4 d' e' f' + g'4 f' e' d' + + % Revert the overrides to get back a normal + % bar line at the end. + + \revert Staff.BarLine #'bar-size + \revert Staff.BarLine #'extra-offset + \bar "|." +} diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index 472f7c8a35..2a2f79d243 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -3,6 +3,7 @@ single-staff-template-with-notes-and-lyrics.ly adding-ambitus-per-voice.ly single-staff-template-with-notes,-lyrics,-chords-and-frets.ly skips-in-lyric-mode-2.ly +changing-stanza-fonts.ly vocal-ensemble-template-with-automatic-piano-reduction.ly ambitus-with-multiple-voices.ly aligning-lyrics.ly -- 2.39.5