Merge lp:~logan/ubuntu/quantal/libmusicbrainz/new-upstream into lp:ubuntu/quantal/libmusicbrainz

[Logan Rosen]

[Daniel Holbach (dholbach)]

Looks alright. Is there any specific reason why you "Bump Build-Depends for debhelper to >= 9."?

review: Needs Information

[Logan Rosen (logan)]

I did that because Lintian was getting angry about how debian/compat is set to "9," but debian/control requires only version 7 or up of debhelper - the Lintian website recommended increasing the version in control to greater than or equal to the compatibility value.

[Daniel Holbach (dholbach)]

Ok, that's fine then. :)

review: Approve

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2012-06-25 05:56:21 +0000
@@ -0,0 +1,9 @@
+CMakeCache.txt
+CMakeFiles/
+Doxyfile
+Makefile
+cmake_install.cmake
+config.h
+libmusicbrainz4.pc
+docs/
+install_manifest.txt
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-01 17:18:10 +0000
+++ CMakeLists.txt	2012-06-25 05:56:21 +0000
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.6)
 
 PROJECT(libmusicbrainz4)
-SET(PROJECT_VERSION 4.0.0)
+SET(PROJECT_VERSION 4.0.3)
 
 # 1. If the library source code has changed at all since the last update, then increment revision.
 # 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
 # 3. If any interfaces have been added since the last public release, then increment age.
 # 4. If any interfaces have been removed since the last public release, then set age to 0.
-SET(musicbrainz4_SOVERSION_CURRENT  3)
-SET(musicbrainz4_SOVERSION_REVISION 0)
-SET(musicbrainz4_SOVERSION_AGE      0)
+SET(musicbrainz4_SOVERSION_CURRENT  5)
+SET(musicbrainz4_SOVERSION_REVISION 1)
+SET(musicbrainz4_SOVERSION_AGE      2)
 
 MATH(EXPR musicbrainz4_SOVERSION_MAJOR "${musicbrainz4_SOVERSION_CURRENT} - ${musicbrainz4_SOVERSION_AGE}")
 MATH(EXPR musicbrainz4_SOVERSION_MINOR "${musicbrainz4_SOVERSION_AGE}")
@@ -47,6 +47,5 @@
 
 ADD_CUSTOM_TARGET(dist
     rm -rf "libmusicbrainz-${PROJECT_VERSION}"
-    COMMAND svn export http://svn.musicbrainz.org/libmusicbrainz/trunk "libmusicbrainz-${PROJECT_VERSION}"
-    COMMAND tar -zcvf "libmusicbrainz-${PROJECT_VERSION}.tar.gz" "libmusicbrainz-${PROJECT_VERSION}"
+    COMMAND git archive --prefix="libmusicbrainz-${PROJECT_VERSION}/" release-${PROJECT_VERSION} | gzip -9 > libmusicbrainz-${PROJECT_VERSION}.tar.gz
 )
 
=== modified file 'Doxyfile.cmake'
--- Doxyfile.cmake	2012-02-01 17:18:10 +0000
+++ Doxyfile.cmake	2012-06-25 05:56:21 +0000
@@ -16,5 +16,5 @@
 FULL_PATH_NAMES     = NO
 MACRO_EXPANSION     = YES
 EXPAND_ONLY_PREDEF  = YES
-PREDEFINED          = MB_API
+PREDEFINED          = LIBMB4_DEPRECATED(f)=
 REPEAT_BRIEF        = NO
 
=== modified file 'NEWS.txt'
--- NEWS.txt	2012-02-01 17:18:10 +0000
+++ NEWS.txt	2012-06-25 05:56:21 +0000
@@ -1,3 +1,29 @@
+Changes for libmusicbrainz 4.0.3
+--------------------------------
+
+   - Fix LMB-32 - Correctly ignore unrecognised nodes
+   - Don't compile using -Werror when building from tarball
+
+Changes for libmusicbrainz 4.0.2
+--------------------------------
+
+   - Add extra attributes to Alias
+   - Add IPI lists to Artist and Label
+   - Add 'Ended' to Lifespan
+   - Add PrimaryType and SecondaryTypeList to ReleaseGroup
+   - Add text based track number to Track
+   - Add ISWC list to Work
+   - Debug builds show queries and responses on stderr
+   - Documentation updates
+
+Changes for libmusicbrainz 4.0.1
+--------------------------------
+
+   - Fixed bug LMB-30 - Unable to access all relation lists on objects with
+      multiple relation lists
+   - Fixed bug LMB-31 - mb_relationlist_get_targettype always returns
+      "target-type"
+
 Changes for libmusicbrainz 4.0.0
 --------------------------------
 
 
