* scm/framework-ps.scm (output-framework): start system count at 1.

* scm/stencil.scm (write-system-signature): escape
newlines. Output empty stencils as (1,-1)

diff --git a/ChangeLog b/ChangeLog
index ee9b4b6c0ae442c5f253de49b578ee0d919c7639..deee21b0518854feac1bd0808a994efcf828d9ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scm/framework-ps.scm (output-framework): start system count at 1.
+
+       * scm/stencil.scm (write-system-signature): escape
+       newlines. Output empty stencils as (1,-1)
+
        * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
        $(outdir)/%.ly $(outdir)/%.ps): dump sigs for normal files too.
 

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 930ac51bf1141577bc80a23285adea40203e45d0..2260c00c2eb84df7d30726e5b703abb894fc732b 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -101,7 +101,7 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment."
   (output-scopes scopes fields basename)
 
   (if (ly:get-option 'dump-signatures)
-      (write-system-signatures basename (ly:paper-book-systems book) 0))
+      (write-system-signatures basename (ly:paper-book-systems book) 1))
   
   (dump-stencils-as-EPSes
    (map paper-system-stencil (ly:paper-book-systems book))

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 99e4b3120441676bd361d21ed04d3fde3bebff53..0b8372b47d45fa93384da9e6540fafdcd49ba9bc 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -456,7 +456,7 @@
         (port (ly:outputter-port outputter)))
 
     (if (ly:get-option 'dump-signatures)
-       (write-system-signatures basename (ly:paper-book-systems book) 0))
+       (write-system-signatures basename (ly:paper-book-systems book) 1))
   
     (output-scopes scopes fields basename)
     (display (file-header paper page-count #t) port)

diff --git a/scm/stencil.scm b/scm/stencil.scm
index c47baa3815a922c2af2e739452ef1ca4b65f5ff2..b8f5acb158a656f3e33a747bf8b94ab5f5514068 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -317,7 +317,7 @@ EndEPSF"))
 
   (define (pythonic-string expr)
     "escape quotes and slashes for python consumption"
-    (regexp-substitute/global #f "([\\\\'\"])" (format "~a" expr) 'pre "\\" 1 'post))
+    (regexp-substitute/global #f "([\n\\\\'\"])" (format "~a" expr) 'pre "\\" 1 'post))
 
   (define (pythonic-pair expr)
     (format "(~a,~a)"
@@ -344,8 +344,8 @@ EndEPSF"))
              "['~a', '~a', ~a, ~a, '~a'],\n"
              (cdr (assq 'name (ly:grob-property grob 'meta) ))
              (pythonic-string location)
-             (pythonic-pair (if (interval-empty? x-ext) '(0 . 0) x-ext))
-             (pythonic-pair (if (interval-empty? y-ext) '(0 . 0) y-ext))
+             (pythonic-pair (if (interval-empty? x-ext) '(1 . -1) x-ext))
+             (pythonic-pair (if (interval-empty? y-ext) '(1 . -1) y-ext))
              (pythonic-string collected))
       ))