X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-rules.make;h=243a9f18c789f25167589ca2fc72a9667932d5eb;hb=HEAD;hp=754e88c5ef30210e1e1f00d49fe8e1ab64ac747f;hpb=8ce8785d1cbd95ddd082195d17f400f0c65e28e6;p=lilypond.git

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 754e88c5ef..243a9f18c7 100644
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -5,6 +5,9 @@
 $(outdir)/%.html:  %.html
 	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
+$(outdir)/%.html:  %.htmly
+	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
 $(outdir)/%.html:  %.xml
 	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
@@ -12,7 +15,7 @@ $(outdir)/%.html:  %.xml
 ############## LaTeX ########################
 
 $(outdir)/%.tex:  %.lytex
-	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
+	$(buildscript-dir)/run-and-check "$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<"  "$*.lytex.log"
 
 $(outdir)/%.tex:  %.tex
 	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
@@ -20,10 +23,16 @@ $(outdir)/%.tex:  %.tex
 $(outdir)/%.tex:  %.latex
 	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
-# Add the tex => pdf rule only if we have dblatex
+# Add the tex => pdf rule only if we have pdflatex
 ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-	cd $(outdir) && $(PDFLATEX) $(notdir $<)
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log"
+ifeq ($(USE_EXTRACTPDFMARK),yes)
+	$(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@
+	$(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@
+	rm $@
+	mv $(outdir)/$*.final.pdf $@
+endif
 endif
 
 ############## Texinfo ######################
@@ -49,5 +58,11 @@ $(outdir)/%.xml:  %.lyxml
 # Add the xml => pdf rule only if we have dblatex
 ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.xml
-	cd $(outdir) && $(DBLATEX) $(notdir $<)
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(DBLATEX_BACKEND) $(notdir $<)" "$*.dblatex.log"
+ifeq ($(USE_EXTRACTPDFMARK),yes)
+	$(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@
+	$(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -dAutoRotatePages=/None -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@
+	rm $@
+	mv $(outdir)/$*.final.pdf $@
+endif
 endif