release: 1.3.44

[lilypond.git] / lily / bar.cc

diff --git a/lily/bar.cc b/lily/bar.cc
index c3dc7684b8fa3cf5ab8adfd4695e90fb860ee154..99f65c026ecabd64f111efc1d4efdeed0ca5a658 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -3,9 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <math.h>
 
+#include "main.hh"
+#include "dimensions.hh"
 #include "dimension-cache.hh"
 #include "bar.hh"
 #include "string.hh"
@@ -13,7 +16,7 @@
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "debug.hh"
-
+#include "all-font-metrics.hh"
 
 Bar::Bar ()
 {
@@ -29,55 +32,119 @@ Bar::get_bar_size () const
 }
 
 
-Molecule*
-Bar::do_brew_molecule_p () const
+Molecule 
+Bar::do_brew_molecule () const
+{
+  SCM s = get_elt_property ("glyph");
+  if (gh_string_p (s))
+    {
+      String str  =ly_scm2string (s);
+      return compound_barline (str, get_bar_size ());
+    }
+  return Molecule ();
+}
+
+
+Molecule
+Bar::compound_barline (String str, Real h) const
 {
-  String s = ly_scm2string (get_elt_property ("glyph"));
-  Molecule *output
-    = new Molecule (lookup_l ()->bar (s, get_bar_size (), paper_l ()));
+  Real kern = paper_l()->get_var ("bar_kern");
+  Real thinkern = paper_l()->get_var ("bar_thinkern");
+
+  Molecule thin = simple_barline (paper_l()->get_var ("barthick_thin"), h);
+  Molecule thick = simple_barline (paper_l()->get_var ("barthick_thick"), h);
+  Molecule colon = lookup_l ()->afm_find ("dots-repeatcolon");  
+
+  Molecule m;
   
-  return output;
+  if (str == "")
+    {
+      return lookup_l ()->blank (Box (Interval(0, 0), Interval (-h/2, h/2)));
+    }
+  if (str == "scorepostbreak")
+    {
+      return simple_barline (paper_l ()->get_var ("barthick_score"), h);
+    }
+  else if (str == "|")
+    {
+      return thin;
+    }
+  else if (str == "|.")
+    {
+      m.add_at_edge (X_AXIS, LEFT, thick, 0);      
+      m.add_at_edge (X_AXIS, LEFT, thin, kern);
+    }
+  else if (str == ".|")
+    {
+      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);
+      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);
+      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);
+      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);
+      m.add_at_edge (X_AXIS, RIGHT, thick, kern);      
+    }
+  else if (str == "||")
+    {
+      m.add_at_edge (X_AXIS, RIGHT, thin, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);      
+    }
+
+  return m;
 }
 
 
+Molecule
+Bar::simple_barline (Real w, Real h) const
+{
+  return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+}
+
 
 void
-Bar::do_pre_processing ()
+Bar::before_line_breaking ()
 {
-  SCM def = remove_elt_property ("default-glyph");
   SCM g = get_elt_property ("glyph");
-  if (!gh_string_p (g) && gh_string_p (def))
-    {
-      set_elt_property ("glyph", def);
-      g = get_elt_property ("glyph");
-    }
-
-  SCM breakdir = gh_int2scm (break_status_dir ());
-  
+  Direction bsd = break_status_dir ();
   if (gh_string_p (g))
     {
-      g = scm_eval (gh_list (ly_symbol2scm ("break-barline"),
-                            g,
-                            breakdir,
-                            SCM_UNDEFINED));
+      if (bsd)
+       {
+         SCM breakdir = gh_int2scm (bsd);
+         g = scm_eval (gh_list (ly_symbol2scm ("break-barline"),
+                                g,
+                                breakdir,
+                                SCM_UNDEFINED));
+       }
     }
   else
     {
       g = SCM_UNDEFINED;
     }
   
-#if 0  
-  if (remove_elt_property ("at-line-start") == SCM_BOOL_T      // UGR.
-      && (break_status_dir () == RIGHT) && (type_str_ == ""))
-    {
-      type_str_ = "|";
-    }
-#endif
-  
   if (!gh_string_p (g))
     {
       set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (X_AXIS);      
+      set_extent_callback (0, X_AXIS);      
     }
   else
     set_elt_property ("glyph", g);