resolve merge

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

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index a4625c1e926aac6c0bf9169b66ddeb2ac051db41..60ac97920bbd5984c07d8e3f9f849442ea2686dc 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -1,8 +1,19 @@
-;;;; safe-lily.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (map
  (lambda (sym)
@@ -43,7 +54,6 @@
    ly:format-output
    ly:get-all-function-documentation
    ly:get-all-translators
-   ly:get-glyph
    ly:get-option
    ly:grob-alist-chain
    ly:grob-default-font
@@ -128,7 +138,6 @@
    ly:stencil-translate
    ly:stencil-translate-axis
    ly:stencil?
-   ly:text-dimension
    ly:translator-description
    ly:translator-name
    ly:translator?
@@ -144,7 +153,6 @@
    ;;$defaultlayout
 
    ly:accidental-interface::print
-   ly:ambitus::print
    ly:arpeggio::print
    ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
@@ -170,7 +178,6 @@
    ly:multi-measure-rest::print
    ly:multi-measure-rest::set-spacing-rods
    ly:note-head::print
-;;   ly:note-head::brew-ez-stencil
    ly:ottava-bracket::print
    ly:paper-column::print
    ly:percent-repeat-item-interface::beat-slash