From e94b1f8c791251d4d7ae948c04302d58d0abbd8c Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 23:56:26 +0000
Subject: [PATCH] lilypond-1.3.92

---
 lily/include/scm-hash.hh | 12 ++++++++++--
 scripts/etf2ly.py        |  3 +--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index ae733e9df8..a19ed279e7 100644
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -28,7 +28,7 @@ struct SCM_less
 typedef map<SCM,SCM, SCM_less> Scm_stl_map;
 
 /**
-   auto resizing hash table. This should come from GUILE.
+   auto resizing hash table. 
 
    1. ALWAYS USE THIS AS VIA A POINTER, i.e.
 
@@ -46,6 +46,15 @@ typedef map<SCM,SCM, SCM_less> Scm_stl_map;
    2. UPON DESTRUCTION, DO
 
    scm_unprotect_object (tab->self_scm_);
+
+
+
+
+   TODO:
+
+   This should come from GUILE. We're typically doing double work,
+   because KEY already is a symbol, and is looked up in a symbol
+   hashtable.
    
  */
 class Scheme_hash_table :  private Scm_stl_map
@@ -66,7 +75,6 @@ public:
 
   SCM to_alist () const;
   DECLARE_SMOBS(Scheme_hash_table,foo);
-
 };
 
 #endif /* SCM_HASH_HH */
diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 4d142ff7e5..d469cc1775 100644
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -355,14 +355,13 @@ class Measure:
 	def calculate (self):
 		fs = []
 
-		
 		if len (self.finale) < 2:
 			fs = self.finale[0]
 			fs = map (string.atoi, list (fs))
 			self.clef = fs[1]
 			self.frames = [fs[0]]
 		else:
-			fs = self.finale[0:2]
+			fs = self.finale[0] + self.finale[1]
 			
 			fs = map (string.atoi, list (fs))
 			self.clef = fs[0]
-- 
2.39.5