From 2ebdeb08eed908a595ab9b29a323dad10c57e39b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 17 Mar 2003 16:44:45 +0000 Subject: [PATCH] * 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 --- ChangeLog | 13 +++++++++++++ Documentation/user/lilypond.tely | 3 ++- Documentation/user/music-glossary.tely | 5 +++-- VERSION | 2 +- buildscripts/texi2omf.py | 8 ++++---- config.make.in | 1 + lily/parser.yy | 2 +- make/lilypond.redhat.spec.in | 22 ++++++++++++++-------- make/ly-rules.make | 26 ++++++++++++++++++++++++-- scm/generate-documentation.scm | 5 +++-- scripts/lilypond-book.py | 25 +++++++------------------ stepmake/stepmake/texinfo-rules.make | 13 +++++++------ stepmake/stepmake/texinfo-vars.make | 3 ++- 13 files changed, 82 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 310d3b4774..740021d41d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2003-03-17 Han-Wen Nienhuys + * 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 c6b0c58d39..c696741df3 100644 --- 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 488bc2824f..536d79aa11 100644 --- 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 9afe7f3f94..4a1c3730a8 100644 --- 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 d6c01affb8..f87fea1623 100644 --- a/buildscripts/texi2omf.py +++ b/buildscripts/texi2omf.py @@ -112,8 +112,7 @@ if not omf_vars['creator']: -print r''' - +print r''' @@ -129,7 +128,7 @@ print r''' %(date)s - + %(description)s @@ -137,12 +136,13 @@ print r''' %(type)s - + + ''' % omf_vars diff --git a/config.make.in b/config.make.in index 6aa0508c75..35f1fad435 100644 --- 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 51561581cf..f7f13c4eb0 100644 --- 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 5aeab26ace..a1b37fd09d 100644 --- 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 5a117ce522..46a3efa7b6 100644 --- 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 d83a2b1796..4e84ab7aec 100644 --- 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 b336e921de..1a6498bfe4 100644 --- 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 5cfa7f8253..426045a041 100644 --- 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 4ba56853ef..fe2c8244c9 100644 --- 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) $< > $@ + -- 2.39.5