=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2012-06-25 05:56:21 +0000
@@ -0,0 +1,44 @@
+============================
+ MusicBrainz Client Library
+============================
+
+Documentation
+-------------
+
+To get started quickly have a look at the examples directory which
+contains various sample programs. API documentation can be generated
+using [Doxygen] (http://www.stack.nl/~dimitri/doxygen/). The online version of
+the API documentation can be found at:
+
+    http://metabrainz.github.com/libmusicbrainz/
+
+Compiling and Linking
+---------------------
+
+This package provides a pkg-config script that returns the necessary compiler
+and linker flags, as well as the version number.  To build a small sample
+program one would use:
+
+    g++ -o test_app test_app.cpp `pkg-config libmusicbrainz4 --cflags --libs`
+
+If you don't want/can't use pkg-config and you are using the C API, make sure
+you link in the C++ standard library:
+
+    gcc -o test_app test_app.c -lmusicbrainz4 -lm -lstdc++
+
+Contact
+-------
+
+If you have any questions about this library, feel free to ask on the
+MusicBrainz development mailing list:
+
+    http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel
+
+Please submit bug reports to the MusicBrainz bug tracking system:
+
+    http://tickets.musicbrainz.org/browse/LMB
+
+You can find out more about the MusicBrainz project by visiting its
+site:
+
+    http://musicbrainz.org/
 
=== removed file 'README.txt'
--- README.txt	2012-02-01 17:18:10 +0000
+++ README.txt	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-============================
- MusicBrainz Client Library
-============================
-
-Documentation
-=============
-
-To get started quickly have a look at the examples directory which
-contains various sample programs. API documentation can be generated
-using Doxygen (http://www.stack.nl/~dimitri/doxygen/). Online version of
-the API documentation can be found at:
-
-  http://users.musicbrainz.org/~luks/docs/libmusicbrainz4/
-
-Compiling and Linking
-=====================
-
-This package provides a pkg-config script that returns the necessary compiler
-and linker flags, as well as the version number.  To build a small sample
-program one would use:
-
-   g++ -o test_app test_app.cpp `pkg-config libmusicbrainz4 --cflags --libs`
-
-If you don't want/can't use pkg-config and you are using the C API, make sure
-you link in the C++ standard library:
-
-   gcc -o test_app test_app.c -lmusicbrainz4 -lm -lstdc++
-
-Contact
-=======
-
-If you have any questions about this library, feel free to ask on the
-MusicBrainz development mailing list:
-
-   http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel
-
-Please submit bug reports to the MusicBrainz bug tracking system:
-
-   http://tickets.musicbrainz.org/
-
-You can find out more about the MusicBrainz project by visiting its
-site:
-
-   http://musicbrainz.org/
 
=== modified file 'config.h.cmake'
--- config.h.cmake	2012-02-01 17:18:10 +0000
+++ config.h.cmake	2012-06-25 05:56:21 +0000
@@ -4,6 +4,4 @@
 #define PACKAGE "${PROJECT_NAME}"
 #define VERSION "${PROJECT_VERSION}"
 
-#cmakedefine DISCID_FOUND
-
 #endif
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 17:18:10 +0000
+++ debian/changelog	2012-06-25 05:56:21 +0000
@@ -1,3 +1,11 @@
+libmusicbrainz (4.0.3-0ubuntu1) quantal; urgency=low
+
+  * New upstream release (LP: #1005075).
+  * Bump Standards-Version to 3.9.3.
+  * Bump Build-Depends for debhelper to >= 9.
+
+ -- Logan Rosen <[e-mail]>  Mon, 25 Jun 2012 01:45:21 -0400
+
 libmusicbrainz (4.0.0-0ubuntu1) precise; urgency=low
 
   * Merge from unreleased Debian git.
 
=== modified file 'debian/control'
--- debian/control	2012-02-01 17:18:10 +0000
+++ debian/control	2012-06-25 05:56:21 +0000
@@ -1,11 +1,11 @@
 Source: libmusicbrainz
 Priority: extra
 Maintainer: Timo Aaltonen <[e-mail]>
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 9),
  cmake,
  libneon27-gnutls-dev| libneon-dev,
  doxygen,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Section: libs
 Homepage: http://musicbrainz.org/doc/libmusicbrainz
 Vcs-Git: git://git.debian.org/collab-maint/libmusicbrainz.git
 
=== added file 'examples/.gitignore'
--- examples/.gitignore	1970-01-01 00:00:00 +0000
+++ examples/.gitignore	2012-06-25 05:56:21 +0000
@@ -0,0 +1,8 @@
+CMakeFiles/
+Makefile
+cdlookup
+cdlookup_c
+cmake_install.cmake
+collections
+search
+search_c
 
=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2012-02-01 17:18:10 +0000
+++ examples/CMakeLists.txt	2012-06-25 05:56:21 +0000
@@ -8,10 +8,16 @@
 ADD_EXECUTABLE(collections collections.cc)
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors")
+		IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+		ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic-errors")
+		IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+		ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 
=== modified file 'examples/cdlookup.cc'
--- examples/cdlookup.cc	2012-02-01 17:18:10 +0000
+++ examples/cdlookup.cc	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: cdlookup.cc 13266 2011-08-25 12:56:47Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'examples/cdlookup_c.c'
--- examples/cdlookup_c.c	2012-02-01 17:18:10 +0000
+++ examples/cdlookup_c.c	2012-06-25 05:56:21 +0000
@@ -10,7 +10,7 @@
    modify it under the terms of v2 of the GNU Lesser General Public
    License as published by the Free Software Foundation.
 
-   Flactag is distributed in the hope that it will be useful,
+   libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
=== modified file 'examples/collections.cc'
--- examples/collections.cc	2012-02-01 17:18:10 +0000
+++ examples/collections.cc	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: collections.cc 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'examples/search.cc'
--- examples/search.cc	2012-02-01 17:18:10 +0000
+++ examples/search.cc	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: search.cc 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'examples/search_c.c'
--- examples/search_c.c	2012-02-01 17:18:10 +0000
+++ examples/search_c.c	2012-06-25 05:56:21 +0000
@@ -10,7 +10,7 @@
    modify it under the terms of v2 of the GNU Lesser General Public
    License as published by the Free Software Foundation.
 
-   Flactag is distributed in the hope that it will be useful,
+   libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
=== added file 'include/musicbrainz4/.gitignore'
--- include/musicbrainz4/.gitignore	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/.gitignore	2012-06-25 05:56:21 +0000
@@ -0,0 +1,1 @@
+mb4_c.h
 
=== modified file 'include/musicbrainz4/Alias.h'
--- include/musicbrainz4/Alias.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Alias.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Alias.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -48,13 +48,18 @@
 
 		std::string Locale() const;
 		std::string Text() const;
+		std::string SortName() const;
+		std::string Type() const;
+		std::string Primary() const;
+		std::string BeginDate() const;
+		std::string EndDate() const;
 
 		virtual std::ostream& Serialise(std::ostream& os) const;
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CAliasPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/AliasList.h'
--- include/musicbrainz4/AliasList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/AliasList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: AliasList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Annotation.h'
--- include/musicbrainz4/Annotation.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Annotation.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Annotation.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -55,8 +55,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CAnnotationPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/AnnotationList.h'
--- include/musicbrainz4/AnnotationList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/AnnotationList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: AnnotationList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Artist.h'
--- include/musicbrainz4/Artist.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Artist.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Artist.h 13265 2011-08-25 12:53:44Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -29,6 +29,7 @@
 #include <iostream>
 
 #include "musicbrainz4/Entity.h"
+#include "musicbrainz4/IPIList.h"
 #include "musicbrainz4/ReleaseList.h"
 #include "musicbrainz4/AliasList.h"
 #include "musicbrainz4/RecordingList.h"
@@ -65,7 +66,20 @@
 		std::string Gender() const;
 		std::string Country() const;
 		std::string Disambiguation() const;
-		std::string IPI() const;
+
+		/**
+		 * @deprecated Returns one of the IPIs for this artist
+		 *
+		 * Returns one of the IPIs for this artist. To return all
+		 * IPIs, see MusicBrainz4::CArtist::IPIList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CArtist::IPIList</b>
+		 *
+		 * @return One of the IPIs for this artist
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CArtist::IPIList) std::string IPI() const;
+		CIPIList *IPIList() const;
 		CLifespan *Lifespan() const;
 		CAliasList *AliasList() const;
 		CRecordingList *RecordingList() const;
@@ -73,7 +87,20 @@
 		CReleaseGroupList *ReleaseGroupList() const;
 		CLabelList *LabelList() const;
 		CWorkList *WorkList() const;
-		CRelationList *RelationList() const;
+
+		/**
+		 * @deprecated Returns the <b>last</b> relation list for this artist
+		 *
+		 * Returns the <b>last</b> relation list for this artist. To return all
+		 * relation lists, see MusicBrainz4::CArtist::RelationListList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CArtist::RelationListList</b>
+		 *
+		 * @return The <b>last</b> relation list for this artist
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CArtist::RelationListList) CRelationList *RelationList() const;
+		CRelationListList *RelationListList() const;
 		CTagList *TagList() const;
 		CUserTagList *UserTagList() const;
 		CRating *Rating() const;
@@ -83,8 +110,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/ArtistCredit.h'
--- include/musicbrainz4/ArtistCredit.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ArtistCredit.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ArtistCredit.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -52,8 +52,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/ArtistList.h'
--- include/musicbrainz4/ArtistList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ArtistList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ArtistList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Attribute.h'
--- include/musicbrainz4/Attribute.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Attribute.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Attribute.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -52,8 +52,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CAttributePrivate * const m_d;
 
=== modified file 'include/musicbrainz4/AttributeList.h'
--- include/musicbrainz4/AttributeList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/AttributeList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: AttributeList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/CDStub.h'
--- include/musicbrainz4/CDStub.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/CDStub.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: CDStub.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -58,8 +58,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/CDStubList.h'
--- include/musicbrainz4/CDStubList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/CDStubList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: CDStubList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Collection.h'
--- include/musicbrainz4/Collection.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Collection.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Collection.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -53,8 +53,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/CollectionList.h'
--- include/musicbrainz4/CollectionList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/CollectionList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: CollectionList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Disc.h'
--- include/musicbrainz4/Disc.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Disc.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Disc.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -57,8 +57,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/DiscList.h'
--- include/musicbrainz4/DiscList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/DiscList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: DiscList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Entity.h'
--- include/musicbrainz4/Entity.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Entity.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Entity.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -36,6 +36,8 @@
 {
 	class CEntityPrivate;
 
+	class CRelationListList;
+
 	class CEntity
 	{
 	public:
@@ -46,7 +48,7 @@
 
 		virtual CEntity *Clone()=0;
 
-		bool Parse(const XMLNode& Node);
+		void Parse(const XMLNode& Node);
 
 		std::map<std::string,std::string> ExtAttributes() const;
 		std::map<std::string,std::string> ExtElements() const;
@@ -55,19 +57,17 @@
 		static std::string GetElementName();
 
 	protected:
+		void ProcessRelationList(const XMLNode& Node, CRelationListList* & RetVal);
+
 		template<typename T>
-		bool ProcessItem(const XMLNode& Node, T* & RetVal)
+		void ProcessItem(const XMLNode& Node, T* & RetVal)
 		{
 			RetVal=new T(Node);
-
-			return true;
 		}
 
 		template<class T>
-		bool ProcessItem(const XMLNode& Node, T& RetVal)
+		void ProcessItem(const XMLNode& Node, T& RetVal)
 		{
-			bool Ret=true;
-
 			std::stringstream os;
 			if (Node.getText())
 				os << (const char *)Node.getText();
@@ -75,51 +75,39 @@
 			os >> RetVal;
 			if (os.fail())
 			{
-				Ret=false;
 				std::cerr << "Error parsing value '";
 				if (Node.getText())
 					std::cerr << Node.getText();
 				std::cerr << "'" << std::endl;
 			}
-
-			return Ret;
 		}
 
 		template<typename T>
-		bool ProcessItem(const std::string& Text, T& RetVal)
+		void ProcessItem(const std::string& Text, T& RetVal)
 		{
-			bool Ret=true;
-
 			std::stringstream os;
 			os << Text;
 
 			os >> RetVal;
 			if (os.fail())
 			{
-				Ret=false;
 				std::cerr << "Error parsing value '" << Text << "'" << std::endl;
 			}
-
-			return Ret;
 		}
 
-		bool ProcessItem(const XMLNode& Node, std::string& RetVal)
+		void ProcessItem(const XMLNode& Node, std::string& RetVal)
 		{
 			if (Node.getText())
 				RetVal=Node.getText();
-
-			return true;
-
 		}
 
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value)=0;
-		virtual bool ParseElement(const XMLNode& Node)=0;
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value)=0;
+		virtual void ParseElement(const XMLNode& Node)=0;
 
 	private:
 		CEntityPrivate *m_d;
 
 		void Cleanup();
-
 	};
 }
 
 
=== modified file 'include/musicbrainz4/FreeDBDisc.h'
--- include/musicbrainz4/FreeDBDisc.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/FreeDBDisc.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: FreeDBDisc.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -58,8 +58,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/FreeDBDiscList.h'
--- include/musicbrainz4/FreeDBDiscList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/FreeDBDiscList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: FreeDBDiscList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/HTTPFetch.h'
--- include/musicbrainz4/HTTPFetch.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/HTTPFetch.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: HTTPFetch.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== added file 'include/musicbrainz4/IPI.h'
--- include/musicbrainz4/IPI.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/IPI.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,63 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2012 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_IPI_H
+#define _MUSICBRAINZ4_IPI_H
+
+#include <string>
+#include <iostream>
+
+#include "musicbrainz4/Entity.h"
+
+#include "musicbrainz4/xmlParser.h"
+
+namespace MusicBrainz4
+{
+	class CIPIPrivate;
+
+	class CIPI: public CEntity
+	{
+	public:
+		CIPI(const XMLNode& Node=XMLNode::emptyNode());
+		CIPI(const CIPI& Other);
+		CIPI& operator =(const CIPI& Other);
+		virtual ~CIPI();
+
+		virtual CIPI *Clone();
+
+		std::string IPI() const;
+
+		virtual std::ostream& Serialise(std::ostream& os) const;
+		static std::string GetElementName();
+
+	protected:
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
+
+	private:
+		CIPIPrivate * const m_d;
+	};
+}
+
+#endif
 
=== added file 'include/musicbrainz4/IPIList.h'
--- include/musicbrainz4/IPIList.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/IPIList.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,37 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2011 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_IPI_LIST_H
+#define _MUSICBRAINZ4_IPI_LIST_H
+
+#include "musicbrainz4/ListImpl.h"
+
+namespace MusicBrainz4
+{
+	class CIPI;
+
+	typedef CListImpl<CIPI> CIPIList;
+}
+
+#endif
 
=== modified file 'include/musicbrainz4/ISRC.h'
--- include/musicbrainz4/ISRC.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ISRC.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ISRC.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -51,8 +51,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/ISRCList.h'
--- include/musicbrainz4/ISRCList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ISRCList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ISRCList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== added file 'include/musicbrainz4/ISWC.h'
--- include/musicbrainz4/ISWC.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/ISWC.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,65 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2012 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_ISWC_H
+#define _MUSICBRAINZ4_ISWC_H
+
+#include <string>
+#include <iostream>
+
+#include "musicbrainz4/Entity.h"
+
+#include "musicbrainz4/xmlParser.h"
+
+namespace MusicBrainz4
+{
+	class CISWCPrivate;
+
+	class CISWC: public CEntity
+	{
+	public:
+		CISWC(const XMLNode& Node=XMLNode::emptyNode());
+		CISWC(const CISWC& Other);
+		CISWC& operator =(const CISWC& Other);
+		virtual ~CISWC();
+
+		virtual CISWC *Clone();
+
+		std::string ISWC() const;
+
+		virtual std::ostream& Serialise(std::ostream& os) const;
+		static std::string GetElementName();
+
+	protected:
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
+
+	private:
+		void Cleanup();
+
+		CISWCPrivate * const m_d;
+	};
+}
+
+#endif
 
=== added file 'include/musicbrainz4/ISWCList.h'
--- include/musicbrainz4/ISWCList.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/ISWCList.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,62 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2012 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_ISWC_LIST_H
+#define _MUSICBRAINZ4_ISWC_LIST_H
+
+#include <string>
+#include <iostream>
+
+#include "musicbrainz4/ListImpl.h"
+
+#include "musicbrainz4/xmlParser.h"
+
+namespace MusicBrainz4
+{
+	class CISWC;
+	class CISWCListPrivate;
+
+	class CISWCList: public CListImpl<CISWC>
+	{
+	public:
+		CISWCList(const XMLNode& Node=XMLNode::emptyNode());
+		CISWCList(const CISWCList& Other);
+		CISWCList& operator =(const CISWCList& Other);
+		virtual ~CISWCList();
+
+		virtual CISWCList *Clone();
+
+		virtual std::ostream& Serialise(std::ostream& os) const;
+		static std::string GetElementName();
+
+	protected:
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
+
+	private:
+		CISWCListPrivate * const m_d;
+	};
+}
+
+#endif
 
=== modified file 'include/musicbrainz4/Label.h'
--- include/musicbrainz4/Label.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Label.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Label.h 13265 2011-08-25 12:53:44Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -29,6 +29,7 @@
 #include <iostream>
 
 #include "musicbrainz4/Entity.h"
+#include "musicbrainz4/IPIList.h"
 #include "musicbrainz4/ReleaseList.h"
 #include "musicbrainz4/AliasList.h"
 #include "musicbrainz4/RelationList.h"
@@ -60,13 +61,39 @@
 		std::string Name() const;
 		std::string SortName() const;
 		int LabelCode() const;
-		std::string IPI() const;
+
+		/**
+		 * @deprecated Returns one of the IPIs for this label
+		 *
+		 * Returns one of the IPIs for this label. To return all
+		 * IPIs, see MusicBrainz4::CLabel::IPIList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CLabel::IPIList</b>
+		 *
+		 * @return One of the IPIs for this label
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CLabel::IPIList) std::string IPI() const;
+		CIPIList *IPIList() const;
 		std::string Disambiguation() const;
 		std::string Country() const;
 		CLifespan *Lifespan() const;
 		CAliasList *AliasList() const;
 		CReleaseList *ReleaseList() const;
-		CRelationList *RelationList() const;
+
+		/**
+		 * @deprecated Returns the <b>last</b> relation list for this label
+		 *
+		 * Returns the <b>last</b> relation list for this label. To return all
+		 * relation lists, see MusicBrainz4::CLabel::RelationListList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CLabel::RelationListList</b>
+		 *
+		 * @return The <b>last</b> relation list for this label
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CLabel::RelationListList) CRelationList *RelationList() const;
+		CRelationListList *RelationListList() const;
 		CTagList *TagList() const;
 		CUserTagList *UserTagList() const;
 		CRating *Rating() const;
@@ -76,8 +103,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/LabelInfo.h'
--- include/musicbrainz4/LabelInfo.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/LabelInfo.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: LabelInfo.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -55,8 +55,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/LabelInfoList.h'
--- include/musicbrainz4/LabelInfoList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/LabelInfoList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: LabelInfoList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/LabelList.h'
--- include/musicbrainz4/LabelList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/LabelList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: LabelList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Lifespan.h'
--- include/musicbrainz4/Lifespan.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Lifespan.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Lifespan.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -48,13 +48,14 @@
 
 		std::string Begin() const;
 		std::string End() const;
+		std::string Ended() const;
 
 		virtual std::ostream& Serialise(std::ostream& os) const;
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CLifespanPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/List.h'
--- include/musicbrainz4/List.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/List.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: List.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -51,8 +51,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 		void AddItem(CEntity *Item);
 		CEntity *Item(int Item) const;
 
=== modified file 'include/musicbrainz4/ListImpl.h'
--- include/musicbrainz4/ListImpl.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ListImpl.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ListImpl.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -101,26 +101,20 @@
 		}
 
 	protected:
-		bool ParseElement(const XMLNode& Node)
+		void ParseElement(const XMLNode& Node)
 		{
-			bool RetVal=true;
-
 			std::string NodeName=Node.getName();
 
 			if (T::GetElementName()==NodeName)
 			{
 				T *Item=0;
 
-				RetVal=ProcessItem(Node,Item);
-				if (RetVal)
-					AddItem(Item);
+				ProcessItem(Node,Item);
+				AddItem(Item);
 			}
 			else
-				RetVal=CList::ParseElement(Node);
-
-			return RetVal;
+				CList::ParseElement(Node);
 		}
-
 	};
 }
 
 
=== modified file 'include/musicbrainz4/Medium.h'
--- include/musicbrainz4/Medium.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Medium.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Medium.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -60,8 +60,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/MediumList.h'
--- include/musicbrainz4/MediumList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/MediumList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: MediumList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -53,8 +53,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CMediumListPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/Message.h'
--- include/musicbrainz4/Message.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Message.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Message.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -52,8 +52,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CMessagePrivate * const m_d;
 
=== modified file 'include/musicbrainz4/Metadata.h'
--- include/musicbrainz4/Metadata.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Metadata.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Metadata.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -112,8 +112,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/NameCredit.h'
--- include/musicbrainz4/NameCredit.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/NameCredit.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: NameCredit.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -56,8 +56,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/NameCreditList.h'
--- include/musicbrainz4/NameCreditList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/NameCreditList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: NameCreditList.h 13254 2011-08-09 09:29:20Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/NonMBTrack.h'
--- include/musicbrainz4/NonMBTrack.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/NonMBTrack.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: NonMBTrack.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -54,8 +54,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CNonMBTrackPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/NonMBTrackList.h'
--- include/musicbrainz4/NonMBTrackList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/NonMBTrackList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: NonMBTrackList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/PUID.h'
--- include/musicbrainz4/PUID.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/PUID.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: PUID.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -53,8 +53,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/PUIDList.h'
--- include/musicbrainz4/PUIDList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/PUIDList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: PUIDList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Query.h'
--- include/musicbrainz4/Query.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Query.h	2012-06-25 05:56:21 +0000
@@ -18,13 +18,17 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Query.h 13266 2011-08-25 12:56:47Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 #ifndef _MUSICBRAINZ4_QUERY_H
 #define _MUSICBRAINZ4_QUERY_H
 
+#include "defines.h"
+
+#include "Entity.h"
+
 #include "musicbrainz4/ReleaseList.h"
 #include "musicbrainz4/Metadata.h"
 
@@ -47,6 +51,23 @@
  * Please report any issues with this library at
  * <a target="_blank" href="http://tickets.musicbrainz.org/">http://tickets.musicbrainz.org/</a>.
  *
+ * @par Compiling and Linking
+ *
+ * This package provides a pkg-config script that returns the necessary compiler
+ * and linker flags, as well as the version number.  To build a small sample
+ * program one would use:
+ *
+ * @par
+ *     <tt>g++ -o test_app test_app.cpp `pkg-config libmusicbrainz4 --cflags --libs`</tt>
+ *
+ * If you don't want/can't use pkg-config and you are using the C API, make sure
+ * you link in the C++ standard library:
+ *
+ * @par
+ *     <tt>gcc -o test_app test_app.c -lmusicbrainz4 -lm -lstdc++</tt>
+ *
+ * @par Example:
+ *
  * A brief example showing how to lookup a list of releases matching a disc id
  *
 @code
 
=== modified file 'include/musicbrainz4/Rating.h'
--- include/musicbrainz4/Rating.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Rating.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Rating.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -52,8 +52,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CRatingPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/Recording.h'
--- include/musicbrainz4/Recording.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Recording.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Recording.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -69,7 +69,20 @@
 		CReleaseList *ReleaseList() const;
 		CPUIDList *PUIDList() const;
 		CISRCList *ISRCList() const;
-		CRelationList *RelationList() const;
+
+		/**
+		 * @deprecated Returns the <b>last</b> relation list for this recording
+		 *
+		 * Returns the <b>last</b> relation list for this recording. To return all
+		 * relation lists, see MusicBrainz4::CRecording::RelationListList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CRecording::RelationListList</b>
+		 *
+		 * @return The <b>last</b> relation list for this recording
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CRecording::RelationListList) CRelationList *RelationList() const;
+		CRelationListList *RelationListList() const;
 		CTagList *TagList() const;
 		CUserTagList *UserTagList() const;
 		CRating *Rating() const;
@@ -79,8 +92,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/RecordingList.h'
--- include/musicbrainz4/RecordingList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/RecordingList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: RecordingList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Relation.h'
--- include/musicbrainz4/Relation.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Relation.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Relation.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -71,8 +71,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/RelationList.h'
--- include/musicbrainz4/RelationList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/RelationList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: RelationList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -53,8 +53,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CRelationListPrivate * const m_d;
 
=== added file 'include/musicbrainz4/RelationListList.h'
--- include/musicbrainz4/RelationListList.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/RelationListList.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,63 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2011 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_RELATIONLIST_GROUP_H
+#define _MUSICBRAINZ4_RELATIONLIST_GROUP_H
+
+#include <iostream>
+
+#include "musicbrainz4/xmlParser.h"
+
+namespace MusicBrainz4
+{
+	class CRelationListListPrivate;
+
+	class CRelationList;
+
+	class CRelationListList
+	{
+	public:
+		CRelationListList();
+		CRelationListList(const CRelationListList& Other);
+		CRelationListList& operator =(const CRelationListList& Other);
+		virtual ~CRelationListList();
+
+		void Add(CRelationList *RelationList);
+		int NumItems() const;
+		CRelationList *Item(int Item) const;
+		int Offset() const { return 0; }
+		int Count() const { return NumItems(); }
+
+		std::ostream& Serialise(std::ostream& os) const;
+
+	private:
+		void Cleanup();
+
+		CRelationListListPrivate * const m_d;
+	};
+}
+
+std::ostream& operator << (std::ostream& os, const MusicBrainz4::CRelationListList& RelationListList);
+
+#endif
 
=== modified file 'include/musicbrainz4/Release.h'
--- include/musicbrainz4/Release.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Release.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Release.h 13385 2012-01-15 15:19:56Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -70,7 +70,20 @@
 		std::string ASIN() const;
 		CLabelInfoList *LabelInfoList() const;
 		CMediumList *MediumList() const;
-		CRelationList *RelationList() const;
+
+		/**
+		 * @deprecated Returns the <b>last</b> relation list for this release
+		 *
+		 * Returns the <b>last</b> relation list for this release. To return all
+		 * relation lists, see MusicBrainz4::CRelease::RelationListList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CRelease::RelationListList</b>
+		 *
+		 * @return The <b>last</b> relation list for this release
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CRelease::RelationListList) CRelationList *RelationList() const;
+		CRelationListList *RelationListList() const;
 		CCollectionList *CollectionList() const;
 
 		CMediumList MediaMatchingDiscID(const std::string& DiscID) const;
@@ -79,8 +92,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/ReleaseGroup.h'
--- include/musicbrainz4/ReleaseGroup.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ReleaseGroup.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ReleaseGroup.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -33,6 +33,7 @@
 #include "musicbrainz4/RelationList.h"
 #include "musicbrainz4/TagList.h"
 #include "musicbrainz4/UserTagList.h"
+#include "musicbrainz4/SecondaryTypeList.h"
 
 #include "musicbrainz4/xmlParser.h"
 
@@ -43,6 +44,7 @@
 	class CArtistCredit;
 	class CRating;
 	class CUserRating;
+	class CSecondaryType;
 
 	class CReleaseGroup: public CEntity
 	{
@@ -55,24 +57,51 @@
 		virtual CReleaseGroup *Clone();
 
 		std::string ID() const;
-		std::string Type() const;
+
+		/**
+		 * @deprecated Returns the type for this release group
+		 *
+		 * Returns the type for this release group.
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CReleaseGroup::PrimaryType
+		 * and MusicBrainz4::CReleaseGroup::SecondaryTypeList</b>
+		 *
+		 * @return The type for this release group
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CReleaseGroup::PrimaryType) std::string Type() const;
+		std::string PrimaryType() const;
 		std::string Title() const;
 		std::string Disambiguation() const;
 		std::string FirstReleaseDate() const;
 		CArtistCredit *ArtistCredit() const;
 		CReleaseList *ReleaseList() const;
-		CRelationList *RelationList() const;
+
+		/**
+		 * @deprecated Returns the <b>last</b> relation list for this release group
+		 *
+		 * Returns the <b>last</b> relation list for this release group. To return all
+		 * relation lists, see MusicBrainz4::CReleaseGroup::RelationListList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CReleaseGroup::RelationListList</b>
+		 *
+		 * @return The <b>last</b> relation list for this release group
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CReleaseGroup::RelationListList) CRelationList *RelationList() const;
+		CRelationListList *RelationListList() const;
 		CTagList *TagList() const;
 		CUserTagList *UserTagList() const;
 		CRating *Rating() const;
 		CUserRating *UserRating() const;
+		CSecondaryTypeList *SecondaryTypeList() const;
 
 		virtual std::ostream& Serialise(std::ostream& os) const;
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/ReleaseGroupList.h'
--- include/musicbrainz4/ReleaseGroupList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ReleaseGroupList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ReleaseGroupList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/ReleaseList.h'
--- include/musicbrainz4/ReleaseList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/ReleaseList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: ReleaseList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== added file 'include/musicbrainz4/SecondaryType.h'
--- include/musicbrainz4/SecondaryType.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/SecondaryType.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,65 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2012 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_SECONDARY_TYPE_H
+#define _MUSICBRAINZ4_SECONDARY_TYPE_H
+
+#include <string>
+#include <iostream>
+
+#include "musicbrainz4/Entity.h"
+
+#include "musicbrainz4/xmlParser.h"
+
+namespace MusicBrainz4
+{
+	class CSecondaryTypePrivate;
+
+	class CSecondaryType: public CEntity
+	{
+	public:
+		CSecondaryType(const XMLNode& Node=XMLNode::emptyNode());
+		CSecondaryType(const CSecondaryType& Other);
+		CSecondaryType& operator =(const CSecondaryType& Other);
+		virtual ~CSecondaryType();
+
+		virtual CSecondaryType *Clone();
+
+		std::string SecondaryType() const;
+
+		virtual std::ostream& Serialise(std::ostream& os) const;
+		static std::string GetElementName();
+
+	protected:
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
+
+	private:
+		void Cleanup();
+
+		CSecondaryTypePrivate * const m_d;
+	};
+}
+
+#endif
 
=== added file 'include/musicbrainz4/SecondaryTypeList.h'
--- include/musicbrainz4/SecondaryTypeList.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/SecondaryTypeList.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,62 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2012 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _MUSICBRAINZ4_SECONDARY_TYPE_LIST_H
+#define _MUSICBRAINZ4_SECONDARY_TYPE_LIST_H
+
+#include <string>
+#include <iostream>
+
+#include "musicbrainz4/ListImpl.h"
+
+#include "musicbrainz4/xmlParser.h"
+
+namespace MusicBrainz4
+{
+	class CSecondaryType;
+	class CSecondaryTypeListPrivate;
+
+	class CSecondaryTypeList: public CListImpl<CSecondaryType>
+	{
+	public:
+		CSecondaryTypeList(const XMLNode& Node=XMLNode::emptyNode());
+		CSecondaryTypeList(const CSecondaryTypeList& Other);
+		CSecondaryTypeList& operator =(const CSecondaryTypeList& Other);
+		virtual ~CSecondaryTypeList();
+
+		virtual CSecondaryTypeList *Clone();
+
+		virtual std::ostream& Serialise(std::ostream& os) const;
+		static std::string GetElementName();
+
+	protected:
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
+
+	private:
+		CSecondaryTypeListPrivate * const m_d;
+	};
+}
+
+#endif
 
=== modified file 'include/musicbrainz4/Tag.h'
--- include/musicbrainz4/Tag.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Tag.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Tag.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -53,8 +53,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CTagPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/TagList.h'
--- include/musicbrainz4/TagList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/TagList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: TagList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/TextRepresentation.h'
--- include/musicbrainz4/TextRepresentation.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/TextRepresentation.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: TextRepresentation.h 13263 2011-08-25 12:38:04Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -53,8 +53,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CTextRepresentationPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/Track.h'
--- include/musicbrainz4/Track.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Track.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Track.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -54,13 +54,14 @@
 		CRecording *Recording() const;
 		int Length() const;
 		CArtistCredit *ArtistCredit() const;
+		std::string Number() const;
 
 		virtual std::ostream& Serialise(std::ostream& os) const;
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/TrackList.h'
--- include/musicbrainz4/TrackList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/TrackList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: TrackList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/UserRating.h'
--- include/musicbrainz4/UserRating.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/UserRating.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: UserRating.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -51,8 +51,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CUserRatingPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/UserTag.h'
--- include/musicbrainz4/UserTag.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/UserTag.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: UserTag.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -52,8 +52,8 @@
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		CUserTagPrivate * const m_d;
 
=== modified file 'include/musicbrainz4/UserTagList.h'
--- include/musicbrainz4/UserTagList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/UserTagList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: UserTagList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== modified file 'include/musicbrainz4/Work.h'
--- include/musicbrainz4/Work.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/Work.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: Work.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
@@ -32,6 +32,7 @@
 #include "musicbrainz4/RelationList.h"
 #include "musicbrainz4/TagList.h"
 #include "musicbrainz4/UserTagList.h"
+#include "musicbrainz4/ISWCList.h"
 
 #include "musicbrainz4/xmlParser.h"
 
@@ -58,21 +59,49 @@
 		std::string Type() const;
 		std::string Title() const;
 		CArtistCredit *ArtistCredit() const;
-		std::string ISWC() const;
+
+		/**
+		 * @deprecated Returns the <b>first</b> ISWC for this work
+		 *
+		 * Returns the <b>first</b> ISWC for this work. To return all
+		 * ISWCs, see MusicBrainz4::CWork::ISWCList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CWork::ISWCList</b>
+		 *
+		 * @return The <b>first</b> ISWC for this work
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CWork::ISWCList) std::string ISWC() const;
+
+		CISWCList *ISWCList() const;
 		std::string Disambiguation() const;
 		CAliasList *AliasList() const;
-		CRelationList *RelationList() const;
+
+		/**
+		 * @deprecated Returns the <b>last</b> relation list for this work
+		 *
+		 * Returns the <b>last</b> relation list for this work. To return all
+		 * relation lists, see MusicBrainz4::CWork::RelationListList
+		 *
+		 * <b>This method is deprecated, please use MusicBrainz4::CWork::RelationListList</b>
+		 *
+		 * @return The <b>last</b> relation list for this work
+		 */
+
+		LIBMB4_DEPRECATED(MusicBrainz4::CWork::RelationListList) CRelationList *RelationList() const;
+		CRelationListList *RelationListList() const;
 		CTagList *TagList() const;
 		CUserTagList *UserTagList() const;
 		CRating *Rating() const;
 		CUserRating *UserRating() const;
+		std::string Language() const;
 
 		virtual std::ostream& Serialise(std::ostream& os) const;
 		static std::string GetElementName();
 
 	protected:
-		virtual bool ParseAttribute(const std::string& Name, const std::string& Value);
-		virtual bool ParseElement(const XMLNode& Node);
+		virtual void ParseAttribute(const std::string& Name, const std::string& Value);
+		virtual void ParseElement(const XMLNode& Node);
 
 	private:
 		void Cleanup();
 
=== modified file 'include/musicbrainz4/WorkList.h'
--- include/musicbrainz4/WorkList.h	2012-02-01 17:18:10 +0000
+++ include/musicbrainz4/WorkList.h	2012-06-25 05:56:21 +0000
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-     $Id: WorkList.h 13259 2011-08-10 12:02:50Z adhawkins $
+     $Id$
 
 ----------------------------------------------------------------------------*/
 
 
=== added file 'include/musicbrainz4/defines.h'
--- include/musicbrainz4/defines.h	1970-01-01 00:00:00 +0000
+++ include/musicbrainz4/defines.h	2012-06-25 05:56:21 +0000
@@ -0,0 +1,42 @@
+/* --------------------------------------------------------------------------
+
+   libmusicbrainz4 - Client library to access MusicBrainz
+
+   Copyright (C) 2012 Andrew Hawkins
+
+   This file is part of libmusicbrainz4.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of v2 of the GNU Lesser General Public
+   License as published by the Free Software Foundation.
+
+   libmusicbrainz4 is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+     $Id$
+
+----------------------------------------------------------------------------*/
+
+#ifndef _DEFINES_H
+#define _DEFINES_H
+
+#if defined(__GNUC__) && __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+
+#define LIBMB4_DEPRECATED(f) __attribute__((deprecated("Use '" #f "' instead")))
+
+#elif defined(__GNUC__) && __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+
+#define LIBMB4_DEPRECATED(f) __attribute__ ((deprecated))
+
+#else
+
+#define LIBMB4_DEPRECATED(f)
+
+#endif
+
+#endif
 
=== removed directory 'schema'
=== removed file 'schema/musicbrainz_mmd-1.0.rng'
--- schema/musicbrainz_mmd-1.0.rng	2012-02-01 17:18:10 +0000
+++ schema/musicbrainz_mmd-1.0.rng	1970-01-01 00:00:00 +0000
@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ==================================================================
-     $Id: musicbrainz_mmd-1.0.rng 7511 2006-05-10 20:06:24Z matt $
-
-     Relax NG Schema for MusicBrainz XML Metadata Version 1.0
-
-
-     This XML schema has been designed to represent music metadata.
-     Documentation and the latest revision can be found at
-
-        http://musicbrainz.org/development/mmd/
-
-
-     Copyright (c) 2006 Robert Kaye, Matthias Friedrich
-   
-     The schema is released under the Creative Commons 
-     Attribution-ShareAlike 2.5 license.
-
-     http://creativecommons.org/licenses/by-sa/2.5/
-
-     ================================================================== -->
-
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         ns="http://musicbrainz.org/ns/mmd-1.0#">
-
-
-    <start>
-        <ref name="def_metadata-element"/>
-    </start>
-
-
-    <define name="def_metadata-element">
-        <element name="metadata">
-            <optional>
-                <attribute name="generator">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="created">
-                    <data type="dateTime"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <ref name="def_artist-element"/>
-            </optional>
-            <optional>
-                <ref name="def_release-element"/>
-            </optional>
-            <optional>
-                <ref name="def_track-element"/>
-            </optional>
-
-            <optional>
-                <ref name="def_artist-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-                
-            <ref name="def_metadata-element_extension"/>
-        </element>
-    </define>
-
-
-    <define name="def_artist-element">
-        <element name="artist">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <ref name="def_artist-attribute_extension"/>
-
-            <optional>
-                <element name="name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="sort-name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="disambiguation">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="life-span">
-                    <optional>
-                        <attribute name="begin">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="end">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-
-            <optional>
-                <ref name="def_alias-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <ref name="def_artist-element_extension"/>
-        </element>
-    </define>
-
-
-    <define name="def_release-element">
-        <element name="release">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <ref name="def_release-attribute_extension"/>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="text-representation">
-                    <optional>
-                        <attribute name="language">
-                            <ref name="def_iso-639"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="script">
-                            <ref name="def_iso-15924"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-            <optional>
-                <element name="asin">
-                    <data type="string">
-                        <param name="pattern">[A-Z0-9]{10}</param>
-                    </data>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist-element"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-event-list"/>
-            </optional>
-            <optional>
-                <ref name="def_disc-list"/>
-            </optional>
-            <optional>
-                <ref name="def_puid-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <ref name="def_release-element_extension"/>
-        </element>
-    </define>
-
-
-    <define name="def_track-element">
-        <element name="track">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <ref name="def_track-attribute_extension"/>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="duration">
-                    <data type="nonNegativeInteger"/>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist-element"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_puid-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <ref name="def_track-element_extension"/>
-        </element>
-    </define>
-
-
-    <define name="def_relation-element">
-        <element name="relation">
-            <attribute name="type">
-                <data type="anyURI"/>
-            </attribute>
-            <attribute name="target">
-                <data type="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="direction">
-                    <ref name="def_direction"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="attributes">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="begin">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="end">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <choice>
-                    <ref name="def_artist-element"/>
-                    <ref name="def_release-element"/>
-                    <ref name="def_track-element"/>
-
-                    <ref name="def_relation-element_extension"/>
-                </choice>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_alias">
-        <element name="alias">
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="script">
-                    <ref name="def_iso-15924"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </define>
-
-
-    <!--
-        This part defines the extensions elements and attributes.
-    -->
-
-    <define name="def_metadata-element_extension">
-        <optional>
-            <ref name="def_extension_element"/>
-        </optional>
-    </define>
-
-
-    <define name="def_artist-element_extension">
-        <zeroOrMore>
-            <ref name="def_extension_element"/>
-        </zeroOrMore>
-    </define>
-
-
-    <define name="def_release-element_extension">
-        <zeroOrMore>
-            <ref name="def_extension_element"/>
-        </zeroOrMore>
-    </define>
-
-
-    <define name="def_track-element_extension">
-        <zeroOrMore>
-            <ref name="def_extension_element"/>
-        </zeroOrMore>
-    </define>
-
-
-    <define name="def_relation-element_extension">
-        <ref name="def_extension_element"/>
-    </define>
-
-
-    <define name="def_artist-attribute_extension">
-        <zeroOrMore>
-            <ref name="def_extension_attribute"/>
-        </zeroOrMore>
-    </define>
-
-
-    <define name="def_release-attribute_extension">
-        <zeroOrMore>
-            <ref name="def_extension_attribute"/>
-        </zeroOrMore>
-    </define>
-
-
-    <define name="def_track-attribute_extension">
-        <zeroOrMore>
-            <ref name="def_extension_attribute"/>
-        </zeroOrMore>
-    </define>
-
-
-    <define name="def_extension_element">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns="http://musicbrainz.org/ns/mmd-1.0#"/>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                        <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_extension_attribute">
-	<attribute>
-	<anyName>
-            <except>
-                <nsName ns="http://musicbrainz.org/ns/mmd-1.0#"/>
-                <nsName ns=""/>
-            </except>
-	</anyName>
-	</attribute>
-    </define>
-
-
-    <define name="def_anything">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                    <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_artist-list">
-        <element name="artist-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_artist-element"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-list">
-        <element name="release-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_release-element"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_alias-list">
-        <element name="alias-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_alias"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track-list">
-        <element name="track-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_track-element"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-event-list">
-        <element name="release-event-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="event">
-                    <attribute name="date">
-                        <ref name="def_incomplete-date"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="country">
-                            <ref name="def_iso-3166"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_disc-list">
-        <element name="disc-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="disc">
-                    <attribute name="id">
-                        <data type="string">
-                            <param name="pattern">[a-zA-Z0-9._]{27}-</param>
-                        </data>
-                    </attribute>
-                    <optional>
-                        <attribute name="sectors">
-                            <data type="nonNegativeInteger"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_puid-list">
-        <element name="puid-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="puid">
-                    <attribute name="id">
-                        <ref name="def_uuid"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation-list">
-        <element name="relation-list">
-            <attribute name="target-type">
-                <data type="anyURI"/>
-            </attribute>
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_relation-element"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_list-attributes">
-        <optional>
-            <attribute name="count">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="offset">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </define>
-
-
-    <!-- A space separated list of URIs, relative ones are possible, too. -->
-    <define name="def_URI-list">
-        <list>
-            <oneOrMore>
-                <data type="anyURI"/>
-            </oneOrMore>
-        </list>
-    </define>
-
-
-    <!-- A date with varying precision in format 'YYYY-MM-DD'. -->
-    <define name="def_incomplete-date">
-        <data type="string">
-            <param name="pattern">[0-9]{4}(-[0-9]{2})?(-[0-9]{2})?</param>
-        </data>
-    </define>
-
-
-    <!-- A two-letter country code like 'DE', 'UK', 'FR' etc. -->
-    <define name="def_iso-3166">
-        <data type="string">
-            <param name="pattern">[A-Z]{2}</param>
-        </data>
-    </define>
-
-
-    <!-- An ISO-639-2/T language code like 'DEU', 'ENG', 'JPN' etc. -->
-    <define name="def_iso-639">
-        <data type="string">
-            <param name="pattern">[A-Z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A four-letter script code like 'Latn', 'Cyrl', etc. -->
-    <define name="def_iso-15924">
-        <data type="string">
-            <param name="pattern">[A-Z][a-z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A 128 Bit UUID in its standard ASCII representation. -->
-    <define name="def_uuid">
-        <data type="string">
-            <param name="pattern">[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}</param>
-        </data>
-    </define>
-
-
-    <!-- Reading direction of a relation. Defaults to "both". -->
-    <define name="def_direction">
-        <choice>
-            <value>both</value>
-            <value>forward</value>
-            <value>backward</value>
-        </choice>
-    </define>
-
-</grammar>
 
=== removed file 'schema/musicbrainz_mmd-1.0rc1.rng'
--- schema/musicbrainz_mmd-1.0rc1.rng	2012-02-01 17:18:10 +0000
+++ schema/musicbrainz_mmd-1.0rc1.rng	1970-01-01 00:00:00 +0000
@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ==================================================================
-     $Id: musicbrainz_mmd-1.0rc1.rng 36 2006-01-30 10:23:03Z matt $
-
-     Relax NG Schema for MusicBrainz XML Metadata Version 1.0rc1
-
-
-     This XML schema has been designed to represent music metadata.
-     Documentation and the latest revision can be found at
-
-        http://musicbrainz.org/development/mmd/
-
-
-     Copyright (c) 2006 Robert Kaye, Matthias Friedrich
-   
-     The schema is released under the Creative Commons 
-     Attribution-ShareAlike 2.5 license.
-
-     http://creativecommons.org/licenses/by-sa/2.5/
-
-     ================================================================== -->
-
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         ns="http://musicbrainz.org/ns/mmd-1.0#">
-
-
-    <start>
-        <ref name="def_metadata"/>
-    </start>
-
-
-    <define name="def_metadata">
-        <element name="metadata">
-            <optional>
-                <attribute name="generator">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="created">
-                    <data type="dateTime"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-            <optional>
-                <ref name="def_release"/>
-            </optional>
-            <optional>
-                <ref name="def_track"/>
-            </optional>
-
-            <optional>
-                <ref name="def_artist-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-                
-            <optional>
-                <ref name="def_extension"/>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_artist">
-        <element name="artist">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="sort-name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="life-span">
-                    <optional>
-                        <attribute name="begin">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="end">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release">
-        <element name="release">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="text-representation">
-                    <optional>
-                        <attribute name="language">
-                            <ref name="def_iso-639"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="script">
-                            <ref name="def_iso-15924"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-            <optional>
-                <element name="asin">
-                    <data type="string">
-                        <param name="pattern">[A-Z0-9]{10}</param>
-                    </data>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-info-list"/>
-            </optional>
-            <optional>
-                <ref name="def_disc-list"/>
-            </optional>
-            <optional>
-                <ref name="def_trmid-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track">
-        <element name="track">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="duration">
-                    <data type="nonNegativeInteger"/>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_trmid-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation">
-        <element name="relation">
-            <attribute name="type">
-                <data type="anyURI"/>
-            </attribute>
-            <attribute name="target">
-                <data type="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="direction">
-                    <ref name="def_direction"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="attributes">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="begin">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="end">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <choice>
-                    <ref name="def_artist"/>
-                    <ref name="def_release"/>
-                    <ref name="def_track"/>
-
-                    <ref name="def_extension"/>
-                </choice>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_extension">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns="http://musicbrainz.org/ns/mmd-1.0#"/>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                        <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_anything">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                    <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_artist-list">
-        <element name="artist-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_artist"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-list">
-        <element name="release-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_release"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track-list">
-        <element name="track-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_track"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-info-list">
-        <element name="release-info-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="info">
-                    <attribute name="date">
-                        <ref name="def_incomplete-date"/>
-                    </attribute>
-                    <attribute name="country">
-                        <ref name="def_iso-3166"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_disc-list">
-        <element name="disc-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="disc">
-                    <attribute name="id">
-                        <data type="string">
-                            <param name="pattern">[a-zA-Z0-9._]{27}-</param>
-                        </data>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_trmid-list">
-        <element name="trmid-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="trmid">
-                    <attribute name="id">
-                        <ref name="def_uuid"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation-list">
-        <element name="relation-list">
-            <attribute name="target-type">
-                <data type="anyURI"/>
-            </attribute>
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_relation"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_list-attributes">
-        <optional>
-            <attribute name="count">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="offset">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </define>
-
-
-    <!-- A space separated list of URIs, relative ones are possible, too. -->
-    <define name="def_URI-list">
-        <list>
-            <oneOrMore>
-                <data type="anyURI"/>
-            </oneOrMore>
-        </list>
-    </define>
-
-
-    <!-- A date with varying precision in format 'YYYY-MM-DD'. -->
-    <define name="def_incomplete-date">
-        <data type="string">
-            <param name="pattern">[0-9]{4}(-[0-9]{2})?(-[0-9]{2})?</param>
-        </data>
-    </define>
-
-
-    <!-- A two-letter country code like 'DE', 'UK', 'FR' etc. -->
-    <define name="def_iso-3166">
-        <data type="string">
-            <param name="pattern">[A-Z]{2}</param>
-        </data>
-    </define>
-
-
-    <!-- A three-letter language code like 'GER', 'GER', etc. -->
-    <define name="def_iso-639">
-        <data type="string">
-            <param name="pattern">[A-Z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A four-letter script code like 'Latn', 'Cyrl', etc. -->
-    <define name="def_iso-15924">
-        <data type="string">
-            <param name="pattern">[A-Z][a-z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A 128 Bit UUID in its standard ASCII representation. -->
-    <define name="def_uuid">
-        <data type="string">
-            <param name="pattern">[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}</param>
-        </data>
-    </define>
-
-
-    <!-- Reading direction of a relation. Defaults to "both". -->
-    <define name="def_direction">
-        <choice>
-            <value>both</value>
-            <value>forward</value>
-            <value>backward</value>
-        </choice>
-    </define>
-
-</grammar>
 
=== removed file 'schema/musicbrainz_mmd-1.0rc2.rng'
--- schema/musicbrainz_mmd-1.0rc2.rng	2012-02-01 17:18:10 +0000
+++ schema/musicbrainz_mmd-1.0rc2.rng	1970-01-01 00:00:00 +0000
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ==================================================================
-     $Id: musicbrainz_mmd-1.0rc2.rng 71 2006-02-14 18:56:32Z matt $
-
-     Relax NG Schema for MusicBrainz XML Metadata Version 1.0rc2
-
-
-     This XML schema has been designed to represent music metadata.
-     Documentation and the latest revision can be found at
-
-        http://musicbrainz.org/development/mmd/
-
-
-     Copyright (c) 2006 Robert Kaye, Matthias Friedrich
-   
-     The schema is released under the Creative Commons 
-     Attribution-ShareAlike 2.5 license.
-
-     http://creativecommons.org/licenses/by-sa/2.5/
-
-     ================================================================== -->
-
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         ns="http://musicbrainz.org/ns/mmd-1.0#">
-
-
-    <start>
-        <ref name="def_metadata"/>
-    </start>
-
-
-    <define name="def_metadata">
-        <element name="metadata">
-            <optional>
-                <attribute name="generator">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="created">
-                    <data type="dateTime"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-            <optional>
-                <ref name="def_release"/>
-            </optional>
-            <optional>
-                <ref name="def_track"/>
-            </optional>
-
-            <optional>
-                <ref name="def_artist-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-                
-            <optional>
-                <ref name="def_extension"/>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_artist">
-        <element name="artist">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="sort-name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="disambiguation">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="life-span">
-                    <optional>
-                        <attribute name="begin">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="end">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-
-            <optional>
-                <ref name="def_alias-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release">
-        <element name="release">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="text-representation">
-                    <optional>
-                        <attribute name="language">
-                            <ref name="def_iso-639"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="script">
-                            <ref name="def_iso-15924"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-            <optional>
-                <element name="asin">
-                    <data type="string">
-                        <param name="pattern">[A-Z0-9]{10}</param>
-                    </data>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-event-list"/>
-            </optional>
-            <optional>
-                <ref name="def_disc-list"/>
-            </optional>
-            <optional>
-                <ref name="def_trmid-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track">
-        <element name="track">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="duration">
-                    <data type="nonNegativeInteger"/>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_trmid-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation">
-        <element name="relation">
-            <attribute name="type">
-                <data type="anyURI"/>
-            </attribute>
-            <attribute name="target">
-                <data type="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="direction">
-                    <ref name="def_direction"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="attributes">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="begin">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="end">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <choice>
-                    <ref name="def_artist"/>
-                    <ref name="def_release"/>
-                    <ref name="def_track"/>
-
-                    <ref name="def_extension"/>
-                </choice>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_alias">
-        <element name="alias">
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="script">
-                    <ref name="def_iso-15924"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </define>
-
-
-    <define name="def_extension">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns="http://musicbrainz.org/ns/mmd-1.0#"/>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                        <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_anything">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                    <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_artist-list">
-        <element name="artist-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_artist"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-list">
-        <element name="release-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_release"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_alias-list">
-        <element name="alias-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_alias"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track-list">
-        <element name="track-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_track"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-event-list">
-        <element name="release-event-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="event">
-                    <attribute name="date">
-                        <ref name="def_incomplete-date"/>
-                    </attribute>
-                    <attribute name="country">
-                        <ref name="def_iso-3166"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_disc-list">
-        <element name="disc-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="disc">
-                    <attribute name="id">
-                        <data type="string">
-                            <param name="pattern">[a-zA-Z0-9._]{27}-</param>
-                        </data>
-                    </attribute>
-                    <optional>
-                        <attribute name="sectors">
-                            <data type="nonNegativeInteger"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_trmid-list">
-        <element name="trmid-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="trmid">
-                    <attribute name="id">
-                        <ref name="def_uuid"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation-list">
-        <element name="relation-list">
-            <attribute name="target-type">
-                <data type="anyURI"/>
-            </attribute>
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_relation"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_list-attributes">
-        <optional>
-            <attribute name="count">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="offset">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </define>
-
-
-    <!-- A space separated list of URIs, relative ones are possible, too. -->
-    <define name="def_URI-list">
-        <list>
-            <oneOrMore>
-                <data type="anyURI"/>
-            </oneOrMore>
-        </list>
-    </define>
-
-
-    <!-- A date with varying precision in format 'YYYY-MM-DD'. -->
-    <define name="def_incomplete-date">
-        <data type="string">
-            <param name="pattern">[0-9]{4}(-[0-9]{2})?(-[0-9]{2})?</param>
-        </data>
-    </define>
-
-
-    <!-- A two-letter country code like 'DE', 'UK', 'FR' etc. -->
-    <define name="def_iso-3166">
-        <data type="string">
-            <param name="pattern">[A-Z]{2}</param>
-        </data>
-    </define>
-
-
-    <!-- An ISO-639-2/T language code like 'DEU', 'ENG', 'JPN' etc. -->
-    <define name="def_iso-639">
-        <data type="string">
-            <param name="pattern">[A-Z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A four-letter script code like 'Latn', 'Cyrl', etc. -->
-    <define name="def_iso-15924">
-        <data type="string">
-            <param name="pattern">[A-Z][a-z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A 128 Bit UUID in its standard ASCII representation. -->
-    <define name="def_uuid">
-        <data type="string">
-            <param name="pattern">[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}</param>
-        </data>
-    </define>
-
-
-    <!-- Reading direction of a relation. Defaults to "both". -->
-    <define name="def_direction">
-        <choice>
-            <value>both</value>
-            <value>forward</value>
-            <value>backward</value>
-        </choice>
-    </define>
-
-</grammar>
 
=== removed file 'schema/musicbrainz_mmd-1.0rc3.rng'
--- schema/musicbrainz_mmd-1.0rc3.rng	2012-02-01 17:18:10 +0000
+++ schema/musicbrainz_mmd-1.0rc3.rng	1970-01-01 00:00:00 +0000
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ==================================================================
-     $Id: musicbrainz_mmd-1.0rc3.rng 167 2006-03-14 18:59:45Z matt $
-
-     Relax NG Schema for MusicBrainz XML Metadata Version 1.0rc3
-
-
-     This XML schema has been designed to represent music metadata.
-     Documentation and the latest revision can be found at
-
-        http://musicbrainz.org/development/mmd/
-
-
-     Copyright (c) 2006 Robert Kaye, Matthias Friedrich
-   
-     The schema is released under the Creative Commons 
-     Attribution-ShareAlike 2.5 license.
-
-     http://creativecommons.org/licenses/by-sa/2.5/
-
-     ================================================================== -->
-
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         ns="http://musicbrainz.org/ns/mmd-1.0#">
-
-
-    <start>
-        <ref name="def_metadata"/>
-    </start>
-
-
-    <define name="def_metadata">
-        <element name="metadata">
-            <optional>
-                <attribute name="generator">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="created">
-                    <data type="dateTime"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-            <optional>
-                <ref name="def_release"/>
-            </optional>
-            <optional>
-                <ref name="def_track"/>
-            </optional>
-
-            <optional>
-                <ref name="def_artist-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-                
-            <optional>
-                <ref name="def_extension"/>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_artist">
-        <element name="artist">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="sort-name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="disambiguation">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="life-span">
-                    <optional>
-                        <attribute name="begin">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="end">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-
-            <optional>
-                <ref name="def_alias-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release">
-        <element name="release">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="text-representation">
-                    <optional>
-                        <attribute name="language">
-                            <ref name="def_iso-639"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="script">
-                            <ref name="def_iso-15924"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-            <optional>
-                <element name="asin">
-                    <data type="string">
-                        <param name="pattern">[A-Z0-9]{10}</param>
-                    </data>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-event-list"/>
-            </optional>
-            <optional>
-                <ref name="def_disc-list"/>
-            </optional>
-            <optional>
-                <ref name="def_puid-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track">
-        <element name="track">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="duration">
-                    <data type="nonNegativeInteger"/>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_puid-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation">
-        <element name="relation">
-            <attribute name="type">
-                <data type="anyURI"/>
-            </attribute>
-            <attribute name="target">
-                <data type="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="direction">
-                    <ref name="def_direction"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="attributes">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="begin">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="end">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <choice>
-                    <ref name="def_artist"/>
-                    <ref name="def_release"/>
-                    <ref name="def_track"/>
-
-                    <ref name="def_extension"/>
-                </choice>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_alias">
-        <element name="alias">
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="script">
-                    <ref name="def_iso-15924"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </define>
-
-
-    <define name="def_extension">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns="http://musicbrainz.org/ns/mmd-1.0#"/>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                        <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_anything">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                    <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_artist-list">
-        <element name="artist-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_artist"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-list">
-        <element name="release-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_release"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_alias-list">
-        <element name="alias-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_alias"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track-list">
-        <element name="track-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_track"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-event-list">
-        <element name="release-event-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="event">
-                    <attribute name="date">
-                        <ref name="def_incomplete-date"/>
-                    </attribute>
-                    <attribute name="country">
-                        <ref name="def_iso-3166"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_disc-list">
-        <element name="disc-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="disc">
-                    <attribute name="id">
-                        <data type="string">
-                            <param name="pattern">[a-zA-Z0-9._]{27}-</param>
-                        </data>
-                    </attribute>
-                    <optional>
-                        <attribute name="sectors">
-                            <data type="nonNegativeInteger"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_puid-list">
-        <element name="puid-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="puid">
-                    <attribute name="id">
-                        <ref name="def_uuid"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation-list">
-        <element name="relation-list">
-            <attribute name="target-type">
-                <data type="anyURI"/>
-            </attribute>
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_relation"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_list-attributes">
-        <optional>
-            <attribute name="count">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="offset">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </define>
-
-
-    <!-- A space separated list of URIs, relative ones are possible, too. -->
-    <define name="def_URI-list">
-        <list>
-            <oneOrMore>
-                <data type="anyURI"/>
-            </oneOrMore>
-        </list>
-    </define>
-
-
-    <!-- A date with varying precision in format 'YYYY-MM-DD'. -->
-    <define name="def_incomplete-date">
-        <data type="string">
-            <param name="pattern">[0-9]{4}(-[0-9]{2})?(-[0-9]{2})?</param>
-        </data>
-    </define>
-
-
-    <!-- A two-letter country code like 'DE', 'UK', 'FR' etc. -->
-    <define name="def_iso-3166">
-        <data type="string">
-            <param name="pattern">[A-Z]{2}</param>
-        </data>
-    </define>
-
-
-    <!-- An ISO-639-2/T language code like 'DEU', 'ENG', 'JPN' etc. -->
-    <define name="def_iso-639">
-        <data type="string">
-            <param name="pattern">[A-Z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A four-letter script code like 'Latn', 'Cyrl', etc. -->
-    <define name="def_iso-15924">
-        <data type="string">
-            <param name="pattern">[A-Z][a-z]{3}</param>
-        </data>
-    </define>
-
-
-    <!-- A 128 Bit UUID in its standard ASCII representation. -->
-    <define name="def_uuid">
-        <data type="string">
-            <param name="pattern">[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}</param>
-        </data>
-    </define>
-
-
-    <!-- Reading direction of a relation. Defaults to "both". -->
-    <define name="def_direction">
-        <choice>
-            <value>both</value>
-            <value>forward</value>
-            <value>backward</value>
-        </choice>
-    </define>
-
-</grammar>
 
=== removed file 'schema/musicbrainz_mmd-1.0rc4.rng'
--- schema/musicbrainz_mmd-1.0rc4.rng	2012-02-01 17:18:10 +0000
+++ schema/musicbrainz_mmd-1.0rc4.rng	1970-01-01 00:00:00 +0000
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ==================================================================
-     $Id: musicbrainz_mmd-1.0rc4.rng 188 2006-03-22 16:54:20Z matt $
-
-     Relax NG Schema for MusicBrainz XML Metadata Version 1.0rc4
-
-
-     This XML schema has been designed to represent music metadata.
-     Documentation and the latest revision can be found at
-
-        http://musicbrainz.org/development/mmd/
-
-
-     Copyright (c) 2006 Robert Kaye, Matthias Friedrich
-   
-     The schema is released under the Creative Commons 
-     Attribution-ShareAlike 2.5 license.
-
-     http://creativecommons.org/licenses/by-sa/2.5/
-
-     ================================================================== -->
-
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         ns="http://musicbrainz.org/ns/mmd-1.0#">
-
-
-    <start>
-        <ref name="def_metadata"/>
-    </start>
-
-
-    <define name="def_metadata">
-        <element name="metadata">
-            <optional>
-                <attribute name="generator">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="created">
-                    <data type="dateTime"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-            <optional>
-                <ref name="def_release"/>
-            </optional>
-            <optional>
-                <ref name="def_track"/>
-            </optional>
-
-            <optional>
-                <ref name="def_artist-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-                
-            <optional>
-                <ref name="def_extension"/>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_artist">
-        <element name="artist">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_any_attribute"/>
-            </zeroOrMore>
-
-            <optional>
-                <element name="name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="sort-name">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="disambiguation">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="life-span">
-                    <optional>
-                        <attribute name="begin">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="end">
-                            <ref name="def_incomplete-date"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-
-            <optional>
-                <ref name="def_alias-list"/>
-            </optional>
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release">
-        <element name="release">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="type">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_any_attribute"/>
-            </zeroOrMore>
-
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="text-representation">
-                    <optional>
-                        <attribute name="language">
-                            <ref name="def_iso-639"/>
-                        </attribute>
-                    </optional>
-                    <optional>
-                        <attribute name="script">
-                            <ref name="def_iso-15924"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </optional>
-            <optional>
-                <element name="asin">
-                    <data type="string">
-                        <param name="pattern">[A-Z0-9]{10}</param>
-                    </data>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-event-list"/>
-            </optional>
-            <optional>
-                <ref name="def_disc-list"/>
-            </optional>
-            <optional>
-                <ref name="def_puid-list"/>
-            </optional>
-            <optional>
-                <ref name="def_track-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track">
-        <element name="track">
-            <optional>
-                <attribute name="id">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_any_attribute"/>
-            </zeroOrMore>
-            <optional>
-                <element name="title">
-                    <text/>
-                </element>
-            </optional>
-            <optional>
-                <element name="duration">
-                    <data type="nonNegativeInteger"/>
-                </element>
-            </optional>
-            <optional>
-                <ref name="def_artist"/>
-            </optional>
-
-            <optional>
-                <ref name="def_release-list"/>
-            </optional>
-            <optional>
-                <ref name="def_puid-list"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="def_relation-list"/>
-            </zeroOrMore>
-
-            <zeroOrMore>
-                <ref name="def_extension"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation">
-        <element name="relation">
-            <attribute name="type">
-                <data type="anyURI"/>
-            </attribute>
-            <attribute name="target">
-                <data type="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="direction">
-                    <ref name="def_direction"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="attributes">
-                    <ref name="def_URI-list"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="begin">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="end">
-                    <ref name="def_incomplete-date"/>
-                </attribute>
-            </optional>
-
-            <optional>
-                <choice>
-                    <ref name="def_artist"/>
-                    <ref name="def_release"/>
-                    <ref name="def_track"/>
-
-                    <ref name="def_extension"/>
-                </choice>
-            </optional>
-        </element>
-    </define>
-
-
-    <define name="def_alias">
-        <element name="alias">
-            <optional>
-                <attribute name="type">
-                    <data type="anyURI"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="script">
-                    <ref name="def_iso-15924"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </define>
-
-
-    <define name="def_extension">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns="http://musicbrainz.org/ns/mmd-1.0#"/>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                        <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_anything">
-        <element>
-            <anyName>
-                <except>
-                    <nsName ns=""/>
-                </except>
-            </anyName>
-            <zeroOrMore>
-                <choice>
-                    <attribute>
-                    <anyName/>
-                    </attribute>
-                    <text/>
-                    <ref name="def_anything"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_any_attribute">
-	<attribute>
-	<anyName>
-            <except>
-                <nsName ns=""/>
-            </except>
-	</anyName>
-	</attribute>
-    </define>
-
-
-    <define name="def_artist-list">
-        <element name="artist-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_artist"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-list">
-        <element name="release-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_release"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_alias-list">
-        <element name="alias-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_alias"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_track-list">
-        <element name="track-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_track"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_release-event-list">
-        <element name="release-event-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="event">
-                    <attribute name="date">
-                        <ref name="def_incomplete-date"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="country">
-                            <ref name="def_iso-3166"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_disc-list">
-        <element name="disc-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="disc">
-                    <attribute name="id">
-                        <data type="string">
-                            <param name="pattern">[a-zA-Z0-9._]{27}-</param>
-                        </data>
-                    </attribute>
-                    <optional>
-                        <attribute name="sectors">
-                            <data type="nonNegativeInteger"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_puid-list">
-        <element name="puid-list">
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <element name="puid">
-                    <attribute name="id">
-                        <ref name="def_uuid"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_relation-list">
-        <element name="relation-list">
-            <attribute name="target-type">
-                <data type="anyURI"/>
-            </attribute>
-            <ref name="def_list-attributes"/>
-            <zeroOrMore>
-                <ref name="def_relation"/>
-            </zeroOrMore>
-        </element>
-    </define>
-
-
-    <define name="def_list-attributes">
-        <optional>
-            <attribute name="count">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="offset">
-                <data type="nonNegativeInteger"/>
-            </attribute>
-        </optional>