From 3721b8d0eff367ac3924af1fd9b0b5923c73c959 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 24 Jul 2003 23:59:58 +0000
Subject: [PATCH] (Top): rewrite NEWS in texinfo.

---
 Documentation/GNUmakefile            |  2 +-
 Documentation/index.html.in          |  6 +++---
 Documentation/topdocs/NEWS.texi      | 19 +++++++++++++++++++
 Documentation/user/GNUmakefile       |  4 ++--
 buildscripts/mutopia-index.py        |  2 +-
 stepmake/stepmake/texinfo-rules.make |  1 -
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index af336445b3..3bafadd075 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -5,7 +5,7 @@ SUBDIRS=user bibliography pictures topdocs
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
-README_TOP_FILES=NEWS DEDICATION ChangeLog
+README_TOP_FILES= DEDICATION ChangeLog
 EXTRA_DIST_FILES=
 
 include $(depth)/make/stepmake.make 
diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index e87ac1729c..1549eeab4b 100644
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -41,7 +41,7 @@
           <td class="left-column">
 	  <ul>
 	    <li>
-	    <a class="title" href="../user/out-www/lilypond.html#Tutorial">Tutorial</a>
+	    <a class="title" href="../user/out-www/lilypond/lilypond.html#Tutorial">Tutorial</a>
 	      <br>(start here)
 	  </ul>
 	  </td>
@@ -50,7 +50,7 @@
 	  
             <li>
 	    <a class="title" href="../topdocs/out-www/NEWS.html">NEWS</a>
-	    <br>(changes since the last major release)
+ 	    <br>(changes since the last major release)
 	  </ul>
 	  </td>
         </tr>
@@ -61,7 +61,7 @@
 	    <li>
 <a class="title" href="../user/out-www/lilypond/lilypond.html">User manual</a>
 (in <a class="title" href="../user/out-www/lilypond.pdf">PDF</a>, in
-<a class="title" href="../user/out-www/lilypond.html">one big page</a>)
+<a class="title" href="../user/out-www/lilypond/lilypond.html">one big page</a>)
 
      <br>(everything about LilyPond)
      
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index e305a17fdd..238c4a1674 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -184,41 +184,60 @@ The manual has been completely revised and extended.
 @chapter New features in 1.6 since 1.4
 
 
+@itemize @bullet
 
+@item
 Support for figured bass and tablature.
 
+@item
 Completely rewritten beam formatting: provides much better output
 now.
 
+
+@item
 Completely revised and improved music font.
 
+
+@item
 Completely rewritten MIDI import support.
 
+@item
 Completely rewritten grace note support. Practically speaking this
 means that grace notes can be slurred to normal normal notes.
 
+
+@item
 Improved accidental handling and formatting: styles for producing
 cautionaries may vary, and complex collisions between accidentals of a
 chord are handled much better.
 
+@item
 Better spacing: both globally and locally. This includes subtle
 details like optical stem spacing.
 
+@item
 More support for ancient notation: mensural ligatures, ambitus
 (pitch range) of voices, more shapes, etc.
 
+@item
 More support for piano notation: bracket pedals, directed arpeggios,
 arpeggio brackets.
 
+@item
 Easier music polyphonic music entry.
 
+@item
 More extensibility, many speedups and bugfixes
 
+@item
 The manual has been thoroughly revised.
 
+@item
 Development is now hosted at http://savannah.gnu.org, and sources
 can be downloaded through anonymous CVS.
 
+@item
 Support for windows: LilyPond is part of the cygwin distribution,
 which comes with a user-friendly installer.
 
+@end itemize
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index d52cf47650..f6e334cd14 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -69,14 +69,14 @@ extra-local-help:
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi 
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$(outdir)/lilypond --html $<
+	$(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
 	-cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond
-	-cp -f $(outdir)/lilypond/index.html $@
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$(outdir)/lilypond-internals --html $<
+	$(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
 	-cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond-internals
-	-cp -f $(outdir)/lilypond-internals/index.html $@
 
 ifeq ($(SPLITTING_MAKEINFO),yes)
 
diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py
index 4eb80f688d..345a2f4c94 100644
--- a/buildscripts/mutopia-index.py
+++ b/buildscripts/mutopia-index.py
@@ -145,7 +145,7 @@ def gen_list(inputs, filename):
 		composer = read_dict('composer', '')
 		desc = read_dict('description', '')
 		list.write('<hr>\n')
-		list.write('<h1>example file: %s</h1>\n' % head);
+		list.write('<h1>%s</h1>\n' % head);
 		if composer <> '':
 			list.write('<h2>%s</h2>\n' % composer)
 		if desc <> '':
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index fb6c07ce13..2bad713de2 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -18,7 +18,6 @@ $(outdir)/%.ps.gz.omf: %.texi
 
 # Generic rule not possible?
 $(outdir)/%/%.html: $(outdir)/%.texi 
-	$(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
 	$(MAKEINFO) --output=$@ --html $<
 
 
-- 
2.39.5