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

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index 6df422ae5f..1be52621b3 100644
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -1,58 +1,54 @@
-/*   
-  translator-scheme.cc --  implement Scheme context functions
- 
-  source file of the GNU LilyPond music typesetter
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
- */
-
-#include "translator.hh"
-#include "context-def.hh"
-
-#include "translator-group.hh"
-#include "lily-guile.hh"
+  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.")
+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 * 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_description,
-	  "ly:translator-description",
-	  1,0,0, (SCM me),
-	  "Return an alist of properties of  translator @var{me}.")
+LY_DEFINE (ly_translator_description, "ly:translator-description",
+           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__, "Context");
-
+  LY_ASSERT_SMOB (Translator, me, 1);
+  Translator *tr = Translator::unsmob (me);
   return tr->translator_description ();
 }
 
-
-int
-Translator::print_smob (SCM s, SCM port, scm_print_state *)
+LY_DEFINE (ly_translator_context, "ly:translator-context",
+           1, 0, 0, (SCM trans),
+           "Return the context of the translator object @var{trans}.")
 {
-  Translator *sc = (Translator *) ly_cdr (s);
-     
-  scm_puts ("#<Translator ", port);
-  scm_puts (classname (sc), port);
-
-  /*
-    don't try to print properties, that is too much hassle.
-   */
-  scm_puts (" >", port);
-  
-  return 1;
-}
+  LY_ASSERT_SMOB (Translator, trans, 1);
+  Translator *tr = Translator::unsmob (trans);
 
+  Context *c = tr->context ();
+  return c ? c->self_scm () : SCM_BOOL_F;
+}