lilypond-1.2.15

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index d900ff88fcffbcf10fc2d572e866ae12f327e239..1d6e86f54e0207151fe53ead4204fc2a9db8a60d 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,25 +1,16 @@
-# Documentation/Makefile
-
 depth = ..
 
 NAME = documentation
-SUBDIRS= user metadoc bibliography pictures topdocs ntweb
+SUBDIRS= user metadoc bibliography pictures topdocs ntweb misc
 STEPMAKE_TEMPLATES=documentation  texinfo
 
-README_TOP_FILES=NEWS DEDICATION TODO AIMS CHANGES
-INFO_FILES = $(wildcard $(outdir)/$(package).info*)
-EXTRA_DIST_FILES = COPYRIGHT 
-
-
-
-BLURBS=BLURB 
+README_TOP_FILES=NEWS DEDICATION CHANGES
+EXTRA_DIST_FILES = 
 
 include $(depth)/make/stepmake.make 
 
 default: do-doc
 
-info: $(outdir)/$(package).info
-
 local-WWW: copy-for-me
 
 copy-for-me:

diff --git a/TODO b/TODO
index f2df107e6c070008aa137ec15245653cd7f399f8..dc34df747547933ed9bc2013f0ab451def13cb2d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,6 +11,8 @@ Grep -i for TODO, FIXME and ugh/ugr/urg.
 .* TODO
 . * use Rhythmic_head::position_i () for all Staff_referenced 
 . * .po -> .pot.
+. *  why need to run -C mf twice?
+. * junk BLURB files.
 . * setting indent to 0 with \shape fails
 . * ly2dvi : don't repeat opus if same.
 . * breaks before mmrests are favored.
@@ -20,11 +22,9 @@ Grep -i for TODO, FIXME and ugh/ugr/urg.
 . * rerun profile
 . * fix or replace feta-accordion.mf
 . * fix configure with CFLAGS or LDFLAGS, try:
-+    CFLAGS=-g LDFLAGS='-Wl,--warn-common' ./configure
-+ configure will use them while testing the compiler, but they don't
-+ appear in config.make
-
-. * Break_req handling is silly (break_forbid () + \break fucks up.)
+   CFLAGS=-g LDFLAGS='-Wl,--warn-common' ./configure
+configure will use them while testing the compiler, but they don't
+appear in config.make
 . * script engraver
 . * Chords:
 .  * Bass/inversion pitch when not part of Chord
@@ -490,19 +490,7 @@ hesitate to ask.
 . * SGML input
 
 . * Documentation
-.  * remove links to non-free SW.
 .  * internal documentation
-.  * a general paper. 
-.  * \properties
-.   * left/rightbeamcount
-.   * various other new properties.
-.  * introduction?
-.  * info?
-.  * LaTeX?
-.  * more manpages?
-.  * Doc (C) stuff of sheet music
-.  * a better format?  SGML?  TeX?  Info?
-.  * a better tutorial
 
 . * more spanners (smallish)
 .  * Glissando
@@ -515,7 +503,6 @@ hesitate to ask.
 
 . * lines:
 .  * Ledger lines, should be separate item: Ledger_lines
-.  * set different line sizes / thicknesses
 .  * beam stem showthrough, inter beam sizes (french vs german style)
 
 . * Collisions
@@ -524,7 +511,7 @@ hesitate to ask.
 
 . * Keys:
 .  * merge key{item} & localkey{item}?
-.  * spacing, national styles?
+.  * spacing
 
 . * Support for TAB
 .  * redo Notehead to allow digits as heads
@@ -533,7 +520,6 @@ hesitate to ask.
 . * should adjust stemlength for flag number.
 
 . * breaking:
-.  * caching breakpoints
 .  * saving them
 .  * specify number of lines
 
@@ -543,10 +529,8 @@ hesitate to ask.
 .  * \translator -> ?
 .  * fix \partial 
 .  * \bla {} vs \bla ; 
-.  * mix engraver hacking with music ?
 .  * \once\property  KEY = VAL
 .  * input property
-.  * abstract grammar.
 . * Figure out semicolons.
 . * <c f a>4 ?
 . * Viola mode?
@@ -564,8 +548,6 @@ hesitate to ask.
 
 .* SMALLISH PROJECTS
 
-. * fix confusing naming in Engraver vs Engraver_group_engraver (context)
-
 . * A range for context errors (eg. mark both { and }. )
 
 . * lyric in staff  (sharpsharp in staff, text below)

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 638a618ace06d76ded5c554a6304a0fe3bf1b7fa..29df5200624321709833809c90b5639ad93adc05 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -20,7 +20,6 @@ $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
 $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
-$(outdir)/main.o: $(outdir)/BLURB.hh 
 
 
 

diff --git a/lily/main.cc b/lily/main.cc
index f4ad427ab9df9f05a5fbef42bf4d113912091ef9..c4062cb1a40df72c39e7146b9d65bea1971a6b5f 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -94,7 +94,11 @@ usage ()
   cout << _ ("Typeset music and or play MIDI from FILE");
   cout << "\n\n";
   cout << 
-#include "BLURB.hh"
+_(
+"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
+"using a high level description file as input.  LilyPond is part of \n"
+"the GNU Project.\n"
+);
 
   cout << '\n';
   cout << _ ("Options:");