From 0c54db94e3374140be744305374583aa5ba8cb1d Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 8 Mar 2005 12:48:50 +0000
Subject: [PATCH] *** empty log message ***
---
lily/chord-tremolo-engraver.cc | 2 +-
lily/parse-scm.cc | 2 +-
lily/rest-collision-engraver.cc | 2 +-
lily/rest-engraver.cc | 2 +-
lily/rhythmic-column-engraver.cc | 2 +-
lily/score-translator.cc | 1 -
lily/sequential-iterator.cc | 2 +-
lily/sequential-music-iterator.cc | 2 +-
lily/side-position-interface.cc | 2 +-
lily/simple-spacer.cc | 86 +------------------------------
10 files changed, 10 insertions(+), 93 deletions(-)
diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index efc8e74a05..52ae7fde05 100644
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -1,5 +1,5 @@
/*
- new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+ chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
source file of the GNU LilyPond music typesetter
diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 6c29677348..b1619d9afd 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -1,5 +1,5 @@
/*
- parse-scm --
+ parse-scm -- Parse a single SCM expression exactly.
source file of the GNU LilyPond music typesetter
diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 28f8002305..3c5b2632c6 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,5 +1,5 @@
/*
- rest-collision-reg.cc -- implement Rest_collision_engraver
+ rest-collision-engraver.cc -- implement Rest_collision_engraver
source file of the GNU LilyPond music typesetter
diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 04d63fae15..690f994663 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,5 +1,5 @@
/*
- rest-grav.cc -- implement Rest_engraver
+ rest-engraver.cc -- implement Rest_engraver
source file of the GNU LilyPond music typesetter
diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 84708dade1..f095ef8e1e 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,5 +1,5 @@
/*
- rhythmic-column-grav.cc -- implement Rhythmic_column_engraver
+ rhythmic-column-engraver.cc -- implement Rhythmic_column_engraver
source file of the GNU LilyPond music typesetter
diff --git a/lily/score-translator.cc b/lily/score-translator.cc
index 4a78cd8d1f..f6908817b6 100644
--- a/lily/score-translator.cc
+++ b/lily/score-translator.cc
@@ -7,7 +7,6 @@
*/
#include "score-translator.hh"
-
#include "moment.hh"
void
diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index 7b991ed6f0..3d619fd287 100644
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -1,5 +1,5 @@
/*
- Sequential_iterator.cc -- implement Sequential_iterator
+ sequential-iterator.cc -- implement Sequential_iterator
source file of the GNU LilyPond music typesetter
diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index 6a24488712..bf0f630509 100644
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -1,5 +1,5 @@
/*
- Sequential_music_iterator.cc -- implement Sequential_music_iterator
+ sequential-music-iterator.cc -- implement Sequential_music_iterator
source file of the GNU LilyPond music typesetter
diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index e79aad880b..25900a012a 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -1,5 +1,5 @@
/*
- staff-side.cc -- implement Staff_side_element
+ side-position-interface.cc -- implement Side_position_interface
source file of the GNU LilyPond music typesetter
diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 0ca1fbe1b6..ac65a0ce00 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -10,13 +10,12 @@
*/
-#include "simple-spacer.hh"
#include <cstdio>
#include <math.h>
-#include <libc-extension.hh> // isinf
-
+#include "libc-extension.hh" // isinf
+#include "simple-spacer.hh"
#include "paper-column.hh"
#include "spring.hh"
#include "warn.hh"
@@ -248,87 +247,6 @@ Simple_spacer::my_solve_natural_len ()
force_ = line_len_force;
}
-LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
- 4, 1, 0, (SCM springs, SCM rods, SCM length, SCM ragged),
- "Solve a spring and rod problem for @var{count} objects, that "
- "are connected by @var{count-1} springs, and an arbitrary number of rods "
- "Springs have the format (ideal, hooke) and rods (idx1, idx2, distance) "
- "@var{length} is a number, @var{ragged} a boolean "
- "Return: a list containing the force (positive for stretching, "
- "negative for compressing and #f for non-satisfied constraints) "
- "followed by the @var{spring-count}+1 positions of the objects. "
- )
-{
- int len = scm_ilength (springs);
- if (len == 0)
- return scm_list_2 (scm_from_double (0.0), scm_from_double (0.0));
-
- SCM_ASSERT_TYPE (len >= 0, springs, SCM_ARG1, __FUNCTION__, "list of springs");
- SCM_ASSERT_TYPE (scm_ilength (rods) >= 0, rods, SCM_ARG2, __FUNCTION__, "list of rods");
- SCM_ASSERT_TYPE (scm_is_number (length) || length == SCM_BOOL_F,
- length, SCM_ARG3, __FUNCTION__, "number or #f");
-
-
- bool is_ragged = ragged == SCM_BOOL_T;
- Simple_spacer spacer;
- for (SCM s = springs; scm_is_pair (s); s = scm_cdr (s))
- {
- Real ideal = scm_to_double (scm_caar (s));
- Real hooke = scm_to_double (scm_cadar (s));
-
- spacer.add_spring (ideal, hooke);
- }
-
- for (SCM s = rods; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM entry = scm_car (s);
- int l = scm_to_int (scm_car (entry));
- int r = scm_to_int (scm_cadr (entry));
- entry = scm_cddr (entry);
-
- Real distance = scm_to_double (scm_car (entry));
- spacer.add_rod (l, r, distance);
- }
-
- spacer.line_len_ = scm_to_double (length);
-
- if (is_ragged)
- spacer.my_solve_natural_len ();
- else
- spacer.my_solve_linelen ();
-
- Array<Real> posns;
- posns.push (0.0);
- for (int i = 0; i < spacer.springs_.size(); i++)
- {
- Real l = spacer.springs_[i].length ((is_ragged) ? 0.0 : spacer.force_);
- posns.push (posns.top() + l);
- }
-
-
-
- SCM force_return = SCM_BOOL_F;
- if (!isinf (spacer.force_)
- && (spacer.is_active () || is_ragged))
- {
- force_return = scm_from_double (spacer.force_);
- }
-
- if (is_ragged
- && posns.top () > spacer.line_len_)
- {
- force_return = SCM_BOOL_F;
- }
-
- SCM retval = SCM_EOL;
- for (int i = posns.size(); i--;)
- {
- retval = scm_cons (scm_from_double (posns[i]), retval);
- }
-
- retval = scm_cons (force_return, retval);
- return retval;
-}
/****************************************************************/
--
2.39.5