From: Han-Wen Nienhuys Date: Fri, 26 Jan 2007 02:46:08 +0000 (+0100) Subject: new-line-spanner-interface -> line-spanner-interface X-Git-Tag: release/2.11.14-1~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6baaa087a095a0678252e589ee161ce0242215ca;p=lilypond.git new-line-spanner-interface -> line-spanner-interface --- diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index f8c46312f0..5bbc1eeaf2 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -1,5 +1,5 @@ /* - line-spanner.cc -- implement New_line_spanner + line-spanner.cc -- implement Line_spanner source file of the GNU LilyPond music typesetter @@ -20,12 +20,11 @@ #include "grob-interface.hh" #include "text-interface.hh" -class New_line_spanner +class Line_spanner { public: DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_left_bound_info, (SCM)); DECLARE_SCHEME_CALLBACK (calc_left_bound_info_and_text, (SCM)); DECLARE_SCHEME_CALLBACK (calc_right_bound_info, (SCM)); @@ -51,7 +50,7 @@ line_spanner_common_parent (Grob *me) } SCM -New_line_spanner::calc_bound_info (SCM smob, Direction dir) +Line_spanner::calc_bound_info (SCM smob, Direction dir) { Spanner *me = unsmob_spanner (smob); @@ -150,25 +149,25 @@ New_line_spanner::calc_bound_info (SCM smob, Direction dir) return details; } -MAKE_SCHEME_CALLBACK (New_line_spanner, calc_right_bound_info, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, calc_right_bound_info, 1); SCM -New_line_spanner::calc_right_bound_info (SCM smob) +Line_spanner::calc_right_bound_info (SCM smob) { - return New_line_spanner::calc_bound_info (smob, RIGHT); + return Line_spanner::calc_bound_info (smob, RIGHT); } -MAKE_SCHEME_CALLBACK (New_line_spanner, calc_left_bound_info, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, calc_left_bound_info, 1); SCM -New_line_spanner::calc_left_bound_info (SCM smob) +Line_spanner::calc_left_bound_info (SCM smob) { - return New_line_spanner::calc_bound_info (smob, LEFT); + return Line_spanner::calc_bound_info (smob, LEFT); } -MAKE_SCHEME_CALLBACK (New_line_spanner, calc_left_bound_info_and_text, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, calc_left_bound_info_and_text, 1); SCM -New_line_spanner::calc_left_bound_info_and_text (SCM smob) +Line_spanner::calc_left_bound_info_and_text (SCM smob) { - SCM alist = New_line_spanner::calc_bound_info (smob, LEFT); + SCM alist = Line_spanner::calc_bound_info (smob, LEFT); Spanner *me = unsmob_spanner (smob); SCM text = me->get_property ("text"); @@ -187,9 +186,9 @@ New_line_spanner::calc_left_bound_info_and_text (SCM smob) return alist; } -MAKE_SCHEME_CALLBACK (New_line_spanner, print, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, print, 1); SCM -New_line_spanner::print (SCM smob) +Line_spanner::print (SCM smob) { Spanner *me = dynamic_cast (unsmob_grob (smob)); @@ -317,7 +316,7 @@ New_line_spanner::print (SCM smob) return line.smobbed_copy (); } -ADD_INTERFACE (New_line_spanner, +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" diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 93dfbba0e6..b7d25131bf 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -655,9 +655,9 @@ (left-broken . ((attach-dir . ,RIGHT) )) )) - (stencil . ,ly:new-line-spanner::print) - (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info-and-text) - (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info) + (stencil . ,ly:line-spanner::print) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) ;; need to blend with dynamic texts. (font-size . 1) @@ -666,7 +666,7 @@ (meta . ((class . Spanner) (interfaces . (font-interface text-interface - new-line-spanner-interface + line-spanner-interface line-interface dynamic-interface dynamic-text-spanner-interface @@ -720,13 +720,13 @@ (padding . 1.5) )) )) - (stencil . ,ly:new-line-spanner::print) - (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info) - (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info) + (stencil . ,ly:line-spanner::print) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) (meta . ((class . Spanner) (interfaces . (line-interface unbreakable-spanner-interface - new-line-spanner-interface)))))) + line-spanner-interface)))))) (GraceSpacing . ( @@ -1820,8 +1820,8 @@ (direction . ,UP) (outside-staff-priority . 350) - (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info) - (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) (bound-details . ((left . ((Y . 0) (padding . 0.25) (attach-dir . ,LEFT) @@ -1830,10 +1830,10 @@ (padding . 0.25) )) )) - (stencil . ,ly:new-line-spanner::print) + (stencil . ,ly:line-spanner::print) (meta . ((class . Spanner) - (interfaces . (new-line-spanner-interface + (interfaces . (line-spanner-interface side-position-interface font-interface)))))) @@ -1901,8 +1901,8 @@ (TrillSpanner . ( - (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info) - (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) (bound-details . ((left . ((text . ,(make-translate-scaled-markup '(0.5 . -0.6) @@ -1914,7 +1914,7 @@ (right . ((Y . 0))) )) - (stencil . ,ly:new-line-spanner::print) + (stencil . ,ly:line-spanner::print) (style . trill) (staff-padding . 1.0) @@ -1924,7 +1924,7 @@ (side-axis . ,Y) (outside-staff-priority . 50) (meta . ((class . Spanner) - (interfaces . (new-line-spanner-interface + (interfaces . (line-spanner-interface line-interface trill-spanner-interface side-position-interface @@ -2107,11 +2107,11 @@ (padding . 1.5) )) )) - (stencil . ,ly:new-line-spanner::print) - (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info) - (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info) + (stencil . ,ly:line-spanner::print) + (left-bound-info . ,ly:line-spanner::calc-left-bound-info) + (right-bound-info . ,ly:line-spanner::calc-right-bound-info) (meta . ((class . Spanner) - (interfaces . (new-line-spanner-interface + (interfaces . (line-spanner-interface line-interface)))) ))