From 6ccdc33b67af16bed0b445d54c880941bb6c4596 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 6 Nov 2000 17:22:51 +0100 Subject: [PATCH] release: 1.3.104 ============ * Documentation build fix: don't run LilyPond when generating plain info doc. * Resurrected info documentation and made cross links between manual and generated doco, some small fixes. * Made small Time signature style fix. * Generate texinfo iso html documentation. * Added x-references for elements->engravers and engravers->contexts. * Fixed number font listing in style sheet. * Fixed default font settings for text items, text-item now uses font-interface's alist-chain. * Renamed property AutoBeam to autoBeamSettings to avoid confusion about non-existing AutoBeam element. * Mensural clefs (courtesy Juergen Reuter) 1.3.103.l --- CHANGES | 56 +- DEDICATION | 6 +- Documentation/user/GNUmakefile | 14 +- Documentation/user/lilypond.tely | 31 +- Documentation/user/refman.itely | 71 +-- Documentation/user/tutorial.itely | 15 +- VERSION | 4 +- debian/GNUmakefile | 6 +- debian/changelog | 6 + debian/{ex.doc-base => doc-base} | 4 +- debian/{ex.prerm => prerm} | 0 debian/rules | 2 +- lily/change-translator.cc | 0 lily/include/change-translator.hh | 0 lily/staff-bar.cc | 0 lilypond-mode.el | 4 +- ly/engraver.ly | 44 +- make/lilypond.spec.in | 19 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 23 +- mf/feta-klef.mf | 601 +++++++++++++++++++ scm/documentation-lib.scm | 4 +- scm/element-descriptions.scm | 2 +- scm/generate-documentation.scm | 5 +- stepmake/stepmake/documentation-targets.make | 21 +- stepmake/stepmake/texinfo-rules.make | 4 +- 26 files changed, 802 insertions(+), 148 deletions(-) rename debian/{ex.doc-base => doc-base} (69%) rename debian/{ex.prerm => prerm} (100%) delete mode 100644 lily/change-translator.cc delete mode 100644 lily/include/change-translator.hh delete mode 100644 lily/staff-bar.cc diff --git a/CHANGES b/CHANGES index 244f769b7e..303cca1570 100644 --- a/CHANGES +++ b/CHANGES @@ -1,18 +1,12 @@ ---- ../lilypond-1.3.103.jcn4/CHANGES Sun Nov 5 21:15:23 2000 -++ b/CHANGES Sun Nov 5 23:03:35 2000 -@@ -1,3 +1,8 @@ 1.3.103.jcn5 ============ * Documentation build fix: don't run LilyPond when generating plain info doc. - 1.3.103.jcn4 - ============ - --- ../lilypond-1.3.103.jcn2/CHANGES Fri Nov 3 14:39:30 2000 -++ b/CHANGES Sat Nov 4 15:09:38 2000 -@@ -1,3 +1,12 @@ -1.3.103.jcn3 -============ +* Resurrected info documentation and made cross links between manual +and generated doco, some small fixes. + +* Made small Time signature style fix. * Generate texinfo iso html documentation. @@ -20,11 +14,14 @@ * Fixed number font listing in style sheet. - 1.3.103.jcn2 - ============ - --- ../lilypond-1.3.103/CHANGES Thu Nov 2 15:25:16 2000 -++ b/CHANGES Sat Nov 4 10:40:02 2000 -@@ -1,3 +1,22 @@ +* Fixed default font settings for text items, text-item now uses +font-interface's alist-chain. + +* Renamed property AutoBeam to autoBeamSettings to avoid confusion +about non-existing AutoBeam element. + +* Mensural clefs (courtesy Juergen Reuter) + 1.3.103.lec1 ============ @@ -44,33 +41,8 @@ * fix for translation of :: repeat - 1.3.102.jcn1 - ============ - 1.3.103.jcn2 -============ - -* Fixed default font settings for text items, text-item now uses -font-interface's alist-chain. - -* Renamed property AutoBeam to autoBeamSettings to avoid confusion -about non-existing AutoBeam element. - -1.3.103.jcn1 -============ - -* Added tex/dynamics.tex and tex/number.tex to ensure feta fonts are fine. - -* Fulfilled long standing promise: fixed arpeggios in vicinity of collisions -(removed a ';' thus re-adding rhythmic-head support :-). - -* Removed non-ascii characters from contributed Chord name code. - -* Finished rewrite of auto-beam. - -* Small bugfix for lilypond-mode. - -1.3.102.jcn1 -============ +1.3.103 +======= * Translated auto-beam properties to alist. diff --git a/DEDICATION b/DEDICATION index d889d1fa0c..3cded516bc 100644 --- a/DEDICATION +++ b/DEDICATION @@ -13,9 +13,9 @@ certainly not least) Janneke! HWN That's a nice thought, Wendy. I've got a few too, to spread -the credits a bit (Again, no particular order) Michelle, Illushka, -Ruth, Eva, Fro/ydis, Monique, Noor, Sascha, Monique, Ilse, Monique, -Eva, Roos, Judith, Tim, and, of course, Wendy! +the credits a bit (Again, no particular order) Michelle, Illushka, +Mieke, Ruth, Eva, Fro/ydis, Monique, Mary Anne, Noor, Sascha, Monique, +Ilse, Monique, Eva, Roos, Judith, Tim, Connie and, of course, Wendy! JCN diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 4bdccbfed6..0cee86ef33 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -18,6 +18,8 @@ PS_FILES = $(DVI_FILES:.dvi=.ps) $(OUTDOC_FILES:.doc=.ps) $(OUTTEX_FILES:.tex=. PS_GZ_FILES= $(addsuffix .gz, $(PS_FILES)) +INFO_FILES = $(addprefix $(outdir)/, lilypond.info lilypond-internals.info) + STEPMAKE_TEMPLATES=tex texinfo documentation LOCALSTEPMAKE_TEMPLATES=lilypond mudela @@ -27,10 +29,11 @@ dvi: $(DVI_FILES) ps: $(PS_FILES) -# urg -default: +info: $(INFO_FILES) + +default: info -local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) backdoc +local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) backdoc-WWW true # $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \ @@ -45,8 +48,9 @@ $(outdir)/%.bib: %.bib localclean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk -#ugh. out/ hardcoded. -backdoc: $(outdir)/lilypond-internals.html +backdoc-WWW: $(outdir)/lilypond-internals.html +#ugh. lily/OUT/lilypond hardcoded. $(outdir)/lilypond-internals.texi: (cd $(outdir); $(topdir)/lily/out/lilypond ../$(srcdir)/../ly/generate-documentation) + diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 9e91317106..d988d77164 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -1,12 +1,12 @@ \input texinfo @c -*-texinfo-*- @setfilename lilypond.info -@settitle LilyPond Reference Manual +@settitle GNU LilyPond @titlepage -@title LilyPond Reference Manual -@subtitle The GNU Project Typesetter +@title GNU LilyPond +@subtitle The music typesetter @author Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano Copyright @copyright{} 1999 by the authors @@ -77,18 +77,23 @@ than the names being similar :-)" @end ignore -@contents - @node Top, , , (dir) +@chapter GNU LilyPond --- The music typesetter + +@contents @menu -* Tutorial:: a tutorial introduction to lilypond. -* Invoking LilyPond:: Operation. -* Reporting Bugs:: Where to report bugs. -* Reference Manual:: Reference Manual. -* More information:: Where to turn to for more help. -* convert-mudela:: Upgrading input files. -* Index:: Unified index. +* Tutorial:: A tutorial introduction to lilypond. +* Invoking LilyPond:: Operation. +* Reporting Bugs:: Where to report bugs. +* Reference Manual:: Reference Manual. +@c Move to Reference Manual? +* Internals:(lilypond-internals). Auto generated detailed documentation. +* More information:: Where to turn to for more help. +* convert-mudela:: Upgrading input files. +@c Hmm, having the generated doco in a separate file, +@c the index can't refer to that. +* Index:: Unified index. @end menu @macro keyindex {word} @@ -115,8 +120,6 @@ than the names being similar :-)" @include convert-mudela.itexi -@c @include out/lilypond-internals.texi - @node Index, , , Top @unnumbered Index diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 4c2f097e0c..77f40dfcd7 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1,3 +1,4 @@ +@c -*-texinfo-*- @c TODO: @c - Reinsert subsection commands that were lost in the @c ancient conversion from YODL! /MB @@ -6,43 +7,45 @@ @c - Fix indexing (keyindex) so it doesn't add line breaks /MB @node Reference Manual, , , Top +@chapter Reference Manual + @menu -* Overview:: Overview -* Top level:: Top level -* notenames:: notenames -* Lexical conventions:: Lexical conventions -* Other languages:: notelang -* modes:: modes -* Types:: Types -* Music expressions:: Music expressions -* Atomic music expressions:: Atomic music expressions -* Note specification:: notedesc -* barlines:: barlines -* Manual beams:: Manual beam -* stem tremolo:: tremolo -* Compound music expressions:: Compound music expressions -* relative:: relative -* Repeats:: Repeats -* transpose:: transpose -* Ambiguities:: Ambiguities -* Notation conversion specifics:: Notation conversion specifics -* autobeam:: autobeam -* lyricprint:: lyricprint -* Notation Contexts:: Notation Contexts -* Properties:: Changing formatting -* Notation output definitions:: Notation output definitions -* paper:: paper -* Paper variables:: papervars -* contextdefs:: contextdefs -@c should include backend doco -@c * engravers:: engravers -* Sound output:: Sound output -* midilist:: midilist -* Pre-defined Identifiers:: Pre-defined Identifiers +* Overview:: Overview +* Top level:: Top level +* notenames:: notenames +* Lexical conventions:: Lexical conventions +* Other languages:: notelang +* modes:: modes +* Types:: Types +* Music expressions:: Music expressions +* Atomic music expressions:: Atomic music expressions +* Note specification:: notedesc +* barlines:: barlines +* Manual beams:: Manual beam +* stem tremolo:: tremolo +* Compound music expressions:: Compound music expressions +* relative:: relative +* Repeats:: Repeats +* transpose:: transpose +* Ambiguities:: Ambiguities +* Notation conversion specifics:: Notation conversion specifics +* autobeam:: autobeam +* lyricprint:: lyricprint +* Notation Contexts:: Notation Contexts +* Properties:: Changing formatting +* Notation output definitions:: Notation output definitions +* paper:: paper +* Paper variables:: papervars +* contextdefs:: contextdefs +* Sound output:: Sound output +* midilist:: midilist +* Pre-defined Identifiers:: Pre-defined Identifiers +@c May be fragile. Better make single link to generated doco? +* Interpretation contexts:(lilypond-internals)LilyPond interpretation contexts. +* Engravers:(lilypond-internals)LilyPond engravers. +* Backend:(lilypond-internals)LilyPond backend. @end menu -@chapter Reference Manual - @node Overview, , , Reference Manual diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 66c915a63c..2a6e64e63a 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1,13 +1,14 @@ -@chapter Tutorial - +@c -*-texinfo-*- @node Tutorial, , , Top +@chapter Tutorial + @menu -* Introduction:: Introduction -* The first tune:: The first tune -* Lyrics and chords:: Lyrics and chords -* Piano music:: Piano music -* end of tutorial:: The end +* Introduction:: Introduction +* The first tune:: The first tune +* Lyrics and chords:: Lyrics and chords +* Piano music:: Piano music +* end of tutorial:: The end @end menu @node Introduction, , , Tutorial diff --git a/VERSION b/VERSION index abdabb66ba..3e35f9dbd6 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=103 -MY_PATCH_LEVEL=jcn5 +PATCH_LEVEL=104 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/GNUmakefile b/debian/GNUmakefile index b9ea31efad..7e67f9d823 100644 --- a/debian/GNUmakefile +++ b/debian/GNUmakefile @@ -7,9 +7,9 @@ at-dir = $(outdir)/ at-ext = EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) \ - control.foka ex.prerm ex.doc-base -CONF_FILES = changelog control copyright emacsen-startup \ - preinst postinst postrm rules watch + control.foka +CONF_FILES = changelog control copyright doc-base emacsen-startup \ + preinst postinst postrm prerm rules watch #OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES) OUTCONF_FILES = $(OUTIN_FILES) OUT_DIST_FILES = $(OUTIN_FILES) diff --git a/debian/changelog b/debian/changelog index af625de087..dc55185130 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lilypond1.3 (1.3.103) unstable; urgency=low + + * Re-enabled info doc rules. + + -- Jan Nieuwenhuizen Sun, 5 Nov 2000 22:15:57 -0100 + lilypond1.3 (1.3.79-1) unstable; urgency=low * New upstream release. diff --git a/debian/ex.doc-base b/debian/doc-base similarity index 69% rename from debian/ex.doc-base rename to debian/doc-base index 13016d1aad..cb521ca139 100644 --- a/debian/ex.doc-base +++ b/debian/doc-base @@ -1,5 +1,5 @@ Document: lilypond -Title: LilyPond, the GNU Project music typesetter +Title: GNU LilyPond, the music typesetter Author: Various Abstract: This documentation describes LilyPond (the GNU Project music typesetter), its language Mudela, and the Mutopia project, a.k.a. @@ -8,4 +8,4 @@ Section: Apps/Music Format: info Index: /usr/share/info/lilypond.info.gz -Files: /usr/share/info/lilypond.info* +Files: /usr/share/info/lilypond.info* /usr/share/info/lilypond-internals.info* diff --git a/debian/ex.prerm b/debian/prerm similarity index 100% rename from debian/ex.prerm rename to debian/prerm diff --git a/debian/rules b/debian/rules index 42631883e4..de648132d4 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,7 @@ binary-arch: build install dh_testroot cp -av lilypond-mode.el lilypond-font-lock.el \ $(r)/usr/share/emacs/site-lisp/ - dh_installdocs DEDICATION NEWS ROADMAP TODO *.txt \ + dh_installdocs DEDICATION NEWS ROADMAP *.txt \ Documentation/pictures/out/*.png \ Documentation/out/*.txt \ Documentation/*/out/[a-z]*.dvi \ diff --git a/lily/change-translator.cc b/lily/change-translator.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/include/change-translator.hh b/lily/include/change-translator.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/staff-bar.cc b/lily/staff-bar.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lilypond-mode.el b/lilypond-mode.el index 71c3a68429..5f570c77fd 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -442,6 +442,6 @@ command." (interactive) (message "Using `LilyPond-mode' version %s" LilyPond-version)) -(provide 'LilyPond-mode) -;;; LilyPond-mode.el ends here +(provide 'lilypond-mode) +;;; lilypond-mode.el ends here diff --git a/ly/engraver.ly b/ly/engraver.ly index 020e781ca4..383bb18c8c 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -388,12 +388,52 @@ ScoreContext = \translator { ("bass" . ("clefs-F" 2 )) ("F" . ( "clefs-F" 2)) ("subbass" . ("clefs-F" 4)) + ("vaticana_do1" . ("clefs-vaticana_do" -1)) + ("vaticana_do2" . ("clefs-vaticana_do" 1)) + ("vaticana_do3" . ("clefs-vaticana_do" 3)) + ("vaticana_fa1" . ("clefs-vaticana_fa" -1)) + ("vaticana_fa2" . ("clefs-vaticana_fa" 1)) + ("medicaea_do1" . ("clefs-medicaea_do" -1)) + ("medicaea_do2" . ("clefs-medicaea_do" 1)) + ("medicaea_do3" . ("clefs-medicaea_do" 3)) + ("medicaea_fa1" . ("clefs-medicaea_fa" -1)) + ("medicaea_fa2" . ("clefs-medicaea_fa" 1)) + ("hufnagel_do1" . ("clefs-hufnagel_do" -1)) + ("hufnagel_do2" . ("clefs-hufnagel_do" 1)) + ("hufnagel_do3" . ("clefs-hufnagel_do" 3)) + ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1)) + ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1)) + ("hufnagel" . ("clefs-hufnagel_do_fa" 4)) + ("mensural1_c1" . ("clefs-mensural1_c" -4)) + ("mensural1_c2" . ("clefs-mensural1_c" -2)) + ("mensural1_c3" . ("clefs-mensural1_c" 0)) + ("mensural1_c4" . ("clefs-mensural1_c" 2)) + ("mensural2_c1" . ("clefs-mensural2_c" -4)) + ("mensural2_c2" . ("clefs-mensural2_c" -2)) + ("mensural2_c3" . ("clefs-mensural2_c" 0)) + ("mensural2_c4" . ("clefs-mensural2_c" 2)) + ("mensural2_c5" . ("clefs-mensural2_c" 4)) + ("mensural3_c1" . ("clefs-mensural3_c" -2)) + ("mensural3_c2" . ("clefs-mensural3_c" 0)) + ("mensural3_c3" . ("clefs-mensural3_c" 2)) + ("mensural3_c4" . ("clefs-mensural3_c" 4)) + ("mensural_f" . ("clefs-mensural_f" 2)) ) % where is c0 in this clef? clefPitches = #'(("clefs-G" . -4) ("clefs-C" . 0) - ("clefs-F" . 4)) - + ("clefs-F" . 4) + ("clefs-vaticana_do" . 0) + ("clefs-vaticana_fa" . 4) + ("clefs-medicaea_do" . 0) + ("clefs-medicaea_fa" . 4) + ("clefs-hufnagel_do" . 0) + ("clefs-hufnagel_fa" . 4) + ("clefs-hufnagel_do_fa" . 0) + ("clefs-mensural1_c" . 0) + ("clefs-mensural2_c" . 0) + ("clefs-mensural3_c" . 0) + ("clefs-mensural_f" . 0)) automaticPhrasing = ##t; alignmentReference = \down; diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index bcd0bca7a7..f8b2634943 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -1,3 +1,5 @@ +%define info yes + Name: lilypond Version: @TOPLEVEL_VERSION@ Release: 1 @@ -56,7 +58,9 @@ mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc strip lily/out/lilypond midi2ly/out/midi2ly make prefix="$RPM_BUILD_ROOT%{_prefix}" install -# gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +%if info=="yes" +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +%endif mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh @@ -83,12 +87,16 @@ echo '!c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/s touch /tmp/.lilypond-install rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install -# /sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +%if info=="yes" +/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +%endif %preun +%if info=="yes" if [ $1 = 0 ]; then - true # /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true + /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true fi +%endif %files @@ -111,6 +119,11 @@ fi %{_prefix}/bin %endif +%if info=="yes" +%{_prefix}/info/lilypond.info.gz +%{_prefix}/info/lilypond-internals.info.gz +%endif + %{_prefix}/man/man1/abc2ly.1.gz %{_prefix}/man/man1/as2text.1.gz %{_prefix}/man/man1/convert-mudela.1.gz diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 532b294e05..f00a595d06 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.103 -Entered-date: 02NOV00 +Version: 1.3.104 +Entered-date: 06NOV00 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.103.tar.gz + 1000k lilypond-1.3.104.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.103.tar.gz + 1000k lilypond-1.3.104.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 625ee55aa2..b3161eaf23 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,11 @@ +%define info yes + Name: lilypond -Version: 1.3.103 +Version: 1.3.104 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.103.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.104.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif @@ -56,7 +58,9 @@ mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc strip lily/out/lilypond midi2ly/out/midi2ly make prefix="$RPM_BUILD_ROOT%{_prefix}" install -# gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +%if info=="yes" +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +%endif mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh @@ -83,12 +87,16 @@ echo '!c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/s touch /tmp/.lilypond-install rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install -# /sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +%if info=="yes" +/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +%endif %preun +%if info=="yes" if [ $1 = 0 ]; then - true # /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true + /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true fi +%endif %files @@ -111,6 +119,11 @@ fi %{_prefix}/bin %endif +%if info=="yes" +%{_prefix}/info/lilypond.info.gz +%{_prefix}/info/lilypond-internals.info.gz +%endif + %{_prefix}/man/man1/abc2ly.1.gz %{_prefix}/man/man1/as2text.1.gz %{_prefix}/man/man1/convert-mudela.1.gz diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index a759cc0e85..44c7cff199 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -308,4 +308,605 @@ fet_beginchar("G clef", "G_change", "ctrebleclef") draw_gclef((1.3 staff_space#,0), .8); fet_endchar; +%%%%%%%% +% +% +% +% Editio Vaticana +% +% +% +def draw_vaticana_do_clef(expr exact_center, reduction) = + save reduced_il; + + reduced_il# = staff_space# * reduction; + + set_char_box(0.4reduced_il#, 0.4reduced_il#, 0, reduced_il#); + + define_pixels(reduced_il); + + pickup pencircle xscaled stafflinethickness yscaled 0.6reduced_il; + + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + za = exact_center + (-0.0reduced_il, -.45reduced_il); + zb = exact_center + (-0.2reduced_il, -.50reduced_il); + zc = exact_center + (-0.4reduced_il, -.25reduced_il); + zd = exact_center + (-0.4reduced_il, +.25reduced_il); + ze = exact_center + (-0.2reduced_il, +.50reduced_il); + zf = exact_center + (-0.0reduced_il, +.45reduced_il); + draw za .. zb .. zc -- % lower punctum + zd .. ze .. zf; % upper punctum +enddef; + + +fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_vaticana_do_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef") + draw_vaticana_do_clef((0,0), 1.0); % no reduction +fet_endchar; + + +def draw_vaticana_fa_clef(expr exact_center, reduction) = + + save reduced_il, z; + reduced_il# = staff_space# * reduction; + define_pixels(reduced_il); + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + %stem + pickup pencircle scaled stafflinethickness; + xpart za = xpart zb = + xpart exact_center + 0.4reduced_il; + ypart za = ypart exact_center = ypart zb + 1.5reduced_il; + draw za .. zb; + + %left-handed punctum + pickup pencircle xscaled stafflinethickness yscaled 0.5reduced_il; + zc = exact_center + + (+0.4reduced_il, -0.05reduced_il); + zd = exact_center + + (+0.2reduced_il, +0.05reduced_il); + ze = exact_center + + (+0.0reduced_il, +0.00reduced_il); + draw zc .. zd .. ze; + + %right-handed puncta as in do clef + draw_vaticana_do_clef( + exact_center + + (+0.8reduced_il + 1.25stafflinethickness, 0), + reduction); + + set_char_box(0.5reduced_il#, 1.5reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_vaticana_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef") + draw_vaticana_fa_clef((0,0), 1.0); % no reduction +fet_endchar; + +%%%%%%%% +% +% +% +% Editio Medicaea +% +% +% +def draw_medicaea_do_clef(expr exact_center, reduction) = + save reduced_il, reduced_slt; + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + define_pixels(reduced_il); + define_pixels(reduced_slt); + + save flag_height; + flag_height# = 0.5 reduced_il#; + define_pixels(flag_height); + + %lower flag + save za, zb; + pair za, zb; + pickup pencircle xscaled reduced_slt yscaled flag_height; + xpart exact_center + = xpart za + 0.5 reduced_il + = xpart zb - 0.5 reduced_il; + ypart za = ypart exact_center - 0.5 flag_height + - 0.5 (staff_space - reduced_il); + ypart zb = ypart za - reduced_il + flag_height; + draw za .. zb; + + %upper flag + save za, zb; + pair za, zb; + pickup pencircle xscaled reduced_slt yscaled flag_height; + xpart exact_center + = xpart za + 0.5 reduced_il + = xpart zb - 0.5 reduced_il; + ypart za = ypart exact_center - 0.5 flag_height + - 0.5 (staff_space - reduced_il) + + staff_space; + ypart zb = ypart za - reduced_il + flag_height; + draw za .. zb; + + %stem + save za, zb; + pair za, zb; + pickup pencircle scaled reduced_slt; + xpart za = xpart zb = xpart exact_center - 0.5 reduced_il; + ypart exact_center + = ypart za + 1.5 reduced_il + = ypart zb - 1.5 reduced_il; + draw za .. zb; + + set_char_box(0.5reduced_il#, 1.5reduced_il#, + 1.5reduced_il#, 1.5reduced_il#); +enddef; + + +fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_medicaea_do_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef") + draw_medicaea_do_clef((0,0), .8); +fet_endchar; + + +def draw_medicaea_fa_clef(expr exact_center, reduction) = + % inspired by Regensburger Edition of Medicaea (1885/86), in: + % MGG, volume 2, col. 1327 ("Choralreform"), fig. 2. + + save reduced_il, reduced_slt; + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + define_pixels(reduced_il); + define_pixels(reduced_slt); + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + %stem + pickup pencircle scaled stafflinethickness; + xpart za = xpart zb = + xpart exact_center + 0.4reduced_il; + ypart za = ypart exact_center = ypart zb + 1.5reduced_il; + draw za -- zb; + + %left-handed punctum + pickup pencircle xscaled reduced_slt yscaled reduced_il; + zc = exact_center + + (+0.4reduced_il, 0); + zd = exact_center + + (+0.0reduced_il, 0); + draw zc -- zd; + + %right-handed puncta as in do clef + draw_medicaea_do_clef( + exact_center + + (+1.1reduced_il + 1.25stafflinethickness, 0), + reduction); + + set_char_box(reduced_il#/2, 2.6reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_medicaea_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef") + draw_medicaea_fa_clef((0,0), .8); +fet_endchar; + + +%%%%%%%% +% +% +% +% Mensural Notation +% +% +% +brevis_wid# := 2 staff_space#; + +def draw_brevis(expr exact_center, reduction, small_width, small_height) = + % + % inspired by function draw_brevis of + % feta-bolletjes.mf + % + save reduced_slt, reduced_nht; + save stem_width, head_width; + save serif_size, serif_protrude; + save holeheight, beamheight; + + reduced_slt# = stafflinethickness# * reduction; + reduced_nht# = noteheight# * reduction; + stem_width# = 1.4 reduced_slt#; + if small_width: + head_width# = 0.5brevis_wid# * reduction; + else: + head_width# = brevis_wid# * reduction; + fi; + if small_height: + serif_size# = 0.64 reduced_slt#; + serif_protrude# = 0.96 serif_size#; + holeheight# = 3 reduced_slt#; + beamheight# = 0.32(reduced_nht# - holeheight#); + else: + serif_size# = 1.0 reduced_slt#; + serif_protrude# = 1.5 serif_size#; + holeheight# = 3 reduced_slt#; + beamheight# = 0.5(reduced_nht# - holeheight#); + fi; + define_pixels(reduced_slt); + define_pixels(stem_width); + define_pixels(head_width); + define_pixels(serif_size); + define_pixels(serif_protrude); + define_pixels(beamheight); + + penpos1(stem_width, 0); + penpos2(stem_width, 0); + penpos3(beamheight, 90); + penpos4(beamheight, 90); + penpos5(stem_width, 180); + + z1l = exact_center; + z2l = z1l + (0, -reduced_slt/2); + z3r = z2r + serif_size*(1,-1); + y4r = y3r; + x4l = x1l + head_width/2; + z5l = z3l + (-serif_size, -serif_protrude); + + penlabels(1,2,3,4,5); + fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right} + -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle; +enddef; + + +def draw_mensural_i_c_clef(expr exact_center, reduction) = + draw_brevis(exact_center, reduction, false, false); + + save reduced_il, reduced_slt; + save stem_width; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + + define_pixels(reduced_il); + define_pixels(reduced_slt); + define_pixels(stem_width); + + penpos6(stem_width, 0); + penpos7(stem_width, 0); + z6l = exact_center; + z7l = z6l + (0, -2reduced_il); + fill z6l -- z7l -- z7r -- z6r -- cycle; + penpos8(stem_width, 0); + penpos9(stem_width, 0); + z8l = z6l + (-3reduced_slt, 0); + z9l = z8l + (0, -2reduced_il); + fill z8l -- z9l -- z9r -- z8r -- cycle; + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*(ypart exact_center)); + addto currentpicture also currentpicture + xscaled -1 shifted (2x4l,0); + + set_char_box(0, 2head_width#, + 6reduced_slt#*reduction, 6reduced_slt#*reduction); +enddef; + + +fet_beginchar("mensural c clef", "mensural1_c", "mens1cclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_i_c_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural c clef", "mensural1_c_change", "cmens1cclef") + draw_mensural_i_c_clef((1.3 staff_space#,0), .8); +fet_endchar; + + +def draw_mensural_ii_c_clef(expr exact_center, reduction) = + draw_brevis(exact_center, reduction, false, true); + + save reduced_il, reduced_slt; + save stem_width, interline; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + interline# = staff_space#; + + define_pixels(reduced_il); + define_pixels(reduced_slt); + define_pixels(stem_width); + define_pixels(interline); + + penpos6(stem_width, 0); + penpos7(stem_width, 0); + z6l = exact_center + (0, -interline/2); + z7l = z6l + (0, -1.5reduced_il); + fill z6l -- z7l -- z7r -- z6r -- cycle; + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*(ypart exact_center) - interline); + addto currentpicture also currentpicture + yscaled -1 shifted (0, 4*(ypart exact_center)); + addto currentpicture also currentpicture + xscaled -1 shifted (2x4l,0); + + set_char_box(0, 2head_width#, + noteheight#*4*reduction, noteheight#*4*reduction); +enddef; + + +fet_beginchar("mensural c clef", "mensural2_c", "mens2cclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_ii_c_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural c clef", "mensural2_c_change", "cmens2cclef") + draw_mensural_ii_c_clef((1.3 staff_space#,0), .8); +fet_endchar; + + +def draw_mensural_iii_c_clef(expr exact_center, reduction) = + % inspired by Ockeghem, "Missa Prolationum", in: MGG, volume + % 9, table 94. + draw_mensural_ii_c_clef(exact_center, reduction); + + addto currentpicture also currentpicture + shifted (0, -interline); + + set_char_box(0, 2head_width#, + noteheight#*6*reduction, noteheight#*6*reduction); +enddef; + + +fet_beginchar("mensural c clef", "mensural3_c", "mens3cclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_iii_c_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural c clef", "mensural3_c_change", "cmens3cclef") + draw_mensural_iii_c_clef((0,0), .8); +fet_endchar; + +def draw_diamond(expr exact_center, reduction) = + save stem_width, reduced_il, reduced_nht, holeheight, beamheight; + save rh_height, rh_width; + + stem_width# = 1.4 reduced_slt#; + reduced_il# = staff_space# * reduction; + reduced_nht# = noteheight# * reduction; + holeheight# = 3 reduced_slt#; + beamheight# = 0.4(reduced_nht# - holeheight#); + + rh_height# = 1.2reduced_il#; + rh_width# / rh_height# = 0.58; % tan(30) + + define_pixels(beamheight); + define_pixels(stem_width); + define_pixels(rh_height); + define_pixels(rh_width); + + pickup pencircle + xscaled beamheight + yscaled stem_width + rotated 45; + + draw + exact_center + (-rh_width/2, 0) -- + exact_center + (0, rh_height/2) -- + exact_center + (+rh_width/2, 0) -- + exact_center + (0, -rh_height/2) -- + cycle; +enddef; + +def draw_mensural_f_clef(expr exact_center, reduction) = + % + % inspired by Gaspar van Weerbeke, "Virgo Maria" (1502), in: + % MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by + % Andr'e Campra, "Entr'ee des s'er'enades" (1710), in: MGG, + % volume 2, col. 1649 ("Contredanse"), fig. 2. + % + draw_brevis(exact_center, reduction, true, false); + + save reduced_il, reduced_slt; + save stem_width, interline; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + interline# = staff_space#; + + define_pixels(reduced_il); + define_pixels(reduced_slt); + define_pixels(stem_width); + define_pixels(interline); + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*(ypart exact_center)); + addto currentpicture also currentpicture + xscaled -1 shifted (2x4l,0); + + penpos6(stem_width, 0); + penpos7(stem_width, 0); + z6r = exact_center + (2x4l, 0); + z7r = z6r + (0, -4reduced_il); + fill z6l -- z7l -- z7r -- z6r -- cycle; + + draw_diamond(exact_center + + (1.6interline*reduction, interline/2), reduction); + %% some editions put a stem on top of the upper note head: + % penpos8(stem_width, 0); + % penpos9(stem_width, 0); + % z8l = exact_center + (1.6interline*reduction, interline*reduction); + % z9l = z8l + (0, 1.5interline*reduction); + % fill z8l -- z9l -- z9r -- z8r -- cycle; + + draw_diamond(exact_center + + (1.6interline*reduction, -interline/2), reduction); + penpos10(stem_width, 0); + penpos11(stem_width, 0); + z10r = exact_center + (1.6interline*reduction, -interline*reduction); + z11r = z10r + (0, -3.5interline*reduction); + fill z10l -- z11l -- z11r -- z10r -- cycle; + + set_char_box(0, 3head_width#, + 3.5noteheight#*reduction, 1.5noteheight#*reduction); +enddef; + + +fet_beginchar("mensural f clef", "mensural_f", "mensfclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_f_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef") + draw_mensural_f_clef((0,0), .8); +fet_endchar; + + +%%%%%%%% +% +% +% +% Hufnagel +% +% +% +def draw_hufnagel_do_clef(expr exact_center, reduction) = + % + % inspired by Graduale of Friedrich Zollner (1442), in: MGG, + % volume 9, col. 1413 ("Neustift"), fig. 1. + % + save reduced_il; + + reduced_il# = staff_space# * reduction; + + define_pixels(reduced_il); + + pickup pencircle + xscaled (0.60reduced_il) + yscaled (0.10reduced_il) + rotated 40; + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + za = exact_center + (+0.30reduced_il, +.45reduced_il); + zb = exact_center + (+0.20reduced_il, +.45reduced_il); + zc = exact_center + (-0.10reduced_il, +.60reduced_il); + zd = exact_center + (-0.40reduced_il, +.45reduced_il); + ze = exact_center + (-0.40reduced_il, -.45reduced_il); + zf = exact_center + (-0.20reduced_il, -.55reduced_il); + draw za .. zb .. zc -- zd -- ze -- zf; + + set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_hufnagel_do_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef") + draw_hufnagel_do_clef((1.3 staff_space#,0), .8); +fet_endchar; + + +def draw_hufnagel_fa_clef(expr exact_center, reduction) = + % + % inspired by Bamberger Manuscript (15th century), in: + % MGG, volume 2, table 59. + % + save reduced_il; + + reduced_il# = staff_space# * reduction; + + define_pixels(reduced_il); + + pickup pencircle + xscaled (0.60reduced_il) + yscaled (0.10reduced_il) + rotated 40; + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + za = exact_center + (+0.30reduced_il, +0.70reduced_il); + zb = exact_center + (+0.20reduced_il, +0.70reduced_il); + zc = exact_center + (-0.10reduced_il, +0.85reduced_il); + zd = exact_center + (-0.40reduced_il, +0.70reduced_il); + ze = exact_center + (-0.40reduced_il, -1.10reduced_il); + draw za .. zb .. zc -- zd -- ze; + + save zg, zh, zi, zj; + pair zg, zh, zi, zj; + + zg = exact_center + (+0.30reduced_il, -0.05reduced_il); + zh = exact_center + (+0.20reduced_il, -0.05reduced_il); + zi = exact_center + (-0.10reduced_il, +0.10reduced_il); + zj = exact_center + (-0.40reduced_il, -0.05reduced_il); + draw zg .. zh .. zi -- zj; + + set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_hufnagel_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef") + draw_hufnagel_fa_clef((0,0), .8); +fet_endchar; + + +def draw_hufnagel_do_fa_clef(expr exact_center, reduction) = + draw_hufnagel_do_clef(exact_center, reduction); + draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction); +enddef; + + +fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_hufnagel_do_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change", + "chufnageldofaclef") + draw_hufnagel_do_fa_clef((0,0), .8); +fet_endchar; + + fet_endgroup("clefs"); diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm index 2ee6e7a9cf..5bc4476531 100644 --- a/scm/documentation-lib.scm +++ b/scm/documentation-lib.scm @@ -81,12 +81,12 @@ (section 1 name) (texi-menu items-alist))) -(define (texi-file-head name file-name items-alist) +(define (texi-file-head name file-name top items-alist) (string-append "\input texinfo @c -*-texinfo-*-\n" "@settitle " name "\n@setfilename " file-name ".info" - (node "Top") + (node "Top") top "\n@top" (section 1 name) (texi-menu items-alist))) diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index 094195f846..cb5f5438d1 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -215,7 +215,7 @@ (direction . -1) (left-padding . 0.2) (right-padding . 0.4) - (meta . ,(element-description "Accidentals" accidentals-interface font-interface )) + (meta . ,(element-description "Accidentals" accidentals-interface font-interface side-position-interface)) )) (LineOfScore . ( diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm index fa6d30246c..d53207faba 100644 --- a/scm/generate-documentation.scm +++ b/scm/generate-documentation.scm @@ -34,12 +34,13 @@ (texi-file-head ;; we can't use (dir) and top if we're included by lilypond.tely - "LilyPond internals" name + "LilyPond internals" name "(lilypond.info)" '(("LilyPond interpretation contexts" . "Hierarchy and grouping of Engravers") ("LilyPond engravers" . "Engravers create Elements") ("LilyPond backend" . "Detailed description of all Elements"))) - doc) + doc + "\n@bye") out)) (newline (current-error-port)) diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make index ab527dba4d..5f43a858ba 100644 --- a/stepmake/stepmake/documentation-targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -10,20 +10,17 @@ local-web: footify: $(footify) $(sort $(wildcard $(outdir)/*.html out/*.html out-www/*.html)) -# what to do here? -ifeq (a,b) +INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES))) -$(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES) - $(MAKEINFO) --force -o $@ $(outdir)/topinfo.texinfo +INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" -f $(stepdir)/install-out.sub.make +localinstall: install-info +localuninstall: uninstall-info -INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-out.sub.make $@ - -localinstall: # $(INFO_FILES) +install-info: $(INFO_FILES) -$(INSTALL) -d $(infodir) - $(INFOINSTALL) -localuninstall: - $(INFOINSTALL) - -endif + $(INFOINSTALL) localinstall +uninstall-info: + $(INFOINSTALL) localuninstall + -rmdir $(infodir) \ No newline at end of file diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 42474ba6fc..796be65295 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -3,10 +3,10 @@ .SUFFIXES: .html .info .texi .texinfo $(outdir)/%.info: $(outdir)/%.texi - makeinfo --output=$@ $< + -$(MAKEINFO) --force --output=$@ $< $(outdir)/%.html: $(outdir)/%.texi - -makeinfo --force --output=$@ --html --no-headers $< + -$(MAKEINFO) --force --output=$@ --html --no-headers $< # we want footers even if website builds (or is built) partly $(footify) $@ -- 2.39.2