X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=32f8307442e6031858ffd30c9cbbec8a785e2dc4;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=4d2cbf9b5968b46b80f3f9c7b557379a09fde3d2;hpb=def21b306e2b8fa2d5630fab0878e9922e197f0c;p=lilypond.git

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 4d2cbf9b59..32f8307442 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -1,9 +1,20 @@
 /*
-  bar-line.cc -- implement Bar_line
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "bar-line.hh"
@@ -116,6 +127,11 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
       thin.translate_axis (center, Y_AXIS);
       return thin;
     }
+  else if (str == ".")
+    {
+      thick.translate_axis (center, Y_AXIS);
+      return thick;
+    }
   else if (str == "|." || (h == 0 && str == ":|"))
     {
       m.add_at_edge (X_AXIS, LEFT, thick, 0);
@@ -145,11 +161,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 == "||")
     {
       /*
@@ -176,9 +214,9 @@ Bar_line::compound_barline (Grob *me, string str, Real h,
     {
       m = dashed_bar_line (me, h, hair);
     }
-  else if (str == ".")
+  else if (str == "'")
     {
-      m = dot;
+      m = tick_bar_line (me, h, rounded);
     }
 
   m.translate_axis (center, Y_AXIS);
@@ -200,6 +238,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)
@@ -312,13 +366,17 @@ ADD_INTERFACE (Bar_line,
 	       "\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"
+	       " 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{.|.},"
+	       " @code{|.|}, @code{:}, @code{dashed} and @code{'}.\n"
 	       "\n"
-	       "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"
+	       "These produce, respectively, a normal bar line, a right repeat, a left repeat,"
+	       " a thick double repeat, a thin-thick-thin double repeat,"
+	       " a thin-thick double repeat, a thick bar, a double bar, a start bar,"
+	       " an end bar, a thick double bar, a thin-thick-thin bar,"
+	       " a dotted bar, a dashed bar and a tick as bar bar line."
+	       "  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"
@@ -327,7 +385,7 @@ ADD_INTERFACE (Bar_line,
 	       "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.",
+	       "@code{gap} is used for the gaps in dashed bar lines.",
 
 	       /* properties */
 	       "allow-span-bar "
@@ -341,5 +399,3 @@ ADD_INTERFACE (Bar_line,
 	       "bar-size "
 	       "bar-extent "
 	       );
-
-