Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / scm / safe-lily.scm

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 5a664e2d9b4e9f966734519303e98c5cf3754b7c..ac89b1e2790177f1bb87d206bc516bddeb58a6c7 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (map
  (lambda (sym)
@@ -97,7 +97,7 @@
    ly:output-description
    ly:paper-book?
    ly:prob-property
-   ly:layout-def?
+   ly:output-def?
    ly:paper-get-font
    ly:paper-get-number
    ly:paper-system?
@@ -161,8 +161,8 @@
    ly:hara-kiri-group-spanner::force-hara-kiri-callback
    ly:hara-kiri-group-spanner::y-extent
    ly:horizontal-bracket::print
-   ly:hyphen-spanner::print
-   ly:hyphen-spanner::set-spacing-rods
+   ly:lyric-hyphen::print
+   ly:lyric-hyphen::set-spacing-rods
    ly:key-signature-interface::print
    ly:line-spanner::print
    ly:lyric-extender::print