3 files changed, 257 insertions, 49 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 1c18efc4faff..647a583eb931 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.18.8
+PORTVERSION=	3.20.0
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 PKGNAMESUFFIX=	-nosound
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index b495d7a3b60e..7c61fce42558 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,2 +1,2 @@
-SHA256 (solfege-3.18.8.tar.gz) = c8db512639afd9b0ec6e03bb5b2f140c3e959b54d62d2f9381ca2b0e86198010
-SIZE (solfege-3.18.8.tar.gz) = 5017654
+SHA256 (solfege-3.20.0.tar.gz) = 7adf9ec42bc0965807e3a76152254731a280daa0b6c33e02781f1f67b745d1d3
+SIZE (solfege-3.20.0.tar.gz) = 6033876
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index ad18bdd43276..2356fc9aec33 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -22,19 +22,33 @@ share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
 share/locale/vi/LC_MESSAGES/solfege.mo
 share/locale/zh_CN/LC_MESSAGES/solfege.mo
-share/pixmaps/solfege.png
+share/pixmaps/solfege.svg
 %%DATADIR%%/solfege/exercises/rhythmdictation.py
 %%DATADIR%%/solfege/exercises/rhythmdictation2.py
 %%DATADIR%%/solfege/exercises/tuner.py
 %%DATADIR%%/solfege/exercises/rhythmdictation.pyc
 %%DATADIR%%/solfege/exercises/rhythmdictation2.pyc
 %%DATADIR%%/solfege/exercises/tuner.pyc
+%%DATADIR%%/solfege/mpd/elems.py
+%%DATADIR%%/solfege/mpd/performer.py
+%%DATADIR%%/solfege/mpd/lexer.py
+%%DATADIR%%/solfege/mpd/lexer.pyc
+%%DATADIR%%/solfege/mpd/rhythmwidget.py
+%%DATADIR%%/solfege/mpd/elems.pyc
+%%DATADIR%%/solfege/mpd/performer.pyc
+%%DATADIR%%/solfege/mpd/rhythmwidget.pyc
 %%DATADIR%%/solfege/mpd/mpdutils.py
 %%DATADIR%%/solfege/mpd/mpdutils.pyc
+%%DATADIR%%/solfege/soundcard/alsa_sequencer.py
+%%DATADIR%%/solfege/soundcard/alsa_sequencer.pyc
 %%DATADIR%%/solfege/soundcard/soundcardexceptions.py
 %%DATADIR%%/solfege/soundcard/soundcardexceptions.pyc
 %%DATADIR%%/solfege/__init__.py
 %%DATADIR%%/solfege/_version.py
+%%DATADIR%%/solfege/make_screenshots.py
+%%DATADIR%%/solfege/make_screenshots.pyc
+%%DATADIR%%/solfege/download_pyalsa.py
+%%DATADIR%%/solfege/download_pyalsa.pyc
 %%DATADIR%%/solfege/abstract.py
 %%DATADIR%%/solfege/application.py
 %%DATADIR%%/solfege/buildinfo.py
@@ -46,7 +60,6 @@ share/pixmaps/solfege.png
 %%DATADIR%%/solfege/filesystem.py
 %%DATADIR%%/solfege/fpeditor.py
 %%DATADIR%%/solfege/frontpage.py
-%%DATADIR%%/solfege/gpath.py
 %%DATADIR%%/solfege/gu.py
 %%DATADIR%%/solfege/history.py
 %%DATADIR%%/solfege/i18n.py
@@ -61,12 +74,10 @@ share/pixmaps/solfege.png
 %%DATADIR%%/solfege/notenamespinbutton.py
 %%DATADIR%%/solfege/optionparser.py
 %%DATADIR%%/solfege/osutils.py
-%%DATADIR%%/solfege/pmwiki.py
 %%DATADIR%%/solfege/practisesheetdlg.py
 %%DATADIR%%/solfege/profilemanager.py
 %%DATADIR%%/solfege/reportbug.py
 %%DATADIR%%/solfege/reportlib.py
