From 05624d5147843d2fcbd6e4e126f1fd43142ac6e5 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Wed, 31 Dec 2008 20:34:31 +0000 Subject: [PATCH] LSR: Update. --- ...a-figured-bass-above-or-below-the-notes.ly | 4 +- ...hen-using-tuplet-and-non-tuplet-rythms..ly | 2 +- input/lsr/adding-fingerings-to-tablatures.ly | 8 -- ...ound-an-expressive-mark-or-chordal-note.ly | 2 +- .../lsr/adding-the-current-date-to-a-score.ly | 12 +-- input/lsr/ambitus.ly | 18 ++-- ...yles-depending-on-the-step-of-the-scale.ly | 3 +- input/lsr/automatic-beam-subdivisions.ly | 29 +++--- ...wo-per-two-in-4-4-or-2-2-time-signature.ly | 22 +++-- input/lsr/changing--flageolet-mark-size.ly | 13 +-- input/lsr/changing-the-tuplet-number.ly | 3 +- input/lsr/chant-or-psalms-notation.ly | 2 +- ...-a-sequence-of-notes-on-various-pitches.ly | 47 +++++----- input/lsr/creating-slurs-across-voices.ly | 36 +++---- ...entals-for-each-note-including-naturals.ly | 4 +- input/lsr/editorial-annotations.snippet-list | 1 + input/lsr/expressive-marks.snippet-list | 1 + input/lsr/flat-flags-and-beam-nibs.ly | 94 +++++++++---------- ...-to-start-from-a-given-letter-or-number.ly | 2 +- input/lsr/grouping-beats.ly | 5 +- input/lsr/guitar-strum-rhythms.ly | 23 ++--- input/lsr/incipit.ly | 22 ++--- ...invisible-with-the-transparent-property.ly | 26 ++--- .../manually-controlling-beam-positions.ly | 4 +- ...f-spoken-parts-with-a-cross-on-the-stem.ly | 24 ++--- ...ulti-measure-rests-in-a-polyphonic-part.ly | 30 +++--- input/lsr/ottava-text.ly | 17 ++-- ...tting-line-breaks-within-beamed-tuplets.ly | 4 +- .../positioning-text-markups-inside-slurs.ly | 21 +++++ ...ng-music-with-different-time-signatures.ly | 10 +- input/lsr/rhythmic-slashes.ly | 12 +-- .../specifying-context-with-beatgrouping.ly | 4 +- input/lsr/three-sided-box.ly | 29 +++--- ...ith-minimum-accidentals-smart-transpose.ly | 17 ++-- input/lsr/tweaking-clef-properties.ly | 2 +- input/lsr/tweaks-and-overrides.snippet-list | 1 + ...entals-for-each-note-including-naturals.ly | 4 +- input/new/guitar-strum-rhythms.ly | 23 ++--- input/new/incipit.ly | 22 ++--- ...invisible-with-the-transparent-property.ly | 26 ++--- ...f-spoken-parts-with-a-cross-on-the-stem.ly | 24 ++--- input/new/ottava-text.ly | 23 +++++ .../specifying-context-with-beatgrouping.ly | 4 +- ...ith-minimum-accidentals-smart-transpose.ly | 17 ++-- ...ured-bass-above-or-below-the-notes.texidoc | 4 +- .../adding-fingerings-to-tablatures.ly | 6 ++ ...adding-the-current-date-to-a-score.texidoc | 8 +- 47 files changed, 377 insertions(+), 338 deletions(-) create mode 100644 input/lsr/positioning-text-markups-inside-slurs.ly create mode 100644 input/new/ottava-text.ly create mode 100644 input/texidocs/adding-fingerings-to-tablatures.ly 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 22a086f551..631d4fb6fc 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 @@ -15,12 +15,12 @@ dentro de un contexto @code{Staff}). Se puede elegir entre centrado) y @code{#DOWN} (o @code{#-1}, abajo). Como podemos ver, esta propiedad se puede cambiar tantas veces -como queramos. Utilice @code{\\once \\override} si no quiere que el +como queramos. Utilice @code{\\once \\override} si no quiere que el truco se aplique a toda la partitura. " doctitlees = "Añadir un bajo cifrado encima o debajo de las notas" - + doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes" 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 index c5077dc34c..6bdbc5fe1b 100644 --- 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 @@ -39,7 +39,7 @@ sections (enclosed within curly braces). { r16[ g16 \times 2/3 { r16 e'8] } g16( a \times 2/3 { b d e') } - g8[( 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-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index bea920b614..c145d66cb6 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -5,14 +5,6 @@ \header { lsrtags = "fretted-strings" - texidocfr = "Ajout de doigtés à des tablatures" - - texidocfr = " -L'ajout de doigtés à des tablatures s'obtient en conjuguant des -@code{\\markup} et des @code{\\finger}. - -" - texidoc = " To add fingerings to tablatures, use a combination of @code{\\markup} and @code{\\finger}. 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 4f0a37147f..baf329d475 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 @@ -26,6 +26,6 @@ objects in parentheses. The associated grob is c2-\parenthesize -> \override ParenthesesItem #'padding = #0.1 \override ParenthesesItem #'font-size = #-4 - 2 + 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 a6923e97b1..fed821a5b3 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -8,15 +8,15 @@ texidoces = " Con algo de código de Scheme, se puede añadir fácilmente la fecha actual a una partitura. - " doctitlees = "Añadir la fecha actual a una partitura" - - doctitlefr = "Ajout de la date du jour à une partition" - + texidocfr = " -Avec un peu de code Scheme, voici comment ajouter facilement -la date du jour à votre partition." +Avec un peu de code Scheme, voici comment ajouter facilement +la date du jour à votre partition. +" + + doctitlefr = "Ajout de la date du jour à une partition" texidoc = " With a little Scheme code, the current date can easily be added to a diff --git a/input/lsr/ambitus.ly b/input/lsr/ambitus.ly index 34ac16d14b..ce6457e4f1 100644 --- a/input/lsr/ambitus.ly +++ b/input/lsr/ambitus.ly @@ -17,22 +17,24 @@ Accidentals only show up if they are not part of the key signature. } % begin verbatim \layout { - ragged-right = ##t \context { \Voice \consists "Ambitus_engraver" } } -\relative << \new Staff { - \time 2/4 c4 f' + \relative c' { + \time 2/4 + c4 f' + } } - \new Staff \relative { - \time 2/4 - \key d \major - cis as' + \new Staff { + \relative c' { + \time 2/4 + \key d \major + cis4 as' + } } >> - 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 14feb5ed89..2935c977a3 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 @@ -70,8 +70,6 @@ correspondence between harmonic functions and note head styles. doctitle = "Applying note head styles depending on the step of the scale" } % begin verbatim -\layout { ragged-right = ##t } - fragment = { \key c \major c2 d @@ -97,4 +95,5 @@ fragment = { \fragment } } + \layout { ragged-right = ##t } } diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index 23aed5baab..22fc8f0bf1 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -22,22 +22,25 @@ specified in @code{beatLength}). doctitle = "Automatic beam subdivisions" } % begin verbatim -\score { - \new Staff \relative c'' { - << { - \voiceOne - \set subdivideBeams = ##t - b32[ a g f c' b a g b^"subdivide beams" a g f c' b a g] - \oneVoice - } - \new Voice { - \voiceTwo - b32_"default"[ a g f c' b a g b a g f c' b a g] - } >> +\new Staff { + \relative c'' { + << + { + \voiceOne + \set subdivideBeams = ##t + b32[ a g f c' b a g + b32^"subdivide beams" a g f c' b a g] + } + \new Voice { + \voiceTwo + b32_"default"[ a g f c' b a g + b32 a g f c' b a g] + } + >> + \oneVoice \set beatLength = #(ly:make-moment 1 8) b32^"beatLength 1 8"[ a g f c' b a g] \set beatLength = #(ly:make-moment 1 16) b32^"beatLength 1 16"[ a g f c' b a g] } } - diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index b78275f82b..6d4cbc3a6e 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -41,17 +41,21 @@ qBeam = { \score { << - \new Staff \relative c'' { - \time 4/4 - g8^\markup { without the macro } g g g g g g g - g8 g g g4 g8 g g + \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^\markup { with the macro } g g g g g g g - g8 g g g4 g8 g g + \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 { diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index 2009bb2528..06cc98f352 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -20,12 +20,13 @@ function. doctitle = "Changing \\flageolet mark size" } % begin verbatim -smallFlageolet = #(let ((m (make-music 'ArticulationEvent - 'articulation-type "flageolet"))) - (set! (ly:music-property m 'tweaks) - (acons 'font-size -3 - (ly:music-property m 'tweaks))) - m) +smallFlageolet = +#(let ((m (make-music 'ArticulationEvent + 'articulation-type "flageolet"))) + (ly:music-set-property! m 'tweaks + (acons 'font-size -3 + (ly:music-property m 'tweaks))) + m) \layout { ragged-right = ##f } diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index c540db358e..3e74c2921e 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -37,7 +37,8 @@ be printed, or the tuplet number may be suppressed altogether. } % begin verbatim \relative c'' { - \times 2/3 { c8 c c } \times 2/3 { c8 c c } + \times 2/3 { c8 c c } + \times 2/3 { c8 c c } \override TupletNumber #'text = #tuplet-number::calc-fraction-text \times 2/3 { c8 c c } \override TupletNumber #'stencil = ##f diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 988f1c1f50..52773268fd 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -20,7 +20,7 @@ aren't always the same length. doctitle = "Chant or psalms notation" } % begin verbatim -stemOn = { \override Staff.Stem #'transparent = ##f } +stemOn = { \revert Staff.Stem #'transparent } stemOff = { \override Staff.Stem #'transparent = ##t } \score { 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 9098fe7927..acaae74b0a 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 @@ -50,29 +50,28 @@ throughout Mars, from Gustav Holst's The Planets. '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)) - )))) +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)) + )))) -\score { - \new Staff { - \time 5/4 - \rhythm c' - \rhythm c'' - \rhythm g - } +\new Staff { + \time 5/4 + \rhythm c' + \rhythm c'' + \rhythm g } diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 02b4cab45b..13d67688b5 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -33,21 +33,23 @@ solo violin, BWV 1004. } % begin verbatim \relative c' { - << { - d16( a') s a s a[ s a] s a[ s a] - } - \\ - { - \slurUp - bes,16[ s e]( - \hideNotes a) - \unHideNotes f[( - \hideNotes a) - \unHideNotes fis]( - \hideNotes a) - \unHideNotes g[( - \hideNotes a) - \unHideNotes gis]( - \hideNotes a) - } >> + << + { + d16( a') s a s a[ s a] s a[ s a] + } + \\ + { + \slurUp + bes,16[ s e]( + \hideNotes a) + \unHideNotes f[( + \hideNotes a) + \unHideNotes fis]( + \hideNotes a) + \unHideNotes g[( + \hideNotes a) + \unHideNotes gis]( + \hideNotes a) + } + >> } 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 79ce6efa27..f326d4f41b 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 @@ -54,8 +54,8 @@ This snippet shows how to achieve such notation rules. } \layout { \context { - \Staff - \remove "Key_engraver" + \Staff + \remove "Key_engraver" } } } diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index 652c2b3f99..c60e130f8f 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -17,4 +17,5 @@ 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-text-markups-inside-slurs.ly using-postscript-to-generate-special-note-head-shapes.ly diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index e95535469b..33515ad24d 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -28,6 +28,7 @@ laissez-vibrer-ties.ly line-arrows.ly modifying-default-values-for-articulation-shorthand-notation.ly piano-template-with-centered-dynamics.ly +positioning-text-markups-inside-slurs.ly printing-hairpins-using-al-niente-notation.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly setting-hairpin-behavior-at-bar-lines.ly diff --git a/input/lsr/flat-flags-and-beam-nibs.ly b/input/lsr/flat-flags-and-beam-nibs.ly index f0c30ffbee..e5de622711 100644 --- a/input/lsr/flat-flags-and-beam-nibs.ly +++ b/input/lsr/flat-flags-and-beam-nibs.ly @@ -59,12 +59,12 @@ no tiene nada que ver con el @code{\\set} de dos notas por detrás.) texidoc = " Flat flags on lone notes and beam nibs at the ends of beamed figures are both possible with a combination of @code{stemLeftBeamCount}, -@code{stemRightBeamCount} and paired @code{[ ]} beam indicators. +@code{stemRightBeamCount} and paired @code{[]} beam indicators. -For right-pointing flat flags on lone notes, use paired @code{[ ]} beam +For right-pointing flat flags on lone notes, use paired @code{[]} beam indicators and set @code{stemLeftBeamCount} to zero (see Example 1). @@ -86,16 +86,16 @@ nibs at the start of a run of beamed notes, set Sometimes it may make sense for a lone note surrounded by rests to carry both a left- and right-pointing flat flag. Do this with paired -@code{[ ]} beam indicators alone (Example 4). +@code{[]} beam indicators alone (Example 4). -(Note that @code{\\set stemLeftBeamCount}is always equivalent to -@code{\\once \\set}. In other words, the beam count settings aren't -\"sticky\", so the pair of flat flags attached to the lone @code{c'16 -[ ]} in the last example have nothing to do with the @code{\\set} two -notes prior.) +(Note that @code{\\set stemLeftBeamCount} is always equivalent to +@code{\\once \\set}. In other words, the beam count settings are not +\"sticky\", so the pair of flat flags attached to the lone +@code{c'16[]} in the last example have nothing to do with the +@code{\\set} two notes prior.) @@ -105,47 +105,39 @@ notes prior.) } % begin verbatim \score { -<< -% Example 1 -\new RhythmicStaff { - \set stemLeftBeamCount = #0 - c'16 [ ] - r8. -} - -% Example 2 -\new RhythmicStaff { - r8. - \set stemRightBeamCount = #0 - c'16 [ ] -} - -% Example 3 -\new RhythmicStaff { - c'16 - c'16 - \set stemRightBeamCount = #2 - c'16 - r16 - r16 - \set stemLeftBeamCount = #2 - c'16 - c'16 - c'16 -} - -% Example 4 -\new RhythmicStaff { - c'16 - c'16 - \set stemRightBeamCount = #2 - c'16 - r16 - c'16 [ ] - r16 - \set stemLeftBeamCount = #2 - c'16 - c'16 -} ->> + << + % Example 1 + \new RhythmicStaff { + \set stemLeftBeamCount = #0 + c16[] + r8. + } + + % Example 2 + \new RhythmicStaff { + r8. + \set stemRightBeamCount = #0 + c16[] + } + + % Example 3 + \new RhythmicStaff { + c16 c + \set stemRightBeamCount = #2 + c16 r r + \set stemLeftBeamCount = #2 + c16 c c + } + + % Example 4 + \new RhythmicStaff { + c16 c + \set stemRightBeamCount = #2 + c16 r + c16[] + r16 + \set stemLeftBeamCount = #2 + c16 c + } + >> } 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 4bbf70d006..e2f2259ffc 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 @@ -7,7 +7,7 @@ texidoc = " This snippet demonstrates how to obtain automatic ordered rehearsal -marks, but from the letter or number you want. +marks, but from the letter or number desired. " doctitle = "Forcing rehearsal marks to start from a given letter or number" diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly index ee1af2a7b7..bf31bee503 100644 --- a/input/lsr/grouping-beats.ly +++ b/input/lsr/grouping-beats.ly @@ -29,9 +29,10 @@ Beaming patterns may be altered with the @code{beatGrouping} property: \relative c'' { \time 5/16 + #(override-auto-beam-setting '(end * * 5 16) 5 16) \set beatGrouping = #'(2 3) - c8[^"(2+3)" c16 c8] + c8^"(2+3)" c16 c8 \set beatGrouping = #'(3 2) - c8[^"(3+2)" c16 c8] + c8^"(3+2)" c16 c8 } diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly index b77b8746e3..8a76a48097 100644 --- a/input/lsr/guitar-strum-rhythms.ly +++ b/input/lsr/guitar-strum-rhythms.ly @@ -34,35 +34,30 @@ with melody notes, chord names, and fret diagrams. 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 + \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'' { - \improvisationOff c2 e4 e4 f2. r4 g2. a4 e4 c2. } } - \new Lyrics { \lyricsto "melody" { This is my song. diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly index 21bb835877..e8295eec43 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -23,7 +23,7 @@ incipit = \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 = + \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))) @@ -47,7 +47,7 @@ incipit = (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) - (set! (ly:grob-property grob 'long-text) + (ly:grob-set-property! grob 'long-text (markup #:score score)) (ly:system-start-text::print grob))) #}) @@ -58,9 +58,7 @@ global = { \set Score.skipBars = ##t \key g \major \time 4/4 - - %make the staff lines invisible on staves - \override Staff.BarLine #'transparent = ##t + % the actual music \skip 1*8 @@ -246,25 +244,19 @@ bassusLyrics = \lyricmode { \incipit \bassusIncipit \bassusNotes >> + \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - %% Keep the bass lyrics outside of the staff group to avoid bar lines - %% between the lyrics. >> \layout { \context { \Score - %% no bar lines in staves + %% no bar lines in staves or lyrics \override BarLine #'transparent = ##t } - %% the next three instructions keep the lyrics between the bar lines + %% the next two instructions keep the lyrics between the bar lines \context { \Lyrics - \consists "Bar_engraver" - \override BarLine #'transparent = ##t - } - \context { - \StaffGroup + \consists "Bar_engraver" \consists "Separating_line_group_engraver" } \context { 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 f334b8bbc7..75c90e6579 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 @@ -21,16 +21,18 @@ flag from interfering with tie positioning, the stem is extended. \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 - } >> + << + { + \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/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index 30609a3b33..910266ba6b 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -18,10 +18,10 @@ Beam positions may be controlled manually, by overriding the \relative c' { \time 2/4 - % from upper staffline (position 4) to center (position 0) + % from upper staff-line (position 2) to center (position 0) \override Beam #'positions = #'(2 . 0) c8 c - % from center to one above center (position 2) + % from center to one above center (position 1) \override Beam #'positions = #'(0 . 1) 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 c5914fd259..9c73e9cde6 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 @@ -8,9 +8,7 @@ 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. Remember to end cross sections -before entering any rest: this function also adds crosses to the -invisible stems of rests. +with the @code{\\speakOff} keyword. " doctitle = "Marking notes of spoken parts with a cross on the stem" } % begin verbatim @@ -18,14 +16,18 @@ invisible stems of rests. speakOn = { \override Stem #'stencil = #(lambda (grob) - (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)) + (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 = { 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 081ff01c58..449164be3b 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 @@ -14,24 +14,24 @@ can be printed on the same staff line, using the following setting. doctitle = "Merging multi-measure rests in a polyphonic part" } % begin verbatim -normalPos= \revert MultiMeasureRest #'staff-position +normalPos = \revert MultiMeasureRest #'staff-position { << { - c''1 - R1 - c''1 - \normalPos - R1 - } - \\ - { - c'1 - R1 - c'1 - \normalPos - R1 - } + c''1 + R1 + c''1 + \normalPos + R1 + } + \\ + { + c'1 + R1 + c'1 + \normalPos + R1 + } >> } diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index 56175e1892..cfbcec87c0 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -1,10 +1,8 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. \version "2.12.0" \header { - lsrtags = "pitches, text" - texidoces = " Internamente, la función @code{set-octavation} establece las propiedades @code{ottavation} (por ejemplo, a @code{\"8va\"} o a @@ -26,18 +24,17 @@ und @code{middleCPosition}. Um den Text der Oktavierungsklammer zu doctitlede = "Ottava-Text" + lsrtags = "pitches, text" texidoc = " -Internally, the @code{set-octavation} function 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{set-octavation}. - - - +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" diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index 314976cf2d..cb9b9727d6 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -44,9 +44,9 @@ tuplets have to be beamed manually. } \relative c'' { a8 - \repeat unfold 8 { \times 2/3 { c[ b a] } } + \repeat unfold 5 { \times 2/3 { c[ b a] } } % Insert a manual line break within a tuplet \times 2/3 { c[ b \bar "" \break a] } - \repeat unfold 2 { \times 2/3 { c[ b a] } } + \repeat unfold 5 { \times 2/3 { c[ b a] } } c8 } diff --git a/input/lsr/positioning-text-markups-inside-slurs.ly b/input/lsr/positioning-text-markups-inside-slurs.ly new file mode 100644 index 0000000000..b65c7d0a07 --- /dev/null +++ b/input/lsr/positioning-text-markups-inside-slurs.ly @@ -0,0 +1,21 @@ +%% Do 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 = "expressive-marks, editorial-annotations, tweaks-and-overrides" + + texidoc = " +Text markups need to have the @code{outside-staff-priority} property +set to false in order to be printed inside slurs. + +" + doctitle = "Positioning text markups inside slurs" +} % begin verbatim + +\relative c'' { + \override TextScript #'avoid-slur = #'inside + \override TextScript #'outside-staff-priority = ##f + c2(^\markup { \halign #-10 \natural } d4.) c8 +} + diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 3bfefdc1a4..00db6fb29d 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -9,8 +9,9 @@ In the following snippet, two parts have a completely different time signature, yet remain synchronized. The bar lines can no longer be printed at the @code{Score} level; to allow independent bar lines in -each part, the @code{Barline_engraver} is moved from the @code{Score} -context to the @code{Staff} context. +each part, the @code{Default_barline_engraver} and +@code{Timing_translator} are moved from the @code{Score} context to the +@code{Staff} context. " doctitle = "Printing music with different time signatures" @@ -136,5 +137,8 @@ Perkussion = \new StaffGroup << >> \score { - << \Bassklarinette \Perkussion >> + << + \Bassklarinette + \Perkussion + >> } diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 184a2905d3..5e64b7d79c 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -25,8 +25,8 @@ the appropriate duration). % Macro to print single slash rs = { \once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash - \once \override Rest #'thickness = #'0.48 - \once \override Rest #'slope = #'1.7 + \once \override Rest #'thickness = #0.48 + \once \override Rest #'slope = #1.7 r4 } @@ -34,16 +34,16 @@ rs = { comp = #(define-music-function (parser location count) ( integer?) #{ \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash - \override Rest #'thickness = #'0.48 - \override Rest #'slope = #'1.7 + \override Rest #'thickness = #0.48 + \override Rest #'slope = #1.7 \repeat unfold $count { r4 } \revert Rest #'stencil #} ) -\score{ +\score { \relative c' { - c d e f | + c4 d e f | \rs \rs \rs \rs | \comp #4 | } diff --git a/input/lsr/specifying-context-with-beatgrouping.ly b/input/lsr/specifying-context-with-beatgrouping.ly index 621f2195ca..1abd1db271 100644 --- a/input/lsr/specifying-context-with-beatgrouping.ly +++ b/input/lsr/specifying-context-with-beatgrouping.ly @@ -17,7 +17,7 @@ altos: 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} +@code{\\set} commands must be placed @emph{after} all @code{\\time} commands: " doctitle = "Specifying context with beatGrouping" @@ -36,7 +36,7 @@ commands: \new Voice { \relative c' { \voiceTwo - \set Voice.beatGrouping = #'(1 3 3) + \set beatGrouping = #'(1 3 3) f8 f f f f f f } } diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 9b9c04f4a5..9e94044ccd 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -15,17 +15,17 @@ around some text (or other markup). % New command to add a three sided box, with sides north, west and south % Based on the box-stencil command defined in scm/stencil.scm -% Note that you use ";" to comment a line in Scheme +% Note that ";" is used to comment a line in Scheme #(define-public (NWS-box-stencil stencil thickness padding) "Add a box around STENCIL, producing a new stencil." (let* ((x-ext (interval-widen (ly:stencil-extent stencil 0) padding)) - (y-ext (interval-widen (ly:stencil-extent stencil 1) padding)) - (y-rule (make-filled-box-stencil (cons 0 thickness) y-ext)) - (x-rule (make-filled-box-stencil - (interval-widen x-ext thickness) (cons 0 thickness)))) + (y-ext (interval-widen (ly:stencil-extent stencil 1) padding)) + (y-rule (make-filled-box-stencil (cons 0 thickness) y-ext)) + (x-rule (make-filled-box-stencil + (interval-widen x-ext thickness) (cons 0 thickness)))) ; (set! stencil (ly:stencil-combine-at-edge stencil X 1 y-rule padding)) (set! stencil (ly:stencil-combine-at-edge stencil X -1 y-rule padding)) - (set! stencil (ly:stencil-combine-at-edge stencil Y 1 x-rule 0.0)) + (set! stencil (ly:stencil-combine-at-edge stencil Y 1 x-rule 0.0)) (set! stencil (ly:stencil-combine-at-edge stencil Y -1 x-rule 0.0)) stencil)) @@ -34,21 +34,18 @@ around some text (or other markup). #(define-markup-command (NWS-box layout props arg) (markup?) "Draw a box round @var{arg}. Looks at @code{thickness}, @code{box-padding} and @code{font-size} properties to determine line -thickness and padding around the markup." - +thickness and padding around the markup." (let* ((th (chain-assoc-get 'thickness props 0.1)) - (size (chain-assoc-get 'font-size props 0)) - (pad (* (magstep size) - (chain-assoc-get 'box-padding props 0.2))) - (m (interpret-markup layout props arg))) + (size (chain-assoc-get 'font-size props 0)) + (pad (* (magstep size) + (chain-assoc-get 'box-padding props 0.2))) + (m (interpret-markup layout props arg))) (NWS-box-stencil m th pad))) - % Test it: \layout { ragged-right = ##f } - -\relative c' { +\relative c' { c2^\markup { \NWS-box ABCD } - c^\markup { \NWS-box \note #"4" #1.0 } + c2^\markup { \NWS-box \note #"4" #1.0 } } 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 3c612c99eb..d6b7695aa4 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -94,7 +94,8 @@ In this manner, the most natural enharmonic notes are chosen. #(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 + ; 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))) @@ -115,23 +116,23 @@ In this manner, the most natural enharmonic notes are chosen. (e (ly:music-property music 'element)) (p (ly:music-property music 'pitch))) (if (pair? es) - (ly:music-set-property! + (ly:music-set-property! music 'elements (map (lambda (x) (naturalize x)) es))) (if (ly:music? e) - (ly:music-set-property! + (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))) + (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)) + (ly:music?) + (naturalize m)) music = \relative c' { c4 d e g } diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index c78b7e64f3..136787c5dd 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -148,7 +148,7 @@ line, they do not. \set Staff.clefPosition = #0 c'1 - % Here we go back to the normal clef: + % Return to the normal clef: \set Staff.middleCPosition = #0 c'1 diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index e4264b29c7..e8d93d9e41 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -31,6 +31,7 @@ mensurstriche-layout-bar-lines-between-the-staves.ly nesting-staves.ly percent-repeat-count-visibility.ly positioning-multi--measure-rests.ly +positioning-text-markups-inside-slurs.ly printing-a-repeat-sign-at-the-beginning-of-a-piece.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly proportional-strict-notespacing.ly 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 index ee2eab0e1b..f1cd319376 100644 --- a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -24,8 +24,8 @@ This snippet shows how to achieve such notation rules. } \layout { \context { - \Staff - \remove "Key_engraver" + \Staff + \remove "Key_engraver" } } } diff --git a/input/new/guitar-strum-rhythms.ly b/input/new/guitar-strum-rhythms.ly index 7def51448f..9c5c0ab1b1 100644 --- a/input/new/guitar-strum-rhythms.ly +++ b/input/new/guitar-strum-rhythms.ly @@ -16,35 +16,30 @@ with melody notes, chord names, and fret diagrams. 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 + \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'' { - \improvisationOff c2 e4 e4 f2. r4 g2. a4 e4 c2. } } - \new Lyrics { \lyricsto "melody" { This is my song. diff --git a/input/new/incipit.ly b/input/new/incipit.ly index 4df3bb2f96..5664d32cb1 100644 --- a/input/new/incipit.ly +++ b/input/new/incipit.ly @@ -13,7 +13,7 @@ incipit = \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 = + \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))) @@ -37,7 +37,7 @@ incipit = (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) - (set! (ly:grob-property grob 'long-text) + (ly:grob-set-property! grob 'long-text (markup #:score score)) (ly:system-start-text::print grob))) #}) @@ -48,9 +48,7 @@ global = { \set Score.skipBars = ##t \key g \major \time 4/4 - - %make the staff lines invisible on staves - \override Staff.BarLine #'transparent = ##t + % the actual music \skip 1*8 @@ -236,25 +234,19 @@ bassusLyrics = \lyricmode { \incipit \bassusIncipit \bassusNotes >> + \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } >> - \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } - %% Keep the bass lyrics outside of the staff group to avoid bar lines - %% between the lyrics. >> \layout { \context { \Score - %% no bar lines in staves + %% no bar lines in staves or lyrics \override BarLine #'transparent = ##t } - %% the next three instructions keep the lyrics between the bar lines + %% the next two instructions keep the lyrics between the bar lines \context { \Lyrics - \consists "Bar_engraver" - \override BarLine #'transparent = ##t - } - \context { - \StaffGroup + \consists "Bar_engraver" \consists "Separating_line_group_engraver" } \context { 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 index 501ccd2b9d..47014eea84 100644 --- a/input/new/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly @@ -18,16 +18,18 @@ flag from interfering with tie positioning, the stem is extended. \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 - } >> + << + { + \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 index 184bd48e3b..bdf0224acf 100644 --- 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 @@ -6,23 +6,25 @@ 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. Remember to end cross sections -before entering any rest: this function also adds crosses to the -invisible stems of rests. +with the @code{\\speakOff} keyword. " doctitle = "Marking notes of spoken parts with a cross on the stem" } speakOn = { \override Stem #'stencil = #(lambda (grob) - (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)) + (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 = { diff --git a/input/new/ottava-text.ly b/input/new/ottava-text.ly new file mode 100644 index 0000000000..6110b795d5 --- /dev/null +++ b/input/new/ottava-text.ly @@ -0,0 +1,23 @@ +\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/specifying-context-with-beatgrouping.ly b/input/new/specifying-context-with-beatgrouping.ly index 71ef3530c7..5744ba37ae 100644 --- a/input/new/specifying-context-with-beatgrouping.ly +++ b/input/new/specifying-context-with-beatgrouping.ly @@ -6,7 +6,7 @@ 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} +@code{\\set} commands must be placed @emph{after} all @code{\\time} commands: " doctitle = "Specifying context with beatGrouping" @@ -24,7 +24,7 @@ commands: \new Voice { \relative c' { \voiceTwo - \set Voice.beatGrouping = #'(1 3 3) + \set beatGrouping = #'(1 3 3) f8 f f f f f f } } diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 84de7611ec..1ff8444f55 100644 --- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -31,7 +31,8 @@ In this manner, the most natural enharmonic notes are chosen. #(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 + ; 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))) @@ -52,23 +53,23 @@ In this manner, the most natural enharmonic notes are chosen. (e (ly:music-property music 'element)) (p (ly:music-property music 'pitch))) (if (pair? es) - (ly:music-set-property! + (ly:music-set-property! music 'elements (map (lambda (x) (naturalize x)) es))) (if (ly:music? e) - (ly:music-set-property! + (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))) + (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)) + (ly:music?) + (naturalize m)) music = \relative c' { c4 d e g } diff --git a/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc b/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc index 94dd94820f..0f43098559 100644 --- a/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc +++ b/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc @@ -8,8 +8,10 @@ dentro de un contexto @code{Staff}). Se puede elegir entre centrado) y @code{#DOWN} (o @code{#-1}, abajo). Como podemos ver, esta propiedad se puede cambiar tantas veces -como queramos. Utilice @code{\\once \\override} si no quiere que el +como queramos. Utilice @code{\\once \\override} si no quiere que el truco se aplique a toda la partitura. " doctitlees = "Añadir un bajo cifrado encima o debajo de las notas" + + doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes" diff --git a/input/texidocs/adding-fingerings-to-tablatures.ly b/input/texidocs/adding-fingerings-to-tablatures.ly new file mode 100644 index 0000000000..4fc9caf6d3 --- /dev/null +++ b/input/texidocs/adding-fingerings-to-tablatures.ly @@ -0,0 +1,6 @@ + texidocfr = "Ajout de doigtés à des tablatures" + + doctitlefr = " +L'ajout de doigtés à des tablatures s'obtient en conjuguant des +@code{\\markup} et des @code{\\finger}. +" diff --git a/input/texidocs/adding-the-current-date-to-a-score.texidoc b/input/texidocs/adding-the-current-date-to-a-score.texidoc index f71fe81631..4e6a67cdf7 100644 --- a/input/texidocs/adding-the-current-date-to-a-score.texidoc +++ b/input/texidocs/adding-the-current-date-to-a-score.texidoc @@ -1,6 +1,12 @@ texidoces = " Con algo de código de Scheme, se puede añadir fácilmente la fecha actual a una partitura. - " doctitlees = "Añadir la fecha actual a una partitura" + + texidocfr = " +Avec un peu de code Scheme, voici comment ajouter facilement +la date du jour à votre partition. +" + + doctitlefr = "Ajout de la date du jour à une partition" -- 2.39.5