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

lilypond-1.3.53
---

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index a9d868a3a9..e7dcde019b 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -137,10 +137,11 @@ Axis_group_interface::get_children ()
 bool
 Axis_group_interface::has_interface_b ()
 {
-  SCM memq = scm_memq (ly_symbol2scm ("Axis_group"),
-		       elt_l_->get_elt_property ("interfaces"));
-  
-  return (memq != SCM_BOOL_F);
+  SCM ifs = elt_l_->get_elt_property ("interfaces");
+
+  if (!gh_pair_p (ifs ))
+    return false;
+  return scm_memq (ly_symbol2scm ("Axis_group"),ifs)  != SCM_BOOL_F;
 }
 
 
diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 7a05a08844..0e8e1d0942 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -32,7 +32,14 @@
 Molecule
 Chord_name::ly_word2molecule (SCM word) const
 {
-  Dictionary<SCM> option_dict;	// junkme
+  /*
+    junkme.
+
+    Using the dict doesn't save code, since you have to compare
+    dict entries by hand later on anyway.
+    
+   */
+  Dictionary<SCM> option_dict;	
   if (gh_pair_p (word))
     {
       SCM options = gh_cdr (word);
@@ -40,8 +47,7 @@ Chord_name::ly_word2molecule (SCM word) const
       while (gh_pair_p (options))
         {
 	  SCM option = gh_car (options);
-	  if (option != SCM_UNDEFINED && option != SCM_BOOL_F
-	      && gh_pair_p (option))
+	  if (gh_pair_p (option))
 	    {
 	      SCM key = gh_car (option);
 	      SCM val = gh_cdr (option);
@@ -57,8 +63,11 @@ Chord_name::ly_word2molecule (SCM word) const
 	  options = gh_cdr (options);
         }
     }
-  Real ex = lookup_l ()->text ("", "x", paper_l ()).extent
-	    ()[Y_AXIS].length ();
+
+  /*
+    UGH. Should read from font metric structure.
+  */
+  Real ex = lookup_l ()->text ("", "x", paper_l ()).extent(Y_AXIS).length ();
   if (gh_string_p (word))
     {
       String w = ly_scm2string (word);
@@ -77,7 +86,7 @@ Chord_name::ly_word2molecule (SCM word) const
 	  && ly_scm2string (option_dict["type"]) == "super")
 	{
 	  Real super_y = ex / 2;
-	  //super_y += -acc.extent ()[Y_AXIS][MIN];
+	  //super_y += -acc.extent (Y_AXIS)[MIN];
 	  offset = Offset (0, super_y);
 	  if (!size)
 	    size = -2;