-#!/usr/bin/perl
+#!/usr/bin/perl -w -CID
use strict;
use vars qw($opt_in_cs $opt_order $opt_kage $opt_replace
@CDP @HZK @GT
);
use Getopt::Long;
+use Fcntl ':flock';
use utf8;
use Chise_utils ':all';
+require 5.008;
-my $perl="/usr/bin/perl";
-my $makefonts="/Users/izumi/.chise/makefonts.pl";
+my $omegadb_path="/usr/local/lib/chise/omega";
+$omegadb_path=~s!/$!!;
+
+my $makefonts="$omegadb_path/makefonts.pl";
my $exec_makefonts=0;
my $geta=pack("S",8750|0x8080);
-if($^V and $^V ge v5.8){
- $perl58=1;
-}elsif($^V and $^V ge v5.6){
- $perl56=1;
-}else{
- print STDERR "This versin is not supported.";
-}
-if($perl58){
- eval "use Encode";
- binmode(STDIN, ':encoding(utf8)');
- binmode(STDOUT, ':encoding(utf8)');
-}
-
&GetOptions("in=s"=>\$opt_in_cs,
"order=s"=>\$opt_order,
"replace",\$opt_replace,
g: GB
j: JIS
k: KS
- t: GT
+ G: GT
m: Multi, use \\UTFM of otf.sty
You can also combine them, ex. jtcgkm
k: use Kage server.
'g'=>'UniGB',
'j'=>'UniJIS',
'k'=>'UniKS',
- 't'=>'GT',
+ 'G'=>'GT',
'm'=>'Multi',
);
}
if(defined($opt_order)){
- if($opt_order=~/^[cgjktm]+$/){
+ if($opt_order=~/^[cgjkGm]+$/){
@order=split(//,$opt_order);
@order=map {$order{$_}} @order;
}else{
$texmacro[0x1E5D]='{\ifmmode \ucirc{\bar{r}}\else \ucirc{\={r}}\fi}';
}
-$idsdata_file="idsdata.pl";
+$idsdata_file="$omegadb_path/idsdata.pl";
$ids_start=0x00;
$font_start=0;
if(-e $idsdata_file){
- require $idsdata_file;
+ open(IDSDATA,"+<$idsdata_file") or die;
+ flock(IDSDATA,LOCK_EX);
+ seek(IDSDATA,0,0);
+ while(<IDSDATA>){
+ eval $_;
+ }
+ seek(IDSDATA,0,0);
+# require $idsdata_file;
+}else{
+ open(IDSDATA,">$idsdata_file") or die;
+ flock(IDSDATA,LOCK_EX);
+ seek(IDSDATA,0,0);
}
$ids_argc=0;
"=gt-pj-11"
#,"=gt-pj-k1","=gt-pj-k2"
);
-@HZK=("=hanziku-1","=hanziku-10","=hanziku-11","=hanziku-12",
- "=hanziku-2","=hanziku-3","=hanziku-4","=hanziku-5",
- "=hanziku-6","=hanziku-7","=hanziku-8","=hanziku-9");
+@HZK=("=hanziku-1","=hanziku-2","=hanziku-3","=hanziku-4",
+ "=hanziku-5","=hanziku-6","=hanziku-7","=hanziku-8",
+ "=hanziku-9","=hanziku-10","=hanziku-11","=hanziku-12");
@CDP=("=big5-cdp");
while(<>){
- s/&(.*?);/&de_er($1)/ge;
if($in_cs ne 'ucs@mcs'){
s/(.)/pack("U",&get_char_id(unpack("U",$1),$in_cs))/ge;
}
+ s/((?:^|[^\\])(?:\\\\)*)(&.*?;)/&de_tex_er($1,$2)/ge;
+ s/((?:^|[^\\])(?:\\\\)*)\\([$idc])/$1.'\UTFM{'.sprintf("%X",unpack("U",$2)).'}'/ge;
@chars=split(//);
for($i=0;$i<=$#chars;$i++){
$char=$chars[$i];
# Ideographic Description Characters
print &ids_parse();
next;
- }elsif($char_id >= 0x20000 && $char_id <=0x2a6df){
- # CJK Unified Ideographs Extension B
- if(not defined($ids{$char}) and $ids{$char}[1]>=0){
- $ids{$char}[0]=$font_start;
- $ids{$char}[1]=$ids_start;
- $ids_start++;
- if($ids_start>255){
- $ids_start=0;
- $font_start++;
- }
- }
- print "{\\fontencoding{OT1}\\fontfamily{" .
- sprintf("chise%03d",$ids{$char}[0]) .
- "}\\selectfont\\char$ids{$char}[1]}";
- next;
}else{
if(($out_char=&get_output_char($char_id))){
print $out_char;
+ }elsif($char_id >= 0x20000 && $char_id <=0x2a6df){
+ # CJK Unified Ideographs Extension B
+ if(not defined($ids{$char}) and $ids{$char}[1]>=0){
+ $ids{$char}[0]=$font_start;
+ $ids{$char}[1]=$ids_start;
+ $ids_start++;
+ if($ids_start>255){
+ $ids_start=0;
+ $font_start++;
+ }
+ }
+ print "{\\fontencoding{OT1}\\fontfamily{" .
+ sprintf("chise%03d",$ids{$char}[0]) .
+ "}\\selectfont\\char$ids{$char}[1]}";
+ next;
}else{
print &get_macro_for_ids(&get_ids($char));
}
}
}
-open(IDSDATA,">$idsdata_file") or die;
print IDSDATA 'use utf8;',"\n";
foreach $ids (keys %ids){
print IDSDATA '$ids{\'',$ids,'\'}='
- ,'[',join ",",@{$ids{$ids}},"];\n" if($perl56);
- print IDSDATA '$ids{\'',encode('utf8',$ids),'\'}='
- ,'[',join ",",@{$ids{$ids}},"];\n" if($perl58);
+ ,'[',join ",",@{$ids{$ids}},"];\n";
}
print IDSDATA '$font_start=',$font_start,";\n";
print IDSDATA '$ids_start=',$ids_start,";\n";
print IDSDATA "1;";
+flock(IDSDATA,LOCK_UN);
if($exec_makefonts){
if(-f $makefonts){
- system($perl,$makefonts) ==0
+ system("/usr/bin/env","perl",$makefonts) ==0
or die "Could not make fonts: $?";
}else{
print STDERR "cannot find $makefonts\n";
exit 0;
+sub de_tex_er{
+ my($before_er,$er)=@_;
+ my($prefix,$suffix);
+ my($output_char,$atr,$value);
+ $er=~/^(\&)(.*)(;)$/
+ and $prefix=$1,$er=$2,$suffix=$3;
+ $prefix or $prefix="",$suffix or $suffix="";
+ if($er=~/^U[\+|\-]([a-fA-F\d]+)/){
+ $output_char=pack("U",hex($1));
+ }elsif($er=~/^(?:I\-)?($er_prefix_re)\-?([0-9a-fA-F]+)$/){
+ ($atr,$value)=($1,$2);
+ unless($er_alias{$atr}=~/daikanwa|gt/){
+ $value=hex($value);
+ }
+ ($output_char)=&get_chars_matching($er_alias{$atr},$value);
+ utf8::decode($output_char);
+ }
+ if($output_char){
+ return $before_er.$output_char;
+ }else{
+ return $before_er.$prefix.$er.$suffix;
+ }
+}
+
sub ids_parse{
# arguments: none
# return: return character for output,
and($out_char=&get_output_char($char_id))){
return $out_char;
}else{
- return &get_macro_for_ids($ids) if($perl56);
- return encode('utf8', &get_macro_for_ids($ids)) if($perl58);
+ return &get_macro_for_ids($ids);
}
}
}
}else{
$ids_argc--;
}
- $ids.=$char if($perl56);
- $ids.=encode('utf8',$char) if($perl58);
+ $ids.=$char;
+# $ids.=$char if($perl56);
+# $ids.=encode('utf8',$char) if($perl58);
return ($ids,$ids_argc);
}
# argument: <ids>, <output coding system>
# return: ids or GETA character if ids is invalid for KAGE.
my($ids,$out_cs)=@_;
- $ids = decode('utf8', $ids) if $perl58;
- $out_cs=~s/Uni(.+)/"ucs\@".lc($1)/e;
+ $out_cs=~s/Uni(.+)/'ucs@'.lc($1)/e;
my $output_ids="";
my($char,$char_id,$output_char_id);
}else{
foreach $out_cs (@order){
if($out_cs eq 'UniJIS'
- and &get_char_attribute($char,"adobe-unijis-utf16-h")){
+ and &get_char_attribute($char,"vnd-adobe-cid-unijis-utf16-h")){
if($out_char_id=&get_char_attribute($char,'=ucs@jis')
or $out_char_id=&get_char_attribute($char,'=ucs')
or $out_char_id=&get_char_attribute($char,'=>ucs@jis')
return "\\UTF{".sprintf("%X",$out_char_id)."}";
}
}elsif($out_cs eq 'UniGB'
- and &get_char_attribute($char,"adobe-unigb-ucs2-h")){
+ and &get_char_attribute($char,"vnd-adobe-cid-unigb-ucs2-h")){
if($out_char_id=&get_char_attribute($char,'=ucs@gb')
or $out_char_id=&get_char_attribute($char,'=ucs')
or $out_char_id=&get_char_attribute($char,'=>ucs@gb')
return "\\UTFC{".sprintf("%X",$out_char_id)."}";
}
}elsif($out_cs eq 'UniCNS'
- and &get_char_attribute($char,"adobe-unicns-ucs2-h")){
+ and &get_char_attribute($char,"vnd-adobe-cid-unicns-ucs2-h")){
if($out_char_id=&get_char_attribute($char,'=ucs@cns')
or $out_char_id=&get_char_attribute($char,'=ucs')
or $out_char_id=&get_char_attribute($char,'=>ucs@cns')
return "\\UTFT{".sprintf("%X",$out_char_id)."}";
}
}elsif($out_cs eq 'UniKS'
- and &get_char_attribute($char,"adobe-uniks-ucs2-h")){
+ and &get_char_attribute($char,"vnd-adobe-cid-uniks-ucs2-h")){
if($out_char_id=&get_char_attribute($char,'=ucs@ks')
or $out_char_id=&get_char_attribute($char,'=ucs')
or $out_char_id=&get_char_attribute($char,'=>ucs@ks')
my $ids="";
$ids=&get_char_attribute($char,"ids-aggregated")
or &get_char_attribute($char,"ids");
- $ids=decode('utf8', $ids) if($perl58);
return $ids;
}
sub get_char_id_for_ids{
- # argument: <character>
+ # argument: <ideographic description sequence>
# return: char-id
my($ids)=@_;
my($output_char);
- $ids=decode('utf8', $ids) if($perl58);
if(($output_char)=&get_chars_matching("ids",$ids)){
return unpack("U",$output_char);