lilypond-1.2.11

diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile
index 2afee0f19096fb935b02b435aa6a7b73ff79256f..2fbe79809f65f21a827265a3d2416dbad9446456 100644 (file)
--- a/Documentation/ntweb/GNUmakefile
+++ b/Documentation/ntweb/GNUmakefile
@@ -11,10 +11,8 @@ include $(depth)/make/stepmake.make
 
 default: do-doc dist-plain
 
-$(outdir)/%.html: %.yo
-       $(sed-version) < $< > $<.out
-       $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<.out
-       rm -f $<.out
+$(outdir)/%.texi: %.texi
+       m4 -DTOPLEVEL_VERSION=$(TOPLEVEL_VERSION) < $< > $@ 
 
 dist-plain: 
        cp $(PLAIN_FILES) $(outdir)

diff --git a/Documentation/ntweb/index.texi b/Documentation/ntweb/index.texi
index 4880b8492cd62a0d76f9abf7109b8458196fe140..d8064fbdc96fad60da37aec6e70523522f7146cf 100644 (file)
--- a/Documentation/ntweb/index.texi
+++ b/Documentation/ntweb/index.texi
@@ -7,8 +7,7 @@
 This page documents the NT port of LilyPond.  It reflects  the latest
 version of lilypond that was ported.
 
-@section Windows NT/95 Binary Distribution
-
+@section Introduction
 
 This page is dedicated to the distribution of precompiled and
 preformatted LilyPond binaries for Windows NT 4.0 .  This package is
@@ -24,8 +23,7 @@ in various formats is also available.
 using a high level description file as input.  LilyPond is part of 
 the GNU Project.
 
-
-
+@section News
 
 @table @samp
  @item BUG FIXES
@@ -104,7 +102,7 @@ found to be operational.  If you have any troubles and or comments
 please do not hesitate to drop me a line 
 @uref{mailto:daboys@@austin.rr.com,Jeffrey B. Reed}.
 
-
+@section Bugs
 
 @itemize @bullet
 
@@ -115,8 +113,7 @@ please do not hesitate to drop me a line
        foo.tex". 
 @end itemize
 
-
-
+@section Required Packages
 
 LilyPond uses the @code{TeX} package as its rendering engine. @code{TeX}
 represents the state-of-the-art in computer typesetting. It is used to
@@ -132,26 +129,27 @@ Gsview is used to display and print the music scores created by
 LilyPond.
 
 @itemize @bullet
-    @item @uref{http://www.snafu.de/~cschenk/miktex/,code(MiKTeX)}. Versions
+    @item 
+        @uref{http://www.snafu.de/~cschenk/miktex/,MiKTeX}. Versions
         1.10b, 1.11, and 1.20b are known to work.
-    @item @uref{http://www.python.org,code(Python)}. Version 1.5.1 and
+    @item 
+        @uref{http://www.python.org,Python}. Version 1.5.1 and
        possibly 1.5 work.
-    @item @uref{http://www.cs.wisc.edu/~ghost/gsview/index.html,code(gsview)}. 
+    @item 
+        @uref{http://www.cs.wisc.edu/~ghost/gsview/index.html,gsview}. 
        Version 5.10 is known to work.
 @end itemize
 
-
-
+@section Download
 
 @itemize @bullet
     @item Windows 95
-        @uref{lilypond-VERSION-95.exe,lilypond-VERSION-95}
+        @uref{lilypond-TOPLEVEL_VERSION-95.exe,lilypond-TOPLEVEL_VERSION-95}
     @item Windows NT 4.0
-        @uref{lilypond-VERSION-nt.exe,lilypond-VERSION-nt}
+        @uref{lilypond-TOPLEVEL_VERSION-nt.exe,lilypond-TOPLEVEL_VERSION-nt}
 @end itemize
 
-
-
+@section Installation
 
 @itemize @bullet
  the distribution.
@@ -161,7 +159,8 @@ LilyPond.
      @table @samp
        @item LaTeX geometry package
        @itemize @bullet
-         @item @uref{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/supported/geometry.zip,download} the zip file to @code{\Temp}.
+         @item 
+          @uref{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/supported/geometry.zip,download} the zip file to @code{\Temp}.
          @item Extract the zip file into the LaTeX package area of
              @code{MiKTeX}. This will be @strong{@emph{MiKTeX-dir}\tex\latex}
          @item From a Command Prompt change directory into geometry
@@ -185,8 +184,7 @@ LilyPond.
  instructions below
 @end itemize
 
-
-
+@section Running LilyPond
 
 @itemize @bullet
   @item Take a look at @uref{angels.ly,angels.ly}
@@ -198,13 +196,15 @@ LilyPond.
   @strong{start angels.ps}  
 @end itemize
 
-
-
+@section LilyPond Resources
 
 @itemize @bullet
-  @item @uref{http://www.cs.ruu.nl/people/hanwen/lilypond/index.html,LilyPond Homepage}
-  @item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/,LilyPond Ftp Site}
-  @item @uref{http://jab.org/mail/gnu-music-discuss@@gnu.org/,gnu-music-discuss mail archive}
+  @item 
+        @uref{http://www.cs.ruu.nl/people/hanwen/lilypond/index.html,LilyPond Homepage}
+  @item 
+        @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/,LilyPond Ftp Site}
+  @item 
+        @uref{http://jab.org/mail/gnu-music-discuss@@gnu.org/,gnu-music-discuss mail archive}
   @item Please feel free to mail us at @uref{mailto:gnu-music-discuss@@gnu.org,gnu-music-discuss}
 @end itemize
 

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 4722fea6cd90ebd30abe716843521238b38ff836..bb3accc06084bdf581345761fe40a7cf6dc2bffd 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -168,7 +168,7 @@ class Log_reader:
 
     def __init__(self,  texfile_nm, depfile_nm, afmfile_nm):       
        self.texfile = open(texfile_nm, 'w')
-       self.depfile = open (depfile_nm, 'w')
+       self.depfile = open (depfile_nm, 'wb')
        self.afmfile = Afm_file (afmfile_nm)
        headerstr = '%% Creator: %s\n%% Automatically generated on\n%% Do not edit' % \
                   (program_id() )

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index 72481671147dd5c594a9c41225b735cf7811c03a..bc80eaf9097ff376b592e78a0de6c1be7b4e14ef 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -137,7 +137,7 @@ def makediff (fromdir, todir, patch_name):
                toname = os.path.basename (toname)
                fromdir = '../' + fromname
 
-       f = open (patch_name, 'w')
+       f = open (patch_name, 'wb')
        f.write (header %
                (mailaddress (),   fromname, toname, 
                 flags.package.name, os.path.basename (patch_name)))