* lily/hairpin.cc: lengthen hairpin if space is available.

* input/regression/dynamics-hairpin-length.ly (Module): new file.

diff --git a/ChangeLog b/ChangeLog
index 878ef3c9d1e250d331923f782d79b85299c44949..526abf1813830ce66dd33d34881e76bf3ad95469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,18 @@
+2004-09-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/define-grob-properties.scm (all-internal-grob-properties):
+       add adjacent-hairpins property.
+
+       * lily/hairpin.cc: lengthen hairpin if space is available.
+
+       * input/regression/dynamics-hairpin-length.ly (Module): new file.
+
 2004-09-10  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/notation.itely: small fixes to docs.
 
 2004-09-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
-
+       
        * VERSION (PACKAGE_NAME): release 2.3.15
 
        * make/lilypond.redhat.spec.in (Requires): bump requirement for

diff --git a/ROADMAP b/ROADMAP
index b2c0bcadb6df5d7074c2e0d96902a63e413cbccc..ffe13dba44942139604e77202dff3da0c10772b3 100644 (file)
--- a/ROADMAP
+++ b/ROADMAP
@@ -27,7 +27,7 @@ source files.
    input/              Music input examples
        bugs/           Buggy or problematic notation
        mutopia/                Real music, more at www.mutopiaproject.org
-       no-notation/    Examples or bugs that do not produce output
+       no-notation/    Examples that do not produce output
        regression/     Testing of [all] features, one test per file
        templates/      Boilerplates for typical music layouts
        test/           Tips and tricks

diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly
new file mode 100644 (file)
index 0000000..3f3f2d4
--- /dev/null
+++ b/input/regression/dynamics-hairpin-length.ly
@@ -0,0 +1,19 @@
+\header {
+
+    texidoc = "Hairpins extend to the extremes of the bound if there
+    is no adjacent hairpin of dynamic-text.  If there is, the hairpin
+    extends to the center of the column or the bound of the text
+    respectively."
+
+}
+\version "2.3.15"
+
+
+\paper { raggedright = ##t }
+
+\relative c'' { 
+  c4 \< c4 \!
+  c4 \< c \!\> c\!
+  c4 \< c c \!  \fff\> c c\!
+  
+} 

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 7e0557a1e8a7d576b827f136d5c3e4105fc1889a..71dfcce857cadd90f9e1be69bd26eb58b92d7110 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -226,6 +226,16 @@ Dynamic_engraver::process_music ()
          if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
            {
              cresc_  = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ());
+             if (finished_cresc_)
+               {
+                 Pointer_group_interface::add_grob (finished_cresc_,
+                                                    ly_symbol2scm ("adjacent-hairpins"),
+                                                    cresc_);
+                 
+                 Pointer_group_interface::add_grob (cresc_,
+                                                    ly_symbol2scm ("adjacent-hairpins"),
+                                                    finished_cresc_);
+               }
              cresc_->set_property ("grow-direction",
                                    scm_int2num ((start_type == "crescendo")
                                                 ? BIGGER : SMALLER));

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 799616bf1495cdba098a643a8f25fb8d7588b7aa..828bb6ec52b11694f23826e98391146d40bc2138 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -63,16 +63,31 @@ Hairpin::print (SCM smob)
        {
          if (dynamic_cast<Paper_column*> (b))
            {
+             bool neighbor_found = false;
+             for (SCM  adj = me->get_property ("adjacent-hairpins");
+                  ly_c_pair_p (adj); adj = ly_cdr (adj))
+               {
+                 /*
+                  FIXME: this will fuck up in case of polyphonic
+                  notes in other voices. Need to look at note-columns
+                  in the current staff/voice.
+                 */
+                 
+                 Spanner *pin = unsmob_spanner (ly_car (adj));
+                 if (pin
+                     && (pin->get_bound (LEFT)->get_column() == b
+                         || pin->get_bound (RIGHT)->get_column() == b))
+                   neighbor_found = true; 
+               }
+             
              /*
                If we're hung on a paper column, that means we're not
                adjacent to a text-dynamic, and we may move closer. We
                make the padding a little smaller, here.
              */
-             Interval e = b->extent (common, X_AXIS);
-             if (e.is_empty ())
-               e = Interval (0,0) + b->relative_coordinate (common, X_AXIS);
-             
-             x_points[d] = e.center () - d  * padding / 3; // ugh.
+             Interval e = robust_relative_extent (b, common, X_AXIS);
+             x_points[d] =
+               neighbor_found ? e.center() - d * padding / 3 : e[d];
            }
          else
            {
@@ -130,5 +145,5 @@ Hairpin::print (SCM smob)
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
   "A hairpin (de)crescendo.",
-  "grow-direction height bound-padding");
+  "grow-direction height bound-padding adjacent-hairpins");