- Update to 3.2.0 [1]

- Add USE_GETTEXT [2]
- Fix build without X server/DISPLAY [3]

PR:		95599
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]
		stefan [2]
		arved[3]
Approved by:	arved

3 files changed, 292 insertions, 152 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 079bae717fec..3dcc6644c733 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.0.7
+PORTVERSION=	3.2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,18 +17,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free eartraining software
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		swig:${PORTSDIR}/devel/swig13
+		swig:${PORTSDIR}/devel/swig13 \
+		${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl
+.if defined(PACKAGE_BUILDING)
+BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
+		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+.endif
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomeextras
 USE_PYTHON=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--disable-oss-sound
+CONFIGURE_ARGS=	--disable-oss-sound \
+		--enable-docbook-stylesheet=${STYLESHEET}
 
 MAN1=		lessonfile_editor.1 solfege.1
 
+STYLESHEET=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl
+
 post-patch:
 	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/bin/python|${SETENV} python|g'
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index f25df09d8a1a..67d6516ed1ba 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.0.7.tar.gz) = 5699e5c8d744921a361b64bd85d0f815
-SHA256 (solfege-3.0.7.tar.gz) = 95e8aedaa57a7c6445b1c87d166bf7d2babba5fbc8362c318f97234912414f46
-SIZE (solfege-3.0.7.tar.gz) = 847152
+MD5 (solfege-3.2.0.tar.gz) = a0ccfc77320cb5acfa9a79749c77a723
+SHA256 (solfege-3.2.0.tar.gz) = 388e97a0dff5a7d0ef16fc8969ed6d0feebe19458018434bc4aa18c2903774eb
+SIZE (solfege-3.2.0.tar.gz) = 5145855
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 1c43d848f1c3..62eead419042 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -92,13 +92,26 @@ share/gnome/solfege/graphics/rhythm-c12c12c12.png
 share/gnome/solfege/graphics/rhythm-c12c12r12.png
 share/gnome/solfege/graphics/rhythm-c12r12c12.png
 share/gnome/solfege/graphics/rhythm-c16c16c16c16.png
+share/gnome/solfege/graphics/rhythm-c16c16c16c16c16c16.png
+share/gnome/solfege/graphics/rhythm-c16c16c16c16c8.png
+share/gnome/solfege/graphics/rhythm-c16c16c4.png
 share/gnome/solfege/graphics/rhythm-c16c16c8.png
+share/gnome/solfege/graphics/rhythm-c16c16c8c16c16.png
+share/gnome/solfege/graphics/rhythm-c16c16c8c8.png
 share/gnome/solfege/graphics/rhythm-c16c8..png
 share/gnome/solfege/graphics/rhythm-c16c8c16.png
+share/gnome/solfege/graphics/rhythm-c4..png
 share/gnome/solfege/graphics/rhythm-c4.png
+share/gnome/solfege/graphics/rhythm-c4c16c16.png
+share/gnome/solfege/graphics/rhythm-c4c8.png
 share/gnome/solfege/graphics/rhythm-c8.c16.png
 share/gnome/solfege/graphics/rhythm-c8c16c16.png
+share/gnome/solfege/graphics/rhythm-c8c16c16c16c16.png
+share/gnome/solfege/graphics/rhythm-c8c16c16c8.png
+share/gnome/solfege/graphics/rhythm-c8c4.png
 share/gnome/solfege/graphics/rhythm-c8c8.png
+share/gnome/solfege/graphics/rhythm-c8c8c16c16.png
+share/gnome/solfege/graphics/rhythm-c8c8c8.png
 share/gnome/solfege/graphics/rhythm-r12c12c12.png
 share/gnome/solfege/graphics/rhythm-r12c12r12.png
 share/gnome/solfege/graphics/rhythm-r12r12c12.png
@@ -118,9 +131,243 @@ share/gnome/solfege/graphics/sharp.svg
 share/gnome/solfege/graphics/sing-chord.png
 share/gnome/solfege/graphics/sing-interval.png
 share/gnome/solfege/graphics/solfege.png
+share/gnome/solfege/graphics/solfege.svg
 share/gnome/solfege/graphics/solfege.xpm
 share/gnome/solfege/graphics/test-sound.png
 share/gnome/solfege/graphics/twelve-tone.png
