Update to lilypond-2.22.2.

print/lilypond/Makefile

@@ -1,49 +1,53 @@
 COMMENT-main=		text based music notation system
 COMMENT-docs=		lilypond documentation
 
-VERSION=		2.18.2
+VERSION=		2.22.2
 DISTNAME=		lilypond-${VERSION}
 DISTNAME-docs=		${DISTNAME}-1.documentation
 PKGNAME-main=		lilypond-${VERSION}
 PKGNAME-docs=		lilypond-docs-${VERSION}
 CATEGORIES=		print
-REVISION-main=		4
-REVISION-docs=		2
 
-DISTFILES=		${DISTNAME}.tar.gz ${DISTNAME-docs}.tar.bz2:0
-EXTRACT_ONLY=		${DISTNAME}.tar.gz
+URW_V=			20200910
+DISTFILES=		${DISTNAME}.tar.gz ${DISTNAME-docs}.tar.bz2:0 urw-base35-fonts-${URW_V}.tar.gz:1
+EXTRACT_ONLY=		${DISTNAME}.tar.gz urw-base35-fonts-${URW_V}.tar.gz
 
 MULTI_PACKAGES=		-main -docs
 
-HOMEPAGE=		http://lilypond.org/web/
+HOMEPAGE=		https://lilypond.org/
 
 MAINTAINER=		Matthias Kilian <kili@openbsd.org>
 
-# GPLv3+
+# GPLv3+, for urw-base35-fonts: AGPLv3 with font exception
 PERMIT_PACKAGE=	Yes
 
 COMPILER =		base-clang ports-gcc base-gcc
 
-MASTER_BASE=		http://download.linuxaudio.org/lilypond/
-MASTER_SITES=		${MASTER_BASE}sources/v${VERSION:C,\.[0-9]*$,,}/
+MASTER_BASE=		https://lilypond.org/download/
+MASTER_SITES=		${MASTER_BASE}source/v${VERSION:C,\.[0-9]*$,,}/
 MASTER_SITES0=		${MASTER_BASE}binaries/documentation/
+MASTER_SITES1=		https://github.com/ArtifexSoftware/urw-base35-fonts/archive/${URW_V}/
 
 # We don't use the standard autoconf mechanisms from the ports
 # system, because it doesn't work for lilypond. Instead, we use
 # autogen.sh and add AUTOCONV_VERSION to the environment.
-AUTOCONF_VERSION=	2.63
+AUTOCONF_VERSION=	2.69
 CONFIGURE_STYLE=	gnu
 CONFIGURE_SCRIPT=	autogen.sh
 CONFIGURE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 			BASH=/bin/sh \
 			GREP=/usr/bin/grep \
 			LDFLAGS=-L${LOCALBASE}/lib
+TEXGYREDIR=		${LOCALBASE}/share/texmf-dist/fonts/opentype/public/tex-gyre
+URWDIR=			${WRKDIR}/urw-base35-fonts-${URW_V}/fonts
 CONFIGURE_ARGS+=	--disable-debugging \
 			--disable-documentation \
 			--disable-optimising \
 			--disable-pipe \
 			--with-ncsb-dir=${LOCALBASE}/share/fonts/ghostscript \
-			--with-python-include=${MODPY_INCDIR}
+			--with-python-include=${MODPY_INCDIR} \
+			--with-texgyre-dir=${TEXGYREDIR} \
+			--with-urwotf-dir=${URWDIR}
 USE_GMAKE=		Yes
 MAKE_FILE=		GNUmakefile
 
@@ -56,17 +60,19 @@ WANTLIB-docs =
 LIB_DEPENDS-docs=
 RUN_DEPENDS-docs=
 
-WANTLIB-main=		c fontconfig freetype glib-2.0 gmp gobject-2.0 \
-			guile intl ltdl m pango-1.0 pangoft2-1.0 pthread z \
+WANTLIB-main=		c fontconfig freetype gc glib-2.0 gobject-2.0 \
+			guile-2.2 harfbuzz intl m pango-1.0 \
+			pangoft2-1.0 pthread \
 			${COMPILER_LIBCXX}
 MODULES=		lang/python
-MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}
 LIB_DEPENDS-main=	devel/gettext,-runtime \
-			lang/guile \
+			lang/guile2 \
 			devel/glib2 \
 			devel/pango
 RUN_DEPENDS=		print/ghostscript/gnu
 BUILD_DEPENDS= 		print/mftrace \
+			print/texlive/texmf \
 			devel/bison \
 			devel/gettext,-tools \
 			archivers/bzip2 \

print/lilypond/distinfo

@@ -1,4 +1,6 @@
-SHA256 (lilypond-2.18.2-1.documentation.tar.bz2) = 49dHQgBEjJZ3klzPT5CYLKh+j3ieFDr9xr85fw42i5k=
-SHA256 (lilypond-2.18.2.tar.gz) = Mp1zN2Wwunvhh4rj9Ffbu4dcwoQNK3WvSvxIyUVPugc=
-SIZE (lilypond-2.18.2-1.documentation.tar.bz2) = 231545058
-SIZE (lilypond-2.18.2.tar.gz) = 16027977
+SHA256 (lilypond-2.22.2-1.documentation.tar.bz2) = pWH19A4BrsytIZcxUIcP3moC8yU81frhj12ySZ/o8FI=
+SHA256 (lilypond-2.22.2.tar.gz) = 3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74=
+SHA256 (urw-base35-fonts-20200910.tar.gz) = 4Nm38RiF/f3EmH8GsqoFZa0qSvUrIuXr954amKvQri8=
+SIZE (lilypond-2.22.2-1.documentation.tar.bz2) = 200674488
+SIZE (lilypond-2.22.2.tar.gz) = 18034586
+SIZE (urw-base35-fonts-20200910.tar.gz) = 11190093

print/lilypond/patches/patch-aclocal_m4

@@ -1,24 +1,16 @@
-- Fix version comparision for large version numbers.
+Fix version check of fontforge.
 
