* Documentation/user/lilypond.tely: omf updates.

* buildscripts/texi2omf.py (omf_vars): include version.date

* make/lilypond.redhat.spec.in: fixes for spec file.

* stepmake/stepmake/texinfo-vars.make (GENERATE_OMF):  replace var
by function definition: lily now requires a recent GNU Make.

* scripts/lilypond-book.py (write_deps): remove .tex dependency writing.

* make/ly-rules.make: remove .ly -> .tex rule

diff --git a/ChangeLog b/ChangeLog
index 310d3b4774eb36d1b24caac676f972de1402815d..740021d41dd703a399f5f669cb3ff06c692af62f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2003-03-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * Documentation/user/lilypond.tely: omf updates.
+
+       * buildscripts/texi2omf.py (omf_vars): include version.date
+
+       * make/lilypond.redhat.spec.in: fixes for spec file. 
+
+       * stepmake/stepmake/texinfo-vars.make (GENERATE_OMF):  replace var
+       by function definition: lily now requires a recent GNU Make.
+
+       * scripts/lilypond-book.py (write_deps): remove .tex dependency writing.
+
+       * make/ly-rules.make: remove .ly -> .tex rule
+
        * Documentation/user/refman.itely (Figured bass): revised figured
        bass example.
 

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index c6b0c58d39597e239cff5a80a5bc93d7a5ea183a..c696741df34e0e634a3670df455fca5c78a55750 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -33,7 +33,8 @@ Distributions will want to install lilypond.info doing:
 @omfcreator Han-Wen Nienhuys and Jan Nieuwenhuizen
 @omfdescription User manual  of the LilyPond music engraving system
 @omftype user manual
-@omfcategory Music 
+@omfcategory Music
+@omflanguage English
 @end ignore
 
 

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 488bc2824ffb4e579d44b289c0884d94bfe26bdb..536d79aa11075d873463402edb18225d0d6398f9 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -25,8 +25,9 @@ Copyright @copyright{} 1999--2002 by the authors
 @ignore
 @omfcreator Christian Mondrup
 @omfdescription Glossary of musical terms with translations
-@omftype user manual
-@omfcategory Music 
+@omftype user's guide
+@omfcategory Music
+@omflanguage English
 @end ignore
 
 @ifnottex

diff --git a/VERSION b/VERSION
index 9afe7f3f94bbe9b5878799342824e4f240ddf91a..4a1c3730a81a6bb8be4d13e034325d28831b482e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=7
-PATCH_LEVEL=14
+PATCH_LEVEL=15
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/buildscripts/texi2omf.py b/buildscripts/texi2omf.py
index d6c01affb82dd2b13a42776e70763fa368e4c1ba..f87fea162370d05ff527edaf18c91f9088573adf 100644 (file)
--- a/buildscripts/texi2omf.py
+++ b/buildscripts/texi2omf.py
@@ -112,8 +112,7 @@ if not omf_vars['creator']:
 
 
 
-print r'''
-<?xml version="1.0" encoding="UTF-8"?>
+print r'''<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
 <omf>
   <resource>
@@ -129,7 +128,7 @@ print r'''
     <date>
       %(date)s
     </date>
-    <version identifier="%(version)s" />
+    <version identifier="%(version)s" date="%(date)s" />
     <subject category="%(category)s"/>
     <description>
     %(description)s
@@ -137,12 +136,13 @@ print r'''
     <type>
     %(type)s
     </type>
-    <format mime="%(mimeformat)s">
+    <format mime="%(mimeformat)s" />
     <identifier url="%(location)s"/>
     <language code="C"/>
     <rights type="%(license)s" />
   </resource>
 </omf>