+share/gnome/solfege/help/C/apb.html
+share/gnome/solfege/help/C/bug-reporting.html
+share/gnome/solfege/help/C/chord-module.html
+share/gnome/solfege/help/C/chord.html
+share/gnome/solfege/help/C/compareintervals-module.html
+share/gnome/solfege/help/C/dictation-module.html
+share/gnome/solfege/help/C/dictation.html
+share/gnome/solfege/help/C/extending-solfege.html
+share/gnome/solfege/help/C/figures/chord.png
+share/gnome/solfege/help/C/figures/dictation.png
+share/gnome/solfege/help/C/figures/id-interval-buttons-thirds.png
+share/gnome/solfege/help/C/figures/id-interval-piano.png
+share/gnome/solfege/help/C/figures/idbyname-chords.png
+share/gnome/solfege/help/C/figures/idbyname-intonation.png
+share/gnome/solfege/help/C/figures/identifybpm.png
+share/gnome/solfege/help/C/figures/idtone.png
+share/gnome/solfege/help/C/figures/preferences-gui.png
+share/gnome/solfege/help/C/figures/preferences-midi.png
+share/gnome/solfege/help/C/figures/preferences-practise.png
+share/gnome/solfege/help/C/figures/preferences-sound-setup.png
+share/gnome/solfege/help/C/figures/preferences-user.png
+share/gnome/solfege/help/C/figures/rhythm.png
+share/gnome/solfege/help/C/figures/singchord.png
+share/gnome/solfege/help/C/figures/singinterval.png
+share/gnome/solfege/help/C/figures/twelvetone.png
+share/gnome/solfege/help/C/gpl-2.html
+share/gnome/solfege/help/C/gpl-3.html
+share/gnome/solfege/help/C/gpl.html
+share/gnome/solfege/help/C/harmonicinterval-module.html
+share/gnome/solfege/help/C/harmonicinterval.html
+share/gnome/solfege/help/C/idbyname-chords.html
+share/gnome/solfege/help/C/idbyname-intonation.html
+share/gnome/solfege/help/C/idbyname-module.html
+share/gnome/solfege/help/C/identifybpm.html
+share/gnome/solfege/help/C/idtone-module.html
+share/gnome/solfege/help/C/idtone.html
+share/gnome/solfege/help/C/index.html
+share/gnome/solfege/help/C/ly/scale-aeolian.png
+share/gnome/solfege/help/C/ly/scale-dorian-bebop.png
+share/gnome/solfege/help/C/ly/scale-dorian.png
+share/gnome/solfege/help/C/ly/scale-harmonic-minor.png
+share/gnome/solfege/help/C/ly/scale-ionian.png
+share/gnome/solfege/help/C/ly/scale-locrian.png
+share/gnome/solfege/help/C/ly/scale-lydian.png
+share/gnome/solfege/help/C/ly/scale-major-bebop.png
+share/gnome/solfege/help/C/ly/scale-melodic-minor.png
+share/gnome/solfege/help/C/ly/scale-mixolydian-bebop.png
+share/gnome/solfege/help/C/ly/scale-mixolydian.png
+share/gnome/solfege/help/C/ly/scale-phrygian.png
+share/gnome/solfege/help/C/ly/theory-intervals-1.png
+share/gnome/solfege/help/C/ly/theory-intervals-2.png
+share/gnome/solfege/help/C/ly/theory-intervals-3.png
+share/gnome/solfege/help/C/ly/theory-intervals-4.png
+share/gnome/solfege/help/C/melodicinterval.html
+share/gnome/solfege/help/C/melodicintervals-module.html
+share/gnome/solfege/help/C/midi-instrument-names.html
+share/gnome/solfege/help/C/online-resources.html
+share/gnome/solfege/help/C/preferences-window.html
+share/gnome/solfege/help/C/rhythm-module.html
+share/gnome/solfege/help/C/rhythm.html
+share/gnome/solfege/help/C/scales.html
+share/gnome/solfege/help/C/singanswer-module.html
+share/gnome/solfege/help/C/singchord-module.html
+share/gnome/solfege/help/C/singchord.html
+share/gnome/solfege/help/C/singinterval-module.html
+share/gnome/solfege/help/C/singinterval.html
+share/gnome/solfege/help/C/solfege-exercise-helps.html
+share/gnome/solfege/help/C/solfege-intro.html
+share/gnome/solfege/help/C/twelvetone.html
+share/gnome/solfege/help/C/welcome.html
+share/gnome/solfege/help/fr/apb.html
+share/gnome/solfege/help/fr/bug-reporting.html
+share/gnome/solfege/help/fr/chord-module.html
+share/gnome/solfege/help/fr/chord.html
+share/gnome/solfege/help/fr/compareintervals-module.html
+share/gnome/solfege/help/fr/dictation-module.html
+share/gnome/solfege/help/fr/dictation.html
+share/gnome/solfege/help/fr/extending-solfege.html
+share/gnome/solfege/help/fr/figures/chord.png
+share/gnome/solfege/help/fr/figures/dictation.png
+share/gnome/solfege/help/fr/figures/id-interval-buttons-thirds.png
+share/gnome/solfege/help/fr/figures/id-interval-piano.png
+share/gnome/solfege/help/fr/figures/idbyname-chords.png
+share/gnome/solfege/help/fr/figures/idbyname-intonation.png
+share/gnome/solfege/help/fr/figures/identifybpm.png
+share/gnome/solfege/help/fr/figures/idtone.png
+share/gnome/solfege/help/fr/figures/preferences-gui.png
+share/gnome/solfege/help/fr/figures/preferences-midi.png
+share/gnome/solfege/help/fr/figures/preferences-practise.png
+share/gnome/solfege/help/fr/figures/preferences-sound-setup.png
+share/gnome/solfege/help/fr/figures/preferences-user.png
+share/gnome/solfege/help/fr/figures/rhythm.png
+share/gnome/solfege/help/fr/figures/singchord.png
+share/gnome/solfege/help/fr/figures/singinterval.png
+share/gnome/solfege/help/fr/figures/twelvetone.png
+share/gnome/solfege/help/fr/gpl-2.html
+share/gnome/solfege/help/fr/gpl-3.html
+share/gnome/solfege/help/fr/gpl.html
+share/gnome/solfege/help/fr/harmonicinterval-module.html
+share/gnome/solfege/help/fr/harmonicinterval.html
+share/gnome/solfege/help/fr/idbyname-chords.html
+share/gnome/solfege/help/fr/idbyname-intonation.html
+share/gnome/solfege/help/fr/idbyname-module.html
+share/gnome/solfege/help/fr/identifybpm.html
+share/gnome/solfege/help/fr/idtone-module.html
+share/gnome/solfege/help/fr/idtone.html
+share/gnome/solfege/help/fr/index.html
+share/gnome/solfege/help/fr/melodicinterval.html
+share/gnome/solfege/help/fr/melodicintervals-module.html
+share/gnome/solfege/help/fr/midi-instrument-names.html
+share/gnome/solfege/help/fr/online-resources.html
+share/gnome/solfege/help/fr/preferences-window.html
+share/gnome/solfege/help/fr/rhythm-module.html
+share/gnome/solfege/help/fr/rhythm.html
+share/gnome/solfege/help/fr/scales.html
+share/gnome/solfege/help/fr/singanswer-module.html
+share/gnome/solfege/help/fr/singchord-module.html
+share/gnome/solfege/help/fr/singchord.html
+share/gnome/solfege/help/fr/singinterval-module.html
+share/gnome/solfege/help/fr/singinterval.html
+share/gnome/solfege/help/fr/solfege-exercise-helps.html
+share/gnome/solfege/help/fr/solfege-intro.html
+share/gnome/solfege/help/fr/twelvetone.html
+share/gnome/solfege/help/fr/welcome.html
+share/gnome/solfege/help/no/apb.html
+share/gnome/solfege/help/no/bug-reporting.html
+share/gnome/solfege/help/no/chord-module.html
+share/gnome/solfege/help/no/chord.html
+share/gnome/solfege/help/no/compareintervals-module.html
+share/gnome/solfege/help/no/dictation-module.html
+share/gnome/solfege/help/no/dictation.html
+share/gnome/solfege/help/no/extending-solfege.html
+share/gnome/solfege/help/no/figures/chord.png
+share/gnome/solfege/help/no/figures/dictation.png
+share/gnome/solfege/help/no/figures/id-interval-buttons-thirds.png
+share/gnome/solfege/help/no/figures/id-interval-piano.png
+share/gnome/solfege/help/no/figures/idbyname-chords.png
+share/gnome/solfege/help/no/figures/idbyname-intonation.png
+share/gnome/solfege/help/no/figures/identifybpm.png
+share/gnome/solfege/help/no/figures/idtone.png
+share/gnome/solfege/help/no/figures/preferences-gui.png
+share/gnome/solfege/help/no/figures/preferences-midi.png
+share/gnome/solfege/help/no/figures/preferences-practise.png
+share/gnome/solfege/help/no/figures/preferences-sound-setup.png
+share/gnome/solfege/help/no/figures/preferences-user.png
+share/gnome/solfege/help/no/figures/rhythm.png
+share/gnome/solfege/help/no/figures/singchord.png
+share/gnome/solfege/help/no/figures/singinterval.png
+share/gnome/solfege/help/no/figures/twelvetone.png
+share/gnome/solfege/help/no/gpl-2.html
+share/gnome/solfege/help/no/gpl-3.html
+share/gnome/solfege/help/no/gpl.html
+share/gnome/solfege/help/no/harmonicinterval-module.html
+share/gnome/solfege/help/no/harmonicinterval.html
+share/gnome/solfege/help/no/idbyname-chords.html
+share/gnome/solfege/help/no/idbyname-intonation.html
+share/gnome/solfege/help/no/idbyname-module.html
+share/gnome/solfege/help/no/identifybpm.html
+share/gnome/solfege/help/no/idtone-module.html
+share/gnome/solfege/help/no/idtone.html
+share/gnome/solfege/help/no/index.html
+share/gnome/solfege/help/no/melodicinterval.html
+share/gnome/solfege/help/no/melodicintervals-module.html
+share/gnome/solfege/help/no/midi-instrument-names.html
+share/gnome/solfege/help/no/online-resources.html
+share/gnome/solfege/help/no/preferences-window.html
+share/gnome/solfege/help/no/rhythm-module.html
+share/gnome/solfege/help/no/rhythm.html
+share/gnome/solfege/help/no/scales.html
+share/gnome/solfege/help/no/singanswer-module.html
+share/gnome/solfege/help/no/singchord-module.html
+share/gnome/solfege/help/no/singchord.html
+share/gnome/solfege/help/no/singinterval-module.html
+share/gnome/solfege/help/no/singinterval.html
+share/gnome/solfege/help/no/solfege-exercise-helps.html
+share/gnome/solfege/help/no/solfege-intro.html
+share/gnome/solfege/help/no/twelvetone.html
+share/gnome/solfege/help/no/welcome.html
+share/gnome/solfege/help/tr/apb.html
+share/gnome/solfege/help/tr/bug-reporting.html
+share/gnome/solfege/help/tr/chord-module.html
+share/gnome/solfege/help/tr/chord.html
+share/gnome/solfege/help/tr/compareintervals-module.html
+share/gnome/solfege/help/tr/dictation-module.html
+share/gnome/solfege/help/tr/dictation.html
+share/gnome/solfege/help/tr/extending-solfege.html
+share/gnome/solfege/help/tr/figures/chord.png
+share/gnome/solfege/help/tr/figures/dictation.png
+share/gnome/solfege/help/tr/figures/id-interval-buttons-thirds.png
+share/gnome/solfege/help/tr/figures/id-interval-piano.png
+share/gnome/solfege/help/tr/figures/idbyname-chords.png
+share/gnome/solfege/help/tr/figures/idbyname-intonation.png
+share/gnome/solfege/help/tr/figures/identifybpm.png
+share/gnome/solfege/help/tr/figures/idtone.png
+share/gnome/solfege/help/tr/figures/preferences-gui.png
+share/gnome/solfege/help/tr/figures/preferences-midi.png
+share/gnome/solfege/help/tr/figures/preferences-practise.png
+share/gnome/solfege/help/tr/figures/preferences-sound-setup.png
+share/gnome/solfege/help/tr/figures/preferences-user.png
+share/gnome/solfege/help/tr/figures/rhythm.png
+share/gnome/solfege/help/tr/figures/singchord.png
+share/gnome/solfege/help/tr/figures/singinterval.png
+share/gnome/solfege/help/tr/figures/twelvetone.png
+share/gnome/solfege/help/tr/gpl-2.html
+share/gnome/solfege/help/tr/gpl-3.html
+share/gnome/solfege/help/tr/gpl.html
+share/gnome/solfege/help/tr/harmonicinterval-module.html
+share/gnome/solfege/help/tr/harmonicinterval.html
+share/gnome/solfege/help/tr/idbyname-chords.html
+share/gnome/solfege/help/tr/idbyname-intonation.html
+share/gnome/solfege/help/tr/idbyname-module.html
+share/gnome/solfege/help/tr/identifybpm.html
+share/gnome/solfege/help/tr/idtone-module.html
+share/gnome/solfege/help/tr/idtone.html
+share/gnome/solfege/help/tr/index.html
+share/gnome/solfege/help/tr/melodicinterval.html
+share/gnome/solfege/help/tr/melodicintervals-module.html
+share/gnome/solfege/help/tr/midi-instrument-names.html
+share/gnome/solfege/help/tr/online-resources.html
+share/gnome/solfege/help/tr/preferences-window.html
+share/gnome/solfege/help/tr/rhythm-module.html
+share/gnome/solfege/help/tr/rhythm.html
+share/gnome/solfege/help/tr/scales.html
+share/gnome/solfege/help/tr/singanswer-module.html
+share/gnome/solfege/help/tr/singchord-module.html
+share/gnome/solfege/help/tr/singchord.html
+share/gnome/solfege/help/tr/singinterval-module.html
+share/gnome/solfege/help/tr/singinterval.html
+share/gnome/solfege/help/tr/solfege-exercise-helps.html
+share/gnome/solfege/help/tr/solfege-intro.html
+share/gnome/solfege/help/tr/twelvetone.html
+share/gnome/solfege/help/tr/welcome.html
+share/gnome/solfege/helpbrowser.xml
 share/gnome/solfege/learningtree.txt
 share/gnome/solfege/lesson-files/altered-1
 share/gnome/solfege/lesson-files/altered-2
