* mf/feta-params.mf (stafflines): introduce linethickness as

general blackness of the font.

* lily/stem.cc (position_noteheads): rounding error robustness.

* scm/define-grobs.scm (all-grob-descriptions): remove
enclose-bounds in OttavaBracket and PianoPedalBracket

diff --git a/ChangeLog b/ChangeLog
index c3094f4665aa00a1670e5c4fd624cfece03274ce..977b2993342dcbce54cf633b5bce654d30a00118 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * mf/feta-params.mf (stafflines): introduce linethickness as
+       general blackness of the font.
+
+       * lily/stem.cc (position_noteheads): rounding error robustness.
+
        * input/regression/rest-collision-beam.ly: move beam/rest stuff
        from beam-collision.ly 
 

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 12bbfb74813f9543c60441965650be7b9ff7dd79..7ced331abf022a3128bfb922f8624e3753fe796c 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -499,6 +499,9 @@ For both editors, there is also a facility to jump in the input file
 to the source of errors in the graphical output. See @ref{Point and
 click}.
 
+There exists a plugin jEdit. Refer to the
+@uref{website,lily4jedit.sourceforget.net} for more information.
+
 
 @node Point and click
 @section Point and click

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 852d621f7d01b8786ed72cc43e2d96f182ce18dd..c700d59683a25257b7e9e35e12c4932538044799 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -279,9 +279,9 @@ works like @code{verbatim}, but in a smaller font.
 is used in conjunction with @code{verbatim} option: This puts
 @var{text} between the code and the music (without indentation).
 
-@item filename="@var{filename}"
-saves the LilyPond code to @var{filename}.  By default, a hash value
-of the code is used.
+@item filename=@var{filename}
+name the file (for @code{printfilename} option). The argument should
+be unquoted. 
 
 @item 11pt
 @lilypond[11pt]

diff --git a/lily/stem.cc b/lily/stem.cc
index a6203acec92cfc98f507cdc39e1ad06dc23bb464..c4c7ea364f1415bf1b1ad855601b2386dd23fd34 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -462,13 +462,17 @@ Stem::position_noteheads (Grob*me)
     }
   
   bool parity= true;
