patch::: 1.1.26.jcn3: Re: fixjes

pl 26.jcn3
	- bf's: spring spacer end of measure
	- bf: tie/slur rods (dankje, lieverd)
	- bf's: intl/ compile, install, uninstall

---
Generated by janneke@gnu.org using package-diff 0.62,
>From = lilypond-1.1.26.jcn2, To = lilypond-1.1.26.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.26.jcn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.26.jcn2
1.1.26.jcn3
++state

diff --git a/NEWS b/NEWS
index 6a0614eeca9c33e669eed13375578540784626e9..45b3718ddeaaf4d35c62ab636feee714e95a00c0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
---- ../lilypond-1.1.26.jcn1/NEWS       Mon Feb  1 17:49:32 1999
+--- ../lilypond-1.1.26.jcn2/NEWS       Mon Feb  1 20:58:27 1999
+++ b/NEWS      Tue Feb  2 21:06:00 1999
+@@ -1,3 +1,8 @@
+pl 26.jcn3
+       - bf's: spring spacer end of measure
+       - bf: tie/slur rods (dankje, lieverd)
+       - bf's: intl/ compile, install, uninstall
+
+ pl 26.jcn2
+       - enforce {slur,tie}_x_minimum (urg, paper vars?)
+       - tie listens to tieydirection/ydirection--- ../lilypond-1.1.26.jcn1/NEWS       Mon Feb  1 17:49:32 1999
 ++ b/NEWS      Mon Feb  1 20:58:27 1999
 @@ -1,3 +1,8 @@
 pl 26.jcn2

diff --git a/VERSION b/VERSION
index 26dc282a2da1a9bd23027cf8878ef5ae7dcca3af..e85c442910d16e64cbec25f9bb8324e4e13654cb 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=26
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly
index 686463e19f9078e81b830d70b863343776d5eb5e..43103eaebca07e6f83b5c74a29fac10d3fd94d12 100644 (file)
--- a/input/test/chord-inversion.ly
+++ b/input/test/chord-inversion.ly
@@ -5,10 +5,12 @@ TestedFeatures =       "chord inversions";
 }
 
 inversions = \notes\transpose c''\chords{
+       % inversions ignored here
        c1 c-sus c-6 c/e c/g c/d
        % now try to find chords with inversions
        \property Score.chordInversion = 1 
-       c1 c-sus c-6 c/e c/g c/d
+       c1 c-sus c-6 c/e c/g
+       c/d % this triggers a warning: no 'd' in chord of c
 }
 
 \score{

diff --git a/intl/GNUmakefile b/intl/GNUmakefile
index 0bce164e3d830b424ca451ee3a2cd021eaba7e93..45496fe22c8d9089580fbe4295e67beafd515cf5 100644 (file)
--- a/intl/GNUmakefile
+++ b/intl/GNUmakefile
@@ -1,13 +1,8 @@
-# intl/Makefile
+# intl/GNUmakefile
 
 depth = ..
-
 NAME = intl
 
-
-# MODULE_CXXFLAGS += -D_REENTRANT
-MAINTARGET = $(LIBRARY)# huh?
-
 SED_FILES = $(wildcard *.sed)
 
 # should be set by configure...
@@ -16,19 +11,18 @@ EXTRA_CFLAGS = -I. $(URG_DEFINES)
 
 EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog libintl.inst $(SED_FILES)
 
+STEPMAKE_TEMPLATES=c library
 
+$(outdir)/library.a:
+       @echo "*** To install libintl type 'make lib; make install-lib' ***"
 
-STEPMAKE_TEMPLATES=c
 include $(depth)/make/stepmake.make
 
-default:
-       @echo "to install libintl type 'make lib; make install-lib'"
-
 lib:  $(LIBRARY)
 LIBINTL = $(LIBRARY)
 
-install-lib: $(LIBINTL)
 # localinstall: $(LIBINTL)
+install-lib: $(LIBINTL)
        $(INSTALL) -d $(includedir)
 #      $(INSTALL) libintl.h $(includedir)
        $(INSTALL) libintl.inst $(includedir)/libintl.h
@@ -39,12 +33,10 @@ ifeq ($(LIB_SUFFIX),.so)
        ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
 else
        $(INSTALL) -d $(libdir)
-       echo libintl: $(LIBINTL)
-       echo libdir: $(libdir)
-       $(INSTALL) $(LIBINTL) $(libdir)
+       $(INSTALL) $(LIBINTL) $(libdir)/$(INSTALL_LIBRARY)
 endif
 
 localuninstall:
-       rm -f $(inludedir)/libintl.h
+       rm -f $(includedir)/libintl.h
        rm -f $(libdir)/libintl.{so*,a}
 

diff --git a/lily/slur.cc b/lily/slur.cc
index 85de7051462642b4556605b61dd3533f0480063b..ef773b2cc6e5baf54f18d50bccd710572fa5a83f 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -204,8 +204,8 @@ Slur::do_post_processing ()
 
   Real ratio_f = abs (d_off.y () / d_off.x ());
   if (ratio_f > damp_f)
-    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] -=
-      dir_ * (damp_f - ratio_f) * d_off.x ();
+    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] +=
+      dir_ * (ratio_f - damp_f) * d_off.x ();
 }
 
 Array<Offset>
@@ -294,9 +294,9 @@ Array<Rod>
 Slur::get_rods () const
 {
   Array<Rod> a;
-  Rod r ((Single_malt_grouping_item*)encompass_arr_[0]->stem_l_->head_l_arr_[0],
-        (Single_malt_grouping_item*)encompass_arr_.top ()->stem_l_->head_l_arr_[0]);
-  r.distance_f_ += do_width ().length ();
+  Rod r;
+  r.item_l_drul_ = spanned_drul_;
+  r.distance_f_ = do_width ().length ();
   a.push (r);
   return a;
 }

