rename FML::NL to FML::Language

13 files changed, 40 insertions, 488 deletions

diff --git a/fml/lib/FML/Filter/Rules.pm b/fml/lib/FML/Filter/Rules.pm
index e0b394ca..d4af94aa 100644
--- a/fml/lib/FML/Filter/Rules.pm
+++ b/fml/lib/FML/Filter/Rules.pm
@@ -6,7 +6,7 @@ sub reject_null_mail_body
 
 sub reject_not_iso2022jp_japanese_string
 {
-    use FML::NL::ISO2022JP;
+    use FML::Language::ISO2022JP;
     not is_iso2022jp_string();
 }
 
diff --git a/fml/lib/FML/Header/Subject.pm b/fml/lib/FML/Header/Subject.pm
index 601e98eb..051064e7 100644
--- a/fml/lib/FML/Header/Subject.pm
+++ b/fml/lib/FML/Header/Subject.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Subject.pm,v 1.17 2001/05/30 04:03:21 fukachan Exp $
+# $FML: Subject.pm,v 1.18 2001/06/10 10:22:45 fukachan Exp $
 #
 
 package FML::Header::Subject;
@@ -161,10 +161,10 @@ sub is_reply
 
     return 1 if $subject =~ /^\s*Re:/i;
 
-    my $pkg = 'FML::NL::Japanese::Subject';
+    my $pkg = 'FML::Language::Japanese::Subject';
     eval qq{ require $pkg; $pkg->import();};
     unless ($@) {
-	return 1 if &FML::NL::Japanese::Subject::is_reply($subject);
+	return 1 if &FML::Language::Japanese::Subject::is_reply($subject);
     };
 
     return 0;
