X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fly-examples%2Faucun-snippet.ly;h=e8e6d538fbf62424cfdcf0c89a88c1c7c7809bfd;hb=f947f7e126ccaaea212a7e65ed458a05555c771e;hp=3dd1a642edbf2487afd5a8cf6973d9e5afa860b2;hpb=3b8f430efd506ccd6ae8235be0f08468c0da937d;p=lilypond.git diff --git a/Documentation/ly-examples/aucun-snippet.ly b/Documentation/ly-examples/aucun-snippet.ly index 3dd1a642ed..e8e6d538fb 100644 --- a/Documentation/ly-examples/aucun-snippet.ly +++ b/Documentation/ly-examples/aucun-snippet.ly @@ -1,4 +1,4 @@ -\version "2.14.0" +\version "2.19.22" \include "example-header.ily" \paper { @@ -17,14 +17,14 @@ %%%%%%%%%%% INCIPIT DEFS %%%%%%%%%% incipitGlobal = { - \override NoteHead #'style = #'mensural - \override Accidental #'style = #'mensural - \override KeySignature #'style = #'mensural - \override Rest #'style = #'mensural -% \override Staff.TimeSignature #'style = #'mensural + \override NoteHead.style = #'mensural + \override Accidental.style = #'mensural + \override KeySignature.style = #'mensural + \override Rest.style = #'mensural +% \override Staff.TimeSignature.style = #'mensural \cadenzaOn - \override Score.Clef #'extra-offset = #'(-0.0 . 0.5) - \override Score.Clef #'font-size = #3 + \override Score.Clef.extra-offset = #'(-0.0 . 0.5) + \override Score.Clef.font-size = #3 \clef "vaticana-do1" } @@ -38,8 +38,8 @@ incipitTriplum = \markup{ \layout { %indent = 1\cm \context {\Voice - \remove Ligature_bracket_engraver - \consists Mensural_ligature_engraver + \remove "Ligature_bracket_engraver" + \consists "Mensural_ligature_engraver" } \context {\Staff \remove "Time_signature_engraver" @@ -59,8 +59,8 @@ incipitMotetus = \markup{ \layout { % indent = 1\cm \context {\Voice - \remove Ligature_bracket_engraver - \consists Mensural_ligature_engraver + \remove "Ligature_bracket_engraver" + \consists "Mensural_ligature_engraver" } \context {\Staff \remove "Time_signature_engraver" @@ -80,8 +80,8 @@ incipitTenor = \markup{ \layout { %indent = 1\cm \context {\Voice - \remove Ligature_bracket_engraver - \consists Mensural_ligature_engraver + \remove "Ligature_bracket_engraver" + \consists "Mensural_ligature_engraver" } \context {\Staff \remove "Time_signature_engraver" @@ -94,10 +94,10 @@ incipitTenor = \markup{ incipitBassus = \markup{ \score{ { \set Staff.instrumentName = "Bassus " - \override NoteHead #'style = #'neomensural - \override Accidental #'style = #'neomensural - \override Rest #'style = #'neomensural - \override Staff.TimeSignature #'style = #'neomensural + \override NoteHead.style = #'neomensural + \override Accidental.style = #'neomensural + \override Rest.style = #'neomensural + \override Staff.TimeSignature.style = #'neomensural \cadenzaOn \clef "petrucci-f3" \key f \major @@ -108,8 +108,8 @@ incipitBassus = \markup{ } \layout { \context { \Voice - \remove Ligature_bracket_engraver - \consists Mensural_ligature_engraver + \remove "Ligature_bracket_engraver" + \consists "Mensural_ligature_engraver" } line-width=5\mm } @@ -121,40 +121,40 @@ incipitBassus = \markup{ #(ly:set-option 'point-and-click #f) global = { - \override Staff.TimeSignature #'stencil = #(lambda (grob) + \override Staff.TimeSignature.stencil = #(lambda (grob) (bracketify-stencil (ly:time-signature::print grob) Y 0.1 0.2 0.1)) \time 3/4 - \override Staff.BarLine #'transparent = ##t - \override HorizontalBracket #'direction = #UP - \override HorizontalBracket #'bracket-flare = #'(0 . 0) + \hide Staff.BarLine + \override HorizontalBracket.direction = #UP + \override HorizontalBracket.bracket-flare = #'(0 . 0) } %%%%%%%%% MACRO FOR MAKING SLASHES THROUGH STEMS %%%%%%%%%% -MakeSlash = #(define-music-function (parser location angle len-left len-right +MakeSlash = #(define-music-function (angle len-left len-right thick y-factor offset) (number? number? number? number? number? pair?) #{ -\once \override Voice.Stem #'text = \markup { - \postscript #(let ((x-off (car $offset)) - (y-off (cdr $offset))) +\once \override Voice.Stem.text = \markup { + \postscript #(let ((x-off (car offset)) + (y-off (cdr offset))) (string-append - (ly:number->string (car $offset)) " " (ly:number->string (cdr $offset)) " + (ly:number->string (car offset)) " " (ly:number->string (cdr offset)) " translate " - (ly:number->string $angle) " rotate " + (ly:number->string angle) " rotate " (ly:number->string (- x-off)) " " (ly:number->string (- y-off)) " translate 0 setlinewidth " - (ly:number->string (- x-off $len-left)) " " (ly:number->string (+ y-off -$thick)) " moveto " - (ly:number->string (- x-off $len-left)) " " (ly:number->string y-off) - " " (ly:number->string $thick) " + (ly:number->string (- x-off len-left)) " " (ly:number->string (+ y-off +thick)) " moveto " + (ly:number->string (- x-off len-left)) " " (ly:number->string y-off) + " " (ly:number->string thick) " 90 270 arc " - (ly:number->string (+ x-off $len-right)) " " (ly:number->string y-off) - " " (ly:number->string $thick) " + (ly:number->string (+ x-off len-right)) " " (ly:number->string y-off) + " " (ly:number->string thick) " 270 90 arc " " gsave fill grestore stroke")) } -\once \override Voice.Stem #'stencil = #(lambda (grob) +\once \override Voice.Stem.stencil = #(lambda (grob) (let* ((sten1 (ly:stem::print grob)) (sten2 (ly:text-interface::print grob)) (extent1 (ly:stencil-extent sten1 Y)) @@ -162,8 +162,8 @@ $thick)) " moveto " (ly:stencil-add sten1 (ly:stencil-translate sten2 - (cons 0 (+ (* $y-factor (cdr extent1)) - (* (- 1 $y-factor) (car extent1)))))))) + (cons 0 (+ (* y-factor (cdr extent1)) + (* (- 1 y-factor) (car extent1)))))))) #}) @@ -178,18 +178,18 @@ triplumWords = \lyricmode { si que m'ès -- tuet fai -- re _ chan -- _ _ çon } -triplumNotes = \relative c' { +triplumNotes = \relative { \clef "treble_8" %\set Staff.midiInstrument = "flute" % \global - \override StemTremolo #'beam-thickness = #.125 - \override StemTremolo #'slope = #1.0 - f8 f4 e8 d c f f f | % 1 + \override StemTremolo.beam-thickness = #.125 + \override StemTremolo.slope = #1.0 + f'8 f4 e8 d c f f f | % 1 % the \scaleDurations command below makes 5 notes last the % duration of a dotted quarter - e8 c4 \scaleDurations #'(3 . 2) { \times 4/5{e16[ d e d e]} } e8 f4 | % 2 - g2. ~ g4. | % 3 - f8 d4 f4. \scaleDurations #'(3 . 2) { \times 4/6{ g16[ f e f e f]}} % 4 + e8 c4 \scaleDurations 3/2 { \tuplet 5/4{e16[ d e d e]} } e8 f4 | % 2 + g2. ~ 4. | % 3 + f8 d4 f4. \scaleDurations 3/2 { \tuplet 6/4{ g16[ f e f e f]}} % 4 g8 g4 g4. e4. | % 5 fis8 d4 e8\startGroup g4\stopGroup f8[ e d] | % 6 c2. r4. | % 7 @@ -200,17 +200,17 @@ motetusWords = \lyricmode { mes or ai _ _ } -motetusNotes = \relative c' { +motetusNotes = \relative { \clef "treble_8" - c2. c8\startGroup b8 \slash c\stopGroup | % 1 + c'2. c8\startGroup b8 \slash c\stopGroup | % 1 a2. c4. | d2. e4. | % 2-3 f2. f8 e d | % 4 - c2. ~ c4. | r2. r4. | % 5-6 + c2. ~ 4. | r2. r4. | % 5-6 g'4. g g8 f e | % 7 } -tenorNotes = \relative c { +tenorNotes = \relative { \clef "treble_8" f2. | a2. | g2. | r2. | % 1-4 c2. | b2. | c2. | % 5-7 @@ -222,10 +222,10 @@ tenorNotes = \relative c { %\set Staff.instrumentName = "Triplum" \set Staff.instrumentName = \incipitTriplum \set Staff.shortInstrumentName = "Tr." - \set Staff.timeSignatureFraction = #'(9 . 8) - \scaleDurations #'(2 . 3) + \set Staff.timeSignatureFraction = 9/8 + \scaleDurations 2/3 \context Voice = "triplum" { \global \triplumNotes } -% \scaleDurations #'(2 . 3) +% \scaleDurations 2/3 % \context Voice = "slashes" { \triplumSkips } \new Lyrics { \lyricsto "triplum" { \triplumWords }} >> @@ -233,8 +233,8 @@ tenorNotes = \relative c { %\set Staff.instrumentName = "Motetus" \set Staff.instrumentName = \incipitMotetus \set Staff.shortInstrumentName = "M." - \set Staff.timeSignatureFraction = #'(9 . 8) - \scaleDurations #'(2 . 3) + \set Staff.timeSignatureFraction = 9/8 + \scaleDurations 2/3 \context Voice = "motetus" { \global \motetusNotes } \new Lyrics { \lyricsto "motetus" { \motetusWords }} >>