Run grand replace for 2015.

[lilypond.git] / lily / paper-system-scheme.cc

diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index 4187cfa3dbdf2dedea0af0cc96bad81025597619..c8f515aa52051b9daddb39b3de4de18430f93f21 100644 (file)
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -1,8 +1,8 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+  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
@@ -21,24 +21,24 @@
 #include "prob.hh"
 
 #include "skyline-pair.hh"
-  
+
 LY_DEFINE (ly_paper_system_p, "ly:paper-system?",
-         1, 0, 0, (SCM obj),
-         "Is @var{obj} a C++ @code{Prob} object of type"
-         " @code{paper-system}?")
+           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);
+  Prob *p1 = Prob::unsmob (sys1);
+  Prob *p2 = Prob::unsmob (sys2);
   Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("vertical-skylines"));
   Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("vertical-skylines"));
 
@@ -46,8 +46,8 @@ LY_DEFINE (ly_paper_system_minimum_distance, "ly:paper-system-minimum-distance",
     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 = Stencil::unsmob (p1->get_property ("stencil"));
+      Stencil *s2 = Stencil::unsmob (p2->get_property ("stencil"));
       Interval iv1 = s1->extent (Y_AXIS);
       Interval iv2 = s2->extent (Y_AXIS);
       ret = iv2[UP] - iv1[DOWN];