* stepmake/stepmake/omf-targets.make (omf-local-install): bugfixes

* lily/parser.yy (scalar): DIGIT is also a scalar.

* Documentation/user/music-glossary.tely: add @omf tags

* GNUmakefile.in (web-doc-install): add web-doc-install target

diff --git a/ChangeLog b/ChangeLog
index bb89efba68832e61c84bc621527c335a5f1b1285..de875117ec7c8c7b5105ea9e7c91ee470357ce56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-03-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * stepmake/stepmake/omf-targets.make (omf-local-install): bugfixes
+
+       * lily/parser.yy (scalar): DIGIT is also a scalar.
+
        * Documentation/user/music-glossary.tely: add @omf tags
 
        * Documentation/user/lilypond.tely: add @omf tags

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 7dd4511dedd519fa953c46f4ff52c49f4091fec8..488bc2824ffb4e579d44b289c0884d94bfe26bdb 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -29,7 +29,6 @@ Copyright @copyright{} 1999--2002 by the authors
 @omfcategory Music 
 @end ignore
 
-
 @ifnottex
 @node Top
 @top
@@ -77,6 +76,7 @@ We don't use refs for Info:
 they look too intrusive (says Han-Wen).
 @end ignore
 
+
 @c arrowref
 @macro aref{word}
 @iftex

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6983fb6199cfbbfce873b076fb6de0e263aa6987..26eff5fc19cb5fa82ebac5dbcbe5b5373e18ab8b 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -54,10 +54,11 @@ web-doc: web-reqs
 pfa-fonts:
        $(MAKE) MAKE_PFA_FILES=1 -C mf
 
-docdir = $(prefix)/share/doc/lilypond-$(TOPLEVEL_VERSION)
-install-html-doc: html-doc
-       $(INSTALL) -d $(docdir)/html 
-       tar -C $(docdir)/html -zxf $(outdir)/web.tar.gz
+
+web-doc-install: web-doc top-web
+       $(INSTALL) -m 755 -d $(local_package_docdir) 
+       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
+
 
 # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
 my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
@@ -91,10 +92,6 @@ lily/$(outdir)/lilypond:
 local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
 
-web-doc-install: web-doc
-       $(INSTALL) -m 755 -d $(local_package_docdir) 
-       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
-
 web-ext = gz html midi pdf png txt ly
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`

diff --git a/lily/parser.yy b/lily/parser.yy
index 0d346aed0c3f26fa3dc2a3c56b54109171411563..51561581cfa171143acd6ea53ae2d7ab5586505e 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -44,7 +44,6 @@ TODO:
 
 * There are too many lexical modes?
 
-
 */
 
 #include <ctype.h>
@@ -1184,6 +1183,7 @@ scalar:
         | bare_int      { $$ = gh_int2scm ($1); }
         | embedded_scm  { $$ = $1; }
        | full_markup {  $$ = $1; }
+       | DIGIT { $$ = $1; }
         ;
 
 

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4876e5bb9b1a6247a00915617fc7b5645de1b481..5a117ce52243b69fa059fb8f67a99584d900b2e3 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -30,8 +30,7 @@ $(outdir)/%.texi: $(outdir)/%.tely
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
        -chmod a+w $@
-       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --no-lily $(LILYPOND_BOOK_FLAGS) $<
-       mv $(@D)/$(*F).texi $@
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --no-lily $(LILYPOND_BOOK_FLAGS) -o $(notdir $@) $<
        chmod -w $@
 
 # nfo: info from non-lily texi

diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index aff924392031b49e90b6f905a78d32fdbeca5f04..c96cc788ae97362f4374c4c3947c1f6f8e9e9ebc 100644 (file)
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -3,6 +3,6 @@ omf: $(OMF_FILES)
 
 
 omf-local-install: $(OMF_FILES)
-       $(foreach a, $(OMF_FILES),  $(INSTALL) $(a) $(local_package_omfdir)/$(a) && ) true
+       $(foreach a, $(OMF_FILES),  $(INSTALL) $(a) $(local_package_omfdir)/$(notdir $(a)) && ) true
 
 local-install: omf-local-install

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 1430de5905888d6e7286b435981da0c4fa917691..5cfa7f8253182d77223435d56257b97075970491 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -9,13 +9,14 @@ $(outdir)/%.html: $(outdir)/%.texi
 # we want footers even if website builds (or is built) partly
        $(footify) $@
 
+
 $(outdir)/%.html.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format html --location $(local_package_docdir)/$(current-relative-dir)/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+       $(GENERATE_OMF) --format html --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 $(outdir)/%.pdf.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format pdf --location $(local_package_docdir)/$(current-relative-dir)/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+       $(GENERATE_OMF) --format pdf --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 $(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format ps.gz --location $(local_package_docdir)/$(current-relative-dir)/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+       $(GENERATE_OMF) --format ps.gz --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 # Generic rule not possible?
 $(outdir)/%/%.html: $(outdir)/%.texi