CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/02 11:35:53
Modified files:
. : ChangeLog
lily : dynamic-engraver.cc
scm : define-grobs.scm
Log message:
(acknowledge_grob): only center on
parent if we have a notehead. Fixes incorrect offsets when
Paper_column is very wide in the X direction.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3709&tr2=1.3710&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.169&tr2=1.170&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.203&tr2=1.204&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3709 lilypond/ChangeLog:1.3710
--- lilypond/ChangeLog:1.3709 Thu Jun 2 09:58:10 2005
+++ lilypond/ChangeLog Thu Jun 2 11:35:52 2005
@@ -1,5 +1,9 @@
2005-06-02 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/dynamic-engraver.cc (acknowledge_grob): only center on
+ parent if we have a notehead. Fixes incorrect offsets when
+ Paper_column is very wide in the X direction.
+
* input/regression/font-family-override.ly (Module): new file.
* scm/font.scm (make-pango-font-tree): new function.
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.169
lilypond/lily/dynamic-engraver.cc:1.170
--- lilypond/lily/dynamic-engraver.cc:1.169 Fri May 13 12:09:04 2005
+++ lilypond/lily/dynamic-engraver.cc Thu Jun 2 11:35:53 2005
@@ -19,6 +19,7 @@
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
#include "warn.hh"
+#include "self-alignment-interface.hh"
/*
TODO:
@@ -270,6 +271,7 @@
finished_line_spanner_ = line_spanner_;
line_spanner_ = 0;
}
+
typeset_all ();
if (cresc_ && !cresc_->get_bound (LEFT))
@@ -382,7 +384,12 @@
{
SCM head = scm_last_pair (info.grob ()->get_property ("note-heads"));
if (scm_is_pair (head))
- script_->set_parent (unsmob_grob (scm_car (head)), X_AXIS);
+ {
+ script_->set_parent (unsmob_grob (scm_car (head)), X_AXIS);
+ script_->add_offset_callback
(Self_alignment_interface::centered_on_parent_proc,
+ X_AXIS);
+
+ }
}
if (cresc_)
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.203 lilypond/scm/define-grobs.scm:1.204
--- lilypond/scm/define-grobs.scm:1.203 Sat May 28 01:12:41 2005
+++ lilypond/scm/define-grobs.scm Thu Jun 2 11:35:53 2005
@@ -384,8 +384,7 @@
. (
(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(print-function . ,Text_interface::print)
- (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
- ,Self_alignment_interface::centered_on_parent))
+ (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(self-alignment-X . 0)
(no-spacing-rods . #t)
(script-priority . 100)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
