diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2005-04-13 13:18:09 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2005-04-13 13:18:09 +0000 |
| commit | ea6d4c224d988252a9cff44776d0159b4c26a443 (patch) | |
| tree | 28cbae7a57509a2c5bc87b9d640452b7d1d65d6d /make | |
| parent | 4ef62f89aaad9778a494ec9f8e800132b82d6a2c (diff) | |
* scm/framework-ps.scm (write-preamble): use (NAME . CONTENTS) and
(NAME . FILE-NAME) tuples for font descriptions.
(write-preamble): display BeginFont DSC comments.
* python/fontextract.py (write_extracted_fonts): new file. Extract
font resources from a PS file.
* scripts/lilypond-book.py (option_definitions): --psfonts option.
(Compile_error.process_include): do_file returns chunks.
* make/ly-vars.make (DVIPS_FLAGS): don't load .map file.
* make/lysdoc-targets.make: .texi is .PRECIOUS
* scripts/lilypond-book.py (write_if_updated): new function.
Diffstat (limited to 'make')
| -rw-r--r-- | make/ly-rules.make | 5 | ||||
| -rw-r--r-- | make/ly-vars.make | 3 | ||||
| -rw-r--r-- | make/lysdoc-targets.make | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/make/ly-rules.make b/make/ly-rules.make index 391fcd84ed..c943392e6c 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -1,14 +1,14 @@ .SUFFIXES: .doc .dvi .tely .texi .ly -$(outdir)/%.latex: %.doc +$(outdir)/%.latex $(outdir)/%.fonts.ps: %.doc $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $< # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds $(outdir)/%.texi: %.tely rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null) - $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< + $(PYTHON) $(LILYPOND_BOOK) --psfonts=$(basename $<).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< $(outdir)/%.texi: $(outdir)/%.tely rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null) @@ -36,6 +36,7 @@ $(outdir)/%-book.ps: $(outdir)/%.ps $(outdir)/%.pdf: $(outdir)/%.dvi dvips $(DVIPS_FLAGS) -o $@.pdfps -t $(DVIPS_PAPERSIZE) $< # without -dSAFER +# gs 8.15 complains of safety of loading a ttf directly gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$@ -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $@.pdfps $(outdir)/%.html.omf: %.tely diff --git a/make/ly-vars.make b/make/ly-vars.make index 60194e5798..4cf95cd913 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -17,5 +17,4 @@ TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES) EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES) -# not mf/out , not mf/$(outdir) -DVIPS_FLAGS= -u+$(builddir)/mf/out/lilypond.map -Ppdf +DVIPS_FLAGS= -h $(notdir $(basename $<)).fonts.ps diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make index a3a313758b..147ee6366f 100644 --- a/make/lysdoc-targets.make +++ b/make/lysdoc-targets.make @@ -1,3 +1,5 @@ local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).ps.gz $(outdir)/$(NAME).pdf + +.PRECIOUS: $(outdir)/$(NAME).texi |