From 2029bcaed444bd7c08a3723706567d6c1831e44b Mon Sep 17 00:00:00 2001
From: LMW <williamchange@gmail.com>
Date: Tue, 11 Mar 2025 12:54:23 +0800
Subject: [PATCH 1/2] fix japanese glyphs shader compilation

---
 .../material_maker/nodes/japanese_glyphs2.mmg | 242 +++++++++---------
 1 file changed, 121 insertions(+), 121 deletions(-)

diff --git a/addons/material_maker/nodes/japanese_glyphs2.mmg b/addons/material_maker/nodes/japanese_glyphs2.mmg
index befe1deb5..329e334bb 100644
--- a/addons/material_maker/nodes/japanese_glyphs2.mmg
+++ b/addons/material_maker/nodes/japanese_glyphs2.mmg
@@ -6,11 +6,11 @@
 	},
 	"parameters": {
 		"bevel": 0.01,
-		"char": 1,
-		"gs": 1,
+		"char": 1.0,
+		"gs": 1.0,
 		"rad": 0.025,
-		"scale": 1,
-		"sys": 0
+		"scale": 1.0,
+		"sys": 0.0
 	},
 	"seed_int": 0,
 	"shader_model": {
@@ -708,66 +708,66 @@
 			"\treturn min(d, s(uv, vec2(0.060512, 0.18679), vec2(0.0605, 0.303042),vec2(0.146704, 0.305019)));",
 			"}",
 			"",
-			"float hiragana(vec2 p, int char, float scale, int gs, float bevel, float rad)",
+			"float hiragana(vec2 p, int c, float scale, int gs, float bevel, float rad)",
 			"{",
-			"\tchar = int(fract(float(gs > 1 ? char: char - 1)/46.0)*47.0)+1;",
+			"\tc = int(fract(float(gs > 1 ? c: c - 1)/46.0)*47.0)+1;",
 			"\t\t",
 			"\tfloat s = 1.0/scale;",
 			"\tp *= s;",
 			"\t",
 			"\tfloat d = 1.0;",
 			"\t",
-			"\tif (char == 1) d = h1(p);",
-			"\tif (char == 2) d = h2(p);",
-			"\tif (char == 3) d = h3(p);",
-			"\tif (char == 4) d = h4(p);",
-			"\tif (char == 5) d = h5(p);",
-			"\tif (char == 6) d = h6(p);",
-			"\tif (char == 7) d = h7(p);",
-			"\tif (char == 8) d = h8(p);",
-			"\tif (char == 9) d = h9(p);",
-			"\tif (char == 10) d = h10(p);",
-			"\tif (char == 11) d = h11(p);",
-			"\tif (char == 12) d = h12(p);",
-			"\tif (char == 13) d = h13(p);",
-			"\tif (char == 14) d = h14(p);",
-			"\tif (char == 15) d = h15(p);",
-			"\tif (char == 16) d = h16(p);",
-			"\tif (char == 17) d = h17(p);",
-			"\tif (char == 18) d = h18(p);",
-			"\tif (char == 19) d = h19(p);",
-			"\tif (char == 20) d = h20(p);",
-			"\tif (char == 21) d = h21(p);",
-			"\tif (char == 22) d = h22(p);",
-			"\tif (char == 23) d = h23(p);",
-			"\tif (char == 24) d = h24(p);",
-			"\tif (char == 25) d = h25(p);",
-			"\tif (char == 26) d = h26(p);",
-			"\tif (char == 27) d = h27(p);",
-			"\tif (char == 28) d = h28(p);",
-			"\tif (char == 29) d = h29(p);",
-			"\tif (char == 30) d = h30(p);",
-			"\tif (char == 31) d = h31(p);",
-			"\tif (char == 32) d = h32(p);",
-			"\tif (char == 33) d = h33(p);",
-			"\tif (char == 34) d = h34(p);",
-			"\tif (char == 35) d = h35(p);",
-			"\tif (char == 36) d = h36(p);",
-			"\tif (char == 37) d = h37(p);",
-			"\tif (char == 38) d = h38(p);",
-			"\tif (char == 39) d = h39(p);",
-			"\tif (char == 40) d = h40(p);",
-			"\tif (char == 41) d = h41(p);",
-			"\tif (char == 42) d = h42(p);",
-			"\tif (char == 43) d = h43(p);",
-			"\tif (char == 44) d = h44(p);",
-			"\tif (char == 45) d = h45(p);",
-			"\tif (char == 46) d = h46(p);",
+			"\tif (c == 1) d = h1(p);",
+			"\tif (c == 2) d = h2(p);",
+			"\tif (c == 3) d = h3(p);",
+			"\tif (c == 4) d = h4(p);",
+			"\tif (c == 5) d = h5(p);",
+			"\tif (c == 6) d = h6(p);",
+			"\tif (c == 7) d = h7(p);",
+			"\tif (c == 8) d = h8(p);",
+			"\tif (c == 9) d = h9(p);",
+			"\tif (c == 10) d = h10(p);",
+			"\tif (c == 11) d = h11(p);",
+			"\tif (c == 12) d = h12(p);",
+			"\tif (c == 13) d = h13(p);",
+			"\tif (c == 14) d = h14(p);",
+			"\tif (c == 15) d = h15(p);",
+			"\tif (c == 16) d = h16(p);",
+			"\tif (c == 17) d = h17(p);",
+			"\tif (c == 18) d = h18(p);",
+			"\tif (c == 19) d = h19(p);",
+			"\tif (c == 20) d = h20(p);",
+			"\tif (c == 21) d = h21(p);",
+			"\tif (c == 22) d = h22(p);",
+			"\tif (c == 23) d = h23(p);",
+			"\tif (c == 24) d = h24(p);",
+			"\tif (c == 25) d = h25(p);",
+			"\tif (c == 26) d = h26(p);",
+			"\tif (c == 27) d = h27(p);",
+			"\tif (c == 28) d = h28(p);",
+			"\tif (c == 29) d = h29(p);",
+			"\tif (c == 30) d = h30(p);",
+			"\tif (c == 31) d = h31(p);",
+			"\tif (c == 32) d = h32(p);",
+			"\tif (c == 33) d = h33(p);",
+			"\tif (c == 34) d = h34(p);",
+			"\tif (c == 35) d = h35(p);",
+			"\tif (c == 36) d = h36(p);",
+			"\tif (c == 37) d = h37(p);",
+			"\tif (c == 38) d = h38(p);",
+			"\tif (c == 39) d = h39(p);",
+			"\tif (c == 40) d = h40(p);",
+			"\tif (c == 41) d = h41(p);",
+			"\tif (c == 42) d = h42(p);",
+			"\tif (c == 43) d = h43(p);",
+			"\tif (c == 44) d = h44(p);",
+			"\tif (c == 45) d = h45(p);",
+			"\tif (c == 46) d = h46(p);",
 			"",
 			"\treturn 1.0-clamp(0.0-(d-rad)/max(bevel, 0.00001), 0.0, 1.0);",
 			"}",
 			"",
-			"float c_h(vec2 p, int char, float scale, int gs, float bevel, float rad) {",
+			"float c_h(vec2 p, int c, float scale, int gs, float bevel, float rad) {",
 			"\tif(gs > 1) {",
 			"\t\tif(box(p,0.5) > 0.0) {",
 			"\t\t\tvec3 gr = grid(p,gs);",
@@ -776,70 +776,70 @@
 			"\t\treturn 1.0;",
 			"\t}",
 			"\tif (box(p,0.5*scale) > 0.0)",
-			"\t\treturn hiragana(p,char,scale,gs,bevel,rad);",
+			"\t\treturn hiragana(p,c,scale,gs,bevel,rad);",
 			"\treturn 1.0;",
 			"}",
 			"",
-			"float katakana(vec2 p, int char, float scale, int gs, float bevel, float rad)",
+			"float katakana(vec2 p, int c, float scale, int gs, float bevel, float rad)",
 			"{",
-			"\tchar = int(fract(float(gs > 1 ? char: char - 1)/46.0)*47.0)+1;",
+			"\tc = int(fract(float(gs > 1 ? c: c - 1)/46.0)*47.0)+1;",
 			"\t\t",
 			"\tfloat s = 1.0/scale;",
 			"\tp *= s;",
 			"\t",
 			"\tfloat d = 1.0;",
 			"\t",
-			"\tif (char == 1) d = k1(p);",
-			"\tif (char == 2) d = k2(p);",
-			"\tif (char == 3) d = k3(p);",
-			"\tif (char == 4) d = k4(p);",
-			"\tif (char == 5) d = k5(p);",
-			"\tif (char == 6) d = k6(p);",
-			"\tif (char == 7) d = k7(p);",
-			"\tif (char == 8) d = k8(p);",
-			"\tif (char == 9) d = k9(p);",
-			"\tif (char == 10) d = k10(p);",
-			"\tif (char == 11) d = k11(p);",
-			"\tif (char == 12) d = k12(p);",
-			"\tif (char == 13) d = k13(p);",
-			"\tif (char == 14) d = k14(p);",
-			"\tif (char == 15) d = k15(p);",
-			"\tif (char == 16) d = k16(p);",
-			"\tif (char == 17) d = k17(p);",
-			"\tif (char == 18) d = k18(p);",
-			"\tif (char == 19) d = k19(p);",
-			"\tif (char == 20) d = k20(p);",
-			"\tif (char == 21) d = k21(p);",
-			"\tif (char == 22) d = k22(p);",
-			"\tif (char == 23) d = k23(p);",
-			"\tif (char == 24) d = k24(p);",
-			"\tif (char == 25) d = k25(p);",
-			"\tif (char == 26) d = k26(p);",
-			"\tif (char == 27) d = k27(p);",
-			"\tif (char == 28) d = k28(p);",
-			"\tif (char == 29) d = k29(p);",
-			"\tif (char == 30) d = k30(p);",
-			"\tif (char == 31) d = k31(p);",
-			"\tif (char == 32) d = k32(p);",
-			"\tif (char == 33) d = k33(p);",
-			"\tif (char == 34) d = k34(p);",
-			"\tif (char == 35) d = k35(p);",
-			"\tif (char == 36) d = k36(p);",
-			"\tif (char == 37) d = k37(p);",
-			"\tif (char == 38) d = k38(p);",
-			"\tif (char == 39) d = k39(p);",
-			"\tif (char == 40) d = k40(p);",
-			"\tif (char == 41) d = k41(p);",
-			"\tif (char == 42) d = k42(p);",
-			"\tif (char == 43) d = k43(p);",
-			"\tif (char == 44) d = k44(p);",
-			"\tif (char == 45) d = k45(p);",
-			"\tif (char == 46) d = k46(p);",
+			"\tif (c == 1) d = k1(p);",
+			"\tif (c == 2) d = k2(p);",
+			"\tif (c == 3) d = k3(p);",
+			"\tif (c == 4) d = k4(p);",
+			"\tif (c == 5) d = k5(p);",
+			"\tif (c == 6) d = k6(p);",
+			"\tif (c == 7) d = k7(p);",
+			"\tif (c == 8) d = k8(p);",
+			"\tif (c == 9) d = k9(p);",
+			"\tif (c == 10) d = k10(p);",
+			"\tif (c == 11) d = k11(p);",
+			"\tif (c == 12) d = k12(p);",
+			"\tif (c == 13) d = k13(p);",
+			"\tif (c == 14) d = k14(p);",
+			"\tif (c == 15) d = k15(p);",
+			"\tif (c == 16) d = k16(p);",
+			"\tif (c == 17) d = k17(p);",
+			"\tif (c == 18) d = k18(p);",
+			"\tif (c == 19) d = k19(p);",
+			"\tif (c == 20) d = k20(p);",
+			"\tif (c == 21) d = k21(p);",
+			"\tif (c == 22) d = k22(p);",
+			"\tif (c == 23) d = k23(p);",
+			"\tif (c == 24) d = k24(p);",
+			"\tif (c == 25) d = k25(p);",
+			"\tif (c == 26) d = k26(p);",
+			"\tif (c == 27) d = k27(p);",
+			"\tif (c == 28) d = k28(p);",
+			"\tif (c == 29) d = k29(p);",
+			"\tif (c == 30) d = k30(p);",
+			"\tif (c == 31) d = k31(p);",
+			"\tif (c == 32) d = k32(p);",
+			"\tif (c == 33) d = k33(p);",
+			"\tif (c == 34) d = k34(p);",
+			"\tif (c == 35) d = k35(p);",
+			"\tif (c == 36) d = k36(p);",
+			"\tif (c == 37) d = k37(p);",
+			"\tif (c == 38) d = k38(p);",
+			"\tif (c == 39) d = k39(p);",
+			"\tif (c == 40) d = k40(p);",
+			"\tif (c == 41) d = k41(p);",
+			"\tif (c == 42) d = k42(p);",
+			"\tif (c == 43) d = k43(p);",
+			"\tif (c == 44) d = k44(p);",
+			"\tif (c == 45) d = k45(p);",
+			"\tif (c == 46) d = k46(p);",
 			"",
 			"\treturn 1.0-clamp(0.0-(d-rad)/max(bevel, 0.00001), 0.0, 1.0);",
 			"}",
 			"",
-			"float c_k(vec2 p, int char, float scale, int gs, float bevel, float rad) {",
+			"float c_k(vec2 p, int c, float scale, int gs, float bevel, float rad) {",
 			"\tif(gs > 1) {",
 			"\t\tif(box(p,0.5) > 0.0) {",
 			"\t\t\tvec3 gr = grid(p,gs);",
@@ -848,7 +848,7 @@
 			"\t\treturn 1.0;",
 			"\t}",
 			"\tif (box(p,0.5*scale) > 0.0)",
-			"\t\treturn katakana(p,char,scale,gs,bevel,rad);",
+			"\t\treturn katakana(p,c,scale,gs,bevel,rad);",
 			"\treturn 1.0;",
 			"}"
 		],
