//kageeg.c\r
//\r
\r
-#include <db1/db.h>\r
-//#include <db2/db_185.h>\r
-\r
-#include <glib.h>\r
-#include <stdlib.h>\r
-#include "kagecgi.h"\r
#include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
\r
-void generateGlyphByIDS(const GString *in, GString *out, int flag){\r
- GString *tmp1, *tmp2, *tmp3, *tmp4;\r
+void generateGlyphByIDS(const KGString *in, KGString *out, int flag){\r
+ KGString *tmp1, *tmp2;\r
\r
//pass this method if 'in' is not UCS parts\r
if((in->str)[0] != 'u'){\r
return;\r
}\r
\r
- tmp1 = g_string_new(in->str);\r
- tmp2 = g_string_new(in->str);\r
-// tmp3 = g_string_new(in->str);\r
-// tmp4 = g_string_new(in->str);\r
- \r
- //append design flag\r
-// if(kDesign == 10) g_string_append(tmp1, "-10");\r
-// else if(kDesign == 11) g_string_append(tmp1, "-11");\r
-// else if(kDesign == 20) g_string_append(tmp1, "-20");\r
-// else if(kDesign == 30) g_string_append(tmp1, "-30");\r
-// else if(kDesign == 40) g_string_append(tmp1, "-40");\r
-// else g_string_append(tmp1, "-00");\r
-// if(kDesign == 10) g_string_append(tmp2, "-10");\r
-// else if(kDesign == 11) g_string_append(tmp2, "-11");\r
-// else if(kDesign == 20) g_string_append(tmp2, "-20");\r
-// else if(kDesign == 30) g_string_append(tmp2, "-30");\r
-// else if(kDesign == 40) g_string_append(tmp2, "-40");\r
-// else g_string_append(tmp2, "-00");\r
-// g_string_append(tmp3, "-00");\r
-// g_string_append(tmp4, "-00");\r
+ tmp1 = kg_string_new(in->str);\r
+ tmp2 = kg_string_new(in->str);\r
\r
//append place flag\r
if(1 <= flag && flag <= 7){\r
- if(tmp1->len != 7) g_string_append(tmp1, "-");\r
- if(flag == 1) g_string_append(tmp1, "01");\r
- else if(flag == 2) g_string_append(tmp1, "02");\r
- else if(flag == 3) g_string_append(tmp1, "03");\r
- else if(flag == 4) g_string_append(tmp1, "04");\r
- else if(flag == 5) g_string_append(tmp1, "05");\r
- else if(flag == 6) g_string_append(tmp1, "06");\r
+ if(tmp1->len != 7) kg_string_append(tmp1, "-");\r
+ if(flag == 1) kg_string_append(tmp1, "01");\r
+ else if(flag == 2) kg_string_append(tmp1, "02");\r
+ else if(flag == 3) kg_string_append(tmp1, "03");\r
+ else if(flag == 4) kg_string_append(tmp1, "04");\r
+ else if(flag == 5) kg_string_append(tmp1, "05");\r
+ else if(flag == 6) kg_string_append(tmp1, "06");\r
}\r
\r
-// g_string_append(tmp2, "00");\r
-// if(flag == 1) g_string_append(tmp3, "01");\r
-// else if(flag == 2) g_string_append(tmp3, "02");\r
-// else if(flag == 3) g_string_append(tmp3, "03");\r
-// else if(flag == 4) g_string_append(tmp3, "04");\r
-// else if(flag == 5) g_string_append(tmp3, "05");\r
-// else if(flag == 6) g_string_append(tmp3, "06");\r
-// else g_string_append(tmp3, "00");\r
-// g_string_append(tmp4, "00");\r
- \r
generateGlyph(tmp1, out);\r
if(out->len != 0) return;\r
generateGlyph(tmp2, out);\r
if(out->len != 0) return;\r
-// generateGlyph(tmp3, out);\r
-// if(out->len != 0) return;\r
-// generateGlyph(tmp4, out);\r
return;\r
}\r
\r
-void generateGlyph(const GString *in, GString *out){\r
- GString *tmp, *in2;\r
- tmp = g_string_new("");\r
- g_string_set_size(out, 0);\r
- \r
-// in2 = g_string_new(in->str);\r
+void generateGlyph(const KGString *in, KGString *out){\r
+ KGString *tmp;\r
+ tmp = kg_string_new("");\r
+ kg_string_set_size(out, 0);\r
\r
- //1st search\r
-// if(*(in2->str) == 'u' && (in2->len == 4 || in2->len == 5)){\r
-// //append design flag\r
-// if(kDesign == 10) g_string_append(in2, "-1000");\r
-// else if(kDesign == 11) g_string_append(in2, "-1100");\r
-// else if(kDesign == 20) g_string_append(in2, "-2000");\r
-// else if(kDesign == 30) g_string_append(in2, "-3000");\r
-// else if(kDesign == 40) g_string_append(in2, "-4000");\r
-// else g_string_append(in2, "-0000");\r
- \r
- //search from parts(1st)\r
-// searchPartsData(in2, tmp);\r
-// if(tmp->len != 0){\r
-// g_string_assign(out, tmp->str);\r
-// return;\r
-// }\r
- \r
- //search from alias(1st)\r
-// searchAliasData(in2, tmp);\r
-// if(tmp->len != 0){\r
-// generateGlyph(tmp, out);\r
-// if(out->len == 0) return;\r
-// //save to cache ... not yet\r
-// return;\r
-// }\r
-// }\r
- \r
- //2nd search\r
- //search from parts(2nd)\r
+ //search from parts\r
searchPartsData(in, tmp);\r
if(tmp->len != 0){\r
- g_string_assign(out, tmp->str);\r
- return;\r
+ tmp = CalcSizes(tmp, 1);\r
+ out = kg_string_assign(out, tmp->str);\r
+ return;\r
}\r
\r
- //search from alias(2nd)\r
+ //search from alias\r
searchAliasData(in, tmp);\r
if(tmp->len != 0){\r
generateGlyph(tmp, out);\r
}\r
}\r
\r
-void doCombine(const GString *in, GString *out){\r
- GString *partIDS1, *partIDS2, *partIDS3;\r
- GString *partStroke1, *partStroke2, *partStroke3;\r
+void doCombine(const KGString *in, KGString *out){\r
+ KGString *partIDS1, *partIDS2, *partIDS3;\r
+ KGString *partStroke1, *partStroke2, *partStroke3;\r
int result[12];\r
\r
- partIDS1 = g_string_new("");\r
- partIDS2 = g_string_new("");\r
- partIDS3 = g_string_new("");\r
- partStroke1 = g_string_new("");\r
- partStroke2 = g_string_new("");\r
- partStroke3 = g_string_new("");\r
+ partIDS1 = kg_string_new("");\r
+ partIDS2 = kg_string_new("");\r
+ partIDS3 = kg_string_new("");\r
+ partStroke1 = kg_string_new("");\r
+ partStroke2 = kg_string_new("");\r
+ partStroke3 = kg_string_new("");\r
\r
- g_string_set_size(out, 0);\r
+ kg_string_set_size(out, 0);\r
\r
//check first IDC\r
if(strncmp(in->str, "u2ff", 4) != 0) return;\r
}\r
}\r
\r
-void drawGlyph(const GString *in, const int mode){\r
+void drawGlyph(const KGString *in, const int mode){\r
int i, j;\r
int *buf;\r
buf = convertStroke(in->str, buf, &j);\r
projects / chise / kage.git / blobdiff