From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 13 Apr 2005 13:45:29 +0000 (+0000)
Subject: (write_extracted_fonts): new file. Extract
X-Git-Tag: release/2.5.19~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c809e16201118481b65c1aa4ad986715f804288e;p=lilypond.git

(write_extracted_fonts): new file. Extract
font resources from a PS file.
---

diff --git a/make/ly-rules.make b/make/ly-rules.make
index c943392e6c..4734f594c8 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -8,11 +8,11 @@ $(outdir)/%.latex $(outdir)/%.fonts.ps:  %.doc
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
 	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
-	$(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) $<
+	$(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)
-	$(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) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #	rm -f $<
diff --git a/python/fontextract.py b/python/fontextract.py
index 60d61c083d..ffb0609248 100644
--- a/python/fontextract.py
+++ b/python/fontextract.py
@@ -70,7 +70,7 @@ def extract_fonts_from_file (extract_from_this, font_dict, filename):
 						sys.stderr.write (_('Extracted %s')
 								  % curr_font_name + '\n')
 
-				extract_from_this.remove (curr_font_name)
+					extract_from_this.remove (curr_font_name)
 			elif in_font:
 				curr_font.append (l)
 			if not extract_from_this: