[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] ancient font accidentals and clef update
|
From: |
Juergen Reuter |
|
Subject: |
[PATCH] ancient font accidentals and clef update |
|
Date: |
Fri, 27 Jul 2001 00:30:12 +0200 (MEST) |
Hi!
Below is the patch (against 1.5.2) that I announced last week. It
includes ancient font accidentals. I also revised the ancient font
clefs. The "petrucci" style now contains some Petrucci-like clefs
that partially replace some of the former mensural clefs. I also
introduced a "neo-mensural" style that includes font symbols that can
be found in the incipits of contemporary transciptions of mensural
works. The remaining mensural symbols are still called "mensural",
but that may be subject to change. I think this naming scheme is much
more consistent and easier to recall than the previous one.
My last patch (note heads for the ancient font) did not make it into
1.5.2. Therefore, ancient-font.ly, which is affected by both patches,
this one and the last one, must be merged when considering both
patches. Since I do not really believe that the simple line-based
merge algorithm of rcs/cvs will give any sensible result in this
special case, I would like to suggest that you just apply the below
diff on ancient-font.ly. Eventually, I may do the merge manually.
Greetings,
Juergen
###############################################################################
--- lily/local-key-item.cc.orig Tue Mar 20 12:58:04 2001
+++ lily/local-key-item.cc Mon Jul 9 03:33:53 2001
@@ -126,6 +126,17 @@
bool oct_b = false;
int lastoct = -100;
+ SCM scm_style = me->get_grob_property ("style");
+ String style;
+ if (gh_symbol_p (scm_style))
+ {
+ style = ly_scm2string (scm_symbol_to_string (scm_style));
+ }
+ else
+ {
+ style = "default";
+ }
+
SCM accs = me->get_grob_property ("accidentals");
for (SCM s = accs;
gh_pair_p (s); s = gh_cdr (s))
@@ -154,13 +165,16 @@
SCM c0 = me->get_grob_property ("c0-position");
Real dy = (gh_number_p (c0) ? gh_scm2int (c0) : 0 + p.notename_i_)
* note_distance;
-
- Molecule acc (Font_interface::get_default_font (me)->find_by_name
(String ("accidentals-")
- + to_str
(p.alteration_i_)));
+
+ Molecule acc (Font_interface::get_default_font (me)->
+ find_by_name (String ("accidentals-") +
+ style +
+ to_str (p.alteration_i_)));
if (scm_memq (ly_symbol2scm ("natural"), opts) != SCM_BOOL_F)
{
- Molecule prefix = Font_interface::get_default_font
(me)->find_by_name (String ("accidentals-0"));
+ Molecule prefix = Font_interface::get_default_font (me)->
+ find_by_name (String ("accidentals-") + style + String
("0"));
acc.add_at_edge (X_AXIS, LEFT, Molecule (prefix), 0);
}
###############################################################################
--- lily/key-item.cc.orig Sun Apr 1 14:59:01 2001
+++ lily/key-item.cc Mon Jul 9 03:34:11 2001
@@ -82,6 +82,17 @@
Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
+ SCM scm_style = me->get_grob_property ("style");
+ String style;
+ if (gh_symbol_p (scm_style))
+ {
+ style = ly_scm2string (scm_symbol_to_string (scm_style));
+ }
+ else
+ {
+ style = "default";
+ }
+
SCM newas = me->get_grob_property ("new-accidentals");
Molecule mol;
/*
@@ -89,13 +100,15 @@
the cancellation signature.
*/
int c0p = gh_scm2int (me->get_grob_property ("c0-position"));
+
for (SCM s = newas; gh_pair_p (s); s = gh_cdr (s))
{
SCM what = gh_caar (s);
int alter = gh_scm2int (gh_cdar (s));
int pos = alteration_pos (what, alter, c0p);
- Molecule m = Font_interface::get_default_font (me)->find_by_name
("accidentals-" + to_str (alter));
+ Molecule m = Font_interface::get_default_font (me)->
+ find_by_name (String ("accidentals-") + style + to_str (alter));
m.translate_axis (pos * inter, Y_AXIS);
mol.add_at_edge (X_AXIS, LEFT, m, 0);
}
@@ -117,7 +130,8 @@
Molecule natural;
if (gh_pair_p (old))
- natural=Font_interface::get_default_font (me)->find_by_name
("accidentals-0");
+ natural=Font_interface::get_default_font (me)->
+ find_by_name (String ("accidentals-") + style + String ("0"));
for (; gh_pair_p (old); old = gh_cdr (old))
{
###############################################################################
--- mf/feta-toevallig.mf.orig Sat Feb 24 22:06:31 2001
+++ mf/feta-toevallig.mf Thu Jul 26 03:31:14 2001
@@ -26,7 +26,7 @@
% a square pen). [Wanske] does not mention this, so we'll just ignore
% this fact
%
-fet_beginchar("Sharp" , "1", "sharp");
+fet_beginchar("Default Sharp" , "default1", "defaultsharp");
set_char_box(0, 1.1 staff_space#, 1.5 staff_space#,
1.5 staff_space#);
@@ -82,7 +82,7 @@
labels(1,2,3,4);
fet_endchar;
-fet_beginchar( "Natural", "0", "natural")
+fet_beginchar( "Default Natural", "default0", "defaultnatural")
set_char_box(0, 8/12 staff_space#, 1.5 staff_space#, 1.5
staff_space#);
save interbeam, interstem, beamheight, beamwidth,
@@ -203,13 +203,13 @@
%
% unfortunately, 600dpi is not enough to show the brush of the stem.
%
-fet_beginchar("Flat", "-1", "flat")
+fet_beginchar("Default Flat", "default-1", "defaultflat")
set_char_box(1.2 stafflinethickness#, .8 staff_space#, .5
staff_space#, 2 staff_space#);
draw_meta_flat(0, w, 1/3 staff_space);
fet_endchar;
-fet_beginchar("Double flat", "-2", "flatflat")
+fet_beginchar("Default Double Flat", "default-2", "defaultflatflat")
save left_wid, overlap, right_wid;
left_wid = .7;
right_wid = .8;
@@ -220,7 +220,7 @@
right_wid *staff_space, 1/3 staff_space);
fet_endchar;
-fet_beginchar("Double sharp", "2", "sharpsharp")
+fet_beginchar("Default Double Sharp", "default2", "defaultsharpsharp")
set_char_box(0, staff_space#, .5 staff_space#, .5 staff_space#);
save klaverblad, klaversteel;
@@ -270,16 +270,179 @@
.. simple_serif(z1r, z1l, 90) .. z2l{down} -- cycle;
enddef;
-fet_beginchar("Right parenthesis", ")", "rightparen")
+fet_beginchar("Right Parenthesis", ")", "rightparen")
draw_paren;
fet_endchar;
-fet_beginchar("Left parenthesis", "(", "leftparen")
+fet_beginchar("Left Parenthesis", "(", "leftparen")
draw_paren;
currentpicture := currentpicture xscaled -1;
set_char_box(charwd, charbp, chardp, charht);
fet_endchar;
+%%%%%%%%
+%
+%
+%
+% EDITIO MEDICAEA
+%
+%
+%
+fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
+ set_char_box(0, 0.8 staff_space#, 0.6 staff_space#,
+ 2.0 staff_space#);
+
+ pickup pencircle
+ xscaled 0.50 stafflinethickness
+ yscaled 0.22 staff_space;
+
+ save za, zb;
+ pair za, zb;
+
+ za = (0.00 staff_space, +0.90 staff_space);
+ zb = (0.00 staff_space, -0.50 staff_space);
+ draw za -- zb;
+
+ pickup pencircle
+ xscaled 0.50 stafflinethickness
+ yscaled 0.22 staff_space
+ rotated -63;
+
+ save zc, zd, ze;
+ pair zc, zd, ze;
+
+ zc = (0.10 staff_space, -0.50 staff_space);
+ zd = (0.40 staff_space, +0.40 staff_space);
+ ze = (0.10 staff_space, +0.40 staff_space);
+
+ draw zc{(1,2)} .. zd .. ze{(-1,-1)};
+
+ fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% EDITIO VATICANA
+%
+%
+%
+fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
+ set_char_box(0, 0.8 staff_space#, 0.6 staff_space#,
+ 2.0 staff_space#);
+ define_pixels (stafflinethickness, staff_space);
+
+ save za, zb, zc, zd, ze, zf, zg;
+ pair za, zb, zc, zd, ze, zf, zg;
+ za = (0.00 staff_space, +0.80 staff_space);
+ zb = (0.00 staff_space, -0.03 staff_space);
+ zc = (0.25 staff_space, -0.23 staff_space);
+ zd = (0.50 staff_space, -0.23 staff_space);
+ ze = (0.50 staff_space, +0.00 staff_space);
+ zf = (0.25 staff_space, +0.20 staff_space);
+ zg = (0.15 staff_space, +0.26 staff_space);
+
+ pickup pencircle
+ xscaled 0.50 stafflinethickness
+ yscaled 0.22 staff_space;
+ draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg;
+ fet_endchar;
+
+fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
+ set_char_box(0, 0.7 staff_space#, 0.6 staff_space#,
+ 2.0 staff_space#);
+ define_pixels (stafflinethickness, staff_space);
+
+ save za, zb, zc, zd;
+ pair za, zb, zc, zd;
+ pickup pencircle
+ xscaled 0.80 stafflinethickness
+ yscaled 0.22 staff_space;
+ za = (0.00 staff_space, +0.65 staff_space);
+ zb = (0.00 staff_space, -0.35 staff_space);
+ zc = (0.00 staff_space, -0.30 staff_space);
+ zd = (0.40 staff_space, -0.08 staff_space);
+ draw za -- zb;
+ draw zc -- zd;
+
+ addto currentpicture also currentpicture
+ xscaled -1
+ yscaled -1
+ shifted (0.40 staff_space, 0.0 staff_space);
+
+ fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% MENSURAL NOTATION
+%
+%
+%
+fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
+ set_char_box(0, 0.7 staff_space#, 0.5 staff_space#,
+ 0.5 staff_space#);
+ save stemthick;
+ define_pixels (stemthick, staff_space);
+ stemthick# = stafflinethickness#;
+
+ save za, zb;
+ pair za, zb;
+ pickup pencircle scaled 0.8 stemthick;
+ za = 0.4 * staff_space * (0.8, 1);
+ za = -zb;
+ draw za .. zb;
+
+ addto currentpicture also currentpicture xscaled -1;
+ addto currentpicture also currentpicture shifted (0.20
staff_space, 0);
+
+ fet_endchar;
+
+fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
+ set_char_box(0, 0.7 staff_space#, 0.4 staff_space#,
+ 1.8 staff_space#);
+ save stemthick;
+ define_pixels (stemthick, staff_space);
+ stemthick# = stafflinethickness#;
+
+ save za, zb, zc, zd, ze;
+ pair za, zb, zc, zd, ze;
+ pickup pencircle
+ xscaled 1.4 stemthick
+ yscaled 0.6 stemthick
+ rotated 45;
+
+ za = (0.00 staff_space, +1.80 staff_space);
+ zb = (0.00 staff_space, -0.25 staff_space);
+ zc = (0.35 staff_space, -0.25 staff_space);
+ zd = (0.35 staff_space, +0.25 staff_space);
+ ze = (0.00 staff_space, +0.25 staff_space);
+ draw za -- zb .. zc .. zd .. ze;
+ fet_endchar;
+
+fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
+ set_char_box(0, 0.7 staff_space#, 0.4 staff_space#,
+ 1.8 staff_space#);
+ save stemthick;
+ define_pixels (stemthick, staff_space);
+ stemthick# = stafflinethickness#;
+
+ save za, zb, zc, zd, ze, zf;
+ pair za, zb, zc, zd, ze, zf;
+ pickup pencircle
+ xscaled 2.4 stemthick
+ yscaled 0.4 stemthick
+ rotated 45;
+
+ za = (0.00 staff_space, +1.80 staff_space);
+ zb = (0.00 staff_space, -0.15 staff_space);
+ zc = (0.25 staff_space, -0.30 staff_space);
+ zd = (0.50 staff_space, +0.00 staff_space);
+ ze = (0.30 staff_space, +0.30 staff_space);
+ zf = (0.00 staff_space, +0.15 staff_space);
+ draw za -- zb -- zc .. zd .. ze -- zf;
+ fet_endchar;
fet_endgroup("accidentals");
###############################################################################
--- mf/feta-klef.mf.orig Thu Mar 8 11:50:22 2001
+++ mf/feta-klef.mf Thu Jul 26 03:29:46 2001
@@ -583,7 +583,7 @@
enddef;
-def draw_mensural_i_c_clef(expr exact_center, reduction) =
+def draw_neo_mensural_c_clef(expr exact_center, reduction) =
draw_brevis(exact_center, reduction, false, false);
save reduced_il, reduced_slt;
@@ -618,18 +618,20 @@
enddef;
-fet_beginchar("mensural c clef", "mensural1_c", "mens1cclef")
+fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef")
if test = 1:
draw_staff(-1,3, 0.0);
fi;
- draw_mensural_i_c_clef((0,0), 1.0);
+ draw_neo_mensural_c_clef((0,0), 1.0);
fet_endchar;
-fet_beginchar("mensural c clef", "mensural1_c_change", "cmens1cclef")
- draw_mensural_i_c_clef((1.3 staff_space#,0), .8);
+fet_beginchar("neo-mensural c clef", "neo_mensural_c_change",
"cneomenscclef")
+ draw_neo_mensural_c_clef((1.3 staff_space#,0), .8);
fet_endchar;
-def draw_mensural_ii_c_clef(expr exact_center, reduction) =
+def draw_petrucci_c_clef(expr exact_center, reduction) =
+ % inspired by Josquin Desprez, "Stabat Mater", Libro tertio,
+ % 1519, printed by Petrucci, in: MGG, volume 7, Table 11.
draw_brevis(exact_center, reduction, true, true);
save reduced_il, reduced_slt;
@@ -645,39 +647,47 @@
define_pixels(stem_width);
define_pixels(interline);
+ addto currentpicture also currentpicture
+ yscaled -1 shifted (0, 2*(ypart exact_center) -
interline);
+
penpos6(stem_width, 0);
penpos7(stem_width, 0);
- z6l = exact_center + (0, -interline/2);
- z7l = z6l + (0, -1.5reduced_il);
+ z6l = exact_center + (0, 0);
+ z7l = z6l + (0, -2.2reduced_il);
fill z6l -- z7l -- z7r -- z6r -- cycle;
- addto currentpicture also currentpicture
- yscaled -1 shifted (0, 2*(ypart exact_center) -
interline);
- addto currentpicture also currentpicture
- yscaled -1 shifted (0, 4*(ypart exact_center));
addto currentpicture also currentpicture
xscaled -1 shifted (2x4l,0);
+ penpos8(stem_width, 0);
+ penpos9(stem_width, 0);
+ z8l = exact_center + (0, 0);
+ z9l = z8l + (0, -3.2reduced_il);
+ fill z8l -- z9l -- z9r -- z8r -- cycle;
+
+ addto currentpicture also currentpicture
+ yscaled -1 shifted (0, 4*(ypart exact_center));
+
set_char_box(0, 2head_width#,
noteheight#*4*reduction, noteheight#*4*reduction);
enddef;
-fet_beginchar("mensural c clef", "mensural2_c", "mens2cclef")
+fet_beginchar("petrucci c clef", "petrucci_c", "petruccicclef")
if test = 1:
draw_staff(-1,3, 0.0);
fi;
- draw_mensural_ii_c_clef((0,0), 1.0);
+ draw_petrucci_c_clef((0,0), 1.0);
fet_endchar;
-fet_beginchar("mensural c clef", "mensural2_c_change", "cmens2cclef")
- draw_mensural_ii_c_clef((1.3 staff_space#,0), .8);
+fet_beginchar("petrucci c clef", "petrucci_c_change", "cpetruccicclef")
+ draw_petrucci_c_clef((1.3 staff_space#,0), .8);
fet_endchar;
-def draw_mensural_iii_c_clef(expr exact_center, reduction) =
+def draw_mensural_c_clef(expr exact_center, reduction) =
% inspired by Ockeghem, "Missa Prolationum", in: MGG, volume
% 9, table 94.
- draw_mensural_ii_c_clef(exact_center, reduction);
+ draw_petrucci_c_clef(exact_center, reduction);
addto currentpicture also currentpicture
shifted (0, -interline);
@@ -687,14 +697,14 @@
enddef;
-fet_beginchar("mensural c clef", "mensural3_c", "mens3cclef")
+fet_beginchar("mensural c clef", "mensural_c", "menscclef")
if test = 1:
draw_staff(-1,3, 0.0);
fi;
- draw_mensural_iii_c_clef((0,0), 1.0);
+ draw_mensural_c_clef((0,0), 1.0);
fet_endchar;
-fet_beginchar("mensural c clef", "mensural3_c_change", "cmens3cclef")
- draw_mensural_iii_c_clef((0,0), .8);
+fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef")
+ draw_mensural_c_clef((0,0), .8);
fet_endchar;
def draw_diamond(expr exact_center, reduction) =
@@ -728,12 +738,13 @@
cycle;
enddef;
-def draw_mensural_i_f_clef(expr exact_center, reduction) =
- %
+def draw_petrucci_f_clef(expr exact_center, reduction) =
+ % inspired by L'homme arme super voces musicales in Misse
+ % Josquin, 1502, Petrucci, in: MGG, volume 7, col. 200; also
% inspired by Gaspar van Weerbeke, "Virgo Maria" (1502), in:
- % MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by
- % Andr'e Campra, "Entr'ee des s'er'enades" (1710), in: MGG,
- % volume 2, col. 1649 ("Contredanse"), fig. 2.
+ % MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by Andr'e
+ % Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2,
+ % col. 1649 ("Contredanse"), fig. 2.
%
draw_brevis(exact_center, reduction, true, false);
@@ -763,12 +774,13 @@
draw_diamond(exact_center +
(1.6interline*reduction, interline/2), reduction);
- %% some editions put a stem on top of the upper note head:
- % penpos8(stem_width, 0);
- % penpos9(stem_width, 0);
- % z8l = exact_center + (1.6interline*reduction,
interline*reduction);
- % z9l = z8l + (0, 1.5interline*reduction);
- % fill z8l -- z9l -- z9r -- z8r -- cycle;
+
+ % upper stem
+ penpos8(stem_width, 0);
+ penpos9(stem_width, 0);
+ z8l = exact_center + (1.6interline*reduction,
interline*reduction);
+ z9l = z8l + (0, 1.5interline*reduction);
+ fill z8l -- z9l -- z9r -- z8r -- cycle;
draw_diamond(exact_center +
(1.6interline*reduction, -interline/2), reduction);
@@ -783,18 +795,18 @@
enddef;
-fet_beginchar("mensural f clef", "mensural1_f", "mens1fclef")
+fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef")
if test = 1:
draw_staff(-1,3, 0.0);
fi;
- draw_mensural_i_f_clef((0,0), 1.0);
+ draw_petrucci_f_clef((0,0), 1.0);
fet_endchar;
-fet_beginchar("mensural f clef", "mensural1_f_change", "cmens1fclef")
- draw_mensural_i_f_clef((0,0), .8);
+fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef")
+ draw_petrucci_f_clef((0,0), .8);
fet_endchar;
-def draw_mensural_ii_f_clef(expr exact_center, reduction) =
+def draw_mensural_f_clef(expr exact_center, reduction) =
%
% inspired by Philippe le Duc, "Dite Signori" (1590), in: MGG,
% volume 3, col. 848 ("Duc"); also by John Dowland, "The First
@@ -830,14 +842,14 @@
set_char_box(0, 3staff_space#, 3staff_space#, 0);
enddef;
-fet_beginchar("mensural f clef", "mensural2_f", "mens2fclef")
+fet_beginchar("mensural f clef", "mensural_f", "mensfclef")
if test = 1:
draw_staff(-1,3, 0.0);
fi;
- draw_mensural_ii_f_clef((0,0), 1.0);
+ draw_mensural_f_clef((0,0), 1.0);
fet_endchar;
-fet_beginchar("mensural f clef", "mensural2_f_change", "cmens2fclef")
- draw_mensural_ii_f_clef((0,0), .8);
+fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef")
+ draw_mensural_f_clef((0,0), .8);
fet_endchar;
@@ -931,6 +943,71 @@
fet_endchar;
fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef")
draw_mensural_g_clef((0,0), .8);
+fet_endchar;
+
+
+
+def draw_petrucci_g_clef(expr exact_center, reduction) =
+ % inspired by Josquin Desprez, "Stabat Mater", Libro tertio,
+ % 1519, printed by Petrucci, in: MGG, volume 7, Table 11.
+
+ set_char_box(0.6 staff_space#, 0.8 staff_space#, 0.6 staff_space#,
+ 4.0 staff_space#);
+
+ save reduced_il, reduced_slt;
+
+ reduced_il# = staff_space# * reduction;
+ reduced_slt# = stafflinethickness# * reduction;
+ define_pixels(reduced_il, reduced_slt);
+
+ save za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
+ pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj;
+
+ pickup pencircle
+ xscaled 0.50 reduced_slt
+ yscaled 0.22 reduced_il
+ rotated -35;
+
+ za = exact_center + (+0.00 reduced_il, +0.00 reduced_il);
+ zb = exact_center + (+0.20 reduced_il, +1.20 reduced_il);
+ zc = exact_center + (-0.10 reduced_il, +2.00 reduced_il);
+ zd = exact_center + (-0.50 reduced_il, +3.00 reduced_il);
+ ze = exact_center + (+0.00 reduced_il, +3.70 reduced_il);
+ zf = exact_center + (+0.20 reduced_il, +3.00 reduced_il);
+ zg = exact_center + (-0.20 reduced_il, +2.00 reduced_il);
+ zh = exact_center + (-0.50 reduced_il, +1.70 reduced_il);
+ zi = exact_center + (-0.80 reduced_il, +0.75 reduced_il);
+ zj = exact_center + (-0.60 reduced_il, +0.60 reduced_il);
+
+ draw za{-1,2} .. zb .. zc .. zd .. ze .. zf .. zg .. zh .. zi
.. zj;
+
+ save za, zb, zc, zd, ze, zf;
+ pair za, zb, zc, zd, ze, zf;
+
+ pickup pencircle
+ xscaled 0.75 reduced_slt
+ yscaled 0.33 reduced_il
+ rotated -35;
+
+ za = exact_center + (+0.25 reduced_il, +0.45 reduced_il);
+ zb = exact_center + (-0.25 reduced_il, +0.45 reduced_il);
+ zc = exact_center + (-0.25 reduced_il, -0.45 reduced_il);
+ zd = exact_center + (+0.25 reduced_il, -0.45 reduced_il);
+ ze = exact_center + (+0.30 reduced_il, +0.00 reduced_il);
+ zf = exact_center + (+0.00 reduced_il, +0.00 reduced_il);
+
+ draw za .. zb .. zc .. zd .. {up}ze -- zf;
+enddef;
+
+
+fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef")
+ if test = 1:
+ draw_staff(-1,3, 0.0);
+ fi;
+ draw_petrucci_g_clef((0,0), 1.0);
+fet_endchar;
+fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef")
+ draw_petrucci_g_clef((0,0), .8);
fet_endchar;
###############################################################################
--- scm/clef.scm.orig Thu May 10 17:12:46 2001
+++ scm/clef.scm Wed Jul 25 02:10:01 2001
@@ -39,22 +39,23 @@
("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0))
("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0))
("hufnagel_do_fa" . ("clefs-hufnagel_do_fa" 4 0))
- ("mensural1_c1" . ("clefs-mensural1_c" -4 0))
- ("mensural1_c2" . ("clefs-mensural1_c" -2 0))
- ("mensural1_c3" . ("clefs-mensural1_c" 0 0))
- ("mensural1_c4" . ("clefs-mensural1_c" 2 0))
- ("mensural2_c1" . ("clefs-mensural2_c" -4 0))
- ("mensural2_c2" . ("clefs-mensural2_c" -2 0))
- ("mensural2_c3" . ("clefs-mensural2_c" 0 0))
- ("mensural2_c4" . ("clefs-mensural2_c" 2 0))
- ("mensural2_c5" . ("clefs-mensural2_c" 4 0))
- ("mensural3_c1" . ("clefs-mensural3_c" -2 0))
- ("mensural3_c2" . ("clefs-mensural3_c" 0 0))
- ("mensural3_c3" . ("clefs-mensural3_c" 2 0))
- ("mensural3_c4" . ("clefs-mensural3_c" 4 0))
- ("mensural1_f" . ("clefs-mensural1_f" 2 0))
- ("mensural2_f" . ("clefs-mensural2_f" 2 0))
+ ("mensural_c1" . ("clefs-mensural_c" -2 0))
+ ("mensural_c2" . ("clefs-mensural_c" 0 0))
+ ("mensural_c3" . ("clefs-mensural_c" 2 0))
+ ("mensural_c4" . ("clefs-mensural_c" 4 0))
+ ("mensural_f" . ("clefs-mensural_f" 2 0))
("mensural_g" . ("clefs-mensural_g" -2 0))
+ ("neo_mensural_c1" . ("clefs-neo_mensural_c" -4 0))
+ ("neo_mensural_c2" . ("clefs-neo_mensural_c" -2 0))
+ ("neo_mensural_c3" . ("clefs-neo_mensural_c" 0 0))
+ ("neo_mensural_c4" . ("clefs-neo_mensural_c" 2 0))
+ ("petrucci_c1" . ("clefs-petrucci_c" -4 0))
+ ("petrucci_c2" . ("clefs-petrucci_c" -2 0))
+ ("petrucci_c3" . ("clefs-petrucci_c" 0 0))
+ ("petrucci_c4" . ("clefs-petrucci_c" 2 0))
+ ("petrucci_c5" . ("clefs-petrucci_c" 4 0))
+ ("petrucci_f" . ("clefs-petrucci_f" 2 0))
+ ("petrucci_g" . ("clefs-petrucci_g" -2 0))
)
)
@@ -72,13 +73,15 @@
("clefs-hufnagel_do" . 0)
("clefs-hufnagel_fa" . 4)
("clefs-hufnagel_do_fa" . 0)
- ("clefs-mensural1_c" . 0)
- ("clefs-mensural2_c" . 0)
- ("clefs-mensural3_c" . 0)
- ("clefs-mensural1_f" . 4)
- ("clefs-mensural2_f" . 4)
- ("clefs-mensural_g" . -4))
+ ("clefs-mensural_c" . 0)
+ ("clefs-mensural_f" . 4)
+ ("clefs-mensural_g" . -4)
+ ("clefs-neo_mensural_c" . 0)
+ ("clefs-petrucci_c" . 0)
+ ("clefs-petrucci_f" . 4)
+ ("clefs-petrucci_g" . -4)
)
+)
(define (clef-name-to-properties cl)
(let ((e '())
###############################################################################
--- input/test/ancient-font.ly.orig Thu Apr 5 00:02:39 2001
+++ input/test/ancient-font.ly Thu Jul 26 03:43:29 2001
@@ -10,6 +10,7 @@
global = \notes {
\property Score.timing = ##f
+% \property Score.forceAccidental = ##t
% \property Staff.TimeSignature \override #'style = #'old
}
@@ -17,11 +18,13 @@
\global
\property Staff.StaffSymbol \override #'line-count = #4
\notes \transpose c' {
- \property Voice.NoteHead \override #'style = #'mensural
- \property Voice.Stem \override #'stem-centered = ##t
+ \property Staff.KeySignature \override #'style = #'vaticana
+ \property Staff.Accidentals \override #'style = #'vaticana
\property Staff.Custos \override #'style = #'vaticana
+ \property Voice.NoteHead \override #'style = #'mensural
+ \key es \major
\clef "vaticana_fa2"
- c2 d e f g
+ cis!2 des! e! fis! ges!
% \property Staff.clefGlyph = #"clefs-vaticana_do"
% \property Staff.clefPosition = #1
@@ -29,27 +32,33 @@
\clef "vaticana_do2"
a b c'
- b a g f
+ b as gis fes
\clef "vaticana_fa1"
- e d c1 \bar "|"
+ es dis ces1 \bar "|"
+ \property Staff.KeySignature \override #'style = #'medicaea
+ \property Staff.Accidentals \override #'style = #'medicaea
\property Staff.Custos \override #'style = #'medicaea
+ \property Voice.NoteHead \override #'style = #'mensural
\clef "medicaea_fa2"
- c2 d e f g
+ ces2 des es fes ges
\clef "medicaea_do2"
- a b c'
- b a g f
+ as bes ces'
+ bes as ges fes
\clef "medicaea_fa1"
- e d c1 \bar "|"
+ es des ces1 \bar "|"
+ \property Staff.KeySignature \override #'style = #'hufnagel
+ \property Staff.Accidentals \override #'style = #'hufnagel
\property Staff.Custos \override #'style = #'hufnagel
+ \property Voice.NoteHead \override #'style = #'mensural
\clef "hufnagel_fa2"
- c2 d e f g
+ ces!2 des! es! fes! ges!
\clef "hufnagel_do2"
- a b c'
- b a g f
- \clef "hufnagel_fa1"
- e d c1 \bar "||"
+ as! bes! ces'!
+ bes! as! ges! fes!
+ \clef "hufnagel_do_fa"
+ es! des! ces!1 \bar "||"
}
>
@@ -57,55 +66,57 @@
\global
\property Staff.StaffSymbol \override #'line-count = #5
\notes \transpose c' {
- \property Voice.NoteHead \override #'style = #'mensural
- \property Voice.Stem \override #'stem-centered = ##t
+ \property Staff.KeySignature \override #'style = #'mensural
+ \property Staff.Accidentals \override #'style = #'mensural
\property Staff.Custos \override #'style = #'mensural
- \clef "mensural1_c2"
- c2 d e f g
- \property Staff.forceClef = ##t
- \clef "mensural1_c2"
- a b c'
- b a g f
- \clef "mensural2_c2"
+ \property Voice.NoteHead \override #'style = #'mensural
+ \key a \major
+ \clef "neo_mensural_c2"
+ c2 dis es fis ges
+ \property Staff.forceClef = ##t
+ \clef "neo_mensural_c2"
+ ais bes cis'
+ bis as gis fes
+ \clef "petrucci_c2"
e d c1 \bar "|"
- \clef "mensural2_c2"
+ \clef "petrucci_c2"
c2 d e f g
\property Staff.forceClef = ##t
- \clef "mensural3_c2"
+ \clef "mensural_c2"
a b c'
b a g f
- \clef "mensural3_c2"
+ \clef "mensural_g"
e d c1 \bar "|"
- \clef "mensural1_f"
+ \clef "petrucci_f"
c2 d e f g
\property Staff.forceClef = ##t
- \clef "mensural1_f"
+ \clef "petrucci_f"
a b c'
b a g f
- \clef "mensural2_f"
+ \clef "mensural_f"
e d c1 \bar "|"
\property Staff.forceClef = ##t
- \clef "mensural2_f"
+ \clef "mensural_f"
c2 d e f g
\clef "mensural_g"
- a' b' c''
- b' a' g' f'
+ as'! bes'! cis''!
+ bes'! as'! gis'! fis'!
\property Staff.forceClef = ##t
\clef "mensural_g"
e' d' c'1 \bar "|"
\property Staff.forceClef = ##t
- \clef "mensural_g"
+ \clef "petrucci_g"
c'2 d' e' f' g'
- \clef "hufnagel_do_fa"
- a b c'
- b a g f
+ \clef "petrucci_g"
+ as'! bes'! cis''!
+ bes'! as'! gis'! fis'!
\property Staff.forceClef = ##t
- \clef "hufnagel_do_fa"
- e d c1 \bar "||"
+ \clef "mensural_g"
+ es'! des'! cis'!1 \bar "||"
}
>
@@ -118,6 +129,7 @@
% \paperTwentysix
linewidth = 17.25\cm
textheight = 26.0\cm
+ stafflinethickness = \staffspace / 5.0
indent = 0.0
\translator {
\StaffContext
###############################################################################
- [PATCH] ancient font accidentals and clef update,
Juergen Reuter <=