-  int lastpos = int (Staff_symbol_referencer::get_position (heads[0]));
+  Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0]));
   for (int i=1; i < heads.size (); i ++)
     {
       Real p = Staff_symbol_referencer::get_position (heads[i]);
-      int dy =abs (lastpos- (int)p);
+      Real dy =fabs (lastpos- p);
 
-      if (dy <= 1)
+      /*
+       dy should always be 0.5, 0.0, 1.0, but provide safety margin
+       for rounding errors.
+      */
+      if (dy < 1.1)            
        {
          if (parity)
            {

diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index 9530d0c16d98d30fb9918692e6fdbcd8ebf696b7..461f27fe780b2caa06fba586766113ff3c01d62e 100644 (file)
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -76,7 +76,7 @@ fet_endchar;
 def def_B(expr w, h) = 
        % huh?
        % pickup pencircle scaled 0.1pt;
-       pickup pencircle scaled 0.15stafflinethickness;
+       pickup pencircle scaled 0.15linethickness;
        penpos10(thin, -90);
        penpos11(thin, -90);
        penpos12(thick, 0);
@@ -103,7 +103,7 @@ enddef;
 def def_S(expr w, h) =
        % huh?
        %pickup pencircle scaled 0.02pt;
-       pickup pencircle scaled 0.03stafflinethickness;
+       pickup pencircle scaled 0.03linethickness;
        penpos1(thin, 180);
        penpos2(thin, -90);
        penpos3(thick, 0);
@@ -162,13 +162,13 @@ fet_beginchar("accOldEE", "accOldEE", "accOldEE")
        show w;
        show h;
        r = staff_space;
-       lr = .4 staff_space - stafflinethickness;
+       lr = .4 staff_space - linethickness;
        ir = .6 staff_space;
 
        z1 = (0,0);
        z2 = (0, ir);
        penpos1 (0,0);
-       penpos2 ( .05 staff_space + .5 stafflinethickness,0);
+       penpos2 ( .05 staff_space + .5 linethickness,0);
 
        penlabels(1,2,3);
 

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index e384cc0d4c4fced4f49c147aa0f5e4b5741b73b1..04022aacb359b3c61e5de1c7911ee3d1d66bd7d7 100644 (file)
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -26,8 +26,8 @@ right_downflag_space# = .0 downflag_width#;
 
 save hip_thickness, foot_thickness;
 
-hip_thickness# = 1.0 stafflinethickness# + 0.069 staff_space#;
-foot_thickness# =   1.2055 stafflinethickness# + 0.06 staff_space#;
+hip_thickness# = 1.0 linethickness# + 0.069 staff_space#;
+foot_thickness# =   1.2055 linethickness# + 0.06 staff_space#;
 
 %
 % Inspired by Adobe Sonata and [Wanske]

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index a71c2bf789a37db77bfbc61aed510300c65a5ea2..8ab96f18c61ce34fdaa2db0c8cc535b9fa3daf5d 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -75,7 +75,7 @@ enddef;
 save stafflinethickness;
 save increment;
 
-stafflinethickness := 0.5pt#;
+linethickness := 0.5pt#;
 increment := 0.5pt#;
 y := 10pt#;
 
@@ -98,9 +98,9 @@ for i := 0 step 1 until font_count:
     x := y / 15;
 
     increment := x / 10;
-    stafflinethickness :=  min (0.5pt#, y/150);
+    linethickness :=  min (0.5pt#, y/150);
     if i = font_count:
-      draw_brace (y, x, stafflinethickness);
+      draw_brace (y, x, linethickness);
     fi
   endfor;
 endfor

diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index 9919a896167bd279e8298e2ddd3300e8eb848d71..438b923f4b30ddc4b5bc69d6113ab1691e5dc75b 100644 (file)
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -7,9 +7,9 @@
 
 
 save serif_thick;
-serif_thick# = 1.1 stafflinethickness#;
+serif_thick# = 1.1 linethickness#;
 define_blacker_pixels (serif_thick);
-med_thick = round (1.5 stafflinethickness);
+med_thick = round (1.5 linethickness);
 bottom_blot = 1.3 serif_thick;
 
 

diff --git a/mf/feta-din.mf b/mf/feta-din.mf
index 861959b9e2352ae6c4310001081c98f5c215c69d..b9c7052ebe6ffa9810fd968d412976bbefcd3e7c 100644 (file)
--- a/mf/feta-din.mf
+++ b/mf/feta-din.mf
@@ -12,7 +12,11 @@ ex# :=  (design_size / 2.4)* pt#;
 descender# := 0.5 ex#;
 ascender# := 0.72 ex#;
 staffspace# := 1.75 / 2.0 * ex#;
-stafflinethickness# := staffspace# / 10;
+
+
+%% !! synchronize with feta-params.mf
+linethickness# := 0.3 pt# + 0.04 staffspace#;
+stafflinethickness# := stafflinethickness#;
 
 horizontal_space# :=  .66 ex#;
 

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 29f381484b1f4948c07e7f09fa0d58c023ad512c..8331c955f008de6228436da2796657afb9b4b603 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -97,7 +97,7 @@ fet_beginchar("Quarter rest","2","quartrest");
        thick# := 1/4 staff_space#;
        define_blacker_pixels(thick);
 
-       rthin := 1.25 stafflinethickness;
+       rthin := 1.25 linethickness;
        rthick := 2 thick+rthin;
 
 
@@ -191,11 +191,11 @@ enddef;
 save bulb_diam, thin, thick;
 
 bulb_diam# := 0.64 staff_space#;
-thin# := 1.4 stafflinethickness# - 0.02 staff_space#;
-thick# :=  2.2 stafflinethickness#;
-crook_thin := 0.5 stafflinethickness  + 0.08 staff_space;
+thin# := 1.4 linethickness# - 0.02 staff_space#;
+thick# :=  2.2 linethickness#;
+crook_thin := 0.5 linethickness  + 0.08 staff_space;
 
-lower_brush := 1.5 stafflinethickness;
+lower_brush := 1.5 linethickness;
 
 define_pixels ( bulb_diam, thin, thick);
 
@@ -217,11 +217,11 @@ begingroup;
 
 
        z3 = z10+bulb_diam/2.15*dir(-72) ;
-       z5 = z10 + up*bulb_diam/2 + right*stafflinethickness/3;
+       z5 = z10 + up*bulb_diam/2 + right*linethickness/3;
        
        z7 = 0.5 [z4, z5] +  crook_thin * (0.45 ,0.4 ) / 1.3;
        x8 = x10-0.4bulb_diam;
-       y8 = y10 + 0.25 stafflinethickness;
+       y8 = y10 + 0.25 linethickness;
 
        z6 = whatever [z1l, z2l];
        z6 = z3 + whatever * dir(12);
@@ -254,7 +254,7 @@ def draw_eighth_rest =
 
        define_pixels (width);
        set_char_box (0, width#,
-               1.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
+               1.0 staff_space# + 0.5 linethickness#, 0.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -263,7 +263,7 @@ def draw_eighth_rest =
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(72);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -302,7 +302,7 @@ fet_beginchar("16th rest","4","sixteenthrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               2.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
+               2.0 staff_space# + 0.5 linethickness#, 0.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -311,7 +311,7 @@ fet_beginchar("16th rest","4","sixteenthrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(74);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -335,7 +335,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               2.0 staff_space# + 0.5 stafflinethickness#, 1.5 staff_space# + bulb_diam#/2);
+               2.0 staff_space# + 0.5 linethickness#, 1.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -344,7 +344,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(76);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -369,7 +369,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               3.0 staff_space# + 0.5 stafflinethickness#, 1.5 staff_space# + bulb_diam#/2);
+               3.0 staff_space# + 0.5 linethickness#, 1.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -378,7 +378,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(78);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        
@@ -404,7 +404,7 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
 
        define_pixels (width);
        set_char_box (0, width#,
-               3.0 staff_space# + 0.5 stafflinethickness#, 2.5 staff_space# + bulb_diam#/2);
+               3.0 staff_space# + 0.5 linethickness#, 2.5 staff_space# + bulb_diam#/2);
 
        penpos1 (thick, 0);
        penpos2 (thin, 10);
@@ -413,7 +413,7 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        y2 = h -  lower_brush;
        x2r = width;
        z2 = z1 + whatever*dir(80);
-               z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+               z9 = z2 + 0.5 linethickness * dir (angle(z2 - z1)- 10);
        pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
        fill pat;
        

diff --git a/mf/feta-haak.mf b/mf/feta-haak.mf
index 72a48313e9b88506383ba86bb8a7ff6104edac16..9fb5c2b163d79413ba27bf9d996129b00b92ffc3 100644 (file)
--- a/mf/feta-haak.mf
+++ b/mf/feta-haak.mf
@@ -14,7 +14,7 @@ def draw_bracket( expr height_sharp, width_sharp) =
        beginchar(incr code, width#, height#/2, height#/2);
  
        define_pixels (height, width);
-       thin = 2 stafflinethickness;
+       thin = 2 linethickness;
        thick = .5 staff_space;
        
        pickup pencircle scaled thin;

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 34a6c853cf77120d61e7ec70e0554c5ab54a5c2e..6fac2b46531e77d18e3821079dbb9a7c1d297d2a 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -22,7 +22,7 @@ def draw_c_clef (expr reduction) =
        save hair, norm, reduced_ss, right_edge;
        reduced_ss#=staff_space#*reduction;
        norm#:=2/3reduced_ss#;
-       hair#:=0.06 reduced_ss# + 0.5 stafflinethickness# ;
+       hair#:=0.06 reduced_ss# + 0.5 linethickness# ;
 
        right_edge# = 15/4norm#+2hair#;
 
@@ -48,7 +48,7 @@ def draw_c_clef (expr reduction) =
        z3=(((right_edge -xoff)/2)+xoff,2hair);
 
        penpos4(hair,0);
-       z4=(xoff+1/2norm+1/2hair, reduced_ss - stafflinethickness - .2 hair);
+       z4=(xoff+1/2norm+1/2hair, reduced_ss - linethickness - .2 hair);
 
        penpos6(norm-hair,90);
        z6=(xoff+3/4norm,0);
@@ -173,9 +173,9 @@ def draw_bass_clef(expr exact_center, reduction) =
         reduced_ss# = staff_space# * reduction;
 
         2.2 dot_diam = round reduction* (staff_space - stafflinethickness);
-       right_thickness = 0.37 staff_space + 1.2 stafflinethickness ;
+       right_thickness = 0.37 staff_space + 1.2 linethickness ;
         swoosh_width# = 2.1 reduced_ss#;
-%      tip_protude := (-stafflinethickness, -.2 staff_space);
+%      tip_protude := (-linethickness, -.2 staff_space);
        tip_protude := (0, 0);  
        bulb_y_offset := 0.15 staff_space;
        overshoot_top := 0.0;
@@ -198,8 +198,8 @@ def draw_bass_clef(expr exact_center, reduction) =
         x2 = .5 [x1,x3];
        x2l = x2r = x2;
 
-       y2l := vround_pixels (reduced_ss#  + 0.5 stafflinethickness#);
-       y2l - y2r = (1.0 + overshoot_top) * stafflinethickness;
+       y2l := vround_pixels (reduced_ss#  + 0.5 linethickness#);
+       y2l - y2r = (1.0 + overshoot_top) * linethickness;
 
         x3l - x1 =  swoosh_width;
         x3l - x3r = right_thickness;
@@ -212,12 +212,12 @@ def draw_bass_clef(expr exact_center, reduction) =
         z5 = (x3l +  1/3 reduced_ss, .5 reduced_ss);
 
         penpos3(whatever,  185);
-        penpos4(stafflinethickness, 135);
+        penpos4(linethickness, 135);
 
        pickup pencircle scaled 1; 
 %      draw
        fill
-           new_bulb (z1, 0.45 reduced_ss, 0.4 reduced_ss, 2.5 stafflinethickness,  1, 1)
+           new_bulb (z1, 0.45 reduced_ss, 0.4 reduced_ss, 2.5 linethickness,  1, 1)
 
 {dir (90)}
                .. z2r{right} .. tension 1.0 .. z3r{down}  .. {curl 0} 
@@ -274,7 +274,7 @@ def draw_gclef (expr reduction)=
        define_pixels(reduced_ss);
        pair downstroke_dir, center;
 
-       thinness = 0.08 staff_space + 0.7 stafflinethickness;
+       thinness = 0.08 staff_space + 0.7 linethickness;
        downstroke_dir = unitvector (14, -75);
        downstroke_angle = angle downstroke_dir;
 
@@ -282,7 +282,7 @@ def draw_gclef (expr reduction)=
        breapth_factor = 21.0 /14;
        inner_thick_end = 45;
        inner_start_angle = downstroke_angle - 43;
-       thickness = .32 reduced_ss + 1.1 stafflinethickness;
+       thickness = .32 reduced_ss + 1.1 linethickness;
 
        thinnib = thinness;
 

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index 96621c7e638987efb3fae93fe615222c6ac9ba98..af82b3cc0182e8c11943293d8f4539c6e6d039a0 100644 (file)
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -8,18 +8,26 @@ stafflines = 5;
 staff_space# = staffsize#/(stafflines-1);
 
 
-
 % measuring on pocket scores turns out: stafflinethickness is
-% independent on staff size, and generally 0.5 pt.
+% largely independent on staff size, and generally about 0.5 pt.
+%
+% by request of WL, we tune down the blackness a little
+% for increased contrast with beams.
+
+%% !! synchronize with paper.scm
+stafflinethickness#  = 0.3 pt# + 0.04 staff_space#; 
 
-stafflinethickness#  = 0.5 pt#; 
+%
+% The following tunes the general blackness of the glyphs. 
+%
+linethickness# = stafflinethickness#; %%   0.5 pt#;
 
 %
 % bigger puff_up_factor, relatively thicker stafflines.
 % 20 pt = puff_up_factor 0.
 % 10 pt = puff_up_factor 1
 %
-puff_up_factor =  (stafflinethickness# - 0.1 staff_space#) / (0.1 staff_space#);
+puff_up_factor =  (linethickness# - 0.1 staff_space#) / (0.1 staff_space#);
 
 
 
@@ -27,7 +35,7 @@ stemthickness# := 1.3 stafflinethickness#;
 ledgerlinethickness# := 2 stafflinethickness#;
 
 define_pixels(staff_space, stemthickness);
-define_pixels(stafflinethickness,ledgerlinethickness);
+define_pixels(stafflinethickness, ledgerlinethickness, linethickness);
 
 
 % 

diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index e2db728882e0f28bffff400ee50cd609352c644d..435e81ade58abca9ec44ddd3c54cd4fb0e5125a8 100644 (file)
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pendaal.mf
@@ -19,7 +19,7 @@ fet_begingroup("pedal")
 pedalpha = 40;
 pedbeta = 25;
 
-penh#=0.7stafflinethickness#;
+penh#=0.7linethickness#;
 
 penw# = 2penh# + 0.14 staff_space#;
 
@@ -38,7 +38,7 @@ fet_beginchar("Pedal asterisk", "*", "pedalasterisk")
        save bulb, p, radius, thin;
        path p;
 
-       thin = 0.8 stafflinethickness;
+       thin = 0.8 linethickness;
 
        bulb + 2 radius = w;
        0.9 thin +  bulb = (radius * pi * 2) / 8;

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index e49aad32176620d2a41559484e11a78683f74a93..f0979def1d3338c729781481a147b4f25bc79136 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -19,8 +19,8 @@ def draw_fermata =
   alpha := 10;
 
   radius# = 1.25 staff_space#;
-  crook_thinness# = 1.5stafflinethickness#;
-  crook_fatness# = 0.25 staff_space# +  1.5 stafflinethickness#;
+  crook_thinness# = 1.5linethickness#;
+  crook_fatness# = 0.25 staff_space# +  1.5 linethickness#;
 
   radius# + crook_fatness#/2 = h#;
   radius# + crook_thinness#/2 = w#;
@@ -61,11 +61,11 @@ def draw_short_fermata =
        save fat_factor, thinness, dot_radius;
        set_char_box(staff_space#, staff_space#, 0, 2.2 staff_space#);
 
-       dot_radius# = 0.133 staff_space# + 1.33 stafflinethickness#;
+       dot_radius# = 0.133 staff_space# + 1.33 linethickness#;
        define_pixels(dot_radius)
 
        fat_factor = .11;
-       thinness = 1.5 stafflinethickness;
+       thinness = 1.5 linethickness;
 
        pickup pencircle scaled thinness;
        rt x2 = w;
@@ -101,9 +101,9 @@ def draw_long_fermata =
        define_pixels(wd, dot_radius)
 
        wd# = 2.5 staff_space#;
-       stemthick = 1.5 stafflinethickness;
-       beamheight = 0.3 staff_space+  stafflinethickness;
-       dot_radius# = 0.133 staff_space#+ + 1.333 *stafflinethickness#;
+       stemthick = 1.5 linethickness;
+       beamheight = 0.3 staff_space+  linethickness;
+       dot_radius# = 0.133 staff_space#+ + 1.333 *linethickness#;
        set_char_box(wd#/2, wd#/2, 0, 3/2 staff_space#);
 
        draw_rounded_block((-b, h-beamheight), (w, h), blot_diameter);
@@ -136,7 +136,7 @@ def draw_very_long_fermata =
        iht# = 0.9 staff_space#;
        oht# = 1.6 staff_space#;
 
-       stemthick = 1.5 stafflinethickness;
+       stemthick = 1.5 linethickness;
        ibeamheight = 0.3 staff_space;
        obeamheight = 0.5 staff_space;
        dot_radius = ((iht - ibeamheight) * 4/10)  ;
@@ -177,7 +177,7 @@ fet_beginchar("Thumb", "thumb", "thumb")
         set_char_box(width#/2, width#/2, height#/2, height#/2);
        define_pixels (height,width)
 
-        thin = .6  stafflinethickness + 0.06 staff_space;
+        thin = .6  linethickness + 0.06 staff_space;
        2 thick + 0.5 (height - 2 thin) = width;
 
        penpos1(thick, 0);
@@ -203,7 +203,7 @@ fet_beginchar("> accent", "sforzato", "sforzatoaccent")
        set_char_box(.9 staff_space#, .9 staff_space#, .5 staff_space#, .5 staff_space#);
        save thickness, diminish;
 
-       thickness = 0.05 staff_space + stafflinethickness;
+       thickness = 0.05 staff_space + linethickness;
        pickup pencircle scaled thickness;
 
        % prevent blobs at crossing lines
@@ -215,7 +215,7 @@ fet_beginchar("> accent", "sforzato", "sforzatoaccent")
        y2 = .25 thickness* diminish;
 
        rt z4 = (w,0);
-       x3 = - stafflinethickness + 0.1 staff_space;
+       x3 = - linethickness + 0.1 staff_space;
        z3 = whatever [z1, z4];
 
        penpos2(thickness*(2 - diminish)/2 , 90);
@@ -244,11 +244,11 @@ fet_endchar;
 def draw_staccatissimo =
        save radius, height;
        height# = .8 staff_space#;
-       radius# = stafflinethickness# + .1 staff_space#;
+       radius# = linethickness# + .1 staff_space#;
        define_whole_pixels(radius);
        define_pixels(height);
 
-       draw_brush((0,0), stafflinethickness, (0, height),2 radius);
+       draw_brush((0,0), linethickness, (0, height),2 radius);
        set_char_box(radius#,radius#, blot_diameter#/2, height# + radius#);
 enddef;
 
@@ -264,7 +264,7 @@ fet_endchar;
 
 fet_beginchar("portato/single tenuto", "tenuto", "tenuto")
        save thick;
-       thick# = 1.6 stafflinethickness#;
+       thick# = 1.6 linethickness#;
        define_whole_pixels(thick);
 
        set_char_box(.6 staff_space#, .6 staff_space#, thick#/2,thick#/2);
@@ -274,8 +274,8 @@ fet_endchar;
 
 def draw_portato = 
        save thick, radius;
-       thick# = 1.4 stafflinethickness#;
-       radius# = 1.4 stafflinethickness#;
+       thick# = 1.4 linethickness#;
+       radius# = 1.4 linethickness#;
        define_whole_pixels(thick,radius);
        
        set_char_box(.6 staff_space#, .6 staff_space#, thick#/2,.5 staff_space#+ radius#);
@@ -304,7 +304,7 @@ def draw_marcato =
        set_char_box(staff_space#/2, staff_space#/2, 0, 1.1 staff_space#);
 
        fat_factor = .3;
-       thinness =  stafflinethickness;
+       thinness =  linethickness;
 
        pickup pencircle scaled thinness;
        rt x2 = w;
@@ -346,7 +346,7 @@ fet_beginchar("open (unstopped)", "open", "ouvert")
        save thin, height, width, thick;
        height# = 5/4 width#;
        height# = staff_space#;
-        thin = .6  stafflinethickness + 0.06 staff_space;
+        thin = .6  linethickness + 0.06 staff_space;
        set_char_box(width#/2, width#/2, height#/2, height#/2);
        define_pixels (width,height);
        2 thick + 0.6 (height - 2 thin) = width;
@@ -364,7 +364,7 @@ fet_endchar;
 
 fet_beginchar("plus (stopped)", "stopped", "plusstop")
        save thick, size;
-       thick = 2 stafflinethickness;
+       thick = 2 linethickness;
        size# = 1.1 staff_space#;
 
        set_char_box(size#/2, size#/2, size#/2, size#/2);
@@ -410,7 +410,7 @@ enddef;
 fet_beginchar("Upbow", "upbow", "upbow")
        save ht, wd, thick, diminish;
        
-       thick = 1.4 stafflinethickness;
+       thick = 1.4 linethickness;
        wd# = 1.3 staff_space#;
        ht# = 1.6 wd#; 
        set_char_box(wd#/2, wd#/2, 0, ht#);
@@ -424,7 +424,7 @@ fet_beginchar("Downbow", "downbow", "downbow")
        define_pixels(wd)
 
        wd# = 1.5 staff_space#;
-       stemthick = 1.2 stafflinethickness;
+       stemthick = 1.2 linethickness;
        set_char_box(wd#/2, wd#/2, 0, 4/3 staff_space#);
 
        beamheight = 4/10 h;
@@ -446,7 +446,7 @@ def draw_turn =
 
        wd# = 35/16 staff_space#;
        ht# = 18/17 staff_space#;
-       darkness = 0.3 stafflinethickness + 0.09 staff_space;
+       darkness = 0.3 linethickness + 0.09 staff_space;
 
        set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
 
@@ -534,7 +534,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
        t_width =  1.9 t_fatness;
        r_fatness = 0.78 fatness;
        uitschieter = 0.48 ex;
-       hair_thick =  stafflinethickness;
+       hair_thick =  linethickness;
        r_flare = .5 hair_thick + 0.25 r_fatness;
        r_width =  2 r_fatness + 0.25 kerning;
        slant = .2;
@@ -604,7 +604,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
        penpos9(r_fatness, 0);
 
        x10 = x9;
-       y10 =  -0.3 stafflinethickness;
+       y10 =  -0.3 linethickness;
        penpos10(r_fatness, 0);
 
        krul_p := z4{up}
@@ -624,7 +624,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
        penpos11(hair_thick, -4);
        z11r = z9r;
        
-       z13l = (x9l + r_width, y11 -  stafflinethickness );
+       z13l = (x9l + r_width, y11 -  linethickness );
        penpos13(r_flare, 180);
 
        z15 = z13r  - ( bulb_size * r_fatness,0);
@@ -653,7 +653,7 @@ def draw_heel =
        define_pixels(radius);
        set_char_box(radius#, radius#, radius#, 2/3 staff_space#);
 
-       thickness := 1.5 stafflinethickness;    
+       thickness := 1.5 linethickness; 
        pickup pencircle scaled thickness;
        rt x1 = b;
        top y1 = h;
@@ -683,7 +683,7 @@ fet_endchar;
 def draw_toe =
        save ht,wd;
 
-       thickness := 1.5 stafflinethickness;
+       thickness := 1.5 linethickness;
        ht# := 1.5 staff_space#;
        wd# := 1/3 ht#;
        define_pixels(ht,wd);
@@ -738,7 +738,7 @@ fet_beginchar("Segno", "segno", "segno")
 
        ht# = 3 staff_space#;
        wd# = 2 staff_space#;
-       darkness = .08 staff_space + 0.4  stafflinethickness;
+       darkness = .08 staff_space + 0.4  linethickness;
 
        set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
 
@@ -747,7 +747,7 @@ fet_beginchar("Segno", "segno", "segno")
        thin = darkness;
        ball_nib_thick = 2.7 darkness;
        ball_diam = ball_nib_thick + (w - ball_nib_thick) / 10;
-       pointheight = 2 stafflinethickness;
+       pointheight = 2 linethickness;
        
        y3l = h;
        2 x3 = x2 + x4;
@@ -801,7 +801,7 @@ fet_beginchar("Coda", "coda", "coda")
                codaheight#+stickout#, codaheight#+stickout#);
 
        define_pixels(codawidth, codaheight);
-       thin = 1.2 stafflinethickness;
+       thin = 1.2 linethickness;
        0.1 (codaheight - 2 thin)  = (codawidth - 2 thick);
 
        penpos1(thick,0);
@@ -827,8 +827,8 @@ fet_endchar;
 
 fet_beginchar("Varied Coda", "varcoda", "varcoda")
        save thin, thick, codawidth, codaheight;
-       thin# = 1.2 stafflinethickness#;
-       thick# = 1.0 stafflinethickness# + 0.25 staff_space#;
+       thin# = 1.2 linethickness#;
+       thick# = 1.0 linethickness# + 0.25 staff_space#;
        codawidth# = 2/3 staff_space#;
        codaheight# = 1 staff_space#;
        define_pixels(thin, thick, codawidth, codaheight);
@@ -859,8 +859,8 @@ fet_endchar;
 def draw_comma = 
        save alpha, thick, thin, ht;
        alpha:=35;
-       thin# = 1.2 stafflinethickness#;
-       thick# = 3 stafflinethickness#;
+       thin# = 1.2 linethickness#;
+       thick# = 3 linethickness#;
        ht# = .6staff_space#;
        define_pixels(thin, thick,ht);
        set_char_box(0, .5staff_space#, ht#, ht#);
@@ -892,8 +892,8 @@ fet_endchar;
 def draw_varcomma = 
        save thick, thin, ht, wd, alpha;
        alpha:=35;
-       thin# = 1.2 stafflinethickness#;
-       thick# = 3 stafflinethickness#;
+       thin# = 1.2 linethickness#;
+       thick# = 3 linethickness#;
        ht# = .6 staff_space#;
        wd# = .25 staff_space#;
        define_pixels(thin, thick, ht, alpha);
@@ -915,7 +915,7 @@ fet_endchar;
 thick#:=1/24designsize;
 define_blacker_pixels(thick);
 
-rthin:= 0.075 *staff_space + 0.5 stafflinethickness;
+rthin:= 0.075 *staff_space + 0.5 linethickness;
 rthick:=2thick+rthin;
 
 def draw_arpeggio =
@@ -1041,8 +1041,8 @@ fet_beginchar("Caesura", "caesura", "caesura");
 
   path p;
 
-  botthick = 1.5 stafflinethickness;
-  topthick = 2.5 stafflinethickness;
+  botthick = 1.5 linethickness;
+  topthick = 2.5 linethickness;
   pickup pencircle scaled botthick;
 
 

diff --git a/mf/parmesan-accidentals.mf b/mf/parmesan-accidentals.mf
index 5602f55a227f5838ad2fd7e4a4d1c088f187e10f..5f851d93bb90aa61ebf95ef11c7d4e9956d09454 100644 (file)
--- a/mf/parmesan-accidentals.mf
+++ b/mf/parmesan-accidentals.mf
@@ -22,7 +22,7 @@ fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
                     0.6 staff_space#, 1.0 staff_space#);
 
        pickup pencircle
-               xscaled 0.50 stafflinethickness
+               xscaled 0.50 linethickness
                yscaled 0.22 staff_space;
 
        save za, zb;
@@ -33,7 +33,7 @@ fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
        draw za -- zb;
 
        pickup pencircle
-               xscaled 0.50 stafflinethickness
+               xscaled 0.50 linethickness
                yscaled 0.22 staff_space
                rotated -63;
 
@@ -68,12 +68,12 @@ fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
         zg = (0.15 staff_space, +0.26 staff_space);
 
         pickup pencircle
-                xscaled 0.50 stafflinethickness
+                xscaled 0.50 linethickness
                 yscaled 0.22 staff_space;
         draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg;
 
-        set_char_box(0.00 staff_space# + 0.25 stafflinethickness#,
-                    0.50 staff_space# + 0.25 stafflinethickness#,
+        set_char_box(0.00 staff_space# + 0.25 linethickness#,
+                    0.50 staff_space# + 0.25 linethickness#,
                     0.23 staff_space# + 0.11 staff_space#,
                     0.80 staff_space# + 0.11 staff_space#);
         fet_endchar;
@@ -82,7 +82,7 @@ fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
        save za, zb, zc, zd;
        pair za, zb, zc, zd;
        pickup pencircle
-               xscaled 0.80 stafflinethickness
+               xscaled 0.80 linethickness
                yscaled 0.22 staff_space;
        za = (0.00 staff_space, +0.65 staff_space);
        zb = (0.00 staff_space, -0.35 staff_space);
@@ -96,8 +96,8 @@ fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
                yscaled -1
                shifted (0.40 staff_space, 0.0 staff_space);
 
-       set_char_box(0.00 staff_space# + 0.40 stafflinethickness#,
-                    0.40 staff_space# + 0.40 stafflinethickness#,
+       set_char_box(0.00 staff_space# + 0.40 linethickness#,
+                    0.40 staff_space# + 0.40 linethickness#,
                     0.65 staff_space# + 0.11 staff_space#,
                     0.65 staff_space# + 0.11 staff_space#);
 
@@ -114,7 +114,7 @@ fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
 fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
        save stemthick;
        define_pixels (stemthick);
-       stemthick# = stafflinethickness#;
+       stemthick# = linethickness#;
 
        save za, zb;
        pair za, zb;
@@ -136,7 +136,7 @@ fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
 fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
        save stemthick;
        define_pixels (stemthick);
-       stemthick# = stafflinethickness#;
+       stemthick# = linethickness#;
 
        save za, zb, zc, zd, ze;
        pair za, zb, zc, zd, ze;
@@ -162,7 +162,7 @@ fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
 fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
        save stemthick;
        define_pixels (stemthick);
-       stemthick# = stafflinethickness#;
+       stemthick# = linethickness#;
 
        save za, zb, zc, zd, ze, zf;
        pair za, zb, zc, zd, ze, zf;

diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index e7c603e271fe275ca9b7960e5eb877462fc9b37c..e2bf63e16ee3950fca4abd8eaabe8817bffa6c6c 100644 (file)
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -61,7 +61,7 @@ def draw_vaticana_do_clef(expr exact_center, reduction) =
 
        define_pixels(reduced_il);
 
-       pickup pencircle xscaled 0.6stafflinethickness yscaled 0.6reduced_il;
+       pickup pencircle xscaled 0.6linethickness yscaled 0.6 reduced_il;
 
        save za, zb, zc, zd, ze, zf;
        pair za, zb, zc, zd, ze, zf;
@@ -98,14 +98,14 @@ def draw_vaticana_fa_clef(expr exact_center, reduction) =
        pair za, zb, zc, zd, ze;
 
        %left-handed punctum
-       pickup pencircle xscaled 0.6stafflinethickness yscaled 0.5reduced_il;
+       pickup pencircle xscaled 0.6linethickness yscaled 0.5reduced_il;
        lft za = exact_center + (+0.00reduced_il, +0.00reduced_il);
            zb = exact_center + (+0.25reduced_il, +0.05reduced_il);
        rt  zc = exact_center + (+0.50reduced_il, -0.05reduced_il);
        draw za .. zb .. zc;
 
        %stem
-       pickup pencircle scaled 0.6stafflinethickness;
+       pickup pencircle scaled 0.6linethickness;
        xpart zc = xpart zd = xpart ze;
        ypart zd = ypart exact_center = bot ypart ze + 1.5reduced_il;
        draw zd -- ze;
@@ -141,7 +141,7 @@ fet_endchar;
 def draw_medicaea_do_clef(expr exact_center, reduction) = 
        save reduced_il, reduced_slt;
        reduced_il# = staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        define_pixels(reduced_il);
        define_pixels(reduced_slt);
 
@@ -207,7 +207,7 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) =
 
        save reduced_il, reduced_slt;
        reduced_il# = staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        define_pixels(reduced_il);
        define_pixels(reduced_slt);
 
@@ -215,7 +215,7 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) =
        pair za, zb, zc, zd, ze;
 
        %stem
-       pickup pencircle scaled stafflinethickness;
+       pickup pencircle scaled linethickness;
        xpart za = xpart zb =
                xpart exact_center + 0.4reduced_il;
        ypart za = ypart exact_center = bot ypart zb + 1.5reduced_il;
@@ -312,7 +312,7 @@ enddef;
 def draw_neo_mensural_c_clef(expr exact_center, reduction) = 
        save reduced_il, reduced_slt, stem_width;
        reduced_il# = staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        stem_width# = 1.4 reduced_slt#;
        define_pixels(reduced_il, reduced_slt, stem_width);
 
@@ -363,7 +363,7 @@ def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) =
 
        save reduced_il, reduced_slt;
        reduced_il# = staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        define_pixels(reduced_il);
 
        draw_brevis(exact_center + (0, 0.5staff_space#),
@@ -384,7 +384,7 @@ def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) =
        yoffs# = ypart exact_center;
        define_pixels(xoffs, yoffs);
 
-       pickup pencircle xscaled 1.4 stafflinethickness yscaled blot_diameter;
+       pickup pencircle xscaled 1.4 linethickness yscaled blot_diameter;
        lft x8 = lft x9 = xoffs;
        top y8 = yoffs + left_height;
        bot y9 = yoffs - left_depth;
@@ -460,7 +460,7 @@ def draw_mensural_c_clef(expr exact_center, reduction) =
        save reduced_il;
        reduced_il# = staff_space# * reduction;
        draw_brevis(exact_center + (0, 0.5staff_space#),
-                   2reduced_il#, 0.8staff_space#, 0.8stafflinethickness#);
+                   2reduced_il#, 0.8staff_space#, 0.8linethickness#);
        define_pixels(reduced_il);
        addto currentpicture also currentpicture shifted (0, -staff_space);
        addto currentpicture also currentpicture shifted (0, -staff_space);
@@ -474,7 +474,7 @@ def draw_mensural_c_clef(expr exact_center, reduction) =
        yoffs# = ypart exact_center;
        define_pixels(xoffs, yoffs);
 
-       pickup pencircle xscaled 1.4 stafflinethickness yscaled blot_diameter;
+       pickup pencircle xscaled 1.4 linethickness yscaled blot_diameter;
        lft x8 = lft x9 = xoffs;
        top y8 = yoffs + 2.2 half_reduced_il;
        bot y9 = yoffs - 2.2 half_reduced_il - staff_space;
@@ -544,7 +544,7 @@ def draw_petrucci_f_clef(expr exact_center, reduction) =
 
        save reduced_il, reduced_slt;
        reduced_il# = staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        define_pixels(reduced_il);
        define_pixels(reduced_slt);
 
@@ -618,7 +618,7 @@ def draw_mensural_f_clef(expr exact_center, reduction) =
        save width, reduced_slt, stem_width, dot_diameter;
 
        width# = 1.2staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        stem_width# = 1.4 reduced_slt#;
        dot_diameter# = 0.1 reduction * staff_space#;
        define_pixels(width, stem_width, staff_space, dot_diameter);
@@ -694,7 +694,7 @@ def draw_mensural_g_clef(expr exact_center, reduction) =
        height# = 1.5 reduced_il#;
        width# = 1.13 reduced_il#;
        apex_o# = 0.02 reduced_il#;
-       hair# =  3 stafflinethickness#;
+       hair# =  3 linethickness#;
        define_pixels(reduced_il, stem_width, height, width, apex_o, hair);
 
        penpos1(2 stem_width, -142);
@@ -770,7 +770,7 @@ def draw_petrucci_g_clef(expr exact_center, reduction) =
        save reduced_il, reduced_slt;
 
        reduced_il# = staff_space# * reduction;
-       reduced_slt# = stafflinethickness# * reduction;
+       reduced_slt# = linethickness# * reduction;
        define_pixels(reduced_il, reduced_slt);
 
        set_char_box(0 - xpart exact_center,

diff --git a/mf/parmesan-custodes.mf b/mf/parmesan-custodes.mf
index e37e4c86a3a43fb8f4d1246a0b5d02fd54600587..5eae8ab5c4512368a42997321585f3a087e2556a 100644 (file)
--- a/mf/parmesan-custodes.mf
+++ b/mf/parmesan-custodes.mf
@@ -73,7 +73,7 @@ def custos_hufnagel(expr verbose_name, internal_name, ly_name,
 
                define_pixels(ht, wd, pen_size, stem_ht);
                pickup pencircle
-                 xscaled stafflinethickness
+                 xscaled linethickness
                  yscaled pen_size
                  rotated -dalpha#;
 
@@ -149,14 +149,14 @@ def custos_medicaea(expr verbose_name, internal_name, ly_name,
 
                define_pixels(ht, wd, stem_ht);
 
-               pickup pencircle xscaled 0.6stafflinethickness yscaled ht;
+               pickup pencircle xscaled 0.6linethickness yscaled ht;
                lft x1 = 0;
                y1 = 0;
                rt x2 = wd;
                y2 = y1;
                draw z1 -- z2;
 
-               pickup pencircle scaled 0.6stafflinethickness;
+               pickup pencircle scaled 0.6linethickness;
                rt x3 = wd;
                y3 = 0;
                x4 = x3;
@@ -228,7 +228,7 @@ def custos_vaticana(expr verbose_name, internal_name, ly_name,
 
                define_pixels(u_offs, l_offs, stem_end, ht, wd, pen_ht);
 
-               pickup pencircle scaled 0.6stafflinethickness;
+               pickup pencircle scaled 0.6linethickness;
                z1 = (0, u_offs);
                z2 = (0.7wd, l_offs);
                z3 = (wd, l_offs);
@@ -303,7 +303,7 @@ def custos_mensural(expr verbose_name, internal_name, ly_name,
 
                define_pixels(ht, wd, stem_ht);
                pickup pencircle
-                 xscaled stafflinethickness
+                 xscaled linethickness
                  yscaled 0.4ht
                  rotated -dalpha#;
 

diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf
index 5cd48dc78716a565ae2589932622a999212a3155..84fb5a29e13b03d3bb74fa7b63384b4c2c981a4b 100644 (file)
--- a/mf/parmesan-flags.mf
+++ b/mf/parmesan-flags.mf
@@ -28,10 +28,10 @@ dir_down = -1;
 %
 
 def draw_mensural_outermost_flare (expr staffline_adjustment) =
-       define_pixels(stafflinethickness, staff_space)
+       define_pixels(linethickness, staff_space)
 
        pickup pencircle
-               xscaled 1.00 stafflinethickness
+               xscaled 1.00 linethickness
                yscaled 0.22 staff_space
                rotated -35;
 
@@ -59,10 +59,10 @@ def draw_mensural_outermost_flare (expr staffline_adjustment) =
 enddef;
 
 def draw_mensural_inner_flare(expr il_shift) =
-       define_pixels(stafflinethickness, staff_space)
+       define_pixels(linethickness, staff_space)
 
        pickup pencircle
-               xscaled 1.00 stafflinethickness
+               xscaled 1.00 linethickness
                yscaled 0.22 staff_space
                rotated -35;
 

diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index 1847e663113a622aa52159a15a019541de0c9f8e..af1db475204427a094b5fd4579472718924412ab 100644 (file)
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -168,7 +168,7 @@ def draw_neo_mensural_open_head (expr wid, height)=
        
        save hole_widthNW, hole_widthSW;
        hole_widthNW = 0.34 diamNW ;
-       hole_widthSW + 2.6 stafflinethickness = diamSW;
+       hole_widthSW + 2.6 linethickness = diamSW;
 
        (z7 + z5)/2 = (w/2, 0);
        (z8 + z6)/2 = (w/2, 0);
@@ -259,7 +259,7 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
        head_height#/2, head_height#/2);
       
       charwx := head_width# / 2;
-      charwy := head_height# / 2 - stafflinethickness#;
+      charwy := head_height# / 2 - linethickness#;
 
       pickup pencircle
             xscaled (min(blot_diameter, pen_w * head_width))
@@ -368,7 +368,7 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                fi
 
                define_pixels(convexity, excentricity, yoffs, ht, wd);
-               pickup pencircle scaled stafflinethickness;
+               pickup pencircle scaled linethickness;
 
                path p;
                save height, yoffs_bt;
@@ -385,9 +385,9 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                save box_top, box_bt;
 
                if auctum:
-                       z1a = (0.00wd + stafflinethickness/2, yoffs_bt);
+                       z1a = (0.00wd + linethickness/2, yoffs_bt);
                        z2a = (0.21wd, yoffs_bt + 1.0*convexity);
-                       z3a = (0.42wd - stafflinethickness/2,
+                       z3a = (0.42wd - linethickness/2,
                               yoffs_bt + 1.0*excentricity);
                        box_top# = height# + yoffs_bt# +
                                max(0, 1.0*convexity#, 1.0*excentricity#);
@@ -396,10 +396,10 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                        p = z1a .. {right}z2a .. {direction}z3a --
                            z3b{-direction} .. z2b{left} .. z1b -- cycle;
                elseif excentric:
-                       z1a = (0.00wd + stafflinethickness/2,
+                       z1a = (0.00wd + linethickness/2,
                               yoffs_bt - 1.0*convexity);
                        z2a = (0.08wd, yoffs_bt + 1.4*convexity);
-                       z3a = (0.42wd - stafflinethickness/2,
+                       z3a = (0.42wd - linethickness/2,
                               yoffs_bt - 1.0*convexity);
                        box_top# = height# + yoffs_bt# +
                                max(-1.0*convexity#, 1.4*convexity#, 0);
@@ -408,9 +408,9 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                        p = z1a{direction} .. z2a{right} .. z3a --
                            z3b .. {left}z2b .. {-direction}z1b -- cycle;
                else:
-                       z1a = (0.00wd + stafflinethickness/2, yoffs_bt);
+                       z1a = (0.00wd + linethickness/2, yoffs_bt);
                        z2a = (0.21wd, yoffs_bt + 1.0*convexity);
-                       z3a = (0.42wd - stafflinethickness/2, yoffs_bt);
+                       z3a = (0.42wd - linethickness/2, yoffs_bt);
                        box_top# = height# + yoffs_bt# +
                                max(0, 1.0*convexity#);
                        box_bt# = yoffs_bt# +
@@ -425,18 +425,18 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                        filldraw p;
                fi;
 
-               pickup pencircle scaled 0.6stafflinethickness;
+               pickup pencircle scaled 0.6linethickness;
 
                save stem_bt;
 
                if left_stem:
-                       z5=(0.00wd + 0.6stafflinethickness/2, yoffs);
-                       z6=(0.00wd + 0.6stafflinethickness/2, yoffs - 1.1ht);
+                       z5=(0.00wd + 0.6linethickness/2, yoffs);
+                       z6=(0.00wd + 0.6linethickness/2, yoffs - 1.1ht);
                        draw z5 -- z6;
                        stem_bt# = yoffs# - 1.1ht#;
                elseif right_stem:
-                       z5=(0.42wd - 0.6stafflinethickness/2, yoffs);
-                       z6=(0.42wd - 0.6stafflinethickness/2, yoffs - 1.5ht);
+                       z5=(0.42wd - 0.6linethickness/2, yoffs);
+                       z6=(0.42wd - 0.6linethickness/2, yoffs - 1.5ht);
                        draw z5 -- z6;
                        stem_bt# = yoffs# - 1.5ht#;
                else:
@@ -444,12 +444,12 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                fi;
 
                set_char_box(0.00wd#, 0.42wd#,
-                            max(0, -box_bt#, -stem_bt#) + stafflinethickness#/2,
-                            max(0, box_top#) + stafflinethickness#/2);
+                            max(0, -box_bt#, -stem_bt#) + linethickness#/2,
+                            max(0, box_top#) + linethickness#/2);
 
                if linea:
                        save linea_width, linea_height;
-                       linea_width# = 0.6 stafflinethickness#;
+                       linea_width# = 0.6 linethickness#;
                        linea_height# = 0.7 ht#;
                        define_pixels (linea_width, linea_height);
                        draw_block ((-0.10wd - linea_width/2,
@@ -499,10 +499,10 @@ def inclinatum_char(expr verbose_name, internal_name, ly_name,
                fi;
 
                if auctum:
-                       pickup pencircle scaled stafflinethickness;
+                       pickup pencircle scaled linethickness;
                        save za, zb, zc;
                        pair za, zb, zc;
-                       za = (0, -0.5 head_height + stafflinethickness);
+                       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} ..
@@ -618,7 +618,7 @@ fet_beginchar("Ed. Vat. quilisma", "vaticana_quilisma", "vatquilismahead")
        black_notehead_width# := wd#;
 
        define_pixels(ht, wd);
-       pickup pencircle xscaled stafflinethickness yscaled 0.44ht;
+       pickup pencircle xscaled linethickness yscaled 0.44ht;
        lft x1 = 0.00wd; bot y1 = -0.28ht;
        x2 = 0.11wd;     y2 = -0.14ht;
        x3 = 0.12wd;     y3 = +0.03ht;
@@ -725,17 +725,17 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
                draw z1 .. z2;
 
                pickup pencircle
-                       xscaled stafflinethickness
+                       xscaled linethickness
                        yscaled blot_diameter;
 
                if left_down_stem:
-                       z4=(0.00wd + stafflinethickness/2, blot_diameter/2);
-                       z5=(0.00wd + stafflinethickness/2, - 1.25ht);
+                       z4=(0.00wd + linethickness/2, blot_diameter/2);
+                       z5=(0.00wd + linethickness/2, - 1.25ht);
                        draw z4 .. z5;
                        set_char_box(0.0, 0.4wd#, 1.25ht#, 0.25ht#);
                elseif left_up_stem:
-                       z4=(0.00wd + stafflinethickness/2, blot_diameter/2);
-                       z5=(0.00wd + stafflinethickness/2, + 1.25ht);
+                       z4=(0.00wd + linethickness/2, blot_diameter/2);
+                       z5=(0.00wd + linethickness/2, + 1.25ht);
                        draw z4 .. z5;
                        set_char_box(0.0, 0.4wd#, 0.25ht#, 1.25ht#);
                else:
@@ -804,7 +804,7 @@ fet_beginchar("Hufnagel pes lower punctum", "hufnagel_lpes", "huflpeshead")
 
        set_char_box(0, width#, height#/2, height#/2);
 
-       pickup pencircle scaled stafflinethickness;
+       pickup pencircle scaled linethickness;
        define_pixels(width, height);
 
        rt x3 = -lft x1 = width/2;

diff --git a/mf/parmesan-scripts.mf b/mf/parmesan-scripts.mf
index a10e8555bbaf872b5d60565f74b55e2a9f1454c3..73172348847abe6cbdbc83afcafb6b45ad12f91f 100644 (file)
--- a/mf/parmesan-scripts.mf
+++ b/mf/parmesan-scripts.mf
@@ -11,7 +11,7 @@ fet_begingroup ("scripts")
 fet_beginchar("ictus", "ictus", "ictus")
        save ht, wd;
        ht# = .35 staff_space#;
-       wd# = stafflinethickness#;
+       wd# = linethickness#;
        define_pixels(wd, ht);
        pickup pencircle
                xscaled wd
@@ -25,8 +25,8 @@ fet_endchar;
 
 def draw_accentus =
        save thick, thin, ht, wd;
-       thin# = 1 stafflinethickness#;
-       thick# = 1.2 stafflinethickness#;
+       thin# = 1 linethickness#;
+       thick# = 1.2 linethickness#;
        ht# = .35 staff_space#;
        wd# = .25 staff_space#;
        define_pixels(wd, ht, thin, thick);
@@ -56,7 +56,7 @@ def draw_half_ellipse(expr ellips_width, ellips_height) =
        height# = ellips_height;
        define_pixels(width, height);
 
-       thin = thick = 0.6 stafflinethickness;
+       thin = thick = 0.6 linethickness;
        penpos1(thick, 0);
        penpos2(thin, -90);
        z1r = (width/2, 0);
@@ -100,14 +100,14 @@ def draw_signum_congruentiae =
        save za, zb, zc, zd, ze, zf, zg, zh;
        pair za, zb, zc, zd, ze, zf, zg, zh;
 
-       set_char_box(0.50 staff_space# + 1.5 stafflinethickness#,
-                    0.50 staff_space# + 1.5 stafflinethickness#,
-                    2.5 stafflinethickness#,
-                    2.00 staff_space# + 3.5 stafflinethickness#);
+       set_char_box(0.50 staff_space# + 1.5 linethickness#,
+                    0.50 staff_space# + 1.5 linethickness#,
+                    2.5 linethickness#,
+                    2.00 staff_space# + 3.5 linethickness#);
 
        pickup pencircle
-               xscaled 1.0 stafflinethickness
-               yscaled 5.0 stafflinethickness
+               xscaled 1.0 linethickness
+               yscaled 5.0 linethickness
                rotated -35;
        za = (+0.50staff_space, +2.00staff_space);
        zb = (+0.00staff_space, +2.00staff_space);
@@ -117,7 +117,7 @@ def draw_signum_congruentiae =
        zf = (+0.00staff_space, +0.00staff_space);
        draw za{-1,+1} .. zb .. zc .. zd .. ze .. zf;
 
-       pickup pencircle scaled 3.0 stafflinethickness;
+       pickup pencircle scaled 3.0 linethickness;
        zg = (-0.5staff_space, +0.0staff_space);
        zh = (+0.5staff_space, +0.0staff_space);
        drawdot zg;

diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index 17240cb4981cd2aa6f734fb0cb0acfb6538e1744..7a128582f4f07036e2fb496627862b0c9a44a27a 100644 (file)
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -15,8 +15,8 @@ threequartercircle = halfcircle & quartercircle rotated 180;
 
 save Cdiameter, Cthickness, Chairpin;
 Cdiameter# := 3/2 staff_space#;
-Cthickness# := 2 stafflinethickness#;
-Chairpin# := 0.5 stafflinethickness#;
+Cthickness# := 2 linethickness#;
+Chairpin# := 0.5 linethickness#;
 define_pixels(Cdiameter, Cthickness, Chairpin);
 
 %%%%%%%%
@@ -85,7 +85,7 @@ def mens_timesig (expr verbose_name, internal_name, ly_name,
                        draw threequartercircle rotated 45 scaled Cdiameter;
                fi;
                if dotted:
-                       pickup pencircle scaled 4 stafflinethickness;
+                       pickup pencircle scaled 4 linethickness;
                        draw (0,0);
                fi;
                currentpicture := currentpicture shifted 0.5(Cdiameter + Cthickness, 0);
@@ -147,7 +147,7 @@ mens_timesig ("Mensural 2/4 meter", "mensural2/4", "mensuraltwofourmeter",
 
 save neo_Cdiameter, neo_Cthickness;
 neo_Cdiameter# := 3/2 staff_space#;
-neo_Cthickness# := 2 stafflinethickness#;
+neo_Cthickness# := 2 linethickness#;
 define_pixels(neo_Cdiameter, neo_Cthickness);
 
 def neo_mens_timesig (expr verbose_name, internal_name, ly_name,
@@ -179,7 +179,7 @@ def neo_mens_timesig (expr verbose_name, internal_name, ly_name,
                        draw threequartercircle rotated 45 scaled neo_Cdiameter;
                fi;
                if dotted:
-                       pickup pencircle scaled 4 stafflinethickness;
+                       pickup pencircle scaled 4 linethickness;
                        draw (0,0);
                fi;
                currentpicture := currentpicture shifted 0.5(neo_Cdiameter + neo_Cthickness, 0);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f2f3487513149642ffbfcc9119a891266159027f..17a8ee0cefd9dc65639f911f2293678f8b79b822 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -333,7 +333,7 @@
        (font-family . dynamic)
        (font-shape . italic)
        (self-alignment-Y . 0)
-       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface ))))
+       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface))))
        ))
 
     (DynamicLineSpanner

diff --git a/scm/paper.scm b/scm/paper.scm
index 80a0724bfb1cf4fdc76f61390bf8e9b11b8c283b..bb802bb17bf24799ccc32073d116ef404de38966 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,4 +1,4 @@
-; paper.scm - manipulate the paper block.
+                                       ; paper.scm - manipulate the paper block.
 ;
 ; (C) 2004 Han-Wen Nienhuys
 
@@ -18,7 +18,10 @@
     (module-define! m 'staffheight sz)
     (module-define! m 'staff-space ss)
     (module-define! m 'staffspace ss)
-    (module-define! m 'linethickness (* 0.5 pt))
+
+
+    ;; !! synchronize with feta-params.mf
+    (module-define! m 'linethickness (+ (* 0.3 pt) (* 0.04 ss)))
     (module-define! m 'outputscale ss)
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.35 pt))