-%%DATADIR%%/solfege/rhythmwidget.py
 %%DATADIR%%/solfege/runtime.py
 %%DATADIR%%/solfege/specialwidgets.py
 %%DATADIR%%/solfege/startup.py
@@ -94,7 +105,6 @@ share/pixmaps/solfege.png
 %%DATADIR%%/solfege/filesystem.pyc
 %%DATADIR%%/solfege/fpeditor.pyc
 %%DATADIR%%/solfege/frontpage.pyc
-%%DATADIR%%/solfege/gpath.pyc
 %%DATADIR%%/solfege/gu.pyc
 %%DATADIR%%/solfege/history.pyc
 %%DATADIR%%/solfege/i18n.pyc
@@ -109,12 +119,10 @@ share/pixmaps/solfege.png
 %%DATADIR%%/solfege/notenamespinbutton.pyc
 %%DATADIR%%/solfege/optionparser.pyc
 %%DATADIR%%/solfege/osutils.pyc
-%%DATADIR%%/solfege/pmwiki.pyc
 %%DATADIR%%/solfege/practisesheetdlg.pyc
 %%DATADIR%%/solfege/profilemanager.pyc
 %%DATADIR%%/solfege/reportbug.pyc
 %%DATADIR%%/solfege/reportlib.pyc
-%%DATADIR%%/solfege/rhythmwidget.pyc
 %%DATADIR%%/solfege/runtime.pyc
 %%DATADIR%%/solfege/specialwidgets.pyc
 %%DATADIR%%/solfege/startup.pyc
@@ -134,6 +142,11 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/profile-manager.html
 %%DATADIR%%/help/C/figures/profile-manager.png
 %%DATADIR%%/help/C/figures/statistics.png
+%%DATADIR%%/help/eo/solfege-intro.html
+%%DATADIR%%/help/eo/idbyname.html
+%%DATADIR%%/help/eo/rhythmdictation-module.html
+%%DATADIR%%/help/eo/rhythmdictation2-module.html
+%%DATADIR%%/help/eo/solfege-exercise-helps.html
 %%DATADIR%%/help/eo/extending-solfege.html
 %%DATADIR%%/help/eo/about-statistics.html
 %%DATADIR%%/help/eo/bug-reporting.html
@@ -181,15 +194,45 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/eo/singchord.html
 %%DATADIR%%/help/eo/singinterval-module.html
 %%DATADIR%%/help/eo/singinterval.html
-%%DATADIR%%/help/eo/solfege-exercise-helps.html
-%%DATADIR%%/help/eo/solfege-intro.html
 %%DATADIR%%/help/eo/theory-intervals.html
 %%DATADIR%%/help/eo/trainingset-editor.html
 %%DATADIR%%/help/eo/twelvetone-module.html
 %%DATADIR%%/help/eo/twelvetone.html
+%%DATADIR%%/help/eo/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/eo/figures/id-interval-piano.png
+%%DATADIR%%/help/eo/figures/dictation.png
+%%DATADIR%%/help/eo/figures/identifybpm.png
+%%DATADIR%%/help/eo/figures/idbyname-chords.png
+%%DATADIR%%/help/eo/figures/preferences-practise.png
+%%DATADIR%%/help/eo/figures/statistics.png
+%%DATADIR%%/help/eo/figures/preferences-sound-setup.png
+%%DATADIR%%/help/eo/figures/preferences-midi.png
+%%DATADIR%%/help/eo/figures/chord.png
+%%DATADIR%%/help/eo/figures/preferences-user.png
+%%DATADIR%%/help/eo/figures/preferences-gui-interval.png
+%%DATADIR%%/help/eo/figures/idtone.png
+%%DATADIR%%/help/eo/figures/singchord.png
+%%DATADIR%%/help/eo/figures/id-interval-buttons-thirds.png
+%%DATADIR%%/help/eo/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/eo/figures/profile-manager.png
+%%DATADIR%%/help/eo/figures/rhythm.png
+%%DATADIR%%/help/eo/figures/preferences-gui.png
+%%DATADIR%%/help/eo/figures/twelvetone.png
+%%DATADIR%%/help/eo/figures/preferences-external-programs.png
+%%DATADIR%%/help/eo/figures/preferences-statistics.png
+%%DATADIR%%/help/eo/figures/rhythmtapping2.png
+%%DATADIR%%/help/eo/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/eo/figures/trainingset-editor.png
+%%DATADIR%%/help/eo/figures/nameinterval.png
+%%DATADIR%%/help/eo/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/eo/figures/singinterval.png
+%%DATADIR%%/help/eo/figures/idbyname-intonation.png
 %%DATADIR%%/help/et/extending-solfege.html
