From: Neil Puttock Date: Wed, 3 Jun 2009 21:49:45 +0000 (+0100) Subject: LSR: Update. X-Git-Tag: release/2.13.2-0~68 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e767d4bd709a1ba6877b1eab93383b3359126e3c;p=lilypond.git LSR: Update. --- diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely index 8c58f489c9..461d60f771 100644 --- a/Documentation/de/user/rhythms.itely +++ b/Documentation/de/user/rhythms.itely @@ -904,13 +904,13 @@ Taktprüfungswarnungen nicht angezeigt. @cindex Balkenpausen, mehrtaktig @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{changing-form-of-multi--measure-rests.ly} +{changing-form-of-multi-measure-rests.ly} @cindex Mehrtaktpausen, Positionierung @cindex Position von Mehrtaktpausen @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{positioning-multi--measure-rests.ly} +{positioning-multi-measure-rests.ly} @c TODO -- convert to snippet -- submitted to Neil Markups attached to a multi-measure rest will be centered above or diff --git a/Documentation/de/user/templates.itely b/Documentation/de/user/templates.itely index 688e972491..5f8a4a704d 100644 --- a/Documentation/de/user/templates.itely +++ b/Documentation/de/user/templates.itely @@ -125,7 +125,7 @@ schönen Notenbild erfreuen! @appendixsubsec Orchestra, choir and piano @lilypondfile[verbatim,lilyquote,ragged-right,texidoc] -{orchestra-choir-and-piano-template.ly} +{orchestra,-choir-and-piano-template.ly} @c bad node name to avoid node name conflict diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely index 35b300f91e..fae03d7e3c 100644 --- a/Documentation/es/user/rhythms.itely +++ b/Documentation/es/user/rhythms.itely @@ -909,16 +909,16 @@ las advertencias correspondientes de comprobación de compás. @cindex kirchenpausen @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{changing-form-of-multi--measure-rests.ly} +{changing-form-of-multi-measure-rests.ly} @cindex multicompás, posicionamiento de los silencios @cindex colocación de los silencios multicompás @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{positioning-multi--measure-rests.ly} +{positioning-multi-measure-rests.ly} @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{multi--measure-rest-markup.ly} +{multi-measure-rest-markup.ly} @seealso diff --git a/Documentation/es/user/templates.itely b/Documentation/es/user/templates.itely index dcfa957146..2861410054 100644 --- a/Documentation/es/user/templates.itely +++ b/Documentation/es/user/templates.itely @@ -116,7 +116,7 @@ unas hermosas partituras impresas! @appendixsubsec Orchestra, choir and piano @lilypondfile[verbatim,lilyquote,ragged-right,texidoc] -{orchestra-choir-and-piano-template.ly} +{orchestra,-choir-and-piano-template.ly} @c bad node name to avoid node name conflict diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely index 1b5da49c1f..5295651a30 100644 --- a/Documentation/fr/user/rhythms.itely +++ b/Documentation/fr/user/rhythms.itely @@ -892,16 +892,16 @@ numéros de mesure. @cindex kirchenpausen @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{changing-form-of-multi--measure-rests.ly} +{changing-form-of-multi-measure-rests.ly} @cindex silence multi-mesures, positionnement @cindex positionnement des silences multi-mesures @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{positioning-multi--measure-rests.ly} +{positioning-multi-measure-rests.ly} @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{multi--measure-rest-markup.ly} +{multi-measure-rest-markup.ly} @seealso diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index 7b4dd7bb44..02218d8333 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -882,16 +882,16 @@ setting, resulting bar-check warnings may not be displayed. @cindex kirchenpausen @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{changing-form-of-multi--measure-rests.ly} +{changing-form-of-multi-measure-rests.ly} @cindex multi-measure rests, positioning @cindex positioning multi-measure rests @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{positioning-multi--measure-rests.ly} +{positioning-multi-measure-rests.ly} @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{multi--measure-rest-markup.ly} +{multi-measure-rest-markup.ly} @seealso diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely index e947971af5..f2b22f6b2f 100644 --- a/Documentation/user/templates.itely +++ b/Documentation/user/templates.itely @@ -116,7 +116,7 @@ beautiful printed scores! @appendixsubsec Orchestra, choir and piano @lilypondfile[verbatim,lilyquote,ragged-right,texidoc] -{orchestra-choir-and-piano-template.ly} +{orchestra,-choir-and-piano-template.ly} @c bad node name to avoid node name conflict diff --git a/input/lsr/accordion-discant-symbols.ly b/input/lsr/accordion-discant-symbols.ly index d26907d205..1e03a8a17a 100644 --- a/input/lsr/accordion-discant-symbols.ly +++ b/input/lsr/accordion-discant-symbols.ly @@ -192,3 +192,4 @@ accViolin = ^\markup { c4 d\accPiccolo e f c4 d\accViolin e f } + diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index ec1f11419c..0cff5d93e5 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -62,3 +62,4 @@ continuo = \figuremode { >> } + diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index 57f9f2846e..be7af34aa8 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -46,3 +46,4 @@ manually to prevent collisions. b1 } >> + diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly index f98ecb1639..41dce7003e 100644 --- a/input/lsr/adding-an-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly @@ -59,3 +59,4 @@ is also required (see the example). >> } } + diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index 5d539252eb..00693d1fb0 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -37,3 +37,4 @@ piece. } >> } + diff --git a/input/lsr/adding-bar-lines-to-chordnames-context.ly b/input/lsr/adding-bar-lines-to-chordnames-context.ly index 81905a5d91..cc95934407 100644 --- a/input/lsr/adding-bar-lines-to-chordnames-context.ly +++ b/input/lsr/adding-bar-lines-to-chordnames-context.ly @@ -38,3 +38,4 @@ To add bar line indications in the @code{ChordNames} context, add the f1:maj7 f:7 bes:7 } + diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly new file mode 100644 index 0000000000..70fef281d9 --- /dev/null +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly @@ -0,0 +1,47 @@ +%% 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.13.1" + +\header { + lsrtags = "rhythms, expressive-marks" + +%% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 + texidoces = " +La sintaxis de LilyPond puede implicar muchas colocaciones poco +comunes para los paréntesis, corchetes, etc, que a veces se tienen +que intercalar. Por ejemplo, al introducir una barra manual, el +corchete izquierdo de apertura se debe escribir después de la nota +inicial y de su duración, no antes. De forma similar, el corchete +derecho de cierre debe seguir inmediatamente a la nota que se +quiere situar al final del barrado, incluso si esta nota resulta +estar dentro de un grupo de valoración especial. Este fragmento de +código muestra cómo combinar el barrado manual, las ligaduras de +expresión y de unión y las ligaduras de fraseo, con secciones de +valoración especial (encerradas entre llaves). + +" + doctitlees = "Añadir barras, ligaduras de expresión y de unión, etc. cuando se usan ritmos con y sin grupos de valoración especial." + + texidoc = " +LilyPond syntax can involve many unusual placements for parentheses, +brackets etc., which might sometimes have to be interleaved. For +example, when entering a manual beam, the left square bracket has to be +placed after the starting note and its duration, not before. Similarly, +the right square bracket should directly follow the note which is to be +at the end of the requested beaming, even if this note happens to be +inside a tuplet section. This snippet demonstrates how to combine +manual beaming, manual slurs, ties and phrasing slurs with tuplet +sections (enclosed within curly braces). + +" + doctitle = "Adding beams, slurs, ties etc. when using tuplet and non-tuplet rhythms" +} % begin verbatim + +{ + r16[ g16 \times 2/3 { r16 e'8] } + g16( a \times 2/3 { b d e') } + g8[( a \times 2/3 { b d') e'] ~ } + \time 2/4 + \times 4/5 { e'32\( a b d' e' } a'4.\) +} + diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly deleted file mode 100644 index 28c8f27cb9..0000000000 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ /dev/null @@ -1,46 +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.13.1" - -\header { - lsrtags = "rhythms, expressive-marks" - -%% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 - texidoces = " -La sintaxis de LilyPond puede implicar muchas colocaciones poco -comunes para los paréntesis, corchetes, etc, que a veces se tienen -que intercalar. Por ejemplo, al introducir una barra manual, el -corchete izquierdo de apertura se debe escribir después de la nota -inicial y de su duración, no antes. De forma similar, el corchete -derecho de cierre debe seguir inmediatamente a la nota que se -quiere situar al final del barrado, incluso si esta nota resulta -estar dentro de un grupo de valoración especial. Este fragmento de -código muestra cómo combinar el barrado manual, las ligaduras de -expresión y de unión y las ligaduras de fraseo, con secciones de -valoración especial (encerradas entre llaves). - -" - doctitlees = "Añadir barras, ligaduras de expresión y de unión, etc. cuando se usan ritmos con y sin grupos de valoración especial." - - texidoc = " -LilyPond syntax can involve many unusual placements for parentheses, -brackets etc., which might sometimes have to be interleaved. For -example, when entering a manual beam, the left square bracket has to be -placed after the starting note and its duration, not before. Similarly, -the right square bracket should directly follow the note which is to be -at the end of the requested beaming, even if this note happens to be -inside a tuplet section. This snippet demonstrates how to combine -manual beaming, manual slurs, ties and phrasing slurs with tuplet -sections (enclosed within curly braces). - -" - doctitle = "Adding beams, slurs, ties etc. when using tuplet and non-tuplet rythms." -} % begin verbatim - -{ - r16[ g16 \times 2/3 { r16 e'8] } - g16( a \times 2/3 { b d e') } - g8[( a \times 2/3 { b d') e'] ~ } - \time 2/4 - \times 4/5 { e'32\( a b d' e' } a'4.\) -} diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index 7f7c0c36f3..df815991c3 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -73,3 +73,4 @@ timb = \drummode { timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb } } } } + diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/input/lsr/adding-fingerings-to-a-score.ly index 6dd971ccab..8eb17ffca7 100644 --- a/input/lsr/adding-fingerings-to-a-score.ly +++ b/input/lsr/adding-fingerings-to-a-score.ly @@ -15,3 +15,4 @@ Fingering instructions can be entered using a simple syntax. \relative c'' { c4-1 d-2 f-4 e-3 } + diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index 5e1baf45b5..fd5de41166 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -45,3 +45,4 @@ threeFour = \markup { ^>^\threeTwo[ b\2 e\4] } } + diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly index 8630d8f862..1660d53121 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly @@ -30,3 +30,4 @@ objects in parentheses. The associated grob is 2 } + diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly index 606bbd985d..57c10abcfd 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -46,3 +46,4 @@ date = #(strftime "%d-%m-%Y" (localtime (current-time))) \markup { \date } + diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly index 38baeb3526..c5966922b5 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -45,3 +45,4 @@ should appear; see also the \"Volta multi staff\" snippet. \new Staff \with { \consists "Volta_engraver" } { c'2 g' e' a' } \new Staff { \repeat volta 2 { c'1 } \alternative { c' } } >> + diff --git a/input/lsr/additional-voices-to-avoid-collisions.ly b/input/lsr/additional-voices-to-avoid-collisions.ly index 0028129cd0..2775f51dfe 100644 --- a/input/lsr/additional-voices-to-avoid-collisions.ly +++ b/input/lsr/additional-voices-to-avoid-collisions.ly @@ -62,3 +62,4 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice) } >> } + diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index 95495b6ec2..5feb110f47 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -52,3 +52,4 @@ This snippet shows how to bring the lyrics line closer to the staff. } \lyricsto melody { aa aa aa aa aa aa aa aa aa } >> + diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly index 8bfc53b698..02d093f784 100644 --- a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly +++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly @@ -37,3 +37,4 @@ adjust the shape of falls and doits. c2-\bendAfter #+8 c2-\bendAfter #-6 } + diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index 5667e1d047..3763e10108 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "text, paper-and-layout, titles" + %% Translation of GIT committish: 00e3a8264e138ad61b4f115a173190d5e9dc7533 texidoces = " Los nombres de instrumento se imprimen generalmente a la izquierda de @@ -29,16 +30,17 @@ de las siguientes posiblidades: " doctitlees = "Alinear y centrar los nombres de instrumento" - lsrtags = "text, paper-and-layout, titles" - texidoc = "The horizontal alignment of instrument names is tweaked -by changing the @code{Staff.InstrumentName #'self-alignment-X} property. -The @code{\\layout} variables @code{indent} and @code{short-indent} -define the space in which the instrument names are aligned before the -first and the following systems, respectively." + texidoc = " +The horizontal alignment of instrument names is tweaked by changing the +@code{Staff.InstrumentName #'self-alignment-X} property. The +@code{\\layout} variables @code{indent} and @code{short-indent} define +the space in which the instrument names are aligned before the first +and the following systems, respectively. + +" doctitle = "Aligning and centering instrument names" } % begin verbatim - \paper { left-margin = 3\cm } diff --git a/input/lsr/aligning-bar-numbers.ly b/input/lsr/aligning-bar-numbers.ly index c07be11bfe..266fc8d124 100644 --- a/input/lsr/aligning-bar-numbers.ly +++ b/input/lsr/aligning-bar-numbers.ly @@ -56,3 +56,4 @@ positioned directly over the bar line or left-aligned to the bar line. \override Score.BarNumber #'self-alignment-X = #LEFT c1 | c1 } + diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly index 8ada074b51..7f9d85ed69 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "text" + %% Translation of GIT committish: 00e3a8264e138ad61b4f115a173190d5e9dc7533 texidoces = " Si están especificadas, las marcas de texto se pueden alinear con @@ -37,21 +38,26 @@ diese Einstellung für alle Systeme gemacht werden. doctitlede = "Zeichen an verschiedenen Notationsobjekten ausrichten" - lsrtags = "text" - texidoc = "If specified, text marks may be aligned with notation -objects other than bar lines. These objects include @code{ambitus}, + texidoc = " +If specified, text marks may be aligned with notation objects other +than bar lines. These objects include @code{ambitus}, @code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar}, @code{left-edge}, @code{key-cancellation}, @code{key-signature}, and @code{time-signature}. + + In such cases, text marks will be horizontally centered above the -object. However this can be changed, as demonstrated on the second -line of this example (in a score with multiple staves, this setting -should be done for all the staves)." +object. However this can be changed, as demonstrated on the second line +of this example (in a score with multiple staves, this setting should +be done for all the staves). + + + +" doctitle = "Aligning marks with various notation objects" } % begin verbatim - \relative c' { e1 diff --git a/input/lsr/aligning-objects-created-with-the--mark-command.ly b/input/lsr/aligning-objects-created-with-the--mark-command.ly index c0ac6d9c3c..dd9b34c616 100644 --- a/input/lsr/aligning-objects-created-with-the--mark-command.ly +++ b/input/lsr/aligning-objects-created-with-the--mark-command.ly @@ -25,3 +25,4 @@ This behavior can be modified to align at right or left. c1 } + 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 1f402203e3..a026406c4b 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 @@ -42,3 +42,4 @@ staff. However, this behavior can be canceled. \once \override Fingering #'staff-padding = #'() 2 } + diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly index 358c9847a4..fb743c6f3b 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -47,3 +47,4 @@ voices. } >> + diff --git a/input/lsr/ambitus.ly b/input/lsr/ambitus.ly index 52494e38ed..5ab08a5a72 100644 --- a/input/lsr/ambitus.ly +++ b/input/lsr/ambitus.ly @@ -38,3 +38,4 @@ Accidentals only show up if they are not part of the key signature. } } >> + diff --git a/input/lsr/analysis-brackets-above-the-staff.ly b/input/lsr/analysis-brackets-above-the-staff.ly index 850bb59502..d364a6bf0e 100644 --- a/input/lsr/analysis-brackets-above-the-staff.ly +++ b/input/lsr/analysis-brackets-above-the-staff.ly @@ -34,3 +34,4 @@ staff instead. c2\startGroup d2\stopGroup } + diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index 6846210436..b75ee7d4a0 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -243,3 +243,4 @@ lowerStaff = \new MensuralStaff = "lowerStaff" << } } } + diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly index 9c08786034..f431d9b5bb 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -69,3 +69,4 @@ verba = \lyricmode { } } } + diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly index 5653b1027d..bda4c2332e 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -289,3 +289,4 @@ bassusLyrics = \lyricmode { + diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index 0ea013ef9e..7b89bcc437 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -25,3 +25,4 @@ Time signatures may also be engraved in an old style. \override Staff.TimeSignature #'style = #'neomensural s1 } + 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 303c3fd1e7..986b9ffd47 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 @@ -92,10 +92,11 @@ fragment = { \break \relative c' { - \set shapeNoteStyles = #'#(cross triangle fa #f - mensural xcircle diamond) + \set shapeNoteStyles = #'#(cross triangle fa #f + mensural xcircle diamond) \fragment } } \layout { ragged-right = ##t } } + diff --git a/input/lsr/arabic-improvisation.ly b/input/lsr/arabic-improvisation.ly index 4943a8e1cd..9435fb864f 100644 --- a/input/lsr/arabic-improvisation.ly +++ b/input/lsr/arabic-improvisation.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "world-music" + %% Translation of GIT committish: c2b2eafa00dc451e79e06f03ad1749a76b3c3947 texidoces = " Para las improvisaciones o @emph{taqasim} que son libres durante unos @@ -29,16 +30,16 @@ der Begin einer @emph{hijaz}-Improvisation aussehen könnte: doctitlede = "Arabische Improvisation" - lsrtags = "world-music" - texidoc = "For improvisations or @emph{taqasim} which are -temporarily free, the time signature can be omitted and -@code{\cadenzaOn} can be used. Adjusting the accidental style -might be required, since the absence of bar lines will cause the -accidental to be marked only once. Here is an example of what -could be the start of a @emph{hijaz} improvisation:" -doctitle = "Arabic improvisation" -} % begin verbatim + texidoc = " +For improvisations or taqasim which are temporarily free, the time +signature can be omitted and @code{\\cadenzaOn} can be used. Adjusting +the accidental style might be required, since the absence of bar lines +will cause the accidental to be marked only once. Here is an example +of what could be the start of a hijaz improvisation: +" + doctitle = "Arabic improvisation" +} % begin verbatim \include "arabic.ly" diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index 40bacd852a..359a133009 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -45,3 +45,4 @@ specified in @code{beatLength}). b32^"beatLength 1 16"[ a g f c' b a g] } } + diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index a5475727bb..091465e0f1 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -78,3 +78,4 @@ qBeam = { } } } + diff --git a/input/lsr/avoiding-collisions-with-chord-fingerings.ly b/input/lsr/avoiding-collisions-with-chord-fingerings.ly index bbb4833170..fb1bbda9b8 100644 --- a/input/lsr/avoiding-collisions-with-chord-fingerings.ly +++ b/input/lsr/avoiding-collisions-with-chord-fingerings.ly @@ -36,3 +36,4 @@ overridden. \override StrokeFinger #'add-stem-support = ##t 8 } + diff --git a/input/lsr/beam-endings-in-score-context.ly b/input/lsr/beam-endings-in-score-context.ly index 8c82195800..6dfd211618 100644 --- a/input/lsr/beam-endings-in-score-context.ly +++ b/input/lsr/beam-endings-in-score-context.ly @@ -66,3 +66,4 @@ levels: } >> } + diff --git a/input/lsr/beam-grouping-in-7-8-time.ly b/input/lsr/beam-grouping-in-7-8-time.ly index a87a53dfff..c03eaf34c1 100644 --- a/input/lsr/beam-grouping-in-7-8-time.ly +++ b/input/lsr/beam-grouping-in-7-8-time.ly @@ -44,3 +44,4 @@ example, to group all beams 2-3-2 in 7/8 time, specify beam endings at #(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 9e8ea7d75b..57eb66e085 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -47,3 +47,4 @@ behavior can be changed as shown: c8] c[ c] c[ c] c[ c] c } + diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index e0a1677bc8..f75e409dfc 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -30,3 +30,4 @@ white box will not overlap any other grob. \override TextScript #'extra-offset = #'(2 . 4) c2-\markup { \whiteout \pad-markup #0.5 "middle C" } c } + diff --git a/input/lsr/book-parts.ly b/input/lsr/book-parts.ly index 94bc65513f..609b607224 100644 --- a/input/lsr/book-parts.ly +++ b/input/lsr/book-parts.ly @@ -1,20 +1,20 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { lsrtags = "paper-and-layout" - texidoc = "@code{\\bookpart} can be used to split a book into -several parts. -Each part last page can be affected by @code{ragged-last-bottom}. -Header and footer markups can detect a part last page, and make the -difference with the book last page. + + texidoc = " +@code{\\bookpart} can be used to split a book into several parts. Each +part last page can be affected by @code{ragged-last-bottom}. Header and +footer markups can detect a part last page, and make the difference +with the book last page. + " doctitle = "Book parts" } % begin verbatim - #(set-default-paper-size "a6") \book { diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly index a63ba56082..b9bad0cfc1 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -37,3 +37,4 @@ ticks, vees and \"railroad tracks\" (caesura). es8[ d] \breathe es[ f g f] | es2 r4 \bar "||" } + diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index e5f00f113f..2baa30cf8f 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "expressive-marks" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Para hacer invisibles partes de un regulador de crescendo, se usa @@ -27,27 +28,27 @@ regulador. " doctitlees = "Regulador interrumpido" - lsrtags = "expressive-marks" texidoc = " In order to make parts of a crescendo hairpin invisible, the following method is used: A white rectangle is drawn on top of the respective part of the crescendo hairpin, making it invisible. The rectangle is defined as postscript code within a text markup. -To fine-tune the position and size of the markup, the number -preceding @code{setgray} in the postscript definition can be set to a -value less than one, making it grey. The two numbers before @code{scale} -in the postscript code are responsible for the width and height of the +To fine-tune the position and size of the markup, the number preceding +@code{setgray} in the postscript definition can be set to a value less +than one, making it grey. The two numbers before @code{scale} in the +postscript code are responsible for the width and height of the rectangle, the two numbers before @code{translate} change the x- and y-origin of the rectangle. + Make sure to put the hairpin in a lower layer than the text markup to -draw the rectangle over the hairpin. +draw the rectangle over the hairpin. + " - doctitle = "Broken crescendo hairpin" + doctitle = "Broken Crescendo Hairpin" } % begin verbatim - \relative c' { << { \dynamicUp diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index 6cc59ec7cc..f18af26e2a 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -24,6 +24,7 @@ optically pleasing combination of railtracks and fermata. doctitle = "Caesura (\"railtracks\") with fermata" } % begin verbatim + \relative c'' { c2. % construct the symbol @@ -40,3 +41,4 @@ optically pleasing combination of railtracks and fermata. c2. \breathe c4 \bar "|." } + diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 4ebacc2c70..48c1469a3c 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "expressive-marks, text" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Este ejemplo proporciona una función para tipografiar un regulador @@ -14,18 +15,16 @@ normalmente un objeto, utilizando código de Scheme. " doctitlees = "Centrar texto debajo de un regulador" - lsrtags = "expressive-marks, text" - texidoc = " This example provides a function to typeset a hairpin (de)crescendo with some additional text below it, such as \"molto\" or \"poco\". The example also illustrates how to modify the way an object is normally printed, using some Scheme code. + " doctitle = "Center text below hairpin dynamics" } % begin verbatim - hairpinWithCenteredText = #(define-music-function (parser location text) (markup?) #{ @@ -43,7 +42,9 @@ hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo } \layout { ragged-right = ##f } -{ - \hairpinMolto c'2\< c'\f - \hairpinMore c'2\< c'\f +\relative c' { + \hairpinMolto + c2\< c\f + \hairpinMore + c2\< c\f } diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index 0004a9d4c6..1ed164a0d0 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -52,3 +52,4 @@ smallFlageolet = d4^\flageolet_\markup { default size } d_\flageolet c4^\smallFlageolet_\markup { smaller } c_\smallFlageolet } + diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly index c9746003ce..38befa698d 100644 --- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly +++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly @@ -40,3 +40,4 @@ notehead). \relative { <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup { A tiny e }_\markup { A big c } } + diff --git a/input/lsr/changing-beam-knee-gap.ly b/input/lsr/changing-beam-knee-gap.ly index d0a59e3263..f247b66fe6 100644 --- a/input/lsr/changing-beam-knee-gap.ly +++ b/input/lsr/changing-beam-knee-gap.ly @@ -63,3 +63,4 @@ spaces. \override Beam #'auto-knee-gap = #6 f8 f''8 f8 f''8 } + diff --git a/input/lsr/changing-chord-separator.ly b/input/lsr/changing-chord-separator.ly index d5a99180c9..48529ce579 100644 --- a/input/lsr/changing-chord-separator.ly +++ b/input/lsr/changing-chord-separator.ly @@ -35,3 +35,4 @@ markup. = \markup { \typewriter | } c:7sus4 } + diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly deleted file mode 100644 index 6590fadcc3..0000000000 --- a/input/lsr/changing-form-of-multi--measure-rests.ly +++ /dev/null @@ -1,55 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -%% Note: this file works from version 2.12.0 -\version "2.13.1" -\header { -%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc - doctitlees = "Cambiar la forma de los silencios multicompás" - texidoces = " -Si hay diez compases de silencio o menos, se imprime en el pentagrama -una serie de silencios de breve y longa (conocidos en alemán como -\"Kirchenpausen\", «silencios eclesiásticos»); en caso contrario se -muestra una barra normal. Este número predeterminado de diez se -puede cambiar sobreescribiendo la propiedad @code{expand-limit}: - -" - -%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 - texidocde = " -Wenn zehn oder weniger Pausentakte vorkommen, wird eine Reihe von Longa- -und Brevispausen (auch Kirchenpausen genannt) gesetzt, bei mehr Takten -wird eine Line mit der Taktanzahl ausgegeben. Der vorgegebene Wert von -zehn kann geändert werden, indem man die @code{expand-limit}-Eigenschaft -setzt: -" - doctitlede = "Die Erscheinung von Pausentakten ändern" - - -%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df -texidocfr = " -Dans le cas où ce silence dure mois de dix mesures, LilyPond imprime sur -la portée des @qq{ silences d'église } -- @emph{Kirchenpause} en -allemand -- et qui sont une simple suite de rectangles. La propriété -@code{expand-limit} permet d'obtenir un silence unique : - -" - doctitlefr = "Modifier l'apparence d'un silence multi-mesures" - - lsrtags = "rhythms,tweaks-and-overrides" - texidoc = " -If there are ten or fewer measures of rests, a series of longa -and breve rests (called in German \"Kirchenpausen\" - church rests) -is printed within the staff; otherwise a simple line is shown. -This default number of ten may be changed by overriding the -@code{expand-limit} property: -" - doctitle = "Changing form of multi-measure rests" -} % begin verbatim - - -\relative c'' { - \compressFullBarRests - R1*2 | R1*5 | R1*9 - \override MultiMeasureRest #'expand-limit = #3 - R1*2 | R1*5 | R1*9 -} diff --git a/input/lsr/changing-form-of-multi-measure-rests.ly b/input/lsr/changing-form-of-multi-measure-rests.ly new file mode 100644 index 0000000000..a7e6b2b3c5 --- /dev/null +++ b/input/lsr/changing-form-of-multi-measure-rests.ly @@ -0,0 +1,56 @@ +%% 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.13.1" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + +%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc + doctitlees = "Cambiar la forma de los silencios multicompás" + texidoces = " +Si hay diez compases de silencio o menos, se imprime en el pentagrama +una serie de silencios de breve y longa (conocidos en alemán como +\"Kirchenpausen\", «silencios eclesiásticos»); en caso contrario se +muestra una barra normal. Este número predeterminado de diez se +puede cambiar sobreescribiendo la propiedad @code{expand-limit}: + +" + +%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 + texidocde = " +Wenn zehn oder weniger Pausentakte vorkommen, wird eine Reihe von Longa- +und Brevispausen (auch Kirchenpausen genannt) gesetzt, bei mehr Takten +wird eine Line mit der Taktanzahl ausgegeben. Der vorgegebene Wert von +zehn kann geändert werden, indem man die @code{expand-limit}-Eigenschaft +setzt: +" + doctitlede = "Die Erscheinung von Pausentakten ändern" + + +%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df +texidocfr = " +Dans le cas où ce silence dure mois de dix mesures, LilyPond imprime sur +la portée des @qq{ silences d'église } -- @emph{Kirchenpause} en +allemand -- et qui sont une simple suite de rectangles. La propriété +@code{expand-limit} permet d'obtenir un silence unique : + +" + doctitlefr = "Modifier l'apparence d'un silence multi-mesures" + + texidoc = " +If there are ten or fewer measures of rests, a series of longa and +breve rests (called in German \"Kirchenpausen\" - church rests) is +printed within the staff; otherwise a simple line is shown. This +default number of ten may be changed by overriding the +@code{expand-limit} property. + +" + doctitle = "Changing form of multi-measure rests" +} % begin verbatim + +\relative c'' { + \compressFullBarRests + R1*2 | R1*5 | R1*9 + \override MultiMeasureRest #'expand-limit = #3 + R1*2 | R1*5 | R1*9 +} diff --git a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly index a094af33da..9f013e96a9 100644 --- a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly +++ b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly @@ -76,3 +76,4 @@ two MIDI channels are created, each with a different } } } + diff --git a/input/lsr/changing-partcombine-texts.ly b/input/lsr/changing-partcombine-texts.ly index c717dff05f..4ad3a2ae0a 100644 --- a/input/lsr/changing-partcombine-texts.ly +++ b/input/lsr/changing-partcombine-texts.ly @@ -44,3 +44,4 @@ the solo and unison sections may be changed: a2 g } >> + diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index 6e46bfd59a..10e57b8d1a 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,6 +1,5 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { @@ -8,20 +7,16 @@ texidoc = " The @code{\\applyOutput} command allows the tuning of any layout -object, in any context. It requires a Scheme function with three -arguments." +object, in any context. It requires a Scheme function with three +arguments. +" doctitle = "Changing properties for individual grobs" } % begin verbatim - #(define (mc-squared grob grob-origin context) - (let* - ( - (ifs (ly:grob-interfaces grob)) - (sp (ly:grob-property grob 'staff-position)) - ) - (if (memq 'note-head-interface ifs) + (let ((sp (ly:grob-property grob 'staff-position))) + (if (grob::has-interface grob 'note-head-interface) (begin (ly:grob-set-property! grob 'stencil (grob-interpret-markup grob @@ -30,9 +25,7 @@ arguments." ((-5) "m") ((-3) "c ") ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else "bla") - )))) - )))) + (else "bla"))))))))) \relative c' { 2 diff --git a/input/lsr/changing-stanza-fonts.ly b/input/lsr/changing-stanza-fonts.ly index 933daa4b26..3a9e035035 100644 --- a/input/lsr/changing-stanza-fonts.ly +++ b/input/lsr/changing-stanza-fonts.ly @@ -29,3 +29,4 @@ used for printing the stanza number. \override LyricText #'font-family = #'typewriter Oh, ché -- ri, je t'aime } + diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly index e418be3cbc..7ebecd7394 100644 --- a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "expressive-marks" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Se puede modificar el texto empleado para los crescendos y @@ -30,20 +32,18 @@ und @code{'dotted-line}: " doctitlede = "Text und Strecker-Stile für Dynamik-Texte ändern" - lsrtags = "rhythms,tweaks-and-overrides" texidoc = " The text used for crescendos and decrescendos can be changed by modifying the context properties @code{crescendoText} and -@code{decrescendoText}. The style of the spanner line can be -changed by modifying the @code{'style} property of -@code{DynamicTextSpanner}. The default value is @code{'hairpin}, -and other possible values include @code{'line}, @code{'dashed-line} -and @code{'dotted-line}: +@code{decrescendoText}. The style of the spanner line can be changed by +modifying the @code{'style} property of @code{DynamicTextSpanner}. The +default value is @code{'hairpin}, and other possible values include +@code{'line}, @code{'dashed-line} and @code{'dotted-line}. + " doctitle = "Changing text and spanner styles for text dynamics" } % begin verbatim - \relative c'' { \set crescendoText = \markup { \italic { cresc. poco } } \set crescendoSpanner = #'text diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 3d4e912d4b..c1cb50db18 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -32,3 +32,4 @@ The appearance of slurs may be changed from solid to dotted or dashed. c4( d e c) } + diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index f2e4d997cd..6c13889962 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -53,3 +53,4 @@ music = \chordmode { \semiGermanChords \music } \context Voice { \music } >> + diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index e9be8b457a..70f473881e 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -49,3 +49,4 @@ The default font families for text can be overridden with } } + diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index 66ff79e745..7d60f76df1 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -36,3 +36,4 @@ lower = \relative c { } >> } + diff --git a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly index 41975310ac..9c231cbcd4 100644 --- a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly +++ b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly @@ -42,3 +42,4 @@ depending on the @code{figuredBassAlterationDirection} and \set figuredBassAlterationDirection = #LEFT <6\+> <5+> <6 4-> r } + diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index 79be899b98..e43db87e16 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -30,3 +30,4 @@ changed by scaling the properties @code{'staff-space} and c8 c c c c\f c c c } >> + diff --git a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly b/input/lsr/changing-the-tempo-without-a-metronome-mark.ly index 96a73a8cc7..67a1cf5577 100644 --- a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly +++ b/input/lsr/changing-the-tempo-without-a-metronome-mark.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "staff-notation, midi" + %% Translation of GIT committish: dcd61338c753205b6f8d549389fcb0d999c3a675 texidoces = " Para cambiar el tempo en la salida MIDI sin @@ -22,14 +23,14 @@ Noten auszugeben, kann die Metronombezeichnung unsichtbar gemacht werden: doctitlede = "Das Tempo ohne Metronom-Angabe verändern" - lsrtags = "staff-notation" - texidoc = "To change the tempo in MIDI output without printing -anything, make the metronome mark invisible:" + texidoc = " +To change the tempo in MIDI output without printing anything, make the +metronome mark invisible. +" doctitle = "Changing the tempo without a metronome mark" } % begin verbatim - \score { \new Staff \relative c' { \tempo 4 = 160 diff --git a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly b/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly index 283f275264..4b81d2b2e4 100644 --- a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly +++ b/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly @@ -69,3 +69,4 @@ printed without changing any of the other properties: % Lose 3/4 beaming now \time has been changed a16 a a a a a a a a a a a } + diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index 43fa3b543a..0d1af8649a 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -57,3 +57,4 @@ be printed, or the tuplet number may be suppressed altogether. \override TupletNumber #'stencil = ##f \times 2/3 { c8 c c } } + diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly new file mode 100644 index 0000000000..6771ff0521 --- /dev/null +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly @@ -0,0 +1,65 @@ +%% 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.13.1" + +\header { + lsrtags = "rhythms, contexts-and-engravers" + +%% Translation of GIT committish: f39a9724d9f51ed9d0d464689ef62f549d7b8dd6 + texidoces = " +La propiedad @code{measureLength}, junto con +@code{measurePosition}, determina cuándo es necesario dibujar una +línea divisoria. Sin embargo, al utilizar +@code{\\scaleDurations}, el escalado proporcional de las +duraciones hace difícil introducir cambios de compás. En este +caso se debe establecer manualmente el valor de +@code{measureLength} utilizando la función @code{ly:make-moment}. +El segundo argumento debe ser el mismo que el segundo argumento de +@code{\\scaleDurations}. + +" + doctitlees = "Modificar el compás dentro de una sección polimétrica utilizando @code{\\scaleDurations}" + + texidoc = " +The @code{measureLength} property, together with +@code{measurePosition}, determines when a bar line is needed. However, +when using @code{\\scaleDurations}, the scaling of durations makes it +difficult to change time signatures. In this case, +@code{measureLength} should be set manually, using the +@code{ly:make-moment} callback. The second argument must be the same +as the second argument of @code{\\scaleDurations}. + +" + doctitle = "Changing time signatures inside a polymetric section using \\scaleDurations" +} % begin verbatim + +\layout { + \context { + \Score + \remove "Timing_translator" + \remove "Default_bar_line_engraver" + } + \context { + \Staff + \consists "Timing_translator" + \consists "Default_bar_line_engraver" + } +} + +<< + \new Staff { + \scaleDurations #'(8 . 5) { + \time 6/8 + \set Timing.measureLength = #(ly:make-moment 6 5) + b8 b b b b b + \time 2/4 + \set Timing.measureLength = #(ly:make-moment 4 5) + b4 b + } + } + \new Staff { + \clef bass + \time 2/4 + c2 d e f + } +>> diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly deleted file mode 100644 index 22d625bf0b..0000000000 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ /dev/null @@ -1,62 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -%% Note: this file works from version 2.12.0 -\version "2.13.1" -\header { -%% Translation of GIT committish: f39a9724d9f51ed9d0d464689ef62f549d7b8dd6 - texidoces = " -La propiedad @code{measureLength}, junto con -@code{measurePosition}, determina cuándo es necesario dibujar una -línea divisoria. Sin embargo, al utilizar -@code{\\scaleDurations}, el escalado proporcional de las -duraciones hace difícil introducir cambios de compás. En este -caso se debe establecer manualmente el valor de -@code{measureLength} utilizando la función @code{ly:make-moment}. -El segundo argumento debe ser el mismo que el segundo argumento de -@code{\\scaleDurations}. - -" - doctitlees = "Modificar el compás dentro de una sección polimétrica utilizando @code{\\scaleDurations}" - - lsrtags = "rhythms,contexts-and-engravers" - texidoc = "The @code{measureLength} property, together with -@code{measurePosition}, determines when a bar line is needed. However, -when using @code{\\scaleDurations}, the scaling of durations makes it -difficult to change time signatures. In this case, @code{measureLength} -should be set manually, using the @code{ly:make-moment} callback. The -second argument must be the same as the second argument of -@code{\\scaleDurations}." - doctitle = "Changing time signatures inside a polymetric section using @code{\\scaleDurations}" -} % begin verbatim - - -\layout { - \context { - \Score - \remove "Timing_translator" - \remove "Default_bar_line_engraver" - } - \context { - \Staff - \consists "Timing_translator" - \consists "Default_bar_line_engraver" - } -} - -<< - \new Staff { - \scaleDurations #'(8 . 5) { - \time 6/8 - \set Timing.measureLength = #(ly:make-moment 6 5) - b8 b b b b b - \time 2/4 - \set Timing.measureLength = #(ly:make-moment 4 5) - b4 b - } - } - \new Staff { - \clef bass - \time 2/4 - c2 d e f - } ->> diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 8e31a78ac4..27ba98ad56 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -37,3 +37,4 @@ stemOff = { \override Staff.Stem #'transparent = ##t } \stemOn g'2 \bar "||" } } + diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index cadb6643bb..f5d15068b7 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -55,3 +55,4 @@ theMusic = \chordmode { << \context ChordNames \theMusic \context Voice \theMusic >> + diff --git a/input/lsr/chord-name-major7.ly b/input/lsr/chord-name-major7.ly index 0874620ec7..61a266e4ee 100644 --- a/input/lsr/chord-name-major7.ly +++ b/input/lsr/chord-name-major7.ly @@ -35,3 +35,4 @@ The layout of the major 7 can be tuned with @code{majorSevenSymbol}. \set majorSevenSymbol = \markup { j7 } c:7+ } + diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly index 2f539eda9b..db83db418d 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.ly @@ -1,10 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or -% "Special output" might be more adequate -jm + lsrtags = "paper-and-layout" + texidoc = " This code shows how to clip (extract) snippets from a full score. @@ -12,26 +12,23 @@ This file needs to be run separately with @code{-dclip-systems}; the snippets page may not adequately show the results. The result will be files named -@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. +@samp{base-from-start-to-end[-count].eps}. + -@itemize -@item If system starts and ends are included, they include extents of the System grob, e.g., instrument names. -@item + Grace notes at the end point of the region are not included. -@item + Regions can span multiple systems. In this case, multiple EPS files -are generated. +are generated. -@end itemize " doctitle = "Clip systems" } % begin verbatim - #(ly:set-option 'clip-systems) #(set! output-count 1) @@ -91,3 +88,4 @@ origScore = \score { } } } + diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index 85ffd5af65..e641c0bada 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -35,3 +35,4 @@ fragment = \relative c' { \new Staff \fragment \new Staff \makeClusters \fragment >> + diff --git a/input/lsr/coloring-notes-depending-on-their-pitch.ly b/input/lsr/coloring-notes-depending-on-their-pitch.ly index 855d27a0d8..cab9e24489 100644 --- a/input/lsr/coloring-notes-depending-on-their-pitch.ly +++ b/input/lsr/coloring-notes-depending-on-their-pitch.ly @@ -1,12 +1,15 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "pitches,editorial-annotations,really-cool" + lsrtags = "pitches, editorial-annotations" + texidoc = " -It is possible to color note heads depending on their pitch and/or their names: -the function used in this example even makes it possible to distinguish enharmonics. +It is possible to color note heads depending on their pitch and/or +their names: the function used in this example even makes it possible +to distinguish enharmonics. + " doctitle = "Coloring notes depending on their pitch" } % begin verbatim @@ -29,8 +32,7 @@ the function used in this example even makes it possible to distinguish enharmon (cons (ly:make-pitch 0 3 1/2) (x11-color 'blue)) (cons (ly:make-pitch 0 4 -1/2) (x11-color 'blue)) (cons (ly:make-pitch 0 5 1/2) (x11-color 'blue)) - (cons (ly:make-pitch 0 6 -1/2) (x11-color 'blue)) - )) + (cons (ly:make-pitch 0 6 -1/2) (x11-color 'blue)))) %Compare pitch and alteration (not octave). #(define (pitch-equals? p1 p2) diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index 937a9ff885..87ed3c243a 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -28,3 +28,4 @@ piuF = \markup { \italic più \dynamic f } c2\f c-\piuF } + diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index be8c6d2f9b..4916607521 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -107,3 +107,4 @@ musicDown = \relative c'' { } } } + diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index a8dc2fc241..4a0f811eef 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "rhythms" + %% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc doctitlees = "Indicaciones de compases compuestos" texidoces = " @@ -41,7 +42,6 @@ métriques. LilyPond est capable de rendre ce type de notation, plus " doctitlefr = "Métrique décomposée" - lsrtags = "rhythms" texidoc = " Odd 20th century time signatures (such as \"5/8\") can often be played as compound time signatures (e.g. \"3/8 + 2/8\"), which combine two or @@ -55,15 +55,13 @@ database.) doctitle = "Compound time signatures" } % begin verbatim - #(define ((compound-time one two num) grob) (grob-interpret-markup grob (markup #:override '(baseline-skip . 0) #:number (#:line ( (#:column (one num)) #:vcenter "+" - (#:column (two num)))) - ))) + (#:column (two num))))))) \relative c' { \override Staff.TimeSignature #'stencil = #(compound-time "2" "3" "8") diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 55b302c43d..d9fdc16f52 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -87,3 +87,4 @@ ease reading rhythmically complex modern music. In the example, the } } } + diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly index 798d8e5077..e278534577 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -41,3 +41,4 @@ hidden note and cadenza timing. \cadenzaOff \bar "|" } + diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list index 0fefd9fdd0..73055ed527 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -2,7 +2,7 @@ adding-a-figured-bass-above-or-below-the-notes.ly adding-an-extra-staff-at-a-line-break.ly adding-an-extra-staff.ly changing-midi-output-to-one-channel-per-voice.ly -changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly chant-or-psalms-notation.ly creating-blank-staves.ly engravers-one-by-one.ly diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly index 23125bad94..f55e59e5da 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -50,3 +50,4 @@ The placement of fingering numbers can be controlled precisely. 2 } + diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly index 60826002d8..9a4a5d1bac 100644 --- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly @@ -57,3 +57,4 @@ comes first. \once \override Script #'script-priority = #-100 a2^\prall^\markup { \sharp } } + diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index 8cad6b91bc..de374e55ec 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -35,3 +35,4 @@ music = \relative c'' { } } + diff --git a/input/lsr/creating-a-delayed-turn.ly b/input/lsr/creating-a-delayed-turn.ly index 46e16ecbe7..5f7eb59fd6 100644 --- a/input/lsr/creating-a-delayed-turn.ly +++ b/input/lsr/creating-a-delayed-turn.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" + %% Translation of GIT committish: b10de35f895919aec109de6fb1fc84d42ad851b3 texidoces = " La creación de un grupeto circular de anticipación entre dos notas, @@ -31,20 +32,18 @@ wird benutzt, um den Doppelschlag horizontal zu positionieren. doctitlede = "Einen Doppelschlag mit Vorhalt erstellen" - lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" - texidoc = " -Creating a delayed turn, where the lower note of the -turn uses the accidental, requires several overrides. The -@code{outside-staff-priority} property must be set to @code{#f}, -as otherwise this would take precedence over the -@code{avoid-slur property}. The value of @code{halign} is used -to position the turn horizontally." +Creating a delayed turn, where the lower note of the turn uses the +accidental, requires several overrides. The +@code{outside-staff-priority} property must be set to @code{#f}, as +otherwise this would take precedence over the @code{avoid-slur +property}. The value of @code{halign} is used to position the turn +horizontally. +" doctitle = "Creating a delayed turn" } % begin verbatim - \relative c'' { \once \override TextScript #'avoid-slur = #'inside \once \override TextScript #'outside-staff-priority = ##f diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index 1f0a606f67..3667374650 100644 --- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -32,43 +32,42 @@ throughout Mars, from Gustav Holst's The Planets. } % begin verbatim #(define (make-note-req p d) - (make-music 'NoteEvent - 'duration d - 'pitch p)) + (make-music 'NoteEvent + 'duration d + 'pitch p)) #(define (make-note p d) - (make-music 'EventChord - 'elements (list (make-note-req p d)))) + (make-music 'EventChord + 'elements (list (make-note-req p d)))) #(define (seq-music-list elts) - (make-music 'SequentialMusic - 'elements elts)) + (make-music 'SequentialMusic + 'elements elts)) #(define (make-triplet elt) - (make-music 'TimeScaledMusic - 'denominator 3 - 'numerator 2 - 'element elt)) - + (make-music 'TimeScaledMusic + 'denominator 3 + 'numerator 2 + 'element elt)) rhythm = #(define-music-function (parser location note) (ly:music?) - "Make the rhythm in Mars (the Planets) at the given note's pitch" - (let ((p (ly:music-property - (car (ly:music-property note 'elements)) - 'pitch))) - (seq-music-list (list - (make-triplet (seq-music-list (list - (make-note p (ly:make-duration 3 0 2 3)) - (make-note p (ly:make-duration 3 0 2 3)) - (make-note p (ly:make-duration 3 0 2 3)) - ))) - (make-note p (ly:make-duration 2 0)) - (make-note p (ly:make-duration 2 0)) - (make-note p (ly:make-duration 3 0)) - (make-note p (ly:make-duration 3 0)) - (make-note p (ly:make-duration 2 0)) - )))) + "Make the rhythm in Mars (the Planets) at the given note's pitch" + (let ((p (ly:music-property + (car (ly:music-property note 'elements)) + 'pitch))) + (seq-music-list + (list + (make-triplet (seq-music-list + (list + (make-note p (ly:make-duration 3 0 2 3)) + (make-note p (ly:make-duration 3 0 2 3)) + (make-note p (ly:make-duration 3 0 2 3))))) + (make-note p (ly:make-duration 2 0)) + (make-note p (ly:make-duration 2 0)) + (make-note p (ly:make-duration 3 0)) + (make-note p (ly:make-duration 3 0)) + (make-note p (ly:make-duration 2 0)))))) \new Staff { \time 5/4 diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly index d90e924201..a8af672984 100644 --- a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly +++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly @@ -43,3 +43,4 @@ context: { 2\arpeggio 2 } >> } + diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index 143b918f80..8728b56bab 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -56,3 +56,4 @@ To create blank staves, generate empty measures then remove the bottom-margin = 0.25\in top-margin = 0.25\in } + diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly index af7266268c..f2adbf01f7 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly @@ -47,3 +47,4 @@ the staves by setting the property @code{PianoStaff.connectArpeggios}. } } >> + diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly index 222b06691f..35de0bf070 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly @@ -57,3 +57,4 @@ the @code{Score} context. } } } + diff --git a/input/lsr/creating-metronome-marks-in-markup-mode.ly b/input/lsr/creating-metronome-marks-in-markup-mode.ly index 264dee6641..0368919dd3 100644 --- a/input/lsr/creating-metronome-marks-in-markup-mode.ly +++ b/input/lsr/creating-metronome-marks-in-markup-mode.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "staff-notation" + %% Translation of GIT committish: dcd61338c753205b6f8d549389fcb0d999c3a675 texidoces = " Se pueden crear indicaciones metronómicas nuevas en modo de @@ -21,14 +22,14 @@ aber sie ändern nicht das Tempo für die MIDI-Ausgabe. doctitlede = "Eine Metronombezeichnung als Textbeschriftung erstellen" - lsrtags = "staff-notation" - texidoc = "New metronome marks can be created in markup mode, -but they will not change the tempo in MIDI output." + texidoc = " +New metronome marks can be created in markup mode, but they will not +change the tempo in MIDI output. +" doctitle = "Creating metronome marks in markup mode" } % begin verbatim - \relative c' { \tempo \markup { \concat { diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly index 4228a65376..deaaf3e759 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -50,3 +50,4 @@ parenF = #(make-dynamic-script (markup #:line (#:normal-text #:italic \relative c'' { c4\parenF c c \dynamicUp c\parenF } + diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly index 86f07c8688..866749b830 100644 --- a/input/lsr/creating-simultaneous-rehearsal-marks.ly +++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "expressive-marks, text, tweaks-and-overrides" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " A diferencia de las inscripciones de texto, las lestras de ensayo @@ -18,15 +20,14 @@ siguiente. " doctitlees = "Creación de marcas de ensayo simultáneas" - lsrtags = "expressive-marks,text,tweaks-and-overrides" texidoc = " -Unlike text scripts, rehearsal marks cannot be stacked at a particular point -in a score: only one @code{RehearsalMark} object is created. Using an -invisible measure and bar line, an extra rehearsal mark can be added, giving -the appearance of two marks in the same column. +Unlike text scripts, rehearsal marks cannot be stacked at a particular +point in a score: only one @code{RehearsalMark} object is created. +Using an invisible measure and bar line, an extra rehearsal mark can be +added, giving the appearance of two marks in the same column. This +method may also prove useful for placing rehearsal marks at both the +end of one system and the start of the following system. -This method may also prove useful for placing rehearsal marks at both the -end of one system and the start of the following system. " doctitle = "Creating simultaneous rehearsal marks" } % begin verbatim diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 9507e53dcd..b132962104 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -54,3 +54,4 @@ solo violin, BWV 1004. } >> } + diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 8baf0abb26..0fd479c404 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "expressive-marks, text, tweaks-and-overrides" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Las instrucciones @code{\\startTextSpan} y @code{\\stopTextSpan} @@ -15,16 +16,16 @@ octavaciones. Sobreescribimos ciertas propiedades del objeto " doctitlees = "Crear elementos de extensión textuales" - lsrtags = "expressive-marks, text, tweaks-and-overrides" - texidoc = "The @code{\\startTextSpan} and @code{\\stopTextSpan} -commands allow the creation of text spanners as easily as pedal -indications or octavations. Override some properties of the -@code{TextSpanner} object to modify its output." + texidoc = " +The @code{\\startTextSpan} and @code{\\stopTextSpan} commands allow the +creation of text spanners as easily as pedal indications or +octavations. Override some properties of the @code{TextSpanner} object +to modify its output. +" doctitle = "Creating text spanners" } % begin verbatim - \paper { ragged-right = ##f } \relative c'' { diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index 1e4a57b7a9..41754b3aff 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -40,3 +40,4 @@ Custodes may be engraved in various styles. c1^"mensural" \break 1 } + diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly index 21febc1b12..9456589dd9 100644 --- a/input/lsr/customizing-fretboard-fret-diagrams.ly +++ b/input/lsr/customizing-fretboard-fret-diagrams.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "fretted-strings, tweaks-and-overrides" + %% Translation of GIT committish: acbcbe3683d629575967b972b64ca5e1589bf330 texidoces = " Se pueden establecer las propiedades de los diagramas de @@ -29,26 +30,24 @@ weggelassen werden kann. " doctitlede = "Bunddiagramme anpassen" - lsrtags = "fretted-strings,tweaks-and-overrides" - - texidoc = "Fret diagram properties can be set through -@code{'fret-diagram-details}. For FretBoard fret diagrams, -overrides are applied to the @code{FretBoards.FretBoard} object. -Like @code{Voice}, @code{FretBoards} is a bottom level context, -therefore can be omitted in property overrides. + texidoc = " +Fret diagram properties can be set through +@code{'fret-diagram-details}. For FretBoard fret diagrams, overrides +are applied to the @code{FretBoards.FretBoard} object. Like +@code{Voice}, @code{FretBoards} is a bottom level context, therefore +can be omitted in property overrides. " doctitle = "Customizing fretboard fret diagrams" } % begin verbatim - \include "predefined-guitar-fretboards.ly" \storePredefinedDiagram \chordmode { c' } #guitar-tuning #"x;1-1-(;3-2;3-3;3-4;1-1-);" << \new ChordNames { - \chordmode { c1 c c d } + \chordmode { c1 | c | c | d } } \new FretBoards { % Set global properties of fret diagram @@ -92,6 +91,6 @@ therefore can be omitted in property overrides. } } \new Voice { - c'1 c' c' d' + c'1 | c' | c' | d' } >> diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly index 76fbbeb58a..3982630fe7 100644 --- a/input/lsr/customizing-markup-fret-diagrams.ly +++ b/input/lsr/customizing-markup-fret-diagrams.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "fretted-strings, tweaks-and-overrides" + %% Translation of GIT committish: acbcbe3683d629575967b972b64ca5e1589bf330 texidoces = " Se pueden establecer las propiedades de los diagramas de @@ -36,19 +37,18 @@ Beschriftung vorgenommen werden. " doctitlede = "Anpassung von Beschriftungs-Bunddiagrammen" - lsrtags = "fretted-strings,tweaks-and-overrides" + texidoc = " +Fret diagram properties can be set through +@code{'fret-diagram-details}. For markup fret diagrams, overrides can +be applied to the @code{Voice.TextScript} object or directly to the +markup. - texidoc = "Fret diagram properties can be set through -@code{'fret-diagram-details}. For markup fret diagrams, overrides -can be applied to the @code{Voice.TextScript} object or directly -to the markup. " doctitle = "Customizing markup fret diagrams" } % begin verbatim - << - \chords { c1 c c d } + \chords { c1 | c | c | d } \new Voice = "mel" { \textLengthOn diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly index 7e5f5a67ae..12ab026a49 100644 --- a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly +++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly @@ -37,3 +37,4 @@ by the @code{Stem} property @code{neutral-direction}. \override Stem #'neutral-direction = #down a4 b c b } + diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly index 16189b4fa9..64e72d0bfc 100644 --- a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "fretted-strings" + %% Translation of GIT committish: afbff4903c2dcf413255a42e38b1d26435509370 texidoces = " @@ -58,18 +60,19 @@ enthalten. Das soll in der Zukunft verbessert werden. " doctitlede = "Eigene vordefinierte Bunddiagramme für andere Instrumente erstellen" - lsrtags = "fretted-strings" - texidoc = "Predefined fret diagrams can be added for new instruments -in addition to the standards used for guitar. This file shows how -this is done by defining a new string-tuning and a few predefined -fretboards for the Venezuelan cuatro. + texidoc = " +Predefined fret diagrams can be added for new instruments in addition +to the standards used for guitar. This file shows how this is done by +defining a new string-tuning and a few predefined fretboards for the +Venezuelan cuatro. + +This file also shows how fingerings can be included in the chords used +as reference points for the chord lookup, and displayed in the fret +diagram and the @code{TabStaff}, but not the music. -This file also shows how fingerings can be included in the chords -used as reference points for the chord lookup, and displayed in -the fret diagram and the @code{TabStaff}, but not the music. These fretboards are not transposable because they contain string -information. This is planned to be corrected in the future. +information. This is planned to be corrected in the future. " doctitle = "Defining predefined fretboards for other instruments" diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 94ba606d76..c27263b427 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -172,3 +172,4 @@ melody = { >> \midi { } } + diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index 7d015b2855..880f108655 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -52,3 +52,4 @@ A demonstration of all headers. copyright = "localcopyright" } } + diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly index 04f740e116..e8df72f968 100644 --- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "staff-notation, tweaks-and-overrides" + %% Translation of GIT committish: dcd61338c753205b6f8d549389fcb0d999c3a675 texidoces = " Si hay un solo pentagrama en un de los tipos de sistema @@ -33,20 +35,20 @@ wie das zweite Beispiel zeigt. " doctitlede = "Klammer anzeigen, wenn nur ein System gesetzt wird" - lsrtags = "staff-notation,tweaks-and-overrides" - texidoc = "If there is only one staff in one of the staff types -@code{ChoirStaff} or @code{StaffGroup}, the bracket and the starting -bar line will not be displayed as standard behavior. This can be changed -by overriding the relevant properties. + texidoc = " +If there is only one staff in one of the staff types @code{ChoirStaff} +or @code{StaffGroup}, the bracket and the starting bar line will not be +displayed as standard behavior. This can be changed by overriding the +relevant properties. Note that in contexts such as @code{PianoStaff} and @code{GrandStaff} where the systems begin with a brace instead of a bracket, another -property has to be set, as shown on the second system in the example. +property has to be set, as shown on the second system in the example. + " doctitle = "Display bracket with only one staff in a system" } % begin verbatim - \markup \left-column { \score { \new StaffGroup << @@ -59,6 +61,7 @@ property has to be set, as shown on the second system in the example. >> \layout { } } + \null \score { \new PianoStaff << \override PianoStaff.SystemStartBrace #'collapse-height = #1 diff --git a/input/lsr/displaying-complex-chords.ly b/input/lsr/displaying-complex-chords.ly index a50018b3b5..5701c57c2a 100644 --- a/input/lsr/displaying-complex-chords.ly +++ b/input/lsr/displaying-complex-chords.ly @@ -28,3 +28,4 @@ fixB = { \relative c' { << { \fixA 8 } \\ { \voiceThree \fixB dis } >> s } + 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 363f97a411..581a0a7eaf 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 @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "pitches" + %% Translation of GIT committish: 674a5f874c07063ae56d55be25c55fc3b4bdb7bf doctitlees = "Alteraciones de estilo dodecafónico para todas las notas, incluidas las naturales" texidoces = " @@ -32,21 +33,20 @@ notación. " doctitlede = "Versetzungszeichen für jede Note im Stil der Zwölftonmusik" - lsrtags = "pitches" - texidoc = "In early 20th century works, starting with Schoenberg, -Berg and Webern (the \"Second\" Viennese school), every pitch in the -twelve-tone scale has to be regarded as equal, without any hierarchy -such as the classical (tonal) degrees. Therefore, these composers -print one accidental for each note, even at natural pitches, to -emphasize their new approach to music theory and language. + texidoc = " +In early 20th century works, starting with Schoenberg, Berg and Webern +(the \"Second\" Viennese school), every pitch in the twelve-tone scale +has to be regarded as equal, without any hierarchy such as the +classical (tonal) degrees. Therefore, these composers print one +accidental for each note, even at natural pitches, to emphasize their +new approach to music theory and language. This snippet shows how to achieve such notation rules. -" +" doctitle = "Dodecaphonic-style accidentals for each note including naturals" } % begin verbatim - \score { \new Staff { #(set-accidental-style 'dodecaphonic) @@ -61,3 +61,4 @@ This snippet shows how to achieve such notation rules. } } } + diff --git a/input/lsr/dotted-harmonics.ly b/input/lsr/dotted-harmonics.ly index 99d3ee34d5..e445756688 100644 --- a/input/lsr/dotted-harmonics.ly +++ b/input/lsr/dotted-harmonics.ly @@ -1,17 +1,18 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { - lsrtags = "unfretted-strings,tweaks-and-overrides" - texidoc = "Artificial harmonics using @code{\\harmonic} do not show -dots. To override this behavior, set the context property -@code{harmonicDots}." + lsrtags = "unfretted-strings, tweaks-and-overrides" + + texidoc = " +Artificial harmonics using @code{\\harmonic} do not show dots. To +override this behavior, set the context property @code{harmonicDots}. + +" doctitle = "Dotted harmonics" } % begin verbatim - \relative c''' { \time 3/4 \key f \major diff --git a/input/lsr/double-glissando.ly b/input/lsr/double-glissando.ly index eaa96be22b..77afb3cb34 100644 --- a/input/lsr/double-glissando.ly +++ b/input/lsr/double-glissando.ly @@ -30,3 +30,4 @@ hidden voice. } >> } + diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index 77256f5bec..d8389c7a42 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,17 +1,18 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "tweaks-and-overrides" + lsrtags = "editorial-annotations, tweaks-and-overrides" + texidoc = " The @code{print-function} can be overridden to draw a box around an -arbitrary grob. +arbitrary grob. + " doctitle = "Drawing boxes around grobs" } % begin verbatim - \relative c'' { \override TextScript #'stencil = #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) @@ -28,3 +29,6 @@ arbitrary grob. \mark "F" c1 } + + + diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index c0473914a8..24b477a90b 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,19 +1,20 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "tweaks-and-overrides" + lsrtags = "editorial-annotations, tweaks-and-overrides" + texidoc = " -The @code{\circle} markup command draws circles around various objects, -for example fingering indications. For other objects, specific tweaks -may be required: this example demonstrates two strategies for rehearsal -marks and measure numbers. +The @code{\\circle} markup command draws circles around various +objects, for example fingering indications. For other objects, +specific tweaks may be required: this example demonstrates two +strategies for rehearsal marks and measure numbers. + " doctitle = "Drawing circles around various objects" } % begin verbatim - \relative c' { c1 \set Score.markFormatter = diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index abf52faf0f..f665b3bf67 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -11,6 +11,8 @@ controlling-the-placement-of-chord-fingerings.ly creating-a-delayed-turn.ly creating-blank-staves.ly default-direction-of-stems-on-the-center-line-of-the-staff.ly +drawing-boxes-around-grobs.ly +drawing-circles-around-various-objects.ly embedding-native-postscript-in-a--markup-block.ly grid-lines--changing-their-appearance.ly grid-lines--emphasizing-rhythms-and-notes-synchronization.ly diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly index cf81319d5d..68682ca081 100644 --- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly +++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly @@ -31,3 +31,4 @@ block. s2 a'1 } + diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index c51fa1b871..32ea13888b 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -315,3 +315,4 @@ MyStaff = \context { } } + diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index 7d7724442c..db8d13b76a 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -54,3 +54,4 @@ number indicates the direction (1 = up, -1 = down). #'((0.0 . 1) (-2.0 . 1) (-4.0 . 1)) ~ } + diff --git a/input/lsr/engraving-tremolos-with-floating-beams.ly b/input/lsr/engraving-tremolos-with-floating-beams.ly index 084adf2c09..f001a70aff 100644 --- a/input/lsr/engraving-tremolos-with-floating-beams.ly +++ b/input/lsr/engraving-tremolos-with-floating-beams.ly @@ -43,3 +43,4 @@ the @code{'gap} property. + diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly index db9c578854..a62ba7649f 100644 --- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly +++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly @@ -75,3 +75,4 @@ administration\". \set tupletSpannerDuration = #(ly:make-moment 1 4) \times 2/3 { c8 c c c c c } } + diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index ddd1b2dc49..f9b622b34d 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -1,4 +1,4 @@ -adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly adding-parentheses-around-an-expressive-mark-or-chordal-note.ly adjusting-the-shape-of-falls-and-doits.ly breathing-signs.ly diff --git a/input/lsr/faking-a-hammer-in-tablatures.ly b/input/lsr/faking-a-hammer-in-tablatures.ly index 10f40c7aeb..887260d5d3 100644 --- a/input/lsr/faking-a-hammer-in-tablatures.ly +++ b/input/lsr/faking-a-hammer-in-tablatures.ly @@ -21,3 +21,4 @@ A hammer in tablature can be faked with slurs. } } + diff --git a/input/lsr/fine-tuning-pedal-brackets.ly b/input/lsr/fine-tuning-pedal-brackets.ly index ef55883ce6..71ee9a7134 100644 --- a/input/lsr/fine-tuning-pedal-brackets.ly +++ b/input/lsr/fine-tuning-pedal-brackets.ly @@ -1,16 +1,17 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { lsrtags = "keyboards, tweaks-and-overrides" - texidoc = "The appearance of pedal brackets may be altered in -different ways." + + texidoc = " +The appearance of pedal brackets may be altered in different ways. + +" doctitle = "Fine-tuning pedal brackets" } % begin verbatim - \paper { ragged-right = ##f } \relative c'' { c2\sostenutoOn c 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 b8a8203839..67010be958 100644 --- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly +++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly @@ -48,3 +48,4 @@ right-hand fingering. 4 4 } + diff --git a/input/lsr/flamenco-notation.ly b/input/lsr/flamenco-notation.ly index ec9f4227ea..258acfd55a 100644 --- a/input/lsr/flamenco-notation.ly +++ b/input/lsr/flamenco-notation.ly @@ -246,3 +246,4 @@ part = \relative c' { } } + diff --git a/input/lsr/flat-flags-and-beam-nibs.ly b/input/lsr/flat-flags-and-beam-nibs.ly index 776df34b03..993287229d 100644 --- a/input/lsr/flat-flags-and-beam-nibs.ly +++ b/input/lsr/flat-flags-and-beam-nibs.ly @@ -154,3 +154,4 @@ carry both a left- and right-pointing flat flag. Do this with paired } >> } + diff --git a/input/lsr/flute-slap-notation.ly b/input/lsr/flute-slap-notation.ly index cd85064aa3..3669ca46b4 100644 --- a/input/lsr/flute-slap-notation.ly +++ b/input/lsr/flute-slap-notation.ly @@ -1,21 +1,19 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { lsrtags = "winds" texidoc = " -It is possible to indicate special articulation techniques such as -flute's \"tongue slap\", by replacing the note head with the -appropriate glyph. +It is possible to indicate special articulation techniques such as a +flute's \"tongue slap\" by replacing the note head with the appropriate +glyph. " doctitle = "Flute slap notation" } % begin verbatim - slap = #(define-music-function (parser location music) (ly:music?) #{ @@ -31,3 +29,4 @@ slap = \relative c' { c4 \slap c d r \slap { g a } b r } + diff --git a/input/lsr/forcing-horizontal-shift-of-notes.ly b/input/lsr/forcing-horizontal-shift-of-notes.ly index 63f5ef7409..2339ba6455 100644 --- a/input/lsr/forcing-horizontal-shift-of-notes.ly +++ b/input/lsr/forcing-horizontal-shift-of-notes.ly @@ -44,3 +44,4 @@ are staff spaces. 2 } >> + diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index c116f8ad36..281c0a519a 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -34,3 +34,4 @@ marks, but from the letter or number desired. c1 \mark \default c1 \mark \default } + diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly index a40a2fd6aa..54c13a8553 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -29,3 +29,4 @@ lyr = \lyricmode { \context Lyrics \lyricsto melody \lyr >> + diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/input/lsr/fret-diagrams-explained-and-developed.ly index f9818ae0dc..3d8a68e94b 100644 --- a/input/lsr/fret-diagrams-explained-and-developed.ly +++ b/input/lsr/fret-diagrams-explained-and-developed.ly @@ -1,16 +1,18 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { - lsrtags = "fretted-strings,tweaks-and-overrides" - texidoc = "This snippet shows many possibilities for obtaining -and tweaking fret diagrams." + lsrtags = "fretted-strings, tweaks-and-overrides" + + texidoc = " +This snippet shows many possibilities for obtaining and tweaking fret +diagrams. + +" doctitle = "Fret diagrams explained and developed" } % begin verbatim - << \chords { a2 a diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index dd1ad6a8f4..1611b89b6d 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -28,17 +28,20 @@ get different random note patterns, just change this number. } % begin verbatim \score { - { #(let ((random-state (seed->random-state (current-time)))) - (ly:export - (make-music 'SequentialMusic 'elements - (map (lambda x - (let ((idx (random 12 random-state))) - (make-music 'EventChord - 'elements (list (make-music 'NoteEvent - 'duration (ly:make-duration 2 0 1 1) - 'pitch (ly:make-pitch (quotient idx 7) - (remainder idx 7) - 0)))))) - (make-list 24))))) + { + #(let ((random-state (seed->random-state (current-time)))) + (ly:export + (make-sequential-music + (map (lambda (x) + (let ((idx (random 12 random-state))) + (make-event-chord + (list + (make-music 'NoteEvent + 'duration (ly:make-duration 2 0 1 1) + 'pitch (ly:make-pitch + (quotient idx 7) + (remainder idx 7) + 0)))))) + (make-list 24))))) } } diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/input/lsr/grid-lines--changing-their-appearance.ly index be9d1d8389..62e660b175 100644 --- a/input/lsr/grid-lines--changing-their-appearance.ly +++ b/input/lsr/grid-lines--changing-their-appearance.ly @@ -70,3 +70,4 @@ properties. } } } + diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly index 948fe86a6a..3cee144d8d 100644 --- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -72,3 +72,4 @@ this snippet. ragged-right = ##t } } + diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly index 058b21f9f0..e5820fa807 100644 --- a/input/lsr/grouping-beats.ly +++ b/input/lsr/grouping-beats.ly @@ -46,3 +46,4 @@ Beaming patterns may be altered with the @code{beatGrouping} property: c8^"(3+2)" c16 c8 } + diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly index 7f2d5d66a6..1adb20fc04 100644 --- a/input/lsr/guitar-strum-rhythms.ly +++ b/input/lsr/guitar-strum-rhythms.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "rhythms, fretted-strings" + %% Translation of GIT committish: 4c465c44a037a2a9570964bde1ce64c1cb15014f texidoces = " Para la música de guitarra, es posible mostrar los ritmos de rasgueo, @@ -30,15 +31,14 @@ diagrammes de tablature. " doctitlede = "Rythmique et guitare" - lsrtags = "rhythms,fretted-strings" texidoc = " -For guitar music, it is possible to show strum rhythms, along -with melody notes, chord names, and fret diagrams. +For guitar music, it is possible to show strum rhythms, along with +melody notes, chord names and fret diagrams. + " doctitle = "Guitar strum rhythms" } % begin verbatim - \include "predefined-guitar-fretboards.ly" << \new ChordNames { diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index fb9e179fac..9c6d0ae43f 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,6 +1,5 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { @@ -15,7 +14,6 @@ is the template of a real Balkan song!). doctitle = "Heavily customized polymetric time signatures" } % begin verbatim - #(define plus (markup #:vcenter "+")) #(define ((custom-time-signature one two three four five six seven eight nine ten eleven num) grob) @@ -32,8 +30,7 @@ is the template of a real Balkan song!). (#:column (eight num)) plus (#:column (nine num)) plus (#:column (ten num)) plus - (#:column (eleven num)))) - ))) + (#:column (eleven num))))))) melody = \relative c'' { \set Staff.instrumentName = #"Bb Sop." diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly index a5ee92bb52..208914bdc7 100644 --- a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly +++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly @@ -37,3 +37,4 @@ following way: \crescTextCresc c1\< | d | b | c\! } + diff --git a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly index 816d623fec..0457dcfcb0 100644 --- a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly +++ b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly @@ -49,70 +49,113 @@ not at the center of pp. } % begin verbatim \header { title = "Horizontally aligning custom dynamics" } -\layout { ragged-right = ##t } + +\paper { ragged-right = ##f } % Solution 1: Using a simple markup with a particular halign value -% Drawback: It's a markup, not a dynamic command, so \dynamicDown etc. will have no effect +% Drawback: It's a markup, not a dynamic command, so \dynamicDown +% etc. will have no effect semppMarkup = \markup { \halign #1.4 \italic "sempre" \dynamic "pp" } -% Solution 2: Using a dynamic script and shifting with \once\override ... #'X-offset = .. -% Drawback: \once\override needed for every invocation -semppK = #(make-dynamic-script (markup #:line( #:normal-text #:italic "sempre" #:dynamic "pp"))) - -% Solution 3: Padding the dynamic script so the center-alignment puts it to the correct position +% Solution 2: Using a dynamic script & shifting with +% \once \override ... #'X-offset = .. +% Drawback: \once \override needed for every invocation +semppK = +#(make-dynamic-script + (markup #:line + (#:normal-text + #:italic "sempre" + #:dynamic "pp"))) + +% Solution 3: Padding the dynamic script so the center-alignment +% puts it at the correct position % Drawback: the padding really reserves the space, nothing else can be there -semppT = #( - make-dynamic-script ( - markup #:line ( - #:normal-text #:italic "sempre" #:dynamic "pp" #:hspace 7.1 - ) - ) -) +semppT = +#(make-dynamic-script + (markup #:line + (#:normal-text + #:italic "sempre" + #:dynamic "pp" + #:hspace 7.1))) % Solution 4: Dynamic, setting the dimensions of the additional text to 0 -% Drawback: To lilypond "sempre" has no extent, so it might put other stuff there => collisions -% Drawback: Also, there seems to be some spacing, so it's not exactly the +% Drawback: To lilypond "sempre" has no extent, so it might put +% other stuff there => collisions +% Drawback: Also, there seems to be some spacing, so it's not exactly the % same alignment as without the additional text -semppM = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) '(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "pp"))) +semppM = +#(make-dynamic-script + (markup #:line (#:with-dimensions '(0 . 0) '(0 . 0) + #:right-align #:normal-text #:italic "sempre" #:dynamic "pp"))) % Solution 5: Dynamic with explicit shifting inside the scheme function -semppG = #(make-dynamic-script +semppG = +#(make-dynamic-script (markup - #:hspace 0 #:translate (cons -18.85 0 ) - #:line( #:normal-text #:italic "sempre" #:dynamic "pp")) -) + #:hspace 0 #:translate '(-18.85 . 0) + #:line( #:normal-text #:italic "sempre" #:dynamic "pp"))) % Solution 6: Dynamic with explicit alignment. This has only effect, if one sets X-offset! % Drawback: One needs to set DynamicText #'X-offset! % Drawback: Aligned at the right edge of the additional text, not at the center of pp -semppMII = #(make-dynamic-script (markup #:line(#:right-align #:normal-text #:italic "sempre" #:dynamic "pp"))) - +semppMII = +#(make-dynamic-script (markup #:line(#:right-align + #:normal-text #:italic "sempre" #:dynamic "pp"))) \context StaffGroup << - \context Staff="s" << \set Staff.instrumentName = "Normal" - \relative c'' { \key es \major c4\pp c\p c c | c\ff c c\pp c } + \context Staff = "s" << + \set Staff.instrumentName = "Normal" + \relative c'' { + \key es \major + c4\pp c\p c c | c\ff c c\pp c + } >> - \context Staff="sMarkup" << \set Staff.instrumentName = \markup\column{"Normal" "Markup"} - \relative c'' { \key es \major c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c} + \context Staff = "sMarkup" << + \set Staff.instrumentName = \markup \column { Normal markup } + \relative c'' { + \key es \major + c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c + } >> - \context Staff="sK" << \set Staff.instrumentName = \markup\column{"Explicit" "shifting"} - \relative c'' { \key es \major - \once \override DynamicText #'X-offset = #-9.2 c4\semppK c\p c c | - c\ff c \once \override DynamicText #'X-offset = #-9.2 c\semppK c } + \context Staff = "sK" << + \set Staff.instrumentName = \markup \column { Explicit shifting } + \relative c'' { + \key es \major + \once \override DynamicText #'X-offset = #-9.2 + c4\semppK c\p c c + c4\ff c + \once \override DynamicText #'X-offset = #-9.2 + c4\semppK c + } >> - \context Staff="sT" << \set Staff.instrumentName = \markup\column{"Right" "padding"} - \relative c'' { \key es \major c4\semppT c\p c c | c\ff c c\semppT c } + \context Staff = "sT" << + \set Staff.instrumentName = \markup \column { Right padding } + \relative c'' { + \key es \major + c4\semppT c\p c c | c\ff c c\semppT c + } >> - \context Staff="sM" << \set Staff.instrumentName = \markup\column{"Setting" "dimension" "to zero"} - \relative c'' { \key es \major c4\semppM c\p c c | c\ff c c\semppM c } + \context Staff = "sM" << + \set Staff.instrumentName = \markup \column { Setting dimension "to zero" } + \relative c'' { + \key es \major + c4\semppM c\p c c | c\ff c c\semppM c + } >> - \context Staff="sG" << \set Staff.instrumentName = \markup\column{"Shifting" "inside" "dynamics"} - \relative c'' { \key es \major c4\semppG c\p c c | c\ff c c\semppG c} + \context Staff = "sG" << + \set Staff.instrumentName = \markup \column { Shifting inside dynamics } + \relative c'' { + \key es \major + c4\semppG c\p c c | c\ff c c\semppG c + } + >> + \context Staff = "sMII" << + \set Staff.instrumentName = \markup \column { Alignment inside dynamics } + \relative c'' { + \key es \major + % Setting to ##f (false) gives the same result + \override DynamicText #'X-offset = #0 + c4\semppMII c\p c c | c\ff c c\semppMII c + } >> - \context Staff="sMII" << \set Staff.instrumentName = \markup\column{"Alignment" "inside" "dynamics"} - \relative c'' { \key es \major - \override DynamicText #'X-offset = #0 % Setting to ##f (false) gives the same resul - c4\semppMII c\p c c | c\ff c c\semppMII c } - >> >> - diff --git a/input/lsr/how-to-change-fret-diagram-position.ly b/input/lsr/how-to-change-fret-diagram-position.ly index d055f9aa28..1e86c71dd0 100644 --- a/input/lsr/how-to-change-fret-diagram-position.ly +++ b/input/lsr/how-to-change-fret-diagram-position.ly @@ -55,3 +55,4 @@ harmonies = \chordmode } + diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index f304edf51e..6601079409 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -15,3 +15,4 @@ This can be achieved by separating those syllables by tildes. \lyrics { wa~o~a } + diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly index fd472409cc..6929ccfa6d 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "staff-notation, ancient-notation" + %% Translation of GIT committish: aea975539ec44fd0f1a8fd25930b88b5ab64b53a texidoces = " Los «incipit» se pueden escribir utilizando el grob del nombre del @@ -11,13 +13,14 @@ nombre del instrumento y del incipit." doctitlees = "Incipit" - lsrtags = "staff-notation,ancient-notation" - texidoc = "Incipits can be added using the instrument name grob, but -keeping separate the instrument name definition and the incipit definition." + texidoc = " +Incipits can be added using the instrument name grob, but keeping +separate the instrument name definition and the incipit definition. + +" doctitle = "Incipit" } % begin verbatim - incipit = #(define-music-function (parser location incipit-music) (ly:music?) #{ diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly index 2bb12e3aaf..ed2c356c2b 100644 --- a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly +++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly @@ -74,3 +74,4 @@ context. } } >> + diff --git a/input/lsr/inserting-a-caesura.ly b/input/lsr/inserting-a-caesura.ly index da0dc7c33a..80fb66e644 100644 --- a/input/lsr/inserting-a-caesura.ly +++ b/input/lsr/inserting-a-caesura.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "expressive-marks, tweaks-and-overrides" + %% Translation of GIT committish: a71dfe75d190e18a075443575d71140173829504 texidoces = " Las marcas de cesura se pueden crear sobreescribiendo la propiedad @@ -20,16 +22,15 @@ Zäsurzeichen ist auch möglich. " doctitlede = "Eine Zäsur einfügen" - lsrtags = "expressive-marks,tweaks-and-overrides" texidoc = " -Caesura marks can be created by overriding the @code{'text} -property of the @code{BreathingSign} object. A curved caesura -mark is also available. +Caesura marks can be created by overriding the @code{'text} property of +the @code{BreathingSign} object. A curved caesura mark is also +available. + " doctitle = "Inserting a caesura" } % begin verbatim - \relative c'' { \override BreathingSign #'text = \markup { \musicglyph #"scripts.caesura.straight" diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly index 8db1d71e7d..66f1a63781 100644 --- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly @@ -38,3 +38,4 @@ tuning = \markup { g8 a g a g8 a g a } + diff --git a/input/lsr/isolated-percent-repeats.ly b/input/lsr/isolated-percent-repeats.ly index 7e976c19a1..950edd6ff6 100644 --- a/input/lsr/isolated-percent-repeats.ly +++ b/input/lsr/isolated-percent-repeats.ly @@ -37,3 +37,4 @@ multi-measure rest with a different print function: \override MultiMeasureRest #'thickness = #0.48 R1 } + diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly index c4cf49d432..65f385cc06 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -295,3 +295,4 @@ drumContents = { \midi { } } + diff --git a/input/lsr/laissez-vibrer-ties.ly b/input/lsr/laissez-vibrer-ties.ly index 1903980fa1..d2e6aa2d09 100644 --- a/input/lsr/laissez-vibrer-ties.ly +++ b/input/lsr/laissez-vibrer-ties.ly @@ -25,3 +25,4 @@ using @code{'tie-configuration}. (-1 . ,UP)) 4\laissezVibrer r } + diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly index 0f7eac2740..baf88fa35e 100644 --- a/input/lsr/letter-tablature-formatting.ly +++ b/input/lsr/letter-tablature-formatting.ly @@ -1,21 +1,20 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { - lsrtags = "staff-notation,fretted-strings" + lsrtags = "staff-notation, fretted-strings" - texidoc = "Tablature can be formatted using letters instead of -numbers." + texidoc = " +Tablature can be formatted using letters instead of numbers. + +" doctitle = "Letter tablature formatting" } % begin verbatim - #(define (letter-tablature-format str context event) - (let* - ((tuning (ly:context-property context 'stringTunings)) - (pitch (ly:event-property event 'pitch))) + (let ((tuning (ly:context-property context 'stringTunings)) + (pitch (ly:event-property event 'pitch))) (make-whiteout-markup (make-vcenter-markup (string (integer->char diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index 7d9c7d2f94..dc8d664d5b 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "expressive-marks, tweaks-and-overrides" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Se pueden aplicar puntas de flecha a los elementos de extensión de @@ -11,13 +13,14 @@ texto y de línea (como el Glissando). " doctitlees = "Puntas de flecha para las líneas" - lsrtags = "expressive-marks" - texidoc = "Arrows can be applied to text-spanners and line-spanners -(such as the Glissando)." + texidoc = " +Arrows can be applied to text-spanners and line-spanners (such as the +Glissando). + +" doctitle = "Line arrows" } % begin verbatim - \relative c'' { \override TextSpanner #'bound-padding = #1.0 \override TextSpanner #'style = #'line diff --git a/input/lsr/lyrics-alignment.ly b/input/lsr/lyrics-alignment.ly index 2a80513518..5b2e7718d9 100644 --- a/input/lsr/lyrics-alignment.ly +++ b/input/lsr/lyrics-alignment.ly @@ -41,3 +41,4 @@ well. \once \override LyricText #'self-alignment-X = #1 "This is right-aligned" } + diff --git a/input/lsr/makam-example.ly b/input/lsr/makam-example.ly index 5976bc2fc6..1c0d29df06 100644 --- a/input/lsr/makam-example.ly +++ b/input/lsr/makam-example.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "pitches, world-music" + %% Translation of GIT committish: 33d87eaa6928c0242687fc2361e89de854161c1d texidoces = " El «Makam» es un tipo de melodía de Turquía que @@ -27,14 +29,15 @@ Hinweisen, wo diese Datei gespeichert ist)." doctitlede = "Makam-Beispiel" - lsrtags = "pitches,world-music" - texidoc = "Makam is a type of melody from Turkey using 1/9th-tone -microtonal alterations. Consult the initialization file -@code{ly/makam.ly} for details of pitch names and alterations." + texidoc = " +Makam is a type of melody from Turkey using 1/9th-tone microtonal +alterations. Consult the initialization file @samp{ly/makam.ly} for +details of pitch names and alterations. + +" doctitle = "Makam example" } % begin verbatim - % Initialize makam settings \include "makam.ly" diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly index b1e0cb3c40..32af8183d2 100644 --- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,25 +1,26 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "rhythms,tweaks-and-overrides" + lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides" + texidoc = " -Setting the @code{'transparent} property will cause an object to be +Setting the @code{transparent} property will cause an object to be printed in \"invisible ink\": the object is not printed, but all its other behavior is retained. The object still takes up space, it takes part in collisions, and slurs, ties and beams can be attached to it. + This snippet demonstrates how to connect different voices using ties. Normally, ties only connect two notes in the same voice. By introducing a tie in a different voice, and blanking the first up-stem -in that voice, the tie appears to cross voices. To prevent the blanked stem's -flag from interfering with tie positioning, the stem is extended. +in that voice, the tie appears to cross voices. + " - doctitle = "Making an object invisible with the transparent property" + doctitle = "Making an object invisible with the 'transparent property" } % begin verbatim - \relative c'' { \time 2/4 << diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly index 4c502d760c..3e92b79ebe 100644 --- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly +++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly @@ -41,3 +41,4 @@ emphasized, using the @code{line-positions} property of the \override Staff.StaffSymbol #'line-positions = #'(-4 -2 -0.2 0 0.2 2 4) d'4 e' f' g' } + diff --git a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly index d33e42468e..1644820a31 100644 --- a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly +++ b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly @@ -27,3 +27,4 @@ bassfigures = \figuremode { >> + diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index d168200cde..969c534f7d 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -26,3 +26,4 @@ Beam positions may be controlled manually, by overriding the c8 c } + diff --git a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly index 8331189ec4..4aa2af7618 100644 --- a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly @@ -1,20 +1,19 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { lsrtags = "editorial-annotations, vocal-music" texidoc = " -This example shows how to put crosses on stems. Mark the beginning -of a spoken section with the @code{\\speakOn} keyword, and end it -with the @code{\\speakOff} keyword. +This example shows how to put crosses on stems. Mark the beginning of +a spoken section with the @code{\\speakOn} keyword, and end it with the +@code{\\speakOff} keyword. + " doctitle = "Marking notes of spoken parts with a cross on the stem" } % begin verbatim - speakOn = { \override Stem #'stencil = #(lambda (grob) (let* ((x-parent (ly:grob-parent grob X)) @@ -47,3 +46,4 @@ speakOff = { } } } + diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 7b547d51b9..0edf778b6d 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,16 +1,18 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { lsrtags = "text" - texidoc = "Text that can spread over pages is entered with the -@code{\\markuplines} command." + + texidoc = " +Text that can spread over pages is entered with the +@code{\\markuplines} command. + +" doctitle = "Markup lines" } % begin verbatim - #(set-default-paper-size "a6") #(define-markup-list-command (paragraph layout props args) (markup-list?) diff --git a/input/lsr/measure-counter.ly b/input/lsr/measure-counter.ly index 6e40de0615..3bd18201b1 100644 --- a/input/lsr/measure-counter.ly +++ b/input/lsr/measure-counter.ly @@ -37,3 +37,4 @@ transparent percent repeats. \repeat percent 4 { s1 } } >> + diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly index 07886a0b5c..cb63f4e220 100644 --- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -50,3 +50,4 @@ global = { \new Staff { << \global { c c } >> } >> } + diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly index 5e45fb66b8..018700c00c 100644 --- a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly +++ b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly @@ -35,3 +35,4 @@ normalPos = \revert MultiMeasureRest #'staff-position } >> } + diff --git a/input/lsr/midi.snippet-list b/input/lsr/midi.snippet-list index 34b23248e5..4c94738982 100644 --- a/input/lsr/midi.snippet-list +++ b/input/lsr/midi.snippet-list @@ -1,2 +1,3 @@ changing-midi-output-to-one-channel-per-voice.ly +changing-the-tempo-without-a-metronome-mark.ly demo-midiinstruments.ly diff --git a/input/lsr/modern-tab-text-clef.ly b/input/lsr/modern-tab-text-clef.ly index 580e5df172..18c2210125 100644 --- a/input/lsr/modern-tab-text-clef.ly +++ b/input/lsr/modern-tab-text-clef.ly @@ -1,6 +1,5 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { @@ -13,13 +12,13 @@ Use a markup text to replace the (TAB) clef glyph with a modern font. doctitle = "Modern TAB text clef" } % begin verbatim - TAB = \markup { \raise #1.5 \sans \bold \huge \override #'(baseline-skip . 2.5) + \left-align \center-column { T A diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly index fc74c9ceaf..acebf78a7f 100644 --- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly +++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly @@ -51,3 +51,4 @@ the default + symbol, assign the value @code{trill} to the variable \relative c'' { c1-+ } dashPlus = "trill" \relative c'' { c1-+ } + diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly index 99b07f4a26..3a7f1d4294 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -33,3 +33,4 @@ modify what material they cover. \time 3/4 c2. } + diff --git a/input/lsr/multi--measure-rest-markup.ly b/input/lsr/multi--measure-rest-markup.ly deleted file mode 100644 index ec4f2594bf..0000000000 --- a/input/lsr/multi--measure-rest-markup.ly +++ /dev/null @@ -1,85 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -%% Note: this file works from version 2.12.0 -\version "2.13.1" - -\header { -%% Translation of GIT committish: a041509cb268bc38f6491a33fdeabae91ed6de67 -texidoces = " -Los elementos de marcado aplicados a un silencio multicompás se -centran encima o debajo de éste. Los elementos de marcado extensos -que se adjuntan a silencios multicompás no producen la expansión del -compás. Para expandir un silencio multicompás de forma que quepa todo -el marcado, utilice un silencio de separación con un marcado aplicado -antes del silencio multicompás. - -Observe que el silencio separador produce la inserción de un compás. -El texto aplicado a un siencio sparador de esta forma se alinea por la -izquierda a la posición en que la nota estaría situada dentro del -compás, pero si la longitud del compás está determinada por la -longitud del texto, éste aparecerá centrado. - -" - -doctitlees = "Marcado de silencios multicompás" - -%% Translation of GIT committish: 0364058d18eb91836302a567c18289209d6e9706 - texidocde = "Textbeschriftungen, die an Mehrtaktpausen gehängt wird, -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. - -Man sollte beachten, dass unsichtbare Pausen automatische Taktstriche -nach sich ziehen. Text, der an eine unsichtbare Pause gehänt 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 -ist." - - doctitlede = "Textbeschriftung und Mehrtaktpausen" - - -%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df - texidocfr = " -Lorsque du texte est attaché à un silence multi-mesures, il sera centré -dans la mesure, au-dessus ou en dessous de la portée. Afin d'étirer la -mesure dans le cas ou ce texte est relativement long, il suffit -d'insérer un silence invisible auquel on attache le texte en question, -avant le silence multi-mesures. - -Rappelez-vous qu'un silence invisible génère une barre de mesure. Le -texte attaché à ce silence invisible sera alors aligné sur la gauche de -là où serait positionnée la note. Cependant, si la taille de la mesure -est déterminée par la longueur du texte, il apparaîtra comme centré. - -" - doctitlefr = "Ajout de texte à un silence multi-mesures" - - lsrtags = "rhythms, text" - texidoc = "Markups attached to a multi-measure rest will be -centered above or below it. Long markups attached to multi-measure -rests do not cause the measure to expand. To expand a multi-measure -rest to fit the markup, use a spacer rest with an attached markup -before the multi-measure rest. - -Note that the spacer rest causes a bar line to be inserted. Text attached -to a spacer rest in this way is left-aligned to the position where -the note would be placed in the measure, but if the measure length is -determined by the length of the text, the text will appear to be -centered." - doctitle = "Multi-measure rest markup" -} % begin verbatim - - -\relative c' { - \compressFullBarRests - \textLengthOn - s1*0^\markup { [MAJOR GENERAL] } - R1*19 - s1*0_\markup { \italic { Cue: ... it is yours } } - s1*0^\markup { A } - R1*30^\markup { [MABEL] } - \textLengthOff - c4^\markup { CHORUS } d f c -} diff --git a/input/lsr/multi-measure-rest-markup.ly b/input/lsr/multi-measure-rest-markup.ly new file mode 100644 index 0000000000..2937386b17 --- /dev/null +++ b/input/lsr/multi-measure-rest-markup.ly @@ -0,0 +1,35 @@ +%% 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.13.1" + +\header { + lsrtags = "rhythms, text" + + texidoc = " +Markups attached to a multi-measure rest will be centered above or +below it. Long markups attached to multi-measure rests do not cause +the measure to expand. To expand a multi-measure rest to fit the +markup, use a spacer rest with an attached markup before the +multi-measure rest. + +

Note that the spacer rest causes a bar line to be inserted. Text +attached to a spacer rest in this way is left-aligned to the position +where the note would be placed in the measure, but if the measure +length is determined by the length of the text, the text will appear to +be centered. + +" + doctitle = "Multi-measure rest markup" +} % begin verbatim + +\relative c' { + \compressFullBarRests + \textLengthOn + s1*0^\markup { [MAJOR GENERAL] } + R1*19 + s1*0_\markup { \italic { Cue: ... it is yours } } + s1*0^\markup { A } + R1*30^\markup { [MABEL] } + \textLengthOff + c4^\markup { CHORUS } d f c +} diff --git a/input/lsr/nesting-staves.ly b/input/lsr/nesting-staves.ly index fb3de61c68..422b907487 100644 --- a/input/lsr/nesting-staves.ly +++ b/input/lsr/nesting-staves.ly @@ -66,3 +66,4 @@ staves. The possibilities are @code{SystemStartBar}, \new Staff { c1 } \new Staff { c1 } >> + diff --git a/input/lsr/non-default-tuplet-numbers.ly b/input/lsr/non-default-tuplet-numbers.ly index c910ff66d5..5bb01a9237 100644 --- a/input/lsr/non-default-tuplet-numbers.ly +++ b/input/lsr/non-default-tuplet-numbers.ly @@ -45,21 +45,30 @@ number or tuplet fraction. \relative c'' { - \once \override TupletNumber #'text = #(tuplet-number::non-default-tuplet-denominator-text 7) + \once \override TupletNumber #'text = + #(tuplet-number::non-default-tuplet-denominator-text 7) \times 2/3 { c4. c4. c4. c4. } - \once \override TupletNumber #'text = #(tuplet-number::non-default-tuplet-fraction-text 12 7) + \once \override TupletNumber #'text = + #(tuplet-number::non-default-tuplet-fraction-text 12 7) \times 2/3 { c4. c4. c4. c4. } \once \override TupletNumber #'text = - #(tuplet-number::append-note-wrapper (tuplet-number::non-default-tuplet-fraction-text 12 7) "8") + #(tuplet-number::append-note-wrapper + (tuplet-number::non-default-tuplet-fraction-text 12 7) "8") \times 2/3 { c4. c4. c4. c4. } - \once \override TupletNumber #'text = #(tuplet-number::append-note-wrapper tuplet-number::calc-denominator-text "4") + \once \override TupletNumber #'text = + #(tuplet-number::append-note-wrapper + tuplet-number::calc-denominator-text "4") \times 2/3 { c8 c8 c8 c8 c8 c8 } - \once \override TupletNumber #'text = #(tuplet-number::append-note-wrapper tuplet-number::calc-fraction-text "4") + \once \override TupletNumber #'text = + #(tuplet-number::append-note-wrapper + tuplet-number::calc-fraction-text "4") \times 2/3 { c8 c8 c8 c8 c8 c8 } - \once \override TupletNumber #'text = #(tuplet-number::fraction-with-notes "4." "8") + \once \override TupletNumber #'text = + #(tuplet-number::fraction-with-notes "4." "8") \times 2/3 { c4. c4. c4. c4. } - \once \override TupletNumber #'text = #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4") + \once \override TupletNumber #'text = + #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4") \times 2/3 { c4. c4. c4. c4. } } diff --git a/input/lsr/orchestra,-choir-and-piano-template.ly b/input/lsr/orchestra,-choir-and-piano-template.ly new file mode 100644 index 0000000000..4b2da1de2d --- /dev/null +++ b/input/lsr/orchestra,-choir-and-piano-template.ly @@ -0,0 +1,177 @@ +%% 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.13.1" + +\header { + lsrtags = "template" + +%% Translation of GIT committish: 632d908ee4b36bc84b6f3b15e392040dc9b10dbb + texidoces = " + +Esta plantilla muestra el uso de contextos @code{StaffGroup} y +@code{GrandStaff} anidados para sub-agrupar instrumentos del mismo +tipo, y el uso de @code{\\transpose} para los instrumentos +transpositores. Toda la música que está dentro de variables se +almacena en Do. La música se puede introducir en Do, o (de forma +alternativa) escribirse en el tono del instrumento y transportada +a Do antes de ser asignada a una variable. + +" + doctitlees = "Plantilla de orquesta, coro y piano" + + texidoc = " +This template demonstrates the use of nested @code{StaffGroup} and +@code{GrandStaff} contexts to sub-group instruments of the same type +together, and the use of @code{\\transpose} for transposing +instruments. All music in variables is stored in C. Music may be +entered in C or, alternatively, entered in the instrument key and +transposed to C before being assigned to a variable. + +" + doctitle = "Orchestra, choir and piano template" +} % begin verbatim + +#(set-global-staff-size 17) + +\paper { + indent = 3.0\cm + short-indent = 1.5\cm +} + +fluteMusic = \relative c { \key c \major c'1 d } +oboeMusic = \relative c { \key c \major c'1 d } +clarinetMusic = \relative c { \key c \major c'1 d } +bassoonMusic = \relative c { \clef bass \key c \major c1 d } +trumpetMusic = \relative c { \key c \major c''1 d } +tromboneMusic = \relative c { \key c \major c1 d } +hornIMusic = \relative c { c'1 d } +hornIIMusic = \relative c { c1 d } +percussionMusic = \relative c { \key c \major c1 d } +sopranoMusic = \relative c'' { \key c \major c1 d } +sopranoLyrics = \lyricmode { Sop -- ra } +altoIMusic = \relative c' { \key c \major c1 d } +altoILyrics = \lyricmode { A -- one } +altoIIMusic = \relative c' { \key c \major c1 d } +altoIILyrics = \lyricmode { A -- two } +tenorMusic = \relative c' { \key c \major c1 d } +tenorLyrics = \lyricmode { Ten -- or } +pianoRHMusic = \relative c { \key c \major c'1 d } +pianoLHMusic = \relative c { \key c \major c1 d } +violinIMusic = \relative c { \key c \major c'1 d } +violinIIMusic = \relative c { \key c \major c'1 d } +violaMusic = \relative c { \clef alto \key c \major c'1 d } +celloMusic = \relative c { \clef bass \key c \major c1 d } +bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d } + +\score { + \new GrandStaff = "GrandStaff_score" << + \new StaffGroup = "StaffGroup_woodwinds" << + \new Staff = "Staff_flute" { + \set Staff.instrumentName = #"Flute" + \fluteMusic + } + \new Staff = "Staff_oboe" { + \set Staff.instrumentName = #"Oboe" + \oboeMusic + } + \new Staff = "Staff_clarinet" { + \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat } + \transposition bes + \transpose bes c' \clarinetMusic + } + \new Staff = "Staff_bassoon" { + \set Staff.instrumentName = #"Bassoon" + \bassoonMusic + } + >> + \new StaffGroup = "StaffGroup_brass" << + \new GrandStaff << + \new Staff = "Staff_hornI" { + \set Staff.instrumentName = #"Horn I" + \transposition f + \transpose f c' \hornIMusic + } + \new Staff = "Staff_hornII" { + \set Staff.instrumentName = #"Horn II" + \clef bass + \transposition f' + \transpose f c \hornIIMusic + } + >> + \new Staff = "Staff_trumpet" { + \set Staff.instrumentName = #"Trumpet in C" + \trumpetMusic + } + \new Staff = "Staff_trombone" { + \set Staff.instrumentName = #"Trombone" + \clef bass + \tromboneMusic + } + >> + \new RhythmicStaff = "RhythmicStaff_percussion" << + \set RhythmicStaff.instrumentName = #"Percussion" + \percussionMusic + >> + \new PianoStaff << + \set PianoStaff.instrumentName = #"Piano" + \new Staff { \pianoRHMusic } + \new Staff { + \clef bass + \pianoLHMusic + } + >> + \new ChoirStaff = "ChoirStaff_choir" << + \new Staff = "Staff_soprano" { + \set Staff.instrumentName = #"Soprano" + \new Voice = "soprano" + \sopranoMusic + } + \new Lyrics \lyricsto "soprano" { \sopranoLyrics } + \new GrandStaff = "GrandStaff_altos" \with { \accepts Lyrics } << + \new Staff = "Staff_altoI" { + \set Staff.instrumentName = #"Alto I" + \new Voice = "altoI" + \altoIMusic + } + \new Lyrics \lyricsto "altoI" { \altoILyrics } + \new Staff = "Staff_altoII" { + \set Staff.instrumentName = #"Alto II" + \new Voice = "altoII" + \altoIIMusic + } + \new Lyrics \lyricsto "altoII" { \altoIILyrics } + >> + \new Staff = "Staff_tenor" { + \set Staff.instrumentName = #"Tenor" + \clef "treble_8" + \new Voice = "tenor" + \tenorMusic + } + \new Lyrics \lyricsto "tenor" { \tenorLyrics } + >> + \new StaffGroup = "StaffGroup_strings" << + \new GrandStaff = "GrandStaff_violins" << + \new Staff = "Staff_violinI" { + \set Staff.instrumentName = #"Violin I" + \violinIMusic + } + \new Staff = "Staff_violinII" { + \set Staff.instrumentName = #"Violin II" + \violinIIMusic + } + >> + \new Staff = "Staff_viola" { + \set Staff.instrumentName = #"Viola" + \violaMusic + } + \new Staff = "Staff_cello" { + \set Staff.instrumentName = #"Cello" + \celloMusic + } + \new Staff = "Staff_bass" { + \set Staff.instrumentName = #"Double Bass" + \bassMusic + } + >> + >> +} diff --git a/input/lsr/orchestra-choir-and-piano-template.ly b/input/lsr/orchestra-choir-and-piano-template.ly deleted file mode 100644 index 060298d88b..0000000000 --- a/input/lsr/orchestra-choir-and-piano-template.ly +++ /dev/null @@ -1,176 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -%% Note: this file works from version 2.12.0 -\version "2.13.1" -\header { -%% Translation of GIT committish: 632d908ee4b36bc84b6f3b15e392040dc9b10dbb - texidoces = " - -Esta plantilla muestra el uso de contextos @code{StaffGroup} y -@code{GrandStaff} anidados para sub-agrupar instrumentos del mismo -tipo, y el uso de @code{\\transpose} para los instrumentos -transpositores. Toda la música que está dentro de variables se -almacena en Do. La música se puede introducir en Do, o (de forma -alternativa) escribirse en el tono del instrumento y transportada -a Do antes de ser asignada a una variable. - -" - doctitlees = "Plantilla de orquesta, coro y piano" - - lsrtags = "template" - texidoc = " -This template demonstrates the use of nested @code{StaffGroup} -and @code{GrandStaff} contexts to sub-group instruments of the same -type together, and the use of @code{\\transpose} for transposing -instruments. All music in variables is stored in C. Music may be -entered in C or, alternatively, entered in the instrument key and -transposed to C before being assigned to a variable. -" - doctitle = "Orchestra, choir and piano template" -} % begin verbatim - - -#(set-global-staff-size 17) - -\paper { - indent = 3.0\cm - short-indent = 1.5\cm -} - -fluteMusic = \relative c { \key c \major c'1 d } -oboeMusic = \relative c { \key c \major c'1 d } -clarinetMusic = \relative c { \key c \major c'1 d } -bassoonMusic = \relative c { \clef bass \key c \major c1 d } -trumpetMusic = \relative c { \key c \major c''1 d } -tromboneMusic = \relative c { \key c \major c1 d } -hornIMusic = \relative c { c'1 d } -hornIIMusic = \relative c { c1 d } -percussionMusic = \relative c { \key c \major c1 d } -sopranoMusic = \relative c'' { \key c \major c1 d } -sopranoLyrics = \lyricmode { Sop -- ra } -altoIMusic = \relative c' { \key c \major c1 d } -altoILyrics = \lyricmode { A -- one } -altoIIMusic = \relative c' { \key c \major c1 d } -altoIILyrics = \lyricmode { A -- two } -tenorMusic = \relative c' { \key c \major c1 d } -tenorLyrics = \lyricmode { Ten -- or } -pianoRHMusic = \relative c { \key c \major c'1 d } -pianoLHMusic = \relative c { \key c \major c1 d } -violinIMusic = \relative c { \key c \major c'1 d } -violinIIMusic = \relative c { \key c \major c'1 d } -violaMusic = \relative c { \clef alto \key c \major c'1 d } -celloMusic = \relative c { \clef bass \key c \major c1 d } -bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d } - -\score { - \new GrandStaff = "GrandStaff_score" << - \new StaffGroup = "StaffGroup_woodwinds" << - \new Staff = "Staff_flute" { - \set Staff.instrumentName = #"Flute" - \fluteMusic - } - \new Staff = "Staff_oboe" { - \set Staff.instrumentName = #"Oboe" - \oboeMusic - } - \new Staff = "Staff_clarinet" { - \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat } - \transposition bes - \transpose bes c' \clarinetMusic - } - \new Staff = "Staff_bassoon" { - \set Staff.instrumentName = #"Bassoon" - \bassoonMusic - } - >> - \new StaffGroup = "StaffGroup_brass" << - \new GrandStaff << - \new Staff = "Staff_hornI" { - \set Staff.instrumentName = #"Horn I" - \transposition f - \transpose f c' \hornIMusic - } - \new Staff = "Staff_hornII" { - \set Staff.instrumentName = #"Horn II" - \clef bass - \transposition f' - \transpose f c \hornIIMusic - } - >> - \new Staff = "Staff_trumpet" { - \set Staff.instrumentName = #"Trumpet in C" - \trumpetMusic - } - \new Staff = "Staff_trombone" { - \set Staff.instrumentName = #"Trombone" - \clef bass - \tromboneMusic - } - >> - \new RhythmicStaff = "RhythmicStaff_percussion" << - \set RhythmicStaff.instrumentName = #"Percussion" - \percussionMusic - >> - \new PianoStaff << - \set PianoStaff.instrumentName = #"Piano" - \new Staff { \pianoRHMusic } - \new Staff { - \clef bass - \pianoLHMusic - } - >> - \new ChoirStaff = "ChoirStaff_choir" << - \new Staff = "Staff_soprano" { - \set Staff.instrumentName = #"Soprano" - \new Voice = "soprano" - \sopranoMusic - } - \new Lyrics \lyricsto "soprano" { \sopranoLyrics } - \new GrandStaff = "GrandStaff_altos" \with { \accepts Lyrics } << - \new Staff = "Staff_altoI" { - \set Staff.instrumentName = #"Alto I" - \new Voice = "altoI" - \altoIMusic - } - \new Lyrics \lyricsto "altoI" { \altoILyrics } - \new Staff = "Staff_altoII" { - \set Staff.instrumentName = #"Alto II" - \new Voice = "altoII" - \altoIIMusic - } - \new Lyrics \lyricsto "altoII" { \altoIILyrics } - >> - \new Staff = "Staff_tenor" { - \set Staff.instrumentName = #"Tenor" - \clef "treble_8" - \new Voice = "tenor" - \tenorMusic - } - \new Lyrics \lyricsto "tenor" { \tenorLyrics } - >> - \new StaffGroup = "StaffGroup_strings" << - \new GrandStaff = "GrandStaff_violins" << - \new Staff = "Staff_violinI" { - \set Staff.instrumentName = #"Violin I" - \violinIMusic - } - \new Staff = "Staff_violinII" { - \set Staff.instrumentName = #"Violin II" - \violinIIMusic - } - >> - \new Staff = "Staff_viola" { - \set Staff.instrumentName = #"Viola" - \violaMusic - } - \new Staff = "Staff_cello" { - \set Staff.instrumentName = #"Cello" - \celloMusic - } - \new Staff = "Staff_bass" { - \set Staff.instrumentName = #"Double Bass" - \bassMusic - } - >> - >> -} diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index fb0ea3dda0..afdd13ec40 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "pitches, text" + %% Translation of GIT committish: 674a5f874c07063ae56d55be25c55fc3b4bdb7bf texidoces = " Internamente, la función @code{set-octavation} establece las @@ -27,17 +28,16 @@ und @code{middleCPosition}. Um den Text der Oktavierungsklammer zu doctitlede = "Ottava-Text" - lsrtags = "pitches, text" texidoc = " -Internally, @code{\\ottava} sets the properties @code{ottavation} -(for example, to @code{\"8va\"} or @code{\"8vb\"}) and +Internally, @code{\\ottava} sets the properties @code{ottavation} (for +example, to @code{\"8va\"} or @code{\"8vb\"}) and @code{middleCPosition}. To override the text of the bracket, set @code{ottavation} after invoking @code{\\ottava}. + " doctitle = "Ottava text" } % begin verbatim - { \ottava #1 \set Staff.ottavation = #"8" @@ -48,3 +48,4 @@ Internally, @code{\\ottava} sets the properties @code{ottavation} \set Staff.ottavation = #"Text" c''1 } + diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index 8804e3d002..bade2a58ee 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -25,3 +25,4 @@ By putting the output of } + diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index f1e6df43f8..f55e121821 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,15 +1,18 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { lsrtags = "spacing" - texidoc = "Page labels may be placed inside music or at top-level, -and referred to in markups." + + texidoc = " +Page labels may be placed inside music or at top-level, and referred to +in markups. + +" doctitle = "Page label" } % begin verbatim - #(set-default-paper-size "a6") #(define-markup-command (toc-line layout props label text) diff --git a/input/lsr/percent-repeat-count-visibility.ly b/input/lsr/percent-repeat-count-visibility.ly index 206f746e70..75d4f6fa03 100644 --- a/input/lsr/percent-repeat-count-visibility.ly +++ b/input/lsr/percent-repeat-count-visibility.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "repeats, tweaks-and-overrides" + %% Translation of GIT committish: 43774ddb81b9017802da04ba2862cae4586935b2 texidoces = " Se pueden mostrar los contadores de las repeticiones del tipo @@ -19,15 +21,14 @@ werden, indem man die Eigenschaft @code{repeatCountVisibility} beeinflusst. " doctitlede = "Sichtbarkeit von Prozent-Wiederholungen" - lsrtags = "repeats, tweaks-and-overrides" texidoc = " Percent repeat counters can be shown at regular intervals by setting the context property @code{repeatCountVisibility}. + " doctitle = "Percent repeat count visibility" } % begin verbatim - \relative c'' { \set countPercentRepeats = ##t \set repeatCountVisibility = #(every-nth-repeat-count-visible 5) diff --git a/input/lsr/percent-repeat-counter.ly b/input/lsr/percent-repeat-counter.ly index 0196110188..b15045af18 100644 --- a/input/lsr/percent-repeat-counter.ly +++ b/input/lsr/percent-repeat-counter.ly @@ -34,3 +34,4 @@ convenient property is switched, as shown in this example: \set countPercentRepeats = ##t \repeat percent 4 { c1 } } + diff --git a/input/lsr/percussion-beaters.ly b/input/lsr/percussion-beaters.ly index 16f8c39871..b891c760e7 100644 --- a/input/lsr/percussion-beaters.ly +++ b/input/lsr/percussion-beaters.ly @@ -155,3 +155,4 @@ stick = \markup { \score { b1^\stick } + diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index 896034a357..8032447a40 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -61,3 +61,4 @@ tuplets have to be beamed manually. \repeat unfold 5 { \times 2/3 { c[ b a] } } c8 } + diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index 8d643b644e..89fa28cf59 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -52,3 +52,4 @@ lower = \relative c { \layout { } \midi { } } + diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly index 2d273d1c50..eac25157f6 100644 --- a/input/lsr/piano-template-with-centered-dynamics.ly +++ b/input/lsr/piano-template-with-centered-dynamics.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "expressive-marks, keyboards, template" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Muchas partituras de piano tienen las indicaciones dinámicas @@ -29,16 +30,15 @@ kopieren. う必要はありません。 " - lsrtags = "expressive-marks,keyboards,template" texidoc = " Many piano scores have the dynamics centered between the two staves. This requires a bit of tweaking to implement, but since the template is right here, you don't have to do the tweaking yourself. + " doctitle = "Piano template with centered dynamics" } % begin verbatim - global = { \key c \major \time 4/4 @@ -64,9 +64,9 @@ pedal = { \score { \new PianoStaff = "PianoStaff_pf" << - \new Staff = "Staff_pfUpper" \upper + \new Staff = "Staff_pfUpper" << \global \upper >> \new Dynamics = "Dynamics_pf" \dynamics - \new Staff = "Staff_pfLower" << \lower >> + \new Staff = "Staff_pfLower" << \global \lower >> \new Dynamics = "pedal" \pedal >> diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index acfdb0da8e..512998d7b0 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -71,3 +71,4 @@ text = \lyricmode { } \midi { } } + diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index 8cef40f57d..8d80c301f4 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -74,3 +74,4 @@ lower = \relative c { } \midi { } } + diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly index 6429057e44..e7a6622c62 100644 --- a/input/lsr/placement-of-right-hand-fingerings.ly +++ b/input/lsr/placement-of-right-hand-fingerings.ly @@ -56,3 +56,4 @@ in the following example. \set strokeFingerOrientations = #'(left) 2 } + diff --git a/input/lsr/polyphony-in-tablature.ly b/input/lsr/polyphony-in-tablature.ly index 91d0ac35b7..06ecab5a22 100644 --- a/input/lsr/polyphony-in-tablature.ly +++ b/input/lsr/polyphony-in-tablature.ly @@ -66,3 +66,4 @@ lower = \relative c { >> >> } + diff --git a/input/lsr/positioning-fingering-indications-precisely.ly b/input/lsr/positioning-fingering-indications-precisely.ly index 3dcc6dc4dc..b9d2d9d329 100644 --- a/input/lsr/positioning-fingering-indications-precisely.ly +++ b/input/lsr/positioning-fingering-indications-precisely.ly @@ -31,3 +31,4 @@ involved. 4 } + diff --git a/input/lsr/positioning-grace-notes-with-floating-space.ly b/input/lsr/positioning-grace-notes-with-floating-space.ly index 21f3b0d40e..51536e9f86 100644 --- a/input/lsr/positioning-grace-notes-with-floating-space.ly +++ b/input/lsr/positioning-grace-notes-with-floating-space.ly @@ -54,3 +54,4 @@ the) graces are put left of the musical columns for the main notes. } >> } + diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly deleted file mode 100644 index 2a5273dafc..0000000000 --- a/input/lsr/positioning-multi--measure-rests.ly +++ /dev/null @@ -1,80 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -%% Note: this file works from version 2.12.0 -\version "2.13.1" -\header { -%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc - doctitlees = "Posicionar los silencios multicompás" - texidoces = " -A diferencia de los silencios normales, no existe una instrucción -predefinida para modificar la posición predefinida de un símbolo -multicompás sobre el pentagrama, adjuntándolo a una nota, -independientemente de cuál sea su forma. Sin embargo, en la música -polifónica los silencios multicompás de las voces de numeración par e -impar están separados verticalmente. La colocación de los silencios -multicompás se puede controlar como se ve a continuación: - -" -%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 - -texidocde = " -Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die -vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an -eine Tonhöhe anhängt. In polyphoner Notation wird aber dennoch die -Position der Pausen von geraden und ungeraden Stimmen voneinander -unterschieden. Die Position von Ganztaktpausen kann wie folgt verändert -werden: - " - doctitlede = "Positionierung von Ganztaktpausen" - - -%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df - texidocfr = " -Si l'on peut positionner verticalement un silence simple en le -rattachant à une note, il n'en va pas de même pur un silence -multi-mesure. Néanmoins, et uniquement dans le cadre de musique -polyphonique, les silences multi-mesures sont positionnées différemment -selon qu'ils appartiennent à une voix au numéro pair ou impair. Le -positionnement des silences multi-mesures peut se contrôler ainsi : -" - doctitlefr = "Positionnement des silences multi-mesures" - - lsrtags = "rhythms,tweaks-and-overrides" - texidoc = " -Unlike ordinary rests, there is no predefined command -to change the staff position of a multi-measure -rest symbol of either form by attaching it to a note. However, -in polyphonic music multi-measure rests in odd-numbered and -even-numbered voices are vertically separated. The positioning -of multi-measure rests can be controlled as follows: - " - doctitle = "Positioning multi-measure rests" -} % begin verbatim - - -\relative c'' { - % Multi-measure rests by default are set under the second line - R1 - % They can be moved with an override - \override MultiMeasureRest #'staff-position = #-2 - R1 - % A value of 0 is the default position; - % the following trick moves the rest to the center line - \override MultiMeasureRest #'staff-position = #-0.01 - R1 - % Multi-measure rests in odd-numbered voices are under the top line - << { R1 } \\ { a1 } >> - % Multi-measure rests in even-numbered voices are under the bottom line - << { c1 } \\ { R1 } >> - % They remain separated even in empty measures - << { R1 } \\ { R1 } >> - % This brings them together even though there are two voices - \compressFullBarRests - << - \revert MultiMeasureRest #'staff-position - { R1*3 } - \\ - \revert MultiMeasureRest #'staff-position - { R1*3 } - >> -} diff --git a/input/lsr/positioning-multi-measure-rests.ly b/input/lsr/positioning-multi-measure-rests.ly new file mode 100644 index 0000000000..0792d41889 --- /dev/null +++ b/input/lsr/positioning-multi-measure-rests.ly @@ -0,0 +1,81 @@ +%% 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.13.1" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + +%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc + doctitlees = "Posicionar los silencios multicompás" + texidoces = " +A diferencia de los silencios normales, no existe una instrucción +predefinida para modificar la posición predefinida de un símbolo +multicompás sobre el pentagrama, adjuntándolo a una nota, +independientemente de cuál sea su forma. Sin embargo, en la música +polifónica los silencios multicompás de las voces de numeración par e +impar están separados verticalmente. La colocación de los silencios +multicompás se puede controlar como se ve a continuación: + +" +%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 + +texidocde = " +Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die +vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an +eine Tonhöhe anhängt. In polyphoner Notation wird aber dennoch die +Position der Pausen von geraden und ungeraden Stimmen voneinander +unterschieden. Die Position von Ganztaktpausen kann wie folgt verändert +werden: + " + doctitlede = "Positionierung von Ganztaktpausen" + + +%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df + texidocfr = " +Si l'on peut positionner verticalement un silence simple en le +rattachant à une note, il n'en va pas de même pur un silence +multi-mesure. Néanmoins, et uniquement dans le cadre de musique +polyphonique, les silences multi-mesures sont positionnées différemment +selon qu'ils appartiennent à une voix au numéro pair ou impair. Le +positionnement des silences multi-mesures peut se contrôler ainsi : +" + doctitlefr = "Positionnement des silences multi-mesures" + + texidoc = " +Unlike ordinary rests, there is no predefined command to change the +staff position of a multi-measure rest symbol of either form by +attaching it to a note. However, in polyphonic music multi-measure +rests in odd-numbered and even-numbered voices are vertically +separated. The positioning of multi-measure rests can be controlled as +follows: + +" + doctitle = "Positioning multi-measure rests" +} % begin verbatim + +\relative c'' { + % Multi-measure rests by default are set under the second line + R1 + % They can be moved with an override + \override MultiMeasureRest #'staff-position = #-2 + R1 + % A value of 0 is the default position; + % the following trick moves the rest to the center line + \override MultiMeasureRest #'staff-position = #-0.01 + R1 + % Multi-measure rests in odd-numbered voices are under the top line + << { R1 } \\ { a1 } >> + % Multi-measure rests in even-numbered voices are under the bottom line + << { c1 } \\ { R1 } >> + % They remain separated even in empty measures + << { R1 } \\ { R1 } >> + % This brings them together even though there are two voices + \compressFullBarRests + << + \revert MultiMeasureRest #'staff-position + { R1*3 } + \\ + \revert MultiMeasureRest #'staff-position + { R1*3 } + >> +} diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index b1ed7037bf..93f81eaf40 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -116,3 +116,4 @@ line. \bar"|." } } + diff --git a/input/lsr/positioning-text-markups-inside-slurs.ly b/input/lsr/positioning-text-markups-inside-slurs.ly index 997224b2bf..a468703635 100644 --- a/input/lsr/positioning-text-markups-inside-slurs.ly +++ b/input/lsr/positioning-text-markups-inside-slurs.ly @@ -37,3 +37,4 @@ set to false in order to be printed inside slurs. c2(^\markup { \halign #-10 \natural } d4.) c8 } + 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 edb2ce9abe..fcb5a19e86 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -54,3 +54,4 @@ note needs to be canceled. To change this behavior, set the \set Staff.extraNatural = ##f aeses4 aes ais a } + 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 cdd23c0b56..4f047f63f9 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 @@ -46,3 +46,4 @@ property in the @code{Staff} context. \key g \minor a4 bes c d } + diff --git a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly index 982246d29a..8e472b86f3 100644 --- a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly +++ b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly @@ -47,3 +47,4 @@ overriding the relevant property: d1 d4 e f g } + diff --git a/input/lsr/printing-bar-numbers-at-regular-intervals.ly b/input/lsr/printing-bar-numbers-at-regular-intervals.ly index afbf5deba5..972652b0c1 100644 --- a/input/lsr/printing-bar-numbers-at-regular-intervals.ly +++ b/input/lsr/printing-bar-numbers-at-regular-intervals.ly @@ -48,3 +48,4 @@ measures except at the end of the line. \break c1 | c | c | c | c } + diff --git a/input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly b/input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly index be6545c36d..0faf6a16f5 100644 --- a/input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly +++ b/input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly @@ -46,3 +46,4 @@ Bar numbers can also be printed inside boxes or circles. = #(make-stencil-circler 0.1 0.25 ly:text-interface::print) \repeat unfold 4 { c1 } \bar "|." } + diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/input/lsr/printing-hairpins-using-al-niente-notation.ly index 57e5cbe9ed..e5699ef82c 100644 --- a/input/lsr/printing-hairpins-using-al-niente-notation.ly +++ b/input/lsr/printing-hairpins-using-al-niente-notation.ly @@ -38,3 +38,4 @@ setting the @code{circled-tip} property of the @code{Hairpin} object to c2\< c\! c4\> c\< c2\! } + diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly index 35ff4d9d03..4c624469aa 100644 --- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly @@ -56,3 +56,4 @@ final bar line, as demonstrated on the second line of this example. \override Score.RehearsalMark #'self-alignment-X = #RIGHT \mark "D.C. al Fine" } + diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly index 8a81e4c838..4f90cdd9f7 100644 --- a/input/lsr/printing-marks-on-every-staff.ly +++ b/input/lsr/printing-marks-on-every-staff.ly @@ -48,3 +48,4 @@ they may also be printed on every staff. } } } + diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly index 5059774042..f8fccee298 100644 --- a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly +++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly @@ -49,3 +49,4 @@ of @code{MetronomeMark} or @code{RehearsalMark} appropriately. \mark \default c''1 } + diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 5decff0c78..b0a4455d91 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -142,3 +142,4 @@ Perkussion = \new StaffGroup << \Perkussion >> } + diff --git a/input/lsr/printing-text-from-right-to-left.ly b/input/lsr/printing-text-from-right-to-left.ly index fff5f6eff5..29fe10d10b 100644 --- a/input/lsr/printing-text-from-right-to-left.ly +++ b/input/lsr/printing-text-from-right-to-left.ly @@ -22,3 +22,4 @@ demonstrated here. \line { i n g i r u m i m u s n o c t e } } } + diff --git a/input/lsr/printing-the-bar-number-for-the-first-measure.ly b/input/lsr/printing-the-bar-number-for-the-first-measure.ly index 5a19d2adda..09228ce935 100644 --- a/input/lsr/printing-the-bar-number-for-the-first-measure.ly +++ b/input/lsr/printing-the-bar-number-for-the-first-measure.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.1 \version "2.13.1" \header { + lsrtags = "rhythms" + %% Translation of GIT committish: 5a33019d8b4a837f564eadd4979501ff07e9dfd5 texidoces = " @@ -31,21 +32,17 @@ werden, damit das funktioniert. " doctitlede = "Setzen der Taktnummer für den ersten Takt" - lsrtags = "rhythms" - texidoc = " -By default, the first bar number in a score is suppressed if it is -less than or equal to `1'. By setting @code{barNumberVisibility} -to @code{all-bar-numbers-visible}, any bar number can be printed -for the first measure and all subsequent measures. Note that an -empty bar line must be inserted before the first note for this to -work. +By default, the first bar number in a score is suppressed if it is less +than or equal to `1'. By setting @code{barNumberVisibility} to +@code{all-bar-numbers-visible}, any bar number can be printed for the +first measure and all subsequent measures. Note that an empty bar line +must be inserted before the first note for this to work. " doctitle = "Printing the bar number for the first measure" } % begin verbatim - \relative c' { \set Score.barNumberVisibility = #all-bar-numbers-visible \bar "" diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly index 4b8c82f45a..16de3f17f3 100644 --- a/input/lsr/proportional-strict-notespacing.ly +++ b/input/lsr/proportional-strict-notespacing.ly @@ -30,3 +30,4 @@ the note that occurs at the same time. This may cause collisions. c1 } >> + diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly index 33ab2e59b1..a0632cb113 100644 --- a/input/lsr/quoting-another-voice-with-transposition.ly +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "pitches, staff-notation" + %% Translation of GIT committish: 48f804da6794a7bc8e7fdd4b1649f485b0b09d26 texidoces = " Los pasajes citados tienen en cuenta la transposición de la fuente @@ -27,17 +29,17 @@ in diesem Fall werden alle Noten (auch die zitierten) transponiert. " doctitlede = "Eine Stimme mit Transposition zitieren" - lsrtags = "pitches,staff-notation" - texidoc = "Quotations take into account the transposition of both -source and target. In this example, all instruments play sounding -middle C; the target is an instrument in F. The target part may be -transposed using @code{\\transpose}. In this case, all the pitches -(including the quoted ones) are transposed. + texidoc = " +Quotations take into account the transposition of both source and +target. In this example, all instruments play sounding middle C; the +target is an instrument in F. The target part may be transposed using +@code{\\transpose}. In this case, all the pitches (including the +quoted ones) are transposed. + " doctitle = "Quoting another voice with transposition" } % begin verbatim - \addQuote clarinet { \transposition bes \repeat unfold 8 { d'16 d' d'8 } diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly index 328a6b6a05..94af02f166 100644 --- a/input/lsr/quoting-another-voice.ly +++ b/input/lsr/quoting-another-voice.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "staff-notation" + %% Translation of GIT committish: dcd61338c753205b6f8d549389fcb0d999c3a675 texidoces = " La propiedad @code{quotedEventTypes} determina los tipos de @@ -30,17 +32,18 @@ sich @code{rest-event} nicht in @code{quotedEventTypes} befindet. doctitlede = "Eine andere Stimme zitieren" - lsrtags = "staff-notation" - texidoc = "The @code{quotedEventTypes} property determines the -music event types that are quoted. The default value is -@code{(note-event rest-event)}, which means that only notes and -rests of the quoted voice appear in the @code{\\quoteDuring} -expression. In the following example, a 16th rest is not quoted -since @code{rest-event} is not in @code{quotedEventTypes}." + texidoc = " +The @code{quotedEventTypes} property determines the music event types +that are quoted. The default value is @code{(note-event rest-event)}, +which means that only notes and rests of the quoted voice appear in the +@code{\\quoteDuring} expression. In the following example, a 16th rest +is not quoted since @code{rest-event} is not in +@code{quotedEventTypes}. + +" doctitle = "Quoting another voice" } % begin verbatim - quoteMe = \relative c' { fis4 r16 a8.-> b4\ff c } diff --git a/input/lsr/redefining-grace-note-global-defaults.ly b/input/lsr/redefining-grace-note-global-defaults.ly index 4e0190a5c6..4c61efb175 100644 --- a/input/lsr/redefining-grace-note-global-defaults.ly +++ b/input/lsr/redefining-grace-note-global-defaults.ly @@ -61,3 +61,4 @@ stopAcciaccaturaMusic = { \relative c'' { \acciaccatura d8 c1 } + diff --git a/input/lsr/removing-bar-numbers-from-a-score.ly b/input/lsr/removing-bar-numbers-from-a-score.ly index 04e2e53c8a..8b7816941e 100644 --- a/input/lsr/removing-bar-numbers-from-a-score.ly +++ b/input/lsr/removing-bar-numbers-from-a-score.ly @@ -47,3 +47,4 @@ Bar numbers can be removed entirely by removing the c4 c c c \break c4 c c c } + diff --git a/input/lsr/removing-the-first-empty-line.ly b/input/lsr/removing-the-first-empty-line.ly index 8fed5ba909..7dae894a5a 100644 --- a/input/lsr/removing-the-first-empty-line.ly +++ b/input/lsr/removing-the-first-empty-line.ly @@ -84,3 +84,4 @@ written. R } >> + diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly index 9194ce58e5..2fd8d651a4 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -64,3 +64,4 @@ Rests may be used in various styles. r\maxima^\markup \typewriter { default } r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 s128 } + diff --git a/input/lsr/reverting-default-beam-endings.ly b/input/lsr/reverting-default-beam-endings.ly index f4cd380bd9..9b5666f294 100644 --- a/input/lsr/reverting-default-beam-endings.ly +++ b/input/lsr/reverting-default-beam-endings.ly @@ -52,3 +52,4 @@ new beaming endings: #(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/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 89a001ec0d..554be0e035 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -48,3 +48,4 @@ comp = #(define-music-function (parser location count) ( integer?) \comp #4 | } } + diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index b63ad8e08a..ac87f9c016 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -1,4 +1,4 @@ -adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly adding-drum-parts.ly aligning-bar-numbers.ly automatic-beam-subdivisions.ly @@ -8,11 +8,10 @@ beam-endings-in-score-context.ly beam-grouping-in-7-8-time.ly beams-across-line-breaks.ly changing-beam-knee-gap.ly -changing-form-of-multi--measure-rests.ly -changing-text-and-spanner-styles-for-text-dynamics.ly +changing-form-of-multi-measure-rests.ly changing-the-time-signature-without-affecting-the-beaming.ly changing-the-tuplet-number.ly -changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly chant-or-psalms-notation.ly compound-time-signatures.ly conducting-signs,-measure-grouping-signs.ly @@ -30,11 +29,11 @@ making-slurs-with-complex-dash-structure.ly manually-controlling-beam-positions.ly merging-multi-measure-rests-in-a-polyphonic-part.ly modifying-tuplet-bracket-length.ly -multi--measure-rest-markup.ly +multi-measure-rest-markup.ly non-default-tuplet-numbers.ly permitting-line-breaks-within-beamed-tuplets.ly positioning-grace-notes-with-floating-space.ly -positioning-multi--measure-rests.ly +positioning-multi-measure-rests.ly printing-bar-numbers-at-regular-intervals.ly printing-bar-numbers-inside-boxes-or-circles.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 680b6e60d8..c995e2167b 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -231,3 +231,4 @@ staffBassRhytm = \new Staff=staffbass \with { \remove "Clef_engraver" } { \context Lyrics = "lBassRhytmAboveI" \with {alignAboveContext=staffbass} \lyricsto VoiceBassRhytm \LyricBassRhythmI >> %} + diff --git a/input/lsr/separating-key-cancellations-from-key-signature-changes.ly b/input/lsr/separating-key-cancellations-from-key-signature-changes.ly index 933329be7b..396d00bb8f 100644 --- a/input/lsr/separating-key-cancellations-from-key-signature-changes.ly +++ b/input/lsr/separating-key-cancellations-from-key-signature-changes.ly @@ -25,9 +25,14 @@ or the end. \new Staff { \override Score.BreakAlignment #'break-align-orders = - #'#((left-edge ambitus breathing-sign clef staff-bar key-cancellation key-signature time-signature custos) - (left-edge ambitus breathing-sign clef key-cancellation staff-bar key-signature staff time-signature custos) - (left-edge ambitus breathing-sign clef key-cancellation key-signature staff-bar time-signature custos)) + #'#((left-edge ambitus breathing-sign clef staff-bar + key-cancellation key-signature time-signature custos) + + (left-edge ambitus breathing-sign clef key-cancellation + staff-bar key-signature time-signature custos) + + (left-edge ambitus breathing-sign clef key-cancellation + key-signature staff-bar time-signature custos)) \key des \major c'1 diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly index 93b4afe618..1212c55a1b 100644 --- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "expressive-marks, tweaks-and-overrides" + %% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 texidoces = " Si la nota que da fin a un regulador cae sobre la primera parte de @@ -22,15 +24,15 @@ beendet. Dieses Verhalten kann auch mit der Eigenschaft " doctitlede = "Das Verhalten von Crescendo-Klammern an Taktlinien beeinflussen" - lsrtags = "expressive-marks" - texidoc = "If the note which ends a hairpin falls on a downbeat, -the hairpin stops at the bar line immediately preceding. This behavior -can be controlled by overriding the @code{'to-barline} property. + texidoc = " +If the note which ends a hairpin falls on a downbeat, the hairpin stops +at the bar line immediately preceding. This behavior can be controlled +by overriding the @code{'to-barline} property. + " doctitle = "Setting hairpin behavior at bar lines" } % begin verbatim - \relative c'' { e4\< e2. e1\! diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/input/lsr/setting-the-minimum-length-of-hairpins.ly index 61d531452b..70db964bdf 100644 --- a/input/lsr/setting-the-minimum-length-of-hairpins.ly +++ b/input/lsr/setting-the-minimum-length-of-hairpins.ly @@ -36,3 +36,4 @@ If hairpins are too short, they can be lengthened by modifying the \override Hairpin #'minimum-length = #5 << f1 { s4 s\< s\> s\! } >> } + diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly index d0724ba546..dff3b7b4a1 100644 --- a/input/lsr/shortening-volta-brackets.ly +++ b/input/lsr/shortening-volta-brackets.ly @@ -49,3 +49,4 @@ lasts one measure, which is a duration of 3/4. { g4 g g } } } + diff --git a/input/lsr/showing-chords-at-changes.ly b/input/lsr/showing-chords-at-changes.ly index de225100c5..12bd7ad7f3 100644 --- a/input/lsr/showing-chords-at-changes.ly +++ b/input/lsr/showing-chords-at-changes.ly @@ -41,3 +41,4 @@ harmonies = \chordmode { \relative c' { \harmonies } } >> + diff --git a/input/lsr/simple-lead-sheet.ly b/input/lsr/simple-lead-sheet.ly index 550edbc677..e5a4d159c9 100644 --- a/input/lsr/simple-lead-sheet.ly +++ b/input/lsr/simple-lead-sheet.ly @@ -35,3 +35,4 @@ When put together, chord names, a melody, and lyrics form a lead sheet: } \addlyrics { One day this shall be free __ } >> + diff --git a/input/lsr/simultaneous-notes.snippet-list b/input/lsr/simultaneous-notes.snippet-list index 6d8f1d3592..ace5627929 100644 --- a/input/lsr/simultaneous-notes.snippet-list +++ b/input/lsr/simultaneous-notes.snippet-list @@ -6,4 +6,5 @@ combining-two-parts-on-the-same-staff.ly displaying-complex-chords.ly double-glissando.ly forcing-horizontal-shift-of-notes.ly +making-an-object-invisible-with-the-transparent-property.ly suppressing-warnings-for-clashing-note-columns.ly diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly index 081e3e7e82..569c8fd59a 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -60,3 +60,4 @@ harmonies = \chordmode { \layout { } \midi { } } + diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly index 615214bb78..e67156b7c5 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly @@ -74,3 +74,4 @@ staffMelody = \new Staff { \layout { } \midi { } } + diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly index 84348ecda9..b0897f6595 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -58,3 +58,4 @@ harmonies = \chordmode { \layout{ } \midi { } } + diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly index 59410bee4c..2251a94a47 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -69,3 +69,4 @@ text = \lyricmode { \layout { } \midi { } } + diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly index efc3c5a52a..67d5a7ca3b 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -51,3 +51,4 @@ melody = \relative c' { \layout { } \midi { } } + diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index b55bd3d8bd..80ec4fbbde 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -18,3 +18,4 @@ or underscores (@code{_}) are available.So for example: \relative c'' { a4 b c d } \new Lyrics \lyricmode { a4 "" _ gap } >> + diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly index 30b8b4978f..0335261931 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -18,3 +18,4 @@ mode. In other situations, for example, when entering lyrics, using the \relative { a'1 a } \new Lyrics \lyricmode { \skip 1 bla1 } >> + diff --git a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly index 823f059368..da9941b5d6 100644 --- a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly +++ b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly @@ -65,3 +65,4 @@ snapPizzicato = \markup \snappizz ^\snapPizzicato _\snapPizzicato } + diff --git a/input/lsr/specifying-context-with-beatgrouping.ly b/input/lsr/specifying-context-with-beatgrouping.ly index 8f240d770d..df25766d0e 100644 --- a/input/lsr/specifying-context-with-beatgrouping.ly +++ b/input/lsr/specifying-context-with-beatgrouping.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "rhythms, tweaks-and-overrides" + %% Translation of GIT committish: 5c26e815f2ed54e6c4d022bac10dcc87a9916a29 texidoces = " Mediante la especificación del contexto, el efecto de @@ -36,18 +37,16 @@ commande @code{\time} : " doctitlefr = "Spécification du contexte auquel s'appliquera beatGrouping" - lsrtags = "rhythms" texidoc = " By specifying the context, the effect of @code{beatGrouping} can be -limited to the context specified, and the values which may have -been set in higher-level contexts can be overridden. The -@code{\\set} commands must be placed @emph{after} all @code{\\time} -commands: +limited to the context specified, and the values which may have been +set in higher-level contexts can be overridden. The @code{\\set} +commands must be placed after all @code{\\time} commands: + " doctitle = "Specifying context with beatGrouping" } % begin verbatim - \score { \new Staff << \time 7/8 diff --git a/input/lsr/stand-alone-two-column-markup.ly b/input/lsr/stand-alone-two-column-markup.ly index 2502407635..ee1ff9376a 100644 --- a/input/lsr/stand-alone-two-column-markup.ly +++ b/input/lsr/stand-alone-two-column-markup.ly @@ -30,26 +30,25 @@ Stand-alone text may be arranged in several columns using } % begin verbatim \markup { - \fill-line { - \hspace #1.0 - \column { - \line {"O sacrum convivium" } - \line {"in quo Christus sumitur," } - \line {"recolitur memoria passionis ejus," } - \line {"mens impletur gratia," } - \line {"futurae gloriae nobis pignus datur." } - \line {"Amen."} + \fill-line { + \hspace #1 + \column { + \line { O sacrum convivium } + \line { in quo Christus sumitur, } + \line { recolitur memoria passionis ejus, } + \line { mens impletur gratia, } + \line { futurae gloriae nobis pignus datur. } + \line { Amen. } + } + \hspace #2 + \column { + \line { \italic { O sacred feast } } + \line { \italic { in which Christ is received, } } + \line { \italic { the memory of His Passion is renewed, } } + \line { \italic { the mind is filled with grace, } } + \line { \italic { and a pledge of future glory is given to us. } } + \line { \italic { Amen. } } + } + \hspace #1 } - \hspace #2 - \column { - \line { \italic {"O sacred feast"} } - \line { \italic {"in which Christ is received,"} } - \line { \italic {"the memory of His Passion is renewed,"} } - \line { \italic {"the mind is filled with grace," } } - \line { \italic {"and a pledge of future glory is given to us." }} - \line { \italic {"Amen."}} - } - \hspace #1.0 - } } - diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly index 374a53c371..da8fcb6fcd 100644 --- a/input/lsr/stem-and-beam-behavior-in-tablature.ly +++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly @@ -50,3 +50,4 @@ example. g,,16 b d g b d g b } } + diff --git a/input/lsr/stemlets.ly b/input/lsr/stemlets.ly index 4e1438317c..23b822cef1 100644 --- a/input/lsr/stemlets.ly +++ b/input/lsr/stemlets.ly @@ -39,3 +39,4 @@ the different notations. g'16[^\markup { stemlets and no rests } f' \once \override Rest #'transparent = ##t r d'] } + diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly index 60c01645f1..d1ea2723c1 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -87,3 +87,4 @@ cello = \new Voice \relative c' { \layout { } \midi { } } + diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly index 579c9fc877..15925ec3a5 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -178,3 +178,4 @@ music = { } %} + diff --git a/input/lsr/sub-dividing-beams.ly b/input/lsr/sub-dividing-beams.ly index a0e1645a53..8aa437b80f 100644 --- a/input/lsr/sub-dividing-beams.ly +++ b/input/lsr/sub-dividing-beams.ly @@ -87,3 +87,4 @@ function, as shown here: \set beatLength = #(ly:make-moment 1 16) c32[ c c c c c c c] } + diff --git a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly index b8a0ea5389..3d114acd62 100644 --- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly +++ b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly @@ -1,22 +1,22 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "simultaneous-notes,tweaks-and-overrides" + lsrtags = "simultaneous-notes, tweaks-and-overrides" + texidoc = " -If notes from two voices with stems in the same direction are -placed at the same position, and both voices have no shift or the -same shift specified, the error message \"warning: ignoring too -many clashing note columns\" will appear when compiling the -LilyPond file. This message can be suppressed by setting the -@code{'ignore-collision} property of the @code{NoteColumn} object -to @code{#t}. +If notes from two voices with stems in the same direction are placed at +the same position, and both voices have no shift or the same shift +specified, the error message \"warning: ignoring too many clashing note +columns\" will appear when compiling the LilyPond file. This message +can be suppressed by setting the @code{'ignore-collision} property of +the @code{NoteColumn} object to @code{#t}. + " doctitle = "Suppressing warnings for clashing note columns" } % begin verbatim - ignore = \override NoteColumn #'ignore-collision = ##t \relative c' { diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly index 624bb8d55e..e7f4b60303 100644 --- a/input/lsr/table-of-contents.ly +++ b/input/lsr/table-of-contents.ly @@ -1,16 +1,19 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { lsrtags = "paper-and-layout" - texidoc = "A table of contents is included using -@w{@code{\\markuplines \\table-of-contents}}. The TOC items are -added with the @code{\\tocItem} command." + + texidoc = " +A table of contents is included using @code{\\markuplines +\\table-of-contents}. The TOC items are added with the +@code{\\tocItem} command. + +" doctitle = "Table of contents" } % begin verbatim - #(set-default-paper-size "a6") \book { diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list index 8332b919b4..7c846c5347 100644 --- a/input/lsr/template.snippet-list +++ b/input/lsr/template.snippet-list @@ -1,7 +1,7 @@ ancient-notation-template----modern-transcription-of-gregorian-music.ly ancient-notation-template----modern-transcription-of-mensural-music.ly jazz-combo-template.ly -orchestra-choir-and-piano-template.ly +orchestra,-choir-and-piano-template.ly piano-template-simple.ly piano-template-with-centered-dynamics.ly piano-template-with-centered-lyrics.ly diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list index d27ac6cba3..649e13cf62 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -17,7 +17,7 @@ formatting-lyrics-syllables.ly how-to-put-ties-between-syllables-in-lyrics.ly lyrics-alignment.ly markup-lines.ly -multi--measure-rest-markup.ly +multi-measure-rest-markup.ly ottava-text.ly outputting-the-version-number.ly piano-template-with-centered-lyrics.ly @@ -28,3 +28,4 @@ stand-alone-two-column-markup.ly three-sided-box.ly utf-8.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +volta-text-markup-using-repeatcommands.ly diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 4cd99f3885..eaa321a8b1 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -49,3 +49,4 @@ thickness and padding around the markup." c2^\markup { \NWS-box ABCD } c2^\markup { \NWS-box \note #"4" #1.0 } } + diff --git a/input/lsr/tick-bar-lines.ly b/input/lsr/tick-bar-lines.ly index aeb8106750..470e41a5f6 100644 --- a/input/lsr/tick-bar-lines.ly +++ b/input/lsr/tick-bar-lines.ly @@ -1,12 +1,14 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { lsrtags = "staff-notation" + texidoc = " 'Tick' bar lines are often used in music where the bar line is used only for coordination and is not meant to imply any rhythmic stress. + " doctitle = "Tick bar lines" } % begin verbatim diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly index 0ad93bc361..a7423fdb0c 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -18,3 +18,4 @@ The time signature can be enclosed within parentheses. \time 2/4 a4 b8 c } + diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly index 0b9038cc23..b5f30ade83 100644 --- a/input/lsr/transcription-of-ancient-music-with-incipit.ly +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -289,3 +289,4 @@ incipitBassus = \markup{ indent=5\cm } } + 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 868fb0ed06..44af17bbf7 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "pitches" + %% Translation of GIT committish: 4866dfd58d5c3a8cab4c6c06d5c4fca8e05a3cd7 doctitlees = "Transportar música con el menor número de alteraciones" texidoces = " @@ -64,41 +66,38 @@ 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 -accidentals. In this case, the following rules apply: + texidoc = " +This example uses some Scheme code to enforce enharmonic modifications +for notes in order to have the minimum number of accidentals. In this +case, the following rules apply: -@itemize -@item Double accidentals should be removed -@item + B sharp -> C -@item + E sharp -> F -@item + C flat -> B -@item + F flat -> E -@end itemize -In this manner, the most natural enharmonic notes are chosen. +In this manner, the most natural enharmonic notes are chosen. + " - doctitle = "Transposing music with minimum accidentals" + doctitle = "Transposing pitches with minimum accidentals (\"Smart\" transpose)" } % begin verbatim - -#(define (naturalize-pitch p) - (let* ((o (ly:pitch-octave p)) - (a (* 4 (ly:pitch-alteration p))) - ; alteration, a, in quarter tone steps, - ; for historical reasons - (n (ly:pitch-notename p))) +#(define (naturalize-pitch p) + (let ((o (ly:pitch-octave p)) + (a (* 4 (ly:pitch-alteration p))) + ;; alteration, a, in quarter tone steps, + ;; for historical reasons + (n (ly:pitch-notename p))) (cond ((and (> a 1) (or (eq? n 6) (eq? n 2))) (set! a (- a 2)) @@ -114,9 +113,9 @@ In this manner, the most natural enharmonic notes are chosen. (ly:make-pitch o n (/ a 4)))) #(define (naturalize music) - (let* ((es (ly:music-property music 'elements)) - (e (ly:music-property music 'element)) - (p (ly:music-property music 'pitch))) + (let ((es (ly:music-property music 'elements)) + (e (ly:music-property music 'element)) + (p (ly:music-property music 'pitch))) (if (pair? es) (ly:music-set-property! music 'elements diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index 9f243b2ab1..62737a728b 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -155,3 +155,4 @@ line, they do not. \set Staff.middleCPosition = #0 c'1 } + diff --git a/input/lsr/tweaking-grace-layout-within-music.ly b/input/lsr/tweaking-grace-layout-within-music.ly index 1e8b822513..f5f3ce9046 100644 --- a/input/lsr/tweaking-grace-layout-within-music.ly +++ b/input/lsr/tweaking-grace-layout-within-music.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "rhythms, tweaks-and-overrides" + %% Translation of GIT committish: 5a33019d8b4a837f564eadd4979501ff07e9dfd5 texidoces = " @@ -31,18 +32,17 @@ in ein Kreuz. " doctitlede = "Veränderung des Layouts von Verzierungen innerhalb der Noten" - lsrtags = "rhythms" texidoc = " -The layout of grace expressions can be changed throughout the -music using the functions @code{add-grace-property} and -@code{remove-grace-property}. The following example undefines -the @code{Stem} direction for this grace, so that stems do not -always point up, and changes the default note heads to crosses. +The layout of grace expressions can be changed throughout the music +using the functions @code{add-grace-property} and +@code{remove-grace-property}. The following example undefines the +@code{Stem} direction for this grace, so that stems do not always point +up, and changes the default note heads to crosses. + " doctitle = "Tweaking grace layout within music" } % begin verbatim - \relative c'' { \new Staff { #(remove-grace-property 'Voice 'Stem 'direction) diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index dd9f7b06b5..968e8ba340 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -2,9 +2,8 @@ analysis-brackets-above-the-staff.ly avoiding-collisions-with-chord-fingerings.ly caesura-railtracks-with-fermata.ly changing-a-single-notes-size-in-a-chord.ly -changing-form-of-multi--measure-rests.ly +changing-form-of-multi-measure-rests.ly changing-properties-for-individual-grobs.ly -changing-text-and-spanner-styles-for-text-dynamics.ly changing-the-default-text-font-family.ly changing-the-staff-size.ly controlling-the-vertical-ordering-of-scripts.ly @@ -25,12 +24,13 @@ fret-diagrams-explained-and-developed.ly horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly how-to-change-fret-diagram-position.ly inserting-a-caesura.ly +line-arrows.ly making-an-object-invisible-with-the-transparent-property.ly manually-controlling-beam-positions.ly mensurstriche-layout-bar-lines-between-the-staves.ly nesting-staves.ly percent-repeat-count-visibility.ly -positioning-multi--measure-rests.ly +positioning-multi-measure-rests.ly positioning-text-markups-inside-slurs.ly printing-a-repeat-sign-at-the-beginning-of-a-piece.ly printing-bar-numbers-inside-boxes-or-circles.ly @@ -40,10 +40,14 @@ removing-the-first-empty-line.ly rest-styles.ly rhythmic-slashes.ly separating-key-cancellations-from-key-signature-changes.ly +setting-hairpin-behavior-at-bar-lines.ly +specifying-context-with-beatgrouping.ly suppressing-warnings-for-clashing-note-columns.ly time-signature-in-parentheses.ly transcription-of-ancient-music-with-incipit.ly tweaking-clef-properties.ly +tweaking-grace-layout-within-music.ly +using-beatlength-and-beatgrouping.ly using-postscript-to-generate-special-note-head-shapes.ly using-the--tweak-command-to-tweak-individual-grobs.ly vertically-aligned-dynamics-and-textscripts.ly diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly index cc963fb46d..2571ca3716 100644 --- a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly +++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly @@ -39,3 +39,4 @@ context. \new Staff { c'4 d' e' f' } >> } } + diff --git a/input/lsr/using-beatlength-and-beatgrouping.ly b/input/lsr/using-beatlength-and-beatgrouping.ly index a826f3c19a..12efda9dee 100644 --- a/input/lsr/using-beatlength-and-beatgrouping.ly +++ b/input/lsr/using-beatlength-and-beatgrouping.ly @@ -1,9 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { + lsrtags = "rhythms, tweaks-and-overrides" + %% Translation of GIT committish: 4f881627b3ff5eb538df5221ad77b73d0637aeb4 texidoces = " La propiedad @code{measureLength} determina dónde se deben insertar @@ -41,20 +42,18 @@ contrôler les ligatures à l'aide de ces propriétés. " doctitlefr = "Utilisation conjointe de beatLength et beatGrouping" - lsrtags = "rhythms" texidoc = " -The property @code{measureLength} determines where bar lines -should be inserted and, with @code{beatLength} and -@code{beatGrouping}, how automatic beams should be generated -for beam durations and time signatures for which no beam-ending -rules are defined. This example shows several ways of controlling -beaming by setting these properties. The explanations are shown -as comments in the code. +The property @code{measureLength} determines where bar lines should be +inserted and, with @code{beatLength} and @code{beatGrouping}, how +automatic beams should be generated for beam durations and time +signatures for which no beam-ending rules are defined. This example +shows several ways of controlling beaming by setting these properties. +The explanations are shown as comments in the code. + " doctitle = "Using beatLength and beatGrouping" } % begin verbatim - \relative c'' { \time 3/4 % The default in 3/4 time is to beam in three groups @@ -89,4 +88,3 @@ as comments in the code. \set Score.beatGrouping = #'(3 4 2 3) a16 a a a a a a a a a a a } - diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly index 8511946a44..8193762123 100644 --- a/input/lsr/using-double-slurs-for-legato-chords.ly +++ b/input/lsr/using-double-slurs-for-legato-chords.ly @@ -33,3 +33,4 @@ be achieved by setting @code{doubleSlurs}. \set doubleSlurs = ##t 4( ) } + diff --git a/input/lsr/using-grace-note-slashes-with-normal-heads.ly b/input/lsr/using-grace-note-slashes-with-normal-heads.ly index e33cfab708..50be0997aa 100644 --- a/input/lsr/using-grace-note-slashes-with-normal-heads.ly +++ b/input/lsr/using-grace-note-slashes-with-normal-heads.ly @@ -27,3 +27,4 @@ other situations. \override Stem #'stroke-style = #"grace" c8( d2) e8( f4) } + diff --git a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly index 8f43a3c947..68fd252ce1 100644 --- a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly +++ b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly @@ -49,3 +49,4 @@ normalNoteHeads = \revert NoteHead #'stencil 4 d } + diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index ac09b8c267..9a218f1501 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,17 +1,18 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { lsrtags = "tweaks-and-overrides" + texidoc = " -With the @code{\\tweak} command, every grob can be tuned directly. Here -are some examples of available tweaks. +With the @code{\\tweak} command, every grob can be tuned directly. +Here are some examples of available tweaks. + " - doctitle = "Using the @code{\\tweak} command to tweak individual grobs" + doctitle = "Using the \\tweak command to tweak individual grobs" } % begin verbatim - \relative c' { \time 2/4 \set fingeringOrientations = #'(right) @@ -22,3 +23,4 @@ are some examples of available tweaks. \tweak #'duration-log #2 a >2 } + diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly index e8d5d578df..e1e0af6fc6 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -62,3 +62,4 @@ can also be used for ordinary consecutive notes. \tieDotted g8 ~ c g2 } + diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly index ee9e28b4da..618719061d 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,8 +1,23 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" +\header { + lsrtags = "text" + + texidoc = " +Various scripts may be used for texts (like titles and lyrics) by +entering them in UTF-8 encoding, and using a Pango based backend. +Depending on the fonts installed, this fragment will render Bulgarian +(Cyrillic), Hebrew, Japanese and Portuguese. + +" + doctitle = "UTF-8" +} % begin verbatim + +% end verbatim - this comment is a hack to prevent texinfo.tex +% from choking on non-European UTF-8 subsets + %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs %{ @@ -19,21 +34,8 @@ Debian GNU/Linux apt-get install emacs-intl-fonts xfonts-intl-.* \ ttf-kochi-gothic ttf-kochi-mincho \ xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi -%} - -\header { - lsrtags = "text" - texidoc = "Various scripts may be used for texts (like titles and -lyrics) by entering them in UTF-8 encoding, and using a Pango based -backend. Depending on the fonts installed, this fragment will -render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. -" - doctitle = "UTF-8" -} % begin verbatim - +%} -% end verbatim - this comment is a hack to prevent texinfo.tex -% from choking on non-European UTF-8 subsets % Cyrillic font bulgarian = \lyricmode { Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly index b890f83d9e..43ae0ea49d 100644 --- a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly @@ -60,3 +60,4 @@ music = \relative c'' { \override TextScript #'Y-extent = #'(-1.5 . 1.5) \music } + diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly index 5bf7db21d1..2d0dc14ea5 100644 --- a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly +++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly @@ -31,3 +31,4 @@ of the @code{DynamicLineSpanner} object. c2\p f\mf g2\< b4\> c\! } + diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index 0e89fb7826..1678a54895 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -60,3 +60,4 @@ positioning of lyrics and ossias. >> } >> + diff --git a/input/lsr/vertically-centered-common-lyrics.ly b/input/lsr/vertically-centered-common-lyrics.ly index f96a20d469..b191d44c05 100644 --- a/input/lsr/vertically-centered-common-lyrics.ly +++ b/input/lsr/vertically-centered-common-lyrics.ly @@ -53,3 +53,4 @@ melody = \relative c' { c4 d e f g f e8( e f) d4 c e d c } \new Lyrics \lyricsto m \lyricsD >> } + diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly index 9136acd92c..ec20bbe012 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -124,3 +124,4 @@ bassWords = \lyricmode { } } } + diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index 4e0c53497f..d5cbedb324 100644 --- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -101,3 +101,4 @@ bassWords = \lyricmode { } } } + diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index ed4cf11547..9ecf40af53 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -115,3 +115,4 @@ bassWords = \lyricmode { } } } + diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly index 128cae488b..74e88222b0 100644 --- a/input/lsr/volta-below-chords.ly +++ b/input/lsr/volta-below-chords.ly @@ -1,8 +1,10 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { + lsrtags = "repeats, staff-notation, chords" + %% Translation of GIT committish: 7e2910d2bc6167b10cfe328eb17a5f710f2a515a texidoces = " Mediante la adición del grabador @code{Volta_engraver} al @@ -22,12 +24,13 @@ werden. " doctitlede = "Wiederholungs-(Volta-)Klammern unterhalb der Akkordsymbole" - lsrtags = "repeats,staff-notation,chords" - texidoc = "By adding the @code{Volta_engraver} to the relevant -staff, volte can be put under chords." - doctitle = "Volta under chords" -} % begin verbatim + texidoc = " +By adding the @code{Volta_engraver} to the relevant staff, volte can be +put under chords. +" + doctitle = "Volta below chords" +} % begin verbatim \score { << diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index ce3b79a213..c0d7e752b6 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,15 +1,17 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" + \header { - lsrtags = "repeats,staff-notation" - texidoc = "By adding the @code{Volta_engraver} to the relevant -staff, volte can be put over staves other than the topmost -one in a score." - doctitle = "Volta multi-staff" -} % begin verbatim + lsrtags = "repeats, staff-notation" + texidoc = " +By adding the @code{Volta_engraver} to the relevant staff, volte can be +put over staves other than the topmost one in a score. + +" + doctitle = "Volta multi staff" +} % begin verbatim voltaMusic = \relative c'' { \repeat volta 2 { diff --git a/input/lsr/volta-text-markup-using-repeatcommands.ly b/input/lsr/volta-text-markup-using-repeatcommands.ly index e46f35edc5..5f725fed88 100644 --- a/input/lsr/volta-text-markup-using-repeatcommands.ly +++ b/input/lsr/volta-text-markup-using-repeatcommands.ly @@ -1,23 +1,24 @@ -%% Do not edit this file; it is auto-generated from input/new +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -%% Note: this file works from version 2.12.0 \version "2.13.1" \header { - lsrtags = "repeats" - texidoc = "Though volte are best specified using -@code{\\repeat volta}, the context property @code{repeatCommands} -must be used in cases where the volta text needs more advanced -formatting with @code{\\markup}. + lsrtags = "repeats, text" + + texidoc = " +Though volte are best specified using @code{\\repeat volta}, the +context property @code{repeatCommands} must be used in cases where the +volta text needs more advanced formatting with @code{\\markup}. Since @code{repeatCommands} takes a list, the simplest method of -including markup is to use an identifier for the text and embed -it in the command list using the Scheme syntax -@w{@code{#(list (list 'volta textIdentifier))}}. Start- and -end-repeat commands can be added as separate list elements:" -doctitle = "Volta text markup using @code{repeatCommands}" -} % begin verbatim +including markup is to use an identifier for the text and embed it in +the command list using the Scheme syntax @code{#(list (list 'volta +textIdentifier))}. Start- and end-repeat commands can be added as +separate list elements: +" + doctitle = "Volta text markup using repeatCommands" +} % begin verbatim voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } } diff --git a/input/new/non-default-tuplet-numbers.ly b/input/new/non-default-tuplet-numbers.ly index 29b109c310..c72ee01b72 100644 --- a/input/new/non-default-tuplet-numbers.ly +++ b/input/new/non-default-tuplet-numbers.ly @@ -12,21 +12,30 @@ number or tuplet fraction. } \relative c'' { - \once \override TupletNumber #'text = #(tuplet-number::non-default-tuplet-denominator-text 7) + \once \override TupletNumber #'text = + #(tuplet-number::non-default-tuplet-denominator-text 7) \times 2/3 { c4. c4. c4. c4. } - \once \override TupletNumber #'text = #(tuplet-number::non-default-tuplet-fraction-text 12 7) + \once \override TupletNumber #'text = + #(tuplet-number::non-default-tuplet-fraction-text 12 7) \times 2/3 { c4. c4. c4. c4. } \once \override TupletNumber #'text = - #(tuplet-number::append-note-wrapper (tuplet-number::non-default-tuplet-fraction-text 12 7) "8") + #(tuplet-number::append-note-wrapper + (tuplet-number::non-default-tuplet-fraction-text 12 7) "8") \times 2/3 { c4. c4. c4. c4. } - \once \override TupletNumber #'text = #(tuplet-number::append-note-wrapper tuplet-number::calc-denominator-text "4") + \once \override TupletNumber #'text = + #(tuplet-number::append-note-wrapper + tuplet-number::calc-denominator-text "4") \times 2/3 { c8 c8 c8 c8 c8 c8 } - \once \override TupletNumber #'text = #(tuplet-number::append-note-wrapper tuplet-number::calc-fraction-text "4") + \once \override TupletNumber #'text = + #(tuplet-number::append-note-wrapper + tuplet-number::calc-fraction-text "4") \times 2/3 { c8 c8 c8 c8 c8 c8 } - \once \override TupletNumber #'text = #(tuplet-number::fraction-with-notes "4." "8") + \once \override TupletNumber #'text = + #(tuplet-number::fraction-with-notes "4." "8") \times 2/3 { c4. c4. c4. c4. } - \once \override TupletNumber #'text = #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4") + \once \override TupletNumber #'text = + #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4") \times 2/3 { c4. c4. c4. c4. } } diff --git a/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc b/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc new file mode 100644 index 0000000000..b88362d6ba --- /dev/null +++ b/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc @@ -0,0 +1,16 @@ +%% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 + texidoces = " +La sintaxis de LilyPond puede implicar muchas colocaciones poco +comunes para los paréntesis, corchetes, etc, que a veces se tienen +que intercalar. Por ejemplo, al introducir una barra manual, el +corchete izquierdo de apertura se debe escribir después de la nota +inicial y de su duración, no antes. De forma similar, el corchete +derecho de cierre debe seguir inmediatamente a la nota que se +quiere situar al final del barrado, incluso si esta nota resulta +estar dentro de un grupo de valoración especial. Este fragmento de +código muestra cómo combinar el barrado manual, las ligaduras de +expresión y de unión y las ligaduras de fraseo, con secciones de +valoración especial (encerradas entre llaves). + +" + doctitlees = "Añadir barras, ligaduras de expresión y de unión, etc. cuando se usan ritmos con y sin grupos de valoración especial." diff --git a/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..texidoc b/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..texidoc deleted file mode 100644 index b88362d6ba..0000000000 --- a/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..texidoc +++ /dev/null @@ -1,16 +0,0 @@ -%% Translation of GIT committish: dff50e8e1d3134657a6b6203b9c93826dc4cef65 - texidoces = " -La sintaxis de LilyPond puede implicar muchas colocaciones poco -comunes para los paréntesis, corchetes, etc, que a veces se tienen -que intercalar. Por ejemplo, al introducir una barra manual, el -corchete izquierdo de apertura se debe escribir después de la nota -inicial y de su duración, no antes. De forma similar, el corchete -derecho de cierre debe seguir inmediatamente a la nota que se -quiere situar al final del barrado, incluso si esta nota resulta -estar dentro de un grupo de valoración especial. Este fragmento de -código muestra cómo combinar el barrado manual, las ligaduras de -expresión y de unión y las ligaduras de fraseo, con secciones de -valoración especial (encerradas entre llaves). - -" - doctitlees = "Añadir barras, ligaduras de expresión y de unión, etc. cuando se usan ritmos con y sin grupos de valoración especial." diff --git a/input/texidocs/changing-form-of-multi--measure-rests.texidoc b/input/texidocs/changing-form-of-multi--measure-rests.texidoc deleted file mode 100644 index 8d731cb99d..0000000000 --- a/input/texidocs/changing-form-of-multi--measure-rests.texidoc +++ /dev/null @@ -1,31 +0,0 @@ -%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc - doctitlees = "Cambiar la forma de los silencios multicompás" - texidoces = " -Si hay diez compases de silencio o menos, se imprime en el pentagrama -una serie de silencios de breve y longa (conocidos en alemán como -\"Kirchenpausen\", «silencios eclesiásticos»); en caso contrario se -muestra una barra normal. Este número predeterminado de diez se -puede cambiar sobreescribiendo la propiedad @code{expand-limit}: - -" - -%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 - texidocde = " -Wenn zehn oder weniger Pausentakte vorkommen, wird eine Reihe von Longa- -und Brevispausen (auch Kirchenpausen genannt) gesetzt, bei mehr Takten -wird eine Line mit der Taktanzahl ausgegeben. Der vorgegebene Wert von -zehn kann geändert werden, indem man die @code{expand-limit}-Eigenschaft -setzt: -" - doctitlede = "Die Erscheinung von Pausentakten ändern" - - -%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df -texidocfr = " -Dans le cas où ce silence dure mois de dix mesures, LilyPond imprime sur -la portée des @qq{ silences d'église } -- @emph{Kirchenpause} en -allemand -- et qui sont une simple suite de rectangles. La propriété -@code{expand-limit} permet d'obtenir un silence unique : - -" - doctitlefr = "Modifier l'apparence d'un silence multi-mesures" diff --git a/input/texidocs/changing-form-of-multi-measure-rests.texidoc b/input/texidocs/changing-form-of-multi-measure-rests.texidoc new file mode 100644 index 0000000000..8d731cb99d --- /dev/null +++ b/input/texidocs/changing-form-of-multi-measure-rests.texidoc @@ -0,0 +1,31 @@ +%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc + doctitlees = "Cambiar la forma de los silencios multicompás" + texidoces = " +Si hay diez compases de silencio o menos, se imprime en el pentagrama +una serie de silencios de breve y longa (conocidos en alemán como +\"Kirchenpausen\", «silencios eclesiásticos»); en caso contrario se +muestra una barra normal. Este número predeterminado de diez se +puede cambiar sobreescribiendo la propiedad @code{expand-limit}: + +" + +%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 + texidocde = " +Wenn zehn oder weniger Pausentakte vorkommen, wird eine Reihe von Longa- +und Brevispausen (auch Kirchenpausen genannt) gesetzt, bei mehr Takten +wird eine Line mit der Taktanzahl ausgegeben. Der vorgegebene Wert von +zehn kann geändert werden, indem man die @code{expand-limit}-Eigenschaft +setzt: +" + doctitlede = "Die Erscheinung von Pausentakten ändern" + + +%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df +texidocfr = " +Dans le cas où ce silence dure mois de dix mesures, LilyPond imprime sur +la portée des @qq{ silences d'église } -- @emph{Kirchenpause} en +allemand -- et qui sont une simple suite de rectangles. La propriété +@code{expand-limit} permet d'obtenir un silence unique : + +" + doctitlefr = "Modifier l'apparence d'un silence multi-mesures" diff --git a/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc b/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc new file mode 100644 index 0000000000..201ff812e9 --- /dev/null +++ b/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc @@ -0,0 +1,14 @@ +%% Translation of GIT committish: f39a9724d9f51ed9d0d464689ef62f549d7b8dd6 + texidoces = " +La propiedad @code{measureLength}, junto con +@code{measurePosition}, determina cuándo es necesario dibujar una +línea divisoria. Sin embargo, al utilizar +@code{\\scaleDurations}, el escalado proporcional de las +duraciones hace difícil introducir cambios de compás. En este +caso se debe establecer manualmente el valor de +@code{measureLength} utilizando la función @code{ly:make-moment}. +El segundo argumento debe ser el mismo que el segundo argumento de +@code{\\scaleDurations}. + +" + doctitlees = "Modificar el compás dentro de una sección polimétrica utilizando @code{\\scaleDurations}" diff --git a/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.texidoc b/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.texidoc deleted file mode 100644 index 201ff812e9..0000000000 --- a/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.texidoc +++ /dev/null @@ -1,14 +0,0 @@ -%% Translation of GIT committish: f39a9724d9f51ed9d0d464689ef62f549d7b8dd6 - texidoces = " -La propiedad @code{measureLength}, junto con -@code{measurePosition}, determina cuándo es necesario dibujar una -línea divisoria. Sin embargo, al utilizar -@code{\\scaleDurations}, el escalado proporcional de las -duraciones hace difícil introducir cambios de compás. En este -caso se debe establecer manualmente el valor de -@code{measureLength} utilizando la función @code{ly:make-moment}. -El segundo argumento debe ser el mismo que el segundo argumento de -@code{\\scaleDurations}. - -" - doctitlees = "Modificar el compás dentro de una sección polimétrica utilizando @code{\\scaleDurations}" diff --git a/input/texidocs/orchestra,-choir-and-piano-template.texidoc b/input/texidocs/orchestra,-choir-and-piano-template.texidoc new file mode 100644 index 0000000000..e706a18b7b --- /dev/null +++ b/input/texidocs/orchestra,-choir-and-piano-template.texidoc @@ -0,0 +1,13 @@ +%% Translation of GIT committish: 632d908ee4b36bc84b6f3b15e392040dc9b10dbb + texidoces = " + +Esta plantilla muestra el uso de contextos @code{StaffGroup} y +@code{GrandStaff} anidados para sub-agrupar instrumentos del mismo +tipo, y el uso de @code{\\transpose} para los instrumentos +transpositores. Toda la música que está dentro de variables se +almacena en Do. La música se puede introducir en Do, o (de forma +alternativa) escribirse en el tono del instrumento y transportada +a Do antes de ser asignada a una variable. + +" + doctitlees = "Plantilla de orquesta, coro y piano" diff --git a/input/texidocs/orchestra-choir-and-piano-template.texidoc b/input/texidocs/orchestra-choir-and-piano-template.texidoc deleted file mode 100644 index e706a18b7b..0000000000 --- a/input/texidocs/orchestra-choir-and-piano-template.texidoc +++ /dev/null @@ -1,13 +0,0 @@ -%% Translation of GIT committish: 632d908ee4b36bc84b6f3b15e392040dc9b10dbb - texidoces = " - -Esta plantilla muestra el uso de contextos @code{StaffGroup} y -@code{GrandStaff} anidados para sub-agrupar instrumentos del mismo -tipo, y el uso de @code{\\transpose} para los instrumentos -transpositores. Toda la música que está dentro de variables se -almacena en Do. La música se puede introducir en Do, o (de forma -alternativa) escribirse en el tono del instrumento y transportada -a Do antes de ser asignada a una variable. - -" - doctitlees = "Plantilla de orquesta, coro y piano" diff --git a/input/texidocs/positioning-multi--measure-rests.texidoc b/input/texidocs/positioning-multi--measure-rests.texidoc deleted file mode 100644 index f2191c963d..0000000000 --- a/input/texidocs/positioning-multi--measure-rests.texidoc +++ /dev/null @@ -1,35 +0,0 @@ -%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc - doctitlees = "Posicionar los silencios multicompás" - texidoces = " -A diferencia de los silencios normales, no existe una instrucción -predefinida para modificar la posición predefinida de un símbolo -multicompás sobre el pentagrama, adjuntándolo a una nota, -independientemente de cuál sea su forma. Sin embargo, en la música -polifónica los silencios multicompás de las voces de numeración par e -impar están separados verticalmente. La colocación de los silencios -multicompás se puede controlar como se ve a continuación: - -" -%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 - -texidocde = " -Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die -vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an -eine Tonhöhe anhängt. In polyphoner Notation wird aber dennoch die -Position der Pausen von geraden und ungeraden Stimmen voneinander -unterschieden. Die Position von Ganztaktpausen kann wie folgt verändert -werden: - " - doctitlede = "Positionierung von Ganztaktpausen" - - -%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df - texidocfr = " -Si l'on peut positionner verticalement un silence simple en le -rattachant à une note, il n'en va pas de même pur un silence -multi-mesure. Néanmoins, et uniquement dans le cadre de musique -polyphonique, les silences multi-mesures sont positionnées différemment -selon qu'ils appartiennent à une voix au numéro pair ou impair. Le -positionnement des silences multi-mesures peut se contrôler ainsi : -" - doctitlefr = "Positionnement des silences multi-mesures" diff --git a/input/texidocs/positioning-multi-measure-rests.texidoc b/input/texidocs/positioning-multi-measure-rests.texidoc new file mode 100644 index 0000000000..f2191c963d --- /dev/null +++ b/input/texidocs/positioning-multi-measure-rests.texidoc @@ -0,0 +1,35 @@ +%% Translation of GIT committish: a634a20e0ab2a874ff8bf423e5651139df8733fc + doctitlees = "Posicionar los silencios multicompás" + texidoces = " +A diferencia de los silencios normales, no existe una instrucción +predefinida para modificar la posición predefinida de un símbolo +multicompás sobre el pentagrama, adjuntándolo a una nota, +independientemente de cuál sea su forma. Sin embargo, en la música +polifónica los silencios multicompás de las voces de numeración par e +impar están separados verticalmente. La colocación de los silencios +multicompás se puede controlar como se ve a continuación: + +" +%% Translation of GIT committish: b4f6b5ad66d016c312cddc8d4026ad852f9a7c36 + +texidocde = " +Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die +vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an +eine Tonhöhe anhängt. In polyphoner Notation wird aber dennoch die +Position der Pausen von geraden und ungeraden Stimmen voneinander +unterschieden. Die Position von Ganztaktpausen kann wie folgt verändert +werden: + " + doctitlede = "Positionierung von Ganztaktpausen" + + +%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df + texidocfr = " +Si l'on peut positionner verticalement un silence simple en le +rattachant à une note, il n'en va pas de même pur un silence +multi-mesure. Néanmoins, et uniquement dans le cadre de musique +polyphonique, les silences multi-mesures sont positionnées différemment +selon qu'ils appartiennent à une voix au numéro pair ou impair. Le +positionnement des silences multi-mesures peut se contrôler ainsi : +" + doctitlefr = "Positionnement des silences multi-mesures"