From f47c92f6bb1148cf694883e688c8812417d5683e Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Tue, 5 Jul 2011 11:15:12 +0200 Subject: [PATCH] Doc: LSR update --- .../snippets/accordion-discant-symbols.ly | 2 +- .../adding-bar-lines-to-chordnames-context.ly | 2 +- Documentation/snippets/adding-drum-parts.ly | 2 +- ...to-staves-which-get-split-after-a-break.ly | 2 +- Documentation/snippets/ancient-fonts.ly | 2 +- Documentation/snippets/chords.snippet-list | 1 + .../creating-double-digit-fingerings.ly | 2 +- ...ff-chords---beaming-problems-workaround.ly | 50 +++++++++++++++++++ .../customizing-fretboard-fret-diagrams.ly | 2 +- .../snippets/demo-midiinstruments.ly | 2 +- ...ing-the-extender-line-for-text-dynamics.ly | 2 +- Documentation/snippets/hymn-template.ly | 1 + Documentation/snippets/jazz-combo-template.ly | 2 +- Documentation/snippets/keyboards.snippet-list | 1 + .../snippets/partcombine-and-autobeamoff.ly | 2 + .../piano-template-with-melody-and-lyrics.ly | 2 +- .../snippets/removing-the-first-empty-line.ly | 2 +- .../tweaks-and-overrides.snippet-list | 1 + ...e-bracket-at-the-start-of-a-staff-group.ly | 2 +- ...pt-to-generate-special-note-head-shapes.ly | 4 +- 20 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly index 096d76dd12..b3a92fb486 100644 --- a/Documentation/snippets/accordion-discant-symbols.ly +++ b/Documentation/snippets/accordion-discant-symbols.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "keyboards" diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly index 9280c01b44..204a862023 100644 --- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly +++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "chords" diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly index 770aa89f00..78afd3d1a3 100644 --- a/Documentation/snippets/adding-drum-parts.ly +++ b/Documentation/snippets/adding-drum-parts.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "rhythms, percussion" diff --git a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly index e2c62cd250..5749977d07 100644 --- a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly +++ b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "staff-notation, vocal-music" diff --git a/Documentation/snippets/ancient-fonts.ly b/Documentation/snippets/ancient-fonts.ly index e1d85e1770..42b43c2176 100644 --- a/Documentation/snippets/ancient-fonts.ly +++ b/Documentation/snippets/ancient-fonts.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "ancient-notation" diff --git a/Documentation/snippets/chords.snippet-list b/Documentation/snippets/chords.snippet-list index 0749eb969e..86bdaefd0e 100644 --- a/Documentation/snippets/chords.snippet-list +++ b/Documentation/snippets/chords.snippet-list @@ -9,6 +9,7 @@ chord-name-exceptions.ly chord-name-major7.ly clusters.ly controlling-the-placement-of-chord-fingerings.ly +cross-staff-chords---beaming-problems-workaround.ly displaying-complex-chords.ly manually-break-figured-bass-extenders-for-only-some-numbers.ly showing-chords-at-changes.ly diff --git a/Documentation/snippets/creating-double-digit-fingerings.ly b/Documentation/snippets/creating-double-digit-fingerings.ly index e36819c642..f86634bbba 100644 --- a/Documentation/snippets/creating-double-digit-fingerings.ly +++ b/Documentation/snippets/creating-double-digit-fingerings.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.12.2" +\version "2.14.0" \header { lsrtags = "expressive-marks, staff-notation, editorial-annotations, tweaks-and-overrides" diff --git a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly new file mode 100644 index 0000000000..b01a0ad757 --- /dev/null +++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly @@ -0,0 +1,50 @@ +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.dsi.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.14.0" + +\header { + lsrtags = "chords, keyboards, tweaks-and-overrides" + + texidoc = " +Sometimes it is better to use stems from the upper staff for creating +cross-staff chords, because no problems with automatic beam collision +avoidance then arise. If the stems from the lower staff were used in +the following example, it would be necessary to change the automatic +beam collision avoidance settings so that it doesn't detect collisions +between staves using @code{\\override Staff.Beam #'collision-voice-only += ##t} + +" + doctitle = "Cross-staff chords - beaming problems workaround" +} % begin verbatim + +\new PianoStaff << + \new Staff = up + \relative c' { + << + { r4 + \override Stem #'cross-staff = ##t + \override Stem #'length = #19 % this is in half-spaces, + % so it makes stems 9.5 staffspaces long + \override Stem #'Y-offset = #-6 % stems are normally lengthened + % upwards, so here we must lower the stem by the amount + % equal to the lengthening - in this case (19 - 7) / 2 + % (7 is default stem length) + e e e } + { s4 + \change Staff = "bottom" + c, c c + } + >> + } + \new Staff = bottom + \relative c' { + \clef bass + \voiceOne + g8 a g a g a g a + } +>> diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly index 1e86dcc66d..cfbabf5a9b 100644 --- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly +++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "fretted-strings, tweaks-and-overrides" diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly index e1ba733c2b..78de4305ff 100644 --- a/Documentation/snippets/demo-midiinstruments.ly +++ b/Documentation/snippets/demo-midiinstruments.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "midi" diff --git a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly index dba17f532b..9db5d0633b 100644 --- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly +++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "expressive-marks" diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly index 1c26594742..0ee49bf43b 100644 --- a/Documentation/snippets/hymn-template.ly +++ b/Documentation/snippets/hymn-template.ly @@ -18,6 +18,7 @@ añadir los versos como texto independiente debajo de la música. " doctitlees = "Plantilla para himnos" + %% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 texidocde = " diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly index c25a96fe53..93e0d4a13b 100644 --- a/Documentation/snippets/jazz-combo-template.ly +++ b/Documentation/snippets/jazz-combo-template.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "keyboards, percussion, fretted-strings, template" diff --git a/Documentation/snippets/keyboards.snippet-list b/Documentation/snippets/keyboards.snippet-list index 0c440941d6..b8eb5cf574 100644 --- a/Documentation/snippets/keyboards.snippet-list +++ b/Documentation/snippets/keyboards.snippet-list @@ -3,6 +3,7 @@ changing-the-text-for-sustain-markings.ly clusters.ly controlling-the-placement-of-chord-fingerings.ly creating-slurs-across-voices.ly +cross-staff-chords---beaming-problems-workaround.ly cross-staff-tremolos.ly fine-tuning-pedal-brackets.ly indicating-cross-staff-chords-with-arpeggio-bracket.ly diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly index 338e039157..e84da405de 100644 --- a/Documentation/snippets/partcombine-and-autobeamoff.ly +++ b/Documentation/snippets/partcombine-and-autobeamoff.ly @@ -47,6 +47,7 @@ necesario hacer tres llamadas a @code{\\autoBeamOff}. " doctitlees = "Partcombine y autoBeamOff" + %% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 texidocde = " @@ -78,6 +79,7 @@ wenn man es mit @code{\\partcombine} verwendet, muss @code{\\autoBeamOff} " doctitlede = "Partcombine und autoBeamOff" + %% Translation of GIT committish: e1a149d0cc60b02e86209387958f4028567dd366 texidocfr = " Le fonction @code{@bs{}autoBeamOff} dans le cadre d'un diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly index 24cc3ba335..a5a5fbcdd5 100644 --- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly +++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly index 65e2011251..491eb9bb1d 100644 --- a/Documentation/snippets/removing-the-first-empty-line.ly +++ b/Documentation/snippets/removing-the-first-empty-line.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.14.0" +\version "2.15.2" \header { lsrtags = "staff-notation, tweaks-and-overrides, breaks" diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index 207649664b..f6ecc20234 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -20,6 +20,7 @@ creating-a-delayed-turn.ly creating-double-digit-fingerings.ly creating-simultaneous-rehearsal-marks.ly creating-text-spanners.ly +cross-staff-chords---beaming-problems-workaround.ly custodes.ly customizing-fretboard-fret-diagrams.ly customizing-markup-fret-diagrams.ly diff --git a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly index ac9dfc5102..7c86e7a6c7 100644 --- a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly +++ b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly @@ -41,7 +41,7 @@ mentionnerez explicitement au sein d'un contexte @code{StaffGroup} ou texidoc = " The system start delimiter @code{SystemStartSquare} can be used by -setting it explicitly in a @code{StaffGroup} or @code{ChoirStaffGroup} +setting it explicitly in a @code{StaffGroup} or @code{ChoirStaff} context. " diff --git a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly index a16dcd6d79..ff14f5a769 100644 --- a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly +++ b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly @@ -41,7 +41,7 @@ parallelogram = fill grestore" ) (cons 0 1.3125) - (cons 0 0)) + (cons -.75 .75)) myNoteHeads = \override NoteHead #'stencil = \parallelogram normalNoteHeads = \revert NoteHead #'stencil @@ -52,5 +52,3 @@ normalNoteHeads = \revert NoteHead #'stencil \normalNoteHeads 4 d } - - -- 2.39.2