-%%DATADIR%%/help/et/solfege-exercise-helps.html
+%%DATADIR%%/help/et/idbyname.html
 %%DATADIR%%/help/et/solfege-intro.html
+%%DATADIR%%/help/et/rhythmdictation-module.html
+%%DATADIR%%/help/et/rhythmdictation2-module.html
+%%DATADIR%%/help/et/solfege-exercise-helps.html
 %%DATADIR%%/help/et/about-statistics.html
 %%DATADIR%%/help/et/bug-reporting.html
 %%DATADIR%%/help/et/chordvoicing-module.html
@@ -236,27 +279,122 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/et/singchord.html
 %%DATADIR%%/help/et/singinterval-module.html
 %%DATADIR%%/help/et/singinterval.html
-%%DATADIR%%/help/et/solfege-exercise-helps.html
-%%DATADIR%%/help/et/solfege-intro.html
 %%DATADIR%%/help/et/theory-intervals.html
 %%DATADIR%%/help/et/trainingset-editor.html
 %%DATADIR%%/help/et/twelvetone-module.html
 %%DATADIR%%/help/et/twelvetone.html
-%%DATADIR%%/help/fr/about-statistics.html
+%%DATADIR%%/help/et/figures/id-interval-piano.png
+%%DATADIR%%/help/et/figures/dictation.png
+%%DATADIR%%/help/et/figures/identifybpm.png
+%%DATADIR%%/help/et/figures/idbyname-chords.png
+%%DATADIR%%/help/et/figures/preferences-practise.png
+%%DATADIR%%/help/et/figures/statistics.png
+%%DATADIR%%/help/et/figures/preferences-sound-setup.png
+%%DATADIR%%/help/et/figures/preferences-midi.png
+%%DATADIR%%/help/et/figures/chord.png
+%%DATADIR%%/help/et/figures/preferences-user.png
+%%DATADIR%%/help/et/figures/preferences-gui-interval.png
+%%DATADIR%%/help/et/figures/idtone.png
+%%DATADIR%%/help/et/figures/singchord.png
+%%DATADIR%%/help/et/figures/id-interval-buttons-thirds.png
+%%DATADIR%%/help/et/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/et/figures/profile-manager.png
+%%DATADIR%%/help/et/figures/rhythm.png
+%%DATADIR%%/help/et/figures/preferences-gui.png
+%%DATADIR%%/help/et/figures/twelvetone.png
+%%DATADIR%%/help/et/figures/preferences-external-programs.png
+%%DATADIR%%/help/et/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/et/figures/preferences-statistics.png
+%%DATADIR%%/help/et/figures/rhythmtapping2.png
+%%DATADIR%%/help/et/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/et/figures/trainingset-editor.png
+%%DATADIR%%/help/et/figures/nameinterval.png
+%%DATADIR%%/help/et/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/et/figures/singinterval.png
+%%DATADIR%%/help/et/figures/idbyname-intonation.png
+%%DATADIR%%/help/fr/idbyname.html
+%%DATADIR%%/help/fr/rhythmdictation-module.html
 %%DATADIR%%/help/fr/mpd-module.html
 %%DATADIR%%/help/fr/profile-manager.html
