From 1793d538e145b4f8f4954cabb29bd8072a2ec502 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 16 Oct 2006 20:14:00 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ ly/paper-defaults.ly | 5 +++-- scm/paper.scm | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 154419cf1a..b34c289c81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ 2006-10-16 Han-Wen Nienhuys + * ly/paper-defaults.ly: set left/right margin. + + * scm/paper.scm (set-paper-dimensions): use left-margin and + right-margin for computing linewidth. + * Documentation/topdocs/NEWS.tely (Top): idem. * input/regression/lyric-tie.ly (texidoc): use vowels for tied diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly index 44ec0b961e..8b211581cf 100644 --- a/ly/paper-defaults.ly +++ b/ly/paper-defaults.ly @@ -121,9 +121,10 @@ bottom-margin = 6 \mm head-separation = 4 \mm foot-separation = 4 \mm - right-margin = 10 \mm - left-margin = ##f + left-margin = 10 \mm + right-margin = 10 \mm + first-page-number = #1 print-first-page-number =##f } diff --git a/scm/paper.scm b/scm/paper.scm index c50bcbe6ce..b729b996e5 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -94,7 +94,10 @@ (let* ((mm (eval 'mm m))) (module-define! m 'paper-width w) (module-define! m 'paper-height h) - (module-define! m 'line-width (- w (* 20 mm))) + (module-define! m 'line-width (- w + (ly:modules-lookup (list m) 'left-margin) + (ly:modules-lookup (list m) 'right-margin))) + (module-define! m 'indent (/ w 14)) ;; page layout - what to do with (printer specific!) margin settings? -- 2.39.5