CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/08 19:16:12
Modified files:
lily : axis-group-interface-scheme.cc grob-scheme.cc
scm : translation-functions.scm
Removed files:
lily : font-interface-scheme.cc
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/axis-group-interface-scheme.cc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grob-scheme.cc.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/translation-functions.scm.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: lilypond/lily/axis-group-interface-scheme.cc
diff -u lilypond/lily/axis-group-interface-scheme.cc:1.1
lilypond/lily/axis-group-interface-scheme.cc:1.2
--- lilypond/lily/axis-group-interface-scheme.cc:1.1 Fri Jul 8 17:53:40 2005
+++ lilypond/lily/axis-group-interface-scheme.cc Fri Jul 8 19:16:12 2005
@@ -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
Index: lilypond/lily/grob-scheme.cc
diff -u lilypond/lily/grob-scheme.cc:1.46 lilypond/lily/grob-scheme.cc:1.47
--- lilypond/lily/grob-scheme.cc:1.46 Mon Mar 28 15:33:01 2005
+++ lilypond/lily/grob-scheme.cc Fri Jul 8 19:16:12 2005
@@ -7,10 +7,14 @@
Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
+#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),
@@ -227,4 +231,16 @@
Grob *me = unsmob_grob (grob);
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 ();
}
Index: lilypond/scm/translation-functions.scm
diff -u lilypond/scm/translation-functions.scm:1.12
lilypond/scm/translation-functions.scm:1.13
--- lilypond/scm/translation-functions.scm:1.12 Fri Jul 8 17:53:41 2005
+++ lilypond/scm/translation-functions.scm Fri Jul 8 19:16:12 2005
@@ -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"))
- ))))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
