From 4ad5db96b7b9b4f7f566ce3e8e5503f91d226096 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Sat, 1 Nov 2008 22:00:15 +0000 Subject: [PATCH] LSR: Update. --- input/lsr/changing-the-tuplet-number.ly | 9 ++ ...lling-the-placement-of-chord-fingerings.ly | 3 +- ...efined-fretboards-for-other-instruments.ly | 105 ++++++++++++++++++ input/lsr/double-glissando.ly | 31 ++++++ ...l-tuplets-using-only-one--times-command.ly | 14 +++ input/lsr/expressive-marks.snippet-list | 5 +- input/lsr/flat-flags-and-beam-nibs.ly | 100 +++++++++++++++++ input/lsr/fretted-strings.snippet-list | 21 ++-- input/lsr/grouping-beats.ly | 3 +- ...tting-line-breaks-within-beamed-tuplets.ly | 9 ++ input/lsr/rhythms.snippet-list | 1 + input/lsr/simultaneous-notes.snippet-list | 7 +- input/lsr/using-ties-with-arpeggios.ly | 17 +-- ...efined-fretboards-for-other-instruments.ly | 25 ++--- 14 files changed, 313 insertions(+), 37 deletions(-) create mode 100644 input/lsr/defining-predefined-fretboards-for-other-instruments.ly create mode 100644 input/lsr/double-glissando.ly create mode 100644 input/lsr/flat-flags-and-beam-nibs.ly diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index 0c8deaeac2..436f11b61d 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -16,6 +16,15 @@ del grupo, o eliminar el número. " +texidocde = " +Standardmäßig wird nur der Zähler des N-tolen-Bruchs über der Klammer +dargestellt, wie er dem @code{\\times}-Befehl übergeben wird. +Man kann aber auch Zähler/Nenner ausgeben lassen, oder die Zahl +vollständig unterdrücken. + +" + doctitlede = "Die Zahl der N-tole verändern" + texidoc = " By default, only the numerator of the tuplet number is printed over the tuplet bracket, i.e., the denominator of the argument to the diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly index 8006fafa81..cd7d1c5794 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -28,6 +28,7 @@ The placement of fingering numbers can be controlled precisely. 4 \set fingeringOrientations = #'(left) 2 - \set fingeringOrientations = #'(right) + \set fingeringOrientations = #'(down) 2 } + diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly new file mode 100644 index 0000000000..da647564c0 --- /dev/null +++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly @@ -0,0 +1,105 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.62" +\header { + lsrtags = "fretted-strings" + texidoc = "Predefined fret diagrams can be added for new instruments +in addition to the standards used for guitar. This file shows how +this is done by defining a new string-tuning and a few predefined +fretboards for the Venezuelan cuatro. + +This file also shows how fingerings can be included in the chords +used as reference points for the chord lookup, and displayed in +the fret diagram and the @code{TabStaff}, but not the music. + +These fretboards are not transposable because they contain string +information. This is planned to be corrected in the future. + +" + doctitle = "Defining predefined fretboards for other instruments" +} % begin verbatim + +% add FretBoards for the Cuatro +% Note: This section could be put into a separate file +% predefined-cuatro-fretboards.ly +% and \included into each of your compositions + +cuatroTuning = #'(11 18 14 9) + +dSix = { } +dMajor = { } +aMajSeven = { } +dMajSeven = { } +gMajor = { } + +\storePredefinedDiagram \dSix + #cuatroTuning + #"o;o;o;o;" +\storePredefinedDiagram \dMajor + #cuatroTuning + #"o;o;o;3-3;" +\storePredefinedDiagram \aMajSeven + #cuatroTuning + #"o;2-2;1-1;2-3;" +\storePredefinedDiagram \dMajSeven + #cuatroTuning + #"o;o;o;1-1;" +\storePredefinedDiagram \gMajor + #cuatroTuning + #"2-2;o;1-1;o;" + +% end of potential include file /predefined-cuatro-fretboards.ly + + +#(set-global-staff-size 16) + +primerosNames = \chordmode { + d:6 d a:maj7 d:maj7 + g +} +primeros = { + \dSix \dMajor \aMajSeven \dMajSeven + \gMajor +} + +\score { + << + \new ChordNames { + \set chordChanges = ##t + \primerosNames + } + + \new Staff { + \new Voice \with { + \remove "New_fingering_engraver" + } + \relative c'' { + \primeros + } + } + + \new FretBoards { + \set stringTunings = #cuatroTuning + \override FretBoard #'fret-diagram-details + #'string-count = #'4 + \override FretBoard #'fret-diagram-details + #'finger-code = #'in-dot + \primeros + } + + \new TabStaff \relative c'' { + \set TabStaff.stringTunings = #cuatroTuning + \primeros + } + + >> + + \layout { + \context { + \Score + \override SpacingSpanner + #'base-shortest-duration = #(ly:make-moment 1 16) + } + } + \midi { } +} diff --git a/input/lsr/double-glissando.ly b/input/lsr/double-glissando.ly new file mode 100644 index 0000000000..631b4e3fe5 --- /dev/null +++ b/input/lsr/double-glissando.ly @@ -0,0 +1,31 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.62" + +\header { + lsrtags = "expressive-marks, simultaneous-notes" + + texidoc = " +To connect chords with glissando lines, attach a second glissando to a +hidden voice. + +" + doctitle = "Double glissando" +} % begin verbatim +\relative c { + \clef bass + << + { + % new voice ( = \voiceOne), hidden + \hideNotes + % attach glissando to note heads + e2\glissando g + } + \\ + { + % original voice with chords rearranged so that + % glissando is attached to a & c + 2\glissando + } + >> +} 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 05116bd06f..37a1468071 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 @@ -22,6 +22,20 @@ Para ver más inforamción sobre @code{make-moment}, véase " + texidocde = " +Die Eigenschaft @code{tupletSpannerDuration} bestimmt, wie lange jede +der N-tolen innerhalb der Klammern nach dem @code{\\times}-Befehl +dauert. Auf diese Art können etwa viele Triolen nacheinander mit nur +einem @code{\\times}-Befehl geschrieben werden. + +Im Beispiel sind zwei Triolen zu sehen, obwohl @code{\\times} nur +einmal geschrieben wurde. + +Mehr Information über @code{make-moment} gibt es in \"Verwaltung der Zeiteinheiten\". + +" + doctitlede = "Mehrere Triolen notieren, aber nur einmal \\times benutzen" + texidoc = " The property @code{tupletSpannerDuration} sets how long each of the tuplets contained within the brackets after @code{\\times} should last. diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index 5d160ef0ee..dc88ff87d3 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -3,6 +3,7 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..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 +double-glissando.ly printing-hairpins-using-al-niente-notation.ly laissez-vibrer-ties.ly contemporary-glissando.ly @@ -26,10 +27,10 @@ snap-pizzicato-markup-bartok-pizzicato.ly combining-dynamics-with-markup-texts.ly creating-slurs-across-voices.ly caesura-railtracks-with-fermata.ly -changing-the-breath-mark-symbol.ly +adjusting-the-shape-of-falls-and-doits.ly modifying-default-values-for-articulation-shorthand-notation.ly creating-simultaneous-rehearsal-marks.ly setting-hairpin-behavior-at-bar-lines.ly changing--flageolet-mark-size.ly piano-template-with-centered-dynamics.ly -adjusting-the-shape-of-falls-and-doits.ly +changing-the-breath-mark-symbol.ly diff --git a/input/lsr/flat-flags-and-beam-nibs.ly b/input/lsr/flat-flags-and-beam-nibs.ly new file mode 100644 index 0000000000..a5ca3e0322 --- /dev/null +++ b/input/lsr/flat-flags-and-beam-nibs.ly @@ -0,0 +1,100 @@ +%% 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.62" + +\header { + lsrtags = "rhythms" + + texidoc = " + Flat flags on lone notes and beam nibs at the ends of beamed figures +are both possible with a combination of @code{stemLeftBeamCount}, +@code{stemRightBeamCount} and paired @code{[ ]} beam indicators. + + + + +For right-pointing flat flags on lone notes, use paired @code{[ ]} beam +indicators and set @code{stemLeftBeamCount} to zero (see Example 1). + + + + +For left-pointing flat flags, set @code{stemRightBeamCount} instead +(Example 2). + + + + +For right-pointing nibs at the end of a run of beamed notes, set +@code{stemRightBeamCount} to a positive value. And for left-pointing +nibs at the start of a run of beamed notes, set +@code{stemLeftBeamCount} instead (Example 3). + + + + +Sometimes it may make sense for a lone note surrounded by rests to +carry both a left- and right-pointing flat flag. Do this with paired +@code{[ ]} beam indicators alone (Example 4). + + + + +(Note that @code{\\set stemLeftBeamCount}is always equivalent to +@code{\\once \\set}. In other words, the beam count settings aren't +\"sticky\", so the pair of flat flags attached to the lone @code{c'16 +[ ]} in the last example have nothing to do with the @code{\\set} two +notes prior.) + + + + +" + doctitle = "Flat flags and beam nibs" +} % begin verbatim + +\score { +<< +% Example 1 +\new RhythmicStaff { + \set stemLeftBeamCount = #0 + c'16 [ ] + r8. +} + +% Example 2 +\new RhythmicStaff { + r8. + \set stemRightBeamCount = #0 + c'16 [ ] +} + +% Example 3 +\new RhythmicStaff { + c'16 + c'16 + \set stemRightBeamCount = #2 + c'16 + r16 + r16 + \set stemLeftBeamCount = #2 + c'16 + c'16 + c'16 +} + +% Example 4 +\new RhythmicStaff { + c'16 + c'16 + \set stemRightBeamCount = #2 + c'16 + r16 + c'16 [ ] + r16 + \set stemLeftBeamCount = #2 + c'16 + c'16 +} +>> +} diff --git a/input/lsr/fretted-strings.snippet-list b/input/lsr/fretted-strings.snippet-list index ca57c2f2ad..6a04c8b99c 100644 --- a/input/lsr/fretted-strings.snippet-list +++ b/input/lsr/fretted-strings.snippet-list @@ -1,19 +1,20 @@ -how-to-change-fret-diagram-position.ly -flamenco-notation.ly +customizing-markup-fret-diagrams.ly adding-fingerings-to-tablatures.ly -placement-of-right-hand-fingerings.ly fingerings,-string-indications,-and-right-hand-fingerings.ly -guitar-strum-rhythms.ly -polyphony-in-tablature.ly jazz-combo-template.ly adding-fingerings-to-a-score.ly -letter-tablature-formatting.ly laissez-vibrer-ties.ly controlling-the-placement-of-chord-fingerings.ly +modern-tab-text-clef.ly +fret-diagrams-explained-and-developed.ly +stem-and-beam-behavior-in-tablature.ly +how-to-change-fret-diagram-position.ly +flamenco-notation.ly +placement-of-right-hand-fingerings.ly +guitar-strum-rhythms.ly +polyphony-in-tablature.ly +defining-predefined-fretboards-for-other-instruments.ly +letter-tablature-formatting.ly allowing-fingerings-to-be-printed-inside-the-staff.ly customizing-fretboard-fret-diagrams.ly faking-a-hammer-in-tablatures.ly -fret-diagrams-explained-and-developed.ly -modern-tab-text-clef.ly -stem-and-beam-behavior-in-tablature.ly -customizing-markup-fret-diagrams.ly diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly index 4c5c427075..01e1ae43b1 100644 --- a/input/lsr/grouping-beats.ly +++ b/input/lsr/grouping-beats.ly @@ -6,7 +6,8 @@ lsrtags = "rhythms" texidoc = " -Beaming patterns may be altered with the @code{beatGrouping} property: +Beaming patterns may be altered with the @code{beatGrouping} property: + " doctitle = "Grouping beats" } % begin verbatim diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index da4178b0cf..82bf018320 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -14,6 +14,15 @@ sincopados se deben barrar manualmente. " + texidocde = " +Dieses künstliche Beispiel zeigt, wie sowohl automatische als auch +manuelle Zeilenumbrüche innerhalb einer N-tole mit Balken erlaubt +werden können. Diese unregelmäßige Bebalkung muss allerdings manuell +gesetzt werden. + +" + doctitlede = "Zeilenumbrüche bei N-tolen mit Balken erlauben" + texidoc = " This artificial example shows how both manual and automatic line breaks may be permitted to within a beamed tuplet. Note that such off-beat diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index f4e92e5f46..e84f144ce3 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -22,6 +22,7 @@ modifying-tuplet-bracket-length.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly making-an-object-invisible-with-the-transparent-property.ly permitting-line-breaks-within-beamed-tuplets.ly +flat-flags-and-beam-nibs.ly automatic-beam-subdivisions.ly beam-grouping-in-7-8-time.ly changing-the-tuplet-number.ly diff --git a/input/lsr/simultaneous-notes.snippet-list b/input/lsr/simultaneous-notes.snippet-list index ca4e093f94..6fdd5fb73b 100644 --- a/input/lsr/simultaneous-notes.snippet-list +++ b/input/lsr/simultaneous-notes.snippet-list @@ -1,8 +1,9 @@ -changing-partcombine-texts.ly +clusters.ly additional-voices-to-avoid-collisions.ly forcing-horizontal-shift-of-notes.ly -changing-a-single-notes-size-in-a-chord.ly +double-glissando.ly combining-two-parts-on-the-same-staff.ly -clusters.ly +changing-partcombine-texts.ly +changing-a-single-notes-size-in-a-chord.ly suppressing-warnings-for-clashing-note-columns.ly displaying-complex-chords.ly diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly index 1329b22223..7a73f33fea 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -19,18 +19,21 @@ como se muestra en este ejemplo. texidoc = " Ties are sometimes used to write out arpeggios. In this case, two tied notes need not be consecutive. This can be achieved by setting the -@code{tieWaitForNote} property to \"true\". The same feature is also +@code{tieWaitForNote} property to @code{#t}. The same feature is also useful, for example, to tie a tremolo to a chord, but in principle, it -can also be used for ordinary consecutive notes, as demonstrated in -this example. +can also be used for ordinary consecutive notes. " doctitle = "Using ties with arpeggios" } % begin verbatim \relative c' { \set tieWaitForNote = ##t - \grace { c16[~ e~ g]~ } 2 - \repeat tremolo 8 { c32~ c'~ } 1 - e8~ c~ a~ f~ 2 - \tieUp c8~ a \tieDown \tieDotted g~ c g2 + \grace { c16[ ~ e ~ g] ~ } 2 + \repeat tremolo 8 { c32 ~ c' ~ } 1 + e8 ~ c ~ a ~ f ~ 2 + \tieUp + c8 ~ a + \tieDown + \tieDotted + g8 ~ c g2 } diff --git a/input/new/defining-predefined-fretboards-for-other-instruments.ly b/input/new/defining-predefined-fretboards-for-other-instruments.ly index 29c5fa9237..4fc09cb882 100644 --- a/input/new/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/new/defining-predefined-fretboards-for-other-instruments.ly @@ -4,12 +4,11 @@ texidoc = "Predefined fret diagrams can be added for new instruments in addition to the standards used for guitar. This file shows how this is done by defining a new string-tuning and a few predefined -fretboards for the Venezuelan cuatro. Thanks to Jesus Guillermo -Andrade for the string-tuning and fretboard information. +fretboards for the Venezuelan cuatro. This file also shows how fingerings can be included in the chords used as reference points for the chord lookup, and displayed in -the fret diagram and the TabStaff, but not the music. +the fret diagram and the @code{TabStaff}, but not the music. These fretboards are not transposable because they contain string information. This is planned to be corrected in the future. @@ -18,18 +17,21 @@ information. This is planned to be corrected in the future. doctitle = "Defining predefined fretboards for other instruments" } +%LSR: Thanks to Jesus Guillermo Andrade for the string-tuning +%LSR: and fretboard information. + % add FretBoards for the Cuatro -% Note: This section could be put into a separate file +% Note: This section could be put into a separate file % predefined-cuatro-fretboards.ly % and \included into each of your compositions cuatroTuning = #'(11 18 14 9) -dSix = { } +dSix = { } dMajor = { } -aMajSeven = {} -dMajSeven = {} -gMajor = {} +aMajSeven = { } +dMajSeven = { } +gMajor = { } \storePredefinedDiagram \dSix #cuatroTuning @@ -70,13 +72,12 @@ primeros = { \new Staff { \new Voice \with { - \remove New_fingering_engraver + \remove "New_fingering_engraver" } \relative c'' { \primeros } } - \new FretBoards { \set stringTunings = #cuatroTuning @@ -98,10 +99,8 @@ primeros = { \context { \Score \override SpacingSpanner - #'base-shortest-duration = #(ly:make-moment 1 16) + #'base-shortest-duration = #(ly:make-moment 1 16) } - } \midi { } } - -- 2.39.2