X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-scheme.cc;h=1be52621b34c92d3efbddd1dc6509523522d1401;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fa4774bc6a5636035c4d08903db6cc96eab0b640;hpb=a98b4affe11787c3e30b1e23dd363de64b940a80;p=lilypond.git

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index fa4774bc6a..1be52621b3 100644
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,65 +1,54 @@
 /*
-  translator-scheme.cc -- implement Scheme context functions
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.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 "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}. "
-	   "The name is a symbol.")
+           1, 0, 0, (SCM trans),
+           "Return the type name of the translator object @var{trans}."
+           "  The name is a symbol.")
 {
-  Translator *tr = unsmob_translator (trans);
-  SCM_ASSERT_TYPE (tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
-  char const *nm = classname (tr);
+  LY_ASSERT_SMOB (Translator, trans, 1);
+  Translator *tr = Translator::unsmob (trans);
+  char const *nm = tr->class_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");
+  LY_ASSERT_SMOB (Translator, me, 1);
+  Translator *tr = Translator::unsmob (me);
   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")
+LY_DEFINE (ly_translator_context, "ly:translator-context",
+           1, 0, 0, (SCM trans),
+           "Return the context of the translator object @var{trans}.")
 {
-  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");
+  LY_ASSERT_SMOB (Translator, trans, 1);
+  Translator *tr = Translator::unsmob (trans);
 
-  return sc->internal_get_property (sym);
+  Context *c = tr->context ();
+  return c ? c->self_scm () : SCM_BOOL_F;
 }
-
-int
-Translator::print_smob (SCM s, SCM port, scm_print_state *)
-{
-  Translator *me = (Translator *) SCM_CELL_WORD_1 (s);
-  scm_puts ("#<Translator ", port);
-  scm_puts (classname (me), port);
-  scm_puts (" >", port);
-  return 1;
-}
-