bug-lilypond
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fonts installations (again again again)


From: Han-Wen Nienhuys
Subject: Fonts installations (again again again)
Date: Mon, 18 Mar 2002 15:56:25 +0100

address@hidden writes:
> I tried installing 1.5.42 on out messy uni setup - and - surprise (not)
> - the fonts stopped working again... :-/

try this patch:

Generated by address@hidden,
>From = lilypond-1.5.42, To = lilypond-1.5.42.hwn1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.42.hwn1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.42/ChangeLog ./ChangeLog
--- ../lilypond-1.5.42/ChangeLog        Sun Mar 17 20:55:40 2002
+++ ./ChangeLog Mon Mar 18 01:11:46 2002
@@ -1,3 +1,44 @@
+2002-03-18  Han-Wen  <address@hidden>
+
+       * lily/afm.cc (afm_bbox_to_box): make code dimension independent
+
+       * lily/tfm.cc (dimensions): make code dimension independent
+
+       * ps/lilyponddefs.ps: add constant for MM and true/ps-point
+       scaling
+
+       * tex/lily-ps-defs.tex: scaling for PS points and MM.
+
+       * lily/include/dimensions.hh: try MM as internal unit.
+
+       * scm/*.scm: remove invoke-dim1
+
+2002-03-17  Han-Wen  <address@hidden>
+
+       * GNUmakefile.in (fontpaths): add fontpaths target,
+
+       * make/mutopia-targets.make: add PDF rules.
+
+       * make/mutopia-rules.make: add pdf rule.
+
+       * buildscripts/mutopia-index.py (list_item): add PDF.
+
+       * buildscripts/lilypond-profile.sh (TEXMF): typo.
+
+       * make/lilypond-vars.make: set TEXMF for the new font setup.
+ 
+2002-03-17  Han-Wen  <address@hidden>
+
+       * VERSION: 1.5.42 released
+       
+       * mf/feta-schrift.mf: endless twiddling of Tr.
+
+       * mf/feta-eindelijk.mf: 8th rest: make darker, top of brush lower, and
+       endless twiddling with the bulb shape.
+
+       * lily/note-head.cc (internal_brew_molecule): make ledger lines a
+       little smaller if there is an accidental.
+
 2002-03-15  Mats Bengtsson  <address@hidden>
  
        * buildscripts/lilypond-profile.sh: 
@@ -16,16 +57,6 @@
  
        * mf/GNUmakefile (ALL_GEN_FILES): Actually generate the
        lilypond.map file
- 
-2002-03-17  Han-Wen  <address@hidden>
-
-       * mf/feta-schrift.mf: endless twiddling of Tr.
-
-       * mf/feta-eindelijk.mf: 8th rest: make darker, top of brush lower, and
-       endless twiddling with the bulb shape.
-
-       * lily/note-head.cc (internal_brew_molecule): make ledger lines a
-       little smaller if there is an accidental.
 
 2002-03-17  Jan Nieuwenhuizen  <address@hidden>
 
diff -purN ../lilypond-1.5.42/GNUmakefile.in ./GNUmakefile.in
--- ../lilypond-1.5.42/GNUmakefile.in   Tue Mar 12 23:00:23 2002
+++ ./GNUmakefile.in    Mon Mar 18 01:11:27 2002
@@ -35,6 +35,7 @@ footify:
        $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
        $(footify-all-command)
 
+
 fonts:
        $(MAKE) -C $(depth)/mf
 
@@ -60,21 +61,24 @@ TOP_HTMLS = index.html short-examples.ht
 
 index: web-doc
 
-short-examples:
+short-examples: pfa-fonts
        $(MAKE) out=www -C input WWW
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html 
input/
 
 
-long-examples:
+long-examples: pfa-fonts
        $(MAKE) out=www -C mutopia WWW
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html 
mutopia/
 
+pfa-fonts:
+       $(MAKE) MAKE_PFA_FILES=1 -C mf
+
 lily: lily/$(outdir)/lilypond
 
 lily/$(outdir)/lilypond:
        $(MAKE) -C lily
 
-local-web: fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+local-web: fontpaths fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc 
top-web
 
 top-web:
        rm -f `find . -name \*.html~ -print`
@@ -109,3 +113,11 @@ top-WWW-clean:
 
 
 WWW:
+
+fontpaths:
+       -ln -s $(depth)/mf/out dvips
+       -mkdir -p fonts
+       -ln -s ../$(depth)/mf fonts/source
+       -ln -s ../$(depth)/mf/out fonts/afm
+       -ln -s ../$(depth)/mf/out fonts/tfm
+       -ln -s ../$(depth)/mf/out fonts/type1
diff -purN ../lilypond-1.5.42/VERSION ./VERSION
--- ../lilypond-1.5.42/VERSION  Sun Mar 17 20:55:49 2002
+++ ./VERSION   Mon Mar 18 01:11:27 2002
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=42
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -purN ../lilypond-1.5.42/buildscripts/lilypond-profile.sh 
./buildscripts/lilypond-profile.sh
--- ../lilypond-1.5.42/buildscripts/lilypond-profile.sh Sun Mar 17 19:22:19 2002
+++ ./buildscripts/lilypond-profile.sh  Mon Mar 18 01:11:27 2002
@@ -23,7 +23,7 @@ GS_LIB="$datadir/ps:"${GS_LIB:=""}
 
 # Add the installation directory to the teTeX system tree, 
 # see Documentation/misc/fontinstallation
-TEXMF="{$DATADIR,"`kpsexpand  \\$TEXMF`"}"
+TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
 
 # LILYPONDPREFIX="$datadir"
 # export LILYPONDPREFIX
diff -purN ../lilypond-1.5.42/buildscripts/mutopia-index.py 
./buildscripts/mutopia-index.py
--- ../lilypond-1.5.42/buildscripts/mutopia-index.py    Wed Oct  3 19:44:49 2001
+++ ./buildscripts/mutopia-index.py     Mon Mar 18 01:11:27 2002
@@ -3,7 +3,6 @@
 
 name = 'mutopia-index'
 
-# find.py -- deprecated in python 2.0
 import fnmatch
 import os
 
@@ -57,9 +56,10 @@ headertext= r"""
 These files are also included in the distribution. The output is
 completely generated by LilyPond, without any touch up by humans.
 
-<p>The PostScript files were generated using TeX and dvips. The pictures
-are 90dpi anti-aliased snapshots of the printed output.  The images
-are in PNG format, and should be viewable with any current browser.
+<p>The PostScript files were generated using TeX and dvips at 600 dpi.
+The pictures are 90dpi anti-aliased snapshots of the printed output.
+The images are in PNG format, and should be viewable with any current
+browser.
 
 <p>If you want a better impression of the appearance, do print out one of
 the postscript files.
@@ -166,6 +166,7 @@ def gen_list(inputs, filename):
                        if not file_exist_b (f):
                                break
                        list_item(f, 'See a picture of page %d' % pageno, 'png')
+               list_item(base + '.pdf', 'Print ', 'PDF')
                list_item(base + '.ps.gz', 'Print ', 'gzipped PostScript')
                list_item(base + '.midi', 'Listen', 'MIDI')
                list.write ("</ul>\n");
diff -purN ../lilypond-1.5.42/input/GNUmakefile ./input/GNUmakefile
--- ../lilypond-1.5.42/input/GNUmakefile        Mon Mar 11 13:33:28 2002
+++ ./input/GNUmakefile Mon Mar 18 01:11:27 2002
@@ -16,3 +16,8 @@ $(outdir)/nereides.ly: les-nereides.ly
        cpp -P -traditional -o $@ -DFAKE_GRACE $<
 
 
+foo:
+       echo $(TEXMF)
+       echo $$TEXMF
+       echo {$(topdir),$(shell kpsexpand $$TEXMF\})}
+       echo bla $(shell kpsexpand \$$TEXMF)
diff -purN ../lilypond-1.5.42/input/baerenreiter-sarabande.ly 
./input/baerenreiter-sarabande.ly
--- ../lilypond-1.5.42/input/baerenreiter-sarabande.ly  Sun Mar 17 19:38:01 2002
+++ ./input/baerenreiter-sarabande.ly   Mon Mar 18 01:11:27 2002
@@ -19,7 +19,7 @@ measure 25, we get back the linebreaking
 
 
 This file used to show spacing weaknesses. Now it shows weaknesses in
-beam and slur handling.
+slur handling.
 
 Note that the Barenreiter edition contains an engraving mistake. The
 second line begins with measure 6 (but prints 5).
@@ -133,16 +133,31 @@ sarabandeCelloStaff =  \context Staff <
   \sarabandeCelloScripts
 >
 
-\score{
-  \sarabandeCelloStaff
-  \paper{
-    indent = 7. \mm
-    linewidth = 183.5 \mm
+% size perversions
+smallerPaper = \paper {
+    \translator { \StaffContext
+                 fontSize = #-1
+                 StaffSymbol \override  #'staff-space = #0.8
+                 }
     \translator { \ScoreContext
-                 %% SpacingSpanner \override #'maximum-duration-for-spacing = 
#(make-moment 1 16)
+                  SpacingSpanner \override #'spacing-increment = #0.96
+               }
+       
+    indent = 5.6 \mm
+    linewidth = 146.8 \mm
+}
+
+baerPaper = \paper {
+    indent = 7. \mm
+    linewidth =183.5 \mm
+}
 
 
-               }}
+\score{
+  \sarabandeCelloStaff
+  \paper{
+    \baerPaper
+  }
   \midi{ \tempo 4 = 40 }
   \header{
     opus= "" 
diff -purN ../lilypond-1.5.42/lily/afm.cc ./lily/afm.cc
--- ../lilypond-1.5.42/lily/afm.cc      Mon Mar 11 01:49:51 2002
+++ ./lily/afm.cc       Mon Mar 18 01:11:27 2002
@@ -9,6 +9,7 @@
 #include "afm.hh"
 #include "warn.hh"
 #include "molecule.hh"
+#include "dimensions.hh"
 
 Adobe_font_metric::Adobe_font_metric (AFM_Font_info * fi)
 {
@@ -129,12 +130,16 @@ read_afm_file (String nm)
   return Adobe_font_metric::make_afm (fi, cs);
 }
 
-  
+
+/*
+  actually, AFMs will be printers point, usually, but our .py script dumps
+  real points.
+ */
 Box
 afm_bbox_to_box (AFM_BBox bb)
 {
-  return Box (Interval (bb.llx, bb.urx)* (1/1000.0),
-             Interval (bb.lly, bb.ury)* (1/1000.0));
+  return Box (Interval (bb.llx, bb.urx)* (1/1000.0) PT,
+             Interval (bb.lly, bb.ury)* (1/1000.0) PT);
 
 }
   
