lilypond-1.5.18

diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index 6a4da6320e522a3ec30318253020636e8bfb8021..f1f45fa8c86801bc12013bb9711e323160d1467d 100644 (file)
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -36,7 +36,7 @@
       }
       \context LyricsVoice = "v-2" \lyrics {
         \property LyricsVoice . stanza = "2:"
-        x x x __ x
+        x x x __ x.
       }
    >
 }

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 7cc9232bf26b921c51120566d2de168252895a70..54c9decd293fea8ff8ef6a33d7caabae96ff427e 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -23,6 +23,15 @@
 /* Guile 1.3.4 compatibility */
 #if GUILE_MINOR_VERSION < 4
 
+
+#ifndef SCM_CELL_TYPE
+#define SCM_CELL_TYPE(X) SCM_CAR (X)
+#endif
+
+#ifndef SCM_CELL_WORD_1
+#define SCM_CELL_WORD_1(X) SCM_CDR (X)
+#endif
+
 #define scm_bits_t SCM
 
 #define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port)