@@ -879,7 +879,7 @@
 		],
 		"parameters": [
 			{
-				"default": 0,
+				"default": 0.0,
 				"label": "System",
 				"name": "sys",
 				"shortdesc": "Writing System",
@@ -897,21 +897,21 @@
 			},
 			{
 				"control": "None",
-				"default": 1,
+				"default": 1.0,
 				"label": "Character",
-				"max": 46,
-				"min": 1,
+				"max": 46.0,
+				"min": 1.0,
 				"name": "char",
 				"shortdesc": "Character",
-				"step": 1,
+				"step": 1.0,
 				"type": "float"
 			},
 			{
 				"control": "None",
-				"default": 1,
+				"default": 1.0,
 				"label": "Scale",
-				"max": 1,
-				"min": 0,
+				"max": 1.0,
+				"min": 0.0,
 				"name": "scale",
 				"shortdesc": "Glyph Scale",
 				"step": 0.001,
@@ -921,8 +921,8 @@
 				"control": "None",
 				"default": 0.025,
 				"label": "Radius",
-				"max": 1,
-				"min": 0,
+				"max": 1.0,
+				"min": 0.0,
 				"name": "rad",
 				"shortdesc": "Line thickness",
 				"step": 0.001,
@@ -930,22 +930,22 @@
 			},
 			{
 				"control": "None",
-				"default": 1,
+				"default": 1.0,
 				"label": "Grid Size",
 				"longdesc": "Number of column/rows of the grid.",
-				"max": 32,
-				"min": 1,
+				"max": 32.0,
+				"min": 1.0,
 				"name": "gs",
 				"shortdesc": "Grid Size",
-				"step": 1,
+				"step": 1.0,
 				"type": "float"
 			},
 			{
 				"control": "None",
 				"default": 0.01,
 				"label": "Bevel",
-				"max": 1,
-				"min": 0,
+				"max": 1.0,
+				"min": 0.0,
 				"name": "bevel",
 				"shortdesc": "Width of the edge of the glyphs",
 				"step": 0.001,
@@ -955,4 +955,4 @@
 		"shortdesc": "Japanese Glyphs"
 	},
 	"type": "shader"
-}
+}
\ No newline at end of file

