X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kagecgi%2Fkagedf.c;h=17273daefa3f6feea8e4cb51b8dc1ad42d1fc37b;hb=a7d1a760ffc39e95255fa81a9f7347e8bdae3c97;hp=079c4320a1c4ba7338fcc1a484d71bd60cc25015;hpb=b755cadf536858496296e43b30baec2cd9ec8c13;p=chise%2Fkage.git

diff --git a/kagecgi/kagedf.c b/kagecgi/kagedf.c
index 079c432..17273da 100755
--- a/kagecgi/kagedf.c
+++ b/kagecgi/kagedf.c
@@ -1,6 +1,7 @@
 //kagedf.c
 //
 #include "kage.h"
+#include "kagecgi.h"
 
 void dfDrawFont(int a1, int a2, int a3,
 	int x1, int y1,
@@ -149,10 +150,14 @@ void dfDrawFont(int a1, int a2, int a3,
 	    	break;
 	    case 6:
 	    	if(a3 == 5){
+				/* only implimented for gothic
 				tx1 = x4 - kMage;
 				ty1 = y4;
 				tx2 = x4 + kMage * 0.5;
 				ty2 = y4 - kMage * 2;
+				*/
+				cdDrawBezier(x1, y1, x2, y2, x3, y3, x4, y4, a2, 15);
+				/*
 				if(a2 == 7 || a3 == 7){
 					cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 17);
 		  			cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 17, 15);
@@ -161,8 +166,11 @@ void dfDrawFont(int a1, int a2, int a3,
 		  			cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 8);
 		  			cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 1, 15);
 				}
+				*/
    		   	}
    		   	else{
+				cdDrawBezier(x1, y1, x2, y2, x3, y3, x4, y4, a2, a3);
+				/*
 				if(a2 == 7 || a3 == 7){
 		  			cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 17);
 		  			cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 17, a3);
@@ -171,6 +179,7 @@ void dfDrawFont(int a1, int a2, int a3,
 	  				cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 8);
 	  				cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 1, a3);
 				}
+				*/
 			}
 			break;
     	case 7:
@@ -178,6 +187,8 @@ void dfDrawFont(int a1, int a2, int a3,
     	  cdDrawCurve(x2, y2, x3, y3, x4, y4, 1, 7);
     	  break;
     	case 9: // may not be exist
+          kageCanvas[y1][x1] = 0;
+          kageCanvas[y2][x2] = 0;
     	  break;
     	default:
     	  break;
@@ -334,13 +345,19 @@ void dfDrawFont(int a1, int a2, int a3,
 				ty1 = y4;
 				tx2 = x4 + kMage * 0.5;
 				ty2 = y4 - kMage * 2;
+				/*
 				cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 1);
 				cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, tx1, ty1, 1, 1);
+				*/
+				cdDrawBezier(x1, y1, x2, y2, x3, y3, tx1, ty1, a2, 1);
 				cdDrawCurve(tx1, ty1, x4, y4, tx2, ty2, 1, 0);
     		}
     		else{
+				/*
 				cdDrawCurve(x1, y1, x2, y2, (x2 + x3) / 2, (y2 + y3) / 2, a2, 1);
 				cdDrawCurve((x2 + x3) / 2, (y2 + y3) / 2, x3, y3, x4, y4, 1, a3);
+				*/
+				cdDrawBezier(x1, y1, x2, y2, x3, y3, x4, y4, a2, a3);
     		}
     		break;
     	case 7:
@@ -348,6 +365,8 @@ void dfDrawFont(int a1, int a2, int a3,
     		cdDrawCurve(x2, y2, x3, y3, x4, y4, 1, a3);
     		break;
     	case 9: // may not be exist
+          kageCanvas[y1][x1] = 0;
+          kageCanvas[y2][x2] = 0;
     		break;
     	default:
 			break;