lilypond-1.5.40

diff --git a/ChangeLog b/ChangeLog
index f0c2a013f21094bcf222ecbefd42944337984aed..c34771be21f716bddeeaaf1ffa58520469eb998a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2002-03-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * mf/feta-eindelijk.mf: new 8th rest.
+
+       * mf/feta-toevallig.mf: small fixes for the sharp symbol. Don't
+       stick out of staffline
+
+       * scripts/lilypond-book.py: fixes for texi regular expressions.
+
+2002-03-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/include/new-beam.hh:
+       * lily/new-beam.cc: New file.
+
+       * flower/include/interval.hh: 
+       * flower/include/interval.tcc (delta): New method.
+       (swap): Now public (previously private).
+       
+       * scm/beam.scm (default-beam-y-quants): Bugfix: lower beam-sit by
+       1 staff-line-thickness.  Sadly, this makes dy quanting problems
+       (dy quants allowed should depend on actual left y) more visible.
+
+2002-03-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/beam.cc (quantise_dy): Bugfix: sign (0) = 0.  Hmm.
+
+       * scm/grob-property-description.scm (concaveness-threshold): Add
+       typecheck and description.
+
+       * scm/grob-description.scm (Beam): Remove obsolete properties, add
+       concaveness-threshold (previously concaveness).
+
+       * lily/beam.cc (check_concave): Remove choices and debugging
+       stuff: use best concaveness calculation.
+       (quantise_dy): Remove choice.  Try to never make a slope steeper
+       by quantising, but certainly never quantise a slope away.
+       (check_stem_length_f): Remove choice.  In case of lengthening
+       alowed, always lengthen to ideal length.
+
+       * Documentation/index.texi: Fix FAQ url.
+
+       * Documentation/topdocs/INSTALL.texi: Add information about fink,
+       compile fix and 1.4 specific fix that doesn't hurt 1.5.
+
 2002-03-13  Han-Wen  <hanwen@cs.uu.nl>
 
        * VERSION: 1.5.39 released

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 36a4dc000dee2750b592e186e6e8d82cbd2df84b..93ab0682f12cb44dfa9acec214cbb57473df9318 100644 (file)
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -55,9 +55,10 @@ def draw_flag(expr center, flare,
 enddef;
 
 %
-% TODO: calc intersectpoint
+% TODO: calc intersectpoint (see TeX book, p. 137)
 % TODO: calc incision_depth
 % 
+
 def add_flag(expr yoff, flare, hip_wid_multiplier, 
                hip_dep_multiplier,
                intersectpoint, hip_thickness, foot_thickness) =
@@ -116,7 +117,7 @@ fet_beginchar("8th Flag (up)", "u3", "eighthflag")
                hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness);
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 staff_space);
+       draw (0, 0) .. (0,-1 staff_space);
 fet_endchar;
 
 fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index d59e748b5f617de8db80216c3a5c1ed06f1fc1a8..b44922c89baba490429e97dc897760c4beac9a99 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -330,17 +330,29 @@ fet_endchar;
 endgroup;
 
 %%% Editable values:
-slope := 1.7; % slope of slash. From scm/grob-description.scm. How to auto-copy?
+
+slash_slope := 1.7; % slope of slash. From scm/grob-description.scm. How to auto-copy?
 slt# := 2/3*0.48staff_space#; % thickness of lines. quarter notes get 1.5slt width.
 slh# := 2staff_space#; % height of char.
 
 %%% Calculated values:
 sxa# := 0; % how much the char exceeds the boundingbox horizontally:
-slxt# := sqrt(slt#*slt#+(slt#/slope)*(slt#/slope)); % Width of hor. pen - with thanks to Pythagoras
-slw# := slh#/slope; % width of sloping part of slash:
+
+ % Width of hor. pen - with thanks to Pythagoras
+slxt# := sqrt(slt#*slt#+(slt#/slash_slope)*(slt#/slash_slope));
+slw# := slh#/slash_slope; % width of sloping part of slash:
 
 define_pixels(slt,slh,sxa,slxt,slw);
 