From eddb11c69496d70df642a8bb99c6859cec9de155 Mon Sep 17 00:00:00 2001
From: LMW <williamchange@gmail.com>
Date: Tue, 11 Mar 2025 13:16:49 +0800
Subject: [PATCH 2/2] fix old jp glyphs node

---
 .../material_maker/nodes/japanese_glyphs.mmg  | 200 +++++++++---------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/addons/material_maker/nodes/japanese_glyphs.mmg b/addons/material_maker/nodes/japanese_glyphs.mmg
index 705e0fa02..3a612f2a6 100644
--- a/addons/material_maker/nodes/japanese_glyphs.mmg
+++ b/addons/material_maker/nodes/japanese_glyphs.mmg
@@ -708,66 +708,66 @@
 			"\treturn min(d, s(uv, vec2(0.060512, 0.18679), vec2(0.0605, 0.303042),vec2(0.146704, 0.305019)));",
 			"}",
 			"",
-			"float hiragana(vec2 p, int char, float scale, int gs, float bevel, float rad)",
+			"float hiragana(vec2 p, int c, float scale, int gs, float bevel, float rad)",
 			"{",
-			"\tchar = int(fract(float(gs > 1 ? char: char - 1)/46.0)*47.0)+1;",
+			"\tc = int(fract(float(gs > 1 ? c: c - 1)/46.0)*47.0)+1;",
 			"\t\t",
 			"\tfloat s = 1.0/scale;",
 			"\tp *= s;",
 			"\t",
 			"\tfloat d = 1.0;",
 			"\t",