diff -purN ../lilypond-1.5.42/lily/include/dimensions.hh 
./lily/include/dimensions.hh
--- ../lilypond-1.5.42/lily/include/dimensions.hh       Fri Feb  1 19:16:22 2002
+++ ./lily/include/dimensions.hh        Mon Mar 18 01:11:27 2002
@@ -4,14 +4,17 @@
 #include "real.hh"
 class String;
 
+
 const Real INCH_TO_PT=72.270;
-const Real CM_TO_PT=INCH_TO_PT/2.54;
-const Real MM_TO_PT=CM_TO_PT/10;
+const Real CM_TO_PT=(INCH_TO_PT/2.54);
+const Real MM_TO_PT=(CM_TO_PT/10);
 const Real PT_TO_PT =1.0;
 const Real INCH_TO_BP = 72;
-const Real BIGPOINT_TO_POINT = INCH_TO_PT/ INCH_TO_BP;
+const Real BIGPOINT_TO_POINT = (INCH_TO_PT/ INCH_TO_BP);
 const Real CHAR_TO_PT =1.0;
+const Real PT_TO_MM = (1.0/MM_TO_PT);
 
+#ifdef POINTS
 
 #define PT  *PT_TO_PT
 #define MM  *MM_TO_PT
@@ -20,6 +23,17 @@ const Real CHAR_TO_PT =1.0;
 #define BIGPOINT *BIGPOINT_TO_POINT
 #define CHAR *CHAR_TO_PT
 