@@ -147,6 +394,19 @@ share/gnome/solfege/lesson-files/chord-min-major-inv
 share/gnome/solfege/lesson-files/chord-min-major-inv-not
 share/gnome/solfege/lesson-files/chord-voicing-test
 share/gnome/solfege/lesson-files/compare-intervals
+share/gnome/solfege/lesson-files/compare-intervals-harmonic
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-10
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-2
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-2-3
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-3
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-4-5
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-4-5-8
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-6
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-6-7
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-7
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-7-9
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-9
+share/gnome/solfege/lesson-files/compare-intervals-harmonic-tritonus-7
 share/gnome/solfege/lesson-files/csound-fifth-0.97
 share/gnome/solfege/lesson-files/csound-fifth-0.98
 share/gnome/solfege/lesson-files/csound-fifth-0.99
@@ -206,7 +466,9 @@ share/gnome/solfege/lesson-files/progression-x
 share/gnome/solfege/lesson-files/rhythm-all
 share/gnome/solfege/lesson-files/rhythm-easy
 share/gnome/solfege/lesson-files/rhythm-mid
-share/gnome/solfege/lesson-files/rhythm-self-config
+share/gnome/solfege/lesson-files/rhythm-self-config-binary
+share/gnome/solfege/lesson-files/rhythm-self-config-ternary
+share/gnome/solfege/lesson-files/rhythm-ternary
 share/gnome/solfege/lesson-files/scales
 share/gnome/solfege/lesson-files/scales-all
 share/gnome/solfege/lesson-files/scales-bebop
