From bfb2307f9131c5a1f692b5442fff3ecb59014e6f Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Fri, 19 Sep 2003 10:05:20 +0000
Subject: [PATCH] *** empty log message ***

---
 lily/hairpin.cc                         | 32 ++++++++++++++++++++++----------
 stepmake/stepmake/makedir-targets.make  |  2 +-
 stepmake/stepmake/script-rules.make     | 12 ++++++------
 stepmake/stepmake/substitute-rules.make |  2 +-
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index a069fb0079..ba4427a6ee 100644
--- 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 6059b7adff..04cd506bfc 100644
--- 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 2eb18a50fe..02e99909ac 100644
--- 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 ae3ce812b7..ad63c0f7e6 100644
--- 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) > $@
 
-- 
2.11.4.GIT