%
% source file of LilyPond's pretty-but-neat music font
%
-% (c) 2001--2005 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2006 Juergen Reuter <reuter@ipd.uka.de>
%
% Neo-mensural heads originally by
% Christian Mondrup and Mats Bengtsson
enddef;
+%%% This head does not seem to be used anywhere. Junk me? -- jr
def draw_neomensural_left_stemmed_head (expr wid) =
draw_neomensural_brevis(wid);
draw z6 .. z7;
enddef;
-fet_beginchar("Left stemmed notehead", "lneomensural");
+%%% This head does not seem to be used anywhere. Junk me? -- jr
+fet_beginchar("Left stemmed notehead", "slneomensural");
draw_neomensural_left_stemmed_head (2 staff_space#);
fet_endchar;
%
-% Some sources (eg Musix/OpusTeX think that the appendage should be on
+% Some sources (eg. Musix/OpusTeX) think that the appendage should be on
% the left, some say right. Right wins democratically.
%
def draw_neomensural_longa (expr wid) =
unfill z5 -- z6 -- z7 -- z8 --cycle;
enddef;
-fet_beginchar("Neo-mensural open head","s0neomensural")
- draw_neomensural_open_head (staff_space#, noteheight#);
-fet_endchar;
-
%
% WL says the thin lines should be thinner.
%
-
fet_beginchar("Harmonic notehead (Neo-mensural open)",
- "0harmonic")
-
+ "s0harmonic")
draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#);
charwx := head_width#;
charwy := 0;
fet_endchar;
+fet_beginchar("Neo-mensural semibrevis head","s0neomensural")
+ draw_neomensural_open_head (staff_space#, noteheight#);
+fet_endchar;
-fet_beginchar("Neo-mensural open head","s1neomensural")
+fet_beginchar("Neo-mensural minima head","s1neomensural")
draw_neomensural_open_head (staff_space#, noteheight#);
fet_endchar;
-fet_beginchar("Neo-mensural black head","s2neomensural")
+fet_beginchar("Neo-mensural semiminima head","s2neomensural")
draw_neomensural_black_head (staff_space#, noteheight#);
fet_endchar;
-
-
def draw_mensural_brevis (expr wid) =
% TODO. For the moment, fall back to draw_neomensural_brevis.
draw_neomensural_brevis(wid);
enddef;
+%%% This head does not seem to be used anywhere. Junk me? -- jr
def draw_mensural_left_stemmed_head (expr wid) =
draw_mensural_brevis(wid);
x6 = x7 = stem_width/2;
draw z6 .. z7;
enddef;
+%%% This head does not seem to be used anywhere. Junk me? -- jr
fet_beginchar("Mensural left stemmed notehead", "slmensural");
draw_mensural_left_stemmed_head (staff_space#)
fet_endchar;
enddef;
-fet_beginchar("Mensural open head","s0mensural")
+fet_beginchar("Mensural semibrevis head","s0mensural")
draw_diamond_head (staff_space#, 0.15, 0.30, 30, true);
fet_endchar;
-fet_beginchar("Mensural open head","s1mensural")
+fet_beginchar("Mensural minima head","s1mensural")
draw_diamond_head (staff_space#, 0.15, 0.30, 30, true);
fet_endchar;
-fet_beginchar("Mensural black head","s2mensural")
+fet_beginchar("Mensural semiminima head","s2mensural")
draw_diamond_head (staff_space#, 0.15, 0.30, 30, false);
fet_endchar;
+fet_beginchar("Petrucci semibrevis head","s0petrucci")
+% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, true);
+ draw_neomensural_open_head (staff_space#, 1.8 staff_space#);
+fet_endchar;
+
+fet_beginchar("Petrucci minima head","s1petrucci")
+% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, true);
+ draw_neomensural_open_head (staff_space#, 1.8 staff_space#);
+fet_endchar;
+
+fet_beginchar("Petrucci semiminima head","s2petrucci")
+% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, false);
+ draw_neomensural_black_head (staff_space#, 1.8 staff_space#);
+fet_endchar;
+
%%%%%%%%
%
% parameterized punctum
def punctum_char (expr verbose_name, internal_name,
left_stem, right_stem, linea, cavum,
- straight, auctum, direction_up, excentric, up_shift, down_shift, mag) =
+ straight, auctum, rev_auctum, direction_up,
+ excentric, up_shift, down_shift, mag) =
fet_beginchar(verbose_name, "s" & internal_name)
save b_h, a_w;
direction_sign# = -1;
fi;
- % convexity and excentricity
- save u_convexity, u_excentricity;
+ % convexity and eccentricity
+ save u_convexity, u_eccentricity;
if straight:
u_convexity# = -0.01ht#;
- u_excentricity# = 0.0ht#; % dummy
+ u_eccentricity# = 0.0ht#; % dummy
elseif auctum:
u_convexity# = -0.03ht#;
- u_excentricity# = +0.25ht#;
+ u_eccentricity# = +0.25ht#;
+ elseif rev_auctum:
+ u_convexity# = -0.10ht#;
+ u_eccentricity# = -0.12ht#;
else:
u_convexity# = -0.05ht#;
- u_excentricity# = 0.0ht#; % dummy
+ u_eccentricity# = 0.0ht#; % dummy
fi;
- save convexity, excentricity;
+ save convexity, eccentricity;
convexity# = direction_sign# * u_convexity#;
- excentricity# = direction_sign# * u_excentricity#;
+ eccentricity# = direction_sign# * u_eccentricity#;
% y shift offset
save yoffs;
yoffs# = 0.00ht#;
fi
- define_pixels(convexity, excentricity, yoffs, ht, wd);
+ define_pixels(convexity, eccentricity, yoffs, ht, wd);
pickup pencircle scaled linethickness;
path p;
save box_top, box_bt;
- if auctum:
+ if auctum or rev_auctum:
z1a = (0.00wd + linethickness/2, yoffs_bt);
z2a = (0.21wd, yoffs_bt + 1.0*convexity);
z3a = (0.42wd - linethickness/2,
- yoffs_bt + 1.0*excentricity);
+ yoffs_bt + 1.0*eccentricity);
box_top# = height# + yoffs_bt# +
- max(0, 1.0*convexity#, 1.0*excentricity#);
+ max(0, 1.0*convexity#, 1.0*eccentricity#);
box_bt# = yoffs_bt# +
- min(0, 1.0*convexity#, 1.0*excentricity#);
+ min(0, 1.0*convexity#, 1.0*eccentricity#);
p = z1a .. {right}z2a .. {direction}z3a --
z3b{-direction} .. z2b{left} .. z1b -- cycle;
elseif excentric:
% punctum
punctum_char("Ed. Vat. punctum", "vaticana.punctum",
false, false, false, false, false,
- false, false, false, false, false, 1.0);
+ false, false, false, false, false, false, 1.0);
% punctum cavum (for OpusTeX compatibility)
punctum_char("Ed. Vat. punctum cavum", "vaticana.punctum.cavum",
false, false, false, true, false,
- false, false, false, false, false, 1.0);
+ false, false, false, false, false, false, 1.0);
% linea punctum (for OpusTeX compatibility)
punctum_char("Ed. Vat. linea punctum", "vaticana.linea.punctum",
false, false, true, false, false,
- false, false, false, false, false, 1.0);
+ false, false, false, false, false, false, 1.0);
% linea punctum cavum (for OpusTeX compatibility)
punctum_char("Ed. Vat. linea punctum cavum", "vaticana.linea.punctum.cavum",
false, false, true, true, false,
- false, false, false, false, false, 1.0);
+ false, false, false, false, false, false, 1.0);
% punctum inclinatum
inclinatum_char("Ed. Vat. inclinatum", "vaticana.inclinatum",
% pes lower punctum
punctum_char("Ed. Vat. pes lower punctum", "vaticana.lpes",
false, false, false, false, true,
- false, true, false, false, false, 1.0);
+ false, false, true, false, false, false, 1.0);
% pes lower punctum
punctum_char("Ed. Vat. pes var lower punctum", "vaticana.vlpes",
false, false, false, false, true,
- false, true, false, false, true, 1.0);
+ false, false, true, false, false, true, 1.0);
% pes upper punctum
punctum_char("Ed. Vat. pes upper punctum", "vaticana.upes",
false, false, false, false, true,
- false, false, false, false, false, 1.0);
+ false, false, false, false, false, false, 1.0);
% pes upper punctum (shifted variation)
%
%
punctum_char("Ed. Vat. var pes upper punctum", "vaticana.vupes",
false, false, false, false, true,
- false, false, false, true, false, 1.0);
+ false, false, false, false, true, false, 1.0);
% small punctum as used in epiphonus
punctum_char("Ed. Vat. plica", "vaticana.plica",
false, false, false, false, false,
- false, false, false, false, false, 0.6);
+ false, false, false, false, false, false, 0.6);
+
+% small punctum as used in epiphonus
+punctum_char("Ed. Vat. var plica", "vaticana.vplica",
+ false, false, false, false, false,
+ false, true, false, false, false, true, 0.6);
% excentric punctum as used in epiphonus
punctum_char("Ed. Vat. epiphonus", "vaticana.epiphonus",
false, false, false, false, false,
- false, true, true, false, false, 1.0);
+ false, false, true, true, false, false, 1.0);
% excentric punctum as used in epiphonus (shifted variation)
%
%
punctum_char("Ed. Vat. var epiphonus", "vaticana.vepiphonus",
false, false, false, false, false,
- false, true, true, false, true, 1.0);
+ false, false, true, true, false, true, 1.0);
% small punctum as used in cephalicus
punctum_char("Ed. Vat. rev. plica", "vaticana.reverse.plica",
false, false, false, false, false,
- false, true, false, false, false, 0.6);
+ false, false, true, false, false, false, 0.6);
+
+% small punctum as used in cephalicus
+punctum_char("Ed. Vat. rev. var plica", "vaticana.reverse.vplica",
+ false, false, false, false, false,
+ false, true, true, false, false, true, 0.6);
% excentric punctum as used in cephalicus; without left stem
punctum_char("Ed. Vat. cephalicus", "vaticana.inner.cephalicus",
false, false, false, false, false,
- false, false, true, false, false, 1.0);
+ false, false, false, true, false, false, 1.0);
% excentric punctum as used in cephalicus; with left stem
punctum_char("Ed. Vat. cephalicus", "vaticana.cephalicus",
true, false, false, false, false,
- false, false, true, false, false, 1.0);
+ false, false, false, true, false, false, 1.0);
% quilisma
fet_beginchar("Ed. Vat. quilisma", "svaticana.quilisma")
% solesmes punctum auctum ascendens
punctum_char("Solesmes punctum auctum ascendens", "solesmes.auct.asc",
false, false, false, false, false,
- true, true, false, false, false, 1.0);
+ true, false, true, false, false, false, 1.0);
% solesmes punctum auctum descendens
punctum_char("Solesmes punctum auctum descendens", "solesmes.auct.desc",
false, false, false, false, false,
- true, false, false, false, false, 1.0);
+ true, false, false, false, false, false, 1.0);
% solesmes punctum inclinatum auctum
inclinatum_char("Solesmes punctum incl. auctum", "solesmes.incl.auctum",