fet_endchar;
-%
-% Find point on `curve' which gives the tangent between point `p'
-% and `curve'. To guide the search, two auxiliary points must be
-% specified, `p_in' and `p_out'. The line between `p' and `p_in'
-% must intersect `curve', while the line between `p' and `p_out'
-% must not.
-%
-def find_tangent (expr p, curve, p_in, p_out) =
- begingroup;
- save mid, t, t_good, in, out;
- pair mid, in, out;
-
- in := p_in;
- out := p_out;
-
- forever:
- mid := 0.5 [in, out];
- exitif abs (out - mid) <= eps;
- t := xpart (curve intersectiontimes (p -- mid));
- if (t > 0):
- in := mid;
- t_good := t;
- else:
- out := mid;
- fi;
- endfor;
-
- point t_good of curve
- endgroup
-enddef;
-
-
%
% Some sources (eg. Musix/OpusTeX) think that the appendage should be on
% the left, some say right. Right wins democratically.
fet_endchar;
-%
-% Shift `curve' along the line given by the auxiliary points `p_in'
-% and `p_out' until `line' is a tangent, and return the shift.
-% If `curve' is shifted to position `p_in', it must intersect
-% `line', while shifted to `p_out' it must not.
-%
-def find_tangent_shift (expr line, curve, p_in, p_out) =
- begingroup;
- save mid, t, t_good, in, out;
- pair mid, in, out;
-
- in := p_in;
- out := p_out;
-
- forever:
- mid := 0.5 [in, out];
- exitif abs (out - mid) <= eps;
- t := xpart ((curve shifted mid) intersectiontimes line);
- if (t > 0):
- in := mid;
- t_good := t;
- else:
- out := mid;
- fi;
- endfor;
-
- mid
- endgroup
-enddef;
-
-
def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
save head_width, head_height;
save ellipse, ellipse_r;
- path ellipse, ellipse_r;
+ path ellipse, ellipse_r, diamond_shape;
head_height# = head_h;
head_width# / head_height# = tand (angle);
xscaled (max (blot_diameter, pen_w * head_width))
yscaled (max (blot_diameter, pen_h * head_width))
rotated -angle;
- ellipse_r := ellipse rotated 180;
z1 = find_tangent_shift (((0, h) -- (0, -h)), ellipse,
(0, 0), (w / 2, 0));
z4 = find_tangent_shift (((0, -h) -- (w, -h)), ellipse,
(w / 2, -h), (w / 2, 0));
- fill (subpath (directiontime (z1 - z4) of ellipse,
- directiontime (z2 - z1) of ellipse)
- of ellipse) shifted z1
- -- (subpath (directiontime (z2 - z1) of ellipse,
- directiontime (z3 - z2) of ellipse)
- of ellipse) shifted z2
- -- (subpath (directiontime (z3 - z2) of ellipse_r,
- directiontime (z4 - z3) of ellipse_r)
- of ellipse_r) shifted z3
- -- (subpath (directiontime (z4 - z3) of ellipse_r,
- directiontime (z1 - z4) of ellipse_r)
- of ellipse_r) shifted z4
- -- cycle;
+ diamond_shape := get_subpath (ellipse, z1 - z4, z2 - z1, z1)
+ -- get_subpath (ellipse, z2 - z1, z3 - z2, z2)
+ -- get_subpath (ellipse, z3 - z2, z4 - z3, z3)
+ -- get_subpath (ellipse, z4 - z3, z1 - z4, z4)
+ -- cycle;
+ fill diamond_shape;
if open:
save l;
%
%
-% parameterized punctum
-def punctum_char (expr verbose_name, internal_name,
- left_stem, right_stem, linea, cavum,
- straight, auctum, rev_auctum, d_up,
- eccentric, up_shift, down_shift, mag) =
+def vat_punctum_char (expr verbose_name, internal_name,
+ linea, cavum, straight, auctum,
+ d_up, up_shift, down_shift, mag) =
fet_beginchar (verbose_name, "s" & internal_name);
save a_b, b_h, a_w;
save a, beta, ht, wd;
ht# = noteheight# * mag;
- 2 beta# = ht# * b_h;
- a# = beta# * a_b;
- wd# = 2 a# / a_w;
+ 2 beta = ht# * b_h;
+ a = beta * a_b;
+ wd# = 2 a / a_w;
black_notehead_width# := wd#;
% direction
if d_up:
d_ := up;
- d_sign# := 1;
+ d_sign := 1;
else:
d_ := down;
- d_sign# := -1;
+ d_sign := -1;
fi;
% convexity and eccentricity
elseif auctum:
u_convexity# := -0.03 ht#;
u_eccentricity# := +0.25 ht#;
- elseif rev_auctum:
- u_convexity# := -0.10 ht#;
- u_eccentricity# := -0.12 ht#;
else:
u_convexity# := -0.05 ht#;
u_eccentricity# := 0.0 ht#; % dummy
save convexity, eccentricity;
- convexity# := d_sign# * u_convexity#;
- eccentricity# := d_sign# * u_eccentricity#;
+ convexity# := d_sign * u_convexity#;
+ eccentricity# := d_sign * u_eccentricity#;
% y shift offset
save yoffs;
pickup pencircle scaled linethickness;
- path p;
- save height, yoffs_bt;
+ save height, yoffs_bt, p, circle, circle_r;
+ path p, circle, circle_r;
height# = 0.47 ht#;
yoffs_bt# = yoffs# - 0.5 height# - 0.25 convexity#;
define_pixels (height, yoffs_bt);
+ circle := fullcircle scaled linethickness;
+
x1 = x6;
x2 = x5;
x3 = x4;
save box_top, box_bt;
- if auctum or rev_auctum:
- z1 = (0.00 wd + linethickness / 2,
- yoffs_bt);
- z2 = (0.21 wd,
- yoffs_bt + 1.0 convexity);
+ if auctum:
+ z1 = (0.00 wd + linethickness / 2, yoffs_bt);
+ z2 = (0.21 wd, yoffs_bt + convexity);
z3 = (0.42 wd - linethickness/ 2,
- yoffs_bt + 1.0 eccentricity);
+ yoffs_bt + eccentricity);
box_top# = height# + yoffs_bt# +
- max (0, 1.0 convexity#, 1.0 eccentricity#);
+ max (0, convexity#, eccentricity#);
box_bt# = yoffs_bt# +
- min (0, 1.0 convexity#, 1.0 eccentricity#);
+ min (0, convexity#, eccentricity#);
p = z1
.. {right}z2
.. {d_}z3
.. z5{left}
.. z6
-- cycle;
- elseif eccentric:
- z1 = (0.00 wd + linethickness / 2,
- yoffs_bt - 1.0 convexity);
- z2 = (0.08 wd,
- yoffs_bt + 1.4 convexity);
- z3 = (0.42 wd - linethickness / 2,
- yoffs_bt - 1.0 convexity);
- box_top# = height# + yoffs_bt# +
- max (-1.0 convexity#, 1.4 convexity#, 0);
- box_bt# = yoffs_bt# +
- min (-1.0 convexity#, 1.4 convexity#, 0);
- p = z1{d_}
- .. z2{right}
- .. z3
- -- z4
- .. {left}z5
- .. {-d_}z6
- -- cycle;
else:
- z1 = (0.00 wd + linethickness / 2,
- yoffs_bt);
- z2 = (0.21 wd,
- yoffs_bt + 1.0 convexity);
- z3 = (0.42 wd - linethickness / 2,
- yoffs_bt);
- box_top# = height# + yoffs_bt# +
- max (0, 1.0 convexity#);
- box_bt# = yoffs_bt# +
- min (0, 1.0 convexity#);
+ z1 = (0.00 wd + linethickness / 2, yoffs_bt);
+ z2 = (0.21 wd, yoffs_bt + convexity);
+ z3 = (0.42 wd - linethickness / 2, yoffs_bt);
+ box_top# = height# + yoffs_bt# + max (0, convexity#);
+ box_bt# = yoffs_bt# + min (0, convexity#);
p = z1
.. z2
.. z3
labels (1, 2, 3, 4, 5, 6);
- if cavum:
- draw p;
- else:
- filldraw p;
- fi;
+ save dirs;
+ pair dirs[];
- pickup pencircle scaled 0.6 linethickness;
+ dirs12 := direction (0 + epsilon) of p;
+ dirs2 := direction 1 of p;
+ dirs32 := direction (2 - epsilon) of p;
+ dirs45 := direction (3 + epsilon) of p;
+ dirs5 := direction 4 of p;
+ dirs65 := direction (5 - epsilon) of p;
- save stem_bt;
+ fill get_subpath (circle, down, dirs12, z1)
+ .. (bot z2){dirs2}
+ .. get_subpath (circle, dirs32, up, z3)
+ -- get_subpath (circle, up, dirs45, z4)
+ .. (top z5){dirs5}
+ .. get_subpath (circle, dirs65, down, z6)
+ -- cycle;
- if left_stem:
- z11 = (0.00 wd + 0.6 linethickness / 2, yoffs);
- z12 = (0.00 wd + 0.6 linethickness / 2, yoffs - 1.1 ht);
- draw z11
- -- z12;
- stem_bt# = yoffs# - 1.1 ht#;
- elseif right_stem:
- z11 = (0.42 wd - 0.6 linethickness / 2, yoffs);
- z12 = (0.42 wd - 0.6 linethickness / 2, yoffs - 1.5 ht);
- draw z11
- -- z12;
- stem_bt# = yoffs# - 1.5 ht#;
- else:
- stem_bt# = 0;
+ if cavum:
+ save pat, t;
+ path pat[];
+ numeric t[];
+
+ pat123 := ((directionpoint -dirs12 of circle)
+ shifted z1){dirs12}
+ .. (top z2){dirs2}
+ .. {dirs32}((directionpoint -dirs32 of circle)
+ shifted z3);
+ pat34 := lft z3
+ -- lft z4;
+ pat456 := ((directionpoint -dirs45 of circle)
+ shifted z4){dirs45}
+ .. (bot z5){dirs5}
+ .. {dirs65}((directionpoint -dirs65 of circle)
+ shifted z6);
+ pat61 := rt z6
+ -- rt z1;
+
+ t61 := ypart (pat61 intersectiontimes pat123);
+ t12 := xpart (pat123 intersectiontimes pat34);
+ t34 := ypart (pat34 intersectiontimes pat456);
+ t45 := xpart (pat456 intersectiontimes pat61);
+
+ unfill subpath (t61, t12) of pat123
+ -- subpath (t34, t45) of pat456
+ -- cycle;
fi;
set_char_box (0.00 wd#, 0.42 wd#,
- max (0, -box_bt#, -stem_bt#) + linethickness# / 2,
+ max (0, -box_bt#) + linethickness# / 2,
max (0, box_top#) + linethickness# / 2);
if linea:
define_pixels (linea_width, linea_height);
- draw_block ((-0.10 wd - linea_width / 2,
- -linea_height / 2),
- (-0.10 wd + linea_width / 2,
- +linea_height / 2));
- draw_block ((+0.52 wd - linea_width / 2,
- -linea_height / 2),
- (+0.52 wd + linea_width / 2,
- +linea_height / 2));
-
- set_char_box (0,
- 0.62 wd# + linea_width#,
+ pickup pencircle scaled 0.6 linethickness;
+
+ draw_rounded_block ((-0.10 wd - linea_width / 2,
+ -linea_height / 2),
+ (-0.10 wd + linea_width / 2,
+ +linea_height / 2),
+ 0.6 linethickness);
+ draw_rounded_block ((+0.52 wd - linea_width / 2,
+ -linea_height / 2),
+ (+0.52 wd + linea_width / 2,
+ +linea_height / 2),
+ 0.6 linethickness);
+
+ set_char_box (0, 0.62 wd# + linea_width#,
linea_height# / 2,
linea_height# / 2);
enddef;
-% parameterized punctum inclinatum
-def inclinatum_char (expr verbose_name, internal_name,
- small, stropha, auctum) =
+def plica_char (expr verbose_name, internal_name,
+ d_up, mag) =
+ fet_beginchar (verbose_name, "s" & internal_name);
+ save a_b, b_h, a_w;
+
+ a_b := 1.54; % b_h * a_b / a_w = wd / ht
+ b_h := 0.85;
+ a_w := 1.09;
+
+ save a, beta, ht, wd;
+
+ ht# = noteheight# * mag;
+ 2 beta = ht# * b_h;
+ a = beta * a_b;
+ wd# = 2 a / a_w;
+ black_notehead_width# := wd#;
+
+ % direction
+ save d_, d_sign;
+ pair d_;
+
+ if d_up:
+ d_ := up;
+ d_sign := 1;
+ else:
+ d_ := down;
+ d_sign := -1;
+ fi;
+
+ % convexity and eccentricity
+ save convexity, eccentricity;
+
+ convexity# := d_sign * -0.10 ht#;
+ eccentricity# := d_sign * -0.12 ht#;
+
+ % y shift offset
+ save yoffs;
+
+ yoffs# := -0.11 ht#;
+
+ define_pixels (convexity, eccentricity, yoffs, ht, wd);
+
+ pickup pencircle scaled linethickness;
+
+ save height, yoffs_bt, p, circle, circle_r;
+ path p, circle, circle_r;
+
+ height# = 0.47 ht#;
+ yoffs_bt# = yoffs# - 0.5 height# - 0.25 convexity#;
+
+ define_pixels (height, yoffs_bt);
+
+ circle := fullcircle scaled linethickness;
+
+ x1 = x6;
+ x2 = x5;
+ x3 = x4;
+ y1 + height = y6;
+ y2 + height = y5;
+ y3 + height = y4;
+
+ save box_top, box_bt;
+
+ z1 = (0.00 wd + linethickness / 2, yoffs_bt);
+ z2 = (0.21 wd, yoffs_bt + convexity);
+ z3 = (0.42 wd - linethickness/ 2, yoffs_bt + eccentricity);
+ box_top# = height# + yoffs_bt# +
+ max (0, convexity#, eccentricity#);
+ box_bt# = yoffs_bt# +
+ min (0, convexity#, eccentricity#);
+ p = z1
+ .. z2{right}
+ .. z3
+ -- z4
+ .. z5{left}
+ .. z6
+ -- cycle;
+
+ labels (1, 2, 3, 4, 5, 6);
+
+ save dirs;
+ pair dirs[];
+
+ dirs12 := direction (0 + epsilon) of p;
+ dirs2 := direction 1 of p;
+ dirs32 := direction (2 - epsilon) of p;
+ dirs45 := direction (3 + epsilon) of p;
+ dirs5 := direction 4 of p;
+ dirs65 := direction (5 - epsilon) of p;
+
+ fill get_subpath (circle, down, dirs12, z1)
+ .. (bot z2){dirs2}
+ .. get_subpath (circle, dirs32, up, z3)
+ -- get_subpath (circle, up, dirs45, z4)
+ .. (top z5){dirs5}
+ .. get_subpath (circle, dirs65, down, z6)
+ -- cycle;
+
+ pickup pencircle scaled 0.6 linethickness;
+
+ save stem_bt;
+
+ set_char_box (0.00 wd#, 0.42 wd#,
+ max (0, -box_bt#) + linethickness# / 2,
+ max (0, box_top#) + linethickness# / 2);
+
+ fet_endchar;
+enddef;
+
+
+def epiphonus_char (expr verbose_name, internal_name,
+ left_stem, d_up, down_shift, mag) =
+ fet_beginchar (verbose_name, "s" & internal_name);
+ save a_b, b_h, a_w;
+
+ a_b := 1.54; % b_h * a_b / a_w = wd / ht
+ b_h := 0.85;
+ a_w := 1.09;
+
+ save a, beta, ht, wd;
+
+ ht# = noteheight# * mag;
+ 2 beta = ht# * b_h;
+ a = beta * a_b;
+ wd# = 2 a / a_w;
+ black_notehead_width# := wd#;
+
+ % direction
+ save d_, d_sign;
+ pair d_;
+
+ if d_up:
+ d_ := up;
+ d_sign := 1;
+ else:
+ d_ := down;
+ d_sign := -1;
+ fi;
+
+ % convexity and eccentricity
+ save convexity;
+
+ convexity# := d_sign * -0.05ht#;
+
+ % y shift offset
+ save yoffs;
+
+ if down_shift:
+ yoffs# := -0.11 ht#;
+ else:
+ yoffs# := 0.00 ht#;
+ fi;
+
+ define_pixels (convexity, yoffs, ht, wd);
+
+ pickup pencircle scaled linethickness;
+
+ save height, yoffs_bt, p, circle, circle_r;
+ path p, circle, circle_r;
+ height# = 0.47 ht#;
+ yoffs_bt# = yoffs# - 0.5 height# - 0.25 convexity#;
+
+ define_pixels (height, yoffs_bt);
+
+ circle := fullcircle scaled linethickness;
+
+ x1 = x6;
+ x2 = x5;
+ x3 = x4;
+ y1 + height = y6;
+ y2 + height = y5;
+ y3 + height = y4;
+
+ save box_top, box_bt;
+
+ z1 = (0.00 wd + linethickness / 2, yoffs_bt - 2.5 convexity);
+ z2 = (0.06 wd, yoffs_bt + 1.4 convexity);
+ z3 = (0.42 wd - linethickness / 2, yoffs_bt - 1.0 convexity);
+ box_top# = height# + yoffs_bt# +
+ max (-1.0 convexity#, 1.4 convexity#, 0);
+ box_bt# = yoffs_bt# +
+ min (-1.0 convexity#, 1.4 convexity#, 0);
+ p = z1{-d_}
+ .. {curl 1}z2{right}
+ .. z3
+ -- z4
+ .. {left}z5{curl 1}
+ .. {d_}z6
+ -- cycle;
+
+ labels (1, 2, 3, 4, 5, 6);
+
+ save dirs;
+ pair dirs[];
+
+ dirs12 := direction (0 + epsilon) of p;
+ dirs21 := direction (1 - epsilon) of p;
+ dirs23 := direction (1 + epsilon) of p;
+ dirs32 := direction (2 - epsilon) of p;
+ dirs45 := direction (3 + epsilon) of p;
+ dirs54 := direction (4 - epsilon) of p;
+ dirs56 := direction (4 + epsilon) of p;
+ dirs65 := direction (5 - epsilon) of p;
+
+ fill get_subpath (circle, down, dirs12, z1)
+ .. get_subpath (circle, dirs21, dirs23, z2)
+ .. get_subpath (circle, dirs32, up, z3)
+ -- get_subpath (circle, up, dirs45, z4)
+ .. get_subpath (circle, dirs54, dirs56, z5)
+ .. get_subpath (circle, dirs65, down, z6)
+ -- cycle;
+
+ save stem_bt;
+
+ if left_stem:
+ z11 = (0.00 wd + 0.6 linethickness / 2, yoffs - 1.1 ht);
+ z12 = (0.00 wd + 0.6 linethickness / 2, yoffs);
+ draw_rounded_block ((0, yoffs - 1.1 ht -
+ linethickness / 2),
+ (0.6 linethickness, yoffs),
+ 0.6 linethickness);
+ stem_bt# = yoffs# - 1.1 ht#;
+ else:
+ stem_bt# = 0;
+ fi;
+
+ set_char_box (0.00 wd#, 0.42 wd#,
+ max (0, -box_bt#, -stem_bt#) + linethickness# / 2,
+ max (0, box_top#) + linethickness# / 2);
+ fet_endchar;
+enddef;
+
+
+def inclinatum_char (expr verbose_name, internal_name,
+ small, stropha, auctum) =
fet_beginchar (verbose_name, "s" & internal_name)
save ht, alpha;
- alpha# = 35;
+
+ alpha := 35;
+
if small:
ht# = 0.50 noteheight#;
else:
ht# = 0.80 noteheight#;
fi;
- draw_diamond_head (ht#, 0, 0, alpha#, false);
-
- if stropha:
- pickup pencircle
- xscaled (0.25*head_height)
- yscaled (0.55*head_height)
- rotated alpha#;
- save za, off_angle; pair za;
- off_angle := 15;
- za = (0, -0.25*head_height)
- rotated -(alpha# + off_angle)
- shifted (0.48 head_width, -0.02 head_width);
- undrawdot za;
+ draw_diamond_head (ht#, 0, 0, alpha, false);
+
+ save off_angle;
+
+ off_angle := alpha + 15;
+
+ save stropha_ellipse, auctum_hook, circle;
+ path stropha_ellipse, auctum_hook, circle;
+
+ circle := reverse fullcircle scaled linethickness;
+
+ stropha_ellipse := fullcircle xscaled 0.25 head_height
+ yscaled 0.55 head_height
+ rotated alpha;
+
+ z11 = z12
+ + linethickness / 2 * dir (180 - off_angle)
+ - directionpoint dir (90 - off_angle)
+ of stropha_ellipse;
+ z12 = directionpoint -dir (90 - off_angle) of diamond_shape +
+ linethickness / 2 * dir (180 - off_angle);
+ z13 = (0, -0.5 head_height + linethickness);
+
+ auctum_hook := z12{-dir (90 - off_angle)}
+ .. {dir (90 + alpha)}z13;
+
+ labels (12);
+
+ if (stropha and not auctum):
+ clearit;
+
+ save t_in, t_out;
+
+ t_in := xpart ((stropha_ellipse shifted z11)
+ intersectiontimes
+ get_subpath (diamond_shape,
+ left, up,
+ (0, 0)));
+ t_out := xpart ((stropha_ellipse shifted z11)
+ intersectiontimes
+ get_subpath (diamond_shape,
+ up, right,
+ (0, 0)));
+
+ % the addition or subtraction of `1' is necessary
+ % so that we get the right starting point
+ fill get_subpath_i (diamond_shape,
+ dir (angle (z2 - z1) - 1),
+ dir (angle (z1 - z4) + 1),
+ (0, 0))
+ -- get_subpath (stropha_ellipse,
+ direction t_in of stropha_ellipse,
+ direction t_out of stropha_ellipse,
+ z11)
+ -- cycle;
+
+ labels (11);
+ fi;
+
+ if (auctum and not stropha):
+ clearit;
+
+ fill get_subpath (diamond_shape,
+ left,
+ -dir (90 - off_angle),
+ (0, 0))
+ .. get_subpath (circle,
+ dir (90 + alpha),
+ -dir (90 + alpha),
+ z13)
+ .. get_subpath (circle,
+ dir (90 - off_angle),
+ right,
+ z12)
+ -- cycle;
+
+ labels (13);
fi;
- if auctum:
- pickup pencircle scaled linethickness;
- save za, zb, zc;
- pair za, zb, zc;
- za = (0, -0.5 head_height + linethickness);
- zb = 0.6 (za + zc);
- zc = za + (0.52 head_width, 0);
- draw za{(0,-1) rotated alpha#} .. {right}zb{right} ..
- {(0,1) rotated -alpha#}zc;
+ if (auctum and stropha):
+ clearit;
+
+ save t;
+
+ t := xpart ((stropha_ellipse shifted z11)
+ intersectiontimes
+ get_subpath (diamond_shape, up, right,
+ (0, 0)));
+
+ % the addition or subtraction of `1' is necessary
+ % so that we get the right starting point
+ fill get_subpath_i (diamond_shape,
+ dir (angle (z2 - z1) - 1),
+ -dir (90 - off_angle),
+ (0, 0))
+ .. get_subpath (circle,
+ dir (90 + alpha),
+ -dir (90 + alpha),
+ z13)
+ .. get_subpath (stropha_ellipse,
+ dir (90 - off_angle),
+ direction t of stropha_ellipse,
+ z11)
+ -- cycle;
+
+ labels (11, 13);
fi;
fet_endchar;
enddef;
+
% punctum
-punctum_char ("Ed. Vat. punctum", "vaticana.punctum",
- false, false, false, false, false,
- false, false, false, false, false, false, 1.0);
+vat_punctum_char ("Ed. Vat. punctum", "vaticana.punctum",
+ false, 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, false, 1.0);
+vat_punctum_char ("Ed. Vat. punctum cavum", "vaticana.punctum.cavum",
+ false, true, 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, false, 1.0);
+vat_punctum_char ("Ed. Vat. linea punctum", "vaticana.linea.punctum",
+ true, 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, false, 1.0);
+vat_punctum_char ("Ed. Vat. linea punctum cavum", "vaticana.linea.punctum.cavum",
+ true, true, false, false,
+ false, false, false, 1.0);
+
% punctum inclinatum
inclinatum_char ("Ed. Vat. inclinatum", "vaticana.inclinatum",
false, false, false);
+
% pes lower punctum
-punctum_char ("Ed. Vat. pes lower punctum", "vaticana.lpes",
- false, false, false, false, true,
- false, false, true, false, false, false, 1.0);
+vat_punctum_char ("Ed. Vat. pes lower punctum", "vaticana.lpes",
+ false, false, true, false,
+ true, false, false, 1.0);
+
% pes lower punctum
-punctum_char ("Ed. Vat. pes var lower punctum", "vaticana.vlpes",
- false, false, false, false, true,
- false, false, true, false, false, true, 1.0);
+vat_punctum_char ("Ed. Vat. pes var lower punctum", "vaticana.vlpes",
+ false, false, true, false,
+ true, 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, false, 1.0);
+vat_punctum_char ("Ed. Vat. pes upper punctum", "vaticana.upes",
+ false, false, true, false,
+ false, false, false, 1.0);
+
% pes upper punctum (shifted variation)
%
% avoid collision with the lower punctum note of the pes when the upper
% punctum sits directly on top of the lower punctum.
%
-punctum_char ("Ed. Vat. var pes upper punctum", "vaticana.vupes",
- false, false, false, false, true,
- false, false, false, false, true, false, 1.0);
+vat_punctum_char ("Ed. Vat. var pes upper punctum", "vaticana.vupes",
+ false, false, true, 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, false, 0.6);
+vat_punctum_char ("Ed. Vat. plica", "vaticana.plica",
+ false, 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);
+plica_char ("Ed. Vat. var plica", "vaticana.vplica",
+ false, 0.6);
+
% eccentric punctum as used in epiphonus
-punctum_char ("Ed. Vat. epiphonus", "vaticana.epiphonus",
- false, false, false, false, false,
- false, false, true, true, false, false, 1.0);
+epiphonus_char ("Ed. Vat. epiphonus", "vaticana.epiphonus",
+ false, true, false, 1.0);
+
% eccentric punctum as used in epiphonus (shifted variation)
%
% avoid collision with the plica head when the plica sits directly on
% top of the lower head.
%
-punctum_char ("Ed. Vat. var epiphonus", "vaticana.vepiphonus",
- false, false, false, false, false,
- false, false, true, true, false, true, 1.0);
+epiphonus_char ("Ed. Vat. var epiphonus", "vaticana.vepiphonus",
+ false, true, true, 1.0);
+
% small punctum as used in cephalicus
-punctum_char ("Ed. Vat. rev. plica", "vaticana.reverse.plica",
- false, false, false, false, false,
- false, false, true, false, false, false, 0.6);
+vat_punctum_char ("Ed. Vat. rev. plica", "vaticana.reverse.plica",
+ false, false, false, false,
+ true, 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);
+plica_char ("Ed. Vat. rev. var plica", "vaticana.reverse.vplica",
+ true, 0.6);
+
% eccentric punctum as used in cephalicus; without left stem
-punctum_char ("Ed. Vat. cephalicus", "vaticana.inner.cephalicus",
- false, false, false, false, false,
- false, false, false, true, false, false, 1.0);
+epiphonus_char ("Ed. Vat. inner cephalicus", "vaticana.inner.cephalicus",
+ false, false, false, 1.0);
+
% eccentric punctum as used in cephalicus; with left stem
-punctum_char ("Ed. Vat. cephalicus", "vaticana.cephalicus",
- true, false, false, false, false,
- false, false, false, true, false, false, 1.0);
+epiphonus_char ("Ed. Vat. cephalicus", "vaticana.cephalicus",
+ true, false, false, 1.0);
+
% quilisma
fet_beginchar ("Ed. Vat. quilisma", "svaticana.quilisma")
save a_b, b_h, a_w;
- a_b:=1.54; % b_h*a_b/a_w = wd/ht
- b_h:=0.85;
- a_w:=1.09;
+ a_b := 1.54; % b_h * a_b / a_w = wd / ht
+ b_h := 0.85;
+ a_w := 1.09;
save a, beta, ht, wd;
+
ht# = noteheight#;
- 2 beta# = ht# * b_h;
- a# = beta#*a_b;
- wd# = 2 a# / a_w;
+ 2 beta = ht# * b_h;
+ a = beta * a_b;
+ wd# = 2 a / a_w;
+
set_char_box (0, 0.42 wd#, 0.28 ht#, 0.36 ht#);
+
black_notehead_width# := wd#;
define_pixels (ht, wd);
- pickup pencircle xscaled linethickness yscaled 0.44 ht;
- lft x1 = 0.00 wd; bot y1 = -0.28 ht;
- x2 = 0.11 wd; y2 = -0.14 ht;
- x3 = 0.12 wd; y3 = +0.03 ht;
- x4 = 0.25 wd; y4 = -0.09 ht;
- x5 = 0.26 wd; y5 = +0.08 ht;
- x6 = 0.40 wd; y6 = -0.04 ht;
- rt x7 = 0.42 wd; top y7 = +0.36 ht;
- draw z1 .. z2 -- z3 .. z4 -- z5 .. z6 -- z7;
+
+ pickup pencircle xscaled linethickness
+ yscaled 0.44 ht;
+
+ save ellipse;
+ path ellipse;
+
+ ellipse := reverse fullcircle xscaled linethickness
+ yscaled 0.44 ht;
+
+ z1 = (rt 0.00 wd, top -0.28 ht);
+ z2 = (0.11 wd, -0.14 ht);
+ z3 = (0.12 wd, +0.03 ht);
+ z4 = (0.25 wd, -0.09 ht);
+ z5 = (0.25 wd, +0.08 ht);
+ z6 = (lft 0.42 wd, -0.04 ht);
+ z7 = (lft 0.40 wd, bot +0.36 ht);
+
+ fill get_subpath (ellipse, z1 - z2, z2 - z1, z1)
+ -- get_subpath (ellipse, z2 - z1, z1 - z2, z2)
+ -- cycle;
+ fill get_subpath (ellipse, z3 - z4, z4 - z3, z3)
+ -- get_subpath (ellipse, z4 - z3, z3 - z4, z4)
+ -- cycle;
+ fill get_subpath (ellipse, z5 - z6, z6 - z5, z5)
+ -- point 0 of get_subpath (ellipse, z6 - z5, z5 - z6, z6)
+ -- get_subpath (ellipse, z7 - z6, z6 - z7, z7)
+ -- get_subpath (ellipse, z6 - z7, z5 - z6, z6)
+ -- cycle;
+
+ labels (1, 2, 3, 4, 5, 6, 7);
fet_endchar;
+
% solesmes punctum inclinatum parvum
inclinatum_char ("Solesmes punctum inclinatum parvum", "solesmes.incl.parvum",
true, false, false);
+
% solesmes punctum auctum ascendens
-punctum_char ("Solesmes punctum auctum ascendens", "solesmes.auct.asc",
- false, false, false, false, false,
- true, false, true, false, false, false, 1.0);
+vat_punctum_char ("Solesmes punctum auctum ascendens", "solesmes.auct.asc",
+ false, false, false, true,
+ true, 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, false, 1.0);
+vat_punctum_char ("Solesmes punctum auctum descendens", "solesmes.auct.desc",
+ false, false, false, true,
+ false, false, false, 1.0);
+
% solesmes punctum inclinatum auctum
inclinatum_char ("Solesmes punctum incl. auctum", "solesmes.incl.auctum",
false, false, true);
+
% solesmes stropha
inclinatum_char ("Solesmes stropha", "solesmes.stropha",
false, true, false);
+
% solesmes stropha aucta
inclinatum_char ("Solesmes stropha aucta", "solesmes.stropha.aucta",
false, true, true);
+
% solesmes oriscus
fet_beginchar ("Solesmes oriscus", "ssolesmes.oriscus")
save a_b, b_h, a_w;
- a_b := 1.54; % b_h*a_b/a_w = wd/ht
+ a_b := 1.54; % b_h * a_b / a_w = wd / ht
b_h := 0.85;
a_w := 1.09;
save a, beta, ht, wd;
+
ht# = noteheight#;
- 2 beta# = ht# * b_h;
- a# = beta# * a_b;
- wd# = 2 a# / a_w;
+ 2 beta = ht# * b_h;
+ a = beta * a_b;
+ wd# = 2 a / a_w;
black_notehead_width# := wd#;
save convexity;
+
convexity# = +0.05 ht#;
define_pixels (ht, wd, convexity);
- pickup pencircle xscaled blot_diameter yscaled 0.50 ht;
- lft x1 = 0.00 wd; y1 = -convexity;
- x2 = 0.16 wd; y2 = +convexity;
- x3 = 0.33 wd; y3 = -convexity;
- rt x4 = 0.50 wd; y4 = +convexity;
- draw z1 .. z2 .. z3 .. z4;
+
set_char_box (0.00 wd#, 0.50 wd#,
0.25 ht# + convexity#, 0.25 ht# + convexity#);
+
+ z1 = (0.00 wd + blot_diameter / 2, -convexity);
+ z2 = (1/6 wd, +convexity);
+ z3 = (2/6 wd, -convexity);
+ z4 = (0.50 wd - blot_diameter / 2, +convexity);
+
+ save height, ellipse;
+ path ellipse;
+
+ height = 2 ypart (directionpoint right of (z1
+ .. z2
+ .. z3
+ .. z4));
+
+ pickup pencircle xscaled blot_diameter
+ yscaled (h + d - height);
+
+ ellipse := fullcircle xscaled blot_diameter
+ yscaled (h + d - height);
+
+ % Adjust vertical coordinates to touch bounding box.
+ y1 := top -d;
+ y4 := bot h;
+
+ save d_;
+ pair d_;
+
+ d_ := direction 0 of (z1
+ .. z2
+ .. z3
+ .. z4);
+
+ fill get_subpath (ellipse, -d_, d_, z1)
+ .. bot z2
+ .. bot z3
+ .. get_subpath (ellipse, d_, -d_, z4)
+ .. top z3
+ .. top z2
+ .. cycle;
+
+ labels (1, 2, 3, 4);
fet_endchar;
+
%%%%%%%%
%
%
fet_endchar;
-% parametrized punctum
-def punctum_char (expr verbose_name, internal_name,
- left_up_stem, left_down_stem) =
+def med_punctum_char (expr verbose_name, internal_name,
+ left_up_stem, left_down_stem) =
fet_beginchar (verbose_name, "s" & internal_name);
- save a, beta, ht, wd;
+ save a, ht, wd;
ht# = 2 staff_space#;
wd# = ht#;
define_pixels (ht, wd);
- pickup pencircle xscaled blot_diameter
- yscaled 0.50 ht;
+ save ellipse;
+ path ellipse;
+
+ ellipse := fullcircle xscaled blot_diameter
+ yscaled 0.50 ht;
z1 = (0.00 wd + blot_diameter / 2, 0);
z2 = (0.4 wd - blot_diameter / 2, 0);
- draw z1
- .. z2;
+ fill get_subpath (ellipse, left, right, z1)
+ -- get_subpath (ellipse, right, left, z2)
+ -- cycle;
- pickup pencircle xscaled linethickness
- yscaled blot_diameter;
+ labels (1, 2);
+
+ pickup pencircle scaled linethickness;
if left_down_stem:
+ set_char_box (0.0, 0.4 wd#, 1.25 ht#, 0.25 ht#);
+
z4 = (0.00 wd + linethickness / 2, blot_diameter / 2);
z5 = (0.00 wd + linethickness / 2, -1.25 ht);
- draw z4
- .. z5;
- set_char_box (0.0, 0.4 wd#, 1.25 ht#, 0.25 ht#);
+ draw_rounded_block (lft z5, rt z4, linethickness);
elseif left_up_stem:
- z4 = (0.00 wd + linethickness / 2, blot_diameter / 2);
+ set_char_box (0.0, 0.4 wd#, 0.25 ht#, 1.25 ht#);
+
+ z4 = (0.00 wd + linethickness / 2, -blot_diameter / 2);
z5 = (0.00 wd + linethickness / 2, +1.25 ht);
- draw z4
- .. z5;
- set_char_box (0.0, 0.4 wd#, 0.25 ht#, 1.25 ht#);
+ draw_rounded_block (lft z4, rt z5, linethickness);
else:
set_char_box (0.0, 0.4 wd#, 0.25 ht#, 0.25 ht#);
fi;
+ labels (4, 5);
fet_endchar;
enddef;
% punctum
-punctum_char ("Ed. Med. punctum", "medicaea.punctum",
- false, false);
+med_punctum_char ("Ed. Med. punctum", "medicaea.punctum",
+ false, false);
% left up-stemmed punctum
-punctum_char ("Ed. Med. reverse virga", "medicaea.rvirga",
- true, false);
+med_punctum_char ("Ed. Med. reverse virga", "medicaea.rvirga",
+ true, false);
% virga (i.e. left down-stemmed punctum)
-punctum_char ("Ed. Med. virga", "medicaea.virga",
- false, true);
+med_punctum_char ("Ed. Med. virga", "medicaea.virga",
+ false, true);
+
%%%%%%%%
%
%
%
-% punctum
-% parametrized punctum
-def punctum_char (expr verbose_name, internal_name,
- down_stem) =
+def huf_punctum_char (expr verbose_name, internal_name,
+ down_stem) =
fet_beginchar (verbose_name, "s" & internal_name);
save alpha;
- alpha# = 55;
- draw_diamond_head (staff_space#, 0, 0, alpha#, false);
- if down_stem:
- pickup pencircle xscaled blot_diameter
- yscaled 0.7 staff_space
- rotated -alpha#;
-
- save za, zb;
- pair za, zb;
+ alpha = 55;
- za = (head_width / 2, 0);
- bot zb = (head_width / 2, -1.5 staff_space);
+ draw_diamond_head (staff_space#, 0, 0, alpha, false);
- draw za
- -- zb;
+ if down_stem:
set_char_box (0, head_width#,
1.5 staff_space#, head_height# / 2);
+
+ save ellipse;
+ path ellipse;
+
+ ellipse := reverse fullcircle xscaled blot_diameter
+ yscaled 0.7 staff_space
+ rotated -alpha;
+
+ z11 = (head_width / 2, 0);
+ z12 = find_tangent_shift (((0, -d) -- (w, -d)), ellipse,
+ (w / 2, -d), (w / 2, 0));
+
+ fill get_subpath (ellipse, up, down, z11)
+ -- get_subpath (ellipse, down, up, z12)
+ -- cycle;
+
+ labels (11, 12);
fi;
fet_endchar;
enddef;
+
% punctum
-punctum_char ("Hufnagel punctum", "hufnagel.punctum", false)
+huf_punctum_char ("Hufnagel punctum", "hufnagel.punctum", false)
+
% virga
-punctum_char ("Hufnagel virga", "hufnagel.virga", true)
+huf_punctum_char ("Hufnagel virga", "hufnagel.virga", true)
+
% pes lower punctum
fet_beginchar ("Hufnagel pes lower punctum", "shufnagel.lpes")
save width, height, alpha;
- width# = 2*staff_space#;
- height# = 0.7*staff_space#;
- alpha# = 35;
- set_char_box (0, width#, height#/2, height#/2);
+ width# = 2 * staff_space#;
+ height# = 0.7 * staff_space#;
+ alpha = 35;
+
+ set_char_box (0, width#, height# / 2, height# / 2);
- pickup pencircle scaled linethickness;
define_pixels (width, height);
- rt x3 = -lft x1 = width/2;
- y2 = y3 = height/2;
- y1 = y4 = -height/2;
- tand (alpha#) * (y2 - y1) = x2 - x1 = x3 - x4;
+ save circle;
+ path circle;
- filldraw z1 -- z2 -- z3 -- z4 -- cycle;
+ circle := reverse fullcircle scaled linethickness;
+
+ pickup pencircle scaled linethickness;
+
+ rt x3 = -lft x1 = width / 2;
+ y2 = y3 = height / 2;
+ y1 = y4 = -height / 2;
+
+ tand (alpha) * (y2 - y1) = x2 - x1 = x3 - x4;
+
+ fill get_subpath (circle, left, z2 - z1, z1)
+ -- get_subpath (circle, z2 - z1, right, z2)
+ -- get_subpath (circle, right, z4 - z3, z3)
+ -- get_subpath (circle, z4 - z3, left, z4)
+ -- cycle;
currentpicture := currentpicture shifted (width/2, 0);
+
+% labels (1, 2, 3, 4);
fet_endchar;
+
fet_endgroup ("noteheads")
projects / lilypond.git / commitdiff