mhonarc-commits
[Top] [All Lists]

CVS: mhonarc/MHonArc/lib mhdb.pl,2.22,2.23 mhopt.pl,2.33,2.34 mhrcfile.pl,2...

2002-11-16 20:39:34
Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv25158/lib

Modified Files:
	mhdb.pl mhopt.pl mhrcfile.pl readmail.pl 
Log Message:
* Added CHARSETALIASES resource to define aliases for official
  charset names.
* MHonArc::CharEnt:
  + Several charset mappings added to MHonArc::CharEnt with the
    default value for CHARSETCONVERTERS updated to reflect the new
    mappings: various Cyrillic sets, VISCII, Apple-based charsets, etc.
    Sets that have bidirectional rendering (Hebrew, Arabic) exist,
    but directional re-ording for rendering is currently not supported.
  . Some existing mappings have been updated to use Unicode numeric
    character entity references (&#xHHHH;) instead of standard SGML
    character entity references (eg. &Aelig;).  Most, if not all,
    web browsers only support the set of SGML entity references
    defined in the HTML 4.0 specification.

    All existing tables should now generate entity references
    recognized by all HTML 4.0 compliant browsers.


Index: mhdb.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhdb.pl,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** mhdb.pl	27 Jul 2002 05:13:13 -0000	2.22
--- mhdb.pl	17 Nov 2002 03:38:52 -0000	2.23
***************
*** 82,85 ****
--- 82,89 ----
  print_var(\*DB,'ZoneUD',      \%ZoneUD);
  
+ unless ($IsDefault{'CHARSETALIASES'}) {
+     print_var(\*DB,'readmail::MIMECharsetAliases',
+ 		    \%readmail::MIMECharsetAliases);
+ }
  unless ($IsDefault{'CHARSETCONVERTERS'}) {
      print_var(\*DB,'readmail::MIMECharSetConverters',

Index: mhopt.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhopt.pl,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** mhopt.pl	14 Nov 2002 00:40:59 -0000	2.33
--- mhopt.pl	17 Nov 2002 03:38:52 -0000	2.34
***************
*** 410,414 ****
  
      ## Set mail parsing variables.
!     mhinit_readmail_vars();
  
      ##	Read resource file(s) (I initially used the term 'format file').
--- 410,420 ----
  
      ## Set mail parsing variables.
!     if (!$SCAN) {
! 	# require readmail library
! 	require 'readmail.pl';
! 	mhinit_readmail_vars();
! 	$readmail::FormatHeaderFunc = \&mhonarc::htmlize_header;
! 	$MHeadCnvFunc = \&readmail::MAILdecode_1522_str;
!     }
  
      ##	Read resource file(s) (I initially used the term 'format file').
***************
*** 447,458 ****
      @OtherIdxs = remove_dups(\(_at_)OtherIdxs);
      @PerlINC   = remove_dups(\(_at_)PerlINC);
- 
-     ## Require mail parsing library
      unshift(@INC, @PerlINC);
      if (!$SCAN) {
- 	# require readmail library
- 	require 'readmail.pl' || die("ERROR: Unable to require readmail.pl\n");
- 	$readmail::FormatHeaderFunc = \&mhonarc::htmlize_header;
- 	$MHeadCnvFunc = \&readmail::MAILdecode_1522_str;
  	readmail::MAILset_alternative_prefs(@MIMEAltPrefs);
  	$IsDefault{'MIMEALTPREFS'} = !scalar(@MIMEAltPrefs);
--- 453,460 ----
      @OtherIdxs = remove_dups(\(_at_)OtherIdxs);
      @PerlINC   = remove_dups(\(_at_)PerlINC);
      unshift(@INC, @PerlINC);
+ 
+     ## Set alternative prefs
      if (!$SCAN) {
  	readmail::MAILset_alternative_prefs(@MIMEAltPrefs);
  	$IsDefault{'MIMEALTPREFS'} = !scalar(@MIMEAltPrefs);
***************
*** 798,801 ****
--- 800,804 ----
  ##
  sub mhinit_readmail_vars {
+     ##	Default decoders
      unless (%readmail::MIMEDecoders) {
  	%readmail::MIMEDecoders = (
***************
*** 819,829 ****
      }
  
-     ##----------------------------------------------------------------------
      ##	Default filters
-     ##
      unless (%readmail::MIMEFilters) {
  	%readmail::MIMEFilters = (
  	    # Content-type			Filter
! 	    #-------------------------------------------------------------------
  	    "application/ms-tnef",		"m2h_null::filter",
  	    "application/octet-stream",		"m2h_external::filter",
--- 822,830 ----
      }
  
      ##	Default filters
      unless (%readmail::MIMEFilters) {
  	%readmail::MIMEFilters = (
  	    # Content-type			Filter
! 	    #-----------------------------------------------------------------
  	    "application/ms-tnef",		"m2h_null::filter",
  	    "application/octet-stream",		"m2h_external::filter",
***************
*** 854,858 ****
  	%readmail::MIMEFiltersSrc = (
  	    # Content-type			Filter
! 	    #-------------------------------------------------------------------
  	    "application/ms-tnef",		"mhnull.pl",
  	    "application/octet-stream",		"mhexternal.pl",
--- 855,859 ----
  	%readmail::MIMEFiltersSrc = (
  	    # Content-type			Filter
! 	    #-----------------------------------------------------------------
  	    "application/ms-tnef",		"mhnull.pl",
  	    "application/octet-stream",		"mhexternal.pl",
***************
*** 884,892 ****
  
      ##  Default filter arguments
-     ##
      unless (%readmail::MIMEFiltersArgs) {
  	%readmail::MIMEFiltersArgs = (
  	    # Content-type			Arguments
! 	    #-------------------------------------------------------------------
  	    'm2h_external::filter',		'inline',
  	);
--- 885,892 ----
  
      ##  Default filter arguments
      unless (%readmail::MIMEFiltersArgs) {
  	%readmail::MIMEFiltersArgs = (
  	    # Content-type			Arguments
! 	    #-----------------------------------------------------------------
  	    'm2h_external::filter',		'inline',
  	);
***************
*** 895,957 ****
  
      ##  Charset filters
-     ##
      unless (%readmail::MIMECharSetConverters) {
  	%readmail::MIMECharSetConverters = (
  	    # Character set		Converter Function
! 	    #-------------------------------------------------------------------
! 	    "plain",     		"mhonarc::htmlize",
! 	    "us-ascii",   		"mhonarc::htmlize",
! 	    "iso-8859-1",   		"mhonarc::htmlize",
! 	    "iso-8859-2",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-3",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-4",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-5",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-6",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-7",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-8",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-9",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-10",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-8859-15",   		"MHonArc::CharEnt::str2sgml",
! 	    "iso-2022-jp",   		"iso_2022_jp::str2html",
! 	    "latin1",   		"mhonarc::htmlize",
! 	    "latin2",   		"MHonArc::CharEnt::str2sgml",
! 	    "latin3",   		"MHonArc::CharEnt::str2sgml",
! 	    "latin4",   		"MHonArc::CharEnt::str2sgml",
! 	    "latin5",   		"MHonArc::CharEnt::str2sgml",
! 	    "latin6",   		"MHonArc::CharEnt::str2sgml",
! 	    "latin9",   		"MHonArc::CharEnt::str2sgml",
! 	    "windows-1250",   		"MHonArc::CharEnt::str2sgml",
! 	    "windows-1252",   		"MHonArc::CharEnt::str2sgml",
! 	    "default",     		"-ignore-",
  	);
  	%readmail::MIMECharSetConvertersSrc = (
  	    # Character set		Converter Function
! 	    #-------------------------------------------------------------------
! 	    "plain",     		undef,
! 	    "us-ascii",   		undef,
! 	    "iso-8859-1",   		undef,
! 	    "iso-8859-2",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-3",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-4",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-5",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-6",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-7",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-8",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-9",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-10",   		"MHonArc/CharEnt.pm",
! 	    "iso-8859-15",   		"MHonArc/CharEnt.pm",
! 	    "iso-2022-jp",   		"iso2022jp.pl",
! 	    "latin1",   		undef,
! 	    "latin2",   		"MHonArc/CharEnt.pm",
! 	    "latin3",   		"MHonArc/CharEnt.pm",
! 	    "latin4",   		"MHonArc/CharEnt.pm",
! 	    "latin5",   		"MHonArc/CharEnt.pm",
! 	    "latin6",   		"MHonArc/CharEnt.pm",
! 	    "latin9",   		"MHonArc/CharEnt.pm",
! 	    "windows-1250",   		"MHonArc/CharEnt.pm",
! 	    "windows-1252",   		"MHonArc/CharEnt.pm",
! 	    "default",     		undef,
  	);
  	$IsDefault{'CHARSETCONVERTERS'} = 1;
      }
  
--- 895,1093 ----
  
      ##  Charset filters
      unless (%readmail::MIMECharSetConverters) {
  	%readmail::MIMECharSetConverters = (
  	    # Character set		Converter Function
! 	    #-----------------------------------------------------------------
! 	    'plain',     		'mhonarc::htmlize',
! 	    'us-ascii',   		'mhonarc::htmlize',
! 	    'iso-8859-1',   		'mhonarc::htmlize',
! 	    'iso-8859-2',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-3',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-4',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-5',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-6',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-7',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-8',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-9',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-10',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-11',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-13',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-14',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-15',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-8859-16',   		'MHonArc::CharEnt::str2sgml',
! 	    'iso-2022-jp',   		'iso_2022_jp::str2html',
! 	    'cp1250',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1251',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1252',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1253',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1254',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1255',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1256',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1257',   		'MHonArc::CharEnt::str2sgml',
! 	    'cp1258',   		'MHonArc::CharEnt::str2sgml',
! 	    'koi-0',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi-7',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi8-a',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi8-b',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi8-e',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi8-f',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi8-r',            	'MHonArc::CharEnt::str2sgml',
! 	    'koi8-u',            	'MHonArc::CharEnt::str2sgml',
! 	    'gost19768-87',            	'MHonArc::CharEnt::str2sgml',
! 	    'viscii',            	'MHonArc::CharEnt::str2sgml',
! 	    'apple-arabic',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-centeuro',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-croatian',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-cyrillic',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-greek',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-hebrew',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-iceland',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-romanian',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-roman',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-thai',		'MHonArc::CharEnt::str2sgml',
! 	    'apple-turkish',		'MHonArc::CharEnt::str2sgml',
! 	    'default',     		'-ignore-',
  	);
  	%readmail::MIMECharSetConvertersSrc = (
  	    # Character set		Converter Function
! 	    #-----------------------------------------------------------------
! 	    'plain',     		undef,
! 	    'us-ascii',   		undef,
! 	    'iso-8859-1',   		undef,
! 	    'iso-8859-2',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-3',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-4',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-5',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-6',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-7',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-8',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-9',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-10',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-11',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-13',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-14',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-15',   		'MHonArc/CharEnt.pm',
! 	    'iso-8859-16',   		'MHonArc/CharEnt.pm',
! 	    'iso-2022-jp',   		'iso2022jp.pl',
! 	    'cp1250',   		'MHonArc/CharEnt.pm',
! 	    'cp1251',   		'MHonArc/CharEnt.pm',
! 	    'cp1252',   		'MHonArc/CharEnt.pm',
! 	    'cp1253',   		'MHonArc/CharEnt.pm',
! 	    'cp1254',   		'MHonArc/CharEnt.pm',
! 	    'cp1255',   		'MHonArc/CharEnt.pm',
! 	    'cp1256',   		'MHonArc/CharEnt.pm',
! 	    'cp1257',   		'MHonArc/CharEnt.pm',
! 	    'cp1258',   		'MHonArc/CharEnt.pm',
! 	    'koi-0',            	'MHonArc/CharEnt.pm',
! 	    'koi-7',            	'MHonArc/CharEnt.pm',
! 	    'koi8-a',            	'MHonArc/CharEnt.pm',
! 	    'koi8-b',            	'MHonArc/CharEnt.pm',
! 	    'koi8-e',            	'MHonArc/CharEnt.pm',
! 	    'koi8-f',            	'MHonArc/CharEnt.pm',
! 	    'koi8-r',            	'MHonArc/CharEnt.pm',
! 	    'koi8-u',            	'MHonArc/CharEnt.pm',
! 	    'gost19768-87',            	'MHonArc/CharEnt.pm',
! 	    'viscii',            	'MHonArc/CharEnt.pm',
! 	    'apple-arabic',		'MHonArc/CharEnt.pm',
! 	    'apple-centeuro',		'MHonArc/CharEnt.pm',
! 	    'apple-croatian',		'MHonArc/CharEnt.pm',
! 	    'apple-cyrillic',		'MHonArc/CharEnt.pm',
! 	    'apple-greek',		'MHonArc/CharEnt.pm',
! 	    'apple-hebrew',		'MHonArc/CharEnt.pm',
! 	    'apple-iceland',		'MHonArc/CharEnt.pm',
! 	    'apple-romanian',		'MHonArc/CharEnt.pm',
! 	    'apple-roman',		'MHonArc/CharEnt.pm',
! 	    'apple-thai',		'MHonArc/CharEnt.pm',
! 	    'apple-turkish',		'MHonArc/CharEnt.pm',
! 	    'default',     		undef,
  	);
  	$IsDefault{'CHARSETCONVERTERS'} = 1;
+     }
+ 
+     ##	Default charset aliases
+     unless (%readmail::MIMECharsetAliases) {
+ 	readmail::MAILset_charset_aliases({ 
+ 	    'us-ascii'     => [ 'ascii',
+ 				'iso646', 'iso646-us',
+ 				'cp367',
+ 				'csascii',
+ 				'iso-ir-6',
+ 				'us' ],
+ 	    'iso-8859-1'   => [ 'latin1', 'l1',
+ 				'iso_8859_1', 'iso_8859-1:1987',
+ 			        'iso8859-1', 'iso8859_1', '8859-1', '8859_1',
+ 				'cp819', 'ibm819',
+ 				'iso-ir-100' ],
+ 	    'iso-8859-2'   => [ 'latin2', 'l2',
+ 				'iso_8859_2', 'iso_8859-2:1987',
+ 			        'iso8859-2', 'iso8859_2', '8859-2', '8859_2',
+ 				'iso-ir-101' ],
+ 	    'iso-8859-3'   => [ 'latin3', 'l3',
+ 				'iso_8859_3', 'iso_8859-3:1988',
+ 			        'iso8859-3', 'iso8859_3', '8859-3', '8859_3',
+ 				'iso-ir-109' ],
+ 	    'iso-8859-4'   => [ 'latin4', 'l4',
+ 				'iso_8859_4', 'iso_8859-4:1988',
+ 			        'iso8859-4', 'iso8859_4', '8859-4', '8859_4',
+ 				'iso-ir-110' ],
+ 	    'iso-8859-5'   => [ 'iso_8859-5:1988',
+ 				'cyrillic',
+ 				'iso-ir-144' ],
+ 	    'iso-8859-6'   => [ 'iso_8859-6:1987',
+ 				'arabic',
+ 				'asmo-708',
+ 				'ecma-114',
+ 				'iso-ir-127' ],
+ 	    'iso-8859-7'   => [ 'iso_8859-7:1987',
+ 				'greek', 'greek8',
+ 				'ecma-118',
+ 				'elot_928',
+ 				'iso-ir-126' ],
+ 	    'iso-8859-8'   => [ 'iso-8859-8-i', 'iso_8859-8:1988',
+ 				'hebrew',
+ 				'iso-ir-138' ],
+ 	    'iso-8859-9'   => [ 'latin5', 'l5',
+ 				'iso_8859_9', 'iso-8859_9:1989',
+ 			        'iso8859-9', 'iso8859_9', '8859-9', '8859_9',
+ 				'iso-ir-148' ],
+ 	    'iso-8859-10'  => [ 'latin6', 'l6',
+ 				'iso_8859_10', 'iso_8859-10:1993',
+ 			        'iso8859-10', 'iso8859_10',
+ 				'8859-10', '8859_10',
+ 				'iso-ir-157' ],
+ 	    'iso-8859-13'  => [ 'latin7' ,'l7' ],
+ 	    'iso-8859-14'  => [ 'latin8' ,'l8' ],
+ 	    'iso-8859-15'  => [ 'latin9', 'latin0', 'l9', 'l0',
+ 				'iso_8859_15',
+ 				'iso8859-15', 'iso8859_15',
+ 				'8859-15', '8859_15' ],
+ 	    'cp1250'       => [ 'windows-1250' ],
+ 	    'cp1251'       => [ 'windows-1251' ],
+ 	    'cp1252'       => [ 'windows-1252' ],
+ 	    'cp1253'       => [ 'windows-1253' ],
+ 	    'cp1254'       => [ 'windows-1254' ],
+ 	    'cp1255'       => [ 'windows-1255' ],
+ 	    'cp1256'       => [ 'windows-1256' ],
+ 	    'cp1257'       => [ 'windows-1257' ],
+ 	    'cp1258'       => [ 'windows-1258' ],
+ 	    'koi-0'          => [ 'gost-13052' ],
+ 	    'koi8-e'         => [ 'iso-ir-111',
+ 				'ecma-113:1986' ],
+ 	    'koi8-r'         => [ 'cp878' ],
+ 	    'gost-19768-87'  => [ 'ecma-cyrillic',
+ 				  'ecma-113', 'ecma-113:1988' ],
+ 	    'apple-arabic'   => [ 'x-mac-arabic' ],
+ 	    'apple-centeuro' => [ 'x-mac-centeuro' ],
+ 	    'apple-croatian' => [ 'x-mac-croatian' ],
+ 	    'apple-cyrillic' => [ 'x-mac-cyrillic' ],
+ 	    'apple-greek'    => [ 'x-mac-greek' ],
+ 	    'apple-hebrew'   => [ 'x-mac-hebrew' ],
+ 	    'apple-iceland'  => [ 'x-mac-iceland' ],
+ 	    'apple-romanian' => [ 'x-mac-romanian' ],
+ 	    'apple-roman'    => [ 'x-mac-roman' ],
+ 	    'apple-thai'     => [ 'x-mac-thai' ],
+ 	    'apple-turkish'  => [ 'x-mac-turkish' ],
+ 	});
+ 	$IsDefault{'CHARSETALIASES'} = 1;
      }
  

Index: mhrcfile.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhrcfile.pl,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -r2.25 -r2.26
*** mhrcfile.pl	27 Jul 2002 05:13:13 -0000	2.25
--- mhrcfile.pl	17 Nov 2002 03:38:52 -0000	2.26
***************
*** 81,84 ****
--- 81,97 ----
  	    last FMTSW;
  	}
+ 	if ($elem eq 'charsetaliases') {	# Charset aliases
+ 	    $IsDefault{'CHARSETALIASES'} = 0;
+ 	    readmail::MAILset_charset_aliases({ }, $override);
+ 	    while (defined($line = <$handle>)) {
+ 		last  if $line =~ /^\s*<\/charsetaliases\s*>/i;
+ 		next  unless $line =~ /\S/;
+ 		$line =~ s/\s//g;
+ 		($name, $aliases) = split(/;/, $line, 2);
+ 		readmail::MAILset_charset_aliases({
+ 		    $name => [ split(/,/, $aliases) ] });
+ 	    }
+ 	    last FMTSW;
+ 	}
  	if ($elem eq 'charsetconverters') {	# Charset filters
  	    $IsDefault{'CHARSETCONVERTERS'} = 0;
***************
*** 91,100 ****
  		next  if $line =~ /^\s*$/;
  		$line =~ s/\s//g;
! 		if ($line =~ /;/) {	# using Perl 5 qualification
! 		    ($type,$routine,$plfile) = split(/;/,$line,3);
! 		} else {
! 		    ($type,$routine,$plfile) = split(/:/,$line,3);
! 		}
! 		$type =~ tr/A-Z/a-z/;
  		$readmail::MIMECharSetConverters{$type}    = $routine;
  		$readmail::MIMECharSetConvertersSrc{$type} = $plfile
--- 104,109 ----
  		next  if $line =~ /^\s*$/;
  		$line =~ s/\s//g;
! 		($type,$routine,$plfile) = split(/;/,$line,3);
! 		$type = lc($type);
  		$readmail::MIMECharSetConverters{$type}    = $routine;
  		$readmail::MIMECharSetConvertersSrc{$type} = $plfile
***************
*** 432,440 ****
  		next  unless $line =~ /\S/;
  		$line =~ s/\s//g;
! 		if ($line =~ /;/) {	# using Perl 5 qualification
! 		    ($type,$routine,$plfile) = split(/;/,$line,3);
! 		} else {
! 		    ($type,$routine,$plfile) = split(/:/,$line,3);
! 		}
  		$type =~ tr/A-Z/a-z/;
  		$readmail::MIMEDecoders{$type}    = $routine;
--- 441,445 ----
  		next  unless $line =~ /\S/;
  		$line =~ s/\s//g;
! 		($type,$routine,$plfile) = split(/;/,$line,3);
  		$type =~ tr/A-Z/a-z/;
  		$readmail::MIMEDecoders{$type}    = $routine;
***************
*** 453,461 ****
  		next  if $line =~ /^\s*$/;
  		$line =~ s/\s//g;
! 		if ($line =~ /;/) {	# using Perl 5 qualification
! 		    ($type,$routine,$plfile) = split(/;/,$line,3);
! 		} else {
! 		    ($type,$routine,$plfile) = split(/:/,$line,3);
! 		}
  		$type =~ tr/A-Z/a-z/;
  		$readmail::MIMEFilters{$type}    = $routine;
--- 458,462 ----
  		next  if $line =~ /^\s*$/;
  		$line =~ s/\s//g;
! 		($type,$routine,$plfile) = split(/;/,$line,3);
  		$type =~ tr/A-Z/a-z/;
  		$readmail::MIMEFilters{$type}    = $routine;
***************
*** 471,475 ****
  		next  unless $line =~ /\S/;
  		$line =~ s/^\s+//;
! 		if ($line =~ /;/) {	# using Perl 5 qualification
  		    ($type, $arg) = split(/;/,$line,2);
  		} else {
--- 472,476 ----
  		next  unless $line =~ /\S/;
  		$line =~ s/^\s+//;
! 		if ($line =~ /;/) {
  		    ($type, $arg) = split(/;/,$line,2);
  		} else {

Index: readmail.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/readmail.pl,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -r2.23 -r2.24
*** readmail.pl	14 Nov 2002 00:40:59 -0000	2.23
--- readmail.pl	17 Nov 2002 03:38:52 -0000	2.24
***************
*** 143,150 ****
      unless defined(%MIMECharSetConvertersSrc);
  
- ##	Default settings:
- $MIMECharSetConverters{"default"}	= "-ignore-"
-     unless defined($MIMECharSetConverters{"default"});
- 
  ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  ##  %MIMEFilters is the associative array for storing functions that
--- 143,146 ----

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV