From: Jan Nieuwenhuizen Date: Fri, 3 Sep 1999 13:39:23 +0000 (+0200) Subject: patch::: 1.2.5.jcn1 X-Git-Tag: release/1.2.6~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d21a524c5cdce45fb3bc51b30c9e805d69586b56;p=lilypond.git patch::: 1.2.5.jcn1 pl 5.jcn1 - lily.scm: don't use regex-substitute/global - try at tutorial explain environment/macro - website/doco fixes - bf: package-diff.py --- diff --git a/CHANGES b/CHANGES index 2f0e5efd8d..31fd1c273a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +pl 5.jcn1 + - lily.scm: don't use regex-substitute/global + - try at tutorial explain environment/macro + - website/doco fixes + - bf: package-diff.py + pl 4.hwn1 - bf: repeats. - bf: mmrests diff --git a/Documentation/index.yo b/Documentation/index.yo index 4eb4dd7692..dff3395c08 100644 --- a/Documentation/index.yo +++ b/Documentation/index.yo @@ -1,17 +1,12 @@ DEFINEMACRO(tops)(0)(../topdocs/DOEXPAND(outdir)) DEFINEMACRO(pics)(0)(../pictures/DOEXPAND(outdir)) -nsect(NAME) - -The Documentation of LilyPond -- the GNU Project music typesetter - -nsect(DESCRIPTION) +nsectLilyPond Documentation) Note: These pages are created from the latest bf(development snapshots) of LilyPond. You can look at the bottom if you want to know which version this was. - nsubsect(Documentation: Introduction) itemize( @@ -34,6 +29,7 @@ it()url(The lilypond nsubsect(Documentation: manuals) +COMMENT(Reference manual/regtest stuffed away too deep) itemize( it()url(User documentation)(../tex/DOEXPAND(outdir)/index.html) it()url(Hacker documentation)(../metadoc/DOEXPAND(outdir)/index.html) diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile index fd0723e714..e64c881ecc 100644 --- a/Documentation/tex/GNUmakefile +++ b/Documentation/tex/GNUmakefile @@ -9,10 +9,8 @@ DOC_FILES = $(wildcard *.doc) DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(TELY_FILES:.tely=.dvi)) - - -OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) -OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) +#OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) +#OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(TEX_FILES) testje.fly HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html)) @@ -50,11 +48,9 @@ $(outdir)/%.latex: %.data $(depth)/VERSION - - -local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(datafiles) +local-WWW: $(HTML_FILES) $(DVI_FILES:.dvi=.ps.gz) $(datafiles) $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about LilyPond' \ - $(DOC_FILES) $(TEX_FILES)\ + $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) $(TEXI_FILES)\ | sed "s!$(outdir)/!!g" > $(outdir)/index.html $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html diff --git a/Documentation/tex/feta.tex b/Documentation/tex/feta.tex index a65e6dd888..a8815e7f64 100644 --- a/Documentation/tex/feta.tex +++ b/Documentation/tex/feta.tex @@ -1,6 +1,14 @@ % display all feta chars in a pretty picture % GNU LilyPond % (c) 1998 Jan Nieuwenhuizen +% +% urg: fool ls-latex +\def\urg{ +\title{The Feta font} +\author{JCN} +\begin{document} +} + \parindent0pt \nopagenumbers diff --git a/Documentation/tex/mudela-book-test.doc b/Documentation/tex/mudela-book-test.doc index 05c65ab914..b679830542 100644 --- a/Documentation/tex/mudela-book-test.doc +++ b/Documentation/tex/mudela-book-test.doc @@ -1,4 +1,6 @@ \documentclass{article} +\title{Mudela-book test} +\author{HWN} \begin{document} diff --git a/Documentation/tex/reference-manual.tely b/Documentation/tex/reference-manual.tely index f8a4f3b28f..a34e68d7ea 100644 --- a/Documentation/tex/reference-manual.tely +++ b/Documentation/tex/reference-manual.tely @@ -2,6 +2,13 @@ @setfilename reference-manual.info @settitle LilyPond 1-2-0 Reference Manual +@c ls-latex +@ignore +@author Adrian Mariano, Han-Wen Nienhuys and Jan Nieuwenhuizen +@title LilyPond Regression test +@end ignore + + @ifinfo This is the reference documentation to LilyPond. It is not a tutorial. diff --git a/Documentation/tex/regression-test.tely b/Documentation/tex/regression-test.tely index 9f9d06bcbf..f0fc7f15ad 100644 --- a/Documentation/tex/regression-test.tely +++ b/Documentation/tex/regression-test.tely @@ -2,6 +2,12 @@ @setfilename regression-test.info @settitle LilyPond Regression test +@c fool ls-latex +@ignore +@author Han-Wen Nienhuys and Jan Nieuwenhuizen +@title LilyPond Regression test +@end ignore + @node Top, , , This document tries give an brief overview of LilyPond features. When diff --git a/Documentation/tex/tutorial.tely b/Documentation/tex/tutorial.tely index 23ad4c3dfc..934e3a248a 100644 --- a/Documentation/tex/tutorial.tely +++ b/Documentation/tex/tutorial.tely @@ -1,7 +1,19 @@ -\\input texinfo @c -*-texinfo-*- +\input texinfo @c -*-texinfo-*- vim:textwidth=72:expandtab @setfilename tutorial.info @settitle Typesetting music with LilyPond +@ignore +macros don't work (yet?) --jcn +@macro explain{line,explanation} +@multitable @columnfractions .60 .39 +@item +@noindent +@exdent @code{\line\} +@tab +\explanation\ +@end multitable +@end macro +@end ignore @ifinfo @@ -11,7 +23,15 @@ tutorial. It was written by Han-Wen Nienhuys. Copyright 1999 by its authors. @end ifinfo + @titlepage + +@c fool ls-latex: why not use these, for texinfo?? +@ignore +@author Han-Wen Nienhuys +@title Typesetting music with LilyPond +@end ignore + @sp 10 @comment The title is printed in a large font. @center @titlefont{LilyPond tutorial} @@ -128,14 +148,31 @@ If all goes well, the file @file{menuet.dvi} will be created. To view this output, issue the command `@code{xdvi menuet}'. Now that we are familiar with the procedure of producing output, we -will analyse the input, line by line.@example +will analyse the input, line by line. +@ignore +Let's try to redo this +@example % lines preceded by a percent are comments. @end example The percent sign, `@code{%}', introduces a line comment. If you want to make larger comments, you can use block comments. These are delimited -by `@code{%@{}' and `@code{%@}}'@example +by `@code{%@{}' and `@code{%@}}' +@end ignore +@multitable @columnfractions .60 .39 +@item +@noindent +@c @example urg: no tt font +@c @exdent % lines preceded by a percent are comments. +@exdent @code{% lines preceded by a percent are comments.} +@c @end example +@tab +The percent sign, `@code{%}', introduces a line comment. If you +want to make larger comments, you can use block comments. These +are delimited by `@code{%@{}' and `@code{%@}}' +@end multitable +@example \input "paper16.ly" diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 253c68c3d0..fcc04fa8d0 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -9,11 +9,13 @@ @unnumbered LilyPond -- The @uref{http://www.fsf.org/gnu/gnu-history.html,GNU Project} Music Typesetter +@center @quotation @mudela[fragment] \relative c'' { \key es; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 } @end mudela @end quotation +@end center @c include BLURB? @@ -25,7 +27,7 @@ the GNU Project. -@unnumberedsec View sheet music +@unnumberedsec Sheet music @itemize @bullet @@ -44,6 +46,7 @@ LilyPond handling real music. MIDI, view PNG, PostScript, and Source. @itemize @bullet @item @uref{Documentation/tex/out-www/tutorial.html,Tutorial} +@item @uref{Documentation/tex/out-www/reference-manual.html,Tutorial} @item @uref{Documentation/out-www/faq.html,FAQ} @item @uref{Documentation/out-www/mail.html,Mailing Lists} @item @uref{Documentation/out-www/index.html,All of the LilyPond documentation} diff --git a/VERSION b/VERSION index e752f734ff..19b79a7fc2 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=5 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/ps/lily.ps b/ps/lily.ps index b25deb22b2..a7ea49cc37 100644 --- a/ps/lily.ps +++ b/ps/lily.ps @@ -3,8 +3,8 @@ % 2 setlanguagelevel % hmm. auto_resize_dicts doesn't help either. % round cappings 1 setlinecap - - +% +% /draw_beam % width slope thick { 2 div /beam_thick exch def @@ -17,14 +17,14 @@ 0 beam_thick lineto closepath fill } bind def - +% /draw_decrescendo % width height cons thick { setlinewidth /cresc_cont exch def /cresc_ht exch def /cresc_wd exch def - +% cresc_wd cresc_cont moveto 0 cresc_ht lineto stroke @@ -32,14 +32,14 @@ 0 cresc_ht neg lineto stroke } bind def - +% /draw_crescendo % width height cons thick { setlinewidth /cresc_cont exch def /cresc_ht exch def /cresc_wd exch def - +% 0 cresc_cont moveto cresc_wd cresc_ht lineto stroke @@ -47,12 +47,12 @@ cresc_wd cresc_ht neg lineto stroke } bind def - +% /lily_distance { 1 copy mul exch 1 copy mul add sqrt } bind def - +% /draw_tuplet % height gap dx dy thick dir { % urg: the only Level-2 PS, check effect in print @@ -66,8 +66,8 @@ /tuplet_gapx exch def /tuplet_h exch def tuplet_dy tuplet_dx div tuplet_gapx mul /tuplet_gapy exch def - - +% +% 0 0 moveto 0 tuplet_h dir mul lineto tuplet_dx tuplet_gapx sub 2 div @@ -78,7 +78,7 @@ tuplet_dx tuplet_dy lineto stroke } bind def - +% /draw_volta % h w thick vert_start vert_end { /vert_end exch def @@ -101,7 +101,7 @@ } if stroke } bind def - +% % this is for drawing slurs. /draw_bezier_sandwich % thickness { @@ -115,7 +115,7 @@ grestore stroke } bind def - +% /draw_dashed_slur { 1 setlinecap @@ -127,9 +127,9 @@ curveto stroke } bind def - - - +% +% +% /bracket_traject { /traject_ds exch def @@ -139,9 +139,9 @@ traject_ds traject_alpha cos mul add exch } bind def - - - +% +% +% /half_bracket { %6 @@ -169,7 +169,7 @@ %1 0 0 } bind def - +% /draw_half_bracket { moveto lineto @@ -181,7 +181,7 @@ fill grestore } bind def - +% /draw_bracket % height { 2 div bracket_b add /bracket_h exch def @@ -201,4 +201,4 @@ draw_half_bracket stroke } bind def - +% diff --git a/scm/lily.scm b/scm/lily.scm index cba847f06b..51c41b490c 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -236,7 +236,8 @@ (define (header-end) (string-append "\\special{! " - (regexp-substitute/global #f "\n" (ly-gulp-file "lily.ps") 'pre " %\n" 'post) + ;(regexp-substitute/global #f "\n" (ly-gulp-file "lily.ps") 'pre " %\n" 'post) + (ly-gulp-file "lily.ps") "}" "\\input lilyponddefs \\turnOnPostScript")) diff --git a/stepmake/CHANGES b/stepmake/CHANGES new file mode 100644 index 0000000000..a718863184 --- /dev/null +++ b/stepmake/CHANGES @@ -0,0 +1,380 @@ +pl 80 + - use mgsmerge iso tupdate + +pl 79 + - empty sed script fix for aix + +pl 78 + - yodl mode, mp fixes + +pl 77 + - mfmode + +pl 76 + - bfs: shells, scripts + +pl 75 + - bfs: release + +pl 74 + - avoid buggy /bin/sh on hp-ux + - bf: make/stepmake.make + - simple prolog support + +pl 73 + - bf: invoke sed only once + +pl 72 + - bf: mfplain dependency + - inimf, inimf checking (sigh) + +pl 71 + - bf: c-tags + - yodl: groff, ditroff + +pl 70 + - GUILE config fixes (AF) + +pl 69 + - package_depth detection fix + +pl 68 + - support for install-libraries + +pl 66 + - check for tbl and gmake + +pl 65 + - unix style pathsep/dirsep for cygwin + +pl 64 + - gcc-2.8/egcs + +pl 63 + - CFLAGS from yodl debian patch + +pl 62 + - fixed dist from subdirs + - junked stepmake/aclocal.m4 (again?) + - resurrected po stuff + +pl 61 + - bf: package-diff + +pl 60 + - small fixes. + +pl 59 + - bf: package-diff (remove missing automatic) + - install templates, (urg) INSTALL*1,2 INSTALL_OUT*1,2 + +pl 58 + - distribute formatted txt files: no yodl needed for operation! + - guile 1.2 and 1.3 support + +pl 57 + - yodl first build script fixes + - uninstall fixes, but, urg, still have to uninstall twice + to get rid of all subdirs + - installed stepmake + * install not required + * only installs on explicit make install from toplevel stepdir + * rather urg, 'make dist' needs absolute distdir! + +pl 56 + - crude metapost stuff + +pl 55 + - table-to-html stuff moved . + +pl 54 + - && for TeX + +pl 53 + - moved TeX stuff into tex template + +pl 52 + - striproff + - reeable $(PACKAGE)_LIBES,_INCLUDES + - metafont rules + - GTK+, --, -draw config stuff + +pl 51 + - bumped version nr + +pl 50 + - bf's: PATHSEP + - png + +pl 49 + - use yodl2ms and striproff for txt conversion + - bf: chmod fail + +pl 48 + - bumped version for yodl after various (lily pl7) changes + +pl 47 + - bf: patch in website after 'make release' + - windows ln -> cp + - bf: texinfo build + +pl 46 + - bf: versioning typo: topleveL_MAJOR + - bf: reincluded optional STATE-VECTOR +pl 45 + - Foo_rules.make -> foo-rules.make + +pl 44 + - split: Toplevel.make, debian/Makefile, Documentation/topdocs/Makefile + +pl 43 + - grand split up in targets/rules/variables. The vars should be before rules!! +pl 42 + - fake-msgfmt.sh; urg copied from fake-yodl + +pl 41 + - standard naming: _FILES + - use install-sh + - junked most check-X-deps + - standard naming: dir/out/library.a + - split C++ / C stuff in separate files. Moved out of default stuff + - automake.yo updates + - fake-yodl.sh + +pl 40 + - bf's: texinfo + - bf's: package-zip.sh for bash-2.0 + - typo package-diff + +pl 39 + - disabled toplevel index + +pl 38 + - bf's: topweb, Documentation + - bf: ls-latex + +pl 37 + - bf's: add-html-footer (ok, i've been reading /.) + +pl 36.hwn1 + - Metafont.make + - use := assignment for shell & wildcard stuff + +pl 36 + - bf: Executable.make install + +pl 35 + - bf: Po_rules + - grand foreach hack (HWN) + +pl 34 + - stepmake/*shared.make + +pl 33 + - make dist fix + - yodl/lily website fixes + +pl 32 + - DEPTH: enable fixing of 'yodl using yodl' + - bf's: package-diff: --dir-* + +pl 31.hwn1 + - bf ls-latex.py; added format + +pl 31 + - fixed make-flags + - fixup package-diff and added to-dir, from-dir + +pl 30.hwn2 + - + +pl 30.hwn1 + - doc++ target + - make -> $(MAKE) + +pl 30 + - add-html-footer: html/body/title + +pl 29.hwn1 + - automake.urgh -> automake.yo + +pl 29 + - counter fix + +pl 28 + - mini fix voor soladeris (HWN) + - add-html-footer fixes + - dropped pl + +pl 27 + - irix fixes(?) (HWN) + +pl 26.jcn3 + - update.py: try at stupid advice + - bf: ls-latex .yo author + - bf: Excutable.make install + +pl 26.jcn2 + - no changes + +pl 26.hwn1 + - no changes; just testin' make update + +pl 26.jcn1 + - no changes + +pl 26 + - make apply + - package-to.diff.gz + - package-from-to.diff.gz with state-vector + - state vector + +pl 25 + - bf: add-html-footer.py: version_str iso tuple + - typo: Executable.make + - for 2latex: yodl2latex of yodl-1.30.0.pre9 + - package depth 'detected' by configure (kinda ugh) + - fixes (HWN) + +pl 24 + - binary releases: + * make deb + * dpkg 1.4.0.23.2 + * debhelper 0.96 + * /usr/bin/db_*: remove -p from install options (urg) + * make rpm + * make zip + - debian fixes + - SEXECUTABLES / EXECUTABLES (JBR) + - fixed package-zip.sh (again?) + - bf's: make zip + - some doco + - bf: STRIPFILES + - rpm from tarball in $(depth)/$(outdir) + - dropped lilypython, pythonblurb + - bf's: flower.py/packagepython.py/package-diff.py + + +pl 23.hwn2 + - add mailaddress to package-diff, beautifications + +pl 23.hwn1 + - release.py: check make dist retval + - revamped rpm stuff. + - bf abs-step-bindir + + +pl 23 + - relaxed 'error' to '-echo' for non-vital utilities + - table-to-html.py + - bin/stepdirs.sh + - bin/stepmakeise.sh + - --package-ised + - windows-nt fixes (JBR) + +pl 22 + - new zip stuff + +pl 21 + - packagepythonified add-html-footer, ls-latex + - packagepython (dankje lieverd) + - LD + - bf: don't diff .pyc + - yodl2 -> YODL2 + - AC_STEPMAKE_YODL + - vars: GCC/TROFF/LD + +pl 20 + - bf: ls-latex: .yo author + title + - htmldoc fix + - ls-latex + - add-html-footer + - po stuff + - latex + bibtex + - latex2yodl fixes + +pl 19 + - add htmlfooter to all yodl chapter files + - .latex for latex files + - tex2html -> latex2html.sh + +pl 18 + - package-zet.sh + - cleaned-out configure -> aclocal.m4 + - (step)make targets: + * diff + * help + * rpm + * zip + - tex2yodl.pl helper + - patches are now called $package-$TOPLEVEL_VERSION.diff + - fixed @FILE@ and @VAR@ substitute + - bf: DO_CXX_COMPILE + +pl 17 + - C rules :-) + - bf's Template.make + +pl 16 + - more lily macros -> generic stepmake + - dropped POD configuration + - used it + - pod2yodl: one time conversion helper + +pl 15 + - fixes: texi2man + +pl 14 + - text2html + +pl 13 + - texinfo support + - removed mudela rules + +pl 12 + - irix patch + +pl 11 + - 'urg comment' by wendy + - python fixes + +pl 10 + - more from lily + - sed-stuff + +pl 9 + - configure fix for irix tr + - bf: Install_*.make + - bf: PACKAGE_ ROOTDIR + +pl 8 + - some python stuff from lily + +pl 7 + - PACKAGE_NAME + - BLURB + - INSTALL doco + - Documentation/ + +pl 6 + - bf: include makedir/Rules.make too + - Documentation/automake.urgh + +pl 5 + - allow chained make-dist + +pl 4 + - DOTTEXT->.txt + +pl 3 + - included more Lily makefiles + +pl 2 + - dropped $(package) in makefile names + - moved stepmake makes to stepmake/ + +pl 1 + - preparing for verbatim include + +pl 0 + - shared between lilypond-0.1.69 lilyx-0.1.0 diff --git a/stepmake/NEWS b/stepmake/NEWS index a718863184..e69de29bb2 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,380 +0,0 @@ -pl 80 - - use mgsmerge iso tupdate - -pl 79 - - empty sed script fix for aix - -pl 78 - - yodl mode, mp fixes - -pl 77 - - mfmode - -pl 76 - - bfs: shells, scripts - -pl 75 - - bfs: release - -pl 74 - - avoid buggy /bin/sh on hp-ux - - bf: make/stepmake.make - - simple prolog support - -pl 73 - - bf: invoke sed only once - -pl 72 - - bf: mfplain dependency - - inimf, inimf checking (sigh) - -pl 71 - - bf: c-tags - - yodl: groff, ditroff - -pl 70 - - GUILE config fixes (AF) - -pl 69 - - package_depth detection fix - -pl 68 - - support for install-libraries - -pl 66 - - check for tbl and gmake - -pl 65 - - unix style pathsep/dirsep for cygwin - -pl 64 - - gcc-2.8/egcs - -pl 63 - - CFLAGS from yodl debian patch - -pl 62 - - fixed dist from subdirs - - junked stepmake/aclocal.m4 (again?) - - resurrected po stuff - -pl 61 - - bf: package-diff - -pl 60 - - small fixes. - -pl 59 - - bf: package-diff (remove missing automatic) - - install templates, (urg) INSTALL*1,2 INSTALL_OUT*1,2 - -pl 58 - - distribute formatted txt files: no yodl needed for operation! - - guile 1.2 and 1.3 support - -pl 57 - - yodl first build script fixes - - uninstall fixes, but, urg, still have to uninstall twice - to get rid of all subdirs - - installed stepmake - * install not required - * only installs on explicit make install from toplevel stepdir - * rather urg, 'make dist' needs absolute distdir! - -pl 56 - - crude metapost stuff - -pl 55 - - table-to-html stuff moved . - -pl 54 - - && for TeX - -pl 53 - - moved TeX stuff into tex template - -pl 52 - - striproff - - reeable $(PACKAGE)_LIBES,_INCLUDES - - metafont rules - - GTK+, --, -draw config stuff - -pl 51 - - bumped version nr - -pl 50 - - bf's: PATHSEP - - png - -pl 49 - - use yodl2ms and striproff for txt conversion - - bf: chmod fail - -pl 48 - - bumped version for yodl after various (lily pl7) changes - -pl 47 - - bf: patch in website after 'make release' - - windows ln -> cp - - bf: texinfo build - -pl 46 - - bf: versioning typo: topleveL_MAJOR - - bf: reincluded optional STATE-VECTOR -pl 45 - - Foo_rules.make -> foo-rules.make - -pl 44 - - split: Toplevel.make, debian/Makefile, Documentation/topdocs/Makefile - -pl 43 - - grand split up in targets/rules/variables. The vars should be before rules!! -pl 42 - - fake-msgfmt.sh; urg copied from fake-yodl - -pl 41 - - standard naming: _FILES - - use install-sh - - junked most check-X-deps - - standard naming: dir/out/library.a - - split C++ / C stuff in separate files. Moved out of default stuff - - automake.yo updates - - fake-yodl.sh - -pl 40 - - bf's: texinfo - - bf's: package-zip.sh for bash-2.0 - - typo package-diff - -pl 39 - - disabled toplevel index - -pl 38 - - bf's: topweb, Documentation - - bf: ls-latex - -pl 37 - - bf's: add-html-footer (ok, i've been reading /.) - -pl 36.hwn1 - - Metafont.make - - use := assignment for shell & wildcard stuff - -pl 36 - - bf: Executable.make install - -pl 35 - - bf: Po_rules - - grand foreach hack (HWN) - -pl 34 - - stepmake/*shared.make - -pl 33 - - make dist fix - - yodl/lily website fixes - -pl 32 - - DEPTH: enable fixing of 'yodl using yodl' - - bf's: package-diff: --dir-* - -pl 31.hwn1 - - bf ls-latex.py; added format - -pl 31 - - fixed make-flags - - fixup package-diff and added to-dir, from-dir - -pl 30.hwn2 - - - -pl 30.hwn1 - - doc++ target - - make -> $(MAKE) - -pl 30 - - add-html-footer: html/body/title - -pl 29.hwn1 - - automake.urgh -> automake.yo - -pl 29 - - counter fix - -pl 28 - - mini fix voor soladeris (HWN) - - add-html-footer fixes - - dropped pl - -pl 27 - - irix fixes(?) (HWN) - -pl 26.jcn3 - - update.py: try at stupid advice - - bf: ls-latex .yo author - - bf: Excutable.make install - -pl 26.jcn2 - - no changes - -pl 26.hwn1 - - no changes; just testin' make update - -pl 26.jcn1 - - no changes - -pl 26 - - make apply - - package-to.diff.gz - - package-from-to.diff.gz with state-vector - - state vector - -pl 25 - - bf: add-html-footer.py: version_str iso tuple - - typo: Executable.make - - for 2latex: yodl2latex of yodl-1.30.0.pre9 - - package depth 'detected' by configure (kinda ugh) - - fixes (HWN) - -pl 24 - - binary releases: - * make deb - * dpkg 1.4.0.23.2 - * debhelper 0.96 - * /usr/bin/db_*: remove -p from install options (urg) - * make rpm - * make zip - - debian fixes - - SEXECUTABLES / EXECUTABLES (JBR) - - fixed package-zip.sh (again?) - - bf's: make zip - - some doco - - bf: STRIPFILES - - rpm from tarball in $(depth)/$(outdir) - - dropped lilypython, pythonblurb - - bf's: flower.py/packagepython.py/package-diff.py - - -pl 23.hwn2 - - add mailaddress to package-diff, beautifications - -pl 23.hwn1 - - release.py: check make dist retval - - revamped rpm stuff. - - bf abs-step-bindir - - -pl 23 - - relaxed 'error' to '-echo' for non-vital utilities - - table-to-html.py - - bin/stepdirs.sh - - bin/stepmakeise.sh - - --package-ised - - windows-nt fixes (JBR) - -pl 22 - - new zip stuff - -pl 21 - - packagepythonified add-html-footer, ls-latex - - packagepython (dankje lieverd) - - LD - - bf: don't diff .pyc - - yodl2 -> YODL2 - - AC_STEPMAKE_YODL - - vars: GCC/TROFF/LD - -pl 20 - - bf: ls-latex: .yo author + title - - htmldoc fix - - ls-latex - - add-html-footer - - po stuff - - latex + bibtex - - latex2yodl fixes - -pl 19 - - add htmlfooter to all yodl chapter files - - .latex for latex files - - tex2html -> latex2html.sh - -pl 18 - - package-zet.sh - - cleaned-out configure -> aclocal.m4 - - (step)make targets: - * diff - * help - * rpm - * zip - - tex2yodl.pl helper - - patches are now called $package-$TOPLEVEL_VERSION.diff - - fixed @FILE@ and @VAR@ substitute - - bf: DO_CXX_COMPILE - -pl 17 - - C rules :-) - - bf's Template.make - -pl 16 - - more lily macros -> generic stepmake - - dropped POD configuration - - used it - - pod2yodl: one time conversion helper - -pl 15 - - fixes: texi2man - -pl 14 - - text2html - -pl 13 - - texinfo support - - removed mudela rules - -pl 12 - - irix patch - -pl 11 - - 'urg comment' by wendy - - python fixes - -pl 10 - - more from lily - - sed-stuff - -pl 9 - - configure fix for irix tr - - bf: Install_*.make - - bf: PACKAGE_ ROOTDIR - -pl 8 - - some python stuff from lily - -pl 7 - - PACKAGE_NAME - - BLURB - - INSTALL doco - - Documentation/ - -pl 6 - - bf: include makedir/Rules.make too - - Documentation/automake.urgh - -pl 5 - - allow chained make-dist - -pl 4 - - DOTTEXT->.txt - -pl 3 - - included more Lily makefiles - -pl 2 - - dropped $(package) in makefile names - - moved stepmake makes to stepmake/ - -pl 1 - - preparing for verbatim include - -pl 0 - - shared between lilypond-0.1.69 lilyx-0.1.0 diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 9ffa512c33..1eb654a685 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -1,7 +1,7 @@ #!@PYTHON@ """ -Print a nice footer. add the top of the NEWS file (up to the ********) +Print a nice footer. add the top of the ChangeLog file (up to the ********) """ program_name = 'add-html-footer' @@ -15,27 +15,38 @@ import getopt import __main__ fullname = "unknown" -news_file = '' +changelog_file = '' index_file='' banner_file = '' -news_file='' -news ='' +changelog_file='' +changes ='' footer = '\n
Please take me back to the index\n\ of %s\n' builtstr = '\n
\n\ This page was built from %s-%s by\