-			"\tif (char == 1) d = h1(p);",
-			"\tif (char == 2) d = h2(p);",
-			"\tif (char == 3) d = h3(p);",
-			"\tif (char == 4) d = h4(p);",
-			"\tif (char == 5) d = h5(p);",
-			"\tif (char == 6) d = h6(p);",
-			"\tif (char == 7) d = h7(p);",
-			"\tif (char == 8) d = h8(p);",
-			"\tif (char == 9) d = h9(p);",
-			"\tif (char == 10) d = h10(p);",
-			"\tif (char == 11) d = h11(p);",
-			"\tif (char == 12) d = h12(p);",
-			"\tif (char == 13) d = h13(p);",
-			"\tif (char == 14) d = h14(p);",
-			"\tif (char == 15) d = h15(p);",
-			"\tif (char == 16) d = h16(p);",
-			"\tif (char == 17) d = h17(p);",
-			"\tif (char == 18) d = h18(p);",
-			"\tif (char == 19) d = h19(p);",
-			"\tif (char == 20) d = h20(p);",
-			"\tif (char == 21) d = h21(p);",
-			"\tif (char == 22) d = h22(p);",
-			"\tif (char == 23) d = h23(p);",
-			"\tif (char == 24) d = h24(p);",
-			"\tif (char == 25) d = h25(p);",
-			"\tif (char == 26) d = h26(p);",
-			"\tif (char == 27) d = h27(p);",
-			"\tif (char == 28) d = h28(p);",
-			"\tif (char == 29) d = h29(p);",
-			"\tif (char == 30) d = h30(p);",
-			"\tif (char == 31) d = h31(p);",
-			"\tif (char == 32) d = h32(p);",
-			"\tif (char == 33) d = h33(p);",
-			"\tif (char == 34) d = h34(p);",
-			"\tif (char == 35) d = h35(p);",
-			"\tif (char == 36) d = h36(p);",
-			"\tif (char == 37) d = h37(p);",
-			"\tif (char == 38) d = h38(p);",
-			"\tif (char == 39) d = h39(p);",
-			"\tif (char == 40) d = h40(p);",
-			"\tif (char == 41) d = h41(p);",
-			"\tif (char == 42) d = h42(p);",
-			"\tif (char == 43) d = h43(p);",
-			"\tif (char == 44) d = h44(p);",
-			"\tif (char == 45) d = h45(p);",
-			"\tif (char == 46) d = h46(p);",
+			"\tif (c == 1) d = h1(p);",
+			"\tif (c == 2) d = h2(p);",
+			"\tif (c == 3) d = h3(p);",
+			"\tif (c == 4) d = h4(p);",
+			"\tif (c == 5) d = h5(p);",
+			"\tif (c == 6) d = h6(p);",
+			"\tif (c == 7) d = h7(p);",
+			"\tif (c == 8) d = h8(p);",
+			"\tif (c == 9) d = h9(p);",
+			"\tif (c == 10) d = h10(p);",
+			"\tif (c == 11) d = h11(p);",
+			"\tif (c == 12) d = h12(p);",
+			"\tif (c == 13) d = h13(p);",
+			"\tif (c == 14) d = h14(p);",
+			"\tif (c == 15) d = h15(p);",
+			"\tif (c == 16) d = h16(p);",
+			"\tif (c == 17) d = h17(p);",
+			"\tif (c == 18) d = h18(p);",
+			"\tif (c == 19) d = h19(p);",
+			"\tif (c == 20) d = h20(p);",
+			"\tif (c == 21) d = h21(p);",
+			"\tif (c == 22) d = h22(p);",
+			"\tif (c == 23) d = h23(p);",
+			"\tif (c == 24) d = h24(p);",
+			"\tif (c == 25) d = h25(p);",
+			"\tif (c == 26) d = h26(p);",
+			"\tif (c == 27) d = h27(p);",
+			"\tif (c == 28) d = h28(p);",
+			"\tif (c == 29) d = h29(p);",
+			"\tif (c == 30) d = h30(p);",
+			"\tif (c == 31) d = h31(p);",
+			"\tif (c == 32) d = h32(p);",
+			"\tif (c == 33) d = h33(p);",
+			"\tif (c == 34) d = h34(p);",
+			"\tif (c == 35) d = h35(p);",
+			"\tif (c == 36) d = h36(p);",
+			"\tif (c == 37) d = h37(p);",
+			"\tif (c == 38) d = h38(p);",
+			"\tif (c == 39) d = h39(p);",
+			"\tif (c == 40) d = h40(p);",
+			"\tif (c == 41) d = h41(p);",
+			"\tif (c == 42) d = h42(p);",
+			"\tif (c == 43) d = h43(p);",
+			"\tif (c == 44) d = h44(p);",
+			"\tif (c == 45) d = h45(p);",
+			"\tif (c == 46) d = h46(p);",
 			"",
 			"\treturn 1.0-clamp(0.0-(d-rad)/max(bevel, 0.00001), 0.0, 1.0);",
 			"}",
 			"",
