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 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
2005-10-24 Jan Nieuwenhuizen <janneke@gnu.org>
* stepmake/stepmake/generic-vars.make (DIST_FILES): Fix
}
//#define PROFILE_PROPERTY_ACCESSES
}
//#define PROFILE_PROPERTY_ACCESSES
-
-/*
- Ugh C&P Coding.
-
- Retrieve property without triggering callback.
- */
SCM
Grob::get_property_data (SCM sym) const
{
SCM
Grob::get_property_data (SCM sym) const
{
(set! annotation (ly:stencil-translate annotation
(cons 0 (interval-center extent))))
(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*
(define (paper-system-annotate-last system layout)
(let*
(add-stencil
(ly:stencil-translate-axis
(annotate-y-interval layout "topmargin"
(add-stencil
(ly:stencil-translate-axis
(annotate-y-interval layout "topmargin"
#t)
(/ (ly:output-def-lookup layout 'linewidth) 2)
X)
#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
+ )
(module-define! old-mod '$defaultpaper new-paper)))
(define-public paper-alist
(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)))
("a6" . (cons (* 105 mm) (* 148.95 mm)))
("a5" . (cons (* 148.95 mm) (* 210 mm)))
("a4" . (cons (* 210 mm) (* 297.9 mm)))
(list (real-part z) (imag-part z))))
(z-dest (+ (* e_x (car destination)) (* e_y (cdr destination))))
(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))
(triangle-points '(-1+0.25i
0
-1-0.25i))
`(polygon (quote ,(concatenate (map complex-to-offset p2s)))
0.0
#t) null null ) )
`(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))))
+
- `(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))
(cons (min 0 (car destination))
(min 0 (cdr destination)))
(cons (max 0 (car destination))