* stepmake/stepmake/tex-rules.make ($(outdir)/%.pdf): make PDF

directly, remove -$(PAGESIZE) target.

* input/test/embedded-postscript.ly: update.

diff --git a/ChangeLog b/ChangeLog
index 6ba4f587f88a9d66f8639dab50b1c2b26ff8ddb7..8a935e3e7ed969aaa3736e04a948f3d6a4aa2bb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * stepmake/stepmake/tex-rules.make ($(outdir)/%.pdf): make PDF
+       directly, remove -$(PAGESIZE) target.
+
+       * input/test/embedded-postscript.ly: update.
+
 2005-04-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * make/lysdoc-targets.make (local-WWW): remove ps.gz target.

diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index e61a17eacb66531884d1fb419bdb298362596b9a..4184b7a564d5ddb76a59eb85401c5620073d6a5b 100644 (file)
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -1,24 +1,28 @@
 
-\version "2.4.0"
+\version "2.5.17"
+
+
 \header {
-  texidoc = "@cindex Embedded Postscript
-By inserting the @TeX{} command \embeddedps, you can
-insert postscript directly into the output.
 
-  "
+  texidoc = "
+
+@cindex Embedded Postscript
+
+The markup command @code{\postscript} inserts postscript directly into
+the output."
+
+}
+
+\layout {
+  linewidth = 70 * 5 \pt
 }
 
-\score {
-   \relative c'' {
-    a-\markup { \postscript #"3 4 moveto 5 3 rlineto stroke" }
-     -\markup { \postscript #"[ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke " }
-    
-    b-\markup { \postscript #"3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke" }
-    s2
-    a'1
-  }
-  \layout { linewidth = 70 * 5 \pt
-%      raggedright = ##t 
-       }
+\relative c'' {
+  a-\markup { \postscript #"3 4 moveto 5 3 rlineto stroke" }
+  -\markup { \postscript #"[ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke " }
+  
+  b-\markup { \postscript #"3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke" }
+  s2
+  a'1
 }
 

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 5048f717f4fd4e442906e1ce5ce924167616368b..71c279a1556fb076911250380331dce5a4a3e174 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -35,11 +35,6 @@ $(outdir)/%-book.ps: $(outdir)/%.ps
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
        $(cd $(outdir) && dvips $(DVIPS_FLAGS)  -o $(notdir $@).pdfps -t $(DVIPS_PAPERSIZE)  $(notdir $<)  \
-        && gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$(notdir $@) -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $(notdir $@).pdfps )
-
-# without -dSAFER
-# gs 8.15 complains of safety of loading a ttf directly 
-
 
 $(outdir)/%.html.omf: %.tely
        $(call GENERATE_OMF,html)

diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index e4fa7b301eaea9d947564298a01c8eadcbe08df3..f977ea8a7596632df3ee71b3e32a6871e5d192e0 100644 (file)
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -13,10 +13,11 @@ $(outdir)/%.dvi: $(outdir)/%.latex
          (makeindex $(basename $(<F)) || true) && \
          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
+# without -dSAFER
+# gs 8.15 complains of safety of loading a ttf directly 
 
-$(outdir)/%.ps: $(outdir)/%.dvi
-       cd $(outdir) && dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) -o $(@F) $(<F)
-
-$(outdir)-$(PAPERSIZE)/%.ps: $(outdir)-$(PAPERSIZE)/%.dvi
-       cd $(outdir)-$(PAPERSIZE) && dvips $(DVIPS_FLAGS)  -t$(PAPERSIZE) -o $(@F) $(<F)