[gsharp-cvs] CVS gsharp/Fonts
rstrandh
rstrandh at common-lisp.net
Sun Feb 26 22:14:30 UTC 2006
Update of /project/gsharp/cvsroot/gsharp/Fonts
In directory clnet:/tmp/cvs-serv9721
Modified Files:
charmap.mf ties.mf
Log Message:
Cleaned up the ties.
--- /project/gsharp/cvsroot/gsharp/Fonts/charmap.mf 2004/03/26 14:25:34 1.4
+++ /project/gsharp/cvsroot/gsharp/Fonts/charmap.mf 2006/02/26 22:14:30 1.5
@@ -120,103 +120,53 @@
global_variable(numeric)(small_tie_eight_down)(160)
global_variable(numeric)(small_tie_eight_down_light)(161)
-global_variable(numeric)(large_tie_line_one_up)(162)
-global_variable(numeric)(large_tie_line_one_up_light)(163)
-global_variable(numeric)(large_tie_line_two_up)(164)
-global_variable(numeric)(large_tie_line_two_up_light)(165)
-global_variable(numeric)(large_tie_line_three_up)(166)
-global_variable(numeric)(large_tie_line_three_up_light)(167)
-global_variable(numeric)(large_tie_line_four_up)(168)
-global_variable(numeric)(large_tie_line_four_up_light)(169)
-global_variable(numeric)(large_tie_line_five_up)(170)
-global_variable(numeric)(large_tie_line_five_up_light)(171)
-global_variable(numeric)(large_tie_line_six_up)(172)
-global_variable(numeric)(large_tie_line_six_up_light)(173)
-global_variable(numeric)(large_tie_line_seven_up)(174)
-global_variable(numeric)(large_tie_line_seven_up_light)(175)
-global_variable(numeric)(large_tie_line_eight_up)(176)
-global_variable(numeric)(large_tie_line_eight_up_light)(177)
-global_variable(numeric)(large_tie_line_nine_up)(178)
-global_variable(numeric)(large_tie_line_nine_up_light)(179)
-global_variable(numeric)(large_tie_line_ten_up)(180)
-global_variable(numeric)(large_tie_line_ten_up_light)(181)
-global_variable(numeric)(large_tie_line_left_up)(182)
-global_variable(numeric)(large_tie_line_left_up_light)(183)
-global_variable(numeric)(large_tie_line_right_up)(184)
-global_variable(numeric)(large_tie_line_right_up_light)(185)
+global_variable(numeric)(large_tie_one_up)(162)
+global_variable(numeric)(large_tie_one_up_light)(163)
+global_variable(numeric)(large_tie_two_up)(164)
+global_variable(numeric)(large_tie_two_up_light)(165)
+global_variable(numeric)(large_tie_three_up)(166)
+global_variable(numeric)(large_tie_three_up_light)(167)
+global_variable(numeric)(large_tie_four_up)(168)
+global_variable(numeric)(large_tie_four_up_light)(169)
+global_variable(numeric)(large_tie_five_up)(170)
+global_variable(numeric)(large_tie_five_up_light)(171)
+global_variable(numeric)(large_tie_six_up)(172)
+global_variable(numeric)(large_tie_six_up_light)(173)
+global_variable(numeric)(large_tie_seven_up)(174)
+global_variable(numeric)(large_tie_seven_up_light)(175)
+global_variable(numeric)(large_tie_eight_up)(176)
+global_variable(numeric)(large_tie_eight_up_light)(177)
+global_variable(numeric)(large_tie_nine_up)(178)
+global_variable(numeric)(large_tie_nine_up_light)(179)
+global_variable(numeric)(large_tie_ten_up)(180)
+global_variable(numeric)(large_tie_ten_up_light)(181)
+global_variable(numeric)(large_tie_left_up)(182)
+global_variable(numeric)(large_tie_left_up_light)(183)
+global_variable(numeric)(large_tie_right_up)(184)
+global_variable(numeric)(large_tie_right_up_light)(185)
-global_variable(numeric)(large_tie_space_one_up)(186)
-global_variable(numeric)(large_tie_space_one_up_light)(187)
-global_variable(numeric)(large_tie_space_two_up)(188)
-global_variable(numeric)(large_tie_space_two_up_light)(189)
-global_variable(numeric)(large_tie_space_three_up)(190)
-global_variable(numeric)(large_tie_space_three_up_light)(191)
-global_variable(numeric)(large_tie_space_four_up)(192)
-global_variable(numeric)(large_tie_space_four_up_light)(193)
-global_variable(numeric)(large_tie_space_five_up)(194)
-global_variable(numeric)(large_tie_space_five_up_light)(195)
-global_variable(numeric)(large_tie_space_six_up)(196)
-global_variable(numeric)(large_tie_space_six_up_light)(197)
-global_variable(numeric)(large_tie_space_seven_up)(198)
-global_variable(numeric)(large_tie_space_seven_up_light)(199)
-global_variable(numeric)(large_tie_space_eight_up)(200)
-global_variable(numeric)(large_tie_space_eight_up_light)(201)
-global_variable(numeric)(large_tie_space_nine_up)(202)
-global_variable(numeric)(large_tie_space_nine_up_light)(203)
-global_variable(numeric)(large_tie_space_ten_up)(204)
-global_variable(numeric)(large_tie_space_ten_up_light)(205)
-global_variable(numeric)(large_tie_space_left_up)(206)
-global_variable(numeric)(large_tie_space_left_up_light)(207)
-global_variable(numeric)(large_tie_space_right_up)(208)
-global_variable(numeric)(large_tie_space_right_up_light)(209)
-
-global_variable(numeric)(large_tie_line_one_down)(210)
-global_variable(numeric)(large_tie_line_one_down_light)(211)
-global_variable(numeric)(large_tie_line_two_down)(212)
-global_variable(numeric)(large_tie_line_two_down_light)(213)
-global_variable(numeric)(large_tie_line_three_down)(214)
-global_variable(numeric)(large_tie_line_three_down_light)(215)
-global_variable(numeric)(large_tie_line_four_down)(216)
-global_variable(numeric)(large_tie_line_four_down_light)(217)
-global_variable(numeric)(large_tie_line_five_down)(218)
-global_variable(numeric)(large_tie_line_five_down_light)(219)
-global_variable(numeric)(large_tie_line_six_down)(220)
-global_variable(numeric)(large_tie_line_six_down_light)(221)
-global_variable(numeric)(large_tie_line_seven_down)(222)
-global_variable(numeric)(large_tie_line_seven_down_light)(223)
-global_variable(numeric)(large_tie_line_eight_down)(224)
-global_variable(numeric)(large_tie_line_eight_down_light)(225)
-global_variable(numeric)(large_tie_line_nine_down)(226)
-global_variable(numeric)(large_tie_line_nine_down_light)(227)
-global_variable(numeric)(large_tie_line_ten_down)(228)
-global_variable(numeric)(large_tie_line_ten_down_light)(229)
-global_variable(numeric)(large_tie_line_left_down)(230)
-global_variable(numeric)(large_tie_line_left_down_light)(231)
-global_variable(numeric)(large_tie_line_right_down)(232)
-global_variable(numeric)(large_tie_line_right_down_light)(233)
-
-global_variable(numeric)(large_tie_space_one_down)(234)
-global_variable(numeric)(large_tie_space_one_down_light)(235)
-global_variable(numeric)(large_tie_space_two_down)(236)
-global_variable(numeric)(large_tie_space_two_down_light)(237)
-global_variable(numeric)(large_tie_space_three_down)(238)
-global_variable(numeric)(large_tie_space_three_down_light)(239)
-global_variable(numeric)(large_tie_space_four_down)(240)
-global_variable(numeric)(large_tie_space_four_down_light)(241)
-global_variable(numeric)(large_tie_space_five_down)(242)
-global_variable(numeric)(large_tie_space_five_down_light)(243)
-global_variable(numeric)(large_tie_space_six_down)(244)
-global_variable(numeric)(large_tie_space_six_down_light)(245)
-global_variable(numeric)(large_tie_space_seven_down)(246)
-global_variable(numeric)(large_tie_space_seven_down_light)(247)
-global_variable(numeric)(large_tie_space_eight_down)(248)
-global_variable(numeric)(large_tie_space_eight_down_light)(249)
-global_variable(numeric)(large_tie_space_nine_down)(250)
-global_variable(numeric)(large_tie_space_nine_down_light)(251)
-global_variable(numeric)(large_tie_space_ten_down)(252)
-global_variable(numeric)(large_tie_space_ten_down_light)(253)
-global_variable(numeric)(large_tie_space_left_down)(254)
-global_variable(numeric)(large_tie_space_left_down_light)(255)
-global_variable(numeric)(large_tie_space_right_down)(256)
-global_variable(numeric)(large_tie_space_right_down_light)(257)
+global_variable(numeric)(large_tie_one_down)(186)
+global_variable(numeric)(large_tie_one_down_light)(187)
+global_variable(numeric)(large_tie_two_down)(188)
+global_variable(numeric)(large_tie_two_down_light)(189)
+global_variable(numeric)(large_tie_three_down)(190)
+global_variable(numeric)(large_tie_three_down_light)(191)
+global_variable(numeric)(large_tie_four_down)(192)
+global_variable(numeric)(large_tie_four_down_light)(193)
+global_variable(numeric)(large_tie_five_down)(194)
+global_variable(numeric)(large_tie_five_down_light)(195)
+global_variable(numeric)(large_tie_six_down)(196)
+global_variable(numeric)(large_tie_six_down_light)(197)
+global_variable(numeric)(large_tie_seven_down)(198)
+global_variable(numeric)(large_tie_seven_down_light)(199)
+global_variable(numeric)(large_tie_eight_down)(200)
+global_variable(numeric)(large_tie_eight_down_light)(201)
+global_variable(numeric)(large_tie_nine_down)(202)
+global_variable(numeric)(large_tie_nine_down_light)(203)
+global_variable(numeric)(large_tie_ten_down)(204)
+global_variable(numeric)(large_tie_ten_down_light)(205)
+global_variable(numeric)(large_tie_left_down)(206)
+global_variable(numeric)(large_tie_left_down_light)(207)
+global_variable(numeric)(large_tie_right_down)(208)
+global_variable(numeric)(large_tie_right_down_light)(209)
--- /project/gsharp/cvsroot/gsharp/Fonts/ties.mf 2004/03/26 14:25:35 1.3
+++ /project/gsharp/cvsroot/gsharp/Fonts/ties.mf 2006/02/26 22:14:30 1.4
@@ -4,11 +4,15 @@
(round(0.33 * staff_line_distance));
local_variable(numeric)(small_tie_height)
(round(0.5 * staff_line_distance));
+ local_variable(numeric)(large_tie_height)
+ (round(1.0 * staff_line_distance));
save small_tie_up;
def small_tie_up(expr width) =
local_variable(numeric)(top)
- (round(0.33 * staff_line_distance)-1);
+ (round(0.5 * (staff_line_distance +
+ staff_line_thickness +
+ small_tie_height)));
fill ((0, top){right} ..
(width, top-small_tie_height) --
(width-1, top-small_tie_height) ..
@@ -29,7 +33,9 @@
save small_tie_down;
def small_tie_down(expr width) =
local_variable(numeric)(bot)
- (round(0.33 * staff_line_distance));
+ (round(0.5 * (staff_line_distance -
+ staff_line_thickness +
+ small_tie_height)));
fill ((0, -bot){right} ..
(width, small_tie_height-bot) --
(width-1, small_tie_height-bot) ..
@@ -175,127 +181,111 @@
small_tie_down_light(round(2.67 * staff_line_distance));
end_character;
- local_variable(numeric)(large_tie_line_height)
- (round(0.5 * staff_line_distance));
-
- local_variable(numeric)(large_tie_space_height)
- (round(0.5 * staff_line_distance));
-
save large_tie_up;
- def large_tie_up(expr width_multiplier, height) =
+ def large_tie_up(expr width_multiplier) =
local_variable(numeric)(top)
- (round(0.33 * staff_line_distance)-1);
+ (round(11.0/6.0 * staff_line_distance));
local_variable(numeric)(width)
(round(width_multiplier * staff_line_distance));
fill ((0, top){right} ..
- (width, top-height) --
- (width-1, top-height) ..
+ (width, top-large_tie_height) --
+ (width-1, top-large_tie_height) ..
(0.3*width, top-tie_thickness) ..
(0, top-tie_thickness) ..
(-0.3*width, top-tie_thickness) ..
- (-(width-1), top-height) --
- (-width, top-height) .. cycle)
+ (-(width-1), top-large_tie_height) --
+ (-width, top-large_tie_height) .. cycle)
scaled magnification;
enddef;
save large_tie_up_light;
- def large_tie_up_light(expr width, height) =
- large_tie_up(width, height);
- stripes(width, 2*height);
- enddef;
-
- save large_tie_line_up;
- def large_tie_line_up(expr width_multiplier) =
- large_tie_up(width_multiplier, round(1.0 * staff_line_distance));
- enddef;
-
- save large_tie_line_up_light;
- def large_tie_line_up_light(expr width_multiplier) =
- large_tie_up_light(width_multiplier, round(1.0 * staff_line_distance));
+ def large_tie_up_light(expr width) =
+ large_tie_up(width);
+ stripes(width, 2*large_tie_height);
enddef;
- begin_character(large_tie_line_one_up)
- large_tie_line_up(2.0);
+ begin_character(large_tie_one_up)
+ large_tie_up(2.0);
end_character;
- begin_character(large_tie_line_one_up_light)
- large_tie_line_up_light(2.0);
+ begin_character(large_tie_one_up_light)
+ large_tie_up_light(2.0);
end_character;
- begin_character(large_tie_line_two_up)
- large_tie_line_up(2.33);
+ begin_character(large_tie_two_up)
+ large_tie_up(2.33);
end_character;
- begin_character(large_tie_line_two_up_light)
- large_tie_line_up_light(2.33);
+ begin_character(large_tie_two_up_light)
+ large_tie_up_light(2.33);
end_character;
- begin_character(large_tie_line_three_up)
- large_tie_line_up(2.67);
+ begin_character(large_tie_three_up)
+ large_tie_up(2.67);
end_character;
- begin_character(large_tie_line_three_up_light)
- large_tie_line_up_light(2.67);
+ begin_character(large_tie_three_up_light)
+ large_tie_up_light(2.67);
end_character;
- begin_character(large_tie_line_four_up)
- large_tie_line_up(3.0);
+ begin_character(large_tie_four_up)
+ large_tie_up(3.0);
end_character;
- begin_character(large_tie_line_four_up_light)
- large_tie_line_up_light(3.0);
+ begin_character(large_tie_four_up_light)
+ large_tie_up_light(3.0);
end_character;
- begin_character(large_tie_line_five_up)
- large_tie_line_up(3.33);
+ begin_character(large_tie_five_up)
+ large_tie_up(3.33);
end_character;
- begin_character(large_tie_line_five_up_light)
- large_tie_line_up_light(3.33);
+ begin_character(large_tie_five_up_light)
+ large_tie_up_light(3.33);
end_character;
- begin_character(large_tie_line_six_up)
- large_tie_line_up(3.67);
+ begin_character(large_tie_six_up)
+ large_tie_up(3.67);
end_character;
- begin_character(large_tie_line_six_up_light)
- large_tie_line_up_light(3.67);
+ begin_character(large_tie_six_up_light)
+ large_tie_up_light(3.67);
end_character;
- begin_character(large_tie_line_seven_up)
- large_tie_line_up(4.0);
+ begin_character(large_tie_seven_up)
+ large_tie_up(4.0);
end_character;
- begin_character(large_tie_line_seven_up_light)
- large_tie_line_up_light(4.0);
+ begin_character(large_tie_seven_up_light)
+ large_tie_up_light(4.0);
end_character;
- begin_character(large_tie_line_eight_up)
- large_tie_line_up(4.33);
+ begin_character(large_tie_eight_up)
+ large_tie_up(4.33);
end_character;
- begin_character(large_tie_line_eight_up_light)
- large_tie_line_up_light(4.33);
+ begin_character(large_tie_eight_up_light)
+ large_tie_up_light(4.33);
end_character;
- begin_character(large_tie_line_nine_up)
- large_tie_line_up(4.67);
+ begin_character(large_tie_nine_up)
+ large_tie_up(4.67);
end_character;
- begin_character(large_tie_line_nine_up_light)
- large_tie_line_up_light(4.67);
+ begin_character(large_tie_nine_up_light)
+ large_tie_up_light(4.67);
end_character;
- begin_character(large_tie_line_ten_up)
- large_tie_line_up(5.0);
+ begin_character(large_tie_ten_up)
+ large_tie_up(5.0);
end_character;
- begin_character(large_tie_line_ten_up_light)
- large_tie_line_up_light(5.0);
+ begin_character(large_tie_ten_up_light)
+ large_tie_up_light(5.0);
end_character;
- begin_character(large_tie_line_left_up)
- large_tie_line_up(5.0);
+ begin_character(large_tie_left_up)
+ large_tie_up(5.0);
erase fill ((0, -2 * staff_line_distance) --
(6 * staff_line_distance, -2 * staff_line_distance) --
(6 * staff_line_distance, 2 * staff_line_distance) --
@@ -303,8 +293,8 @@
scaled magnification;
end_character;
- begin_character(large_tie_line_left_up_light)
- large_tie_line_up(5.0);
+ begin_character(large_tie_left_up_light)
+ large_tie_up(5.0);
erase fill ((0, -2 * staff_line_distance) --
(6 * staff_line_distance, -2 * staff_line_distance) --
(6 * staff_line_distance, 2 * staff_line_distance) --
@@ -313,8 +303,8 @@
stripes(6 * staff_line_distance, 2 * staff_line_distance);
end_character;
- begin_character(large_tie_line_right_up)
- large_tie_line_up(5.0);
+ begin_character(large_tie_right_up)
+ large_tie_up(5.0);
erase fill ((0, -2 * staff_line_distance) --
(-6 * staff_line_distance, -2 * staff_line_distance) --
(-6 * staff_line_distance, 2 * staff_line_distance) --
@@ -322,8 +312,8 @@
scaled magnification;
end_character;
- begin_character(large_tie_line_right_up_light)
- large_tie_line_up(5.0);
+ begin_character(large_tie_right_up_light)
+ large_tie_up(5.0);
erase fill ((0, -2 * staff_line_distance) --
(-6 * staff_line_distance, -2 * staff_line_distance) --
(-6 * staff_line_distance, 2 * staff_line_distance) --
@@ -332,377 +322,112 @@
stripes(6 * staff_line_distance, 2 * staff_line_distance);
end_character;
- save large_tie_space_up;
- def large_tie_space_up(expr width_multiplier) =
- large_tie_up(width_multiplier, round(1.33 * staff_line_distance));
- enddef;
-
- save large_tie_space_up_light;
- def large_tie_space_up_light(expr width_multiplier) =
- large_tie_up_light(width_multiplier, round(1.33 * staff_line_distance));
- enddef;
-
- begin_character(large_tie_space_one_up)
- large_tie_space_up(2.0);
- end_character;
-
- begin_character(large_tie_space_one_up_light)
- large_tie_space_up_light(2.0);
- end_character;
-
- begin_character(large_tie_space_two_up)
- large_tie_space_up(2.33);
- end_character;
-
- begin_character(large_tie_space_two_up_light)
- large_tie_space_up_light(2.33);
- end_character;
-
- begin_character(large_tie_space_three_up)
- large_tie_space_up(2.67);
- end_character;
-
- begin_character(large_tie_space_three_up_light)
- large_tie_space_up_light(2.67);
- end_character;
-
- begin_character(large_tie_space_four_up)
- large_tie_space_up(3.0);
- end_character;
-
- begin_character(large_tie_space_four_up_light)
- large_tie_space_up_light(3.0);
- end_character;
-
- begin_character(large_tie_space_five_up)
- large_tie_space_up(3.33);
- end_character;
-
- begin_character(large_tie_space_five_up_light)
- large_tie_space_up_light(3.33);
- end_character;
-
- begin_character(large_tie_space_six_up)
- large_tie_space_up(3.67);
- end_character;
-
- begin_character(large_tie_space_six_up_light)
- large_tie_space_up_light(3.67);
- end_character;
-
- begin_character(large_tie_space_seven_up)
- large_tie_space_up(4.0);
- end_character;
-
- begin_character(large_tie_space_seven_up_light)
- large_tie_space_up_light(4.0);
- end_character;
-
- begin_character(large_tie_space_eight_up)
- large_tie_space_up(4.33);
- end_character;
-
- begin_character(large_tie_space_eight_up_light)
- large_tie_space_up_light(4.33);
- end_character;
-
- begin_character(large_tie_space_nine_up)
- large_tie_space_up(4.67);
- end_character;
-
- begin_character(large_tie_space_nine_up_light)
- large_tie_space_up_light(4.67);
- end_character;
-
- begin_character(large_tie_space_ten_up)
- large_tie_space_up(5.0);
- end_character;
-
- begin_character(large_tie_space_ten_up_light)
- large_tie_space_up_light(5.0);
- end_character;
-
- begin_character(large_tie_space_left_up)
- large_tie_space_up(5.0);
- erase fill ((0, -2 * staff_line_distance) --
- (6 * staff_line_distance, -2 * staff_line_distance) --
- (6 * staff_line_distance, 2 * staff_line_distance) --
- (0, 2 * staff_line_distance) -- cycle)
- scaled magnification;
- end_character;
-
- begin_character(large_tie_space_left_up_light)
- large_tie_space_up(5.0);
- erase fill ((0, -2 * staff_line_distance) --
- (6 * staff_line_distance, -2 * staff_line_distance) --
- (6 * staff_line_distance, 2 * staff_line_distance) --
- (0, 2 * staff_line_distance) -- cycle)
- scaled magnification;
- stripes(6 * staff_line_distance, 2 * staff_line_distance);
- end_character;
-
- begin_character(large_tie_space_right_up)
- large_tie_space_up(5.0);
- erase fill ((0, -2 * staff_line_distance) --
- (-6 * staff_line_distance, -2 * staff_line_distance) --
- (-6 * staff_line_distance, 2 * staff_line_distance) --
- (0, 2 * staff_line_distance) -- cycle)
- scaled magnification;
- end_character;
-
- begin_character(large_tie_space_right_up_light)
- large_tie_space_up(5.0);
- erase fill ((0, -2 * staff_line_distance) --
- (-6 * staff_line_distance, -2 * staff_line_distance) --
- (-6 * staff_line_distance, 2 * staff_line_distance) --
- (0, 2 * staff_line_distance) -- cycle)
- scaled magnification;
- stripes(6 * staff_line_distance, 2 * staff_line_distance);
- end_character;
save large_tie_down;
- def large_tie_down(expr width_multiplier, height) =
+ def large_tie_down(expr width_multiplier) =
local_variable(numeric)(bot)
- (round(0.33 * staff_line_distance));
+ (round(11.0/6.0 * staff_line_distance) - staff_line_thickness);
local_variable(numeric)(width)
(round(width_multiplier * staff_line_distance));
fill ((0, -bot){right} ..
- (width, height-bot) --
- (width-1, height-bot) ..
+ (width, large_tie_height-bot) --
+ (width-1, large_tie_height-bot) ..
(0.3*width, tie_thickness-bot) ..
(0, tie_thickness-bot) ..
(-0.3*width, tie_thickness-bot) ..
- (-(width-1), height-bot) --
- (-width, height-bot) .. cycle)
+ (-(width-1), large_tie_height-bot) --
+ (-width, large_tie_height-bot) .. cycle)
scaled magnification;
enddef;
save large_tie_down_light;
- def large_tie_down_light(expr width, height) =
- large_tie_down(width, height);
[310 lines skipped]
More information about the Gsharp-cvs
mailing list