From d098d33a41336f4966b5b3c8444d7646b5f80c88 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 17 Jun 2000 16:13:50 +0200 Subject: [PATCH] patch::: 1.3.60.jcn2: jcn1: gejat webpeets idee 1.3.60.jcn2 =========== * Did som more webpage hacking and made some make website fixes, back links should work again. --- Generated by janneke@gnu.org, >From = lilypond-1.3.60.jcn1, To = lilypond-1.3.60.jcn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.60.jcn2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 13 ++- Documentation/GNUmakefile | 11 ++- Documentation/footer.html.in | 38 +++---- Documentation/header.html.in | 103 ++++++++++++++++--- Documentation/index.texi | 24 ++--- Documentation/misc/GNUmakefile | 14 ++- Documentation/topdocs/index.tely | 55 +++++++---- VERSION | 2 +- buildscripts/ps-to-gifs.sh | 90 +++++++++++++++++ input/test/{scales.ly => scales-fixme.ly} | 37 ++++--- input/trip.ly | 12 +-- make/toplevel.make.in | 13 ++- scripts/abc2ly.py | 4 +- stepmake/bin/add-html-footer.py | 115 +++++++++++----------- stepmake/stepmake/documentation-vars.make | 2 +- 15 files changed, 372 insertions(+), 161 deletions(-) create mode 100644 buildscripts/ps-to-gifs.sh rename input/test/{scales.ly => scales-fixme.ly} (78%) diff --git a/CHANGES b/CHANGES index 6e10892ca7..885fa95906 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,15 @@ ---- ../lilypond-1.3.60/CHANGES Fri Jun 16 16:45:48 2000 +--- ../lilypond-1.3.60.jcn1/CHANGES Sat Jun 17 16:10:49 2000 +++ b/CHANGES Sun Jun 18 16:18:28 2000 +@@ -1,3 +1,9 @@ +1.3.60.jcn2 +=========== + +* Did som more webpage hacking and made some make website fixes, back links + should work again. + + 1.3.60.jcn1 + =========== + --- ../lilypond-1.3.60/CHANGES Fri Jun 16 16:45:48 2000 ++ b/CHANGES Sat Jun 17 16:10:49 2000 @@ -1,3 +1,8 @@ 1.3.60.jcn1 diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 72aeaddca7..40b54c886b 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -12,8 +12,15 @@ include $(depth)/make/stepmake.make default: local-doc -local-WWW: copy-for-me $(outdir)/regression-test.ps.gz $(outdir)/regression-test.html footify +local-WWW: copy-for-me txt-to-html $(outdir)/regression-test.ps.gz $(outdir)/regression-test.html footify copy-for-me: - $(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true + $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true +txt-to-html: + $(foreach a, $(README_TOP_FILES), \ + echo "" > $(outdir)/$(a).html;\ + cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\ + echo "" >> $(outdir)/$(a).html\ + && ) true + $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(README_TOP_FILES))) diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index bcae009876..205114b335 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -1,27 +1,20 @@ - - - - - - - -automatically by add-html-footer, and replaces the simple standard -footer substitutions: + - * index, - * package name - * package name - * ENV:WEBMASTER, - * ENV:WEBMASTER + + ---> + + -
-Go back to index of LilyPond. +Go back to index of LilyPond.

Please send GNU LilyPond questions and comments to @@ -30,12 +23,8 @@ Please send GNU LilyPond questions and comments to gnu-music-discuss@gnu.org.

- - Please send comments on these web pages to -%s - - +@MAIL_ADDRESS@

@@ -46,3 +35,6 @@ Copyright (c) 1997, 1998, 1999, 2000 Han-Wen Nienhuys and Jan Nieuwenhuizen. Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.

+ + + diff --git a/Documentation/header.html.in b/Documentation/header.html.in index e96b3aaf29..f6a9b01c20 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -1,26 +1,101 @@ + + + + + - + + + + + -
+ [icon] + +

GNU LilyPond

+

Welcome to the home of the GNU Music Typesetter

