X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-mod-scheme.cc;h=a774fc7426a571135ee2467390f539659e2006ea;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=f63d02887f195b4d1a9354657f6b113369a530a5;hpb=9158bc17904d4dd930a1f776cfe3226f1ad84092;p=lilypond.git

diff --git a/lily/context-mod-scheme.cc b/lily/context-mod-scheme.cc
index f63d02887f..a774fc7426 100644
--- a/lily/context-mod-scheme.cc
+++ b/lily/context-mod-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2010--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -21,26 +21,50 @@
 #include "context.hh"
 #include "context-mod.hh"
 
-LY_DEFINE (ly_get_context_mods,
-	   "ly:get-context-mods",
-	   1, 0, 0, (SCM contextmod),
-	   "Returns the list of context modifications stored in"
-	   " @var{contextmod}.")
+LY_DEFINE (ly_get_context_mods, "ly:get-context-mods",
+           1, 0, 0, (SCM contextmod),
+           "Returns the list of context modifications stored in"
+           " @var{contextmod}.")
 {
-  Context_mod *tr = unsmob_context_mod (contextmod);
+  Context_mod *tr = unsmob<Context_mod> (contextmod);
   LY_ASSERT_SMOB (Context_mod, contextmod, 1);
   return tr->get_mods ();
 }
 
-LY_DEFINE (ly_add_context_mod,
-	   "ly:add-context-mod",
-	   2, 0, 0, (SCM contextmods, SCM modification),
-	   "Adds the given context @var{modification} to the list"
-	   " @var{contextmods} of context modifications.")
+LY_DEFINE (ly_add_context_mod, "ly:add-context-mod",
+           2, 0, 0, (SCM contextmods, SCM modification),
+           "Adds the given context @var{modification} to the list"
+           " @var{contextmods} of context modifications.")
 {
-  Context_mod *ctxmod = unsmob_context_mod (contextmods);
+  Context_mod *ctxmod = unsmob<Context_mod> (contextmods);
   LY_ASSERT_SMOB (Context_mod, contextmods, 1);
   ctxmod->add_context_mod (modification);
   return SCM_UNSPECIFIED;
 }
 
+LY_DEFINE (ly_make_context_mod, "ly:make-context-mod",
+           0, 1, 0, (SCM mod_list),
+           "Creates a context modification, optionally initialized"
+           " via the list of modifications @var{mod-list}.")
+{
+  if (!SCM_UNBNDP (mod_list))
+    {
+      LY_ASSERT_TYPE (ly_cheap_is_list, mod_list, 1);
+      return Context_mod (mod_list).smobbed_copy ();
+    }
+  else
+    return Context_mod ().smobbed_copy ();
+}
+
+LY_DEFINE (ly_context_mod_apply_x, "ly:context-mod-apply!",
+           2, 0, 0, (SCM context, SCM mod),
+           "Apply the context modification @var{mod} to @var{context}.")
+{
+  LY_ASSERT_SMOB (Context, context, 1);
+  LY_ASSERT_SMOB (Context_mod, mod, 2);
+
+  apply_property_operations (unsmob<Context> (context),
+                             unsmob<Context_mod> (mod)->get_mods ());
+  scm_remember_upto_here_1 (context);
+  return SCM_UNSPECIFIED;
+}