From 64f755f3c484dd78a7f9b581aac591099c5019af Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Thu, 26 Aug 2010 23:31:44 +0100 Subject: [PATCH] LSR: Update. --- .../snippets/adding-ambitus-per-voice.ly | 2 +- .../additional-voices-to-avoid-collisions.ly | 2 +- .../snippets/aligning-bar-numbers.ly | 2 +- .../snippets/anglican-psalm-template.ly | 140 +++++++++--------- ...yles-depending-on-the-step-of-the-scale.ly | 2 +- .../snippets/arabic-improvisation.ly | 2 +- .../snippets/changing-chord-separator.ly | 2 +- ...xt-and-spanner-styles-for-text-dynamics.ly | 4 +- .../combining-two-parts-on-the-same-staff.ly | 6 +- ...onducting-signs,-measure-grouping-signs.ly | 2 +- ...eggios-across-notes-in-different-voices.ly | 2 +- ...bracket-with-only-one-staff-in-a-system.ly | 6 +- ...entals-for-each-note-including-naturals.ly | 2 +- .../snippets/flat-flags-and-beam-nibs.ly | 2 +- .../snippets/generating-custom-flags.ly | 59 ++++++++ .../snippets/guitar-strum-rhythms.ly | 4 +- ...ing-the-extender-line-for-text-dynamics.ly | 2 +- Documentation/snippets/hymn-template.ly | 25 +++- ...che-layout-bar-lines-between-the-staves.ly | 2 +- .../snippets/multi-measure-rest-markup.ly | 4 +- .../snippets/new/anglican-psalm-template.ly | 129 ---------------- Documentation/snippets/new/hymn-template.ly | 100 ------------- .../new/partcombine-and-autobeamoff.ly | 52 ------- .../snippets/new/vocal-ensemble-template.ly | 81 ---------- .../snippets/partcombine-and-autobeamoff.ly | 70 ++++----- ...naturals-from-being-automatically-added.ly | 2 +- ...inting-bar-numbers-at-regular-intervals.ly | 2 +- ...ng-the-bar-number-for-the-first-measure.ly | 2 +- Documentation/snippets/rhythms.snippet-list | 1 + .../setting-hairpin-behavior-at-bar-lines.ly | 2 +- Documentation/snippets/template.snippet-list | 1 + .../tweaks-and-overrides.snippet-list | 1 + .../snippets/using-ties-with-arpeggios.ly | 2 +- ...nsemble-template-with-verse-and-refrain.ly | 11 ++ .../snippets/vocal-ensemble-template.ly | 13 +- .../snippets/vocal-music.snippet-list | 1 + 36 files changed, 231 insertions(+), 511 deletions(-) create mode 100644 Documentation/snippets/generating-custom-flags.ly delete mode 100644 Documentation/snippets/new/anglican-psalm-template.ly delete mode 100644 Documentation/snippets/new/hymn-template.ly delete mode 100644 Documentation/snippets/new/partcombine-and-autobeamoff.ly delete mode 100644 Documentation/snippets/new/vocal-ensemble-template.ly diff --git a/Documentation/snippets/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly index 8ea0118ded..7ac1256fb6 100644 --- a/Documentation/snippets/adding-ambitus-per-voice.ly +++ b/Documentation/snippets/adding-ambitus-per-voice.ly @@ -17,7 +17,7 @@ debe desplazar manualmente para evitar colisiones. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " Ambitus können pro Stimme gesetzt werden. In diesem Fall müssen sie -manual verschoben werden, um Zusammenstöße zu verhindern. +manuell verschoben werden, um Zusammenstöße zu verhindern. " doctitlede = "Ambitus pro Stimme hinzufügen" diff --git a/Documentation/snippets/additional-voices-to-avoid-collisions.ly b/Documentation/snippets/additional-voices-to-avoid-collisions.ly index 3d8255ecb3..d8cf9d904b 100644 --- a/Documentation/snippets/additional-voices-to-avoid-collisions.ly +++ b/Documentation/snippets/additional-voices-to-avoid-collisions.ly @@ -20,7 +20,7 @@ variable que utiliza la función de Scheme @code{context-spec-music}. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " Ein einigen Fällen von sehr komplexer polyphoner Musik sind zusätzliche -Stimmen notwendig, um Zusammestöße zwischen den Noten zu vermeiden. +Stimmen notwendig, um Zusammenstöße zwischen den Noten zu vermeiden. Wenn mehr als vier parallele Stimmen benötigt werden, können zusätzliche Stimmen definiert werden, indem eine Variable mit der Funktion @code{context-spec-music} definiert wird. diff --git a/Documentation/snippets/aligning-bar-numbers.ly b/Documentation/snippets/aligning-bar-numbers.ly index 6cae9d078f..8cfa9b37da 100644 --- a/Documentation/snippets/aligning-bar-numbers.ly +++ b/Documentation/snippets/aligning-bar-numbers.ly @@ -23,7 +23,7 @@ alineados por la izquierda con ella. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " -Taktnummern sind standardmäßig links an ihrem Ursprungsobjet +Taktnummern sind standardmäßig links an ihrem Ursprungsobjekt ausgerichtet. Das ist normalerweise die linke Ecke einer Linie oder, wenn die Nummern innerhalb einer Zeile gesetzt werden, auf der linken Seite eines Taktstrichs. Die Nummern können auch diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly index f666189d9d..ac0b797a2c 100644 --- a/Documentation/snippets/anglican-psalm-template.ly +++ b/Documentation/snippets/anglican-psalm-template.ly @@ -1,22 +1,21 @@ -% Do not edit this file; it is automatically -% generated from Documentation\snippets\new -% This file is in the public domain. -%% Note: this file works from version 2.13.30 +%% Do not edit this file; it is automatically +%% generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.13.31" -\version "2.13.30" \header { lsrtags = "vocal-music, template" + texidoc = " -This template shows one way of setting out an Anglican psalm chant. -It also shows how the verses may be added as stand-alone text under -the music. The two verses are coded in different styles to -demonstrate more possibilities. +This template shows one way of setting out an Anglican psalm chant. It +also shows how the verses may be added as stand-alone text under the +music. The two verses are coded in different styles to demonstrate +more possibilities. " doctitle = "Anglican psalm template" } % begin verbatim - SopranoMusic = \relative g' { g1 | c2 b | a1 | \bar "||" a1 | d2 c | c b | c1 | \bar "||" @@ -38,67 +37,61 @@ BassMusic = \relative c { } global = { - \time 2/2 + \time 2/2 } dot = \markup { - \override #'(font-encoding . fetaMusic) - \raise #0.7 \lookup #"dots.dot" + \raise #0.7 \musicglyph #"dots.dot" } tick = \markup { - \override #'(font-encoding . fetaMusic) - \raise #1 \fontsize #-5 { \lookup #'"scripts.rvarcomma" } + \raise #1 \fontsize #-5 \musicglyph #"scripts.rvarcomma" } % Use markup to center the chant on the page \markup { \fill-line { - " " % left-justified - -\score { % centered - << - \new ChoirStaff << - \new Staff << - \global - \clef "treble" - \new Voice = "Soprano" << - \voiceOne - \SopranoMusic - >> - \new Voice = "Alto" << - \voiceTwo - \AltoMusic + \score { % centered + << + \new ChoirStaff << + \new Staff << + \global + \clef "treble" + \new Voice = "Soprano" << + \voiceOne + \SopranoMusic + >> + \new Voice = "Alto" << + \voiceTwo + \AltoMusic + >> + >> + \new Staff << + \clef "bass" + \global + \new Voice = "Tenor" << + \voiceOne + \TenorMusic + >> + \new Voice = "Bass" << + \voiceTwo + \BassMusic + >> + >> >> >> - \new Staff << - \clef "bass" - \global - \new Voice = "Tenor" << - \voiceOne - \TenorMusic - >> - \new Voice = "Bass" << - \voiceTwo - \BassMusic - >> - >> - >> - >> - \layout { - \context { - \Score - \override SpacingSpanner - #'base-shortest-duration = #(ly:make-moment 1 2) - } - \context { - \Staff - \remove Time_signature_engraver - } - } -} % End score - - " " % right-justified + \layout { + \context { + \Score + \override SpacingSpanner + #'base-shortest-duration = #(ly:make-moment 1 2) + } + \context { + \Staff + \remove "Time_signature_engraver" + } + } + } % End score } } % End markup @@ -106,28 +99,31 @@ tick = \markup { \fill-line { \column { \left-align { - " " " " " " + \null \null \null + \line { + \fontsize #5 O + \fontsize #3 come + let us \bold sing | unto \dot the | Lord : let + } + \line { + us heartily + \concat { re \bold joice } + in the | strength of | our + } \line { - \fontsize #5 "O" - \fontsize #3 "come" - \fontsize #0 - "let us" \bold "sing" "| unto" \dot "the | Lord : let" + sal | vation. } + \null \line { - "us heartily" - \concat { "re" \bold "joice" } - "in the | strength of | our" + \hspace #2.5 2. Let us come before his presence \tick with } - "sal | vation." - " " \line { - " 2. Let us come before his presence" \tick "with" + thanks \tick giving * and shew ourselves + \tick glad in \tick } \line { - "thanks" \tick "giving * and shew ourselves" - \tick "glad in" \tick + him with psalms. } - "him with psalms." } } } diff --git a/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly index aa69dff71e..7f6b9da69c 100644 --- a/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly +++ b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly @@ -37,7 +37,7 @@ nota. Die @code{shapeNoteStyles}-(NotenFormenStile)-Eigenschaft kann benutzt werden, um verschiedene Notenstile für jeden Schritt der Tonleiter zu definieren (vorgegeben von der Tonart oder der @qq{tonic} -(Tonika)-Eigneschaft. Diese Eigenschaft braucht eine Anzahl von Symbolen, +(Tonika)-Eigenschaft. Diese Eigenschaft braucht eine Anzahl von Symbolen, welche beliebig 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 diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly index c03319e7d2..407294ec66 100644 --- a/Documentation/snippets/arabic-improvisation.ly +++ b/Documentation/snippets/arabic-improvisation.ly @@ -26,7 +26,7 @@ werden, kann die Taktart ausgelassen werden und @code{\cadenzaOn} kann eingesetzt werden. Es kann nötig sein, den Versetzungszeichenstil anzupassen, weil sonst die Versetzungszeichen nur einmal ausgegeben werden, da keine Taktlinien gesetzt sind. Hier ein Beispiel, wie -der Begin einer @emph{hijaz}-Improvisation aussehen könnte: +der Beginn einer @emph{hijaz}-Improvisation aussehen könnte: " diff --git a/Documentation/snippets/changing-chord-separator.ly b/Documentation/snippets/changing-chord-separator.ly index 21af4907a4..f9b843571d 100644 --- a/Documentation/snippets/changing-chord-separator.ly +++ b/Documentation/snippets/changing-chord-separator.ly @@ -18,7 +18,7 @@ nombre de un acorde para que sea cualquier elemento de marcado. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " Der Trenner zwischen unterschiedlichen Teilen eines Akkordsymbols kann -beliebeiger Text sein. +beliebiger Text sein. " doctitlede = "Akkordsymboltrenner verändern" diff --git a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly index 56c81e085a..8046cf38cc 100644 --- a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -24,12 +24,12 @@ valores posibles se encuentran @code{'line} (línea), %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " -Der Text, der für Crescendo und Decrescendo gestzt wird, kann geändert +Der Text, der für Crescendo und Decrescendo gesetzt wird, kann geändert werden, indem man die Eigenschaften @code{crescendoText} und @code{decrescendoText} verändert. Der Stil des Streckers kann auch geändert werden, indem die @code{'style}-Eigenschaft des @code{DynamicTextSpanner} beeinflusst wird. Der Standardwert ist -@code{'hairpin}, ander Möglichkeiten sind @code{'line}, @code{'dashed-line} +@code{'hairpin}, andere Möglichkeiten sind @code{'line}, @code{'dashed-line} und @code{'dotted-line}. " doctitlede = "Text und Strecker-Stile für Dynamik-Texte ändern" diff --git a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly index e2d558977e..d40fc6b073 100644 --- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly +++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly @@ -33,10 +33,10 @@ textos. texidocde = " Die Funktion, die Stimmen kombiniert (also der @code{\\partcombine}-Befehl) ermöglicht die Kombination unterschiedlicher Stimmen auf einem -System. Textanweisungen wie \"solo\" or \"a2\" werden automatisch +System. Textanweisungen wie \"solo\" oder \"a2\" werden automatisch hinzugefügt. Wenn man sie entfernen will, muss man die Eigenschaft -@code{printPartCombineTexts} auf flasch setzen. Für Klavierauszüge -muss natürlich kein \"solo\"/\"a2\" usw. hinzugefügt werdne, man +@code{printPartCombineTexts} auf falsch setzen. Für Klavierauszüge +muss natürlich kein \"solo\"/\"a2\" usw. hinzugefügt werden, man sollte sie also ausschalten. Wenn aber Solo-Stellen in einem Klavierauszug oder einer Chorpartitur angezeigt werden, ist es besser, normale Polyphonie zu verwenden, weil so die Solostellen angezeigt diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly index e97f906722..183ea6d638 100644 --- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly +++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly @@ -41,7 +41,7 @@ der @code{set-time-signature}-Funktion als das dritte Argument mitgegeben: @code{'(2 2 2 3)}: " - doctitlede = "Dirigirzeichen Taktgruppenzeichen" + doctitlede = "Dirigierzeichen Taktgruppenzeichen" diff --git a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly index 2c792c6343..804a79c90f 100644 --- a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly +++ b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly @@ -19,7 +19,7 @@ voces que están sobre el mismo pentagrama si el grabador %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " -Ein Arpeggio kann zwischen Noten aus unterschidlichen Stimmen auf demselben +Ein Arpeggio kann zwischen Noten aus unterschiedlichen Stimmen auf demselben System gezogen werden, wenn der @code{Span_arpeggio_engraver} in den @code{Staff}-Kontext verschoben wird: diff --git a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly index 7b9ad9aa29..b84c5a8f51 100644 --- a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly +++ b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly @@ -27,11 +27,11 @@ distinta, como se ve en el segundo sistema del ejemplo. texidocde = " Wenn nur ein System einer Systemgruppe vom Typ @code{ChoirStaff} oder @code{StaffGroup} angezeigt wird, wird die Klammer zu Beginn normalerweise -nicht gesetzt. Das kann verändert werden, indem man die ensprechende -Eigenschaft veränder. +nicht gesetzt. Das kann verändert werden, indem man die entsprechende +Eigenschaft verändert. Bei Systemen wie @code{PianoStaff} und @code{GrandStaff}, die mit einer -geschweiften Klammer beginne, muss eine andere Eigenschaft verändt werden, +geschweiften Klammer beginne, muss eine andere Eigenschaft verändert werden, wie das zweite Beispiel zeigt. " diff --git a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 8cc1200e62..9e21edc34c 100644 --- a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -23,7 +23,7 @@ notación. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " - In Werken des fürhen 20. Jahrhundert, angefangen mit Schönberg, Berg + In Werken des frühen 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 diff --git a/Documentation/snippets/flat-flags-and-beam-nibs.ly b/Documentation/snippets/flat-flags-and-beam-nibs.ly index ddeeb8a7ad..60b8c704d0 100644 --- a/Documentation/snippets/flat-flags-and-beam-nibs.ly +++ b/Documentation/snippets/flat-flags-and-beam-nibs.ly @@ -65,7 +65,7 @@ in beide Richtungen tragen. Das geschieht mit @code{[]}-Klammern (Bsp. 4). (@code{\\set stemLeftBeamCount} entspricht immer dem Befehl @code{\\once \\set}. Anders gesagt müssen die Einstellungen immer wieder -wiederholt werden und die Fähnchen des letzten Sechszehntels im letzten +wiederholt werden und die Fähnchen des letzten Sechzehntels im letzten Beispiel haben nichts mit dem @code{\\set}-Befehl zwei Noten vorher zu tun.) " diff --git a/Documentation/snippets/generating-custom-flags.ly b/Documentation/snippets/generating-custom-flags.ly new file mode 100644 index 0000000000..b71bfeb12b --- /dev/null +++ b/Documentation/snippets/generating-custom-flags.ly @@ -0,0 +1,59 @@ +%% Do not edit this file; it is automatically +%% generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.13.31" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + texidoc = " +The @code{flag} property of the Stem grob can be set to a custom scheme +function to generate the glyph for the flag. + +" + doctitle = "Generating custom flags" +} % begin verbatim + +#(define-public (weight-flag stem-grob) + (let* ((log (- (ly:grob-property stem-grob 'duration-log) 2)) + (is-up (eqv? (ly:grob-property stem-grob 'direction) UP)) + (yext (if is-up (cons (* log -0.8) 0) (cons 0 (* log 0.8)))) + (flag-stencil (make-filled-box-stencil '(-0.4 . 0.4) yext)) + (stroke-style (ly:grob-property stem-grob 'stroke-style)) + (stroke-stencil (if (equal? stroke-style "grace") (make-line-stencil 0.2 -0.9 -0.4 0.9 -0.4) empty-stencil))) + (ly:stencil-add flag-stencil stroke-stencil))) + + +% Create a flag stencil by looking up the glyph from the font +#(define (inverted-flag stem-grob) + (let* ((dir (if (eqv? (ly:grob-property stem-grob 'direction) UP) "d" "u")) + (flag (retrieve-glyph-flag "" dir "" stem-grob)) + (line-thickness (ly:staff-symbol-line-thickness stem-grob)) + (stem-thickness (ly:grob-property stem-grob 'thickness)) + (stem-width (* line-thickness stem-thickness)) + (stroke-style (ly:grob-property stem-grob 'stroke-style)) + (stencil (if (null? stroke-style) flag + (add-stroke-glyph flag stem-grob dir stroke-style ""))) + (rotated-flag (ly:stencil-rotate-absolute stencil 180 0 0))) + (ly:stencil-translate rotated-flag (cons (- (/ stem-width 2)) 0)))) + +snippetexamplenotes = { \autoBeamOff c'8 d'16 c'32 d'64 \acciaccatura {c'8} d'64 } + +{ + \override Score.RehearsalMark #'self-alignment-X = #LEFT + \time 1/4 + \mark "Normal flags" + \snippetexamplenotes + + \mark "Custom flag: inverted" + \override Stem #'flag = #inverted-flag + \snippetexamplenotes + + \mark "Custom flag: weight" + \override Stem #'flag = #weight-flag + \snippetexamplenotes + + \mark "Revert to normal" + \revert Stem #'flag + \snippetexamplenotes +} diff --git a/Documentation/snippets/guitar-strum-rhythms.ly b/Documentation/snippets/guitar-strum-rhythms.ly index 04131f5c0b..a5b7ae3139 100644 --- a/Documentation/snippets/guitar-strum-rhythms.ly +++ b/Documentation/snippets/guitar-strum-rhythms.ly @@ -17,11 +17,11 @@ además de las notas de la melodía, acordes y diagramas de posiciones. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " -In Guitarrennotation kann neben Melodie, Akkordbezeichnungen und +In Gitarrennotation kann neben Melodie, Akkordbezeichnungen und Bunddiagrammen auch der Schlagrhythmus angegeben werden. " - doctitlede = "Schlagrhythmus für Guitarren" + doctitlede = "Schlagrhythmus für Gitarren" 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 02a4049efd..d710eb2c49 100644 --- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly +++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly @@ -19,7 +19,7 @@ Esta línea se puede suprimir de la siguiente manera: %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " Dynamik-Texte (wie cresc. und dim.) werden mit einer gestrichelten Linie -gesetzt, die ihre Dauer anzeigt. Diese Linie kann auf foldenge Weise +gesetzt, die ihre Dauer anzeigt. Diese Linie kann auf folgende Weise unterdrückt werden: " diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly index 8aa3e12897..c536f11116 100644 --- a/Documentation/snippets/hymn-template.ly +++ b/Documentation/snippets/hymn-template.ly @@ -1,20 +1,31 @@ -% Do not edit this file; it is automatically -% generated from Documentation/snippets/new -% This file is in the public domain. -%% Note: this file works from version 2.13.31 +%% Do not edit this file; it is automatically +%% generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. \version "2.13.31" + \header { lsrtags = "vocal-music, template" + +%% Translation of GIT committish: 26375d5016d8d180fc914bfd07cf76f4168f2e37 + + texidocfr = " +Le code ci-dessous illustre la manière d'agencer un cantique liturgique +dans lequel chaque ligne débute et se termine par une mesure incomplète. +Vous noterez par ailleurs l'affichage des paroles indépendamment de la +musique. + +" + doctitlefr = "Modèle pour cantique" + texidoc = " This code shows one way of setting out a hymn tune when each line -starts and ends with a partial measure. It also shows how to add -the verses as stand-alone text under the music. +starts and ends with a partial measure. It also shows how to add the +verses as stand-alone text under the music. " doctitle = "Hymn template" } % begin verbatim - Timeline = { \time 4/4 \tempo 4=96 diff --git a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly index 00bd8a6b6b..114e3f804e 100644 --- a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -24,7 +24,7 @@ propiedad @code{transparent}. Das Mensurstiche-Layout, in welchem die Taktlinien nicht auf den Systemen, sondern zwischen den Systemen gesetzt werden, kann mit einer @code{StaffGroup} anstelle von @code{ChoirStaff} erreicht werden. Die Taktlinien auf den -Systemen werden mit der the @code{transparent}-Eigenschaft ausgelöscht. +Systemen werden mit der @code{transparent}-Eigenschaft ausgelöscht. " doctitlede = "Mensurstriche-Layout (Taktstriche zwischen den Systemen" diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly index d5b4d16094..111c084049 100644 --- a/Documentation/snippets/multi-measure-rest-markup.ly +++ b/Documentation/snippets/multi-measure-rest-markup.ly @@ -31,10 +31,10 @@ doctitlees = "Marcado de silencios multicompás" wird über oder unter der Pause zentriert. Lange Beschriftungen lassen den Takt nicht breiter werden. Um eine Mehrtaktpause einer Beschriftung anzupassen, muss eine unsichtbare Pause mit der -Beschriftung direkt vor der Mehrtkatpause eingesetzt werden. +Beschriftung direkt vor der Mehrtaktpause eingesetzt werden. Man sollte beachten, dass unsichtbare Pausen automatische Taktstriche -nach sich ziehen. Text, der an eine unsichtbare Pause gehänt wird, +nach sich ziehen. Text, der an eine unsichtbare Pause gehängt wird, ist links ausgerichtet an der Position, wo die Pause erscheinen würde. Wenn aber die Länge des Taktes durch die Länge des Textes bestimmt wird, sieht es so aus, als ob der Text zentriert gesetzt diff --git a/Documentation/snippets/new/anglican-psalm-template.ly b/Documentation/snippets/new/anglican-psalm-template.ly deleted file mode 100644 index c8c570bb24..0000000000 --- a/Documentation/snippets/new/anglican-psalm-template.ly +++ /dev/null @@ -1,129 +0,0 @@ - -\version "2.13.30" -\header { - lsrtags = "vocal-music, template" - texidoc = " -This template shows one way of setting out an Anglican psalm chant. -It also shows how the verses may be added as stand-alone text under -the music. The two verses are coded in different styles to -demonstrate more possibilities. - -" - doctitle = "Anglican psalm template" -} - -SopranoMusic = \relative g' { - g1 | c2 b | a1 | \bar "||" - a1 | d2 c | c b | c1 | \bar "||" -} - -AltoMusic = \relative c' { - e1 | g2 g | f1 | - f1 | f2 e | d d | e1 | -} - -TenorMusic = \relative a { - c1 | c2 c | c1 | - d1 | g,2 g | g g | g1 | -} - -BassMusic = \relative c { - c1 | e2 e | f1 | - d1 | b2 c | g' g | c,1 | -} - -global = { - \time 2/2 -} - -dot = \markup { - \override #'(font-encoding . fetaMusic) - \raise #0.7 \lookup #"dots.dot" -} - -tick = \markup { - \override #'(font-encoding . fetaMusic) - \raise #1 \fontsize #-5 { \lookup #'"scripts.rvarcomma" } -} - -% Use markup to center the chant on the page -\markup { - \fill-line { - " " % left-justified - -\score { % centered - << - \new ChoirStaff << - \new Staff << - \global - \clef "treble" - \new Voice = "Soprano" << - \voiceOne - \SopranoMusic - >> - \new Voice = "Alto" << - \voiceTwo - \AltoMusic - >> - >> - \new Staff << - \clef "bass" - \global - \new Voice = "Tenor" << - \voiceOne - \TenorMusic - >> - \new Voice = "Bass" << - \voiceTwo - \BassMusic - >> - >> - >> - >> - \layout { - \context { - \Score - \override SpacingSpanner - #'base-shortest-duration = #(ly:make-moment 1 2) - } - \context { - \Staff - \remove Time_signature_engraver - } - } -} % End score - - " " % right-justified - } -} % End markup - -\markup { - \fill-line { - \column { - \left-align { - " " " " " " - \line { - \fontsize #5 "O" - \fontsize #3 "come" - \fontsize #0 - "let us" \bold "sing" "| unto" \dot "the | Lord : let" - } - \line { - "us heartily" - \concat { "re" \bold "joice" } - "in the | strength of | our" - } - "sal | vation." - " " - \line { - " 2. Let us come before his presence" \tick "with" - } - \line { - "thanks" \tick "giving * and shew ourselves" - \tick "glad in" \tick - } - "him with psalms." - } - } - } -} diff --git a/Documentation/snippets/new/hymn-template.ly b/Documentation/snippets/new/hymn-template.ly deleted file mode 100644 index 89527f652b..0000000000 --- a/Documentation/snippets/new/hymn-template.ly +++ /dev/null @@ -1,100 +0,0 @@ -\version "2.13.31" -\header { - lsrtags = "vocal-music, template" - texidoc = " -This code shows one way of setting out a hymn tune when each line -starts and ends with a partial measure. It also shows how to add -the verses as stand-alone text under the music. - -" - doctitle = "Hymn template" -} - -Timeline = { - \time 4/4 - \tempo 4=96 - \partial 2 - s2 | s1 | s2 \breathe s2 | s1 | s2 \bar "||" \break - s2 | s1 | s2 \breathe s2 | s1 | s2 \bar "||" -} - -SopranoMusic = \relative g' { - g4 g | g g g g | g g g g | g g g g | g2 - g4 g | g g g g | g g g g | g g g g | g2 -} - -AltoMusic = \relative c' { - d4 d | d d d d | d d d d | d d d d | d2 - d4 d | d d d d | d d d d | d d d d | d2 -} - -TenorMusic = \relative a { - b4 b | b b b b | b b b b | b b b b | b2 - b4 b | b b b b | b b b b | b b b b | b2 -} - -BassMusic = \relative g { - g4 g | g g g g | g g g g | g g g g | g2 - g4 g | g g g g | g g g g | g g g g | g2 -} - -global = { - \key g \major -} - -\score { % Start score - << - \new PianoStaff << % Start pianostaff - \new Staff << % Start Staff = RH - \global - \clef "treble" - \new Voice = "Soprano" << % Start Voice = "Soprano" - \Timeline - \voiceOne - \SopranoMusic - >> % End Voice = "Soprano" - \new Voice = "Alto" << % Start Voice = "Alto" - \Timeline - \voiceTwo - \AltoMusic - >> % End Voice = "Alto" - >> % End Staff = RH - \new Staff << % Start Staff = LH - \global - \clef "bass" - \new Voice = "Tenor" << % Start Voice = "Tenor" - \Timeline - \voiceOne - \TenorMusic - >> % End Voice = "Tenor" - \new Voice = "Bass" << % Start Voice = "Bass" - \Timeline - \voiceTwo - \BassMusic - >> % End Voice = "Bass" - >> % End Staff = LH - >> % End pianostaff - >> -} % End score - -\markup { - \fill-line { - "" - { - \column { - \left-align { - "This is line one of the first verse" - "This is line two of the same" - "And here's line three of the first verse" - "And the last line of the same" - } - } - } - "" - } -} - -\paper { % Start paper block - indent = 0 % don't indent first system - line-width = 130 % shorten line length to suit music -} % End paper block diff --git a/Documentation/snippets/new/partcombine-and-autobeamoff.ly b/Documentation/snippets/new/partcombine-and-autobeamoff.ly deleted file mode 100644 index ffefba8ddf..0000000000 --- a/Documentation/snippets/new/partcombine-and-autobeamoff.ly +++ /dev/null @@ -1,52 +0,0 @@ -\version "2.13.31" - -\header { - lsrtags = "rhythms" - - texidoc = " -The function of @code{@bs{}autoBeamOff} when used with -@code{@bs{}partcombine} can be difficult to understand. It may -be preferable to use - -@example -\set Staff.autobeaming = ##f -@end example - -@noindent -instead, to ensure that autobeaming will be turned off for the entire -staff. - -@code{\partcombine} apparently works with 3 voices -- stem up single, -stem down single, stem up combined. - -An @code{\autoBeamOff} call in the first argument to partcombine will -apply to the voice that is active at the time the call is processed, -either stem up single or stem up combined. -An @code{\autoBeamOff} call in the second argument will apply to the -voice that is stem down single. - -In order to use @code{\autoBeamOff} to stop all autobeaming when used -with @code{\partcombine}, -it will be necessary to use @emph{three} calls to @code{\autoBeamOff}. - -" -doctitle = "Partcombine and autoBeamOff" -} - -{ - %\set Staff.autoBeaming = ##f % turns off all autobeaming - \partcombine - { - \autoBeamOff % applies to split up stems - \repeat unfold 4 a'16 - %\autoBeamOff % applies to combined up stems - \repeat unfold 4 a'8 - \repeat unfold 4 a'16 - } - { - \autoBeamOff % applies to down stems - \repeat unfold 4 f'8 - \repeat unfold 8 f'16 | - } -} - diff --git a/Documentation/snippets/new/vocal-ensemble-template.ly b/Documentation/snippets/new/vocal-ensemble-template.ly deleted file mode 100644 index 4f656b9f50..0000000000 --- a/Documentation/snippets/new/vocal-ensemble-template.ly +++ /dev/null @@ -1,81 +0,0 @@ -\version "2.13.31" - -\header { - lsrtags = "vocal-music, template" - texidoc = " -Here is a standard four-part SATB vocal score. With larger ensembles, -it is often useful to include a section which is included in all parts. -For example, the time signature and key signature are almost always the -same for all parts. Like in the @qq{Hymn} template, the four voices are -regrouped on only two staves. - -" - doctitle = "Vocal ensemble template" -} % begin verbatim - -global = { - \key c \major - \time 4/4 -} - -sopMusic = \relative c'' { - c4 c c8[( b)] c4 -} -sopWords = \lyricmode { - hi hi hi hi -} - -altoMusic = \relative c' { - e4 f d e -} -altoWords = \lyricmode { - ha ha ha ha -} - -tenorMusic = \relative c' { - g4 a f g -} -tenorWords = \lyricmode { - hu hu hu hu -} - -bassMusic = \relative c { - c4 c g c -} -bassWords = \lyricmode { - ho ho ho ho -} - -\score { - \new ChoirStaff << - \new Lyrics = "sopranos" - \new Staff = "women" << - \new Voice = "sopranos" { - \voiceOne - << \global \sopMusic >> - } - \new Voice = "altos" { - \voiceTwo - << \global \altoMusic >> - } - >> - \new Lyrics = "altos" - \new Lyrics = "tenors" - \new Staff = "men" << - \clef bass - \new Voice = "tenors" { - \voiceOne - << \global \tenorMusic >> - } - \new Voice = "basses" { - \voiceTwo << \global \bassMusic >> - } - >> - \new Lyrics = "basses" - \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords - \context Lyrics = "altos" \lyricsto "altos" \altoWords - \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords - \context Lyrics = "basses" \lyricsto "basses" \bassWords - >> -} - diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly index acd42708a7..d60870c669 100644 --- a/Documentation/snippets/partcombine-and-autobeamoff.ly +++ b/Documentation/snippets/partcombine-and-autobeamoff.ly @@ -1,57 +1,59 @@ -% Do not edit this file; it is automatically -% generated from Documentation/snippets/new -% This file is in the public domain. -%% Note: this file works from version 2.13.31 +%% Do not edit this file; it is automatically +%% generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. \version "2.13.31" \header { lsrtags = "rhythms" texidoc = " -The function of @code{@bs{}autoBeamOff} when used with -@code{@bs{}partcombine} can be difficult to understand. It may -be preferable to use +The function of @code{\\autoBeamOff} when used with +@code{\\partcombine} can be difficult to understand. + +It may be preferable to use + + +@code{\\set Staff.autoBeaming = ##f} -@example -\set Staff.autobeaming = ##f -@end example -@noindent instead, to ensure that autobeaming will be turned off for the entire staff. -@code{\partcombine} apparently works with 3 voices -- stem up single, + +@code{\\partcombine} apparently works with 3 voices -- stem up single, stem down single, stem up combined. -An @code{\autoBeamOff} call in the first argument to partcombine will + +An @code{\\autoBeamOff} call in the first argument to partcombine will apply to the voice that is active at the time the call is processed, -either stem up single or stem up combined. -An @code{\autoBeamOff} call in the second argument will apply to the -voice that is stem down single. +either stem up single or stem up combined. An @code{\\autoBeamOff} call +in the second argument will apply to the voice that is stem down single. + + +In order to use @code{\\autoBeamOff} to stop all autobeaming when used +with @code{\\partcombine}, it will be necessary to use three calls to +@code{\\autoBeamOff}. + + -In order to use @code{\autoBeamOff} to stop all autobeaming when used -with @code{\partcombine}, -it will be necessary to use @emph{three} calls to @code{\autoBeamOff}. " -doctitle = "Partcombine and autoBeamOff" + doctitle = "Partcombine and autoBeamOff" } % begin verbatim - { %\set Staff.autoBeaming = ##f % turns off all autobeaming \partcombine - { - \autoBeamOff % applies to split up stems - \repeat unfold 4 a'16 - %\autoBeamOff % applies to combined up stems - \repeat unfold 4 a'8 - \repeat unfold 4 a'16 - } - { - \autoBeamOff % applies to down stems - \repeat unfold 4 f'8 - \repeat unfold 8 f'16 | - } + { + \autoBeamOff % applies to split up stems + \repeat unfold 4 a'16 + %\autoBeamOff % applies to combined up stems + \repeat unfold 4 a'8 + \repeat unfold 4 a'16 + } + { + \autoBeamOff % applies to down stems + \repeat unfold 4 f'8 + \repeat unfold 8 f'16 | + } } - diff --git a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly index a83be09a05..7bfa09004c 100644 --- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly +++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly @@ -24,7 +24,7 @@ dentro del contexto de @code{Staff}. doctitlede = "Verhindern, dass zusätzliche Auflösungszeichen automatisch hinzugefügt werden" -texidocde = "Den tranditionellen Notensatzregeln zufolge wird ein +texidocde = "Den traditionellen 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 diff --git a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly index 57aa1dd3a7..592e391d99 100644 --- a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly +++ b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly @@ -28,7 +28,7 @@ Beispiel werden die Taktnummern jeden zweiten Takt gesetzt, außer am Ende einer Zeile. " - doctitlede = "Setzen der Taktnummern in regelmäßigen Intevallen" + doctitlede = "Setzen der Taktnummern in regelmäßigen Intervallen" diff --git a/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly index 743b9b2f83..275fc1fd6d 100644 --- a/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly +++ b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly @@ -24,7 +24,7 @@ líinea divisoria vacía antes de la primera nota. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " -Standardmäßig wird die erste Taktzahl einer Paritur nicht gesetzt, +Standardmäßig wird die erste Taktzahl einer Partitur nicht gesetzt, wenn sie weniger oder gleich '1' ist. Indem man @code{barNumberVisibility} auf @code{all-bar-numbers-visible} setzt, kann eine beliebige Taktzahl für den ersten und die folgenden Takte gesetzt werden. diff --git a/Documentation/snippets/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list index 0b9ee61b80..d9891cf4dc 100644 --- a/Documentation/snippets/rhythms.snippet-list +++ b/Documentation/snippets/rhythms.snippet-list @@ -22,6 +22,7 @@ engraving-tremolos-with-floating-beams.ly entering-several-tuplets-using-only-one--times-command.ly flat-flags-and-beam-nibs.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +generating-custom-flags.ly grouping-beats.ly guitar-strum-rhythms.ly heavily-customized-polymetric-time-signatures.ly diff --git a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly index c46cf2c124..c5204ba8f4 100644 --- a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly +++ b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly @@ -20,7 +20,7 @@ sobreescribiendo la propiedad @code{'to-barline}. %% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40 texidocde = " Wenn die Note, an welcher eine Crescendo-Klammer endet, die erste Note -eines Taktes ist, wird die Klammer an der vorhergehenden Tatklinie +eines Taktes ist, wird die Klammer an der vorhergehenden Taktlinie beendet. Dieses Verhalten kann auch mit der Eigenschaft @code{'to-barline} geändert werden: " diff --git a/Documentation/snippets/template.snippet-list b/Documentation/snippets/template.snippet-list index d6219307a6..4be0dd20ac 100644 --- a/Documentation/snippets/template.snippet-list +++ b/Documentation/snippets/template.snippet-list @@ -1,5 +1,6 @@ ancient-notation-template----modern-transcription-of-gregorian-music.ly ancient-notation-template----modern-transcription-of-mensural-music.ly +anglican-psalm-template.ly hymn-template.ly jazz-combo-template.ly orchestra,-choir-and-piano-template.ly diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index 8be8be1f52..fa0b9d4aea 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -30,6 +30,7 @@ dynamics-text-spanner-postfix.ly fine-tuning-pedal-brackets.ly forcing-horizontal-shift-of-notes.ly fret-diagrams-explained-and-developed.ly +generating-custom-flags.ly hairpins-with-different-line-styles.ly horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly how-to-change-fret-diagram-position.ly diff --git a/Documentation/snippets/using-ties-with-arpeggios.ly b/Documentation/snippets/using-ties-with-arpeggios.ly index 06808e3456..8c44135141 100644 --- a/Documentation/snippets/using-ties-with-arpeggios.ly +++ b/Documentation/snippets/using-ties-with-arpeggios.ly @@ -28,7 +28,7 @@ auf @code{#t} gesetzt wird. Diese Funktion ist auch sinnvoll, um etwa ein Tremolo mit einem Akkord zu überbinden, kann aber prinzipiell auch für normale Überbindungen eingesetzt werden " - doctitlede = "Überbingungen für Arpeggio genutzen" + doctitlede = "Überbindungen für Arpeggio benutzen" diff --git a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly index 67bb73d50b..3d70986120 100644 --- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly +++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly @@ -30,6 +30,17 @@ Stück zu definieren. " doctitlede = "Sologesang und zweistimmiger Refrain" +%% Translation of GIT committish: 26375d5016d8d180fc914bfd07cf76f4168f2e37 + + texidocfr = " +Ce canevas illustre la manière d'agencer une œuvre vocale où le couplet +est chanté en solo et le refrain à deux voix. Vous noterez le recours +aux silences invisibles dans la variable @code{\global}@tie{}; ils +permettent de positionner les changements de métrique et autres éléments +communs à toutes les parties et pour l'intégralité du morceau. +" + doctitlefr = "Ensemble vocal avec couplet et refrain" + lsrtags = "vocal-music, contexts-and-engravers, template" texidoc = " This template creates a score which starts with a solo verse and diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly index e255d782b0..331e2c2eee 100644 --- a/Documentation/snippets/vocal-ensemble-template.ly +++ b/Documentation/snippets/vocal-ensemble-template.ly @@ -1,10 +1,11 @@ -% Do not edit this file; it is automatically -% generated from Documentation/snippets/new -% This file is in the public domain. -%% Note: this file works from version 2.13.31 +%% Do not edit this file; it is automatically +%% generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. \version "2.13.31" \header { + lsrtags = "vocal-music, template" + %% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441 texidoces = " He aquí una partitura vocal estándar para cuatro voces SATB. Con @@ -48,7 +49,6 @@ portées. " doctitlefr = "Ensemble vocal (simple)" - lsrtags = "vocal-music, template" texidoc = " Here is a standard four-part SATB vocal score. With larger ensembles, it is often useful to include a section which is included in all parts. @@ -63,8 +63,7 @@ regrouped on only two staves. global = { \key c \major \time 4/4 -} % begin verbatim - +} sopMusic = \relative c'' { c4 c c8[( b)] c4 diff --git a/Documentation/snippets/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list index 029d06709a..a8d4c87149 100644 --- a/Documentation/snippets/vocal-music.snippet-list +++ b/Documentation/snippets/vocal-music.snippet-list @@ -4,6 +4,7 @@ adjusting-lyrics-vertical-spacing.ly ambitus-with-multiple-voices.ly ambitus.ly ancient-notation-template----modern-transcription-of-gregorian-music.ly +anglican-psalm-template.ly changing-stanza-fonts.ly chant-or-psalms-notation.ly forcing-hyphens-to-be-shown.ly -- 2.39.2