From: imiyazaki <imiyazaki>
Date: Mon, 27 Oct 2003 15:30:47 +0000 (+0000)
Subject: change prefix of CID to vnd-adobe-cid.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=662fb9d4cdb35c73874fd40c0f660a0fed59b8b8;p=chise%2Fomega.git

change prefix of CID to vnd-adobe-cid.
move CJK Unified Ideographs Extension B.
---

diff --git a/chise2otf/chise2otf b/chise2otf/chise2otf
index ab1274c..f736029 100755
--- a/chise2otf/chise2otf
+++ b/chise2otf/chise2otf
@@ -149,9 +149,9 @@ $ids="";
      "=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(<>){
@@ -180,24 +180,24 @@ while(<>){
 	    # 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));
 	    }
@@ -333,7 +333,7 @@ sub get_output_char{
     }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')
@@ -342,7 +342,7 @@ sub get_output_char{
 		    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')
@@ -351,7 +351,7 @@ sub get_output_char{
 		    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')
@@ -360,7 +360,7 @@ sub get_output_char{
 		    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')