From: Jan Nieuwenhuizen Date: Sun, 18 Jun 2000 16:36:06 +0000 (+0200) Subject: patch::: 1.3.61.jcn1: tegen 61 X-Git-Tag: release/1.3.62~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c3b1d8bb77159138c451fdac99b29d432640a5fc;p=lilypond.git patch::: 1.3.61.jcn1: tegen 61 1.3.60.jcn2 =========== * Did som more webpage hacking and made some make website fixes, back links should work again. --- diff --git a/CHANGES b/CHANGES index 652041d578..d8157aa027 100644 --- a/CHANGES +++ b/CHANGES @@ -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 =========== 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..22300ddee0 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -1,26 +1,101 @@ + + + + + - + + + + + -
+ + +
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 cd29b6442a..ea61df02b0 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -5,28 +5,12 @@ @node Top, , , (dir) @top -@html -

@end html -@unnumberedsec LilyPond -- The GNU Project Music Typesetter + +@c @unnumberedsec LilyPond -- The GNU Project Music Typesetter @c something breaks on 3.12 f @@ -46,7 +30,7 @@ this: @quotation @mudela[fragment,verbatim] - \relative c'' { \key c \minor; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 } +\relative c'' { \key c \minor; r8 c16 b c8 g as c16 b c8 d | g,4 } @end mudela @end quotation @@ -70,7 +54,7 @@ are `stable'. The webpages for the stable version (1.2) reside enhancements go into the latest odd numbered version (1.3), whose webpages are on @uref{http://www.cs.uu.nl/~hanwen/lilypond/,Han-Wen's site}. Information on the latest and greatest features can be found in -the @uref{Documentation/out-www/CHANGES.txt, Change Log}. +the @uref{Documentation/out-www/CHANGES.html, Change Log}. If want more information, you can browse the @uref{Documentation/user/out-www/lilypond.html, manual} or other @@ -102,7 +86,7 @@ Lattermann also put some works @uref{http://www.alqualonde.de/lilypond.html,on the web}. @html - + @end html @unnumberedsec Download @@ -114,30 +98,38 @@ If you want to compile LilyPond from source, download here: @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/,the source} @item @uref{http://sca.uwaterloo.ca/lilypond/, by http (Canadian mirror)} and -@uref{ftp://sca.uwaterloo.ca/pub/, ftp (Canadian mirror)} +@uref{ftp://sca.uwaterloo.ca/pub/, ftp (Canadian mirror)} @item -@uref{ftp://ftp.lilypond.org/pub/LilyPond/,mirror (Europe)} +@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 -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/,RedHat-i386 and Linuxppc RPMs:} +@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/ppc, LinuxPPC} +@item +@uref{ftp://ftp.debian.org/debian/dists/unstable/main/binary-i386/tex, +Debian GNU/Linux i386} @item -@uref{ftp://ftp.debian.org/pub/debian/dists/unstable/main/binary-i386/tex, - Debian binary} -@item @uref{http://home.austin.rr.com/jbr/jeff/lilypond/,Windows NT} +@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, @@ -189,21 +181,4 @@ These pages were entirely created from a @strong{development snapshot} of the LilyPond package. The version of this webpage is printed at the bottom. -@html -

-[ - Download - | - FAQ - | - Documentation - | - Music archives - | - Mailing lists - | - News -] -@end html - @bye diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index a457b40368..87993537ae 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -707,7 +707,7 @@ Sammartini. It was composed around 1740. @mudela[verbatim] -\version "1.3.56"; +\version "1.3.61"; \include "paper16.ly"; viola = \notes \relative c' \context Voice = viola { @@ -771,7 +771,7 @@ If it looks like incomprehensible gibberish to you@dots{} Then you are right. The author has doctored this example to have as many quirks in one system as possible. @example -\version "1.3.56"; +\version "1.3.61"; @end example Lilypond and the Mudela language is still under development, therefore it is useful to indicate the Lilypond version of the file. Lilypond diff --git a/VERSION b/VERSION index 5599f7aa07..85b18afde3 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=61 -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/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.ly index d31e9ca81d..f3f8df7c05 100644 --- a/input/test/scales.ly +++ b/input/test/scales.ly @@ -3,28 +3,28 @@ % 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 +57,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 +106,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} 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 b206fcebdd..9dcba7c686 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 -