-- Allow older (buggy?) metapost.
-
---- aclocal.m4.orig	Mon Mar 17 16:29:16 2014
-+++ aclocal.m4	Thu May 22 20:15:38 2014
-@@ -116,7 +116,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION, [
-     num=`STEPMAKE_NUMERIC_VERSION($ver)`
-     req=`STEPMAKE_NUMERIC_VERSION($3)`
-     AC_MSG_RESULT([$ver])
--    if test "$num" -lt "$req"; then
-+    if test $(dc -e "[[1]] sa 0 $num $req <a p") = 0; then
- 	STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
-     fi
-     vervar="`echo $1 | tr '[a-z]' '[A-Z]'`_VERSION"
-@@ -1171,7 +1171,7 @@ AC_DEFUN(STEPMAKE_TEXMF, [
- 	ver=`STEPMAKE_GET_VERSION($METAPOST)`
- 	num=`STEPMAKE_NUMERIC_VERSION($ver)`
- 	# Avoid buggy metapost versions: 1.600 <= x < 1.803
--	if test "$num" -ge "1600000" -a "$num" -lt "1803000"; then
-+	if test "$num" -ge "1600000" -a "$num" -lt "1801000"; then
-             STEPMAKE_ADD_ENTRY($1, ["mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"])
- 	fi
+Index: aclocal.m4
+--- aclocal.m4.orig
++++ aclocal.m4
+@@ -61,9 +61,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+         eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
+-        | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
+-        | head -n 1 \
+-        | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
++        | sed -ne 's/^libfontforge //p'\`\"
      fi
+     echo "$_ver"
+     changequote([, ])#dnl

print/lilypond/patches/patch-configure_ac

@@ -1,27 +1,15 @@
-# Builds fine with gcc 3.3.5 and without makeinfo (unless you try to
-# build the documentation).
+# Builds fine without makeinfo (unless you try to build the
+# documentation).
 
---- configure.ac.orig	Mon Mar 17 16:29:16 2014
-+++ configure.ac	Thu May 22 19:53:41 2014
-@@ -109,10 +109,10 @@ STEPMAKE_PYTHON(REQUIRED, 2.4, 3.0)
- # __GNUC__, but that macro now unofficially means "the compiler
- # supports the GNU C extensions" -- the intel C compiler and clang
- # both support __GNUC__!
--STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4)
-+STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.3)
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -382,7 +382,7 @@ if test "$USE_EXTRACTPDFMARK" != "yes"; then
+         [" can significantly reduce the size of the final PDF files.)"])
+ fi
  
- STEPMAKE_CXX(REQUIRED)
--STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4)
-+STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.3)
- STEPMAKE_GXXCODEGENBUG
- STEPMAKE_CXXTEMPLATE
- STEPMAKE_STL_DATA_METHOD
-@@ -226,7 +226,7 @@ fi
- 
- STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
- 
--STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.11)
- STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
- STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
- STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
+-STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 6.1)
++STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 6.1)
+ TEXI2HTML_REQUIRED=$DOCUMENTATION_REQUIRED
+ if test "$ENABLE_TEXI2HTML" = "no"; then
+   TEXI2HTML_REQUIRED=OPTIONAL

print/lilypond/patches/patch-lily_include_open-type-font_hh

@@ -1,7 +1,8 @@
---- lily/include/open-type-font.hh.orig	Tue May 13 10:13:58 2014
-+++ lily/include/open-type-font.hh	Tue May 13 10:15:05 2014
-@@ -23,8 +23,8 @@
- #include "font-metric.hh"
+Index: lily/include/open-type-font.hh
+--- lily/include/open-type-font.hh.orig
++++ lily/include/open-type-font.hh
+@@ -25,8 +25,8 @@
+ #include <unordered_map>
  
  Index_to_charcode_map make_index_to_charcode_map (FT_Face face);
 -void get_unicode_name (char *s, FT_ULong code);
@@ -9,5 +10,5 @@
 +void get_unicode_name (char *s, size_t size, FT_ULong code);
 +void get_glyph_index_name (char *s, size_t size, FT_ULong code);
  
- class Open_type_font : public Font_metric
+ struct Preinit_Open_type_font
  {

print/lilypond/patches/patch-lily_music-iterator_cc

@@ -1,11 +1,11 @@
---- lily/music-iterator.cc.orig	Tue May 13 10:19:28 2014
-+++ lily/music-iterator.cc	Tue May 13 10:19:59 2014
-@@ -224,7 +224,7 @@ Music_iterator::print_smob (SCM sm, SCM port, scm_prin
+Index: lily/music-iterator.cc
+--- lily/music-iterator.cc.orig
++++ lily/music-iterator.cc
+@@ -199,6 +199,7 @@ Music_iterator::print_smob (SCM port, scm_print_state 
    char s[1000];
  
-   Music_iterator *iter = unsmob_iterator (sm);
--  sprintf (s, "#<%s>", iter->class_name ());
-+  snprintf (s, sizeof(s), "#<%s>", iter->class_name ());
+   sprintf (s, "#<%s>", class_name ());
++  snprintf (s, sizeof(s), "#<%s>", class_name ());
    scm_puts (s, port);
    return 1;
  }

print/lilypond/patches/patch-lily_pango-font_cc

@@ -1,6 +1,7 @@
---- lily/pango-font.cc.orig	Tue May 13 10:22:35 2014
-+++ lily/pango-font.cc	Tue May 13 10:26:47 2014
-@@ -116,19 +116,21 @@ Pango_font::derived_mark () const
+Index: lily/pango-font.cc
+--- lily/pango-font.cc.orig
++++ lily/pango-font.cc
+@@ -169,19 +169,21 @@ Pango_font::derived_mark () const
  
  void
  get_glyph_index_name (char *s,
@@ -25,7 +26,7 @@
  }
  
  Box
-@@ -265,7 +267,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem 
+@@ -317,7 +319,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem 
            && cmap->find (pg) != cmap->end ())
          {
            FT_ULong char_code = cmap->find (pg)->second;
@@ -34,7 +35,7 @@
          }
  
        if (glyph_name[0] == '\0' && has_glyph_names)
-@@ -281,7 +283,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem 
+@@ -333,7 +335,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem 
  
        if (glyph_name[0] == '\0' && is_ttf)
          // Access by glyph index directly.

print/lilypond/patches/patch-lily_ttf_cc

@@ -1,6 +1,7 @@
---- lily/ttf.cc.orig	Tue May 13 10:25:46 2014
-+++ lily/ttf.cc	Tue May 13 10:26:24 2014
-@@ -439,7 +439,7 @@ print_trailer (void *out,
+Index: lily/ttf.cc
+--- lily/ttf.cc.orig
++++ lily/ttf.cc
+@@ -427,7 +427,7 @@ print_trailer (std::ostream &stream, FT_Face face)
        if (!glyph_name[0] && ic_map.find (i) != ic_map.end ())
          {
            FT_ULong ucode = ic_map[i];
@@ -9,7 +10,7 @@
          }
  
        if (i == 0)
-@@ -448,7 +448,7 @@ print_trailer (void *out,
+@@ -436,7 +436,7 @@ print_trailer (std::ostream &stream, FT_Face face)
          glyph_name[0] = '\0';
  
        if (!glyph_name[0])

print/lilypond/pkg/PLIST-main

@@ -9,10 +9,6 @@ bin/lilypond-invoke-editor
 bin/lilysong
 bin/midi2ly
 bin/musicxml2ly
-lib/lilypond/
-lib/lilypond/${VERSION}/
-lib/lilypond/${VERSION}/python/
-lib/lilypond/${VERSION}/python/midi.so
 @man man/man1/abc2ly.1
 @man man/man1/convert-ly.1
 @man man/man1/etf2ly.1
@@ -23,8 +19,6 @@ lib/lilypond/${VERSION}/python/midi.so
 @man man/man1/lilysong.1
 @man man/man1/midi2ly.1
 @man man/man1/musicxml2ly.1
-share/emacs/
-share/emacs/site-lisp/
 share/emacs/site-lisp/lilypond-font-lock.el
 share/emacs/site-lisp/lilypond-indent.el
 share/emacs/site-lisp/lilypond-init.el
@@ -35,11 +29,21 @@ share/emacs/site-lisp/lilypond-words.el
 share/lilypond/
 share/lilypond/${VERSION}/
 share/lilypond/${VERSION}/fonts/
+share/lilypond/${VERSION}/fonts/00-lilypond-fonts.conf
+share/lilypond/${VERSION}/fonts/99-lilypond-fonts.conf
 share/lilypond/${VERSION}/fonts/otf/
-share/lilypond/${VERSION}/fonts/otf/CenturySchL-Bold.otf
-share/lilypond/${VERSION}/fonts/otf/CenturySchL-BoldItal.otf
-share/lilypond/${VERSION}/fonts/otf/CenturySchL-Ital.otf
-share/lilypond/${VERSION}/fonts/otf/CenturySchL-Roma.otf
+share/lilypond/${VERSION}/fonts/otf/C059-BdIta.otf
+share/lilypond/${VERSION}/fonts/otf/C059-Bold.otf
+share/lilypond/${VERSION}/fonts/otf/C059-Italic.otf
+share/lilypond/${VERSION}/fonts/otf/C059-Roman.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusMonoPS-Bold.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusMonoPS-BoldItalic.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusMonoPS-Italic.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusMonoPS-Regular.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusSans-Bold.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusSans-BoldItalic.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusSans-Italic.otf
+share/lilypond/${VERSION}/fonts/otf/NimbusSans-Regular.otf
 share/lilypond/${VERSION}/fonts/otf/emmentaler-11.otf
 share/lilypond/${VERSION}/fonts/otf/emmentaler-13.otf
 share/lilypond/${VERSION}/fonts/otf/emmentaler-14.otf
@@ -49,10 +53,25 @@ share/lilypond/${VERSION}/fonts/otf/emmentaler-20.otf
 share/lilypond/${VERSION}/fonts/otf/emmentaler-23.otf
 share/lilypond/${VERSION}/fonts/otf/emmentaler-26.otf
 share/lilypond/${VERSION}/fonts/otf/emmentaler-brace.otf
+share/lilypond/${VERSION}/fonts/otf/texgyrecursor-bold.otf
+share/lilypond/${VERSION}/fonts/otf/texgyrecursor-bolditalic.otf
+share/lilypond/${VERSION}/fonts/otf/texgyrecursor-italic.otf
+share/lilypond/${VERSION}/fonts/otf/texgyrecursor-regular.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreheros-bold.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreheros-bolditalic.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreheros-italic.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreheros-regular.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreschola-bold.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreschola-bolditalic.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreschola-italic.otf
+share/lilypond/${VERSION}/fonts/otf/texgyreschola-regular.otf
 share/lilypond/${VERSION}/fonts/source/
+share/lilypond/${VERSION}/fonts/source/common-modules-and-initialization.mf
+share/lilypond/${VERSION}/fonts/source/debugging-settings.mf
+share/lilypond/${VERSION}/fonts/source/declare-autometric-parameters.mf
 share/lilypond/${VERSION}/fonts/source/feta-accidentals.mf
 share/lilypond/${VERSION}/fonts/source/feta-accordion.mf
-share/lilypond/${VERSION}/fonts/source/feta-alphabet.mf
+share/lilypond/${VERSION}/fonts/source/feta-alphabet-generic.mf
 share/lilypond/${VERSION}/fonts/source/feta-alphabet11.mf
 share/lilypond/${VERSION}/fonts/source/feta-alphabet13.mf
 share/lilypond/${VERSION}/fonts/source/feta-alphabet14.mf
@@ -61,6 +80,7 @@ share/lilypond/${VERSION}/fonts/source/feta-alphabet18.mf
 share/lilypond/${VERSION}/fonts/source/feta-alphabet20.mf
 share/lilypond/${VERSION}/fonts/source/feta-alphabet23.mf
 share/lilypond/${VERSION}/fonts/source/feta-alphabet26.mf
+share/lilypond/${VERSION}/fonts/source/feta-arrow.mf
 share/lilypond/${VERSION}/fonts/source/feta-arrowheads.mf
 share/lilypond/${VERSION}/fonts/source/feta-autometric.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces-a.mf
@@ -70,6 +90,7 @@ share/lilypond/${VERSION}/fonts/source/feta-braces-d.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces-e.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces-f.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces-g.mf
+share/lilypond/${VERSION}/fonts/source/feta-braces-generic.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces-h.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces-i.mf
 share/lilypond/${VERSION}/fonts/source/feta-braces.mf
@@ -87,8 +108,9 @@ share/lilypond/${VERSION}/fonts/source/feta-flags18.mf
 share/lilypond/${VERSION}/fonts/source/feta-flags20.mf
 share/lilypond/${VERSION}/fonts/source/feta-flags23.mf
 share/lilypond/${VERSION}/fonts/source/feta-flags26.mf
-share/lilypond/${VERSION}/fonts/source/feta-generic.mf
+share/lilypond/${VERSION}/fonts/source/feta-flats.mf
 share/lilypond/${VERSION}/fonts/source/feta-macros.mf
+share/lilypond/${VERSION}/fonts/source/feta-naturals.mf
 share/lilypond/${VERSION}/fonts/source/feta-noteheads-generic.mf
 share/lilypond/${VERSION}/fonts/source/feta-noteheads.mf
 share/lilypond/${VERSION}/fonts/source/feta-noteheads11.mf
@@ -100,17 +122,13 @@ share/lilypond/${VERSION}/fonts/source/feta-noteheads20.mf
 share/lilypond/${VERSION}/fonts/source/feta-noteheads23.mf
 share/lilypond/${VERSION}/fonts/source/feta-noteheads26.mf
 share/lilypond/${VERSION}/fonts/source/feta-numbers.mf
+share/lilypond/${VERSION}/fonts/source/feta-other-generic.mf
 share/lilypond/${VERSION}/fonts/source/feta-params.mf
+share/lilypond/${VERSION}/fonts/source/feta-parenthesis.mf
 share/lilypond/${VERSION}/fonts/source/feta-pedals.mf
 share/lilypond/${VERSION}/fonts/source/feta-rests.mf
 share/lilypond/${VERSION}/fonts/source/feta-scripts.mf
-share/lilypond/${VERSION}/fonts/source/feta-test-generic.mf
-share/lilypond/${VERSION}/fonts/source/feta-test11.mf
-share/lilypond/${VERSION}/fonts/source/feta-test13.mf
-share/lilypond/${VERSION}/fonts/source/feta-test16.mf
-share/lilypond/${VERSION}/fonts/source/feta-test20.mf
-share/lilypond/${VERSION}/fonts/source/feta-test23.mf
-share/lilypond/${VERSION}/fonts/source/feta-test26.mf
+share/lilypond/${VERSION}/fonts/source/feta-sharps.mf
 share/lilypond/${VERSION}/fonts/source/feta-ties.mf
 share/lilypond/${VERSION}/fonts/source/feta-timesignatures.mf
 share/lilypond/${VERSION}/fonts/source/feta-trills.mf
@@ -127,7 +145,6 @@ share/lilypond/${VERSION}/fonts/source/parmesan-clefs.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-custodes.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-dots.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-flags.mf
-share/lilypond/${VERSION}/fonts/source/parmesan-generic.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-macros.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-noteheads-generic.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-noteheads.mf
@@ -139,6 +156,7 @@ share/lilypond/${VERSION}/fonts/source/parmesan-noteheads18.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-noteheads20.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-noteheads23.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-noteheads26.mf
+share/lilypond/${VERSION}/fonts/source/parmesan-other-generic.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-rests.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-scripts.mf
 share/lilypond/${VERSION}/fonts/source/parmesan-timesignatures.mf
@@ -175,6 +193,7 @@ share/lilypond/${VERSION}/ly/Welcome_to_LilyPond.ly
 share/lilypond/${VERSION}/ly/arabic.ly
 share/lilypond/${VERSION}/ly/articulate.ly
 share/lilypond/${VERSION}/ly/bagpipe.ly
+share/lilypond/${VERSION}/ly/base-tkit.ly
 share/lilypond/${VERSION}/ly/catalan.ly
 share/lilypond/${VERSION}/ly/chord-modifiers-init.ly
 share/lilypond/${VERSION}/ly/chord-repetition-init.ly
@@ -194,9 +213,11 @@ share/lilypond/${VERSION}/ly/grace-init.ly
 share/lilypond/${VERSION}/ly/graphviz-init.ly
 share/lilypond/${VERSION}/ly/gregorian.ly
 share/lilypond/${VERSION}/ly/guile-debugger.ly
+share/lilypond/${VERSION}/ly/hel-arabic.ly
 share/lilypond/${VERSION}/ly/init.ly
 share/lilypond/${VERSION}/ly/italiano.ly
 share/lilypond/${VERSION}/ly/lilypond-book-preamble.ly
+share/lilypond/${VERSION}/ly/lyrics-tkit.ly
 share/lilypond/${VERSION}/ly/makam.ly
 share/lilypond/${VERSION}/ly/midi-init.ly
 share/lilypond/${VERSION}/ly/music-functions-init.ly
@@ -204,6 +225,7 @@ share/lilypond/${VERSION}/ly/nederlands.ly
 share/lilypond/${VERSION}/ly/norsk.ly
 share/lilypond/${VERSION}/ly/paper-defaults-init.ly
 share/lilypond/${VERSION}/ly/performer-init.ly
+share/lilypond/${VERSION}/ly/piano-tkit.ly
 share/lilypond/${VERSION}/ly/portugues.ly
 share/lilypond/${VERSION}/ly/predefined-fretboards-init.ly
 share/lilypond/${VERSION}/ly/predefined-guitar-fretboards.ly
@@ -211,49 +233,60 @@ share/lilypond/${VERSION}/ly/predefined-guitar-ninth-fretboards.ly
 share/lilypond/${VERSION}/ly/predefined-mandolin-fretboards.ly
 share/lilypond/${VERSION}/ly/predefined-ukulele-fretboards.ly
 share/lilypond/${VERSION}/ly/property-init.ly
+share/lilypond/${VERSION}/ly/satb.ly
 share/lilypond/${VERSION}/ly/scale-definitions-init.ly
 share/lilypond/${VERSION}/ly/scheme-sandbox.ly
 share/lilypond/${VERSION}/ly/script-init.ly
 share/lilypond/${VERSION}/ly/spanners-init.ly
+share/lilypond/${VERSION}/ly/ssaattbb.ly
+share/lilypond/${VERSION}/ly/staff-tkit.ly
 share/lilypond/${VERSION}/ly/string-tunings-init.ly
 share/lilypond/${VERSION}/ly/suomi.ly
 share/lilypond/${VERSION}/ly/svenska.ly
+share/lilypond/${VERSION}/ly/swing.ly
 share/lilypond/${VERSION}/ly/text-replacements.ly
 share/lilypond/${VERSION}/ly/titling-init.ly
 share/lilypond/${VERSION}/ly/toc-init.ly
+share/lilypond/${VERSION}/ly/turkish-makam.ly
 share/lilypond/${VERSION}/ly/vlaams.ly
+share/lilypond/${VERSION}/ly/vocal-tkit.ly
+share/lilypond/${VERSION}/ly/voice-tkit.ly
 share/lilypond/${VERSION}/ps/
+share/lilypond/${VERSION}/ps/encodingdefs.ps
 share/lilypond/${VERSION}/ps/lilyponddefs.ps
 share/lilypond/${VERSION}/ps/music-drawing-routines.ps
 share/lilypond/${VERSION}/python/
+${MODPY_COMMENT}share/lilypond/${VERSION}/python/${MODPY_PYCACHE}/
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}book_base.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}book_docbook.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}book_html.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}book_latex.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}book_snippets.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}book_texinfo.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}convertrules.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}fontextract.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}langdefs.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}lilylib.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}midi.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}musicexp.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}musicxml.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}musicxml2ly_conversion.${MODPY_PYC_MAGIC_TAG}pyc
+share/lilypond/${VERSION}/python/${MODPY_PYCACHE}utilities.${MODPY_PYC_MAGIC_TAG}pyc
 share/lilypond/${VERSION}/python/book_base.py
-share/lilypond/${VERSION}/python/book_base.pyc
 share/lilypond/${VERSION}/python/book_docbook.py
-share/lilypond/${VERSION}/python/book_docbook.pyc
 share/lilypond/${VERSION}/python/book_html.py
-share/lilypond/${VERSION}/python/book_html.pyc
 share/lilypond/${VERSION}/python/book_latex.py
-share/lilypond/${VERSION}/python/book_latex.pyc
 share/lilypond/${VERSION}/python/book_snippets.py
-share/lilypond/${VERSION}/python/book_snippets.pyc
 share/lilypond/${VERSION}/python/book_texinfo.py
-share/lilypond/${VERSION}/python/book_texinfo.pyc
 share/lilypond/${VERSION}/python/convertrules.py
-share/lilypond/${VERSION}/python/convertrules.pyc
 share/lilypond/${VERSION}/python/fontextract.py
-share/lilypond/${VERSION}/python/fontextract.pyc
 share/lilypond/${VERSION}/python/langdefs.py
-share/lilypond/${VERSION}/python/langdefs.pyc
 share/lilypond/${VERSION}/python/lilylib.py
-share/lilypond/${VERSION}/python/lilylib.pyc
+share/lilypond/${VERSION}/python/midi.py
 share/lilypond/${VERSION}/python/musicexp.py
-share/lilypond/${VERSION}/python/musicexp.pyc
 share/lilypond/${VERSION}/python/musicxml.py
-share/lilypond/${VERSION}/python/musicxml.pyc
-share/lilypond/${VERSION}/python/rational.py
-share/lilypond/${VERSION}/python/rational.pyc
-share/lilypond/${VERSION}/python/safeeval.py
-share/lilypond/${VERSION}/python/safeeval.pyc
+share/lilypond/${VERSION}/python/musicxml2ly_conversion.py
+share/lilypond/${VERSION}/python/utilities.py
 share/lilypond/${VERSION}/scm/
 share/lilypond/${VERSION}/scm/accreg.scm
 share/lilypond/${VERSION}/scm/auto-beam.scm
@@ -263,11 +296,10 @@ share/lilypond/${VERSION}/scm/bar-line.scm
 share/lilypond/${VERSION}/scm/bezier-tools.scm
 share/lilypond/${VERSION}/scm/c++.scm
 share/lilypond/${VERSION}/scm/chord-entry.scm
-share/lilypond/${VERSION}/scm/chord-generic-names.scm
 share/lilypond/${VERSION}/scm/chord-ignatzek-names.scm
 share/lilypond/${VERSION}/scm/chord-name.scm
 share/lilypond/${VERSION}/scm/clip-region.scm
-share/lilypond/${VERSION}/scm/coverage.scm
+share/lilypond/${VERSION}/scm/color.scm
 share/lilypond/${VERSION}/scm/define-context-properties.scm
 share/lilypond/${VERSION}/scm/define-event-classes.scm
 share/lilypond/${VERSION}/scm/define-grob-interfaces.scm
@@ -302,7 +334,6 @@ share/lilypond/${VERSION}/scm/framework-eps.scm
 share/lilypond/${VERSION}/scm/framework-null.scm
 share/lilypond/${VERSION}/scm/framework-ps.scm
 share/lilypond/${VERSION}/scm/framework-scm.scm
-share/lilypond/${VERSION}/scm/framework-socket.scm
 share/lilypond/${VERSION}/scm/framework-svg.scm
 share/lilypond/${VERSION}/scm/fret-diagrams.scm
 share/lilypond/${VERSION}/scm/graphviz.scm
@@ -316,13 +347,11 @@ share/lilypond/${VERSION}/scm/lily.scm
 share/lilypond/${VERSION}/scm/ly-syntax-constructors.scm
 share/lilypond/${VERSION}/scm/markup-macros.scm
 share/lilypond/${VERSION}/scm/markup.scm
-share/lilypond/${VERSION}/scm/memory-trace.scm
 share/lilypond/${VERSION}/scm/midi.scm
 share/lilypond/${VERSION}/scm/modal-transforms.scm
 share/lilypond/${VERSION}/scm/music-functions.scm
 share/lilypond/${VERSION}/scm/output-lib.scm
 share/lilypond/${VERSION}/scm/output-ps.scm
-share/lilypond/${VERSION}/scm/output-socket.scm
 share/lilypond/${VERSION}/scm/output-svg.scm
 share/lilypond/${VERSION}/scm/page.scm
 share/lilypond/${VERSION}/scm/paper-system.scm
@@ -342,14 +371,14 @@ share/lilypond/${VERSION}/scm/song.scm
 share/lilypond/${VERSION}/scm/standalone.scm
 share/lilypond/${VERSION}/scm/stencil.scm
 share/lilypond/${VERSION}/scm/tablature.scm
-share/lilypond/${VERSION}/scm/text.scm
 share/lilypond/${VERSION}/scm/time-signature-settings.scm
+share/lilypond/${VERSION}/scm/time-signature.scm
 share/lilypond/${VERSION}/scm/titling.scm
 share/lilypond/${VERSION}/scm/to-xml.scm
 share/lilypond/${VERSION}/scm/translation-functions.scm
-share/lilypond/${VERSION}/scm/x11-color.scm
 share/lilypond/${VERSION}/tex/
 share/lilypond/${VERSION}/tex/lilypond-tex-metrics.tex
+share/lilypond/${VERSION}/tex/texinfo-ja.tex
 share/lilypond/${VERSION}/vim/
 share/lilypond/${VERSION}/vim/compiler/
 share/lilypond/${VERSION}/vim/compiler/lilypond.vim
@@ -363,58 +392,21 @@ share/lilypond/${VERSION}/vim/syntax/
 share/lilypond/${VERSION}/vim/syntax/lilypond-words
 share/lilypond/${VERSION}/vim/syntax/lilypond-words.vim
 share/lilypond/${VERSION}/vim/syntax/lilypond.vim
-share/locale/
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/lilypond.mo
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/lilypond.mo
-share/locale/da/
-share/locale/da/LC_MESSAGES/
 share/locale/da/LC_MESSAGES/lilypond.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/lilypond.mo
-share/locale/el/
-share/locale/el/LC_MESSAGES/
 share/locale/el/LC_MESSAGES/lilypond.mo
-share/locale/eo/
-share/locale/eo/LC_MESSAGES/
 share/locale/eo/LC_MESSAGES/lilypond.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/lilypond.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/lilypond.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/lilypond.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/lilypond.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/lilypond.mo
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
 share/locale/nl/LC_MESSAGES/lilypond.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/lilypond.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/lilypond.mo
-share/locale/tr/
-share/locale/tr/LC_MESSAGES/
 share/locale/tr/LC_MESSAGES/lilypond.mo
-share/locale/uk/
-share/locale/uk/LC_MESSAGES/
 share/locale/uk/LC_MESSAGES/lilypond.mo
-share/locale/vi/
-share/locale/vi/LC_MESSAGES/
 share/locale/vi/LC_MESSAGES/lilypond.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
 share/locale/zh_TW/LC_MESSAGES/lilypond.mo