CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Mats Bengtsson <[EMAIL PROTECTED]>      05/05/16 11:46:54

Modified files:
        .              : ChangeLog 
        lily           : horizontal-bracket.cc 
        scm            : define-grobs.scm 

Log message:
        * lily/horizontal-bracket.cc (print): Take care of the direction
        property so brackets above the stave point downwards.
        
        * scm/define-grobs.scm (all-grob-descriptions): Set staff-padding
        for HorizontalBracket so it doesn't end up within the stave.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3622&tr2=1.3623&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/horizontal-bracket.cc.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.195&tr2=1.196&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3622 lilypond/ChangeLog:1.3623
--- lilypond/ChangeLog:1.3622   Sun May 15 23:50:18 2005
+++ lilypond/ChangeLog  Mon May 16 11:46:52 2005
@@ -1,3 +1,11 @@
+2005-05-16  Mats Bengtsson  <[EMAIL PROTECTED]>
+
+       * lily/horizontal-bracket.cc (print): Take care of the direction
+       property so brackets above the stave point downwards. 
+
+       * scm/define-grobs.scm (all-grob-descriptions): Set staff-padding
+       for HorizontalBracket so it doesn't end up within the stave.
+
 2005-05-16  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
        * lily/GNUmakefile (default): Typo.
Index: lilypond/lily/horizontal-bracket.cc
diff -u lilypond/lily/horizontal-bracket.cc:1.22 
lilypond/lily/horizontal-bracket.cc:1.23
--- lilypond/lily/horizontal-bracket.cc:1.22    Thu Mar 10 14:36:13 2005
+++ lilypond/lily/horizontal-bracket.cc Mon May 16 11:46:54 2005
@@ -57,6 +57,10 @@
   Drul_array<Real> shorten = robust_scm2interval (me->get_property 
("shorten-pair"),
                                                  Interval (0, 0));
 
+  // Make sure that it points in the correct direction:
+  Real dir = get_grob_direction (me);
+  scale_drul (&edge_height, -dir);
+
   Interval empty;
   Stencil b
     = Tuplet_bracket::make_bracket (me, Y_AXIS, Offset (ext.length (), 0),
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.195 lilypond/scm/define-grobs.scm:1.196
--- lilypond/scm/define-grobs.scm:1.195 Tue May  3 08:02:01 2005
+++ lilypond/scm/define-grobs.scm       Mon May 16 11:46:54 2005
@@ -537,6 +537,7 @@
        (print-function . ,Horizontal_bracket::print)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (padding . 0.2)
+       (staff-padding . 0.2)
        (direction . -1)
        (bracket-flare . (0.5 . 0.5))
        (meta . ((interfaces . (horizontal-bracket-interface


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to