lilypond-0.0.50

diff --git a/ANNOUNCE b/ANNOUNCE
index 6d05b1d38c7e8c552194f7749d99f51887aecfbe..0b79200e5b3c3856b94e17ae87b393de3e6fdc19 100644 (file)
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,22 +1,22 @@
 
        Announcing
-       
-               LILYPOND
+                       
+       GNU LilyPond
 
        The Music Typesetter
 
 Do you pine for the nice days of Linux 0.95, when men were men and
 wrote their own applications? Are you without a nice project and just
 dying to cut your teeth into a bleeding edge application you can
-modify for your needs. Do you find it frustrating that everything
+modify for your needs?  Do you find it frustrating that everything
 works in LaTeX?  No more all-nighters to get a nifty program working?
 Then this post might be just for you!
 
 I have been working very hard on a music typesetting system (called
-LilyPond) the past half year, and I finally think it is ready to be
+GNU LilyPond) the past half year, and I finally think it is ready to be
 used and hacked at by a larger public than me and my co-developer.
 
-Sources for this project are on
+Sources for this project are on:
 
        ftp://pcnov095.win.tue.nl/pub/lilypond/
 
@@ -29,7 +29,7 @@ detailed info and examples can be found on the webpage at:
 
 [DETAILED DESCRIPTION]
 
-WHAT IS LILYPOND
+WHAT IS GNU LilyPond
 
 Technically it is a preprocessor which generates TeX
 (or LaTeX) output which contains information to typeset a musical

diff --git a/Documentation/lilypond.pod b/Documentation/lilypond.pod
index da1d68bf3fab7cd5a31088a8a16d3664d5d4d56d..3482fa961c231b1401f4d4edf4c6fb4da8c7d9ee 100644 (file)
--- a/Documentation/lilypond.pod
+++ b/Documentation/lilypond.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-LilyPond - a music typesetter
+lilypond - the GNU music typesetter
 
 =head1 SYNOPSIS
 
@@ -8,7 +8,7 @@ LilyPond - a music typesetter
 
 =head1 DESCRIPTION
 
-Technically LilyPond is a preprocessor which generates TeX
+Technically GNU LilyPond is a preprocessor which generates TeX
 (or LaTeX) output which contains information to typeset a musical
 score. Practically it is a typesetter, which only uses TeX as an
 output medium. (this is handy because there exist music fonts for TeX)
