From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 31 Aug 2005 21:12:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.9~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97aec2781e614b644d797f0380657fb50130d55f;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index df464809e2..643d4df33a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,14 +5,19 @@
 	undefined. 
 
 	* Documentation/user/lilypond-book.itely (Integrating LaTeX and
-	music): Document the \linebreak!
-	
+	music): Document the \linebreak
+
 	* Documentation/user/lilypond-book.itely,
 	input/tutorial/lbook-latex-test.tex,
 	Documentation/user/examples.itely: Remove \usepackage{graphics}
 
 2005-08-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* mf/aybabtu.pe.in (i): don't merge alphabet into aybabtu.
+
+	* lily/ly-module.cc (make_stand_in_procs_weak): 1.6.4 and earlier
+	compat bugfix.
+
 	* scripts/lilypond-book.py (PREAMBLE_LY): define
 	inside-lilypond-book
 	(modify_preamble): new function. Insert \RequirePackage{graphics}
diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 0f5fa5d46e..2ff3915cbf 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -156,6 +156,15 @@ redefine_keyval (void *closure, SCM key, SCM val, SCM result)
 void
 make_stand_in_procs_weak ()
 {
+  /*
+    Ugh, ABI breakage for 1.6.5: scm_stand_in_procs is a hashtab from
+    1.6.5 on.
+   */
+  if (scm_is_pair (scm_stand_in_procs))
+    {
+      return; 
+    }
+      
   if (scm_weak_key_hash_table_p (scm_stand_in_procs) == SCM_BOOL_T)
     {
 #if (SCM_MINOR_VERSION == 7) 
@@ -163,6 +172,7 @@ make_stand_in_procs_weak ()
 #endif
       return; 
     }
+
   
   perform_gc_kludge = true;
   
diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in
index 98b691e804..9072d30c0c 100644
--- a/mf/aybabtu.pe.in
+++ b/mf/aybabtu.pe.in
@@ -80,8 +80,6 @@ LoadTableFromFile("LILF", "aybabtu.subfonts")
 LoadTableFromFile("LILC", "aybabtu.otf-table")
 LoadTableFromFile("LILY", "aybabtu.otf-gtable")
 
-MergeFonts ("feta-alphabet20.pfa");
-
 Generate("aybabtu.otf");
 Generate("aybabtu.svg");
 SetFontNames("PFAAybabtu-Regular", "PFAAybabtu", "PFAAybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");