+
 ''' % omf_vars
 
 

diff --git a/config.make.in b/config.make.in
index 6aa0508c75ea2f8104b82e1c8abc1f3eaa7d809d..35f1fad4351b11d24ada10868773396bba618cbb 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -51,6 +51,7 @@ local_package_omfdir = $(lilypond_omfdir)/$(TOPLEVEL_VERSION)
 lilypond_datadir = $(package_datadir)
 lilypond_libdir = $(package_libdir)
 lilypond_docdir = $(package_docdir)
+lilypond_omfdir = $(package_omfdir)
 
 local_lilypond_datadir = $(local_package_datadir)
 local_lilypond_libdir = $(local_package_libdir)

diff --git a/lily/parser.yy b/lily/parser.yy
index 51561581cfa171143acd6ea53ae2d7ab5586505e..f7f13c4eb0cdb11a59869cf57e0ff1fa6bcb7c58 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1183,7 +1183,7 @@ scalar:
         | bare_int      { $$ = gh_int2scm ($1); }
         | embedded_scm  { $$ = $1; }
        | full_markup {  $$ = $1; }
-       | DIGIT { $$ = $1; }
+       | DIGIT { $$ = gh_int2scm ($1); }
         ;
 
 

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 5aeab26ace92fa9ebe3c4134b8b894c5455c50ab..a1b37fd09dbfa717e05b9dd69f418fd5f40bf771 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -52,7 +52,7 @@ make -C Documentation
 
 # make  html
 make web-doc top-web 
-
+make -C Documentation/user omf
 
 %install
 
@@ -96,12 +96,6 @@ echo 'Please logout first before using LilyPond.'
 
 %preun
 
-%post documentation
-scrollkeeper-update
-
-%preun documentation
-scrollkeeper-update
-
 
 %if %{info}
 if [ $1 = 0 ]; then
@@ -111,6 +105,15 @@ fi
 
 chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
+
+%post documentation
+scrollkeeper-update
+
+%postun documentation
+scrollkeeper-update
+
+
+
 %files
 %defattr(-, root, root)
 %{_datadir}/emacs/site-lisp/lilypond*
@@ -128,6 +131,8 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_bindir}/musedata2ly
 %{_bindir}/pmx2ly
 
+
+
 %if %{info}
 %{_infodir}/*
 %endif
@@ -147,6 +152,7 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo
 
+%{_libdir}/lilypond/
 
 /etc/profile.d/lilypond.*
 
@@ -155,7 +161,7 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 %defattr(-, root, root)
 
-%{docdir}/lilypond/@TOPLEVEL_VERSION@
+%{docdir}/@TOPLEVEL_VERSION@
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
 
 

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 5a117ce52243b69fa059fb8f67a99584d900b2e3..46a3efa7b679e8dfb80d5d2aab6f8aa9eb9ab936 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -41,8 +41,11 @@ $(outdir)/%.info: $(outdir)/%.nexi
 #$(outdir)/%.nfo: $(outdir)/%.nexi
 #      $(MAKEINFO) --output=$(outdir)/$(*F).info $<
 
-$(outdir)/%.tex: $(outdir)/%.ly
-       $(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
+#
+# let's not do this: this interferes with the lilypond-book dependency mechanism.
+#
+##$(outdir)/%.tex: $(outdir)/%.ly
+##     $(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
 
 #
 # Timothy's booklet
@@ -55,3 +58,22 @@ $(outdir)/%.pdf: $(outdir)/%.dvi
        dvips -u lilypond.map -o $@.pdfps  -Ppdf $<
        ps2pdf $@.pdfps $@
 
+
+$(outdir)/%.html.omf: %.tely
+       $(call GENERATE_OMF,html)
+
+$(outdir)/%.pdf.omf: %.tely
+       $(call GENERATE_OMF,pdf)
+
+$(outdir)/%.ps.gz.omf: %.tely
+       $(call GENERATE_OMF,ps.gz) 
+
+
+$(outdir)/%.html.omf: $(outdir)/%.texi
+       $(call GENERATE_OMF,html)
+
+$(outdir)/%.pdf.omf: $(outdir)/%.texi
+       $(call GENERATE_OMF,pdf)
+
+$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
+       $(call GENERATE_OMF,ps.gz) 

diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm
index d83a2b179636d4c6bfcba6b1b260eb5d5f146fa3..4e84ab7aece6e23145204c3282bd007832a831e6 100644 (file)
--- a/scm/generate-documentation.scm
+++ b/scm/generate-documentation.scm
@@ -78,8 +78,9 @@
 @omftitle LilyPond internals
 @omfcreator Han-Wen Nienhuys and Jan Nieuwenhuizen
 @omfdescription Programmer's reference of the LilyPond music engraving system
-@omftype user manual
-@omfcategory Music 
+@omftype user's guide
+@omflanguage English
+@omfcategory Music
 @end ignore
 
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index b336e921dea0ac560d4a33196c407d9762ac7140..1a6498bfe488b88f7330c92ce0d3ccf36c5754a5 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1340,24 +1340,13 @@ def write_deps (fn, target, chunks):
        f.write ('%s%s: ' % (g_dep_prefix, target))
        for d in read_files:
                f.write ('%s ' %  d)
-       basenames=[]
-        for c in chunks:
-               if c[0] == 'lilypond':
-                       (type, body, opts, todo, basename) = c;
-                       basenames.append (basename)
-       for d in basenames:
-               if g_outdir:
-                       d=g_outdir + '/' + d
-               if g_dep_prefix:
-                       #if not os.isfile (d): # thinko?
-                       if not re.search ('/', d):
-                               d = g_dep_prefix + d
-               f.write ('%s.tex ' %  d)
-       f.write ('\n')
-       #if len (basenames):
-       #       for d in basenames:
-       #               f.write ('%s.ly ' %  d)
-       #       f.write (' : %s' % target)
+
+
+       ## There used to be code to write .tex dependencies, but
+       ## that is silly: lilypond-book has its own dependency scheme
+       ## to ensure that all lily-XXX.tex files are there
+               
+
        f.write ('\n')
        f.close ()
        read_files = []

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 5cfa7f8253182d77223435d56257b97075970491..426045a04178056adf63e739f7da85728af0d46f 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -10,13 +10,14 @@ $(outdir)/%.html: $(outdir)/%.texi
        $(footify) $@
 
 
-$(outdir)/%.html.omf: $(outdir)/%.texi
-       $(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)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+$(outdir)/%.html.omf: %.texi
+       $(call GENERATE_OMF,html)
 
-$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format ps.gz --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+$(outdir)/%.pdf.omf: %.texi
+       $(call GENERATE_OMF,pdf)
+
+$(outdir)/%.ps.gz.omf: %.texi
+       $(call GENERATE_OMF,ps.gz) 
 
 # Generic rule not possible?
 $(outdir)/%/%.html: $(outdir)/%.texi

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 4ba56853efed77959fa931257045b5ef78bbe869..fe2c8244c9c5ea2806996da4ddc2e98234160ab4 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -7,5 +7,6 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
-GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py
+GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py --format $(1) --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+