From: Neil Puttock Date: Sat, 25 Jul 2009 11:12:02 +0000 (+0100) Subject: LSR: Update. X-Git-Tag: release/2.12.3-1~12 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=fb09f28821ce6ce66ec508ddaa8c9320d2813695;p=lilypond.git LSR: Update. --- diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely index 0583c27c6e..80aa9662ba 100644 --- a/Documentation/de/user/rhythms.itely +++ b/Documentation/de/user/rhythms.itely @@ -846,38 +846,17 @@ 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 -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: - -@lilypond[quote,verbatim,relative=2] -\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 -@end lilypond +@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +{multi-measure-rest-markup.ly} -@noindent -Note that the spacer rest causes a bar 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. @seealso Glossar: diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely index 0733e654ed..9772477f46 100644 --- a/Documentation/es/user/rhythms.itely +++ b/Documentation/es/user/rhythms.itely @@ -849,16 +849,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/user/rhythms.itely b/Documentation/user/rhythms.itely index 828fc27857..da9a8a3245 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -822,16 +822,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/input/lsr/accordion-discant-symbols.ly b/input/lsr/accordion-discant-symbols.ly index c89e78f9ea..bb5e08360e 100644 --- a/input/lsr/accordion-discant-symbols.ly +++ b/input/lsr/accordion-discant-symbols.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "keyboards" @@ -190,3 +190,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 7ab5021104..025435740b 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords, ancient-notation, contexts-and-engravers" @@ -38,19 +38,26 @@ to the whole score. doctitle = "Adding a figured bass above or below the notes" } % begin verbatim -bass = { \clef bass g4 b, c d e d8 c d2} +bass = { + \clef bass + g4 b, c d + e d8 c d2 +} continuo = \figuremode { - < _ >4 < 6 >8 - \once \override Staff.BassFigureAlignmentPositioning #'direction = #CENTER - <5/> < _ >4 - \override Staff.BassFigureAlignmentPositioning #'direction = #UP - < _+ > < 6 > - \set Staff.useBassFigureExtenders = ##t - \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN - < 4 >4. < 4 >8 < _+ >4 - } + <_>4 <6>8 + \once \override Staff.BassFigureAlignmentPositioning #'direction = #CENTER + <5/>8 <_>4 + \override Staff.BassFigureAlignmentPositioning #'direction = #UP + <_+>4 <6> + \set Staff.useBassFigureExtenders = ##t + \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN + <4>4. <4>8 <_+>4 +} \score { - << \new Staff = bassStaff \bass - \context Staff = bassStaff \continuo >> + << + \new Staff = bassStaff \bass + \context Staff = bassStaff \continuo + >> } + diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index 419d857959..3e0dcb4464 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches, staff-notation, vocal-music" @@ -44,3 +44,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 129ab0cbd5..56bb6baf53 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, contexts-and-engravers, breaks" @@ -21,7 +21,7 @@ compás (véase el ejemplo). texidoc = " When adding a new staff at a line break, some extra space is unfortunately added at the end of the line before the break (to fit in -a key signature change, which will never be printed anyway). The +a key signature change, which will never be printed anyway). The workaround is to add a setting of @code{Staff.explicitKeySignatureVisibility} as is shown in the example. In versions 2.10 and earlier, a similar setting for the time signatures @@ -38,23 +38,24 @@ is also required (see the example). \new Staff \key f \major c1 c^"Unwanted extra space" \break - << { c1 c } + << { c1 | c } \new Staff { \key f \major \once \override Staff.TimeSignature #'stencil = ##f - c1 c + c1 | c } >> - c1 c^"Fixed here" \break - << { c1 c } + c1 | c^"Fixed here" \break + << { c1 | c } \new Staff { \once \set Staff.explicitKeySignatureVisibility = #end-of-line-invisible % The next line is not needed in 2.11.x or later: \once \override Staff.TimeSignature #'break-visibility = #end-of-line-invisible \key f \major \once \override Staff.TimeSignature #'stencil = ##f - c1 c + c1 | c } >> } } + diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index f289584576..cbdafda5e6 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, contexts-and-engravers" @@ -22,13 +22,18 @@ piece. \score { << - \new Staff \relative c'' { c1 c c c c } + \new Staff \relative c'' { c1 | c | c | c | c } \new StaffGroup \relative c'' { \new Staff { - c1 c - << c1 \new Staff { \once \override Staff.TimeSignature #'stencil = ##f c1 } >> - c + c1 | c << + c1 \new Staff { + \once \override Staff.TimeSignature #'stencil = ##f + c1 + } + >> + c1 } } >> } + diff --git a/input/lsr/adding-bar-lines-to-chordnames-context.ly b/input/lsr/adding-bar-lines-to-chordnames-context.ly index a28ffda079..c29a3eacd5 100644 --- a/input/lsr/adding-bar-lines-to-chordnames-context.ly +++ b/input/lsr/adding-bar-lines-to-chordnames-context.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -29,3 +29,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..c794480c20 --- /dev/null +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly @@ -0,0 +1,46 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, expressive-marks" + + 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 6bdbc5fe1b..0000000000 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ /dev/null @@ -1,45 +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.12.0" - -\header { - lsrtags = "rhythms, expressive-marks" - - 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 80aeac3c94..d55dc980f7 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, percussion" @@ -71,3 +71,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 5d2e7f0bbb..422b1c5fd2 100644 --- a/input/lsr/adding-fingerings-to-a-score.ly +++ b/input/lsr/adding-fingerings-to-a-score.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, fretted-strings" @@ -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 ebb28b6979..468fad55e8 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -44,3 +44,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 baf329d475..9ed6baf65e 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -29,3 +29,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 fed821a5b3..aa62a4a373 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -1,9 +1,9 @@ %% 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.12.0" +\version "2.12.3" \header { - lsrtags = "titles" + lsrtags = "text, titles" texidoces = " Con algo de código de Scheme, se puede añadir fácilmente la fecha @@ -44,3 +44,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 4425c6709d..c615480a7f 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats" @@ -33,3 +33,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 e406cdc4ca..32eb654aad 100644 --- a/input/lsr/additional-voices-to-avoid-collisions.ly +++ b/input/lsr/additional-voices-to-avoid-collisions.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes" @@ -50,3 +50,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 7e2aa72d20..db1c17cbb3 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, vocal-music, spacing" @@ -50,3 +50,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 b82a86910f..a0f5f2a824 100644 --- a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly +++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -36,3 +36,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 0a67d32d7c..c791cf0c4d 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "text, paper-and-layout, titles" + texidoces = " Los nombres de instrumento se imprimen generalmente a la izquierda de los pentagramas. Para alinear los nombres de varios instrumentos @@ -27,16 +29,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 new file mode 100644 index 0000000000..f1d171c3bc --- /dev/null +++ b/input/lsr/aligning-bar-numbers.ly @@ -0,0 +1,33 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.12.3" + +\header { + lsrtags = "rhythms" + + texidoc = " +Bar numbers by default are right-aligned to their parent object. This +is usually the left edge of a line or, if numbers are printed within a +line, the left hand side of a bar line. The numbers may also be +positioned directly over the bar line or left-aligned to the bar line. + +" + doctitle = "Aligning bar numbers" +} % begin verbatim + +\relative c' { + \set Score.currentBarNumber = #111 + \override Score.BarNumber #'break-visibility = #'#(#t #t #t) + % Increase the size of the bar number by 2 + \override Score.BarNumber #'font-size = #2 + % Print a bar number every second measure + \set Score.barNumberVisibility = #(every-nth-bar-number-visible 2) + c1 | c1 + % Center-align bar numbers + \override Score.BarNumber #'self-alignment-X = #CENTER + c1 | c1 + % Left-align bar numbers + \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 f96a8ad0fe..40a4c11e50 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "text" + texidoces = " Si están especificadas, las marcas de texto se pueden alinear con objetos de notación distintos a las líneas divisorias. Entre estos @@ -18,21 +20,26 @@ debe hacer este ajuste para todos los pentagramas). " doctitlees = "Alinear marcas con varios objetos de notación" - 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 new file mode 100644 index 0000000000..8cd5b58c2a --- /dev/null +++ b/input/lsr/aligning-objects-created-with-the--mark-command.ly @@ -0,0 +1,28 @@ +%% 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.12.3" + +\header { + lsrtags = "text" + + texidoc = " +By default the @code{\\mark} command centers objects over a bar line. +This behavior can be modified to align at right or left. + +" + doctitle = "Aligning objects created with the \\mark command" +} % begin verbatim + +\relative c' { + c1 \mark "(Center)" + c1 + \once \override Score.RehearsalMark #'self-alignment-X = #LEFT + \mark "(Left)" + c4 c c c + c4 c c c + \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT + \mark "(Right)" + 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 08bfb23c84..30b4e02a5f 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, fretted-strings, spacing" @@ -13,6 +13,13 @@ cancelar. " doctitlees = "Permitir que las digitaciones se impriman dentro del pentagrama" +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + texidocfr = " +L'empilement des indications de doigté se fait par défaut à l'extérieur de la portée. Néanmoins, il est possible d'annuler ce comportement. + +" + doctitlefr = "Impression des doigtés à l'intérieur de la portée" + texidoc = " By default, vertically oriented fingerings are positioned outside the staff. However, this behavior can be canceled. @@ -26,3 +33,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 91a3e295f5..4477c8e60c 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches, vocal-music" @@ -45,3 +45,4 @@ voices. } >> + diff --git a/input/lsr/ambitus.ly b/input/lsr/ambitus.ly index ce6457e4f1..6d343008f0 100644 --- a/input/lsr/ambitus.ly +++ b/input/lsr/ambitus.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches, vocal-music" @@ -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 283078d0a4..ad9000d305 100644 --- a/input/lsr/analysis-brackets-above-the-staff.ly +++ b/input/lsr/analysis-brackets-above-the-staff.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, tweaks-and-overrides" @@ -33,3 +33,4 @@ staff instead. c2\startGroup d2\stopGroup } + diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index a175e5936f..326a1928fd 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "ancient-notation" @@ -241,3 +241,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 c4c313a526..3748eec84d 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "ancient-notation, template" @@ -67,3 +67,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 d0d09ef503..a5daa4c980 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "ancient-notation, template" @@ -286,3 +286,4 @@ bassusLyrics = \lyricmode { + diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list index 8dabc7f59b..79f96b4454 100644 --- a/input/lsr/ancient-notation.snippet-list +++ b/input/lsr/ancient-notation.snippet-list @@ -9,3 +9,4 @@ incipit.ly mensurstriche-layout-bar-lines-between-the-staves.ly rest-styles.ly transcription-of-ancient-music-with-incipit.ly +vertical-line-as-a-baroque-articulation-mark.ly diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index e98c716c0a..6afc8df5f6 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "ancient-notation" @@ -24,3 +24,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 2935c977a3..a6b1c24f87 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches, editorial-annotations" @@ -90,10 +90,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 823823feda..d2d012b18d 100644 --- a/input/lsr/arabic-improvisation.ly +++ b/input/lsr/arabic-improvisation.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "world-music" + texidoces = " Para las improvisaciones o @emph{taqasim} que son libres durante unos momentos, se puede omitir la indicación de compás y se puede usar @@ -14,16 +16,16 @@ cómo podría ser el comienzo de una improvisación @emph{hijaz}: " doctitlees = "Improvisación de música árabe" - 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 22fc8f0bf1..e30e47d6f7 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -44,3 +44,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 deleted file mode 100644 index 6d4cbc3a6e..0000000000 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ /dev/null @@ -1,67 +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.12.0" - -\header { - lsrtags = "rhythms" - - texidoces = " -En un compás sencillo como 2/2 ó 4/4, las corcheas se barran de forma -predeterminada como dos grupos de cuatro. - -Utilizando un macro que seobreescribe el comportamiento automático del -barrado, este fragmento de código cambia el barrado a pulsos de negra. - -" - doctitlees = "Barras automáticas de dos en dos en los compases de 4/4 o de 2/2" - - texidoc = " -In a simple time signature of 2/2 or 4/4, 8th notes are beamed by -default as two sets of four. - -Using a macro which overrides the autobeaming behavior, this snippet -changes the beaming to quarter note beats. - -" - doctitle = "Automatic beams two per two in 4/4 or 2/2 time signature" -} % begin verbatim - -% Automatic beams two per two in 4/4 or 2/2 time signature -% _____ -% Default | | | | -% _ _ -% Required | | | | - -% macro for beamed two per two in 2/2 and 4/4 time signature -qBeam = { - #(override-auto-beam-setting '(end 1 8 * *) 1 4 'Staff) - #(override-auto-beam-setting '(end 1 8 * *) 2 4 'Staff) - #(override-auto-beam-setting '(end 1 8 * *) 3 4 'Staff) -} - -\score { - << - \new Staff { - \relative c'' { - \time 4/4 - g8-"without the macro" g g g g g g g - g8 g g g4 g8 g g - } - } - %Use the macro - \new Staff { - \relative c'' { - \time 4/4 - \qBeam - g8-"with the macro" g g g g g g g - g8 g g g4 g8 g g - } - } - >> - \layout { - \context { - \Staff - \override TimeSignature #'style = #'() - } - } -} diff --git a/input/lsr/avoiding-collisions-with-chord-fingerings.ly b/input/lsr/avoiding-collisions-with-chord-fingerings.ly index 4ce809423a..b0c4377ec9 100644 --- a/input/lsr/avoiding-collisions-with-chord-fingerings.ly +++ b/input/lsr/avoiding-collisions-with-chord-fingerings.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides" @@ -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 28aefed6fa..7f3b7d5d84 100644 --- a/input/lsr/beam-endings-in-score-context.ly +++ b/input/lsr/beam-endings-in-score-context.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -56,3 +56,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 d31487662e..cba44312f6 100644 --- a/input/lsr/beam-grouping-in-7-8-time.ly +++ b/input/lsr/beam-grouping-in-7-8-time.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -43,3 +43,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 72655a3c5d..dd4906380e 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -36,3 +36,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 fd7e5cea83..6bc53fbba7 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, text" @@ -29,3 +29,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 ebec6023e5..cdb4ea7c91 100644 --- a/input/lsr/book-parts.ly +++ b/input/lsr/book-parts.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. -\version "2.12.0" +\version "2.12.3" \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-bottom-last}. -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 513dbfb378..c6ce245f7e 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index 4cc3216d2d..5e83a9f2eb 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "expressive-marks" + texidoces = " Para hacer invisibles partes de un regulador de crescendo, se usa el método de dibujar un rectángulo blanco encima de la parte @@ -25,27 +27,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 4de19c7842..b364fecc42 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index a88f2aa24b..d0c7d200f1 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "expressive-marks, text" + texidoces = " Este ejemplo proporciona una función para tipografiar un regulador con texto por debajo, como \"molto\" o \"poco\". El ejemplo @@ -12,18 +14,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?) #{ @@ -41,7 +41,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 06cc98f352..1a3fcffdc9 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, unfretted-strings" @@ -34,3 +34,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 24ff68630b..699b90bf78 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides" @@ -35,7 +35,7 @@ notehead). doctitle = "Changing a single note's size in a chord" } % begin verbatim -\layout { ragged-right = ##t } \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 0ada10784b..3eb75d403b 100644 --- a/input/lsr/changing-beam-knee-gap.ly +++ b/input/lsr/changing-beam-knee-gap.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -49,3 +49,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 8bd86dab51..d21e310c8a 100644 --- a/input/lsr/changing-chord-separator.ly +++ b/input/lsr/changing-chord-separator.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -26,3 +26,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 14e8b6eee0..0000000000 --- a/input/lsr/changing-form-of-multi--measure-rests.ly +++ /dev/null @@ -1,41 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -\version "2.12.0" -\header { - 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}: - -" - -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" - - 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..64e437c152 --- /dev/null +++ b/input/lsr/changing-form-of-multi-measure-rests.ly @@ -0,0 +1,43 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + 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}: + +" + +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" + + 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 748bf2c2e6..f3153cd539 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "contexts-and-engravers, midi" @@ -75,3 +75,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 1963230ea0..2d4070b21a 100644 --- a/input/lsr/changing-partcombine-texts.ly +++ b/input/lsr/changing-partcombine-texts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes" @@ -35,3 +35,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 129c8fc9b4..b58c52be20 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,26 +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. -\version "2.12.0" +\version "2.12.3" \header { lsrtags = "tweaks-and-overrides" 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 @@ -29,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 9d706bd94e..37ec4291a3 100644 --- a/input/lsr/changing-stanza-fonts.ly +++ b/input/lsr/changing-stanza-fonts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music" @@ -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 adb48b0850..80cc0c2490 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,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "expressive-marks" + texidoces = " Se puede modificar el texto empleado para los crescendos y decrescendos modificando las propiedades de contexto @@ -28,20 +31,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 99f64e2d33..d0a052d4e1 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, editorial-annotations" @@ -31,3 +31,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-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly index c9db86ef07..8373898c94 100644 --- a/input/lsr/changing-the-breath-mark-symbol.ly +++ b/input/lsr/changing-the-breath-mark-symbol.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" 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 c61781337c..90437311bd 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -52,3 +52,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 d73371c642..41876c7154 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, tweaks-and-overrides" @@ -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 e2fdedc293..9cf365905d 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation" @@ -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 79e9d2e31b..860dde68f5 100644 --- a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly +++ b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -32,3 +32,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 a699f9ee6b..b4ed717b42 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout" @@ -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 b3a1c31a63..7053b577ae 100644 --- a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly +++ b/input/lsr/changing-the-tempo-without-a-metronome-mark.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "staff-notation, midi" + texidoces = " Para cambiar el tempo en la salida MIDI sin imprimir nada, hacemos invisible la indicación metronómica: @@ -11,14 +13,14 @@ imprimir nada, hacemos invisible la indicación metronómica: doctitlees = "Cambiar el tempo sin indicación metronómica" - 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 ac62f3aa72..615c355259 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -41,3 +41,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 3e74c2921e..ca86f5297f 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -44,3 +44,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..2e2eb677a5 --- /dev/null +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly @@ -0,0 +1,64 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, contexts-and-engravers" + + 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 be7f455db3..0000000000 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ /dev/null @@ -1,60 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -\version "2.12.0" -\header { - 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 52773268fd..17aa31b209 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers" @@ -36,3 +36,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 b43262ade8..122bba0a20 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -46,3 +46,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 d071f2d1de..674f6e1d2b 100644 --- a/input/lsr/chord-name-major7.ly +++ b/input/lsr/chord-name-major7.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -17,3 +17,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 c9ecf938c1..8db309ebb8 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.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. -\version "2.12.0" +\version "2.12.3" + \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. @@ -11,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) @@ -90,3 +88,4 @@ origScore = \score { } } } + diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index 5c97720fe9..d953c203ab 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes, chords, keyboards" @@ -20,10 +20,6 @@ played. doctitle = "Clusters" } % begin verbatim -\layout { - ragged-right = ##t -} - fragment = \relative c' { c4 f 4 8 a4 c2 4 @@ -34,3 +30,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 2a9a5a810d..38445dffe7 100644 --- a/input/lsr/coloring-notes-depending-on-their-pitch.ly +++ b/input/lsr/coloring-notes-depending-on-their-pitch.ly @@ -1,11 +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. -\version "2.12.0" +\version "2.12.3" + \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 @@ -28,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) @@ -44,7 +47,7 @@ the function used in this example even makes it possible to distinguish enharmon #(define (color-notehead grob) (pitch-to-color - (ly:event-property (ly:grob-property grob 'cause) 'pitch))) + (ly:event-property (event-cause grob) 'pitch))) \score { \new Staff \relative c' { diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index 9062d62d11..54f4a1f838 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, text" @@ -27,3 +27,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 e51eb43132..ff6990a062 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes, text" @@ -86,3 +86,4 @@ musicDown = \relative c'' { } } } + diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index a75cc8eb58..003b9c8c44 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "rhythms" + doctitlees = "Indicaciones de compases compuestos" texidoces = " Las indicaciones de compás poco frecuentes como \"5/8\" se pueden @@ -27,7 +29,6 @@ Bebalkung angepasst wird. " doctitlede = "Zusammengesetzte Taktarten" - 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 @@ -41,15 +42,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 91dfebd58c..1ff95278c9 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -53,3 +53,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 20661cd9bd..ede768b62b 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -40,3 +40,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 e8c484113e..73055ed527 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -2,11 +2,12 @@ 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 mensurstriche-layout-bar-lines-between-the-staves.ly nesting-staves.ly +removing-bar-numbers-from-a-score.ly use-square-bracket-at-the-start-of-a-staff-group.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly index 877fd09403..d488c5cb98 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, chords, keyboards, fretted-strings" @@ -11,6 +11,15 @@ Se puede controlar con precisión la colocación de los números de digitación. " doctitlees = "Controlar la colocación de las digitaciones de acordes" + +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +Le positionnement des doigtés peut être contrôlé de manière très précise. + +" + doctitlefr = "Conrôle du positionnement des doigtés" + texidoc = " The placement of fingering numbers can be controlled precisely. @@ -33,3 +42,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 425752eb54..d8327c96dc 100644 --- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, tweaks-and-overrides" @@ -56,3 +56,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 c14b672ca8..74c356cb89 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -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 5e667425d3..3ed5d9a528 100644 --- a/input/lsr/creating-a-delayed-turn.ly +++ b/input/lsr/creating-a-delayed-turn.ly @@ -1,22 +1,35 @@ -%% 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. -\version "2.12.0" +\version "2.12.3" \header { - lsrtags = "expressive-marks, editorial-annotations,tweaks-and-overrides" + lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" + +texidoces = " +La creación de un grupeto circular de anticipación entre dos notas, +donde la nota inferior del grupeto utiliza una alteración, requiere +varias sobreescriturasw de propiedades. La propiedad +@code{outside-staff-priority} se debe establecer al valor #f, pues en +caso contrario tendría prioridad sobre la propiedad @code{avoid-slur +property}. El valor de @code{halign} se utiliza para colocar el +grupeto horizontalmente. + +" + +doctitlees = "Crear un grupeto de anticipación" 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 acaae74b0a..1f624ee0ce 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches" @@ -31,43 +31,38 @@ 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)))) - -#(define (seq-music-list elts) - (make-music 'SequentialMusic - 'elements elts)) + (make-music 'EventChord + 'elements (list (make-note-req p d)))) #(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))) + (make-sequential-music + (list + (make-triplet (make-sequential-music + (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 d392f5b760..d4967879e8 100644 --- a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly +++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -42,3 +42,4 @@ context: { 2\arpeggio 2 } >> } + diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index c26a5be090..538b549ff1 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout" @@ -55,3 +55,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 e32d8cda16..bac8cdbd4f 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -46,3 +46,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 f58ff2e8a3..7dfc106468 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -56,3 +56,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 76a61d55a4..de8b721df1 100644 --- a/input/lsr/creating-metronome-marks-in-markup-mode.ly +++ b/input/lsr/creating-metronome-marks-in-markup-mode.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "staff-notation" + texidoces = " Se pueden crear indicaciones metronómicas nuevas en modo de marcado, pero no cambian el tempo en la salida MIDI. @@ -11,14 +13,14 @@ marcado, pero no cambian el tempo en la salida MIDI. doctitlees = "Crear indicaciones metronómicas en modo de marcado" - 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 69a523c113..870671166c 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, text" @@ -40,12 +40,11 @@ commands such as @code{\\dynamicUp} or @code{\\dynamicDown}. doctitle = "Creating \"real\" parenthesized dynamics" } % begin verbatim -\paper { ragged-right = ##t } - parenF = #(make-dynamic-script (markup #:line (#:normal-text #:italic #:fontsize 2 "(" #:hspace -0.8 #:dynamic "f" #:normal-text - #:italic #:fontsize 2 ")" - ))) + #:italic #:fontsize 2 ")"))) + \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 31fe61796c..2d6f8ade38 100644 --- a/input/lsr/creating-simultaneous-rehearsal-marks.ly +++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "expressive-marks, text, tweaks-and-overrides" + texidoces = " A diferencia de las inscripciones de texto, las lestras de ensayo no se pueden apilar en un punto concreto de la partitura: sólo se @@ -16,15 +19,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 @@ -44,7 +46,6 @@ end of one system and the start of the following system. \time 4/4 \once \override Score.RehearsalMark #'self-alignment-X = #LEFT - \once \override Score.RehearsalMark #'break-align-symbols = #'(bar-line) \mark \markup { \box \bold Intro } d'1 \mark \default diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 13d67688b5..8d1c5fa919 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, keyboards, unfretted-strings" @@ -53,3 +53,4 @@ solo violin, BWV 1004. } >> } + diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index d19cbbed91..feb83b55dc 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "expressive-marks, text, tweaks-and-overrides" + texidoces = " Las instrucciones @code{\\startTextSpan} y @code{\\stopTextSpan} permiten la creación de elementos de extensión textuales tan @@ -13,16 +15,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 6ff5dae026..da0eb0da67 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "ancient-notation, tweaks-and-overrides" @@ -39,3 +39,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 d5847b2b7b..6359b526c7 100644 --- a/input/lsr/customizing-fretboard-fret-diagrams.ly +++ b/input/lsr/customizing-fretboard-fret-diagrams.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "fretted-strings, tweaks-and-overrides" + texidoces = " Se pueden establecer las propiedades de los diagramas de posiciones de acordes por medio de @code{'fret-diagram-details}. @@ -15,26 +17,24 @@ sobreescritura de propiedades. " doctitlees = "Personalizar los diagramas de posiciones" - 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 @@ -78,6 +78,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 c8cbd7468c..f6c9f52d05 100644 --- a/input/lsr/customizing-markup-fret-diagrams.ly +++ b/input/lsr/customizing-markup-fret-diagrams.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "fretted-strings, tweaks-and-overrides" + texidoces = " Se pueden establecer las propiedades de los diagramas de posiciones a través de @code{'fret-diagram-details}. Para los @@ -12,19 +14,30 @@ diagramas de posiciones de marcado, se pueden aplicar overrides " doctitlees = "Personalizar diagramas de posiciones de marcado" - lsrtags = "fretted-strings,tweaks-and-overrides" +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +Les propriétés d'un diagramme de fret sont modifiables grâce au +@code{'fret-diagram-details}. Lorsqu'ils sont générés sous forme +de @code{\markup}, rien n'empêche de les modifier en jouant sur les +réglages de l'objet @code{Voice.TextScript} ou bien directement sur +le @qq{markup}. + +" + doctitlefr = "Personnalisation des diagrammes de fret" + + 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 a1459f885d..4f2fe64389 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations" @@ -28,3 +28,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 cbf7067e34..a64b4ad7af 100644 --- a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "fretted-strings" + texidoces = " Se pueden añadir diagramas de posiciones predefinidas para @@ -20,18 +23,38 @@ de las cuerdas. Hay planes para corregir esto en un futuro. " doctitlees = "Definición de posiciones predefinidas para otros instrumentos" - 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. +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +La liste des diagrammes standards prédéfinis pour la guitare peut être + augmentée d'autres définitions spécifiques à d'autres instruments. +Voici comment définir un nouvel accordage ainsi que quelques diagrammes +prédéfinis pour le @qq{cuatro vénézuélien}. + +Cet exemple illustre aussi la manière d'ajouter des doigtés aux +accords ; ils serviront de référence pour la boucle d'accord et seront +indiqués dans les diagrammes et le @code{TabStaff}, mais pas dans la musique. + +Ces diagrémmes ne peuvent pas être transposés, dans la mesure où ils +contiennent des informations sur les condes. Ceci est amené à évoluer. + +" + doctitlefr = "Création de diagrammes de fret prédéfinis pour +d'autres instruments" + + 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 0ea3160296..27dd9c2ee6 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "midi" @@ -172,3 +172,4 @@ melody = { >> \midi { } } + diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index 804288c008..f7f12712e7 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, paper-and-layout, titles" @@ -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 9a9e8be8ee..cc0e44e137 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,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "staff-notation, tweaks-and-overrides" + texidoces = " Si hay un solo pentagrama en un de los tipos de sistema @code{ChoirStaff} o @code{StaffGroup}, el comportamiento @@ -17,20 +20,20 @@ distinta, como se ve en el segundo sistema del ejemplo. doctitlees = "Mostrar corchete o llave en grupos de un solo pentagrama" - 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 << @@ -43,6 +46,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 ebe77122df..aef40d9c09 100644 --- a/input/lsr/displaying-complex-chords.ly +++ b/input/lsr/displaying-complex-chords.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes, chords" @@ -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 f326d4f41b..cea81a132b 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,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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "pitches" + doctitlees = "Alteraciones de estilo dodecafónico para todas las notas, incluidas las naturales" texidoces = " En las obras de principios del s.XX, empezando por Schoenberg, Berg y @@ -30,21 +32,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) @@ -59,3 +60,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 c19604aa2b..b2c337c2d3 100644 --- a/input/lsr/dotted-harmonics.ly +++ b/input/lsr/dotted-harmonics.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. -\version "2.12.0" +\version "2.12.3" \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 797641454f..c2c74d224f 100644 --- a/input/lsr/double-glissando.ly +++ b/input/lsr/double-glissando.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, simultaneous-notes" @@ -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 76da5b97f0..63b64b1a80 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.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. -\version "2.12.0" +\version "2.12.3" + \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) @@ -27,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 d3db013fa6..ac97adbee9 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,18 +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. -\version "2.12.0" +\version "2.12.3" + \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 884345679d..f665b3bf67 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -11,11 +11,15 @@ 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 making-some-staff-lines-thicker-than-the-others.ly marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly measure-counter.ly +positioning-fingering-indications-precisely.ly positioning-text-markups-inside-slurs.ly +printing-text-from-right-to-left.ly using-postscript-to-generate-special-note-head-shapes.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 19ca959055..b24fffc534 100644 --- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly +++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, text" @@ -30,3 +30,4 @@ block. s2 a'1 } + diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index 190f30b821..1defdf8b3b 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "contexts-and-engravers" @@ -314,3 +314,4 @@ MyStaff = \context { } } + diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index f95d8e1abb..4ef5148c54 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -42,3 +42,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 new file mode 100644 index 0000000000..655b976318 --- /dev/null +++ b/input/lsr/engraving-tremolos-with-floating-beams.ly @@ -0,0 +1,46 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, repeats" + + texidoc = " +If a tremolo's total duration is less than a quarter-note, or exactly a +half-note, or between a half-note and a whole-note, it is normally +typeset with all beams touching the stems. Certain engraving styles +typeset some of these beams as centered floating beams that do not +touch the stems. The number of floating beams in this type of tremolo +is controlled with the @code{'gap-count } property of the @code{Beam} +object, and the size of the gaps between beams and stems is set with +the @code{'gap} property. + + + +" + doctitle = "Engraving tremolos with floating beams" +} % begin verbatim + +\relative c'' { + \repeat tremolo 8 { a32 f } + \override Beam #'gap-count = #1 + \repeat tremolo 8 { a32 f } + \override Beam #'gap-count = #2 + \repeat tremolo 8 { a32 f } + \override Beam #'gap-count = #3 + \repeat tremolo 8 { a32 f } + + \override Beam #'gap-count = #3 + \override Beam #'gap = #1.33 + \repeat tremolo 8 { a32 f } + \override Beam #'gap = #1 + \repeat tremolo 8 { a32 f } + \override Beam #'gap = #0.67 + \repeat tremolo 8 { a32 f } + \override Beam #'gap = #0.33 + \repeat tremolo 8 { a32 f } +} + + + + 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 ffe26e9cc7..bb6d35bdc5 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -59,3 +59,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 33515ad24d..52e644d012 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 @@ -35,4 +35,5 @@ setting-hairpin-behavior-at-bar-lines.ly setting-the-minimum-length-of-hairpins.ly snap-pizzicato-markup-bartok-pizzicato.ly using-double-slurs-for-legato-chords.ly +vertical-line-as-a-baroque-articulation-mark.ly vertically-aligning-dynamics-across-multiple-notes.ly diff --git a/input/lsr/faking-a-hammer-in-tablatures.ly b/input/lsr/faking-a-hammer-in-tablatures.ly index e07b15f0bf..9ff1735ded 100644 --- a/input/lsr/faking-a-hammer-in-tablatures.ly +++ b/input/lsr/faking-a-hammer-in-tablatures.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -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 cc9d16c3d3..150d4cadac 100644 --- a/input/lsr/fine-tuning-pedal-brackets.ly +++ b/input/lsr/fine-tuning-pedal-brackets.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. -\version "2.12.0" +\version "2.12.3" \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 371e9e787c..7aef035a1d 100644 --- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly +++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -13,6 +13,16 @@ derecha. " doctitlees = "Digitaciones, indicación del número de cuerda y digitaciones de mano derecha" +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +L'exemple suivant illustre comment combiner des doigtés pour la main +gauche, des indications de corrde et des doigtés pour la main droite. + +" + doctitlefr = "Doigtés, indications de cordeet doigtés main droite" + + texidoc = " This example combines left-hand fingering, string indications, and right-hand fingering. @@ -30,3 +40,4 @@ right-hand fingering. 4 4 } + diff --git a/input/lsr/flamenco-notation.ly b/input/lsr/flamenco-notation.ly index 90b1c42dcd..4319ecc404 100644 --- a/input/lsr/flamenco-notation.ly +++ b/input/lsr/flamenco-notation.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -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 e5de622711..36f12c9fb5 100644 --- a/input/lsr/flat-flags-and-beam-nibs.ly +++ b/input/lsr/flat-flags-and-beam-nibs.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -141,3 +141,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 c835631773..c5b5d8d787 100644 --- a/input/lsr/flute-slap-notation.ly +++ b/input/lsr/flute-slap-notation.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. -\version "2.12.0" +\version "2.12.3" \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?) #{ @@ -30,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 a0841fcdb0..d18a8e0061 100644 --- a/input/lsr/forcing-horizontal-shift-of-notes.ly +++ b/input/lsr/forcing-horizontal-shift-of-notes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "simultaneous-notes, tweaks-and-overrides" @@ -33,3 +33,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 e2f2259ffc..7f4a9cbb77 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -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 54c0a1e7f1..a126c875d3 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, vocal-music" @@ -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 ff25b711c1..47a65e5a92 100644 --- a/input/lsr/fret-diagrams-explained-and-developed.ly +++ b/input/lsr/fret-diagrams-explained-and-developed.ly @@ -1,27 +1,32 @@ -%% 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. -\version "2.12.0" +\version "2.12.3" \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 - c2 c - d1 + \repeat unfold 3 { + c c c d d + } } \new Voice = "mel" { \textLengthOn % Set global properties of fret diagram \override TextScript #'size = #1.2 - \override TextScript #'fret-diagram-details #'finger-code = #'below-string + \override TextScript + #'fret-diagram-details #'finger-code = #'below-string \override TextScript #'fret-diagram-details #'dot-color = #'black %% A chord for ukelele @@ -45,6 +50,8 @@ and tweaking fret diagrams." } } + %% These chords will be in normal orientation + %% C major for guitar, barred on third fret % verbose style % roman fret label, finger labels below string, straight barre @@ -67,6 +74,7 @@ and tweaking fret diagrams." } %% C major for guitar, barred on third fret + %% Double barre used to test barre function % verbose style c'2^\markup { % 110% of default size @@ -79,7 +87,6 @@ and tweaking fret diagrams." (fret-label-vertical-offset . 0) (label-dir . -1) (mute-string . "M") - (orientation . landscape) (xo-font-magnification . 0.4) (xo-padding . 0.3))) { \fret-diagram-verbose #'((mute 6) @@ -88,17 +95,252 @@ and tweaking fret diagrams." (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) + (barre 4 2 5) (barre 5 1 3)) } } } + %% C major for guitar, with capo on third fret + % verbose style + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . roman-upper) + (dot-label-font-mag . 0.9) + (finger-code . none) + (fret-label-vertical-offset . 0.5) + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (capo 3) + (open 5) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + (open 1)) + } + } + } + %% simple D chord - d'1^\markup { + d'2^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (string-thickness-factor . 0.3) + (dot-position . 0.5) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + + %% simple D chord, large top fret thickness + d'2^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (dot-position . 0.5) + (top-fret-thickness . 7) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + + % These chords will be in landscape orientation + \override TextScript + #'fret-diagram-details #'orientation = #'landscape + + %% C major for guitar, barred on third fret + % verbose style + % roman fret label, finger labels below string, straight barre + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . roman-lower) + (finger-code . below-string) + (barre-type . straight))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 5 1 3)) + } + } + } + + %% C major for guitar, barred on third fret + %% Double barre used to test barre function + % verbose style + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . arabic) + (dot-label-font-mag . 0.9) + (finger-code . in-dot) + (fret-label-font-mag . 0.6) + (fret-label-vertical-offset . 0) + (label-dir . -1) + (mute-string . "M") + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 4 2 5) + (barre 5 1 3)) + } + } + } + + %% C major for guitar, with capo on third fret + % verbose style + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . roman-upper) + (dot-label-font-mag . 0.9) + (finger-code . none) + (fret-label-vertical-offset . 0.5) + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (capo 3) + (open 5) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + (open 1)) + } + } + } + + %% simple D chord + d'2^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (dot-position . 0.5) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + + %% simple D chord, large top fret thickness + d'2^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (dot-position . 0.5) + (top-fret-thickness . 7) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + + % These chords will be in opposing-landscape orientation + \override TextScript #'fret-diagram-details + #'orientation = #'opposing-landscape + + %% C major for guitar, barred on third fret + % verbose style + % roman fret label, finger labels below string, straight barre + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . roman-lower) + (finger-code . below-string) + (barre-type . straight))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 5 1 3)) + } + } + } + + %% C major for guitar, barred on third fret + %% Double barre used to test barre function + % verbose style + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . arabic) + (dot-label-font-mag . 0.9) + (finger-code . in-dot) + (fret-label-font-mag . 0.6) + (fret-label-vertical-offset . 0) + (label-dir . -1) + (mute-string . "M") + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 4 2 5) + (barre 5 1 3)) + } + } + } + + %% C major for guitar, with capo on third fret + % verbose style + c'2^\markup { + % 110% of default size + \override #'(size . 1.1) { + \override #'(fret-diagram-details . ( + (number-type . roman-upper) + (dot-label-font-mag . 0.9) + (finger-code . none) + (fret-label-vertical-offset . 0.5) + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (capo 3) + (open 5) + (place-fret 4 5 1) + (place-fret 3 5 2) + (place-fret 2 5 3) + (open 1)) + } + } + } + + %% simple D chord + d'2^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (dot-position . 0.5) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + + %% simple D chord, large top fret thickness + d'2^\markup { \override #'(fret-diagram-details . ( (finger-code . below-string) (dot-radius . 0.35) (dot-position . 0.5) + (top-fret-thickness . 7) (fret-count . 3))) { \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" } diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index f199ef1598..b71c9b1185 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches" @@ -27,17 +27,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 93b3064f4d..1d1198bc1c 100644 --- a/input/lsr/grid-lines--changing-their-appearance.ly +++ b/input/lsr/grid-lines--changing-their-appearance.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations" @@ -61,3 +61,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 3917bd9f31..356745f573 100644 --- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations" @@ -71,3 +71,4 @@ this snippet. ragged-right = ##t } } + diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly index bf31bee503..5e8b92d282 100644 --- a/input/lsr/grouping-beats.ly +++ b/input/lsr/grouping-beats.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -36,3 +36,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 8a76a48097..baa31203ad 100644 --- a/input/lsr/guitar-strum-rhythms.ly +++ b/input/lsr/guitar-strum-rhythms.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "rhythms, fretted-strings" + texidoces = " Para la música de guitarra, es posible mostrar los ritmos de rasgueo, además de las notas de la melodía, acordes y diagramas de posiciones. @@ -18,15 +20,14 @@ Bunddiagrammen auch der Schlagrhythmus angegeben werden. " doctitldee = "Schlagrhythmus für Guitarren" - 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 7d87617dd5..b311b94ff3 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,6 +1,6 @@ -%% 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. -\version "2.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, percussion" @@ -14,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) @@ -31,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 cb2c586c57..c3a4a95763 100644 --- a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly +++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -36,3 +36,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 bd46cf9f7e..445e8a5f54 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, tweaks-and-overrides" @@ -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 5f9b5502b9..17997e9c77 100644 --- a/input/lsr/how-to-change-fret-diagram-position.ly +++ b/input/lsr/how-to-change-fret-diagram-position.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings, tweaks-and-overrides" @@ -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 d5a8e585ab..c0382d8132 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, vocal-music" @@ -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 e8295eec43..d09025ef74 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "staff-notation, ancient-notation" + texidoces = " Los «incipit» se pueden escribir utilizando el grob del nombre del instruemento, pero manteniendo independientes las definiciones del @@ -9,13 +12,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 ad2ff9d087..b2320c2990 100644 --- a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly +++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "keyboards" @@ -31,8 +31,6 @@ context. doctitle = "Indicating cross-staff chords with arpeggio bracket" } % begin verbatim -\paper { ragged-right = ##t } - \new PianoStaff << \set PianoStaff.connectArpeggios = ##t \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket @@ -60,3 +58,4 @@ context. } } >> + diff --git a/input/lsr/inserting-a-caesura.ly b/input/lsr/inserting-a-caesura.ly index 1cd862fd5c..81efd07340 100644 --- a/input/lsr/inserting-a-caesura.ly +++ b/input/lsr/inserting-a-caesura.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "expressive-marks, tweaks-and-overrides" + texidoces = " Las marcas de cesura se pueden crear sobreescribiendo la propiedad @code{'text} del objeto @code{BreathingSign}. También está disponible @@ -18,16 +21,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 d20efa55f3..651100ee0c 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation" @@ -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 77c7777dac..cf6355faa7 100644 --- a/input/lsr/isolated-percent-repeats.ly +++ b/input/lsr/isolated-percent-repeats.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats" @@ -27,3 +27,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 de4dea159e..c230936cf1 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "keyboards, percussion, fretted-strings, template" @@ -293,3 +293,4 @@ drumContents = { \midi { } } + diff --git a/input/lsr/laissez-vibrer-ties.ly b/input/lsr/laissez-vibrer-ties.ly index b606db3ee4..f71c9e9f34 100644 --- a/input/lsr/laissez-vibrer-ties.ly +++ b/input/lsr/laissez-vibrer-ties.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, keyboards, fretted-strings" @@ -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 beaaa0f723..9b247dcb22 100644 --- a/input/lsr/letter-tablature-formatting.ly +++ b/input/lsr/letter-tablature-formatting.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. -\version "2.12.0" +\version "2.12.3" \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 d3ef6af808..566ee690fb 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "expressive-marks, tweaks-and-overrides" + texidoces = " Se pueden aplicar puntas de flecha a los elementos de extensión de texto y de línea (como el Glissando). @@ -9,13 +12,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 8b47e276d2..9787ac8c92 100644 --- a/input/lsr/lyrics-alignment.ly +++ b/input/lsr/lyrics-alignment.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, vocal-music" @@ -40,3 +40,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 eea080b8a4..416d2aaf32 100644 --- a/input/lsr/makam-example.ly +++ b/input/lsr/makam-example.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "pitches, world-music" + texidoces = " El «Makam» es un tipo de melodía de Turquía que utiliza intervalos microtonales de 1/9 de tono. Consulte el @@ -13,16 +16,15 @@ nombres de las notas y las alteraciones. " doctitlees = "El «Makam»" - lsrtags = "pitches,world-music" - texidoc = "Makam is a type of melody from Turkey using 1/9th-tone -microtonal alterations. Consult the initialization file -@code{makam.ly} (see the `Learning Manual @version{}, -4.6.3 Other sources of information' for the location of this file) -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 75c90e6579..927cc4e273 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,24 +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. -\version "2.12.0" +\version "2.12.3" + \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 e1337cb3d5..309005b36b 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, editorial-annotations" @@ -30,3 +30,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 09b41cc50b..a24b8e2724 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -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 910266ba6b..6407d39ecf 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -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 9c73e9cde6..800d93b974 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,19 +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. -\version "2.12.0" +\version "2.12.3" \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)) @@ -46,3 +46,4 @@ speakOff = { } } } + diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 48598d92c7..b02cd6eedf 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.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. -\version "2.12.0" +\version "2.12.3" \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 863bfaf0d2..9574a6ccb1 100644 --- a/input/lsr/measure-counter.ly +++ b/input/lsr/measure-counter.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats, staff-notation, editorial-annotations" @@ -36,3 +36,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 e8370c5f1f..bcb7b00fd5 100644 --- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides" @@ -39,3 +39,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 449164be3b..81820cecf9 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -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 2b1d7a1d0c..f7bee1b4cb 100644 --- a/input/lsr/modern-tab-text-clef.ly +++ b/input/lsr/modern-tab-text-clef.ly @@ -1,6 +1,6 @@ -%% 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. -\version "2.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, fretted-strings" @@ -12,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 @@ -28,6 +28,6 @@ TAB = \markup { \new TabStaff { \override Staff.Clef #'stencil = #(lambda (grob) - ly:clef::print (grob-interpret-markup grob TAB)) + (grob-interpret-markup grob TAB)) 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 a2e9dd9cf3..260fa3e87c 100644 --- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly +++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -50,3 +50,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 d2ec9534be..092760720d 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -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 cbf953b6f2..0000000000 --- a/input/lsr/multi--measure-rest-markup.ly +++ /dev/null @@ -1,49 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -\version "2.12.0" - -\header { -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" - 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..6baa1bdade --- /dev/null +++ b/input/lsr/multi-measure-rest-markup.ly @@ -0,0 +1,52 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, text" + +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" + 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 26aecd057e..73223a5b86 100644 --- a/input/lsr/nesting-staves.ly +++ b/input/lsr/nesting-staves.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides" @@ -49,3 +49,4 @@ staves. The possibilities are @code{SystemStartBar}, \new Staff { c1 } \new Staff { c1 } >> + diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index 772c4dad1d..be636059d6 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches, staff-notation" 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..158af839d6 --- /dev/null +++ b/input/lsr/orchestra,-choir-and-piano-template.ly @@ -0,0 +1,163 @@ +%% 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.12.3" + +\header { + 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 cfbcec87c0..245a68d139 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "pitches, text" + texidoces = " Internamente, la función @code{set-octavation} establece las propiedades @code{ottavation} (por ejemplo, a @code{\"8va\"} o a @@ -24,17 +26,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" @@ -45,3 +46,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 43ea09d16e..1666f205c5 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,23 +1,28 @@ -%% 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. -\version "2.12.0" +\version "2.12.3" \header { - lsrtags = "text" + lsrtags = "text, titles" + texidoc = " -By putting the output of @code{lilypond-version} into lyrics or a -text markup, it is possible to print the version number of LilyPond in -a score, or in a document generated with @code{lilypond-book}. +By putting the output of + @code{lilypond-version} into a lyric, it is possible to print the + version number of LilyPond in a score, or in a document generated + with @code{lilypond-book}. Another possibility is to append the + version number to the doc-string, in this manner: + " doctitle = "Outputting the version number" } % begin verbatim - \score { \new Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT - \mark #(ly:export (string-append "Processed with LilyPond version " - (lilypond-version))) + \mark #(string-append "Processed with LilyPond version " (lilypond-version)) s2 } } + + + diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index e89c7bca33..bbdd8dfb26 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,14 +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. -\version "2.12.0" +\version "2.12.3" + \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 4a044846ba..3d55200a65 100644 --- a/input/lsr/percent-repeat-count-visibility.ly +++ b/input/lsr/percent-repeat-count-visibility.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "repeats, tweaks-and-overrides" + texidoces = " Se pueden mostrar los contadores de las repeticiones del tipo porcentaje a intervalos regulares mediante el establecimiento de @@ -10,15 +13,14 @@ la propiedad de contexto @code{repeatCountVisibility}. " doctitlees = "Visibilidad del contador de repeticiones de tipo porcentaje" - lsrtags = "repeats, tweaks-and-overrides" texidoc = " Percent repeat counters can be shown at regular intervals by setting 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 0ffe523d76..af00725dd4 100644 --- a/input/lsr/percent-repeat-counter.ly +++ b/input/lsr/percent-repeat-counter.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats" @@ -25,3 +25,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 565bc6bf3e..87109f74be 100644 --- a/input/lsr/percussion-beaters.ly +++ b/input/lsr/percussion-beaters.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "percussion" @@ -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 cb9b9727d6..a8cc75f9d0 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -50,3 +50,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 301251cb55..88c6fff4dc 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "keyboards, template" @@ -50,3 +50,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 3abe8bc938..348ad910c7 100644 --- a/input/lsr/piano-template-with-centered-dynamics.ly +++ b/input/lsr/piano-template-with-centered-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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "expressive-marks, keyboards, template" + texidoces = " Muchas partituras de piano tienen las indicaciones dinámicas centradas entre los dos pentagramas. Esto requiere un poco de @@ -19,16 +21,15 @@ etwas anpassen, aber Sie können ja das angepasste Beispiel von hier 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 @@ -54,9 +55,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 41e739639d..ad36e2611b 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, keyboards, template" @@ -64,3 +64,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 44d6cd8d72..03c3c3b4b6 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, keyboards, template" @@ -67,3 +67,4 @@ lower = \relative c { } \midi { } } + diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list index b6814c4603..d6f0217428 100644 --- a/input/lsr/pitches.snippet-list +++ b/input/lsr/pitches.snippet-list @@ -12,5 +12,6 @@ ottava-text.ly preventing-extra-naturals-from-being-automatically-added.ly preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly quoting-another-voice-with-transposition.ly +separating-key-cancellations-from-key-signature-changes.ly transposing-pitches-with-minimum-accidentals-smart-transpose.ly tweaking-clef-properties.ly diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly index 614a80484e..53e6002629 100644 --- a/input/lsr/placement-of-right-hand-fingerings.ly +++ b/input/lsr/placement-of-right-hand-fingerings.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -13,6 +13,17 @@ propiedad específica, como se muestra en el ejemplo siguiente. " doctitlees = "Posicionamiento de digitaciones de mano derecha" +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +Vous disposez d'une propriété spécifique qui permet de contrôler plus +finement le positionnement des doigtés main droite, comme l'indique +l'exemple suivant. + +" + doctitlefr = "Positionnement des doigtés main droite" + + texidoc = " It is possible to exercise greater control over the placement of right-hand fingerings by setting a specific property, as demonstrated @@ -36,3 +47,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 e3b2b63c84..e2ff175fbc 100644 --- a/input/lsr/polyphony-in-tablature.ly +++ b/input/lsr/polyphony-in-tablature.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -12,6 +12,15 @@ en una pauta normal. " doctitlees = "Polifonía en tablaturas" +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +Une section polyphonique s'obtient dans un @code{TabStaff} de la +même manière que dans une portée normale. + +" + doctitlefr = "Polyphonie en mode tablature" + texidoc = " Polyphony is created the same way in a @code{TabStaff} as in a regular staff. @@ -48,3 +57,4 @@ lower = \relative c { >> >> } + diff --git a/input/lsr/positioning-fingering-indications-precisely.ly b/input/lsr/positioning-fingering-indications-precisely.ly new file mode 100644 index 0000000000..b5cb3eb951 --- /dev/null +++ b/input/lsr/positioning-fingering-indications-precisely.ly @@ -0,0 +1,34 @@ +%% 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.12.3" + +\header { + lsrtags = "editorial-annotations" + + texidoc = " +Generally the options available for positioning the fingering of chords +work well by default, but if one of the indications needs to positioned +more precisely the following tweak may be used. This is particularly +useful for correcting the positioning when intervals of a second are +involved. + +" + doctitle = "Positioning fingering indications precisely" +} % begin verbatim + +\relative c' { + \set fingeringOrientations = #'(left) + 4 + 4 + \set fingeringOrientations = #'(down) + 4 + 4 + \set fingeringOrientations = #'(down right up) + 4 + 4 + \set fingeringOrientations = #'(up) + 4 + 4 +} + + diff --git a/input/lsr/positioning-grace-notes-with-floating-space.ly b/input/lsr/positioning-grace-notes-with-floating-space.ly new file mode 100644 index 0000000000..c42479c6a3 --- /dev/null +++ b/input/lsr/positioning-grace-notes-with-floating-space.ly @@ -0,0 +1,31 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.12.3" + +\header { + lsrtags = "rhythms" + + texidoc = " +Setting the property @code{'strict-grace-spacing} makes the musical +columns for grace notes 'floating', i.e., decoupled from the non-grace +notes: first the normal notes are spaced, then the (musical columns of +the) graces are put left of the musical columns for the main notes. + +" + doctitle = "Positioning grace notes with floating space" +} % begin verbatim + +\relative c'' { + << + \override Score.SpacingSpanner #'strict-grace-spacing = ##t + \new Staff \new Voice { + \afterGrace c4 { c16[ c8 c16] } + c8[ \grace { b16[ d] } c8] + c4 r + } + \new Staff { + c16 c c c c c c c c4 r + } + >> +} + diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly deleted file mode 100644 index da9cb95bee..0000000000 --- a/input/lsr/positioning-multi--measure-rests.ly +++ /dev/null @@ -1,65 +0,0 @@ -%% Do not edit this file; it is auto-generated from input/new -%% This file is in the public domain. -\version "2.12.0" -\header { - 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: - -" - -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" - - 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..3f48e725ce --- /dev/null +++ b/input/lsr/positioning-multi-measure-rests.ly @@ -0,0 +1,67 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + 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: + +" + +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" + + 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 fourth 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 56b76912bc..a83f39fe85 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats, breaks" @@ -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 b65c7d0a07..3be3e34164 100644 --- a/input/lsr/positioning-text-markups-inside-slurs.ly +++ b/input/lsr/positioning-text-markups-inside-slurs.ly @@ -1,10 +1,19 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides" + texidoces = " + +Los elementos de marcado de texto deben tener la propiedad +@code{outside-staff-priority} establecida al valor falso para que se +impriman por dentro de las ligaduras de expresión. + +" + doctitlees = "Situar los elementos de marcado de texto por dentro de las ligaduras" + texidoc = " Text markups need to have the @code{outside-staff-priority} property set to false in order to be printed inside slurs. @@ -19,3 +28,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 fdce5a11f8..4da093f508 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches" @@ -48,3 +48,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 2ad0cf190c..930878d8bf 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches" @@ -44,3 +44,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 f442f40c03..5974038965 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats, tweaks-and-overrides" @@ -38,3 +38,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 new file mode 100644 index 0000000000..0e1548f0b6 --- /dev/null +++ b/input/lsr/printing-bar-numbers-at-regular-intervals.ly @@ -0,0 +1,28 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms" + + texidoc = " +Bar numbers can be printed at regular intervals by setting the property +@code{barNumberVisibility}. Here the bar numbers are printed every two +measures except at the end of the line. + +" + doctitle = "Printing bar numbers at regular intervals" +} % begin verbatim + +\relative c' { + \override Score.BarNumber #'break-visibility = #'#(#f #t #t) + \set Score.currentBarNumber = #11 + % Permit first bar number to be printed + \bar "" + % Print a bar number every second measure + \set Score.barNumberVisibility = #(every-nth-bar-number-visible 2) + c1 | c | c | c | c + \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 new file mode 100644 index 0000000000..442207f015 --- /dev/null +++ b/input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly @@ -0,0 +1,33 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.12.3" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + texidoc = " +Bar numbers can also be printed inside boxes or circles. + +" + doctitle = "Printing bar numbers inside boxes or circles" +} % begin verbatim + +\relative c' { + % Prevent bar numbers at the end of a line and permit them elsewhere + \override Score.BarNumber #'break-visibility = #end-of-line-invisible + \set Score.barNumberVisibility = #(every-nth-bar-number-visible 4) + + % Increase the size of the bar number by 2 + \override Score.BarNumber #'font-size = #2 + + % Draw a box round the following bar number(s) + \override Score.BarNumber #'stencil + = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) + \repeat unfold 5 { c1 } + + % Draw a circle round the following bar number(s) + \override Score.BarNumber #'stencil + = #(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 bd9f6ebcea..e02f2ceb5e 100644 --- a/input/lsr/printing-hairpins-using-al-niente-notation.ly +++ b/input/lsr/printing-hairpins-using-al-niente-notation.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -37,3 +37,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 ad787bf56f..c07d0ba287 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text" @@ -42,3 +42,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 b5a54da703..c9467820b2 100644 --- a/input/lsr/printing-marks-on-every-staff.ly +++ b/input/lsr/printing-marks-on-every-staff.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text" @@ -39,3 +39,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 2261494ebb..bbd068ccd8 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides" @@ -38,3 +38,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 00db6fb29d..f54a7b9837 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, percussion" @@ -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 new file mode 100644 index 0000000000..275406dea6 --- /dev/null +++ b/input/lsr/printing-text-from-right-to-left.ly @@ -0,0 +1,25 @@ +%% 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.12.3" + +\header { + lsrtags = "editorial-annotations, text, world-music" + + texidoc = " +It is possible to print text from right to left in a markup object, as +demonstrated here. + +" + doctitle = "Printing text from right to left" +} % begin verbatim + +{ + b1^\markup { + \line { i n g i r u m i m u s n o c t e } + } + f'_\markup { + \override #'(text-direction . -1) + \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 new file mode 100644 index 0000000000..6d693668bf --- /dev/null +++ b/input/lsr/printing-the-bar-number-for-the-first-measure.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.12.3" + +\header { + 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. + +" + doctitle = "Printing the bar number for the first measure" +} % begin verbatim + +\relative c' { + \set Score.barNumberVisibility = #all-bar-numbers-visible + \bar "" + c1 d e f \break + g1 e d c +} diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly index 99da9c2b65..f9d7e6bead 100644 --- a/input/lsr/proportional-strict-notespacing.ly +++ b/input/lsr/proportional-strict-notespacing.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "tweaks-and-overrides, spacing" @@ -14,10 +14,6 @@ the note that occurs at the same time. This may cause collisions. doctitle = "Proportional strict notespacing" } % begin verbatim -\paper { - ragged-right = ##t -} - \relative c'' << \override Score.SpacingSpanner #'strict-note-spacing = ##t \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) @@ -30,3 +26,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 4be2a04313..934db073ca 100644 --- a/input/lsr/quoting-another-voice-with-transposition.ly +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "pitches, staff-notation" + texidoces = " Los pasajes citados tienen en cuenta la transposición de la fuente tanto como la del destino. En este ejemplo, todos los @@ -13,17 +16,17 @@ se transportan todas las notas (incluidas las citadas). " doctitlees = "Citar otra voz con transposición" - 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 70cc428341..901ee1779c 100644 --- a/input/lsr/quoting-another-voice.ly +++ b/input/lsr/quoting-another-voice.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "staff-notation" + texidoces = " La propiedad @code{quotedEventTypes} determina los tipos de eventos musicales que resultan citados. El valor predeterminado @@ -13,17 +16,18 @@ el fragmento citado porque @code{rest-event} no está dentro de los " doctitlees = "Citar otra voz" - 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 new file mode 100644 index 0000000000..fdf6fa2ee2 --- /dev/null +++ b/input/lsr/redefining-grace-note-global-defaults.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.12.3" + +\header { + lsrtags = "rhythms" + + texidoc = " +The global defaults for grace notes are stored in the identifiers +@code{startGraceMusic}, @code{stopGraceMusic}, +@code{startAcciaccaturaMusic}, @code{stopAcciaccaturaMusic}, +@code{startAppoggiaturaMusic} and @code{stopAppoggiaturaMusic}, which +are defined in the file @code{ly/grace-init.ly}. By redefining them +other effects may be obtained. + +" + doctitle = "Redefining grace note global defaults" +} % begin verbatim + +startAcciaccaturaMusic = { + s1*0( + \override Stem #'stroke-style = #"grace" + \slurDashed +} + +stopAcciaccaturaMusic = { + \revert Stem #'stroke-style + \slurSolid + s1*0) +} + +\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 new file mode 100644 index 0000000000..a86a1f645f --- /dev/null +++ b/input/lsr/removing-bar-numbers-from-a-score.ly @@ -0,0 +1,27 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, contexts-and-engravers" + + texidoc = " +Bar numbers can be removed entirely by removing the +@code{Bar_number_engraver} from the @code{Score} context. + +" + doctitle = "Removing bar numbers from a score" +} % begin verbatim + +\layout { + \context { + \Score + \remove "Bar_number_engraver" + } +} + +\relative c'' { + 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 0cac0dec1a..6553757568 100644 --- a/input/lsr/removing-the-first-empty-line.ly +++ b/input/lsr/removing-the-first-empty-line.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, tweaks-and-overrides, breaks" @@ -67,3 +67,4 @@ written. R } >> + diff --git a/input/lsr/repeats.snippet-list b/input/lsr/repeats.snippet-list index dc43a685aa..288f87d567 100644 --- a/input/lsr/repeats.snippet-list +++ b/input/lsr/repeats.snippet-list @@ -1,4 +1,5 @@ adding-volta-brackets-to-additional-staves.ly +engraving-tremolos-with-floating-beams.ly isolated-percent-repeats.ly measure-counter.ly percent-repeat-count-visibility.ly diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly index 9db722f727..c8967608ac 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, ancient-notation, tweaks-and-overrides" @@ -54,3 +54,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 f9950c69fe..c094bf2afe 100644 --- a/input/lsr/reverting-default-beam-endings.ly +++ b/input/lsr/reverting-default-beam-endings.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -41,3 +41,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 5e64b7d79c..1af0472f16 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -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 75d487975c..1009600305 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -1,22 +1,22 @@ -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 -automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly avoiding-collisions-with-chord-fingerings.ly 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 controlling-tuplet-bracket-visibility.ly engraving-ties-manually.ly +engraving-tremolos-with-floating-beams.ly entering-several-tuplets-using-only-one--times-command.ly flat-flags-and-beam-nibs.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -27,11 +27,17 @@ making-an-object-invisible-with-the-transparent-property.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 permitting-line-breaks-within-beamed-tuplets.ly -positioning-multi--measure-rests.ly +positioning-grace-notes-with-floating-space.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 printing-music-with-different-time-signatures.ly +printing-the-bar-number-for-the-first-measure.ly +redefining-grace-note-global-defaults.ly +removing-bar-numbers-from-a-score.ly rest-styles.ly reverting-default-beam-endings.ly rhythmic-slashes.ly @@ -41,5 +47,8 @@ specifying-context-with-beatgrouping.ly stemlets.ly sub-dividing-beams.ly three-sided-box.ly +time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly +tweaking-grace-layout-within-music.ly using-beatlength-and-beatgrouping.ly +using-grace-note-slashes-with-normal-heads.ly using-ties-with-arpeggios.ly diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 364a273ad6..6aaa748634 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "template" @@ -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 new file mode 100644 index 0000000000..c812f86922 --- /dev/null +++ b/input/lsr/separating-key-cancellations-from-key-signature-changes.ly @@ -0,0 +1,42 @@ +%% 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.12.3" + +\header { + lsrtags = "pitches, tweaks-and-overrides" + + texidoc = " +By default, the accidentals used for key cancellations are placed +adjacent to those for key signature changes. This behavior can be +changed by overriding the @code{'break-align-orders} property of the +@code{BreakAlignment} grob. + + +The value of @code{'break-align-orders} is a vector of length 3, with +quoted lists of breakable items as elements. This example only +modifies the second list, moving @code{key-cancellation} before +@code{staff-bar}; by modifying the second list, break alignment +behavior only changes in the middle of a system, not at the beginning +or the end. + +" + doctitle = "Separating key cancellations from key signature changes" +} % begin verbatim + +\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 time-signature custos) + + (left-edge ambitus breathing-sign clef key-cancellation + key-signature staff-bar time-signature custos)) + + \key des \major + c'1 + \bar "||" + \key bes \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 fea5627e64..550ea28f62 100644 --- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "expressive-marks, tweaks-and-overrides" + texidoces = " Si la nota que da fin a un regulador cae sobre la primera parte de un compás, el regulador se detiene en la línea divisoria @@ -20,15 +23,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 8def1f89cf..fdf517146c 100644 --- a/input/lsr/setting-the-minimum-length-of-hairpins.ly +++ b/input/lsr/setting-the-minimum-length-of-hairpins.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -35,3 +35,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 0c61ebeedb..45ac8ede0b 100644 --- a/input/lsr/shortening-volta-brackets.ly +++ b/input/lsr/shortening-volta-brackets.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "repeats" @@ -38,3 +38,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 7146da898f..e46904628e 100644 --- a/input/lsr/showing-chords-at-changes.ly +++ b/input/lsr/showing-chords-at-changes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -32,3 +32,4 @@ harmonies = \chordmode { \relative c' { \harmonies } } >> + diff --git a/input/lsr/simple-lead-sheet.ly b/input/lsr/simple-lead-sheet.ly index a7f7df33df..5f6912ba7f 100644 --- a/input/lsr/simple-lead-sheet.ly +++ b/input/lsr/simple-lead-sheet.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords" @@ -27,3 +27,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 de800cec78..28acf942ea 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, chords, template" @@ -53,3 +53,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 bff63283ea..9f9822ce03 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, chords, template" @@ -21,15 +21,6 @@ fret diagrams. doctitle = "Single staff template with notes, lyrics, chords and frets" } % begin verbatim -% Define the fret diagrams to be used -cFretDiagram = \markup { - \fret-diagram #"6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;" -} - -gFretDiagram = \markup { - \fret-diagram #"6-3-2;5-2-1;4-o;3-o;2-o;1-3-3;" -} - verseI = \lyricmode { \set stanza = #"1." This is the first verse @@ -40,36 +31,34 @@ verseII = \lyricmode { This is the second verse. } -theChords = \new ChordNames { - \chordmode { - % insert the chords for chordnames here - c2 g4 c - } +theChords = \chordmode { + % insert chords for chordnames and fretboards here + c2 g4 c } -staffMelody = \new Staff { - \context Voice = "voiceMelody" { +staffMelody = \relative c' { \key c \major \clef treble - \relative c' { - % Type notes and fret diagram markups here - c4^\cFretDiagram d8 e f4^\gFretDiagram g^\cFretDiagram - \bar "|." - } - } + % Type notes for melody here + c4 d8 e f4 g + \bar "|." } \score { << - \theChords - \staffMelody - \new Lyrics = "lyricsI" \lyricmode { + \context ChordNames { \theChords } + \context FretBoards { \theChords } + \new Staff { + \context Voice = "voiceMelody" { \staffMelody } + } + \new Lyrics = "lyricsI" { \lyricsto "voiceMelody" \verseI } - \new Lyrics = "lyricsII" \lyricmode { + \new Lyrics = "lyricsII" { \lyricsto "voiceMelody" \verseII } >> \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 076191ee5f..69742408c5 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "chords, template" @@ -51,3 +51,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 70c93f7ee6..324c30fe5a 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, template" @@ -58,3 +58,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 4bdbd0de3f..21844ecfdf 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "template" @@ -42,3 +42,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 803c57ccd1..1c48689154 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, vocal-music" @@ -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 e5d0dc5911..cfe80eab3b 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, vocal-music" @@ -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 92b15d4b9a..8c321d8499 100644 --- a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly +++ b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks, unfretted-strings" @@ -63,3 +63,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 1abd1db271..8e074d5aa1 100644 --- a/input/lsr/specifying-context-with-beatgrouping.ly +++ b/input/lsr/specifying-context-with-beatgrouping.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "rhythms, tweaks-and-overrides" + texidoces = " Mediante la especificación del contexto, el efecto de @code{beatGrouping} puede limitarse al contexto especificado, y @@ -12,18 +14,16 @@ altos: " doctitlees = "Especificar el contexto con 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 ef7219f27a..ae1eeba66a 100644 --- a/input/lsr/stand-alone-two-column-markup.ly +++ b/input/lsr/stand-alone-two-column-markup.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text" @@ -21,26 +21,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 602dcc865f..51ca6a01fa 100644 --- a/input/lsr/stem-and-beam-behavior-in-tablature.ly +++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "fretted-strings" @@ -12,6 +12,17 @@ poner horizontales, como se muestra en este ejemplo. " doctitlees = "Comportamiento de las plicas y las barras de corchea en tablaturas" + +%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839 + + texidocfr = " +La direction des hampes se gère dans les tablatures tout comme en +notation traditionnelle. Les ligatures peuvvent être mises à l'horizontale +comme le montre cet exemple. + +" + doctitlefr = "Hampes et ligatures en mode tablature" + texidoc = " The direction of stems is controlled the same way in tablature as in traditional notation. Beams can be made horizontal, as shown in this @@ -29,3 +40,4 @@ example. g,,16 b d g b d g b } } + diff --git a/input/lsr/stemlets.ly b/input/lsr/stemlets.ly index ebb096ac5c..a38fd2e0b2 100644 --- a/input/lsr/stemlets.ly +++ b/input/lsr/stemlets.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -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 72ff6105f2..2557eb3abc 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "unfretted-strings, template" @@ -79,3 +79,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 c6d4613aca..36ff573cb2 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "unfretted-strings, template" @@ -161,3 +161,4 @@ music = { } %} + diff --git a/input/lsr/sub-dividing-beams.ly b/input/lsr/sub-dividing-beams.ly index cdc16b747e..ed6f2584c5 100644 --- a/input/lsr/sub-dividing-beams.ly +++ b/input/lsr/sub-dividing-beams.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -55,3 +55,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 50cfa3ccef..d3cecd2370 100644 --- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly +++ b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly @@ -1,21 +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. -\version "2.12.0" +\version "2.12.3" + \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 a669f51cba..491f6a6968 100644 --- a/input/lsr/table-of-contents.ly +++ b/input/lsr/table-of-contents.ly @@ -1,15 +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. -\version "2.12.0" +\version "2.12.3" + \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 67e43fe024..7c846c5347 100644 --- a/input/lsr/template.snippet-list +++ b/input/lsr/template.snippet-list @@ -1,6 +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 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 748af521de..649e13cf62 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -1,6 +1,8 @@ +adding-the-current-date-to-a-score.ly adjusting-lyrics-vertical-spacing.ly aligning-and-centering-instrument-names.ly aligning-marks-with-various-notation-objects.ly +aligning-objects-created-with-the--mark-command.ly blanking-staff-lines-using-the--whiteout-command.ly center-text-below-hairpin-dynamics.ly changing-the-default-text-font-family.ly @@ -15,13 +17,15 @@ 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 printing-marks-at-the-end-of-a-line-or-a-score.ly printing-marks-on-every-staff.ly +printing-text-from-right-to-left.ly 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 9e94044ccd..896593aa7a 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms, text" @@ -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 458e522b58..a49da4a4d4 100644 --- a/input/lsr/tick-bar-lines.ly +++ b/input/lsr/tick-bar-lines.ly @@ -1,11 +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. -\version "2.12.0" +\version "2.12.3" + \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 054c9fb151..c26a7a6802 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, tweaks-and-overrides" @@ -18,3 +18,4 @@ The time signature can be enclosed within parentheses. \time 2/4 a4 b8 c } + diff --git a/input/lsr/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly b/input/lsr/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly new file mode 100644 index 0000000000..8a31255ef5 --- /dev/null +++ b/input/lsr/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly @@ -0,0 +1,40 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + texidoc = " +Sometimes, a time signature should not print the whole fraction (e.g. +7/4), but only the numerator (7 in this case). This can be easily done +by using \\override Staff.TimeSignature #'style = #'single-digit to +change the style permanently. By using \\revert Staff.TimeSignature +#'style, this setting can be reversed. To apply the single-digit style +to only one time signature, use the \\override command and prefix it +with a \\once. + +" + doctitle = "Time signature printing only the numerator as a number (instead of the fraction)" +} % begin verbatim + +\relative c'' { + \time 3/4 + c4 c c + % Change the style permanently + \override Staff.TimeSignature #'style = #'single-digit + \time 2/4 + c c + \time 3/4 + c c c + % Revert to default style: + \revert Staff.TimeSignature #'style + \time 2/4 + c c + % single-digit style only for the next time signature + \once \override Staff.TimeSignature #'style = #'single-digit + \time 5/4 + c c c c c + \time 2/4 + c c +} diff --git a/input/lsr/titles.snippet-list b/input/lsr/titles.snippet-list index a21553f161..0b2c5c162f 100644 --- a/input/lsr/titles.snippet-list +++ b/input/lsr/titles.snippet-list @@ -1,3 +1,4 @@ adding-the-current-date-to-a-score.ly aligning-and-centering-instrument-names.ly demonstrating-all-headers.ly +outputting-the-version-number.ly diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly index ddfaf91613..056c540250 100644 --- a/input/lsr/transcription-of-ancient-music-with-incipit.ly +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "ancient-notation, tweaks-and-overrides" @@ -288,3 +288,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 d6b7695aa4..138606c341 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "pitches" + doctitlees = "Transportar música con el menor número de alteraciones" texidoces = " Este ejemplo utiliza código de Scheme para forzar las @@ -62,41 +65,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)) @@ -112,9 +112,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 136787c5dd..d3fbef3b4e 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" @@ -153,3 +153,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 new file mode 100644 index 0000000000..e6875bee91 --- /dev/null +++ b/input/lsr/tweaking-grace-layout-within-music.ly @@ -0,0 +1,29 @@ +%% 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.12.3" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + 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. + +" + doctitle = "Tweaking grace layout within music" +} % begin verbatim + +\relative c'' { + \new Staff { + #(remove-grace-property 'Voice 'Stem 'direction) + #(add-grace-property 'Voice 'NoteHead 'style 'cross) + \new Voice { + \acciaccatura { f16 } g4 + \grace { d16[ e] } f4 + \appoggiatura { f,32[ g a] } e2 + } + } +} diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index 0c246b2e14..efcbf26794 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,23 +24,31 @@ 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 printing-metronome-and-rehearsal-marks-below-the-staff.ly proportional-strict-notespacing.ly 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 +time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.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 988e728318..fcbbbbd171 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "staff-notation, contexts-and-engravers" @@ -29,3 +29,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 616597a18a..c148611cfa 100644 --- a/input/lsr/using-beatlength-and-beatgrouping.ly +++ b/input/lsr/using-beatlength-and-beatgrouping.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. -\version "2.12.0" +\version "2.12.3" \header { + lsrtags = "rhythms, tweaks-and-overrides" + texidoces = " La propiedad @code{measureLength} determina dónde se deben insertar líneas divisorias y, con @code{beatLength} y @code{beatGrouping}, cómo @@ -15,20 +17,18 @@ explicaciones están en forma de comentarios dentro del código. " doctitlees = "Utilización de beatLength y 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 @@ -63,4 +63,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 ea8a4889e3..47f82c267f 100644 --- a/input/lsr/using-double-slurs-for-legato-chords.ly +++ b/input/lsr/using-double-slurs-for-legato-chords.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -32,3 +32,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 new file mode 100644 index 0000000000..586ad5bf8c --- /dev/null +++ b/input/lsr/using-grace-note-slashes-with-normal-heads.ly @@ -0,0 +1,20 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.12.3" + +\header { + lsrtags = "rhythms" + + texidoc = " +The slash through the stem found in acciaccaturas can be applied in +other situations. + +" + doctitle = "Using grace note slashes with normal heads" +} % begin verbatim + +\relative c'' { + \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 28143c8faa..e02b27e861 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "editorial-annotations, tweaks-and-overrides" @@ -48,3 +48,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 04b33750c0..23c0ca66b3 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,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. -\version "2.12.0" +\version "2.12.3" + \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) @@ -21,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 4ef94434c3..b0c83267c8 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "rhythms" @@ -50,3 +50,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 3fed51ec10..fd892f4c60 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,6 +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. -\version "2.12.0" +\version "2.12.3" + +\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 @@ -18,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/vertical-line-as-a-baroque-articulation-mark.ly b/input/lsr/vertical-line-as-a-baroque-articulation-mark.ly new file mode 100644 index 0000000000..5af736d832 --- /dev/null +++ b/input/lsr/vertical-line-as-a-baroque-articulation-mark.ly @@ -0,0 +1,36 @@ +%% 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.12.3" + +\header { + lsrtags = "expressive-marks, ancient-notation" + + texidoc = " +This short vertical line placed above the note is commonly used in +baroque music. Its meaning can vary, but generally indicates notes +that should be played with more \"weight\". The following example +demonstrates how to achieve such a notation. + +" + doctitle = "Vertical line as a baroque articulation mark" +} % begin verbatim + +upline = +#(let* ((m (make-music 'ArticulationEvent + 'articulation-type "stopped" + 'direction 1))) + (ly:music-set-property! m 'tweaks + (acons 'font-size 3 + (acons 'text (markup + #:postscript " + .15 setlinewidth + 0 -1 0 1.5 lineto + stroke") + (acons 'stencil ly:text-interface::print + (ly:music-property m 'tweaks))))) + m) + + +\relative c' { + a'^\upline a( c a) +} diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly index 3c07af3716..97116f9872 100644 --- a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "tweaks-and-overrides, spacing" @@ -59,3 +59,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 9f6baade12..4dc951213c 100644 --- a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly +++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "expressive-marks" @@ -30,3 +30,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 138e0abe94..ef3f3d6394 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, tweaks-and-overrides, spacing" @@ -50,3 +50,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 592a3700a6..136b57b014 100644 --- a/input/lsr/vertically-centered-common-lyrics.ly +++ b/input/lsr/vertically-centered-common-lyrics.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music" @@ -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 bd4605d93c..adceb33224 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, keyboards, template" @@ -115,3 +115,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 7543e89160..a8995f7073 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 @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "text, vocal-music, contexts-and-engravers, template" @@ -93,3 +93,4 @@ bassWords = \lyricmode { } } } + diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index 0b529e3767..ec83303759 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -1,6 +1,6 @@ %% 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.12.0" +\version "2.12.3" \header { lsrtags = "vocal-music, template" @@ -106,3 +106,4 @@ bassWords = \lyricmode { } } } + diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly index 4f5934e67a..55640fe17b 100644 --- a/input/lsr/volta-below-chords.ly +++ b/input/lsr/volta-below-chords.ly @@ -1,7 +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. -\version "2.12.0" +\version "2.12.3" + \header { + lsrtags = "repeats, staff-notation, chords" + texidoces = " Mediante la adición del grabador @code{Volta_engraver} al pentagrama pertinente, se pueden poner los corchetes de primera y @@ -10,12 +13,13 @@ segunda vez debajo de los acordes. " doctitlees = "Corchetes de primera y segunda vez debajo de los acordes" - 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 b89cca5af8..022b46a8e5 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,14 +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. -\version "2.12.0" +\version "2.12.3" + \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 4ea2d1952d..9bcfdd1d58 100644 --- a/input/lsr/volta-text-markup-using-repeatcommands.ly +++ b/input/lsr/volta-text-markup-using-repeatcommands.ly @@ -1,22 +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. -\version "2.12.0" +\version "2.12.3" \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/lsr/world-music.snippet-list b/input/lsr/world-music.snippet-list index 51938cbb25..ff88b90b47 100644 --- a/input/lsr/world-music.snippet-list +++ b/input/lsr/world-music.snippet-list @@ -1,2 +1,3 @@ arabic-improvisation.ly makam-example.ly +printing-text-from-right-to-left.ly diff --git a/input/new/aligning-and-centering-instrument-names.ly b/input/new/aligning-and-centering-instrument-names.ly deleted file mode 100644 index 6ad24e927d..0000000000 --- a/input/new/aligning-and-centering-instrument-names.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "2.12.0" - -\header { - 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." - doctitle = "Aligning and centering instrument names" -} - -\paper { - left-margin = 3\cm -} - -\score { - \new StaffGroup << - \new Staff { - \override Staff.InstrumentName #'self-alignment-X = #LEFT - \set Staff.instrumentName = \markup \left-column { - "Left aligned" - "instrument name" - } - \set Staff.shortInstrumentName = #"Left" - c''1 - \break - c''1 - } - \new Staff { - \override Staff.InstrumentName #'self-alignment-X = #CENTER - \set Staff.instrumentName = \markup \center-column { - Centered - "instrument name" - } - \set Staff.shortInstrumentName = #"Centered" - g'1 - g'1 - } - \new Staff { - \override Staff.InstrumentName #'self-alignment-X = #RIGHT - \set Staff.instrumentName = \markup \right-column { - "Right aligned" - "instrument name" - } - \set Staff.shortInstrumentName = #"Right" - e'1 - e'1 - } - >> - \layout { - ragged-right = ##t - indent = 4\cm - short-indent = 2\cm - } -} diff --git a/input/new/aligning-marks-with-various-notation-objects.ly b/input/new/aligning-marks-with-various-notation-objects.ly deleted file mode 100644 index 79f78ef938..0000000000 --- a/input/new/aligning-marks-with-various-notation-objects.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "text" - 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)." - doctitle = "Aligning marks with various notation objects" -} - -\relative c' { - e1 - - % the RehearsalMark will be centered above the Clef - \override Score.RehearsalMark #'break-align-symbols = #'(clef) - \key a \major - \clef treble - \mark "↓" - e1 - - % the RehearsalMark will be centered above the TimeSignature - \override Score.RehearsalMark #'break-align-symbols = #'(time-signature) - \key a \major - \clef treble - \time 3/4 - \mark "↓" - e2. - - % the RehearsalMark will be centered above the KeySignature - \override Score.RehearsalMark #'break-align-symbols = #'(key-signature) - \key a \major - \clef treble - \time 4/4 - \mark "↓" - e1 - - \break - e1 - - % the RehearsalMark will be aligned with the left edge of the KeySignature - \once \override Score.KeySignature #'break-align-anchor-alignment = #LEFT - \mark "↓" - \key a \major - e1 - - % the RehearsalMark will be aligned with the right edge of the KeySignature - \once \override Score.KeySignature #'break-align-anchor-alignment = #RIGHT - \key a \major - \mark "↓" - e1 - - % the RehearsalMark will be aligned with the left edge of the KeySignature - % and then shifted right by one unit. - \once \override Score.KeySignature #'break-align-anchor = #1 - \key a \major - \mark "↓" - e1 -} diff --git a/input/new/arabic-improvisation.ly b/input/new/arabic-improvisation.ly deleted file mode 100644 index 06348916f5..0000000000 --- a/input/new/arabic-improvisation.ly +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.12.0" - -\header { - 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" -} - -\include "arabic.ly" - -\relative sol' { - \key re \kurd - #(set-accidental-style 'forget) - \cadenzaOn - sol4 sol sol sol fad mib sol1 fad8 mib re4. r8 mib1 fad sol -} diff --git a/input/new/book-parts.ly b/input/new/book-parts.ly deleted file mode 100644 index 33a624caba..0000000000 --- a/input/new/book-parts.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "2.12.0" - -\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-bottom-last}. -Header and footer markups can detect a part last page, and make the -difference with the book last page. -" - doctitle = "Book parts" -} - -#(set-default-paper-size "a6") - -\book { - - %% book paper, which is inherited by all children bookparts - \paper { - ragged-last-bottom = ##t - %% Page footer: add a different part-tagline at part last page - oddFooterMarkup = \markup { - \column { - \fill-line { - %% Copyright header field only on book first page. - \on-the-fly #first-page \fromproperty #'header:copyright - } - \fill-line { - %% Part tagline header field only on each part last page. - \on-the-fly #part-last-page \fromproperty #'header:parttagline - } - \fill-line { - %% Tagline header field only on book last page. - \on-the-fly #last-page \fromproperty #'header:tagline - } - } - } - } - - %% book header, which is inherited by the first bookpart - \header { - title = "Book title" - copyright = "Copyright line on book first page" - parttagline = "Part tagline" - tagline = "Book tagline" - } - - \bookpart { - %% a different page breaking function may be used on each part - \paper { #(define page-breaking optimal-page-breaks) } - \header { subtitle = "First part" } - \markup { The first book part } - \markup { a page break } - \pageBreak - \markup { first part last page } - \markup \wordwrap { with ragged-last-bottom (see the space below this text) } - } - - \bookpart { - \header { subtitle = "Second part" } - { c' } - } - -} diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly deleted file mode 100644 index 839b361065..0000000000 --- a/input/new/broken-crescendo-hairpin.ly +++ /dev/null @@ -1,49 +0,0 @@ -\version "2.12.0" - -\header { - 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 -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. -" - doctitle = "Broken crescendo hairpin" -} - -\relative c' { - << { - \dynamicUp - \override DynamicLineSpanner #'staff-padding = #4 - r2 r16 c'8.\pp r4 - } - \\ - { - \override DynamicLineSpanner #'layer = #0 - des,2\mf\< ~ - \override TextScript #'layer = #2 - des16_\markup { - \postscript #" - 1.9 -8 translate - 5 4 scale - 1 setgray - 0 0 moveto - 0 1 lineto - 1 1 lineto - 1 0 lineto - 0 0 lineto - fill" - } - r8. des4 ~ des16->\sff - } >> -} diff --git a/input/new/center-text-below-hairpin-dynamics.ly b/input/new/center-text-below-hairpin-dynamics.ly deleted file mode 100644 index 769f735fb3..0000000000 --- a/input/new/center-text-below-hairpin-dynamics.ly +++ /dev/null @@ -1,35 +0,0 @@ -\version "2.12.0" - -\header { - 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" -} - -hairpinWithCenteredText = -#(define-music-function (parser location text) (markup?) -#{ - \override Voice.Hairpin #'stencil = #(lambda (grob) - (ly:stencil-aligned-to - (ly:stencil-combine-at-edge - (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER) - Y DOWN - (ly:stencil-aligned-to (grob-interpret-markup grob $text) X CENTER)) - X LEFT)) -#}) - -hairpinMolto = \hairpinWithCenteredText \markup { \italic molto } -hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo } - -\layout { ragged-right = ##f } - -{ - \hairpinMolto c'2\< c'\f - \hairpinMore c'2\< c'\f -} diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly deleted file mode 100644 index 2803fc5842..0000000000 --- a/input/new/changing-form-of-multi--measure-rests.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.12.0" -\header { - 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" -} - -\relative c'' { - \compressFullBarRests - R1*2 | R1*5 | R1*9 - \override MultiMeasureRest #'expand-limit = #3 - R1*2 | R1*5 | R1*9 -} diff --git a/input/new/changing-properties-for-individual-grobs.ly b/input/new/changing-properties-for-individual-grobs.ly deleted file mode 100644 index 714ae7e172..0000000000 --- a/input/new/changing-properties-for-individual-grobs.ly +++ /dev/null @@ -1,37 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "tweaks-and-overrides" - - texidoc = " -The @code{\\applyOutput} command allows the tuning of any layout -object, in any context. It requires a Scheme function with three -arguments." - - doctitle = "Changing properties for individual grobs" -} - -#(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) - (begin - (ly:grob-set-property! grob 'stencil - (grob-interpret-markup grob - (make-lower-markup 0.5 - (case sp - ((-5) "m") - ((-3) "c ") - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else "bla") - )))) - )))) - -\relative c' { - 2 - \applyOutput #'Voice #mc-squared - 2 -} diff --git a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly deleted file mode 100644 index 956f3bdcbe..0000000000 --- a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "2.12.0" -\header { - 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}: -" - doctitle = "Changing text and spanner styles for text dynamics" -} - -\relative c'' { - \set crescendoText = \markup { \italic { cresc. poco } } - \set crescendoSpanner = #'text - \override DynamicTextSpanner #'style = #'dotted-line - a2\< a - a2 a - a2 a - a2 a\mf -} diff --git a/input/new/changing-the-tempo-without-a-metronome-mark.ly b/input/new/changing-the-tempo-without-a-metronome-mark.ly deleted file mode 100644 index f64adcc61e..0000000000 --- a/input/new/changing-the-tempo-without-a-metronome-mark.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "staff-notation" - texidoc = "To change the tempo in MIDI output without printing -anything, make the metronome mark invisible:" - - doctitle = "Changing the tempo without a metronome mark" -} - -\score { - \new Staff \relative c' { - \tempo 4 = 160 - c4 e g b - c4 b d c - \set Score.tempoHideNote = ##t - \tempo 4 = 96 - d,4 fis a cis - d4 cis e d - } - \layout { } - \midi { } -} diff --git a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly deleted file mode 100644 index f7007eb1ce..0000000000 --- a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ /dev/null @@ -1,43 +0,0 @@ -\version "2.12.0" -\header { - 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}" -} - -\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/new/clip-systems.ly b/input/new/clip-systems.ly deleted file mode 100644 index 49532ac21e..0000000000 --- a/input/new/clip-systems.ly +++ /dev/null @@ -1,89 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or -% "Special output" might be more adequate -jm - texidoc = " -This code shows how to clip (extract) snippets from a full score. - -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}. - -@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. - -@end itemize -" - doctitle = "Clip systems" -} - -#(ly:set-option 'clip-systems) -#(set! output-count 1) - -origScore = \score { - \relative c' { - \set Staff.instrumentName = #"bla" - c1 - d1 - \grace c16 e1 - \key d \major - f1 \break - \clef bass - g,1 - fis1 - } -} - -\book { - \score { - \origScore - \layout { - % Each clip-region is a (START . END) pair - % where both are rhythmic-locations. - - % (make-rhythmic-locations BAR-NUMBER NUM DEN) - % means NUM/DEN whole-notes into bar numbered BAR-NUMBER - - clip-regions = #(list - (cons - (make-rhythmic-location 2 0 1) - (make-rhythmic-location 4 0 1)) - - (cons - (make-rhythmic-location 0 0 1) - (make-rhythmic-location 4 0 1)) - - (cons - (make-rhythmic-location 0 0 1) - (make-rhythmic-location 6 0 1)) - ) - } - } -} - -#(set! output-count 0) -#(ly:set-option 'clip-systems #f) - -\book { - \score { \origScore } - \markup { \bold \fontsize #6 clips } - \score { - \lyrics { - \markup { from-2.0.1-to-4.0.1-clip.eps } - \markup { - \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" - (ly:parser-output-name parser)) } - } - } -} diff --git a/input/new/coloring-notes-depending-on-their-pitch.ly b/input/new/coloring-notes-depending-on-their-pitch.ly deleted file mode 100644 index 6359c293ae..0000000000 --- a/input/new/coloring-notes-depending-on-their-pitch.ly +++ /dev/null @@ -1,54 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "pitches,editorial-annotations,really-cool" - 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. -" - doctitle = "Coloring notes depending on their pitch" -} - -%LSR Thanks a LOT to Damian leGassick, Steven Weber and Jay Anderson for this snippet - -%Association list of pitches to colors. -#(define color-mapping - (list - (cons (ly:make-pitch 0 0 0) (x11-color 'red)) - (cons (ly:make-pitch 0 0 1/2) (x11-color 'green)) - (cons (ly:make-pitch 0 1 -1/2) (x11-color 'green)) - (cons (ly:make-pitch 0 2 0) (x11-color 'red)) - (cons (ly:make-pitch 0 2 1/2) (x11-color 'green)) - (cons (ly:make-pitch 0 3 -1/2) (x11-color 'red)) - (cons (ly:make-pitch 0 3 0) (x11-color 'green)) - (cons (ly:make-pitch 0 4 1/2) (x11-color 'red)) - (cons (ly:make-pitch 0 5 0) (x11-color 'green)) - (cons (ly:make-pitch 0 5 -1/2) (x11-color 'red)) - (cons (ly:make-pitch 0 6 1/2) (x11-color 'red)) - (cons (ly:make-pitch 0 1 0) (x11-color 'blue)) - (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)) - )) - -%Compare pitch and alteration (not octave). -#(define (pitch-equals? p1 p2) - (and - (= (ly:pitch-alteration p1) (ly:pitch-alteration p2)) - (= (ly:pitch-notename p1) (ly:pitch-notename p2)))) - -#(define (pitch-to-color pitch) - (let ((color (assoc pitch color-mapping pitch-equals?))) - (if color - (cdr color)))) - -#(define (color-notehead grob) - (pitch-to-color - (ly:event-property (ly:grob-property grob 'cause) 'pitch))) - -\score { - \new Staff \relative c' { - \override NoteHead #'color = #color-notehead - c8 b d dis ees f g aes - } -} diff --git a/input/new/compound-time-signatures.ly b/input/new/compound-time-signatures.ly deleted file mode 100644 index b55a3fdc12..0000000000 --- a/input/new/compound-time-signatures.ly +++ /dev/null @@ -1,34 +0,0 @@ -\version "2.12.0" - -\header { - 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 -more inequal metrics. LilyPond can make such music quite easy to read -and play, by explicitly printing the compound time signatures and -adapting the automatic beaming behavior. (Graphic measure grouping -indications can also be added; see the appropriate snippet in this -database.) - -" - doctitle = "Compound time signatures" -} - -#(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)))) - ))) - -\relative c' { - \override Staff.TimeSignature #'stencil = #(compound-time "2" "3" "8") - \time 5/8 - #(override-auto-beam-setting '(end 1 8 5 8) 1 4) - c8 d e fis gis - c8 fis, gis e d - c8 d e4 gis8 -} diff --git a/input/new/creating-a-delayed-turn.ly b/input/new/creating-a-delayed-turn.ly deleted file mode 100644 index 16df65b606..0000000000 --- a/input/new/creating-a-delayed-turn.ly +++ /dev/null @@ -1,28 +0,0 @@ -\version "2.12.0" - -\header { - 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." - - doctitle = "Creating a delayed turn" -} - -\relative c'' { - \once \override TextScript #'avoid-slur = #'inside - \once \override TextScript #'outside-staff-priority = ##f - c2(^\markup \tiny \override #'(baseline-skip . 1) { - \halign #-4 - \center-column { - \sharp - \musicglyph #"scripts.turn" - } - } - d4.) c8 -} diff --git a/input/new/creating-metronome-marks-in-markup-mode.ly b/input/new/creating-metronome-marks-in-markup-mode.ly deleted file mode 100644 index bb1379bdfd..0000000000 --- a/input/new/creating-metronome-marks-in-markup-mode.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "staff-notation" - 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" -} - -\relative c' { - \tempo \markup { - \concat { - ( - \smaller \general-align #Y #DOWN \note #"16." #1 - " = " - \smaller \general-align #Y #DOWN \note #"8" #1 - ) - } - } - c1 - c4 c' c,2 -} diff --git a/input/new/creating-simultaneous-rehearsal-marks.ly b/input/new/creating-simultaneous-rehearsal-marks.ly deleted file mode 100644 index 2f065dd3be..0000000000 --- a/input/new/creating-simultaneous-rehearsal-marks.ly +++ /dev/null @@ -1,38 +0,0 @@ -\version "2.12.0" -\header { - 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. - -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" -} - -% LSR: Thanks to Risto Vääräniemi for this snippet - -{ - \key a \major - \set Score.markFormatter = #format-mark-box-letters - \once \override Score.RehearsalMark #'outside-staff-priority = #5000 - \once \override Score.RehearsalMark #'self-alignment-X = #LEFT - \once \override Score.RehearsalMark #'break-align-symbols = #'(key-signature) - \mark \markup { \bold { Senza denti } } - - % the hidden measure and bar line - \once \override Score.TimeSignature #'stencil = ##f - \time 1/16 - s16 \bar "" - - \time 4/4 - \once \override Score.RehearsalMark #'self-alignment-X = #LEFT - \once \override Score.RehearsalMark #'break-align-symbols = #'(bar-line) - \mark \markup { \box \bold Intro } - d'1 - \mark \default - d'1 -} diff --git a/input/new/creating-text-spanners.ly b/input/new/creating-text-spanners.ly deleted file mode 100644 index 0d89056fb5..0000000000 --- a/input/new/creating-text-spanners.ly +++ /dev/null @@ -1,47 +0,0 @@ -\version "2.12.0" - -\header { - 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." - - doctitle = "Creating text spanners" -} - -\paper { ragged-right = ##f } - -\relative c'' { - \override TextSpanner #'(bound-details left text) = #"bla" - \override TextSpanner #'(bound-details right text) = #"blu" - a4 \startTextSpan - b4 c - a4 \stopTextSpan - - \override TextSpanner #'style = #'line - \once \override TextSpanner - #'(bound-details left stencil-align-dir-y) = #CENTER - a4 \startTextSpan - b4 c - a4 \stopTextSpan - - \override TextSpanner #'style = #'dashed-line - \override TextSpanner #'(bound-details left text) = - \markup { \draw-line #'(0 . 1) } - \override TextSpanner #'(bound-details right text) = - \markup { \draw-line #'(0 . -2) } - \once \override TextSpanner #'(bound-details right padding) = #-2 - - a4 \startTextSpan - b4 c - a4 \stopTextSpan - - \set Staff.middleCPosition = #-13 - \override TextSpanner #'dash-period = #10 - \override TextSpanner #'dash-fraction = #0.5 - \override TextSpanner #'thickness = #10 - a4 \startTextSpan - b4 c - a4 \stopTextSpan -} diff --git a/input/new/customizing-fretboard-fret-diagrams.ly b/input/new/customizing-fretboard-fret-diagrams.ly deleted file mode 100644 index 1f4d8cb2b5..0000000000 --- a/input/new/customizing-fretboard-fret-diagrams.ly +++ /dev/null @@ -1,68 +0,0 @@ -\version "2.12.0" - -\header { - 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. - -" - doctitle = "Customizing fretboard fret diagrams" -} - -\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 } - } - \new FretBoards { - % Set global properties of fret diagram - \override FretBoards.FretBoard #'size = #'1.2 - \override FretBoard - #'(fret-diagram-details finger-code) = #'in-dot - \override FretBoard - #'(fret-diagram-details dot-color) = #'white - \chordmode { - c - \once \override FretBoard #'size = #'1.0 - \once \override FretBoard - #'(fret-diagram-details barre-type) = #'straight - \once \override FretBoard - #'(fret-diagram-details dot-color) = #'black - \once \override FretBoard - #'(fret-diagram-details finger-code) = #'below-string - c' - \once \override FretBoard - #'(fret-diagram-details barre-type) = #'none - \once \override FretBoard - #'(fret-diagram-details number-type) = #'arabic - \once \override FretBoard - #'(fret-diagram-details orientation) = #'landscape - \once \override FretBoard - #'(fret-diagram-details mute-string) = #"M" - \once \override FretBoard - #'(fret-diagram-details label-dir) = #LEFT - \once \override FretBoard - #'(fret-diagram-details dot-color) = #'black - c' - \once \override FretBoard - #'(fret-diagram-details finger-code) = #'below-string - \once \override FretBoard - #'(fret-diagram-details dot-radius) = #0.35 - \once \override FretBoard - #'(fret-diagram-details dot-position) = #0.5 - \once \override FretBoard - #'(fret-diagram-details fret-count) = #3 - d - } - } - \new Voice { - c'1 c' c' d' - } ->> diff --git a/input/new/customizing-markup-fret-diagrams.ly b/input/new/customizing-markup-fret-diagrams.ly deleted file mode 100644 index c3d03fd9b1..0000000000 --- a/input/new/customizing-markup-fret-diagrams.ly +++ /dev/null @@ -1,90 +0,0 @@ -\version "2.12.0" - -\header { - 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. -" - doctitle = "Customizing markup fret diagrams" -} - -<< - \chords { c1 c c d } - - \new Voice = "mel" { - \textLengthOn - % Set global properties of fret diagram - \override TextScript #'size = #'1.2 - \override TextScript - #'(fret-diagram-details finger-code) = #'in-dot - \override TextScript - #'(fret-diagram-details dot-color) = #'white - - %% C major for guitar, no barre, using defaults - % terse style - c'1^\markup { \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;" } - - %% C major for guitar, barred on third fret - % verbose style - % size 1.0 - % roman fret label, finger labels below string, straight barre - c'1^\markup { - % standard size - \override #'(size . 1.0) { - \override #'(fret-diagram-details . ( - (number-type . roman-lower) - (finger-code . in-dot) - (barre-type . straight))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, barred on third fret - % verbose style - % landscape orientation, arabic numbers, M for mute string - % no barre, fret label down or left, small mute label font - c'1^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (number-type . arabic) - (label-dir . -1) - (mute-string . "M") - (orientation . landscape) - (barre-type . none) - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 5 1 3)) - } - } - - %% simple D chord - % terse style - % larger dots, centered dots, fewer frets - % label below string - d'1^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (dot-position . 0.5) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - } ->> diff --git a/input/new/defining-predefined-fretboards-for-other-instruments.ly b/input/new/defining-predefined-fretboards-for-other-instruments.ly deleted file mode 100644 index f38d4a2fbe..0000000000 --- a/input/new/defining-predefined-fretboards-for-other-instruments.ly +++ /dev/null @@ -1,106 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "fretted-strings" - texidoc = "Predefined fret diagrams can be added for new instruments -in addition to the standards used for guitar. This file shows how -this is done by defining a new string-tuning and a few predefined -fretboards for the Venezuelan cuatro. - -This file also shows how fingerings can be included in the chords -used as reference points for the chord lookup, and displayed in -the fret diagram and the @code{TabStaff}, but not the music. - -These fretboards are not transposable because they contain string -information. This is planned to be corrected in the future. - -" - doctitle = "Defining predefined fretboards for other instruments" -} - -%LSR: Thanks to Jesus Guillermo Andrade for the string-tuning -%LSR: and fretboard information. - -% add FretBoards for the Cuatro -% Note: This section could be put into a separate file -% predefined-cuatro-fretboards.ly -% and \included into each of your compositions - -cuatroTuning = #'(11 18 14 9) - -dSix = { } -dMajor = { } -aMajSeven = { } -dMajSeven = { } -gMajor = { } - -\storePredefinedDiagram \dSix - #cuatroTuning - #"o;o;o;o;" -\storePredefinedDiagram \dMajor - #cuatroTuning - #"o;o;o;3-3;" -\storePredefinedDiagram \aMajSeven - #cuatroTuning - #"o;2-2;1-1;2-3;" -\storePredefinedDiagram \dMajSeven - #cuatroTuning - #"o;o;o;1-1;" -\storePredefinedDiagram \gMajor - #cuatroTuning - #"2-2;o;1-1;o;" - -% end of potential include file /predefined-cuatro-fretboards.ly - - -#(set-global-staff-size 16) - -primerosNames = \chordmode { - d:6 d a:maj7 d:maj7 - g -} -primeros = { - \dSix \dMajor \aMajSeven \dMajSeven - \gMajor -} - -\score { - << - \new ChordNames { - \set chordChanges = ##t - \primerosNames - } - - \new Staff { - \new Voice \with { - \remove "New_fingering_engraver" - } - \relative c'' { - \primeros - } - } - - \new FretBoards { - \set stringTunings = #cuatroTuning - \override FretBoard - #'(fret-diagram-details string-count) = #'4 - \override FretBoard - #'(fret-diagram-details finger-code) = #'in-dot - \primeros - } - - \new TabStaff \relative c'' { - \set TabStaff.stringTunings = #cuatroTuning - \primeros - } - - >> - - \layout { - \context { - \Score - \override SpacingSpanner - #'base-shortest-duration = #(ly:make-moment 1 16) - } - } - \midi { } -} diff --git a/input/new/display-bracket-with-only-one-staff-in-a-system.ly b/input/new/display-bracket-with-only-one-staff-in-a-system.ly deleted file mode 100644 index 87e416b30d..0000000000 --- a/input/new/display-bracket-with-only-one-staff-in-a-system.ly +++ /dev/null @@ -1,38 +0,0 @@ -\version "2.12.0" -\header { - 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. - -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. -" - doctitle = "Display bracket with only one staff in a system" -} - -\markup \left-column { - \score { - \new StaffGroup << - % Must be lower than the actual number of staff lines - \override StaffGroup.SystemStartBracket #'collapse-height = #1 - \override Score.SystemStartBar #'collapse-height = #1 - \new Staff { - c'1 - } - >> - \layout { } - } - \score { - \new PianoStaff << - \override PianoStaff.SystemStartBrace #'collapse-height = #1 - \override Score.SystemStartBar #'collapse-height = #1 - \new Staff { - c'1 - } - >> - \layout { } - } -} diff --git a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly deleted file mode 100644 index f1cd319376..0000000000 --- a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.12.0" - -\header { - 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. - -This snippet shows how to achieve such notation rules. -" - - doctitle = "Dodecaphonic-style accidentals for each note including naturals" -} - -\score { - \new Staff { - #(set-accidental-style 'dodecaphonic) - c'4 dis' cis' cis' - c'4 dis' cis' cis' - c'4 c' dis' des' - } - \layout { - \context { - \Staff - \remove "Key_engraver" - } - } -} diff --git a/input/new/dotted-harmonics.ly b/input/new/dotted-harmonics.ly deleted file mode 100644 index 43cdd3b141..0000000000 --- a/input/new/dotted-harmonics.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.12.0" - -\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}." - doctitle = "Dotted harmonics" -} - -\relative c''' { - \time 3/4 - \key f \major - \set harmonicDots = ##t - 2. ~ - 4. 8( ) - 2. - 2. -} diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly deleted file mode 100644 index 9d53c90cb3..0000000000 --- a/input/new/drawing-boxes-around-grobs.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "tweaks-and-overrides" - texidoc = " -The @code{print-function} can be overridden to draw a box around an -arbitrary grob. -" - doctitle = "Drawing boxes around grobs" -} - -\relative c'' { - \override TextScript #'stencil = - #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) - c'4^"foo" - - \override Stem #'stencil = - #(make-stencil-boxer 0.05 0.25 ly:stem::print) - \override Score.RehearsalMark #'stencil = - #(make-stencil-boxer 0.15 0.3 ly:text-interface::print) - b8 - - \revert Stem #'stencil - c4. c4 - \mark "F" - c1 -} diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly deleted file mode 100644 index 27318e7b78..0000000000 --- a/input/new/drawing-circles-around-various-objects.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "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. -" - doctitle = "Drawing circles around various objects" -} - -\relative c' { - c1 - \set Score.markFormatter = - #(lambda (mark context) - (make-circle-markup (format-mark-numbers mark context))) - \mark \default - c2 d^\markup { - \override #'(thickness . 3) { - \circle \finger 2 - } - } - \override Score.BarNumber #'break-visibility = #all-visible - \override Score.BarNumber #'stencil = - #(make-stencil-circler 0.1 0.25 ly:text-interface::print) -} diff --git a/input/new/fine-tuning-pedal-brackets.ly b/input/new/fine-tuning-pedal-brackets.ly deleted file mode 100644 index e3a2344615..0000000000 --- a/input/new/fine-tuning-pedal-brackets.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "keyboards, tweaks-and-overrides" - texidoc = "The appearance of pedal brackets may be altered in -different ways." - doctitle = "Fine-tuning pedal brackets" -} - -\paper { ragged-right = ##f } -\relative c'' { - c2\sostenutoOn c - c2\sostenutoOff c - \once \override Staff.PianoPedalBracket #'shorten-pair = #'(-7 . -2) - c2\sostenutoOn c - c2\sostenutoOff c - \once \override Staff.PianoPedalBracket #'edge-height = #'(0 . 3) - c2\sostenutoOn c - c2\sostenutoOff c -} diff --git a/input/new/flute-slap-notation.ly b/input/new/flute-slap-notation.ly deleted file mode 100644 index 35f8987060..0000000000 --- a/input/new/flute-slap-notation.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "2.12.0" - -\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. - -" - doctitle = "Flute slap notation" -} - -slap = -#(define-music-function (parser location music) (ly:music?) -#{ - \override NoteHead #'stencil = #(lambda (grob) - (grob-interpret-markup grob - (markup #:musicglyph "scripts.sforzato"))) - \override NoteHead #'extra-offset = #'(0.1 . 0.0) - $music - \revert NoteHead #'stencil - \revert NoteHead #'extra-offset -#}) - -\relative c' { - c4 \slap c d r \slap { g a } b r -} diff --git a/input/new/fret-diagrams-explained-and-developed.ly b/input/new/fret-diagrams-explained-and-developed.ly deleted file mode 100644 index 971dd0e4e7..0000000000 --- a/input/new/fret-diagrams-explained-and-developed.ly +++ /dev/null @@ -1,343 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "fretted-strings,tweaks-and-overrides" - texidoc = "This snippet shows many possibilities for obtaining -and tweaking fret diagrams." - doctitle = "Fret diagrams explained and developed" -} - -<< - \chords { - a2 a - \repeat unfold 3 { - c c c d d - } - } - - \new Voice = "mel" { - \textLengthOn - % Set global properties of fret diagram - \override TextScript #'size = #1.2 - \override TextScript - #'fret-diagram-details #'finger-code = #'below-string - \override TextScript #'fret-diagram-details #'dot-color = #'black - - %% A chord for ukelele - a'2^\markup { - \override #'(fret-diagram-details . ( - (string-count . 4) - (dot-color . white) - (finger-code . in-dot))) { - \fret-diagram #"4-2-2;3-1-1;2-o;1-o;" - } - } - - %% A chord for ukelele, with formatting defined in definition string - % 1.2 * size, 4 strings, 4 frets, fingerings below string - % dot radius .35 of fret spacing, dot position 0.55 of fret spacing - a'2^\markup { - \override #'(fret-diagram-details . ( - (dot-color . white) - (open-string . "o"))) { - \fret-diagram #"s:1.2;w:4;h:3;f:2;d:0.35;p:0.55;4-2-2;3-1-1;2-o;1-o;" - } - } - - %% These chords will be in normal orientation - - %% C major for guitar, barred on third fret - % verbose style - % roman fret label, finger labels below string, straight barre - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . roman-lower) - (finger-code . below-string) - (barre-type . straight))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, barred on third fret - %% Double barre used to test barre function - % verbose style - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . arabic) - (dot-label-font-mag . 0.9) - (finger-code . in-dot) - (fret-label-font-mag . 0.6) - (fret-label-vertical-offset . 0) - (label-dir . -1) - (mute-string . "M") - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 4 2 5) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, with capo on third fret - % verbose style - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . roman-upper) - (dot-label-font-mag . 0.9) - (finger-code . none) - (fret-label-vertical-offset . 0.5) - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (capo 3) - (open 5) - (place-fret 4 5 1) - (place-fret 3 5 2) - (place-fret 2 5 3) - (open 1)) - } - } - } - - %% simple D chord - d'2^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (string-thickness-factor . 0.3) - (dot-position . 0.5) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - - %% simple D chord, large top fret thickness - d'2^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (dot-position . 0.5) - (top-fret-thickness . 7) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - - % These chords will be in landscape orientation - \override TextScript - #'fret-diagram-details #'orientation = #'landscape - - %% C major for guitar, barred on third fret - % verbose style - % roman fret label, finger labels below string, straight barre - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . roman-lower) - (finger-code . below-string) - (barre-type . straight))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, barred on third fret - %% Double barre used to test barre function - % verbose style - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . arabic) - (dot-label-font-mag . 0.9) - (finger-code . in-dot) - (fret-label-font-mag . 0.6) - (fret-label-vertical-offset . 0) - (label-dir . -1) - (mute-string . "M") - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 4 2 5) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, with capo on third fret - % verbose style - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . roman-upper) - (dot-label-font-mag . 0.9) - (finger-code . none) - (fret-label-vertical-offset . 0.5) - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (capo 3) - (open 5) - (place-fret 4 5 1) - (place-fret 3 5 2) - (place-fret 2 5 3) - (open 1)) - } - } - } - - %% simple D chord - d'2^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (dot-position . 0.5) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - - %% simple D chord, large top fret thickness - d'2^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (dot-position . 0.5) - (top-fret-thickness . 7) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - - % These chords will be in opposing-landscape orientation - \override TextScript #'fret-diagram-details - #'orientation = #'opposing-landscape - - %% C major for guitar, barred on third fret - % verbose style - % roman fret label, finger labels below string, straight barre - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . roman-lower) - (finger-code . below-string) - (barre-type . straight))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, barred on third fret - %% Double barre used to test barre function - % verbose style - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . arabic) - (dot-label-font-mag . 0.9) - (finger-code . in-dot) - (fret-label-font-mag . 0.6) - (fret-label-vertical-offset . 0) - (label-dir . -1) - (mute-string . "M") - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (place-fret 5 3 1) - (place-fret 4 5 2) - (place-fret 3 5 3) - (place-fret 2 5 4) - (place-fret 1 3 1) - (barre 4 2 5) - (barre 5 1 3)) - } - } - } - - %% C major for guitar, with capo on third fret - % verbose style - c'2^\markup { - % 110% of default size - \override #'(size . 1.1) { - \override #'(fret-diagram-details . ( - (number-type . roman-upper) - (dot-label-font-mag . 0.9) - (finger-code . none) - (fret-label-vertical-offset . 0.5) - (xo-font-magnification . 0.4) - (xo-padding . 0.3))) { - \fret-diagram-verbose #'((mute 6) - (capo 3) - (open 5) - (place-fret 4 5 1) - (place-fret 3 5 2) - (place-fret 2 5 3) - (open 1)) - } - } - } - - %% simple D chord - d'2^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (dot-position . 0.5) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - - %% simple D chord, large top fret thickness - d'2^\markup { - \override #'(fret-diagram-details . ( - (finger-code . below-string) - (dot-radius . 0.35) - (dot-position . 0.5) - (top-fret-thickness . 7) - (fret-count . 3))) { - \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" - } - } - } ->> diff --git a/input/new/guitar-strum-rhythms.ly b/input/new/guitar-strum-rhythms.ly deleted file mode 100644 index 9c5c0ab1b1..0000000000 --- a/input/new/guitar-strum-rhythms.ly +++ /dev/null @@ -1,49 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "rhythms,fretted-strings" - texidoc = " -For guitar music, it is possible to show strum rhythms, along -with melody notes, chord names, and fret diagrams. -" - doctitle = "Guitar strum rhythms" -} - -\include "predefined-guitar-fretboards.ly" -<< - \new ChordNames { - \chordmode { - c1 f g c - } - } - \new FretBoards { - \chordmode { - c1 f g c - } - } - \new Voice \with { - \consists "Pitch_squash_engraver" - } { - \relative c'' { - \improvisationOn - c4 c8 c c4 c8 c - f4 f8 f f4 f8 f - g4 g8 g g4 g8 g - c4 c8 c c4 c8 c - } - } - \new Voice = "melody" { - \relative c'' { - c2 e4 e4 - f2. r4 - g2. a4 - e4 c2. - } - } - \new Lyrics { - \lyricsto "melody" { - This is my song. - I like to sing. - } - } ->> diff --git a/input/new/heavily-customized-polymetric-time-signatures.ly b/input/new/heavily-customized-polymetric-time-signatures.ly deleted file mode 100644 index 8e6d38da51..0000000000 --- a/input/new/heavily-customized-polymetric-time-signatures.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "rhythms, percussion" - - texidoc = " -Though the polymetric time signature shown was not the most essential -item here, it has been included to show the beat of this piece (which -is the template of a real Balkan song!). - -" - doctitle = "Heavily customized polymetric time signatures" -} - -#(define plus (markup #:vcenter "+")) -#(define ((custom-time-signature one two three four five six - seven eight nine ten eleven num) grob) - (grob-interpret-markup grob - (markup #:override '(baseline-skip . 0) #:number - (#:line ( - (#:column (one num)) plus - (#:column (two num)) plus - (#:column (three num)) plus - (#:column (four num)) plus - (#:column (five num)) plus - (#:column (six num)) plus - (#:column (seven num)) plus - (#:column (eight num)) plus - (#:column (nine num)) plus - (#:column (ten num)) plus - (#:column (eleven num)))) - ))) - -melody = \relative c'' { - \set Staff.instrumentName = #"Bb Sop." - \key g \major - #(set-time-signature 25 8 '(3 2 2 3 2 2 2 2 3 2 2)) - \override Staff.TimeSignature #'stencil = - #(custom-time-signature "3" "2" "2" "3" "2" "2" - "2" "2" "3" "2" "2" "8") - c8 c c d4 c8 c b c b a4 g fis8 e d c b' c d e4-^ fis8 g \break - c,4. d4 c4 d4. c4 d c2 d4. e4-^ d4 - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break -} - -drum = \new DrumStaff \drummode { - \bar "|:" bd4.^\markup { "Drums" } sn4 bd \bar ":" sn4. - bd4 sn \bar ":" bd sn bd4. sn4 bd \bar ":|" -} - -{ - \melody - \drum -} diff --git a/input/new/incipit.ly b/input/new/incipit.ly deleted file mode 100644 index 5664d32cb1..0000000000 --- a/input/new/incipit.ly +++ /dev/null @@ -1,267 +0,0 @@ -\version "2.12.0" -\header { - 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." - doctitle = "Incipit" -} - -incipit = -#(define-music-function (parser location incipit-music) (ly:music?) - #{ - \once \override Staff.InstrumentName #'self-alignment-X = #RIGHT - \once \override Staff.InstrumentName #'self-alignment-Y = #UP - \once \override Staff.InstrumentName #'Y-offset = #4 - \once \override Staff.InstrumentName #'padding = #0.3 - \once \override Staff.InstrumentName #'stencil = - #(lambda (grob) - (let* ((instrument-name (ly:grob-property grob 'long-text)) - (layout (ly:output-def-clone (ly:grob-layout grob))) - (music (make-music 'SequentialMusic - 'elements (list (make-music 'ContextSpeccedMusic - 'context-type 'MensuralStaff - 'element (make-music 'PropertySet - 'symbol 'instrumentName - 'value instrument-name)) - $incipit-music))) - (score (ly:make-score music)) - (mm (ly:output-def-lookup layout 'mm)) - (indent (ly:output-def-lookup layout 'indent)) - (width (ly:output-def-lookup layout 'incipit-width)) - (incipit-width (if (number? width) - (* width mm) - (* indent 0.5)))) - (ly:output-def-set-variable! layout 'indent (- indent incipit-width)) - (ly:output-def-set-variable! layout 'line-width indent) - (ly:output-def-set-variable! layout 'ragged-right #f) - (ly:output-def-set-variable! layout 'ragged-last #f) - (ly:output-def-set-variable! layout 'system-count 1) - (ly:score-add-output-def! score layout) - (ly:grob-set-property! grob 'long-text - (markup #:score score)) - (ly:system-start-text::print grob))) - #}) - -%%%%%%%%%%%%%%%%%%%%%%%%% - -global = { - \set Score.skipBars = ##t - \key g \major - \time 4/4 - - % the actual music - \skip 1*8 - - % let finis bar go through all staves - \override Staff.BarLine #'transparent = ##f - - % finis bar - \bar "|." -} - -discantusIncipit = << - \new MensuralVoice = "discantusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c1" - \key f \major - \time 2/2 - c''1. - } - >> - \new Lyrics \lyricsto discantusIncipit { IV- } ->> - -discantusNotes = { - \transpose c' c'' { - \clef "treble" - d'2. d'4 | - b e' d'2 | - c'4 e'4.( d'8 c' b | - a4) b a2 | - b4.( c'8 d'4) c'4 | - \once \override NoteHead #'transparent = ##t - c'1 | - b\breve | - } -} - -discantusLyrics = \lyricmode { - Ju -- bi -- | - la -- te De -- | - o, om -- - nis ter -- | - ra, __ om- | - "..." | - -us. | -} - -altusIncipit = << - \new MensuralVoice = "altusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c3" - \key f \major - \time 2/2 - r1 f'1. - } - >> - \new Lyrics \lyricsto altusIncipit { IV- } ->> - -altusNotes = { - \transpose c' c'' { - \clef "treble" - % two measures - r2 g2. e4 fis g | - a2 g4 e | - fis g4.( fis16 e fis4) | - g1 | - \once \override NoteHead #'transparent = ##t - g1 | - g\breve | - } -} - -altusLyrics = \lyricmode { - % two measures - Ju -- bi -- la -- te | - De -- o, om -- | - nis ter -- ra, | - "..." | - -us. | -} - -tenorIncipit = << - \new MensuralVoice = "tenorIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "neomensural-c4" - \key f \major - \time 2/2 - r\longa - r\breve - r1 c'1. - } - >> - \new Lyrics \lyricsto tenorIncipit { IV- } ->> - -tenorNotes = { - \transpose c' c' { - \once \override Staff.VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 3) - \clef "treble_8" - R1 | - R1 | - R1 | - % two measures - r2 d'2. d'4 b e' | - \once \override NoteHead #'transparent = ##t - e'1 | - d'\breve | - } -} - -tenorLyrics = \lyricmode { - % two measures - Ju -- bi -- la -- te | - "..." | - -us. -} - -bassusIncipit = << - \new MensuralVoice = "bassusIncipit" << - \repeat unfold 9 { s1 \noBreak } - { - \clef "bass" - \key f \major - \time 2/2 - %% incipit - r\maxima - f1. - } - >> - \new Lyrics \lyricsto bassusIncipit { IV- } ->> - -bassusNotes = { - \transpose c' c' { - \clef "bass" - R1 | - R1 | - R1 | - R1 | - g2. e4 | - \once \override NoteHead #'transparent = ##t - e1 | - g\breve | - } -} - -bassusLyrics = \lyricmode { - Ju -- bi- | - "..." | - -us. -} - -\score { - << - \new StaffGroup = choirStaff << - \new Voice = "discantusNotes" << - \global - \set Staff.instrumentName = #"Discantus" - \incipit \discantusIncipit - \discantusNotes - >> - \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics } - \new Voice = "altusNotes" << - \global - \set Staff.instrumentName = #"Altus" - \incipit \altusIncipit - \altusNotes - >> - \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics } - \new Voice = "tenorNotes" << - \global - \set Staff.instrumentName = #"Tenor" - \incipit \tenorIncipit - \tenorNotes - >> - \new Lyrics = "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics } - \new Voice = "bassusNotes" << - \global - \set Staff.instrumentName = #"Bassus" - \incipit \bassusIncipit - \bassusNotes - >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - >> - >> - \layout { - \context { - \Score - %% no bar lines in staves or lyrics - \override BarLine #'transparent = ##t - } - %% the next two instructions keep the lyrics between the bar lines - \context { - \Lyrics - \consists "Bar_engraver" - \consists "Separating_line_group_engraver" - } - \context { - \Voice - %% no slurs - \override Slur #'transparent = ##t - %% Comment in the below "\remove" command to allow line - %% breaking also at those bar lines where a note overlaps - %% into the next measure. The command is commented out in this - %% short example score, but especially for large scores, you - %% will typically yield better line breaking and thus improve - %% overall spacing if you comment in the following command. - %%\remove "Forbid_line_break_engraver" - } - indent = 6\cm - incipit-width = 4\cm - } -} diff --git a/input/new/inserting-a-caesura.ly b/input/new/inserting-a-caesura.ly deleted file mode 100644 index c143675851..0000000000 --- a/input/new/inserting-a-caesura.ly +++ /dev/null @@ -1,22 +0,0 @@ -\version "2.12.0" -\header { - 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. -" - doctitle = "Inserting a caesura" -} - -\relative c'' { - \override BreathingSign #'text = \markup { - \musicglyph #"scripts.caesura.straight" - } - c8 e4. \breathe g8. e16 c4 - - \override BreathingSign #'text = \markup { - \musicglyph #"scripts.caesura.curved" - } - g8 e'4. \breathe g8. e16 c4 -} diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly deleted file mode 100644 index 79da84dff5..0000000000 --- a/input/new/letter-tablature-formatting.ly +++ /dev/null @@ -1,39 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "staff-notation,fretted-strings" - - texidoc = "Tablature can be formatted using letters instead of -numbers." - doctitle = "Letter tablature formatting" -} - -#(define (letter-tablature-format str context event) - (let* - ((tuning (ly:context-property context 'stringTunings)) - (pitch (ly:event-property event 'pitch))) - (make-whiteout-markup - (make-vcenter-markup - (string (integer->char - (+ (char->integer #\a) - (- (ly:pitch-semitones pitch) - (list-ref tuning (- str 1)))))))))) - -music = \relative c { - c4 d e f - g4 a b c - d4 e f g -} - -<< - \new Staff { - \clef "G_8" - \music - } - \new TabStaff \with { - tablatureFormat = #letter-tablature-format - } - { - \music - } ->> diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly deleted file mode 100644 index 7fbc9d6017..0000000000 --- a/input/new/line-arrows.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "expressive-marks" - texidoc = "Arrows can be applied to text-spanners and line-spanners -(such as the Glissando)." - doctitle = "Line arrows" -} - -\relative c'' { - \override TextSpanner #'bound-padding = #1.0 - \override TextSpanner #'style = #'line - \override TextSpanner #'(bound-details right arrow) = ##t - \override TextSpanner #'(bound-details left text) = #"fof" - \override TextSpanner #'(bound-details right text) = #"gag" - \override TextSpanner #'(bound-details right padding) = #0.6 - - \override TextSpanner #'(bound-details right stencil-align-dir-y) = #CENTER - \override TextSpanner #'(bound-details left stencil-align-dir-y) = #CENTER - - \override Glissando #'(bound-details right arrow) = ##t - \override Glissando #'arrow-length = #0.5 - \override Glissando #'arrow-width = #0.25 - - a8\startTextSpan gis a4 b\glissando b, - g'4 c\stopTextSpan c2 -} diff --git a/input/new/makam-example.ly b/input/new/makam-example.ly deleted file mode 100644 index 9e88142120..0000000000 --- a/input/new/makam-example.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "pitches,world-music" - texidoc = "Makam is a type of melody from Turkey using 1/9th-tone -microtonal alterations. Consult the initialization file -@code{makam.ly} (see the `Learning Manual @version{}, -4.6.3 Other sources of information' for the location of this file) -for details of pitch names and alterations." - doctitle = "Makam example" -} - -% Initialize makam settings -\include "makam.ly" - -\relative c' { - \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA))) - c4 cc db fk - gbm4 gfc gfb efk - fk4 db cc c -} diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly deleted file mode 100644 index 47014eea84..0000000000 --- a/input/new/making-an-object-invisible-with-the-transparent-property.ly +++ /dev/null @@ -1,35 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "rhythms,tweaks-and-overrides" - texidoc = " -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. -" - doctitle = "Making an object invisible with the transparent property" -} - -\relative c'' { - \time 2/4 - << - { - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - b8 ~ b\noBeam - \once \override Stem #'transparent = ##t - \once \override Stem #'length = #8 - g8 ~ g\noBeam - } - \\ - { - b8 g g e - } - >> -} diff --git a/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly deleted file mode 100644 index bdf0224acf..0000000000 --- a/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ /dev/null @@ -1,45 +0,0 @@ -\version "2.12.0" - -\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. -" - doctitle = "Marking notes of spoken parts with a cross on the stem" -} - -speakOn = { - \override Stem #'stencil = #(lambda (grob) - (let* ((x-parent (ly:grob-parent grob X)) - (is-rest? (ly:grob? (ly:grob-object x-parent 'rest)))) - (if is-rest? - empty-stencil - (ly:stencil-combine-at-edge - (ly:stem::print grob) - Y - (- (ly:grob-property grob 'direction)) - (grob-interpret-markup grob - (markup #:hspace -1.025 #:fontsize -4 - #:musicglyph "noteheads.s2cross")) - -2.3 0)))) -} - -speakOff = { - \revert Stem #'stencil -} - -\score { - \new Staff { - \relative c'' { - a4 b a c - \speakOn - g4 f r g - b4 r d e - \speakOff - c4 a g f - } - } -} diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly deleted file mode 100644 index bc32520f8d..0000000000 --- a/input/new/markup-lines.ly +++ /dev/null @@ -1,42 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "text" - texidoc = "Text that can spread over pages is entered with the -@code{\\markuplines} command." - doctitle = "Markup lines" -} - -#(set-default-paper-size "a6") - -#(define-markup-list-command (paragraph layout props args) (markup-list?) - (interpret-markup-list layout props - (make-justified-lines-markup-list (cons (make-hspace-markup 2) args)))) - -% Candide, Voltaire -\markuplines { - \override-lines #'(baseline-skip . 2.5) { - \paragraph { - Il y avait en Westphalie, dans le château de M. le baron de - Thunder-ten-tronckh, un jeune garçon à qui la nature avait donné - les mœurs les plus douces. Sa physionomie annonçait son âme. - Il avait le jugement assez droit, avec l'esprit le plus simple ; - c'est, je crois, pour cette raison qu'on le nommait Candide. Les - anciens domestiques de la maison soupçonnaient qu'il était fils - de la sœur de monsieur le baron et d'un bon et honnête - gentilhomme du voisinage, que cette demoiselle ne voulut jamais - épouser parce qu'il n'avait pu prouver que soixante et onze - quartiers, et que le reste de son arbre généalogique avait été - perdu par l'injure du temps. - } - \paragraph { - Monsieur le baron était un des plus puissants seigneurs de la - Westphalie, car son château avait une porte et des fenêtres. Sa - grande salle même était ornée d'une tapisserie. Tous les chiens - de ses basses-cours composaient une meute dans le besoin ; ses - palefreniers étaient ses piqueurs; le vicaire du village était - son grand-aumônier. Ils l'appelaient tous monseigneur, et ils - riaient quand il faisait des contes. - } - } -} diff --git a/input/new/modern-tab-text-clef.ly b/input/new/modern-tab-text-clef.ly deleted file mode 100644 index fa7dadee7d..0000000000 --- a/input/new/modern-tab-text-clef.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "staff-notation, fretted-strings" - - texidoc = " -Use a markup text to replace the (TAB) clef glyph with a modern font. - -" - doctitle = "Modern TAB text clef" -} - -TAB = \markup { - \raise #1.5 - \sans - \bold - \huge - \override #'(baseline-skip . 2.5) - \center-column { - T - A - B - } -} - -\new TabStaff { - \override Staff.Clef #'stencil = #(lambda (grob) - ly:clef::print (grob-interpret-markup grob TAB)) - a -} diff --git a/input/new/multi--measure-rest-markup.ly b/input/new/multi--measure-rest-markup.ly deleted file mode 100644 index ffb1b3a347..0000000000 --- a/input/new/multi--measure-rest-markup.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "2.12.0" - -\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" -} - -\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/new/ottava-text.ly b/input/new/ottava-text.ly deleted file mode 100644 index 6110b795d5..0000000000 --- a/input/new/ottava-text.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "pitches, text" - texidoc = " -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" -} - -{ - \ottava #1 - \set Staff.ottavation = #"8" - c''1 - \ottava #0 - c'1 - \ottava #1 - \set Staff.ottavation = #"Text" - c''1 -} diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly deleted file mode 100644 index e573ade326..0000000000 --- a/input/new/outputting-the-version-number.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.12.0" - -\header { - lsrtags = "text" - texidoc = " -By putting the output of @code{lilypond-version} into lyrics or a -text markup, it is possible to print the version number of LilyPond in -a score, or in a document generated with @code{lilypond-book}. -" - doctitle = "Outputting the version number" -} - -\score { - \new Lyrics { - \override Score.RehearsalMark #'self-alignment-X = #LEFT - \mark #(ly:export (string-append "Processed with LilyPond version " - (lilypond-version))) - s2 - } -} diff --git a/input/new/page-label.ly b/input/new/page-label.ly deleted file mode 100644 index 657ea9efc6..0000000000 --- a/input/new/page-label.ly +++ /dev/null @@ -1,52 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "spacing" - texidoc = "Page labels may be placed inside music or at top-level, -and referred to in markups." - doctitle = "Page label" -} - -#(set-default-paper-size "a6") - -#(define-markup-command (toc-line layout props label text) - (symbol? markup?) - (interpret-markup layout props - (markup #:fill-line (text #:page-ref label "8" "?")))) - -\book { - \markup \huge \fill-line { \null Title Page \null } - - \pageBreak - - \label #'toc - \markup \column { - \large \fill-line { \null Table of contents \null } - \toc-line #'toc "Table of contents" - \toc-line #'firstScore "First Score" - \toc-line #'markA "Mark A" - \toc-line #'markB "Mark B" - \toc-line #'markC "Mark C" - \toc-line #'unknown "Unknown label" - } - - \pageBreak - - \label #'firstScore - \score { - \new Staff \relative c' { - c2 c - \mark \markup { - A (page \concat { \page-ref #'markA "0" "?" ) } - } \label #'markA - c2 c - \pageBreak - \mark "B" \label #'markB - d2 d - d2 d - \once \override Score.RehearsalMark #'break-visibility = - #begin-of-line-invisible - \mark "C" \label #'markC - } - \header { piece = "First score" } - } -} diff --git a/input/new/percent-repeat-count-visibility.ly b/input/new/percent-repeat-count-visibility.ly deleted file mode 100644 index 3ae1e129ad..0000000000 --- a/input/new/percent-repeat-count-visibility.ly +++ /dev/null @@ -1,17 +0,0 @@ -\version "2.12.0" -\header { - 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" -} - -\relative c'' { - \set countPercentRepeats = ##t - \set repeatCountVisibility = #(every-nth-repeat-count-visible 5) - \repeat percent 10 { c1 } \break - \set repeatCountVisibility = #(every-nth-repeat-count-visible 2) - \repeat percent 6 { c1 d1 } -} diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly deleted file mode 100644 index 7bc5cd5b4e..0000000000 --- a/input/new/piano-template-with-centered-dynamics.ly +++ /dev/null @@ -1,80 +0,0 @@ -\version "2.12.0" - -\header { - 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" -} - -global = { - \key c \major - \time 4/4 -} - -upper = \relative c'' { - \clef treble - a4 b c d -} - -lower = \relative c { - \clef bass - a2 c -} - -dynamics = { - s2\fff\> s4 s\!\pp -} - -pedal = { - s2\sustainOn s\sustainOff -} - -\score { - \new PianoStaff = "PianoStaff_pf" << - \new Staff = "Staff_pfUpper" \upper - \new Dynamics = "Dynamics_pf" \dynamics - \new Staff = "Staff_pfLower" << \lower >> - \new Dynamics = "pedal" \pedal - >> - - \layout { - % define Dynamics context - \context { - \type "Engraver_group" - \name Dynamics - \alias Voice - \consists "Output_property_engraver" - \consists "Piano_pedal_engraver" - \consists "Script_engraver" - \consists "New_dynamic_engraver" - \consists "Dynamic_align_engraver" - \consists "Text_engraver" - \consists "Skip_event_swallow_translator" - \consists "Axis_group_engraver" - - pedalSustainStrings = #'("Ped." "*Ped." "*") - pedalUnaCordaStrings = #'("una corda" "" "tre corde") - \override DynamicLineSpanner #'Y-offset = #0 - \override TextScript #'font-size = #2 - \override TextScript #'font-shape = #'italic - \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) - } - % modify PianoStaff context to accept Dynamics context - \context { - \PianoStaff - \accepts Dynamics - } - } -} - -\score { - \new PianoStaff = "PianoStaff_pf" << - \new Staff = "Staff_pfUpper" << \global \upper \dynamics \pedal >> - \new Staff = "Staff_pfLower" << \global \lower \dynamics \pedal >> - >> - \midi { } -} diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly deleted file mode 100644 index 235b8baad1..0000000000 --- a/input/new/positioning-multi--measure-rests.ly +++ /dev/null @@ -1,40 +0,0 @@ -\version "2.12.0" -\header { - 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" -} - -\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/new/printing-the-bar-number-for-the-first-measure.ly b/input/new/printing-the-bar-number-for-the-first-measure.ly deleted file mode 100644 index 86cc793088..0000000000 --- a/input/new/printing-the-bar-number-for-the-first-measure.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.12.1" - -\header { - 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. - -" - doctitle = "Printing the bar number for the first measure" -} - -\relative c' { - \set Score.barNumberVisibility = #all-bar-numbers-visible - \bar "" - c1 d e f \break - g1 e d c -} diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly deleted file mode 100644 index 7a87f41d7c..0000000000 --- a/input/new/quoting-another-voice-with-transposition.ly +++ /dev/null @@ -1,39 +0,0 @@ -\version "2.12.0" -\header { - 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. -" - doctitle = "Quoting another voice with transposition" -} - -\addQuote clarinet { - \transposition bes - \repeat unfold 8 { d'16 d' d'8 } -} - -\addQuote sax { - \transposition es' - \repeat unfold 16 { a8 } -} - -quoteTest = { - % french horn - \transposition f - g'4 - << \quoteDuring #"clarinet" { \skip 4 } s4^"clar." >> - << \quoteDuring #"sax" { \skip 4 } s4^"sax." >> - g'4 -} - -{ - \set Staff.instrumentName = - \markup { - \center-column { Horn \line { in F } } - } - \quoteTest - \transpose c' d' << \quoteTest s4_"up a tone" >> -} diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly deleted file mode 100644 index 13da99eacd..0000000000 --- a/input/new/quoting-another-voice.ly +++ /dev/null @@ -1,45 +0,0 @@ -\version "2.12.0" -\header { - 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}." - doctitle = "Quoting another voice" -} - -quoteMe = \relative c' { - fis4 r16 a8.-> b4\ff c -} -\addQuote quoteMe \quoteMe - -original = \relative c'' { - c8 d s2 - \once \override NoteColumn #'ignore-collision = ##t - es8 gis8 -} - -<< - \new Staff { - \set Staff.instrumentName = #"quoteMe" - \quoteMe - } - \new Staff { - \set Staff.instrumentName = #"orig" - \original - } - \new Staff \relative c'' << - \set Staff.instrumentName = #"orig+quote" - \set Staff.quotedEventTypes = - #'(note-event articulation-event) - \original - \new Voice { - s4 - \set fontSize = #-4 - \override Stem #'length-fraction = #(magstep -4) - \quoteDuring #"quoteMe" { \skip 2. } - } - >> ->> diff --git a/input/new/setting-hairpin-behavior-at-bar-lines.ly b/input/new/setting-hairpin-behavior-at-bar-lines.ly deleted file mode 100644 index a6dd6584b1..0000000000 --- a/input/new/setting-hairpin-behavior-at-bar-lines.ly +++ /dev/null @@ -1,17 +0,0 @@ -\version "2.12.0" -\header { - 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. -" - doctitle = "Setting hairpin behavior at bar lines" -} - -\relative c'' { - e4\< e2. - e1\! - \override Hairpin #'to-barline = ##f - e4\< e2. - e1\! -} diff --git a/input/new/specifying-context-with-beatgrouping.ly b/input/new/specifying-context-with-beatgrouping.ly deleted file mode 100644 index 5744ba37ae..0000000000 --- a/input/new/specifying-context-with-beatgrouping.ly +++ /dev/null @@ -1,32 +0,0 @@ -\version "2.12.0" - -\header { - 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: -" - doctitle = "Specifying context with beatGrouping" -} - -\score { - \new Staff << - \time 7/8 - \new Voice { - \relative c'' { - \set Staff.beatGrouping = #'(2 3 2) - a8 a a a a a a - } - } - \new Voice { - \relative c' { - \voiceTwo - \set beatGrouping = #'(1 3 3) - f8 f f f f f f - } - } - >> -} diff --git a/input/new/suppressing-warnings-for-clashing-note-columns.ly b/input/new/suppressing-warnings-for-clashing-note-columns.ly deleted file mode 100644 index 5dbf28df0d..0000000000 --- a/input/new/suppressing-warnings-for-clashing-note-columns.ly +++ /dev/null @@ -1,25 +0,0 @@ -\version "2.12.0" -\header { - 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}. -" - doctitle = "Suppressing warnings for clashing note columns" -} - -ignore = \override NoteColumn #'ignore-collision = ##t - -\relative c' { - << - \ignore - { \stemDown f2 g } - \\ - { c2 c, } - >> -} diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly deleted file mode 100644 index f639c06222..0000000000 --- a/input/new/table-of-contents.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "2.12.0" -\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." - doctitle = "Table of contents" -} - -#(set-default-paper-size "a6") - -\book { - \markuplines \table-of-contents - \pageBreak - \tocItem \markup { The first score } - \score { - { - c'1 \pageBreak - \mark "A" \tocItem \markup { Mark A } - d'1 - } - } - \pageBreak - \tocItem \markup { The second score } - \score { - { e'1 } - \header { piece = "Second score" } - } -} diff --git a/input/new/tick-bar-lines.ly b/input/new/tick-bar-lines.ly deleted file mode 100644 index d237aa67da..0000000000 --- a/input/new/tick-bar-lines.ly +++ /dev/null @@ -1,17 +0,0 @@ -\version "2.12.0" -\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" -} -\relative c' { - \set Score.defaultBarType = #"'" - c4 d e f - g4 f e d - c4 d e f - g4 f e d - \bar "|." -} diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly deleted file mode 100644 index 1ff8444f55..0000000000 --- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ /dev/null @@ -1,84 +0,0 @@ -\version "2.12.0" -\header { - 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: - -@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. -" - doctitle = "Transposing music with minimum accidentals" -} - -#(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)) - (set! n (+ n 1))) - ((and (< a -1) (or (eq? n 0) (eq? n 3))) - (set! a (+ a 2)) - (set! n (- n 1)))) - (cond - ((> a 2) (set! a (- a 4)) (set! n (+ n 1))) - ((< a -2) (set! a (+ a 4)) (set! n (- n 1)))) - (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7)))) - (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7)))) - (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))) - (if (pair? es) - (ly:music-set-property! - music 'elements - (map (lambda (x) (naturalize x)) es))) - (if (ly:music? e) - (ly:music-set-property! - music 'element - (naturalize e))) - (if (ly:pitch? p) - (begin - (set! p (naturalize-pitch p)) - (ly:music-set-property! music 'pitch p))) - music)) - -naturalizeMusic = -#(define-music-function (parser location m) - (ly:music?) - (naturalize m)) - -music = \relative c' { c4 d e g } - -\score { - \new Staff { - \transpose c ais { \music } - \naturalizeMusic \transpose c ais { \music } - \transpose c deses { \music } - \naturalizeMusic \transpose c deses { \music } - } - \layout { } -} diff --git a/input/new/using-beatlength-and-beatgrouping.ly b/input/new/using-beatlength-and-beatgrouping.ly deleted file mode 100644 index fd3c776392..0000000000 --- a/input/new/using-beatlength-and-beatgrouping.ly +++ /dev/null @@ -1,51 +0,0 @@ -\version "2.12.0" - -\header { - 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. -" - doctitle = "Using beatLength and beatGrouping" -} - -\relative c'' { - \time 3/4 - % The default in 3/4 time is to beam in three groups - % each of a quarter note length - a16 a a a a a a a a a a a - - \time 12/16 - % No auto-beaming is defined for 12/16 - a16 a a a a a a a a a a a - - \time 3/4 - % Change time signature symbol, but retain underlying 3/4 beaming - \set Score.timeSignatureFraction = #'(12 . 16) - a16 a a a a a a a a a a a - - % The 3/4 time default grouping of (1 1 1) and beatLength of 1/8 - % are not consistent with a measureLength of 3/4, so the beams - % are grouped at beatLength intervals - \set Score.beatLength = #(ly:make-moment 1 8) - a16 a a a a a a a a a a a - - % Specify beams in groups of (3 3 2 3) 1/16th notes - % 3+3+2+3=11, and 11*1/16<>3/4, so beatGrouping does not apply, - % and beams are grouped at beatLength (1/16) intervals - \set Score.beatLength = #(ly:make-moment 1 16) - \set Score.beatGrouping = #'(3 3 2 3) - a16 a a a a a a a a a a a - - % Specify beams in groups of (3 4 2 3) 1/16th notes - % 3+4+2+3=12, and 12*1/16=3/4, so beatGrouping applies - \set Score.beatLength = #(ly:make-moment 1 16) - \set Score.beatGrouping = #'(3 4 2 3) - a16 a a a a a a a a a a a -} - diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly deleted file mode 100644 index 77f574d359..0000000000 --- a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.12.0" -\header { - lsrtags = "tweaks-and-overrides" - texidoc = " -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" -} - -\relative c' { - \time 2/4 - \set fingeringOrientations = #'(right) - < - \tweak #'font-size #3 c - \tweak #'color #red d-\tweak #'font-size #8 -4 - \tweak #'style #'cross g - \tweak #'duration-log #2 a - >2 -} diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly deleted file mode 100644 index e79f0c5831..0000000000 --- a/input/new/utf-8.ly +++ /dev/null @@ -1,63 +0,0 @@ -\version "2.12.0" - -%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs - -%{ - -You may have to install additional fonts. - -Red Hat Fedora - - taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ - ttfonts-zh_CN fonts-ja fonts-hebrew - -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" -} - -% end verbatim - this comment is a hack to prevent texinfo.tex -% from choking on non-European UTF-8 subsets -% Cyrillic font -bulgarian = \lyricmode { - Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. -} - -hebrew = \lyricmode { - זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. -} - -japanese = \lyricmode { - いろはにほへど ちりぬるを - わがよたれぞ つねならむ - うゐのおくや まけふこえて - あさきゆめみじ ゑひもせず -} - -% "a legal song to you" -portuguese = \lyricmode { - à vo -- cê uma can -- ção legal -} - -\relative c' { - c2 d - e2 f - g2 f - e1 -} -\addlyrics { \bulgarian } -\addlyrics { \hebrew } -\addlyrics { \japanese } -\addlyrics { \portuguese } diff --git a/input/new/volta-below-chords.ly b/input/new/volta-below-chords.ly deleted file mode 100644 index 1b054a756c..0000000000 --- a/input/new/volta-below-chords.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "2.12.0" -\header { - 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" -} - -\score { - << - \chords { - c1 - c1 - } - \new Staff \with { - \consists "Volta_engraver" - } - { - \repeat volta 2 { c'1 } - \alternative { c' } - } - >> - \layout { - \context { - \Score - \remove "Volta_engraver" - } - } -} diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly deleted file mode 100644 index a45dddec74..0000000000 --- a/input/new/volta-multi-staff.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "2.12.0" -\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" -} - -voltaMusic = \relative c'' { - \repeat volta 2 { - c1 - } - \alternative { - d1 - e - } -} - -<< - \new StaffGroup << - \new Staff \voltaMusic - \new Staff \voltaMusic - >> - \new StaffGroup << - \new Staff \with { \consists "Volta_engraver" } - \voltaMusic - \new Staff \voltaMusic - >> ->> diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly deleted file mode 100644 index a12c28599c..0000000000 --- a/input/new/volta-text-markup-using-repeatcommands.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.12.0" - -\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}. - -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}" -} - -voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } } - -\relative c'' { - c1 - \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat) - c4 b d e - \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat) - f1 - \set Score.repeatCommands = #'((volta #f)) -} 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..a42cd46d38 --- /dev/null +++ b/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc @@ -0,0 +1,15 @@ + 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 a42cd46d38..0000000000 --- a/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..texidoc +++ /dev/null @@ -1,15 +0,0 @@ - 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 03b3b70746..0000000000 --- a/input/texidocs/changing-form-of-multi--measure-rests.texidoc +++ /dev/null @@ -1,18 +0,0 @@ - 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}: - -" - -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" 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..03b3b70746 --- /dev/null +++ b/input/texidocs/changing-form-of-multi-measure-rests.texidoc @@ -0,0 +1,18 @@ + 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}: + +" + +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" 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..d0fc068c25 --- /dev/null +++ b/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc @@ -0,0 +1,13 @@ + 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 d0fc068c25..0000000000 --- a/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.texidoc +++ /dev/null @@ -1,13 +0,0 @@ - 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/multi--measure-rest-markup.texidoc b/input/texidocs/multi--measure-rest-markup.texidoc deleted file mode 100644 index 36662526e7..0000000000 --- a/input/texidocs/multi--measure-rest-markup.texidoc +++ /dev/null @@ -1,17 +0,0 @@ -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" \ No newline at end of file diff --git a/input/texidocs/multi-measure-rest-markup.texidoc b/input/texidocs/multi-measure-rest-markup.texidoc new file mode 100644 index 0000000000..36662526e7 --- /dev/null +++ b/input/texidocs/multi-measure-rest-markup.texidoc @@ -0,0 +1,17 @@ +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" \ No newline at end of file diff --git a/input/texidocs/positioning-multi--measure-rests.texidoc b/input/texidocs/positioning-multi--measure-rests.texidoc deleted file mode 100644 index 549729ee3b..0000000000 --- a/input/texidocs/positioning-multi--measure-rests.texidoc +++ /dev/null @@ -1,21 +0,0 @@ - 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: - -" - -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" diff --git a/input/texidocs/positioning-multi-measure-rests.texidoc b/input/texidocs/positioning-multi-measure-rests.texidoc new file mode 100644 index 0000000000..549729ee3b --- /dev/null +++ b/input/texidocs/positioning-multi-measure-rests.texidoc @@ -0,0 +1,21 @@ + 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: + +" + +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"