CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/19 12:07:35
Modified files:
. : ChangeLog
Documentation/user: changing-defaults.itely examples.itely
lily : ly-module.cc
Log message:
* Documentation/user/examples.itely (Piano templates): change
Engraver_group_engraver -> Engraver_group
* lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
scm_stand_in_procs is not weak_any.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4042&tr2=1.4043&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/changing-defaults.itely.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/examples.itely.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ly-module.cc.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4042 lilypond/ChangeLog:1.4043
--- lilypond/ChangeLog:1.4042 Fri Aug 19 10:34:26 2005
+++ lilypond/ChangeLog Fri Aug 19 12:07:34 2005
@@ -1,5 +1,8 @@
2005-08-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * Documentation/user/examples.itely (Piano templates): change
+ Engraver_group_engraver -> Engraver_group
+
* lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
scm_stand_in_procs is not weak_any.
Index: lilypond/Documentation/user/changing-defaults.itely
diff -u lilypond/Documentation/user/changing-defaults.itely:1.133
lilypond/Documentation/user/changing-defaults.itely:1.134
--- lilypond/Documentation/user/changing-defaults.itely:1.133 Mon Jul 18
23:37:24 2005
+++ lilypond/Documentation/user/changing-defaults.itely Fri Aug 19 12:07:35 2005
@@ -661,7 +661,7 @@
@lilypond[quote,raggedright]
\layout { \context {
\name ImproVoice
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\consists "Note_heads_engraver"
\consists "Text_engraver"
\consists Pitch_squash_engraver
@@ -740,10 +740,10 @@
All these plug-ins have to cooperate, and this is achieved with a
special plug-in, which must be marked with the keyword @code{\type}.
-This should always be @internalsref{Engraver_group_engraver},
+This should always be @internalsref{Engraver_group},
@example
-\type "Engraver_group_engraver"
+\type "Engraver_group"
@end example
Put together, we get
@@ -751,7 +751,7 @@
@example
\context @{
\name ImproVoice
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\consists "Note_heads_engraver"
\consists "Text_engraver"
\consists Pitch_squash_engraver
Index: lilypond/Documentation/user/examples.itely
diff -u lilypond/Documentation/user/examples.itely:1.43
lilypond/Documentation/user/examples.itely:1.44
--- lilypond/Documentation/user/examples.itely:1.43 Wed Jul 27 23:31:05 2005
+++ lilypond/Documentation/user/examples.itely Fri Aug 19 12:07:35 2005
@@ -334,7 +334,7 @@
>>
\layout {
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name Dynamics
\alias Voice % So that \cresc works, for example.
\consists "Output_property_engraver"
Index: lilypond/lily/ly-module.cc
diff -u lilypond/lily/ly-module.cc:1.51 lilypond/lily/ly-module.cc:1.52
--- lilypond/lily/ly-module.cc:1.51 Fri Aug 19 10:34:26 2005
+++ lilypond/lily/ly-module.cc Fri Aug 19 12:07:35 2005
@@ -14,11 +14,13 @@
#ifdef MODULE_GC_KLUDGE
Protected_scm anonymous_modules = SCM_EOL;
+bool perform_gc_kludge;
#endif
void
clear_anonymous_modules ()
{
+#ifdef MODULE_GC_KLUDGE
for (SCM s = anonymous_modules;
scm_is_pair (s);
s = scm_cdr (s))
@@ -35,6 +37,7 @@
}
anonymous_modules = SCM_EOL;
+#endif
}
SCM
@@ -61,7 +64,8 @@
}
#ifdef MODULE_GC_KLUDGE
- anonymous_modules = scm_cons (mod, anonymous_modules);
+ if (perform_gc_kludge)
+ anonymous_modules = scm_cons (mod, anonymous_modules);
#endif
return mod;
@@ -153,7 +157,15 @@
make_stand_in_procs_weak ()
{
if (SCM_IS_WHVEC_ANY(scm_stand_in_procs))
- return;
+ {
+#if (SCM_MINOR_VERSION == 7)
+ perform_gc_kludge = false;
+#endif
+ return;
+ }
+
+ perform_gc_kludge = true;
+
SCM old_tab = scm_stand_in_procs;
SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
