Mimetype extensions are now ordered by freedesktop.org's priority

51bdc840 · epitron · Daniel Mendler · 64b60d12 · 51bdc840 · 51bdc840
Commit 51bdc840 authored Mar 30, 2020 by epitron Committed by Daniel Mendler Apr 27, 2020
Show whitespace changes
Inline Side-by-side

Showing with 83 additions and 83 deletions

lib/mimemagic/tables.rb
+82 -82

script/generate-mime.rb
+1 -1

No files found.
--- a/lib/mimemagic/tables.rb
+++ b/lib/mimemagic/tables.rb
@@ -964,7 +964,7 @@ class MimeMagic
    'application/dicom' => [%w(dcm), %w(), 'DICOM image'],
    'application/ecmascript' => [%w(es), %w(application/x-executable text/plain), 'ECMAScript program'],
    'application/epub+zip' => [%w(epub), %w(application/zip), 'electronic book document'],
-    'application/geo+json' => [%w(geo.json geojson), %w(application/json), 'GeoJSON geospatial data'],
+    'application/geo+json' => [%w(geojson geo.json), %w(application/json), 'GeoJSON geospatial data'],
    'application/gml+xml' => [%w(gml), %w(application/xml), 'GML document'],
    'application/gnunet-directory' => [%w(gnd), %w(), 'GNUnet search file'],
    'application/gpx+xml' => [%w(gpx), %w(application/xml), 'GPX geographic data'],
@@ -988,9 +988,9 @@ class MimeMagic
    'application/owl+xml' => [%w(owx), %w(application/xml), 'OWL XML file'],
    'application/oxps' => [%w(oxps xps), %w(application/zip), 'XPS document'],
    'application/pdf' => [%w(pdf), %w(), 'PDF document'],
-    'application/pgp-encrypted' => [%w(asc gpg pgp), %w(text/plain), 'PGP/MIME-encrypted message header'],
+    'application/pgp-encrypted' => [%w(pgp gpg asc), %w(text/plain), 'PGP/MIME-encrypted message header'],
-    'application/pgp-keys' => [%w(asc gpg pgp pkr skr), %w(text/plain), 'PGP keys'],
+    'application/pgp-keys' => [%w(skr pkr asc pgp gpg), %w(text/plain), 'PGP keys'],
-    'application/pgp-signature' => [%w(asc gpg pgp sig), %w(text/plain), 'detached OpenPGP signature'],
+    'application/pgp-signature' => [%w(asc sig pgp gpg), %w(text/plain), 'detached OpenPGP signature'],
    'application/pkcs10' => [%w(p10), %w(), 'PKCS#10 certification request'],
    'application/pkcs12' => [%w(p12 pfx), %w(), 'PKCS#12 certificate bundle'],
    'application/pkcs7-mime' => [%w(p7c p7m), %w(), 'PKCS#7 Message or Certificate'],
@@ -1003,16 +1003,16 @@ class MimeMagic
    'application/postscript' => [%w(ps), %w(text/plain), 'PS document'],
    'application/ram' => [%w(ram), %w(), 'RealMedia Metafile'],
    'application/raml+yaml' => [%w(raml), %w(application/x-yaml), 'RAML document'],
-    'application/rdf+xml' => [%w(owl rdf rdfs), %w(application/xml), 'RDF file'],
+    'application/rdf+xml' => [%w(rdf rdfs owl), %w(application/xml), 'RDF file'],
    'application/relax-ng-compact-syntax' => [%w(rnc), %w(text/plain), 'RELAX NG XML schema'],
    'application/rss+xml' => [%w(rss), %w(application/xml), 'RSS summary'],
    'application/rtf' => [%w(rtf), %w(text/plain), 'RTF document'],
    'application/sdp' => [%w(sdp), %w(text/plain), 'SDP multicast stream file'],
    'application/sieve' => [%w(siv), %w(application/xml), 'Sieve mail filter script'],
-    'application/smil+xml' => [%w(kino smi smil sml), %w(application/xml), 'SMIL document'],
+    'application/smil+xml' => [%w(smil smi sml kino), %w(application/xml), 'SMIL document'],
    'application/sql' => [%w(sql), %w(text/plain), 'SQL code'],
    'application/trig' => [%w(trig), %w(text/plain), 'TriG RDF document'],
-    'application/vnd.adobe.flash.movie' => [%w(spl swf), %w(), 'Shockwave Flash file'],
+    'application/vnd.adobe.flash.movie' => [%w(swf spl), %w(), 'Shockwave Flash file'],
    'application/vnd.android.package-archive' => [%w(apk), %w(application/x-java-archive), 'Android package'],
    'application/vnd.appimage' => [%w(appimage), %w(application/vnd.squashfs application/x-executable), 'AppImage application bundle'],
    'application/vnd.apple.mpegurl' => [%w(m3u m3u8), %w(text/plain), 'HTTP Live Streaming playlist'],
@@ -1038,13 +1038,13 @@ class MimeMagic
    'application/vnd.ms-access' => [%w(mdb), %w(), 'JET database'],
    'application/vnd.ms-asf' => [%w(asf), %w(), 'ASF video'],
    'application/vnd.ms-cab-compressed' => [%w(cab), %w(), 'Microsoft Cabinet archive'],
-    'application/vnd.ms-excel' => [%w(xla xlc xld xll xlm xls xlt xlw), %w(), 'Excel spreadsheet'],
+    'application/vnd.ms-excel' => [%w(xls xlc xll xlm xlw xla xlt xld), %w(), 'Excel spreadsheet'],
    'application/vnd.ms-excel.addin.macroEnabled.12' => [%w(xlam), %w(application/vnd.openxmlformats-officedocument.spreadsheetml.sheet), 'Excel add-in'],
    'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => [%w(xlsb), %w(application/vnd.openxmlformats-officedocument.spreadsheetml.sheet), 'Excel 2007 binary spreadsheet'],
    'application/vnd.ms-excel.sheet.macroEnabled.12' => [%w(xlsm), %w(application/vnd.openxmlformats-officedocument.spreadsheetml.sheet), 'Excel spreadsheet'],
    'application/vnd.ms-excel.template.macroEnabled.12' => [%w(xltm), %w(application/vnd.openxmlformats-officedocument.spreadsheetml.template), 'Excel spreadsheet template'],
    'application/vnd.ms-htmlhelp' => [%w(chm), %w(), 'CHM document'],
