CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         lilypond_1_6
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/06/10 14:06:56

Modified files:
        .              : ChangeLog 
        Documentation  : index.texi 
        buildscripts   : mutopia-index.py 

Log message:
        (Top): remove ChangeLog link.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?only_with_tag=lilypond_1_6&tr1=1.482.2.153&tr2=1.482.2.154&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/index.texi.diff?only_with_tag=lilypond_1_6&tr1=1.57.2.2&tr2=1.57.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/mutopia-index.py.diff?only_with_tag=lilypond_1_6&tr1=1.16.2.1&tr2=1.16.2.2&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.482.2.153 lilypond/ChangeLog:1.482.2.154
--- lilypond/ChangeLog:1.482.2.153      Thu Aug  7 02:43:07 2003
+++ lilypond/ChangeLog  Fri Jun 10 14:06:56 2005
@@ -1,3 +1,11 @@
+2005-06-10  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * Documentation/index.texi (Top): remove ChangeLog link.
+
+2003-08-08  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * buildscripts/mutopia-index.py: backport fix.
+
 2003-08-07  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
        * VERSION (PATCH_LEVEL): release 1.6.12
Index: lilypond/Documentation/index.texi
diff -u lilypond/Documentation/index.texi:1.57.2.2 
lilypond/Documentation/index.texi:1.57.2.3
--- lilypond/Documentation/index.texi:1.57.2.2  Thu Sep 26 13:02:18 2002
+++ lilypond/Documentation/index.texi   Fri Jun 10 14:06:56 2005
@@ -122,7 +122,6 @@
 @c Jan's site?
 
 @itemize @bullet
[EMAIL PROTECTED] The @uref{ChangeLog.html, ChangeLog} lists things recently 
done.
 @item The
 @uref{../../input/regression/out-www/regression.html,Regression Tests}
 are lot of snippets that test all basic features.  Also available in
Index: lilypond/buildscripts/mutopia-index.py
diff -u lilypond/buildscripts/mutopia-index.py:1.16.2.1 
lilypond/buildscripts/mutopia-index.py:1.16.2.2
--- lilypond/buildscripts/mutopia-index.py:1.16.2.1     Mon Sep 23 09:20:27 2002
+++ lilypond/buildscripts/mutopia-index.py      Fri Jun 10 14:06:56 2005
@@ -52,12 +52,14 @@
 
 
 headertext= r"""
-<p>You're looking at a page with some LilyPond samples.
-These files are also included in the distribution. The output is
-completely generated by LilyPond, without any touch up by humans.
+
+<p>You're looking at a page with some LilyPond samples.  These files
+are also included in the distribution. The output is completely
+generated from the <tt>.ly</tt> source file, without any further touch
+up.
 
 <p>The PostScript files were generated using TeX and dvips at 600 dpi.
-The pictures are 90dpi anti-aliased snapshots of the printed output.
+The pictures are 90 dpi anti-aliased snapshots of the printed output.
 The images are in PNG format, and should be viewable with any current
 browser.
 
@@ -86,7 +88,7 @@
                        return dict
 
        while s:
-               m = re.search (r"""\s*(\S+)\s*=\s*([^;]+)\s*;""", s)
+               m = re.search (r'''\s*(\S+)\s*=\s*"([^"]+)"''', s)
                if m == None:
                        s = ''
                else:
@@ -101,13 +103,16 @@
        return dict
 
 def help ():
-       sys.stdout.write (r"""Usage: mutopia-index [options] INFILE OUTFILE
-Generate index for mutopia\n
+       sys.stdout.write (r"""Usage: mutopia-index [OPTIONS] INFILE OUTFILE
+Generate index for mutopia.
+
 Options:
   -h, --help                 print this help
-  -o,-output=FILE            write output to file.
+  -o, --output=FILE          write output to file
   -s, --subdirs=DIR         add subdir
-  --suffix=SUF                  specify suffix"""
+      --suffix=SUF          specify suffix
+      
+"""
                                          )
        sys.exit (0)
 
@@ -132,9 +137,7 @@
                (base, ext2) = os.path.splitext (base)          
                ext = ext2 + ext
                
-               print '%s, ' % ex
                header = read_lilypond_header(ex)
-               
                def read_dict(s, default, h =header):
                                try:
                                        ret = h[s]
@@ -145,10 +148,10 @@
                composer = read_dict('composer', '')
                desc = read_dict('description', '')
                list.write('<hr>\n')
-               list.write('<h1>example file: %s</h1>\n' % head);
-               if composer <> '':
+               list.write('<h1>%s</h1>\n' % head);
+               if composer:
                        list.write('<h2>%s</h2>\n' % composer)
-               if desc <> '':
+               if desc:
                        list.write('%s<p>' % desc)
                list.write ('<ul>\n')
                def list_item(filename, desc, type, l = list):
@@ -162,9 +165,9 @@
                                size=os.stat(filename)[stat.ST_SIZE]
                                kB=(size + 512) / 1024
                                if kB:
-                                       l.write (' (%s %dkB)' % (type, kB))
+                                       l.write (' (%s %d kB)' % (type, kB))
                                else:
-                                       l.write (' (%s %dcharacters)' % (type, 
size))
+                                       l.write (' (%s %d characters)' % (type, 
size))
                                pictures = ['jpeg', 'png', 'xpm']
                                l.write ('\n')
 
@@ -174,8 +177,8 @@
                        if not file_exist_b (f):
                                break
                        list_item(f, 'See a picture of page %d' % pageno, 'png')
-               list_item(base + '.pdf', 'Print ', 'PDF')
-               list_item(base + '.ps.gz', 'Print ', 'gzipped PostScript')
+               list_item(base + '.pdf', 'Print', 'PDF')
+               list_item(base + '.ps.gz', 'Print', 'gzipped PostScript')
                list_item(base + '.midi', 'Listen', 'MIDI')
                list.write ("</ul>\n");
 


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to