From: fred <fred>
Date: Tue, 26 Mar 2002 23:23:00 +0000 (+0000)
Subject: lilypond-1.3.60
X-Git-Tag: release/1.5.59~1579
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af0c79fe87fd0c0cdf73978ee0af06ea5ad6fc57;p=lilypond.git

lilypond-1.3.60
---

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index d38687e4f1..5ab553257f 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -97,8 +97,7 @@ Paper_column::column_l () const
 Paper_column::Paper_column (Moment w)
   : Item (SCM_EOL)		// guh.?
 {
-  SCM when = (new Moment (w))->smobify_self ();
-  scm_unprotect_object (when);
+  SCM when = smobify (new Moment (w));
   set_elt_property ("when", when);
 
   Axis_group_interface (this).set_interface ();
diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 8a2094b86e..98c430b3eb 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -9,7 +9,7 @@
 #include <stdio.h>
 
 #include "scm-hash.hh"
-#include "hash-table-iter.hh"
+
 
 
 Scheme_hash_table::Scheme_hash_table ()
@@ -97,7 +97,6 @@ void
 Scheme_hash_table::set (SCM k, SCM v)
 {
   (*this)[k] = v;
-  scm_unprotect_object (v);
 }
 
 // UGH. 
diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 5e05094bdb..8146b72676 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -97,12 +97,9 @@ Spacing_engraver::do_pre_move_processing ()
   Paper_column * sc
     = dynamic_cast<Paper_column*> (get_staff_info ().musical_pcol_l ());
 
-  SCM sh = (new Moment (shortest_playing))->smobify_self ();
-  SCM st = (new Moment (starter))->smobify_self ();
+  SCM sh = smobify (new Moment (shortest_playing));
+  SCM st = smobify (new Moment (starter));
 
-  scm_unprotect_object (st);
-  scm_unprotect_object (sh);
-  
   sc->set_elt_property ("shortest-playing-duration", sh);  
   sc->set_elt_property ("shortest-starter-duration", st);
 }
diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 9cec28f42b..74efa874af 100644
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -79,7 +79,7 @@ Timing_translator::do_process_music()
 				  measure_position ().str ()));
 	      // resync
 	      daddy_trans_l_->set_property("measurePosition",
-					   (new Moment)->smobify_self ());
+					   smobify (new Moment));
 
 	    }
 	}
@@ -124,12 +124,9 @@ Timing_translator::do_creation_processing()
 {
   daddy_trans_l_->set_property ("timing" , SCM_BOOL_T);  
   daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1));
-  daddy_trans_l_->set_property("measurePosition",
-			       (new Moment)->smobify_self());
-  daddy_trans_l_->set_property ("oneBeat",
-				(new Moment (1,4))->smobify_self ());
-  daddy_trans_l_->set_property("measureLength",
-			       (new Moment (1))->smobify_self());
+  daddy_trans_l_->set_property ("measurePosition", smobify (new Moment));
+  daddy_trans_l_->set_property ("oneBeat", smobify (new Moment (1,4)));
+  daddy_trans_l_->set_property ("measureLength", smobify (new Moment (1)));
 }
 
 Moment
@@ -160,10 +157,8 @@ Timing_translator::set_time_signature (int l, int o)
 {
   Moment one_beat = Moment (1)/Moment (o);
   Moment len = Moment (l) * one_beat;
-  daddy_trans_l_->set_property ("measureLength",
-				(new Moment (len))->smobify_self ());
-  daddy_trans_l_->set_property ("beatLength",
-				(new Moment (one_beat))->smobify_self ());
+  daddy_trans_l_->set_property ("measureLength", smobify (new Moment (len)));
+  daddy_trans_l_->set_property ("beatLength", smobify (new Moment (one_beat)));
 }
 
 Timing_translator::Timing_translator()
@@ -219,7 +214,7 @@ Timing_translator::do_post_move_processing()
   else
     {
       measposp = new Moment;
-      daddy_trans_l_->set_property ("measurePosition", measposp->smobify_self ());
+      daddy_trans_l_->set_property ("measurePosition", smobify (measposp));
     }
   
   *measposp += dt;
diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index b1fe324985..98fcbfe64b 100644
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -257,7 +257,7 @@ if to_diff == from_diff:
 	elif to_src:
 	      to_diff = to_diff + '.src'
 	else:
-	      sys.stderr.write (name + ': nothing to do: to == from == ' + from_diff + '\n')
+	      sys.stderr.write (patch_name + ': nothing to do: to == from = ' + from_diff + '\n')
 	      sys.exit (1)
 
 if not patch_name:
diff --git a/stepmake/bin/packagepython.py b/stepmake/bin/packagepython.py
index 1950f56935..10ab9a8065 100755
--- a/stepmake/bin/packagepython.py
+++ b/stepmake/bin/packagepython.py
@@ -121,10 +121,9 @@ def version_tuple_to_str(tup):
 
 def version_str_to_tuple(str):
 	t = string.split(str, '.')
-	try:
-		mypatch = t[3]
-	except IndexError:
-		mypatch = ''
+	mypatch = ''
+	if len (t) >= 4:
+		mypatch = string.join (t[3:], '.')
 	return (string.atoi(t[0]), string.atoi(t[1]), string.atoi(t[2]), mypatch)
 
 def version_compare (tupl, tupr):