From: fred <fred>
Date: Tue, 26 Mar 2002 23:57:33 +0000 (+0000)
Subject: lilypond-1.3.102
X-Git-Tag: release/1.5.59~1227
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=71e53bce10a27a0d8fb3bc48f2d3933cfb57c5a3;p=lilypond.git

lilypond-1.3.102
---

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 81183d7d29..43b238f877 100644
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -128,7 +128,3 @@ Articulation_req::do_equal_b (Request const* r) const
 }
 
 
-Script_req::Script_req ()
-{
-  set_direction (CENTER);
-}
diff --git a/lily/request.cc b/lily/request.cc
index a8db23eec9..90831a5cab 100644
--- a/lily/request.cc
+++ b/lily/request.cc
@@ -29,6 +29,13 @@ Request::Request ()
   set_mus_property ("type", ly_symbol2scm ("request"));
 }
 
+
+
+Script_req::Script_req ()
+{
+  set_direction (CENTER);
+}
+
 void
 Script_req::set_direction (Direction d)
 {
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 6947d40390..8474f75722 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -85,7 +85,8 @@ Script_engraver::do_process_music()
       SCM priority = gh_car (list);
 
       
-      if (to_dir (relative_stem_dir))
+      if (!isdir_b (force_dir)
+	  && to_dir (relative_stem_dir))
 	p->set_elt_property ("side-relative-direction", relative_stem_dir);
       else
 	p->set_elt_property ("direction", force_dir);