summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2006-02-22 11:28:55 +0000
committerHan-Wen Nienhuys <hanwen@xs4all.nl>2006-02-22 11:28:55 +0000
commit947a911aeb23664fd090f1a0ab83bfba7e291cb9 (patch)
treef338e7b453168ac610b240ecd8615a4c3b04d46e
parente153c0a662134ebec453ea50a4fad2c82e2b8f27 (diff)
* lily/ambitus-engraver.cc (finalize): use grob_array. This fixes
ambitus lines. * input/regression/beam-cross-staff-slope.ly: remove decrescendo.
-rw-r--r--ChangeLog7
-rw-r--r--input/regression/beam-cross-staff-slope.ly2
-rw-r--r--lily/ambitus-engraver.cc11
-rw-r--r--lily/ambitus.cc7
4 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ade733a2ff..80515e5829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-22 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/ambitus-engraver.cc (finalize): use grob_array. This fixes
+ ambitus lines.
+
+ * input/regression/beam-cross-staff-slope.ly: remove decrescendo.
+
2006-02-22 Erik Sandberg <mandolaerik@gmail.com>
* input/regression/: upgraded syntax for some files.
diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index 157eb72457..4e0af132d3 100644
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -10,7 +10,7 @@
\relative c'' <<
{
\stemDown
- f16( \> d b\! \change Staff = down \stemUp
+ f16( d b \change Staff = down \stemUp
\clef treble g ~ < g e>8)
e[ \change Staff = up
diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index b8310ad356..f71c33b49c 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -9,12 +9,14 @@
*/
#include "engraver.hh"
+
+#include "axis-group-interface.hh"
#include "note-head.hh"
#include "pitch-interval.hh"
+#include "pointer-group-interface.hh"
#include "protected-scm.hh"
-#include "staff-symbol-referencer.hh"
-#include "axis-group-interface.hh"
#include "side-position-interface.hh"
+#include "staff-symbol-referencer.hh"
#include "translator.icc"
@@ -160,8 +162,9 @@ Ambitus_engraver::finalize ()
}
while (flip (&d) != DOWN);
- ambitus_->set_object ("note-heads", scm_list_2 (heads_[DOWN]->self_scm (),
- heads_[UP]->self_scm ()));
+
+ Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[DOWN]);
+ Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[UP]);
}
else
{
diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index c27ebc468d..2d88f61eae 100644
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -70,4 +70,9 @@ Ambitus::print (SCM smob)
ADD_INTERFACE (Ambitus, "ambitus-interface",
"The line between note heads for a pitch range.",
- "thickness note-heads join-heads");
+
+ /* props */
+ "join-heads "
+ "note-heads "
+ "thickness "
+ );