''

[lilypond.git] / ps / lilyponddefs.ps

diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 114d0beaaaf563a75a88edbe542eff58e348dc01..991dc58caa7c5263f54dba3720469e3e9a6e6762 100644 (file)
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -5,22 +5,32 @@
 % hmm
 % /setgray { 1 add } bind def
 
-/staff-line-thickness lilypondpaperstafflinethickness def
+/staff-line-thickness lilypondpaperlinethickness def
 /staff-height lilypondpaperstaffheight def
 /line-width lilypondpaperlinewidth def
 
 % FIXME: why isn't this set (by default) by lily?
 % /text-height lilypondpapertextheight def
 
-/output-scale lilypondpaperoutputscale def
+/lily-output-units 2.83464  def  %% milimeter
+% /lily-output-units 0.996264  def  %% true points.
+
+/output-scale
+lilypondpaperoutputscale lily-output-units mul 
+def
+
+/set-ps-scale-to-lily-scale
+{
+output-scale output-scale scale
+} bind def
+
 /paper-size { lilypondpaperpapersize } bind def
 
 % FIXME
 % urg, read from paper block
-% fixed base line skip value, for single line staffs
+% fixed base line skip value, for single line staves
 /base-line-skip lilypondpaperlineheight def
 
-
 /init-paper {
        gsave
        .1 setlinewidth
@@ -46,7 +56,7 @@
        grestore
 } bind def
 
-/start-line % height
+/start-system % height
 {
        dup base-line-skip gt {
                /line-height exch def
@@ -62,7 +72,7 @@
        line-x line-y translate
 } bind def
 
-/stop-line
+/stop-system
 { 
        /the-line exch def
        the-line
@@ -74,32 +84,32 @@
 % FIXME: font definitions should come from LilyPond
 %        built-in ps fonts are ugly
 /huge-bold-font {
-       /Times-Bold findfont 20.7 scalefont setfont
+       /Palatino-Bold findfont 20.7 scalefont setfont
 } bind def
 
 /Large-bold-font {
-       /Times-Bold findfont 17.3 scalefont setfont
+       /Palatino-Bold findfont 17.3 scalefont setfont
 } bind def
 
 /large-bold-font {
-       /Times-Bold findfont 14.4 scalefont setfont
+       /Palatino-Bold findfont 14.4 scalefont setfont
 } bind def
 
 /large-font {
-       /Times-Roman findfont 14.4 scalefont setfont
+       /Palatino-Roman findfont 14.4 scalefont setfont
 } bind def
 
 /large-smallcaps-font {
        % urg
-       /Helvetica findfont 14.4 scalefont setfont
+       /Bookman-Light findfont 14.4 scalefont setfont
 } bind def
 
 /normal-font {
-       /Times-Roman findfont 12 scalefont setfont
+       /Palatino-Roman findfont 12 scalefont setfont
 } bind def
 
 /footnote-font {
-       /Times-Roman findfont 10 scalefont setfont
+       /Palatino-Roman findfont 10 scalefont setfont
 } bind def
 
 /get-text-dimensions % path .. width height
@@ -204,7 +214,7 @@ paper-size
 % initialise paper dimensions
 staff-height init-paper
 
-/line-x left-margin def
+/line-x left-margin output-scale div def
 /line-y vsize top-margin sub def
 
 make-lilypond-title