-    'application/vnd.ms-powerpoint' => [%w(pot pps ppt ppz), %w(), 'PowerPoint presentation'],
+    'application/vnd.ms-powerpoint' => [%w(ppz ppt pps pot), %w(), 'PowerPoint presentation'],
    'application/vnd.ms-powerpoint.addin.macroEnabled.12' => [%w(ppam), %w(), 'PowerPoint add-in'],
    'application/vnd.ms-powerpoint.presentation.macroEnabled.12' => [%w(pptm), %w(application/vnd.openxmlformats-officedocument.presentationml.presentation), 'PowerPoint presentation'],
    'application/vnd.ms-powerpoint.slide.macroEnabled.12' => [%w(sldm), %w(application/vnd.openxmlformats-officedocument.presentationml.slide), 'PowerPoint slide'],
@@ -1092,9 +1092,9 @@ class MimeMagic
    'application/vnd.openxmlformats-officedocument.spreadsheetml.template' => [%w(xltx), %w(application/zip), 'Excel 2007 spreadsheet template'],
    'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => [%w(docx), %w(application/zip), 'Word 2007 document'],
    'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => [%w(dotx), %w(application/zip), 'Word 2007 document template'],
-    'application/vnd.palm' => [%w(oprc pdb pqa prc), %w(), 'Palm OS database'],
+    'application/vnd.palm' => [%w(prc pdb pqa oprc), %w(), 'Palm OS database'],
    'application/vnd.rar' => [%w(rar), %w(), 'RAR archive'],
-    'application/vnd.rn-realmedia' => [%w(rm rmj rmm rms rmvb rmx), %w(), 'RealMedia document'],
+    'application/vnd.rn-realmedia' => [%w(rm rmj rmm rms rmx rmvb), %w(), 'RealMedia document'],
    'application/vnd.snap' => [%w(snap), %w(application/vnd.squashfs), 'Snap package'],
    'application/vnd.sqlite3' => [%w(sqlite3), %w(), 'SQLite3 database'],
    'application/vnd.squashfs' => [%w(sqsh), %w(), 'Squashfs filesystem'],
@@ -1104,7 +1104,7 @@ class MimeMagic
    'application/vnd.stardivision.impress' => [%w(sdd sdp), %w(), 'StarImpress presentation'],
    'application/vnd.stardivision.mail' => [%w(smd), %w(), 'StarMail email'],
    'application/vnd.stardivision.math' => [%w(smf), %w(), 'StarMath formula'],
-    'application/vnd.stardivision.writer' => [%w(sdw sgl vor), %w(), 'StarWriter document'],
+    'application/vnd.stardivision.writer' => [%w(sdw vor sgl), %w(), 'StarWriter document'],
    'application/vnd.sun.xml.calc' => [%w(sxc), %w(application/zip), 'OpenOffice Calc spreadsheet'],
    'application/vnd.sun.xml.calc.template' => [%w(stc), %w(application/zip), 'OpenOffice Calc template'],
    'application/vnd.sun.xml.draw' => [%w(sxd), %w(application/zip), 'OpenOffice Draw drawing'],
@@ -1116,8 +1116,8 @@ class MimeMagic
    'application/vnd.sun.xml.writer.global' => [%w(sxg), %w(application/zip), 'OpenOffice Writer global document'],
    'application/vnd.sun.xml.writer.template' => [%w(stw), %w(application/zip), 'OpenOffice Writer template'],
    'application/vnd.symbian.install' => [%w(sis), %w(), 'SIS package'],
-    'application/vnd.tcpdump.pcap' => [%w(cap dmp pcap), %w(), 'Network Packet Capture'],
+    'application/vnd.tcpdump.pcap' => [%w(pcap cap dmp), %w(), 'Network Packet Capture'],
-    'application/vnd.visio' => [%w(vsd vss vst vsw), %w(application/x-ole-storage), 'Microsoft Visio document'],
+    'application/vnd.visio' => [%w(vsd vst vsw vss), %w(application/x-ole-storage), 'Microsoft Visio document'],
    'application/vnd.wordperfect' => [%w(wp wp4 wp5 wp6 wpd wpp), %w(), 'WordPerfect document'],
    'application/vnd.youtube.yt' => [%w(yt), %w(application/zip), 'YouTube Media Archive'],
    'application/winhlp' => [%w(hlp), %w(), 'WinHelp help file'],
@@ -1140,11 +1140,11 @@ class MimeMagic
    'application/x-awk' => [%w(awk), %w(application/x-executable text/plain), 'AWK script'],
    'application/x-bcpio' => [%w(bcpio), %w(), 'BCPIO document'],
    'application/x-bittorrent' => [%w(torrent), %w(), 'BitTorrent seed file'],
-    'application/x-blender' => [%w(blend blend blender), %w(), 'Blender scene'],
+    'application/x-blender' => [%w(blender blend blend), %w(), 'Blender scene'],
    'application/x-bsdiff' => [%w(bsdiff), %w(), 'binary differences between files'],
    'application/x-bzdvi' => [%w(dvi.bz2), %w(application/x-bzip), 'TeX DVI document (bzip-compressed)'],
-    'application/x-bzip' => [%w(bz bz2), %w(), 'Bzip archive'],
+    'application/x-bzip' => [%w(bz2 bz), %w(), 'Bzip archive'],
-    'application/x-bzip-compressed-tar' => [%w(tar.bz tar.bz2 tb2 tbz tbz2), %w(application/x-bzip), 'Tar archive (bzip-compressed)'],
+    'application/x-bzip-compressed-tar' => [%w(tar.bz2 tar.bz tbz2 tbz tb2), %w(application/x-bzip), 'Tar archive (bzip-compressed)'],
    'application/x-bzpdf' => [%w(pdf.bz2), %w(application/x-bzip), 'PDF document (bzip-compressed)'],
    'application/x-bzpostscript' => [%w(ps.bz2), %w(application/x-bzip), 'PostScript document (bzip-compressed)'],
    'application/x-cb7' => [%w(cb7), %w(application/x-7z-compressed), 'comic book archive'],
@@ -1177,23 +1177,23 @@ class MimeMagic
    'application/x-font-afm' => [%w(afm), %w(), 'Adobe font metrics'],
    'application/x-font-bdf' => [%w(bdf), %w(), 'BDF font'],
    'application/x-font-linux-psf' => [%w(psf), %w(), 'Linux PSF console font'],
