From effa4fd862bdf2188d4d94bf93b35a4ff0e31bee Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:35:03 +0000 Subject: [PATCH] lilypond-1.3.120 --- Documentation/bibliography/GNUmakefile | 4 +-- Documentation/header.html.in | 4 +-- Documentation/topdocs/INSTALL.texi | 25 ++++++++------ Documentation/topdocs/index.tely | 8 ++--- Documentation/user/development.itexi | 13 +++---- Documentation/user/lilypond.tely | 8 +++++ config.make.in | 2 ++ configure.in | 1 + debian/changelog | 38 ++++++++++++++++++-- debian/control | 6 ++-- debian/control.foka | 6 ++-- debian/copyright | 4 +-- debian/postinst | 7 ++-- debian/postrm | 1 - debian/rules | 17 +++------ input/test/american-chords.ly | 2 +- input/test/jazz-chords.ly | 2 +- lily/include/stem.hh | 1 + lily/property-engraver.cc | 2 -- lily/slur.cc | 2 +- lily/stem.cc | 20 +++++++++++ mf/feta-din12.mf | 9 +++++ mf/feta-din14.mf | 9 +++++ mf/feta-din17.mf | 9 +++++ mf/feta-din19.mf | 9 +++++ mf/feta-din9.mf | 7 ++++ scm/backend-documentation-lib.scm | 48 ++++++++++++++------------ scm/clef.scm | 1 + scm/documentation-lib.scm | 5 +++ scm/font.scm | 18 +++++----- scm/grob-description.scm | 1 + scripts/convert-ly.py | 2 +- scripts/lilypond-book.py | 6 ++-- stepmake/aclocal.m4 | 14 ++++++-- stepmake/stepmake/package.make | 6 ++-- 35 files changed, 219 insertions(+), 98 deletions(-) create mode 100644 mf/feta-din12.mf create mode 100644 mf/feta-din14.mf create mode 100644 mf/feta-din17.mf create mode 100644 mf/feta-din19.mf create mode 100644 mf/feta-din9.mf diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile index 2c193065be..b3fd5fc7a1 100644 --- a/Documentation/bibliography/GNUmakefile +++ b/Documentation/bibliography/GNUmakefile @@ -32,10 +32,8 @@ $(outdir)/%.bib: %.bib # we want footers even if website builds (or is built) partly $(MAKE) footify - -# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j $(outdir)/%.html: %.bib - -bib2html $< $@ + -$(BIBTEX2HTML) $(BIBTEX2HTML_FLAGS) $(footify) $@ localclean: diff --git a/Documentation/header.html.in b/Documentation/header.html.in index b920b95bfa..bb84e2874b 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -71,8 +71,8 @@ which substitutes some @AT_VARIABLES@ as well. RedHat i386
LinuxPPC
- Debian i386
- Debian PowerPC
+ Debian Stable
+ Debian Unstable
Windows Stable
Windows Testing

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index e76f50d0eb..aea898e5db 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -45,11 +45,11 @@ disk-space run configure with @code{--disable-debugging}. Although we recommend to use Unix, LilyPond is known to run on Windows NT/95/98 as well. See Section Windows NT/95,es. -@item EGCS 1.1 or newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/}. +@item A reasonable C++ compiler: EGCS 1.1, GCC 2.95.2 or newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/}. @item Python 1.5, -Check out -@uref{ftp://ftp.python.org} or @uref{ftp://ftp.cwi.nl/pub/python}. +Check out @uref{ftp://ftp.python.org} or +@uref{ftp://ftp.cwi.nl/pub/python}. @item GUILE 1.3.4 or newer, check out @uref{http://www.gnu.org/software/guile/guile.html,http://www.gnu.org/software/guile/guile.html}. @@ -101,7 +101,7 @@ following software @item A PostScript printer and/or viewer (such as Ghostscript) is strongly recommended. Xdvi will show all embedded PostScript too if you have Ghostscript installed. -@item GUILE 1.3.4, check out @uref{http://www.gnu.org/programs/guile.html,http://www.gnu.org/software/guile/} +@item GUILE 1.3.4, or newer. Check out @uref{http://www.gnu.org/programs/guile.html,http://www.gnu.org/software/guile/} @end itemize For running LilyPond successfully you have to help TeX and MetaFont find @@ -133,12 +133,12 @@ If you want to auto-generate Lily's website, you'll need some additional conversion tools. @itemize @bullet -@item xpmtoppm (from the Portable Bitmap Utilities) (For RedHat Linux +@item xpmtoppm (from the netpbm package: the Portable Bitmap Utilities) (For RedHat Linux users: it is included within the package libgr-progs). the original is at @uref{ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.p1.tar.gz,ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.p1.tar.gz} -@item pnmtopng, which is also in libgr-progs for RedHat. The original is +@item pnmtopng (also in libgr-progs for RedHat). The original is at @uref{ftp://swrinde.nde.swri.edu/pub/png/applications/pnmtopng-2.37.2.tar.gz,ftp://swrinde.nde.swri.edu/pub/png/applications/pnmtopng-2.37.2.tar.gz}.i @@ -146,12 +146,15 @@ The version of @file{pnmtopng} that is distributed with RedHat 5.1 and 5.2 contains a bug: pnmtopng is dynamically linked to the wrong version of libpng. -@item @uref{http://pertsserver.cs.uiuc.edu/~hull/bib2html,Bib2html}. - Which, in turn depends on man2html for proper installation. +@item @uref{http://www.lri.fr/~filliatr/ftp/bibtex2html/, Bibtex2html}, or +@uref{http://www.uni-koblenz.de/ag-ki/ftp/bib2html/, Bib2html}. +Bibtex2html is available in debian, while bib2html is in some rpm based +distributions. +Bib2html, in turn depends on man2html for proper installation. man2html can be had from @uref{http://askdonald.ask.uni-karlsruhe.de/hppd/hpux/Networking/WWW/Man2html-1.05,http://askdonald.ask.uni-karlsruhe.de/hppd/hpux/Networking/WWW/Man2html-1.05}. -The website will build without this utility, but you will not see our -hypertextified bibliography. +The website will build without bib converter utility, but you will not +see our hypertextified bibliography. @end itemize @@ -309,7 +312,7 @@ You can make the rpm by issuing @end example -Precompiled i386 RedHat RPMS are available from +Precompiled RedHat-7.0 i386 RPMS are available from @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/}. For compilation on a RedHat system you need these packages, diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 9372b7299b..269f4b3f60 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -104,11 +104,11 @@ Binaries are available, but are not updated for every version released. @item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/, RedHat i386} @item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/ppc, LinuxPPC} @item -@uref{ftp://ftp.debian.org/debian/dists/unstable/main/binary-i386/tex, -Debian GNU/Linux i386} +@uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond, +Debian GNU/Linux Stable} @item -@uref{ftp://ftp.debian.org/debian/dists/unstable/main/binary-powerpc/tex, -Debian GNU/Linux PowerPC} +@uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond1.3, +Debian GNU/Linux Unstable} @item @uref{http://home.austin.rr.com/jbr/jeff/lilypond/, Windows Stable} @item @uref{http://appel.lilypond.org/lilypond/gnu-windows, Windows Testing} diff --git a/Documentation/user/development.itexi b/Documentation/user/development.itexi index e01549b272..fa6b0dfb17 100644 --- a/Documentation/user/development.itexi +++ b/Documentation/user/development.itexi @@ -7,7 +7,7 @@ * Engraver:: * Music_iterator:: * Music:: -* Molecule:: Molecule are stand-alone descriptions of output +* Molecules:: Molecules are stand-alone descriptions of output @end menu @@ -143,7 +143,7 @@ grobs are created, and they are linked into a giant network of objects. This network of grobs forms the "specification" of the print problem. This problem is then solved: configurations, directions, dimensions, line breaks, etc. are calculated. Finally, the printing -description in the form of Molecules (@ref{Molecule}) is extracted from +description in the form of Molecules (@ref{Molecules}) is extracted from the network. These are then dumped into the output file @node Callbacks, , , Grobs @@ -324,7 +324,7 @@ so that spanner grob will only reference other grobs in the same line. @node Music, , , Internals -@node Molecule, , , Internals +@node Molecules, , , Internals The objective of any typesetting system is to put ink on paper in the right places. For LilyPond, this final stage is left to the TeX and the @@ -367,11 +367,12 @@ Molecule. @chapter Development @menu -* Coding standards:: +* CodingStyle:: * Making patches:: * Localisation:: @end menu +@node CodingStyle, , , Development @section CodingStyle - standards while programming for GNU LilyPond As a general rule, you should always try to continue computations, even @@ -600,7 +601,7 @@ files, doing a release. Use them. -@node Making patches, , , Top +@node Making patches, , , Development @unnumberedsec Track and distribute your code changes @@ -700,7 +701,7 @@ and don't forget to make automatically generated files: @end example -@node Localisation, , , Top +@node Localisation, , , Development @chapter Localisation - User messages in LilyPond diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 88b3b59f16..e2d9cfbd08 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -3,6 +3,14 @@ @settitle GNU LilyPond +@dircategory GNU music project +@direntry +@c ;; prepend GNU for dir, must be unique +* GNU LilyPond (lilypond). The GNU music typesetter. +@c * install-info: (texinfo)Invoking install-info. Update info/dir entries. +@c * texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents. +@end direntry + @titlepage @title GNU LilyPond diff --git a/config.make.in b/config.make.in index 97b7d70045..3f2ec353a2 100644 --- a/config.make.in +++ b/config.make.in @@ -47,6 +47,8 @@ COMPILEINFO = @COMPILEINFO@ DOTEXE = @DOTEXE@ INSTALL = @INSTALL@ BASH = @BASH@ +BIBTEX2HTML=@BIBTEX2HTML@ +BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ diff --git a/configure.in b/configure.in index c4cf39588c..db95517de9 100644 --- a/configure.in +++ b/configure.in @@ -36,6 +36,7 @@ AC_STEPMAKE_TEXMF AC_STEPMAKE_TEXMF_DIRS AC_STEPMAKE_GUILE AC_STEPMAKE_KPATHSEA +AC_STEPMAKE_BIBTEX2HTML dnl should check out -print dnl huh? diff --git a/debian/changelog b/debian/changelog index 672ef00d2a..8faf519015 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,49 @@ +lilypond1.3 (1.3.119-1) unstable; urgency=low + + * New upstream release. + * Merged debian/* fixes by upstream author Jan Nieuwenhuizen. Thanks! + - The lilypond info files are back! Partially fixed Bug#72233. + - Uses the new libguile9 instead of the old libguile6. + * Depends on libkpathsea3 instead of the old tetex-lib; Build-Depends + is also changed accordingly. Closes: Bug#79469, Bug#79837. + * Edited Documentation/user/development.itexi so that it builds + without error. + + -- Anthony Fok Fri, 22 Dec 2000 12:54:49 -0700 + lilypond1.3 (1.3.107) unstable; urgency=low * Fixed watch location. - * Hmm, what about ``add-log-mailing-address: "foka@debian.org"''? + * Local build, not uploaded to Debian. - -- Jan Nieuwenhuizen Mon, 13 Nov 2000 13:33:53 +0100 + -- Jan Nieuwenhuizen Mon, 13 Nov 2000 13:33:53 +0100 lilypond1.3 (1.3.103) unstable; urgency=low * Re-enabled info doc rules. + * Local build, not uploaded to Debian. -- Jan Nieuwenhuizen Sun, 5 Nov 2000 22:15:57 -0100 + +lilypond1.3 (1.3.99-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok Tue, 31 Oct 2000 00:48:20 -0700 + +lilypond1.3 (1.3.94-1) unstable; urgency=low + + * New upstream release. + + -- Anthony Fok Sun, 8 Oct 2000 12:36:52 -0600 + +lilypond1.3 (1.3.80.jcn1-1) unstable; urgency=low + + * New upstream release. + * s/tetex-devel/tetex-dev/ in Build-Depends. Thanks to bug report + filed by fellow developer Roman Hodek (closes: Bug#69772). + + -- Anthony Fok Sun, 27 Aug 2000 06:11:22 -0600 lilypond1.3 (1.3.79-1) unstable; urgency=low diff --git a/debian/control b/debian/control index f373046dc0..b692d81a21 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: lilypond1.3 -Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile9-dev, tetex-bin, tetex-devel, tetex-extra, flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1), groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13) +Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile9-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.1.1 +Standards-Version: 3.2.1 Package: lilypond1.3 Architecture: any @@ -18,7 +18,7 @@ Description: A program for printing sheet music. the GNU Project. . This is the developmental 1.3 branch of LilyPond. It is not intended for - use with stable projects, although 1.3.79 is most likely to be less buggy + use with stable projects, although 1.3.x is most likely to be less buggy and much more featureful than then the old "stable" 1.2.17. . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ diff --git a/debian/control.foka b/debian/control.foka index 3e6d361154..b692d81a21 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,9 +1,9 @@ Source: lilypond1.3 -Build-Depends: debhelper (>= 2.0.71), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin, tetex-devel, tetex-extra, flex (>= 2.5.4a-1), bison (>= 1:1.28-1), texinfo (>= 4.0-1), groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13) +Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile9-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.1.1 +Standards-Version: 3.2.1 Package: lilypond1.3 Architecture: any @@ -18,7 +18,7 @@ Description: A program for printing sheet music. the GNU Project. . This is the developmental 1.3 branch of LilyPond. It is not intended for - use with stable projects, although 1.3.79 is most likely to be less buggy + use with stable projects, although 1.3.x is most likely to be less buggy and much more featureful than then the old "stable" 1.2.17. . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ diff --git a/debian/copyright b/debian/copyright index 10af91522a..cde17209d5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,10 +5,10 @@ The development branch, lilypond1.3, is packaged separately on Tue, 9 Nov 1999 22:30:32 -0700 It was downloaded from - ftp://ftp.lilypond.org/pub/LilyPond/v1.3/lilypond-1.3.79.tar.gz + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/ It is also available at: - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/lilypond-1.3.79.tar.gz + ftp://ftp.lilypond.org/pub/LilyPond/v1.3/ For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ diff --git a/debian/postinst b/debian/postinst index 32ba2706e4..bf404ce2a2 100644 --- a/debian/postinst +++ b/debian/postinst @@ -18,12 +18,11 @@ TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'` echo " Running /usr/bin/mktexlsr $TEXMFMAIN..." /usr/bin/mktexlsr $TEXMFMAIN -#install-info --description='LilyPond, the GNU Project music typesetter' \ -# --section "Music" "Music" \ -# --quiet /usr/share/info/lilypond.info.gz +install-info --description='LilyPond, the GNU Project music typesetter' \ + --section "Music" "Music" \ + --quiet /usr/share/info/lilypond.info.gz #DEBHELPER# - echo echo " $pkg_name configuration completed." echo " Please read /usr/share/doc/lilypond1.3/README.Debian to get started." diff --git a/debian/postrm b/debian/postrm index 51f571a4f0..a6461fb272 100644 --- a/debian/postrm +++ b/debian/postrm @@ -15,7 +15,6 @@ std_TEXMFMAIN=/usr/share/texmf std_VARTEXFONTS=/var/spool/texmf #DEBHELPER# - TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'` : ${TEXMFMAIN:=$std_TEXMFMAIN} VARTEXFONTS=`/usr/bin/kpsewhich -expand-var '$VARTEXFONTS'` diff --git a/debian/rules b/debian/rules index b3aa3e6391..07880f23a6 100644 --- a/debian/rules +++ b/debian/rules @@ -11,15 +11,15 @@ package = lilypond1.3 SHELL = /bin/sh -r = debian/tmp -TMP = `pwd`/debian/tmp +r = debian/$(package) +TMP = `pwd`/$(r) d = usr/share/doc/$(package) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. -export DH_COMPAT=1 +export DH_COMPAT=2 build: build-stamp build-stamp: @@ -42,8 +42,6 @@ clean: dh_testroot rm -f build-stamp -$(MAKE) distclean - # Remove obsolete files which are still in the upstream tarball (1.3.42) - rm -f debian/control.in debian/doc-base debian/prerm dh_clean # Correct the owner of the out/dummy.dep files when built with sudo. @@ -82,6 +80,7 @@ binary-indep: build install # We have nothing to do by default. binary-arch: build install + dh_testversion 2 dh_testdir dh_testroot cp -av lilypond-mode.el lilypond-font-lock.el \ @@ -104,13 +103,7 @@ binary-arch: build install # dh_installcron # dh_installmanpages # dh_undocumented -# dh_installchangelogs -k CHANGES -# dh_installchangelogs CHANGES -# These give all errrors. -# Strange, in the maint-guide, it says add the upstream changelog name. -# Let's install as doc, then. --jcn - dh_installdocs CHANGES - dh_installchangelogs + dh_installchangelogs -k CHANGES dh_link dh_strip dh_compress diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 31a5c3cf37..82ad35fd2c 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -14,7 +14,7 @@ chord::names-alist-american)) chord = \notes\transpose c''\chords{ - \property Chordnames.Chordname \override #'style = #'american + \property ChordNames.ChordName \override #'style = #'american c % Major triad cs:m % Minor triad df:m5- % Diminished triad diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index f1fc994149..fefa24587a 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -12,7 +12,7 @@ % chord = \notes\transpose c''\chords{ -\property Chordnames.Chordname \override #'style = #'jazz +\property ChordNames.ChordName \override #'style = #'jazz % major chords c c:6 % 6 = major triad with added sixth diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 64d55f2bc2..46ad72c2f6 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -42,6 +42,7 @@ public: static Molecule flag (Grob*); DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); DECLARE_SCHEME_CALLBACK(dim_callback, (SCM smob, SCM axis)); + DECLARE_SCHEME_CALLBACK (height, (SCM,SCM)); static bool has_interface (Grob*); static void set_interface (Grob*); diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 8ba9d331be..4ece8f3919 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -142,13 +142,11 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) SCM errport = scm_current_error_port (); SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); SCM type_name = gh_call1 (typefunc, type_p); -#if 0 warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s", ly_symbol2string (prop_sym).ch_C (), ly_scm2string (type_name).ch_C (), ly_scm2string (ly_write2scm (val)).ch_C (), ly_scm2string (ly_type (val)).ch_C ())); -#endif scm_puts ("\n", errport); } } diff --git a/lily/slur.cc b/lily/slur.cc index 901c8fc417..425a3b8809 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -501,7 +501,7 @@ Slur::set_spacing_rods (SCM smob) /* ugh ? */ -MAKE_SCHEME_CALLBACK(Slur,height,2); +MAKE_SCHEME_CALLBACK (Slur, height, 2); SCM Slur::height (SCM smob, SCM ax) { diff --git a/lily/stem.cc b/lily/stem.cc index a69f476f93..5824cc967a 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -377,6 +377,26 @@ Stem::before_line_breaking (SCM smob) } +/* + ugh. + When in a beam with tuplet brackets, brew_mol is called early, + caching a wrong value. + */ +MAKE_SCHEME_CALLBACK (Stem, height, 2); +SCM +Stem::height (SCM smob, SCM ax) +{ + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert ( a == Y_AXIS); + + SCM mol = me->get_uncached_molecule (); + Interval iv; + if (mol != SCM_EOL) + iv = unsmob_molecule (mol)->extent (a); + return ly_interval2scm (iv); +} + /** set stem directions for hinting the optical spacing correction. diff --git a/mf/feta-din12.mf b/mf/feta-din12.mf new file mode 100644 index 0000000000..f444107455 --- /dev/null +++ b/mf/feta-din12.mf @@ -0,0 +1,9 @@ +% feta-din12.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=12; % feta16 = 16pt + +input feta-din; + +end. + diff --git a/mf/feta-din14.mf b/mf/feta-din14.mf new file mode 100644 index 0000000000..178c19a613 --- /dev/null +++ b/mf/feta-din14.mf @@ -0,0 +1,9 @@ +% feta-din14.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=14; % feta20 = 20pt + +input feta-din; + +end. + diff --git a/mf/feta-din17.mf b/mf/feta-din17.mf new file mode 100644 index 0000000000..516f9c1048 --- /dev/null +++ b/mf/feta-din17.mf @@ -0,0 +1,9 @@ +% feta-din17.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=17; % feta23 = 23pt + +input feta-din; + +end. + diff --git a/mf/feta-din19.mf b/mf/feta-din19.mf new file mode 100644 index 0000000000..83464207bb --- /dev/null +++ b/mf/feta-din19.mf @@ -0,0 +1,9 @@ +% feta-din19.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=19; % feta26 = 26pt + +input feta-din; + +end. + diff --git a/mf/feta-din9.mf b/mf/feta-din9.mf new file mode 100644 index 0000000000..69bc57513f --- /dev/null +++ b/mf/feta-din9.mf @@ -0,0 +1,7 @@ +% feta-din9.mf +% part of LilyPond's pretty-but-neat music font + +design_size:=9; % feta13 = 13pt + +input feta-din.mf; + diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm index b9623477b8..d33d70bca3 100644 --- a/scm/backend-documentation-lib.scm +++ b/scm/backend-documentation-lib.scm @@ -120,49 +120,53 @@ names)) doc))) -;; testin.. -- how to do this -(eval-string (ly-gulp-file "interface-description.scm")) -(define xinterface-description-alist - `( - (general-grob . ,general-grob-interface) - (beam . ,beam-interface) - (clef . ,clef-interface) - (slur . ,slur-interface) - )) - -;; burp, need these for running outside of LilyPond -(if #f +;; ugh, this works standalone, but not anymore with lily +(if (not (defined? 'standalone)) (begin (debug-enable 'backtrace) + (load "standalone.scm") + (define (number-pair? x) (and (pair? x) (number? (car x)) (number? (cdr x)))) - (define (ly-gulp-file x) "") (define (ly-grob? x) #f) (define (ly-input-location? x) #f) (define (dir? x) #f) (define (moment? x) #f) - (load "lily.scm"))) + )) (use-modules (ice-9 string-fun)) (define interface-file-str (string-append (ly-gulp-file "interface-description.scm") "\n(define ")) -(define (list-interface-names) +;;(define (list-interface-names) +(define (ugh-standalone-list-interface-names) (let* ((text interface-file-str) - (r (make-regexp - "\n[(](define *([a-z-]*-interface)*)*[^\n]*")) - (t (regexp-substitute/global #f r text 2 " " 'post)) - (ugh (regexp-substitute/global #f "#f *" t 'pre 'post)) + (t1 (regexp-substitute/global #f "\n" text 'pre 'post)) + (t (regexp-substitute/global #f "[^\t ]*[ \t]([a-z-]+interface)" + t1 1 " " 'post)) + (ugh (regexp-substitute/global #f " .*" t 'pre 'post)) (l (separate-fields-discarding-char #\ ugh list))) (reverse (cdr (reverse l))))) +(if standalone + (begin + (display "(define (list-interface-names) '") + (write (ugh-standalone-list-interface-names)) + (display ")") + (exit 0))) + +;; Ugh +;; This list is generated manually, by doing: +;; guile +;; guile> (load "backend-documentation-lib.scm") +;; For some reason, this can't be generated when lilypond is loaded; +;; the regexp stuff behaves weird. +(define (list-interface-names) '("general-grob-interface" "general-grob-interface" "beam-interface" "clef-interface" "axis-group-interface" "note-column-interface" "stem-interface" "slur-interface" "side-position-interface" "accidentals-interface" "line-of-score-interface" "note-head-interface" "note-name-interface" "rhythmic-head-interface" "rest-interface" "tuplet-bracket-interface" "align-interface" "aligned-interface" "align-interface" "break-aligned-interface" "chord-name-interface" "time-signature-interface" "bar-line-interface" "hairpin-interface" "arpeggio-interface" "note-collision-interface" "custos-interface" "dot-interface" "font-interface" "text-interface" "dot-column-interface" "dynamic-interface" "finger-interface" "separation-spanner-interface" "text-script-interface" "grace-alignment-interface" "hara-kiri-group-interface" "line-spanner-interface" "lyric-hyphen-interface" "key-signature-interface" "lyric-extender-interface" "lyric-syllable-interface" "mark-interface" "multi-measure-rest-interface" "font-interface" "paper-column-interface" "spaceable-element-interface" "rest-collision-interface" "script-interface" "script-column-interface" "spacing-spanner-interface" "staff-symbol-interface" "stem-tremolo-interface" "separation-item-interface" "sustain-pedal-interface" "system-start-delimiter-interface" "text-spanner-interface" "tie-interface" "tie-column-interface" "volta-bracket-interface")) - - -(eval (ly-gulp-file "interface-description.scm")) +(eval-string (ly-gulp-file "interface-description.scm")) (define interface-description-alist (map (lambda (x) (cons (string->symbol x) (eval-string x))) diff --git a/scm/clef.scm b/scm/clef.scm index f1504ac46f..666b5bae6e 100644 --- a/scm/clef.scm +++ b/scm/clef.scm @@ -19,6 +19,7 @@ ("bass" . ("clefs-F" 2 0)) ("F" . ( "clefs-F" 2 0)) ("subbass" . ("clefs-F" 4 0)) + ("none" . ("" 0 0)) ;; should move mensural stuff to separate file? ("vaticana_do1" . ("clefs-vaticana_do" -1 0)) diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm index 0593eac0a9..317fc486db 100644 --- a/scm/documentation-lib.scm +++ b/scm/documentation-lib.scm @@ -120,6 +120,11 @@ Add a ref if REF is set "\\input texinfo @c -*-texinfo-*-" "\n@setfilename " file-name ".info" "\n@settitle " name + "\n@dircategory GNU music project" + "\n@direntry" + ;; prepend GNU for dir, must be unique + "\n* GNU " name " (" file-name "). " name "." + "\n@end direntry" (node "Top") top "\n@top" (texi-section 1 name #f) diff --git a/scm/font.scm b/scm/font.scm index 06ddc26b7f..b77414dc4f 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -108,15 +108,15 @@ ((-2 medium upright braces feta-braces 13) . "feta-braces13") ((-3 medium upright braces feta-braces 11) . "feta-braces11") - ((3 bold italic dynamic feta-din 13) . "feta-din13") - ((2 bold italic dynamic feta-din 13) . "feta-din13") - ((1 bold italic dynamic feta-din 11) . "feta-din11") - ((0 bold italic dynamic feta-din 10) . "feta-din10") - ((-1 bold italic dynamic feta-din 8) . "feta-din8") - ((-2 bold italic dynamic feta-din 7) . "feta-din7") - ((-3 bold italic dynamic feta-din 6) . "feta-din6") - ((-4 bold italic dynamic feta-din 5) . "feta-din5") - ((-5 bold italic dynamic feta-din 4) . "feta-din4") + ((3 bold italic dynamic feta-din 19) . "feta-din19") + ((2 bold italic dynamic feta-din 19) . "feta-din19") + ((1 bold italic dynamic feta-din 17) . "feta-din17") + ((0 bold italic dynamic feta-din 14) . "feta-din14") + ((-1 bold italic dynamic feta-din 12) . "feta-din12") + ((-2 bold italic dynamic feta-din 9) . "feta-din9") + ((-3 bold italic dynamic feta-din 8) . "feta-din8") + ((-4 bold italic dynamic feta-din 7) . "feta-din7") + ((-5 bold italic dynamic feta-din 6) . "feta-din6") ((2 medium upright music feta 26) . "feta26") ((1 medium upright music feta 23) . "feta23") diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 9d7cd37e50..2f3a0d5f00 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -494,6 +494,7 @@ (default-neutral-direction . 1) (X-offset-callbacks . (,Stem::off_callback)) (X-extent-callback . ,Stem::dim_callback) + (Y-extent-callback . ,Stem::height) (meta . ,(grob-description "Stem" stem-interface font-interface)) )) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index e132f6fb71..01e5b31020 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -576,7 +576,7 @@ if 1: def conv (str): str = re.sub ('LyricVoice', 'LyricsVoice', str) # old fix - str = re.sub ('ChordNames*.ChordNames*', 'Chordnames.Chordname', str) + str = re.sub ('Chord[Nn]ames*.Chord[Nn]ames*', 'ChordNames.ChordName', str) return str conversions.append (((1,3,113), conv, 'LyricVoice -> LyricsVoice')) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 0634dad0ab..bd0e3c822e 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1015,9 +1015,9 @@ def fix_epswidth (chunks): for c in chunks: if c[0] == 'lilypond' and 'eps' in c[2]: body = re.sub (r"""\\lilypondepswidth{(.*?)}""", find_eps_dims, c[1]) - # why do we junk opts, todo, basename? - new_chunk = (('lilypond', body)) - newchunks.append (c) + newchunks.append(('lilypond', body, c[2], c[3], c[4])) + else: + newchunks.append (c) return newchunks diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 724a91b40b..0de4fdda72 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,8 +1,18 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in +AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ + AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) + if test "$BIBTEX2HTML" = "bib2html"; then + BIBTEX2HTML_FLAGS='$< $(@)' + else + BIBTEX2HTML_FLAGS='-o $(@D)/$(*F) $<' + fi + AC_SUBST(BIBTEX2HTML) + AC_SUBST(BIBTEX2HTML_FLAGS) +]) + + AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining OPTIMIZE="" diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index 0d525494c3..39161ff2f7 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -10,12 +10,12 @@ deb: # ln -sf debian DEBIAN; ) # su -c 'dpkg-deb -b $(depth)/../debian/$(distname)' # urg, why aren't there any decent manual pages for dpkg or rpm? - su -c '(cd $(depth)/../debian; \ + (cd $(depth)/../debian; \ rm -rf $(distname) $(distname).deb;\ tar xz -C $(depth)/../debian -f $(release-dir)/$(distname).tar.gz; \ cd $(distname);\ - dpkg-buildpackage -b; \ - )' + dpkg-buildpackage -b -rfakeroot; \ + ) makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%)))) -- 2.39.5