From 0d5cd27b3638ceea4b2326b795aef5b83d5389c4 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Sun, 23 Nov 2008 00:16:48 +0000 Subject: [PATCH] LSR: Update. --- ...ollisions-of-chord-fingering-with-beams.ly | 38 ++++++++++++ input/lsr/beam-endings-in-score-context.ly | 9 +++ input/lsr/chords.snippet-list | 1 + input/lsr/creating-text-spanners.ly | 16 ++--- .../customizing-fretboard-fret-diagrams.ly | 62 +++++++++---------- input/lsr/customizing-markup-fret-diagrams.ly | 10 +-- ...efined-fretboards-for-other-instruments.ly | 10 +-- input/lsr/editorial-annotations.snippet-list | 1 + input/lsr/isolated-percent-repeats.ly | 3 +- input/lsr/line-arrows.ly | 16 ++--- input/lsr/percent-repeat-count-visibility.ly | 8 +++ input/lsr/rhythms.snippet-list | 1 + input/lsr/tweaks-and-overrides.snippet-list | 1 + 13 files changed, 118 insertions(+), 58 deletions(-) create mode 100644 input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly diff --git a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly new file mode 100644 index 0000000000..62883a21bd --- /dev/null +++ b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly @@ -0,0 +1,38 @@ +%% 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.64" + +\header { + lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides" + + texidoc = " +Fingerings and string numbers applied to individual notes will +automatically avoid beams, but this is not true by default for +fingerings and string numbers applied to the individual notes of +chords. The following example shows how this default behavior can be +overriden: + +" + doctitle = "Avoiding collisions of chord fingering with beams" +} % begin verbatim + +\relative c' { + \set fingeringOrientations = #'(up) + \set stringNumberOrientations = #'(up) + \set strokeFingerOrientations = #'(up) + + % Default behavior + r8 + 8 + 8 + 8 + + % Corrected to avoid collisions + r8 + \override Fingering #'add-stem-support = ##t + 8 + \override StringNumber #'add-stem-support = ##t + 8 + \override StrokeFinger #'add-stem-support = ##t + 8 +} diff --git a/input/lsr/beam-endings-in-score-context.ly b/input/lsr/beam-endings-in-score-context.ly index 19adab0669..a45638027f 100644 --- a/input/lsr/beam-endings-in-score-context.ly +++ b/input/lsr/beam-endings-in-score-context.ly @@ -5,6 +5,15 @@ \header { lsrtags = "rhythms" + texidoces = " +Las reglas de final de barra especificadas en el contexto +@code{Score} se aplican a todos los pentagramas, pero se pueden +modificar tanto en los niveles de @code{Staff} como de +@code{Voice}: + +" + doctitlees = "Finales de barra en el contexto Score" + texidoc = " Beam-ending rules specified in the @code{Score} context apply to all staves, but can be modified at both @code{Staff} and @code{Voice} diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index 60e0d58e16..58222544f5 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -1,5 +1,6 @@ adding-a-figured-bass-above-or-below-the-notes.ly adding-bar-lines-to-chordnames-context.ly +avoiding-collisions-of-chord-fingering-with-beams.ly changing-chord-separator.ly changing-the-chord-names-to-german-or-semi-german-notation.ly changing-the-positions-of-figured-bass-alterations.ly diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 7cd1e517d4..05ea88ba5d 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 input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.11.65" \header { texidoces = " @@ -26,25 +26,25 @@ indications or octavations. Override some properties of the \paper { ragged-right = ##f } \relative c'' { - \override TextSpanner #'bound-details #'left #'text = #"bla" - \override TextSpanner #'bound-details #'right #'text = #"blu" + \override TextSpanner #'(bound-details left text) = #"bla" + \override TextSpanner #'(bound-details right text) = #"blu" a4 \startTextSpan b4 c a4 \stopTextSpan \override TextSpanner #'style = #'line - \once \override TextSpanner #'bound-details - #'left #'stencil-align-dir-y = #CENTER + \once \override TextSpanner + #'(bound-details left stencil-align-dir-y) = #CENTER a4 \startTextSpan b4 c a4 \stopTextSpan \override TextSpanner #'style = #'dashed-line - \override TextSpanner #'bound-details #'left #'text = + \override TextSpanner #'(bound-details left text) = \markup { \draw-line #'(0 . 1) } - \override TextSpanner #'bound-details #'right #'text = + \override TextSpanner #'(bound-details right text) = \markup { \draw-line #'(0 . -2) } - \once \override TextSpanner #'bound-details #'right #'padding = #-2 + \once \override TextSpanner #'(bound-details right padding) = #-2 a4 \startTextSpan b4 c diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly index 2ace6d2d53..f819c35e77 100644 --- a/input/lsr/customizing-fretboard-fret-diagrams.ly +++ b/input/lsr/customizing-fretboard-fret-diagrams.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.64" +\version "2.11.65" \header { texidoces = " @@ -39,41 +39,41 @@ therefore can be omitted in property overrides. \new FretBoards { % Set global properties of fret diagram \override FretBoards.FretBoard #'size = #'1.2 - \override FretBoard #'fret-diagram-details - #'finger-code = #'in-dot - \override FretBoard #'fret-diagram-details - #'dot-color = #'white + \override FretBoard + #'(fret-diagram-details finger-code) = #'in-dot + \override FretBoard + #'(fret-diagram-details dot-color) = #'white \chordmode { c \once \override FretBoard #'size = #'1.0 - \once \override FretBoard #'fret-diagram-details - #'barre-type = #'straight - \once \override FretBoard #'fret-diagram-details - #'dot-color = #'black - \once \override FretBoard #'fret-diagram-details - #'finger-code = #'below-string + \once \override FretBoard + #'(fret-diagram-details barre-type) = #'straight + \once \override FretBoard + #'(fret-diagram-details dot-color) = #'black + \once \override FretBoard + #'(fret-diagram-details finger-code) = #'below-string c' - \once \override FretBoard #'fret-diagram-details - #'barre-type = #'none - \once \override FretBoard #'fret-diagram-details - #'number-type = #'arabic - \once \override FretBoard #'fret-diagram-details - #'orientation = #'landscape - \once \override FretBoard #'fret-diagram-details - #'mute-string = #"M" - \once \override FretBoard #'fret-diagram-details - #'label-dir = #-1 - \once \override FretBoard #'fret-diagram-details - #'dot-color = #'black + \once \override FretBoard + #'(fret-diagram-details barre-type) = #'none + \once \override FretBoard + #'(fret-diagram-details number-type) = #'arabic + \once \override FretBoard + #'(fret-diagram-details orientation) = #'landscape + \once \override FretBoard + #'(fret-diagram-details mute-string) = #"M" + \once \override FretBoard + #'(fret-diagram-details label-dir) = #LEFT + \once \override FretBoard + #'(fret-diagram-details dot-color) = #'black c' - \once \override FretBoard #'fret-diagram-details - #'finger-code = #'below-string - \once \override FretBoard #'fret-diagram-details - #'dot-radius = #0.35 - \once \override FretBoard #'fret-diagram-details - #'dot-position = #0.5 - \once \override FretBoard #'fret-diagram-details - #'fret-count = #3 + \once \override FretBoard + #'(fret-diagram-details finger-code) = #'below-string + \once \override FretBoard + #'(fret-diagram-details dot-radius) = #0.35 + \once \override FretBoard + #'(fret-diagram-details dot-position) = #0.5 + \once \override FretBoard + #'(fret-diagram-details fret-count) = #3 d } } diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly index 8df8fb3941..09c6baeb0c 100644 --- a/input/lsr/customizing-markup-fret-diagrams.ly +++ b/input/lsr/customizing-markup-fret-diagrams.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.64" +\version "2.11.65" \header { texidoces = " @@ -30,10 +30,10 @@ to the markup. \textLengthOn % Set global properties of fret diagram \override TextScript #'size = #'1.2 - \override TextScript #'fret-diagram-details - #'finger-code = #'in-dot - \override TextScript #'fret-diagram-details - #'dot-color = #'white + \override TextScript + #'(fret-diagram-details finger-code) = #'in-dot + \override TextScript + #'(fret-diagram-details dot-color) = #'white %% C major for guitar, no barre, using defaults % terse style diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly index e5bca3acbf..b820d61c84 100644 --- a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.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.64" +\version "2.11.65" \header { texidoces = " @@ -98,10 +98,10 @@ primeros = { \new FretBoards { \set stringTunings = #cuatroTuning - \override FretBoard #'fret-diagram-details - #'string-count = #'4 - \override FretBoard #'fret-diagram-details - #'finger-code = #'in-dot + \override FretBoard + #'(fret-diagram-details string-count) = #'4 + \override FretBoard + #'(fret-diagram-details finger-code) = #'in-dot \primeros } diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index e4c8614894..c3d82864aa 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -2,6 +2,7 @@ adding-fingerings-to-a-score.ly allowing-fingerings-to-be-printed-inside-the-staff.ly analysis-brackets-above-the-staff.ly applying-note-head-styles-depending-on-the-step-of-the-scale.ly +avoiding-collisions-of-chord-fingering-with-beams.ly blanking-staff-lines-using-the--whiteout-command.ly changing-a-single-notes-size-in-a-chord.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly diff --git a/input/lsr/isolated-percent-repeats.ly b/input/lsr/isolated-percent-repeats.ly index bef0bf3b1d..9c0d1d3893 100644 --- a/input/lsr/isolated-percent-repeats.ly +++ b/input/lsr/isolated-percent-repeats.ly @@ -23,6 +23,7 @@ multi-measure rest with a different print function: \relative c'' { \override MultiMeasureRest #'stencil - = #ly:multi-measure-rest::percent + = #ly:multi-measure-rest::percent + \override MultiMeasureRest #'thickness = #0.48 R1 } diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index e29348c0be..49935ead3e 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.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.64" +\version "2.11.65" \header { texidoces = " Se pueden aplicar puntas de flecha a los elementos de extensión de @@ -19,15 +19,15 @@ texto y de línea (como el Glissando). \relative c'' { \override TextSpanner #'bound-padding = #1.0 \override TextSpanner #'style = #'line - \override TextSpanner #'bound-details #'right #'arrow = ##t - \override TextSpanner #'bound-details #'left #'text = #"fof" - \override TextSpanner #'bound-details #'right #'text = #"gag" - \override TextSpanner #'bound-details #'right #'padding = #0.6 + \override TextSpanner #'(bound-details right arrow) = ##t + \override TextSpanner #'(bound-details left text) = #"fof" + \override TextSpanner #'(bound-details right text) = #"gag" + \override TextSpanner #'(bound-details right padding) = #0.6 - \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER - \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER + \override TextSpanner #'(bound-details right stencil-align-dir-y) = #CENTER + \override TextSpanner #'(bound-details left stencil-align-dir-y) = #CENTER - \override Glissando #'bound-details #'right #'arrow = ##t + \override Glissando #'(bound-details right arrow) = ##t \override Glissando #'arrow-length = #0.5 \override Glissando #'arrow-width = #0.25 diff --git a/input/lsr/percent-repeat-count-visibility.ly b/input/lsr/percent-repeat-count-visibility.ly index bb319141fc..58a5d77fbd 100644 --- a/input/lsr/percent-repeat-count-visibility.ly +++ b/input/lsr/percent-repeat-count-visibility.ly @@ -2,6 +2,14 @@ %% This file is in the public domain. \version "2.11.64" \header { + texidoces = " +Se pueden mostrar los contadores de las repeticiones del tipo +porcentaje a intervalos regulares mediante el establecimiento de +la propiedad de contexto @code{repeatCountVisibility}. + +" + doctitlees = "Visibilidad del contador de repeticiones de tipo porcentaje" + lsrtags = "repeats, tweaks-and-overrides" texidoc = " Percent repeat counters can be shown at regular intervals by setting diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index b701c1bb4e..dc88624aee 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -2,6 +2,7 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly adding-drum-parts.ly automatic-beam-subdivisions.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +avoiding-collisions-of-chord-fingering-with-beams.ly beam-endings-in-score-context.ly beam-grouping-in-7-8-time.ly beams-across-line-breaks.ly diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index 63d679e5f1..a40f0534ac 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,4 +1,5 @@ analysis-brackets-above-the-staff.ly +avoiding-collisions-of-chord-fingering-with-beams.ly caesura-railtracks-with-fermata.ly changing-a-single-notes-size-in-a-chord.ly changing-form-of-multi--measure-rests.ly -- 2.39.5