From 172d5558847bc5d96526efb715a61db38bd73f49 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 6 Jul 2003 18:37:07 +0000
Subject: [PATCH] * mf/feta-toevallig.mf: tweak for bottom of flat sign. lo-res
fixes.
* mf/feta-schrift.mf: bugfix in varcoda sign.
WARNING: FONT CHANGED
* lily/my-lily-lexer.cc (lookup_identifier): return SCM_UNDEFINED,
in accordance with lexer.ll.
---
ChangeLog | 11 +++++++++++
lily/my-lily-lexer.cc | 2 +-
mf/feta-generic.mf | 2 +-
mf/feta-schrift.mf | 5 +++--
mf/feta-toevallig.mf | 16 ++++++++++------
5 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1c910d563b..8e9f54a1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-06 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * mf/feta-toevallig.mf: tweak for bottom of flat sign.
+ lo-res fixes.
+
+ * mf/feta-schrift.mf: bugfix in varcoda sign.
+ WARNING: FONT CHANGED
+
+ * lily/my-lily-lexer.cc (lookup_identifier): return SCM_UNDEFINED,
+ in accordance with lexer.ll.
+
2003-07-05 Jan Nieuwenhuizen <janneke@gnu.org>
* Documentation/user/tutorial.itely: Edit introduction.
diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 5919b84188..8513720acb 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -147,7 +147,7 @@ My_lily_lexer::lookup_identifier (String s)
return scm_variable_ref(var);
}
- return SCM_UNSPECIFIED;
+ return SCM_UNDEFINED;
}
void
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 0270ad3803..c551a22989 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -44,7 +44,7 @@ else:
% input feta-eindelijk;
% input feta-klef;
input feta-toevallig;
-% input feta-schrift;
+ input feta-schrift;
% input feta-haak;
% input feta-timesig;
% input feta-pendaal;
diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 46d99983c4..513acfcf22 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -827,13 +827,14 @@ fet_beginchar("Varied Coda", "varcoda", "varcoda")
y1 = y2 - thin;
x2 = 0;
y2 = codaheight;
- draw_rounded_block(z1, z2, thick);
+ draw_rounded_block(z1, z2, blot_diameter);
x3 = x1;
y3 = -blot_diameter;
x4 = x1 + thick;
y4 = y2;
- draw_rounded_block(z3, z4, thick);
+ draw_rounded_block(z3, z4, blot_diameter);
+ labels(1,2,3,4);
addto currentpicture also currentpicture xscaled -1;
addto currentpicture also currentpicture yscaled -1;
diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 9616c63d75..ea85a29c55 100644
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -170,6 +170,7 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
save crook_thinness;
save bottom_overshoot;
save top_stem_thick, bottom_stem_thick, hair, smaller_hole;
+ save top_crook_thinness;
save zwiep;
save center;
pair center;
@@ -184,12 +185,14 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
% TODO: parameterize this
%
if w >= 0.75 staff_space:
- smaller_hole = 0.2 stafflinethickness;
+ smaller_hole = 0.35 stafflinethickness;
else:
smaller_hole = 0.0 stafflinethickness;
fi
- crook_thinness = 1.1 stafflinethickness;
- top_stem_thick = 2.2 stafflinethickness;
+ crook_thinness = 1.3 stafflinethickness;
+ top_crook_thinness = 1.65 stafflinethickness;
+ top_stem_thick# = 2.2 stafflinethickness#;
+ define_blacker_pixels (top_stem_thick);
bottom_overshoot = stafflinethickness;
bottom_stem_thick = 1.2 stafflinethickness;
@@ -214,7 +217,8 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
-staff_space/2 - stafflinethickness/2) - (0,bottom_overshoot);
penpos4(whatever, 53);
- y4l - y4r = 1.5 crook_thinness ;
+
+ y4l - y4r = top_crook_thinness ;
y5r = .20 staff_space + ypart center;
x5l = w + xpart center;
@@ -231,7 +235,7 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
z7 = z8 + whatever * bot_crook_dir + crook_thinness * (bot_crook_dir rotated 90);
- x7 = .5 [x11, x8];
+ x7 = .4 [x11, x8];
penlabels(range 0 thru 10);
@@ -271,7 +275,7 @@ fet_beginchar("Double Flat", "-2", "flatflat")
overlap = .05;
set_char_box(1.2 stafflinethickness#, (left_wid + right_wid -overlap) *staff_space#, .6 staff_space#, 1.9 staff_space#);
draw_meta_flat(0, left_wid* staff_space, 1/3 staff_space);
- draw_meta_flat((left_wid - overlap) *staff_space,
+ draw_meta_flat(round ((left_wid - overlap) *staff_space),
right_wid *staff_space, 0.33 staff_space);
fet_endchar;
--
2.39.5