+%%DATADIR%%/help/fr/about-statistics.html
+%%DATADIR%%/help/fr/rhythmdictation2-module.html
+%%DATADIR%%/help/fr/figures/statistics.png
+%%DATADIR%%/help/fr/figures/preferences-gui-interval.png
+%%DATADIR%%/help/fr/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/fr/figures/profile-manager.png
+%%DATADIR%%/help/fr/figures/preferences-external-programs.png
+%%DATADIR%%/help/fr/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/fr/figures/preferences-statistics.png
+%%DATADIR%%/help/fr/figures/rhythmtapping2.png
+%%DATADIR%%/help/fr/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/fr/figures/trainingset-editor.png
+%%DATADIR%%/help/fr/figures/nameinterval.png
+%%DATADIR%%/help/fr/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/gl/idbyname.html
+%%DATADIR%%/help/gl/rhythmdictation-module.html
+%%DATADIR%%/help/gl/rhythmdictation2-module.html
 %%DATADIR%%/help/gl/about-statistics.html
 %%DATADIR%%/help/gl/mpd-module.html
 %%DATADIR%%/help/gl/profile-manager.html
+%%DATADIR%%/help/nb/idbyname.html
+%%DATADIR%%/help/nb/rhythmdictation-module.html
+%%DATADIR%%/help/nb/rhythmdictation2-module.html
 %%DATADIR%%/help/nb/about-statistics.html
 %%DATADIR%%/help/nb/mpd-module.html
 %%DATADIR%%/help/nb/profile-manager.html
+%%DATADIR%%/help/nb/figures/id-intervals-buttons-thirds.png
+%%DATADIR%%/help/nb/figures/statistics.png
+%%DATADIR%%/help/nb/figures/preferences-gui-interval.png
+%%DATADIR%%/help/nb/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/nb/figures/profile-manager.png
+%%DATADIR%%/help/nb/figures/preferences-external-programs.png
+%%DATADIR%%/help/nb/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/nb/figures/preferences-statistics.png
+%%DATADIR%%/help/nb/figures/rhythmtapping2.png
+%%DATADIR%%/help/nb/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/nb/figures/trainingset-editor.png
+%%DATADIR%%/help/nb/figures/nameinterval.png
+%%DATADIR%%/help/nb/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/nl/idbyname.html
+%%DATADIR%%/help/nl/rhythmdictation-module.html
+%%DATADIR%%/help/nl/rhythmdictation2-module.html
 %%DATADIR%%/help/nl/about-statistics.html
 %%DATADIR%%/help/nl/mpd-module.html
 %%DATADIR%%/help/nl/profile-manager.html
-%%DATADIR%%/help/pl/extending-solfege.html
-%%DATADIR%%/help/pl/solfege-exercise-helps.html
+%%DATADIR%%/help/nl/figures/id-interval-piano.png
+%%DATADIR%%/help/nl/figures/dictation.png
+%%DATADIR%%/help/nl/figures/identifybpm.png
+%%DATADIR%%/help/nl/figures/idbyname-chords.png
+%%DATADIR%%/help/nl/figures/preferences-practise.png
+%%DATADIR%%/help/nl/figures/statistics.png
+%%DATADIR%%/help/nl/figures/preferences-sound-setup.png
+%%DATADIR%%/help/nl/figures/preferences-midi.png
+%%DATADIR%%/help/nl/figures/chord.png
+%%DATADIR%%/help/nl/figures/preferences-user.png
+%%DATADIR%%/help/nl/figures/preferences-gui-interval.png
+%%DATADIR%%/help/nl/figures/idtone.png
+%%DATADIR%%/help/nl/figures/singchord.png
+%%DATADIR%%/help/nl/figures/id-interval-buttons-thirds.png
+%%DATADIR%%/help/nl/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/nl/figures/profile-manager.png
+%%DATADIR%%/help/nl/figures/rhythm.png
+%%DATADIR%%/help/nl/figures/preferences-gui.png
+%%DATADIR%%/help/nl/figures/twelvetone.png
+%%DATADIR%%/help/nl/figures/preferences-external-programs.png
+%%DATADIR%%/help/nl/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/nl/figures/preferences-statistics.png
+%%DATADIR%%/help/nl/figures/rhythmtapping2.png
+%%DATADIR%%/help/nl/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/nl/figures/trainingset-editor.png
+%%DATADIR%%/help/nl/figures/nameinterval.png
+%%DATADIR%%/help/nl/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/nl/figures/singinterval.png
+%%DATADIR%%/help/nl/figures/idbyname-intonation.png
 %%DATADIR%%/help/pl/solfege-intro.html