-    'application/x-font-pcf' => [%w(pcf pcf.gz pcf.z), %w(), 'PCF font'],
+    'application/x-font-pcf' => [%w(pcf pcf.z pcf.gz), %w(), 'PCF font'],
    'application/x-font-speedo' => [%w(spd), %w(), 'Speedo font'],
    'application/x-font-ttx' => [%w(ttx), %w(application/xml), 'TrueType XML font'],
-    'application/x-font-type1' => [%w(gsf pfa pfb), %w(application/postscript), 'PostScript type-1 font'],
+    'application/x-font-type1' => [%w(pfa pfb gsf), %w(application/postscript), 'PostScript type-1 font'],
-    'application/x-gameboy-color-rom' => [%w(cgb gbc), %w(), 'Game Boy Color ROM'],
+    'application/x-gameboy-color-rom' => [%w(gbc cgb), %w(), 'Game Boy Color ROM'],
    'application/x-gameboy-rom' => [%w(gb sgb), %w(), 'Game Boy ROM'],
    'application/x-gamecube-rom' => [%w(iso), %w(), 'GameCube disc image'],
    'application/x-gamegear-rom' => [%w(gg), %w(), 'Game Gear ROM'],
-    'application/x-gba-rom' => [%w(agb gba), %w(), 'Game Boy Advance ROM'],
+    'application/x-gba-rom' => [%w(gba agb), %w(), 'Game Boy Advance ROM'],
    'application/x-gedcom' => [%w(ged gedcom), %w(), 'GEDCOM family history'],
    'application/x-genesis-32x-rom' => [%w(32x mdx), %w(), 'Genesis 32X ROM'],
    'application/x-genesis-rom' => [%w(gen smd), %w(), 'Genesis ROM'],
    'application/x-gettext-translation' => [%w(gmo mo), %w(), 'translated messages (machine-readable)'],
    'application/x-glade' => [%w(glade), %w(application/xml), 'Glade project'],
-    'application/x-gnucash' => [%w(gnc gnucash xac), %w(), 'GnuCash financial data'],
+    'application/x-gnucash' => [%w(gnucash gnc xac), %w(), 'GnuCash financial data'],
    'application/x-gnumeric' => [%w(gnumeric), %w(), 'Gnumeric spreadsheet'],
-    'application/x-gnuplot' => [%w(gnuplot gp gplt), %w(text/plain), 'Gnuplot document'],
+    'application/x-gnuplot' => [%w(gp gplt gnuplot), %w(text/plain), 'Gnuplot document'],
    'application/x-go-sgf' => [%w(sgf), %w(text/plain), 'SGF record'],
    'application/x-graphite' => [%w(gra), %w(), 'Graphite scientific graph'],
    'application/x-gtk-builder' => [%w(ui), %w(application/xml), 'GTK+ Builder'],
@@ -1201,7 +1201,7 @@ class MimeMagic
    'application/x-gzdvi' => [%w(dvi.gz), %w(application/gzip), 'TeX DVI document (gzip-compressed)'],
    'application/x-gzpdf' => [%w(pdf.gz), %w(application/gzip), 'PDF document (gzip-compressed)'],
    'application/x-gzpostscript' => [%w(ps.gz), %w(application/gzip), 'PostScript document (gzip-compressed)'],
-    'application/x-hdf' => [%w(h4 h5 hdf hdf4 hdf5), %w(), 'HDF document'],
+    'application/x-hdf' => [%w(hdf hdf4 h4 hdf5 h5), %w(), 'HDF document'],
    'application/x-hfe-floppy-image' => [%w(hfe), %w(), 'HFE floppy disk image'],
    'application/x-hwp' => [%w(hwp), %w(), 'Haansoft Hangul document'],
    'application/x-hwt' => [%w(hwt), %w(), 'Haansoft Hangul document template'],
@@ -1250,15 +1250,15 @@ class MimeMagic
    'application/x-magicpoint' => [%w(mgp), %w(text/plain), 'MagicPoint presentation'],
    'application/x-markaby' => [%w(mab), %w(application/x-ruby), 'Markaby script'],
    'application/x-mif' => [%w(mif), %w(), 'Adobe FrameMaker MIF document'],
-    'application/x-mimearchive' => [%w(mht mhtml), %w(multipart/related), 'MHTML web archive'],
+    'application/x-mimearchive' => [%w(mhtml mht), %w(multipart/related), 'MHTML web archive'],
    'application/x-mobipocket-ebook' => [%w(mobi prc), %w(application/vnd.palm), 'Mobipocket e-book'],
    'application/x-ms-dos-executable' => [%w(exe), %w(), 'DOS/Windows executable'],
-    'application/x-ms-wim' => [%w(swm wim), %w(), 'WIM disk Image'],
+    'application/x-ms-wim' => [%w(wim swm), %w(), 'WIM disk Image'],
    'application/x-msi' => [%w(msi), %w(application/x-ole-storage), 'Windows Installer package'],
    'application/x-mswinurl' => [%w(url), %w(), 'Internet shortcut'],
    'application/x-mswrite' => [%w(wri), %w(), 'WRI document'],
    'application/x-msx-rom' => [%w(msx), %w(), 'MSX ROM'],
-    'application/x-n64-rom' => [%w(n64 v64 z64), %w(), 'Nintendo64 ROM'],
+    'application/x-n64-rom' => [%w(n64 z64 v64), %w(), 'Nintendo64 ROM'],
    'application/x-navi-animation' => [%w(ani), %w(), 'Windows animated cursor'],
    'application/x-neo-geo-pocket-color-rom' => [%w(ngc), %w(), 'Neo-Geo Pocket Color ROM'],
    'application/x-neo-geo-pocket-rom' => [%w(ngp), %w(), 'Neo-Geo Pocket ROM'],
@@ -1272,9 +1272,9 @@ class MimeMagic
    'application/x-pagemaker' => [%w(p65 pm pm6 pmd), %w(application/x-ole-storage), 'Adobe PageMaker'],
    'application/x-pak' => [%w(pak), %w(), 'PAK archive'],
    'application/x-par2' => [%w(par2 par2), %w(), 'Parchive archive'],
