From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 14 Apr 2005 00:04:36 +0000 (+0000)
Subject: * make/ly-rules.make ($(outdir)/%.html.omf): transplant .dvi ->
X-Git-Tag: release/2.5.19~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=401bfa5ec50ad1592cd701b8dcec21fec54b79ab;p=lilypond.git

* 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 8a935e3e7e..54b50729b6 100644
--- 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 109d559080..a7a8bc4a0a 100644
--- 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 d276e188ef..b9581518ca 100644
--- 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 201240446d..348929c1c4 100644
--- 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 f977ea8a75..254a96e0ba 100644
--- 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