diff --git a/lily/spring-spacer.cc b/lily/spring-spacer.cc
index 167940a687264948ff5fa1b88218c8f5663ac338..cbf3f2e7c305c2a3add6243e33faf9d85fb5f48b 100644 (file)
--- a/lily/spring-spacer.cc
+++ b/lily/spring-spacer.cc
@@ -668,8 +668,11 @@ Spring_spacer::calc_idealspacing()
          */
          if (i && scol_l (i - 1)->breakable_b_)
            {
-             // fixed: probably should set minimum (rod/spring)?
-             cols_[i-1].width_[RIGHT] += interline_f;
+             // one interline minimum at start of bar
+
+             // cols_[i].width_[RIGHT] += interline_f;
+             cols_[i].width_[RIGHT] = cols_[i].width_[RIGHT] >? interline_f;
+
              // should adjust dist too?
              ideal_arr[i-1] = ideal_arr[i-1] >? (2 * interline_f);
            }
@@ -679,17 +682,28 @@ Spring_spacer::calc_idealspacing()
          */
          if (i + 1 < cols_.size () && scol_l(i+1)->breakable_b_)
            {
-             // hmm, how bout?
+             // one interline minimum seems ok for last column too?
              dist = dist >? interline_f;
 
+             // set minimum rod 
              /*
-               uhuh, this code looks fine, already?
-               someone was junking this last "hinterfleisch" whitespace?!
+               urg: simply *adding* an interline leaves big gaps at
+               end of measure in star-spangled-banner (after lyrics
+               at eom).
 
-               but this seems to be fixed now :-)
-             */
-             // set minimum rod 
-             cols_[i].width_[RIGHT] += interline_f;
+                  cols_[i].width_[RIGHT] += interline_f; // before
+
+               having a minimum of one interline solves this problem
+               in most (but not all??) cases.
+
+               for music without lyrics (esp. when set very tightly),
+               adding an interline looks good: probably because this
+               hides a bug that allows the last note's "hinterfleish"
+               to be removed (e.g., see wtk1-fugue2: that's ugly now).
+               -- jcn
+              */
+
+             cols_[i].width_[RIGHT] = cols_[i].width_[RIGHT] >? interline_f;
            }
 
          // ugh, do we need this?

diff --git a/lily/tie.cc b/lily/tie.cc
index 2c418b13c7dad37d9b6f0526d15be359601ed780..7b0cbc870b9cd7fa13c514c8738d0d657600e587 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -137,8 +137,8 @@ Tie::do_post_processing()
 
   Real ratio_f = abs (d_off.y () / d_off.x ());
   if (ratio_f > damp_f)
-    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] -=
-      dir_ * (damp_f - ratio_f) * d_off.x ();
+    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] +=
+      dir_ * (ratio_f - damp_f) * d_off.x ();
 }
 
 void
@@ -163,9 +163,9 @@ Array<Rod>
 Tie::get_rods () const
 {
   Array<Rod> a;
-  Rod r ((Single_malt_grouping_item*)head_l_drul_[LEFT],
-        (Single_malt_grouping_item*)head_l_drul_[RIGHT]);
-  r.distance_f_ += do_width ().length ();
+  Rod r;
+  r.item_l_drul_ = spanned_drul_;
+  r.distance_f_ = do_width ().length ();
   a.push (r);
   return a;
 }

diff --git a/ly/params.ly b/ly/params.ly
index 28406315594d5d145b80c7220377dd69b56100df..f98ac790802d1a8fa872817db0e2e8d97b758b9c 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -66,10 +66,13 @@ beam_steep_slope = 0.2 / 1.0;
 % OSU: suggested gap = ss / 5;
 slur_x_gap = \interline / 5.0;
 slur_x_minimum = 3.0 * \interline;
-slur_slope_damping = 0.5;
+
+% slope damping: keep dy/dx < slur_slope_damping
+slur_slope_damping = 0.6;
+
 tie_x_minimum = \slur_x_minimum;
 tie_x_gap = \slur_x_gap;
-tie_slope_damping = 0.3;
+tie_slope_damping = 0.8;
 
 % ugh: rename to bow (in bezier.cc and fonts.doc too...)
 % slur_thickness = 1.8 * \staffline;

diff --git a/stepmake/stepmake/c-targets.make b/stepmake/stepmake/c-targets.make
index 6bdc6921c03a4de24be95b254e8aef65a5d46856..55b82ab1823fb26a27696fd27bf28d042e68a5b8 100644 (file)
--- a/stepmake/stepmake/c-targets.make
+++ b/stepmake/stepmake/c-targets.make
@@ -1,7 +1,2 @@
-#empty
-
-$(configheader): $(depth)/config.h
-       cp $< $@
-
 $(configheader): $(depth)/config.h
        cp $< $@

diff --git a/stepmake/stepmake/library-vars.make b/stepmake/stepmake/library-vars.make
index 037f8ae80582f40bb69f1e82b7339dce34a5b65c..b2555a9c84588c96f9a8eea8ff08dbb4233d6cd0 100644 (file)
--- a/stepmake/stepmake/library-vars.make
+++ b/stepmake/stepmake/library-vars.make
@@ -15,5 +15,8 @@ AR_COMMAND = $(AR) $(ARFLAGS) $@
 RANLIB_COMMAND=$(RANLIB) $@ || $(AR) ts $@ || true
 
 # linker:
+# urg, i don't like this name, it's not what you'd expect
 LIBRARY = $(outdir)/library.a
-SHAREDLIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so
+
+INSTALL_LIBRARY = $(LIB_PREFIX)$(NAME)$(LIB_SUFFIX)
+SHARED_LIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so