-    'application/x-partial-download' => [%w(crdownload part wkdownload), %w(), 'Partially downloaded file'],
+    'application/x-partial-download' => [%w(wkdownload crdownload part), %w(), 'Partially downloaded file'],
    'application/x-pc-engine-rom' => [%w(pce), %w(), 'PC Engine ROM'],
-    'application/x-perl' => [%w(al perl pl pl pm pod t), %w(application/x-executable text/plain), 'Perl script'],
+    'application/x-perl' => [%w(pl pl pm al perl pod t), %w(application/x-executable text/plain), 'Perl script'],
    'application/x-php' => [%w(php php3 php4 php5 phps), %w(text/plain), 'PHP script'],
    'application/x-pkcs7-certificates' => [%w(p7b spc), %w(), 'PKCS#7 certificate bundle'],
    'application/x-planperfect' => [%w(pln), %w(), 'PlanPerfect spreadsheet'],
@@ -1286,12 +1286,12 @@ class MimeMagic
    'application/x-quattropro' => [%w(wb1 wb2 wb3), %w(), 'Quattro Pro spreadsheet'],
    'application/x-quicktime-media-link' => [%w(qtl), %w(video/quicktime), 'QuickTime metalink playlist'],
    'application/x-qw' => [%w(qif), %w(), 'Quicken document'],
-    'application/x-raw-disk-image' => [%w(img raw-disk-image), %w(), 'Raw disk image'],
+    'application/x-raw-disk-image' => [%w(raw-disk-image img), %w(), 'Raw disk image'],
-    'application/x-raw-disk-image-xz-compressed' => [%w(img.xz raw-disk-image.xz), %w(application/x-xz), 'Raw disk image (XZ-compressed)'],
+    'application/x-raw-disk-image-xz-compressed' => [%w(raw-disk-image.xz img.xz), %w(application/x-xz), 'Raw disk image (XZ-compressed)'],
    'application/x-raw-floppy-disk-image' => [%w(fd qd), %w(application/x-raw-disk-image), 'Floppy disk image'],
    'application/x-rpm' => [%w(rpm), %w(), 'RPM package'],
    'application/x-ruby' => [%w(rb), %w(application/x-executable text/plain), 'Ruby script'],
-    'application/x-sami' => [%w(sami smi), %w(text/plain), 'SAMI subtitles'],
+    'application/x-sami' => [%w(smi sami), %w(text/plain), 'SAMI subtitles'],
    'application/x-saturn-rom' => [%w(bin iso), %w(), 'Sega Saturn disc image'],
    'application/x-sega-cd-rom' => [%w(bin iso), %w(), 'Sega CD disc image'],
    'application/x-sg1000-rom' => [%w(sg), %w(), 'SG-1000 ROM'],
@@ -1303,7 +1303,7 @@ class MimeMagic
    'application/x-siag' => [%w(siag), %w(), 'Siag spreadsheet'],
    'application/x-smaf' => [%w(mmf smaf), %w(), 'SMAF audio'],
    'application/x-sms-rom' => [%w(sms), %w(), 'Master System ROM'],
-    'application/x-source-rpm' => [%w(spm src.rpm), %w(application/x-rpm), 'Source RPM package'],
+    'application/x-source-rpm' => [%w(src.rpm spm), %w(application/x-rpm), 'Source RPM package'],
    'application/x-spss-por' => [%w(por), %w(), 'SPSS Portable Data File'],
    'application/x-spss-sav' => [%w(sav zsav), %w(), 'SPSS Data File'],
    'application/x-sqlite2' => [%w(sqlite2), %w(), 'SQLite2 database'],
@@ -1312,7 +1312,7 @@ class MimeMagic
    'application/x-sv4cpio' => [%w(sv4cpio), %w(), 'SV4 CPIO archive'],
    'application/x-sv4crc' => [%w(sv4crc), %w(), 'SV4 CPIO archive (with CRC)'],
    'application/x-t602' => [%w(602), %w(), 'T602 document'],
-    'application/x-tar' => [%w(gem gtar tar), %w(), 'Tar archive'],
+    'application/x-tar' => [%w(tar gtar gem), %w(), 'Tar archive'],
    'application/x-tarz' => [%w(tar.z taz), %w(application/x-compress), 'Tar archive (compressed)'],
    'application/x-tex-gf' => [%w(gf), %w(), 'generic font file'],
    'application/x-tex-pk' => [%w(pk), %w(), 'packed font file'],
@@ -1335,8 +1335,8 @@ class MimeMagic
    'application/x-wonderswan-rom' => [%w(ws), %w(), 'Bandai WonderSwan ROM'],
    'application/x-wpg' => [%w(wpg), %w(), 'WordPerfect/Drawperfect image'],
    'application/x-wwf' => [%w(wwf), %w(application/pdf), 'WWF document'],
-    'application/x-x509-ca-cert' => [%w(cert crt der pem), %w(), 'DER/PEM/Netscape-encoded X.509 certificate'],
+    'application/x-x509-ca-cert' => [%w(der crt cert pem), %w(), 'DER/PEM/Netscape-encoded X.509 certificate'],
-    'application/x-xar' => [%w(pkg xar), %w(), 'XAR archive'],
+    'application/x-xar' => [%w(xar pkg), %w(), 'XAR archive'],
    'application/x-xbel' => [%w(xbel), %w(application/xml), 'XBEL bookmarks'],
    'application/x-xpinstall' => [%w(xpi), %w(application/zip), 'XPInstall installer module'],
    'application/x-xz' => [%w(xz), %w(), 'XZ archive'],
@@ -1345,9 +1345,9 @@ class MimeMagic
    'application/x-yaml' => [%w(yaml yml), %w(text/plain), 'YAML document'],
    'application/x-zip-compressed-fb2' => [%w(fb2.zip), %w(application/zip), 'Compressed FictionBook document'],
    'application/x-zoo' => [%w(zoo), %w(), 'Zoo archive'],
-    'application/xhtml+xml' => [%w(xht xhtml), %w(application/xml), 'XHTML page'],
+    'application/xhtml+xml' => [%w(xhtml xht), %w(application/xml), 'XHTML page'],
    'application/xliff+xml' => [%w(xlf xliff), %w(application/xml), 'XLIFF translation file'],
