Index: manual/appendix/file_formats.tex
===================================================================
--- manual/appendix/file_formats.tex	(revision 29855)
+++ manual/appendix/file_formats.tex	(working copy)
@@ -185,20 +185,71 @@
     extension.}
     
     \begin{rbtabular}{\textwidth}{lX}%
-    {\textbf{Extension} & \textbf{Tag type}}{}{}
-      \fname{.mp1}, \fname{.mpa}, \fname{.mp2}, \fname{.mp3},
-         \fname{.rm}, \fname{.ra}, \fname{.rmvb}, \fname{.tta}        & ID3 \\
-      \fname{.mpc}, \fname{.ape}, \fname{.mac}, \fname{.wv}           & APE \\
-      \fname{.ogg}, \fname{.oga}, \fname{.spx}, \fname{.flac}         & Vorbis \\
-      \fname{.m4a}, \fname{.m4b}, \fname{.mp4}                        & MP4 \\
-      \fname{.wma}, \fname{.wmv}, \fname{.asf}                        & ASF \\
-      \fname{.mmf}, \fname{.mod}, \fname{.nsf}, \fname{.nsfe},
-         \fname{.sap}, \fname{.sid}, \fname{.spc}                     & Codec specific \\
-      \fname{.a52}, \fname{.ac3}, \fname{.adx}, \fname{.oma},
-         \fname{.aa3}, \fname{.aif}, \fname{.aiff}, \fname{.au}       & None \\
-      \fname{.snd}, \fname{.shn}, \fname{.vox}, \fname{.w64},
-         \fname{.wav}, \fname{.cmc}, \fname{.cm3}, \fname{.cmr}       & None \\
-      \fname{.cms}, \fname{.dmc}, \fname{.dlt}, \fname{.mpt},
-         \fname{.mpd}                                                 & None \\
+    {\textbf{Tag type} & \textbf{File extension}}{}{}
+      ID3               & \fname{.mp1}, \fname{.mpa}, \fname{.mp2}, \fname{.mp3},
+                          \fname{.rm}, \fname{.ra}, \fname{.rmvb}, \fname{.tta} \\
+      APE               & \fname{.mpc}, \fname{.ape}, \fname{.mac}, \fname{.wv} \\
+      Vorbis            & \fname{.ogg}, \fname{.oga}, \fname{.spx}, \fname{.flac} \\
+      MP4               & \fname{.m4a}, \fname{.m4b}, \fname{.mp4} \\
+      ASF               & \fname{.wma}, \fname{.wmv}, \fname{.asf} \\
+      Codec specific    & \fname{.mmf}, \fname{.mod}, \fname{.nsf}, \fname{.nsfe},
+                          \fname{.sap}, \fname{.sid}, \fname{.spc} \\
+      None              & \fname{.a52}, \fname{.ac3}, \fname{.adx}, \fname{.oma},
+                          \fname{.aa3}, \fname{.aif}, \fname{.aiff}, \fname{.au},
+                          \fname{.snd}, \fname{.shn}, \fname{.vox}, \fname{.w64},
+                          \fname{.wav}, \fname{.cmc}, \fname{.cm3}, \fname{.cmr},
+                          \fname{.cms}, \fname{.dmc}, \fname{.dlt}, \fname{.mpt},
+                          \fname{.mpd} \\
     \end{rbtabular}
+    
+    \subsection{Featureset for generic metadata tags}
+    \begin{rbtabular}{\textwidth}{lccccX}%
+    {\textbf{Feature} & \textbf{ID3} & \textbf{APE} & \textbf{Vorbis} & 
+     \textbf{MP4} & \textbf{ASF}}{}{}
+     Embedded albumart \fname{.bmp}     &   &   &   &   &   \\
+     Embedded albumart \fname{.jpg}     & x &   &   & x &   \\
+     Embedded albumart \fname{.png}     & x &   &   & x &   \\
+     Gapless playback information       & x &   &   & x &   \\
+     Replaygain information             & x & x & x & x & x \\
+     Title (string)                     & x & x & x & x & x \\
+     Artist (string)                    & x & x & x & x & x \\
+     Album (string)                     & x & x & x & x & x \\
+     Genre (string)                     & x & x & x & x & x \\
+     Disc (string or number)            & x & x & x & x &   \\
+     Track (string or number)           & x & x & x & x & x \\
+     Year (string or number)            & x & x & x & x & x \\
+     Composer (string)                  &   & x & x & x & x \\
+     Comment (string)                   & x & x & x & x & x \\
+     Albumartist (string)               & x & x & x & x & x \\
+     Grouping (string)                  &   & x & x & x &   \\
+    \end{rbtabular}
+    
+    \note{The possibility to gather information for gapless playback does not
+    mean that codecs will make use of this information.}
+    
+    \subsection{Featureset codec specific metadata}
+    \begin{rbtabular}{\textwidth}{lX}%
+    {\textbf{Feature} & \textbf{Codec specific metadata (file extension)}}
+     {}{}
+     Embedded \fname{.bmp}  & None \\
+     Embedded \fname{.jpg}  & None \\
+     Embedded \fname{.png}  & None \\
+     Gapless                & All lossless codecs and \fname{.mpc} \\
+     Replaygain             & \fname{.mpc}\\
+     Title                  & \fname{.tta}, \fname{.spc}, \fname{.mmf}, \fname{.sid}, 
+                              \fname{.rm}, \fname{.ra}, \fname{.rmvb}, \fname{.nsf}, 
+                              \fname{.nsfe}, \fname{.mod}, \fname{.sap} \\
+     Artist                 & \fname{.tta}, \fname{.spc}, \fname{.mmf}, \fname{.sid}, 
+                              \fname{.rm}, \fname{.ra}, \fname{.rmvb}, \fname{.nsf}, 
+                              \fname{.nsfe}, \fname{.sap} \\
+     Album                  & \fname{.spc}, \fname{.sid}, \fname{.nsf}, \fname{.nsfe} \\
+     Genre                  & \fname{.tta}, \fname{.spc}, \fname{.sap} \\
+     Disc                   & \fname{.tta} \\
+     Track                  & \fname{.tta} \\
+     Year                   & \fname{.spc}, \fname{.sid}, \fname{.sap} \\
+     Composer               & \fname{.mmf} \\
+     Comment                & \fname{.spc}, \fname{.rm}, \fname{.ra}, \fname{.rmvb} \\
+     Albumartist            & None \\
+     Grouping               & None \\
+    \end{rbtabular}
 }