* lily/font-interface-scheme.cc (LY_DEFINE): function

ly:grob-default-font (changed from get-default-font).

* lily/axis-group-interface-scheme.cc (LY_DEFINE): new file.

diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc
index 36f5d7a453fa6e0ee7a19a26d8b1c2a5127dc3ee..c53b5aebb4785467d061ad39f16b56f689933fbd 100644 (file)
--- a/lily/axis-group-interface-scheme.cc
+++ b/lily/axis-group-interface-scheme.cc
@@ -1,5 +1,5 @@
 /*
-  axis-group-interface-scheme.cc -- implement Axis_group_interface
+  axis-group-interface-scheme.cc -- implement Axis_group_interface bindings
 
   source file of the GNU LilyPond music typesetter
 

diff --git a/lily/font-interface-scheme.cc b/lily/font-interface-scheme.cc
deleted file mode 100644 (file)
index 737f4a5..0000000
--- a/lily/font-interface-scheme.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  font-interface-scheme.cc -- implement Font_interface bindings
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#include "font-interface.hh"
-
-#include "grob.hh"
-
-
-LY_DEFINE (ly_grob_default_font, "ly:grob-default-font",
-          1, 0, 0, (SCM grob),
-          "Return the default font for grob @var{gr}.")
-{
-  Grob *gr = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob");
-
-  return Font_interface::get_default_font (gr)->self_scm ();
-}

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index 60e5f05fe653d36ec8983450a8ccbf9e1aae487c..edf700aa6095583e0b9aae663b3de86a78ea2523 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -7,10 +7,14 @@
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "grob.hh"
+
 #include "warn.hh"
 #include "item.hh"
 #include "output-def.hh"
 #include "system.hh"
+#include "font-interface.hh"
+
 
 LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!",
           3, 0, 0, (SCM grob, SCM sym, SCM val),
@@ -228,3 +232,15 @@ LY_DEFINE (ly_grob_key, "ly:grob-key",
   SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "Grob");
   return me->get_key ()->self_scm ();
 }
+
+
+
+LY_DEFINE (ly_grob_default_font, "ly:grob-default-font",
+          1, 0, 0, (SCM grob),
+          "Return the default font for grob @var{gr}.")
+{
+  Grob *gr = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob");
+
+  return Font_interface::get_default_font (gr)->self_scm ();
+}

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 3571440dd4d34693a22bf03bc773752e0402e50d..571e6c964c857e006b268671019f5acbfe09194a 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -52,22 +52,3 @@
 (define-public (format-mark-box-barnumbers mark context)
   (make-bold-markup (make-box-markup
     (number->string (ly:context-property context 'currentBarNumber)))))
-
-(define-public (format-pitched-trill-head pitch do-print-accidental context)
-  (make-override-markup
-   '(word-space . 0.0)
-   (make-line-markup
-    (append
-     (list
-      (make-musicglyph-markup "accidentals.leftparen"))
-     (if do-print-accidental
-        (list (make-musicglyph-markup
-               (string-append "accidentals."
-                              (number->string (ly:pitch-alteration pitch))))
-              (make-hspace-markup 0.2))
-        '())
-     
-     (list
-      (make-musicglyph-markup "noteheads.s2")
-      (make-musicglyph-markup "accidentals.rightparen"))
-     ))))