From 6760fec7d806f5cc16bbcb8bc3f6a02239e55113 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 26 Jan 2007 03:41:57 +0100 Subject: [PATCH] junk old line spanner. --- lily/include/line-spanner.hh | 28 ----- lily/line-spanner.cc | 225 ----------------------------------- 2 files changed, 253 deletions(-) diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh index ceff6f6a99..e69de29bb2 100644 --- a/lily/include/line-spanner.hh +++ b/lily/include/line-spanner.hh @@ -1,28 +0,0 @@ -/* - line-spanner.hh -- declare Line_spanner - - source file of the GNU LilyPond music typesetter - - (c) 2000--2007 Jan Nieuwenhuizen -*/ - -#ifndef LINE_SPANNER_HH -#define LINE_SPANNER_HH - -#include "lily-proto.hh" -#include "grob-interface.hh" - -class Line_spanner -{ -public: - DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); - static Stencil line_stencil (Grob *me, Offset f, Offset t); - DECLARE_GROB_INTERFACE(); - -private: - static Offset get_broken_offset (Grob *me, Direction dir); - static Offset broken_trend_offset (Grob *me, Direction dir); -}; - -#endif /* LINE_SPANNER_HH */ diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 7a8870aee5..e69de29bb2 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -1,225 +0,0 @@ -/* - line-spanner.cc -- implement Line_spanner - - source file of the GNU LilyPond music typesetter - - (c) 2000--2007 Jan Nieuwenhuizen -*/ - -#include "line-spanner.hh" - - -#include "spanner.hh" -#include "output-def.hh" -#include "paper-column.hh" -#include "staff-symbol-referencer.hh" -#include "font-interface.hh" -#include "warn.hh" -#include "align-interface.hh" -#include "lookup.hh" -#include "line-interface.hh" - -MAKE_SCHEME_CALLBACK (Line_spanner, after_line_breaking, 1); -SCM -Line_spanner::after_line_breaking (SCM g) -{ - Grob *me = unsmob_grob (g); - Spanner *sp = dynamic_cast (me); - - /* - We remove the line at the start of the line. For piano voice - indicators, it makes no sense to have them at the start of the - line. - - I'm not sure what the official rules for glissandi are, but - usually the 2nd note of the glissando is "exact", so when playing - from the start of the line, there is no need to glide. - - From a typographical p.o.v. this makes sense, since the amount of - space left of a note at the start of a line is very small. - - --hwn. - - */ - if (sp->get_bound (LEFT)->break_status_dir () - && !sp->get_bound (RIGHT)->break_status_dir ()) - { - /* - Can't do suicide, since this mucks up finding the trend. - */ - me->set_property ("transparent", SCM_BOOL_T); - } - return SCM_EOL; -} - -Stencil -Line_spanner::line_stencil (Grob *me, - Offset from, - Offset to) -{ - Stencil line = Line_interface::line (me, from, to); - - if (to_boolean (me->get_property ("arrow"))) - line.add_stencil (Line_interface::arrows (me, from, to, false, true)); - - return line; -} - -/* - Find a common Y parent, which --if found-- should be the - fixed-distance alignment. -*/ -Grob * -line_spanner_common_parent (Grob *me) -{ - Grob *common = find_fixed_alignment_parent (me); - if (!common) - { - common = Staff_symbol_referencer::get_staff_symbol (me); - if (common) - common = common->get_parent (Y_AXIS); - else - common = me->get_parent (Y_AXIS); - } - - return common; -} - -/* - Warning: this thing is a cross-staff object, so it should have empty Y-dimensions. - - (If not, you risk that this is called from the staff-alignment - routine, via stencil_extent. At this point, the staves aren't - separated yet, so it doesn't work cross-staff. - - (huh? crossable staves have fixed distance? --hwn) -*/ - -MAKE_SCHEME_CALLBACK (Line_spanner, print, 1); -SCM -Line_spanner::print (SCM smob) -{ - Spanner *me = dynamic_cast (unsmob_grob (smob)); - - Drul_array bound (me->get_bound (LEFT), - me->get_bound (RIGHT)); - - Real gap = robust_scm2double (me->get_property ("gap"), 0.0); - - Offset ofxy (gap, 0); /* offset from start point to start of line */ - Offset dxy; - Offset my_off; - Offset his_off; - - Real extra_dy = robust_scm2double (me->get_property ("extra-dy"), - 0.0); - - if (bound[RIGHT]->break_status_dir ()) - { - if (bound[LEFT]->break_status_dir ()) - { - programming_error ("line-spanner with two broken ends. Farewell sweet world."); - - me->suicide (); - return SCM_EOL; - } - - /* - This is hairy. For the normal case, we simply find common - parents, and draw a line between the bounds. When two note - heads are on different systems, there is no common parent - anymore. We have to find the piano-staff object. - */ - - Spanner *next_sp = me->broken_neighbor (RIGHT); - Item *next_bound = next_sp->get_bound (RIGHT); - - if (next_bound->break_status_dir ()) - { - programming_error ("no note heads for the line spanner on next line?" - " Confused."); - me->suicide (); - return SCM_EOL; - } - - Grob *commonx = bound[LEFT]->common_refpoint (bound[RIGHT], X_AXIS); - commonx = me->common_refpoint (commonx, X_AXIS); - - Grob *next_common_y = line_spanner_common_parent (next_bound); - Grob *this_common_y = line_spanner_common_parent (bound[LEFT]); - - Grob *all_common_y = me->common_refpoint (this_common_y, Y_AXIS); - - Interval next_ext = next_bound->extent (next_common_y, Y_AXIS); - Interval this_ext = bound[LEFT]->extent (this_common_y, Y_AXIS); - - Real yoff = this_common_y->relative_coordinate (all_common_y, Y_AXIS); - - Offset p1 (bound[LEFT]->extent (commonx, X_AXIS)[RIGHT], - this_ext.center () + yoff - extra_dy / 2); - Offset p2 (bound[RIGHT]->extent (commonx, X_AXIS)[LEFT], - next_ext.center () + yoff + extra_dy / 2); - - Offset dz (p2 - p1); - Real len = dz.length (); - - Offset dir = dz * (1 / len); - dz = (dz.length () - 2 * gap) * dir; - - Stencil l (line_stencil (me, Offset (0, 0), dz)); - - l.translate (dir * gap + p1 - - Offset (me->relative_coordinate (commonx, X_AXIS), - me->relative_coordinate (all_common_y, Y_AXIS))); - - return l.smobbed_copy (); - } - else - { - Grob *common[] = { me, me }; - for (int a = X_AXIS; a < NO_AXES; a++) - { - common[a] = me->common_refpoint (bound[RIGHT], Axis (a)); - common[a] = common[a]->common_refpoint (bound[LEFT], Axis (a)); - } - - // distance from center to start of line - Real off = gap + ((bound[LEFT]->extent (bound[LEFT], X_AXIS).length () * 3) / 4); - - for (int a = X_AXIS; a < NO_AXES; a++) - { - Axis ax = (Axis)a; - dxy[ax] - = + robust_relative_extent (bound[RIGHT], common[X_AXIS], ax).center () - - robust_relative_extent (bound[LEFT], common[X_AXIS], ax).center (); - - my_off[ax] = me->relative_coordinate (common[a], ax); - his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax); - } - - ofxy = dxy * (off / dxy.length ()) ; - dxy -= 2*ofxy; - - dxy[Y_AXIS] += extra_dy; - - Stencil line = line_stencil (me, Offset (0, 0), dxy); - - line.translate_axis (bound[LEFT]->extent (bound[LEFT], X_AXIS).length () / 2, X_AXIS); - line.translate (ofxy - my_off + his_off + Offset (0, -extra_dy/2)); - return line.smobbed_copy (); - } -} - -ADD_INTERFACE (Line_spanner, - "Generic line drawn between two objects, e.g. for use with glissandi.\n" - "The property @code{style} can be @code{line}, " - "@code{dashed-line}, @code{trill}, \n" - "@code{dotted-line} or @code{zigzag}.\n" - "\n", - - "extra-dy " - "arrow " - "gap " - "thickness " - ); - -- 2.39.5