]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-1.3.106
authorfred <fred>
Wed, 27 Mar 2002 00:32:50 +0000 (00:32 +0000)
committerfred <fred>
Wed, 27 Mar 2002 00:32:50 +0000 (00:32 +0000)
Documentation/header.html.in
Documentation/index.texi
Documentation/user/GNUmakefile
buildscripts/install-info-html.sh
stepmake/stepmake/documentation-targets.make
stepmake/stepmake/documentation-vars.make
stepmake/stepmake/texinfo-rules.make

index 2fa27d012a7f5f45ab06c29a85e828cbcf54e78c..6bd96bbf5a9988650f4599ba4aba2fa92a307daa 100644 (file)
@@ -50,7 +50,7 @@ which substitutes some @AT_VARIABLES@ as well.
       <tr><td><font size=-1>
        <a href="@TOP@Documentation/out-www/CHANGES.html">Change Log</a><br>
        <a href="http://appel.lilypond.org/wiki/index.php3?LilyPondFaqs">FAQ</a><br>
-       <a href="@TOP@Documentation/user/out-www/lilypond.html">User manual</a><br>
+       <a href="@TOP@Documentation/user/out-www/lilypond/lilypond.html">User manual</a><br>
        <a href="@TOP@Documentation/out-www/regression-test.html">Features</a><br>
        <a href="http://appel.lilypond.org/wiki/index.php3?LilyPondToDo">To do</a><br>
 <br>
@@ -81,10 +81,9 @@ which substitutes some @AT_VARIABLES@ as well.
       <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/scarlattimus.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>
+       <a href="http://www.mutopiaproject.org/">Mutopia Project</a><br>
+
+       <a href="http://appel.lilypond.org/wiki/index.php?DownloadLilyPondScores">Other URLs</a><br>
        <br>
       </td></tr>
       <tr><td bgcolor="#e8e8ff">
index 0bc1a041591d67fd27f389afa23891e5a82d9741..bdc4f52267002598d4ef25aa955f0f5d31d7a618 100644 (file)
@@ -20,9 +20,9 @@
 @unnumberedsubsec Manuals
 
 @itemize @bullet
-@item @uref{../user/out-www/lilypond.html,LilyPond reference manual}
+@item @uref{../user/out-www/lilypond/lilypond.html,LilyPond reference manual}
 also available in @uref{../user/out-www/lilypond.ps.gz,Postscript}
-@item LilyPond @uref{../user/out-www/lilypond-internals.html,internals}
+@item LilyPond @uref{../user/out-www/lilypond-internals/lilypond-internals.html,internals}
 @item @uref{../user/out-www/glossary.html,A glossary of musical
 terms}, includes translations.  Also available in @uref{../user/out-www/glossary.ps.gz,Postscript})
 @item @uref{../user/out-www/mudela-book.html,mudela-book}, a tool for
index 70af27845cdb86f2ef726425aa26c6357500eda1..b586a9a4f59211a7c533f522c2a265759b6048f4 100644 (file)
@@ -33,16 +33,15 @@ info: $(INFO_FILES)
 
 default: 
 
-local-WWW: $(HTML_FILES)   $(datafiles) $(PS_GZ_FILES) backdoc-WWW
-       $(SHELL) $(buildscript-dir)/install-info-html.sh $(outdir) lilypond lilypond-internals
+DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
+
+local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
+       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
        $(MAKE) footify
+       -mkdir $(outdir)/lilypond 
        ln -f $(outdir)/*.png $(outdir)/lilypond
        $(MAKE) deep-footify
 
-deep-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 $(sort $(wildcard $(outdir)/*/*.html))
-
-
 #      $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
 #         $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
 #        | sed "s!$(outdir)/!!g" > $(outdir)/index.html
@@ -55,8 +54,8 @@ $(outdir)/%.bib: %.bib
 localclean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
 
-backdoc-WWW: $(outdir)/lilypond-internals.html
-       $(MAKE) footify
+backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
+       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
 
 #ugh. lily/OUT/lilypond hardcoded.
 # when cross-compiling, we don't have lilypond
@@ -66,3 +65,19 @@ $(outdir)/lilypond-internals.texi:
        else \
                touch $@; \
        fi
