*** empty log message ***

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index a069fb0079aeb4838fcbcfb752a29a4ce60afc80..ba4427a6eec58666c33dc81e7d49a7485a9cd3ec 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -133,19 +133,31 @@ Hairpin::brew_molecule (SCM smob)
   /*
     TODO: set line style.
    */
-  Molecule mol  = Lookup::dashed_line (thick,
-                               Offset (0, starth),
-                               Offset (width, endh),
-                               period, fraction);
-  mol.add_molecule (Lookup::dashed_line (thick,
-                                 Offset (0, -starth),
-                                 Offset (width, -endh),
-                                 period, fraction));
-  
+  Molecule mol;
+  if (fraction < 1.0)
+    {
+      mol  = Lookup::dashed_line (thick,
+                                 Offset (0, starth),
+                                 Offset (width, endh),
+                                 period, fraction);
+      mol.add_molecule (Lookup::dashed_line (thick,
+                                            Offset (0, -starth),
+                                            Offset (width, -endh),
+                                            period, fraction));
+    }
+  else
+    {
+      mol  = Lookup::line (thick,
+                          Offset (0, starth),
+                          Offset (width, endh));
+      mol.add_molecule (Lookup::line (thick,
+                                     Offset (0, -starth),
+                                     Offset (width, -endh)
+                                     ));
+    }
   mol.translate_axis (x_points[LEFT]
                      - bounds[LEFT]->relative_coordinate (common, X_AXIS),
                      X_AXIS);
-
   return mol.smobbed_copy ();
 }
 

diff --git a/stepmake/stepmake/makedir-targets.make b/stepmake/stepmake/makedir-targets.make
index 6059b7adffc3ec3998aa22ecb8c2e9ce3ba1d703..04cd506bfca5036db60fe5512ed35d5ce59c0163 100644 (file)
--- a/stepmake/stepmake/makedir-targets.make
+++ b/stepmake/stepmake/makedir-targets.make
@@ -1,4 +1,4 @@
 
 spec: $(OUTSPEC_FILES)
 
-$(OUTSPEC_FILES): $(config_make)
+$(OUTSPEC_FILES): $(config_make) $(depth)/VERSION

diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make
index 2eb18a50feca46651a97b6931c00fa4639b172d2..02e99909ac114480cb848fbf7628c9e13ea33eb0 100644 (file)
--- a/stepmake/stepmake/script-rules.make
+++ b/stepmake/stepmake/script-rules.make
@@ -1,25 +1,25 @@
 
-$(outdir)/%: %.pl $(config_make) 
+$(outdir)/%: %.pl $(config_make)  $(depth)/VERSION
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.bash $(config_make) 
+$(outdir)/%: %.bash $(config_make) $(depth)/VERSION
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.scm $(config_make) 
+$(outdir)/%: %.scm $(config_make) $(depth)/VERSION
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.expect $(config_make) 
+$(outdir)/%: %.expect $(config_make) $(depth)/VERSION
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.sh $(config_make) 
+$(outdir)/%: %.sh $(config_make) $(depth)/VERSION
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.py $(config_make) 
+$(outdir)/%: %.py $(config_make) $(depth)/VERSION
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 

diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index ae3ce812b700ca242d57f3a5e7b64c45e000773d..ad63c0f7e6fe8608634449e26597bca595c624ec 100644 (file)
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -1,6 +1,6 @@
 
 # config_make dep isn't working. Why?  
-$(outdir)/%: %.in $(config_make)
+$(outdir)/%: %.in $(config_make) $(depth)/VERSION
        rm -f $@
        cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@