X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftranslator-scheme.cc;h=cc6f13f8ca073a070cddad59a6453d8e5ec968f4;hb=d544bd3103acc8175089ec6aeecd57376f2d201d;hp=b501c555a441174180256e7de3f3a06b63c72b2b;hpb=31634a53495ec6fb350da6a2cefbbc401f388599;p=lilypond.git

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index b501c555a4..cc6f13f8ca 100644
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,33 +1,54 @@
-#include "translator.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 2002--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "context.hh"
+#include "context-def.hh"
 #include "translator-group.hh"
-#include "lily-guile.hh"
+#include "moment.hh"
 
-LY_DEFINE(ly_get_context_property,
-	  "ly-get-context-property", 2, 0, 0,
-	  (SCM context, SCM name),
-	  "retrieve the value of @var{name} from context @var{context}")
+LY_DEFINE (ly_translator_name, "ly:translator-name",
+           1, 0, 0, (SCM trans),
+           "Return the type name of the translator object @var{trans}."
+           "  The name is a symbol.")
 {
-  Translator *t = unsmob_translator (context);
-  Translator_group* tr=   dynamic_cast<Translator_group*> (t);
-  SCM_ASSERT_TYPE(tr, context, SCM_ARG1, __FUNCTION__, "Translator group");
-  SCM_ASSERT_TYPE(gh_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
-
-  return tr->internal_get_property (name);
-  
+  LY_ASSERT_SMOB (Translator, trans, 1);
+  Translator *tr = unsmob_translator (trans);
+  char const *nm = tr->class_name ();
+  return ly_symbol2scm (nm);
 }
 
-LY_DEFINE(ly_set_context_property,
-	  "ly-set-context-property", 3, 0, 0,
-	  (SCM context, SCM name, SCM val),
-	  "set value of property @var{name} in context @var{context} to @var{val}.
-")
+LY_DEFINE (ly_translator_description, "ly:translator-description",
+           1, 0, 0, (SCM me),
+           "Return an alist of properties of translator @var{me}.")
 {
-  Translator *t = unsmob_translator (context);
-  Translator_group* tr=   dynamic_cast<Translator_group*> (t);
+  LY_ASSERT_SMOB (Translator, me, 1);
+  Translator *tr = unsmob_translator (me);
+  return tr->translator_description ();
+}
 
-  SCM_ASSERT_TYPE(tr, context, SCM_ARG1, __FUNCTION__, "Context");
-  tr->internal_set_property (name, val);
+LY_DEFINE (ly_translator_context, "ly:translator-context",
+           1, 0, 0, (SCM trans),
+           "Return the context of the translator object @var{trans}.")
+{
+  LY_ASSERT_SMOB (Translator, trans, 1);
+  Translator *tr = unsmob_translator (trans);
 
-  return SCM_UNSPECIFIED;
+  Context *c = tr->context ();
+  return c ? c->self_scm () : SCM_BOOL_F;
 }