@@ -263,141 +525,6 @@ share/gnome/solfege/mpd/musicdisplayer.py
 share/gnome/solfege/mpd/parser.py
 share/gnome/solfege/mpd/requests.py
 share/gnome/solfege/mpd/testsetup.py
-share/gnome/solfege/online-docs/C/bug-reporting.html
-share/gnome/solfege/online-docs/C/chord-help.html
-share/gnome/solfege/online-docs/C/chord-names.html
-share/gnome/solfege/online-docs/C/chordvoicing-help.html
-share/gnome/solfege/online-docs/C/compareintervals-help.html
-share/gnome/solfege/online-docs/C/copyright.html
-share/gnome/solfege/online-docs/C/dictation-help.html
-share/gnome/solfege/online-docs/C/fdl.html
-share/gnome/solfege/online-docs/C/gpl.html
-share/gnome/solfege/online-docs/C/harmonicinterval-help.html
-share/gnome/solfege/online-docs/C/harmonicprogressiondictation-help.html
-share/gnome/solfege/online-docs/C/helpfile-format.html
-share/gnome/solfege/online-docs/C/idbyname-help.html
-share/gnome/solfege/online-docs/C/identifybpm-help.html
-share/gnome/solfege/online-docs/C/idtone-help.html
-share/gnome/solfege/online-docs/C/lessonfiles.html
-share/gnome/solfege/online-docs/C/melodicinterval-help.html
-share/gnome/solfege/online-docs/C/missing-helpfile.html
-share/gnome/solfege/online-docs/C/music-format.html
-share/gnome/solfege/online-docs/C/online-resources.html
-share/gnome/solfege/online-docs/C/preferences-window.html
-share/gnome/solfege/online-docs/C/rhythm-help.html
-share/gnome/solfege/online-docs/C/singanswer-help.html
-share/gnome/solfege/online-docs/C/singchord-help.html
-share/gnome/solfege/online-docs/C/singinterval-help.html
-share/gnome/solfege/online-docs/C/theory-intervals.html
-share/gnome/solfege/online-docs/C/toc.html
-share/gnome/solfege/online-docs/C/translating-solfege.html
-share/gnome/solfege/online-docs/C/twelvetone-help.html
-share/gnome/solfege/online-docs/C/ui.html
-share/gnome/solfege/online-docs/C/welcome.html
-share/gnome/solfege/online-docs/es/theory-intervals.html
-share/gnome/solfege/online-docs/es/toc.html
-share/gnome/solfege/online-docs/es/welcome.html
-share/gnome/solfege/online-docs/es_MX/toc.html
-share/gnome/solfege/online-docs/es_MX/welcome.html
-share/gnome/solfege/online-docs/fr/bug-reporting.html
-share/gnome/solfege/online-docs/fr/chord-help.html
-share/gnome/solfege/online-docs/fr/chord-names.html
-share/gnome/solfege/online-docs/fr/chordvoicing-help.html
-share/gnome/solfege/online-docs/fr/compareintervals-help.html
-share/gnome/solfege/online-docs/fr/dictation-help.html
-share/gnome/solfege/online-docs/fr/harmonicinterval-help.html
-share/gnome/solfege/online-docs/fr/harmonicprogressiondictation-help.html
-share/gnome/solfege/online-docs/fr/helpfile-format.html
-share/gnome/solfege/online-docs/fr/idbyname-help.html
-share/gnome/solfege/online-docs/fr/identifybpm-help.html
-share/gnome/solfege/online-docs/fr/idtone-help.html
-share/gnome/solfege/online-docs/fr/lessonfiles.html
-share/gnome/solfege/online-docs/fr/melodicinterval-help.html
-share/gnome/solfege/online-docs/fr/missing-helpfile.html
-share/gnome/solfege/online-docs/fr/music-format.html
-share/gnome/solfege/online-docs/fr/online-resources.html
-share/gnome/solfege/online-docs/fr/preferences-window.html
-share/gnome/solfege/online-docs/fr/rhythm-help.html
-share/gnome/solfege/online-docs/fr/singanswer-help.html
-share/gnome/solfege/online-docs/fr/singchord-help.html
-share/gnome/solfege/online-docs/fr/singinterval-help.html
-share/gnome/solfege/online-docs/fr/theory-intervals.html
-share/gnome/solfege/online-docs/fr/toc.html
-share/gnome/solfege/online-docs/fr/translating-solfege.html
-share/gnome/solfege/online-docs/fr/twelvetone-help.html
-share/gnome/solfege/online-docs/fr/ui.html
-share/gnome/solfege/online-docs/fr/welcome.html
-share/gnome/solfege/online-docs/midi/Theory-intervals-1.midi
-share/gnome/solfege/online-docs/midi/Theory-intervals-2.midi
-share/gnome/solfege/online-docs/midi/Theory-intervals-3.midi
-share/gnome/solfege/online-docs/midi/Theory-intervals-4.midi
-share/gnome/solfege/online-docs/nl/bug-reporting.html
-share/gnome/solfege/online-docs/nl/chord-help.html
-share/gnome/solfege/online-docs/nl/chord-names.html
-share/gnome/solfege/online-docs/nl/chordvoicing-help.html
-share/gnome/solfege/online-docs/nl/compareintervals-help.html
-share/gnome/solfege/online-docs/nl/dictation-help.html
-share/gnome/solfege/online-docs/nl/harmonicinterval-help.html
-share/gnome/solfege/online-docs/nl/idbyname-help.html
-share/gnome/solfege/online-docs/nl/identifybpm-help.html
-share/gnome/solfege/online-docs/nl/idtone-help.html
-share/gnome/solfege/online-docs/nl/melodicinterval-help.html
-share/gnome/solfege/online-docs/nl/missing-helpfile.html
-share/gnome/solfege/online-docs/nl/online-resources.html
-share/gnome/solfege/online-docs/nl/preferences-window.html
-share/gnome/solfege/online-docs/nl/rhythm-help.html
-share/gnome/solfege/online-docs/nl/singanswer-help.html
-share/gnome/solfege/online-docs/nl/singchord-help.html
-share/gnome/solfege/online-docs/nl/singinterval-help.html
-share/gnome/solfege/online-docs/nl/theory-intervals.html
-share/gnome/solfege/online-docs/nl/toc.html
-share/gnome/solfege/online-docs/nl/twelvetone-help.html
-share/gnome/solfege/online-docs/nl/ui.html
-share/gnome/solfege/online-docs/nl/welcome.html
-share/gnome/solfege/online-docs/no/chord-help.html
-share/gnome/solfege/online-docs/no/chordvoicing-help.html
-share/gnome/solfege/online-docs/no/compareintervals-help.html
-share/gnome/solfege/online-docs/no/dictation-help.html
-share/gnome/solfege/online-docs/no/harmonicinterval-help.html
-share/gnome/solfege/online-docs/no/harmonicprogressiondictation-help.html
-share/gnome/solfege/online-docs/no/idbyname-help.html
-share/gnome/solfege/online-docs/no/identifybpm-help.html
-share/gnome/solfege/online-docs/no/idtone-help.html
-share/gnome/solfege/online-docs/no/melodicinterval-help.html
-share/gnome/solfege/online-docs/no/online-resources.html
-share/gnome/solfege/online-docs/no/rhythm-help.html
-share/gnome/solfege/online-docs/no/singchord-help.html
-share/gnome/solfege/online-docs/no/singinterval-help.html
-share/gnome/solfege/online-docs/no/toc.html
-share/gnome/solfege/online-docs/no/twelvetone-help.html
-share/gnome/solfege/online-docs/no/welcome.html
-share/gnome/solfege/online-docs/png/Theory-intervals-1-fr.png
-share/gnome/solfege/online-docs/png/Theory-intervals-1-nl.png
-share/gnome/solfege/online-docs/png/Theory-intervals-1.png
-share/gnome/solfege/online-docs/png/Theory-intervals-2-fr.png
-share/gnome/solfege/online-docs/png/Theory-intervals-2-nl.png
-share/gnome/solfege/online-docs/png/Theory-intervals-2.png
-share/gnome/solfege/online-docs/png/Theory-intervals-3-fr.png
-share/gnome/solfege/online-docs/png/Theory-intervals-3-nl.png
-share/gnome/solfege/online-docs/png/Theory-intervals-3.png
-share/gnome/solfege/online-docs/png/Theory-intervals-4-fr.png
-share/gnome/solfege/online-docs/png/Theory-intervals-4-nl.png
-share/gnome/solfege/online-docs/png/Theory-intervals-4.png
-share/gnome/solfege/online-docs/png/addvoice.png
-share/gnome/solfege/online-docs/png/ceg-relative.png
-share/gnome/solfege/online-docs/png/ceg.png
-share/gnome/solfege/online-docs/png/clef.png
-share/gnome/solfege/online-docs/png/fist.png
-share/gnome/solfege/online-docs/png/mainwin-fr.png
-share/gnome/solfege/online-docs/png/mainwin.png
-share/gnome/solfege/online-docs/png/simple.png
-share/gnome/solfege/online-docs/png/skip.png
-share/gnome/solfege/online-docs/png/test.png
-share/gnome/solfege/online-docs/png/tie.png
-share/gnome/solfege/online-docs/png/tuple.png
-share/gnome/solfege/online-docs/ru/bug-reporting.html
-share/gnome/solfege/online-docs/ru/toc.html
-share/gnome/solfege/online-docs/ru/welcome.html
 share/gnome/solfege/solfege.gtkrc
 share/gnome/solfege/soundcard/__init__.py
 share/gnome/solfege/soundcard/fakesynth.py
