From 310c3bc043cae36b5bde46cf4e4a696c1b908caf Mon Sep 17 00:00:00 2001
From: Urs Fleisch <ufleisch@users.sourceforge.net>
Date: Sat, 9 Jan 2021 18:10:05 +0100
Subject: [PATCH] Add missing 'COMPOSERSORT' property for ID3v2 tags

---
 taglib/mpeg/id3v2/id3v2frame.cpp |  3 ++-
 taglib/toolkit/tpropertymap.h    |  1 +
 tests/test_mpeg.cpp              | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index 4799c88c..27a81ada 100644
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -347,7 +347,7 @@ namespace
     { "TEXT", "LYRICIST" },
     { "TFLT", "FILETYPE" },
     //{ "TIPL", "INVOLVEDPEOPLE" }, handled separately
-    { "TIT1", "CONTENTGROUP" },
+    { "TIT1", "CONTENTGROUP" }, // 'Work' in iTunes
     { "TIT2", "TITLE"},
     { "TIT3", "SUBTITLE" },
     { "TKEY", "INITIALKEY" },
@@ -372,6 +372,7 @@ namespace
     { "TRSN", "RADIOSTATION" },
     { "TRSO", "RADIOSTATIONOWNER" },
     { "TSOA", "ALBUMSORT" },
+    { "TSOC", "COMPOSERSORT" },
     { "TSOP", "ARTISTSORT" },
     { "TSOT", "TITLESORT" },
     { "TSO2", "ALBUMARTISTSORT" }, // non-standard, used by iTunes
diff --git a/taglib/toolkit/tpropertymap.h b/taglib/toolkit/tpropertymap.h
index 5933b89b..e747a1ce 100644
--- a/taglib/toolkit/tpropertymap.h
+++ b/taglib/toolkit/tpropertymap.h
@@ -68,6 +68,7 @@ namespace TagLib {
    *  - ALBUMSORT
    *  - ARTISTSORT
    *  - ALBUMARTISTSORT
+   *  - COMPOSERSORT
    *
    * Credits:
    *
diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp
index f3b5c365..9df5c861 100644
--- a/tests/test_mpeg.cpp
+++ b/tests/test_mpeg.cpp
@@ -305,12 +305,17 @@ public:
     tags["ALBUMSORT"] = StringList("Album Sort");
     tags["ARRANGER"] = StringList("Arranger");
     tags["ARTIST"] = StringList("Artist");
+    tags["ARTISTSORT"] = StringList("Artist Sort");
     tags["ARTISTWEBPAGE"] = StringList("Artist Web Page");
+    tags["ASIN"] = StringList("ASIN");
     tags["AUDIOSOURCEWEBPAGE"] = StringList("Audio Source Web Page");
+    tags["BARCODE"] = StringList("Barcode");
     tags["BPM"] = StringList("123");
+    tags["CATALOGNUMBER"] = StringList("Catalog Number");
     tags["COMMENT"] = StringList("Comment");
     tags["COMMENT:CDESC"] = StringList("Comment with Description");
     tags["COMPOSER"] = StringList("Composer");
+    tags["COMPOSERSORT"] = StringList("Composer Sort");
     tags["CONDUCTOR"] = StringList("Conductor");
     tags["CONTENTGROUP"] = StringList("Content Group");
     tags["COPYRIGHT"] = StringList("2021 Copyright");
@@ -338,6 +343,12 @@ public:
     tags["MOOD"] = StringList("Mood");
     tags["MOVEMENTNAME"] = StringList("Movement Name");
     tags["MOVEMENTNUMBER"] = StringList("2");
+    tags["MUSICBRAINZ_ALBUMID"] = StringList("MusicBrainz_AlbumID");
+    tags["MUSICBRAINZ_ALBUMARTISTID"] = StringList("MusicBrainz_AlbumartistID");
+    tags["MUSICBRAINZ_ARTISTID"] = StringList("MusicBrainz_ArtistID");
+    tags["MUSICBRAINZ_RELEASEGROUPID"] = StringList("MusicBrainz_ReleasegroupID");
+    tags["MUSICBRAINZ_TRACKID"] = StringList("MusicBrainz_TrackID");
+    tags["MUSICBRAINZ_WORKID"] = StringList("MusicBrainz_WorkID");
     tags["ORIGINALALBUM"] = StringList("Original Album");
     tags["ORIGINALARTIST"] = StringList("Original Artist");
     tags["ORIGINALDATE"] = StringList("2021-01-03 13:52:19");
@@ -359,6 +370,7 @@ public:
     tags["RADIOSTATION"] = StringList("Radio Station");
     tags["RADIOSTATIONOWNER"] = StringList("Radio Station Owner");
     tags["REMIXER"] = StringList("Remixer");
+    tags["SCRIPT"] = StringList("Script");
     tags["SUBTITLE"] = StringList("Subtitle");
     tags["TITLE"] = StringList("Title");
     tags["TITLESORT"] = StringList("Title Sort");