From: David Kastrup Date: Sun, 22 Jan 2017 14:26:56 +0000 (+0100) Subject: Run scripts/auxiliar/makelsr.py X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=f2c5cd5aba42472996a33b463ed39abe23353484 Run scripts/auxiliar/makelsr.py --- diff --git a/Documentation/snippets/contexts-and-engravers.snippet-list b/Documentation/snippets/contexts-and-engravers.snippet-list index 3b3c016eb3..cfa813c52b 100644 --- a/Documentation/snippets/contexts-and-engravers.snippet-list +++ b/Documentation/snippets/contexts-and-engravers.snippet-list @@ -17,5 +17,6 @@ nesting-staves.ly numbering-groups-of-measures.ly removing-bar-numbers-from-a-score.ly use-square-bracket-at-the-start-of-a-staff-group.ly +using-marklines-in-a-frenched-score.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly vocal-ensemble-template-with-verse-and-refrain.ly diff --git a/Documentation/snippets/expressive-marks.snippet-list b/Documentation/snippets/expressive-marks.snippet-list index 0bc43e26f9..2aa843367d 100644 --- a/Documentation/snippets/expressive-marks.snippet-list +++ b/Documentation/snippets/expressive-marks.snippet-list @@ -41,6 +41,7 @@ line-arrows.ly making-slurs-with-complex-dash-structure.ly modifying-default-values-for-articulation-shorthand-notation.ly moving-slur-positions-vertically.ly +moving-the-ends-of-hairpins.ly positioning-arpeggios.ly positioning-text-markups-inside-slurs.ly printing-hairpins-in-various-styles.ly diff --git a/Documentation/snippets/moving-the-ends-of-hairpins.ly b/Documentation/snippets/moving-the-ends-of-hairpins.ly new file mode 100644 index 0000000000..7447284038 --- /dev/null +++ b/Documentation/snippets/moving-the-ends-of-hairpins.ly @@ -0,0 +1,38 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.55 +\version "2.19.55" + +\header { + lsrtags = "expressive-marks" + + texidoc = " +The ends of hairpins may be offset by setting the @code{shorten-pair} +property of the @code{Hairpin} object. Positive values move endpoints +to the right, negative to the left. Unlike the @code{minimum-length} +property, this property only affects the appearance of the hairpin; it +does not adjust horizontal spacing (including the position of bounding +dynamics). This method is thus suitable for fine-tuning a hairpin +within its allotted space. + +" + doctitle = "Moving the ends of hairpins" +} % begin verbatim + + +{ + c'1~\< + c'2~ c'\! + \once \override Hairpin.shorten-pair = #'(2 . 2) + c'1~\< + c'2~ c'\! + \once \override Hairpin.shorten-pair = #'(-2 . -2) + c'1~\< + c'2~ c'\! + c'1~\p-\tweak shorten-pair #'(2 . 0)\< + c'2~ c'\ffff +} diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list index bfb3706161..5095cbeb9c 100644 --- a/Documentation/snippets/staff-notation.snippet-list +++ b/Documentation/snippets/staff-notation.snippet-list @@ -47,6 +47,7 @@ tweaking-clef-properties.ly two--partcombine-pairs-on-one-staff.ly use-square-bracket-at-the-start-of-a-staff-group.ly using-autochange-with-more-than-one-voice.ly +using-marklines-in-a-frenched-score.ly vertical-aligned-staffgroups-without-connecting-systemstartbar.ly volta-below-chords.ly volta-multi-staff.ly diff --git a/Documentation/snippets/using-marklines-in-a-frenched-score.ly b/Documentation/snippets/using-marklines-in-a-frenched-score.ly new file mode 100644 index 0000000000..00dce4f6ad --- /dev/null +++ b/Documentation/snippets/using-marklines-in-a-frenched-score.ly @@ -0,0 +1,105 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.48 +\version "2.19.48" +\header { + lsrtags = "contexts-and-engravers, staff-notation" + texidoc = " +Using @code{MarkLine} contexts (such as in +@uref{http://lsr.di.unimi.it/LSR/Item?id=1010, LSR1010}) in a +Frenched score can be problematic if all the staves between two +@code{MarkLine}s are removed in one system. The +@code{Keep_alive_together_engraver} can be used within each +@code{StaffGroup} to keep the @code{MarkLine} alive only as long +as the other staves in the group stay alive. +" + doctitle = "Using marklines in a Frenched score" +} % begin verbatim + +bars = { + \tempo "Allegro" 4=120 + s1*2 + \repeat unfold 5 { \mark \default s1*2 } + \bar "||" + \tempo "Adagio" 4=40 + s1*2 + \repeat unfold 8 { \mark \default s1*2 } + \bar "|." +} +winds = \repeat unfold 120 { c''4 } +trumpet = { \repeat unfold 8 g'2 R1*16 \repeat unfold 4 g'2 R1*8 } +trombone = { \repeat unfold 4 c'1 R1*8 d'1 R1*17 } +strings = \repeat unfold 240 { c''8 } + +#(set-global-staff-size 16) +\paper { + systems-per-page = 5 + ragged-last-bottom = ##f +} + +\layout { + indent = 15\mm + short-indent = 5\mm + \context { + \name MarkLine + \type Engraver_group + \consists Output_property_engraver + \consists Axis_group_engraver + \consists Mark_engraver + \consists Metronome_mark_engraver + \override VerticalAxisGroup.remove-empty = ##t + \override VerticalAxisGroup.remove-layer = #'any + \override VerticalAxisGroup.staff-affinity = #DOWN + \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = 1 + keepAliveInterfaces = #'() + } + \context { + \Staff + \override VerticalAxisGroup.remove-empty = ##t + \override VerticalAxisGroup.remove-layer = ##f + } + \context { + \StaffGroup + \accepts MarkLine + \consists Keep_alive_together_engraver + } + \context { + \Score + \remove Mark_engraver + \remove Metronome_mark_engraver + } +} + +\score { + << + \new StaffGroup = "winds" \with { + instrumentName = "Winds" + shortInstrumentName = "Winds" + } << + \new MarkLine \bars + \new Staff \winds + >> + \new StaffGroup = "brass" << + \new MarkLine \bars + \new Staff = "trumpet" \with { + instrumentName = "Trumpet" + shortInstrumentName = "Tpt" + } \trumpet + \new Staff = "trombone" \with { + instrumentName = "Trombone" + shortInstrumentName = "Tbn" + } \trombone + >> + \new StaffGroup = "strings" \with { + instrumentName = "Strings" + shortInstrumentName = "Strings" + } << + \new MarkLine \bars + \new Staff = "strings" { \strings } + >> + >> +}