%s <%s>, at %s.

' -(options, files) = getopt.getopt(sys.argv[1:], 'hp:', ['help', 'news=', 'index=', 'package=']) - -def gulp_file (fn): - f = open (fn) - return f.read () +(options, files) = getopt.getopt(sys.argv[1:], 'c:hp:', ['changelog=', 'help', 'news=', 'index=', 'package=']) + +def gulp_file(f): + try: + i = open(f) + i.seek (0, 2) + n = i.tell () + i.seek (0,0) + except: + sys.stderr.write ("can't open file: %s\n" % f) + return '' + s = i.read (n) + if len (s) <= 0: + sys.stderr.write ("gulped emty file: %s\n" % f) + i.close () + return s def help (): sys.stdout.write (r"""Usage: add-html-footer [OPTION]... HTML-FILE -Add a nice footer, add the top of the NEWS file (up to the ********) +Add a nice footer, add the top of the ChangLog file (up to the ********) Options: -h, --help print this help -p, --package package name (ugh. Junkme.) @@ -45,8 +56,8 @@ Options: for opt in options: o = opt[0] a = opt[1] - if o == '--news': - news_file = a + if o == '--news' or o == '--changelog' or o == '-c': + changelog_file = a elif o == '--index': index_file = a elif o == '-h' or o == '--help': @@ -91,10 +102,10 @@ banner = footstr (index_file) banner_id = '' -if news_file: - news = gulp_file (news_file) - i = regex.search ('^\*\*', news) - news = news[:i] +if changelog_file: + changes = gulp_file (changelog_file) + i = regex.search ('^\*\*', changes) + changes = changes[:i] def check_tag (tag, sub, s, bottom): tag = string.lower (tag) @@ -111,8 +122,8 @@ def check_tag (tag, sub, s, bottom): for f in files: s = gulp_file (f) - if news_file: - s = regsub.sub ('top_of_NEWS', '

\n'+ news + '\n\n', s) + if changelog_file: + s = regsub.sub ('top_of_ChangeLog', '\n'+ changes + '\n\n', s) s = check_tag (' $@ rm -f $@.in - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --news=$(depth)/NEWS $@ + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --changelog=$(depth)/CHANGES $@ local-WWW: -cp $(outdir)/*png $(outdir)/index.html $(depth) # don't fail if not making website