-    'application/xml' => [%w(rng xbl xml xsd), %w(text/plain), 'XML document'],
+    'application/xml' => [%w(xml xbl xsd rng), %w(text/plain), 'XML document'],
    'application/xml-dtd' => [%w(dtd), %w(text/plain), 'DTD file'],
    'application/xml-external-parsed-entity' => [%w(ent), %w(application/xml), 'XML entities document'],
    'application/xslt+xml' => [%w(xsl xslt), %w(application/xml), 'XSLT stylesheet'],
@@ -1361,34 +1361,34 @@ class MimeMagic
    'audio/annodex' => [%w(axa), %w(application/annodex), 'Annodex Audio'],
    'audio/basic' => [%w(au snd), %w(), 'ULAW (Sun) audio'],
    'audio/flac' => [%w(flac), %w(), 'FLAC audio'],
-    'audio/midi' => [%w(kar mid midi), %w(), 'MIDI audio'],
+    'audio/midi' => [%w(mid midi kar), %w(), 'MIDI audio'],
    'audio/mp2' => [%w(mp2), %w(), 'MP2 audio'],
-    'audio/mp4' => [%w(f4a m4a), %w(), 'MPEG-4 audio'],
+    'audio/mp4' => [%w(m4a f4a), %w(), 'MPEG-4 audio'],
    'audio/mpeg' => [%w(mp3 mpga), %w(), 'MP3 audio'],
    'audio/ogg' => [%w(oga ogg opus), %w(application/ogg), 'Ogg Audio'],
-    'audio/prs.sid' => [%w(psid sid), %w(), 'Commodore 64 audio'],
+    'audio/prs.sid' => [%w(sid psid), %w(), 'Commodore 64 audio'],
    'audio/usac' => [%w(loas xhe), %w(), 'USAC audio'],
    'audio/vnd.dts' => [%w(dts), %w(), 'DTS audio'],
    'audio/vnd.dts.hd' => [%w(dtshd), %w(audio/vnd.dts), 'DTSHD audio'],
    'audio/vnd.rn-realaudio' => [%w(ra rax), %w(), 'RealAudio document'],
    'audio/x-aifc' => [%w(aifc aiffc), %w(application/x-iff), 'AIFC audio'],
-    'audio/x-aiff' => [%w(aif aiff), %w(application/x-iff), 'AIFF/Amiga/Mac audio'],
+    'audio/x-aiff' => [%w(aiff aif), %w(application/x-iff), 'AIFF/Amiga/Mac audio'],
    'audio/x-amzxml' => [%w(amz), %w(), 'AmazonMP3 download file'],
    'audio/x-ape' => [%w(ape), %w(), "Monkey's audio"],
    'audio/x-flac+ogg' => [%w(oga ogg), %w(audio/ogg), 'Ogg FLAC audio'],
    'audio/x-gsm' => [%w(gsm), %w(), 'GSM 06.10 audio'],
    'audio/x-iriver-pla' => [%w(pla), %w(), 'iRiver Playlist'],
    'audio/x-it' => [%w(it), %w(), 'Impulse Tracker audio'],
-    'audio/x-m4b' => [%w(f4b m4b), %w(audio/mp4), 'MPEG-4 audio book'],
+    'audio/x-m4b' => [%w(m4b f4b), %w(audio/mp4), 'MPEG-4 audio book'],
    'audio/x-m4r' => [%w(m4r), %w(video/mp4), 'MPEG-4 Ringtone'],
    'audio/x-matroska' => [%w(mka), %w(application/x-matroska), 'Matroska audio'],
    'audio/x-minipsf' => [%w(minipsf), %w(audio/x-psf), 'MiniPSF audio'],
    'audio/x-mo3' => [%w(mo3), %w(), 'compressed Tracker audio'],
-    'audio/x-mod' => [%w(669 m15 med mod mtm ult uni), %w(), 'Amiga SoundTracker audio'],
+    'audio/x-mod' => [%w(mod ult uni m15 mtm 669 med), %w(), 'Amiga SoundTracker audio'],
    'audio/x-mpegurl' => [%w(m3u m3u8 vlc), %w(text/plain), 'MP3 audio (streamed)'],
-    'audio/x-ms-asx' => [%w(asx wax wmx wvx), %w(), 'Microsoft ASX playlist'],
+    'audio/x-ms-asx' => [%w(asx wax wvx wmx), %w(), 'Microsoft ASX playlist'],
    'audio/x-ms-wma' => [%w(wma), %w(application/vnd.ms-asf), 'Windows Media audio'],
-    'audio/x-musepack' => [%w(mp+ mpc mpp), %w(), 'Musepack audio'],
+    'audio/x-musepack' => [%w(mpc mpp mp+), %w(), 'Musepack audio'],
    'audio/x-opus+ogg' => [%w(opus), %w(audio/ogg), 'Opus audio'],
    'audio/x-pn-audibleaudio' => [%w(aa aax), %w(), 'Audible.Com audio'],
    'audio/x-psf' => [%w(psf), %w(), 'PSF audio'],
@@ -1420,8 +1420,8 @@ class MimeMagic
    'image/heif' => [%w(heic heif), %w(), 'HEIF image'],
    'image/ief' => [%w(ief), %w(), 'IEF image'],
    'image/jp2' => [%w(jp2 jpg2), %w(), 'JPEG-2000 JP2 image'],
-    'image/jpeg' => [%w(jpe jpeg jpg), %w(), 'JPEG image'],
+    'image/jpeg' => [%w(jpeg jpg jpe), %w(), 'JPEG image'],
-    'image/jpm' => [%w(jpgm jpm), %w(), 'JPEG-2000 JPM image'],
+    'image/jpm' => [%w(jpm jpgm), %w(), 'JPEG-2000 JPM image'],
    'image/jpx' => [%w(jpf jpx), %w(), 'JPEG-2000 JPX image'],
    'image/ktx' => [%w(ktx), %w(), 'Khronos texture image'],
    'image/openraster' => [%w(ora), %w(application/zip), 'OpenRaster archiving image'],
@@ -1431,8 +1431,8 @@ class MimeMagic
    'image/svg+xml-compressed' => [%w(svgz), %w(application/gzip), 'compressed SVG image'],
    'image/tiff' => [%w(tif tiff), %w(), 'TIFF image'],
    'image/vnd.adobe.photoshop' => [%w(psd), %w(), 'Photoshop image'],
