Update to 3.8.0. Highlights from the changelog:

* Added the rhythmtapping modules.
* Added lessons to practise intervals from second to octave.
* Added twelve-tone and bpm exercises.
* Added ternary rhythm exercise.
* Added nameinterval exercise.
* Added descending melodic intervals exercise.
* Added LOTS of scale exercsies from Davide Bonetti.
* Removed GNOME dependencies. We now require pygtk 2.6.0 or newer.
* The user manual is now translatable using .po files.
* Many updated translations.
* Cairo version of all input widgets.
* Improved GtkTextView-based html widget if GtkHtml is not available.

4 files changed, 619 insertions, 181 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index da21f3a019c..c48c26db2de 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/06/21 13:22:27 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/05/13 13:02:42 schmonz Exp $
 #
 
-DISTNAME=		solfege-3.0.7
-PKGREVISION=		1
+DISTNAME=		solfege-3.8.0
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=solfege/}
 
@@ -10,24 +9,46 @@ MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.solfege.org/
 COMMENT=		Practice several musical ear training exercises
 
+BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--disable-oss-sound
+CONFIGURE_ARGS+=	--disable-pygtk-test
+CONFIGURE_ARGS+=	--enable-docbook-stylesheet=${LOCALBASE}/share/xsl/docbook/html/chunk.xsl
 
 USE_TOOLS+=		gmake gm4 makeinfo pkg-config msgfmt
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 PYTHON_PATCH_SCRIPTS=	*.py *.py.in */*.py */*.py.in
 
+SUBST_CLASSES+=		sound
+SUBST_STAGE.sound=	do-configure
+SUBST_FILES.sound=	default.config
+SUBST_SED.sound=	-e 's|@WAVPLAYER@|${WAVPLAYER}|g'
+SUBST_SED.sound+=	-e 's|@MIDIPLAYER@|${MIDIPLAYER}|g'
+SUBST_MESSAGE.sound=	Setting default audio player.
+
 EGDIR=			${PREFIX}/share/examples/solfege
