* scm/auto-beam.scm (revert-property-setting): Bugfixes: add

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

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index 1129a7b99abfcba9d33a625e1e6ebf573c5cf0a3..fa4774bc6a5636035c4d08903db6cc96eab0b640 100644 (file)
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,21 +1,18 @@
 /*
-  translator-scheme.cc --  implement Scheme context functions
+  translator-scheme.cc -- implement Scheme context functions
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
- */
-
-#include "translator.hh"
 #include "context-def.hh"
 #include "translator-group.hh"
-#include "lily-guile.hh"
-
+#include "moment.hh"
 
 LY_DEFINE (ly_translator_name, "ly:translator-name",
           1, 0, 0, (SCM trans),
-         "Return the type name of the translator object @var{trans}. "
+          "Return the type name of the translator object @var{trans}. "
           "The name is a symbol.")
 {
   Translator *tr = unsmob_translator (trans);
@@ -24,21 +21,44 @@ LY_DEFINE (ly_translator_name, "ly:translator-name",
   return ly_symbol2scm (nm);
 }
 
+LY_DEFINE (ly_translator_now, "ly:translator-now",
+          1, 0, 0, (SCM trans),
+          "Return now-moment of translater TRANS")
+{
+  Translator *tr = unsmob_translator (trans);
+  SCM_ASSERT_TYPE (tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
+  return tr->now_mom ().smobbed_copy ();
+}
+
 LY_DEFINE (ly_translator_description, "ly:translator-description",
-         1,0,0, (SCM me),
-         "Return an alist of properties of  translator @var{me}.")
+          1, 0, 0, (SCM me),
+          "Return an alist of properties of  translator @var{me}.")
 {
   Translator *tr = unsmob_translator (me);
   SCM_ASSERT_TYPE (tr, me, SCM_ARG1, __FUNCTION__, "Translator");
   return tr->translator_description ();
 }
 
+LY_DEFINE (ly_translator_property, "ly:translator-property",
+          2, 0, 0, (SCM translator, SCM sym),
+          "Return the value of a value in translator @var{g} of property @var{sym}. "
+          "It will return @code{' ()} (end-of-list) "
+          "if  @var{sym} is undefined in @var{g}."
+          "\n\n")
+{
+  Translator *sc = unsmob_translator (translator);
+  SCM_ASSERT_TYPE (sc, translator, SCM_ARG1, __FUNCTION__, "translator");
+  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+
+  return sc->internal_get_property (sym);
+}
+
 int
 Translator::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Translator *sc = (Translator*) ly_cdr (s);
+  Translator *me = (Translator *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator ", port);
-  scm_puts (classname (sc), port);
+  scm_puts (classname (me), port);
   scm_puts (" >", port);
   return 1;
 }