*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index d664f182d56ce42cabfefe3debe7570effc74ca2..a7397d3f375135f442aed768f9ebdc754084970a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,13 +5,15 @@
 
 2004-02-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scripts/hw-lilypond-book.py (Snippet.output_print_filename): 
+
+       * scm/define-translator-properties.scm (drumPitchTable): add
+       property.
+
        * scripts/lilypond-book.py (simple_toplevel_snippets): new
        function.
        (help_summary): docstrings.
-
-2004-02-05  Han-Wen Nienhuys   <hanwen@xs4all.nl>
-
-       * scripts/lilypond-book.py (outname): fix typo
+       (do_file): strip the dir of input_base too.
 
 2004-02-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile
index a7e07b3f60cb1f23a46756d904827615cbed88a7..6e0c855d3c823241f7f8a994ef9ef58e6e370c41 100644 (file)
--- a/input/regression/GNUmakefile
+++ b/input/regression/GNUmakefile
@@ -2,7 +2,7 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+LILYPOND_BOOK_FLAGS = --process="lilypond-bin -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"
 
 
 include $(depth)/make/stepmake.make 

diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
index b35e4d2592696f6b6df9575cdcabcd8e3ce5d2fa..6e268e7f807491eb2c55a7f27ee51ae271ce0745 100644 (file)
--- a/input/test/GNUmakefile
+++ b/input/test/GNUmakefile
@@ -3,7 +3,7 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+LILYPOND_BOOK_FLAGS = --process="lilypond-bin -I $(srcdir)/input/regression -e '(ly:set-option (quote internal-type-checking) \#t)'"
 
 ## Hmm, would this work?  No -- if we really want examples, move
 ## to other dir (input/) comes to mind.

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 0b8613180dd30f8f369bcb343eab5bd151cb2cf2..dcfd74a0ea3133e153885c5e3ec7860650292ac6 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -36,7 +36,7 @@ the-script-dir=$(wildcard $(script-dir))
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
-LILYPOND_BOOK = $(script-dir)/lilypond-book.py
+LILYPOND_BOOK = $(script-dir)/hw-lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
 
 #texi-html for www only:

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 82ef20d5236d9dcbaa55ce389382df8276e8aeb7..15069294f02be6a4505a947a6a9a0af9151870ec 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -10,7 +10,6 @@ $(outdir)/%.latex: %.doc
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
        if [ -f $@ ]; then chmod a+w $@; fi
-       set|egrep '(TEX|LILY)'  # ugh, what's this?
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
        chmod -w $@
 

diff --git a/scm/define-translator-properties.scm b/scm/define-translator-properties.scm
index 332901a40f2740b4ee58751f61eb3279be69551d..df75e3b260962ef0f76d7e9bcc11c12f37acbf5b 100644 (file)
--- a/scm/define-translator-properties.scm
+++ b/scm/define-translator-properties.scm
@@ -190,6 +190,10 @@ arpeggios that cross staves.
 (translator-property-description 'crescendoText markup? "Text to print at start of non-hairpin crecscendo, ie: @samp{cresc.}")
 (translator-property-description 'crescendoSpanner symbol? "Type of spanner to be used for crescendi.  One of: @samp{hairpin}, @samp{line}, @samp{dashed-line}, @samp{dotted-line}.  If unset, hairpin type is used.")
 (translator-property-description 'decrescendoText markup? "Text to print at start of non-hairpin decrecscendo, ie: @samp{dim.}")
+(translator-property-description 'drumPitchTable hash-table?
+                                "A table mapping percussion
+instruments (symbols) to pitches.")
+
 (translator-property-description 'drumStyleTable hash-table?
                                 "A hash table containing mapping drums to layout settings.
 Predefined values: @code{drums-style}, @code{timbales-style}, @code{congas-style}, @code{bongos-style}

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index b8c1010e606115b90d550527403b4a252e725e7d..0e76fe2af96402b2737864dd4f48397e7d73dcfb 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -368,7 +368,6 @@ def split_options (option_string):
 index = 0
 
 class Snippet:
-
        ## huh? index is redundant? --hwn
        def __init__ (self, type, source, index, match):
                self.type = type
@@ -630,7 +629,7 @@ LATEX_DOCUMENT = r'''
 '''
 #need anything else besides textwidth?
 def get_latex_textwidth (source):
-       m = re.search (r'''(?P<preabmle>\\begin\s*{document})''', source)
+       m = re.search (r'''(?P<preamble>\\begin\s*{document})''', source)
        preamble = source[:m.start (0)]
        latex_document = LATEX_DOCUMENT % vars ()
         parameter_string = filter_pipe (latex_document, latex_filter_cmd)
@@ -719,6 +718,8 @@ def do_file (input_filename):
                        input_base = 'stdin'
                else:
                        input_base = os.path.splitext (input_filename)[0]
+                       input_base = os.path.basename (input_base)
+                       
                output_filename = output_name + '/' + input_base \
                                  + format2ext[format]
                h = open (output_filename, 'w')