+%%DATADIR%%/help/pl/idbyname.html
+%%DATADIR%%/help/pl/rhythmdictation-module.html
+%%DATADIR%%/help/pl/rhythmdictation2-module.html
+%%DATADIR%%/help/pl/solfege-exercise-helps.html
 %%DATADIR%%/help/pl/about-statistics.html
 %%DATADIR%%/help/pl/bug-reporting.html
 %%DATADIR%%/help/pl/chordvoicing-module.html
@@ -304,21 +442,82 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/pl/singchord.html
 %%DATADIR%%/help/pl/singinterval-module.html
 %%DATADIR%%/help/pl/singinterval.html
-%%DATADIR%%/help/pl/solfege-exercise-helps.html
-%%DATADIR%%/help/pl/solfege-intro.html
 %%DATADIR%%/help/pl/theory-intervals.html
 %%DATADIR%%/help/pl/trainingset-editor.html
 %%DATADIR%%/help/pl/twelvetone-module.html
 %%DATADIR%%/help/pl/twelvetone.html
+%%DATADIR%%/help/pl/figures/id-interval-piano.png
+%%DATADIR%%/help/pl/figures/dictation.png
+%%DATADIR%%/help/pl/figures/identifybpm.png
+%%DATADIR%%/help/pl/figures/idbyname-chords.png
+%%DATADIR%%/help/pl/figures/preferences-practise.png
+%%DATADIR%%/help/pl/figures/statistics.png
+%%DATADIR%%/help/pl/figures/preferences-sound-setup.png
+%%DATADIR%%/help/pl/figures/preferences-midi.png
+%%DATADIR%%/help/pl/figures/chord.png
+%%DATADIR%%/help/pl/figures/preferences-user.png
+%%DATADIR%%/help/pl/figures/preferences-gui-interval.png
+%%DATADIR%%/help/pl/figures/idtone.png
+%%DATADIR%%/help/pl/figures/singchord.png
+%%DATADIR%%/help/pl/figures/id-interval-buttons-thirds.png
+%%DATADIR%%/help/pl/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/pl/figures/profile-manager.png
+%%DATADIR%%/help/pl/figures/rhythm.png
+%%DATADIR%%/help/pl/figures/preferences-gui.png
+%%DATADIR%%/help/pl/figures/twelvetone.png
+%%DATADIR%%/help/pl/figures/preferences-external-programs.png
+%%DATADIR%%/help/pl/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/pl/figures/preferences-statistics.png
+%%DATADIR%%/help/pl/figures/rhythmtapping2.png
+%%DATADIR%%/help/pl/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/pl/figures/trainingset-editor.png
+%%DATADIR%%/help/pl/figures/nameinterval.png
+%%DATADIR%%/help/pl/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/pl/figures/singinterval.png
+%%DATADIR%%/help/pl/figures/idbyname-intonation.png
+%%DATADIR%%/help/pt_BR/idbyname.html
+%%DATADIR%%/help/pt_BR/rhythmdictation-module.html
+%%DATADIR%%/help/pt_BR/rhythmdictation2-module.html
 %%DATADIR%%/help/pt_BR/about-statistics.html
 %%DATADIR%%/help/pt_BR/mpd-module.html
 %%DATADIR%%/help/pt_BR/profile-manager.html
