(chise-tex-encode-region-for-jis): Don't decompose <CYRILLIC SMALL

[chise/omega.git] / makefonts.pl

diff --git a/makefonts.pl b/makefonts.pl
index 44e80cf..51274b8 100755 (executable)
--- a/makefonts.pl
+++ b/makefonts.pl
@@ -18,7 +18,8 @@ my $kagecgi="v0.4/engine/kage.cgi"; #
 
 my $t1asm = "/usr/bin/env t1asm"; # point to 't1asm' executable.
 #die "Cannot execute $t1asm. Abort.\n" unless -x $t1asm;
-my $pfaedit="/usr/bin/env pfaedit"; # point to 'pfaedit' executable.
+#my $pfaedit="/usr/bin/env pfaedit"; # point to 'pfaedit' executable.
+my $pfaedit="/usr/bin/env fontforge"; # point to 'pfaedit' executable.
 #die "Cannot execute $pfaedit. Abort.\n" unless -x $pfaedit;
 
 $omegadb_path=~s!/$!!;
@@ -223,14 +224,19 @@ BLACKBOX
 ##############
 
 # Read ids data generated by inCHISE
-my $idsdata="$omegadb_path/idsdata.pl";
+my $idsdata="$omegadb_path/idsdata.txt";
 my ($font_start, $ids_start, %ids);
 if(-e $idsdata){
     # "require" doesn't work well.
     # I don't know why...
     open (my $data, "<:utf8","$idsdata");
     while(<$data>){
-       eval $_;
+       utf8::decode($_);
+       if(m/^START\t(\d+)\t(\d+)/){
+           $font_start=$1,$ids_start=$2;
+       }elsif(m/^(.*?)\t(\d+)\t(\d+)/){
+           $ids{$1}=[$2,$3,];
+       }
     }
     close($data);
 }else{