Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / scm / page.scm

diff --git a/scm/page.scm b/scm/page.scm
index bfae0ea2f434b5d94732bd88cf682d3083a1f89e..8fa1f0e10e9f7e0188ed172e7a678e93886893c5 100644 (file)
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2006--2014 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
@@ -82,16 +82,12 @@
 (define (page-translate-systems page)
   (for-each
 
-   (lambda (sys-off)
-     (let*
-         ((sys (car sys-off))
-          (off (cadr sys-off)))
+   (lambda (sys off)
+     (if (not (number? (ly:prob-property sys 'Y-offset)))
+         (ly:prob-set-property! sys 'Y-offset off)))
 
-       (if (not (number? (ly:prob-property sys 'Y-offset)))
-           (ly:prob-set-property! sys 'Y-offset off))))
-
-   (zip (page-property page 'lines)
-        (page-property page 'configuration))))
+   (page-property page 'lines)
+   (page-property page 'configuration)))
 
 (define (annotate-top-space first-system layout header-stencil stencil)
   (let* ((top-margin (ly:output-def-lookup layout 'top-margin))
@@ -291,7 +287,7 @@
                     (append (cdr lines) (list #f)))
           (paper-system-annotate-last (car (last-pair lines)) layout)))
 
-    (map add-system lines)
+    (for-each add-system lines)
 
 
     (ly:prob-set-property! page 'bottom-system-edge
@@ -373,4 +369,3 @@
       (page-set-property! page 'printable-height (calc-printable-height page)))
 
   (page-property page 'printable-height))
-