*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 20aa3964d35a9a96db9e1d41e9c986f039d50b4c..9aa94339cd95c32f1df6bac47ea02573770c84f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-29  Arno Waschk <arno@arnowaschk.de>
+
+       * mf/feta-schrift.mf: added <>-like articulation mark as "espressivo"
+
 2004-12-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/music-functions.scm (cue-substitute): voice counts start at 0.

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index d08c1e674867817588adfbaecd635658bb101050..dcd362eaaab76e26f86b3dc5453531063fd7e4c9 100644 (file)
--- 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 db969a25897366054a52444d824dfc5495a1f63a..61bd630b33be86c8d0fd419124526ce8dcf5d02d 100644 (file)
--- 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 75ec6bd786cf05f4ce44b8727a31eb38e5d9431e..26cfac733e33abf00ba46acf7b701fa4ebc1bf39 100644 (file)
--- 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 248559ba543e0e360837757772537dea7454da46..61ed5bb4108b6aeb4d4a629a51d9fd65b521095b 100644 (file)
--- 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 ae432902d8b57bce1405410b429e760d4f5f4e60..4c656d8e59209db4f06e924307bef7005c2e6f26 100644 (file)
--- 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 0165f27c90ccaa57e4458b97c3a672928003b09d..74631d0b8d40b2c1c83028f1d313d31188c37ba3 100644 (file)
--- 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)