+%%DATADIR%%/help/pt_BR/figures/statistics.png
+%%DATADIR%%/help/pt_BR/figures/preferences-gui-interval.png
+%%DATADIR%%/help/pt_BR/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/pt_BR/figures/profile-manager.png
+%%DATADIR%%/help/pt_BR/figures/preferences-external-programs.png
+%%DATADIR%%/help/pt_BR/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/pt_BR/figures/preferences-statistics.png
+%%DATADIR%%/help/pt_BR/figures/rhythmtapping2.png
+%%DATADIR%%/help/pt_BR/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/pt_BR/figures/trainingset-editor.png
+%%DATADIR%%/help/pt_BR/figures/nameinterval.png
+%%DATADIR%%/help/pt_BR/figures/elembuilder-harmonic-progressions.png
+%%DATADIR%%/help/pt_BR/figures/idbyname-intonation.png
+%%DATADIR%%/help/ru/idbyname.html
+%%DATADIR%%/help/ru/rhythmdictation-module.html
+%%DATADIR%%/help/ru/rhythmdictation2-module.html
 %%DATADIR%%/help/ru/about-statistics.html
 %%DATADIR%%/help/ru/mpd-module.html
 %%DATADIR%%/help/ru/profile-manager.html
+%%DATADIR%%/help/tr/idbyname.html
+%%DATADIR%%/help/tr/rhythmdictation-module.html
+%%DATADIR%%/help/tr/rhythmdictation2-module.html
 %%DATADIR%%/help/tr/about-statistics.html
 %%DATADIR%%/help/tr/mpd-module.html
 %%DATADIR%%/help/tr/profile-manager.html
+%%DATADIR%%/help/tr/figures/statistics.png
+%%DATADIR%%/help/tr/figures/preferences-gui-interval.png
+%%DATADIR%%/help/tr/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/tr/figures/profile-manager.png
+%%DATADIR%%/help/tr/figures/preferences-external-programs.png
+%%DATADIR%%/help/tr/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/tr/figures/preferences-statistics.png
+%%DATADIR%%/help/tr/figures/rhythmtapping2.png
+%%DATADIR%%/help/tr/figures/preferences-gui-idtone.png
+%%DATADIR%%/help/tr/figures/trainingset-editor.png
+%%DATADIR%%/help/tr/figures/nameinterval.png
+%%DATADIR%%/help/tr/figures/elembuilder-harmonic-progressions.png
 %%DATADIR%%/exercises/standard/csound-tree.txt
 %%DATADIR%%/exercises/standard/debugtree.txt
 %%DATADIR%%/exercises/standard/learningtree.txt
@@ -725,6 +924,13 @@ share/pixmaps/solfege.png
 %%DATADIR%%/exercises/standard/lesson-files/progression-2
 %%DATADIR%%/exercises/standard/lesson-files/progression-atte
 %%DATADIR%%/exercises/standard/lesson-files/progression-x
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-6_8-2
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-3_4-2
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-3_4-1
+%%DATADIR%%/exercises/standard/lesson-files/polish-folk-songs
+%%DATADIR%%/exercises/standard/lesson-files/chord-7-inv
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-6_8-1
+%%DATADIR%%/exercises/standard/lesson-files/rhythmdict-gen-3_4-3
 %%DATADIR%%/exercises/standard/lesson-files/rhythm-all
 %%DATADIR%%/exercises/standard/lesson-files/rhythm-easy
 %%DATADIR%%/exercises/standard/lesson-files/rhythm-mid
@@ -1494,22 +1700,32 @@ share/pixmaps/solfege.png
 %%DATADIR%%/feta/feta20-rests-5.xpm
 %%DATADIR%%/feta/feta20-rests-6.xpm
 %%DATADIR%%/feta/feta20-rests-7.xpm
