From: imiyazaki <imiyazaki>
Date: Tue, 11 May 2004 14:04:10 +0000 (+0000)
Subject: minimum change to use kagecgi v0.4.
X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fomega.git;a=commitdiff_plain;h=96469bf8088eb39a5f6601271833b8acda360de5

minimum change to use kagecgi v0.4.
---

diff --git a/makefonts.pl b/makefonts.pl
index e1928a9..44e80cf 100755
--- a/makefonts.pl
+++ b/makefonts.pl
@@ -10,8 +10,11 @@ use Chise_utils '$omegadb_path';
 require 5.008001;
 
 #my $kageaddr="home.fonts.jp:5100"; # Specify port number!
-my $kageaddr="home.fonts.jp:5101"; # Specify port number!
+my $kageaddr="fonts.jp:80"; # Specify port number!
 #my $kagecgi="/~kamichi/test/kagecgi.cgi"; #
+my $kagecgi="v0.4/engine/kage.cgi"; #
+#my $kageaddr="localhost:80"; # Specify port number!
+#my $kagecgi="cgi-bin/kage.cgi"; #
 
 my $t1asm = "/usr/bin/env t1asm"; # point to 't1asm' executable.
 #die "Cannot execute $t1asm. Abort.\n" unless -x $t1asm;
@@ -108,11 +111,12 @@ FOOTER
 # Return: Type1 charstring.
 sub svg2charstring {
     my ($svg) = @_;
+    $svg=~s/></>\n</g;
     my @paths= split(/\n/, $svg);
     my ($x1, $y1, $x2, $y2);
     my $glyph= "\{\n0 1000 hsbw\n";
     for (@paths){
-	if(m/error/i){
+	if(m/error/i or m/bad/i){
 	    return undef;
 	}
 	next unless /\<path d=\"M([0-9, ]+)Z\"\/\>/;
@@ -169,8 +173,9 @@ BLACKBOX
 	     my $kageserver;
 	     my $location; # For redirection
 	     if($kageserver = IO::Socket::INET->new("$kageaddr")){
-		 print $kageserver "HEAD /$request.svg HTTP/1.1\r\n";
-		 print $kageserver "Host: $kageaddr\r\n\r\n";
+		 print $kageserver "GET /$kagecgi?$req&shotai=$suffix&type=svg\r\n";
+#		 print $kageserver "HEAD /$kagecgi?$req&shotai=$suffix&type=svg HTTP/1.1\r\n";
+#		 print $kageserver "Host: $kageaddr\r\n\r\n";
 #		 #Get redirection info.
 #		 local $/="\r\n";
 #		 while(<$kageserver>){
@@ -252,9 +257,12 @@ foreach my $key (keys %ids){
 	    last;
 	}
     }
+    $code=~s/(.)u/$1.u/g;
     $Requests[$ids{$key}[0]]->[$ids{$key}[1]]=$code;
 }
 
+print STDERR "Sending query to KAGE server at $kageaddr.\n";
+
 # Create fonts.
 foreach my $fontnum (0 .. $#Requests){
     my @faces=(['Mincho', 'min', 'mincho'],