* 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.

* scripts/lilypond-book.py (write_if_updated): new function.

diff --git a/python/fontextract.py b/python/fontextract.py
index 12f4313b271efda5998d4750f80540b701ae508b..60d61c083dbd952f7006478e28368a9f9e79f31b 100644 (file)
--- a/python/fontextract.py
+++ b/python/fontextract.py
@@ -78,7 +78,7 @@ def extract_fonts_from_file (extract_from_this, font_dict, filename):
 
                if extract_from_this:
                        sys.stderr.write ("Failed to extract %s from %s\n"
-                                         % (string.join (extract_from_this, ', '), f))
+                                         % (string.join (extract_from_this, ', '), filename))
 
 def write_extracted_fonts (output_file_name, font_dict):
        output = open (output_file_name, 'w')

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 637b96ef66e80323efbc642605d7b5cd5f1c3325..0592d020ad7c76926923fc7dcea6675ff2dfbc76 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1542,6 +1542,7 @@ def main ():
        try:
                chunks = do_file (file)
                if psfonts_file:
+                       fontextract.verbose = verbose_p
                        snippet_chunks = filter (lambda x: is_derived_class (x.__class__,
                                                                              Lilypond_snippet),
                                                 chunks)