summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2006-10-11 23:56:44 +0000
committerHan-Wen Nienhuys <hanwen@xs4all.nl>2006-10-11 23:56:44 +0000
commitc8f97e6a48dce778db8e1e58702b958bf86eac7b (patch)
tree43cca3ebafc9f53644a8330492879287a70e37f2
parent7ad5c55bcb4f13327853e4c62af63eb6ab61d45b (diff)
(texidoc): new file.
-rw-r--r--ChangeLog2
-rw-r--r--input/regression/lyric-tie.ly10
-rw-r--r--lily/context.cc9
3 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d60d3ac44..14dad8993b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-10-12 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * input/regression/lyric-tie.ly (texidoc): new file.
+
* Documentation/topdocs/NEWS.tely (Top): add new feature.
* lily/general-scheme.cc (LY_DEFINE): elucidate docstring.
diff --git a/input/regression/lyric-tie.ly b/input/regression/lyric-tie.ly
new file mode 100644
index 0000000000..f36813f4a2
--- /dev/null
+++ b/input/regression/lyric-tie.ly
@@ -0,0 +1,10 @@
+\header
+{
+texidoc = "Tildes in lyric syllables are converted to tie symbols."
+ }
+
+\version "2.9.22"
+
+\lyrics {
+ bla~bla
+}
diff --git a/lily/context.cc b/lily/context.cc
index 629dfadc4f..80a6fb9138 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -645,10 +645,15 @@ Context::mark_smob (SCM sm)
scm_gc_mark (me->definition_mods_);
scm_gc_mark (me->properties_scm_);
scm_gc_mark (me->accepts_list_);
+
if (me->implementation_)
scm_gc_mark (me->implementation_->self_scm ());
- if (me->event_source_) scm_gc_mark (me->event_source_->self_scm ());
- if (me->events_below_) scm_gc_mark (me->events_below_->self_scm ());
+
+ if (me->event_source_)
+ scm_gc_mark (me->event_source_->self_scm ());
+
+ if (me->events_below_)
+ scm_gc_mark (me->events_below_->self_scm ());
return me->properties_scm_;
}