CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/31 21:12:21
Modified files:
. : ChangeLog
lily : ly-module.cc
mf : aybabtu.pe.in
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4103&tr2=1.4104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ly-module.cc.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/aybabtu.pe.in.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4103 lilypond/ChangeLog:1.4104
--- lilypond/ChangeLog:1.4103 Wed Aug 31 13:20:23 2005
+++ lilypond/ChangeLog Wed Aug 31 21:12:20 2005
@@ -5,13 +5,18 @@
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 <[EMAIL PROTECTED]>
+
+ * 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
Index: lilypond/lily/ly-module.cc
diff -u lilypond/lily/ly-module.cc:1.53 lilypond/lily/ly-module.cc:1.54
--- lilypond/lily/ly-module.cc:1.53 Fri Aug 19 19:54:01 2005
+++ lilypond/lily/ly-module.cc Wed Aug 31 21:12:21 2005
@@ -156,6 +156,15 @@
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 @@
#endif
return;
}
+
perform_gc_kludge = true;
Index: lilypond/mf/aybabtu.pe.in
diff -u lilypond/mf/aybabtu.pe.in:1.9 lilypond/mf/aybabtu.pe.in:1.10
--- lilypond/mf/aybabtu.pe.in:1.9 Fri Jun 17 12:41:13 2005
+++ lilypond/mf/aybabtu.pe.in Wed Aug 31 21:12:21 2005
@@ -80,8 +80,6 @@
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@");
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
