---- ../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
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 "<html><body><xmp>" > $(outdir)/$(a).html;\
+ cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\
+ echo "</xmp></body></html>" >> $(outdir)/$(a).html\
+ && ) true
+ $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(README_TOP_FILES)))
-
-<! shamefully inspired by Franc,ois Pinard's TP pages >
-
- </td>
- </tr>
-</table>
-
<!--
-if this file ./Documentation/footer.html.in is present, it is included
+If this file ./Documentation/footer.html.in is present,
+it is included automatically by add-html-footer.py,
+which substitutes some @AT_VARIABLES@ as well.
+
+!-->
-automatically by add-html-footer, and replaces the simple standard
-footer substitutions:
+<! Layout shamelessly inspired by Franc,ois Pinard's TP pages >
- * index,
- * package name
- * package name
- * ENV:WEBMASTER,
- * ENV:WEBMASTER
+ </td>
+ </tr>
--->
+ <tr align=left valign=bottom>
+ <td align=left valign=middle colspan=3 width="100%" bgcolor="#e8e8ff">
-<hr>
-Go <a href=%s>back</a> to index of LilyPond.
+Go <a href="@INDEX@">back</a> to index of LilyPond.
<p>
Please send GNU LilyPond questions and comments to
<em>gnu-music-discuss@gnu.org</em></a>.
<p>
-<!-- package %s %s -->
-
Please send comments on these web pages to
-<a href="mailto:%s"><em>%s</em></a>
-
-
+<a href="mailto:@MAIL_ADDRESS@"><em>@MAIL_ADDRESS@</em></a>
<p>
Verbatim copying and distribution of this entire article is
permitted in any medium, provided this notice is preserved.<p>
+ </td>
+ </tr>
+</table>
+<!--
-<! your header here >
-<! shamefully inspired by Franc,ois Pinard's TP pages >
+If this file ./Documentation/header.html.in is present,
+it is included automatically by add-html-footer.py,
+which substitutes some @AT_VARIABLES@ as well.
-<! ur* can't we generate this with @table from a .texi? >
+!-->
+
+<! Layout shamelessly inspired by Franc,ois Pinard's TP pages >
+
+<!--
+<table cellpadding=5 width="100%">
+ <tr align=left valign=bottom>
+ <td align=middle valign=middle colspan=3 width="100%" bgcolor="#e8ffe8">
+ <h1>
+ GNU LilyPond
+ </h1>
+ <h2>Welcome to the home of the GNU Music Typesetter</h2>
+ </td>
+ </tr>
+!-->
-<bgcolor="grey">
<table cellpadding=5 width="100%">
+ <tr align=left valign=bottom>
+ <td align=center valign=middle width="15%" bgcolor="#e8ffe8">
+ <img align=center valign=middle
+ src="@TOP@Documentation/pictures/out-www/lelie-icon.png" alt="[icon]">
+ </td>
+ <td align=center valign=middle width="85%" bgcolor="#e8ffe8">
+ <h1>GNU LilyPond</h1>
+ <h2>Welcome to the home of the GNU Music Typesetter</h2>
+ </td>
+ </tr>
+
<tr>
- <td align=left valign=top width="15%" bgcolor="grey">
+ <td align=left valign=top width="15%" bgcolor="#e8ffe8">
<table align=left>
- <tr><td bgcolor="cyan"><b>General info</b></td></tr>
+ <tr><td bgcolor="#e8e8ff"><a href="@INDEX@"><b>Home</b></a></td></tr>
<tr><td><font size=-1>
- <a href="http://www.lilypond.org"><b>Entry page</b></a><br>
- <a href="http://appel.dyndns.org/lilypond"><b>Hacking</b></a><br>
+ <a href="http://appel.dyndns.org/lilypond">Hacking</a><br>
+ <a href="http://www.gnu.org">GNU Project</a><br>
+ <a href="http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=lilypond">Translations</a><br>
+ <a href="http://www.lilypond.org">LilyPond dot org</a><br>
+ <br>
+ </td></tr>
+ <tr><td bgcolor="#e8e8ff">
+ <a href="@TOP@Documentation/out-www/index.html"><b>Documentation</b></a>
+ </td></tr>
+ <tr><td><font size=-1>
+ <a href="@TOP@Documentation/out-www/CHANGES.html">News</a><br>
+ <a href="@TOP@Documentation/out-www/faq.html">FAQ</a><br>
+ <a href="@TOP@Documentation/user/out-www/lilypond.html">User manual</a><br>
+ <a href="@TOP@Documentation/out-www/regression-test.html">Features</a><br>
+ <a href="http://appel.dyndns.org/lilypond/todo.html">Todo</a><br>
+ <br>
+ </td></tr>
+ <tr><td bgcolor="#e8e8ff">
+ <a href="@INDEX@#download-source"><b>Download Source</b></a>
+ </td></tr>
+ <tr><td><font size=-1>
+ <a href="ftp://ftp.gnu.org/pub/gnu/lilypond">Stable</a><br>
+ <a href="ftp://ftp.cs.uu.nl/pub/gnu/LilyPond/development">Development</a><br>
+ <br>
+ </td></tr>
+ <tr><td bgcolor="#e8e8ff">
+ <a href="@INDEX@#download-binary"><b>Download Binary</b></a>
+ </td></tr>
+ <tr><td><font size=-1>
+ <a href="ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/">RedHat i386</a><br>
+ <a href="ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/">LinuxPPC</a><br>
+ <a href="ftp://ftp.debian.org/debian/dists/unstable/main/binary-i386/tex">Debian i386</a><br>
+ <a href="ftp://ftp.debian.org/debian/dists/unstable/main/binary-powerpc/tex">Debian PowerPC</a><br>
+ <a href="http://home.austin.rr.com/jbr/jeff/lilypond/">Windows Stable</a><br>
+ <a href="http://appel.dyndns.org/lilypond/gnu-windows/zip">Windows Testing</a><br>
+ <br>
+ </td></tr>
+ <tr><td bgcolor="#e8e8ff">
+ <a href="@INDEX@#music"><b>Music</b></a>
+ </td></tr>
+ <tr><td><font size=-1>
+ <a href="@TOP@short-examples.html">Short examples</a><br>
+ <a href="@TOP@long-examples.html">Longer examples</a><br>
+ <a href="http://sca.uwaterloo.ca/Mutopia/">Mutopia Project</a><br>
+ <a href="http://www.geocities.com/Vienna/Studio/1714/scarlattidwn.html">Jonh Sankey</a><br>
+ <a href="http://www4.smart.net/~jcovey/scores/">Jeff Covey</a><br>
+ <a href="http://www.alqualonde.de/lilypond.html">Dirk Lattermann</a><br>
+ <br>
+ </td></tr>
+ <tr><td bgcolor="#e8e8ff">
+ <a href="@INDEX@#mailing-lists"><b>Mailing Lists</b></a>
</td></tr>
- <tr><td bgcolor="cyan"><b>Download Source</b></td></tr>
<tr><td><font size=-1>
- <a href="ftp://ftp.gnu.org/pub/gnu/lilypond"><b>Stable</b></a><br>
- <a href="ftp://cs.uu.nl/pub/gnu/LilyPond/development"><b>Development</b></a><br>
+ <a href="http://www.mail-archive.com/gnu-music-discuss@gnu.org">Discussion</a><br>
+ <a href="http://www.mail-archive.com/help-gnu-music@gnu.org">Help</a><br>
+ <a href="http://www.mail-archive.com/bug-gnu-music@gnu.org">Bugs</a><br>
+ <br>
</td></tr>
- </table>
- <! /tr >
- <td align=left valign=top width="90%">
+ </table>
+ <td align=left valign=top width="85%">
@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
@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
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 "<html><body><xmp>" > $(outdir)/$(a).html;\
+ cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\
+ echo "</xmp></body></html>" >> $(outdir)/$(a).html\
+ && ) true
+ $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(TEXTS)))
@top
@html
+<!----
<p align=center>
[
- <a href="#download">Download</a>
+ <a href="#download-source">Download</a>
|
<a href="Documentation/out-www/faq.html">FAQ</a>
|
|
<a href="#mailing-lists">Mailing lists</a>
|
- <a href="Documentation/out-www/CHANGES.txt">News</a>
+ <a href="Documentation/out-www/CHANGES.html">News</a>
]
+!---->
@end html
@html
<p align=center>
<img src="Documentation/pictures/out-www/lelie-logo.png" alt="[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
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
@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
@uref{http://www.alqualonde.de/lilypond.html,on the web}.
@html
-<a name="download">
+<a name="download-source">
@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
+<a name="download-binary">
+@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
<a name="mailing-lists">
@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,
bottom.
@html
+<!----
<p align=center>
[
- <a href="#download">Download</a>
+ <a href="#download-source">Download</a>
|
<a href="Documentation/out-www/faq.html">FAQ</a>
|
|
<a href="#mailing-lists">Mailing lists</a>
|
- <a href="Documentation/out-www/CHANGES.txt">News</a>
+ <a href="Documentation/out-www/CHANGES.html">News</a>
]
+!---->
@end html
@bye
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.
--- /dev/null
+#!/bin/sh
+# ps-to-gifs, convert PS to multiple gifs or other bitmaps
+
+usage()
+{
+ cat <<EOF
+Convert PS to multiple gifs or other bitmaps
+Usage: ps-to-gifs.sh [OPTION]... [FILE]
+Options:
+ -h, --help this help
+ -c, --crop crop output
+ -o, --output=NAME set output base
+ -p, --png convert to png
+ -s, --size=SIZE set papersize
+ -t, --transparent change white to transparent
+EOF
+}
+
+if [ $# -lt 1 ]; then
+ usage;
+ exit 2;
+fi
+CROP=cat
+GIF=gif
+PNMTOGIF=ppmtogif
+
+while [ $# -gt 0 ]; do
+opt=$1
+shift
+ case $opt in
+ -t|--t*)
+ color='-transparent white'
+ ;;
+ -h|--h*)
+ usage;
+ exit 0
+ ;;
+ -c|--c*)
+ CROP=" pnmcrop "
+ ;;
+ -o) OUTFILE=$2; shift
+ ;;
+ --o*=*) OUTFILE=`echo $opt | sed -e s/"^.*="//`
+ ;;
+ -p|--p*)
+ GIF=png
+ PNMTOGIF=pnmtopng
+ ;;
+ -s) SIZE="-sPAPERSIZE=$2"; shift
+ ;;
+ --s*=*)
+ SIZE="-sPAPERSIZE=`echo $opt | sed -e s/"^.*="//`"
+ ;;
+ -*)
+ echo "ps-to-gifs: unknown option: \`$opt'"
+ exit 1
+ ;;
+ *)
+ FILE=$opt
+ ;;
+ esac
+done
+
+if [ "x$TRANSPARENT_IS_BROKEN" != "x" ]; then
+ color=
+fi
+
+if [ "x$OUTFILE" = "x" ]; then
+ BASE=`dirname $FILE`/`basename $FILE .ps`
+else
+ BASE=`dirname $OUTFILE`/`basename $OUTFILE .$GIF`
+fi
+
+# urg, pipe breaks
+rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
+
+cat $FILE | gs -sDEVICE=pgm $SIZE -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$BASE-page%d.ppm" -r90 -dNOPAUSE - -c quit $FILE
+# quant is soo slow
+# cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $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
+
--- /dev/null
+%
+% 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 \major;
+ c' d e f g a b c
+
+ \key g\major;
+ g a b c d e fis g
+
+ \key d\major;
+ d, e fis g a b cis d
+
+ \key a\major;
+ a b cis d e fis gis a
+
+ \key e\major;
+ e, fis gis a b cis dis e
+
+ \key b\major;
+ b cis dis e fis gis ais b
+
+ \key fis\major;
+ fis, gis ais b cis dis eis fis
+
+ \key cis\major;
+ cis, dis eis fis gis ais bis cis
+
+ % sharp-minor
+ % a e b fis cis gis dis ais
+
+ \key a\minor;
+ a b c d e f gis a
+
+ \key e\minor;
+ e, fis g a b c dis e
+
+ \key b\minor;
+ b cis d e fis g ais b
+
+ \key fis\minor;
+ fis, gis a b cis d eis fis
+
+ \key cis\minor;
+ cis, dis e fis gis a bis cis
+
+ \key gis\minor;
+ gis ais b cis dis e fisis gis
+
+ \key dis\minor;
+ dis, eis fis gis ais b cisis dis
+
+ \key ais\minor;
+ ais bis cis dis eis fis gisis ais
+
+ % flat-major
+ % c f bes es as des ges ces
+
+ \key f\major;
+ f, g a bes c d e f
+
+ \key bes\major;
+ bes, c d es f g a bes
+
+ \key es\major;
+ es,, f g as bes c d es
+
+ \key as\major;
+ as, bes c des es f g as
+
+ \key des\major;
+ des,, es f ges as bes c des
+
+ \key ges\major;
+ ges, as bes ces des es f ges
+
+ \key ces\major;
+ ces,, des es fes ges as bes ces
+
+ % flat-minor
+ % a d g c f bes es as
+
+ \key d\minor;
+ d, e f g a bes cis d
+
+ \key g\minor;
+ g, a bes c d es fis g
+
+ \key c\minor;
+ c,, d es f g as b c
+
+ \key f\minor;
+ f, g as bes c des e f
+
+ \key bes\minor;
+ bes, c des es f ges a bes
+
+ \key es\minor;
+ es,, f ges as bes ces d es
+
+ \key as\minor;
+ as, bes ces des es fes g as
+
+
+ }
+ \paper { }
+ \midi { }
+}
+++ /dev/null
-\score {
- \context Voice \notes\relative c {
- % sharp-major
- % c g d a e b fis cis
-
- \key c;
- c' d e f g a b c
-
- \key g;
- g a b c d e fis g
-
- \key d;
- d, e fis g a b cis d
-
- \key a;
- a b cis d e fis gis a
-
- \key e;
- e, fis gis a b cis dis e
-
- \key b;
- b cis dis e fis gis ais b
-
- \key fis;
- fis, gis ais b cis dis eis fis
-
- \key cis;
- cis, dis eis fis gis ais bis cis
-
- % sharp-minor
- % a e b fis cis gis dis ais
-
- \key a\minor;
- a b c d e f gis a
-
- \key e\minor;
- e, fis g a b c dis e
-
- \key b\minor;
- b cis d e fis g ais b
-
- \key fis\minor;
- fis, gis a b cis d eis fis
-
- \key cis\minor;
- cis, dis e fis gis a bis cis
-
- \key gis\minor;
- gis ais b cis dis e fisis gis
-
- \key dis\minor;
- dis, eis fis gis ais b cisis dis
-
- \key ais\minor;
- ais bis cis dis eis fis gisis ais
-
- % flat-major
- % c f bes es as des ges ces
-
- \key f;
- f, g a bes c d e f
-
- \key bes;
- bes, c d es f g a bes
-
- \key es;
- es,, f g as bes c d es
-
- \key as;
- as, bes c des es f g as
-
- \key des;
- des,, es f ges as bes c des
-
- \key ges;
- ges, as bes ces des es f ges
-
- \key ces;
- ces,, des es fes ges as bes ces
-
- % flat-minor
- % a d g c f bes es as
-
- \key d\minor;
- d, e f g a bes cis d
-
- \key g\minor;
- g, a bes c d es fis g
-
- \key c\minor;
- c,, d es f g as b c
-
- \key f\minor;
- f, g as bes c des e f
-
- \key bes\minor;
- bes, c des es f ges a bes
-
- \key es\minor;
- es,, f ges as bes ces d es
-
- \key as\minor;
- as, bes ces des es fes g as
-
-
- }
- \paper { }
- \midi { }
-}
\ No newline at end of file
%}
praeludiumRight = \notes {
- \key e;
+ \key e \major;
\clef violin;
% 13 -- how to type -- where to split -- this more neatly?
}
praeludiumLeft = \notes \relative c {
- \key e;
+ \key e \major;
\clef bass;
% 13
fugaIIRight = \notes \relative c'' {
- \key e; % E-major
+ \key e \major; % E-major
\clef violin;
\time3/4;
gracetest = \notes \grace { [c16 ( cis dis] }
fugaIILeft = \notes {
- \key e;
+ \key e \major;
\clef bass;
%15
}
fugaIIPedal = \notes \relative c {
- \key e;
+ \key e \major;
\clef bass;
%15
\property Staff.instr = #"bs"
\time 4/4;
- \key e;
+ \key e \major;
\clef bass;
%13
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
$(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
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`
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
import string
import getopt
-fullname = "unknown"
-index_file=''
+gcos = "unknown"
+index_url=''
+top_url=''
changelog_file=''
package_name = ''
package_version = ''
default_header = r"""
"""
-default_footer = r"""<hr>Please take me <a href=%s>back to the index</a>
-of %s
-<!-- package name %s>
- <!-- webmaster fields. %s %s>
+default_footer = r"""<hr>Please take me <a href=@INDEX@>back to the index</a>
+of @PACKAGE_NAME@
"""
-builtstr = r"""<hr><font size=-1>
-This page was built from %s-%s by
-<address><br>%s <<a href="mailto:%s">%s</a>>, %s.</address><p></font>"""
+built = r"""<hr><font size=-1>
+This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ by
+<address><br>@GCOS@ <<a href="mailto:%s">@MAIL_ADDRESS@</a>>,
+@LOCALTIME@.</address><p></font>"""
def gulp_file (f):
header_file = a
elif o == '-h' or o == '--help':
help ()
+ # urg, this is top!
elif o == '--index':
- index_file = a
+ index_url = a
elif o == '--name':
package_name = a
elif o == '--version':
else:
raise 'unknown opt ', o
-def set_vars ():
- global fullname
+#burp?
+def set_gcos ():
+ global gcos
os.environ["CONFIGSUFFIX"] = 'www';
if os.name == 'nt':
import ntpwd
f = pw[4]
f = string.split (f, ',')[0]
- fullname = f
-
-#burp
-def compose_header ():
- global default_header
- head = default_header
- if header_file:
- head = gulp_file (header_file)
- return head
-
-def compose_footer (index):
- global default_footer
- foot = default_footer
-
- if footer_file:
- foot = gulp_file (footer_file)
-
- s = foot % (index, package_name, package_name, webmaster, webmaster)
- s = s + builtstr % (package_name, package_version, fullname,
- mail_address, mail_address,
- time.strftime ('%c %Z', time.localtime (time.time ())))
+ gcos = f
+
+def compose (default, file):
+ s = default
+ if file:
+ s = gulp_file (file)
return s
-set_vars ()
-header = compose_header ()
-footer = compose_footer (index_file)
+set_gcos ()
+localtime = time.strftime ('%c %Z', time.localtime (time.time ()))
+
+if os.path.basename (index_url) != "index.html":
+ index_url = index_url + "/index.html"
+top_url = os.path.dirname (index_url) + "/"
+
+header = compose (default_header, header_file)
+footer = compose (default_footer, footer_file) + built
header_tag = '<! header_tag >'
footer_tag = '<! footer_tag >'
-def do_file (s):
+def do_file (f):
+ s = gulp_file (f)
+
if changelog_file:
changes = gulp_file (changelog_file)
# urg?
s = re.sub ('top_of_ChangeLog', '<XMP>\n'+ changes + '\n</XMP>\n', s)
if re.search (header_tag, s) == None:
- body='<BODY BGCOLOR=WHITE><FONT COLOR=BLACK>'
+ body = '<BODY BGCOLOR=WHITE><FONT COLOR=BLACK>'
s = re.sub ('(?i)<body>', body, s)
if re.search ('(?i)<BODY', s):
- s = re.sub ('(?i)<body[^>]*>', body + header, s)
+ s = re.sub ('(?i)<body[^>]*>', body + header, s, 1)
elif re.search ('(?i)<html', s):
- s = re.sub ('(?i)<html>', '<HTML>' + header, s)
+ s = re.sub ('(?i)<html>', '<HTML>' + header, s, 1)
else:
s = header + s
s = s + footer_tag
if re.search ('(?i)</body', s):
- s = re.sub ('(?i)</body>', footer + '</BODY>', s)
+ s = re.sub ('(?i)</body>', footer + '</BODY>', s, 1)
elif re.search ('(?i)</html', s):
- s = re.sub ('(?i)</html>', footer + '</HTML>', s)
+ s = re.sub ('(?i)</html>', footer + '</HTML>', s, 1)
else:
s = s + footer
- return s
-
+ #URUGRGOUSNGUOUNRIU
+ index = index_url
+ top = top_url
+ if os.path.basename (f) == "index.html":
+ cwd = os.getcwd ()
+ if os.path.basename (cwd) == "topdocs":
+ index = "./index.html"
+ top = "./"
+
+ s = re.sub ('@INDEX@', index, s)
+ s = re.sub ('@TOP@', top, s)
+ s = re.sub ('@PACKAGE_NAME@', package_name, s)
+ s = re.sub ('@PACKAGE_VERSION@', package_version, s)
+ s = re.sub ('@WEBMASTER@', webmaster, s)
+ s = re.sub ('@GCOS@', gcos, s)
+ s = re.sub ('@LOCALTIME@', localtime, s)
+ s = re.sub ('@MAIL_ADDRESS@', mail_address, s)
-for f in files:
- s = gulp_file (f)
- s = do_file (s)
open (f, 'w').write (s)
-if 0:
- title = '<HEAD><TITLE>' \
- + package_name + ' -- ' + os.path.basename (os.path.splitext(f)[0]) \
- + '</TITLE></HEAD>'
- s = check_tag ('<title>', title, s, 0)
-
- s = check_tag ('<html', '', s, 0)
- if regex.search ('<HTML', s) == -1:
- s = '<HTML>\n' + s
- s = check_tag ('</html>', '</HTML>', s, 1)
-
- dump_file (f, s)
+for f in files:
+ do_file (f)
at-dir = $(doc-dir)/
at-ext = .in
-footify=$(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) --header=$(depth)/Documentation/header.html.in --footer $(depth)/Documentation/footer.html.in
+footify=$(PYTHON) $(step-bindir)/add-html-footer.py --index=../$(depth)/ --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) --header=$(depth)/Documentation/header.html.in --footer $(depth)/Documentation/footer.html.in
footify-all-command=$(footify) `$(FIND) . -name '*.html' -print`