Unify define-builtin-markup-command and define-markup-command

[lilypond.git] / scm / stencil.scm

diff --git a/scm/stencil.scm b/scm/stencil.scm
index 0393c617491a7b8dbabc8ab873f1a200ff10f746..04ace53b3b75c322472c8e4ff32b5d2cc9964736 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -1,8 +1,19 @@
-;;;; stencil.scm -- 
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2003--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/>.
 
 (define-public (stack-stencils axis dir padding stils)
   "Stack stencils STILS in direction AXIS, DIR, using PADDING."
@@ -56,14 +67,14 @@
          (set! result (car p)))))
 
   result)
-    
 
-(define-public (bracketify-stencil stil axis thick protusion padding)
+
+(define-public (bracketify-stencil stil axis thick protrusion padding)
   "Add brackets around STIL, producing a new stencil."
 
   (let* ((ext (ly:stencil-extent stil axis))
-        (lb (ly:bracket axis ext thick protusion))
-        (rb (ly:bracket axis ext thick (- protusion))))
+        (lb (ly:bracket axis ext thick protrusion))
+        (rb (ly:bracket axis ext thick (- protrusion))))
     (set! stil
          (ly:stencil-combine-at-edge stil (other-axis axis) 1 rb padding))
     (set! stil