From ebc165eb28570c32201b9ac10224f643bab62769 Mon Sep 17 00:00:00 2001 From: janneke Date: Mon, 9 Feb 2004 20:04:49 +0000 Subject: [PATCH] * Documentation/user/refman.itely: Run texinfo-all-menus-update (fixes make web). * GNUmakefile.in (web-clean): Do not remove fonts (they do not live in $(out)-www). * scripts/lilypond-book.py: Small cleanups. Junk hairy include dependencies. Add link to .ly source in HTML output. (Lilypond_snippet.output_html): Handle multiple page picture output. (Lilypond_snippet.output_html, Lilypond_snippet.output_latex): Make usable for output_texinfo again. * Documentation/user/GNUmakefile: Add static dependency for lilypond.tely includes. --- ChangeLog | 16 +++ Documentation/user/GNUmakefile | 10 +- Documentation/user/refman.itely | 1 + GNUmakefile.in | 6 +- scripts/lilypond-book.py | 166 +++++++++++++++----------------- 5 files changed, 100 insertions(+), 99 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d8536e2a4..bf1559661b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2004-02-09 Jan Nieuwenhuizen + * Documentation/user/refman.itely: Run texinfo-all-menus-update + (fixes make web). + + * GNUmakefile.in (web-clean): Do not remove fonts (they do not + live in $(out)-www). + + * scripts/lilypond-book.py: Small cleanups. Junk hairy include + dependencies. Add link to .ly source in HTML output. + (Lilypond_snippet.output_html): Handle multiple page picture + output. + (Lilypond_snippet.output_html, Lilypond_snippet.output_latex): + Make usable for output_texinfo again. + + * Documentation/user/GNUmakefile: Add static dependency for + lilypond.tely includes. + * Documentation/user/tutorial.itely: Add some lost `relative' ly-options. diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 4e51ac5e82..c3c629a029 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -116,20 +116,20 @@ local-clean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals -#$(outdir)/lilypond.nexi: $(outdir)/interfaces.itexi -#$(outdir)/lilypond.texi: $(outdir)/interfaces.itexi - # lilypond.texi deps $(builddir)/mf/$(outconfbase)/feta16list.ly: $(MAKE) -C $(topdir)/mf +$(outdir)/lilypond.texi: $(ITELY_FILES) macros.itexi + # Rules for the automatically generated documentation # When cross-compiling, we don't have lilypond, so we fake ifneq ($(CROSS),yes) -# there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time. -# however, this triggers compilation during install, which is a bad thing (tm). +# There used to be a dependency on a dummy target, to force a rebuild +# of lilypond-internals every time. however, this triggers +# compilation during install, which is a bad thing (tm). $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond-bin cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin --verbose $(abs-srcdir)/ly/generate-documentation diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index bf0b9da757..6c15848427 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2746,6 +2746,7 @@ Internals: @internalsref{RepeatSlash}, @internalsref{PercentRepeat}, @menu * Showing melody rhythms:: +* Entering percussion:: * Percussion staves:: @end menu diff --git a/GNUmakefile.in b/GNUmakefile.in index 5b2716a8e8..41f11fe930 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -76,15 +76,15 @@ local-WWW-post: src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh +# FIXME: rename to TAGS; should include deeper TAGS files, see guile-core ALL-TAGS: - etags $(shell find . $(src-ext:%=-name '*.%' -or) -false | grep -v '/out') + etags $(shell find . $(src-ext:%=-name '*.%' -or) -false \ + | grep -v '/out') web-clean: - $(SHELL) $(buildscript-dir)/clean-fonts.sh $(MAKE) out=www clean $(MAKE) $(builddir)/share/lilypond-force - default: $(config_h) builddir-setup builddir-setup: $(builddir)/share/lilypond-force diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index b4020ef1db..687d060d9b 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -27,8 +27,9 @@ classic lilypond-book: ''' -import string import __main__ +import glob +import string ################################################################ # Users of python modules should include this snippet @@ -207,21 +208,22 @@ ly_options = { output = { HTML : { - AFTER: '', - PRINTFILENAME:'

%(filename)s

', - BEFORE: '', + AFTER: r''' + +

''', + BEFORE: r''' +

+ ''', OUTPUT: r''' -[picture of music]''', + [picture of music]''', + PRINTFILENAME:'

%(filename)s

', VERBATIM: r'''
 %(verb)s
''', }, LATEX : { AFTER: '', - PRINTFILENAME: '''\\texttt{%(filename)s} - - ''', BEFORE: '', OUTPUT: r'''{\parindent 0pt \catcode`\@=12 @@ -230,17 +232,20 @@ border="0" src="%(base)s.png" alt="[picture of music]">''', \input %(base)s.tex \ifx\preLilyPondExample\postLilyPondExample\fi \catcode`\@=0}''', + PRINTFILENAME: '''\\texttt{%(filename)s} + + ''', VERBATIM: r'''\begin{verbatim} %(verb)s\end{verbatim} ''', }, TEXINFO : { + AFTER: '', + BEFORE: '', PRINTFILENAME: '''@file{%(filename)s} ''', - BEFORE: '', - AFTER: '', VERBATIM: r'''@example %(verb)s@end example ''', @@ -379,6 +384,7 @@ def split_options (option_string): class Chunk: def replacement_text (self): return '' + def is_outdated (self): return 0 @@ -387,6 +393,7 @@ class Substring (Chunk): self.source = source self.start = start self.end = end + def replacement_text (self): return self.source [self.start:self.end] @@ -397,13 +404,16 @@ class Snippet (Chunk): self.hash = 0 self.options = [] self.format = format + def replacement_text (self): return self.match.group (0) def substring (self, s): return self.match.group (s) + def filter_code (self): pass # todo + def __repr__(self): return `self.__class__` + " type = " + self.type @@ -424,7 +434,6 @@ class Lilypond_snippet (Snippet): os = match.group ('options') if os: self.options = split_options (os) - def ly (self): if self.type == 'lilypond_file': @@ -463,7 +472,6 @@ class Lilypond_snippet (Snippet): # TODO: something smart with target formats # (ps, png) and m/ctimes return None - return self def replacement_text (self): @@ -472,30 +480,40 @@ class Lilypond_snippet (Snippet): def output_html (self): base = self.basename () - str = self.output_print_filename (HTML) - if VERBATIM in self.options and format == HTML: - verb = verbatim_html (self.substring ('code')) - str += write (output[HTML][VERBATIM] % vars ()) - str += (output[HTML][BEFORE] - + (output[HTML][OUTPUT] % vars ()) - + output[HTML][AFTER]) - + str = '' + if format == HTML: + str = self.output_print_filename (HTML) + if VERBATIM in self.options: + verb = verbatim_html (self.substring ('code')) + str += write (output[HTML][VERBATIM] % vars ()) + + # URGUGHUGHUGUGHU + single = '%(base)s.png' % vars () + multiple = '%(base)s-page1.png' % vars () + pictures = (single,) + if os.path.exists (multiple) \ + and (not os.path.exists (single)\ + or (os.stat (multiple)[stat.ST_MTIME] \ + > os.stat (single)[stat.ST_MTIME])): + pictures = glob.glob ('%(base)s-page*.png' % vars ()) + + str += output[HTML][BEFORE] % vars () + for picture in pictures: + str += output[HTML][OUTPUT] % vars () + str += output[HTML][AFTER] % vars () return str def output_latex (self): - str = self.output_print_filename (LATEX) - + str = '' base = self.basename () - if VERBATIM in self.options\ - and format == LATEX: - verb = self.substring ('code') - str += (output[LATEX][VERBATIM] % vars ()) - + if format == LATEX: + str = self.output_print_filename (LATEX) + if VERBATIM in self.options: + verb = self.substring ('code') + str += (output[LATEX][VERBATIM] % vars ()) str += (output[LATEX][BEFORE] + (output[LATEX][OUTPUT] % vars ()) + output[LATEX][AFTER]) - - return str def output_print_filename (self,format): @@ -503,50 +521,36 @@ class Lilypond_snippet (Snippet): if PRINTFILENAME in self.options: base = self.basename () filename = self.substring ('filename') - str += output[format][PRINTFILENAME] % vars () - + str = output[format][PRINTFILENAME] % vars () return str def output_texinfo (self): - str = '' - ## Ugh, this breaks texidoc. - str = self.output_print_filename (TEXINFO) - + ## str = self.output_print_filename (TEXINFO) + str = '' base = self.basename () - - str = "" if 'texidoc' in self.options : texidoc = base + '.texidoc' if os.path.exists (texidoc): str += '@include %s\n' % texidoc - - str += '\n@tex\n' - str += (output[LATEX][BEFORE] - + (output[LATEX][OUTPUT] % vars ()) - + output[LATEX][AFTER]) - str += ('\n@end tex\n') - - str += ('\n\n@html\n') - str += (output[HTML][BEFORE] - + (output[HTML][OUTPUT] % vars ()) - + output[HTML][AFTER]) - str += ('\n@end html\n\n') # need par after picture. if VERBATIM in self.options: verb = verbatim_texinfo (self.substring ('code')) str += (output[TEXINFO][VERBATIM] % vars ()) - + + str += ('@tex\n' + self.output_latex () + '\n@end tex\n') + str += ('@html\n' + self.output_html () + '\n@end html\n') + # need par after picture + str += '\n' + return str - snippet_type_to_class = { 'lilypond_file' : Lilypond_snippet, 'lilypond_block' : Lilypond_snippet, 'lilypond' : Lilypond_snippet, 'include' : Include_snippet } - def find_toplevel_snippets (s, types): res = {} @@ -555,17 +559,15 @@ def find_toplevel_snippets (s, types): snippets = [] index = 0 - found = dict ([(t, None) for t in types] ) + found = dict (map (lambda x: (x, None), types)) - # - # We want to search for multiple regexes, - # without searching the string multiple times for one regex. - # + # We want to search for multiple regexes, without searching + # the string multiple times for one regex. # Hence, we use earlier results to limit the string portion # where we search. # Since every part of the string is traversed at most once for # every type of snippet, this is linear. - + while 1: first = None endex = 1 << 30 @@ -583,9 +585,8 @@ def find_toplevel_snippets (s, types): start = index + m.start (0) found[type] = (start, snip) - if found[type] and (first == None - or found[type][0] < found[first][0]): - + if found[type] \ + and (not first or found[type][0] < found[first][0]): first = type endex = found[first][0] @@ -600,7 +601,6 @@ def find_toplevel_snippets (s, types): return snippets - def filter_pipe (input, cmd): if verbose_p: ly.progress (_ ("Opening filter `%s\'") % cmd) @@ -635,7 +635,7 @@ def run_filter (s): return filter_pipe (s, filter_cmd) def process_snippets (cmd, snippets): - names = filter (lambda x:x, [y.basename () for y in snippets]) + names = filter (lambda x: x, map (Lilypond_snippet.basename, snippets)) if names: ly.system (string.join ([cmd] + names)) @@ -758,7 +758,8 @@ def do_file (input_filename): if LINEWIDTH not in default_ly_options.keys (): if format == LATEX: textwidth = get_latex_textwidth (source) - default_ly_options[LINEWIDTH] = '''%.0f\\pt''' % textwidth + default_ly_options[LINEWIDTH] = '''%.0f\\pt''' \ + % textwidth elif format == TEXINFO: for (k,v) in texi_linewidths.items (): s = chunks[0].replacement_text() @@ -769,20 +770,22 @@ def do_file (input_filename): if filter_cmd: pass # todo elif process_cmd: - outdated = filter (lambda x: x.__class__ == Lilypond_snippet and x.is_outdated (), - chunks) + outdated = filter (lambda x: x.__class__ == Lilypond_snippet \ + and x.is_outdated (), chunks) ly.progress (_ ("Writing snippets...")) map (Lilypond_snippet.write_ly, outdated) ly.progress ('\n') - + if outdated: ly.progress (_ ("Processing...")) process_snippets (process_cmd, outdated) else: ly.progress (_ ("All snippets are up to date...")) ly.progress ('\n') - + ly.progress (_ ("Compiling %s...") % output_filename) + output_file.writelines ([s.replacement_text () \ + for s in chunks]) ly.progress ('\n') def process_include (snippet): @@ -791,28 +794,9 @@ def do_file (input_filename): ly.progress (_ ('Processing include: %s') % name) ly.progress ('\n') do_file (name) - - - output_file.writelines ([s.replacement_text () for s in chunks]) - - - included_files = [input_filename] - def notice_include (target, snip): - included_files.append (snip.match.group ('filename')) - included_files.append (os.path.join (output_name, snip.processed_filename ())) - - [notice_include (output_filename, x) for x in - - ## UGH. how do you do dynamic_cast/typecheck in Python? - filter (lambda x: x.__class__ == Include_snippet, chunks)] - - target = re.sub (r'^\./','', output_filename) - open (os.path.split (output_filename)[1] + '.dep', 'w').write ('%s: %s\n' % (target, - string.join (included_files))) - - map (process_include, filter (lambda x: x.__class__ == Include_snippet, chunks)) - + map (process_include, + filter (lambda x: x.__class__ == Include_snippet, chunks)) def do_options (): global format, output_name @@ -866,7 +850,6 @@ def do_options (): return files def main (): - files = do_options () global process_cmd if process_cmd: @@ -877,5 +860,6 @@ def main (): ly.setup_environment () if files: do_file (files[0]) + if __name__ == '__main__': main () -- 2.39.5