-CONF_FILES+=		${EGDIR}/${PKGBASE}/solfege ${PKG_SYSCONFDIR}/solfege
+CONF_FILES+=		${EGDIR}/solfege ${PKG_SYSCONFDIR}/solfege
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
-INSTALLATION_DIRS=	${EGDIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+WAVPLAYER=	/usr/bin/audioplay
+MIDIPLAYER=	/usr/bin/midiplay
+.elif ${OPSYS} == "Darwin"
+WAVPLAYER=	${LOCALBASE}/bin/qtplay
+MIDIPLAYER=	${LOCALBASE}/bin/qtplay
+DEPENDS+=	qtplay-[0-9]*:../../audio/qtplay
+.endif
 
 .include "../../lang/python/application.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/solfege/PLIST b/audio/solfege/PLIST
index 9e3080f1c13..13bb4d26b0e 100644
--- a/audio/solfege/PLIST
+++ b/audio/solfege/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/05/13 13:02:42 schmonz Exp $
 bin/lessonfile_editor
 bin/solfege
 man/man1/lessonfile_editor.1
@@ -15,12 +15,15 @@ share/locale/hu/LC_MESSAGES/solfege.mo
 share/locale/it/LC_MESSAGES/solfege.mo
 share/locale/nl/LC_MESSAGES/solfege.mo
 share/locale/no/LC_MESSAGES/solfege.mo
+share/locale/pt_BR/LC_MESSAGES/solfege.mo
 share/locale/ru/LC_MESSAGES/solfege.mo
 share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
 share/pixmaps/solfege.png
+share/solfege/debugtree.txt
 share/solfege/default.config
 share/solfege/example-lesson-files/chord-satb
+share/solfege/example-lesson-files/example-1
 share/solfege/example-lesson-files/harmonic-progression-dictation
 share/solfege/example-lesson-files/id-by-name-1
 share/solfege/example-lesson-files/id-by-name-2
@@ -73,10 +76,6 @@ share/solfege/feta/feta20-rests-4.xpm
 share/solfege/feta/feta20-rests-5.xpm
 share/solfege/feta/feta20-rests-6.xpm
 share/solfege/feta/feta20-rests-7.xpm
-share/solfege/gnomeemu/gnome/__init__.py
-share/solfege/gnomeemu/gnome/canvas.py
-share/solfege/gnomeemu/gnome/ui.py
-share/solfege/gnomeemu/gnome/uiconsts.py
 share/solfege/graphics/chord-voicing.png
 share/solfege/graphics/chord.png
 share/solfege/graphics/compare-intervals.png
@@ -108,13 +107,26 @@ share/solfege/graphics/rhythm-c12c12c12.png
 share/solfege/graphics/rhythm-c12c12r12.png
 share/solfege/graphics/rhythm-c12r12c12.png
 share/solfege/graphics/rhythm-c16c16c16c16.png
+share/solfege/graphics/rhythm-c16c16c16c16c16c16.png
+share/solfege/graphics/rhythm-c16c16c16c16c8.png
+share/solfege/graphics/rhythm-c16c16c4.png
 share/solfege/graphics/rhythm-c16c16c8.png
+share/solfege/graphics/rhythm-c16c16c8c16c16.png
+share/solfege/graphics/rhythm-c16c16c8c8.png
 share/solfege/graphics/rhythm-c16c8..png
 share/solfege/graphics/rhythm-c16c8c16.png
+share/solfege/graphics/rhythm-c4..png
 share/solfege/graphics/rhythm-c4.png
+share/solfege/graphics/rhythm-c4c16c16.png
+share/solfege/graphics/rhythm-c4c8.png
 share/solfege/graphics/rhythm-c8.c16.png
 share/solfege/graphics/rhythm-c8c16c16.png
+share/solfege/graphics/rhythm-c8c16c16c16c16.png
+share/solfege/graphics/rhythm-c8c16c16c8.png
+share/solfege/graphics/rhythm-c8c4.png
 share/solfege/graphics/rhythm-c8c8.png
+share/solfege/graphics/rhythm-c8c8c16c16.png
+share/solfege/graphics/rhythm-c8c8c8.png
 share/solfege/graphics/rhythm-r12c12c12.png
 share/solfege/graphics/rhythm-r12c12r12.png
 share/solfege/graphics/rhythm-r12r12c12.png
@@ -134,9 +146,361 @@ share/solfege/graphics/sharp.svg
 share/solfege/graphics/sing-chord.png
 share/solfege/graphics/sing-interval.png
 share/solfege/graphics/solfege.png
+share/solfege/graphics/solfege.svg
 share/solfege/graphics/solfege.xpm
 share/solfege/graphics/test-sound.png
 share/solfege/graphics/twelve-tone.png
+share/solfege/help-menu.xml
+share/solfege/help/C/apb.html
+share/solfege/help/C/bug-reporting.html
+share/solfege/help/C/chord-module.html
+share/solfege/help/C/chord.html
+share/solfege/help/C/compareintervals-module.html
+share/solfege/help/C/dictation-module.html
+share/solfege/help/C/dictation.html
+share/solfege/help/C/elembuilder-module.html
+share/solfege/help/C/elembuilder.html
+share/solfege/help/C/extending-solfege.html
+share/solfege/help/C/figures/chord.png
+share/solfege/help/C/figures/dictation.png
+share/solfege/help/C/figures/elembuilder-harmonic-progressions.png
+share/solfege/help/C/figures/id-interval-buttons-thirds.png
+share/solfege/help/C/figures/id-interval-piano.png
+share/solfege/help/C/figures/idbyname-chords.png
+share/solfege/help/C/figures/idbyname-intonation.png
+share/solfege/help/C/figures/identifybpm.png
+share/solfege/help/C/figures/idtone.png
+share/solfege/help/C/figures/nameinterval.png
+share/solfege/help/C/figures/preferences-gui.png
+share/solfege/help/C/figures/preferences-midi.png
+share/solfege/help/C/figures/preferences-practise.png
+share/solfege/help/C/figures/preferences-sound-setup.png
+share/solfege/help/C/figures/preferences-user.png
+share/solfege/help/C/figures/rhythm.png
+share/solfege/help/C/figures/singchord.png
+share/solfege/help/C/figures/singinterval.png
+share/solfege/help/C/figures/trainingset-editor.png
+share/solfege/help/C/figures/twelvetone.png
+share/solfege/help/C/gpl-2.html
+share/solfege/help/C/gpl-3.html
+share/solfege/help/C/gpl.html
+share/solfege/help/C/harmonicinterval-module.html
+share/solfege/help/C/harmonicinterval.html
+share/solfege/help/C/idbyname-chords.html
+share/solfege/help/C/idbyname-intonation.html
+share/solfege/help/C/idbyname-module.html
+share/solfege/help/C/identifybpm.html
+share/solfege/help/C/idtone-module.html
+share/solfege/help/C/idtone.html
+share/solfege/help/C/index.html
+share/solfege/help/C/inverting-intervals.html
+share/solfege/help/C/lesson-files.html
+share/solfege/help/C/ly/inverting-intervals.png
+share/solfege/help/C/ly/theory-intervals-1.png
+share/solfege/help/C/ly/theory-intervals-fifths-1.png
+share/solfege/help/C/ly/theory-intervals-fifths-2.png
+share/solfege/help/C/ly/theory-intervals-fifths.png
+share/solfege/help/C/ly/theory-intervals-fourths.png
+share/solfege/help/C/ly/theory-intervals-seconds-1.png
+share/solfege/help/C/ly/theory-intervals-seconds-2.png
+share/solfege/help/C/ly/theory-intervals-seconds-3.png
+share/solfege/help/C/ly/theory-intervals-seconds.png
+share/solfege/help/C/ly/theory-intervals-sevenths.png
+share/solfege/help/C/ly/theory-intervals-sixths.png
+share/solfege/help/C/ly/theory-intervals-thirds.png
+share/solfege/help/C/melodicinterval.html
+share/solfege/help/C/melodicintervals-module.html
+share/solfege/help/C/midi-instrument-names.html
+share/solfege/help/C/music-theory.html
+share/solfege/help/C/nameinterval-module.html
+share/solfege/help/C/nameinterval.html
+share/solfege/help/C/one-big-page.html
+share/solfege/help/C/online-resources.html
+share/solfege/help/C/preferences-window.html
+share/solfege/help/C/rhythm-module.html
+share/solfege/help/C/rhythm.html
+share/solfege/help/C/rhythmtapping-module.html
+share/solfege/help/C/rhythmtapping2-module.html
+share/solfege/help/C/rhythmtapping2.html
+share/solfege/help/C/scales.html
+share/solfege/help/C/singanswer-module.html
+share/solfege/help/C/singchord-module.html
+share/solfege/help/C/singchord.html
+share/solfege/help/C/singinterval-module.html
+share/solfege/help/C/singinterval.html
+share/solfege/help/C/solfege-exercise-helps.html
+share/solfege/help/C/solfege-intro.html
+share/solfege/help/C/theory-intervals.html
+share/solfege/help/C/trainingset-editor.html
+share/solfege/help/C/twelvetone.html
+share/solfege/help/C/welcome.html
+share/solfege/help/fr/apb.html
+share/solfege/help/fr/bug-reporting.html
+share/solfege/help/fr/chord-module.html
+share/solfege/help/fr/chord.html
+share/solfege/help/fr/compareintervals-module.html
+share/solfege/help/fr/dictation-module.html
+share/solfege/help/fr/dictation.html
+share/solfege/help/fr/elembuilder-module.html
+share/solfege/help/fr/elembuilder.html
+share/solfege/help/fr/extending-solfege.html
+share/solfege/help/fr/figures/chord.png
+share/solfege/help/fr/figures/dictation.png
+share/solfege/help/fr/figures/id-interval-buttons-thirds.png
+share/solfege/help/fr/figures/id-interval-piano.png
+share/solfege/help/fr/figures/idbyname-chords.png
+share/solfege/help/fr/figures/idbyname-intonation.png
+share/solfege/help/fr/figures/identifybpm.png
+share/solfege/help/fr/figures/idtone.png
+share/solfege/help/fr/figures/preferences-gui.png
+share/solfege/help/fr/figures/preferences-midi.png
+share/solfege/help/fr/figures/preferences-practise.png
+share/solfege/help/fr/figures/preferences-sound-setup.png
+share/solfege/help/fr/figures/preferences-user.png
+share/solfege/help/fr/figures/rhythm.png
+share/solfege/help/fr/figures/singchord.png
+share/solfege/help/fr/figures/singinterval.png
+share/solfege/help/fr/figures/twelvetone.png
+share/solfege/help/fr/gpl-2.html
+share/solfege/help/fr/gpl-3.html
+share/solfege/help/fr/gpl.html
+share/solfege/help/fr/harmonicinterval-module.html
+share/solfege/help/fr/harmonicinterval.html
+share/solfege/help/fr/idbyname-chords.html
+share/solfege/help/fr/idbyname-intonation.html
+share/solfege/help/fr/idbyname-module.html
+share/solfege/help/fr/identifybpm.html
+share/solfege/help/fr/idtone-module.html
+share/solfege/help/fr/idtone.html
+share/solfege/help/fr/index.html
+share/solfege/help/fr/inverting-intervals.html
+share/solfege/help/fr/lesson-files.html
+share/solfege/help/fr/melodicinterval.html
+share/solfege/help/fr/melodicintervals-module.html
+share/solfege/help/fr/midi-instrument-names.html
+share/solfege/help/fr/music-theory.html
+share/solfege/help/fr/nameinterval-module.html
+share/solfege/help/fr/nameinterval.html
+share/solfege/help/fr/one-big-page.html
+share/solfege/help/fr/online-resources.html
+share/solfege/help/fr/preferences-window.html
+share/solfege/help/fr/rhythm-module.html
+share/solfege/help/fr/rhythm.html
+share/solfege/help/fr/rhythmtapping-module.html
+share/solfege/help/fr/rhythmtapping2-module.html
+share/solfege/help/fr/rhythmtapping2.html
+share/solfege/help/fr/scales.html
+share/solfege/help/fr/singanswer-module.html
+share/solfege/help/fr/singchord-module.html
+share/solfege/help/fr/singchord.html
+share/solfege/help/fr/singinterval-module.html
+share/solfege/help/fr/singinterval.html
+share/solfege/help/fr/solfege-exercise-helps.html
+share/solfege/help/fr/solfege-intro.html
+share/solfege/help/fr/theory-intervals.html
+share/solfege/help/fr/trainingset-editor.html
+share/solfege/help/fr/twelvetone.html
+share/solfege/help/fr/welcome.html
+share/solfege/help/no/apb.html
+share/solfege/help/no/bug-reporting.html
+share/solfege/help/no/chord-module.html
+share/solfege/help/no/chord.html
+share/solfege/help/no/compareintervals-module.html
+share/solfege/help/no/dictation-module.html
+share/solfege/help/no/dictation.html
+share/solfege/help/no/elembuilder-module.html
+share/solfege/help/no/elembuilder.html
+share/solfege/help/no/extending-solfege.html
+share/solfege/help/no/figures/chord.png
+share/solfege/help/no/figures/dictation.png
+share/solfege/help/no/figures/id-interval-buttons-thirds.png
+share/solfege/help/no/figures/id-interval-piano.png
+share/solfege/help/no/figures/idbyname-chords.png
+share/solfege/help/no/figures/idbyname-intonation.png
+share/solfege/help/no/figures/identifybpm.png
+share/solfege/help/no/figures/idtone.png
+share/solfege/help/no/figures/preferences-gui.png
+share/solfege/help/no/figures/preferences-midi.png
+share/solfege/help/no/figures/preferences-practise.png
+share/solfege/help/no/figures/preferences-sound-setup.png
+share/solfege/help/no/figures/preferences-user.png
+share/solfege/help/no/figures/rhythm.png
+share/solfege/help/no/figures/singchord.png
+share/solfege/help/no/figures/singinterval.png
+share/solfege/help/no/figures/twelvetone.png
+share/solfege/help/no/gpl-2.html
+share/solfege/help/no/gpl-3.html
+share/solfege/help/no/gpl.html
+share/solfege/help/no/harmonicinterval-module.html
+share/solfege/help/no/harmonicinterval.html
+share/solfege/help/no/idbyname-chords.html
+share/solfege/help/no/idbyname-intonation.html
+share/solfege/help/no/idbyname-module.html
+share/solfege/help/no/identifybpm.html
+share/solfege/help/no/idtone-module.html
+share/solfege/help/no/idtone.html
+share/solfege/help/no/index.html
+share/solfege/help/no/inverting-intervals.html
+share/solfege/help/no/lesson-files.html
+share/solfege/help/no/melodicinterval.html
+share/solfege/help/no/melodicintervals-module.html
+share/solfege/help/no/midi-instrument-names.html
+share/solfege/help/no/music-theory.html
+share/solfege/help/no/nameinterval-module.html
+share/solfege/help/no/nameinterval.html
+share/solfege/help/no/one-big-page.html
+share/solfege/help/no/online-resources.html
+share/solfege/help/no/preferences-window.html
+share/solfege/help/no/rhythm-module.html
+share/solfege/help/no/rhythm.html
+share/solfege/help/no/rhythmtapping-module.html
+share/solfege/help/no/rhythmtapping2-module.html
+share/solfege/help/no/rhythmtapping2.html
+share/solfege/help/no/scales.html
+share/solfege/help/no/singanswer-module.html
+share/solfege/help/no/singchord-module.html
+share/solfege/help/no/singchord.html
+share/solfege/help/no/singinterval-module.html
+share/solfege/help/no/singinterval.html
+share/solfege/help/no/solfege-exercise-helps.html
+share/solfege/help/no/solfege-intro.html
+share/solfege/help/no/theory-intervals.html
+share/solfege/help/no/trainingset-editor.html
+share/solfege/help/no/twelvetone.html
+share/solfege/help/no/welcome.html
+share/solfege/help/pt_BR/apb.html
+share/solfege/help/pt_BR/bug-reporting.html
+share/solfege/help/pt_BR/chord-module.html
+share/solfege/help/pt_BR/chord.html
+share/solfege/help/pt_BR/compareintervals-module.html
+share/solfege/help/pt_BR/dictation-module.html
+share/solfege/help/pt_BR/dictation.html
+share/solfege/help/pt_BR/elembuilder-module.html
+share/solfege/help/pt_BR/elembuilder.html
+share/solfege/help/pt_BR/extending-solfege.html
+share/solfege/help/pt_BR/figures/chord.png
+share/solfege/help/pt_BR/figures/dictation.png
+share/solfege/help/pt_BR/figures/id-interval-buttons-thirds.png
+share/solfege/help/pt_BR/figures/id-interval-piano.png
+share/solfege/help/pt_BR/figures/idbyname-chords.png
+share/solfege/help/pt_BR/figures/identifybpm.png
+share/solfege/help/pt_BR/figures/idtone.png
+share/solfege/help/pt_BR/figures/preferences-gui.png
+share/solfege/help/pt_BR/figures/preferences-midi.png
+share/solfege/help/pt_BR/figures/preferences-practise.png
+share/solfege/help/pt_BR/figures/preferences-sound-setup.png
+share/solfege/help/pt_BR/figures/preferences-user.png
+share/solfege/help/pt_BR/figures/rhythm.png
+share/solfege/help/pt_BR/figures/singchord.png
+share/solfege/help/pt_BR/figures/singinterval.png
+share/solfege/help/pt_BR/figures/twelvetone.png
+share/solfege/help/pt_BR/gpl-2.html
+share/solfege/help/pt_BR/gpl-3.html
+share/solfege/help/pt_BR/gpl.html
+share/solfege/help/pt_BR/harmonicinterval-module.html
+share/solfege/help/pt_BR/harmonicinterval.html
+share/solfege/help/pt_BR/idbyname-chords.html
+share/solfege/help/pt_BR/idbyname-intonation.html
+share/solfege/help/pt_BR/idbyname-module.html
+share/solfege/help/pt_BR/identifybpm.html
+share/solfege/help/pt_BR/idtone-module.html
+share/solfege/help/pt_BR/idtone.html
+share/solfege/help/pt_BR/index.html
+share/solfege/help/pt_BR/inverting-intervals.html
+share/solfege/help/pt_BR/lesson-files.html
+share/solfege/help/pt_BR/melodicinterval.html
+share/solfege/help/pt_BR/melodicintervals-module.html
+share/solfege/help/pt_BR/midi-instrument-names.html
+share/solfege/help/pt_BR/music-theory.html
+share/solfege/help/pt_BR/nameinterval-module.html
+share/solfege/help/pt_BR/nameinterval.html
+share/solfege/help/pt_BR/online-resources.html
+share/solfege/help/pt_BR/preferences-window.html
+share/solfege/help/pt_BR/rhythm-module.html
+share/solfege/help/pt_BR/rhythm.html
+share/solfege/help/pt_BR/rhythmtapping-module.html
+share/solfege/help/pt_BR/rhythmtapping2-module.html
+share/solfege/help/pt_BR/rhythmtapping2.html
+share/solfege/help/pt_BR/scales.html
+share/solfege/help/pt_BR/singanswer-module.html
+share/solfege/help/pt_BR/singchord-module.html
+share/solfege/help/pt_BR/singchord.html
+share/solfege/help/pt_BR/singinterval-module.html
+share/solfege/help/pt_BR/singinterval.html
+share/solfege/help/pt_BR/solfege-exercise-helps.html
+share/solfege/help/pt_BR/solfege-intro.html
+share/solfege/help/pt_BR/theory-intervals.html
+share/solfege/help/pt_BR/trainingset-editor.html
+share/solfege/help/pt_BR/twelvetone.html
+share/solfege/help/pt_BR/welcome.html
+share/solfege/help/tr/apb.html
+share/solfege/help/tr/bug-reporting.html
+share/solfege/help/tr/chord-module.html
+share/solfege/help/tr/chord.html
+share/solfege/help/tr/compareintervals-module.html
+share/solfege/help/tr/dictation-module.html
+share/solfege/help/tr/dictation.html
+share/solfege/help/tr/elembuilder-module.html
+share/solfege/help/tr/elembuilder.html
+share/solfege/help/tr/extending-solfege.html
+share/solfege/help/tr/figures/chord.png
+share/solfege/help/tr/figures/dictation.png
+share/solfege/help/tr/figures/id-interval-buttons-thirds.png
+share/solfege/help/tr/figures/id-interval-piano.png
+share/solfege/help/tr/figures/idbyname-chords.png
+share/solfege/help/tr/figures/idbyname-intonation.png
+share/solfege/help/tr/figures/identifybpm.png
+share/solfege/help/tr/figures/idtone.png
+share/solfege/help/tr/figures/preferences-gui.png
+share/solfege/help/tr/figures/preferences-midi.png
+share/solfege/help/tr/figures/preferences-practise.png
+share/solfege/help/tr/figures/preferences-sound-setup.png
+share/solfege/help/tr/figures/preferences-user.png
+share/solfege/help/tr/figures/rhythm.png
+share/solfege/help/tr/figures/singchord.png
+share/solfege/help/tr/figures/singinterval.png
+share/solfege/help/tr/figures/twelvetone.png
+share/solfege/help/tr/gpl-2.html
+share/solfege/help/tr/gpl-3.html
+share/solfege/help/tr/gpl.html
+share/solfege/help/tr/harmonicinterval-module.html
+share/solfege/help/tr/harmonicinterval.html
+share/solfege/help/tr/idbyname-chords.html
+share/solfege/help/tr/idbyname-intonation.html
+share/solfege/help/tr/idbyname-module.html
+share/solfege/help/tr/identifybpm.html
+share/solfege/help/tr/idtone-module.html
+share/solfege/help/tr/idtone.html
+share/solfege/help/tr/index.html
+share/solfege/help/tr/inverting-intervals.html
+share/solfege/help/tr/lesson-files.html
+share/solfege/help/tr/melodicinterval.html
+share/solfege/help/tr/melodicintervals-module.html
+share/solfege/help/tr/midi-instrument-names.html
+share/solfege/help/tr/music-theory.html
+share/solfege/help/tr/nameinterval-module.html
+share/solfege/help/tr/nameinterval.html
+share/solfege/help/tr/one-big-page.html
+share/solfege/help/tr/online-resources.html
+share/solfege/help/tr/preferences-window.html
+share/solfege/help/tr/rhythm-module.html
+share/solfege/help/tr/rhythm.html
+share/solfege/help/tr/rhythmtapping-module.html
+share/solfege/help/tr/rhythmtapping2-module.html
+share/solfege/help/tr/rhythmtapping2.html
+share/solfege/help/tr/scales.html
+share/solfege/help/tr/singanswer-module.html
+share/solfege/help/tr/singchord-module.html
+share/solfege/help/tr/singchord.html
+share/solfege/help/tr/singinterval-module.html
+share/solfege/help/tr/singinterval.html
+share/solfege/help/tr/solfege-exercise-helps.html
+share/solfege/help/tr/solfege-intro.html
+share/solfege/help/tr/theory-intervals.html
+share/solfege/help/tr/trainingset-editor.html
+share/solfege/help/tr/twelvetone.html
+share/solfege/help/tr/welcome.html
+share/solfege/helpbrowser.xml
 share/solfege/learningtree.txt
 share/solfege/lesson-files/altered-1
 share/solfege/lesson-files/altered-2
@@ -163,6 +527,19 @@ share/solfege/lesson-files/chord-min-major-inv
 share/solfege/lesson-files/chord-min-major-inv-not
 share/solfege/lesson-files/chord-voicing-test
 share/solfege/lesson-files/compare-intervals
+share/solfege/lesson-files/compare-intervals-harmonic
+share/solfege/lesson-files/compare-intervals-harmonic-10
+share/solfege/lesson-files/compare-intervals-harmonic-2
+share/solfege/lesson-files/compare-intervals-harmonic-2-3
+share/solfege/lesson-files/compare-intervals-harmonic-3
+share/solfege/lesson-files/compare-intervals-harmonic-4-5
+share/solfege/lesson-files/compare-intervals-harmonic-4-5-8
+share/solfege/lesson-files/compare-intervals-harmonic-6
+share/solfege/lesson-files/compare-intervals-harmonic-6-7
+share/solfege/lesson-files/compare-intervals-harmonic-7
+share/solfege/lesson-files/compare-intervals-harmonic-7-9
+share/solfege/lesson-files/compare-intervals-harmonic-9
+share/solfege/lesson-files/compare-intervals-harmonic-tritonus-7
 share/solfege/lesson-files/csound-fifth-0.97
 share/solfege/lesson-files/csound-fifth-0.98
 share/solfege/lesson-files/csound-fifth-0.99
@@ -178,6 +555,7 @@ share/solfege/lesson-files/harmonic-intervals
 share/solfege/lesson-files/harmonic-intervals-10
 share/solfege/lesson-files/harmonic-intervals-2
 share/solfege/lesson-files/harmonic-intervals-2-3
+share/solfege/lesson-files/harmonic-intervals-2-to-8
 share/solfege/lesson-files/harmonic-intervals-3
 share/solfege/lesson-files/harmonic-intervals-4-5
 share/solfege/lesson-files/harmonic-intervals-4-5-8
@@ -199,11 +577,15 @@ share/solfege/lesson-files/id-tone-cde-6
 share/solfege/lesson-files/id-tone-cde-7
 share/solfege/lesson-files/id-tone-cde-8
 share/solfege/lesson-files/id-tone-cde-9
+share/solfege/lesson-files/include/interval-elements
+share/solfege/lesson-files/include/progression-elements
+share/solfege/lesson-files/include/sc-master
 share/solfege/lesson-files/jsb-inventions
 share/solfege/lesson-files/melodic-intervals
 share/solfege/lesson-files/melodic-intervals-10
 share/solfege/lesson-files/melodic-intervals-2
 share/solfege/lesson-files/melodic-intervals-2-3
+share/solfege/lesson-files/melodic-intervals-2-to-8
 share/solfege/lesson-files/melodic-intervals-2int-2-3
 share/solfege/lesson-files/melodic-intervals-3
 share/solfege/lesson-files/melodic-intervals-4-5
@@ -213,8 +595,46 @@ share/solfege/lesson-files/melodic-intervals-6-7
 share/solfege/lesson-files/melodic-intervals-7
 share/solfege/lesson-files/melodic-intervals-7-9
 share/solfege/lesson-files/melodic-intervals-9
+share/solfege/lesson-files/melodic-intervals-down
+share/solfege/lesson-files/melodic-intervals-down-10
+share/solfege/lesson-files/melodic-intervals-down-2
+share/solfege/lesson-files/melodic-intervals-down-2-3
+share/solfege/lesson-files/melodic-intervals-down-2-to-8
+share/solfege/lesson-files/melodic-intervals-down-3
+share/solfege/lesson-files/melodic-intervals-down-4-5
+share/solfege/lesson-files/melodic-intervals-down-4-5-8
+share/solfege/lesson-files/melodic-intervals-down-6
+share/solfege/lesson-files/melodic-intervals-down-6-7
+share/solfege/lesson-files/melodic-intervals-down-7
+share/solfege/lesson-files/melodic-intervals-down-7-9
+share/solfege/lesson-files/melodic-intervals-down-9
+share/solfege/lesson-files/melodic-intervals-down-tritonus-7
 share/solfege/lesson-files/melodic-intervals-self-config
 share/solfege/lesson-files/melodic-intervals-tritonus-7
+share/solfege/lesson-files/melodic-intervals-up
+share/solfege/lesson-files/melodic-intervals-up-10
+share/solfege/lesson-files/melodic-intervals-up-2
+share/solfege/lesson-files/melodic-intervals-up-2-3
+share/solfege/lesson-files/melodic-intervals-up-2-to-8
+share/solfege/lesson-files/melodic-intervals-up-3
+share/solfege/lesson-files/melodic-intervals-up-4-5
+share/solfege/lesson-files/melodic-intervals-up-4-5-8
+share/solfege/lesson-files/melodic-intervals-up-6
+share/solfege/lesson-files/melodic-intervals-up-6-7
+share/solfege/lesson-files/melodic-intervals-up-7
+share/solfege/lesson-files/melodic-intervals-up-7-9
+share/solfege/lesson-files/melodic-intervals-up-9
+share/solfege/lesson-files/melodic-intervals-up-tritonus-7
+share/solfege/lesson-files/nameinterval-1
+share/solfege/lesson-files/nameinterval-2
+share/solfege/lesson-files/nameinterval-fifths
+share/solfege/lesson-files/nameinterval-fourths
+share/solfege/lesson-files/nameinterval-octave
+share/solfege/lesson-files/nameinterval-seconds
+share/solfege/lesson-files/nameinterval-sevenths
+share/solfege/lesson-files/nameinterval-sixths
+share/solfege/lesson-files/nameinterval-thirds
+share/solfege/lesson-files/nameinterval-unison
 share/solfege/lesson-files/progression-1
 share/solfege/lesson-files/progression-2
 share/solfege/lesson-files/progression-atte
@@ -222,7 +642,127 @@ share/solfege/lesson-files/progression-x
 share/solfege/lesson-files/rhythm-all
 share/solfege/lesson-files/rhythm-easy
 share/solfege/lesson-files/rhythm-mid
-share/solfege/lesson-files/rhythm-self-config
+share/solfege/lesson-files/rhythm-self-config-binary
+share/solfege/lesson-files/rhythm-self-config-ternary
+share/solfege/lesson-files/rhythm-ternary
+share/solfege/lesson-files/rhythmtapping2-self-config-binary
+share/solfege/lesson-files/rhythmtapping2-self-config-ternary
+share/solfege/lesson-files/sc-6tones
+share/solfege/lesson-files/sc-8tones
+share/solfege/lesson-files/sc-beb
+share/solfege/lesson-files/sc-beb-a
+share/solfege/lesson-files/sc-beb-d
+share/solfege/lesson-files/sc-beb-elem
+share/solfege/lesson-files/sc-beb-name
+share/solfege/lesson-files/sc-beb-s
+share/solfege/lesson-files/sc-church
+share/solfege/lesson-files/sc-dha
+share/solfege/lesson-files/sc-dha-a
+share/solfege/lesson-files/sc-dha-d
+share/solfege/lesson-files/sc-dha-elem
+share/solfege/lesson-files/sc-dha-f
+share/solfege/lesson-files/sc-dha-g
+share/solfege/lesson-files/sc-dha-name
+share/solfege/lesson-files/sc-dha-p
+share/solfege/lesson-files/sc-dha-s
+share/solfege/lesson-files/sc-dha-t
+share/solfege/lesson-files/sc-dom
+share/solfege/lesson-files/sc-dom-jazz
+share/solfege/lesson-files/sc-east
+share/solfege/lesson-files/sc-greek
+share/solfege/lesson-files/sc-hal
+share/solfege/lesson-files/sc-hal-jazz
+share/solfege/lesson-files/sc-ham
+share/solfege/lesson-files/sc-ham-a
+share/solfege/lesson-files/sc-ham-d
+share/solfege/lesson-files/sc-ham-elem
+share/solfege/lesson-files/sc-ham-f
+share/solfege/lesson-files/sc-ham-g
+share/solfege/lesson-files/sc-ham-name
+share/solfege/lesson-files/sc-ham-p
+share/solfege/lesson-files/sc-ham-s
+share/solfege/lesson-files/sc-ham-t
+share/solfege/lesson-files/sc-har
+share/solfege/lesson-files/sc-har-a
+share/solfege/lesson-files/sc-har-d
+share/solfege/lesson-files/sc-har-elem
+share/solfege/lesson-files/sc-har-f
+share/solfege/lesson-files/sc-har-g
+share/solfege/lesson-files/sc-har-name
+share/solfege/lesson-files/sc-har-p
+share/solfege/lesson-files/sc-har-s
+share/solfege/lesson-files/sc-har-t
+share/solfege/lesson-files/sc-hum-g
+share/solfege/lesson-files/sc-hun
+share/solfege/lesson-files/sc-hun-a
+share/solfege/lesson-files/sc-hun-d
+share/solfege/lesson-files/sc-hun-elem
+share/solfege/lesson-files/sc-hun-f
+share/solfege/lesson-files/sc-hun-g
+share/solfege/lesson-files/sc-hun-name
+share/solfege/lesson-files/sc-hun-p
+share/solfege/lesson-files/sc-hun-s
+share/solfege/lesson-files/sc-hun-t
+share/solfege/lesson-files/sc-maj
+share/solfege/lesson-files/sc-maj-a
+share/solfege/lesson-files/sc-maj-d
+share/solfege/lesson-files/sc-maj-elem
+share/solfege/lesson-files/sc-maj-f
+share/solfege/lesson-files/sc-maj-g
+share/solfege/lesson-files/sc-maj-name
+share/solfege/lesson-files/sc-maj-p
+share/solfege/lesson-files/sc-maj-px
+share/solfege/lesson-files/sc-maj-s
+share/solfege/lesson-files/sc-maj-t
+share/solfege/lesson-files/sc-mau
+share/solfege/lesson-files/sc-mau-jazz
+share/solfege/lesson-files/sc-mel
+share/solfege/lesson-files/sc-mel-a
+share/solfege/lesson-files/sc-mel-d
+share/solfege/lesson-files/sc-mel-elem
+share/solfege/lesson-files/sc-mel-f
+share/solfege/lesson-files/sc-mel-g
+share/solfege/lesson-files/sc-mel-name
+share/solfege/lesson-files/sc-mel-p
+share/solfege/lesson-files/sc-mel-s
+share/solfege/lesson-files/sc-mel-t
+share/solfege/lesson-files/sc-min
+share/solfege/lesson-files/sc-min-jazz
+share/solfege/lesson-files/sc-nat-g
+share/solfege/lesson-files/sc-nea
+share/solfege/lesson-files/sc-nea-a
+share/solfege/lesson-files/sc-nea-d
+share/solfege/lesson-files/sc-nea-elem
+share/solfege/lesson-files/sc-nea-f
+share/solfege/lesson-files/sc-nea-g
+share/solfege/lesson-files/sc-nea-name
+share/solfege/lesson-files/sc-nea-p
+share/solfege/lesson-files/sc-nea-s
+share/solfege/lesson-files/sc-nea-t
+share/solfege/lesson-files/sc-nem
+share/solfege/lesson-files/sc-nem-a
+share/solfege/lesson-files/sc-nem-d
+share/solfege/lesson-files/sc-nem-elem
+share/solfege/lesson-files/sc-nem-f
+share/solfege/lesson-files/sc-nem-g
+share/solfege/lesson-files/sc-nem-name
+share/solfege/lesson-files/sc-nem-p
+share/solfege/lesson-files/sc-nem-s
+share/solfege/lesson-files/sc-nem-t
+share/solfege/lesson-files/sc-pen
+share/solfege/lesson-files/sc-pen-a
+share/solfege/lesson-files/sc-pen-d
+share/solfege/lesson-files/sc-pen-elem
+share/solfege/lesson-files/sc-pen-g
+share/solfege/lesson-files/sc-pen-name
+share/solfege/lesson-files/sc-pen-s
+share/solfege/lesson-files/sc-plagal
+share/solfege/lesson-files/sc-sim
+share/solfege/lesson-files/sc-sim-a
+share/solfege/lesson-files/sc-sim-d
+share/solfege/lesson-files/sc-sim-elem
+share/solfege/lesson-files/sc-sim-name
+share/solfege/lesson-files/sc-sim-s
 share/solfege/lesson-files/scales
 share/solfege/lesson-files/scales-all
 share/solfege/lesson-files/scales-bebop
@@ -262,6 +802,9 @@ share/solfege/lesson-files/singchord-4
 share/solfege/lesson-files/singchord-5
 share/solfege/lesson-files/singchord-6
 share/solfege/lesson-files/singchord-all
+share/solfege/lesson-files/tapping-all
+share/solfege/lesson-files/tapping-easy
+share/solfege/lesson-files/tapping-mid
 share/solfege/lesson-files/three-prog-root
 share/solfege/lesson-files/twelvetone
 share/solfege/lesson-files/two-prog-root
@@ -273,159 +816,24 @@ share/solfege/mpd/const.py
 share/solfege/mpd/duration.py
 share/solfege/mpd/engravers.py
 share/solfege/mpd/interval.py
+share/solfege/mpd/mfutils.py
 share/solfege/mpd/mpdutils.py
 share/solfege/mpd/musicalpitch.py
 share/solfege/mpd/musicdisplayer.py
 share/solfege/mpd/parser.py
+share/solfege/mpd/rat.py
 share/solfege/mpd/requests.py
-share/solfege/mpd/testsetup.py
-share/solfege/online-docs/C/bug-reporting.html
-share/solfege/online-docs/C/chord-help.html
-share/solfege/online-docs/C/chord-names.html
-share/solfege/online-docs/C/chordvoicing-help.html
-share/solfege/online-docs/C/compareintervals-help.html
-share/solfege/online-docs/C/copyright.html
-share/solfege/online-docs/C/dictation-help.html
-share/solfege/online-docs/C/fdl.html
-share/solfege/online-docs/C/gpl.html
-share/solfege/online-docs/C/harmonicinterval-help.html
-share/solfege/online-docs/C/harmonicprogressiondictation-help.html
-share/solfege/online-docs/C/helpfile-format.html
-share/solfege/online-docs/C/idbyname-help.html
-share/solfege/online-docs/C/identifybpm-help.html
-share/solfege/online-docs/C/idtone-help.html
-share/solfege/online-docs/C/lessonfiles.html
-share/solfege/online-docs/C/melodicinterval-help.html
-share/solfege/online-docs/C/missing-helpfile.html
-share/solfege/online-docs/C/music-format.html
-share/solfege/online-docs/C/online-resources.html
-share/solfege/online-docs/C/preferences-window.html
-share/solfege/online-docs/C/rhythm-help.html
-share/solfege/online-docs/C/singanswer-help.html
-share/solfege/online-docs/C/singchord-help.html
-share/solfege/online-docs/C/singinterval-help.html
-share/solfege/online-docs/C/theory-intervals.html
-share/solfege/online-docs/C/toc.html
-share/solfege/online-docs/C/translating-solfege.html
-share/solfege/online-docs/C/twelvetone-help.html
-share/solfege/online-docs/C/ui.html
-share/solfege/online-docs/C/welcome.html
-share/solfege/online-docs/es/theory-intervals.html
-share/solfege/online-docs/es/toc.html
-share/solfege/online-docs/es/welcome.html
-share/solfege/online-docs/es_MX/toc.html
-share/solfege/online-docs/es_MX/welcome.html
-share/solfege/online-docs/fr/bug-reporting.html
-share/solfege/online-docs/fr/chord-help.html
-share/solfege/online-docs/fr/chord-names.html
-share/solfege/online-docs/fr/chordvoicing-help.html
-share/solfege/online-docs/fr/compareintervals-help.html
-share/solfege/online-docs/fr/dictation-help.html
-share/solfege/online-docs/fr/harmonicinterval-help.html
-share/solfege/online-docs/fr/harmonicprogressiondictation-help.html
-share/solfege/online-docs/fr/helpfile-format.html
-share/solfege/online-docs/fr/idbyname-help.html
-share/solfege/online-docs/fr/identifybpm-help.html
-share/solfege/online-docs/fr/idtone-help.html
-share/solfege/online-docs/fr/lessonfiles.html
-share/solfege/online-docs/fr/melodicinterval-help.html
-share/solfege/online-docs/fr/missing-helpfile.html
-share/solfege/online-docs/fr/music-format.html
-share/solfege/online-docs/fr/online-resources.html
-share/solfege/online-docs/fr/preferences-window.html
-share/solfege/online-docs/fr/rhythm-help.html
-share/solfege/online-docs/fr/singanswer-help.html
-share/solfege/online-docs/fr/singchord-help.html
-share/solfege/online-docs/fr/singinterval-help.html
-share/solfege/online-docs/fr/theory-intervals.html
-share/solfege/online-docs/fr/toc.html
-share/solfege/online-docs/fr/translating-solfege.html
-share/solfege/online-docs/fr/twelvetone-help.html
-share/solfege/online-docs/fr/ui.html
-share/solfege/online-docs/fr/welcome.html
-share/solfege/online-docs/midi/Theory-intervals-1.midi
-share/solfege/online-docs/midi/Theory-intervals-2.midi
-share/solfege/online-docs/midi/Theory-intervals-3.midi
-share/solfege/online-docs/midi/Theory-intervals-4.midi
-share/solfege/online-docs/nl/bug-reporting.html
-share/solfege/online-docs/nl/chord-help.html
-share/solfege/online-docs/nl/chord-names.html
-share/solfege/online-docs/nl/chordvoicing-help.html
-share/solfege/online-docs/nl/compareintervals-help.html
-share/solfege/online-docs/nl/dictation-help.html
-share/solfege/online-docs/nl/harmonicinterval-help.html
-share/solfege/online-docs/nl/idbyname-help.html
-share/solfege/online-docs/nl/identifybpm-help.html
-share/solfege/online-docs/nl/idtone-help.html
-share/solfege/online-docs/nl/melodicinterval-help.html
-share/solfege/online-docs/nl/missing-helpfile.html
-share/solfege/online-docs/nl/online-resources.html
-share/solfege/online-docs/nl/preferences-window.html
-share/solfege/online-docs/nl/rhythm-help.html
-share/solfege/online-docs/nl/singanswer-help.html
-share/solfege/online-docs/nl/singchord-help.html
-share/solfege/online-docs/nl/singinterval-help.html
-share/solfege/online-docs/nl/theory-intervals.html
-share/solfege/online-docs/nl/toc.html
-share/solfege/online-docs/nl/twelvetone-help.html
-share/solfege/online-docs/nl/ui.html
-share/solfege/online-docs/nl/welcome.html
-share/solfege/online-docs/no/chord-help.html
-share/solfege/online-docs/no/chordvoicing-help.html
-share/solfege/online-docs/no/compareintervals-help.html
-share/solfege/online-docs/no/dictation-help.html
-share/solfege/online-docs/no/harmonicinterval-help.html
-share/solfege/online-docs/no/harmonicprogressiondictation-help.html
-share/solfege/online-docs/no/idbyname-help.html
-share/solfege/online-docs/no/identifybpm-help.html
-share/solfege/online-docs/no/idtone-help.html
-share/solfege/online-docs/no/melodicinterval-help.html
-share/solfege/online-docs/no/online-resources.html
-share/solfege/online-docs/no/rhythm-help.html
-share/solfege/online-docs/no/singchord-help.html
-share/solfege/online-docs/no/singinterval-help.html
-share/solfege/online-docs/no/toc.html
-share/solfege/online-docs/no/twelvetone-help.html
-share/solfege/online-docs/no/welcome.html
-share/solfege/online-docs/png/Theory-intervals-1-fr.png
-share/solfege/online-docs/png/Theory-intervals-1-nl.png
-share/solfege/online-docs/png/Theory-intervals-1.png
-share/solfege/online-docs/png/Theory-intervals-2-fr.png
-share/solfege/online-docs/png/Theory-intervals-2-nl.png
-share/solfege/online-docs/png/Theory-intervals-2.png
-share/solfege/online-docs/png/Theory-intervals-3-fr.png
-share/solfege/online-docs/png/Theory-intervals-3-nl.png
-share/solfege/online-docs/png/Theory-intervals-3.png
-share/solfege/online-docs/png/Theory-intervals-4-fr.png
-share/solfege/online-docs/png/Theory-intervals-4-nl.png
-share/solfege/online-docs/png/Theory-intervals-4.png
-share/solfege/online-docs/png/addvoice.png
-share/solfege/online-docs/png/ceg-relative.png
-share/solfege/online-docs/png/ceg.png
-share/solfege/online-docs/png/clef.png
-share/solfege/online-docs/png/fist.png
-share/solfege/online-docs/png/mainwin-fr.png
-share/solfege/online-docs/png/mainwin.png
-share/solfege/online-docs/png/simple.png
-share/solfege/online-docs/png/skip.png
-share/solfege/online-docs/png/test.png
-share/solfege/online-docs/png/tie.png
-share/solfege/online-docs/png/tuple.png
-share/solfege/online-docs/ru/bug-reporting.html
-share/solfege/online-docs/ru/toc.html
-share/solfege/online-docs/ru/welcome.html
+share/solfege/mpd/track.py
 share/solfege/solfege.gtkrc
 share/solfege/soundcard/__init__.py
 share/solfege/soundcard/fakesynth.py
-share/solfege/soundcard/mfutils.py
 share/solfege/soundcard/midifilesynth.py
 share/solfege/soundcard/oss_common.py
 share/solfege/soundcard/oss_sequencer.py
 share/solfege/soundcard/oss_sequencer2.py
-share/solfege/soundcard/rat.py
 share/solfege/soundcard/solfege_c_midi.py
 share/solfege/soundcard/soundcardexceptions.py
-share/solfege/soundcard/track.py
+share/solfege/soundcard/synth_common.py
 share/solfege/soundcard/winsynth.py
 share/solfege/src/__init__.py
 share/solfege/src/abstract.py
@@ -439,11 +847,16 @@ share/solfege/src/configwindow.py
 share/solfege/src/const.py
 share/solfege/src/dataparser.py
 share/solfege/src/dictation.py
+share/solfege/src/docviewer.py
+share/solfege/src/elembuilder.py
 share/solfege/src/example.py
+share/solfege/src/exceptiondialog.py
 share/solfege/src/gethomedir.py
+share/solfege/src/gpath.py
 share/solfege/src/gu.py
 share/solfege/src/harmonicinterval.py
 share/solfege/src/harmonicprogressiondictation.py
+share/solfege/src/helpbrowser.py
 share/solfege/src/history.py
 share/solfege/src/htmlwidget.py
 share/solfege/src/i18n.py
@@ -456,14 +869,19 @@ share/solfege/src/languages.py
 share/solfege/src/learning_tree_editor.py
 share/solfege/src/lessonfile.py
 share/solfege/src/lessonfile_editor_main.py
+share/solfege/src/lessonfilegui.py
 share/solfege/src/mainwin.py
 share/solfege/src/melodicinterval.py
 share/solfege/src/multipleintervalconfigwidget.py
+share/solfege/src/nameinterval.py
 share/solfege/src/notenamespinbutton.py
 share/solfege/src/osutils.py
 share/solfege/src/pmwiki.py
 share/solfege/src/reportbug.py
+share/solfege/src/reportlib.py
 share/solfege/src/rhythm.py
+share/solfege/src/rhythmtapping.py
+share/solfege/src/rhythmtapping2.py
 share/solfege/src/runtime.py
 share/solfege/src/singanswer.py
 share/solfege/src/singchord.py
@@ -472,8 +890,9 @@ share/solfege/src/specialwidgets.py
 share/solfege/src/statistics.py
 share/solfege/src/statisticsviewer.py
 share/solfege/src/stock.py
-share/solfege/src/testsetup.py
 share/solfege/src/tracebackwindow.py
+share/solfege/src/trainingsetdlg.py
+share/solfege/src/tree.py
 share/solfege/src/tuner.py
 share/solfege/src/twelvetone.py
 share/solfege/src/utils.py
@@ -495,23 +914,24 @@ share/solfege/ui.xml
 @dirrm share/solfege/themes
 @dirrm share/solfege/src
 @dirrm share/solfege/soundcard
-@dirrm share/solfege/online-docs/ru
-@dirrm share/solfege/online-docs/png
-@dirrm share/solfege/online-docs/no
-@dirrm share/solfege/online-docs/nl
-@dirrm share/solfege/online-docs/midi
-@dirrm share/solfege/online-docs/fr
-@dirrm share/solfege/online-docs/es_MX
-@dirrm share/solfege/online-docs/es
-@dirrm share/solfege/online-docs/C
-@dirrm share/solfege/online-docs
 @dirrm share/solfege/mpd
 @dirrm share/solfege/lesson-files/share
+@dirrm share/solfege/lesson-files/include
 @dirrm share/solfege/lesson-files/bin
 @dirrm share/solfege/lesson-files
+@dirrm share/solfege/help/tr/figures
+@dirrm share/solfege/help/tr
+@dirrm share/solfege/help/pt_BR/figures
+@dirrm share/solfege/help/pt_BR
+@dirrm share/solfege/help/no/figures
+@dirrm share/solfege/help/no
+@dirrm share/solfege/help/fr/figures
+@dirrm share/solfege/help/fr
+@dirrm share/solfege/help/C/ly
+@dirrm share/solfege/help/C/figures
+@dirrm share/solfege/help/C
+@dirrm share/solfege/help
 @dirrm share/solfege/graphics
-@dirrm share/solfege/gnomeemu/gnome
-@dirrm share/solfege/gnomeemu
 @dirrm share/solfege/feta
 @dirrm share/solfege/example-lesson-files
 @dirrm share/solfege
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index db6f6e68ee0..2526b4613b6 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/03/02 00:48:31 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2007/05/13 13:02:42 schmonz Exp $
 
-SHA1 (solfege-3.0.7.tar.gz) = 66bb51dd9bc1b19b894c4e4911b30d0809812cd3
-RMD160 (solfege-3.0.7.tar.gz) = 7d943defd6bb4ba24498d68614f91259c09ab8d8
-Size (solfege-3.0.7.tar.gz) = 847152 bytes
-SHA1 (patch-aa) = aed03ee233649212f28bd928742fedd8bdb41ded
+SHA1 (solfege-3.8.0.tar.gz) = 3ad5e03db5cae744fa8826c12efc22679be4d5c4
+RMD160 (solfege-3.8.0.tar.gz) = 435358a763f8c45f66ce841d62ace349270d0287
+Size (solfege-3.8.0.tar.gz) = 2543125 bytes
+SHA1 (patch-aa) = 86e7d473659f347bb63bc0b9b20809d93002748d
diff --git a/audio/solfege/patches/patch-aa b/audio/solfege/patches/patch-aa
index 90a2ca8ff9b..45f42ce74bb 100644
--- a/audio/solfege/patches/patch-aa
+++ b/audio/solfege/patches/patch-aa
@@ -1,20 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/28 02:08:19 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2007/05/13 13:02:42 schmonz Exp $
 
---- default.config.orig	2005-12-07 15:25:15.000000000 -0500
+--- default.config.orig	2007-05-10 05:21:46.000000000 -0400
 +++ default.config
-@@ -40,11 +40,11 @@ history_forward_ak=<alt>Right
- history_reload_ak=<ctrl>r
- 
- [sound]
--type=sequencer-device
--device_file=/dev/sequencer2
-+type=external-midiplayer
-+device_file=/dev/music
+@@ -52,8 +52,10 @@ history_reload_ak=<ctrl>r
+ type=external-midiplayer
+ device_file=/dev/sequencer2
  synth_number=2
 -wav_player=/usr/bin/aplay
 -midi_player=/usr/bin/timidity -idqq %s
-+wav_player=/usr/bin/audioplay
-+midi_player=/usr/bin/midiplay
++#wav_player=/usr/bin/aplay
++#midi_player=/usr/bin/timidity -idqq %s
++wav_player=@WAVPLAYER@ %s
++midi_player=@MIDIPLAYER@ %s
  
  [config]
  preferred_instrument=0