From 6973a0c25cff3f52da93d90bba63e9e396e0aaef Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:06:09 +0000
Subject: [PATCH] lilypond-1.5.35

---
 lily/grob.cc             | 37 ++++++++-----------------------------
 lily/lexer.ll            |  9 +++++++++
 scm/grob-description.scm | 12 ++----------
 3 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/lily/grob.cc b/lily/grob.cc
index 4077188023..064b68faab 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -815,27 +815,13 @@ SCM
 ly_set_grob_property (SCM elt, SCM sym, SCM val)
 {
   Grob * sc = unsmob_grob (elt);
-
-  if (!gh_symbol_p (sym))
-    {
-      error ("Not a symbol");
-      ly_display_scm (sym);
-      return SCM_UNSPECIFIED;
-    }
+  SCM_ASSERT_TYPE(sc, elt, SCM_ARG1, __FUNCTION__, "grob");
+  SCM_ASSERT_TYPE(gh_symbol_p(sym), sym, SCM_ARG2, __FUNCTION__, "symbol");  
 
   if (!type_check_assignment (sym, val, ly_symbol2scm ("backend-type?")))
-    return SCM_UNSPECIFIED;
+    error ("typecheck failed");
       
-  if (sc)
-    {
-      sc->internal_set_grob_property (sym, val);
-    }
-  else
-    {
-      error ("Not a score element");
-      ly_display_scm (elt);
-    }
-
+  sc->internal_set_grob_property (sym, val);
   return SCM_UNSPECIFIED;
 }
 
@@ -844,17 +830,10 @@ SCM
 ly_get_grob_property (SCM elt, SCM sym)
 {
   Grob * sc = unsmob_grob (elt);
-  
-  if (sc)
-    {
-      return sc->internal_get_grob_property (sym);
-    }
-  else
-    {
-      error ("Not a score element");
-      ly_display_scm (elt);
-    }
-  return SCM_UNSPECIFIED;
+  SCM_ASSERT_TYPE(sc, elt, SCM_ARG1, __FUNCTION__, "grob");
+  SCM_ASSERT_TYPE(gh_symbol_p(sym), sym, SCM_ARG2, __FUNCTION__, "symbol");  
+
+  return sc->internal_get_grob_property (sym);
 }
 
 
diff --git a/lily/lexer.ll b/lily/lexer.ll
index fa5a4dad89..7bff8df6f4 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -269,6 +269,15 @@ HYPHEN		--
 	return SCM_T;
 }
 <figures>{
+	_	{
+		return FIGURE_SPACE;
+	}
+	\]	{
+		return FIGURE_BRACKET_CLOSE;
+	}
+	\[	{
+		return FIGURE_BRACKET_OPEN;
+	}
 	\>		{
 		return FIGURE_CLOSE;
 	}
diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 02bfd0d36d..3ea708e2f7 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -8,14 +8,6 @@
 ; distances are given in stafflinethickness (thicknesses) and
 ; staffspace (distances)
 
-(define default-alteration-alist
-  '(
-    (0 . ((raise . 0.5) (music "accidentals-0")))
-    (-1 . ((raise . 0.5) (music "accidentals--1")))
-    (-2 . ((raise . 0.5) (music "accidentals--2")))
-    (1 . ((raise . 0.5) (music  "accidentals-1")))
-    (2 . ((raise . 0.5) (music "accidentals-2")))
-    ))
 
 
 ;;; WARNING: the meta field should be the last one.
@@ -80,10 +72,9 @@
 	))
 
 	(BassFigure . (
-		       (molecule-callback . ,Text_item::brew_molecule)
+		       (molecule-callback . ,brew-bass-figure)
 		       (Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
 		       (direction . 0)
-		       (accidental-alist . ,default-alteration-alist)
 		       (font-family . number)
 		       (font-relative-size . -1)
 		       (meta . ,(grob-description text-interface font-interface ))
@@ -505,6 +496,7 @@
 		(padding . 0.29) 
 		(X-offset-callbacks . (,Side_position_interface::centered_on_parent))
 		(before-line-breaking-callback . ,Script::before_line_breaking)
+		(font-family . music)
 		(meta . ,(grob-description script-interface side-position-interface font-interface))
 	))
 	
-- 
2.39.5