X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Flilylib.py;h=c50ab48e10902660fbdc42adf73d120daf1db651;hb=ac92a973e996f5405551d9bf9f3ff84279ccde20;hp=1ae32ad41a6435835d116d112d0f3bc3f7c2c400;hpb=c15ee7f1e5493bd3286bcf3fd1900029d036404a;p=lilypond.git diff --git a/python/lilylib.py b/python/lilylib.py index 1ae32ad41a..c50ab48e10 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -3,7 +3,7 @@ # # source file of the GNU LilyPond music typesetter # -# (c) 1998--2003 Han-Wen Nienhuys +# (c) 1998--2005 Han-Wen Nienhuys # Jan Nieuwenhuizen ### subst:\(^\|[^._a-z]\)\(abspath\|identify\|warranty\|progress\|warning\|error\|exit\|getopt_args\|option_help_str\|options_help_str\|help\|setup_temp\|read_pipe\|system\|cleanup_temp\|strip_extension\|cp_to_dir\|mkdir_p\|init\) *( @@ -12,11 +12,14 @@ ### subst: \(help_summary\|keep_temp_dir_p\|option_definitions\|original_dir\|program_name\|pseudo_filter_p\|temp_dir\|verbose_p\) import __main__ +import getopt +import glob +import os +import re import shutil import string import sys import tempfile -import glob ################################################################ # Users of python modules should include this snippet @@ -30,7 +33,6 @@ import glob # If set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX -import getopt, os, sys datadir = '@local_lilypond_datadir@' if not os.path.isdir (datadir): datadir = '@lilypond_datadir@' @@ -43,52 +45,6 @@ sys.path.insert (0, os.path.join (datadir, 'python')) -# Customize these -if __name__ == '__main__': - import lilylib as ly - global _;_=ly._ - global re;re = ly.re - - # lilylib globals - program_name = 'unset' - pseudo_filter_p = 0 - original_dir = os.getcwd () - temp_dir = os.path.join (original_dir, '%s.dir' % program_name) - keep_temp_dir_p = 0 - verbose_p = 0 - - help_summary = _ ("lilylib module") - - option_definitions = [ - ('', 'h', 'help', _ ("print this help")), - ] - - from lilylib import * -################################################################ - -# Handle bug in Python 1.6-2.1 -# -# there are recursion limits for some patterns in Python 1.6 til 2.1. -# fix this by importing pre instead. Fix by Mats. - -if float (sys.version[0:3]) <= 2.1: - try: - import pre - re = pre - del pre - except ImportError: - import re -else: - import re - -# Attempt to fix problems with limited stack size set by Python! -# Sets unlimited stack size. Note that the resource module only -# is available on UNIX. -try: - import resource - resource.setrlimit (resource.RLIMIT_STACK, (-1, -1)) -except: - pass localedir = '@localedir@' try: @@ -107,7 +63,7 @@ def identify (port): def warranty (): identify (sys.stdout) sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 1998--2003')) + sys.stdout.write (_ ("Copyright (c) %s by") % '1998--2005') sys.stdout.write ('\n') map (lambda x: sys.stdout.write (' %s\n' % x), __main__.copyright) sys.stdout.write ('\n') @@ -120,16 +76,16 @@ def progress (s): sys.stderr.write (s) def warning (s): - sys.stderr.write (__main__.program_name + ": " + _ ("warning: ") + s + '\n') + sys.stderr.write (__main__.program_name + ": " + _ ("warning: %s") % s + '\n') def error (s): - sys.stderr.write (__main__.program_name + ": " + _ ("error: ") + s + '\n') + sys.stderr.write (__main__.program_name + ": " + _ ("error: %s") % s + '\n') def exit (i): if __main__.verbose_p: raise _ ('Exiting (%d)...') % i else: - sys.exit (1) + sys.exit (i) def getopt_args (opts): '''Construct arguments (LONG, SHORT) for getopt from list of options.''' @@ -148,7 +104,7 @@ def getopt_args (opts): return (short, long) def option_help_str (o): - '''Transform one option description (4-tuple ) into neatly formatted string''' + '''Transform one option description (4-tuple) into neatly formatted string''' sh = ' ' if o[1]: sh = '-%s' % o[1] @@ -183,7 +139,15 @@ def options_help_str (opts): str = '' for s in strs: - str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0]) + 3), s[1]) + first = 1 + for ss in re.split ('\n\s*', s[1]): + if first: + str = str + '%s%s%s\n' \ + % (s[0], ' ' * (w - len (s[0]) + 3), ss) + first = 0 + else: + str = str + '%s%s\n' \ + % (' ' * (w + 3), ss) return str def help (): @@ -234,10 +198,10 @@ def setup_temp (): return __main__.temp_dir def command_name (cmd): - - # deal with "((latex ) >& 1 ) .." too - cmd = re.match ("([\(\)]*)([^ ]*)", cmd).group(2) - return os.path.split (cmd)[1] + # Strip all stuf after command, + # deal with "((latex ) >& 1 ) .." too + cmd = re.match ('([\(\)]*)([^\\\ ]*)', cmd).group (2) + return os.path.basename (cmd) def error_log (name): name = re.sub('[^a-z]','x', name) @@ -276,7 +240,7 @@ def read_pipe (cmd, mode = 'r'): if error_log_file: os.unlink (error_log_file) - exit (status) + exit (1) if __main__.verbose_p: progress ('\n') @@ -332,7 +296,7 @@ Exit status of CMD ''' sys.stderr.write (open (error_log_file).read ()) if error_log_file: os.unlink (error_log_file) - exit (status) + exit (1) if error_log_file: os.unlink (error_log_file) @@ -365,146 +329,88 @@ def cp_to_dir (pattern, dir): map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files) -# Python < 1.5.2 compatibility -# -# On most platforms, this is equivalent to -#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2* - -if os.path.__dict__.has_key ('abspath'): - abspath = os.path.abspath -else: - def abspath (path): - return os.path.normpath (os.path.join (os.getcwd (), path)) - -if os.__dict__.has_key ('makedirs'): - makedirs = os.makedirs -else: - def makedirs (dir, mode=0777): - system ('mkdir -p %s' % dir) +def search_exe_path (name): + p = os.environ['PATH'] + exe_paths = string.split (p, ':') + for e in exe_paths: + full = os.path.join (e, name) + if os.path.exists (full): + return full + return None def mkdir_p (dir, mode=0777): if not os.path.isdir (dir): makedirs (dir, mode) - -environment = {} - -# tex needs lots of memory, more than it gets by default on Debian -non_path_environment = { - 'extra_mem_top' : '1000000', - 'extra_mem_bottom' : '1000000', - 'pool_size' : '250000', -} - -def setup_environment (): - global environment - - kpse = read_pipe ('kpsexpand \$TEXMF') - texmf = re.sub ('[ \t\n]+$','', kpse) - type1_paths = read_pipe ('kpsewhich -expand-path=\$T1FONTS') - - environment = { - # TODO: * prevent multiple addition. - # * clean TEXINPUTS, MFINPUTS, TFMFONTS, - # as these take prevalence over $TEXMF - # and thus may break tex run? - - 'TEXMF' : "{%s,%s}" % (datadir, texmf) , - 'GS_FONTPATH' : type1_paths, - 'GS_LIB' : datadir + '/ps', - } - - # $TEXMF is special, previous value is already taken care of - if os.environ.has_key ('TEXMF'): - del os.environ['TEXMF'] - - for key in environment.keys (): - val = environment[key] - if os.environ.has_key (key): - val = os.environ[key] + os.pathsep + val - os.environ[key] = val - - for key in non_path_environment.keys (): - val = non_path_environment[key] - os.environ[key] = val - def print_environment (): for (k,v) in os.environ.items (): sys.stderr.write ("%s=\"%s\"\n" % (k, v)) -def get_bbox (filename): - bbox = filename + '.bbox' - ## -sOutputFile does not work with bbox? - cmd = 'gs -sDEVICE=bbox -q -dNOPAUSE %s -c quit 2>%s' % \ - (filename, bbox) - system (cmd, progress_p = 1) - box = open (bbox).read () - m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', - box) - gr = [] - if m: - gr = map (string.atoi, m.groups ()) - - return gr - -def make_ps_images (ps_name, resolution = 90): - ## todo: - ## have better algorithm for deciding when to crop page, - ## and when to show full page - base = re.sub (r'\.e?ps', '', ps_name) - +def ps_page_count (ps_name): header = open (ps_name).read (1024) - multi_page = re.search ('\n%%Pages: ', header) - cmd = '' - - if multi_page == None: - bbox = get_bbox (ps_name) - trans_ps = ps_name + '.trans.ps' - output_file = re.sub (r'\.e?ps', '.png', ps_name) - - - - # need to have margin, otherwise edges of letters will - # be cropped off. - - margin = 3 - fo = open (trans_ps, 'w') - fo.write ('%d %d translate\n' % (-bbox[0] + margin, - -bbox[1] + margin)) - fo.close () + m = re.search ('\n%%Pages: ([0-9]+)', header) + if m: + return string.atoi (m.group (1)) + return 0 - x = (2* margin + bbox[2] - bbox[0]) \ - * resolution / 72.0 - y = (2* margin + bbox[3] - bbox[1]) \ - * resolution / 72.0 - if x == 0: - x = 1 - if y == 0: - y = 1 +def make_ps_images (ps_name, resolution = 90, papersize = "a4", + rename_page1_p = 0): + base = os.path.basename (re.sub (r'\.e?ps', '', ps_name)) + header = open (ps_name).read (1024) - cmd = r'''gs -g%dx%d -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -r%d -dNOPAUSE %s %s -c quit ''' % \ - (x, y, output_file, resolution, trans_ps, ps_name) + png1 = base + '.png' + pngn = base + '-page%d.png' + output_file = pngn + multi_page = re.search ('\n%%Pages: ', header) - rms = glob.glob (base + '-page*.png') - map (os.unlink, rms) + # png16m is because Lily produces color nowadays. + if not multi_page: + + # GS can produce empty 2nd page if pngn is used. + output_file = png1 + cmd = r'''gs\ + -dEPSCrop\ + -dGraphicsAlphaBits=4\ + -dNOPAUSE\ + -dTextAlphaBits=4\ + -sDEVICE=png16m\ + -sOutputFile='%(output_file)s'\ + -sPAPERSIZE=%(papersize)s\ + -q\ + -r%(resolution)d\ + '%(ps_name)s'\ + -c showpage\ + -c quit ''' % vars () else: - output_file = re.sub (r'\.e?ps', '-page%d.png', ps_name) - - rmfile = base + '.png' - if os.path.isfile (rmfile): - os.unlink (rmfile) - - cmd = r'''gs -s -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c quit''' % (output_file, - resolution, ps_name) + cmd = r'''gs\ + -s\ + -dGraphicsAlphaBits=4\ + -dNOPAUSE\ + -dTextAlphaBits=4\ + -sDEVICE=png16m\ + -sOutputFile='%(output_file)s'\ + -sPAPERSIZE=%(papersize)s\ + -q\ + -r%(resolution)d\ + '%(ps_name)s'\ + -c quit''' % vars () + + remove = glob.glob (png1) + glob.glob (base + '-page*.png') + map (os.unlink, remove) status = system (cmd) signal = 0xf & status exit_status = status >> 8 - if status: - os.unlink (png) - error (_ ("Removing output file")) + remove = glob.glob (png1) + glob.glob (base + '-page*.png') + map (os.unlink, remove) + error (_ ("%s exited with status: %d") % ('GS', status)) exit (1) + + if rename_page1_p and multi_page: + os.rename (pngn % 1, png1) + files = glob.glob (png1) + glob.glob (re.sub ('%d', '*', pngn)) + return files