From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 24 Oct 2005 08:48:35 +0000 (+0000)
Subject: * scm/layout-page-layout.scm (page-headfoot): annotate
X-Git-Tag: release/2.7.15~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=81e278e6bdd27e41e05f8d336e8ace777c0b7a56;p=lilypond.git

* scm/layout-page-layout.scm (page-headfoot): annotate
pagetopspace too.

* scm/stencil.scm (dimension-arrows): shorten arrowed lines a bit.

* scm/layout-page-layout.scm (annotate-y-interval): y-annotation
doesn't take y-space.

* scm/paper.scm (paper-alist): fix A7 dimensions.
---

diff --git a/ChangeLog b/ChangeLog
index a269eb38ec..bce6caa934 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-24  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scm/layout-page-layout.scm (page-headfoot): annotate
+	pagetopspace too.
+
+	* scm/stencil.scm (dimension-arrows): shorten arrowed lines a bit. 
+
+	* scm/layout-page-layout.scm (annotate-y-interval): y-annotation
+	doesn't take y-space.
+
+	* scm/paper.scm (paper-alist): fix A7 dimensions. 
+
 2005-10-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* stepmake/stepmake/generic-vars.make (DIST_FILES): Fix
diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 9e217b33be..3c8a07db5c 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -68,12 +68,6 @@ Grob::internal_set_property (SCM sym, SCM v)
 }
 
 //#define PROFILE_PROPERTY_ACCESSES
-
-/*
-  Ugh C&P Coding.
-
-  Retrieve property without triggering callback.
- */
 SCM
 Grob::get_property_data (SCM sym) const
 {
diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 64259c0263..85e19ab95c 100644
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -80,8 +80,14 @@
     (set! annotation (ly:stencil-translate annotation
 			  (cons 0 (interval-center extent))))
 
-    (ly:stencil-combine-at-edge arrows X RIGHT annotation 0.5 0)
-    ))
+    (set! annotation
+	  (ly:stencil-combine-at-edge arrows X RIGHT annotation 0.5 0))
+
+    (set! annotation
+	  (ly:make-stencil (ly:stencil-expr annotation)
+			   (ly:stencil-extent annotation X)
+			   (cons 10000 -10000)))
+    annotation))
 
 (define (paper-system-annotate-last system layout)
   (let*
@@ -180,6 +186,7 @@
 			   #t)
       1 X))
     
+
     (add-stencil
      (ly:stencil-translate-axis 
       (annotate-y-interval layout "topmargin"
@@ -246,6 +253,18 @@
 					   #t)
 		      (/ (ly:output-def-lookup layout 'linewidth) 2)
 		      X)
+		     (if (= dir UP)
+			 (ly:stencil-translate-axis
+			  (annotate-y-interval layout
+					      "topspace"
+					      (cons
+					       (- (min 0 (* dir sep))
+						  (ly:output-def-lookup layout 'pagetopspace))
+					       (min 0 (* dir sep)))
+					      #t)
+			  (+ 7 (interval-center (ly:stencil-extent head-stencil X))) X)
+			 empty-stencil
+			 )
 		     head-stencil
 		     ))
 	      )))
diff --git a/scm/paper.scm b/scm/paper.scm
index 0085a15839..f86aeb0161 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -73,7 +73,7 @@
     (module-define! old-mod '$defaultpaper new-paper)))
 
 (define-public paper-alist
-  '(("a7" . (cons (* 74.48 mm) (* 148.95 mm)))
+  '(("a7" . (cons (* 74.48 mm) (* 105 mm)))
     ("a6" . (cons (* 105 mm) (* 148.95 mm)))
     ("a5" . (cons (* 148.95 mm) (* 210 mm)))
     ("a4" . (cons (* 210 mm) (* 297.9 mm)))
diff --git a/scm/stencil.scm b/scm/stencil.scm
index 4cc57b39fd..3fb0df8b2d 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -129,6 +129,7 @@ encloses the contents.
 			    (list (real-part z) (imag-part z))))
        
        (z-dest (+ (* e_x (car destination)) (* e_y (cdr destination))))
+       (e_z (/ z-dest (magnitude z-dest)))
        (triangle-points '(-1+0.25i
 			  0
 			  -1-0.25i))
@@ -149,10 +150,16 @@ encloses the contents.
 	 `(polygon (quote ,(concatenate (map complex-to-offset p2s)))
 		   0.0
 		   #t) null null ) )
+       (thickness 0.1)
+       (shorten-line 0.5)
+       (start (complex-to-offset (/ (* e_z shorten-line) 2)))
+       (end (complex-to-offset (- z-dest (/ (* e_z shorten-line) 2))))
+       
        (line (ly:make-stencil
-	      `(draw-line 0.1 0 0
-			  ,(car destination)
-			  ,(cdr destination))
+	      `(draw-line ,thickness
+			  ,(car start) ,(cadr start)
+			  ,(car end) ,(cadr end)
+			  )
 	      (cons (min 0 (car destination))
 		    (min 0 (cdr destination)))
 	      (cons (max 0 (car destination))