--- a/MIMETypes.st	Fri Feb 28 14:27:37 2014 +0100
+++ b/MIMETypes.st	Fri Feb 28 16:31:25 2014 +0100
@@ -322,6 +322,8 @@
 !
 
 initializeImageReaderMappings
+    |rdr|
+
     FileSuffixToImageReaderClassMapping isNil ifTrue:[
         FileSuffixToImageReaderClassMapping := Dictionary new
     ].
@@ -330,23 +332,127 @@
     ].
 
     "/ setup mimeType to image reader class mapping ...
-
     TypeToImageReaderClassMapping at:'image/jpeg' put:JPEGReader.
     TypeToImageReaderClassMapping at:'image/gif'  put:GIFReader.
     TypeToImageReaderClassMapping at:'image/tiff' put:TIFFReader.
     TypeToImageReaderClassMapping at:'image/png'  put:PNGReader.
 
     "/ setup suffix to image reader class mapping ...
-
     FileSuffixToImageReaderClassMapping at:'jpg'  put:JPEGReader.
+    FileSuffixToImageReaderClassMapping at:'jpeg' put:JPEGReader.
     FileSuffixToImageReaderClassMapping at:'gif'  put:GIFReader.
     FileSuffixToImageReaderClassMapping at:'tif'  put:TIFFReader.
+    FileSuffixToImageReaderClassMapping at:'tiff' put:TIFFReader.
     FileSuffixToImageReaderClassMapping at:'png'  put:PNGReader.
 
-    WindowsIconReader notNil ifTrue:[
-        TypeToImageReaderClassMapping at:'image/bmp'  put:WindowsIconReader.
-        FileSuffixToImageReaderClassMapping at:'bmp'  put:WindowsIconReader.
+    "/ some 'used-to-be-optional' readers
+    (rdr := Smalltalk at:#WindowsIconReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/bmp'      put:rdr.
+        TypeToImageReaderClassMapping       at:'image/x-MS-bmp' put:rdr.
+        TypeToImageReaderClassMapping       at:'image/x-MS-ico' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'bmp'            put:rdr.
+        FileSuffixToImageReaderClassMapping at:'ico'            put:rdr.
+    ].
+    (rdr := Smalltalk at:#XBMReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-xbitmap' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'xbm'             put:rdr.
+    ].
+    (rdr := Smalltalk at:#XPMReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-xpixmap' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'pm'              put:rdr.
+    ].
+    (rdr := Smalltalk at:#PBMReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-portable-pixmap'  put:rdr.
+        TypeToImageReaderClassMapping       at:'image/x-portable-bitmap'  put:rdr.
+        TypeToImageReaderClassMapping       at:'image/x-portable-graymap' put:rdr.
+        TypeToImageReaderClassMapping       at:'image/x-portable-anymap'  put:rdr.
+        FileSuffixToImageReaderClassMapping at:'ppm'                      put:rdr.
+        FileSuffixToImageReaderClassMapping at:'pbm'                      put:rdr.
+        FileSuffixToImageReaderClassMapping at:'pgm'                      put:rdr.
+        FileSuffixToImageReaderClassMapping at:'pnm'                      put:rdr.
+    ].
+    (rdr := Smalltalk at:#PCXReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-pcx' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'pcx'         put:rdr.
+    ].
+    (rdr := Smalltalk at:#TargaReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-targa' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'tga'           put:rdr.
+    ].
+    (rdr := Smalltalk at:#XWDReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-xwindowdump' put:rdr.
+        TypeToImageReaderClassMapping       at:'image/x-windowdump'  put:rdr.
+        FileSuffixToImageReaderClassMapping at:'xwd'                 put:rdr.
+    ].
+    (rdr := Smalltalk at:#BlitImageReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-blitimage' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'48x48x1'           put:rdr.
+    ].
+    (rdr := Smalltalk at:#IrisRGBReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-rgb' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'rgb'         put:rdr.
+    ].
+    (rdr := Smalltalk at:#SunRasterReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-sunraster' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'im8'               put:rdr.
+        FileSuffixToImageReaderClassMapping at:'icon'              put:rdr.
     ].
+    (rdr := Smalltalk at:#ST80FormReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-st80-form' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'form'              put:rdr.
+    ].
+    (rdr := Smalltalk at:#FaceReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-face' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'face'         put:rdr.
+    ].
+    (rdr := Smalltalk at:#PCDReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-photo-cd' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'pcd'              put:rdr.
+    ].
+    (rdr := Smalltalk at:#CMURasterReader) notNil ifTrue:[
+        TypeToImageReaderClassMapping       at:'image/x-cmu-raster' put:rdr.
+        FileSuffixToImageReaderClassMapping at:'ras'                put:rdr.
+    ].
+
+    "/ movie formats - experimantal and not yet complete / finished / delivered
+"/    (rdr := Smalltalk at:#FLIReader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/x-fli' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'fli'         put:rdr.
+"/    ].
+"/    (rdr := Smalltalk at:#AVIReader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/x-msvideo' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'avi'             put:rdr.
+"/    ].
+"/    (rdr := Smalltalk at:#AVIReader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/x-msvideo' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'avi'             put:rdr.
+"/    ].
+"/    (rdr := Smalltalk at:#QuickTimeReader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/quicktime' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'qt'              put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mov'             put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'moov'            put:rdr.
+"/    ].
+"/    (rdr := Smalltalk at:#MPEG2Reader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/x-mpeg2' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpg2'          put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpv2'          put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mp2v'          put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mp2'           put:rdr.
+"/    ].
+"/    (rdr := Smalltalk at:#MPEGReader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/mpeg' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpg'        put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpeg'       put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpe'        put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpv'        put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'vps'        put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'mpegv'      put:rdr.
+"/    ].
+"/    (rdr := Smalltalk at:#SGIMovieReader) notNil ifTrue:[
+"/        TypeToImageReaderClassMapping       at:'video/x-sgi-movie' put:rdr.
+"/        FileSuffixToImageReaderClassMapping at:'movie'             put:rdr.
+"/    ].
 !
 
 initializeParenthesisSpecMappings
@@ -536,7 +642,7 @@
         ('jpg' 'jpeg')  'image/jpeg'
         'gif'           'image/gif'
         ('tif' 'tiff')  'image/tiff'
-        'xbm'           'image/x-xbitmap'
+        ('xbm' 'bm')    'image/x-xbitmap'
         'xpm'           'image/x-xpixmap'
         'png'           'image/png'
         'pcd'           'image/x-photo-cd'
@@ -607,6 +713,7 @@
         ('mpv2' 'mp2v' 'mp2' 'mpeg2')      'video/x-mpeg2'
         'rm'                               'application/vnd.rn-realmedia'
         'rv'                               'video/x-pn-realvideo'
+        'fli'                              'video/x-fli'
    )
 !
 
@@ -1394,11 +1501,11 @@
 !MIMETypes class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/MIMETypes.st,v 1.131 2013-12-07 10:28:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/MIMETypes.st,v 1.132 2014-02-28 15:31:25 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/MIMETypes.st,v 1.131 2013-12-07 10:28:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/MIMETypes.st,v 1.132 2014-02-28 15:31:25 cg Exp $'
 ! !