patch::: 1.1.52.gp2

[lilypond.git] / lily / bar.cc

diff --git a/lily/bar.cc b/lily/bar.cc
index 96071ad385b8a7001f9bf75db1ff2b2e72767040..31ff0b9c2583125e6ce9542aaf5a53facbbb39d5 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -1,9 +1,9 @@
 /*
   bar.cc -- implement Bar
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "bar.hh"
@@ -13,24 +13,74 @@
 #include "lookup.hh"
 #include "debug.hh"
 
-Bar::Bar( String t)
+
+Bar::Bar ()
 {
-    type = t;
+  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+  type_str_ = "|";
 }
 
-IMPLEMENT_STATIC_NAME(Bar);
-
 void
-Bar::do_print()const
+Bar::do_print () const
+{
+#ifndef NPRINT
+  String s = type_str_;
+  DOUT << "type = " << s;
+#endif
+}
+
+Real
+Bar::get_bar_size () const
 {
-    mtor << type;
+  return paper_l ()->get_var ("barsize");
 }
 
+
 Molecule*
-Bar::brew_molecule_p()const
+Bar::do_brew_molecule_p () const
 {    
-    Symbol s = paper()->lookup_l()->bar(type);
-    Molecule*output = new Molecule(Atom(s));
-    return output;
+  Molecule *output = new Molecule (lookup_l ()->bar (type_str_, get_bar_size (), paper_l ()));
+  
+  return output;
+}
+
+/**
+  Prescriptions for splitting bars.
+  TODO: put this in SCM.
+ */
+static char const *bar_breaks[][3] ={
+  {":|", ":|:", "|:"},
+  {"|", "|", ""},
+  {"", "|s", "|"},
+  {"|", "|:", "|:"},
+  {"|.", "|.", ""},
+  {":|", ":|", ""},
+  {"||", "||", ""},
+  {".|.", ".|.", ""},
+  {"", "scorebar", "scorepostbreak"},
+  {"", "brace", "brace"},
+  {"", "bracket", "bracket"},  
+  {0,0,0}
+};
+
+void
+Bar::do_pre_processing ()
+{
+  for (int i=0; bar_breaks[i][0]; i++) 
+    {
+      if (bar_breaks[i][1] == type_str_)
+       {
+         type_str_ = bar_breaks[i][break_status_dir ()+1];
+         break;
+       }
+    }
+  if (remove_elt_property (at_line_start_scm_sym)!= SCM_BOOL_F
+      && (break_status_dir () == RIGHT) && (type_str_ == ""))
+    {
+      type_str_ = "|";
+    }
+
+  if (type_str_ =="")
+    dim_cache_[X_AXIS]->set_empty (true);
 }
-    
+