+
+# Generic rule not possible?
+# $(outdir)/%/%.html: $(outdir)/%.texi
+
+$(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
+       -$(MAKEINFO) --force --output=$@ --html $<
+# we want footers even if website builds (or is built) partly
+       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+
+
+$(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
+       -$(MAKEINFO) --force --output=$@ --html $<
+# we want footers even if website builds (or is built) partly
+       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+
+
index ba86329fb9b5a0f36b996c1eba2af3565dca5693..a21e9b7d8f2827814115f32821331e68b3e94bcf 100644 (file)
 #!@BASH@
 
-dir=$1
-index=$dir/index.html
-shift
+name=install-info-html
+version=1.0
 
-rm -f $index
-cat > $index <<EOF
+all=
+index_dir=.
+
+#
+# debugging
+#
+debug_echo=:
+
+
+#
+# print usage
+#
+function help ()
+{
+       cat << EOF
+$name $version
+Install HTML info document.
+
+Usage: $name [OPTION]... [DOCUMENT-DIR]...
+
+Options:
+  -a,--all             assume all subdirectories of index to be DOCUMENT-DIRs
+  -d,--dir=DIR         set index directory to DIR (default=.)
+  -D,--debug           print debugging info
+  -h,--help            this help text
+  -v,--version         show version
+EOF
+}
+
+function cleanup ()
+{
+       $debug_echo "cleaning ($?)..."
+}
+
+trap cleanup 0 9 15
+
+#
+# Find command line options and switches
+#
+
+# "x:" x takes argument
+#
+options="adhvW:"
+#
+# ugh, "\-" is a hack to support long options
+# must be in double quotes for bash-2.0
+
+while getopts "\-:$options" O
+do
+       $debug_echo "O: \`$O'"
+       $debug_echo "arg: \`$OPTARG'"
+       case $O in
+               a)
+                       all=yes
+                       ;;
+               D)
+                       [ "$debug_echo" = "echo" ] && set -x
+                       debug_echo=echo
+                       ;;
+               h)
+                       help;
+                       exit 0
+                       ;;
+               v)
+                       echo $name $version
+                       exit 0
+                       ;;
+               d)
+                       index_dir=$OPTARG
+                       ;;
+       # a long option!
+       -)
+               case "$OPTARG" in
+                       a*|-a*)
+                               all=yes
+                               ;;
+                       de*|-de*)
+                               [ "$debug_echo" = "echo" ] && set -x
+                               debug_echo=echo
+                               ;;
+                       h*|-h*)
+                               help;
+                               exit 0
+                               ;;
+                       di*|-di*)
+                               index_dir="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`"
+                               ;;
+                       version|-version)
+                               echo $name $version
+                               exit 0
+                               ;;
+                       *|-*)
+                               echo "$0: invalid option -- \"$OPTARG\""
+                               help;
+                               exit -1
+                               ;;
+               esac
+       esac
+done
+shift `expr $OPTIND - 1`
+
+#
+# Input file name
+#
+if [ -z "$all" -a -z "$1" ]; then
+       help
+       echo "$name: No HTML documents given"
+       exit 2
+fi
+
+if [ -n "$all" -a -n "$1" ]; then
+       echo "$name: --all specified, ignoring DIRECTORY-DIRs"
+fi
+
+if [ -n "$all" ]; then
+       document_dirs=`/bin/ls -d1 $index_dir`
+else
+       document_dirs=$*
+fi
+
+index_file=$index_dir/index.html
+rm -f $index_file
+echo -n "$name: Writing index: $index_file..."
+
+# head
+cat >> $index_file <<EOF
 <html> 
+<title>Info documentation index</title>
 <body>
-You want to be <a href=$1/$1.html>here</a>
+<h1>Info documentation index</h1>
+This is the directory file \`index.html' a.k.a. \`DIR', which contains the
+topmost node of the HTML Info hierarchy.
+<p>
+This is all very much Work in Progress (WiP).
 <p>
 <ul>
 EOF
 
-for i in $*; do
-cat >> $index <<EOF
-<li> <a href=$i/$i.html>$i</a>
-EOF
-done
+#list
+for i in $document_dirs; do
+       echo "<li> <a href=$i/$i.html>$i</a>"
+done >> $index_file
 
-cat >> $index <<EOF
+# foot
+cat >> $index_file <<EOF
 </ul>
 </body>
 </html>
 EOF
-
+echo
\ No newline at end of file
index 5f43a858ba13dc74a8decd1a51b992a4f636f235..478bffd71d8d69642e6b7e8f7ed57362b7ba6f78 100644 (file)
@@ -10,6 +10,9 @@ local-web:
 footify:
        $(footify) $(sort $(wildcard $(outdir)/*.html out/*.html out-www/*.html))
 
+deep-footify:
+       $(deep-footify) $(sort $(wildcard $(outdir)/*/*.html))
+
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
 
 INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" -f $(stepdir)/install-out.sub.make
index bbed23c068c9857bbdff8f2336c75ad3c5bb8169..a4efa4eb59464c9de5cfb3f38fbe49be230c9775 100644 (file)
@@ -4,6 +4,7 @@ at-dir = $(doc-dir)/
 at-ext = .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
+deep-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`
 
index b4a7e41117fd0a6551edc25aeccf7f93cacac871..2a2dc8d101190c2f8988a0412841fd932c8eb869 100644 (file)
@@ -5,11 +5,17 @@
 $(outdir)/%.info: $(outdir)/%.texi
        -$(MAKEINFO) --force --output=$@ $<
 
-$(outdir)/%.html:      $(outdir)/%.texi
-       -$(MAKEINFO) --force --output=$@ --html $<
+$(outdir)/%.html: $(outdir)/%.texi
+       -$(MAKEINFO) --force --output=$@ --html --no-split $<
 # we want footers even if website builds (or is built) partly
        $(footify) $@
 
+# Generic rule not possible?
+$(outdir)/%/%.html: $(outdir)/%.texi
+       -$(MAKEINFO) --force --output=$@ --html $<
+# we want footers even if website builds (or is built) partly
+       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+
 $(outdir)/%.dvi:       $(outdir)/%.texi
 # --clean only in >= 3.12s
 # cd $(outdir); texi2dvi --clean ../$<