@@ -180,11 +180,11 @@ sub _cut_off_reply
 {
     my ($self, $r_subject) = @_;
 
-    my $pkg = 'FML::NL::Japanese::Subject';
+    my $pkg = 'FML::Language::Japanese::Subject';
     eval qq{ require $pkg; $pkg->import();};
     unless ($@) {
 	$$r_subject = 
-	    &FML::NL::Japanese::Subject::cut_off_reply_tag($$r_subject);
+	    &FML::Language::Japanese::Subject::cut_off_reply_tag($$r_subject);
     }
     else  {
 	Log($@);
diff --git a/fml/lib/FML/Language/ISO2022JP.pm b/fml/lib/FML/Language/ISO2022JP.pm
index 0a62ef94..41a71ee2 100644
--- a/fml/lib/FML/Language/ISO2022JP.pm
+++ b/fml/lib/FML/Language/ISO2022JP.pm
@@ -4,10 +4,10 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: ISO2022JP.pm,v 1.2 2001/06/10 10:22:46 fukachan Exp $
+# $FML: ISO2022JP.pm,v 1.1.1.1 2001/07/31 14:13:08 fukachan Exp $
 #
 
-package FML::NL::ISO2022JP;
+package FML::Language::ISO2022JP;
 
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
@@ -16,42 +16,42 @@ use Carp;
 
 =head1 NAME
 
-FML::NL::ISO2022JP - adapter for FML::NL::Japanese
+FML::Language::ISO2022JP - adapter for FML::Language::Japanese
 
 =head1 SYNOPSIS
 
-    use FML::NL::ISO2022JP qw(is_iso2022jp_string);
+    use FML::Language::ISO2022JP qw(is_iso2022jp_string);
     if ( is_iso2022jp_string($string) ) { do_something_if_Japanese;}
 
-    use FML::NL::ISO2022JP qw(STR2EUC);
+    use FML::Language::ISO2022JP qw(STR2EUC);
     $euc_string = STR2EUC( $string );
 
 =cut
 
 
-use FML::NL::Japanese::Utils qw(is_iso2022jp_string);
-use FML::NL::Japanese::String qw(STR2JIS STR2EUC STR2SJIS);
+use FML::Language::Japanese::Utils qw(is_iso2022jp_string);
+use FML::Language::Japanese::String qw(STR2JIS STR2EUC STR2SJIS);
 
 require Exporter;
-@ISA = qw(FML::NL::Japanese::Utils FML::NL::Japanese::String Exporter);
-push(@EXPORT_OK, @FML::NL::Japanese::Utils::EXPORT_OK);
-push(@EXPORT_OK, @FML::NL::Japanese::String::EXPORT_OK);
+@ISA = qw(FML::Language::Japanese::Utils FML::Language::Japanese::String Exporter);
+push(@EXPORT_OK, @FML::Language::Japanese::Utils::EXPORT_OK);
+push(@EXPORT_OK, @FML::Language::Japanese::String::EXPORT_OK);
 
 
 =head1 METHODS
 
 =head2 C<is_iso2022jp_string>
 
-See L<FML::NL::Japanese::Utils>
+See L<FML::Language::Japanese::Utils>
 
 =head2 C<STR2JIS> C<STR2EUC> C<STR2SJIS>
 
-See L<FML::NL::Japanese::String>
+See L<FML::Language::Japanese::String>
 
 =head1 SEE ALSO
 
-L<FML::NL::Japanese::Utils>,
-L<FML::NL::Japanese::String>
+L<FML::Language::Japanese::Utils>,
+L<FML::Language::Japanese::String>
 
 =head1 AUTHOR
 
@@ -66,7 +66,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::NL::ISO2022JP appeared in fml5 mailing list driver package.
+FML::Language::ISO2022JP appeared in fml5 mailing list driver package.
 See C<http://www.fml.org/> for more details.
 
 =cut
diff --git a/fml/lib/FML/Language/Japanese/String.pm b/fml/lib/FML/Language/Japanese/String.pm
index 7346f40e..6381dca2 100644
--- a/fml/lib/FML/Language/Japanese/String.pm
+++ b/fml/lib/FML/Language/Japanese/String.pm
@@ -4,21 +4,21 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: String.pm,v 1.2 2001/06/10 10:22:46 fukachan Exp $
+# $FML: String.pm,v 1.1.1.1 2001/07/31 14:13:08 fukachan Exp $
 #
 
-package FML::NL::Japanese::String;
+package FML::Language::Japanese::String;
 use strict;
 use Carp;
 use vars qw(@ISA @EXPORT @EXPORT_OK);
 
 =head1 NAME
 
-FML::NL::Japanese::String -- utilities to manipulate strings
+FML::Language::Japanese::String -- utilities to manipulate strings
 
 =head1 SYNOPSIS
 
-    use FML::NL::Japanese::String qw(STR2JIS);
+    use FML::Language::Japanese::String qw(STR2JIS);
     $euc_str = STR2JIS($str);
 
 =head1 METHOD
@@ -82,7 +82,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::NL::Japanese::String appeared in fml5 mailing list driver package.
+FML::Language::Japanese::String appeared in fml5 mailing list driver package.
 See C<http://www.fml.org/> for more details.
 
 =cut
diff --git a/fml/lib/FML/Language/Japanese/Subject.pm b/fml/lib/FML/Language/Japanese/Subject.pm
index df6fc3ba..f22dc462 100644
--- a/fml/lib/FML/Language/Japanese/Subject.pm
+++ b/fml/lib/FML/Language/Japanese/Subject.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Subject.pm,v 1.2 2001/06/10 10:22:47 fukachan Exp $
+# $FML: Subject.pm,v 1.1.1.1 2001/07/31 14:13:08 fukachan Exp $
 #
 
 
@@ -13,7 +13,7 @@
 ###                                                   ###
 
 
-package FML::NL::Japanese::Subject;
+package FML::Language::Japanese::Subject;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK);
 use Carp;
@@ -21,12 +21,12 @@ use Jcode;
 
 =head1 NAME
 
-FML::NL::Japanese::Subject - Japanese specific handling of a subject
+FML::Language::Japanese::Subject - Japanese specific handling of a subject
 
 =head1 SYNOPSIS
 
-    use FML::NL::Japanese::Subject;
-    $is_reply = FML::NL::Japanese::Subject::is_reply($subject);
+    use FML::Language::Japanese::Subject;
+    $is_reply = FML::Language::Japanese::Subject::is_reply($subject);
 
 =head1 DESCRIPTION
 
@@ -152,7 +152,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::NL::Japanese::Subject appeared in fml5 mailing list driver package.
+FML::Language::Japanese::Subject appeared in fml5 mailing list driver package.
 See C<http://www.fml.org/> for more details.
 
 =cut
diff --git a/fml/lib/FML/Language/Japanese/Utils.pm b/fml/lib/FML/Language/Japanese/Utils.pm
index 92c858d8..b573b555 100644
--- a/fml/lib/FML/Language/Japanese/Utils.pm
+++ b/fml/lib/FML/Language/Japanese/Utils.pm
@@ -4,21 +4,21 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Utils.pm,v 1.2 2001/06/10 10:22:47 fukachan Exp $
+# $FML: Utils.pm,v 1.1.1.1 2001/07/31 14:13:08 fukachan Exp $
 #
 
-package FML::NL::Japanese::Utils;
+package FML::Language::Japanese::Utils;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
 =head1 NAME
 
-FML::NL::Japanese::Utils - what is this
+FML::Language::Japanese::Utils - what is this
 
 =head1 SYNOPSIS
 
-   use FML::NL::Japanese::Utils qw(is_iso2022jp_string);
+   use FML::Language::Japanese::Utils qw(is_iso2022jp_string);
    if ( is_iso2022jp_string($string) ) { do_something_if_Japanese;}
 
 =head1 DESCRIPTION
@@ -93,7 +93,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::NL::Japanese::Utils appeared in fml5 mailing list driver package.
+FML::Language::Japanese::Utils appeared in fml5 mailing list driver package.
 See C<http://www.fml.org/> for more details.
 
 =cut
diff --git a/fml/lib/FML/NL/ISO2022JP.pm b/fml/lib/FML/NL/ISO2022JP.pm
deleted file mode 100644
index 777f42ad..00000000
--- a/fml/lib/FML/NL/ISO2022JP.pm
+++ /dev/null
@@ -1,74 +0,0 @@
-#-*- perl -*-
-#
-#  Copyright (C) 2001 Ken'ichi Fukamachi
-#   All rights reserved. This program is free software; you can
-#   redistribute it and/or modify it under the same terms as Perl itself. 
-#
-# $FML: ISO2022JP.pm,v 1.1.1.1 2001/06/10 04:11:39 fukachan Exp $
-#
-
-package FML::NL::ISO2022JP;
-
-use strict;
-use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
-use Carp;
-
-
-=head1 NAME
-
-FML::NL::ISO2022JP - adapter for FML::NL::Japanese
-
-=head1 SYNOPSIS
-
-    use FML::NL::ISO2022JP qw(is_iso2022jp_string);
-    if ( is_iso2022jp_string($string) ) { do_something_if_Japanese;}
-
-    use FML::NL::ISO2022JP qw(STR2EUC);
-    $euc_string = STR2EUC( $string );
-
-=cut
-
-
-use FML::NL::Japanese::Utils qw(is_iso2022jp_string);
-use FML::NL::Japanese::String qw(STR2JIS STR2EUC STR2SJIS);
-
-require Exporter;
-@ISA = qw(FML::NL::Japanese::Utils FML::NL::Japanese::String Exporter);
-push(@EXPORT_OK, @FML::NL::Japanese::Utils::EXPORT_OK);
-push(@EXPORT_OK, @FML::NL::Japanese::String::EXPORT_OK);
-
-
-=head1 METHODS
-
-=head2 C<is_iso2022jp_string>
-
-See L<FML::NL::Japanese::Utils>
-
-=head2 C<STR2JIS> C<STR2EUC> C<STR2SJIS>
-
-See L<FML::NL::Japanese::String>
-
-=head1 SEE ALSO
-
-L<FML::NL::Japanese::Utils>,
-L<FML::NL::Japanese::String>
-
-=head1 AUTHOR
-
-Ken'ichi Fukamachi
-
-=head1 COPYRIGHT
-
-Copyright (C) 2001 Ken'ichi Fukamachi
-
-All rights reserved. This program is free software; you can
-redistribute it and/or modify it under the same terms as Perl itself. 
-
-=head1 HISTORY
-
-FML::NL::ISO2022JP appeared in fml5 mailing list driver package.
-See C<http://www.fml.org/> for more details.
-
-=cut
-
-1;
diff --git a/fml/lib/FML/NL/Japanese/Makefile b/fml/lib/FML/NL/Japanese/Makefile
deleted file mode 100644
index 4ed76816..00000000
--- a/fml/lib/FML/NL/Japanese/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all: html
-
-html:	index.ja.html
-
-index.ja.html: *.pm
-	../../../../doc/bin/dir2url.pl > index.ja.html
diff --git a/fml/lib/FML/NL/Japanese/String.pm b/fml/lib/FML/NL/Japanese/String.pm
deleted file mode 100644
index ca6c5c66..00000000
--- a/fml/lib/FML/NL/Japanese/String.pm
+++ /dev/null
@@ -1,90 +0,0 @@
-#-*- perl -*-
-#
-#  Copyright (C) 2000 Ken'ichi Fukamachi
-#   All rights reserved. This program is free software; you can
-#   redistribute it and/or modify it under the same terms as Perl itself. 
-#
-# $FML: String.pm,v 1.1.1.1 2001/06/10 04:11:39 fukachan Exp $
-#
-
-package FML::NL::Japanese::String;
-use strict;
-use Carp;
-use vars qw(@ISA @EXPORT @EXPORT_OK);
-
-=head1 NAME
-
-FML::NL::Japanese::String -- utilities to manipulate strings
-
-=head1 SYNOPSIS
-
-    use FML::NL::Japanese::String qw(STR2JIS);
-    $euc_str = STR2JIS($str);
-
-=head1 METHOD
-
-=head2 C<STR2JIS(string)>
-
-convert CHARSET of the given string to JIS.
-
-=head2 C<STR2EUC(string)>
-
-convert CHARSET of the given string to EUC.
-
-=head2 C<STR2SJIS(string)>
-
-convert CHARSET of the given string to SJIS.
-
-=cut
-
-
-require Exporter;
-@ISA       = qw(Exporter); 
-@EXPORT_OK = qw(STR2JIS STR2EUC STR2SJIS);
-
-use Jcode;
-
-
-sub STR2EUC
-{
-    my ($str) = @_;
-    &Jcode::convert(\$str, 'euc');
-    $str;
-}
-
-
-sub STR2JIS
-{
-    my ($str) = @_;
-    &Jcode::convert(\$str, 'jis');
-    $str;
-}
-
-
-sub STR2SJIS
-{
-    my ($str) = @_;
-    &Jcode::convert(\$str, 'sjis');
-    $str;
-}
-
-
-=head1 AUTHOR
-
-Ken'ichi Fukamachi
-
-=head1 COPYRIGHT
-
-Copyright (C) 2001 Ken'ichi Fukamachi
-
-All rights reserved. This program is free software; you can
-redistribute it and/or modify it under the same terms as Perl itself. 
-
-=head1 HISTORY
-
-FML::NL::Japanese::String appeared in fml5 mailing list driver package.
-See C<http://www.fml.org/> for more details.
-
-=cut
-
-1;
diff --git a/fml/lib/FML/NL/Japanese/Subject.pm b/fml/lib/FML/NL/Japanese/Subject.pm
deleted file mode 100644
index aeeb3378..00000000
--- a/fml/lib/FML/NL/Japanese/Subject.pm
+++ /dev/null
@@ -1,161 +0,0 @@
-#-*- perl -*-
-#
-#  Copyright (C) 2001 Ken'ichi Fukamachi
-#   All rights reserved. This program is free software; you can
-#   redistribute it and/or modify it under the same terms as Perl itself. 
-#
-# $FML: Subject.pm,v 1.1.1.1 2001/06/10 04:11:39 fukachan Exp $
-#
-
-
-###                                                   ###
-### CAUTION: THE CHARSET OF THIS FILE IS "EUC-JAPAN". ###
-###                                                   ###
-
-
-package FML::NL::Japanese::Subject;
-use strict;
-use vars qw(@ISA @EXPORT @EXPORT_OK);
-use Carp;
-use Jcode;
-
-=head1 NAME
-
-FML::NL::Japanese::Subject - Japanese specific handling of a subject
-
-=head1 SYNOPSIS
-
-    use FML::NL::Japanese::Subject;
-    $is_reply = FML::NL::Japanese::Subject::is_reply($subject);
-
-=head1 DESCRIPTION
-
-a collection to handle Japanese specific representations which appears
-in the subject.
-
-=cut
-
-
-require Exporter;
-@ISA = qw(Exporter);
-
-# XXX we should it in proper way in the future.
-# XXX but we import it anyway for further rewriting.
-my $CUT_OFF_RERERE_PATTERN = '';
-my $CUT_OFF_RERERE_HOOK    = '';
-
-
-# subjec reply pattern
-# apply patch from OGAWA Kunihiko <kuni@edit.ne.jp> 
-#            fml-support:7626 7653 07666
-#            Re: Re2:   Re[2]:     Re(2):     Re^2:    Re*2:
-# i-mode ? (PR fml-help: 00157 by OGAWA Kunihiko)
-my $pattern  = 'Re:|Re\d+:|Re\[\d+\]:|Re\(\d+\):|Re\^\d+:|Re\*\d+:|Re>';
-   $pattern .= '|(返信|返|ＲＥ|Ｒｅ)(\s*:|：)';
-
-
-=head1 METHODS
-
-=head2 C<new()>
-
-usual constructor.
-
-=head2 C<is_reply($string)>
-
-check whether C<$string> looks like a reply message.
-C<$string> is a C<Subject:> of the mail header.
-For example, it is like this:
-
-  Re: reply to your messages
-
-=cut
-
-
-sub new
-{
-    my ($self) = @_;
-    my ($type) = ref($self) || $self;
-    my $me     = {};
-    return bless $me, $type;
-}
-
-
-sub is_reply
-{
-    my ($self, $x) = @_;
-    return 0 unless $x;
-    &Jcode::convert(\$x, 'euc');
-    return ($x =~ /^((\s|(　))*($pattern)\s*)+/ ? 1 : 0);
-}
-
-
-=head2 C<cut_off_reply_tag($subject)>
-
-cut off C<Re:> in the string C<$subject> like C<Re: ... >
-within C<Subject:>.
-
-=cut
-
-
-# fml-support: 07507
-# sub CutOffRe
-# {
-#    いままでどおりの Re: とかとっぱらう 
-#
-#   if ($LANGUAGE eq 'Japanese') {
-#	日本語処理依存ライブラリへ飛ぶ
-#	この中で $CUT_OFF_PATTERN (config.ph)などにしたがって
-#	切り落とすのも良し（きっと日本語を書くだろうとおもうわけで
-#	で、このライブラリの先で実行する）
-#   }
-#
-#   run-hooks $CUT_OFF_HOOK(ユーザ定義HOOK)
-#}
-# レレレ対策
-sub cut_off_reply_tag
-{
-    my ($subject) = @_;
-    my ($y, $limit);
-
-    Jcode::convert(\$subject, 'euc');
-
-    if ($CUT_OFF_RERERE_PATTERN) {
-	Jcode::convert(\$CUT_OFF_RERERE_PATTERN, 'euc');
-    }
-
-    $pattern .= '|' . $CUT_OFF_RERERE_PATTERN if ($CUT_OFF_RERERE_PATTERN);
-
-    # fixed by OGAWA Kunihiko <kuni@edit.ne.jp> (fml-support: 07815)
-    # $subject =~ s/^((\s*|(　)*)*($pattern)\s*)+/Re: /oi;
-    $subject =~ s/^((\s|(　))*($pattern)\s*)+/Re: /oi;
-
-    if ($CUT_OFF_RERERE_HOOK) { 
-	eval($CUT_OFF_RERERE_HOOK);
-	&Log($@) if $@;
-    }
-
-    Jcode::convert(\$subject, 'jis');
-    $subject;
-}
-
-
-=head1 AUTHOR
-
- Ken'ichi Fukamachi
-
-=head1 COPYRIGHT
-
-Copyright (C) 2001 Ken'ichi Fukamachi
-
-All rights reserved. This program is free software; you can
-redistribute it and/or modify it under the same terms as Perl itself. 
-
-=head1 HISTORY
-
-FML::NL::Japanese::Subject appeared in fml5 mailing list driver package.
-See C<http://www.fml.org/> for more details.
-
-=cut
-
-
-1;
diff --git a/fml/lib/FML/NL/Japanese/Utils.pm b/fml/lib/FML/NL/Japanese/Utils.pm
deleted file mode 100644
index 3b6d3246..00000000
--- a/fml/lib/FML/NL/Japanese/Utils.pm
+++ /dev/null
@@ -1,101 +0,0 @@
-#-*- perl -*-
-#
-#  Copyright (C) 2001 Ken'ichi Fukamachi
-#   All rights reserved. This program is free software; you can
-#   redistribute it and/or modify it under the same terms as Perl itself. 
-#
-# $FML: Utils.pm,v 1.1.1.1 2001/06/10 04:11:39 fukachan Exp $
-#
-
-package FML::NL::Japanese::Utils;
-use strict;
-use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
-use Carp;
-
-=head1 NAME
-
-FML::NL::Japanese::Utils - what is this
-
-=head1 SYNOPSIS
-
-   use FML::NL::Japanese::Utils qw(is_iso2022jp_string);
-   if ( is_iso2022jp_string($string) ) { do_something_if_Japanese;}
-
-=head1 DESCRIPTION
-
-Utilities for Japanse string
-
-=head1 METHODS
-
-=head2 <is_iso2022jp_string($string)>
-
-check whether $string looks Japanese. 
-return 1 if it looks so.
-
-=cut
-
-require Exporter;
-
-@ISA       = qw(Exporter);
-@EXPORT_OK = qw(is_iso2022jp_string);
-
-
-sub is_iso2022jp_string
-{
-    my ($buf) = @_;
-    return (not _look_not_iso2022jp_string($buf));
-}
-
-
-# based on fml-support: 07020, 07029
-#   Koji Sudo <koji@cherry.or.jp>
-#   Takahiro Kambe <taca@sky.yamashina.kyoto.jp>
-# check the given buffer has unusual Japanese (not ISO-2022-JP)
-sub _look_not_iso2022jp_string
-{
-    my ($buf) = @_;
-
-    # check 8 bit on
-    if ($buf =~ /[\x80-\xFF]/){
-        return 1;
-    }
-
-    # check SI/SO
-    if ($buf =~ /[\016\017]/) {
-        return 1;
-    }
-
-    # HANKAKU KANA
-    if ($buf =~ /\033\(I/) {
-        return 1;
-    }
-
-    # MSB flag or other control sequences
-    if ($buf =~ /[\001-\007\013\015\020-\032\034-\037\177-\377]/) {
-        return 1;
-    }
-
-    0; # O.K.
-}
-
-
-
-=head1 AUTHOR
-
-Ken'ichi Fukamachi
-
-=head1 COPYRIGHT
-
-Copyright (C) 2001 Ken'ichi Fukamachi
-
-All rights reserved. This program is free software; you can
-redistribute it and/or modify it under the same terms as Perl itself. 
-
-=head1 HISTORY
-
-FML::NL::Japanese::Utils appeared in fml5 mailing list driver package.
-See C<http://www.fml.org/> for more details.
-
-=cut
-
-1;
diff --git a/fml/lib/FML/NL/Makefile b/fml/lib/FML/NL/Makefile
deleted file mode 100644
index 2347ea49..00000000
--- a/fml/lib/FML/NL/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-all: anal
-
-anal:
-	@ find . | sort | grep -v CVS | sed 's@./@@'
-
-html:	index.ja.html
-
-index.ja.html: *.pm Japanese/*.pm
-	(cd Japanese; make html)
-	../../../doc/bin/dir2url.pl > index.ja.html
-
-_clean:
-	rm -f index.ja.html */index.ja.html
-
-clean:
-	(cd ../../..;make clean)
diff --git a/fml/lib/FML/Ticket/Model/minimal_states.pm b/fml/lib/FML/Ticket/Model/minimal_states.pm
index 7f8e6cf7..503362d7 100644
--- a/fml/lib/FML/Ticket/Model/minimal_states.pm
+++ b/fml/lib/FML/Ticket/Model/minimal_states.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: minimal_states.pm,v 1.18 2001/04/17 09:52:54 fukachan Exp $
+# $FML: minimal_states.pm,v 1.19 2001/06/10 10:22:47 fukachan Exp $
 #
 
 package FML::Ticket::Model::minimal_states;
@@ -901,7 +901,7 @@ sub show_articles_for_ticket
     print "</B><HR><PRE>\n" if $mode eq 'html';
 
     use FileHandle;
-    use FML::NL::ISO2022JP qw(STR2EUC);
+    use FML::Language::ISO2022JP qw(STR2EUC);
 
     my $s = '';
     for (split(/\s+/, $articles)) {
@@ -1006,7 +1006,7 @@ sub _show_ticket_by_html_table
 
     $aid = (split(/\s+/, $articles))[0];
     my $buf = $self->_article_summary( $spool_dir ."/". $aid );
-    use FML::NL::ISO2022JP qw(STR2EUC);
+    use FML::Language::ISO2022JP qw(STR2EUC);
     print STR2EUC($buf);
 }