-%%DATADIR%%/graphics/double-flat.png
+%%DATADIR%%/graphics/tie.svg
+%%DATADIR%%/graphics/note-8.svg
+%%DATADIR%%/graphics/rest-1.svg
+%%DATADIR%%/graphics/rest-16.svg
+%%DATADIR%%/graphics/note-32.svg
+%%DATADIR%%/graphics/remove-dot.svg
+%%DATADIR%%/graphics/note-16.svg
+%%DATADIR%%/graphics/note-1.svg
+%%DATADIR%%/graphics/add-dot.svg
+%%DATADIR%%/graphics/rest-8.svg
+%%DATADIR%%/graphics/rest-32.svg
+%%DATADIR%%/graphics/note-4.svg
+%%DATADIR%%/graphics/rest-2.svg
+%%DATADIR%%/graphics/note-2.svg
+%%DATADIR%%/graphics/dot-mode.svg
+%%DATADIR%%/graphics/rest-4.svg
 %%DATADIR%%/graphics/double-flat.svg
-%%DATADIR%%/graphics/double-sharp.png
 %%DATADIR%%/graphics/double-sharp.svg
-%%DATADIR%%/graphics/erase.png
 %%DATADIR%%/graphics/erase.svg
-%%DATADIR%%/graphics/flat.png
 %%DATADIR%%/graphics/flat.svg
 %%DATADIR%%/graphics/happyface.png
 %%DATADIR%%/graphics/holder.png
 %%DATADIR%%/graphics/identify-bpm.png
 %%DATADIR%%/graphics/identify-chord.png
 %%DATADIR%%/graphics/image-not-found.png
-%%DATADIR%%/graphics/natural.png
 %%DATADIR%%/graphics/natural.svg
-%%DATADIR%%/graphics/notehead.png
 %%DATADIR%%/graphics/notehead.svg
 %%DATADIR%%/graphics/rhythm-c12c12c12.png
 %%DATADIR%%/graphics/rhythm-c12c12r12.png
@@ -1548,12 +1764,13 @@ share/pixmaps/solfege.png
 %%DATADIR%%/graphics/rhythm-r8r16c16.png
 %%DATADIR%%/graphics/rhythm-wrong.png
 %%DATADIR%%/graphics/sadface.png
-%%DATADIR%%/graphics/sharp.png
 %%DATADIR%%/graphics/sharp.svg
-%%DATADIR%%/graphics/solfege.png
 %%DATADIR%%/graphics/solfege.svg
 %%DATADIR%%/graphics/solfege.xpm
 %%DATADIR%%/graphics/test-sound.png
+%%DATADIR%%/help/C/idbyname.html
+%%DATADIR%%/help/C/rhythmdictation-module.html
+%%DATADIR%%/help/C/rhythmdictation2-module.html
 %%DATADIR%%/help/C/chordvoicing-module.html
 %%DATADIR%%/help/C/identifybpm-module.html
 %%DATADIR%%/help/C/twelvetone-module.html
@@ -1565,6 +1782,12 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/elembuilder-module.html
 %%DATADIR%%/help/C/elembuilder.html
 %%DATADIR%%/help/C/extending-solfege.html
+%%DATADIR%%/help/C/figures/preferences-gui-interval.png
+%%DATADIR%%/help/C/figures/melodicinterval-buttons.png
+%%DATADIR%%/help/C/figures/ear-training-test-printout-editor.png
+%%DATADIR%%/help/C/figures/preferences-statistics.png
+%%DATADIR%%/help/C/figures/rhythmtapping2.png
+%%DATADIR%%/help/C/figures/preferences-gui-idtone.png
 %%DATADIR%%/help/C/figures/chord.png
 %%DATADIR%%/help/C/figures/chordname-example.png
 %%DATADIR%%/help/C/figures/dictation.png
@@ -1605,19 +1828,6 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/index.html
 %%DATADIR%%/help/C/inverting-intervals.html
 %%DATADIR%%/help/C/lesson-files.html
-%%DATADIR%%/help/C/ly/inverting-intervals.png
-%%DATADIR%%/help/C/ly/theory-intervals-1.png
-%%DATADIR%%/help/C/ly/theory-intervals-fifths-1.png
-%%DATADIR%%/help/C/ly/theory-intervals-fifths-2.png
-%%DATADIR%%/help/C/ly/theory-intervals-fifths.png
-%%DATADIR%%/help/C/ly/theory-intervals-fourths.png
-%%DATADIR%%/help/C/ly/theory-intervals-seconds-1.png
-%%DATADIR%%/help/C/ly/theory-intervals-seconds-2.png
-%%DATADIR%%/help/C/ly/theory-intervals-seconds-3.png
-%%DATADIR%%/help/C/ly/theory-intervals-seconds.png
-%%DATADIR%%/help/C/ly/theory-intervals-sevenths.png
-%%DATADIR%%/help/C/ly/theory-intervals-sixths.png
-%%DATADIR%%/help/C/ly/theory-intervals-thirds.png
 %%DATADIR%%/help/C/melodicinterval-module.html
 %%DATADIR%%/help/C/melodicinterval.html
 %%DATADIR%%/help/C/midi-instrument-names.html
@@ -1901,12 +2111,6 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/theory-intervals.html
 %%DATADIR%%/help/C/trainingset-editor.html
 %%DATADIR%%/help/C/twelvetone.html
-%%DATADIR%%/help/eo/extending-solfege.html
-%%DATADIR%%/help/eo/solfege-exercise-helps.html
-%%DATADIR%%/help/eo/solfege-intro.html
-%%DATADIR%%/help/et/extending-solfege.html
-%%DATADIR%%/help/et/solfege-exercise-helps.html
-%%DATADIR%%/help/et/solfege-intro.html
 %%DATADIR%%/help/fr/chordvoicing-module.html
 %%DATADIR%%/help/fr/identifybpm-module.html
 %%DATADIR%%/help/fr/twelvetone-module.html
@@ -2464,8 +2668,6 @@ share/pixmaps/solfege.png
 %%DATADIR%%/solfege/soundcard/oss_sequencer.pyc
 %%DATADIR%%/solfege/soundcard/oss_sequencer2.py
 %%DATADIR%%/solfege/soundcard/oss_sequencer2.pyc
-%%DATADIR%%/solfege/soundcard/solfege_c_midi.py
-%%DATADIR%%/solfege/soundcard/solfege_c_midi.pyc
 %%DATADIR%%/solfege/soundcard/synth_common.py
 %%DATADIR%%/solfege/soundcard/synth_common.pyc
 %%DATADIR%%/solfege/soundcard/winsynth.py
@@ -2492,17 +2694,23 @@ share/pixmaps/solfege.png
 @dirrm %%DATADIR%%/learningtrees
 @dirrm %%DATADIR%%/help/tr/figures
 @dirrm %%DATADIR%%/help/tr
+@dirrm %%DATADIR%%/help/ru/figures
 @dirrm %%DATADIR%%/help/ru
 @dirrm %%DATADIR%%/help/pt_BR/figures
 @dirrm %%DATADIR%%/help/pt_BR
 @dirrm %%DATADIR%%/help/nb/figures
 @dirrm %%DATADIR%%/help/nb
+@dirrm %%DATADIR%%/help/nl/figures
 @dirrm %%DATADIR%%/help/nl
+@dirrm %%DATADIR%%/help/gl/figures
 @dirrm %%DATADIR%%/help/gl
 @dirrm %%DATADIR%%/help/fr/figures
 @dirrm %%DATADIR%%/help/fr
+@dirrm %%DATADIR%%/help/eo/figures
 @dirrm %%DATADIR%%/help/eo
+@dirrm %%DATADIR%%/help/et/figures
 @dirrm %%DATADIR%%/help/et
+@dirrm %%DATADIR%%/help/pl/figures
 @dirrm %%DATADIR%%/help/pl
 @dirrm %%DATADIR%%/help/C/scales/images/triads
 @dirrm %%DATADIR%%/help/C/scales/images/quadriads