X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=5ecda098a9b40b941a1ba03c4aed9992974629f1;hb=c6b8818201add8f2e2114b5583bca805ac63574a;hp=64450ec25e236556d174391f00d46d45735a0f14;hpb=1806f0b1a3ca989203675dc8f44387a076acdffa;p=lilypond.git

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 64450ec25e..5ecda098a9 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,13 +1,24 @@
 /*
-  system-start-delimiter.cc -- implement System_start_delimiter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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"
@@ -137,15 +148,11 @@ Stencil
 System_start_delimiter::staff_brace (Grob *me, Real y)
 {
   Font_metric *fm = 0;
-  /* 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. */
-  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
-		      ly_symbol2scm ("fetaBraces"));
 
-  SCM alist = scm_list_n (fam, SCM_UNDEFINED);
-  fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED));
+  /*
+    Find the default brace font if the user overrides it.
+  */
+  fm = Font_interface::get_default_font (me);
 
   int
     lo = 0;
@@ -173,8 +180,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 "