+
+ - + + + + + + + + + + - -
General info
Home
- Entry page
- Hacking
+ Hacking
+ GNU Project
+ Translations
+ LilyPond dot org
+
+
+ Documentation +
+ News
+ FAQ
+ User manual
+ Features
+ Todo
+
+
+ Download Source +
+ Stable
+ Development
+
+
+ Download Binary +
+ RedHat i386
+ LinuxPPC
+ Debian i386
+ Debian PowerPC
+ Windows Stable
+ Windows Testing
+
+
+ Music +
+ Short examples
+ Longer examples
+ Mutopia Project
+ Jonh Sankey
+ Jeff Covey
+ Dirk Lattermann
+
+
+ Mailing Lists
Download Source
- Stable
- Development
+ Discussion
+ Help
+ Bugs
+
- - 		+
+ diff --git a/Documentation/index.texi b/Documentation/index.texi index d3ee87f0cd..feb58100c9 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -9,11 +9,11 @@ @unnumberedsubsec General information @itemize @bullet -@item @uref{DEDICATION.txt,Dedication} +@item @uref{DEDICATION.html,Dedication} @item @uref{../topdocs/out-www/AUTHORS.html, Authors} @item @uref{../topdocs/out-www/README.html, Readme file} @item @uref{../topdocs/out-www/INSTALL.html, Installation instructions} -@item @uref{CHANGES.txt, Things recently done} +@item @uref{CHANGES.html, Things recently done} @item @uref{faq.html,FAQ: Frequently asked questions}, with answers @end itemize @@ -66,18 +66,18 @@ by computer}. @itemize @bullet @item @uref{hacking.html,Internals} details of the implementation @item @uref{README-W32.html,Compiling and running on Windows32} -@item @uref{../misc/out-www/CHANGES-0.0.txt, Change logs from 0.0 till 0.1 } -@item @uref{../misc/out-www/CHANGES-0.1.txt, Change logs from 0.1 till 1.0 } -@item @uref{../misc/out-www/CHANGES-1.0.txt, Change logs from 1.0 till 1.1 } -@item @uref{../misc/out-www/CHANGES-1.1.txt, Change logs from 1.1 till 1.2 } -@item @uref{../misc/out-www/NEWS-1.2.txt, summary of changes from 1.1 till 1.2 } -@item @uref{../misc/out-www/ANNOUNCE-0.1.txt, Announcement of 0.1 (includes summary of +@item @uref{../misc/out-www/CHANGES-0.0.html, Change logs from 0.0 till 0.1 } +@item @uref{../misc/out-www/CHANGES-0.1.html, Change logs from 0.1 till 1.0 } +@item @uref{../misc/out-www/CHANGES-1.0.html, Change logs from 1.0 till 1.1 } +@item @uref{../misc/out-www/CHANGES-1.1.html, Change logs from 1.1 till 1.2 } +@item @uref{../misc/out-www/NEWS-1.2.html, summary of changes from 1.1 till 1.2 } +@item @uref{../misc/out-www/ANNOUNCE-0.1.html, Announcement of 0.1 (includes summary of changes)} -@item @uref{../misc/out-www/ANNOUNCE-1.0.txt, Announcement of 1.0 (includes summary of +@item @uref{../misc/out-www/ANNOUNCE-1.0.html, Announcement of 1.0 (includes summary of changes)} -@item @uref{../misc/out-www/ANNOUNCE-1.2.txt, Announcement of 1.2 (includes summary of changes)} -@item @uref{../misc/out-www/AIMS.txt, Why LilyPond?} -@item @uref{../misc/out-www/interview.txt, Answers} to the Brave GNU world standard questions. +@item @uref{../misc/out-www/ANNOUNCE-1.2.html, Announcement of 1.2 (includes summary of changes)} +@item @uref{../misc/out-www/AIMS.html, Why LilyPond?} +@item @uref{../misc/out-www/interview.html, Answers} to the Brave GNU world standard questions. @end itemize diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile index 003590955b..ebcf4f2fd0 100644 --- a/Documentation/misc/GNUmakefile +++ b/Documentation/misc/GNUmakefile @@ -11,10 +11,20 @@ include $(depth)/make/stepmake.make default: local-doc -local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) +#urg default local-WWW target uses footify before its time; +# must add footify with txt-to-html target +local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html copy-for-me: - $(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true + $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true $(outdir)/%.txt: % cp $< $@ + +txt-to-html: + $(foreach a, $(TEXTS),\ + echo "

" > $(outdir)/$(a).html;\ + cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\ + echo "" >> $(outdir)/$(a).html\ + && ) true + $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(TEXTS))) diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 1ee15eb970..0f8eff1238 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -6,9 +6,10 @@ @top @html + @end html @html

[logo] @end html -@unnumberedsec LilyPond -- The GNU Project Music Typesetter + +@c @unnumberedsec LilyPond -- The GNU Project Music Typesetter @c something breaks on 3.12 f @@ -44,9 +47,10 @@ The input to LilyPond is plain text. So, you can use your favorite text editor to enter it, you can put it in mail or embed it in an article like this: +@c \relative c''{ \key es \major; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 } @quotation @mudela[fragment,verbatim] - \relative c'' { \key es \major; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 } +\relative c''{ \key es \major; r8 c16 b c8 g as c16 b c8 d | g,4 } @end mudela @end quotation @@ -78,7 +82,7 @@ If want more information, you can browse the @unnumberedsec News For the latest and greatest features, check out the -@uref{Documentation/out-www/CHANGES.txt, Change Log}. +@uref{Documentation/out-www/CHANGES.html, Change Log}. @html @@ -105,38 +109,49 @@ Lattermann also put some works @uref{http://www.alqualonde.de/lilypond.html,on the web}. @html - + @end html @unnumberedsec Download If you want to compile LilyPond from source, download here: @itemize @bullet @item Download stable releases at -@uref{ftp://ftp.gnu.org/gnu/lilypond/} -@item Download development releases at -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/} -@item Canadian mirror @uref{http://sca.uwaterloo.ca/lilypond/} and @uref{ftp://sca.uwaterloo.ca/pub/} -@item Another site in Europe -@uref{ftp://ftp.lilypond.org/pub/LilyPond/} +@uref{ftp://ftp.gnu.org/gnu/lilypond/, GNU} +@item Download development releases from +@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/, the source} +@item @uref{http://sca.uwaterloo.ca/lilypond/, by http (Canadian +mirror)} or @uref{ftp://sca.uwaterloo.ca/pub/, ftp (Canadian mirror)} +@item @uref{ftp://ftp.lilypond.org/pub/LilyPond/, mirror (Europe)} @end itemize Installing and compiling requires many additional packages, which are listed in the @uref{Documentation/topdocs/out-www/INSTALL.html, installation instructions}. +@html + +@end html + Binaries are available, but are not updated for every version released. @itemize @bullet -@item RedHat-i386 and Linuxppc RPMs: -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/} -@item Debian binary @uref{ftp://ftp.debian.org/pub/debian/dists/unstable/main/binary-i386/tex} -@item Windows NT: @uref{http://home.austin.rr.com/jbr/jeff/lilypond/} +@item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/, RedHat i386} +@item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/, LinuxPPC} +@item +@uref{ftp://ftp.debian.org/debian/dists/unstable/main/binary-i386/tex, +Debian GNU/Linux i386} +@item +@uref{ftp://ftp.debian.org/debian/dists/unstable/main/binary-powerpc/tex, +Debian GNU/Linux PowerPC} +@item @uref{http://home.austin.rr.com/jbr/jeff/lilypond/, Windows Stable} +@item @uref{http://appel.dyndns.org/lilypond/gnu-windows, Windows +Testing} @end itemize @html @end html -@unnumberedsec Mailing list +@unnumberedsec Mailing lists If you have questions, do write to the mailing lists! (But don't forget to read the @uref{Documentation/out-www/faq.html, @@ -193,9 +208,10 @@ of the LilyPond package. The version of this webpage is printed at the bottom. @html + @end html @bye diff --git a/VERSION b/VERSION index d8141361f5..9ec500aab8 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=60 -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/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh new file mode 100644 index 0000000000..e2a3da89cb --- /dev/null +++ b/buildscripts/ps-to-gifs.sh @@ -0,0 +1,90 @@ +#!/bin/sh +# ps-to-gifs, convert PS to multiple gifs or other bitmaps + +usage() +{ + cat < $OUTFILE +PPMS=`ls $BASE*ppm` +for i in $PPMS; do + o=`dirname $i`/`basename $i .ppm`.$GIF + cat $i | $CROP | $PNMTOGIF $color > $o + rm $i +done + +if [ "x$OUTFILE" != "x" ]; then + mv $BASE-page1.$GIF $BASE.$GIF +fi + diff --git a/input/test/scales.ly b/input/test/scales-fixme.ly similarity index 78% rename from input/test/scales.ly rename to input/test/scales-fixme.ly index d31e9ca81d..92b696b5d1 100644 --- a/input/test/scales.ly +++ b/input/test/scales-fixme.ly @@ -1,30 +1,35 @@ +% +% URG: this file was named 'scales.ly' but now that we have a +% ly/scales.ly, that name doesn't compile anymore. +% + \score { \context Voice \notes\relative c { % sharp-major % c g d a e b fis cis - \key c; + \key c \major; c' d e f g a b c - \key g; + \key g\major; g a b c d e fis g - \key d; + \key d\major; d, e fis g a b cis d - \key a; + \key a\major; a b cis d e fis gis a - \key e; + \key e\major; e, fis gis a b cis dis e - \key b; + \key b\major; b cis dis e fis gis ais b - \key fis; + \key fis\major; fis, gis ais b cis dis eis fis - \key cis; + \key cis\major; cis, dis eis fis gis ais bis cis % sharp-minor @@ -57,25 +62,25 @@ % flat-major % c f bes es as des ges ces - \key f; + \key f\major; f, g a bes c d e f - \key bes; + \key bes\major; bes, c d es f g a bes - \key es; + \key es\major; es,, f g as bes c d es - \key as; + \key as\major; as, bes c des es f g as - \key des; + \key des\major; des,, es f ges as bes c des - \key ges; + \key ges\major; ges, as bes ces des es f ges - \key ces; + \key ces\major; ces,, des es fes ges as bes ces % flat-minor @@ -106,4 +111,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/trip.ly b/input/trip.ly index 5cccdb146d..eaa76f6568 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -20,7 +20,7 @@ TODO: %} praeludiumRight = \notes { - \key e; + \key e \major; \clef violin; % 13 -- how to type -- where to split -- this more neatly? @@ -46,7 +46,7 @@ praeludiumRight = \notes { } praeludiumLeft = \notes \relative c { - \key e; + \key e \major; \clef bass; % 13 @@ -86,7 +86,7 @@ praeludiumLeft = \notes \relative c { fugaIIRight = \notes \relative c'' { - \key e; % E-major + \key e \major; % E-major \clef violin; \time3/4; @@ -137,7 +137,7 @@ fugaIIRight = \notes \relative c'' { gracetest = \notes \grace { [c16 ( cis dis] } fugaIILeft = \notes { - \key e; + \key e \major; \clef bass; %15 @@ -155,7 +155,7 @@ fugaIILeft = \notes { } fugaIIPedal = \notes \relative c { - \key e; + \key e \major; \clef bass; %15 @@ -192,7 +192,7 @@ fugaIIPedal = \notes \relative c { \property Staff.instr = #"bs" \time 4/4; - \key e; + \key e \major; \clef bass; %13 diff --git a/make/toplevel.make.in b/make/toplevel.make.in index 9cc19ff4b5..dd38191b50 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -26,7 +26,11 @@ STEPMAKE_TEMPLATES=toplevel yolily-toplevel po include $(depth)/make/stepmake.make # -website: fonts htmldoc examples doc++ +website: fonts htmldoc examples doc++ footify + +footify: + $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print` + $(footify-all-command) fonts: $(MAKE) -C $(depth)/mf @@ -38,6 +42,7 @@ htmldoc: $(MAKE) out='www' local-WWW $(MAKE) out='www' -C Documentation WWW rm -f `find . -name \*.html~ -print` + $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print` $(footify-all-command) find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.png $(ERRORLOG)` index.html @@ -45,10 +50,12 @@ htmldoc: examples: $(MAKE) out='www' -C input WWW $(MAKE) out='www' -C mutopia WWW - $(footify-all-command) + # arg, should not break concept of recursive make; + # this breaks links (and dependencies, see above) $(PYTHON) $(buildscripts)/mutopia-index.py -o short-examples.html input/ $(PYTHON) $(buildscripts)/mutopia-index.py -o long-examples.html mutopia/ - + #$(footify-all-command) + $(footify) --index=./ `$(FIND) . -name '*.html' -print` tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html `find input mutopia -type d -name 'out-www' -print` diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index aa9f7893de..68073f20ba 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -512,11 +512,11 @@ def try_parse_header_line (ln, state): m = re.match ('^([^ \t]*) *(.*)$', a) # seperate clef info if m: __main__.global_key =compute_key (m.group(1))# ugh. - voices_append ('\\key %s;' % lily_key(m.group(1))) + voices_append ('\\key %s \\major;' % lily_key(m.group(1))) check_clef(m.group(2)) else: __main__.global_key =compute_key (a)# ugh. - voices_append ('\\key %s;' % lily_key(a)) + voices_append ('\\key %s \\major;' % lily_key(a)) if g == 'O': # Origin header ['origin'] = a if g == 'X': # Reference Number diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index adb1152088..984bbc7c10 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -10,8 +10,9 @@ import time import string import getopt -fullname = "unknown" -index_file='' +gcos = "unknown" +index_url='' +top_url='' changelog_file='' package_name = '' package_version = '' @@ -33,15 +34,14 @@ footer_file = '' default_header = r""" """ -default_footer = r"""

Please take me back to the index -of %s -