lilypond-0.0.64

diff --git a/Documentation/MANIFESTO.pod b/Documentation/MANIFESTO.pod
index 35568361c14520eb1d3d74fc0b16182dd8f46849..04d220e96ea4ad3570ba920c0bb458258b192121 100644 (file)
--- a/Documentation/MANIFESTO.pod
+++ b/Documentation/MANIFESTO.pod
@@ -33,8 +33,8 @@ setting is not possible without a knowledgeable printer,"  untrue.
 
 =item *
 
-Make a  which system which fully tweakable. It should be possible to
-typeset a book on how not to typeset music. 
+Make a system which is fully tweakable. It should be possible to
+typeset a book on how not to typeset music.
 
 =back 
 

diff --git a/Documentation/gnu-music.pod b/Documentation/gnu-music.pod
index 33a3aee7b379b034d70b51db9408dbec37fd5e62..cdd1ea3b7040067f3fcd4fb38de1b177e43006f0 100644 (file)
--- a/Documentation/gnu-music.pod
+++ b/Documentation/gnu-music.pod
@@ -132,6 +132,8 @@ A noninteractive typesetter, suited for batch jobs, and
 typesetting existing music. This would couple the  ASCII language, the
 printing engine and the typesetting engine
 
+LilyPond is currently representing this section.
+
 =item *
 
 A GUI for composing. This would combine the display engine, the

diff --git a/Documentation/index.pod b/Documentation/index.pod
index 4dd3193944d2ab58c3651cedfefbe81a83423648..b90e3b463cc5c9d950055f87ca328773b26ea47f 100644 (file)
--- a/Documentation/index.pod
+++ b/Documentation/index.pod
@@ -142,6 +142,13 @@ The coding standards of the lilypond project.
 </a
 >
 
+=item *
+<a href=gnu-music.html
+>
+The GNU Music project
+</a
+>
+
 =item *
 <a href=docxx/index.html
 >
@@ -154,12 +161,14 @@ The DOC++ documentation of the C++ sources.
 Get it at ftp://pcnov095.win.tue.nl/pub/lilypond !
 
 
-=head1 AUTHOR
-
-Han-Wen Nienhuys <hanwen@stack.nl>, for this page
-
+=item *
 <a href=sconstat/stats.html
 >
 Stats on this page.
 </a
 >
+
+
+=back
+
+

diff --git a/NEWS b/NEWS
index f2495c5234651cd9bc3318f049d5378b2efe2346..5a66e820a8ae1278a0c16576af7282a998521f5e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+pl 64
+       - exe's now built in out/
+       - toplevel Makefile dep from make/Toplevel.make.in
+       - make_website: add version fokoter
+       - make_website: bf dist *.txt
+       - bf: fix loose bars :  \meter 4/4; c1.  
+       - Staff_elem -> Score_elem
+       - bf <cis cis>
+       - vbrace lookup
+       - stop if barchecks failed
+       - resync barcheck
+
+*******
 pl 63
        - bf: segfault during MIDI output  with mi2mu output.
        - kludge: parse error beyond eof

diff --git a/bin/make_website b/bin/make_website
index c9fc73dfb4a3fe21b3dad61ef5f6ffdb8ed5dcfb..9586d88598c60a9d1e036585586df165bf27fcee 100755 (executable)
--- a/bin/make_website
+++ b/bin/make_website
@@ -1,14 +1,55 @@
 #!/usr/bin/perl -w
-
+# stupid script to generate WWW site.
 
 use FileHandle;
