From: Han-Wen Nienhuys Date: Wed, 1 Dec 2004 12:06:32 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.5.14~472 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=78f7c652e770210e0cf058cb9da8ef599d89bdb5;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 20aa3964d3..9aa94339cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-29 Arno Waschk + + * mf/feta-schrift.mf: added <>-like articulation mark as "espressivo" + 2004-12-01 Han-Wen Nienhuys * scm/music-functions.scm (cue-substitute): voice counts start at 0. diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index d08c1e6748..dcd362eaaa 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -2278,6 +2278,7 @@ c\fermata c^\fermata c_\fermata @cindex accent @cindex marcato @cindex staccatissimo +@cindex espressivo @cindex fermata @cindex stopped @cindex staccato diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index db969a2589..61bd630b33 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -18,7 +18,7 @@ This chart shows all articulations, or scripts, that feta font contains. \set Score.timing = ##f \set Score.barAlways = ##t \override Staff.BarLine #'transparent = ##t - c''\accent c''\marcato c''\staccatissimo + c''\accent c''\marcato c''\staccatissimo c''\espressivo c''\staccato c''\tenuto c''\portato c''\upbow c''\downbow c''\flageolet c''\thumb c''^\lheel c''\rheel @@ -33,7 +33,7 @@ This chart shows all articulations, or scripts, that feta font contains. c''\coda c''\varcoda } \context Lyrics \lyricmode { - accent__ marcato__ staccatissimo__ + accent__ marcato__ staccatissimo__ espressivo__ staccato__ tenuto__ portato__ upbow__ downbow__ flageolet__ thumb__ lheel__ rheel__ diff --git a/ly/script-init.ly b/ly/script-init.ly index 75ec6bd786..26cfac733e 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -15,6 +15,7 @@ harmonic = #(make-music 'HarmonicEvent) thumb = #(make-articulation "thumb") accent = #(make-articulation "accent") +espressivo = #(make-articulation "espressivo") marcato = #(make-articulation "marcato") staccatissimo = #(make-articulation "staccatissimo") portato = #(make-articulation "portato") diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 248559ba54..61ed5bb410 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -236,6 +236,32 @@ fet_beginchar("> accent", "sforzato", "sforzatoaccent") labels(4); fet_endchar; +fet_beginchar("espr", "espr", "espressivo") + set_char_box(1.9 staff_space#, 1.9 staff_space#, .5 staff_space#, .5 staff_space#); + save thickness, diminish; + thickness = 0.05 staff_space + linethickness; + pickup pencircle scaled thickness; + t = thickness; + diminish = .75; + top z1 =(0.2 staff_space,h); + rt z3 =(w,0); + x4 = x3; + y4 = y3 + .25 t * diminish; + x2 = .5[x1,x3]; + z2 = whatever[z1,z3]; + penpos1(t,90); + penpos2(t,90); + penpos4((2-diminish)*t*.5,90); + draw z1 .. z2; + penstroke z2e .. z4e; + penlabels(1,2,4); + labels(3); + draw z3; + addto currentpicture also currentpicture xscaled -1; + addto currentpicture also currentpicture yscaled -1; + +fet_endchar; + fet_beginchar("staccato dot", "staccato", "staccato") save radius; radius# = 0.20 * staff_space#; diff --git a/mf/feta-test-generic.mf b/mf/feta-test-generic.mf index ae432902d8..4c656d8e59 100644 --- a/mf/feta-test-generic.mf +++ b/mf/feta-test-generic.mf @@ -3,63 +3,6 @@ % in a separate file to avoid tainting non-test font files for testing. % % -fet_beginchar("> accent", "sforzato", "sforzatoaccent") - set_char_box(.9 staff_space#, .9 staff_space#, .5 staff_space#, .5 staff_space#); - save thickness, diminish; - - thickness = 0.05 staff_space + linethickness; - pickup pencircle scaled thickness; - - % prevent blobs at crossing lines - diminish = 1.0; - - top y1 = h; - lft x1 = -b; - rt x2 = w; - y2 = .25 thickness* diminish; - - rt z4 = (w,0); - x3 = - linethickness + 0.1 staff_space; - z3 = whatever [z1, z4]; - - penpos2(thickness*(2 - diminish)/2 , 90); - penpos1(thickness, 90); - penpos3(thickness, 90); - - draw z1 .. z3; - draw (z1 .. z3) yscaled -1; - draw z4; - penstroke z3e .. z2e; - penstroke (z3e .. z2e) yscaled -1; - - penlabels(1,2,3); - labels(4); -fet_endchar; - - -fet_beginchar("espr", "espr", "espressivo") - set_char_box(1.9 staff_space#, 1.9 staff_space#, .5 staff_space#, .5 staff_space#); - save thickness, diminish; - thickness = 0.05 staff_space + linethickness; - pickup pencircle scaled thickness; - t = thickness; - diminish = .1; - top z1 =(0.2 staff_space,h); - rt z3 =(w,0); - x2 = .5[x1,x3]; - z2 = whatever[z1,z3]; - penpos1(t,90); - penpos2(t,90); - penpos3(diminish*t,90); - draw z1 .. z2; - penstroke z2e .. z3e; - penlabels(1,2,3); - pickup pencircle scaled (diminish* thickness); - draw z3; - addto currentpicture also currentpicture xscaled -1; - addto currentpicture also currentpicture yscaled -1; - -fet_endchar; input feta-bolletjes; %input feta-banier; diff --git a/scm/script.scm b/scm/script.scm index 0165f27c90..74631d0b8d 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -14,6 +14,11 @@ (follow-into-staff . #t) (script-stencil . (feta . ("sforzato" . "sforzato"))) (side-relative-direction . -1))) + ("espressivo" . + ((inside-slur . #f) + (follow-into-staff . #t) + (script-stencil . (feta . ("espr" . "espr"))) + (side-relative-direction . -1))) ("marcato" . ((script-stencil . (feta . ("dmarcato" . "umarcato"))) (follow-into-staff . #t)