*** empty log message ***

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index efc8e74a05aed28ffb57c77fb5ba02c3c06246b4..52ae7fde05c4152f6574131a81b265ed3bc07db5 100644 (file)
--- 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 6c29677348409332ece79ba4e09c55aba4c1f05e..b1619d9afd0a699edd04d2f7a1e7f5e6428953a0 100644 (file)
--- 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 28f8002305da5e929052afccec1284c08d263e7b..3c5b2632c6d51d99d80c6a5cabd1913a1514ed3a 100644 (file)
--- 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 04d63fae15433d0eb6eb80115d297cc50a5d6596..690f994663d6e8183f806c04312a471c5d5b9398 100644 (file)
--- 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 84708dade1b8f5cf7df1e600302ede350e5acb1e..f095ef8e1e069d176fa32f54db56b3385a7b37c1 100644 (file)
--- 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 4a78cd8d1f4de0107d291cce5baee7dc6b977e82..f6908817b641d7619af02b3193156a71f55290e1 100644 (file)
--- 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 7b991ed6f0b2cc350b04079439ebcc3678e09e1d..3d619fd287b228cde40c39056a62f26958ee6789 100644 (file)
--- 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 6a2448871244ccf20c3cedee4cef9e7e28c7f54a..bf0f63050948c5c1ee1565ae675ef258771085c2 100644 (file)
--- 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 e79aad880b8d298bbfe6861127226e4110c50d0c..25900a012ae26e8516f62143100aa562f319b4bf 100644 (file)
--- 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 0ca1fbe1b6a6db05c741a7af259730d08d1d6edc..ac65a0ce0086b95bc76da9cc3afb59c15df34287 100644 (file)
--- 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;  
-}
          
          
 /****************************************************************/