X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system-scheme.cc;h=1f5a39b96af82208e73285d8595951a3b992fccd;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=69351106110980c61ca58bd7df7722bfd0b5313a;hpb=9d9e2e5637e06d98245c3395b58207ec173e7e7d;p=lilypond.git

diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index 6935110611..1f5a39b96a 100644
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -1,41 +1,53 @@
-/* 
-  paper-system-scheme.cc -- implement Paper_system bindings.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2008--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
+
+
+  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/>.
 */
 
 #include "prob.hh"
 
 #include "skyline-pair.hh"
-  
+
 LY_DEFINE (ly_paper_system_p, "ly:paper-system?",
-	  1, 0, 0, (SCM obj),
-	  "Type predicate.")
+           1, 0, 0, (SCM obj),
+           "Is @var{obj} a C++ @code{Prob} object of type"
+           " @code{paper-system}?")
 {
   return ly_prob_type_p (obj, ly_symbol2scm ("paper-system"));
 }
 
 LY_DEFINE (ly_paper_system_minimum_distance, "ly:paper-system-minimum-distance",
-	   2, 0, 0, (SCM sys1, SCM sys2),
-	   "Measure the minimum distance between these two paper-systems,"
-	   " using their stored skylines if possible and falling back to"
-	   " their extents otherwise.")
+           2, 0, 0, (SCM sys1, SCM sys2),
+           "Measure the minimum distance between these two paper-systems,"
+           " using their stored skylines if possible and falling back to"
+           " their extents otherwise.")
 {
   Real ret = 0;
-  Prob *p1 = unsmob_prob (sys1);
-  Prob *p2 = unsmob_prob (sys2);
-  Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("vertical-skylines"));
-  Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("vertical-skylines"));
+  Prob *p1 = unsmob<Prob> (sys1);
+  Prob *p2 = unsmob<Prob> (sys2);
+  Skyline_pair *sky1 = unsmob<Skyline_pair> (p1->get_property ("vertical-skylines"));
+  Skyline_pair *sky2 = unsmob<Skyline_pair> (p2->get_property ("vertical-skylines"));
 
   if (sky1 && sky2)
     ret = (*sky1)[DOWN].distance ((*sky2)[UP]);
   else
     {
-      Stencil *s1 = unsmob_stencil (p1->get_property ("stencil"));
-      Stencil *s2 = unsmob_stencil (p2->get_property ("stencil"));
+      Stencil *s1 = unsmob<Stencil> (p1->get_property ("stencil"));
+      Stencil *s2 = unsmob<Stencil> (p2->get_property ("stencil"));
       Interval iv1 = s1->extent (Y_AXIS);
       Interval iv2 = s2->extent (Y_AXIS);
       ret = iv2[UP] - iv1[DOWN];