*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index df464809e2d192b822e8b156612c7faddac2a79e..643d4df33a1b9a64b5539a5c9f9808beb6ebce6f 100644 (file)
--- 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 0f5fa5d46eca59c68faed03882df0963ea77c939..2ff3915cbf59de1b99cc69dd666ac5b3102930b6 100644 (file)
--- 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 98b691e804ae58f868267823bd717737b44e8d8d..9072d30c0cefb5e2a522e10442bb93d18433c2d2 100644 (file)
--- 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@");