+#else  // mm
+
+#define PT  *PT_TO_PT *PT_TO_MM
+#define MM  *MM_TO_PT *PT_TO_MM
+#define CM  *CM_TO_PT *PT_TO_MM
+#define INCH *INCH_TO_PT *PT_TO_MM
+#define BIGPOINT *BIGPOINT_TO_POINT *PT_TO_MM
+#define CHAR *CHAR_TO_PT *PT_TO_MM
+
+#endif
+
 String print_dimen (Real);
 
 #endif // DIMENSIONS_HH
diff -purN ../lilypond-1.5.42/lily/tfm.cc ./lily/tfm.cc
--- ../lilypond-1.5.42/lily/tfm.cc      Fri Feb  1 19:16:16 2002
+++ ./lily/tfm.cc       Mon Mar 18 01:11:27 2002
@@ -14,6 +14,7 @@
 #include "string-convert.hh"
 #include "debug.hh"
 #include "warn.hh"
+#include "dimensions.hh"
 
 Box
 Tex_font_char_metric::dimensions () const
@@ -26,7 +27,12 @@ Tex_font_char_metric::dimensions () cons
     }
   
   Real d = -depth_;
-  return Box (Interval (0, width_),Interval (d <? height_, d >? height_));
+
+  Real point_constant = 1 PT;
+  
+  return Box (Interval (0, width_*point_constant ),
+             Interval ((d <? height_)*point_constant,
+                       (d >? height_)*point_constant));
 }
 
 Tex_font_char_metric::Tex_font_char_metric ()
diff -purN ../lilypond-1.5.42/make/lilypond-vars.make ./make/lilypond-vars.make
--- ../lilypond-1.5.42/make/lilypond-vars.make  Fri Mar  1 23:48:40 2002
+++ ./make/lilypond-vars.make   Mon Mar 18 01:11:27 2002
@@ -3,11 +3,8 @@
 
 
 export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
+export TEXMF:={$(topdir),$(shell kpsexpand \$$TEXMF)}
 
-export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS)::
-export 
TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd)::
-export 
LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE)
-export TFMFONTS:=$(topdir)/mf/out:
 export extra_mem_top=1000000
 export extra_mem_bottom=1000000
 export pool_size=250000
diff -purN ../lilypond-1.5.42/make/mutopia-rules.make ./make/mutopia-rules.make
--- ../lilypond-1.5.42/make/mutopia-rules.make  Wed Dec  5 18:54:42 2001
+++ ./make/mutopia-rules.make   Mon Mar 18 01:11:27 2002
@@ -33,6 +33,13 @@ $(outdir)/%.dvi: $(outdir)/%.ly
 $(outdir)/%.dvi: %.ly
        $(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
 
+
+$(outdir)/%.pdf: $(outdir)/%.dvi
+       dvips -u lilypond.map -o address@hidden  -Ppdf $<
+       ps2pdf address@hidden $@
+
+       $(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
+
 $(outdir)-$(PAPERSIZE)/%.dvi: %.ly
        $(PYTHON) $(LY2DVI) --output=$@ --dependencies 
--set=papersize=$(PAPERSIZE) $< 
 
diff -purN ../lilypond-1.5.42/make/mutopia-targets.make 
./make/mutopia-targets.make
--- ../lilypond-1.5.42/make/mutopia-targets.make        Wed Dec  5 18:54:42 2001
+++ ./make/mutopia-targets.make Mon Mar 18 01:11:27 2002
@@ -12,7 +12,7 @@ all: $(OUT_FILES)
 
 # we want dvi_examples as well, because they get thrown away otherwise
 # incurring another costly lilypond run.
-local-WWW: $(ly_examples) $(dvi_examples) $(ps_examples) $(png_examples)
+local-WWW: $(ly_examples) $(pdf_examples) $(ps_examples) $(png_examples)
 
 tar:
        mkdir -p $(outdir)/$(tarball)
diff -purN ../lilypond-1.5.42/make/mutopia-vars.make ./make/mutopia-vars.make
--- ../lilypond-1.5.42/make/mutopia-vars.make   Wed Dec  5 18:54:42 2001
+++ ./make/mutopia-vars.make    Mon Mar 18 01:11:27 2002
@@ -14,6 +14,7 @@ ly_examples=$(addprefix $(outdir)/, $(ad
 all_examples=$(examples)
 dvi_examples=$(addprefix $(outdir)/, $(addsuffix .dvi, $(all_examples)))
 ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
+pdf_examples=$(addprefix $(outdir)/, $(addsuffix .pdf, $(all_examples)))
 gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
 png_examples=$(addprefix $(outdir)/, $(addsuffix .png, $(all_examples)))
 
diff -purN ../lilypond-1.5.42/ps/lilyponddefs.ps ./ps/lilyponddefs.ps
--- ../lilypond-1.5.42/ps/lilyponddefs.ps       Wed Dec  5 18:54:39 2001
+++ ./ps/lilyponddefs.ps        Mon Mar 18 01:11:27 2002
@@ -12,7 +12,18 @@
 % 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
diff -purN ../lilypond-1.5.42/scm/pdf.scm ./scm/pdf.scm
--- ../lilypond-1.5.42/scm/pdf.scm      Wed Dec  5 18:54:40 2001
+++ ./scm/pdf.scm       Mon Mar 18 01:11:27 2002
@@ -151,10 +151,6 @@
     (string-append 
      "(\\" (inexact->string i 8) ") " s " " ))
   
-  (define (invoke-dim1 s d) 
-    (string-append
-     (ly-number->string (* d  (/ 72.27 72))) " " s ))
-
   (define (placebox x y s) "")
 
   (define (bezier-sandwich l thick)
@@ -249,7 +245,7 @@
            (define font-load-command ,font-load-command)
            (define header ,header) 
            (define invoke-char ,invoke-char) 
-           (define invoke-dim1 ,invoke-dim1)
+
            (define placebox ,placebox)
            (define repeat-slash ,repeat-slash) 
            (define select-font ,select-font)
@@ -285,4 +281,4 @@
 
 ; Local Variables:
 ; scheme-program-name: "guile"
-; End:
\ No newline at end of file
+; End:
diff -purN ../lilypond-1.5.42/scm/pdftex.scm ./scm/pdftex.scm
--- ../lilypond-1.5.42/scm/pdftex.scm   Wed Dec  5 18:54:40 2001
+++ ./scm/pdftex.scm    Mon Mar 18 01:11:27 2002
@@ -7,6 +7,9 @@
 ;;; Han-Wen Nienhuys <address@hidden>
 ;;; Stephen Peters <address@hidden>
 
+
+;; TODO: port this  to the new module framework.
+
 (define (pdftex-scm action-name)
   (define (unknown) 
     "%\n\\unknown%\n")
@@ -107,12 +110,6 @@
     (string-append 
      "\n\\" s "{" (inexact->string i 10) "}" ))
 
-  (define (invoke-dim1 s d)
-    (string-append
-     "\n\\" s "{" (number->dim d) "}"))
-  (define (pt->sp x)
-    (* 65536 x))
-  
   ;;
   ;; need to do something to make this really safe.
   ;;
@@ -203,7 +200,7 @@
            (define ez-ball ,ez-ball)
            (define header ,header) 
            (define invoke-char ,invoke-char) 
-           (define invoke-dim1 ,invoke-dim1)
+
            (define placebox ,placebox)
            (define select-font ,select-font)
            (define start-line ,start-line)
@@ -231,7 +228,7 @@
        ((eq? action-name 'lily-def) lily-def)
        ((eq? action-name 'header) header) 
        ((eq? action-name 'invoke-char) invoke-char) 
-       ((eq? action-name 'invoke-dim1) invoke-dim1)
+
        ((eq? action-name 'placebox) placebox)
        ((eq? action-name 'bezier-sandwich) bezier-sandwich)
        ((eq? action-name 'start-line) start-line)
diff -purN ../lilypond-1.5.42/scm/ps.scm ./scm/ps.scm
--- ../lilypond-1.5.42/scm/ps.scm       Sun Mar 17 19:38:01 2002
+++ ./scm/ps.scm        Mon Mar 18 01:11:27 2002
@@ -129,11 +129,11 @@
 
 (define (dashed-line thick on off dx dy)
   (string-append 
-   (ly-number->string (* dx (/ 72 72.27)))
+   (ly-number->string dx)
    " "
    (ly-number->string dy)
    " "
-   (ly-number->string (* thick (/ 72 72.27))) 
+   (ly-number->string thick)
    " [ "
    (ly-number->string on)
    " "
@@ -192,9 +192,6 @@
   (string-append 
    "(\\" (inexact->string i 8) ") " s " " ))
 
-(define (invoke-dim1 s d) 
-  (string-append
-   (ly-number->string (* d  (/ 72.27 72))) " " s ))
 
 (define (placebox x y s) 
   (string-append 
@@ -222,12 +219,15 @@
      " draw_dot")))
 
                                        ; TODO: use HEIGHT argument
+
+  
 (define (start-line height)
   (string-append
    "\n"
    (ly-number->string height)
    " start-line {
-lilypondpaperoutputscale lilypondpaperoutputscale scale
+set-ps-scale-to-lily-scale
+
 "))
 
 (define (stem breapth width depth height) 
diff -purN ../lilypond-1.5.42/scm/sketch.scm ./scm/sketch.scm
--- ../lilypond-1.5.42/scm/sketch.scm   Wed Dec  5 18:54:40 2001
+++ ./scm/sketch.scm    Mon Mar 18 01:11:27 2002
@@ -234,9 +234,6 @@ layer('Layer 1',1,1,0,0,(0,0,0))
 (define (invoke-char s i)
   "")
 
-(define (invoke-dim1 s d) 
-  (string-append
-   (ly-number->string (* d  (/ 72.27 72))) " " s ))
 
 (define (bezier-sandwich x y l thick)
   (apply
diff -purN ../lilypond-1.5.42/scm/tex.scm ./scm/tex.scm
--- ../lilypond-1.5.42/scm/tex.scm      Mon Mar 11 01:49:52 2002
+++ ./scm/tex.scm       Mon Mar 18 01:11:27 2002
@@ -175,7 +175,11 @@
        (ly-gulp-file "music-drawing-routines.ps"))
    (if (defined? 'ps-testing) "/testing true def%\n" "")
    "}"
-   "\\input lilyponddefs \\outputscale=\\lilypondpaperoutputscale 
pt\\turnOnPostScript"))
+   "\\input lilyponddefs \\outputscale=\\lilypondpaperoutputscale "
+   ;; "pt"
+   "mm"
+
+   "\\turnOnPostScript"))
 
 ;; Note: this string must match the string in ly2dvi.py!!!
 (define (header creator generate) 
@@ -186,12 +190,6 @@
   (string-append 
    "\n\\" s "{" (inexact->string i 10) "}" ))
 
-(define (invoke-dim1 s d)
-  (string-append
-   "\n\\" s "{" (number->dim d) "}"))
-(define (pt->sp x)
-  (* 65536 x))
-
 ;;
 ;; need to do something to make this really safe.
 ;;
diff -purN ../lilypond-1.5.42/tex/lily-ps-defs.tex ./tex/lily-ps-defs.tex
--- ../lilypond-1.5.42/tex/lily-ps-defs.tex     Wed Dec  5 18:54:38 2001
+++ ./tex/lily-ps-defs.tex      Mon Mar 18 01:11:27 2002
@@ -11,13 +11,19 @@
 %
 \def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\csname #1\endcsname) 
set_tex_dimen}}
 \def\lilySpace{ }
+
+% for mm: 72.27/25.4
+\def\scaletounit{ 2.845276 mul }
+
+% for true printers points to postscript points: 
+%\def\scaletounit{1.00375}
 \def\turnOnPostScript{%
         % This sets CTM so that you get to the currentpoint
         % by executing a 0 0 moveto
         \def\embeddedps##1{%
                 \special{ps\string: @beginspecial @setspecial
-                        \lilypondpaperoutputscale\lilySpace 
-                        \lilypondpaperoutputscale\lilySpace
+                        \lilypondpaperoutputscale\lilySpace\scaletounit
+                        \lilypondpaperoutputscale\lilySpace\scaletounit
                         % FUCKING REDHAT XDVI -- ARG!
                         skeel ##1 @endspecial}%
         }
-- 

Han-Wen Nienhuys   |   address@hidden    | http://www.cs.uu.nl/~hanwen/




reply via email to

[Prev in Thread] Current Thread [Next in Thread]