+
+%
+%
+% UUGGGH! FIXME -- get rid of those sharp corners. 
+%
+%
+%
+
+
 def draw_slash(expr hwid_hash) =
        wid# := slw#+2slxt#+hwid_hash;
        set_char_box(0,wid#-2sxa#,slh#/2,slh#/2);

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index b323e46d712a61458fab729dbc09f471fda2e936..2602e03142a9365ad4780270eb7648f7521dd589 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -39,15 +39,15 @@ if test = 0:
        input feta-solfa;
        
 else:
-%      input feta-bolletjes;   
-%      input feta-banier;
-%      input feta-eindelijk;
-       input feta-klef;
+       input feta-bolletjes;   
+       input feta-banier;
+       input feta-eindelijk;
+%      input feta-klef;
        input feta-toevallig;
 %      input feta-schrift;
 %      input feta-haak;
 %      input feta-timesig;
 %      input feta-pendaal;
 %      input feta-accordion;
-       input feta-solfa;
+%      input feta-solfa;
 fi

diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index 7c12709e67f002403bc66f135d1baef2cbc45333..61764beba106cf3285b23e9e15b4e69d45818a7e 100644 (file)
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -125,6 +125,10 @@ def distorted_ellipse(expr a,b,err_y,err_x,super) =
 
 
 
+%
+% draw an axis aligned block making sure that edges are on pixels.
+%
+
 def draw_rounded_block (expr bottom_left, top_right, roundness) =
        save round;
        round = floor min(roundness,xpart (top_right-bottom_left),

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index accc2310ac09de794ffc8c38c09e6d03b7660176..4d0150d02a40992ca400f223029cf37846881244 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -31,14 +31,15 @@ fet_beginchar("Sharp" , "1", "sharp");
                1.5 staff_space#);
 
        save interbeam, interstem, beamheight, beamwidth, 
-               stemwidth;
+               stemwidth, beamslope;
 
        interbeam := 1.05 staff_space;
        interstem := 7/16 ;
        beamheight := 4 stafflinethickness;
        beamwidth := w;
-       stemwidth := 1.3 stafflinethickness;
-       roundness := 2blot_diameter;
+       stemwidth := 1.5 stafflinethickness;
+       roundness := 2 blot_diameter;
+
        pair center;
        center := (.5 w, 0);
        
@@ -69,14 +70,23 @@ fet_beginchar("Sharp" , "1", "sharp");
 
        pickup pencircle scaled stemwidth;
        x3 = x4 = xpart center;
-       bot y3 = -1.5 staff_space + ypart center;
-       top y4 = 1.5 staff_space + ypart center;
 
        numeric xs;
        xs := interstem* beamwidth / 2;
+
+       (bot y3) + -xs * beamslope = -1.5 staff_space + ypart center;
+       top y4  + xs * beamslope = 1.5 staff_space + ypart center;
+
        draw_gridline (z3-(xs,xs* beamslope),z4-(xs,xs*beamslope),stemwidth);
        addto currentpicture also currentpicture rotated 180 shifted (w,0);
        labels(1,2,3,4);
+
+
+% to check that it doesn't overshoot staffline.
+%
+%      pickup pencircle scaled stafflinethickness;
+%      draw (0, 1.5 staff_space ) ..  (1 staff_space, 1.5 staff_space);
+
        fet_endchar;
 
 
@@ -111,7 +121,7 @@ fet_beginchar( "Natural", "0", "natural")
 
        pickup penrazor scaled beamheight rotated 90;
        top y2 = staff_space - 3/2 stafflinethickness ;
-       slope =  stafflinethickness / interstem;
+       slope = stafflinethickness / interstem;
        
        draw z1 .. z2;
        draw (xpart z1, -y2) .. (xpart z2, -y1);