From 6416b175bf8dd335faca034e7c90053b63909b57 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:51:00 +0000 Subject: [PATCH] lilypond-1.1.55 --- Documentation/GNUmakefile | 2 +- Documentation/bibliography/GNUmakefile | 75 ++++++++++++++++++++++++ Documentation/index.yo | 4 +- Documentation/man/midi2ly.yo | 79 ++++++++++++++++++++++++++ Documentation/metadoc/GNUmakefile | 75 ++++++++++++++++++++++++ Documentation/tex/GNUmakefile | 15 ++--- Documentation/tex/testje.fly | 2 +- make/lilypond.spec.in | 6 +- midi2ly/GNUmakefile | 22 +++++++ 9 files changed, 263 insertions(+), 17 deletions(-) create mode 100644 Documentation/bibliography/GNUmakefile create mode 100644 Documentation/man/midi2ly.yo create mode 100644 Documentation/metadoc/GNUmakefile create mode 100644 midi2ly/GNUmakefile diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index c7dbe8373f..395991e53a 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -3,7 +3,7 @@ depth = .. NAME = documentation -SUBDIRS=man tex pictures topdocs ntweb +SUBDIRS=man tex metadoc bibliography pictures topdocs ntweb STEPMAKE_TEMPLATES=documentation README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1 AIMS INFO_FILES = $(wildcard $(outdir)/$(package).info*) diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile new file mode 100644 index 0000000000..6e8a382f62 --- /dev/null +++ b/Documentation/bibliography/GNUmakefile @@ -0,0 +1,75 @@ +# Documentation/tex/Makefile + +depth=../.. + +DATA_FILES = $(wildcard *.data) +datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html)) +TEX_FILES = $(wildcard *.tex) +DOC_FILES = $(wildcard *.doc) +DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi)) +OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) + +# just include me +YO_URG_FILES = $(wildcard *.yo-urg) + +OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) +OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) +EL_FILES = $(wildcard *.el) +BIB_FILES= $(wildcard *.bib) +EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) +HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html)) +PS_FILES = $(DVI_FILES:.dvi=.ps) + +STEPMAKE_TEMPLATES=tex documentation +LOCALSTEPMAKE_TEMPLATES=lilypond mudela + +export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS) +include $(depth)/make/stepmake.make + + + + + + +dvi: $(OUT_BIB_FILES) $(DVI_FILES) + +ps: $(PS_FILES) + +# urg +default: + +GENHTMLS = engraving colorado computer-notation +OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) + +#urg should generalise and move Lilypond -> StepMake +# URG. Lilypond specific. Move out. +$(outdir)/%.html: %.data $(depth)/VERSION + $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ $< + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@ + +$(outdir)/%.tex: %.data $(depth)/VERSION + $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ --latex $< + + + +local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) + $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \ + $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\ + | sed "s!$(outdir)/!!g" > $(outdir)/index.html + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html + +$(outdir)/%.bib: %.bib + ln -f $< $@ + +# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j +$(outdir)/%.html: %.bib + -bib2html $< $@ + +# Yeah right: +# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi + +#out/%: $(outdir)/% +# cp -f $< $@ + +locamlclean: + rm -f fonts.aux fonts.log feta*.tfm feta*.*pk diff --git a/Documentation/index.yo b/Documentation/index.yo index 6f11bcad7c..ca106c5d6e 100644 --- a/Documentation/index.yo +++ b/Documentation/index.yo @@ -41,8 +41,10 @@ nsubsect(Documentation: manuals) itemize( it()url(Mudela)(../tex/DOEXPAND(outdir)/tutorial.html) -it()url(TeX documents about LilyPond)(../tex/DOEXPAND(outdir)/index.html) +it()url(User documentation)(../tex/DOEXPAND(outdir)/index.html) +it()url(Hacker documentation)(../metadoc/DOEXPAND(outdir)/index.html) it()url(Manual pages)(../man/DOEXPAND(outdir)/index.html) +it()url(Bibliography)(../bibliography/DOEXPAND(outdir)/vocabulary.html) it()url(Musical vocabulary)(../tex/DOEXPAND(outdir)/vocabulary.html) ) diff --git a/Documentation/man/midi2ly.yo b/Documentation/man/midi2ly.yo new file mode 100644 index 0000000000..11ee01c806 --- /dev/null +++ b/Documentation/man/midi2ly.yo @@ -0,0 +1,79 @@ + +mailto(janneke@gnu.org) +COMMENT( + (PIPETHROUGH(echo -n `date '+%d/%b/%y'|tr '[a-z]' '[A-Z]'`)()) +) +manpage(LilyPond) + (1) + (1998) + (midi2ly) + (The LilyPond package) + +metalC(Automatically generated by yodl(1) from midi2ly.yo.) + +manpagename(midi2ly)(convert MIDI to bf(mudela)(5)) + +manpagedescription() +midi2ly translates a MIDI input file to Mudela (GNU LilyPond source +format). midi2ly is part of the GNU LilyPond music typesetting package. + +manpagessynopsis() + + midi2ly [options] midi-file + +manpageoptions() + +description( +dit(-b, --no-quantify,) + Write exact durations, e.g.: `a4*385/384'. +dit(-D, --debug,) + Print lots of debugging stuff. +dit(-h, --help,) + Show a summary of usage. +dit(-I, --include=file(DIR),) + Add DIR to search path. +dit(-k, --key=ACC[:MINOR],) + Set default key. ACC > 0 sets number of sharps; ACC < 0 sets number + of flats. A minor key is indicated by ":1". +dit(-n, --no-silly,) + Assume no plets or double dots, assume smallest (reciprocal) duration 16. +dit(-o, --output=file(FILE),) + Set file(FILE) as default output. +dit(-p, --no-plets,) + Assume no plets. +dit(-q, --quiet,) + Be quiet. +dit(-s, --smallest=N,) + Assume no shorter (reciprocal) durations than N. +dit(-v, --verbose,) + Be verbose. +dit(-w, --warranty,) + Show the warranty with which midi2ly comes. (It comes with bf(NO WARRANTY)!) +dit(-x, --no-double-dots,) + Assume no double dotted notes. +) + +manpagesection(DISCLAIMER) + +midi2ly is copyright 1996, 1997 by its authors. midi2ly is distributed +as part of GNU LilyPond, under the terms of the GNU General Public +License. midi2ly is provided without any warranty what so ever. +midi2ly may be freely distributed. For further information consult +the GNU General Public License, from the file file(COPYING). + +manpageseealso() + +description( +dit(bf(lilypond)(1)) + The GNU LilyPond music typesetter. +dit(mudela-man) + On the input format. This is a LilyPond-enhanced LaTeX document. +) + +manpageauthor() + +Please consult the documentation file file(AUTHORS) for more detailed +information, and small contributions. + +nemail(Jan Nieuwenhuizen)(janneke@gnu.org), lurl(http://www.xs4all.nl/~jantien) + diff --git a/Documentation/metadoc/GNUmakefile b/Documentation/metadoc/GNUmakefile new file mode 100644 index 0000000000..6e8a382f62 --- /dev/null +++ b/Documentation/metadoc/GNUmakefile @@ -0,0 +1,75 @@ +# Documentation/tex/Makefile + +depth=../.. + +DATA_FILES = $(wildcard *.data) +datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html)) +TEX_FILES = $(wildcard *.tex) +DOC_FILES = $(wildcard *.doc) +DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi)) +OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) + +# just include me +YO_URG_FILES = $(wildcard *.yo-urg) + +OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) +OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) +EL_FILES = $(wildcard *.el) +BIB_FILES= $(wildcard *.bib) +EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) +HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html)) +PS_FILES = $(DVI_FILES:.dvi=.ps) + +STEPMAKE_TEMPLATES=tex documentation +LOCALSTEPMAKE_TEMPLATES=lilypond mudela + +export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS) +include $(depth)/make/stepmake.make + + + + + + +dvi: $(OUT_BIB_FILES) $(DVI_FILES) + +ps: $(PS_FILES) + +# urg +default: + +GENHTMLS = engraving colorado computer-notation +OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) + +#urg should generalise and move Lilypond -> StepMake +# URG. Lilypond specific. Move out. +$(outdir)/%.html: %.data $(depth)/VERSION + $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ $< + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@ + +$(outdir)/%.tex: %.data $(depth)/VERSION + $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ --latex $< + + + +local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) + $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \ + $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\ + | sed "s!$(outdir)/!!g" > $(outdir)/index.html + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html + +$(outdir)/%.bib: %.bib + ln -f $< $@ + +# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j +$(outdir)/%.html: %.bib + -bib2html $< $@ + +# Yeah right: +# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi + +#out/%: $(outdir)/% +# cp -f $< $@ + +locamlclean: + rm -f fonts.aux fonts.log feta*.tfm feta*.*pk diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile index 496c0b7571..ce19dc689c 100644 --- a/Documentation/tex/GNUmakefile +++ b/Documentation/tex/GNUmakefile @@ -7,23 +7,20 @@ datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html)) TEX_FILES = $(wildcard *.tex) DOC_FILES = $(wildcard *.doc) DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi)) -OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) # just include me YO_URG_FILES = $(wildcard *.yo-urg) OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) -EL_FILES = $(wildcard *.el) -BIB_FILES= $(wildcard *.bib) -EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) testje.fly + +EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) testje.fly HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html)) PS_FILES = $(DVI_FILES:.dvi=.ps) STEPMAKE_TEMPLATES=tex documentation LOCALSTEPMAKE_TEMPLATES=lilypond mudela -export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS) include $(depth)/make/stepmake.make @@ -31,7 +28,7 @@ include $(depth)/make/stepmake.make -dvi: $(OUT_BIB_FILES) $(DVI_FILES) +dvi: $(DVI_FILES) ps: $(PS_FILES) @@ -55,7 +52,7 @@ $(outdir)/glossary.dvi: $(outdir)/glossary-table.tex $(outdir)/glossary.html: $(outdir)/glossary-table.html -local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) +local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(datafiles) $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about LilyPond' \ $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\ | sed "s!$(outdir)/!!g" > $(outdir)/index.html @@ -64,10 +61,6 @@ local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(outdir)/%.bib: %.bib ln -f $< $@ -# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j -$(outdir)/%.html: %.bib - -bib2html $< $@ - # Yeah right: # make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi diff --git a/Documentation/tex/testje.fly b/Documentation/tex/testje.fly index f114e445eb..4c354406d3 100644 --- a/Documentation/tex/testje.fly +++ b/Documentation/tex/testje.fly @@ -1,2 +1,2 @@ - +% We're testing \mudelafile here. c''4^"This! Is! A! Test!" d e diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index c53adf4866..f42f35368a 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -32,7 +32,7 @@ mkdir htmldocs tar -C htmldocs -xzf out/htmldoc.tar.gz #tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz -strip lily/out/lilypond mi2mu/out/mi2mu +strip lily/out/lilypond midi2ly/out/midi2ly make prefix="$RPM_BUILD_ROOT/usr" install # gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true @@ -66,8 +66,8 @@ fi /usr/bin/mudela-book /usr/bin/ly2dvi /usr/bin/lilypond -/usr/bin/mi2mu -/usr/man/man1/mi2mu.1 +/usr/bin/midi2ly +/usr/man/man1/midi2ly.1 /usr/man/man1/lilypond.1 /usr/man/man1/mudela-book.1 /usr/man/man1/ly2dvi.1 diff --git a/midi2ly/GNUmakefile b/midi2ly/GNUmakefile new file mode 100644 index 0000000000..de64e3e8bd --- /dev/null +++ b/midi2ly/GNUmakefile @@ -0,0 +1,22 @@ +# title makefile for midi2ly +# file midi2ly/Makefile + +depth = .. + +NAME = midi2ly +MODULE_NAME = midi2ly + +SUBDIRS = include +EXTRA_DIST_FILES += TODO +MODULE_LIBS=$(depth)/lib $(depth)/flower +STEPMAKE_TEMPLATES=c++ executable po + +include $(depth)/make/stepmake.make + +# explicit dependencies: (how to do auto?) +# +midi-lexer.l: $(outdir)/midi-parser.hh + + +$(outdir)/midi2ly-version.o: $(outdir)/version.hh + -- 2.39.5