X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper-system.scm;h=9e9f9ab7d4ca85357f1b759de1745cc5ae75a384;hb=c49d47e3859b857885408a9deda16a9973eb1e21;hp=70985aae6669d012d8ee6a54d7b8e2f76c4ef70a;hpb=34d3e5e54d8036b99e42cfb6079e1f349eeb801f;p=lilypond.git

diff --git a/scm/paper-system.scm b/scm/paper-system.scm
index 70985aae66..9e9f9ab7d4 100644
--- a/scm/paper-system.scm
+++ b/scm/paper-system.scm
@@ -1,10 +1,19 @@
-;;
-;; paper-system.scm -- implement paper-system objects.
-;;
-;; source file of the GNU LilyPond music typesetter
-;;
-;; (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
-;;
+;;;; This file is part of LilyPond, the GNU music typesetter.
+;;;;
+;;;; Copyright (C) 2006--2011 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-module (scm paper-system))
 
@@ -17,11 +26,22 @@
 (define-public (paper-system-stencil system)
   (ly:prob-property system 'stencil))
 
+(define-public (paper-system-layout system)
+  (let*
+      ((g (paper-system-system-grob system)))
+
+    (if (ly:grob? g)
+	(ly:grob-layout  g)
+	#f)))
+
+(define-public (paper-system-system-grob paper-system)
+  (ly:prob-property paper-system 'system-grob))
+
 (define-public (paper-system-extent system axis)
   (ly:stencil-extent (paper-system-stencil system) axis))
 
 (define-public (paper-system-staff-extents ps)
-  (ly:prob-property ps 'refpoint-Y-extent '(0 . 0)))
+  (ly:prob-property ps 'staff-refpoint-extent '(0 . 0)))
 
 (define-public (paper-system-annotate-last system layout)
   (let*
@@ -45,58 +65,47 @@
     (set! (ly:prob-property system 'stencil)
 	  stencil)
   ))
-  
-(define-public (paper-system-annotate system layout)
-  "Add arrows and texts to indicate which lengths are set."
-  
-  (let*
-      ((annotations (ly:make-stencil '() (cons 0 2) (cons 0 0)))
-       (append-stencil
-	(lambda (a b)
-	  (ly:stencil-combine-at-edge a X RIGHT b 0.5 0)))
 
-       (annotate-property
-	(lambda (name extent is-length?)
-	  (set! annotations
-		(append-stencil annotations
-				(annotate-y-interval layout
-						     name extent is-length?)))))
-
-       (bbox-extent (paper-system-extent system Y))
-       (refp-extent (ly:prob-property system 'refpoint-Y-extent))
-       (next-space (ly:prob-property system 'next-space
-					     (ly:output-def-lookup layout 'between-system-space)
-					     ))
-       (next-padding (ly:prob-property system 'next-padding
-					       (ly:output-def-lookup layout 'between-system-padding)
-					       ))
-       )
-
-    (if (number-pair? bbox-extent)
-	(begin
-	  (annotate-property  "Y-extent"
-			       bbox-extent #f)
-	  (annotate-property  "next-padding"
-			     (interval-translate (cons (- next-padding) 0) (car bbox-extent))
-			     #t)))
-    
-    ;; titles don't have a refpoint-Y-extent.
-    (if (number-pair? refp-extent)
-	(begin
-	  (annotate-property "refpoint-Y-extent"
-			     refp-extent #f)
-	
-	  (annotate-property "next-space"
-			     (interval-translate (cons (- next-space) 0) (car refp-extent))
-		       #t)))
+; TODO: annotate the spacing for every spaceable staff within the system.
+(define-public (paper-system-annotate system next-system layout)
+  "Add arrows and texts to indicate which lengths are set."
+  (let* ((annotations (list))
+	 (grob (ly:prob-property system 'system-grob))
+	 (estimate-extent (if (ly:grob? grob)
+			      (annotate-y-interval layout
+						   "extent-estimate"
+						   (ly:grob-property grob 'pure-Y-extent)
+						   #f)
+			      #f)))
+    (let* ((spacing-spec (cond ((and next-system
+				     (paper-system-title? system)
+				     (paper-system-title? next-system))
+				(ly:output-def-lookup layout 'markup-markup-spacing))
+			       ((paper-system-title? system)
+				(ly:output-def-lookup layout 'markup-system-spacing))
+			       ((and next-system
+				     (paper-system-title? next-system))
+				(ly:output-def-lookup layout 'score-markup-spacing))
+			       ((not next-system)
+				(ly:output-def-lookup layout 'last-bottom-spacing))
+			       (else
+				(ly:output-def-lookup layout 'system-system-spacing))))
+	   (last-staff-Y (car (paper-system-staff-extents system))))
 
-    (set! (ly:prob-property system 'stencil)
-	  (ly:stencil-add
-	   (ly:prob-property system 'stencil)
-	   (ly:make-stencil
-	    (ly:stencil-expr annotations)
-	    (ly:stencil-extent empty-stencil X)
-	    (ly:stencil-extent empty-stencil Y)
-	    )))
-    
-    ))
+      (set! annotations
+	    (annotate-spacing-spec layout spacing-spec last-staff-Y (car (paper-system-extent system Y)))))
+    (if estimate-extent
+	(set! annotations
+	      (stack-stencils X RIGHT 0.5
+			      (list annotations
+				    estimate-extent))))
+				
+    (if (not (null? annotations))
+	(set! (ly:prob-property system 'stencil)
+	      (ly:stencil-add
+	       (ly:prob-property system 'stencil)
+	       (ly:make-stencil
+		(ly:stencil-expr annotations)
+		(ly:stencil-extent empty-stencil X)
+		(ly:stencil-extent empty-stencil Y)))))
+    (ly:prob-property system 'stencil)))