Re: janitoring scm/layout-page-layout.scm

[Nicolas Sceaux]

Han-Wen Nienhuys <address@hidden> writes:

> Nicolas Sceaux schreef:
>> Hi,
>> Here is a patch cleaning the file scm/layout-page-layout.scm:
>>  - the page dumping function (used in two-pass spacing) is pushed in
>> a
>> separate file: scm/layout-page-dump.scm;
>>  - some functions regarding system position and distance are
>> introduced,
>> and auxiliary functions that were defined inside optimal-page-break are
>> moved to toplevel;
>>  - both files have their separate module to avoid polluting the lily
>> namespace.
>
> Sounds good. Please apply if you can also run "make web".

make web was not running for another reason: there are references to
paper-system-* functions in stencil.scm and define-markup-commands.scm,
which belong to the (lily) module, which does not use the 
(scm paper-system) module. After applying the attached patch, make web
ran fine. I don't understand how other people could run make web,
unless there's something broken in my tree. Should I apply this patch?

nicolas

Index: define-markup-commands.scm
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scm/define-markup-commands.scm,v
retrieving revision 1.150
diff -u -r1.150 define-markup-commands.scm
--- define-markup-commands.scm  13 Jun 2006 10:42:30 -0000      1.150
+++ define-markup-commands.scm  15 Jul 2006 10:17:14 -0000
@@ -250,8 +250,9 @@
   (let* ((output (ly:score-embedded-format score layout)))
 
     (if (ly:music-output? output)
-       (paper-system-stencil
-        (vector-ref (ly:paper-score-paper-systems output) 0))
+       (ly:prob-property
+        (vector-ref (ly:paper-score-paper-systems output) 0)
+         'stencil)
        (begin
          (ly:warning (_"no systems found in \\score markup, does it have a 
\\layout block?"))
          empty-stencil))))
Index: stencil.scm
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scm/stencil.scm,v
retrieving revision 1.39
diff -u -r1.39 stencil.scm
--- stencil.scm 13 Jun 2006 13:34:37 -0000      1.39
+++ stencil.scm 15 Jul 2006 10:17:14 -0000
@@ -284,7 +284,7 @@
     (and (number? x) (inexact? x)))
 
   (define system-grob
-    (paper-system-system-grob paper-system))
+    (ly:prob-property paper-system 'system-grob))
   
   (define output (open-output-file filename))
   
@@ -388,7 +388,7 @@
                 output)
        (interpret-for-signature found-grob (lambda (x) #f)
                                 (ly:stencil-expr
-                                 (paper-system-stencil paper-system)))))
+                                 (ly:prob-property paper-system 'stencil)))))
 
   ;; should be superfluous, but leaking "too many open files"?
   (close-port output))