From 66ffd212bba2b1b09580f878d66dba6c1e713102 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Tue, 20 May 2008 15:38:06 -0700 Subject: [PATCH] LSR: update. --- ...a-figured-bass-above-or-below-the-notes.ly | 2 +- input/lsr/adding-ambitus-per-voice.ly | 8 +- .../adding-an-extra-staff-at-a-line-break.ly | 25 +++-- input/lsr/adding-an-extra-staff.ly | 2 +- input/lsr/adding-bars-to-chordnames.ly | 22 +++++ ...hen-using-tuplet-and-non-tuplet-rythms..ly | 2 +- input/lsr/adding-drum-parts.ly | 2 +- ...ound-an-expressive-mark-or-chordal-note.ly | 8 +- ...ing-text-indications-to-metronome-marks.ly | 60 ------------ .../lsr/adding-the-current-date-to-a-score.ly | 4 +- ...ing-volta-brackets-to-additional-staves.ly | 2 +- .../lsr/adjusting-lyrics-vertical-spacing.ly | 2 +- .../adjusting-the-shape-of-falls-and-doits.ly | 21 +++++ ...aligning-and-centering-instrument-names.ly | 2 +- input/lsr/aligning-lyrics.ly | 22 +++-- ...ing-marks-with-various-notation-objects.ly | 2 +- input/lsr/alignment-vertical-spacing.ly | 2 +- ...ngerings-to-be-printed-inside-the-staff.ly | 8 +- input/lsr/ambitus-with-multiple-voices.ly | 8 +- input/lsr/ancient-fonts.ly | 2 +- ...modern-transcription-of-gregorian-music.ly | 2 +- ...-modern-transcription-of-mensural-music.ly | 2 +- input/lsr/ancient-notation.snippet-list | 4 +- input/lsr/ancient-time-signatures.ly | 2 +- ...yles-depending-on-the-step-of-the-scale.ly | 11 ++- input/lsr/automatic-beam-subdivisions.ly | 8 +- ...wo-per-two-in-4-4-or-2-2-time-signature.ly | 6 +- input/lsr/beams-across-line-breaks.ly | 9 +- ...staff-lines-using-the--whiteout-command.ly | 9 +- input/lsr/breaks.snippet-list | 2 +- input/lsr/breathing-signs.ly | 2 +- input/lsr/broken-crescendo-hairpin.ly | 43 ++++----- input/lsr/caesura-railtracks-with-fermata.ly | 2 +- .../lsr/center-text-below-hairpin-dynamics.ly | 10 +- input/lsr/changing--flageolet-mark-size.ly | 6 +- ...changing-a-single-notes-size-in-a-chord.ly | 2 +- .../changing-form-of-multi--measure-rests.ly | 2 +- ...hanging-properties-for-individual-grobs.ly | 2 +- ...xt-and-spanner-styles-for-text-dynamics.ly | 27 ++++++ ...f-a-slur-from-solid-to-dotted-or-dashed.ly | 12 +-- input/lsr/changing-the-breath-mark-symbol.ly | 21 +++++ ...names-to-german-or-semi-german-notation.ly | 2 +- .../changing-the-default-text-font-family.ly | 2 +- ...changing-the-number-of-lines-in-a-staff.ly | 6 +- input/lsr/changing-the-staff-size.ly | 11 ++- input/lsr/changing-the-tuplet-number.ly | 2 +- ...polymetric-section-using--compressmusic.ly | 2 +- input/lsr/chant-or-psalms-notation.ly | 2 +- input/lsr/chord-name-exceptions.ly | 21 +++-- input/lsr/chords.snippet-list | 2 + input/lsr/clip-systems.ly | 22 +++-- input/lsr/clusters.ly | 6 +- .../combining-dynamics-with-markup-texts.ly | 6 +- .../combining-two-parts-on-the-same-staff.ly | 10 +- input/lsr/compound-time-signatures.ly | 2 +- ...onducting-signs,-measure-grouping-signs.ly | 2 +- input/lsr/contemporary-glissando.ly | 9 +- input/lsr/contexts-and-engravers.snippet-list | 8 +- ...lling-the-placement-of-chord-fingerings.ly | 10 +- ...olling-the-vertical-ordering-of-scripts.ly | 27 ++++++ .../controlling-tuplet-bracket-visibility.ly | 2 +- ...-a-sequence-of-notes-on-various-pitches.ly | 10 +- ...eggios-across-notes-in-different-voices.ly | 25 +++++ input/lsr/creating-blank-staves.ly | 2 +- ...-cross-staff-arpeggios-in-a-piano-staff.ly | 34 +++++++ ...cross-staff-arpeggios-in-other-contexts.ly | 39 ++++++++ .../creating-real-parenthesized-dynamics.ly | 2 +- .../creating-simultaneous-rehearsal-marks.ly | 6 +- input/lsr/creating-slurs-across-voices.ly | 8 +- input/lsr/creating-text-spanners.ly | 2 +- input/lsr/custodes.ly | 2 +- ...f-stems-on-the-center-line-of-the-staff.ly | 8 +- input/lsr/demo-midiinstruments.ly | 2 +- input/lsr/demonstrating-all-headers.ly | 2 +- ...bracket-with-only-one-staff-in-a-system.ly | 57 ++++++------ ...entals-for-each-note-including-naturals.ly | 8 +- input/lsr/drawing-boxes-around-grobs.ly | 15 ++- .../drawing-circles-around-various-objects.ly | 21 ++--- input/lsr/editorial-annotations.snippet-list | 8 +- ...ng-native-postscript-in-a--markup-block.ly | 8 +- input/lsr/engravers-one-by-one.ly | 2 +- input/lsr/engraving-ties-manually.ly | 2 +- ...l-tuplets-using-only-one--times-command.ly | 2 +- input/lsr/expressive-marks.snippet-list | 33 +++++-- ...-to-start-from-a-given-letter-or-number.ly | 2 +- input/lsr/formatting-lyrics-syllables.ly | 2 +- input/lsr/fretted-strings.snippet-list | 2 +- input/lsr/generating-random-notes.ly | 2 +- .../grid-lines--changing-their-appearance.ly | 2 +- ...izing-rhythms-and-notes-synchronization.ly | 2 +- ...y-customized-polymetric-time-signatures.ly | 2 +- ...ing-the-extender-line-for-text-dynamics.ly | 20 ++++ ...to-put-ties-between-syllables-in-lyrics.ly | 2 +- input/lsr/incipit.ly | 58 +++++++----- ...ore-fragments-above-a-staff,-as-markups.ly | 14 +-- ...ing-text-indications-in-metronome-marks.ly | 2 +- input/lsr/jazz-combo-template.ly | 6 +- input/lsr/letter-tablature-formatting.ly | 14 --- input/lsr/line-arrows.ly | 10 +- input/lsr/makam.ly | 18 ++-- ...invisible-with-the-transparent-property.ly | 10 +- ...ome-staff-lines-thicker-than-the-others.ly | 10 +- .../manually-controlling-beam-positions.ly | 2 +- input/lsr/markup-lines.ly | 6 +- ...che-layout-bar-lines-between-the-staves.ly | 6 +- ...ues-for-articulation-shorthand-notation.ly | 23 +++++ input/lsr/modifying-tuplet-bracket-length.ly | 2 +- input/lsr/move-specific-text.ly | 2 +- input/lsr/nesting-staves.ly | 2 +- input/lsr/non-traditional-key-signatures.ly | 4 +- input/lsr/ottava-text.ly | 4 +- input/lsr/outputting-the-version-number.ly | 10 +- input/lsr/page-label.ly | 22 ++--- ...tting-line-breaks-within-beamed-tuplets.ly | 2 +- input/lsr/piano-template-simple.ly | 2 +- .../piano-template-with-centered-dynamics.ly | 29 ++---- .../piano-template-with-centered-lyrics.ly | 2 +- .../piano-template-with-melody-and-lyrics.ly | 2 +- input/lsr/positioning-multi--measure-rests.ly | 3 +- ...itioning-segno-and-coda-with-line-break.ly | 2 +- ...naturals-from-being-automatically-added.ly | 11 +-- ...-printed-when-the-key-signature-changes.ly | 12 +-- ...nting-hairpins-using-al-niente-notation.ly | 20 ++++ ...g-marks-at-the-end-of-a-line-or-a-score.ly | 2 +- input/lsr/printing-marks-on-every-staff.ly | 2 +- ...ome-and-rehearsal-marks-below-the-staff.ly | 16 ++-- ...ng-music-with-different-time-signatures.ly | 2 +- input/lsr/proportional-strict-notespacing.ly | 2 +- ...uoting-another-voice-with-transposition.ly | 13 +-- input/lsr/quoting-another-voice.ly | 47 +++++----- input/lsr/removing-the-first-empty-line.ly | 2 +- input/lsr/repeats.snippet-list | 1 + input/lsr/rest-styles.ly | 2 +- input/lsr/rhythmic-slashes.ly | 2 +- input/lsr/rhythms.snippet-list | 8 +- input/lsr/score-for-diatonic-accordion.ly | 2 +- .../setting-hairpin-behavior-at-bar-lines.ly | 4 +- .../setting-the-minimum-length-of-hairpins.ly | 19 ++++ input/lsr/shortening-volta-brackets.ly | 13 ++- ...template-with-notes,-lyrics,-and-chords.ly | 2 +- ...le-staff-template-with-notes-and-chords.ly | 2 +- ...le-staff-template-with-notes-and-lyrics.ly | 2 +- .../single-staff-template-with-only-notes.ly | 2 +- input/lsr/skips-in-lyric-mode-2.ly | 2 +- input/lsr/skips-in-lyric-mode.ly | 2 +- input/lsr/staff-notation.snippet-list | 21 +++-- input/lsr/string-quartet-template-simple.ly | 2 +- ...ng-quartet-template-with-separate-parts.ly | 2 +- ...-warnings-when-two-glissandos-intersect.ly | 22 +++++ input/lsr/table-of-contents.ly | 18 ++-- input/lsr/template.snippet-list | 16 ++-- input/lsr/text.snippet-list | 6 +- input/lsr/three-sided-box.ly | 2 +- input/lsr/time-signature-in-parentheses.ly | 25 +++-- ...scription-of-ancient-music-with-incipit.ly | 2 +- ...ith-minimum-accidentals-smart-transpose.ly | 30 +++--- input/lsr/tweaking-clef-properties.ly | 91 +++++++++---------- input/lsr/tweaks-and-overrides.snippet-list | 6 +- input/lsr/unfretted-strings.snippet-list | 2 +- ...e-bracket-at-the-start-of-a-staff-group.ly | 2 +- .../using-double-slurs-for-legato-chords.ly | 18 ++++ ...tweak-command-to-tweak-individual-grobs.ly | 15 +-- input/lsr/using-ties-with-arpeggios.ly | 2 +- input/lsr/utf-8.ly | 33 ++++--- ...aligning-dynamics-across-multiple-notes.ly | 21 +++++ .../vertically-aligning-ossias-and-lyrics.ly | 2 +- ...cally-centered-dynamics-and-textscripts.ly | 2 +- ...template-with-automatic-piano-reduction.ly | 2 +- ...rics-aligned-below-and-above-the-staves.ly | 2 +- input/lsr/vocal-ensemble-template.ly | 2 +- input/lsr/vocal-music.snippet-list | 10 +- input/lsr/volta-below-chords.ly | 31 +++++++ input/lsr/volta-multi-staff.ly | 26 +++--- 173 files changed, 1054 insertions(+), 696 deletions(-) create mode 100644 input/lsr/adding-bars-to-chordnames.ly delete mode 100644 input/lsr/adding-text-indications-to-metronome-marks.ly create mode 100644 input/lsr/adjusting-the-shape-of-falls-and-doits.ly create mode 100644 input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly create mode 100644 input/lsr/changing-the-breath-mark-symbol.ly create mode 100644 input/lsr/controlling-the-vertical-ordering-of-scripts.ly create mode 100644 input/lsr/creating-arpeggios-across-notes-in-different-voices.ly create mode 100644 input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly create mode 100644 input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly create mode 100644 input/lsr/hiding-the-extender-line-for-text-dynamics.ly delete mode 100644 input/lsr/letter-tablature-formatting.ly create mode 100644 input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly create mode 100644 input/lsr/printing-hairpins-using-al-niente-notation.ly create mode 100644 input/lsr/setting-the-minimum-length-of-hairpins.ly create mode 100644 input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly create mode 100644 input/lsr/using-double-slurs-for-legato-chords.ly create mode 100644 input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly create mode 100644 input/lsr/volta-below-chords.ly diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index cb03887b91..66b38f461a 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "chords, ancient-notation, contexts-and-engravers" diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index bacadf5185..7d1c0e123a 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches, staff-notation, vocal-music" @@ -18,12 +18,14 @@ manually to prevent collisions. } \relative c'' { \override Ambitus #'X-offset = #2.0 \voiceOne - c4 a d e f1 + c4 a d e + f1 } \new Voice \with { \consists "Ambitus_engraver" } \relative c' { \voiceTwo - es4 f g as b1 + es4 f g as + b1 } >> diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly index b206077b76..c9ae07a9e3 100644 --- a/input/lsr/adding-an-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, contexts-and-engravers, breaks" @@ -20,28 +20,27 @@ is also required (see the example). doctitle = "Adding an extra staff at a line break" } % begin verbatim \score { - \new StaffGroup \relative c'' { - \new Staff + \new StaffGroup \relative c'' { + \new Staff \key f \major - c1 c^"Unwanted extra space" \break + c1 c^"Unwanted extra space" \break << { c1 c } - \new Staff { + \new Staff { \key f \major \once \override Staff.TimeSignature #'stencil = ##f c1 c } >> - c1 c^"Fixed here" \break + c1 c^"Fixed here" \break << { c1 c } - \new Staff { - \once \set Staff.explicitKeySignatureVisibility = #end-of-line-invisible - %The next line is not needed in 2.11.x or later: - \once \override Staff.TimeSignature #'break-visibility = #end-of-line-invisible + \new Staff { + \once \set Staff.explicitKeySignatureVisibility = #end-of-line-invisible + % The next line is not needed in 2.11.x or later: + \once \override Staff.TimeSignature #'break-visibility = #end-of-line-invisible \key f \major \once \override Staff.TimeSignature #'stencil = ##f - c1 c - } + c1 c + } >> } } - diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index 2584621a04..fbebf90553 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/adding-bars-to-chordnames.ly b/input/lsr/adding-bars-to-chordnames.ly new file mode 100644 index 0000000000..dffd3b150c --- /dev/null +++ b/input/lsr/adding-bars-to-chordnames.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.46" + +\header { + lsrtags = "chords" + + texidoc = " +To add bar indications in the @@code@{ChordNames@} context, add +@@code@{Bar_engraver@}. + +" + doctitle = "Adding bars to ChordNames" +} % begin verbatim +\new ChordNames \with { + \override BarLine #'bar-size = #4 + \consists "Bar_engraver" +} +\chordmode { + f1:maj7 f:7 bes:7 +} + 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 5c6dbf3fdf..55b358ae47 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 @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, expressive-marks" diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index f89939c1be..eca1307fc4 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly index c734ccab6a..32276fff42 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly @@ -1,22 +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" +\version "2.11.46" \header { lsrtags = "expressive-marks" texidoc = " The @code{\\parenthesize} function is a special tweak that encloses -objects in parentheses. The associated grob is +objects in parentheses. The associated grob is @code{Score.ParenthesesItem}. " doctitle = "Adding parentheses around an expressive mark or chordal note" } % begin verbatim -\relative { +\relative c' { c2-\parenthesize -> \override ParenthesesItem #'padding = #0.1 \override ParenthesesItem #'font-size = #-4 - + 2 } diff --git a/input/lsr/adding-text-indications-to-metronome-marks.ly b/input/lsr/adding-text-indications-to-metronome-marks.ly deleted file mode 100644 index 817446ecd1..0000000000 --- a/input/lsr/adding-text-indications-to-metronome-marks.ly +++ /dev/null @@ -1,60 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -\version "2.11.45" -\header { - lsrtags = "expressive-marks,tweaks-and-overrides" - texidoc = " -Using Scheme code to override the stencil for @code{MetronomeMark} -objects, this example allows the creation of metronome marks which include -text directions. The function @code{\movement} is called with three -arguments: the text label, note duration, and beats per minute. -" - doctitle = "Adding text indications to metronome marks" -} % begin verbatim - -#(define-markup-command (mvt layout props arg) (markup?) - (interpret-markup layout props - (markup #:huge #:bold arg))) - -#(define (string->duration duration-string) - "Parse the `duration-string', e.g. ''4..'' or ''breve.'', and return a duration object." - (let* ((length (string-length duration-string)) - (dot-index (or (string-index duration-string #\.) length)) - (len (substring duration-string 0 dot-index)) - (dots (- length dot-index))) - (ly:make-duration (cond ((string=? len "breve") -1) - ((string=? len "longa") -2) - ((string=? len "maxima") -3) - (else (log2 (string->number len)))) - dots 1 1))) - -movement = #(define-music-function (parser location text duration count music) - (string? string? integer? ly:music?) - (define (format-movement-markup dur count context) - (markup #:mvt text #:hspace 1 - #:concat ("(" #:general-align Y DOWN #:smaller #:note duration 1) - "=" - #:concat ((number->string count) ")"))) - #{ - \set Score.metronomeMarkFormatter = #$format-movement-markup - \set Score.tempoWholesPerMinute = #$(ly:moment-mul (ly:make-moment count 1) - (ly:duration-length - (string->duration duration))) - \set Score.tempoUnitDuration = #$(string->duration duration) - \set Score.tempoUnitCount = $count - $music - \set Score.metronomeMarkFormatter = #format-metronome-markup - #}) - -\layout { ragged-right = ##f } - -\relative c' { - \time 3/4 - \movement "Allegro" "2." #92 - c2 e4 - g2. - \movement "Moderato" "4" #104 - f4 e d - \tempo 4 = 92 - c2. -} diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly index f46f036948..b3ee589826 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "titles" @@ -27,7 +27,7 @@ details on this format string: Formatting Calendar Time. " doctitle = "Adding the current date to a score" } % begin verbatim -\version "2.11.38" +\version "2.11.46" % first, define a variable to hold the formatted date: date = #(strftime "%d-%m-%Y" (localtime (current-time))) diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly index 99c0b47ebb..45e433c721 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "repeats" diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index 3f74e2ab70..5bda716c77 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, vocal-music, spacing" diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly new file mode 100644 index 0000000000..288c58ea71 --- /dev/null +++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly @@ -0,0 +1,21 @@ +%% 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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +The @code{shortest-duration-space} property may have to be tweaked to +adjust the shape of falls and doits. + +" + doctitle = "Adjusting the shape of falls and doits" +} % begin verbatim +\relative c'' { + \override Score.SpacingSpanner #'shortest-duration-space = #4.0 + c2-\bendAfter #+5 + c2-\bendAfter #-3 + c2-\bendAfter #+8 + c2-\bendAfter #-6 +} diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index c0c5b6e6f8..93b903c324 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly index fb675b5ff7..47659547c6 100644 --- a/input/lsr/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -1,25 +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.38" +\version "2.11.46" \header { lsrtags = "text, vocal-music" texidoc = " -You can specify different horizontal alignment for your lyrics, by -overriding the @code{self-alignment-X} property of the @code{LyricText} -object. @code{#-1} is left, @code{#0} is center and @code{#1} is right; +Horizontal alignment for lyrics cam be set by overriding the +@code{self-alignment-X} property of the @code{LyricText} object. +@code{#-1} is left, @code{#0} is center and @code{#1} is right; however, you can use @code{#LEFT}, @code{#CENTER} and @code{#RIGHT} as well. " doctitle = "Aligning lyrics" } % begin verbatim +\layout { ragged-right = ##f } \relative c'' { - c1 c c + c1 + c1 + c1 } \addlyrics { - \once \override LyricText #'self-alignment-X = #LEFT "This is left-aligned" - \once \override LyricText #'self-alignment-X = #CENTER "This is centered" - \once \override LyricText #'self-alignment-X = #1 "This is right-aligned" + \once \override LyricText #'self-alignment-X = #LEFT + "This is left-aligned" + \once \override LyricText #'self-alignment-X = #CENTER + "This is centered" + \once \override LyricText #'self-alignment-X = #1 + "This is right-aligned" } diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly index fdc8dd519c..961e683fd1 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text" diff --git a/input/lsr/alignment-vertical-spacing.ly b/input/lsr/alignment-vertical-spacing.ly index 71ca319cb1..14dff606b2 100644 --- a/input/lsr/alignment-vertical-spacing.ly +++ b/input/lsr/alignment-vertical-spacing.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "tweaks-and-overrides, paper-and-layout, spacing" 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 index b0997d3f8c..e60352a290 100644 --- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly +++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly @@ -1,12 +1,12 @@ %% 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" +\version "2.11.46" \header { lsrtags = "editorial-annotations, spacing" texidoc = " -By default, fingering numbers will be printed outside the staff. +By default, fingering numbers will be printed outside the staff. However, this behavior can be canceled. " @@ -14,6 +14,6 @@ However, this behavior can be canceled. } % begin verbatim \relative c' { 2 - \once \override Fingering #'staff-padding = #'() - + \once \override Fingering #'staff-padding = #'() + 2 } diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly index 8b3e5932f1..906ac3ef8d 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches, vocal-music" @@ -19,11 +19,13 @@ voices. << \new Voice \relative c'' { \voiceOne - c4 a d e f1 + c4 a d e + f1 } \new Voice \relative c' { \voiceTwo - es4 f g as b1 + es4 f g as + b1 } >> diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index f530a43578..66425043f7 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly index a9853b34e6..acfca2cde9 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly index b0f760e405..a83e550b63 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list index 87c0c5ba9c..8593b52ab3 100644 --- a/input/lsr/ancient-notation.snippet-list +++ b/input/lsr/ancient-notation.snippet-list @@ -1,11 +1,11 @@ transcription-of-ancient-music-with-incipit.ly -mensurstriche-layout-bar-lines-between-the-staves.ly +chant-or-psalms-notation.ly adding-a-figured-bass-above-or-below-the-notes.ly incipit.ly -chant-or-psalms-notation.ly 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/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index 421debf37f..419a0f5463 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly index 03aa44276a..8a675dee15 100644 --- a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches, editorial-annotations" @@ -27,18 +27,21 @@ correspondence between harmonic functions and note head styles. } % begin verbatim fragment = { \key c \major - c2 d e f g a b c + c2 d + e2 f + g2 a + b2 c } \score { \new Staff { \transpose c d - \relative { + \relative c' { \set shapeNoteStyles = ##(do re mi fa #f la ti) \fragment } - \relative { + \relative c' { \set shapeNoteStyles = ##(cross triangle fa #f mensural xcircle diamond) \fragment } diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index 1700014822..6640a02adf 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,12 +1,12 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" texidoc = " -Beams can be subdivided automatically. By setting the property +Beams can be subdivided automatically. By setting the property @code{subdivideBeams}, beams are subdivided at beat positions (as specified in @code{beatLength}). @@ -14,11 +14,11 @@ specified in @code{beatLength}). doctitle = "Automatic beam subdivisions" } % begin verbatim \score { - \new Staff \relative { + \new Staff \relative c'' { << { \voiceOne \set subdivideBeams = ##t - b'32[ a g f c' b a g b^"subdivide beams" a g f c' b a g] + b32[ a g f c' b a g b^"subdivide beams" a g f c' b a g] \oneVoice } \new Voice { diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index 8408b2c83c..07d34abfc8 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" @@ -35,14 +35,14 @@ qBeam = { \new Staff \relative c'' { \time 4/4 g8^\markup { without the macro } g g g g g g g | - g g g g4 g8 g g | + g8 g g g4 g8 g g | } %Use the macro \new Staff \relative c'' { \time 4/4 \qBeam g8^\markup { with the macro } g g g g g g g | - g g g g4 g8 g g | + g8 g g g4 g8 g g | } >> \layout { diff --git a/input/lsr/beams-across-line-breaks.ly b/input/lsr/beams-across-line-breaks.ly index 77797f5a6b..84cc7d8d5f 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -1,14 +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" +\version "2.11.46" \header { lsrtags = "rhythms, breaks" texidoc = " -By default, beams can't be printed across line breaks. This behavior -can be overridden by setting the @code{breakable} property. See also in -the manual the \"Line breaking\" and \"Manual beams\" sections. +By default, beams can't be printed across line breaks. This behavior +can be overridden by setting the @code{breakable} property. " doctitle = "Beams across line breaks" @@ -18,5 +17,5 @@ the manual the \"Line breaking\" and \"Manual beams\" sections. \override Score.Beam #'breakable = ##t \time 3/16 c16[ d e \break - f] r r + f16] r r } 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 801371d9eb..ead6733afa 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,19 +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" +\version "2.11.46" \header { lsrtags = "editorial-annotations, text" texidoc = " -The @code{\\whiteout} command underlays a white box under a markup. +The @code{\\whiteout} command underlays a markup with a white box. Since staff lines are in a lower layer than most other grobs, this white box will not overlap any other grob. " doctitle = "Blanking staff lines using the \\whiteout command" } % begin verbatim -\relative { +\layout { ragged-right = ##f } +\relative c' { \override TextScript #'extra-offset = #'(2 . 4) - c2-\markup { \whiteout \pad-markup #0.5 "middle C" } c + c2-\markup { \whiteout \pad-markup #0.5 "middle C" } c } diff --git a/input/lsr/breaks.snippet-list b/input/lsr/breaks.snippet-list index 7a61860912..3d1579ba3c 100644 --- a/input/lsr/breaks.snippet-list +++ b/input/lsr/breaks.snippet-list @@ -1,4 +1,4 @@ -removing-the-first-empty-line.ly positioning-segno-and-coda-with-line-break.ly +removing-the-first-empty-line.ly beams-across-line-breaks.ly adding-an-extra-staff-at-a-line-break.ly diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly index acf02a240d..036e43838d 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "winds" diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index a192b91444..dc1ab53a07 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,44 +1,41 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { lsrtags = "expressive-marks" texidoc = " In order to make parts of a crescendo hairpin invisible, the following method is used: A white rectangle is drawn on top of the respective -part of the crescendo hairpin, making it invisible. The rectangle is +part of the crescendo hairpin, making it invisible. The rectangle is defined as postscript code within a text markup. To fine-tune the position and size of the markup, the number preceding @code{setgray} in the postscript definition can be set to a -value <1 making it grey. The two numbers before @code{scale} in the -postscript code are responsible for the width and height of the +value less than one, making it grey. The two numbers before @code{scale} +in the postscript code are responsible for the width and height of the rectangle, the two numbers before @code{translate} change the x- and -y-origin of the rectangle. +y-origin of the rectangle. Make sure to put the hairpin in a lower layer than the text markup to -actually draw the rectangle above the hairpin. +draw the rectangle over the hairpin. " doctitle = "Broken crescendo hairpin" } % begin verbatim -\score { - \relative c' { - << { - \dynamicUp - \override DynamicLineSpanner #'staff-padding = #4 - r2 r16 c'8.\pp r4 - } \\ { - \override DynamicLineSpanner #'layer = #0 - des,2\mf\< ~ - \override TextScript #'layer = #2 - des16_\markup { - \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1 +\relative c' { + << { + \dynamicUp + \override DynamicLineSpanner #'staff-padding = #4 + r2 r16 c'8.\pp r4 + } \\ { + \override DynamicLineSpanner #'layer = #0 + des,2\mf\< ~ + \override TextScript #'layer = #2 + des16_\markup { + \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1 lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" - } - r8. des4 ~ des16->\sff - } >> - } - \layout { ragged-right = ##t } + } + r8. des4 ~ des16->\sff + } >> } diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index 58bde649d2..3a5c6eb2a0 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 5c5fd44d86..7ed4e7b3de 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, text" @@ -26,12 +26,12 @@ hairpinWithCenteredText = #(define-music-function (parser location text) (markup \override Voice.Hairpin #'text = $text #}) -hairpinMolto = \hairpinWithCenteredText \markup { \italic "molto" } -hairpinMore = \hairpinWithCenteredText \markup { \bigger "moltissimo" } +hairpinMolto = \hairpinWithCenteredText \markup { \italic molto } +hairpinMore = \hairpinWithCenteredText \markup { \bigger moltissimo } \layout { ragged-right = ##f } { - \hairpinMolto c'2\< c'2\f - \hairpinMore c'2\< c'2\f + \hairpinMolto c'2\< c'\f + \hairpinMore c'2\< c'\f } diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index f4035da427..b91c78cf3c 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, unfretted-strings" @@ -22,6 +22,6 @@ smallFlageolet = #(let ((m (make-music 'ArticulationEvent \layout { ragged-right = ##f } \relative c'' { - d4^\flageolet_\markup { default size } d4_\flageolet - c4^\smallFlageolet_\markup { smaller } c4_\smallFlageolet + d4^\flageolet_\markup { default size } d_\flageolet + c4^\smallFlageolet_\markup { smaller } c_\smallFlageolet } diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly index e33bc406a7..3e955c36c8 100644 --- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly +++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly index 5b1d5c3bd3..8c436c0c32 100644 --- a/input/lsr/changing-form-of-multi--measure-rests.ly +++ b/input/lsr/changing-form-of-multi--measure-rests.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.42" +\version "2.11.46" \layout { ragged-right = ##t } \header { lsrtags = "rhythms,tweaks-and-overrides" diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index b0f9facd1f..29956ca2bd 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "tweaks-and-overrides" diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly new file mode 100644 index 0000000000..9d88a95704 --- /dev/null +++ b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +The text used for crescendos and decrescendos can be changed by +modifying the context properties @code{crescendoText} and +@code{decrescendoText}. The style of the spanner line can be changed +by modifying the context properties @code{crescendoSpanner} and +@code{decrescendoSpanner}. Available values for the spanner properties +are @code{'hairpin}, @code{'line}, @code{'dashed-line}, and +@code{'dotted-line}. If unset, a hairpin crescendo is used: + +" + doctitle = "Changing text and spanner styles for text dynamics" +} % begin verbatim +\relative c'' { + \set crescendoText = \markup { \italic { cresc. poco } } + \set crescendoSpanner = #'dotted-line + a2\< a + a2 a + a2 a + a2 a\mf +} 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 f35de5224a..60826803db 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 @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, editorial-annotations" @@ -12,14 +12,14 @@ The appearance of slurs may be changed from solid to dotted or dashed. doctitle = "Changing the appearance of a slur from solid to dotted or dashed" } % begin verbatim \relative c' { - c( d e c) | + c4( d e c) \slurDotted - c( d e c) | + c4( d e c) \slurSolid - c( d e c) | + c4( d e c) \slurDashed - c( d e c) | + c4( d e c) \slurSolid - c( d e c) | + c4( d e c) } diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly new file mode 100644 index 0000000000..462fea5d32 --- /dev/null +++ b/input/lsr/changing-the-breath-mark-symbol.ly @@ -0,0 +1,21 @@ +%% 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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +The glyph of the breath mark can be tuned by overriding the text +property of the @code{BreathingSign} layout object with any markup +text. + +" + doctitle = "Changing the breath mark symbol" +} % begin verbatim +\relative c'' { + c2 + \override BreathingSign #'text = #(make-musicglyph-markup "scripts.rvarcomma") + \breathe + d2 +} diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index 3d512f871d..8b31d059fc 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "chords" diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index c2b3472ae6..060ac75a38 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, tweaks-and-overrides" diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index f3b8a9dd7c..1c64e1e658 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation" @@ -16,12 +16,12 @@ The number of lines in a staff may changed by overriding the doctitle = "Changing the number of lines in a staff" } % begin verbatim upper = \relative c'' { - c1 d e f + c4 d e f } lower = \relative c { \clef bass - c1 b a g + c4 b a g } \score { diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index 4d04de01ec..68548625c4 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout" @@ -15,14 +15,15 @@ changed by scaling the properties @code{staff-space} and doctitle = "Changing the staff size" } % begin verbatim << - \new Staff \relative c'' { \dynamicDown c8\ff c c c c c c c } + \new Staff \relative c'' { + \dynamicDown + c8\ff c c c c c c c + } \new Staff \with { fontSize = #-3 \override StaffSymbol #'staff-space = #(magstep -3) - } - { + } { \clef bass c8 c c c c\f c c c } >> - diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index 7c4857dfdc..7a8f8e58fa 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" 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 59b362f2ba..46df9510c9 100644 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, contexts-and-engravers" diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 6d4fbf42cd..123289c27f 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers" diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index 7936c1ab09..e9944046ec 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,31 +1,33 @@ %% 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" +\version "2.11.46" \header { lsrtags = "chords" texidoc = " -The property @code{chordNameExceptions} can used to store a list of +The property @code{chordNameExceptions} can be used to store a list of special notations for specific chords. " doctitle = "Chord name exceptions" } % begin verbatim -% 7sus4 denoted with ^7 wahh +% modify maj9 and 6(add9) +% Exception music is chords with markups chExceptionMusic = { - 1-\markup { \super "7" "wahh" } + 1-\markup { \super "maj9" } + 1-\markup { \super "6(add9)" } } -% add to existing exceptions. -chExceptions = #(append - (sequential-music-to-chord-exceptions chExceptionMusic #t) +% Convert music to list and prepend to existing exceptions. +chExceptions = #( append + ( sequential-music-to-chord-exceptions chExceptionMusic #t) ignatzekExceptions) theMusic = \chordmode { - c:7sus4 c:dim7/+f + g1:maj9 g1:6.9 \set chordNameExceptions = #chExceptions - c:7sus4 c:dim7/+f + g1:maj9 g1:6.9 } \layout { @@ -35,4 +37,3 @@ theMusic = \chordmode { << \context ChordNames \theMusic \context Voice \theMusic >> - diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index 3eb5fd7a86..9451f28f73 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -5,3 +5,5 @@ controlling-the-placement-of-chord-fingerings.ly clusters.ly single-staff-template-with-notes,-lyrics,-and-chords.ly chord-name-exceptions.ly +volta-below-chords.ly +adding-bars-to-chordnames.ly diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly index 759a3de69e..3bd07ac06b 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \layout { ragged-right= ##t } \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or @@ -14,10 +14,18 @@ snippets page may not adequately show the results. The result will be files named @file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. -@itemize @bullet -@item If system starts and ends are included, they include extents of the System grob, e.g., instrument names. -@item Grace notes at the end point of the region are not included. -@item Regions can span multiple systems. In this case, multiple EPS files are generated. +@itemize +@item +If system starts and ends are included, they include extents of the +System grob, e.g., instrument names. + +@item +Grace notes at the end point of the region are not included. + +@item +Regions can span multiple systems. In this case, multiple EPS files +are generated. + @end itemize " doctitle = "Clip systems" @@ -76,7 +84,9 @@ origScore = \score { \score { \lyrics { \markup { from-2.0.1-to-4.0.1-clip.eps } - \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) } + \markup { + \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" + (ly:parser-output-name parser)) } } } } diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index f124d36374..b264c4787d 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "simultaneous-notes, chords, keyboards" @@ -17,9 +17,9 @@ played. } fragment = \relative c' { - c4 f4 4 + c4 f 4 8 a4 c2 4 - e2 c2 + e2 c } << diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index 78f79ef308..17451c4b2e 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, text" @@ -12,8 +12,8 @@ Some dynamics may involve text indications (such as \"più forte\" or " doctitle = "Combining dynamics with markup texts" } % begin verbatim -piuF = \markup { \italic "più" \dynamic "f" } - +piuF = \markup { \italic più \dynamic f } +\layout { ragged-right = ##f } \relative c'' { c2\f c-\piuF } diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index 0fd7054f47..fc200d6578 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,19 +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" +\version "2.11.46" \header { lsrtags = "simultaneous-notes, text" texidoc = " The part combiner tool ( @code{\\partcombine} command ) allows the -combination of several different parts on the same staff. Text +combination of several different parts on the same staff. Text directions such as \"solo\" or \"a2\" are added by default; to remove them, simply set the property @code{printPartCombineTexts} to \"false\". For vocal scores (hymns), there is no need to add -\"solo\"/\"a2\" texts, so they should be switched off. However, it +\"solo\"/\"a2\" texts, so they should be switched off. However, it might be better not to use it if there are any solos, as they won't be -indicated. In such cases, standard polyphonic notation may be +indicated. In such cases, standard polyphonic notation may be preferable. This snippet presents the three ways two parts can be printed on a same @@ -44,7 +44,7 @@ musicDown = \relative c'' { << \new Staff { \set Staff.instrumentName = "Standard polyphony " - << \musicUp \\ \musicDown >> + << \musicUp \\ \musicDown >> } \new Staff \with { printPartCombineTexts = ##f } { \set Staff.instrumentName = "PartCombine without texts " diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index b94107506e..e4cb4f3e71 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index aea46a34fb..504fe41d15 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly index 65552b0f2a..4e71e4d351 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks" @@ -16,6 +16,11 @@ hidden note and cadenza timing. \time 3/4 \override Glissando #'style = #'zigzag c4 c - \cadenzaOn c\glissando \hideNotes c,, \unHideNotes \cadenzaOff + \cadenzaOn + c4\glissando + \hideNotes + c,,4 + \unHideNotes + \cadenzaOff \bar "|" } diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list index 153af1fab7..670a7a75fe 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -1,11 +1,11 @@ creating-blank-staves.ly -mensurstriche-layout-bar-lines-between-the-staves.ly +chant-or-psalms-notation.ly adding-a-figured-bass-above-or-below-the-notes.ly adding-an-extra-staff-at-a-line-break.ly adding-an-extra-staff.ly -chant-or-psalms-notation.ly -use-square-bracket-at-the-start-of-a-staff-group.ly -engravers-one-by-one.ly +mensurstriche-layout-bar-lines-between-the-staves.ly changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +engravers-one-by-one.ly +use-square-bracket-at-the-start-of-a-staff-group.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.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 index 51f5899a61..55b703ca6e 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "editorial-annotations, chords, keyboards" @@ -15,13 +15,13 @@ The placement of fingering numbers can be controlled precisely. \set fingeringOrientations = #'(left) 4 \set fingeringOrientations = #'(down) - + 4 \set fingeringOrientations = #'(right) - + 4 \set fingeringOrientations = #'(up) - + 4 \set fingeringOrientations = #'(left down) 2 \set fingeringOrientations = #'(up right down) - + 2 } diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly new file mode 100644 index 0000000000..71a8a7febe --- /dev/null +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.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.46" + +\header { + lsrtags = "expressive-marks, tweaks-and-overrides" + + texidoc = " +The vertical ordering of scripts is controlled with the +@code{script-priority} property. The lower this number, the closer it +will be put to the note. In this example, the @code{TextScript} (the +sharp symbol) first has the lowest priority, so it is put lowest in the +first example. In the second, the prall trill (the @code{Script}) has +the lowest, so it is on the inside. When two objects have the same +priority, the order in which they are entered determines which one +comes first. + +" + doctitle = "Controlling the vertical ordering of scripts" +} % begin verbatim +\relative c''' { + \once \override TextScript #'script-priority = #-100 + a2^\prall^\markup { \sharp } + + \once \override Script #'script-priority = #-100 + a2^\prall^\markup { \sharp } +} diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index 24deaacb54..85aa4bc23c 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, tweaks-and-overrides" 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 3b3fc7477b..787d4c22c7 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 @@ -1,16 +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" +\version "2.11.46" \header { lsrtags = "pitches" texidoc = " In music that contains many occurrences of the same sequence of notes -at different pitches, the following music function may prove useful. It -takes a note, of which only the pitch is used. The supporting Scheme -functions were borrowed from the \"Tips and tricks\" document in the -manual for version 2.10. This example creates the rhythm used +at different pitches, the following music function may prove useful. +It takes a note, of which only the pitch is used. The supporting +Scheme functions were borrowed from the \"Tips and tricks\" document in +the manual for version 2.10. This example creates the rhythm used throughout Mars, from Gustav Holst's The Planets. " diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly new file mode 100644 index 0000000000..6d3a09f311 --- /dev/null +++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +An arpeggio can be drawn across notes in different voices on the same +staff if the @code{Span_arpeggio_engraver} is moved to the @code{Staff} +context: + +" + doctitle = "Creating arpeggios across notes in different voices" +} % begin verbatim +\new Staff \with { + \consists "Span_arpeggio_engraver" +} +\relative c' { + \set Staff.connectArpeggios = ##t + << + { 4\arpeggio 2 } \\ + { 2\arpeggio 2 } + >> +} diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index c45f9ac423..38e35daf0e 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly new file mode 100644 index 0000000000..68a4e74ab7 --- /dev/null +++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly @@ -0,0 +1,34 @@ +%% 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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +In a @code{PianoStaff}, it is possible to let an arpeggio cross between +the staves by setting the property @code{PianoStaff.connectArpeggios}. + + +" + doctitle = "Creating cross-staff arpeggios in a piano staff" +} % begin verbatim +\relative c'' { + +\new PianoStaff << + \set PianoStaff.connectArpeggios = ##t + \new Staff { + \arpeggio + \arpeggio + \arpeggio + \arpeggio + } + \new Staff { + \clef bass + \repeat unfold 4 { + \arpeggio + } + } +>> + +} diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly new file mode 100644 index 0000000000..97557da5f7 --- /dev/null +++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly @@ -0,0 +1,39 @@ +%% 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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +Cross-staff arpeggios can be created in contexts other than +@code{PianoStaff} if the @code{Span_arpeggio_engraver} is included in +the @code{Score} context. + +" + doctitle = "Creating cross-staff arpeggios in other contexts" +} % begin verbatim +\score { + \new StaffGroup { + \set Score.connectArpeggios = ##t + << + \new Voice \relative c' { + 2\arpeggio + 2\arpeggio + 1\arpeggio + } + \new Voice \relative c { + \clef bass + 2\arpeggio + 2\arpeggio + 1\arpeggio + } + >> + } + \layout { + \context { + \Score + \consists "Span_arpeggio_engraver" + } + } +} diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly index cf8867b266..a94dd4b285 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly index b7b5238438..bfbb3ed8a8 100644 --- a/input/lsr/creating-simultaneous-rehearsal-marks.ly +++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.39" +\version "2.11.46" \header { lsrtags = "expressive-marks,text,tweaks-and-overrides" texidoc = " @@ -17,8 +17,6 @@ end of one system and the start of the following system. % Thanks to Risto Vääräniemi for this snippet -\paper { ragged-right = ##t } - { \key a \major \set Score.markFormatter = #format-mark-box-letters @@ -38,5 +36,5 @@ end of one system and the start of the following system. \mark \markup { \box \bold "Intro" } d'1 \mark \default - d' + d'1 } diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 9ee396c97f..bc2ec548ab 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, keyboards, unfretted-strings" @@ -10,15 +10,15 @@ In some situations, you may want to create slurs between notes from different voices. The solution is to add invisible notes to one of the voices, using -\\hideNotes. +@code{\\hideNotes}. -This example is bar 235 of the Ciaconna from Bach's 2nd Partita for +This example is measure 235 of the Ciaconna from Bach's 2nd Partita for solo violin, BWV 1004. " doctitle = "Creating slurs across voices" } % begin verbatim -\relative +\relative c' << {d16( a') s a s a[ s a] s a[ s a] } \\ {\slurUp bes,[ s e]( \hideNotes a) \unHideNotes f[( \hideNotes a) \unHideNotes fis]( \hideNotes a) \unHideNotes g[( \hideNotes a) \unHideNotes gis]( \hideNotes a) } diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index f507265d35..5a75db0d0e 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "expressive-marks, text, tweaks-and-overrides" diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index 8987abdded..ccf24dcee4 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "ancient-notation, tweaks-and-overrides" 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 index f3a270281f..45b068e838 100644 --- 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 @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "editorial-annotations" @@ -13,9 +13,9 @@ by the @code{Stem} property @code{neutral-direction}. doctitle = "Default direction of stems on the center line of the staff" } % begin verbatim \relative c'' { - a b c b + a4 b c b \override Stem #'neutral-direction = #up - a b c b + a4 b c b \override Stem #'neutral-direction = #down - a b c b + a4 b c b } diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 3f07692be3..8359ddcfa2 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, keyboards, unfretted-strings, midi" diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index ef7645ff3d..2e02e1a8f5 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, paper-and-layout, titles" 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 index ce632161a6..2fab8a77c6 100644 --- 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 @@ -1,44 +1,41 @@ -%% 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.38" - +\version "2.11.46" \header { - lsrtags = "staff-notation, tweaks-and-overrides" - - texidoc = " -If there is only one staff in one of the staff types @code{ChoirStaff}, -@code{InnerChoirStaff}, @code{InnerStaffGroup} or @code{StaffGroup}, -the bracket and the starting bar line will not be displayed as standard -behavior. This can be changed by overriding the relevant properties, -as demonstrated in this example. - -Note that in some contexts such as @code{PianoStaff} where the systems -begin with a brace instead of a bracket, another property has to be -set, as shown on the second system in the example. + lsrtags = "staff-notation,tweaks-and-overrides" + texidoc = "If there is only one staff in one of the staff types +@code{ChoirStaff}, @code{InnerChoirStaff}, @code{InnerStaffGroup} +or @code{StaffGroup}, the bracket and the starting bar line will not +be displayed as standard behavior. This can be changed by overriding +the relevant properties, as demonstrated in this example. +Note that in contexts such as @code{PianoStaff} and @code{GrandStaff} +where the systems begin with a brace instead of a bracket, another +property has to be set, as shown on the second system in the example. " doctitle = "Display bracket with only one staff in a system" } % begin verbatim + \markup \column { \score { \new StaffGroup << - % Must be lower than your actual amount of staff lines - \override StaffGroup.SystemStartBracket #'collapse-height = #1 - \override Score.SystemStartBar #'collapse-height = #1 - \new Staff { - c'1 - } + % Must be lower than the actual number of staff lines + \override StaffGroup.SystemStartBracket #'collapse-height = #1 + \override Score.SystemStartBar #'collapse-height = #1 + \new Staff { + c'1 + } >> - \layout {ragged-right = ##t} + \layout {} } \score { \new PianoStaff << - \override PianoStaff.SystemStartBrace #'collapse-height = #1 - \override Score.SystemStartBar #'collapse-height = #1 - \new Staff { - c' - } - >> - \layout {ragged-right = ##t} + \override PianoStaff.SystemStartBrace #'collapse-height = #1 + \override Score.SystemStartBar #'collapse-height = #1 + \new Staff { + c'1 + } + >> + \layout {} } -} +} 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 35e5450451..ae1aa4de8b 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 @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches" @@ -29,9 +29,9 @@ webernAccidentals = { \score { { \webernAccidentals - c' dis' cis' cis' - c' dis' cis' cis' - c' c' dis' des' + c'4 dis' cis' cis' + c'4 dis' cis' cis' + c'4 c' dis' des' } \layout { \context { diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index 96739ce494..c8c95c3c3d 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,25 +1,24 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right= ##t } +\version "2.11.46" \header { lsrtags = "tweaks-and-overrides" texidoc = " The @code{print-function} can be overridden to draw a box around an -arbitrary grob. +arbitrary grob. " doctitle = "Drawing boxes around grobs" } % begin verbatim \relative c'' { - \override TextScript #'stencil = - #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) + \override TextScript #'stencil = + #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) c'4^"foo" - \override Stem #'stencil = - #(make-stencil-boxer 0.05 0.25 ly:stem::print) + \override Stem #'stencil = + #(make-stencil-boxer 0.05 0.25 ly:stem::print) \override Score.RehearsalMark #'stencil = - #(make-stencil-boxer 0.15 0.3 ly:text-interface::print) + #(make-stencil-boxer 0.15 0.3 ly:text-interface::print) b8 \revert Stem #'stencil diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index 7f5f6b907d..7aae0d3b41 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,7 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right= ##t } +\version "2.11.46" \header { lsrtags = "tweaks-and-overrides" texidoc = " @@ -16,14 +15,14 @@ such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}. doctitle = "Drawing circles around various objects" } % begin verbatim -\relative c'{ -c1 -\set Score.markFormatter - = #(lambda (mark context) +\relative c' { + c1 + \set Score.markFormatter = + #(lambda (mark context) (make-circle-markup (format-mark-numbers mark context))) -\mark \default -c2 d^\markup{\circle \finger "2"} -\override Score.BarNumber #'break-visibility = #all-visible -\override Score.BarNumber #'stencil - = #(make-stencil-circler 0.1 0.25 ly:text-interface::print) + \mark \default + c2 d^\markup { \circle \finger 2 } + \override Score.BarNumber #'break-visibility = #all-visible + \override Score.BarNumber #'stencil = + #(make-stencil-circler 0.1 0.25 ly:text-interface::print) } diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index ffaca5209e..de93af3949 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -1,12 +1,12 @@ creating-blank-staves.ly -controlling-the-placement-of-chord-fingerings.ly making-some-staff-lines-thicker-than-the-others.ly applying-note-head-styles-depending-on-the-step-of-the-scale.ly -embedding-native-postscript-in-a--markup-block.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly -grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +embedding-native-postscript-in-a--markup-block.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 grid-lines--changing-their-appearance.ly -default-direction-of-stems-on-the-center-line-of-the-staff.ly +controlling-the-placement-of-chord-fingerings.ly allowing-fingerings-to-be-printed-inside-the-staff.ly blanking-staff-lines-using-the--whiteout-command.ly diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly index c8cf651fbb..0ab90c7728 100644 --- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly +++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "editorial-annotations, text" @@ -12,13 +12,13 @@ block. " doctitle = "Embedding native PostScript in a \\markup block" } % begin verbatim -% PostScript is a registred trademark by Adobe Systems Inc. +% PostScript is a registered trademark of Adobe Systems Inc. \relative c'' { - a-\markup { \postscript #"3 4 moveto 5 3 rlineto stroke" } + a4-\markup { \postscript #"3 4 moveto 5 3 rlineto stroke" } -\markup { \postscript #"[ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke " } - b-\markup { \postscript #"3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke" } + b4-\markup { \postscript #"3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke" } s2 a'1 } diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index 720b2ea15f..89b4341847 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "contexts-and-engravers" diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index 3dc83dddac..efc41bcdb2 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly index 19437456ae..ef3e7befa7 100644 --- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly +++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index fef2a104e2..f13506108c 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -1,18 +1,31 @@ -creating-text-spanners.ly -combining-dynamics-with-markup-texts.ly +creating-cross-staff-arpeggios-in-a-piano-staff.ly adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly -creating-slurs-across-voices.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +creating-arpeggios-across-notes-in-different-voices.ly +creating-cross-staff-arpeggios-in-other-contexts.ly +printing-hairpins-using-al-niente-notation.ly +contemporary-glissando.ly +adding-parentheses-around-an-expressive-mark-or-chordal-note.ly +line-arrows.ly +hiding-the-extender-line-for-text-dynamics.ly +vertically-aligning-dynamics-across-multiple-notes.ly +modifying-default-values-for-articulation-shorthand-notation.ly +setting-the-minimum-length-of-hairpins.ly +changing-text-and-spanner-styles-for-text-dynamics.ly +controlling-the-vertical-ordering-of-scripts.ly +using-double-slurs-for-legato-chords.ly +creating-text-spanners.ly +creating-real-parenthesized-dynamics.ly center-text-below-hairpin-dynamics.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly -creating-real-parenthesized-dynamics.ly -creating-simultaneous-rehearsal-marks.ly +broken-crescendo-hairpin.ly +combining-dynamics-with-markup-texts.ly +creating-slurs-across-voices.ly caesura-railtracks-with-fermata.ly -contemporary-glissando.ly -adding-parentheses-around-an-expressive-mark-or-chordal-note.ly -adding-text-indications-to-metronome-marks.ly +adjusting-the-shape-of-falls-and-doits.ly +creating-simultaneous-rehearsal-marks.ly +suppressing-compiler-warnings-when-two-glissandos-intersect.ly setting-hairpin-behavior-at-bar-lines.ly changing--flageolet-mark-size.ly piano-template-with-centered-dynamics.ly -line-arrows.ly -broken-crescendo-hairpin.ly +changing-the-breath-mark-symbol.ly diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index 70d75e2df4..b0ea9ca4bc 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly index 305bc4b2db..682860b608 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/fretted-strings.snippet-list b/input/lsr/fretted-strings.snippet-list index 0a2dfd735c..01e15570dc 100644 --- a/input/lsr/fretted-strings.snippet-list +++ b/input/lsr/fretted-strings.snippet-list @@ -1 +1 @@ -letter-tablature-formatting.ly +volta-multi-staff.ly diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index d70d12884d..b28ecef0d8 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches" diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/input/lsr/grid-lines--changing-their-appearance.ly index d2534d9e0f..49488741c7 100644 --- a/input/lsr/grid-lines--changing-their-appearance.ly +++ b/input/lsr/grid-lines--changing-their-appearance.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly index 66bb52fa61..3cfb92f968 100644 --- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 7c3d1018ad..3bcaa25db0 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly new file mode 100644 index 0000000000..f4afd0089f --- /dev/null +++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +Text style dynamic changes (such as cresc. and dim.) are printed with a +dashed line showing their extent. This line can be suppressed in the +following way: + +" + doctitle = "Hiding the extender line for text dynamics" +} % begin verbatim +\relative c'' { + \override DynamicTextSpanner #'dash-period = #-1.0 + \setTextCresc + c1\< | d | b | c\! +} diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index 098b867fc4..7ebc8b8932 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly index fc8999b7d1..718c48ed11 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.39" +\version "2.11.46" \header { lsrtags = "staff-notation,ancient-notation" texidoc = "Incipits can be added using the instrument name grob, but @@ -53,7 +53,8 @@ global = { %make the staff lines invisible on staves \override Staff.BarLine #'transparent = ##t - \skip 1*8 % the actual music + % the actual music + \skip 1*8 % let finis bar go through all staves \override Staff.BarLine #'transparent = ##f @@ -69,7 +70,7 @@ discantusIncipit = << \clef "neomensural-c1" \key f \major \time 2/2 - c''1. + c''1. } >> \new Lyrics \lyricsto discantusIncipit { IV- } @@ -83,7 +84,8 @@ discantusNotes = { c'4 e'4.( d'8 c' b | a4) b a2 | b4.( c'8 d'4) c'4 | - \once \override NoteHead #'transparent = ##t c'1 | + \once \override NoteHead #'transparent = ##t + c'1 | b\breve | } } @@ -105,7 +107,7 @@ altusIncipit = << \clef "neomensural-c3" \key f \major \time 2/2 - r1 f'1. + r1 f'1. } >> \new Lyrics \lyricsto altusIncipit { IV- } @@ -114,17 +116,20 @@ altusIncipit = << altusNotes = { \transpose c' c'' { \clef "treble" - r2 g2. e4 fis g | % two bars + % two measures + r2 g2. e4 fis g | a2 g4 e | fis g4.( fis16 e fis4) | g1 | - \once \override NoteHead #'transparent = ##t g1 | + \once \override NoteHead #'transparent = ##t + g1 | g\breve | } } altusLyrics = \lyricmode { - Ju -- bi -- la -- te | % two bars + % two measures + Ju -- bi -- la -- te | De -- o, om -- | nis ter -- ra, | "..." | @@ -153,14 +158,17 @@ tenorNotes = { R1 | R1 | R1 | - r2 d'2. d'4 b e' | % two bars - \once \override NoteHead #'transparent = ##t e'1 | + % two measures + r2 d'2. d'4 b e' | + \once \override NoteHead #'transparent = ##t + e'1 | d'\breve | } } tenorLyrics = \lyricmode { - Ju -- bi -- la -- te | % two bars + % two measures + Ju -- bi -- la -- te | "..." | -us. } @@ -188,7 +196,8 @@ bassusNotes = { R1 | R1 | g2. e4 | - \once \override NoteHead #'transparent = ##t e1 | + \once \override NoteHead #'transparent = ##t + e1 | g\breve | } } @@ -196,28 +205,28 @@ bassusNotes = { bassusLyrics = \lyricmode { Ju -- bi- | "..." | - -us. + -us. } \score { << \new StaffGroup = choirStaff << \new Voice = "discantusNotes" << - \global + \global \set Staff.instrumentName = "Discantus" \incipit \discantusIncipit \discantusNotes >> \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } \new Voice = "altusNotes" << - \global + \global \set Staff.instrumentName = "Altus" \incipit \altusIncipit \altusNotes >> \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics } \new Voice = "tenorNotes" << - \global + \global \set Staff.instrumentName = "Tenor" \incipit \tenorIncipit \tenorNotes @@ -229,30 +238,33 @@ bassusLyrics = \lyricmode { \bassusNotes >> >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } + \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } %% Keep the bass lyrics outside of the staff group to avoid bar lines %% between the lyrics. >> \layout { \context { \Score - %% no bars in staves + %% no bar lines in staves \override BarLine #'transparent = ##t } - %% the next three instructions keep the lyrics between the barlines + %% the next three instructions keep the lyrics between the bar lines \context { - \Lyrics + \Lyrics \consists "Bar_engraver" \override BarLine #'transparent = ##t } - \context { \StaffGroup \consists "Separating_line_group_engraver" } + \context { + \StaffGroup + \consists "Separating_line_group_engraver" + } \context { \Voice %% no slurs \override Slur #'transparent = ##t %% Comment in the below "\remove" command to allow line - %% breaking also at those barlines where a note overlaps - %% into the next bar. The command is commented out in this + %% breaking also at those bar lines where a note overlaps + %% into the next measure. The command is commented out in this %% short example score, but especially for large scores, you %% will typically yield better line breaking and thus improve %% overall spacing if you comment in the following command. diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly index 920cc52bff..4260799b7e 100644 --- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly @@ -1,12 +1,12 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation" texidoc = " -The @code{\\markup} command is quite versatile. In this snippet, it +The @code{\\markup} command is quite versatile. In this snippet, it contains a @code{\\score} block instead of texts or marks. " @@ -25,15 +25,15 @@ tuning = \markup { \header { title = "Solo Cello Suites" subtitle = "Suite IV" - subsubtitle = \markup { "Originalstimmung:" \general-align #Y #CENTER \tuning } + subsubtitle = \markup { Originalstimmung: \general-align #Y #CENTER \tuning } } \layout { ragged-right = ##f } -\relative { +\relative c'' { \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 + \times 2/3 { c8 d e } \times 2/3 { c d e } + g8 a g a + g8 a g a } diff --git a/input/lsr/integrating-text-indications-in-metronome-marks.ly b/input/lsr/integrating-text-indications-in-metronome-marks.ly index 4329aeac94..78b69b9148 100644 --- a/input/lsr/integrating-text-indications-in-metronome-marks.ly +++ b/input/lsr/integrating-text-indications-in-metronome-marks.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, text" diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly index 23e688906f..6ee2df96de 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "keyboards, percussion, template" @@ -43,8 +43,8 @@ music is within a \\transpose section. \revert NoteHead #'style \revert Stem #'transparent } - cr = \override NoteHead #'style = #'cross - ncr = \revert NoteHead #'style + crOn = \override NoteHead #'style = #'cross + crOff = \revert NoteHead #'style %% insert chord name style stuff here. diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly deleted file mode 100644 index 3fb01d3934..0000000000 --- a/input/lsr/letter-tablature-formatting.ly +++ /dev/null @@ -1,14 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "fretted-strings" - texidoc = " -You can format a tablature with letters instead of numbers - so that -0->a, 1->b, 2->c, etc. - -BROKEN IN 2.11, COMMENTED OUT." - doctitle = "Letter tablature formatting" -} % begin verbatim -{ c'4 } diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index aa7c977ff8..9550264445 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,10 +1,10 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right= ##t } +\version "2.11.46" \header { lsrtags = "expressive-marks" - texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" + texidoc = "Arrows can be applied to text-spanners and line-spanners +(such as the Glissando)" doctitle = "Line arrows" } % begin verbatim @@ -23,6 +23,6 @@ \override Glissando #'arrow-length = #0.5 \override Glissando #'arrow-width = #0.25 - a8\startTextSpan gis8 a4 b4\glissando - b,4 | g' c\stopTextSpan c + a8\startTextSpan gis a4 b\glissando b, + g'4 c\stopTextSpan c2 } diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly index 8849640ba7..f7784135bc 100644 --- a/input/lsr/makam.ly +++ b/input/lsr/makam.ly @@ -1,13 +1,13 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { lsrtags = "pitches" texidoc = "Makam is a type of melody from Turkey using 1/9th-tone - microtonal alterations. Consult the initialization file - @code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly}) - for details of pitch names and alterations. - " +microtonal alterations. Consult the initialization file +@code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly}) +for details of pitch names and alterations. +" doctitle = "Makam" } % begin verbatim @@ -15,8 +15,8 @@ \include "makam-init.ly" \relative c' { - \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA))) - c cc db fk - gbm gfc gfb efk - fk db cc c + \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA))) + c4 cc db fk + gbm4 gfc gfb efk + fk4 db cc c } diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly index 096b23f67e..dc38e325c5 100644 --- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,7 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right = ##t } +\version "2.11.46" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " @@ -10,8 +9,7 @@ printed in \"invisible ink\": the object is not printed, but all its other behavior is retained. The object still takes up space, it takes part in collisions, and slurs, ties and beams can be attached to it. - -The snippet demonstrates how to connect different voices using ties. +This snippet demonstrates how to connect different voices using ties. Normally, ties only connect two notes in the same voice. By introducing a tie in a different voice, and blanking the first up-stem in that voice, the tie appears to cross voices. To prevent the blanked stem's @@ -28,8 +26,8 @@ flag from interfering with tie positioning, the stem is extended. b8 ~ b\noBeam \once \override Stem #'transparent = ##t \once \override Stem #'length = #8 - g ~ g\noBeam + g8 ~ g\noBeam } \\ { - b g g e + b8 g g e } >> } 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 index 08ebd76848..9b245e603b 100644 --- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly +++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly @@ -1,15 +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" +\version "2.11.46" \header { lsrtags = "staff-notation, editorial-annotations" 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 @code{'line-positions} property of the +For pedagogical purposes, a staff line can be thickened (e.g., the +middle line, or to emphasize the line of the G clef). This can be +achieved by adding extra lines very close to the line that should be +emphasized, using the @code{line-positions} property of the @code{StaffSymbol} object. " diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index aa18cd1de1..8a3a31ca8d 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 333e5610f3..95fd0e2234 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { lsrtags = "text" @@ -12,10 +12,10 @@ #(set-default-paper-size "a6") #(define-markup-list-command (paragraph layout props args) (markup-list?) - (interpret-markup-list layout props + (interpret-markup-list layout props (make-justified-lines-markup-list (cons (make-hspace-markup 2) args)))) -%% Candide, Voltaire +% Candide, Voltaire \markuplines \override-lines #'(baseline-skip . 2.5) { \paragraph { Il y avait en Westphalie, dans le château de M. le baron de diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly index a9698aa316..04d014e25e 100644 --- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides" @@ -8,8 +8,8 @@ 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. +a @code{ChoirStaff}. The bar line on staves is blanked out by setting +the @code{transparent} property. " doctitle = "Mensurstriche layout (bar lines between the staves)" diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly new file mode 100644 index 0000000000..d9b68fee34 --- /dev/null +++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +The shorthands are defined in @samp{ly/script-init.ly}, where the +variables @code{dashHat}, @code{dashPlus}, @code{dashDash}, +@code{dashBar}, @code{dashLarger}, @code{dashDot}, and +@code{dashUnderscore} are assigned default values. The default values +for the shorthands can be modified. For example, to associate the +@code{-+} (@code{dashPlus}) shorthand with the trill symbol instead of +the default + symbol, assign the value @code{trill} to the variable +@code{dashPlus}: + +" + doctitle = "Modifying default values for articulation shorthand notation" +} % begin verbatim +\relative c'' { c1-+ } +dashPlus = "trill" +\relative c'' { c1-+ } diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly index 38161d08d8..6284916b28 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/move-specific-text.ly b/input/lsr/move-specific-text.ly index e1e5f119cf..76bc3d69bc 100644 --- a/input/lsr/move-specific-text.ly +++ b/input/lsr/move-specific-text.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" % possible rename to scheme- or something like that. -gp \header { lsrtags = "tweaks-and-overrides" diff --git a/input/lsr/nesting-staves.ly b/input/lsr/nesting-staves.ly index 75c6fabddd..48f6926dc9 100644 --- a/input/lsr/nesting-staves.ly +++ b/input/lsr/nesting-staves.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index 9291fbcf6b..f27b5673f4 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches, staff-notation" @@ -34,6 +34,6 @@ whole-tone scale: \relative c' { \set Staff.keySignature = #`(((0 . 3) . ,SHARP) ((0 . 5) . ,FLAT) ((0 . 6) . ,FLAT)) c4 d e fis - aes bes c2 + aes4 bes c2 } diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index fd6b167c36..c848203d41 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches, text" @@ -8,7 +8,7 @@ texidoc = " Internally, the @code{set-octavation} function sets the properties @code{ottavation} (for example, to @code{\"8va\"} or @code{\"8vb\"}) -and @code{middleCPosition}. To override the text of the bracket, set +and @code{middleCPosition}. To override the text of the bracket, set @code{ottavation} after invoking @code{set-octavation}. diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index e2c9db25f8..61192b369f 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { lsrtags = "text" @@ -12,9 +12,11 @@ a score, or in a document generated with @code{lilypond-book}. doctitle = "Outputting the version number" } % begin verbatim -\score { \context Lyrics { - \override Score.RehearsalMark #'self-alignment-X = #LEFT - \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) +\score { + \context Lyrics { + \override Score.RehearsalMark #'self-alignment-X = #LEFT + \mark #(ly:export (string-append "Processed with LilyPond version " + (lilypond-version))) s2 } } diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index f482cbac61..b376adfac2 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,11 +1,10 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right= ##t } +\version "2.11.46" \header { lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, -and refered to in markups." +and referred to in markups." doctitle = "Page label" } % begin verbatim @@ -16,13 +15,13 @@ and refered to in markups." (markup #:fill-line (text #:page-ref label "8" "?")))) \book { - \markup \huge \fill-line { \null "Title Page" \null } + \markup \huge \fill-line { \null Title Page \null } \pageBreak \label #'toc \markup \column { - \large \fill-line { \null "Table of contents" \null } + \large \fill-line { \null Table of contents \null } \toc-line #'toc "Table of contents" \toc-line #'firstScore "First Score" \toc-line #'markA "Mark A" @@ -35,14 +34,15 @@ and refered to in markups." \label #'firstScore \score { - { c'2 c' - \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA - c' c' + { + c'2 c' + \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) } } \label #'markA + c'2 c' \pageBreak \mark "B" \label #'markB - d' d' - d' d' - \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible + d'2 d' + d'2 d' + \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible \mark "C" \label #'markC } \header { piece = "First score" } diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index 8eb60966b8..0b2fb510e9 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index 0b538ea71b..4c84cd1b40 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "keyboards, template" diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly index 0be31bf8d5..175f29d45d 100644 --- a/input/lsr/piano-template-with-centered-dynamics.ly +++ b/input/lsr/piano-template-with-centered-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { lsrtags = "expressive-marks,keyboards,template" @@ -17,7 +17,7 @@ upper = \relative c'' { \key c \major \time 4/4 - a b c d + a4 b c d } lower = \relative c { @@ -29,12 +29,11 @@ lower = \relative c { } dynamics = { - s2\fff\> s4 - s\!\pp + s2\fff\> s4 s\!\pp } pedal = { - s2\sustainDown s2\sustainUp + s2\sustainDown s\sustainUp } \score { @@ -51,7 +50,8 @@ pedal = { \context { \type "Engraver_group" \name Dynamics - \alias Voice % So that \cresc works, for example. + % So that \cresc works, for example. + \alias Voice \consists "Output_property_engraver" \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) @@ -79,19 +79,8 @@ pedal = { } \score { \new PianoStaff << - \new Staff = "upper" << \upper \dynamics >> - \new Staff = "lower" << \lower \dynamics >> - \new Dynamics = "pedal" \pedal + \new Staff = "upper" << \upper \dynamics \pedal >> + \new Staff = "lower" << \lower \dynamics \pedal >> >> - \midi { - \context { - \type "Performer_group" - \name Dynamics - \consists "Piano_pedal_performer" - } - \context { - \PianoStaff - \accepts Dynamics - } - } + \midi {} } diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index 512b0c74ff..6043f6247e 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, keyboards, template" diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index 694535d705..65d4099c73 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly index 829b69e1dc..616b47574f 100644 --- a/input/lsr/positioning-multi--measure-rests.ly +++ b/input/lsr/positioning-multi--measure-rests.ly @@ -1,7 +1,6 @@ %% 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 } +\version "2.11.46" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index 0220794c4b..5ae2a185d2 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "repeats, breaks" 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 0965d30a94..f2d56592dd 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches" @@ -11,8 +11,7 @@ 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). " - - texidoces = " +texidoces = " Según las reglas estándar de composición tipográfica, se imprime un becuadro antes de un sostenido o un bemol cuando se tiene que cancelar una alteración anterior en la misma nota. Para modificar este comportamiento, establezca el valor de la @@ -20,8 +19,6 @@ propiedad @code{extraNatural} a @code{##f} (falso) dentro del contexto de @code{Staff}. " - - texidoc = " In accordance with standard typesetting rules, a natural sign is printed before a sharp or flat if a previous accidental on the same @@ -33,8 +30,8 @@ note needs to be canceled. To change this behavior, set the " doctitle = "Preventing extra naturals from being automatically added" } % begin verbatim -\relative { - aeses'4 aes ais a +\relative c'' { + aeses4 aes ais a \set Staff.extraNatural = ##f aeses4 aes ais a } diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index baf04543f2..443c362822 100644 --- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -1,13 +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" +\version "2.11.46" \header { lsrtags = "pitches" texidoc = " When the key signature changes, natural signs are automatically printed -to cancel any accidentals from previous key signatures. This may be +to cancel any accidentals from previous key signatures. This may be prevented by setting to \"false\" the @code{printKeyCancellation} property in the @code{Staff} context. @@ -16,12 +16,12 @@ property in the @code{Staff} context. } % begin verbatim \relative c' { \key d \major - a b cis d + a4 b cis d \key g \minor - a bes c d + a4 bes c d \set Staff.printKeyCancellation = ##f \key d \major - a b cis d + a4 b cis d \key g \minor - a bes c d + a4 bes c d } diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/input/lsr/printing-hairpins-using-al-niente-notation.ly new file mode 100644 index 0000000000..c7ad090b7f --- /dev/null +++ b/input/lsr/printing-hairpins-using-al-niente-notation.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +Hairpins may be printed with a circled tip (al niente notation) by +setting the @code{circled-tip} property of the @code{Hairpin} object to +@code{#t}. + +" + doctitle = "Printing hairpins using al niente notation" +} % begin verbatim +\relative c'' { + \override Hairpin #'circled-tip = ##t + c2\< c\! + c4\> c\< c2\! +} diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly index 51da44e93c..b520dbfd3b 100644 --- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text" diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly index ce4c4b3ed4..22a3e84058 100644 --- a/input/lsr/printing-marks-on-every-staff.ly +++ b/input/lsr/printing-marks-on-every-staff.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text" diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly index db7520eabb..ea429db83c 100644 --- a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly +++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly @@ -1,15 +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" +\version "2.11.46" \header { lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides" texidoc = " -By default, metronome and rehearsal marks are printed above the staff. -If you would like to have them below the staff, simply set the -'side-axis and 'direction properties of MetronomeMark or RehearsalMark -appropriately. +By default, metronome and rehearsal marks are printed above the staff. +To place them below the staff simply set the @code{side-axis} and +@code{direction} properties of @code{MetronomeMark} or +@code{RehearsalMark} appropriately. " doctitle = "Printing metronome and rehearsal marks below the staff" @@ -19,11 +19,13 @@ appropriately. \override Score.MetronomeMark #'side-axis = #Y \override Score.MetronomeMark #'direction = #DOWN - \tempo 8.=120 c''1 + \tempo 8. = 120 + c''1 % Rehearsal marks below the staff \override Score.RehearsalMark #'side-axis = #Y \override Score.RehearsalMark #'direction = #DOWN - \mark\default c''1 + \mark \default + c''1 } diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 73b9d4b58f..5fa330703a 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly index 48b32e0129..952e6dfe1b 100644 --- a/input/lsr/proportional-strict-notespacing.ly +++ b/input/lsr/proportional-strict-notespacing.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly index f0be04104a..4fa8974460 100644 --- a/input/lsr/quoting-another-voice-with-transposition.ly +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -1,13 +1,14 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { lsrtags = "pitches,staff-notation" texidoc = "Quotations take into account the transposition of both -source and target. In this example, all instruments play sounding -middle C; the target is an instrument in F. The target part may be -transposed using @code{\\transpose}. In this case, all the pitches (including the -quoted ones) are transposed." +source and target. In this example, all instruments play sounding +middle C; the target is an instrument in F. The target part may be +transposed using @code{\\transpose}. In this case, all the pitches +(including the quoted ones) are transposed. +" doctitle = "Quoting another voice with transposition" } % begin verbatim @@ -31,7 +32,7 @@ quoteTest = { } { - \set Staff.instrumentName = \markup \center-align { "Horn" "in F" } + \set Staff.instrumentName = \markup \center-align { Horn \line { in F } } \quoteTest \transpose c' d' << \quoteTest s4_"up a tone" >> } diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly index 09328e4ed5..c822b72618 100644 --- a/input/lsr/quoting-another-voice.ly +++ b/input/lsr/quoting-another-voice.ly @@ -1,39 +1,42 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right= ##t } +\version "2.11.46" \header { lsrtags = "staff-notation" texidoc = "With @code{\\quote}, fragments of previously entered -music may be quoted. @code{quotedEventTypes} will determines what -things are quoted. In this example, a 16th rest is not quoted, since +music may be quoted. @code{quotedEventTypes} will determines which +items are quoted. In this example, a 16th rest is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." doctitle = "Quoting another voice" } % begin verbatim quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } -\addQuote quoteMe \quoteMe -original = \relative c'' { c8 d s2 es8 gis8 } +\addQuote quoteMe \quoteMe +original = \relative c'' { + c8 d s2 + \once \override NoteColumn #'ignore-collision = ##t + es8 gis8 +} << - \new Staff { - \set Staff.instrumentName = "quoteMe" - \quoteMe - } - \new Staff { - \set Staff.instrumentName = "orig" - \original - } - \new Staff \relative c'' << - \set Staff.instrumentName = "orig+quote" - \set Staff.quotedEventTypes = #'(note-event articulation-event) - \original - \new Voice { - s4 + \new Staff { + \set Staff.instrumentName = "quoteMe" + \quoteMe + } + \new Staff { + \set Staff.instrumentName = "orig" + \original + } + \new Staff \relative c'' << + \set Staff.instrumentName = "orig+quote" + \set Staff.quotedEventTypes = #'(note-event articulation-event) + \original + \new Voice { + s4 \set fontSize = #-4 \override Stem #'length-fraction = #(magstep -4) \quoteDuring #"quoteMe" { \skip 2. } - } - >> + } + >> >> diff --git a/input/lsr/removing-the-first-empty-line.ly b/input/lsr/removing-the-first-empty-line.ly index 2df9dbbad1..e2e6f8a01d 100644 --- a/input/lsr/removing-the-first-empty-line.ly +++ b/input/lsr/removing-the-first-empty-line.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, tweaks-and-overrides, breaks" diff --git a/input/lsr/repeats.snippet-list b/input/lsr/repeats.snippet-list index dc08d0bc1a..a04d57124b 100644 --- a/input/lsr/repeats.snippet-list +++ b/input/lsr/repeats.snippet-list @@ -1,4 +1,5 @@ positioning-segno-and-coda-with-line-break.ly +volta-below-chords.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 c39a4caa8d..11630a1bbe 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 85c4cf16e2..225b4a101f 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index dac51a8817..8222963f95 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -5,9 +5,8 @@ adding-drum-parts.ly rest-styles.ly skips-in-lyric-mode-2.ly chant-or-psalms-notation.ly -heavily-customized-polymetric-time-signatures.ly controlling-tuplet-bracket-visibility.ly -changing-the-tuplet-number.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 @@ -18,6 +17,7 @@ printing-metronome-and-rehearsal-marks-below-the-staff.ly changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly making-an-object-invisible-with-the-transparent-property.ly automatic-beam-subdivisions.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 @@ -25,6 +25,6 @@ rhythmic-slashes.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly three-sided-box.ly permitting-line-breaks-within-beamed-tuplets.ly -printing-music-with-different-time-signatures.ly -engraving-ties-manually.ly skips-in-lyric-mode.ly +engraving-ties-manually.ly +printing-music-with-different-time-signatures.ly diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 9849f02c66..5978172da2 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "template" diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly index a47d70e155..8d10683a42 100644 --- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly @@ -5,10 +5,10 @@ lsrtags = "expressive-marks" texidoc = "If the note which ends a hairpin falls on a downbeat, the hairpin stops at the bar line immediately preceding. This behavior -can be controlled by overriding the @code{'to-barline} property. +can be controlled by overriding the @code{to-barline} property. " doctitle = "Setting hairpin behavior at bar lines" -} +} % begin verbatim \relative c'' { e4\< e2. diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/input/lsr/setting-the-minimum-length-of-hairpins.ly new file mode 100644 index 0000000000..0384a4892b --- /dev/null +++ b/input/lsr/setting-the-minimum-length-of-hairpins.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +If hairpins are too short, they can be lengthened by modifying the +@code{minimum-length} property of the @code{Hairpin} object. + +" + doctitle = "Setting the minimum length of hairpins" +} % begin verbatim +\relative c'' { + c4\< c\! d\> e\! + \override Hairpin #'minimum-length = #5 + << f1 { s4 s\< s\> s\! } >> +} diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly index 6c11abeeb4..571a2a8562 100644 --- a/input/lsr/shortening-volta-brackets.ly +++ b/input/lsr/shortening-volta-brackets.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "repeats" @@ -16,11 +16,14 @@ lasts one measure, which is a duration of 3/4. } % begin verbatim \relative c'' { \time 3/4 - c c c + c4 c c \set Score.voltaSpannerDuration = #(ly:make-moment 3 4) - \repeat volta 5 { d d d } + \repeat volta 5 { d4 d d } \alternative { - { e e e f f f } - { g g g } + { + e4 e e + f4 f f + } + { g4 g g } } } diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly index 91c14fa3c0..df8dc11382 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly index 495ac44c4b..92d67dba0b 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly index 68b6a84c94..5250472ad3 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly index 19a9f6d79f..a8c2f2dda2 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "template" diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index 99fb363298..01a42d3ad3 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly index 36ca004e64..c777c76c22 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index 1ccff8fb18..ddfb9b9f30 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -1,21 +1,22 @@ -creating-blank-staves.ly removing-the-first-empty-line.ly mensurstriche-layout-bar-lines-between-the-staves.ly +changing-the-number-of-lines-in-a-staff.ly incipit.ly +display-bracket-with-only-one-staff-in-a-system.ly +adding-an-extra-staff.ly +printing-metronome-and-rehearsal-marks-below-the-staff.ly +tweaking-clef-properties.ly +quoting-another-voice.ly +volta-multi-staff.ly +non-traditional-key-signatures.ly +creating-blank-staves.ly adding-ambitus-per-voice.ly making-some-staff-lines-thicker-than-the-others.ly adding-an-extra-staff-at-a-line-break.ly -display-bracket-with-only-one-staff-in-a-system.ly time-signature-in-parentheses.ly -printing-metronome-and-rehearsal-marks-below-the-staff.ly -tweaking-clef-properties.ly -adding-an-extra-staff.ly changing-the-staff-size.ly use-square-bracket-at-the-start-of-a-staff-group.ly -quoting-another-voice.ly -volta-multi-staff.ly -inserting-score-fragments-above-a-staff,-as-markups.ly -changing-the-number-of-lines-in-a-staff.ly quoting-another-voice-with-transposition.ly -non-traditional-key-signatures.ly +inserting-score-fragments-above-a-staff,-as-markups.ly +volta-below-chords.ly nesting-staves.ly diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly index eb338b8416..73c145ab15 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly index c9c7ee500c..8e00d3dcdb 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly b/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly new file mode 100644 index 0000000000..a4e37c48ef --- /dev/null +++ b/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +When two or more glissandi intersect with each other, a warning +message, \"warning: ignoring too many clashing note columns\" will +appear when compiling the LilyPond file. Here is a way to get rid of +this message. + +" + doctitle = "Suppressing compiler warnings when two glissandos intersect" +} % begin verbatim +Ignore = \once \override NoteColumn #'ignore-collision = ##t + +\relative c'' << + { b1 \glissando c, } \\ + { \Ignore b1 \glissando \Ignore c' } +>> diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly index 4e6016acad..abab3fffc7 100644 --- a/input/lsr/table-of-contents.ly +++ b/input/lsr/table-of-contents.ly @@ -1,11 +1,10 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" -\layout { ragged-right= ##t } +\version "2.11.46" \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using -@code{\\markuplines \\table-of-contents}. The TOC items are added with +@code{\\markuplines \\table-of-contents}. The TOC items are added with the @code{\\tocItem} command." doctitle = "Table of contents" } % begin verbatim @@ -15,19 +14,18 @@ the @code{\\tocItem} command." \book { \markuplines \table-of-contents \pageBreak - - \tocItem \markup "The first score" + \tocItem \markup { The first score } \score { - { + { c'1 \pageBreak - \mark "A" \tocItem \markup "Mark A" - d' + \mark "A" \tocItem \markup { Mark A } + d'1 } } \pageBreak - \tocItem \markup "The second score" + \tocItem \markup { The second score } \score { - { e' } + { e'1 } \header { piece = "Second score" } } } diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list index 4b1aebcb63..4a2ef8b4e7 100644 --- a/input/lsr/template.snippet-list +++ b/input/lsr/template.snippet-list @@ -1,17 +1,17 @@ vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly single-staff-template-with-notes-and-lyrics.ly single-staff-template-with-only-notes.ly -ancient-notation-template----modern-transcription-of-mensural-music.ly jazz-combo-template.ly -vocal-ensemble-template-with-automatic-piano-reduction.ly +score-for-diatonic-accordion.ly piano-template-simple.ly -piano-template-with-centered-dynamics.ly +ancient-notation-template----modern-transcription-of-mensural-music.ly ancient-notation-template----modern-transcription-of-gregorian-music.ly -vocal-ensemble-template.ly +single-staff-template-with-notes-and-chords.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 -single-staff-template-with-notes,-lyrics,-and-chords.ly -string-quartet-template-simple.ly -single-staff-template-with-notes-and-chords.ly +vocal-ensemble-template.ly +piano-template-with-centered-dynamics.ly piano-template-with-centered-lyrics.ly -score-for-diatonic-accordion.ly +vocal-ensemble-template-with-automatic-piano-reduction.ly diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list index 7cd7234f91..c8f4874b1e 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -10,13 +10,13 @@ printing-marks-on-every-staff.ly blanking-staff-lines-using-the--whiteout-command.ly integrating-text-indications-in-metronome-marks.ly adjusting-lyrics-vertical-spacing.ly -combining-dynamics-with-markup-texts.ly +creating-text-spanners.ly creating-real-parenthesized-dynamics.ly center-text-below-hairpin-dynamics.ly demonstrating-all-headers.ly -how-to-put-ties-between-syllables-in-lyrics.ly combining-two-parts-on-the-same-staff.ly -creating-text-spanners.ly +how-to-put-ties-between-syllables-in-lyrics.ly +combining-dynamics-with-markup-texts.ly aligning-marks-with-various-notation-objects.ly ottava-text.ly creating-simultaneous-rehearsal-marks.ly diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index e9fb519f83..44525eec0b 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms, text" diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly index 6f5c65f126..869190be8b 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -1,28 +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" +\version "2.11.46" \header { lsrtags = "staff-notation, tweaks-and-overrides" texidoc = " -You may put the time signature in parentheses. +The time signature can be enclosed within parentheses. " doctitle = "Time signature in parentheses" } % begin verbatim -tsMarkup = \markup { - \override #'(baseline-skip . 2) \number { - \bracket \column { "2" "4" } - } +tsMarkup = \markup { + \override #'(baseline-skip . 2) \number { + \bracket \column { 2 4 } + } } -\score { - \relative c'' { - \override Staff.TimeSignature #'stencil = #ly:text-interface::print - \override Staff.TimeSignature #'text = #tsMarkup - \time 2/4 - - a4 b8 c | - } +\relative c'' { + \override Staff.TimeSignature #'stencil = #ly:text-interface::print + \override Staff.TimeSignature #'text = #tsMarkup + \time 2/4 + a4 b8 c } diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly index e5565e6bec..37361f436c 100644 --- a/input/lsr/transcription-of-ancient-music-with-incipit.ly +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 00d44c82d4..b0a42bf218 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,11 +1,12 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \header { - lsrtags = "pitches" - texidoces = "Este ejemplo utiliza código de Scheme para forzar las modificaciones enarmónicas de las -notas, y así tener el menor número de alteraciones accidentales. En este caso -se aplican las siguientes reglas: +texidoces = " +Este ejemplo utiliza código de Scheme para forzar las +modificaciones enarmónicas de las notas, y así tener el menor +número de alteraciones accidentales. En este caso se aplican las +siguientes reglas: @itemize @item @@ -25,12 +26,13 @@ Fa bemol -> Mi @end itemize -De esta forma se selecciona el mayor número de notas enarmónicas naturales. +De esta forma se selecciona el mayor número de notas enarmónicas +naturales. " - - texidoc = "This example uses some Scheme code to enforce enharmonic modifications for -notes in order to have the minimum number of accidentals. In this -case, the following rules apply: + lsrtags = "pitches" + texidoc = "This example uses some Scheme code to enforce enharmonic +modifications for notes in order to have the minimum number of +accidentals. In this case, the following rules apply: @itemize @item @@ -57,7 +59,7 @@ In this manner, the most natural enharmonic notes are chosen. #(define (naturalize-pitch p) (let* ((o (ly:pitch-octave p)) - (a (* 4 (ly:pitch-alteration p))) + (a (* 4 (ly:pitch-alteration p))) ; alteration, a, in quarter tone steps, for historical reasons (n (ly:pitch-notename p))) (cond @@ -70,8 +72,8 @@ In this manner, the most natural enharmonic notes are chosen. (cond ((> a 2) (set! a (- a 4)) (set! n (+ n 1))) ((< a -2) (set! a (+ a 4)) (set! n (- n 1)))) - (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7)))) - (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7)))) + (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7)))) + (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7)))) (ly:make-pitch o n (/ a 4)))) #(define (naturalize music) @@ -106,5 +108,5 @@ music = \relative c' { c4 d e g } \transpose c deses \music \naturalizeMusic \transpose c deses \music } - \layout { ragged-right = ##t } + \layout {} } diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index 8bb46a8932..8f0e651fa0 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -1,10 +1,44 @@ %% 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" +\version "2.11.46" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" +texidoces = " +La instrucción @code{\clef \"treble_8\"} equivale a un ajuste de +@code{clefGlyph}, @code{clefPosition} (que controla la posición +vertical de la clave), @code{middleCPosition} y +@code{clefOctavation}. Se imprime una clave cada vez que se +modifica cualquiera de las propiedades excepto +@code{middleCPosition}. + + +Observe que la modificación del glifo, la posición de la clave o +su octavación, no cambian 'per se' la posición de las siguientes +notas del pentagrama: para hacer esto también se debe especificar +la posición del Do central. Los parámetros posicionales están en +relación con la tercera línea del pentagrama, los números +positivos desplazan hacia arriba, contando una unidad por cada +línea y espacio. El valor de @code{clefOctavation} se +establecería normalmente a 7, -7, 15 or -15, pero son válidos +otros valores. + + +Cuando se produce un cambio de clave en el salto de línea se +imprime la clave nueva tanto al final de la línea anterior como al +principio de la nueva, de forma predeterminada. Si no se necesita +la clave de advertencia al final de la línea anterior, se puede +quitar estableciendo el valor de la propiedad +@code{explicitClefVisibility} de @code{Staff}, a +@code{end-of-line-invisible}. El comportamiento predeterminado se +puede recuperar con @code{\unset Staff.explicitClefVisibility}. + +Los siguientes ejemplos muestran las posibilidades cuando se +ajustan estas propiedades manualmente. En la primera línea, los +cambios manuales preservan el posicionamiento relativo estándar de +las claves y las notas, pero no lo hacen en la segunda línea. +" texidoc = " The command @code{\\clef \"treble_8\"} is equivalent to setting @code{clefGlyph}, @code{clefPosition} (which controls the vertical @@ -36,41 +70,6 @@ standard relative positioning of clefs and notes, whereas on the second line, they do not. " - texidoces = " -La instrucción @code{\\clef \"treble_8\"} equivale a un ajuste de -@code{clefGlyph}, @code{clefPosition} (que controla la posición vertical -de la clave), @code{middleCPosition} y @code{clefOctavation}. Se imprime -una clave cada vez que se modifica cualquiera de las propiedades -excepto @code{middleCPosition}. - - -Observe que la modificación del glifo, la posición de la clave -o su octavación, no cambian 'per se' la posición de las siguientes notas -del pentagrama: para hacer esto también se debe especificar la posición -del Do central. Los parámetros posicionales están en relación con la tercera -línea del pentagrama, los números positivos desplazan hacia arriba, -contando una unidad por cada línea y espacio. El valor de @code{clefOctavation} -se estaablecería normalmente a 7, -7, 15 or -15, pero son válidos otros valores. - - -Cuando se produce un cambio de clave en el salto de línea se -imprime la clave nueva tanto al final de la línea anterior como al -principio de la nueva, de forma predeterminada. Si no se necesita -la clave de advertencia al final de la línea anterior, se puede -quitar estableciendo el valor de la propiedad -@code{explicitClefVisibility} de @code{Staff}, a -@code{end-of-line-invisible}. El comportamiento predeterminado se -puede recuperar con @code{\\unset Staff.explicitClefVisibility}. - -Los siguientes ejemplos muestran las posibilidades cuando se -ajustan estas propiedades manualmente. En la primera línea, los -cambios manuales preservan el posicionamiento relativo estándar de -las claves y las notas, pero no lo hacen en la segunda línea. - -" - - - doctitle = "Tweaking clef properties" } % begin verbatim { @@ -80,42 +79,42 @@ las claves y las notas, pero no lo hacen en la segunda línea. \set Staff.clefGlyph = #"clefs.F" \set Staff.clefPosition = #2 \set Staff.middleCPosition = #6 - c' + c'1 % The baritone clef \set Staff.clefGlyph = #"clefs.C" \set Staff.clefPosition = #4 \set Staff.middleCPosition = #4 - c' + c'1 % The standard choral tenor clef \set Staff.clefGlyph = #"clefs.G" \set Staff.clefPosition = #-2 \set Staff.clefOctavation = #-7 \set Staff.middleCPosition = #1 - c' + c'1 % A non-standard clef \set Staff.clefPosition = #0 \set Staff.clefOctavation = #0 \set Staff.middleCPosition = #-4 - c' \break + c'1 \break % The following clef changes do not preserve % the normal relationship between notes and clefs: \set Staff.clefGlyph = #"clefs.F" \set Staff.clefPosition = #2 - c' + c'1 \set Staff.clefGlyph = #"clefs.G" - c' + c'1 \set Staff.clefGlyph = #"clefs.C" - c' + c'1 \set Staff.clefOctavation = #7 - c' + c'1 \set Staff.clefOctavation = #0 \set Staff.clefPosition = #0 - c' + c'1 % Here we go back to the normal clef: \set Staff.middleCPosition = #0 - c' + c'1 } diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index ab5af2c7e9..dde15429b3 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,5 +1,5 @@ display-bracket-with-only-one-staff-in-a-system.ly -time-signature-in-parentheses.ly +rhythmic-slashes.ly changing-the-default-text-font-family.ly drawing-boxes-around-grobs.ly manually-controlling-beam-positions.ly @@ -10,6 +10,7 @@ using-the--tweak-command-to-tweak-individual-grobs.ly controlling-tuplet-bracket-visibility.ly positioning-multi--measure-rests.ly changing-the-staff-size.ly +controlling-the-vertical-ordering-of-scripts.ly vertically-aligning-ossias-and-lyrics.ly changing-properties-for-individual-grobs.ly removing-the-first-empty-line.ly @@ -22,11 +23,10 @@ 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 -adding-text-indications-to-metronome-marks.ly creating-text-spanners.ly caesura-railtracks-with-fermata.ly changing-form-of-multi--measure-rests.ly -rhythmic-slashes.ly +time-signature-in-parentheses.ly changing-a-single-notes-size-in-a-chord.ly creating-simultaneous-rehearsal-marks.ly nesting-staves.ly diff --git a/input/lsr/unfretted-strings.snippet-list b/input/lsr/unfretted-strings.snippet-list index 4afa6824c0..5ee803315f 100644 --- a/input/lsr/unfretted-strings.snippet-list +++ b/input/lsr/unfretted-strings.snippet-list @@ -1,5 +1,5 @@ string-quartet-template-with-separate-parts.ly +string-quartet-template-simple.ly changing--flageolet-mark-size.ly creating-slurs-across-voices.ly -string-quartet-template-simple.ly demo-midiinstruments.ly diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly index 66b593ed09..f1522176a2 100644 --- a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly +++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly new file mode 100644 index 0000000000..eab7728f2a --- /dev/null +++ b/input/lsr/using-double-slurs-for-legato-chords.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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +Some composers write two slurs when they want legato chords. This can +be achieved by setting @code{doubleSlurs} + +" + doctitle = "Using double slurs for legato chords" +} % begin verbatim +\relative c' { + \set doubleSlurs = ##t + 4( ) +} diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index 82c79adeb3..65b5c8e48f 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,22 +1,23 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \layout { ragged-right= ##t } \header { lsrtags = "tweaks-and-overrides" texidoc = " -With the @code{\tweak} command, you can tune every grob directly. Here +With the @code{\\tweak} command, every grob can be tuned directly. Here are some examples of available tweaks. " doctitle = "Using the @code{\tweak} command to tweak individual grobs" } % begin verbatim -{ +\relative c' { + \time 2/4 \set fingeringOrientations = #'(right) < - \tweak #'font-size #3 c + \tweak #'font-size #3 c \tweak #'color #red d-\tweak #'font-size #8 -4 - \tweak #'style #'cross g - \tweak #'duration-log #1 a - >4 + \tweak #'style #'cross g + \tweak #'duration-log #2 a + >2 } diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly index 50fac99b4e..ba037df42b 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "rhythms" diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly index 2918e75da0..479bbe5ed8 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs @@ -11,21 +11,21 @@ You may have to install additional fonts. Red Hat Fedora taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ - ttfonts-zh_CN fonts-ja fonts-hebrew + ttfonts-zh_CN fonts-ja fonts-hebrew Debian GNU/Linux apt-get install emacs-intl-fonts xfonts-intl-.* \ - ttf-kochi-gothic ttf-kochi-mincho \ - xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi + ttf-kochi-gothic ttf-kochi-mincho \ + xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi %} \header { lsrtags = "text" texidoc = "Various scripts may be used for texts (like titles and -lyrics) introduced by entering them in UTF-8 encoding, and using a -Pango based backend. Depending on the fonts installed, this fragment -will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. +lyrics) by entering them in UTF-8 encoding, and using a Pango based +backend. Depending on the fonts installed, this fragment will +render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. " doctitle = "UTF-8" } % begin verbatim @@ -37,28 +37,27 @@ bulgarian = \lyricmode { Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. } -hebrew = \lyricmode { +hebrew = \lyricmode { זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. } -japanese = \lyricmode { +japanese = \lyricmode { いろはにほへど ちりぬるを わがよたれぞ つねならむ うゐのおくや まけふこえて - あさきゆめみじ ゑひもせず + あさきゆめみじ ゑひもせず } % "a legal song to you" -portuguese = \lyricmode { +portuguese = \lyricmode { à vo -- cê uma can -- ção legal } -\paper { - ragged-right = ##t -} - -\relative { - c2 d e f g f e +\relative { + c2 d + e2 f + g2 f + e1 } \addlyrics { \bulgarian } \addlyrics { \hebrew } diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly new file mode 100644 index 0000000000..84925b1e39 --- /dev/null +++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly @@ -0,0 +1,21 @@ +%% 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.46" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +Dynamics that occur at, begin on, or end on the same note will be +vertically aligned. To ensure that dynamics are aligned when they do +not occur on the same note, increase the @code{staff-padding} property +of the @code{DynamicLineSpanner} object. + +" + doctitle = "Vertically aligning dynamics across multiple notes" +} % begin verbatim +\relative c' { + \override DynamicLineSpanner #'staff-padding = #4 + c2\p f\mf + g2\< b4\> c\! +} diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index af75028cfd..c0be939398 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, tweaks-and-overrides, spacing" diff --git a/input/lsr/vertically-centered-dynamics-and-textscripts.ly b/input/lsr/vertically-centered-dynamics-and-textscripts.ly index 209c67322f..4175534605 100644 --- a/input/lsr/vertically-centered-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-centered-dynamics-and-textscripts.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly index bf4bcd4a49..b23db33f97 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index 01c274f718..366a74507d 100644 --- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "text, vocal-music, contexts-and-engravers, template" diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index 7a2e96fb35..8bcab05f4b 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -1,6 +1,6 @@ %% 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" +\version "2.11.46" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index 523cefb8cd..ff4d5a6c04 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -6,12 +6,12 @@ skips-in-lyric-mode.ly vocal-ensemble-template-with-automatic-piano-reduction.ly ambitus-with-multiple-voices.ly how-to-put-ties-between-syllables-in-lyrics.ly -piano-template-with-melody-and-lyrics.ly -single-staff-template-with-notes,-lyrics,-and-chords.ly -demo-midiinstruments.ly -formatting-lyrics-syllables.ly vertically-aligning-ossias-and-lyrics.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +single-staff-template-with-notes,-lyrics,-and-chords.ly +formatting-lyrics-syllables.ly +piano-template-with-melody-and-lyrics.ly +aligning-lyrics.ly vocal-ensemble-template.ly adjusting-lyrics-vertical-spacing.ly -aligning-lyrics.ly +demo-midiinstruments.ly diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly new file mode 100644 index 0000000000..1c714a2008 --- /dev/null +++ b/input/lsr/volta-below-chords.ly @@ -0,0 +1,31 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.46" +\layout { ragged-right= ##t } +\header { + lsrtags = "repeats,staff-notation,chords" + texidoc = "By adding the @code{Volta_engraver} to the relevant +staff, volte can be put under chords." + doctitle = "Volta under chords" +} % begin verbatim + +% chords above volta +\score { + << + \chords { + c1 + c + } + \new Staff \with { \consists Volta_engraver } { + \repeat volta 2 { c'1 } + \alternative { c' } + } + >> + \layout { + \context { + \Score + \remove Volta_engraver + } + } +} + diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index e215a35865..229902e2d7 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,26 +1,30 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.38" +\version "2.11.46" \layout { ragged-right= ##t } \header { lsrtags = "repeats,staff-notation" - texidoc = "By adding @code{Volta_engraver}, repeat brackets -can be put over staves other than the topmost one in a score." + texidoc = "By adding the @code{Volta_engraver} to the relevant +staff, volte can be put over staves other than the topmost +one in a score." doctitle = "Volta multi-staff" } % begin verbatim - -vmus = \relative c'' { - \repeat volta 2 c1 \alternative { d e } +voltaMusic = \relative c'' { + \repeat volta 2 + c1 + \alternative { + d e + } } << \new StaffGroup << - \context Staff \vmus - \new Staff \vmus + \context Staff \voltaMusic + \new Staff \voltaMusic >> \new StaffGroup << - \new Staff \with { \consists Volta_engraver } - \vmus - \new Staff \vmus + \new Staff \with { \consists "Volta_engraver" } + \voltaMusic + \new Staff \voltaMusic >> >> -- 2.39.2