-			"float c_h(vec2 p, int char, float scale, int gs, float bevel, float rad) {",
+			"float c_h(vec2 p, int c, float scale, int gs, float bevel, float rad) {",
 			"\tif(gs > 1) {",
 			"\t\tif(box(p,0.5) > 0.0) {",
 			"\t\t\tvec3 gr = grid(p,gs);",
@@ -776,70 +776,70 @@
 			"\t\treturn 1.0;",
 			"\t}",
 			"\tif (box(p,0.5*scale) > 0.0)",
-			"\t\treturn hiragana(p,char,scale,gs,bevel,rad);",
+			"\t\treturn hiragana(p,c,scale,gs,bevel,rad);",
 			"\treturn 1.0;",
 			"}",
 			"",
-			"float katakana(vec2 p, int char, float scale, int gs, float bevel, float rad)",
+			"float katakana(vec2 p, int c, float scale, int gs, float bevel, float rad)",
 			"{",
-			"\tchar = int(fract(float(gs > 1 ? char: char - 1)/46.0)*47.0)+1;",
+			"\tc = int(fract(float(gs > 1 ? c: c - 1)/46.0)*47.0)+1;",
 			"\t\t",
 			"\tfloat s = 1.0/scale;",
 			"\tp *= s;",
 			"\t",
 			"\tfloat d = 1.0;",
 			"\t",
