From: janneke <janneke>
Date: Mon, 11 Oct 2004 20:28:15 +0000 (+0000)
Subject: * scm/framework-ps.scm (page-header): Fix Layout renaming bug.
X-Git-Tag: release/2.3.24^2~47
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8af509f9339036b0f48f7de9d683ee7d5f5a3ed6;p=lilypond.git
* scm/framework-ps.scm (page-header): Fix Layout renaming bug.
* scm/*.scm:
* ly/paper-defaults.ly: Use papersizename only.
---
diff --git a/ChangeLog b/ChangeLog
index a2a26a314a..ba4c48edff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-11 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * scm/framework-ps.scm (page-header): Fix Layout renaming bug.
+
+ * scm/*.scm:
+ * ly/paper-defaults.ly: Use papersizename only.
+
2004-10-11 Werner Lemberg <wl@gnu.org>
* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make
diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index d1c57f3d72..9c546b85df 100644
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -60,7 +60,7 @@
%% ugh. Should use /etc/papersize and set explicitely for
%% documentation.
- papersize = "a4"
+ papersizename = "a4"
#(define font-defaults
'((font-encoding . fetaMusic)))
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index b341102007..c487c36b91 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -160,7 +160,7 @@
"/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter \n"
(output-entry "staff-line-thickness" 'linethickness)
(output-entry "line-width" 'linewidth)
- (output-entry "paper-size" 'papersize)
+ (output-entry "paper-size" 'papersizename)
(output-entry "staff-height" 'staffheight) ;junkme.
"/output-scale "
(number->string (ly:output-def-lookup layout 'outputscale))
@@ -207,8 +207,8 @@
(if (eq? (ly:output-def-lookup paper 'landscape) #t)
"Landscape\n"
"Portrait\n")
- "%%DocumentLayoutSizes: "
- (ly:output-def-lookup paper 'papersize) "\n"))
+ "%%DocumentPaperSizes: "
+ (ly:output-def-lookup paper 'papersizename) "\n"))
(define (preamble paper)
(list
@@ -216,10 +216,7 @@
(ly:gulp-file "music-drawing-routines.ps")
(ly:gulp-file "lilyponddefs.ps")
(load-fonts paper)
- (define-fonts paper)
-
-
- ))
+ (define-fonts paper)))
(define-public (output-framework outputter book scopes fields basename)
(let* ((paper (ly:paper-book-paper book))
@@ -280,19 +277,17 @@
(ly:outputter-dump-string outputter "} stop-system\n%%Trailer\n%%EOF\n")))
(define-public (convert-to-pdf book name)
- (let*
- ((defs (ly:paper-book-paper book))
- (size (ly:output-def-lookup defs 'papersize)))
+ (let* ((defs (ly:paper-book-paper book))
+ (papersizename (ly:output-def-lookup defs 'papersizename)))
(if (equal? name "-")
(ly:warn "Can't convert <stdout> to PDF")
- (postscript->pdf (if (string? size) size "a4")
+ (postscript->pdf (if (string? papersizename) papersizename "a4")
name))))
(define-public (convert-to-png book name)
- (let*
- ((defs (ly:paper-book-paper book))
- (resolution (ly:output-def-lookup defs 'pngresolution)))
+ (let* ((defs (ly:paper-book-paper book))
+ (resolution (ly:output-def-lookup defs 'pngresolution)))
(postscript->png (if (number? resolution) resolution 90)
name)))
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 8e27a74be0..40b4f6814f 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -78,7 +78,7 @@
(number->string (exact->inexact
(ly:paper-outputscale paper))))
(tex-string-def "lilypondpaper" 'papersize
- (eval 'papersize (ly:output-def-scope paper)))
+ (eval 'papersizename (ly:output-def-scope paper)))
;; paper/layout?
(tex-string-def "lilypondpaper" 'inputencoding
(eval 'inputencoding (ly:output-def-scope paper)))
@@ -261,15 +261,14 @@
(define-public (convert-to-pdf book name)
(let* ((defs (ly:paper-book-paper book))
- (size (ly:output-def-lookup defs 'papersize)))
+ (papersizename (ly:output-def-lookup defs 'papersizename)))
- (postscript->pdf (if (string? size) size "a4")
+ (postscript->pdf (if (string? papersizename) papersizename "a4")
(string-append (basename name ".tex") ".ps"))))
(define-public (convert-to-png book name)
- (let*
- ((defs (ly:paper-book-paper book))
- (resolution (ly:output-def-lookup defs 'pngresolution)))
+ (let* ((defs (ly:paper-book-paper book))
+ (resolution (ly:output-def-lookup defs 'pngresolution)))
(postscript->png
(if (number? resolution) resolution 90)
@@ -277,9 +276,9 @@
(define-public (convert-to-ps book name)
(let* ((paper (ly:paper-book-paper book))
- (papersize (ly:output-def-lookup paper 'papersizename))
+ (papersizename (ly:output-def-lookup paper 'papersizename))
(landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))
- (cmd (string-append "dvips -t " papersize
+ (cmd (string-append "dvips -t " papersizename
(if landscape? " -t landscape " " ")
" -u+ec-mftrace.map -u+lilypond.map -Ppdf "
(basename name ".tex"))))
@@ -289,10 +288,11 @@
(system cmd)))
(define-public (convert-to-dvi book name)
- (let*
- ((curr-extra-mem (string->number (regexp-substitute/global #f " *%.*\n?"
- (ly:kpathsea-expand-variable "$extra_mem_top")
- 'pre "" 'post)))
+ (let* ((curr-extra-mem (string->number
+ (regexp-substitute/global
+ #f " *%.*\n?"
+ (ly:kpathsea-expand-variable "$extra_mem_top")
+ 'pre "" 'post)))
(cmd (string-append "latex \\\\nonstopmode \\\\input " name)))
(setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
diff --git a/scm/lily.scm b/scm/lily.scm
index 5bfa942cfd..65be2c56d1 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -562,8 +562,8 @@ possibly turned off."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-public (postscript->pdf papersize name)
- (let* ((cmd (string-append "ps2pdf -sPAPERSIZE=" papersize " " name))
+(define-public (postscript->pdf papersizename name)
+ (let* ((cmd (string-append "ps2pdf -sPAPERSIZE=" papersizename " " name))
(output-name
(regexp-substitute/global #f "\\.ps" name 'pre ".pdf" 'post)))
diff --git a/scm/paper.scm b/scm/paper.scm
index d1233f3e5b..a73549291e 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -113,15 +113,6 @@
(set! entry (swap entry)))
(set-paper-dimensions module (car entry) (cdr entry))
-
- (module-define! module 'papersize name)
-
- ;; FIXME: if this name-play is on purpose, please document. Why
- ;; is it not used troughout? Should this be removed, or
- ;; should 'papersize be removed?
-
- ;; setting \paper{ papersize = "a6" } gives funny results.
-
(module-define! module 'papersizename name)
(if landscape?