patch::: 1.0.8.jcn2: patsje

pl 8.jcn2
	- more doco in texinfo (with yodl pl3)
	- bf's: package-diff

diff --git a/Documentation/programs.yo b/Documentation/programs.yo
index c32fc4171718b908c58024cf84f6994d2a13e759..e3efaf6ed54ff11dc46e9dea9f9a05fcec82d58b 100644 (file)
--- a/Documentation/programs.yo
+++ b/Documentation/programs.yo
@@ -8,7 +8,7 @@ chapter(Programs)
 
 COMMENT(prepare for texinfoing manpages)
 redef(manpage)(5)()
-redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1))
+redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1 ))
 redef(manpageauthor)(0)(sect(Authors))
 redef(manpagesection)(1)(sect(ARG1))
 

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index bbf1a8028bfcb4e96e7486f0a286b547783d1551..fb2d54fb60854c7f6403a5b3dec5a88836c3d407 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -1,6 +1,6 @@
 COMMENT(-*-text-*-)
 
-DEFINEMACRO(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
+redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
 

diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index d8fe5152166f6a94747fc5452d3d52e528bdf905..673f8106bbc0b1f22ef9300134d15f548cb9fe31 100644 (file)
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -1,10 +1,9 @@
 COMMENT(-*-text-*-)
 
-DEFINEMACRO(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
+redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
 
-
 COMMENT( This document contains Mudela fragments.  You need at least
 Yodl-1.30.18 to convert this to tex or html.
 

diff --git a/Documentation/topinfo.yo b/Documentation/topinfo.yo
index ddb3c98fc209fccabdb0ec7c4989e6d31869b9d0..88f16caa2241eb454f2dbb38a78472d5688f1995 100644 (file)
--- a/Documentation/topinfo.yo
+++ b/Documentation/topinfo.yo
@@ -1,41 +1,44 @@
-COMMENT(
-URG
-don't try to make html from this
-)
+COMMENT( URG don't try to make html from this)
+
 whentexinfo(
-nodetext(Your Rights.)
+
+nodetext(Your Rights.)  COMMENT(set different text)
 chapter(Copying)
 LilyPond is Free Software.  See file(COPYING) for details.
 
 
 COMMENT(prepare for texinfoing manpages)
 redef(manpage)(5)()
-redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1))
+redef(manpagename)(2)(nodetext(ARG2)chapter(ARG1))
 redef(manpageauthor)(0)(sect(Authors))
 redef(manpagesection)(1)(sect(ARG1))
 
+COMMENT(prepare for texinfoing articles)
+redef(article)(3)(chapter(ARG1))
+redef(latexlayoutcmds)(1)()
+redef(htmlbodyopt)(2)()
+
 COMMENT(redef(includefile)(1)(INCLUDEFILE(man/ARG1)))
 includefile(programs.yo)
 
-COMMENT(
-
-  Urg fooling nodeprefix for tutorial article still doesn't work...
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial ))
+COMMENT(yodl2texinfo should be able to cope now, although ugly...)
+redef(article)(3)(chapter(ARG1))
 
-  I guess this is broken anyway, yodl2texinfo-post should make sure
-  node names + (menu) references are unique and consistent.
+redef(includefile)(1)(INCLUDEFILE(tex/ARG1))
+includefile(tutorial.yo)
 
-COMMENT(prepare for texinfoing articles)
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial))
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Refman ))
+COMMENT(yodl2texinfo should be able to cope now, although ugly...)
+redef(article)(3)(chapter(ARG1))
 
 redef(includefile)(1)(INCLUDEFILE(tex/ARG1))
-includefile(tutorial.yo)
+includefile(refman.yo)
 
-)
+redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia ))
+COMMENT(yodl2texinfo should be able to cope now, although ugly...)
+redef(article)(3)(chapter(ARG1))
 
-COMMENT(prepare for texinfoing articles)
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
-redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia))
 redef(includefile)(1)(INCLUDEFILE(ARG1))
 includefile(mutopia.yo)
 

diff --git a/NEWS b/NEWS
index 92a7f7e0e9f139750381ec9fed53758fa3a4769a..1f7ae3d063768f5ecae5306a26f4dd54bf08fa1a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 8.jcn2
+       - more doco in texinfo (with yodl pl3)
+       - bf's: package-diff
+
 pl 8.jcn1
        - removed tutorial from texinfo, yodl2texinfo is still rather broken
        - bf: setlocale NUMERIC to 'C'

diff --git a/VERSION b/VERSION
index 33a757b0b9f640b4b510f5392da5c11ad866ac88..bac268857a551d28914cddfd0292099e287baf01 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/VERSION b/lily/VERSION
index 33a757b0b9f640b4b510f5392da5c11ad866ac88..bac268857a551d28914cddfd0292099e287baf01 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/music-list.cc b/lily/music-list.cc
index a14a6ce44c50b927982c8e83bf77dbd1d52ce42c..47c95dd8f625f9a3b4fb70cb2ee9cea4b82f2f69 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -146,5 +146,6 @@ Request_chord::to_relative_octave (Musical_pitch last)
 
 
 Music_list::Music_list ()
+  : Pointer_list<Music*> ()
 {
 }

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index 7bc711f2eeeb9e6c58a4c43a2bca20d7e98c3a3a..cc142821257db670cab696166bba45f8e8231edb 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -78,3 +78,4 @@
 1.0.8.uu1
 1.0.8
 1.0.8.jcn1
+1.0.8.jcn2

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index 2e361e453dea0731ad41f97931a85f39af340333..0d1aba2820f2db5ee5ef36f2a9b4e26a64927a8b 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -79,8 +79,8 @@ def remove_configure (dir):
 
        # should do 'make distclean ?'
        os.system ('rm -rf debian/out')
-       os.system ('rm -f Makefile config.cache config.h config.hh config.log config.make config.status')
-       os.system ('rm -f stepmake/Makefile stepmake/config.hh stepmake/config.log stepmake/config.make')
+       os.system ('rm -f GNUmakefile config.cache config.h config.hh config.log config.make config.status configure')
+       os.system ('rm -f stepmake/GNUmakefile stepmake/config.hh stepmake/config.log stepmake/config.status stepmake/config.make')
 
        # ugh: symlinks
        os.system ('rm -f stepmake/stepmake/stepmake')
@@ -140,9 +140,10 @@ def makediff (fromdir, todir, patch_name):
        if i == -1:
                f.write (to_str + '\n')
        else:
-               i = i + len (version_tuple_to_str (flags.to_version)) + 1
+               i = i + len (version_tuple_to_str (flags.to_version))
                state_vec = state_vec[:i]
                f.write (state_vec)
+               f.write ('\n')
        f.write ('++state\n')
        f.close ()