From: Jan Nieuwenhuizen Date: Mon, 23 Aug 1999 12:01:48 +0000 (+0200) Subject: patch::: 1.2.2.jcn1 X-Git-Tag: release/1.2.3~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c74d159d769fe1e77caf6e1e9d5bf1f13e68c3ea;p=lilypond.git patch::: 1.2.2.jcn1 pl 2.jcn1 - add-html-footer.py, ls-latex.py .tely updates and fixes - tely (texinfo-lily) rules and test Documentation/metadoc/foo.tely --- diff --git a/CHANGES b/CHANGES index 03566b51e0..63c3f7c63b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +pl 2.jcn1 + - add-html-footer.py, ls-latex.py .tely updates and fixes + - tely (texinfo-lily) rules and test Documentation/metadoc/foo.tely + pl 1.uu2 - complete rewrite of mudela-book. Much cleaner now. Support for texinfo. diff --git a/Documentation/metadoc/GNUmakefile b/Documentation/metadoc/GNUmakefile index 015002e47f..ebce9188b1 100644 --- a/Documentation/metadoc/GNUmakefile +++ b/Documentation/metadoc/GNUmakefile @@ -6,7 +6,8 @@ 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)) +TELY_FILES = $(wildcard *.tely) +DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi) $(TELY_FILES:.tely=.dvi)) OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) # just include me @@ -16,8 +17,8 @@ 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)) +EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(TELY_FILES) $(wildcard *.sty) +HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html) $(TELY_FILES:.tely=.html)) PS_FILES = $(DVI_FILES:.dvi=.ps) STEPMAKE_TEMPLATES=tex documentation @@ -54,7 +55,7 @@ $(outdir)/%.tex: %.data $(depth)/VERSION local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.doc=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) ps $(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)\ + $(TELY_FILES) $(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 diff --git a/Documentation/metadoc/lilypond-overview.doc b/Documentation/metadoc/lilypond-overview.doc index 4aa1e759bd..ddcd7f99e5 100644 --- a/Documentation/metadoc/lilypond-overview.doc +++ b/Documentation/metadoc/lilypond-overview.doc @@ -90,7 +90,7 @@ input along with output in Figure~\ref{fig:intro-fig}. % \begin{figure}[htbp] \begin{center} -\begin{mudela}[verbatim] +\begin[verbatim]{mudela} \score { \notes \context GrandStaff < diff --git a/Documentation/metadoc/test.tely b/Documentation/metadoc/test.tely new file mode 100644 index 0000000000..ae2662fa54 --- /dev/null +++ b/Documentation/metadoc/test.tely @@ -0,0 +1,21 @@ +\input texinfo @c -*-texinfo-*- +@setfilename foo +@settitle foo + +@c @node Top +@c @top + +@menu +* foo:: bar +@end menu + +@node foo +@section foo + +@mudela[veryverbatim, intertext="produces this music:"] +\score{ + \notes\relative c'{ + a b c + } +} +@end mudela diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile index ce19dc689c..6fd3cf7762 100644 --- a/Documentation/tex/GNUmakefile +++ b/Documentation/tex/GNUmakefile @@ -6,7 +6,8 @@ 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)) +TELY_FILES = $(wildcard *.tely) +DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi) $(TELY_FILES:.tely=.dvi)) # just include me YO_URG_FILES = $(wildcard *.yo-urg) @@ -14,8 +15,8 @@ YO_URG_FILES = $(wildcard *.yo-urg) OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) -EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) testje.fly -HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html)) +EXTRA_DIST_FILES= $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(TELY_FILES) testje.fly +HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html) $(TELY_FILES:.tely=.html)) PS_FILES = $(DVI_FILES:.dvi=.ps) STEPMAKE_TEMPLATES=tex documentation diff --git a/VERSION b/VERSION index 95a1009af5..9d83f681f5 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=2 -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/make/mudela-rules.make b/make/mudela-rules.make index 4e82175ea2..5a26668914 100644 --- a/make/mudela-rules.make +++ b/make/mudela-rules.make @@ -1,11 +1,22 @@ # Mudela_rules.make -.SUFFIXES: .doc .dvi .mudtex - - +.SUFFIXES: .doc .dvi .mudtex .tely .texi $(outdir)/%.latex: %.doc cd $(outdir); $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies ../$< sed 's! \.\./! !g'< $(basename $@).dep > $(outdir)/temp.dep sed 's!^\(.*\):!'$(outdir)'/\1:!g' < $(outdir)/temp.dep > $(basename $@).dep rm $(outdir)/temp.dep + +$(outdir)/%.texi: %.tely + cd $(outdir); $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --format=texi ../$< + +$(outdir)/%.info: $(outdir)/%.texi + makeinfo --output=$@ $< + +$(outdir)/%.html: $(outdir)/%.texi + makeinfo --output=$@ --html $< + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $@ $(wildcard $(basename $@)[0-9][0-9].html) + +$(outdir)/%.dvi: $(outdir)/%.texi + cd $(outdir); texi2dvi --clean ../$< diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 669a319ac3..9c4126e0a1 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -125,7 +125,9 @@ for f in files: + '' s = check_tag ('', title, s, 0) - s = check_tag ('<html>', '<HTML>', 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) #urg diff --git a/stepmake/bin/ls-latex.py b/stepmake/bin/ls-latex.py index d9542c2ae1..92c0d1644a 100644 --- a/stepmake/bin/ls-latex.py +++ b/stepmake/bin/ls-latex.py @@ -109,6 +109,21 @@ def read_texinfo_header (fn): header.format = 'HTML' return header +def read_tely_header (fn): + header = Latex_head () + s = gulp_file (fn) + i = regex.search( '@settitle', s) + s = s[i+10:] + i = regex.search( '\n', s) + if i < 0: + sys.stderr.write ('gulped file: ' + fn + '\n') + raise 'huh?' + header.title = s[:i] + header.filename = fn + header.outfile = regsub.gsub ('\.tely', '.html', fn) + header.format = 'HTML' + return header + # urg # should make a 'next_parens' yo_article_re = regex.compile('article(\\([^)]*\\))[ \t\n]*(\\([^)]*\\))') @@ -136,7 +151,6 @@ def read_yo_header (fn): header.format = 'HTML' return header - def print_html_head (l,o,h): pre =o @@ -192,6 +206,8 @@ for x in files: head = read_pod_header (x) elif regex.search ('\\.texinfo$', x) <> -1: head = read_texinfo_header (x) + elif regex.search ('\\.tely$', x) <> -1: + head = read_tely_header (x) elif regex.search ('\\.yo$', x) <> -1: head = read_yo_header (x) else: