lilypond-1.5.35

diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf
index 94a5c52f26e37a98da77a307e721b7b5f192258f..53ce2688d118cf8d7b934ca3ef8ebb9e03c8a8ba 100644 (file)
--- a/mf/parmesan-generic.mf
+++ b/mf/parmesan-generic.mf
@@ -1,11 +1,10 @@
-% 
-% feta-generic.mf --  implement generic stuff: include lots of files, but don't
-%  set dims.
+% -*-Fundamental-*-
+% parmesan-generic.mf --  implement generic stuff: include lots of files,
+% but don't set dims.
 %
-% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
-% music font
+% source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 2002 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 
@@ -32,6 +31,7 @@ if test = 0:
        input parmesan-accidentals;
        input parmesan-flags;
        input parmesan-timesig;
+       input parmesan-scripts;
 
 else:
 

diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index 688de02bf1e1f22844843376529f2a0a4f5dd3b3..33aeea3091b00b0058d6f301fce16ebed5d09020 100644 (file)
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -70,7 +70,7 @@ enddef;
 % Some sources (eg Musix/OpusTeX think that the appendage should be on
 % the left, some say right. Right wins democratically.
 %
-def draw_longa (expr wid) =
+def draw_neo_longa (expr wid) =
        draw_brevis(wid);
        save theta;
 
@@ -91,15 +91,15 @@ enddef;
 %
 % (ze is wel breed)
 % 
-fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
-       draw_longa (1.3 brevis_wid#)
+fet_beginchar("Maxima notehead", "-3neo_mensural", "mensuralmaximahead");
+       draw_neo_longa (1.3 brevis_wid#)
 fet_endchar;
 
-fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
-       draw_longa (brevis_wid#)
+fet_beginchar("Longa notehead", "-2neo_mensural", "mensurallongahead");
+       draw_neo_longa (brevis_wid#)
 fet_endchar;
 
-fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
+fet_beginchar("Brevis notehead", "-1neo_mensural", "mensuralbrevishead")
        draw_brevis(brevis_wid#);
 fet_endchar;
 
@@ -141,19 +141,44 @@ def draw_neo_mensural_open_head (expr wid)=
        unfill z5 -- z6 -- z7 -- z8 --cycle;
 enddef;
 
-fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralminimhead")
+fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralsemibrevishead")
       draw_neo_mensural_open_head (staff_space#);
 fet_endchar;
 
-fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralsemiminimhead")
+fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralminimahead")
       draw_neo_mensural_open_head (staff_space#);
 fet_endchar;
 
-fet_beginchar("Neo-mensural black head","2neo_mensural","neofusahead")
+fet_beginchar("Neo-mensural black head","2neo_mensural","neomensuralsemiminimahead")
       draw_neo_mensural_black_head (staff_space#);
 fet_endchar;
 
 
+brevis_wid# := 1 staff_space#;
+
+def draw_longa (expr wid) =
+       draw_brevis(wid);
+       save theta;
+
+       x6 = x7 = head_width - stem_width/2;
+       y6 = y5;
+       y7 = y5 - 2.25staff_space;
+       pickup pencircle scaled stem_width;
+       draw z6 .. z7;
+enddef;
+
+fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
+       draw_longa (2.0 brevis_wid#)
+fet_endchar;
+
+fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
+       draw_longa (brevis_wid#)
+fet_endchar;
+
+fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
+       draw_brevis(brevis_wid#);
+fet_endchar;
+
 def draw_mensural_head (expr wid, open) =
       save head_width;
       head_width# = wid;
@@ -188,15 +213,15 @@ def draw_mensural_head (expr wid, open) =
 enddef;
 
 
-fet_beginchar("Mensural open head","0mensural","mensuralminimhead")
+fet_beginchar("Mensural open head","0mensural","mensuralsemibrevishead")
        draw_mensural_head (staff_space#, true);
 fet_endchar;
 
-fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead")
+fet_beginchar("Mensural open head","1mensural","mensuralminimahead")
        draw_mensural_head (staff_space#, true);
 fet_endchar;
 
-fet_beginchar("Mensural black head","2mensural","fusahead")
+fet_beginchar("Mensural black head","2mensural","mensuralsemiminimahead")
        draw_mensural_head (staff_space#, false);
 fet_endchar;
 

diff --git a/mf/parmesan-scripts.mf b/mf/parmesan-scripts.mf
new file mode 100644 (file)
index 0000000..ded015c
--- /dev/null
+++ b/mf/parmesan-scripts.mf
@@ -0,0 +1,46 @@
+% -*-Fundamental-*-
+% parmesan-scripts.mf -- implement ancient script symbols
+% 
+% source file of LilyPond's pretty-but-neat music font
+% 
+% (c) 2002 Juergen Reuter <reuter@ipd.uka.de>
+% 
+
+fet_begingroup ("scripts")
+
+def draw_fermata =
+       save za, zb, zc, zd, ze, zf, zg, zh;
+       pair za, zb, zc, zd, ze, zf, zg, zh;
+
+       set_char_box(staff_space#/2, staff_space#/2,
+                    5/2*stafflinethickness#, 2staff_space#);
+
+       pickup pencircle
+               xscaled 1.0 stafflinethickness
+               yscaled 5.0 stafflinethickness
+               rotated -35;
+       za = (+0.50staff_space, +2.00staff_space);
+       zb = (+0.00staff_space, +2.00staff_space);
+       zc = (-0.50staff_space, +1.50staff_space);
+       zd = (-0.25staff_space, +1.00staff_space);
+       ze = (+0.10staff_space, +0.80staff_space);
+       zf = (+0.00staff_space, +0.00staff_space);
+       draw za{-1,+1} .. zb .. zc .. zd .. ze .. zf;
+
+       pickup pencircle scaled 3.0 stafflinethickness;
+       zg = (-0.5staff_space, +0.0staff_space);
+       zh = (+0.5staff_space, +0.0staff_space);
+       drawdot zg;
+       drawdot zh;
+enddef;
+
+fet_beginchar("fermata up", "ufermata", "ufermata")
+       draw_fermata;   
+fet_endchar;
+
+fet_beginchar("fermata down", "dfermata", "dfermata")
+       draw_fermata;
+       y_mirror_char;
+fet_endchar;
+
+fet_endgroup ("scripts")

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index fb053465deebbf2c8cff4dbdd28f98e03b820ec3..254732788f0eb638991885ff352be9c6bb384b42 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -64,11 +64,12 @@
 (define (find-notehead-symbol duration style)
   (case style
    ((xcircle) "2xcircle")
-   ((harmonic) "0mensural")
+   ((harmonic) "0neo_mensural")
    ((baroque) 
     (string-append (number->string duration)
-                  (if (< duration 0) "mensural" "")))
+                  (if (< duration 0) "neo_mensural" "")))
    ((mensural) (string-append (number->string duration) (symbol->string style)))
+   ((neo_mensural) (string-append (number->string duration) (symbol->string style)))
    ((default) (number->string duration))
    (else
     (string-append (number->string (max 0 duration)) (symbol->string style)))))