Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 31161e25cf0ff78491ff0448e8196eac5f42c6d0..c47f05583b26f21e3b2f888ef44f15a78090f1ce 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -97,12 +97,11 @@
    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?
    ly:output-def-lookup
-   ly:parse-string
    ly:parser-parse-string
    ly:pitch-alteration
    ly:pitch-diff
@@ -126,7 +125,6 @@
    ly:stencil-combine-at-edge
    ly:stencil-expr
    ly:stencil-extent
-   ly:stencil-moved-to-edge
    ly:stencil-translate
    ly:stencil-translate-axis
    ly:stencil?
@@ -161,8 +159,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