From c68c736b45e9c6ea40f56229bd756ddb58c47363 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:37:59 +0000
Subject: [PATCH] lilypond-0.0.47

---
 flower/test/Makefile      | 6 ++----
 flower/test/stringtest.cc | 2 --
 init/table_sixteen.ini    | 1 +
 lily/.version             | 4 ++--
 lily/Makefile             | 8 +++-----
 lily/crescendo.cc         | 4 +++-
 lily/text-item.cc         | 8 ++++----
 mi2mu/Makefile            | 7 ++-----
 8 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/flower/test/Makefile b/flower/test/Makefile
index 5b6affe77e..3de2bbdc70 100644
--- a/flower/test/Makefile
+++ b/flower/test/Makefile
@@ -40,8 +40,6 @@ VERSION_DEPENDENCY = #
 
 # module compile settings: (not generally needed!
 #
-EXTRA_CFLAGS = -DSTRING_TEST
-#
 
 
 # list of distribution files:
@@ -50,9 +48,9 @@ EXTRA_DISTFILES = result
 
 # list of custom libraries:
 #
-CUSTOMLIBES = $(LIBFLOWER)\
 
-LOADLIBES +=
+MODULE_LIBDEPS=check-flower-deps
+MODULE_LIBES = -lflower
 #
 
 
diff --git a/flower/test/stringtest.cc b/flower/test/stringtest.cc
index adf545b172..cc652a5405 100644
--- a/flower/test/stringtest.cc
+++ b/flower/test/stringtest.cc
@@ -1,4 +1,3 @@
-#ifdef STRING_TEST
 /*
   stupid test program to verify stringlib
   stringtest.cc
@@ -127,5 +126,4 @@ main()
     return 0;
 }
 
-#endif STRING_TEST
 
diff --git a/init/table_sixteen.ini b/init/table_sixteen.ini
index 1767806825..95af77a40a 100644
--- a/init/table_sixteen.ini
+++ b/init/table_sixteen.ini
@@ -114,6 +114,7 @@ table_sixteen=
 	     "linestaf"	"\linestafsym{%}{%}"
 	     "stem"	"\stem{%}{%}"
 	     "fill"	"\hbox{}"
+	% ugh. 8pt
 	     "crescendosym" "\crescendosym{%}"	0\pt	0\pt	-3\pt	3\pt
 	     "decrescendosym" "\decrescendosym{%}"	0\pt	0\pt	-3\pt	3\pt
      }
diff --git a/lily/.version b/lily/.version
index 44ee82c2f9..06a9091689 100644
--- a/lily/.version
+++ b/lily/.version
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 46
+PATCH_LEVEL = 47
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 
-MY_PATCH_LEVEL = .jcn1
+MY_PATCH_LEVEL =
diff --git a/lily/Makefile b/lily/Makefile
index 583becb8e8..9d63dbc469 100644
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -14,10 +14,10 @@ depth = ..
 
 # generic variables:
 #
+include Stable.make
 include ./$(depth)/make/Variables.make
 include ./$(depth)/make/Files.make 
 include .version
-include Stable.make
 #
 
 # identify module:
@@ -39,11 +39,9 @@ EXTRA_DISTFILES = .version
 
 # list of custom libraries:
 #
-# yes, i know about the -L and -l options,
-# but these libraries get rebuilt when needed.
-CUSTOMLIBES = $(LIBLILY) $(LIBFLOWER)
+MODULE_LIBDEPS= check-flower-deps check-lily-deps
+MODULE_LIBES= -llily -lflower
 
-LOADLIBES +=
 #
 
 # main target of this module:
diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 163e3be737..e8a36e29a8 100644
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -48,7 +48,9 @@ Crescendo::brew_molecule_p() const return m_p ;
     Symbol s( paper()->lookup_l()->hairpin(w_dim, grow_dir_i_ < 0) );
     m_p->add(Atom(s));
     int pos = (dir_i_ >0) ? staff_size_i_ + 4 : - 4 ;
-    m_p->translate(Offset(0,pos * paper()->internote()));
+    if(dir_i_<0 )		// should do something better anyway.
+	m_p->translate(Offset(0, -m_p->extent().y.left ));
+    m_p->translate(Offset(x_off_dim,pos * paper()->internote()));
 }
 
 IMPLEMENT_STATIC_NAME(Crescendo);
diff --git a/lily/text-item.cc b/lily/text-item.cc
index 2171a81d24..817dc6a3b7 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -49,7 +49,7 @@ Text_item::Text_item(Text_req* treq_l, int staffsize_i)
 void
 Text_item::set_default_index()
 {
-    pos_i_  = (dir_i_ > 0) ? staffsize_i_ + 2: -4;
+    pos_i_  = (dir_i_ > 0) ? staffsize_i_ + 4: -4;
 }
 
 void
@@ -63,10 +63,10 @@ Molecule*
 Text_item::brew_molecule_p() const
 {
     Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
 
-    if(dir_i_<0)
-	mol_p->translate(Offset(0, -mol_p->extent().y.length() ));
+    if(dir_i_<0 )		// should do something better anyway.
+	mol_p->translate(Offset(0, -mol_p->extent().y.left ));
+    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
     
     return mol_p;
 }
diff --git a/mi2mu/Makefile b/mi2mu/Makefile
index 235504e660..901111dd24 100644
--- a/mi2mu/Makefile
+++ b/mi2mu/Makefile
@@ -46,11 +46,8 @@ DISTFILES = Makefile .version $(ALL_SOURCES)
 
 # list of custom libraries:
 #
-# yes, i know about the -L and -l options,
-# but these libraries get rebuild when needed.
-CUSTOMLIBES = $(LIBLILY) $(LIBFLOWER) 
-
-LOADLIBES +=
+MODULE_LIBDEPS=check-flower-deps check-lily-deps
+MODULE_LIBES=-llily -lflower
 #
 
 # main target of this module:
-- 
2.39.5