X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=e51aad7196851b3ea4b4622fe971a4385d53434f;hb=5b6e9e92849785962a1b1831eeef20e12af5d2d5;hp=840a1de15d352a19c1773707da83d5deed88f39e;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 840a1de15d..e51aad7196 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "bar-line.hh" @@ -16,6 +16,31 @@ #include "staff-symbol-referencer.hh" #include "line-interface.hh" +MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_extent, 1) +SCM +Bar_line::calc_bar_extent (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + SCM size = me->get_property ("bar-size"); + + if (!scm_is_number (size) + || !Staff_symbol_referencer::get_staff_symbol (me)) + return ly_interval2scm (Interval ()); + + Real h = scm_to_double (size); + return ly_interval2scm (Interval (-h/2, h/2)); +} + +Interval +Bar_line::bar_y_extent (Grob *me, Grob *refpoint) +{ + Interval iv = robust_scm2interval (me->get_property ("bar-extent"), Interval ()); + + iv.translate (me->relative_coordinate (refpoint, Y_AXIS)); + return iv; +} + MAKE_SCHEME_CALLBACK (Bar_line, print, 1); SCM Bar_line::print (SCM smob) @@ -78,37 +103,37 @@ Bar_line::compound_barline (Grob *me, string str, Real h, return thin; else if (str == "|." || (h == 0 && str == ":|")) { - m.add_at_edge (X_AXIS, LEFT, thick, 0, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern, 0); + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); } else if (str == ".|" || (h == 0 && str == "|:")) { - m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0); + m.add_at_edge (X_AXIS, RIGHT, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); } else if (str == ":|") { - m.add_at_edge (X_AXIS, LEFT, thick, 0, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern, 0); - m.add_at_edge (X_AXIS, LEFT, colon, kern, 0); + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); } else if (str == "|:") { - m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0); - m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0); + m.add_at_edge (X_AXIS, RIGHT, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); } else if (str == ":|:") { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0); - m.add_at_edge (X_AXIS, LEFT, colon, kern, 0); - m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0); - m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0); + m.add_at_edge (X_AXIS, LEFT, thick, thinkern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); } else if (str == ".|.") { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0); - m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0); + m.add_at_edge (X_AXIS, LEFT, thick, thinkern); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); } else if (str == "||") { @@ -116,8 +141,8 @@ Bar_line::compound_barline (Grob *me, string str, Real h, should align to other side? this never appears on the system-start? */ - m.add_at_edge (X_AXIS, RIGHT, thin, 0, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, thinkern, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, thinkern); } else if (str == ":") { @@ -201,7 +226,7 @@ Bar_line::dashed_bar_line (Grob *me, Real h, Real thick) Real bot_y = max ((i - dash_size) * half_space, -(count-1) * half_space - line_thick/2); - bar.add_stencil (Lookup::round_filled_box (Box (Interval (0,thick), + bar.add_stencil (Lookup::round_filled_box (Box (Interval (0, thick), Interval (bot_y, top_y)), blot)); } @@ -234,37 +259,61 @@ Bar_line::dashed_bar_line (Grob *me, Real h, Real thick) s.translate (Offset (thick/2, -h/2)); return s; } - return Stencil(); + return Stencil (); } +MAKE_SCHEME_CALLBACK (Bar_line, calc_anchor, 1) +SCM +Bar_line::calc_anchor (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real kern = robust_scm2double (me->get_property ("kern"), 1); + Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + string str = robust_scm2string (me->get_property ("glyph-name"), ""); -ADD_INTERFACE (Bar_line, + /* we put the anchor in the center of the barline, unless we are + a repeat bar, in which case we put the anchor in the center of + the barline without the dots. */ + Interval ext = me->extent (me, X_AXIS); + if (ext.is_empty ()) + return scm_from_double (0); + + Real anchor = ext.center (); + + Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot"); + Real dot_width = dot.extent (X_AXIS).length () + kern * staffline; + if (str == "|:") + anchor -= dot_width / 2; + else if (str == ":|") + anchor += dot_width / 2; + return scm_from_double (anchor); +} + +ADD_INTERFACE (Bar_line, "Bar line.\n" "\n" - "Print a special bar symbol. It replaces the \n" - "regular bar symbol with a special\n" - "symbol. The argument @var{bartype} is a string which specifies the\n" - "kind of bar to print. Options are @code{:|}, \n" - "@code{|:}, @code{:|:},\n" - "@code{||}, @code{|.},\n" - "@code{.|}, and @code{.|.}. \n" + "Print a special bar symbol. It replaces the regular bar" + " symbol with a special symbol. The argument @var{bartype}" + " is a string which specifies the kind of bar to print." + " Options are @code{:|}, @code{|:}, @code{:|:}, @code{||}," + " @code{|.}, @code{.|}, and @code{.|.}.\n" "\n" - "These produce, respectively, a right repeat, a left repeat, a double\n" - "repeat, a double bar, a start bar, an end bar, and a thick double bar.\n" - "In addition, there is an option @code{||:} which is equivalent to\n" - "@code{|:} except at line breaks, where it produces a double bar (@code{||})\n" - "at the end of the line and a repeat sign (@code{|:}) at the beginning\n" - "of the new line." - "If @var{bartype} is set to @code{empty} then nothing is printed,\n" - "but a line break is allowed at that spot.\n" - "\n\n" - "@code{gap} is used for the gaps in dashed barlines." - - , - + "These produce, respectively, a right repeat, a left repeat," + " a double repeat, a double bar, a start bar, an end bar, and" + " a thick double bar. In addition, there is an option" + " @code{||:} which is equivalent to @code{|:} except at line" + " breaks, where it produces a double bar (@code{||}) at the" + " end of the line and a repeat sign (@code{|:}) at the" + " beginning of the new line.\n" + "\n" + "If @var{bartype} is set to @code{empty} then nothing is" + " printed, but a line break is allowed at that spot.\n" + "\n" + "@code{gap} is used for the gaps in dashed barlines.", /* properties */ + "allow-span-bar " "gap " "kern " "thin-kern " @@ -273,6 +322,7 @@ ADD_INTERFACE (Bar_line, "glyph " "glyph-name " "bar-size " + "bar-extent " );