Imported Upstream version 2.16.0

[lilypond.git] / lily / spring-smob.cc

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index a679eeae5f58bbe43fe996cabfc3427d02a20080..95d20c4333fea9ff36b9a6bb9af3fc2adbcc3d09 100644 (file)
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2012 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
@@ -39,6 +39,44 @@ Spring::print_smob (SCM, SCM p, scm_print_state *)
 SCM
 Spring::equal_p (SCM a, SCM b)
 {
-  return a == b? SCM_BOOL_T : SCM_BOOL_F;
+  return a == b ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
+LY_DEFINE (ly_make_spring, "ly:make-spring",
+           2, 0, 0, (SCM ideal, SCM min_dist),
+           "Make a spring.  @var{ideal} is the ideal distance of the"
+           " spring, and @var{min-dist} is the minimum distance.")
+{
+  LY_ASSERT_TYPE (scm_is_number, ideal, 1);
+  LY_ASSERT_TYPE (scm_is_number, min_dist, 2);
+
+  Spring s (scm_to_double (ideal), scm_to_double (min_dist));
+
+  return s.smobbed_copy ();
+}
+
+LY_DEFINE (ly_spring_set_inverse_compress_strength_x, "ly:spring-set-inverse-compress-strength!",
+           2, 0, 0, (SCM spring, SCM strength),
+           "Set the inverse compress @var{strength} of @var{spring}.")
+{
+  LY_ASSERT_SMOB (Spring, spring, 1);
+  LY_ASSERT_TYPE (scm_is_number, strength, 2);
+
+  Spring *s = unsmob_spring (spring);
+  s->set_inverse_compress_strength (scm_to_double (strength));
+  return s->smobbed_copy ();
+}
+
+LY_DEFINE (ly_spring_set_inverse_stretch_strength_x, "ly:spring-set-inverse-stretch-strength!",
+           2, 0, 0, (SCM spring, SCM strength),
+           "Set the inverse stretch @var{strength} of @var{spring}.")
+{
+  LY_ASSERT_SMOB (Spring, spring, 1);
+  LY_ASSERT_TYPE (scm_is_number, strength, 2);
+
+  Spring *s = unsmob_spring (spring);
+  s->set_inverse_stretch_strength (scm_to_double (strength));
+  return s->smobbed_copy ();
+}
+
+IMPLEMENT_TYPE_P (Spring, "ly:spring?");