@@ -17,7 +17,7 @@ As a bonus, you can also output a MIDI file of what you typed.
 
 It translates script files (mudela files or F<*.ly>'s) into TeX input.
 Typesetting music is a complex task, whereas the message that printed
-music conveys is usually a simple one. LilyPond is a try at providing
+music conveys is usually a simple one. GNU LilyPond is a try at providing
 a simple interface for setting music.
 
 
@@ -36,13 +36,13 @@ do midi output only
 
 =item B<-d,--debug>,
 
-Turn debugging info. LilyPond will read the file F<.dstreamrc>, which
+Turn debugging info. GNU LilyPond will read the file F<.dstreamrc>, which
 tells for what functions and classes may produce copious debugging
 output.
 
 =item B<-w,--warranty>,
 
-Show the warranty with which LilyPond comes. (It comes with B<NO WARRANTY>!)
+Show the warranty with which GNU LilyPond comes. (It comes with B<NO WARRANTY>!)
 
 =item B<-o,--output=>F<FILE>,
 
@@ -110,7 +110,7 @@ clef changes, meter changes, cadenza-mode, key changes, repeat bars
 
 =head1 DESIGN CONSIDERATIONS
 
-LilyPond was written with some considerations in mind:
+GNU LilyPond was written with some considerations in mind:
 
 =over 5
 
@@ -118,7 +118,7 @@ LilyPond was written with some considerations in mind:
 
 Describing a well-defined language for defining music. We call
 this language (rather arrogantly) The Musical Definition Language
-(mudela for short). LilyPond reads a mudela sourcefile and outputs a
+(mudela for short). GNU LilyPond reads a mudela sourcefile and outputs a
 TeX file.  
 
 =item *
@@ -131,8 +131,8 @@ pitch.
 
 =item *
 
-LilyPond uses MusiXTeX fonts and TeX for its output. This is not a key
-issue: in a future version, LilyPond might bypass TeX, but at the moment
+GNU LilyPond uses MusiXTeX fonts and TeX for its output. This is not a key
+issue: in a future version, GNU LilyPond might bypass TeX, but at the moment
 TeX is very convenient for producing output.
 
 =item  *
@@ -143,23 +143,23 @@ setting is not possible without a knowledgeable printer,"  untrue.
 
 =item *
 
-LilyPond does not display notes directly, nor will it be rehacked to be
-used interactively. LilyPond writes output to a file.  It will not be
+GNU LilyPond does not display notes directly, nor will it be rehacked to be
+used interactively. GNU LilyPond writes output to a file.  It will not be
 extended to play music, or to recognize music.
 
 =item *
 
-LilyPond is intended to run on Unix platforms, but it should
+GNU LilyPond is intended to run on Unix platforms, but it should
 be portable to any platform which can run TeX and the GNU tools
 
 =item *
 
-LilyPond is free. Commercial windows packages for setting music are
+GNU LilyPond is free. Commercial windows packages for setting music are
 abundant. Free musicprinting software is scarce.
 
 =item *
 
-LilyPond is written in GNU C++. It will not be downgraded/ported to fit
+GNU LilyPond is written in GNU C++. It will not be downgraded/ported to fit
 broken systems.
 
 =back
@@ -167,10 +167,10 @@ broken systems.
 =head1
 DISCLAIMER & COPYING POLICY
 
-LilyPond is copyright 1996,97 by its authors. LilyPond is
+GNU LilyPond is copyright 1996,97 by its authors. GNU LilyPond is
 distributed under the terms of the GNU General Public
-License. LilyPond is provided without any warranty what so ever.
-LilyPond may be freely distributed.  For further information consult
+License. GNU LilyPond is provided without any warranty what so ever.
+GNU LilyPond may be freely distributed.  For further information consult
 the GNU General Public License, which is in the file F<COPYING>
 
 =head1 AUTHORS
@@ -179,13 +179,16 @@ the GNU General Public License, which is in the file F<COPYING>
 
 =item *
 
-Han-Wen Nienhuys <hanwen@stack.nl>, Main author
+Han-Wen Nienhuys <hanwen@stack.nl>, http://www.stack.nl/~hanwen
+
+Main author
 
 =item *
 
-Jan Nieuwenhuizen <jan@digicash.com>, Context errors, Lyrics,
-mi2mu, MIDI stuff, make structure, bits of FlowerLib, general
-comments, Mudela design.
+Jan Nieuwenhuizen <jan@digicash.com>,  http://www.digicash.com/~jan.
+
+Context errors, Lyrics, mi2mu, MIDI stuff, make structure, bits of
+FlowerLib, general comments, Mudela design.
 
 =item *
 
@@ -199,7 +202,7 @@ coding C++
 
 =head1 EXAMPLES
 
-At this time, LilyPond output looks nice, but is not of production
+At this time, GNU LilyPond output looks nice, but is not of production
 quality. If you're not discouraged; this is what I type in my xterm:
 
        lilypond someinput.ly
@@ -208,7 +211,7 @@ quality. If you're not discouraged; this is what I type in my xterm:
 
 This is what the output looks like over here:
 
-       LilyPond 0.0.40 #0/FlowerLib 1.1.7 #2. Compile: Mar 11 1997, 22:58:47 (g++ 2.7.2)
+       GNU LilyPond 0.0.40 #0/FlowerLib 1.1.7 #2. Compile: Mar 11 1997, 22:58:47 (g++ 2.7.2)
        Parsing ... [./init//symbol.ini[./init//dynamic.ini][./init//dutch.ini]
        [./init//script.ini][./init//table_sixteen.ini]][./input/wohltemperirt.ly]
        Setting up music ...Processing music ............
@@ -234,7 +237,7 @@ Check out the input files, some of them have comments
 
 =head1 PROBLEMS
 
-If LilyPond bombs out, then please recompile using with debugging info
+If GNU LilyPond bombs out, then please recompile using with debugging info
 turned on, and send a copy of the input which causes the error and a
 gdb stacktrace of the crash. It also helps if you can print the values
 of the objects. So if your trace is
@@ -248,12 +251,12 @@ of the objects. So if your trace is
          :
 
 Than it would help if you send a dump of the Interval and the Item
-(use: C<print *this> or use LilyPond C<print()> methods).
+(use: C<print *this> or use GNU LilyPond C<print()> methods).
 
-This is a beta version of LilyPond. Please send your helpful comments
+This is a beta version of GNU LilyPond. Please send your helpful comments
 and patches to me (see AUTHORS section)
 
-LilyPond is updated very frequently, the latest version is always available at:
+GNU LilyPond is updated very frequently, the latest version is always available at:
 ftp://pcnov095.win.tue.nl/pub/lilypond.
 
 
@@ -282,14 +285,14 @@ http://www.stack.nl/~hanwen/lilypond/index.html
 
 =head1  REMARKS
 
-LilyPond has no connection with the music package RoseGarden, other
+GNU LilyPond has no connection with the music package Rosegarden, other
 than the names being similar :-)
 
 =head1 HISTORY
 
 (for a  detailed changelog, see F<NEWS>)
 
-LilyPond's roots lie in MPP, a preprocessor to the rather arcane
+GNU LilyPond's roots lie in MPP, a preprocessor to the rather arcane
 MusiXTeX macro package for TeX. A friend of mine, Jan Nieuwenhuizen
 wrote the first 44 versions (0.01 to 0.44), then his program caught my
 attention, and I was slowly sucked in to the interesting problem of

diff --git a/NEWS b/NEWS
index 7176a07fcbb9012cb21ddc736f1098d35cc9ea93..237aac8d2f3b73db0a1e0cee5ca09d6556c5fa2e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,35 @@
-pl 48.hwn1
+pl 50
+       - merge rest / notehead.
+       - Staff_side as a base class for most "staff-side" symbols.
+       - version check
+       - Note_column_register, Note_column
+       - multiple scripts
+********
+april 8
+pl 49.jcn1
+Bugfix
+       - configure[.in], make/Configure_variables.make.in c++ (=doze fix)
+       - "configure; make" ok for doze, win32 target may be removed now
+       - win32/gcc 2.7.2 compile fixes -- why does this all compile 
+           (without warnings, why can-t i even trigger warnings) under 
+           linux/gcc-2.7.2.1?  it's quite a tedious job fixing this 
+           shit _on doze_ all the time.
+           * fixed #includes global-regs.cc, staff-info.cc, staff.cc
+           * key.hh:Key() -> Octave_key()
+           * added missing lily/include/input.hh: Input( Input const& )
+       
+pl 49
        - lsm template
        - clef in cadenza mode.
        - notename clear
        - \command bla; for \meter, \clef, \octave etc.
-
+*******
 pl 48
        - notenames init
        - Duration order -> grouping
        - broken key s
        - default octave
+
 ******
 april 3
 pl 47

diff --git a/lily/include/head-reg.hh b/lily/include/head-reg.hh
index d5eb6fa5cd2f0764d1949b25112d64176da91da7..188db10a26ec04b49f2f873fbc39628964c23d71 100644 (file)
--- a/lily/include/head-reg.hh
+++ b/lily/include/head-reg.hh
@@ -10,14 +10,18 @@
 #include "register.hh"
 
 struct Notehead_register : Request_register {
-    Item* note_p_;
+    Notehead* note_p_;
+    Rhythmic_req * note_req_l_;
     int dir_i_;
+    
     /* *************** */
-    Notehead_register(Complex_walker*);
+    Notehead_register();
     virtual bool try_request(Request *req_l) ;
-    virtual void process_request();
-    virtual void do_pre_move_process();
-    void set_dir(int);
+    virtual void process_requests();
+    virtual void pre_move_processing();
+    virtual void post_move_processing();
+    void set_feature(Features);
+    NAME_MEMBERS(Notehead_register);
 };
 
 

diff --git a/lily/include/notehead.hh b/lily/include/notehead.hh
index d7a68e7798884bf6850f3f4b184037ab202ac1f2..5d9c1d012d4a45fa2e07ae082936945af9076b96 100644 (file)
--- a/lily/include/notehead.hh
+++ b/lily/include/notehead.hh
@@ -6,20 +6,23 @@
 
 #ifndef NOTEHEAD_HH
 #define NOTEHEAD_HH
+
 #include "item.hh"
 
-/**
- ball at the end of the stem
-takes care of:
+/** ball at the end of the stem takes care of:
 
   * help lines  
   * proper placing of dots 
 
+  It also is the item for a Rest
+  
   */
 
-struct Notehead : Item {
+class Notehead : public Item {
+public:
     NAME_MEMBERS(Notehead);
 
+    bool rest_b_;
     int position;
     /// -1 = lowest, 0 = inside, 1 = top
     int extremal;
@@ -37,9 +40,10 @@ struct Notehead : Item {
       position of top line (5 linestaff: 8)
       */
     Notehead(int staff_size);
-    void do_print()const;
     static int compare(Notehead * const &a, Notehead *const &b) ;
-    Molecule* brew_molecule_p()const;
+protected:
+    virtual    void do_print()const;
+    virtual    Molecule* brew_molecule_p()const;
 };
 #endif // NOTEHEAD_HH
 

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 389178bbc3bf14a2d78ed971701da28c86ac137e..03f605394de9ca9937a71fc6b168b2e350c8dec8 100644 (file)
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -1,7 +1,7 @@
 #include "version.hh"
 #include <stdio.h>
 
-static char *s = "LilyPond " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
+static char *s = "GNU LilyPond " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
 
 static const int build=
 #include ".build"