@@ -423,11 +550,13 @@ share/gnome/solfege/src/configwindow.py
 share/gnome/solfege/src/const.py
 share/gnome/solfege/src/dataparser.py
 share/gnome/solfege/src/dictation.py
+share/gnome/solfege/src/docviewer.py
 share/gnome/solfege/src/example.py
 share/gnome/solfege/src/gethomedir.py
 share/gnome/solfege/src/gu.py
 share/gnome/solfege/src/harmonicinterval.py
 share/gnome/solfege/src/harmonicprogressiondictation.py
+share/gnome/solfege/src/helpbrowser.py
 share/gnome/solfege/src/history.py
 share/gnome/solfege/src/htmlwidget.py
 share/gnome/solfege/src/i18n.py
@@ -440,6 +569,7 @@ share/gnome/solfege/src/languages.py
 share/gnome/solfege/src/learning_tree_editor.py
 share/gnome/solfege/src/lessonfile.py
 share/gnome/solfege/src/lessonfile_editor_main.py
+share/gnome/solfege/src/lessonfilegui.py
 share/gnome/solfege/src/mainwin.py
 share/gnome/solfege/src/melodicinterval.py
 share/gnome/solfege/src/multipleintervalconfigwidget.py
@@ -458,6 +588,7 @@ share/gnome/solfege/src/statisticsviewer.py
 share/gnome/solfege/src/stock.py
 share/gnome/solfege/src/testsetup.py
 share/gnome/solfege/src/tracebackwindow.py