-    'image/vnd.djvu' => [%w(djv djvu), %w(), 'DjVu image'],
+    'image/vnd.djvu' => [%w(djvu djv), %w(), 'DjVu image'],
-    'image/vnd.djvu+multipage' => [%w(djv djvu), %w(image/vnd.djvu), 'DjVu document'],
+    'image/vnd.djvu+multipage' => [%w(djvu djv), %w(image/vnd.djvu), 'DjVu document'],
    'image/vnd.dwg' => [%w(dwg), %w(), 'AutoCAD image'],
    'image/vnd.dxf' => [%w(dxf), %w(), 'DXF vector image'],
    'image/vnd.microsoft.icon' => [%w(ico), %w(), 'Windows icon'],
@@ -1445,19 +1445,19 @@ class MimeMagic
    'image/x-3ds' => [%w(3ds), %w(), '3D Studio image'],
    'image/x-adobe-dng' => [%w(dng), %w(image/tiff image/x-dcraw), 'Adobe DNG negative'],
    'image/x-applix-graphics' => [%w(ag), %w(), 'Applix Graphics image'],
-    'image/x-bzeps' => [%w(eps.bz2 epsf.bz2 epsi.bz2), %w(application/x-bzip), 'EPS image (bzip-compressed)'],
+    'image/x-bzeps' => [%w(eps.bz2 epsi.bz2 epsf.bz2), %w(application/x-bzip), 'EPS image (bzip-compressed)'],
    'image/x-canon-cr2' => [%w(cr2), %w(image/tiff image/x-dcraw), 'Canon CR2 raw image'],
    'image/x-canon-crw' => [%w(crw), %w(image/x-dcraw), 'Canon CRW raw image'],
    'image/x-cmu-raster' => [%w(ras), %w(), 'CMU raster image'],
-    'image/x-compressed-xcf' => [%w(xcf.bz2 xcf.gz), %w(), 'compressed GIMP image'],
+    'image/x-compressed-xcf' => [%w(xcf.gz xcf.bz2), %w(), 'compressed GIMP image'],
    'image/x-dds' => [%w(dds), %w(), 'DirectDraw surface'],
-    'image/x-eps' => [%w(eps epsf epsi), %w(application/postscript), 'EPS image'],
+    'image/x-eps' => [%w(eps epsi epsf), %w(application/postscript), 'EPS image'],
    'image/x-exr' => [%w(exr), %w(), 'EXR image'],
    'image/x-fuji-raf' => [%w(raf), %w(image/x-dcraw), 'Fuji RAF raw image'],
    'image/x-gimp-gbr' => [%w(gbr), %w(), 'GIMP brush'],
    'image/x-gimp-gih' => [%w(gih), %w(), 'GIMP brush pipe'],
    'image/x-gimp-pat' => [%w(pat), %w(), 'GIMP pattern'],
-    'image/x-gzeps' => [%w(eps.gz epsf.gz epsi.gz), %w(application/gzip), 'EPS image (gzip-compressed)'],
+    'image/x-gzeps' => [%w(eps.gz epsi.gz epsf.gz), %w(application/gzip), 'EPS image (gzip-compressed)'],
    'image/x-icns' => [%w(icns), %w(), 'MacOS X icon'],
    'image/x-ilbm' => [%w(iff ilbm lbm), %w(application/x-iff), 'ILBM image'],
    'image/x-jng' => [%w(jng), %w(), 'JNG image'],
@@ -1481,7 +1481,7 @@ class MimeMagic
    'image/x-portable-bitmap' => [%w(pbm), %w(image/x-portable-anymap), 'PBM image'],
    'image/x-portable-graymap' => [%w(pgm), %w(image/x-portable-anymap), 'PGM image'],
    'image/x-portable-pixmap' => [%w(ppm), %w(image/x-portable-anymap), 'PPM image'],
-    'image/x-quicktime' => [%w(qif qtif), %w(), 'QuickTime image'],
+    'image/x-quicktime' => [%w(qtif qif), %w(), 'QuickTime image'],
    'image/x-rgb' => [%w(rgb), %w(), 'RGB image'],
    'image/x-sgi' => [%w(sgi), %w(), 'SGI image'],
    'image/x-sigma-x3f' => [%w(x3f), %w(image/x-dcraw), 'Sigma X3F raw image'],
@@ -1490,7 +1490,7 @@ class MimeMagic
    'image/x-sony-sr2' => [%w(sr2), %w(image/tiff image/x-dcraw), 'Sony SR2 raw image'],
    'image/x-sony-srf' => [%w(srf), %w(image/tiff image/x-dcraw), 'Sony SRF raw image'],
    'image/x-sun-raster' => [%w(sun), %w(), 'Sun raster image'],
-    'image/x-tga' => [%w(icb tga tpic vda vst), %w(), 'TGA image'],
+    'image/x-tga' => [%w(tga icb tpic vda vst), %w(), 'TGA image'],
    'image/x-win-bitmap' => [%w(cur), %w(), 'Windows cursor'],
    'image/x-xbitmap' => [%w(xbm), %w(), 'XBM image'],
    'image/x-xcf' => [%w(xcf), %w(), 'GIMP image'],
@@ -1498,26 +1498,26 @@ class MimeMagic
    'image/x-xpixmap' => [%w(xpm), %w(), 'XPM image'],
    'image/x-xwindowdump' => [%w(xwd), %w(), 'X window image'],
    'message/rfc822' => [%w(eml), %w(text/plain), 'email message'],
-    'model/iges' => [%w(iges igs), %w(text/plain), 'IGES document'],
+    'model/iges' => [%w(igs iges), %w(text/plain), 'IGES document'],
    'model/stl' => [%w(stl), %w(), 'STL 3D model'],
    'model/vrml' => [%w(vrm vrml wrl), %w(text/plain), 'VRML document'],
    'text/cache-manifest' => [%w(manifest), %w(text/plain), 'Web application cache manifest'],
-    'text/calendar' => [%w(ics vcs), %w(text/plain), 'VCS/ICS calendar'],
+    'text/calendar' => [%w(vcs ics), %w(text/plain), 'VCS/ICS calendar'],
    'text/css' => [%w(css), %w(text/plain), 'CSS stylesheet'],
    'text/csv' => [%w(csv), %w(text/plain), 'CSV document'],
    'text/csv-schema' => [%w(csvs), %w(text/plain), 'CSV Schema document'],
