Updates and macro change

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 206ccd84db7cf68dfede69e5c67c0095b75b64a7..64450ec25e236556d174391f00d46d45735a0f14 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -113,9 +113,7 @@ System_start_delimiter::print (SCM smob)
   SCM glyph_sym = me->get_property ("style");
   Real len = ext.length ();
   if (ext.is_empty ()
-      || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= ext.length ())
-      || (glyph_sym == ly_symbol2scm ("bar-line")
-         && non_empty_count <= 1))
+      || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= ext.length ()))
     {
       me->suicide ();
       return SCM_UNSPECIFIED;
@@ -167,7 +165,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   while (hi - lo > 1);
 
   Stencil stil (fm->find_by_name ("brace" + to_string (lo)));
-  stil.translate_axis (-b[X_AXIS].length()/2, X_AXIS);
+  stil.translate_axis (-b[X_AXIS].length ()/2, X_AXIS);
 
   stil.translate_axis (-0.2, X_AXIS);