+share/gnome/solfege/src/tree.py
 share/gnome/solfege/src/tuner.py
 share/gnome/solfege/src/twelvetone.py
 share/gnome/solfege/src/utils.py
@@ -492,20 +623,20 @@ share/locale/tr/LC_MESSAGES/solfege.mo
 @dirrm share/gnome/solfege/themes
 @dirrm share/gnome/solfege/src
 @dirrm share/gnome/solfege/soundcard
-@dirrm share/gnome/solfege/online-docs/ru
-@dirrm share/gnome/solfege/online-docs/png
-@dirrm share/gnome/solfege/online-docs/no
-@dirrm share/gnome/solfege/online-docs/nl
-@dirrm share/gnome/solfege/online-docs/midi
-@dirrm share/gnome/solfege/online-docs/fr
-@dirrm share/gnome/solfege/online-docs/es_MX
-@dirrm share/gnome/solfege/online-docs/es
-@dirrm share/gnome/solfege/online-docs/C
-@dirrm share/gnome/solfege/online-docs
 @dirrm share/gnome/solfege/mpd
 @dirrm share/gnome/solfege/lesson-files/share
 @dirrm share/gnome/solfege/lesson-files/bin
 @dirrm share/gnome/solfege/lesson-files
+@dirrm share/gnome/solfege/help/tr/figures
+@dirrm share/gnome/solfege/help/tr
+@dirrm share/gnome/solfege/help/no/figures
+@dirrm share/gnome/solfege/help/no
+@dirrm share/gnome/solfege/help/fr/figures
+@dirrm share/gnome/solfege/help/fr
+@dirrm share/gnome/solfege/help/C/ly
+@dirrm share/gnome/solfege/help/C/figures
+@dirrm share/gnome/solfege/help/C
+@dirrm share/gnome/solfege/help
 @dirrm share/gnome/solfege/graphics
 @dirrm share/gnome/solfege/gnomeemu/gnome
 @dirrm share/gnome/solfege/gnomeemu