-    'text/html' => [%w(htm html), %w(text/plain), 'HTML document'],
+    'text/html' => [%w(html htm), %w(text/plain), 'HTML document'],
-    'text/markdown' => [%w(markdown md mkd), %w(text/plain), 'Markdown document'],
+    'text/markdown' => [%w(md mkd markdown), %w(text/plain), 'Markdown document'],
-    'text/plain' => [%w(asc txt), %w(), 'plain text document'],
+    'text/plain' => [%w(txt asc), %w(), 'plain text document'],
    'text/richtext' => [%w(rtx), %w(text/plain), 'rich text document'],
    'text/rust' => [%w(rs), %w(text/plain), 'Rust source code'],
-    'text/sgml' => [%w(sgm sgml), %w(text/plain), 'SGML document'],
+    'text/sgml' => [%w(sgml sgm), %w(text/plain), 'SGML document'],
-    'text/spreadsheet' => [%w(slk sylk), %w(text/plain), 'spreadsheet interchange document'],
+    'text/spreadsheet' => [%w(sylk slk), %w(text/plain), 'spreadsheet interchange document'],
    'text/tab-separated-values' => [%w(tsv), %w(text/plain), 'TSV document'],
-    'text/troff' => [%w(roff t tr), %w(text/plain), 'Troff document'],
+    'text/troff' => [%w(tr roff t), %w(text/plain), 'Troff document'],
    'text/turtle' => [%w(ttl), %w(text/plain), 'Turtle document'],
-    'text/vcard' => [%w(gcrd vcard vcf vct), %w(text/plain), 'electronic business card'],
+    'text/vcard' => [%w(vcard vcf vct gcrd), %w(text/plain), 'electronic business card'],
-    'text/vnd.graphviz' => [%w(dot gv), %w(), 'Graphviz DOT graph'],
+    'text/vnd.graphviz' => [%w(gv dot), %w(), 'Graphviz DOT graph'],
    'text/vnd.qt.linguist' => [%w(ts), %w(application/xml), 'message catalog'],
    'text/vnd.rn-realtext' => [%w(rt), %w(), 'RealText document'],
    'text/vnd.sun.j2me.app-descriptor' => [%w(jad), %w(), 'JAD document'],
@@ -1526,8 +1526,8 @@ class MimeMagic
    'text/vtt' => [%w(vtt), %w(text/plain), 'WebVTT subtitles'],
    'text/x-adasrc' => [%w(adb ads), %w(text/plain), 'Ada source code'],
    'text/x-bibtex' => [%w(bib), %w(text/plain), 'BibTeX document'],
-    'text/x-c++hdr' => [%w(h++ hh hp hpp hxx), %w(text/x-chdr), 'C++ header'],
+    'text/x-c++hdr' => [%w(hh hp hpp h++ hxx), %w(text/x-chdr), 'C++ header'],
-    'text/x-c++src' => [%w(c c++ cc cpp cxx), %w(text/x-csrc), 'C++ source code'],
+    'text/x-c++src' => [%w(cpp cxx cc c c++), %w(text/x-csrc), 'C++ source code'],
    'text/x-chdr' => [%w(h), %w(text/x-csrc), 'C header'],
    'text/x-cmake' => [%w(cmake), %w(text/plain), 'CMake source code'],
    'text/x-cobol' => [%w(cbl cob), %w(text/plain), 'COBOL source file'],
@@ -1548,7 +1548,7 @@ class MimeMagic
    'text/x-go' => [%w(go), %w(text/plain), 'Go source code'],
    'text/x-google-video-pointer' => [%w(gvp), %w(), 'Google Video Pointer'],
    'text/x-haskell' => [%w(hs), %w(text/plain), 'Haskell source code'],
-    'text/x-iMelody' => [%w(ime imy), %w(), 'iMelody ringtone'],
+    'text/x-iMelody' => [%w(imy ime), %w(), 'iMelody ringtone'],
    'text/x-idl' => [%w(idl), %w(text/plain), 'IDL document'],
    'text/x-iptables' => [%w(iptables), %w(text/plain), 'iptables configuration file'],
    'text/x-java' => [%w(java), %w(text/x-csrc), 'Java source code'],
@@ -1557,14 +1557,14 @@ class MimeMagic
    'text/x-literate-haskell' => [%w(lhs), %w(text/plain), 'LHS source code'],
    'text/x-log' => [%w(log), %w(text/plain), 'application log'],
    'text/x-lua' => [%w(lua), %w(application/x-executable text/plain), 'Lua script'],
-    'text/x-makefile' => [%w(mak mk), %w(text/plain), 'Makefile'],
+    'text/x-makefile' => [%w(mk mak), %w(text/plain), 'Makefile'],
    'text/x-matlab' => [%w(m), %w(text/plain), 'MATLAB script/function'],
    'text/x-microdvd' => [%w(sub), %w(text/plain), 'MicroDVD subtitles'],
    'text/x-moc' => [%w(moc), %w(text/plain), 'Qt MOC file'],
    'text/x-modelica' => [%w(mo), %w(text/plain), 'Modelica model'],
    'text/x-mof' => [%w(mof), %w(text/x-csrc), 'Managed Object Format'],
    'text/x-mpsub' => [%w(sub), %w(text/plain), 'MPSub subtitles'],
-    'text/x-mrml' => [%w(mrl mrml), %w(), 'MRML playlist'],
+    'text/x-mrml' => [%w(mrml mrl), %w(), 'MRML playlist'],
    'text/x-ms-regedit' => [%w(reg), %w(text/plain), 'Windows Registry extract'],
    'text/x-mup' => [%w(mup not), %w(text/plain), 'Mup publication'],
    'text/x-nfo' => [%w(nfo), %w(text/x-readme), 'NFO document'],
@@ -1578,7 +1578,7 @@ class MimeMagic
    'text/x-patch' => [%w(diff patch), %w(text/plain), 'differences between files'],
    'text/x-python' => [%w(py pyx wsgi), %w(application/x-executable text/plain), 'Python script'],
    'text/x-python3' => [%w(py py3 py3x), %w(text/x-python), 'Python 3 script'],
