oops. Include $CONFIGFILE.make, not

config.make.

diff --git a/ChangeLog b/ChangeLog
index 4b828930ca935d07441f07bd8e8add561ba7d9c0..58ebf9db436403483a5449ebeac67dc865b4d130 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * stepmake/aclocal.m4: oops. Include $CONFIGFILE.make, not
+       config.make.
+
        * Documentation/user/lilypond.tely: remove musedata2ly entry.
 
 2005-11-16  Jürgen Reuter  <reuter@ipd.uka.de>

diff --git a/THANKS b/THANKS
index da00bde8ca35799da94d4375fb11bc52a94f7940..434b25a294b901e8806f765e9ce0bfab8baaf72e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -47,10 +47,12 @@ Bob Broadus
 Chris Sawer
 Darius Blasband
 Donald Axel
+Eduardo Vieira
 Erlend Aasland
 Matevž Jekovec
 Michael Welsh Duggan
 Milan Zamazal
+Ralph Little
 Scott Russell
 Thomas Bushnell BSG
 Trevor Bača

diff --git a/lily/include/tie-column-format.hh b/lily/include/tie-column-format.hh
index 500ac5882a1ee8a6189bab36995dc66f72c6a043..dfdb5aa07d366dce394c005abb51530c406f7c0c 100644 (file)
--- a/lily/include/tie-column-format.hh
+++ b/lily/include/tie-column-format.hh
@@ -22,8 +22,7 @@ void shift_small_ties (Ties_configuration *tie_configs,
                       Tie_details const &details);
 void final_shape_adjustment (Tie_configuration &conf,
                             Tie_formatting_problem const&,
-                            Grob *staff_referencer,
-                            Tie_details const &details);
+                            Grob *staff_referencer);
 void
 set_chord_outlines (Drul_array< Array<Skyline_entry> > *skyline_drul,
                    Link_array<Grob> ties,

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 946e3032355884e63f5ac8c75dd816fa30d7c210..5adda8bb6241e9ede3598dfaf912e1b907995823 100644 (file)
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -15,10 +15,26 @@
 #include "skyline.hh"
 #include "lily-proto.hh"
 
+
+struct Tie_details
+{
+  Real height_limit_;
+  Real ratio_;
+  Real staff_space_;
+  Real x_gap_;
+  Real between_length_limit_;
+  
+  Tie_details ();
+  void from_grob (Grob *);
+};
+
 class Tie_formatting_problem
 {
   Drul_array< Array<Skyline_entry> > chord_outlines_;
   Grob *x_refpoint_;
+public:
+  Tie_details details_;
+
 public:
   Tie_formatting_problem ();
 

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index b5b8fd8eb6514a2924a4f30e6b778a5e382c63d0..23c73a46c1e4baecedd63f06d391dfc62775184a 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -15,17 +15,6 @@
 
 
 
-struct Tie_details
-{
-  Real height_limit_;
-  Real ratio_;
-  Real staff_space_;
-  Real x_gap_;
-  Real between_length_limit_;
-  
-  Tie_details ();
-  void init (Grob *);
-};
   
 class Tie_configuration
 {
@@ -70,9 +59,7 @@ public:
   static int get_position (Grob *);
   static Direction get_default_dir (Grob *);
   static void get_configuration (Grob *, Tie_configuration *,
-                                Tie_formatting_problem const &,
-                                Tie_details const & 
-                                );
+                                Tie_formatting_problem const &);
   static void set_control_points (Grob *, Grob *,
                                  Tie_configuration const&,
                                  Tie_details const&);

diff --git a/lily/laissez-vibrer-tie-column.cc b/lily/laissez-vibrer-tie-column.cc
index df8cbab09d2983a0a6b60189b1f15b2a1d70b902..a65de78ccc20600850169a0207055847a751b300 100644 (file)
--- a/lily/laissez-vibrer-tie-column.cc
+++ b/lily/laissez-vibrer-tie-column.cc
@@ -70,18 +70,13 @@ Laissez_vibrer_tie_column::calc_positioning_done (SCM smob)
   Tie_formatting_problem problem;
   problem.from_lv_ties (lv_ties);
 
-  Tie_details details;
-  details.init (lv_ties[0]);
-
   /*
     Calculate final width and shape of the ties.
    */
   for (int i = 0; i < lv_ties.size(); i++)
     {
       final_shape_adjustment (ties_config.ties_[i],
-                             problem,
-                             lv_ties[0],
-                             details);
+                             problem, lv_ties[0]);
     }
   
   /*
@@ -89,13 +84,13 @@ Laissez_vibrer_tie_column::calc_positioning_done (SCM smob)
    */
   if (!manual_override)
     {
-      shift_small_ties (&ties_config, lv_ties[0], details);
+      shift_small_ties (&ties_config, lv_ties[0], problem.details_);
     }
   
   for (int i = 0; i < lv_ties.size(); i++)
     {
       Tie::set_control_points (lv_ties[i], problem.common_x_refpoint (), ties_config.ties_[i],
-                              details );
+                              problem.details_);
       set_grob_direction (lv_ties[i], ties_config.ties_[i].dir_);
     }
 

diff --git a/lily/tie-column-format.cc b/lily/tie-column-format.cc
index ce56cae76614b95c30bf07dbfb8181d39e10e0c9..1c6a3cb36241175415b69f58a99f47da083da8e5 100644 (file)
--- a/lily/tie-column-format.cc
+++ b/lily/tie-column-format.cc
@@ -90,9 +90,9 @@ shift_small_ties (Ties_configuration *tie_configs,
 void
 final_shape_adjustment (Tie_configuration &conf,
                        Tie_formatting_problem const &problem,
-                       Grob *staff_referencer,
-                       Tie_details const &details)
+                       Grob *staff_referencer)
 {
+  Tie_details const &details (problem.details_);
   Real line_dy = 0.0;
   bool on_line = Staff_symbol_referencer::on_staffline (staff_referencer,
                                                        int (rint (conf.position_)));

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 7a2b878c49525a2b2ddec7b65c7e741a3afab12e..31b51592dc2d91093ff6de004f3ffacc89457c66 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -103,22 +103,16 @@ Tie_column::calc_positioning_done (SCM smob)
   Tie_formatting_problem problem;
   problem.from_ties (ties);
   
-  Tie_details details;
-  details.init (ties[0]);
-
   /*
     Let the ties flow out, according to our single-tie formatting.
    */
   if (!manual_override)
     {
       Tie::get_configuration (ties[0], &ties_config.ties_.elem_ref (0),
-                             problem,
-                             details);
+                             problem);
       Tie::get_configuration (ties.top (), 
                              &ties_config.ties_.elem_ref (ties_config.ties_.size()-1),
-                             problem,
-                             details
-                             );
+                             problem);
     }
 
   /*
@@ -133,8 +127,7 @@ Tie_column::calc_positioning_done (SCM smob)
 
       final_shape_adjustment (ties_config.ties_[i],
                              problem,
-                             ties[0],
-                             details);
+                             ties[0]);
     }
 
   
@@ -143,14 +136,13 @@ Tie_column::calc_positioning_done (SCM smob)
    */
   if (!manual_override)
     {
-      shift_small_ties (&ties_config, ties[0], details);
+      shift_small_ties (&ties_config, ties[0], problem.details_);
     }
   
   for (int i = 0; i < ties.size(); i++)
     {
       Tie::set_control_points (ties[i], problem.common_x_refpoint (), ties_config.ties_[i],
-                              details
-                              );
+                              problem.details_);
       set_grob_direction (ties[i], ties_config.ties_[i].dir_);
     }
   return SCM_BOOL_T;

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index f30a197d470de08b27ca804a5a25311a62851d0f..d02593c28bc8fcfd23e1da9aab7f62c797eddd34 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -169,6 +169,8 @@ Tie_formatting_problem::from_tie (Grob *tie)
   ties.push (tie);
 
   from_ties (ties);
