X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=f13d8697c3621eb4a9e4b59a677767d5367b298c;hb=5b3759c33c91766c98a939f3aa9ced6568e2bc69;hp=7a1e92de376f3b576b91443e48b7ed1fb88f89b0;hpb=be8e0ed9c4d9bf06fb150e1f0d3cfe1518dfc3a7;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 7a1e92de37..f13d8697c3 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--2007 Han-Wen Nienhuys + (c) 1997--2008 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) @@ -69,13 +94,28 @@ Bar_line::compound_barline (Grob *me, string str, Real h, colon.translate_axis (-dist / 2, Y_AXIS); Stencil m; + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + Real center = 0; + if (staff) + { + Interval staff_extent = staff->extent (staff, Y_AXIS); + center = staff_extent.center (); + } + if (str == "||:") str = "|:"; if (str == "") - return Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2))); + { + Stencil empty = Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2))); + empty.translate_axis (center, Y_AXIS); + return empty; + } else if (str == "|") - return thin; + { + thin.translate_axis (center, Y_AXIS); + return thin; + } else if (str == "|." || (h == 0 && str == ":|")) { m.add_at_edge (X_AXIS, LEFT, thick, 0); @@ -105,11 +145,33 @@ Bar_line::compound_barline (Grob *me, string str, Real h, 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, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); + 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, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); + } else if (str == ".|.") { m.add_at_edge (X_AXIS, LEFT, thick, thinkern); m.add_at_edge (X_AXIS, RIGHT, thick, kern); } + else if (str == "|.|") + { + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); + } else if (str == "||") { /* @@ -136,10 +198,16 @@ Bar_line::compound_barline (Grob *me, string str, Real h, { m = dashed_bar_line (me, h, hair); } + else if (str == "'") + { + m = tick_bar_line (me, h, rounded); + } else if (str == ".") { m = dot; } + + m.translate_axis (center, Y_AXIS); return m; } @@ -158,6 +226,22 @@ Bar_line::simple_barline (Grob *me, Interval (-h / 2, h / 2)), blot); } +Stencil +Bar_line::tick_bar_line (Grob *me, Real h, bool rounded) +{ + Real th = Staff_symbol_referencer::staff_space (me) / 2; + Real line_thick = Staff_symbol_referencer::line_thickness (me); + + Real blot + = rounded + ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")) + : 0.0; + + return Lookup::round_filled_box (Box (Interval (0, line_thick), + Interval (h / 2 - th, h / 2 + th)), blot); +} + + MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1); SCM Bar_line::calc_bar_size (SCM smob) @@ -250,6 +334,9 @@ Bar_line::calc_anchor (SCM smob) 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"); @@ -263,32 +350,33 @@ Bar_line::calc_anchor (SCM smob) } 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 line to print." + " Options are @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:}," + " @code{:|.:}, @code{||}, @code{|.}, @code{.|}, @code{.|.}," + " @code{|.|}, @code{:} and @code{dashed}.\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 thick double repeat, a thin-thick-thin double repeat," + " a thin-thick double repeat, a double bar, a start bar," + " an end bar, a thick double bar, a thin-thick-thin bar," + " a dotted bar and a dashed 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 bar lines.", /* properties */ + "allow-span-bar " "gap " "kern " "thin-kern " @@ -297,6 +385,5 @@ ADD_INTERFACE (Bar_line, "glyph " "glyph-name " "bar-size " + "bar-extent " ); - -