add \defaultchild to InnerStaffGroup.

[lilypond.git] / lily / stencil-scheme.cc

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index b69c9d70e3051b07951da315f92430d0321c3f0c..b497f3f9af544a7d47a6d8dbc2ceb00f456944cb 100644 (file)
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -65,7 +65,7 @@ LY_DEFINE (ly_stencil_expr, "ly:stencil-expr",
   return s->expr ();
 }
 
-LY_DEFINE (ly_stencil_get_extent, "ly:stencil-extent",
+LY_DEFINE (ly_stencil_extent, "ly:stencil-extent",
           2, 0, 0, (SCM stil, SCM axis),
           "Return a pair of numbers signifying the extent of @var{stil} in "
           "@var{axis} direction (0 or 1 for x and y axis respectively).")
@@ -221,12 +221,17 @@ LY_DEFINE (ly_make_stencil, "ly:make-stencil",
           "They carry two pieces of information: \n\n"
           "1: a specification of how to print this object. "
           "This specification is processed by the output backends, "
-          " for example @file{scm/output-tex.scm}.\n\n"
+          " for example @file{scm/output-ps.scm}.\n\n"
           "2: the vertical and horizontal extents of the object.\n\n")
 {
+  SCM_ASSERT_TYPE (!scm_is_pair (expr)
+                  || is_stencil_head (scm_car (expr)),
+                  expr, SCM_ARG1, __FUNCTION__, "registered stencil expression");
+
   SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG2, __FUNCTION__, "number pair");
   SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG3, __FUNCTION__, "number pair");
-
+  
+  
   Box b (ly_scm2interval (xext), ly_scm2interval (yext));
   Stencil s (b, expr);
   return s.smobbed_copy ();
@@ -258,6 +263,20 @@ LY_DEFINE (ly_stencil_fonts, "ly:stencil-fonts",
   return find_expression_fonts (stil->expr ());
 }
 
+
+LY_DEFINE (ly_stencil_in_color, "ly:stencil-in-color",
+          4, 0, 0, (SCM stc, SCM r, SCM g, SCM b),
+          "Put @var{stc} in a different color.")
+{
+  Stencil *stil = unsmob_stencil (stc);
+  SCM_ASSERT_TYPE (stil, stc, SCM_ARG1, __FUNCTION__, "Stencil");
+  return Stencil (stil->extent_box (),
+                 scm_list_3 (ly_symbol2scm ("color"),
+                             scm_list_3 (r, g, b),
+                             stil->expr ())).smobbed_copy ();
+}
+
+
 struct Stencil_interpret_arguments
 {
   SCM func;
@@ -320,3 +339,23 @@ LY_DEFINE (ly_filled_box, "ly:round-filled-box",
                                   scm_to_double (blot)).smobbed_copy ();
 }
 
+
+
+LY_DEFINE (ly_register_stencil_expression, "ly:register-stencil-expression",
+          1, 0, 0,
+          (SCM symbol),
+          "Add @var{symbol} as head of a stencil expression")
+{
+  SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol,
+                  SCM_ARG1, __FUNCTION__, "Symbol");
+  register_stencil_head (symbol);
+  return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_all_stencil_expressions, "ly:all-stencil-expressions",
+          0, 0, 0,
+          (),
+          "Return all symbols recognized as stencil expressions.")
+{
+  return all_stencil_heads ();
+}