+
+  details_.from_grob (tie);
 }
 
 Grob *
@@ -184,6 +186,7 @@ Tie_formatting_problem::from_ties (Link_array<Grob> const &ties)
     return;
   
   x_refpoint_ = ties[0];
+  details_.from_grob (ties[0]);
   for (int i = 0; i < ties.size (); i++)
     {
       x_refpoint_ = dynamic_cast<Spanner*> (ties[i])->get_bound (LEFT)->common_refpoint (x_refpoint_, X_AXIS); 
@@ -213,6 +216,7 @@ Tie_formatting_problem::from_lv_ties (Link_array<Grob> const &lv_ties)
   if (lv_ties.is_empty ())
     return ;
   
+  details_.from_grob (lv_ties[0]);
   Link_array<Item> heads;
   for (int i = 0; i < lv_ties.size (); i++)
     {

diff --git a/lily/tie-helper.cc b/lily/tie-helper.cc
index 58dbac8ac256819799d8421352454cd20f04c058..5410a0d94226b0239de524204cc9cd655b7057f7 100644 (file)
--- a/lily/tie-helper.cc
+++ b/lily/tie-helper.cc
@@ -7,12 +7,12 @@
 
 */
 
-
 #include "tie.hh"
 #include "bezier.hh"
 #include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
+#include "tie-formatting-problem.hh"
 
 int
 Tie_configuration::compare (Tie_configuration const &a,
@@ -87,7 +87,7 @@ Tie_configuration::height (Tie_details const &details) const
 
 
 void
-Tie_details::init (Grob *me)
+Tie_details::from_grob (Grob *me)
 {
   staff_space_ = Staff_symbol_referencer::staff_space (me);
   SCM details = me->get_property ("details");

diff --git a/lily/tie.cc b/lily/tie.cc
index 91e444747e97aebd14c67bc6360d2613ccbf9bd0..b2ae46d96635b093c23780ae5c7a97ffd6a2ca83 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -196,9 +196,7 @@ Tie::get_default_attachments (Spanner *me, Grob *common, Real gap,
 void
 Tie::get_configuration (Grob *me_grob, 
                        Tie_configuration *conf,
-                       Tie_formatting_problem const &problem,
-                       Tie_details const &details
-                       )
+                       Tie_formatting_problem const &problem)
 {
   Spanner *me = dynamic_cast<Spanner*> (me_grob);
   if (!head (me, LEFT) && !head (me, RIGHT))
@@ -217,7 +215,7 @@ Tie::get_configuration (Grob *me_grob,
   if (!conf->dir_)
     conf->dir_ = get_default_dir (me);
 
-  Real staff_space = details.staff_space_;
+  Real staff_space = problem.details_.staff_space_;
   bool in_between = true;
   Real gap = robust_scm2double (me->get_property ("x-gap"), 0.2);
 
@@ -227,7 +225,7 @@ Tie::get_configuration (Grob *me_grob,
       if (!skylines)
        conf->attachment_x_ = get_default_attachments (me, common, gap,
                                                       &conf->position_,
-                                                      &in_between, details);
+                                                      &in_between, problem.details_);
 #endif
       Real y = staff_space * 0.5 * conf->position_;
       conf->attachment_x_ = problem.get_attachment (y);
@@ -235,8 +233,8 @@ Tie::get_configuration (Grob *me_grob,
     }
 
   Bezier b = slur_shape (conf->attachment_x_.length(),
-                        details.height_limit_,
-                        details.ratio_);
+                        problem.details_.height_limit_,
+                        problem.details_.ratio_);
   b.scale (1, conf->dir_);
   
   Offset middle = b.curve_point (0.5);
@@ -273,8 +271,8 @@ Tie::get_configuration (Grob *me_grob,
       conf->attachment_x_ = problem.get_attachment (y);
       conf->attachment_x_.widen (-gap);
       Bezier b = slur_shape (conf->attachment_x_.length(),
-                            details.height_limit_,
-                            details.ratio_);
+                            problem.details_.height_limit_,
+                            problem.details_.ratio_);
       Offset middle = b.curve_point (0.5);
       Offset edge = b.curve_point (0.0);
       dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
@@ -317,8 +315,8 @@ Tie::get_configuration (Grob *me_grob,
       conf->attachment_x_.widen (-gap);
              
       Bezier b = slur_shape (conf->attachment_x_.length(),
-                            details.height_limit_,
-                            details.ratio_);
+                            problem.details_.height_limit_,
+                            problem.details_.ratio_);
       Offset middle = b.curve_point (0.5);
       Offset edge = b.curve_point (0.0);
       dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
@@ -364,7 +362,7 @@ Tie::get_configuration (Grob *me_grob,
          /*
            vertically center in space.
          */
-         conf->center_tie_vertically (details);
+         conf->center_tie_vertically (problem.details_);
        }
       else
        {
@@ -412,15 +410,12 @@ Tie::set_default_control_points (Grob *me_grob)
   int tie_position = (int) Tie::get_position (me);
   conf.position_ = tie_position;
   
-  Tie_details details;
-  details.init (me);
-
   Tie_formatting_problem problem;
   problem.from_tie (me);
   
-  get_configuration (me,  &conf, problem, details);
+  get_configuration (me,  &conf, problem);
   set_control_points (me, problem.common_x_refpoint (),
-                     conf, details);
+                     conf, problem.details_);
 }
 
 void

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 526e0c6bebe76d80f924661c84e549561ffdabb6..52be8dafae26550ae62a88b2064cddd043fd084e 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -885,6 +885,11 @@ solfa_pen_thick# = 2 stafflinethickness#;
 define_blacker_pixels (solfa_pen_thick);
 
 
+solfa_whole_width := 1.8;
+solfa_half_width := 1.35;
+solfa_quarter_width := 1.35;
+
+
 def draw_do_head (expr width_factor, dir) =
        save p_in, p_out;
        save left_dist, right_dist;
@@ -937,34 +942,34 @@ enddef;
 
 
 fet_beginchar ("Whole dohead", "s0do");
-       draw_do_head (1.8, 1);
+       draw_do_head (solfa_whole_width, 1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half dohead", "d1do");
-       draw_do_head (1.5, -1);
+       draw_do_head (solfa_half_width, -1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half dohead", "u1do");
-       draw_do_head (1.5, 1);
+       draw_do_head (solfa_half_width, 1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Quart dohead", "d2do");
-       draw_do_head (1.55, -1);
+       draw_do_head (solfa_quarter_width, -1);
        fill p_out;
 fet_endchar;
 
 
 fet_beginchar ("Quart dohead", "u2do");
-       draw_do_head (1.55, 1);
+       draw_do_head (solfa_quarter_width, 1);
        fill p_out;
 fet_endchar;
 
@@ -1027,34 +1032,34 @@ enddef;
 
 
 fet_beginchar ("Whole rehead", "s0re");
-       draw_re_head (1.8, 1);
+       draw_re_head (solfa_whole_width, 1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half up rehead", "u1re");
-       draw_re_head (1.5, 1);
+       draw_re_head (solfa_half_width, 1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half down rehead", "d1re");
-       draw_re_head (1.5, -1);
+       draw_re_head (solfa_half_width, -1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Quart rehead", "u2re");
-       draw_re_head (1.55, 1);
+       draw_re_head (solfa_quarter_width, 1);
        fill p_out;
 fet_endchar;
 
 
 fet_beginchar ("Quart rehead", "d2re");
-       draw_re_head (1.55, -1);
+       draw_re_head (solfa_quarter_width, -1);
        fill p_out;
 fet_endchar;
 
@@ -1120,7 +1125,7 @@ enddef;
 
 
 fet_beginchar ("Whole mihead", "s0mi");
-       draw_mi_head (1.8);
+       draw_mi_head (solfa_whole_width);
        fill path_out;
        unfill path_in;
 fet_endchar;
@@ -1191,41 +1196,41 @@ enddef;
 
 
 fet_beginchar ("Whole fa up head", "u0fa");
-       draw_fa_head (1.8);
+       draw_fa_head (solfa_whole_width);
        fill p_up_out;
        unfill p_up_in;
 fet_endchar;
 
 
 fet_beginchar ("Whole fa down head", "d0fa");
-       draw_fa_head (1.8);
+       draw_fa_head (solfa_whole_width);
        fill p_down_out;
        unfill p_down_in;
 fet_endchar;
 
 
 fet_beginchar ("half fa up head", "u1fa");
-       draw_fa_head (1.5);
+       draw_fa_head (solfa_half_width);
        fill p_up_out;
        unfill p_up_in;
 fet_endchar;
 
 
 fet_beginchar ("Half fa down head", "d1fa");
-       draw_fa_head (1.5);
+       draw_fa_head (solfa_half_width);
        fill p_down_out;
        unfill p_down_in;
 fet_endchar;
 
 
 fet_beginchar ("Quarter fa up head", "u2fa");
-       draw_fa_head (1.55);
+       draw_fa_head (solfa_quarter_width);
        fill p_up_out;
 fet_endchar;
 
 
 fet_beginchar ("Quarter fa down head", "d2fa");
-       draw_fa_head (1.55);
+       draw_fa_head (solfa_quarter_width);
        fill p_down_out;
 fet_endchar;
 
@@ -1270,21 +1275,21 @@ enddef;
 
 
 fet_beginchar ("Whole lahead", "s0la");
-       draw_la_head (1.8);
+       draw_la_head (solfa_whole_width);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half lahead", "s1la");
-       draw_la_head (1.5);
+       draw_la_head (solfa_half_width);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Quart lahead", "s2la");
-       draw_la_head (1.55);
+       draw_la_head (solfa_quarter_width);
        fill p_out;
 fet_endchar;
 
@@ -1352,34 +1357,34 @@ enddef;
 
 
 fet_beginchar ("Whole up tihead", "s0ti");
-       draw_ti_head (1.8, 1);
+       draw_ti_head (solfa_whole_width, 1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half up tihead", "u1ti");
-       draw_ti_head (1.5, 1);
+       draw_ti_head (solfa_half_width, 1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Half down tihead", "d1ti");
-       draw_ti_head (1.5, -1);
+       draw_ti_head (solfa_half_width, -1);
        fill p_out;
        unfill p_in;
 fet_endchar;
 
 
 fet_beginchar ("Quart up tihead", "u2ti");
-       draw_ti_head (1.55, 1);
+       draw_ti_head (solfa_quarter_width, 1);
        fill p_out;
 fet_endchar;
 
 
 fet_beginchar ("Quart down tihead", "d2ti");
-       draw_ti_head (1.55, -1);
+       draw_ti_head (solfa_quarter_width, -1);
        fill p_out;
 fet_endchar;
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b0f65e10b3a5f702b7ba497c6115020350a23618..376e25b2d01eae7ed0cc6af24c9243a8ca1ddaf9 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -371,14 +371,14 @@ EOF
                mkdir -p $(dirname $mf)
                cat <<EOF | $PYTHON -  > $mf
 print 'depth=' + ('../' * ( $d-1 ) )
-print 'include \$(depth)/config.make'
+print 'include \$(depth)/$CONFIGFILE.make'
 print 'include \$(configure-srcdir)/$mf'
 EOF
            done
            for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do
                mkdir -p $(dirname $mf)
                cat <<EOF | $PYTHON -  > $mf
-print 'include \$(depth)/config.make'
+print 'include \$(depth)/$CONFIGFILE.make'
 print 'include \$(configure-srcdir)/$mf'
 EOF
            done