* scm/output-ps.scm (header): Papersize from paper.

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index 3cad32f1f31887b9fad74563596f19c1f366612e..4df1532a19d04302af197533d9faf5ac54728c94 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -60,7 +60,7 @@ if __name__ == '__main__':
        help_summary = _ ("lilylib module")
 
        option_definitions = [
-               ('', 'h', 'help', _ ("this help")),
+               ('', 'h', 'help', _ ("print this help")),
                ]
 
        from lilylib import *
@@ -107,7 +107,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--2004')
        sys.stdout.write ('\n')
        map (lambda x: sys.stdout.write ('  %s\n' % x), __main__.copyright)
        sys.stdout.write ('\n')
@@ -120,10 +120,10 @@ 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:
@@ -153,9 +153,9 @@ def option_help_str (o):
        if o[1]:
                sh = '-%s' % o[1]
 
-       sep = ' '
+       sep = '  '
        if o[1] and o[2]:
-               sep = ','
+               sep = ', '
                
        long = ''
        if o[2]:
@@ -187,7 +187,7 @@ def options_help_str (opts):
        return str
 
 def help ():
-       ls = [(_ ("Usage: %s [OPTION]... FILE") % __main__.program_name),
+       ls = [(_ ("Usage: %s [OPTIONS]... FILE") % __main__.program_name),
              ('\n\n'),
              (__main__.help_summary),
              ('\n\n'),
@@ -195,21 +195,21 @@ def help ():
              ('\n'),
              (options_help_str (__main__.option_definitions)),
              ('\n\n'),
-             (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
+             (_ ("Report bugs to %s.") % 'bug-lilypond@gnu.org'),
              ('\n')]
        map (sys.stdout.write, ls)
 
 def lilypond_version (binary):
        p = read_pipe ('%s --version ' % binary)
-       x = []
-       def catch_version (match):
-               x.append (match.group (1))
-               return ''
-       
-       re.sub ('GNU LilyPond ([^\n]+)\n', catch_version, p)
-       x.append ('not found')
-       
-       return x[0]
+
+       ls = p.split ('\n')
+       v= '<not found>'
+       for l in ls:
+               m = re.search ('GNU LilyPond ([0-9a-z.]+)', p)
+               if m:
+                       v = m.group (1)
+                       
+       return v
        
 def lilypond_version_check (binary, req):
        if req[0] <> '@' :
@@ -234,16 +234,26 @@ def setup_temp ():
        return __main__.temp_dir
 
 def command_name (cmd):
-       return re.match ('^[ \t]*([^ \t]*)', cmd).group (1)
+
+       # deal with "((latex ) >& 1 ) .." too 
+       cmd = re.match ("([\(\)]*)([^ ]*)", cmd).group(2)
+       return os.path.split (cmd)[1]
 
 def error_log (name):
+       name = re.sub('[^a-z]','x', name)
        return tempfile.mktemp ('%s.errorlog' % name)
 
 def read_pipe (cmd, mode = 'r'):
+       
+       
        redirect = ''
+       error_log_file = ''
        if __main__.verbose_p:
                progress (_ ("Opening pipe `%s\'") % cmd)
-               redirect = ' 2>%s' % error_log (command_name (cmd))
+       else:
+               error_log_file = error_log (command_name (cmd))
+               redirect = ' 2>%s' % error_log_file
+               
        pipe = os.popen (cmd + redirect, mode)
        output = pipe.read ()
        status = pipe.close ()
@@ -255,12 +265,25 @@ def read_pipe (cmd, mode = 'r'):
 
        if status:
                error (_ ("`%s\' failed (%d)") % (cmd, exit_status))
+               
                if not __main__.verbose_p:
-                       error (_ ("The error log is as follows:"))
-                       sys.stderr.write (open (error_log (command_name (cmd)).read ()))
+                       contents = open (error_log_file).read ()
+                       if contents:
+                               error (_ ("The error log is as follows:"))
+                               sys.stderr.write (contents)
+
+               # Ugh. code dup
+               if error_log_file:
+                       os.unlink (error_log_file)
+
                exit (status)
+               
        if __main__.verbose_p:
                progress ('\n')
+
+       if error_log_file:
+               os.unlink (error_log_file)
+               
        return output
 
 def system (cmd, ignore_error = 0, progress_p = 0):
@@ -273,7 +296,8 @@ RETURN VALUE
 Exit status of CMD '''
 
        name = command_name (cmd)
-
+       error_log_file = ''
+       
        if __main__.verbose_p:
                progress_p = 1
                progress (_ ("Invoking `%s\'") % cmd)
@@ -282,10 +306,11 @@ Exit status of CMD '''
 
        redirect = ''
        if not progress_p:
-               redirect = ' 1>/dev/null 2>' + error_log (name)
+               error_log_file = error_log (name)
+               redirect = ' 1>/dev/null 2>' + error_log_file
        elif __main__.pseudo_filter_p:
                redirect = ' 1>/dev/null'
-                       
+
        status = os.system (cmd + redirect)
        signal = 0x0f & status
        exit_status = status >> 8
@@ -302,11 +327,15 @@ Exit status of CMD '''
                                warning (msg + ' ' + _ ("(ignored)"))
                else:
                        error (msg)
-                       if not progress_p:
+                       if not progress_p and error_log_file:
                                error (_ ("The error log is as follows:"))
-                               sys.stderr.write (open (error_log (name)).read ())
+                               sys.stderr.write (open (error_log_file).read ())
+                       if error_log_file:
+                               os.unlink (error_log_file)
                        exit (status)
 
+       if error_log_file:
+               os.unlink (error_log_file)
        progress ('\n')
        return status
 
@@ -404,6 +433,7 @@ def print_environment ():
        for (k,v) in os.environ.items ():
                sys.stderr.write ("%s=\"%s\"\n" % (k, v)) 
 
+BOUNDING_BOX_RE = '^%%BoundingBox: (-?[0-9]+) (-?[0-9]+) (-?[0-9]+) (-?[0-9]+)'
 def get_bbox (filename):
        bbox = filename + '.bbox'
        ## -sOutputFile does not work with bbox?
@@ -411,8 +441,7 @@ def get_bbox (filename):
              (filename, bbox)
        system (cmd, progress_p = 1)
        box = open (bbox).read ()
-       m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)',
-                     box)
+       m = re.match (BOUNDING_BOX_RE, box)
        gr = []
        if m:
                gr = map (string.atoi, m.groups ())
@@ -436,7 +465,11 @@ def make_ps_images (ps_name, resolution = 90):
                output_file = re.sub (r'\.e?ps', '.png', ps_name)
        
 
-               margin = 0
+
+               # 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))
@@ -458,13 +491,14 @@ def make_ps_images (ps_name, resolution = 90):
                map (os.unlink, rms)
        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)
-       
+
        status = system (cmd)
        signal = 0xf & status
        exit_status = status >> 8