-			"\tif (char == 1) d = k1(p);",
-			"\tif (char == 2) d = k2(p);",
-			"\tif (char == 3) d = k3(p);",
-			"\tif (char == 4) d = k4(p);",
-			"\tif (char == 5) d = k5(p);",
-			"\tif (char == 6) d = k6(p);",
-			"\tif (char == 7) d = k7(p);",
-			"\tif (char == 8) d = k8(p);",
-			"\tif (char == 9) d = k9(p);",
-			"\tif (char == 10) d = k10(p);",
-			"\tif (char == 11) d = k11(p);",
-			"\tif (char == 12) d = k12(p);",
-			"\tif (char == 13) d = k13(p);",
-			"\tif (char == 14) d = k14(p);",
-			"\tif (char == 15) d = k15(p);",
-			"\tif (char == 16) d = k16(p);",
-			"\tif (char == 17) d = k17(p);",
-			"\tif (char == 18) d = k18(p);",
-			"\tif (char == 19) d = k19(p);",
-			"\tif (char == 20) d = k20(p);",
-			"\tif (char == 21) d = k21(p);",
-			"\tif (char == 22) d = k22(p);",
-			"\tif (char == 23) d = k23(p);",
-			"\tif (char == 24) d = k24(p);",
-			"\tif (char == 25) d = k25(p);",
-			"\tif (char == 26) d = k26(p);",
-			"\tif (char == 27) d = k27(p);",
-			"\tif (char == 28) d = k28(p);",
-			"\tif (char == 29) d = k29(p);",
-			"\tif (char == 30) d = k30(p);",
-			"\tif (char == 31) d = k31(p);",
-			"\tif (char == 32) d = k32(p);",
-			"\tif (char == 33) d = k33(p);",
-			"\tif (char == 34) d = k34(p);",
-			"\tif (char == 35) d = k35(p);",
-			"\tif (char == 36) d = k36(p);",
-			"\tif (char == 37) d = k37(p);",
-			"\tif (char == 38) d = k38(p);",
-			"\tif (char == 39) d = k39(p);",
-			"\tif (char == 40) d = k40(p);",
-			"\tif (char == 41) d = k41(p);",
-			"\tif (char == 42) d = k42(p);",
-			"\tif (char == 43) d = k43(p);",
-			"\tif (char == 44) d = k44(p);",
-			"\tif (char == 45) d = k45(p);",
-			"\tif (char == 46) d = k46(p);",
+			"\tif (c == 1) d = k1(p);",
+			"\tif (c == 2) d = k2(p);",
+			"\tif (c == 3) d = k3(p);",
+			"\tif (c == 4) d = k4(p);",
+			"\tif (c == 5) d = k5(p);",
+			"\tif (c == 6) d = k6(p);",
+			"\tif (c == 7) d = k7(p);",
+			"\tif (c == 8) d = k8(p);",
+			"\tif (c == 9) d = k9(p);",
+			"\tif (c == 10) d = k10(p);",
+			"\tif (c == 11) d = k11(p);",
+			"\tif (c == 12) d = k12(p);",
+			"\tif (c == 13) d = k13(p);",
+			"\tif (c == 14) d = k14(p);",
+			"\tif (c == 15) d = k15(p);",
+			"\tif (c == 16) d = k16(p);",
+			"\tif (c == 17) d = k17(p);",
+			"\tif (c == 18) d = k18(p);",
+			"\tif (c == 19) d = k19(p);",
+			"\tif (c == 20) d = k20(p);",
+			"\tif (c == 21) d = k21(p);",
+			"\tif (c == 22) d = k22(p);",
+			"\tif (c == 23) d = k23(p);",
+			"\tif (c == 24) d = k24(p);",
+			"\tif (c == 25) d = k25(p);",
+			"\tif (c == 26) d = k26(p);",
+			"\tif (c == 27) d = k27(p);",
+			"\tif (c == 28) d = k28(p);",
+			"\tif (c == 29) d = k29(p);",
+			"\tif (c == 30) d = k30(p);",
+			"\tif (c == 31) d = k31(p);",
+			"\tif (c == 32) d = k32(p);",
+			"\tif (c == 33) d = k33(p);",
+			"\tif (c == 34) d = k34(p);",
+			"\tif (c == 35) d = k35(p);",
+			"\tif (c == 36) d = k36(p);",
+			"\tif (c == 37) d = k37(p);",
+			"\tif (c == 38) d = k38(p);",
+			"\tif (c == 39) d = k39(p);",
+			"\tif (c == 40) d = k40(p);",
+			"\tif (c == 41) d = k41(p);",
+			"\tif (c == 42) d = k42(p);",
+			"\tif (c == 43) d = k43(p);",
+			"\tif (c == 44) d = k44(p);",
+			"\tif (c == 45) d = k45(p);",
+			"\tif (c == 46) d = k46(p);",
 			"",
 			"\treturn 1.0-clamp(0.0-(d-rad)/max(bevel, 0.00001), 0.0, 1.0);",
 			"}",
 			"",
-			"float c_k(vec2 p, int char, float scale, int gs, float bevel, float rad) {",
+			"float c_k(vec2 p, int c, float scale, int gs, float bevel, float rad) {",
 			"\tif(gs > 1) {",
 			"\t\tif(box(p,0.5) > 0.0) {",
 			"\t\t\tvec3 gr = grid(p,gs);",
@@ -848,7 +848,7 @@
 			"\t\treturn 1.0;",
 			"\t}",
 			"\tif (box(p,0.5*scale) > 0.0)",
-			"\t\treturn katakana(p,char,scale,gs,bevel,rad);",
+			"\t\treturn katakana(p,c,scale,gs,bevel,rad);",
 			"\treturn 1.0;",
 			"}"
 		],