#include "sysdep.h"\r
\r
void combineYoko2(const KGString *parts1, const KGString *parts3, int *result){\r
- int f, g, h, i, j, k, l;\r
- int flg_boxL, flg_boxR;\r
- int Xside, YsideLa, YsideLb, YsideRa, YsideRb, YheightL, YnanameL, YsmallL;\r
- int pxL, pxR, pyL, pyR;\r
- double prL, prR, pryL, pryR, rL, rR, rTemp;\r
- int lxL, rxL, lxR, rxR;\r
- int dlyL, dryL, dlyR, dryR;\r
- int chk_y1, chk_y2;\r
- int mitsuL, mitsuR;\r
- double yokoL, tateL, yokoR, tateR;\r
+ int f, g, h, i, j, k, l;\r
+ int flg_boxL, flg_boxR;\r
+ int YsideLa, YsideLb, YsideRa, YsideRb, YheightL, YnanameL, YsmallL;\r
+ int pxL, pxR, pyL, pyR;\r
+ double prL, prR, pryL, pryR, rL, rR, rTemp;\r
+ int lxL, rxL, lxR, rxR;\r
+ int dlyL, dryL, dlyR, dryR;\r
+ int chk_y1, chk_y2;\r
+ int mitsuL, mitsuR;\r
+ double yokoL, tateL, yokoR, tateR;\r
int *buf, strokes;\r
int tempShotai;\r
\r
//initialize\r
- pxL = 0;\r
- pyL = 0;\r
- prL = 1.0;\r
- pryL = 1.0;\r
- pxR = 0;\r
- pyR = 0;\r
- prR = 1.0;\r
- pryR = 1.0;\r
- \r
- YsideLa = 0;\r
- YsideLb = 0;\r
- YsideRa = 0;\r
- YsideRb = 0;\r
+ pxL = 0;\r
+ pyL = 0;\r
+ prL = 1.0;\r
+ pryL = 1.0;\r
+ pxR = 0;\r
+ pyR = 0;\r
+ prR = 1.0;\r
+ pryR = 1.0;\r
+ \r
+ YsideLa = 0;\r
+ YsideLb = 0;\r
+ YsideRa = 0;\r
+ YsideRb = 0;\r
YnanameL = 0;\r
- YheightL = pngWidth * 0.9;\r
+ YheightL = pngWidth * 0.9;\r
\r
tempShotai = kShotai;\r
kShotai = kGothic;\r
\r
- CalcOptions(parts1, &mitsuL, &flg_boxL, &yokoL, &tateL);\r
- CalcOptions(parts3, &mitsuR, &flg_boxR, &yokoR, &tateR);\r
+ CalcOptions(parts1, &mitsuL, &flg_boxL, &yokoL, &tateL);\r
+ CalcOptions(parts3, &mitsuR, &flg_boxR, &yokoR, &tateR);\r
\r
//left parts Y-axis processing #1\r
- //if its upper and bottom are flat\r
- if(flg_boxL % 8 / 4 != 0) YsideLa++;\r
- if(flg_boxL % 16 / 8 != 0) YsideLb++;\r
- \r
- //if its goes right-up\r
- if(flg_boxL % 1024 / 512 == 0){\r
- j = 0;\r
- buf = convertStroke(parts1->str, buf, &strokes);\r
- for(i = 0; i < strokes; i++) if(buf[i * 11 + 0] / 10 == 1) j++;\r
- free(buf);\r
- l = 0;\r
- if(j != 0){\r
- YsideLb++;\r
- YnanameL++;\r
- }\r
+
+ //if its upper and bottom are flat\r
+ if(flg_boxL & FLAG_FLAT_TOP) YsideLa++;\r
+ if(flg_boxL & FLAG_FLAT_BOTTOM) YsideLb++;\r
+ \r
+ //if its goes right-up\r
+ j = 0;\r
+ buf = convertStroke(parts1->str, buf, &strokes);\r
+ for(i = 0; i < strokes; i++){
+ if(buf[i * 11 + 0] / 10 == 1){
+ j++;
+ }
}\r
- YheightL = YheightL - (YsideLa + YsideLb) * 2 * kWidth;\r
+ free(buf);\r
+ l = 0;\r
+ if(j != 0){\r
+ YsideLb++;\r
+ YnanameL++;\r
+ }
+ YheightL = YheightL - (YsideLa + YsideLb) * 2 * kWidth;\r
\r
//left parts Y-axis processing #2\r
- YsmallL = 0;\r
- if(flg_boxL % 1024 / 512 == 0){\r
- YsmallL = 1;\r
- if(flg_boxL % 16 / 8 != 0 && flg_boxL % 8 / 4 != 0 && tateL <= 4) YheightL = (double)YheightL * (max(0.65, tateL * 0.22));\r
- else if(flg_boxL % 16 / 8 != 0 && tateL <= 3) YheightL = (double)YheightL * 0.8;\r
- else if(YnanameL != 0 && flg_boxL % 8 / 4 != 0 && tateL <= 4) YheightL = (double)YheightL * (max(0.65, tateL * 0.22));\r
- else if(YnanameL != 0 && tateL <= 3) YheightL = (double)YheightL * 0.8;\r
- else YsmallL = 0;\r
+ YsmallL = 0;\r
+ YsmallL = 1;\r
+ if(flg_boxL & FLAG_FLAT_TOP && flg_boxL & FLAG_FLAT_BOTTOM && tateL <= 4){
+ YheightL = (double)YheightL * (max(0.65, tateL * 0.22));
+ } else if(flg_boxL & FLAG_FLAT_BOTTOM && tateL <= 3){
+ YheightL = (double)YheightL * 0.8;
+ } else if(YnanameL != 0 && flg_boxL & FLAG_FLAT_TOP && tateL <= 4){
+ YheightL = (double)YheightL * (max(0.65, tateL * 0.22));
+ } else if(YnanameL != 0 && tateL <= 3){
+ YheightL = (double)YheightL * 0.8;
+ } else{
+ YsmallL = 0;
}\r
\r
//left parts Y-axis processing #3\r
- DoDrawParts(parts1, pxL, prL, pyL, pryL);\r
- DotsHeight(&dlyL, &dryL);\r
- pryL = (double)YheightL / (dryL - dlyL);\r
- \r
- if(YsmallL != 0){\r
- if(flg_boxL % 8 / 4 != 0) pyL = kBaseline - (double)pngWidth * 0.9 + 6 * kWidth - dlyL * pryL;\r
- else pyL = kBaseline - (double)pngWidth * 0.9 + 2 * kWidth - dlyL * pryL;\r
- }\r
- else{\r
- if(flg_boxL % 16 / 8 != 0 || YnanameL != 0) pyL = kBaseline - 2 * kWidth - dryL * pryL;\r
- else pyL = kBaseline - dryL * pryL;\r
- }\r
+ DoDrawParts(parts1, pxL, prL, pyL, pryL);\r
+ DotsHeight(&dlyL, &dryL);\r
+ pryL = (double)YheightL / (dryL - dlyL);\r
+ \r
+ if(YsmallL != 0){\r
+ if(flg_boxL & FLAG_FLAT_TOP){
+ pyL = kBaseline - (double)pngWidth * 0.9 + 6 * kWidth - dlyL * pryL;
+ } else{
+ pyL = kBaseline - (double)pngWidth * 0.9 + 2 * kWidth - dlyL * pryL;
+ }\r
+ } else{\r
+ if(flg_boxL & FLAG_FLAT_BOTTOM || YnanameL != 0){
+ pyL = kBaseline - 2 * kWidth - dryL * pryL;
+ } else{
+ pyL = kBaseline - dryL * pryL;
+ }\r
+ }\r
\r
//right parts Y-axis processing #1\r
- if(flg_boxR % 8 / 4 != 0) YsideRa++;\r
- if(flg_boxR % 16 / 8 != 0) YsideRb++;\r
+ if(flg_boxR & FLAG_FLAT_TOP) YsideRa++;\r
+ if(flg_boxR & FLAG_FLAT_BOTTOM) YsideRb++;\r
\r
- DoDrawParts(parts3, pxR, prR, pyR, pryR);\r
+ DoDrawParts(parts3, pxR, prR, pyR, pryR);\r
DotsHeight(&dlyR, &dryR);\r
\r
- if(flg_boxR % 512 / 256 != 0 && flg_boxR % 1024 / 512 == 0){\r
- pryR = pngWidth * 0.9 * 0.8 / (dryR - dlyR);\r
- pyR = kBaseline - pngWidth * 0.9 + 6 * kWidth - dlyR * pryR;\r
- }\r
- else{\r
- pryR = ((double)pngWidth * 0.9 - (YsideRa + YsideRb) * 2 * kWidth) / (dryR - dlyR);\r
- pyR = kBaseline - dryR * pryR;\r
- if(flg_boxR % 16 / 8 != 0) pyR = pyR - 2 * kWidth;\r
+ pryR = ((double)pngWidth * 0.9 - (YsideRa + YsideRb) * 2 * kWidth) / (dryR - dlyR);\r
+ pyR = kBaseline - dryR * pryR;\r
+ if(flg_boxR & FLAG_FLAT_BOTTOM){
+ pyR = pyR - 2 * kWidth;
}\r
\r
//calculate ratio\r
rL = yokoL;\r
rR = yokoR;\r
\r
- if(flg_boxL % 2 / 1 != 0) rL = rL * 0.7;\r
- if(flg_boxL % 4 / 2 != 0) rL = rL * 0.7;\r
- if(flg_boxR % 2 / 1 != 0) rR = rR * 0.7;\r
- if(flg_boxR % 4 / 2 != 0) rR = rR * 0.7;\r
+ if(flg_boxL & FLAG_FLAT_LEFT) rL = rL * 0.7;\r
+ if(flg_boxL & FLAG_FLAT_RIGHT) rL = rL * 0.7;\r
+ if(flg_boxR & FLAG_FLAT_LEFT) rR = rR * 0.7;\r
+ if(flg_boxR & FLAG_FLAT_RIGHT) rR = rR * 0.7;\r
\r
rL = pow(rL, 0.6);\r
rR = pow(rR, 0.6);\r
rL = rL / rTemp;\r
rR = rR / rTemp;\r
\r
-// if(r < 0.3) r = 0.3;\r
-// else if(r > 0.7) r = 0.7;\r
- \r
- prL = rL;\r
- prR = rR;\r
+ prL = rL;\r
+ prR = rR;\r
\r
//calculate width of each parts #1\r
- Xside = 0;\r
- if(flg_boxL % 2 / 1 != 0) Xside++;\r
- if(flg_boxR % 4 / 2 != 0) Xside++;\r
- \r
-// DrawBox();\r
-// drawGlyph(parts1, 1);\r
-// DotsWidth(&lxL, &rxL);\r
-// DrawBox();\r
-// drawGlyph(parts3, 1);\r
-// DotsWidth(&lxR, &rxR);\r
- PartsWidth(parts1, &lxL, &rxL);\r
- PartsWidth(parts3, &lxR, &rxR);\r
- g = 0;\r
+ PartsWidth(parts1, &lxL, &rxL);\r
+ PartsWidth(parts3, &lxR, &rxR);\r
+ g = 0;\r
\r
//calculate width of each parts #2\r
-//1 pxL = kWidth * 2 + (pngWidth - kWidth * 2 * 2) * prL * 0.5 - (lxL + rxL) / 2 * prL;\r
-//1 pxR = kWidth * 2 + (pngWidth - kWidth * 2 * 2) * prL + kWidth * 2 * 2 + (pngWidth - kWidth * 2 * 2) * prR * 0.5 - (lxR + rxR) / 2 * prR;\r
-//2 pxR = pngWidth * prL + kWidth * 4 + pngWidth * prR * 0.5 - (lxR + rxR) / 2 * prR;\r
-//3 pxL = pngWidth * prL * 0.5 - (lxL + rxL) / 2 * prL;\r
-//3 pxR = pngWidth * prL + pngWidth * prR * 0.5 - (lxR + rxR) / 2 * prR;\r
- pxL = 0;\r
- pxR = pngWidth * prL;\r
+ pxL = 0;\r
+ pxR = pngWidth * prL;\r
\r
- DoDrawMixFont(parts1, pxL, prL, parts3, pxR, prR, pyL, pryL, pyR, pryR);\r
+ DoDrawMixFont(parts1, pxL, prL, parts3, pxR, prR, pyL, pryL, pyR, pryR);\r
\r
//count dots for check crossing over\r
DotsHeight(&chk_y1, &chk_y2);\r
}\r
}\r
l = k;\r
- //fprintf(stderr,"%d,%d\n",chk_y1,chk_y2);\r
\r
//get close both parts\r
h = pxR;\r
while(k - l < kMixdot && g < kWidth * 2 * kKasane * 2){\r
g = g + 2;\r
f = pxR - g;\r
- DoDrawMixFont(parts1, pxL, prL, parts3, f, prR, pyL, pryL, pyR, pryR);\r
- \r
+ DoDrawMixFont(parts1, pxL, prL, parts3, f, prR, pyL, pryL, pyR, pryR);\r
+
+ //FOR DEBUG\r
//char fn[256];\r
//FILE *fp;\r
//snprintf(fn,sizeof(fn),"%03d.png",g);\r
- //fp = fopen(fn, "w");\r
- //writePng(pngWidth, pngHeight, kageCanvas, fp);\r
- //fclose(fp);\r
+ //fp = fopen(fn, "w");\r
+ //writePng(pngWidth, pngHeight, kageCanvas, fp);\r
+ //fclose(fp);\r
\r
- l = 0;\r
- for(i = 0; i < pngWidth * 1.1; i++){\r
+ l = 0;\r
+ for(i = 0; i < pngWidth * 1.1; i++){\r
for(j = chk_y1; j <= chk_y2; j++){\r
- if(kageCanvas[j][i] == 0) l++;\r
- }\r
- }\r
- }\r
- //fprintf(stderr,"%d:%d:%d\n",g,k,l);\r
- pxR = f;\r
- //if(flg_boxR % 256 / 128 != 0) pxR = pxR + kWidth * 2 * kKasane * 10 / 2;\r
- //if(flg_boxR % 64 / 32 != 0) pxR = pxR + kWidth * 2 * kKasane * 8 / 2;\r
- //else if(k - l > pngWidth * 0.4){\r
- // if(kShotai == kMincho) pxR = pxR + kMinWidthT * 2 * kKasane * 8 / 2;\r
- // else if(kShotai == kGothic) pxR = pxR + kWidth * 2 * kKasane * 8 / 2;\r
- //}\r
- if((flg_boxL % 2 / 1 != 0) && (flg_boxR % 4 / 2 != 0)){\r
- if(kShotai == kMincho) pxR = pxR + kMinWidthT * 2 * kKasane * 6 / 2;\r
- else pxR = pxR + kWidth * 2 * kKasane * 6 / 2;\r
- }\r
- else pxR = pxR + kWidth * 2 * kKasane * 2 / 2;\r
+ if(kageCanvas[j][i] == 0) l++;\r
+ }\r
+ }\r
+ }\r
+ pxR = f;\r
+
+ if(flg_boxL & FLAG_FLAT_RIGHT && flg_boxR & FLAG_FLAT_LEFT){\r
+ if(kShotai == kMincho){
+ pxR = pxR + kMinWidthT * 2 * kKasane * 3 / 2;\r
+ } else {
+ pxR = pxR + kWidth * 2 * kKasane * 3 / 2;
+ }\r
+ } else {
+ pxR = pxR + kWidth * 2 * kKasane * 2 / 2;
+ }\r
\r
//set results\r
result[0] = pxL;\r
}\r
\r
void combineYoko3(const KGString *parts1, const KGString *parts2, const KGString *parts3, int *result){\r
- //not yet\r
+ //temp.
+ KGString *tempString;
+ int tempResult[8], tempResult2[4];
+ int minx, miny, maxx, maxy, width, height, width2, height2;
+
+ tempString = kg_string_new("");
+ combineYoko2(parts2, parts3, result);
+ addStrokeWithTransform(parts2, 1, result, tempString, 1);\r
+ addStrokeWithTransform(parts3, 3, result, tempString, 1);\r
+ tempResult[0] = result[0];
+ tempResult[1] = result[1];
+ tempResult[2] = result[2];
+ tempResult[3] = result[3];
+ tempResult[4] = result[8];
+ tempResult[5] = result[9];
+ tempResult[6] = result[10];
+ tempResult[7] = result[11];
+ minx = result[0];
+ miny = min(result[1], result[9]);
+ maxx = result[10];
+ maxy = max(result[3], result[11]);
+ width = maxx - minx;
+ height = maxy - miny;
+
+ combineYoko2(parts1, tempString, result);
+ tempResult2[0] = result[8];
+ tempResult2[1] = result[9];
+ tempResult2[2] = result[10];
+ tempResult2[3] = result[11];
+ width2 = result[10] - result[8];
+ height2 = result[11] - result[9];
+ \r
+ result[4] = tempResult2[0] + (tempResult[0] - minx) * ((double)width2 / width); // always 0
+ result[5] = tempResult2[1] + (tempResult[1] - miny) * ((double)height2 / height);
+ result[6] = tempResult2[0] + (tempResult[2] - minx) * ((double)width2 / width);
+ result[7] = tempResult2[1] + (tempResult[3] - miny) * ((double)height2 / height);
+ result[8] = tempResult2[0] + (tempResult[4] - minx) * ((double)width2 / width);
+ result[9] = tempResult2[1] + (tempResult[5] - miny) * ((double)height2 / height);
+ result[10] = tempResult2[0] + (tempResult[6] - minx) * ((double)width2 / width);
+ result[11] = tempResult2[1] + (tempResult[7] - miny) * ((double)height2 / height);
}\r
\r
void combineTate2(const KGString *parts1, const KGString *parts3, int *result){\r
- int f, g, h, i, j, k, l;\r
- int flg_boxL, flg_boxR;\r
- int pxL, pxR, pyL, pyR;\r
- double prL, prR, pryL, pryR, rL, rR, rTemp;\r
- int lxL, rxL, lxR, rxR;\r
- int lyL, ryL, lyR, ryR;\r
- int dlxL, drxL, dlxR, drxR;\r
- int chk_x1, chk_x2;\r
- int mitsuL, mitsuR;\r
- double yokoL, tateL, yokoR, tateR;\r
- int *buf, strokes;\r
+ int f, g, h, i, j, k, l;\r
+ int flg_boxL, flg_boxR;\r
+ int pxL, pxR, pyL, pyR;\r
+ double prL, prR, pryL, pryR, rL, rR, rTemp;\r
+ int lxL, rxL, lxR, rxR;\r
+ int lyL, ryL, lyR, ryR;\r
+ int dlxL, drxL, dlxR, drxR;\r
+ int chk_x1, chk_x2;\r
+ int mitsuL, mitsuR;\r
+ double yokoL, tateL, yokoR, tateR;\r
int tempShotai;\r
\r
//initialize\r
- pxL = 0;\r
- pyL = 0;\r
- prL = 1.0;\r
- pryL = 1.0;\r
- pxR = 0;\r
- pyR = 0;\r
- prR = 1.0;\r
- pryR = 1.0;\r
+ pxL = 0;\r
+ pyL = 0;\r
+ prL = 1.0;\r
+ pryL = 1.0;\r
+ pxR = 0;\r
+ pyR = 0;\r
+ prR = 1.0;\r
+ pryR = 1.0;\r
\r
tempShotai = kShotai;\r
kShotai = kGothic;\r
\r
- CalcOptions(parts1, &mitsuL, &flg_boxL, &yokoL, &tateL);\r
- CalcOptions(parts3, &mitsuR, &flg_boxR, &yokoR, &tateR);\r
+ CalcOptions(parts1, &mitsuL, &flg_boxL, &yokoL, &tateL);\r
+ CalcOptions(parts3, &mitsuR, &flg_boxR, &yokoR, &tateR);\r
\r
//calculate ratio\r
rL = tateL;\r
rR = tateR;\r
\r
- if(flg_boxL % 8 / 4 != 0) rL = rL * 0.7;\r
- if(flg_boxL % 16 / 8 != 0) rL = rL * 0.7;\r
- if(flg_boxR % 8 / 4 != 0) rR = rR * 0.7;\r
- if(flg_boxR % 16 / 8 != 0) rR = rR * 0.7;\r
+ if(flg_boxL & FLAG_FLAT_TOP) rL = rL * 0.7;\r
+ if(flg_boxL & FLAG_FLAT_BOTTOM) rL = rL * 0.7;\r
+ if(flg_boxR & FLAG_FLAT_TOP) rR = rR * 0.7;\r
+ if(flg_boxR & FLAG_FLAT_BOTTOM) rR = rR * 0.7;\r
\r
rL = pow(rL, 0.8);\r
rR = pow(rR, 0.8);\r
rTemp = rL + rR;\r
rL = rL / rTemp;\r
rR = rR / rTemp;\r
- \r
-// if(r < 0.3) r = 0.3;\r
-// else if(r > 0.7) r = 0.7;\r
- \r
- pryL = rL;\r
- pryR = rR;\r
+ \r
+ pryL = rL;\r
+ pryR = rR;\r
\r
//calucurate size of X-axis\r
- PartsWidth(parts1, &lxL, &rxL);\r
- PartsWidth(parts3, &lxR, &rxR);\r
- PartsHeight(parts1, &lyL, &ryL);\r
- PartsHeight(parts3, &lyR, &ryR);\r
+ PartsWidth(parts1, &lxL, &rxL);\r
+ PartsWidth(parts3, &lxR, &rxR);\r
+ PartsHeight(parts1, &lyL, &ryL);\r
+ PartsHeight(parts3, &lyR, &ryR);\r
\r
//left parts\r
- if(flg_boxL % 64 / 32 != 0){\r
- buf = convertStroke(parts1->str, buf, &strokes);\r
- for(i = 0; i < strokes; i++){\r
- if(buf[i * 11 + 0] == 0) j = buf[i * 11 + 4]; // center line\r
- }\r
- k = max(j - lxL, rxL - j);// k : distance from center line\r
- prL = (kSize * 0.9 * 0.5) / k;\r
- if(k == j - lxL) pxL = 0;\r
- else pxL = kSize * 0.5 - j * prL;\r
- }\r
- else if(flg_boxL % 2 / 1 != 0 && flg_boxL % 4 / 2 != 0 && flg_boxL % 32 / 16 == 0){\r
- prL = min(1.0, (double)yokoL * 0.1 + 0.5) - ((kWidth * 6) / (kSize * 0.9));\r
- DoDrawParts(parts1, pxL, prL, pyL, pryL);\r
- DotsWidth(&dlxL, &drxL);\r
- pxL = (kSize / 2 - (dlxL + drxL) / 2);\r
- }\r
- else if(flg_boxL % 128 / 64 != 0){\r
- prL = 0.77;\r
- DoDrawParts(parts1, pxL, prL, pyL, pryL);\r
- DotsWidth(&dlxL, &drxL);\r
- pxL = (kSize / 2 - (dlxL + drxL) / 2);\r
- }\r
- else if(flg_boxL % 2 / 1 != 0 && flg_boxL % 32 / 16 == 0){\r
- prL = (kSize * 0.9 - kWidth * 4) / (rxL - lxL);\r
+ if(flg_boxL & FLAG_FLAT_LEFT && flg_boxL & FLAG_FLAT_RIGHT){\r
+ prL = min(1.0, (double)yokoL * 0.1 + 0.5) - ((kWidth * 6) / (kSize * 0.9));\r
+ DoDrawParts(parts1, pxL, prL, pyL, pryL);\r
+ DotsWidth(&dlxL, &drxL);\r
+ pxL = (kSize / 2 - (dlxL + drxL) / 2);\r
+ } else if(flg_boxL & FLAG_FLAT_LEFT){\r
+ prL = (kSize * 0.9 - kWidth * 4) / (rxL - lxL);\r
pxL = kWidth * 4;\r
- }\r
- else if(flg_boxL % 4 / 2 != 0 && flg_boxL % 32 / 16 == 0){\r
- prL = (kSize * 0.9 - kWidth * 4) / (rxL - lxL);\r
- pxL = (kSize*0.05+kWidth*2) - lxL * prL;\r
- }\r
+ } else if(flg_boxL & FLAG_FLAT_RIGHT){\r
+ prL = (kSize * 0.9 - kWidth * 4) / (rxL - lxL);\r
+ pxL = (kSize * 0.05 + kWidth * 2) - lxL * prL;\r
+ }\r
\r
//right parts\r
- if(flg_boxR % 64 / 32 != 0){\r
- buf = convertStroke(parts3->str, buf, &strokes);\r
- for(i = 0; i < strokes; i++){\r
- if(buf[i * 11 + 0] == 0) j = buf[i * 11 + 4]; // center line\r
- }\r
- k = max(j - lxR, rxR - j);// k : distance from center line\r
- prR = (kSize * 0.9 * 0.5) / k;\r
- if(k == j - lxR) pxR = 0;\r
- else pxR = kSize * 0.5 - j * prR;\r
- }\r
- else if(flg_boxR % 2 / 1 != 0 && flg_boxR % 4 / 2 != 0 && flg_boxR % 32 / 16 == 0){\r
+ if(flg_boxR & FLAG_FLAT_LEFT && flg_boxR & FLAG_FLAT_RIGHT){\r
prR = min(1.0, (double)yokoR * 0.1 + 0.5) - ((kWidth * 6) / (kSize * 0.9));\r
DoDrawParts(parts3, pxR, prR, pyR, pryR);\r
DotsWidth(&dlxR, &drxR);\r
pxR = (kSize / 2 - (dlxR + drxR) / 2);\r
- }\r
- else if(flg_boxR % 128 / 64 != 0){\r
- prR = 0.77;\r
- DoDrawParts(parts3, pxR, prR, pyR, pryR);\r
- DotsWidth(&dlxR, &drxR);\r
- pxR = (kSize / 2 - (dlxR + drxR) / 2);\r
- }\r
- else if(flg_boxR % 2 / 1 != 0 && flg_boxR % 32 / 16 == 0){\r
+ } else if(flg_boxR & FLAG_FLAT_LEFT){\r
prR = (kSize * 0.9 - kWidth * 4) / (rxR - lxR);\r
-// pxR = width * 4;\r
- pxR = (kSize*0.05+kWidth*3) - lxR * prR;\r
- }\r
- else if(flg_boxR % 4 / 2 != 0 && flg_boxR % 32 / 16 == 0){\r
+ pxR = (kSize * 0.05 + kWidth * 3) - lxR * prR;\r
+ } else if(flg_boxR & FLAG_FLAT_RIGHT){\r
prR = (kSize * 0.9 - kWidth * 4) / (rxR - lxR);\r
-// pxR = (size*0.05+width*2) - lxR * prR;\r
- pxR = (kSize*0.05+kWidth*1) - lxR * prR;\r
+ pxR = (kSize * 0.05 + kWidth * 1) - lxR * prR;\r
}\r
\r
g = 0;\r
while(k - l < kMixdot && g < kWidth * (kKasane + 4)){\r
g = g + 2;\r
f = pyR - g;\r
- DoDrawMixFont(parts1, pxL, prL, parts3, pxR, prR, pyL, pryL, f, pryR);\r
+ DoDrawMixFont(parts1, pxL, prL, parts3, pxR, prR, pyL, pryL, f, pryR);\r
\r
- l = 0;\r
- for(i = 0; i < pngWidth * 1.1; i++){\r
- for(j = chk_x1; j <= chk_x2; j++){\r
- if(kageCanvas[i][j] == 0) l++;\r
- }\r
- }\r
- }\r
- pyR = f;\r
- if(k - l > pngWidth * 0.4) pyR = pyR + kWidth * 5;\r
- else pyR = pyR + kWidth * 3;\r
+ l = 0;\r
+ for(i = 0; i < pngWidth * 1.1; i++){\r
+ for(j = chk_x1; j <= chk_x2; j++){\r
+ if(kageCanvas[i][j] == 0) l++;\r
+ }\r
+ }\r
+ }\r
+ pyR = f;\r
+ if(k - l > pngWidth * 0.4){
+ pyR = pyR + kWidth * 4;
+ } else {
+ pyR = pyR + kWidth * 2;\r
+ }
\r
//set results\r
result[0] = pxL;\r
}\r
\r
void combineTate3(const KGString *parts1, const KGString *parts2, const KGString *parts3, int *result){\r
- //not yet\r
+ //temp.
+ //temp.
+ KGString *tempString;
+ int tempResult[8], tempResult2[4];
+ int minx, miny, maxx, maxy, width, height, width2, height2;
+
+ tempString = kg_string_new("");
+ combineTate2(parts2, parts3, result);
+ addStrokeWithTransform(parts2, 1, result, tempString, 1);\r
+ addStrokeWithTransform(parts3, 3, result, tempString, 1);\r
+ tempResult[0] = result[0];
+ tempResult[1] = result[1];
+ tempResult[2] = result[2];
+ tempResult[3] = result[3];
+ tempResult[4] = result[8];
+ tempResult[5] = result[9];
+ tempResult[6] = result[10];
+ tempResult[7] = result[11];
+ minx = min(result[0], result[8]);
+ miny = min(result[1], result[9]);
+ maxx = max(result[2], result[10]);
+ maxy = max(result[3], result[11]);
+ width = maxx - minx;
+ height = maxy - miny;
+
+ combineTate2(parts1, tempString, result);
+ tempResult2[0] = result[8];
+ tempResult2[1] = result[9];
+ tempResult2[2] = result[10];
+ tempResult2[3] = result[11];
+ width2 = result[10] - result[8];
+ height2 = result[11] - result[9];
+ \r
+ result[4] = tempResult2[0] + (tempResult[0] - minx) * ((double)width2 / width); // always 0
+ result[5] = tempResult2[1] + (tempResult[1] - miny) * ((double)height2 / height);
+ result[6] = tempResult2[0] + (tempResult[2] - minx) * ((double)width2 / width);
+ result[7] = tempResult2[1] + (tempResult[3] - miny) * ((double)height2 / height);
+ result[8] = tempResult2[0] + (tempResult[4] - minx) * ((double)width2 / width);
+ result[9] = tempResult2[1] + (tempResult[5] - miny) * ((double)height2 / height);
+ result[10] = tempResult2[0] + (tempResult[6] - minx) * ((double)width2 / width);
+ result[11] = tempResult2[1] + (tempResult[7] - miny) * ((double)height2 / height);
}\r
\r
void combineHame2(const KGString *parts1, const KGString *parts3, int *result){\r
- int i, flag;\r
- int *buf, strokes;\r
-\r
- flag = 0;\r
-\r
- //set results\r
- result[0] = 0;\r
- result[1] = 0;\r
- result[2] = 200;\r
- result[3] = 200;\r
- buf = convertStroke(parts1->str, buf, &strokes);\r
- for(i = 0; i < strokes; i++){\r
- if(buf[i * 11 + 0] == 9){\r
- result[8] = buf[i * 11 + 3];\r
- result[9] = buf[i * 11 + 4];\r
- result[10] = buf[i * 11 + 5];\r
- result[11] = buf[i * 11 + 6];\r
- flag = 1;\r
- }\r
- }\r
- if(flag == 0){ //error\r
- result[8] = 50;\r
- result[9] = 50;\r
- result[10] = 150;\r
- result[11] = 150;\r
- }\r
- //not yet\r
+ int i, flag;\r
+ int *buf, strokes;
+ double yoko, tate;
+ int mitsu, flg_box;\r
+ \r
+ flag = 0;\r
+ CalcOptions(parts3, &mitsu, &flg_box, &yoko, &tate);\r
+ \r
+ //set results\r
+ result[0] = 0;\r
+ result[1] = 0;\r
+ result[2] = 200;\r
+ result[3] = 200;\r
+ buf = convertStroke(parts1->str, buf, &strokes);\r
+ for(i = 0; i < strokes; i++){\r
+ if(buf[i * 11 + 0] == 9){\r
+ result[8] = buf[i * 11 + 3];
+ if(flg_box & FLAG_FLAT_LEFT) result[8] += kWidth * 4;\r
+ result[9] = buf[i * 11 + 4];
+ if(flg_box & FLAG_FLAT_TOP) result[9] += kWidth * 4;\r
+ result[10] = buf[i * 11 + 5];\r
+ if(flg_box & FLAG_FLAT_RIGHT) result[10] -= kWidth * 4;\r
+ result[11] = buf[i * 11 + 6];
+ if(flg_box & FLAG_FLAT_BOTTOM) result[11] -= kWidth * 4;\r
+ flag = 1;\r
+ }\r
+ }\r
+ if(flag == 0){ //error\r
+ result[8] = 50;\r
+ result[9] = 50;\r
+ result[10] = 150;\r
+ result[11] = 150;\r
+ }\r
}\r
projects / chise / kage.git / commitdiff