X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Ffontextract.py;h=1677b558dea23023c4ee14e7134d663758f24e4d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=7066df3f79eafd65a78baa5d6ef529957ca90cf5;hpb=33a4e5aa1128c7a9a381151829be5ee4725691e3;p=lilypond.git

diff --git a/python/fontextract.py b/python/fontextract.py
index 7066df3f79..1677b558de 100644
--- a/python/fontextract.py
+++ b/python/fontextract.py
@@ -1,8 +1,8 @@
 import re
+
 import getopt
 import sys
 import os
-import string
 
 dsr_font_regex = re.compile ('%%DocumentSuppliedResources: font (.*)')
 begin_font_regex = re.compile ('%%BeginFont: (.*)')
@@ -10,107 +10,106 @@ end_font_regex = re.compile ('%%EndFont')
 verbose = 0
 
 try:
-	import gettext
-	gettext.bindtextdomain ('lilypond', localedir)
-	gettext.textdomain ('lilypond')
-	_ = gettext.gettext
+    import gettext
+    gettext.bindtextdomain ('lilypond', localedir)
+    gettext.textdomain ('lilypond')
+    _ = gettext.gettext
 except:
-	def _ (s):
-		return s
-	
+    def _ (s):
+        return s
+
 def scan_files (files):
-	file_of_font_dict = {}
-	for f in files:
-		if verbose:
-			sys.stderr.write (_('Scanning %s') % f + '\n')
-		
-		header = open (f, 'r').read ()
-		idx = 0
-
-		extract_from_this = []
-		while idx < len (header):
-			match = dsr_font_regex.search (header[idx:])
-			if not match:
-				break
-			name = match.group (1)
-			idx += match.end (1)
-			if file_of_font_dict.has_key (name):
-				continue
-
-			file_of_font_dict[name] = f
-
-	return file_of_font_dict
+    file_of_font_dict = {}
+    for f in files:
+        if verbose:
+            sys.stderr.write (_('Scanning %s') % f + '\n')
+
+        header = open (f, 'r').read ()
+        idx = 0
+
+        extract_from_this = []
+        while idx < len (header):
+            match = dsr_font_regex.search (header[idx:])
+            if not match:
+                break
+            name = match.group (1)
+            idx += match.end (1)
+            if file_of_font_dict.has_key (name):
+                continue
+
+            file_of_font_dict[name] = f
+
+    return file_of_font_dict
 
 def get_file_fonts_dict (file_of_font_dict):
-	dict = {}
-	for (n, f) in file_of_font_dict.items ():
-		if not dict.has_key (f):
-			dict[f] = []
+    dict = {}
+    for (n, f) in file_of_font_dict.items ():
+        if not dict.has_key (f):
+            dict[f] = []
+
+        dict[f].append (n)
 
-		dict[f].append (n)
-		
-	return dict
+    return dict
 
 def extract_fonts_from_file (extract_from_this, font_dict, filename):
-	if extract_from_this:
-		curr_font = []
-		curr_font_name = []
-		in_font = 0
-		for l in open (filename).readlines ():
-			if not in_font and begin_font_regex.match (l):
-				in_font = 1
-				curr_font_name = begin_font_regex.match (l).group (1)
-				curr_font = []
-			elif in_font and end_font_regex.match (l):
-				in_font = 0
-
-				if curr_font_name in extract_from_this:
-					font_dict[curr_font_name] = string.join (curr_font, '')
-					if verbose:
-						sys.stderr.write (_('Extracted %s')
-								  % curr_font_name + '\n')
-
-					extract_from_this.remove (curr_font_name)
-			elif in_font:
-				curr_font.append (l)
-			if not extract_from_this:
-				break
-
-		if extract_from_this:
-			sys.stderr.write ("Failed to extract %s from %s\n"
-					  % (string.join (extract_from_this, ', '), filename))
+    if extract_from_this:
+        curr_font = []
+        curr_font_name = []
+        in_font = 0
+        for l in open (filename).readlines ():
+            if not in_font and begin_font_regex.match (l):
+                in_font = 1
+                curr_font_name = begin_font_regex.match (l).group (1)
+                curr_font = []
+            elif in_font and end_font_regex.match (l):
+                in_font = 0
+
+                if curr_font_name in extract_from_this:
+                    font_dict[curr_font_name] = ''.join (curr_font)
+                    if verbose:
+                        sys.stderr.write (_('Extracted %s')
+                                          % curr_font_name + '\n')
+
+                    extract_from_this.remove (curr_font_name)
+            elif in_font:
+                curr_font.append (l)
+            if not extract_from_this:
+                break
+
+        if extract_from_this:
+            sys.stderr.write ("Failed to extract %s from %s\n"
+                              % (', '.join (extract_from_this), filename))
 
 def write_extracted_fonts (output_file_name, font_dict):
-
-	if verbose:
-		sys.stderr.write( _('Writing fonts to %s') % output_file_name + '\n')
-	output = open (output_file_name, 'w')
-	output.write ('''%!PS-Adobe-3.0
+    if verbose:
+        sys.stderr.write( _('Writing fonts to %s') % output_file_name + '\n')
+    output = open (output_file_name, 'w')
+    output.write ('''%!PS-Adobe-3.0
 %%VMusage: 0 0 
 %%Creator: lilypond-extract-fonts
 ''')
 
-	for x in font_dict.keys ():
-		output.write ('%%%%DocumentSuppliedResources: font %s\n' % x)
+    for x in font_dict.keys ():
+        output.write ('%%%%DocumentSuppliedResources: font %s\n' % x)
 
-	output.write ('''%%EndComments\n''')
+    output.write ('''%%EndComments\n''')
 
-	for (k,v) in font_dict.items ():
-		output.write ('\n%%%%BeginFont: %s\n' % k)
-		output.write (v)
-		output.write ('\n%%EndFont')
+    for (k,v) in font_dict.items ():
+        output.write ('\n%%%%BeginFont: %s\n' % k)
+        output.write (v)
+        output.write ('\n%%EndFont')
 
 
 def extract_fonts (output_file_name, input_files):
-	d = scan_files (input_files)
-	ff = get_file_fonts_dict (d)
-	
-	font_dict = {}
-	for (file, fonts) in ff.items ():
-		extract_fonts_from_file (fonts, font_dict, file)
+    d = scan_files (input_files)
+    ff = get_file_fonts_dict (d)
+
+    font_dict = {}
+    for (file, fonts) in ff.items ():
+        extract_fonts_from_file (fonts, font_dict, file)
 
-	write_extracted_fonts (output_file_name, font_dict)
+    write_extracted_fonts (output_file_name, font_dict)
 
 
 if __name__ == '__main__':
-	extract_fonts ('fonts.ps', sys.argv[1:])
+    extract_fonts ('fonts.ps', sys.argv[1:])