X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpage.scm;h=20e58b61e21c4bf0bcdac8a61318a15cebace630;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=8fa1f0e10e9f7e0188ed172e7a678e93886893c5;hpb=0a71592e9a7b4e43e08fb8b0012c831bf6513cbb;p=lilypond.git diff --git a/scm/page.scm b/scm/page.scm index 8fa1f0e10e..20e58b61e2 100644 --- a/scm/page.scm +++ b/scm/page.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2006--2014 Han-Wen Nienhuys +;;;; Copyright (C) 2006--2015 Han-Wen Nienhuys ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -102,6 +102,7 @@ (ly:stencil-add stencil (ly:stencil-translate-axis (annotate-spacing-spec layout + (symbol->string sym) spacing-spec (- top-margin) (car header-extent) @@ -226,7 +227,7 @@ system-separator-markup) #f)) - (page-stencil (ly:make-stencil '())) + (page-stencil empty-stencil) (last-system #f) (last-y 0.0) @@ -242,12 +243,14 @@ (add-system (lambda (system) (let* ((stencil (paper-system-stencil system)) - (y (ly:prob-property system 'Y-offset 0)) + (extra-offset (ly:prob-property system 'extra-offset '(0 . 0))) + (x (+ (ly:prob-property system 'X-offset 0.0) + (car extra-offset))) + (y (+ (ly:prob-property system 'Y-offset 0.0) + (cdr extra-offset))) (is-title (paper-system-title? system))) - (add-to-page stencil - (ly:prob-property system 'X-offset 0.0) - y) + (add-to-page stencil x y) (if (and (ly:stencil? system-separator-stencil) last-system (not (paper-system-title? system))