* make/ly-rules.make ($(outdir)/%.html.omf): transplant .dvi ->

.pdf rule to tex-rules.make.

* scm/framework-eps.scm (dump-stencils-as-EPSes): remove comments
from -systems.* output.

* stepmake/stepmake/tex-rules.make ($(outdir)/%.pdf): make PDF
directly, remove -$(PAGESIZE) target.

diff --git a/ChangeLog b/ChangeLog
index 8a935e3e7ed969aaa3736e04a948f3d6a4aa2bb8..54b50729b6e30f8e06d0a84444a9b8369464a98d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-04-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/ly-rules.make ($(outdir)/%.html.omf): transplant .dvi ->
+       .pdf rule to tex-rules.make.
+
+       * scm/framework-eps.scm (dump-stencils-as-EPSes): remove comments
+       from -systems.* output.
+
        * stepmake/stepmake/tex-rules.make ($(outdir)/%.pdf): make PDF
        directly, remove -$(PAGESIZE) target.
 

diff --git a/THANKS b/THANKS
index 109d559080c6a9c801780e335e5f84e8dcc67256..a7a8bc4a0a0943ea430e5776f0b459df7f00cfae 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -46,6 +46,7 @@ Andreas Scherer
 Anthony W. Youngman
 Antti Kaihola
 Arjan Bos
+Bernard Hurley
 Dylan Nicholson
 Ed Jackson
 Erik Ronström

diff --git a/make/ly-rules.make b/make/ly-rules.make
index d276e188ef044042be2080e7fb83e0ae7724e8bf..b9581518ca2974720a01b114857e0f2fb79b86a2 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -27,28 +27,6 @@ $(outdir)/%.nexi: %.tely
 $(outdir)/%.info: $(outdir)/%.nexi
        $(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<
 
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
-       psbook $< $<.tmp
-       pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
-
-$(outdir)/%.pdf: $(outdir)/%.dvi
-       $(shell cd $(outdir) \
-               && dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) \
-                       -o $(notdir $@).pdfps $(notdir $<) \
-               && gs -dCompatibilityLevel=1.2\
-                       -sPAPERSIZE=a4\
-                       -q\
-                       -dNOPAUSE\
-                       -dBATCH\
-                       -sDEVICE=pdfwrite\
-                       -sOutputFile=$(notdir $@)\
-                       -dCompatibilityLevel=1.2\
-                       -sPAPERSIZE=a4\
-                       -c .setpdfwrite\
-                       -f $(notdir $@).pdfps)
-
 $(outdir)/%.html.omf: %.tely
        $(call GENERATE_OMF,html)
 

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 201240446d9b42e681b3297ff1492f9bdbdc362b..348929c1c49f7cd82a2820e86082bef19c16cea0 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -46,9 +46,9 @@
     (ly:message (_ "Writing ~a...") texi-system-name)
     (dump-stencils-as-separate-EPS stencils 1)
     (for-each (lambda (c)
-               (display (format "\\includegraphics{~a-~a.eps}%\n"
+               (display (format "\\includegraphics{~a-~a.eps}\n"
                                 basename (1+ c)) tex-system-port)
-               (display (format "@image{~a-~a}@c\n"
+               (display (format "@image{~a-~a}\n"
                                 basename (1+ c)) texi-system-port))
              (iota (length stencils)))
 

diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index f977ea8a7596632df3ee71b3e32a6871e5d192e0..254a96e0bacf758920c71840aafcaa3aadce7b11 100644 (file)
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -14,9 +14,22 @@ $(outdir)/%.dvi: $(outdir)/%.latex
          latex \\nonstopmode \\input $(<F) )
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
-       cd $(outdir) && dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) -o $(@F).pdfps $(<F)
        cd $(outdir) \
-        && gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$(@F) -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $(@F).pdfps
+               && dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) \
+                       -o $(@F).pdfps $(<F) \
+               && gs -dCompatibilityLevel=1.2\
+                       -sPAPERSIZE=a4\
+                       -q\
+                       -dNOPAUSE\
+                       -dBATCH\
+                       -sDEVICE=pdfwrite\
+                       -sOutputFile=$(@F)\
+                       -dCompatibilityLevel=1.2\
+                       -sPAPERSIZE=a4\
+                       -c .setpdfwrite\
+                       -f $(@F).pdfps
+
+
 # without -dSAFER
 # gs 8.15 complains of safety of loading a ttf directly