*** empty log message ***

diff --git a/NEWS b/NEWS
index 70bc947d14e2f132dfd8a9a910a8281a2d949010..54a2087d12ede122552ccc80df5cfc91e9ddef0d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,16 +3,23 @@ New features in 1.5
 
 * Many speedups, many slowdowns.
 
 
 * Many speedups, many slowdowns.
 

+* More extensibility
+

 * Figured bass support
 
 * Improved beam formatting.
 
 * Improved grace notes.
 
 * Figured bass support
 
 * Improved beam formatting.
 
 * Improved grace notes.
 

-* Better spacing.
+* Improved accidental handling and formatting
+
+* Better spacing. Includes subtle details like optical stem spacing.
+
+* More ancient notation support: mensural ligatures, porrectuses, more
+shapes.

 
 

-* More ancient notation support.
+* Bracket piano pedals.

 
 * Some entry optimizations.
 
 
 * Some entry optimizations.
 

-* Font updated and improved.
+* Font completely revised and improved.

diff --git a/VERSION b/VERSION
index 7a84f2de2035519dc74844dec9406f0d4cc633dc..b192f194120f2b777e5740aa914b152c943ef675 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=57
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=57

-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1

 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 89b7d52630f42aef3fe5127f3521da73ed69db8c..3398c5d21938f91c2e2b5fa46cac0732c8e2d34d 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -130,8 +130,6 @@ def user_error (s, e=1):
        sys.exit (e)
        
 def error (s):
        sys.exit (e)
        
 def error (s):

-
-

        '''Report the error S.  Exit by raising an exception. Please
        do not abuse by trying to catch this error. If you do not want
        a stack trace, write to the output directly.
        '''Report the error S.  Exit by raising an exception. Please
        do not abuse by trying to catch this error. If you do not want
        a stack trace, write to the output directly.


@@ -322,6 +320,7 @@ errorport = sys.stderr
 keep_temp_dir_p = 0
 verbose_p = 0
 preview_p = 0
 keep_temp_dir_p = 0
 verbose_p = 0
 preview_p = 0

+preview_resolution = 90

 
 help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
 
 
 help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
 


@@ -336,6 +335,7 @@ option_definitions = [
        (_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
        # why capital P?
        ('', '', 'preview', _("Make a picture of the first system.")),
        (_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
        # why capital P?
        ('', '', 'preview', _("Make a picture of the first system.")),

+       ('', '', 'preview-resolution', _("Set the resolution of the preview.")),

        ('', 'P', 'postscript', _ ("generate PostScript output")),
        (_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),
        ('', 'V', 'verbose', _ ("verbose")),
        ('', 'P', 'postscript', _ ("generate PostScript output")),
        (_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),
        ('', 'V', 'verbose', _ ("verbose")),


@@ -734,10 +734,8 @@ def make_preview (name, extra):
        fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
        fo.close ()
        
        fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
        fo.close ()
        

-       res = 90
-
-       x = (2* margin + bbox[2] - bbox[0]) * res / 72.
-       y = (2* margin + bbox[3] - bbox[1]) * res / 72.
+       x = (2* margin + bbox[2] - bbox[0]) * preview_resolution / 72.
+       y = (2* margin + bbox[3] - bbox[1]) * preview_resolution / 72.

 
        cmd = r'''gs -g%dx%d -sDEVICE=pgm  -dTextAlphaBits=4 -dGraphicsAlphaBits=4  -q -sOutputFile=- -r%d -dNOPAUSE %s %s -c quit | pnmtopng > %s'''
        
 
        cmd = r'''gs -g%dx%d -sDEVICE=pgm  -dTextAlphaBits=4 -dGraphicsAlphaBits=4  -q -sOutputFile=- -r%d -dNOPAUSE %s %s -c quit | pnmtopng > %s'''
        


@@ -832,9 +830,9 @@ for opt in options:
        elif o == '--preview':
                preview_p = 1
                targets.append ('PNG')
        elif o == '--preview':
                preview_p = 1
                targets.append ('PNG')

-               
+       elif o == '--preview-resolution':
+               preview_resolution = string.atoi (a)

        elif o == '--no-paper' or o == '-m':
        elif o == '--no-paper' or o == '-m':

-

                targets = ['MIDI'] 
                paper_p = 0
        elif o == '--output' or o == '-o':
                targets = ['MIDI'] 
                paper_p = 0
        elif o == '--output' or o == '-o':