-    'text/x-qml' => [%w(qml qmlproject qmltypes), %w(), 'Qt Markup Language file'],
+    'text/x-qml' => [%w(qml qmltypes qmlproject), %w(), 'Qt Markup Language file'],
    'text/x-reject' => [%w(rej), %w(text/plain), 'rejected patch'],
    'text/x-rpm-spec' => [%w(spec), %w(text/plain), 'RPM spec file'],
    'text/x-sass' => [%w(sass), %w(text/plain), 'Sass CSS pre-processor file'],
@@ -1586,13 +1586,13 @@ class MimeMagic
    'text/x-scheme' => [%w(scm ss), %w(text/plain), 'Scheme source code'],
    'text/x-scss' => [%w(scss), %w(text/plain), 'Sass CSS pre-processor file'],
    'text/x-setext' => [%w(etx), %w(text/plain), 'Setext document'],
-    'text/x-ssa' => [%w(ass ssa), %w(text/plain), 'SSA subtitles'],
+    'text/x-ssa' => [%w(ssa ass), %w(text/plain), 'SSA subtitles'],
    'text/x-subviewer' => [%w(sub), %w(text/plain), 'SubViewer subtitles'],
    'text/x-svhdr' => [%w(svh), %w(text/x-verilog), 'SystemVerilog header'],
    'text/x-svsrc' => [%w(sv), %w(text/x-verilog), 'SystemVerilog source code'],
    'text/x-systemd-unit' => [%w(automount device mount path scope service slice socket swap target timer), %w(text/plain), 'systemd unit file'],
    'text/x-tcl' => [%w(tcl tk), %w(text/plain), 'Tcl script'],
-    'text/x-tex' => [%w(cls dtx ins latex ltx sty tex), %w(text/plain), 'TeX document'],
+    'text/x-tex' => [%w(tex ltx sty cls dtx ins latex), %w(text/plain), 'TeX document'],
    'text/x-texinfo' => [%w(texi texinfo), %w(text/plain), 'TeXInfo document'],
    'text/x-troff-me' => [%w(me), %w(text/plain), 'Troff ME input document'],
    'text/x-troff-mm' => [%w(mm), %w(text/plain), 'Troff MM input document'],
@@ -1607,21 +1607,21 @@ class MimeMagic
    'text/x-xmi' => [%w(xmi), %w(application/xml), 'XMI file'],
    'text/x-xslfo' => [%w(fo xslfo), %w(application/xml), 'XSL FO file'],
    'text/x.gcode' => [%w(gcode), %w(text/plain), 'G-code file'],
-    'video/3gpp' => [%w(3ga 3gp 3gpp), %w(video/mp4), '3GPP multimedia file'],
+    'video/3gpp' => [%w(3gp 3gpp 3ga), %w(video/mp4), '3GPP multimedia file'],
    'video/3gpp2' => [%w(3g2 3gp2 3gpp2), %w(video/mp4), '3GPP2 multimedia file'],
    'video/annodex' => [%w(axv), %w(application/annodex), 'Annodex Video'],
    'video/dv' => [%w(dv), %w(), 'DV video'],
    'video/mj2' => [%w(mj2 mjp2), %w(), 'JPEG-2000 MJ2 video'],
-    'video/mp2t' => [%w(bdm bdmv clpi cpi m2t m2ts mpl mpls mts ts), %w(), 'MPEG-2 transport stream'],
+    'video/mp2t' => [%w(m2t m2ts ts mts cpi clpi mpl mpls bdm bdmv), %w(), 'MPEG-2 transport stream'],
-    'video/mp4' => [%w(f4v lrv m4v mp4), %w(), 'MPEG-4 video'],
+    'video/mp4' => [%w(mp4 m4v f4v lrv), %w(), 'MPEG-4 video'],
-    'video/mpeg' => [%w(mp2 mpe mpeg mpg vob), %w(), 'MPEG video'],
+    'video/mpeg' => [%w(mpeg mpg mp2 mpe vob), %w(), 'MPEG video'],
-    'video/ogg' => [%w(ogg ogv), %w(application/ogg), 'Ogg Video'],
+    'video/ogg' => [%w(ogv ogg), %w(application/ogg), 'Ogg Video'],
-    'video/quicktime' => [%w(moov mov qt qtvr), %w(), 'QuickTime video'],
+    'video/quicktime' => [%w(qt mov moov qtvr), %w(), 'QuickTime video'],
    'video/vnd.mpegurl' => [%w(m1u m4u mxu), %w(text/plain), 'MPEG video (streamed)'],
    'video/vnd.rn-realvideo' => [%w(rv rvx), %w(), 'RealVideo document'],
    'video/vnd.vivo' => [%w(viv vivo), %w(), 'Vivo video'],
    'video/webm' => [%w(webm), %w(), 'WebM video'],
-    'video/x-flic' => [%w(flc fli), %w(), 'FLIC animation'],
+    'video/x-flic' => [%w(fli flc), %w(), 'FLIC animation'],
    'video/x-flv' => [%w(flv), %w(), 'Flash video'],
    'video/x-javafx' => [%w(fxm), %w(video/x-flv), 'JavaFX video'],
    'video/x-matroska' => [%w(mkv), %w(application/x-matroska), 'Matroska video'],
@@ -1629,7 +1629,7 @@ class MimeMagic
    'video/x-mjpeg' => [%w(mjpeg mjpg), %w(image/jpeg), 'MJPEG video stream'],
    'video/x-mng' => [%w(mng), %w(), 'MNG animation'],
    'video/x-ms-wmv' => [%w(wmv), %w(application/vnd.ms-asf), 'Windows Media video'],
-    'video/x-msvideo' => [%w(avf avi divx), %w(), 'AVI video'],
+    'video/x-msvideo' => [%w(avi avf divx), %w(), 'AVI video'],
    'video/x-nsv' => [%w(nsv), %w(), 'NullSoft video'],
    'video/x-ogm+ogg' => [%w(ogm), %w(video/ogg), 'OGM video'],
    'video/x-sgi-movie' => [%w(movie), %w(), 'SGI video'],

--- a/script/generate-mime.rb
+++ b/script/generate-mime.rb
@@ -147,7 +147,7 @@ puts "  # @private"
 puts "  # :nodoc:"
 puts "  TYPES = {"
 types.keys.sort.each do |key|
-  exts = types[key][0].sort.join(' ')
+  exts = types[key][0].join(' ')
  parents = types[key][1].sort.join(' ')
  comment = types[key][2].inspect
  puts "    '#{key}' => [%w(#{exts}), %w(#{parents}), #{comment}],"