Run `make grand-replace'.

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 206ccd84db7cf68dfede69e5c67c0095b75b64a7..c2683cb9a2a991dee691cb92aff02f9ccc92a730 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "system-start-delimiter.hh"
-#include "text-interface.hh" 
+#include "text-interface.hh"
 #include "all-font-metrics.hh"
 #include "axis-group-interface.hh"
 #include "font-interface.hh"
@@ -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);
   
@@ -175,8 +173,30 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
 }
 
 ADD_INTERFACE (System_start_delimiter,
-              "The brace, bracket or bar in front of the system. "
-              ,
+              "The brace, bracket or bar in front of the system.  The"
+              " following values for @code{style} are recognized:\n"
+              "\n"
+              "@table @code\n"
+              "@item bracket\n"
+              "A thick bracket, normally used to group similar"
+              " instruments in a score.  Default for @code{StaffGroup}."
+              "  @code{SystemStartBracket} uses this style.\n"
+              "@item brace\n"
+              "A @q{piano style} brace normally used for an instrument"
+              " that uses two staves.  The default style for"
+              " @code{GrandStaff}.  @code{SystemStartBrace} uses this"
+              " style.\n"
+              "@item bar-line\n"
+              "A simple line between the staves in a score.  Default"
+              " for staves enclosed in @code{<<} and @code{>>}."
+              "  @code{SystemStartBar} uses this style.\n"
+              "@item line-bracket\n"
+              "A simple square, normally used for subgrouping"
+              " instruments in a score.  @code{SystemStartSquare} uses"
+              " this style.\n"
+              "@end table\n"
+              "\n"
+              "See also @file{input/regression/system-start-nesting.ly}.",
 
               /* properties */
               "collapse-height "