Update of /project/gsharp/cvsroot/gsharp/Fonts In directory common-lisp.net:/tmp/cvs-serv31120
Modified Files: charmap.mf ties.mf Log Message: Code factoring for small ties.
Introduced light glyphs for small ties.
Date: Thu Mar 25 07:53:16 2004 Author: rstrandh
Index: gsharp/Fonts/charmap.mf diff -u gsharp/Fonts/charmap.mf:1.2 gsharp/Fonts/charmap.mf:1.3 --- gsharp/Fonts/charmap.mf:1.2 Thu Mar 25 01:48:56 2004 +++ gsharp/Fonts/charmap.mf Thu Mar 25 07:53:16 2004 @@ -87,20 +87,36 @@ global_variable(numeric)(flags_up_five_light)(129)
global_variable(numeric)(small_tie_one_up)(130) +global_variable(numeric)(small_tie_one_up_light)(131) global_variable(numeric)(small_tie_two_up)(132) +global_variable(numeric)(small_tie_two_up_light)(133) global_variable(numeric)(small_tie_three_up)(134) +global_variable(numeric)(small_tie_three_up_light)(135) global_variable(numeric)(small_tie_four_up)(136) +global_variable(numeric)(small_tie_four_up_light)(137) global_variable(numeric)(small_tie_five_up)(138) +global_variable(numeric)(small_tie_five_up_light)(139) global_variable(numeric)(small_tie_six_up)(140) +global_variable(numeric)(small_tie_six_up_light)(141) global_variable(numeric)(small_tie_seven_up)(142) +global_variable(numeric)(small_tie_seven_up_light)(143) global_variable(numeric)(small_tie_eight_up)(144) +global_variable(numeric)(small_tie_eight_up_light)(145)
global_variable(numeric)(small_tie_one_down)(146) +global_variable(numeric)(small_tie_one_down_light)(147) global_variable(numeric)(small_tie_two_down)(148) +global_variable(numeric)(small_tie_two_down_light)(149) global_variable(numeric)(small_tie_three_down)(150) +global_variable(numeric)(small_tie_three_down_light)(151) global_variable(numeric)(small_tie_four_down)(152) +global_variable(numeric)(small_tie_four_down_light)(153) global_variable(numeric)(small_tie_five_down)(154) +global_variable(numeric)(small_tie_five_down_light)(155) global_variable(numeric)(small_tie_six_down)(156) +global_variable(numeric)(small_tie_six_down_light)(157) global_variable(numeric)(small_tie_seven_down)(158) +global_variable(numeric)(small_tie_seven_down_light)(159) global_variable(numeric)(small_tie_eight_down)(160) +global_variable(numeric)(small_tie_eight_down_light)(161)
Index: gsharp/Fonts/ties.mf diff -u gsharp/Fonts/ties.mf:1.1 gsharp/Fonts/ties.mf:1.2 --- gsharp/Fonts/ties.mf:1.1 Thu Mar 25 01:48:56 2004 +++ gsharp/Fonts/ties.mf Thu Mar 25 07:53:16 2004 @@ -9,244 +9,186 @@ local_variable(numeric)(small_tie_height) (round(0.5 * staff_line_distance));
+ save small_tie_up; + def small_tie_up(expr width) = + fill ((0, top){right} .. + (width, top-small_tie_height) -- + (width-1, top-small_tie_height) .. + (0.5*width, top-tie_thickness) .. + (0, top-tie_thickness) .. + (-0.5*width, top-tie_thickness) .. + (-(width-1), top-small_tie_height) -- + (-width, top-small_tie_height) .. cycle) + scaled magnification; + enddef; + + save small_tie_up_light; + def small_tie_up_light(expr width) = + fill ((0, top){right} .. + (width, top-small_tie_height) -- + (width-1, top-small_tie_height) .. + (0.5*width, top-tie_thickness) .. + (0, top-tie_thickness) .. + (-0.5*width, top-tie_thickness) .. + (-(width-1), top-small_tie_height) -- + (-width, top-small_tie_height) .. cycle) + scaled magnification; + stripes(width, 2*tie_thickness); + enddef; + + save small_tie_down; + def small_tie_down(expr width) = + fill ((0, -bot){right} .. + (width, small_tie_height-bot) -- + (width-1, small_tie_height-bot) .. + (0.5*width, tie_thickness-bot) .. + (0, tie_thickness-bot) .. + (-0.5*width, tie_thickness-bot) .. + (-(width-1), small_tie_height-bot) -- + (-width, small_tie_height-bot) .. cycle) + scaled magnification; + enddef; + + save small_tie_down_light; + def small_tie_down_light(expr width) = + fill ((0, -bot){right} .. + (width, small_tie_height-bot) -- + (width-1, small_tie_height-bot) .. + (0.5*width, tie_thickness-bot) .. + (0, tie_thickness-bot) .. + (-0.5*width, tie_thickness-bot) .. + (-(width-1), small_tie_height-bot) -- + (-width, small_tie_height-bot) .. cycle) + scaled magnification; + stripes(width, 2*tie_thickness) + enddef; + begin_character(small_tie_one_up) - local_variable(numeric)(width) - (round(0.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(0.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_one_up_light) + small_tie_up_light(round(0.33 * staff_line_distance)); end_character;
begin_character(small_tie_two_up) - local_variable(numeric)(width) - (round(0.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(0.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_two_up_light) + small_tie_up_light(round(0.67 * staff_line_distance)); end_character;
begin_character(small_tie_three_up) - local_variable(numeric)(width) - (round(1.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(1.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_three_up_light) + small_tie_up_light(round(1.0 * staff_line_distance)); end_character;
begin_character(small_tie_four_up) - local_variable(numeric)(width) - (round(1.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(1.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_four_up_light) + small_tie_up_light(round(1.33 * staff_line_distance)); end_character;
begin_character(small_tie_five_up) - local_variable(numeric)(width) - (round(1.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(1.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_five_up_light) + small_tie_up_light(round(1.67 * staff_line_distance)); end_character;
begin_character(small_tie_six_up) - local_variable(numeric)(width) - (round(2.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(2.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_six_up_light) + small_tie_up_light(round(2.0 * staff_line_distance)); end_character;
begin_character(small_tie_seven_up) - local_variable(numeric)(width) - (round(2.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(2.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_seven_up_light) + small_tie_up_light(round(2.33 * staff_line_distance)); end_character;
begin_character(small_tie_eight_up) - local_variable(numeric)(width) - (round(2.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, top){right} .. - (width, top-small_tie_height) -- - (width-1, top-small_tie_height) .. - (0.5*width, top-tie_thickness) .. - (0, top-tie_thickness) .. - (-0.5*width, top-tie_thickness) .. - (-(width-1), top-small_tie_height) -- - (-width, top-small_tie_height) .. cycle); - fill tie scaled magnification; + small_tie_up(round(2.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_eight_up_light) + small_tie_up_light(round(2.67 * staff_line_distance)); end_character;
begin_character(small_tie_one_down) - local_variable(numeric)(width) - (round(0.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(0.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_one_down_light) + small_tie_down_light(round(0.33 * staff_line_distance)); end_character;
begin_character(small_tie_two_down) - local_variable(numeric)(width) - (round(0.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(0.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_two_down_light) + small_tie_down_light(round(0.67 * staff_line_distance)); end_character;
begin_character(small_tie_three_down) - local_variable(numeric)(width) - (round(1.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(1.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_three_down_light) + small_tie_down_light(round(1.0 * staff_line_distance)); end_character;
begin_character(small_tie_four_down) - local_variable(numeric)(width) - (round(1.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(1.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_four_down_light) + small_tie_down_light(round(1.33 * staff_line_distance)); end_character;
begin_character(small_tie_five_down) - local_variable(numeric)(width) - (round(1.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(1.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_five_down_light) + small_tie_down_light(round(1.67 * staff_line_distance)); end_character;
begin_character(small_tie_six_down) - local_variable(numeric)(width) - (round(2.0 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(2.0 * staff_line_distance)); + end_character; + + begin_character(small_tie_six_down_light) + small_tie_down_light(round(2.0 * staff_line_distance)); end_character;
begin_character(small_tie_seven_down) - local_variable(numeric)(width) - (round(2.33 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(2.33 * staff_line_distance)); + end_character; + + begin_character(small_tie_seven_down_light) + small_tie_down_light(round(2.33 * staff_line_distance)); end_character;
begin_character(small_tie_eight_down) - local_variable(numeric)(width) - (round(2.67 * staff_line_distance)); - local_variable(path)(tie) - ((0, -bot){right} .. - (width, small_tie_height-bot) -- - (width-1, small_tie_height-bot) .. - (0.5*width, tie_thickness-bot) .. - (0, tie_thickness-bot) .. - (-0.5*width, tie_thickness-bot) .. - (-(width-1), small_tie_height-bot) -- - (-width, small_tie_height-bot) .. cycle); - fill tie scaled magnification; + small_tie_down(round(2.67 * staff_line_distance)); + end_character; + + begin_character(small_tie_eight_down_light) + small_tie_down_light(round(2.67 * staff_line_distance)); end_character;
endgroup;