From f482ca00b50faf063a422a80bdbc8fd96ec13fc9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 1 Jun 2006 18:57:04 +0000 Subject: [PATCH] * 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) --- ChangeLog | 5 +++++ scm/framework-eps.scm | 2 +- scm/framework-ps.scm | 2 +- scm/stencil.scm | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee9b4b6c0a..deee21b051 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-06-01 Han-Wen Nienhuys + * 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 930ac51bf1..2260c00c2e 100644 --- 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 99e4b31204..0b8372b47d 100644 --- 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 c47baa3815..b8f5acb158 100644 --- 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)) )) -- 2.39.5