X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=c2683cb9a2a991dee691cb92aff02f9ccc92a730;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=306d9289f6b26fe922fbc655f27d03bddc3a508b;hpb=d0b5f90a96daeede26ca3d0949de71c4ef0a5073;p=lilypond.git

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 306d9289f6..c2683cb9a2 100644
--- 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--2006 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"
@@ -42,7 +42,7 @@ System_start_delimiter::staff_bracket (Grob *me, Real height)
   Stencil bracket = Lookup::filled_box (box);
   Direction d = DOWN;
   do
-    bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0);
+    bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap);
   while (flip (&d) != DOWN);
   bracket = Stencil (box, bracket.expr ());
 
@@ -75,25 +75,6 @@ System_start_delimiter::line_bracket (Grob *me, Real height)
   return vline;
 }
 
-Stencil
-System_start_delimiter::text (Grob *me_grob, Real h)
-{
-  (void) h;
-  
-  Spanner *me = dynamic_cast<Spanner*> (me_grob);
-  SCM t = me->get_property ("text");
-  if (me->get_break_index () == 0)
-    t = me->get_property ("long-text");
-	   
-	   
-  SCM chain = Font_interface::text_font_alist_chain (me);
-
-  SCM scm_stencil = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, t);
-  if (Stencil *p = unsmob_stencil (scm_stencil))
-    return *p;
-  return Stencil();
-}
-
 Stencil
 System_start_delimiter::simple_bar (Grob *me, Real h)
 {
@@ -132,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;
@@ -149,8 +128,6 @@ System_start_delimiter::print (SCM smob)
     m = simple_bar (me, len);
   else if (glyph_sym == ly_symbol2scm ("line-bracket"))
     m = line_bracket (me, len);
-  else if (glyph_sym == ly_symbol2scm ("text"))
-    m = text (me, len);
 
   m.translate_axis (ext.center (), Y_AXIS);
   return m.smobbed_copy ();
@@ -163,7 +140,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   /* We go through the style sheet to lookup the font file
      name.  This is better than using find_font directly,
      esp. because that triggers mktextfm for non-existent
->     fonts. */
+     fonts. */
   SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
 		      ly_symbol2scm ("fetaBraces"));
 
@@ -188,21 +165,41 @@ 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);
   
   return stil;
 }
 
-ADD_INTERFACE (System_start_delimiter, "system-start-delimiter-interface",
-	       "The brace, bracket or bar in front of the system. "
-	       ,
+ADD_INTERFACE (System_start_delimiter,
+	       "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 "
 	       "style "
-	       "text "
-	       "long-text " 
 	       "thickness "
 	       );