+my $lily_version;
+my $footstr;
+my $mw_id = "<!make_website!>";
+sub get_version
+{
+    my ($vstr)=("");
+    open V, "$depth/.version";
+    while (<V>) {
+       s/#.*$//g;
+       next if (/^ *$/);
+       s/^/\$/;
+       s/= *(.*)$/=\"$1\";/;
+       $vstr .= $_;
+    }
+    eval ($vstr);
+    
+    $lily_version= "$TOPLEVEL_MAJOR_VERSION.$TOPLEVEL_MINOR_VERSION.$TOPLEVEL_PATCH_LEVEL$TOPLEVEL_MY_PATCH_LEVEL";
+    
+    # stupid checks.
+    $lily_version= "$TOPLEVEL_MAJOR_VERSION.$TOPLEVEL_MINOR_VERSION.$TOPLEVEL_PATCH_LEVEL$TOPLEVEL_MY_PATCH_LEVEL";
+
+
+    close V;
+}
+
+sub set_html_footer
+{
+    my $MAILADRESS=$ENV{MAILADRESS};
+    my @pw=(getpwuid($<));
+    my $username=$pw[6];
+
+    $footstr = 
+       "\n<hr>
+<font size=-2>
+This page was generated by <code>make_website</code> from lilypond-$lily_version by
+<p>
+<address><br>$username <a href=mailto:$MAILADRESS>&lt<!bla>$MAILADRESS</a>&gt</address>
+<p>" . `date` . "
+<p></font>\n";
+}
+    
 
 # do something, check return status
 sub my_system
 {
     my (@cmds) = @_;
     foreach $cmd (@cmds) {
-       my      $ret =  ( system ($cmd))/256;
+       my $ret =  ( system ($cmd));
        if ($ret) {
            print STDERR "\nmake_website: failed on command \`$cmd\' (status $ret)\n";
            exit 2;
@@ -83,7 +124,7 @@ sub gen_list
 {
     print "generating HTML list\n";
     open HTMLLIST, ">example_output.html";
-    print HTMLLIST "<title>LilyPond examples</title>\n";
+    print HTMLLIST "<html><body><title>LilyPond examples</title>\n";
     foreach $a (@examples) {
        $name=$a;
        print HTMLLIST "<h1>example file: $name</h1>\n<XMP>\n";
@@ -110,8 +151,40 @@ sub gen_list
            if ( -f $midif );
        print HTMLLIST "</ul>";
     }
+    print HTMLLIST "</BODY></HTML>";
        close HTMLLIST;
 }
+
+sub edit_html
+{
+    print STDERR "adding footer\n";
+
+    OUTER:
+    foreach $a (<*.html>) {
+       open H, "$a";
+       my $sep="</BODY>";
+       input_record_separator H $sep;
+       my $file="";
+       
+       while (<H>) { 
+           if (/$mw_id/) {
+               close H;
+               next OUTER;
+           }
+           $file .= $_; 
+
+       }
+       close H;
+       
+       
+       $file =~ s/$sep/$footstr$sep/g ;
+       
+       open H, ">$a";
+       print H $mw_id;
+       print H $file;
+       close H;
+    }
+}
 sub copy_files
 {  
     print "copying files\n";
@@ -126,28 +199,37 @@ sub docxx_update
     my_system "make -C $depth doc++";
 }
 
-sub
-    do_tar
+sub do_tar
 {
      print "tarring.\n";
      my_system
-        " tar vhcf website.tar *.html *.gif *.ps.gz *.ly.txt *.midi docxx/*;",
+        " tar vhcf website.tar *.html *.gif *.ps.gz *.txt *.midi docxx/*;",
         "gzip -f9 website.tar;";
 }
 
-$depth = "../../";
-$ENV{"TEXINPUTS"} .= ":$depth/input/:";
-$ENV{"LILYINCLUDE"} = "$depth/input/";
-my $cwd;
-chomp($cwd = `pwd`);
+sub main
+{
+    $depth = "../";
+    my $cwd;
+    chomp($cwd = `pwd`);
+    die "need to be in directory Documentation\n" if ( ! ($cwd =~ /Documentation$/));
+    get_version;
+    set_html_footer;
+
 
-die "need to be in directory Documentation\n" if ( ! ($cwd =~ /Documentation$/));
-chdir ("out");
+    $depth = "../../";
 
+    chdir ("out");
+    $ENV{"TEXINPUTS"} .= ":$depth/input/:";
+    $ENV{"LILYINCLUDE"} = "$depth/input/";
 
-gen_html;
-gen_examples;
-gen_list;
-copy_files;
-docxx_update;
-do_tar;
+
+    gen_html;
+    gen_examples;
+    gen_list;
+    copy_files;
+    edit_html;
+    docxx_update;
+    do_tar;
+}
+main;

diff --git a/flower/.version b/flower/.version
index 10b56193150686d6083b2178a1ed6d88f539c1ae..c07a4a1e4ed2bd4efcae38dd45f5334e2dbb1fb1 100644 (file)
--- a/flower/.version
+++ b/flower/.version
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 1
-PATCH_LEVEL = 16
+PATCH_LEVEL = 17
 # use to send patches, always empty for released version:
 MY_PATCH_LEVEL = # include separator: "-1" or ".a"
 #

diff --git a/flower/NEWS b/flower/NEWS
index 727d9e2487a02e5e06fb4576425aa96b9f63b8f9..9c330b8005ae558724dc8cce3054321b0a3d896d 100644 (file)
--- a/flower/NEWS
+++ b/flower/NEWS
@@ -1,5 +1,7 @@
 version 1.1:
 
+pl 17
+       - naming: Pointer->Link, IPointer->Pointer
 pl 16
        - Array::get()
        - P< > doco.