From ac41a690f5859693589156b38ff462ac135deea2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 17 Sep 1998 11:00:21 +0200 Subject: [PATCH] patch::: 1.0.8.jcn2: patsje pl 8.jcn2 - more doco in texinfo (with yodl pl3) - bf's: package-diff --- Documentation/programs.yo | 2 +- Documentation/tex/refman.yo | 2 +- Documentation/tex/tutorial.yo | 3 +-- Documentation/topinfo.yo | 41 +++++++++++++++++++---------------- NEWS | 4 ++++ VERSION | 2 +- lily/VERSION | 2 +- lily/music-list.cc | 1 + make/STATE-VECTOR | 1 + stepmake/bin/package-diff.py | 7 +++--- 10 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Documentation/programs.yo b/Documentation/programs.yo index c32fc41717..e3efaf6ed5 100644 --- 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 bbf1a8028b..fb2d54fb60 100644 --- 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 d8fe515216..673f8106bb 100644 --- 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 ddb3c98fc2..88f16caa22 100644 --- 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 92a7f7e0e9..1f7ae3d063 100644 --- 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 33a757b0b9..bac268857a 100644 --- 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 33a757b0b9..bac268857a 100644 --- 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 a14a6ce44c..47c95dd8f6 100644 --- 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 () { } diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index 7bc711f2ee..cc14282125 100644 --- 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 2e361e453d..0d1aba2820 100644 --- 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 () -- 2.39.2