From 853c0208a14bc9ad4a47e2a15f33ad02acfd460d Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Sat, 25 Oct 2008 16:05:37 +0100 Subject: [PATCH] LSR: Update. --- input/lsr/adding-ambitus-per-voice.ly | 7 + input/lsr/alignment-vertical-spacing.ly | 74 ----- ...ngerings-to-be-printed-inside-the-staff.ly | 4 +- input/lsr/ambitus-with-multiple-voices.ly | 6 + .../lsr/analysis-brackets-above-the-staff.ly | 15 +- ...yles-depending-on-the-step-of-the-scale.ly | 24 ++ input/lsr/beam-grouping-in-7-8-time.ly | 24 ++ input/lsr/beams-across-line-breaks.ly | 15 +- input/lsr/breaks.snippet-list | 1 - input/lsr/breathing-signs.ly | 10 +- input/lsr/caesura-railtracks-with-fermata.ly | 12 +- input/lsr/changing-beam-knee-gap.ly | 24 ++ ...hanging-properties-for-individual-grobs.ly | 2 +- .../changing-the-default-text-font-family.ly | 6 +- input/lsr/changing-the-staff-size.ly | 10 +- ...onducting-signs,-measure-grouping-signs.ly | 16 +- ...olling-the-vertical-ordering-of-scripts.ly | 2 +- .../controlling-tuplet-bracket-visibility.ly | 28 +- .../customizing-fretboard-fret-diagrams.ly | 12 + input/lsr/customizing-markup-fret-diagrams.ly | 9 + input/lsr/demo-midiinstruments.ly | 275 +++++++++--------- ...entals-for-each-note-including-naturals.ly | 12 + ...-indications,-and-right-hand-fingerings.ly | 8 + input/lsr/grouping-beats.ly | 20 ++ input/lsr/guitar-strum-rhythms.ly | 7 + input/lsr/keyboards.snippet-list | 1 - input/lsr/non-traditional-key-signatures.ly | 23 ++ input/lsr/ottava-text.ly | 13 + input/lsr/paper-and-layout.snippet-list | 5 +- .../lsr/placement-of-right-hand-fingerings.ly | 8 + input/lsr/polyphony-in-tablature.ly | 7 + ...naturals-from-being-automatically-added.ly | 11 + ...-printed-when-the-key-signature-changes.ly | 10 + input/lsr/reverting-default-beam-endings.ly | 33 +++ input/lsr/rhythms.snippet-list | 7 +- .../snap-pizzicato-markup-bartok-pizzicato.ly | 13 + input/lsr/spacing.snippet-list | 7 +- .../stem-and-beam-behavior-in-tablature.ly | 7 + input/lsr/sub-dividing-beams.ly | 37 +++ ...ith-minimum-accidentals-smart-transpose.ly | 31 ++ input/lsr/tweaking-clef-properties.ly | 36 +++ input/lsr/tweaks-and-overrides.snippet-list | 1 - input/lsr/unfretted-strings.snippet-list | 7 +- ...ically-aligned-dynamics-and-textscripts.ly | 2 +- .../vertically-aligning-ossias-and-lyrics.ly | 2 +- input/lsr/vocal-music.snippet-list | 19 +- 46 files changed, 605 insertions(+), 298 deletions(-) delete mode 100644 input/lsr/alignment-vertical-spacing.ly create mode 100644 input/lsr/beam-grouping-in-7-8-time.ly create mode 100644 input/lsr/changing-beam-knee-gap.ly create mode 100644 input/lsr/grouping-beats.ly create mode 100644 input/lsr/reverting-default-beam-endings.ly create mode 100644 input/lsr/sub-dividing-beams.ly diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index 110709ed56..7c7870aa11 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -12,6 +12,13 @@ debe desplazar manualmente para evitar colisiones. " +texidocde = " +Ambitus können pro Stimme gesetzt werden. In diesem Fall müssen sie +manual verschoben werden, um Zusammenstöße zu verhindern. + +" +doctitlede = "Ambitus pro Stimme hinzufügen" + texidoc = " Ambitus can be added per voice. In this case, the ambitus must be moved manually to prevent collisions. diff --git a/input/lsr/alignment-vertical-spacing.ly b/input/lsr/alignment-vertical-spacing.ly deleted file mode 100644 index a0efe1b11d..0000000000 --- a/input/lsr/alignment-vertical-spacing.ly +++ /dev/null @@ -1,74 +0,0 @@ -%% 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 = "tweaks-and-overrides, paper-and-layout, spacing" - - texidoces = " -Mediante el establecimiento de las propiedades de -@code{NonMusicalPaperColumn} se puede ajustar el espaciado vertical en -cada sistema. - -Ajustando @code{alignment-extra-space} o -@code{fixed-alignment-extra-space} se puede ampliar verticalmente un -sistema individual. - -Por razones técnicas, se debe usar @code{\\overrideProperty} para -cambiar estas propiedades dentro de un pentagrama; aún se debe usar -@code{\\override} dentro de un bloque @code{\\context} para las -sobreescrituras globales. - -" - doctitlees = "Espaciado de la alineación vertical" - - texidoc = " -By setting properties in @code{NonMusicalPaperColumn}, vertical spacing -can be adjusted per system. - - -By setting @code{alignment-extra-space} or -@code{fixed-alignment-extra-space} an individual system may be -stretched vertically. - - -For technical reasons, @code{\\overrideProperty} must be used for -changing these properties within a staff; @code{\\override} in a -@code{\\context} block may still be used for global overrides. - -" - doctitle = "Alignment vertical spacing" -} % begin verbatim -#(set-global-staff-size 13) - -\relative c'' -\new StaffGroup << - \new Staff { - c1 \break - c1 \break - c1 \break - } - \new Staff { - c1 | c | c - } - \new PianoStaff << - \new Voice { - \set PianoStaff.instrumentName = #"piano" - \set PianoStaff.shortInstrumentName = #"pn" - c1_"normal" - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((fixed-alignment-extra-space . 15)) - c_"fixed-aligment-extra-space" - - \overrideProperty - #"Score.NonMusicalPaperColumn" - #'line-break-system-details - #'((alignment-extra-space . 15)) - c_"aligment-extra-space" - } - { c1 | c | c } - >> ->> 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 2034da8fc0..9322bc9b04 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 @@ -14,8 +14,8 @@ cancelar. doctitlees = "Permitir que las digitaciones se impriman dentro del pentagrama" texidoc = " -By default, fingering numbers will be printed outside the staff. -However, this behavior can be canceled. +By default, vertically oriented fingerings are positioned outside the +staff. However, this behavior can be canceled. " doctitle = "Allowing fingerings to be printed inside the staff" diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly index e5da04e6b5..ffebc56de8 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -13,6 +13,12 @@ pentagramas con varias voces. " +texidocde = " +Indem man den @code{Ambitus_engraver} im @code{Staff}-Kontext +hinzufügt, erhält man einen einzigen Ambitus pro System, auch in dem +Fall, dass mehrere Stimmen sich im gleichen System befinden. +" + doctitlede = "Ambitus mit vielen Stimmen" texidoc = " Adding the @code{Ambitus_engraver} to the @code{Staff} context creates diff --git a/input/lsr/analysis-brackets-above-the-staff.ly b/input/lsr/analysis-brackets-above-the-staff.ly index 59f36b2252..d3f9040695 100644 --- a/input/lsr/analysis-brackets-above-the-staff.ly +++ b/input/lsr/analysis-brackets-above-the-staff.ly @@ -22,14 +22,13 @@ staff instead. doctitle = "Analysis brackets above the staff" } % begin verbatim \layout { - \context { - \Voice - \consists "Horizontal_bracket_engraver" - } + \context { + \Voice + \consists "Horizontal_bracket_engraver" + } } \relative c'' { - \once \override HorizontalBracket #'direction = #UP - c2\startGroup - d\stopGroup + \once \override HorizontalBracket #'direction = #UP + c2\startGroup + d2\stopGroup } - 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 f652798ab0..b742d86eda 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 @@ -29,6 +29,30 @@ de nota. " +texidocde = " +Die @code{shapeNoteStyles}-(NotenFormenStile)-Eigenschaft kann benutzt +werden, um verschiedene Notenstile für jeden Schritt der Tonleiter +zudefinieren (vorgegeben von der Tonart oder der \"tonic\" (Tonika)-Eigneschaft. +Diese Eigenschaft braucht eine Anzahl von Symbolen, welche vollständig +arbiträr sein können (geometrische Ausdrücke wie +@code{triangle} (Dreieck), @code{cross} (Kreuz) und @code{xcircle} (X-Kreis) +sind erlaubt) oder basierend auf einer alten amerikanischen Notensatztradition +(einige lateinische Notenbezeichnungen sind auch erlaubt). + +Um alte amerikanische Liederbücher zu imitieren, gibt es einige vordefinierte +Notenstile wie etwa +@code{\\aikenHeads} (im Stil von Aiken) oder @code{\\sacredHarpHeads} (im +Stil der Sacred Harp-Tradition). + +Dieses Beispiel zeigt andere Wege, um die unterschiedliche geformten +Noten zu erhalten, und zeigt, wie man eine Melodie transponieren kann, +ohne dass das Verhältnis zwischen den harmonischen Funktionen und +dem Notenstil verloren geht. + +" + + doctitlede = "Notenkopfstile besierend auf der Tonleiterstufe erstellen" + texidoc = " The @code{shapeNoteStyles} property can be used to define various note head styles for each step of the scale (as set by the key signature or diff --git a/input/lsr/beam-grouping-in-7-8-time.ly b/input/lsr/beam-grouping-in-7-8-time.ly new file mode 100644 index 0000000000..34a6a0d7ae --- /dev/null +++ b/input/lsr/beam-grouping-in-7-8-time.ly @@ -0,0 +1,24 @@ +%% 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 = " +There are no default automatic beam groupings specified for 7/8 time, +so if automatic beams are required the grouping must be specified. For +example, to group all beams 2-3-2 in 7/8 time, specify beam endings at +2/8 and 5/8: + +" + doctitle = "Beam grouping in 7/8 time" +} % begin verbatim +\relative c'' { + \time 7/8 + % rhythm 2-3-2 + a8 a a a a a a + #(override-auto-beam-setting '(end * * 7 8) 2 8) + #(override-auto-beam-setting '(end * * 7 8) 5 8) + a8 a a a a a a +} diff --git a/input/lsr/beams-across-line-breaks.ly b/input/lsr/beams-across-line-breaks.ly index e425e0a9ae..f7ee658c67 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -3,19 +3,18 @@ \version "2.11.62" \header { - lsrtags = "rhythms, breaks" + lsrtags = "rhythms" texidoc = " -By default, beams can't be printed across line breaks. This behavior -can be overridden by setting the @code{breakable} property. +Line breaks are normally forbidden when beams cross bar lines. This +behavior can be changed as shown: " doctitle = "Beams across line breaks" } % begin verbatim -\layout { ragged-right = ##t } \relative c'' { - \override Score.Beam #'breakable = ##t - \time 3/16 - c16[ d e \break - f16] r r + \override Beam #'breakable = ##t + c8 c[ c] c[ c] c[ c] c[ \break + c8] c[ c] c[ c] c[ c] c } + diff --git a/input/lsr/breaks.snippet-list b/input/lsr/breaks.snippet-list index 7a61860912..d5b54b3979 100644 --- a/input/lsr/breaks.snippet-list +++ b/input/lsr/breaks.snippet-list @@ -1,4 +1,3 @@ removing-the-first-empty-line.ly positioning-segno-and-coda-with-line-break.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 f4705ef651..d5cb236e63 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -19,20 +19,20 @@ ticks, vees and \"railroad tracks\" (caesura). << { g4 as g } \\ { es4 bes es } >> | % Modern notation: % by default, \breathe uses the rcomma, just as if saying: - % \override BreathingSign #'text = #(make-musicglyph-markup "scripts.rcomma") + % \override BreathingSign #'text = #(make-musicglyph-markup "scripts.rcomma") << { g4 as g } \\ { es4 \breathe bes es } >> | % rvarcomma and lvarcomma are variations of the default rcomma and lcomma % N.B.: must use Staff context here, since we start a Voice below - \override Staff.BreathingSign #'text = #(make-musicglyph-markup "scripts.rvarcomma") + \override Staff.BreathingSign #'text = \markup { \musicglyph #"scripts.rvarcomma" } << { g4 as g } \\ { es4 \breathe bes es } >> | % vee - \override BreathingSign #'text = #(make-musicglyph-markup "scripts.upbow") + \override BreathingSign #'text = \markup { \musicglyph #"scripts.upbow" } es8[ d es f g] \breathe f | % caesura - \override BreathingSign #'text = #(make-musicglyph-markup "scripts.caesura.curved") - es8[ d] \breathe es[ f g f] | + \override BreathingSign #'text = \markup { \musicglyph #"scripts.caesura.curved" } + es8[ d] \breathe es[ f g f] | es2 r4 \bar "||" } diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index e3f2a22aef..63355618a0 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -15,15 +15,15 @@ visualmente satisfactoria. doctitlees = "Cesura tipo \"vías del tren\" con calderón" texidoc = " -A caesura is sometimes denoted with a double \"railtracks\" breath mark +A caesura is sometimes denoted by a double \"railtracks\" breath mark with a fermata sign positioned above. This snippet should present an -optically pleasing combination of railtracks and a fermata. +optically pleasing combination of railtracks and fermata. " doctitle = "Caesura (\"railtracks\") with fermata" } % begin verbatim -{ - c''2. +\relative c'' { + c2. % construct the symbol \override BreathingSign #'text = \markup { \line { @@ -32,9 +32,9 @@ optically pleasing combination of railtracks and a fermata. \musicglyph #"scripts.ufermata" } } - \breathe c''4 + \breathe c4 % set the breathe mark back to normal \revert BreathingSign #'text - c''2. \breathe c''4 + c2. \breathe c4 \bar "|." } diff --git a/input/lsr/changing-beam-knee-gap.ly b/input/lsr/changing-beam-knee-gap.ly new file mode 100644 index 0000000000..9fd7f0a2a0 --- /dev/null +++ b/input/lsr/changing-beam-knee-gap.ly @@ -0,0 +1,24 @@ +%% 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 = " +Kneed beams are inserted automatically when a large gap is detected +between the note heads. This behavior can be tuned through the +@code{auto-knee-gap} property. A kneed beam is drawn if the gap is +larger than the value of @code{auto-knee-gap} plus the width of the +beam object (which depends on the duration of the notes and the slope +of the beam). By default @code{auto-knee-gap} is set to 5.5 staff +spaces. + +" + doctitle = "Changing beam knee gap" +} % begin verbatim +{ + f8 f''8 f8 f''8 + \override Beam #'auto-knee-gap = #6 + f8 f''8 f8 f''8 +} diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index f8a143fac0..9c4bd34926 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -40,5 +40,5 @@ arguments. \relative c' { 2 \applyOutput #'Voice #mc-squared - + 2 } diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index e870933209..e2df581922 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -30,11 +30,11 @@ The default font families for text can be overridden with (/ myStaffSize 20))) } -\relative { - c'^\markup { +\relative c'' { + c4^\markup { roman: foo \bold bla \italic bar \italic \bold baz } - c'_\markup { + c'4_\markup { \override #'(font-family . sans) { sans: foo \bold bla \italic bar \italic \bold baz diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index 60c4079846..f838595798 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -8,16 +8,18 @@ texidoc = " Though the simplest way to resize staves is to use @code{#(set-global-staff-size xx)}, an individual staff's size can be -changed by scaling the properties @code{staff-space} and +changed by scaling the properties @code{'staff-space} and @code{fontSize}. " 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 diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 3f047d25c9..e2d43217b4 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -6,14 +6,14 @@ lsrtags = "rhythms" texidoc = " -The Scheme function @code{set-time-signature}, in combination with the -@code{Measure_grouping_engraver}, creates measure grouping signs. Such -signs ease reading rhythmically complex modern music. In the following -example, the 9/8 measure is subdivided into 2, 2, 2 and 3 beats. This -is passed to @code{set-time-signature} as the third argument @code{(2 2 -2 3)}. - - +Options to group beats within a bar are available through the Scheme +function @code{set-time-signature}, which takes three arguments: the +number of beats, the beat length, and the internal grouping of beats in +the measure. If the @code{Measure_grouping_engraver} is included, the +function will also create @code{MeasureGrouping} signs. Such signs +ease reading rhythmically complex modern music. In the example, the +9/8 measure is subdivided in 2, 2, 2 and 3. This is passed to +@code{set-time-signature} as the third argument: @code{'(2 2 2 3)}: " doctitle = "Conducting signs, measure grouping signs" diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly index 1ea4e18379..f75778178d 100644 --- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly @@ -22,7 +22,7 @@ lugar. texidoc = " The vertical ordering of scripts is controlled with the -@code{script-priority} property. The lower this number, the closer it +@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 diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index ad445f6ef9..d56cfb1f68 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -8,27 +8,29 @@ texidoc = " The default behavior of tuplet-bracket visibility is to print a bracket unless there is a beam of the same length as the tuplet. To control the -visibility of tuplet brackets, set the property @code{TupletBracket -#'bracket-visibility} to either @code{##t} (always print a bracket), -@code{##f} (never print a bracket) or @code{#'if-no-beam} (only print a -bracket if there is no beam). +visibility of tuplet brackets, set the property +@code{'bracket-visibility} to either @code{#t} (always print a +bracket), @code{#f} (never print a bracket) or @code{#'if-no-beam} +(only print a bracket if there is no beam). " doctitle = "Controlling tuplet bracket visibility" } % begin verbatim -mus = \relative c'' { +music = \relative c'' { \times 2/3 { c16[ d e } f8] \times 2/3 { c8 d e } \times 2/3 { c4 d e } } -\new Voice \relative c'{ - << \mus s4^"default" >> - \override TupletBracket #'bracket-visibility = #'if-no-beam - << \mus s4^"'if-no-beam" >> - \override TupletBracket #'bracket-visibility = ##t - << \mus s4^"#t" >> - \override TupletBracket #'bracket-visibility = ##f - << \mus s4^"#f" >> +\new Voice { + \relative c' { + << \music s4^"default" >> + \override TupletBracket #'bracket-visibility = #'if-no-beam + << \music s4^"'if-no-beam" >> + \override TupletBracket #'bracket-visibility = ##t + << \music s4^"#t" >> + \override TupletBracket #'bracket-visibility = ##f + << \music s4^"#f" >> + } } diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly index 8a40eb6517..b1d3a15eba 100644 --- a/input/lsr/customizing-fretboard-fret-diagrams.ly +++ b/input/lsr/customizing-fretboard-fret-diagrams.ly @@ -3,6 +3,18 @@ \version "2.11.62" \header { + texidoces = " +Se pueden establecer las propiedades de los diagramas de +posiciones de acordes por medio de @code{'fret-diagram-details}. +Para los diagramas de posiciones de FretBoard, se aplican los +overrides (sobreescrituras) al objeto @code{FretBoards.FretBoard}. +Como @code{Voice}, @code{FretBoards} es un contexto del nivel +inferior, y por tanto se puede omitir su nombre en la +sobreescritura de propiedades. + +" + doctitlees = "Personalizar los diagramas de posiciones" + lsrtags = "fretted-strings,tweaks-and-overrides" texidoc = "Fret diagram properties can be set through diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly index c16ecae854..ff8bef52b9 100644 --- a/input/lsr/customizing-markup-fret-diagrams.ly +++ b/input/lsr/customizing-markup-fret-diagrams.ly @@ -3,6 +3,15 @@ \version "2.11.62" \header { + texidoces = " +Se pueden establecer las propiedades de los diagramas de +posiciones a través de @code{'fret-diagram-details}. Para los +diagramas de posiciones de marcado, se pueden aplicar overrides +(sobreescrituras) al objeto @code{Voice.TextScript} o directamente al elemento de marcado. + +" + doctitlees = "Personalizar diagramas de posiciones de marcado" + lsrtags = "fretted-strings,tweaks-and-overrides" texidoc = "Fret diagram properties can be set through diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 434673c6a8..8b59356a75 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -3,7 +3,7 @@ \version "2.11.62" \header { - lsrtags = "vocal-music, keyboards, unfretted-strings, midi" + lsrtags = "midi" texidoc = " Problem: How to know which @code{midiInstrument} would be best for your @@ -19,155 +19,154 @@ composition? Solution: A LilyPond demo file. arranger = "Myself " } -basemelodie = \relative c' { - c4. \mf g c16 b' c d +baseMelody = \relative c' { + c4.\mf g c16 b' c d e16 d e f g4 g'4 r R1 } -melodie = { \tempo 4 = 150 \basemelodie } +melody = { + \tempo 4 = 150 + \baseMelody +} \score { \new Staff << - \new Voice { \melodie - } + \new Voice \melody >> \layout { } } \score { \new Staff << - %\set Staff.instrumentName= #"S/A" - %\set Staff.midiMinimumVolume = #0.2 - %\set Staff.midiMaximumVolume = #0.4 - %\set Voice.dynamicAbsoluteVolumeFunction = #0.6 - \new Voice { r \mf - \set Staff.midiInstrument = #"acoustic grand" \melodie - \set Staff.midiInstrument = #"bright acoustic" \melodie - \set Staff.midiInstrument = #"electric grand" \melodie - \set Staff.midiInstrument = #"honky-tonk" \melodie - \set Staff.midiInstrument = #"electric piano 1" \melodie - \set Staff.midiInstrument = #"electric piano 2" \melodie - \set Staff.midiInstrument = #"harpsichord" \melodie - \set Staff.midiInstrument = #"clav" \melodie - \set Staff.midiInstrument = #"celesta" \melodie - \set Staff.midiInstrument = #"glockenspiel" \melodie - \set Staff.midiInstrument = #"music box" \melodie - \set Staff.midiInstrument = #"vibraphone" \melodie - \set Staff.midiInstrument = #"marimba" \melodie - \set Staff.midiInstrument = #"xylophone" \melodie - \set Staff.midiInstrument = #"tubular bells" \melodie - \set Staff.midiInstrument = #"dulcimer" \melodie - \set Staff.midiInstrument = #"drawbar organ" \melodie - \set Staff.midiInstrument = #"percussive organ" \melodie - \set Staff.midiInstrument = #"rock organ" \melodie - \set Staff.midiInstrument = #"church organ" \melodie - \set Staff.midiInstrument = #"reed organ" \melodie - \set Staff.midiInstrument = #"accordion" \melodie - \set Staff.midiInstrument = #"harmonica" \melodie - \set Staff.midiInstrument = #"concertina" \melodie - \set Staff.midiInstrument = #"acoustic guitar (nylon)" \melodie - \set Staff.midiInstrument = #"acoustic guitar (steel)" \melodie - \set Staff.midiInstrument = #"electric guitar (jazz)" \melodie - \set Staff.midiInstrument = #"electric guitar (clean)" \melodie - \set Staff.midiInstrument = #"electric guitar (muted)" \melodie - \set Staff.midiInstrument = #"overdriven guitar" \melodie - \set Staff.midiInstrument = #"distorted guitar" \melodie - \set Staff.midiInstrument = #"acoustic bass" \melodie - \set Staff.midiInstrument = #"electric bass (finger)" \melodie - \set Staff.midiInstrument = #"electric bass (pick)" \melodie - \set Staff.midiInstrument = #"fretless bass" \melodie - \set Staff.midiInstrument = #"slap bass 1" \melodie - \set Staff.midiInstrument = #"slap bass 2" \melodie - \set Staff.midiInstrument = #"synth bass 1" \melodie - \set Staff.midiInstrument = #"synth bass 2" \melodie - \set Staff.midiInstrument = #"violin" \melodie - \set Staff.midiInstrument = #"viola" \melodie - \set Staff.midiInstrument = #"cello" \melodie - \set Staff.midiInstrument = #"contrabass" \melodie - \set Staff.midiInstrument = #"tremolo strings" \melodie - \set Staff.midiInstrument = #"pizzicato strings" \melodie - \set Staff.midiInstrument = #"orchestral strings" \melodie - \set Staff.midiInstrument = #"timpani" \melodie - \set Staff.midiInstrument = #"string ensemble 1" \melodie - \set Staff.midiInstrument = #"string ensemble 2" \melodie - \set Staff.midiInstrument = #"synthstrings 1" \melodie - \set Staff.midiInstrument = #"synthstrings 2" \melodie - \set Staff.midiInstrument = #"choir aahs" \melodie - \set Staff.midiInstrument = #"voice oohs" \melodie - \set Staff.midiInstrument = #"synth voice" \melodie - \set Staff.midiInstrument = #"orchestra hit" \melodie - \set Staff.midiInstrument = #"trumpet" \melodie - \set Staff.midiInstrument = #"trombone" \melodie - \set Staff.midiInstrument = #"tuba" \melodie - \set Staff.midiInstrument = #"muted trumpet" \melodie - \set Staff.midiInstrument = #"french horn" \melodie - \set Staff.midiInstrument = #"brass section" \melodie - \set Staff.midiInstrument = #"synthbrass 1" \melodie - \set Staff.midiInstrument = #"synthbrass 2" \melodie - \set Staff.midiInstrument = #"soprano sax" \melodie - \set Staff.midiInstrument = #"alto sax" \melodie - \set Staff.midiInstrument = #"tenor sax" \melodie - \set Staff.midiInstrument = #"baritone sax" \melodie - \set Staff.midiInstrument = #"oboe" \melodie - \set Staff.midiInstrument = #"english horn" \melodie - \set Staff.midiInstrument = #"bassoon" \melodie - \set Staff.midiInstrument = #"clarinet" \melodie - \set Staff.midiInstrument = #"piccolo" \melodie - \set Staff.midiInstrument = #"flute" \melodie - \set Staff.midiInstrument = #"recorder" \melodie - \set Staff.midiInstrument = #"pan flute" \melodie - \set Staff.midiInstrument = #"blown bottle" \melodie - \set Staff.midiInstrument = #"shakuhachi" \melodie - \set Staff.midiInstrument = #"whistle" \melodie - \set Staff.midiInstrument = #"ocarina" \melodie - \set Staff.midiInstrument = #"lead 1 (square)" \melodie - \set Staff.midiInstrument = #"lead 2 (sawtooth)" \melodie - \set Staff.midiInstrument = #"lead 3 (calliope)" \melodie - \set Staff.midiInstrument = #"lead 4 (chiff)" \melodie - \set Staff.midiInstrument = #"lead 5 (charang)" \melodie - \set Staff.midiInstrument = #"lead 6 (voice)" \melodie - \set Staff.midiInstrument = #"lead 7 (fifths)" \melodie - \set Staff.midiInstrument = #"lead 8 (bass+lead)" \melodie - \set Staff.midiInstrument = #"pad 1 (new age)" \melodie - \set Staff.midiInstrument = #"pad 2 (warm)" \melodie - \set Staff.midiInstrument = #"pad 3 (polysynth)" \melodie - \set Staff.midiInstrument = #"pad 4 (choir)" \melodie - \set Staff.midiInstrument = #"pad 5 (bowed)" \melodie - \set Staff.midiInstrument = #"pad 6 (metallic)" \melodie - \set Staff.midiInstrument = #"pad 7 (halo)" \melodie - \set Staff.midiInstrument = #"pad 8 (sweep)" \melodie - \set Staff.midiInstrument = #"fx 1 (rain)" \melodie - \set Staff.midiInstrument = #"fx 2 (soundtrack)" \melodie - \set Staff.midiInstrument = #"fx 3 (crystal)" \melodie - \set Staff.midiInstrument = #"fx 4 (atmosphere)" \melodie - \set Staff.midiInstrument = #"fx 5 (brightness)" \melodie - \set Staff.midiInstrument = #"fx 6 (goblins)" \melodie - \set Staff.midiInstrument = #"fx 7 (echoes)" \melodie - \set Staff.midiInstrument = #"fx 8 (sci-fi)" \melodie - \set Staff.midiInstrument = #"sitar" \melodie - \set Staff.midiInstrument = #"banjo" \melodie - \set Staff.midiInstrument = #"shamisen" \melodie - \set Staff.midiInstrument = #"koto" \melodie - \set Staff.midiInstrument = #"kalimba" \melodie - \set Staff.midiInstrument = #"bagpipe" \melodie - \set Staff.midiInstrument = #"fiddle" \melodie - \set Staff.midiInstrument = #"shanai" \melodie - \set Staff.midiInstrument = #"tinkle bell" \melodie - \set Staff.midiInstrument = #"agogo" \melodie - \set Staff.midiInstrument = #"steel drums" \melodie - \set Staff.midiInstrument = #"woodblock" \melodie - \set Staff.midiInstrument = #"taiko drum" \melodie - \set Staff.midiInstrument = #"melodic tom" \melodie - \set Staff.midiInstrument = #"synth drum" \melodie - \set Staff.midiInstrument = #"reverse cymbal" \melodie - \set Staff.midiInstrument = #"guitar fret noise" \melodie - \set Staff.midiInstrument = #"breath noise" \melodie - \set Staff.midiInstrument = #"seashore" \melodie - \set Staff.midiInstrument = #"bird tweet" \melodie - \set Staff.midiInstrument = #"telephone ring" \melodie - \set Staff.midiInstrument = #"helicopter" \melodie - \set Staff.midiInstrument = #"applause" \melodie - \set Staff.midiInstrument = #"gunshot" \melodie + \new Voice { + r\mf + \set Staff.midiInstrument = #"acoustic grand" \melody + \set Staff.midiInstrument = #"bright acoustic" \melody + \set Staff.midiInstrument = #"electric grand" \melody + \set Staff.midiInstrument = #"honky-tonk" \melody + \set Staff.midiInstrument = #"electric piano 1" \melody + \set Staff.midiInstrument = #"electric piano 2" \melody + \set Staff.midiInstrument = #"harpsichord" \melody + \set Staff.midiInstrument = #"clav" \melody + \set Staff.midiInstrument = #"celesta" \melody + \set Staff.midiInstrument = #"glockenspiel" \melody + \set Staff.midiInstrument = #"music box" \melody + \set Staff.midiInstrument = #"vibraphone" \melody + \set Staff.midiInstrument = #"marimba" \melody + \set Staff.midiInstrument = #"xylophone" \melody + \set Staff.midiInstrument = #"tubular bells" \melody + \set Staff.midiInstrument = #"dulcimer" \melody + \set Staff.midiInstrument = #"drawbar organ" \melody + \set Staff.midiInstrument = #"percussive organ" \melody + \set Staff.midiInstrument = #"rock organ" \melody + \set Staff.midiInstrument = #"church organ" \melody + \set Staff.midiInstrument = #"reed organ" \melody + \set Staff.midiInstrument = #"accordion" \melody + \set Staff.midiInstrument = #"harmonica" \melody + \set Staff.midiInstrument = #"concertina" \melody + \set Staff.midiInstrument = #"acoustic guitar (nylon)" \melody + \set Staff.midiInstrument = #"acoustic guitar (steel)" \melody + \set Staff.midiInstrument = #"electric guitar (jazz)" \melody + \set Staff.midiInstrument = #"electric guitar (clean)" \melody + \set Staff.midiInstrument = #"electric guitar (muted)" \melody + \set Staff.midiInstrument = #"overdriven guitar" \melody + \set Staff.midiInstrument = #"distorted guitar" \melody + \set Staff.midiInstrument = #"acoustic bass" \melody + \set Staff.midiInstrument = #"electric bass (finger)" \melody + \set Staff.midiInstrument = #"electric bass (pick)" \melody + \set Staff.midiInstrument = #"fretless bass" \melody + \set Staff.midiInstrument = #"slap bass 1" \melody + \set Staff.midiInstrument = #"slap bass 2" \melody + \set Staff.midiInstrument = #"synth bass 1" \melody + \set Staff.midiInstrument = #"synth bass 2" \melody + \set Staff.midiInstrument = #"violin" \melody + \set Staff.midiInstrument = #"viola" \melody + \set Staff.midiInstrument = #"cello" \melody + \set Staff.midiInstrument = #"contrabass" \melody + \set Staff.midiInstrument = #"tremolo strings" \melody + \set Staff.midiInstrument = #"pizzicato strings" \melody + \set Staff.midiInstrument = #"orchestral strings" \melody + \set Staff.midiInstrument = #"timpani" \melody + \set Staff.midiInstrument = #"string ensemble 1" \melody + \set Staff.midiInstrument = #"string ensemble 2" \melody + \set Staff.midiInstrument = #"synthstrings 1" \melody + \set Staff.midiInstrument = #"synthstrings 2" \melody + \set Staff.midiInstrument = #"choir aahs" \melody + \set Staff.midiInstrument = #"voice oohs" \melody + \set Staff.midiInstrument = #"synth voice" \melody + \set Staff.midiInstrument = #"orchestra hit" \melody + \set Staff.midiInstrument = #"trumpet" \melody + \set Staff.midiInstrument = #"trombone" \melody + \set Staff.midiInstrument = #"tuba" \melody + \set Staff.midiInstrument = #"muted trumpet" \melody + \set Staff.midiInstrument = #"french horn" \melody + \set Staff.midiInstrument = #"brass section" \melody + \set Staff.midiInstrument = #"synthbrass 1" \melody + \set Staff.midiInstrument = #"synthbrass 2" \melody + \set Staff.midiInstrument = #"soprano sax" \melody + \set Staff.midiInstrument = #"alto sax" \melody + \set Staff.midiInstrument = #"tenor sax" \melody + \set Staff.midiInstrument = #"baritone sax" \melody + \set Staff.midiInstrument = #"oboe" \melody + \set Staff.midiInstrument = #"english horn" \melody + \set Staff.midiInstrument = #"bassoon" \melody + \set Staff.midiInstrument = #"clarinet" \melody + \set Staff.midiInstrument = #"piccolo" \melody + \set Staff.midiInstrument = #"flute" \melody + \set Staff.midiInstrument = #"recorder" \melody + \set Staff.midiInstrument = #"pan flute" \melody + \set Staff.midiInstrument = #"blown bottle" \melody + \set Staff.midiInstrument = #"shakuhachi" \melody + \set Staff.midiInstrument = #"whistle" \melody + \set Staff.midiInstrument = #"ocarina" \melody + \set Staff.midiInstrument = #"lead 1 (square)" \melody + \set Staff.midiInstrument = #"lead 2 (sawtooth)" \melody + \set Staff.midiInstrument = #"lead 3 (calliope)" \melody + \set Staff.midiInstrument = #"lead 4 (chiff)" \melody + \set Staff.midiInstrument = #"lead 5 (charang)" \melody + \set Staff.midiInstrument = #"lead 6 (voice)" \melody + \set Staff.midiInstrument = #"lead 7 (fifths)" \melody + \set Staff.midiInstrument = #"lead 8 (bass+lead)" \melody + \set Staff.midiInstrument = #"pad 1 (new age)" \melody + \set Staff.midiInstrument = #"pad 2 (warm)" \melody + \set Staff.midiInstrument = #"pad 3 (polysynth)" \melody + \set Staff.midiInstrument = #"pad 4 (choir)" \melody + \set Staff.midiInstrument = #"pad 5 (bowed)" \melody + \set Staff.midiInstrument = #"pad 6 (metallic)" \melody + \set Staff.midiInstrument = #"pad 7 (halo)" \melody + \set Staff.midiInstrument = #"pad 8 (sweep)" \melody + \set Staff.midiInstrument = #"fx 1 (rain)" \melody + \set Staff.midiInstrument = #"fx 2 (soundtrack)" \melody + \set Staff.midiInstrument = #"fx 3 (crystal)" \melody + \set Staff.midiInstrument = #"fx 4 (atmosphere)" \melody + \set Staff.midiInstrument = #"fx 5 (brightness)" \melody + \set Staff.midiInstrument = #"fx 6 (goblins)" \melody + \set Staff.midiInstrument = #"fx 7 (echoes)" \melody + \set Staff.midiInstrument = #"fx 8 (sci-fi)" \melody + \set Staff.midiInstrument = #"sitar" \melody + \set Staff.midiInstrument = #"banjo" \melody + \set Staff.midiInstrument = #"shamisen" \melody + \set Staff.midiInstrument = #"koto" \melody + \set Staff.midiInstrument = #"kalimba" \melody + \set Staff.midiInstrument = #"bagpipe" \melody + \set Staff.midiInstrument = #"fiddle" \melody + \set Staff.midiInstrument = #"shanai" \melody + \set Staff.midiInstrument = #"tinkle bell" \melody + \set Staff.midiInstrument = #"agogo" \melody + \set Staff.midiInstrument = #"steel drums" \melody + \set Staff.midiInstrument = #"woodblock" \melody + \set Staff.midiInstrument = #"taiko drum" \melody + \set Staff.midiInstrument = #"melodic tom" \melody + \set Staff.midiInstrument = #"synth drum" \melody + \set Staff.midiInstrument = #"reverse cymbal" \melody + \set Staff.midiInstrument = #"guitar fret noise" \melody + \set Staff.midiInstrument = #"breath noise" \melody + \set Staff.midiInstrument = #"seashore" \melody + \set Staff.midiInstrument = #"bird tweet" \melody + \set Staff.midiInstrument = #"telephone ring" \melody + \set Staff.midiInstrument = #"helicopter" \melody + \set Staff.midiInstrument = #"applause" \melody + \set Staff.midiInstrument = #"gunshot" \melody } >> \midi { } 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 153f4b87e1..c9aa698cf8 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 @@ -17,6 +17,18 @@ notación. " + texidocde = " + In Werken des fürhen 20. Jahrhundert, angefangen mit Schönberg, Berg + und Webern (die zweite Wiener Schule), wird jeder Ton der + Zwölftonleiter als gleichwertig erachtet, ohne hierarchische + Ordnung. Deshalb wird in dieser Musik für jede Note ein Versetzungszeichen + ausgegeben, auch für unalterierte Tonhöhen, um das neue Verständnis + der Musiktheorie und Musiksprache zu verdeutlichen. + + Dieser Schnipsel zeigt, wie derartige Notationsregeln zu erstellen sind. + " + +doctitlede = "Versetzungszeichen für jede Note im Stil der Zwölftonmusik" lsrtags = "pitches" texidoc = "In early 20th century works, starting with Schoenberg, diff --git a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly index 97f2e56d0b..059797ed33 100644 --- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly +++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly @@ -5,6 +5,14 @@ \header { lsrtags = "fretted-strings" + texidoces = " +En este ejemplo se combinan las digitaciones de la mano izquierda, +indicaciones del número de cuerda y digitaciones de la mano +derecha. + +" + doctitlees = "Digitaciones, indicación del número de cuerda y digitaciones de mano derecha" + texidoc = " This example combines left-hand fingering, string indications, and right-hand fingering. diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly new file mode 100644 index 0000000000..4c5c427075 --- /dev/null +++ b/input/lsr/grouping-beats.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.62" + +\header { + lsrtags = "rhythms" + + texidoc = " +Beaming patterns may be altered with the @code{beatGrouping} property: +" + doctitle = "Grouping beats" +} % begin verbatim +\relative c'' { + \time 5/16 + \set beatGrouping = #'(2 3) + c8[^"(2+3)" c16 c8] + \set beatGrouping = #'(3 2) + c8[^"(3+2)" c16 c8] +} + diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly index fd66eca835..c7335894cd 100644 --- a/input/lsr/guitar-strum-rhythms.ly +++ b/input/lsr/guitar-strum-rhythms.ly @@ -3,6 +3,13 @@ \version "2.11.62" \header { + texidoces = " +Para la música de guitarra, es posible mostrar los ritmos de rasgueo, +además de las notas de la melodía, acordes y diagramas de posiciones. + +" + doctitlees = "Ritmos rasgueados de guitarra" + lsrtags = "rhythms,fretted-strings" texidoc = " For guitar music, it is possible to show strum rhythms, along diff --git a/input/lsr/keyboards.snippet-list b/input/lsr/keyboards.snippet-list index feb6826cf0..23cb9f9508 100644 --- a/input/lsr/keyboards.snippet-list +++ b/input/lsr/keyboards.snippet-list @@ -11,4 +11,3 @@ fine-tuning-pedal-brackets.ly piano-template-with-melody-and-lyrics.ly piano-template-with-centered-dynamics.ly jazz-combo-template.ly -demo-midiinstruments.ly diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index c6a77f294a..33dd616a88 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -28,6 +28,29 @@ alteración debe estar en todas las octavas. He aquí un ejemplo de una posible armadura para generar una escala exátona: +" + +doctitlede = "Untypische Tonarten" + +texidocde = " +Der üblicherweise benutzte @code{\\key}-Befehl setzt die +@code{keySignature}-Eigenschaft im @code{Staff}-Kontext. + +Um untypische Tonartenvorzeichen zu erstellen, muss man diese Eigenschaft +direkt setzen. Das Format für den Befehl ist eine Liste: + +@code{ \\set Staff.keySignature = #`(((Oktave . Schritt) . Alteration) ((Oktave +. Schritt) . Alteration) ...) } wobei für jedes Element in der Liste +@code{Oktave} die Oktave angibt (0 ist die Oktave vom eingestrichenen C bis +zum eingestrichenen H), @code{Schritt} gibt die Note innerhalb der Oktave an +(0 heißt C und 6 heißt H), und @code{Alteration} ist @code{,SHARP ,FLAT ,DOUBLE-SHARP} +usw. (Beachte das beginnende Komma.) + +Alternativ kann auch für jedes Element der Liste mit dem allgemeineren +Format @code{(Schritt . Alteration)} bestimmt werden, wobei dann die +Einstellungen für alle Oktaven gelten. + +Hier ein Beispiel einer möglichen Tonart für eine Ganztonleiter: " texidoc = " diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index 8b5ade0fd8..75a836c2e7 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -13,6 +13,19 @@ del corchete, ajuste @code{ottavation} despues de invocar a @code{set-octavation}. " doctitlees = "Texto de octava alta y baja" + + +texidocde = " +Intern setzt die @code{set-octavation}-Funktion die Eigenschaften +@code{ottavation} (etwa auf den Wert @code{\"8va\"} oder @code{\"8vb\"}) +und @code{middleCPosition}. Um den Text der Oktavierungsklammer zu +ändern, kann @code{ottavation} manuell gesetzt werden, nachdem +@code{set-octavation} benützt wurde. + +" + +doctitlede = "Ottava-Text" + texidoc = " Internally, the @code{set-octavation} function sets the properties @code{ottavation} (for example, to @code{\"8va\"} or @code{\"8vb\"}) diff --git a/input/lsr/paper-and-layout.snippet-list b/input/lsr/paper-and-layout.snippet-list index a4b5326451..c34dd47e45 100644 --- a/input/lsr/paper-and-layout.snippet-list +++ b/input/lsr/paper-and-layout.snippet-list @@ -1,7 +1,6 @@ creating-blank-staves.ly +aligning-and-centering-instrument-names.ly +table-of-contents.ly demonstrating-all-headers.ly changing-the-staff-size.ly clip-systems.ly -aligning-and-centering-instrument-names.ly -alignment-vertical-spacing.ly -table-of-contents.ly diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly index 892e6aac9e..9435890433 100644 --- a/input/lsr/placement-of-right-hand-fingerings.ly +++ b/input/lsr/placement-of-right-hand-fingerings.ly @@ -5,6 +5,14 @@ \header { lsrtags = "fretted-strings" + texidoces = " +Es posible ejercer un mayor control sobre la colocación de las +digitaciones de la mano derecha estableciendo el valor de una +propiedad específica, como se muestra en el ejemplo siguiente. + +" + doctitlees = "Posicionamiento de digitaciones de mano derecha" + texidoc = " It is possible to exercise greater control over the placement of right-hand fingerings by setting a specific property, as demonstrated diff --git a/input/lsr/polyphony-in-tablature.ly b/input/lsr/polyphony-in-tablature.ly index 14dc5a6fdd..7cf6726fbe 100644 --- a/input/lsr/polyphony-in-tablature.ly +++ b/input/lsr/polyphony-in-tablature.ly @@ -5,6 +5,13 @@ \header { lsrtags = "fretted-strings" + texidoces = " +La polifonía se crea de la misma forma en un @code{TabStaff} que +en una pauta normal. + +" + doctitlees = "Polifonía en tablaturas" + texidoc = " Polyphony is created the same way in a @code{TabStaff} as in a regular staff. 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 fee5e59801..ae927a9d29 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -20,6 +20,17 @@ propiedad @code{extraNatural} a @code{##f} (falso) dentro del contexto de @code{Staff}. " + +doctitlede = "Verhindern, dass zusätzliche Auflösungszeichen automatisch +hinzugefügt werden" + +texidocde = "Den tranditionellen Notensatzregeln zufolge wird ein +Auflösungszeichen immer dann vor einem Kreuz oder B gesetzt, wenn +ein vorheriges Versetzungszeichen der gleichen Note aufgehoben werden +soll. Um dieses Verhalten zu ändern, muss die Eigenschaft +@code{extraNatural} im @code{Staff}-Kontext auf \"false\" gesetzt werden. +" + texidoc = " In accordance with standard typesetting rules, a natural sign is printed before a sharp or flat if a previous accidental on the same 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 9978073b8a..71a7e52146 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 @@ -13,6 +13,16 @@ anteriores. Esto se puede evitar estableciendo al valor \"falso\" la propiedad @code{printKeyCancellation} del contexto @code{Staff}. " + +doctitlede = "Auflösungzeichen nicht setzen, wenn die Tonart wechselt" + +texidocde = " +Wenn die Tonart wechselt, werden automatisch Auflösungszeichen ausgegeben, +um Versetzungszeichen der vorherigen Tonart aufzulösen. Das kann +verhindert werden, indem die @code{printKeyCancellation}-Eigenschaft +im @code{Staff}-Kontext auf \"false\" gesetzt wird. +" + texidoc = " When the key signature changes, natural signs are automatically printed to cancel any accidentals from previous key signatures. This may be diff --git a/input/lsr/reverting-default-beam-endings.ly b/input/lsr/reverting-default-beam-endings.ly new file mode 100644 index 0000000000..0dae627c3d --- /dev/null +++ b/input/lsr/reverting-default-beam-endings.ly @@ -0,0 +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.62" + +\header { + lsrtags = "rhythms" + + texidoc = " +To typeset beams grouped @code{3-4-3-2} in 12/8 it is necessary first +to override the default beam endings in 12/8, and then to set up the +new beaming endings: + +" + doctitle = "Reverting default beam endings" +} % begin verbatim +\relative c'' { + \time 12/8 + + % Default beaming + a8 a a a a a a a a a a a + + % Revert default values in scm/auto-beam.scm for 12/8 time + #(revert-auto-beam-setting '(end * * 12 8) 3 8) + #(revert-auto-beam-setting '(end * * 12 8) 3 4) + #(revert-auto-beam-setting '(end * * 12 8) 9 8) + a8 a a a a a a a a a a a + + % Set new values for beam endings + #(override-auto-beam-setting '(end * * 12 8) 3 8) + #(override-auto-beam-setting '(end * * 12 8) 7 8) + #(override-auto-beam-setting '(end * * 12 8) 10 8) + a8 a a a a a a a a a a a +} diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index c979cb8832..f4e92e5f46 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -1,3 +1,5 @@ +changing-beam-knee-gap.ly +reverting-default-beam-endings.ly adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly printing-music-with-different-time-signatures.ly beams-across-line-breaks.ly @@ -8,10 +10,12 @@ rest-styles.ly chant-or-psalms-notation.ly controlling-tuplet-bracket-visibility.ly heavily-customized-polymetric-time-signatures.ly +grouping-beats.ly positioning-multi--measure-rests.ly using-ties-with-arpeggios.ly changing-text-and-spanner-styles-for-text-dynamics.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +sub-dividing-beams.ly compound-time-signatures.ly changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly modifying-tuplet-bracket-length.ly @@ -19,11 +23,13 @@ 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 automatic-beam-subdivisions.ly +beam-grouping-in-7-8-time.ly changing-the-tuplet-number.ly entering-several-tuplets-using-only-one--times-command.ly conducting-signs,-measure-grouping-signs.ly skips-in-lyric-mode-2.ly changing-form-of-multi--measure-rests.ly +guitar-strum-rhythms.ly rhythmic-slashes.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly three-sided-box.ly @@ -31,4 +37,3 @@ merging-multi-measure-rests-in-a-polyphonic-part.ly skips-in-lyric-mode.ly engraving-ties-manually.ly stemlets.ly -guitar-strum-rhythms.ly diff --git a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly index fc348dc99f..9f8135a6b7 100644 --- a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly +++ b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly @@ -5,6 +5,19 @@ \header { lsrtags = "expressive-marks, unfretted-strings" + texidoces = " +El pizzicato de chasquido (también llamado \"Pizzicato +de Bartók\") es un \"pizzicato fuerte en que la cuerda se pulsa +verticalmente produciendo un chasquido y rebotando en el diapasón del +instrumento\" (Wikipedia). Se denota mediante una circunferencia con +una línea vertical corta que parte del centro de aquélla hacia +fuera. Aunque Lilypond no tiene ninguna instrucción predefinida para +crear esta marca, es fácil hacer la definición y colocarla +directamente en el archivo de lilypond. + +" + doctitlees = "Marca de pizzicato de chasquido (\"pizzicato de Bartók\")" + texidoc = " A snap-pizzicato (also known as \"Bartok pizzicato\") is a \"strong pizzicato where the string is plucked vertically by snapping and diff --git a/input/lsr/spacing.snippet-list b/input/lsr/spacing.snippet-list index b5c62998fa..06ca8aa439 100644 --- a/input/lsr/spacing.snippet-list +++ b/input/lsr/spacing.snippet-list @@ -1,7 +1,6 @@ vertically-aligned-dynamics-and-textscripts.ly -proportional-strict-notespacing.ly -vertically-aligning-ossias-and-lyrics.ly allowing-fingerings-to-be-printed-inside-the-staff.ly -page-label.ly -alignment-vertical-spacing.ly adjusting-lyrics-vertical-spacing.ly +vertically-aligning-ossias-and-lyrics.ly +page-label.ly +proportional-strict-notespacing.ly diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly index 25aa4f3690..cd46ebe7bf 100644 --- a/input/lsr/stem-and-beam-behavior-in-tablature.ly +++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly @@ -5,6 +5,13 @@ \header { lsrtags = "fretted-strings" + texidoces = " +La dirección de las plicas se contola de la misma forma en la +tablatura que en la notación tradicional. Las barras se pueden +poner horizontales, como se muestra en este ejemplo. + +" + doctitlees = "Comportamiento de las plicas y las barras de corchea en tablaturas" texidoc = " The direction of stems is controlled the same way in tablature as in traditional notation. Beams can be made horizontal, as shown in this diff --git a/input/lsr/sub-dividing-beams.ly b/input/lsr/sub-dividing-beams.ly new file mode 100644 index 0000000000..48c267fa9e --- /dev/null +++ b/input/lsr/sub-dividing-beams.ly @@ -0,0 +1,37 @@ +%% 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 = " +The beams of consecutive 16th (or shorter) notes are, by default, not +sub-divided. That is, the three (or more) beams stretch unbroken over +entire groups of notes. This behavior can be modified to sub-divide +the beams into sub-groups by setting the property +@code{subdivideBeams}. When set, multiple beams will be sub-divided at +intervals defined by the current value of @code{beatLength} by reducing +the multiple beams to just one beam between the sub-groups. Note that +@code{beatLength} defaults to a quarter note if not set explicitly. It +must be set to a fraction giving the duration of the beam sub-group +using the @code{make-moment} function, as shown here: + + + +" + doctitle = "Sub-dividing beams" +} % begin verbatim +\relative c'' { + c32[ c c c c c c c] + \set subdivideBeams = ##t + c32[ c c c c c c c] + + % Set beam sub-group length to an eighth note + \set beatLength = #(ly:make-moment 1 8) + c32[ c c c c c c c] + + % Set beam sub-group length to a sixteenth note + \set beatLength = #(ly:make-moment 1 16) + c32[ c c c c c c c] +} 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 5aa1f3470b..bdd3d50311 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -31,6 +31,37 @@ De esta forma se selecciona el mayor número de notas enarmónicas naturales. " + +doctitlede = "Noten mit minimaler Anzahl an Versetzungszeichen transponieren." + +texidocde = "Dieses Beispiel benutzt Scheme-Code, um enharmonische +Verwechslungen für Noten zu erzwingen, damit nur eine minimale Anzahl +an Versetzungszeichen ausgegeben wird. In diesem Fall gelten die +folgenden Regeln: + +@itemize +@item +Doppelte Versetzungszeichen sollen entfernt werden + +@item +His -> C + +@item +Eis -> F + +@item +Ces -> B + +@item +Fes -> E + +@end itemize + +Auf diese Art werden am meisten natürliche Tonhöhen als enharmonische +Variante gewählt. +" + + lsrtags = "pitches" texidoc = "This example uses some Scheme code to enforce enharmonic modifications for notes in order to have the minimum number of diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index 441bd3eda8..91bc90f397 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -41,6 +41,42 @@ cambios manuales preservan el posicionamiento relativo estándar de las claves y las notas, pero no lo hacen en la segunda línea. " + +doctitlede = "Eigenschaften des Schlüssels optimieren" + +texidocde = "Der Befehl @code{\\clef \"treble_8\"} ist gleichbedeutend +mit einem expliziten Setzen der Eigenschaften von @code{clefGlyph}, +@code{clefPosition} (welche die vertikale Position des Schlüssels +bestimmt), @code{middleCPosition} und @code{clefOctavation}. Ein +Schlüssel wird ausgegeben, wenn eine der Eigenschaften außer +@code{middleCPosition} sich ändert. + +Eine Änderung des Schriftzeichens (Glyph), der Schlüsselposition oder +der Oktavierung selber ändert noch nicht die Position der darauf +folgenden Noten auf dem System: das geschieht nur, wenn auch die +Position des eingestrichenen Cs (middleCPosition) angegeben wird. +Die Positionsparameter sind relativ zur Mittellinie des Systems, +dabei versetzen positive Zahlen die Position nach oben, jeweils eine +Zahl für jede Linie plus Zwischenraum. Der @code{clefOctavation}-Wert +ist normalerweise auf 7, -7, 15 oder -15 gesetzt, aber auch andere +Werte sind gültig. + +Wenn ein Schlüsselwechsel an einem Zeilenwechsel geschieht, wird das +neue Symbol sowohl am Ende der alten Zeilen als auch am Anfang der +neuen Zeile ausgegeben. Wenn der Warnungs-Schlüssel am Ende der +alten Zeile nicht erforderlich ist, kann er unterdrückt werden, +indem die @code{explicitClefVisibility} des @code{Staff}-Kontextes +auf den Wert @code{end-of-line-invisible} gesetzt wird. Das +Standardverhalten kann mit @code{\\unset Staff.explicitClefVisibility} +wieder hergestellt werden. + +Die folgenden Beispiele zeigen die Möglichkeiten, wenn man diese +Eigenschaften manuell setzt. Auf der ersten Zeile erhalten die manuellen +Änderungen die ursprüngliche relative Positionierung von Schlüssel und +Noten, auf der zweiten Zeile nicht. +" + + texidoc = " The command @code{\\clef \"treble_8\"} is equivalent to setting @code{clefGlyph}, @code{clefPosition} (which controls the vertical diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index 34d4ced4fe..75b63e3c24 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -31,7 +31,6 @@ tweaking-clef-properties.ly proportional-strict-notespacing.ly 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 analysis-brackets-above-the-staff.ly fret-diagrams-explained-and-developed.ly diff --git a/input/lsr/unfretted-strings.snippet-list b/input/lsr/unfretted-strings.snippet-list index f57be5de17..00b471b222 100644 --- a/input/lsr/unfretted-strings.snippet-list +++ b/input/lsr/unfretted-strings.snippet-list @@ -1,7 +1,6 @@ dotted-harmonics.ly -demo-midiinstruments.ly -snap-pizzicato-markup-bartok-pizzicato.ly -string-quartet-template-simple.ly string-quartet-template-with-separate-parts.ly -changing--flageolet-mark-size.ly creating-slurs-across-voices.ly +changing--flageolet-mark-size.ly +string-quartet-template-simple.ly +snap-pizzicato-markup-bartok-pizzicato.ly diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly index c9334489d4..cce4f4e550 100644 --- a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly @@ -20,7 +20,7 @@ largo de su línea de base. doctitlees = "Indicaciones dinámicas y textuales alineadas verticalmente" texidoc = " -By setting the @code{Y-extent} property to a suitable value, all +By setting the @code{'Y-extent} property to a suitable value, all @code{DynamicLineSpanner} objects (hairpins and dynamic texts) can be aligned to a common reference point, regardless of their actual extent. This way, every element will be vertically aligned, thus producing a diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index 8394e8b712..44f62b0bb5 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -43,7 +43,7 @@ positioning of lyrics and ossias. } { \times 4/6 { \override TextScript #'padding = #3 - c8^"ossia above" d e d e f + c8[^"ossia above" d e d e f] } } >> diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index 12aca70a8d..49e1561119 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -1,22 +1,21 @@ changing-stanza-fonts.ly +vocal-ensemble-template-with-automatic-piano-reduction.ly ambitus-with-multiple-voices.ly +how-to-put-ties-between-syllables-in-lyrics.ly formatting-lyrics-syllables.ly +piano-template-with-melody-and-lyrics.ly +marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly chant-or-psalms-notation.ly +single-staff-template-with-notes-and-lyrics.ly adding-ambitus-per-voice.ly single-staff-template-with-notes,-lyrics,-chords-and-frets.ly skips-in-lyric-mode-2.ly +ambitus.ly lyrics-alignment.ly +single-staff-template-with-notes,-lyrics,-and-chords.ly vertically-aligning-ossias-and-lyrics.ly +vertically-centered-common-lyrics.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly vocal-ensemble-template.ly adjusting-lyrics-vertical-spacing.ly -vocal-ensemble-template-with-automatic-piano-reduction.ly -vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly -how-to-put-ties-between-syllables-in-lyrics.ly -piano-template-with-melody-and-lyrics.ly -demo-midiinstruments.ly -single-staff-template-with-notes-and-lyrics.ly -marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly -ambitus.ly -single-staff-template-with-notes,-lyrics,-and-chords.ly -vertically-centered-common-lyrics.ly skips-in-lyric-mode.ly -- 2.39.5