X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=c9d9159a4cfff26591f12404053947c623ef6cba;hb=51eff44c691a77454e01ffef7a444c42a287e37c;hp=ecc8ac70d6935b14aa8afc6b226ae0c090223490;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index ecc8ac70d6..c9d9159a4c 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -3,35 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
 
-#include <cmath>
-using namespace std;
-
 #include "all-font-metrics.hh"
 #include "font-interface.hh"
 #include "lookup.hh"
 #include "output-def.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
+#include "line-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
+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)
 {
   Grob *me = unsmob_grob (smob);
 
-  SCM s = me->get_property ("glyph");
-  SCM barsiz_proc = me->get_property ("bar-size-procedure");
-  if (scm_is_string (s) && ly_is_procedure (barsiz_proc))
+  SCM s = me->get_property ("glyph-name");
+  SCM barsize = me->get_property ("bar-size");
+  
+  if (scm_is_string (s) && scm_is_number (barsize))
     {
-      String str = ly_scm2string (s);
-      SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
-      Real sz = robust_scm2double (siz, 0);
+      string str = ly_scm2string (s);
+      Real sz = robust_scm2double (barsize, 0);
       if (sz <= 0)
 	return SCM_EOL;
 
@@ -41,7 +63,7 @@ Bar_line::print (SCM smob)
 }
 
 Stencil
-Bar_line::compound_barline (Grob *me, String str, Real h,
+Bar_line::compound_barline (Grob *me, string str, Real h,
 			    bool rounded)
 {
   Real kern = robust_scm2double (me->get_property ("kern"), 1);
@@ -49,7 +71,7 @@ Bar_line::compound_barline (Grob *me, String str, Real h,
   Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
   Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
 
-  Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
@@ -72,46 +94,83 @@ 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, 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, 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, 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 == "|.|")
+    {
+      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 == "||")
     {
@@ -119,8 +178,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 == ":")
     {
@@ -128,13 +187,27 @@ Bar_line::compound_barline (Grob *me, String str, Real h,
 
       for (int i = 0; i < c - 1; i++)
 	{
-	  Real y = (- (c - 1.0) / 2 + 0.5 + i * staff_space);
+	  Real y = (- (c - 1.0) / 2 + 0.5 + i) * staff_space;
 	  Stencil d (dot);
 
 	  d.translate_axis (y, Y_AXIS);
 	  m.add_stencil (d);
 	}
     }
+  else if (str == "dashed")
+    {
+      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;
 }
 
@@ -146,79 +219,171 @@ Bar_line::simple_barline (Grob *me,
 {
   Real blot
     = rounded
-    ? me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"))
+    ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"))
     : 0.0;
 
   return Lookup::round_filled_box (Box (Interval (0, w),
 					Interval (-h / 2, h / 2)), blot);
 }
 
-MAKE_SCHEME_CALLBACK (Bar_line, before_line_breaking, 1);
+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::before_line_breaking (SCM smob)
+Bar_line::calc_bar_size (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Item *item = dynamic_cast<Item *> (me);
-
-  SCM g = me->get_property ("glyph");
-  SCM orig = g;
-  Direction bsd = item->break_status_dir ();
-  if (scm_is_string (g) && bsd)
+  if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me))
     {
-      SCM proc = me->get_property ("break-glyph-function");
-      g = scm_call_2 (proc, g, scm_from_int (bsd));
+      Interval staff_y = staff->extent (staff, Y_AXIS);
+      return scm_from_double (staff_y.is_empty () ? 0.0 : staff_y.length ());
     }
+  return scm_from_int (0);
+}
+
 
-  if (!scm_is_string (g))
+Stencil
+Bar_line::dashed_bar_line (Grob *me, Real h, Real thick)
+{
+  Real dash_size
+    = 1.0 - robust_scm2double (me->get_property ("gap"), 0.3);
+  /*
+    this is a tad complex for what we want to achieve, but with a
+    simple line, the round blotting interferes with staff line
+    connections.
+      */
+  Real ss = Staff_symbol_referencer::staff_space (me);
+  int count = Staff_symbol_referencer::line_count (me);
+      Real line_thick = Staff_symbol_referencer::line_thickness (me);
+
+  if (fabs (line_thick + (count -1) * ss - h) <   0.1) // ugh.
     {
-      me->set_property ("print-function", SCM_EOL);
-      me->set_extent (SCM_EOL, X_AXIS);
-      // leave y_extent for spanbar? 
+      Real blot = 
+	me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
+
+      Real half_space = ss/2;
+      Stencil bar;
+  
+      for (int i = (count-1); i >= -(count-1); i -= 2)
+	{
+	  Real top_y = min ((i + dash_size) * half_space,
+			    (count-1) * half_space +  line_thick / 2);
+	  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),
+							  Interval (bot_y, top_y)),
+						     blot));
+	}
+      return bar;
     }
+  else
+    {
+      /*
+	We have to scale the dashing so it starts and ends with half a
+	dash exactly.
+       */
+      int dashes = int (rint (h / ss));
+      Real total_dash_size = h / dashes;
+      Real factor = (dash_size - thick) / ss;
+      
+      SCM at = scm_list_n (ly_symbol2scm ("dashed-line"),
+			   scm_from_double (thick),
+			   scm_from_double (factor * total_dash_size),
+			   scm_from_double ((1-factor) * total_dash_size),
+			   scm_from_double (0),
+			   scm_from_double (h),
+			   scm_from_double (factor * total_dash_size * 0.5),
+			   SCM_UNDEFINED);
 
-  if (! ly_is_equal (g, orig))
-    me->set_property ("glyph", g);
+      Box box;
+      box.add_point (Offset (0, 0));
+      box.add_point (Offset (0, h));
 
-  return SCM_UNSPECIFIED;
+      Stencil s (box, at);
+      s.translate (Offset (thick/2, -h/2));
+      return s;
+    }
+  return Stencil ();
 }
 
-MAKE_SCHEME_CALLBACK (Bar_line, get_staff_bar_size, 1);
+MAKE_SCHEME_CALLBACK (Bar_line, calc_anchor, 1)
 SCM
-Bar_line::get_staff_bar_size (SCM smob)
+Bar_line::calc_anchor (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Real ss = Staff_symbol_referencer::staff_space (me);
-  SCM size = me->get_property ("bar-size");
-  if (scm_is_number (size))
-    return scm_from_double (scm_to_double (size) * ss);
-  else if (Staff_symbol_referencer::get_staff_symbol (me))
-    {
-      /*
-	If there is no staff-symbol, we get -1 from the next
-	calculation. That's a nonsense value, which would collapse the
-	barline so we return 0.0 in the next alternative.
-      */
-      Real ysize = (Staff_symbol_referencer::line_count (me) -1);
-      ysize = ysize * ss + Staff_symbol_referencer::line_thickness (me);
-      return scm_from_double (ysize);
-    }
-  return scm_from_int (0);
+  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"), "");
+
+  /* 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-interface",
+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 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"
-	       "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"
-	       "If @var{bartype} is set to @code{empty} then nothing is printed,\n"
-	       "but a line break is allowed at that spot.\n",
-	       "bar-size-procedure kern thin-kern hair-thickness thick-thickness glyph bar-size break-glyph-function");
+	       "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 "
+	       "hair-thickness "
+	       "thick-thickness "
+	       "glyph "
+	       "glyph-name "
+	       "bar-size "
+	       "bar-extent "
+	       );