Skip to content

Commit 48cb573

Browse files
doakey3doakey3
committed
added tajik characters and fixed some errors with the decorators
1 parent c300e36 commit 48cb573

File tree

196 files changed

+527
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+527
-260
lines changed

‎__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ def init_props():
138138
("consolas", "Consolas", "A monospace font based on Consolas by doakey3"),
139139
("hershey_script_simplex", "Hershey's Script Simplex", "A cursive font made by by Dr. Allen Vincent Hershey"),
140140
("hershey_roman_simplex", "Hershey's Roman Simplex", "A sans font made by by Dr. Allen Vincent Hershey"),
141-
("shohrukh_russian", "Shohrukh's Russian", "A font made by Shohrukh for Russian characters")
141+
("shohrukh_russian", "Shohrukh's Russian", "A font made by Shohrukh for Russian characters"),
142+
("shohrukh_tajik", "Shohrukh's Tajik", "A font made by Shohrukh for Tajik characters")
142143
]
143144

144145
bpy.types.Scene.gw_font = bpy.props.EnumProperty(
@@ -198,7 +199,6 @@ def init_props():
198199
min=1
199200
)
200201

201-
202202
classes = [
203203
GREASEPENCIL_PT_greasewriter,
204204
SCENE_PT_greasewriter,

‎extras/shohrukh_russian.blend‎

24 Bytes
Binary file not shown.

‎extras/shohrukh_tajik.blend‎

949 KB
Binary file not shown.

‎operators/decorate.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,37 +87,37 @@ def execute(self, context):
8787
origin_y = (height / 2) + bottom
8888

8989
if style == "underline":
90-
v1 = [left - (width * padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
91-
v2 = [right * (1 + padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
90+
v1 = [left - (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
91+
v2 = [right + (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
9292
glyph_strokes.append([v1, v2])
9393

9494
elif style == "over-underline":
95-
v1 = [left - (width * padding_fac) - origin_x, top + (line_height * padding_fac) - origin_y, 0]
96-
v2 = [right * (1 + padding_fac) - origin_x, top + (line_height * padding_fac) - origin_y, 0]
95+
v1 = [left - (line_height * padding_fac * 2) - origin_x, top + (line_height * padding_fac * 2) - origin_y, 0]
96+
v2 = [right + (line_height * padding_fac * 2) - origin_x, top + (line_height * padding_fac * 2) - origin_y, 0]
9797
glyph_strokes.append([v1, v2])
9898

99-
v1 = [left - (width * padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
100-
v2 = [right * (1 + padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
99+
v1 = [left - (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
100+
v2 = [right + (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
101101
glyph_strokes.append([v1, v2])
102102

103103
elif style == "x-out":
104-
v1 = [left - (width * padding_fac) - origin_x, top + (line_height * padding_fac) - origin_y, 0]
105-
v2 = [right * (1 + padding_fac) - origin_x, top + (line_height * padding_fac) - origin_y, 0]
106-
v3 = [right * (1 + padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
107-
v4 = [left - (width * padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
104+
v1 = [left - (line_height * padding_fac * 2) - origin_x, top + (line_height * padding_fac * 2) - origin_y, 0]
105+
v2 = [right + (line_height * padding_fac * 2) - origin_x, top + (line_height * padding_fac * 2) - origin_y, 0]
106+
v3 = [right + (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
107+
v4 = [left - (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
108108
glyph_strokes.append([v1, v3])
109109
glyph_strokes.append([v2, v4])
110110

111111
elif style == "strike-through":
112-
v1 = [left - (width * padding_fac) - origin_x, bottom + (height / 2) - origin_y, 0]
113-
v2 = [right * (1 + padding_fac) - origin_x, bottom + (height / 2) - origin_y, 0]
114-
glyph_strokes.append([v1, v2, 0])
112+
v1 = [left - (line_height * padding_fac * 2) - origin_x, bottom + (height / 2) - origin_y, 0]
113+
v2 = [right + (line_height * padding_fac * 2) - origin_x, bottom + (height / 2) - origin_y, 0]
114+
glyph_strokes.append([v1, v2])
115115

116116
elif style == "box":
117-
v1 = [left - (width * padding_fac) - origin_x, top + (line_height * padding_fac) - origin_y, 0]
118-
v2 = [right * (1 + padding_fac) - origin_x, top + (line_height * padding_fac) - origin_y, 0]
119-
v3 = [right * (1 + padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
120-
v4 = [left - (width * padding_fac) - origin_x, bottom - (line_height * padding_fac) - origin_y, 0]
117+
v1 = [left - (line_height * padding_fac * 2) - origin_x, top + (line_height * padding_fac * 2) - origin_y, 0]
118+
v2 = [right + (line_height * padding_fac * 2) - origin_x, top + (line_height * padding_fac * 2) - origin_y, 0]
119+
v3 = [right + (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
120+
v4 = [left - (line_height * padding_fac * 2) - origin_x, bottom - (line_height * padding_fac * 2) - origin_y, 0]
121121
glyph_strokes.append([v1, v2, v3, v4, v1])
122122

123123
elif style == "ellipse":

‎operators/fonts/shohrukh_russian/0.glyph‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[[0.15828, 0.73261, 0], [0.12932, 0.7256, 0], [0.10457, 0.71581, 0], [0.08358, 0.70366, 0], [0.06593, 0.68949, 0], [0.05124, 0.67365, 0], [0.03914, 0.65648, 0], [0.02931, 0.63825, 0], [0.02142, 0.61925, 0], [0.01519, 0.59972, 0], [0.01038, 0.57989, 0], [0.00674, 0.55997, 0], [0.00408, 0.54012, 0], [0.00222, 0.52051, 0], [0.00099, 0.50127, 0], [0.00029, 0.4825, 0], [0.0, 0.4643, 0], [6e-05, 0.44671, 0], [0.00041, 0.42978, 0], [0.00105, 0.41353, 0], [0.00196, 0.39793, 0], [0.00317, 0.38299, 0], [0.00469, 0.36866, 0], [0.00654, 0.35494, 0], [0.00872, 0.34181, 0], [0.01125, 0.32925, 0], [0.01412, 0.31725, 0], [0.01735, 0.30579, 0], [0.02093, 0.29487, 0], [0.02486, 0.28447, 0], [0.02914, 0.27458, 0], [0.03376, 0.2652, 0], [0.03872, 0.25632, 0], [0.04399, 0.24794, 0], [0.04958, 0.24004, 0], [0.05546, 0.23263, 0], [0.06162, 0.22571, 0], [0.06804, 0.21928, 0], [0.07468, 0.21333, 0], [0.08154, 0.20787, 0], [0.08858, 0.20291, 0], [0.09578, 0.19844, 0], [0.10312, 0.19448, 0], [0.11057, 0.19102, 0], [0.1181, 0.18806, 0], [0.12571, 0.18562, 0], [0.13335, 0.18369, 0], [0.14103, 0.18228, 0], [0.14871, 0.18139, 0], [0.15638, 0.18102, 0], [0.16401, 0.18118, 0], [0.1716, 0.18188, 0], [0.17912, 0.18311, 0], [0.18656, 0.18487, 0], [0.1939, 0.18718, 0], [0.20113, 0.19004, 0], [0.20823, 0.19344, 0], [0.2152, 0.1974, 0], [0.22202, 0.20191, 0], [0.22867, 0.20699, 0], [0.23515, 0.21263, 0], [0.24144, 0.21884, 0], [0.24754, 0.22563, 0], [0.25343, 0.23301, 0], [0.2591, 0.241, 0], [0.26455, 0.24959, 0], [0.26977, 0.25881, 0], [0.27474, 0.26866, 0], [0.27946, 0.27917, 0], [0.28392, 0.29035, 0], [0.28811, 0.30221, 0], [0.29203, 0.31478, 0], [0.29567, 0.32807, 0], [0.29902, 0.34211, 0], [0.30207, 0.35691, 0], [0.30483, 0.37251, 0], [0.30728, 0.38893, 0], [0.30942, 0.40618, 0], [0.31123, 0.42429, 0], [0.31267, 0.44323, 0], [0.31368, 0.46296, 0], [0.31416, 0.4834, 0], [0.31401, 0.50445, 0], [0.31308, 0.52597, 0], [0.31121, 0.54781, 0], [0.30822, 0.56976, 0], [0.30389, 0.5916, 0], [0.298, 0.6131, 0], [0.29028, 0.63396, 0], [0.28045, 0.65388, 0], [0.2682, 0.67251, 0], [0.25321, 0.6895, 0], [0.23511, 0.70445, 0], [0.21353, 0.71692, 0], [0.18806, 0.72647, 0], [0.15828, 0.73261, 0]]
1+
[[0.12662, 0.58609, 0], [0.10346, 0.58048, 0], [0.08366, 0.57265, 0], [0.06686, 0.56292, 0], [0.05275, 0.55159, 0], [0.04099, 0.53892, 0], [0.03132, 0.52518, 0], [0.02344, 0.5106, 0], [0.01713, 0.4954, 0], [0.01215, 0.47978, 0], [0.0083, 0.46391, 0], [0.00539, 0.44797, 0], [0.00327, 0.4321, 0], [0.00177, 0.41641, 0], [0.00079, 0.40101, 0], [0.00023, 0.386, 0], [0.0, 0.37144, 0], [5e-05, 0.35737, 0], [0.00033, 0.34383, 0], [0.00084, 0.33082, 0], [0.00157, 0.31835, 0], [0.00254, 0.30639, 0], [0.00375, 0.29493, 0], [0.00523, 0.28395, 0], [0.00698, 0.27345, 0], [0.009, 0.2634, 0], [0.0113, 0.2538, 0], [0.01388, 0.24463, 0], [0.01674, 0.2359, 0], [0.01989, 0.22758, 0], [0.02331, 0.21967, 0], [0.02701, 0.21216, 0], [0.03097, 0.20506, 0], [0.0352, 0.19835, 0], [0.03967, 0.19203, 0], [0.04437, 0.18611, 0], [0.0493, 0.18057, 0], [0.05443, 0.17542, 0], [0.05975, 0.17066, 0], [0.06523, 0.1663, 0], [0.07087, 0.16233, 0], [0.07663, 0.15875, 0], [0.0825, 0.15558, 0], [0.08845, 0.15281, 0], [0.09448, 0.15045, 0], [0.10056, 0.1485, 0], [0.10668, 0.14695, 0], [0.11282, 0.14582, 0], [0.11897, 0.14511, 0], [0.1251, 0.14482, 0], [0.13121, 0.14495, 0], [0.13728, 0.1455, 0], [0.14329, 0.14649, 0], [0.14925, 0.1479, 0], [0.15512, 0.14975, 0], [0.1609, 0.15203, 0], [0.16659, 0.15475, 0], [0.17216, 0.15792, 0], [0.17761, 0.16153, 0], [0.18293, 0.16559, 0], [0.18812, 0.1701, 0], [0.19315, 0.17507, 0], [0.19803, 0.18051, 0], [0.20274, 0.18641, 0], [0.20728, 0.1928, 0], [0.21164, 0.19967, 0], [0.21581, 0.20705, 0], [0.21979, 0.21493, 0], [0.22357, 0.22334, 0], [0.22713, 0.23228, 0], [0.23049, 0.24177, 0], [0.23362, 0.25182, 0], [0.23653, 0.26245, 0], [0.23921, 0.27368, 0], [0.24166, 0.28553, 0], [0.24386, 0.29801, 0], [0.24582, 0.31114, 0], [0.24753, 0.32494, 0], [0.24898, 0.33943, 0], [0.25014, 0.35458, 0], [0.25094, 0.37037, 0], [0.25133, 0.38672, 0], [0.25121, 0.40356, 0], [0.25046, 0.42078, 0], [0.24897, 0.43824, 0], [0.24657, 0.45581, 0], [0.24311, 0.47328, 0], [0.2384, 0.49048, 0], [0.23222, 0.50717, 0], [0.22436, 0.5231, 0], [0.21456, 0.53801, 0], [0.20257, 0.5516, 0], [0.18809, 0.56356, 0], [0.17082, 0.57354, 0], [0.15045, 0.58118, 0], [0.12662, 0.58609, 0]]

‎operators/fonts/shohrukh_russian/1.glyph‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[[0.0, 0.65473, 0], [0.01529, 0.66095, 0], [0.03058, 0.66717, 0], [0.04587, 0.67339, 0], [0.06116, 0.6796, 0], [0.07646, 0.68582, 0], [0.09175, 0.69204, 0], [0.10704, 0.69826, 0], [0.12233, 0.70448, 0], [0.13762, 0.7107, 0], [0.15291, 0.71691, 0], [0.1682, 0.72313, 0]]
2-
[[0.1682, 0.72313, 0], [0.1682, 0.67525, 0], [0.1682, 0.62737, 0], [0.1682, 0.57948, 0], [0.1682, 0.5316, 0], [0.1682, 0.48371, 0], [0.1682, 0.43583, 0], [0.1682, 0.38795, 0], [0.1682, 0.34006, 0], [0.1682, 0.29218, 0], [0.1682, 0.2443, 0], [0.1682, 0.19641, 0]]
3-
[[0.02949, 0.19641, 0], [0.05497, 0.19641, 0], [0.08046, 0.19641, 0], [0.10595, 0.19641, 0], [0.13143, 0.19641, 0], [0.15692, 0.19641, 0], [0.1824, 0.19641, 0], [0.20789, 0.19641, 0], [0.23337, 0.19641, 0], [0.25886, 0.19641, 0], [0.28435, 0.19641, 0], [0.30983, 0.19641, 0]]
1+
[[0.0, 0.52378, 0], [0.01223, 0.52876, 0], [0.02447, 0.53373, 0], [0.0367, 0.53871, 0], [0.04893, 0.54368, 0], [0.06116, 0.54866, 0], [0.0734, 0.55363, 0], [0.08563, 0.55861, 0], [0.09786, 0.56358, 0], [0.1101, 0.56856, 0], [0.12233, 0.57353, 0], [0.13456, 0.57851, 0]]
2+
[[0.13456, 0.57851, 0], [0.13456, 0.5402, 0], [0.13456, 0.50189, 0], [0.13456, 0.46359, 0], [0.13456, 0.42528, 0], [0.13456, 0.38697, 0], [0.13456, 0.34867, 0], [0.13456, 0.31036, 0], [0.13456, 0.27205, 0], [0.13456, 0.23374, 0], [0.13456, 0.19544, 0], [0.13456, 0.15713, 0]]
3+
[[0.02359, 0.15713, 0], [0.04398, 0.15713, 0], [0.06437, 0.15713, 0], [0.08476, 0.15713, 0], [0.10515, 0.15713, 0], [0.12553, 0.15713, 0], [0.14592, 0.15713, 0], [0.16631, 0.15713, 0], [0.1867, 0.15713, 0], [0.20709, 0.15713, 0], [0.22748, 0.15713, 0], [0.24787, 0.15713, 0]]

‎operators/fonts/shohrukh_russian/2.glyph‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
[[0.00545, 0.65227, 0], [0.00595, 0.66583, 0], [0.00786, 0.67834, 0], [0.01102, 0.68984, 0], [0.01532, 0.70035, 0], [0.02062, 0.70991, 0], [0.0268, 0.71852, 0], [0.03374, 0.72623, 0], [0.04134, 0.73306, 0], [0.0495, 0.73902, 0], [0.05811, 0.74416, 0], [0.06708, 0.74848, 0], [0.07632, 0.75202, 0], [0.08576, 0.7548, 0], [0.09532, 0.75685, 0], [0.10493, 0.75818, 0], [0.11453, 0.75882, 0], [0.12405, 0.7588, 0], [0.13346, 0.75814, 0], [0.14269, 0.75685, 0], [0.15172, 0.75497, 0], [0.1605, 0.75251, 0], [0.16901, 0.7495, 0], [0.17723, 0.74596, 0], [0.18513, 0.74191, 0], [0.1927, 0.73737, 0], [0.19994, 0.73236, 0], [0.20684, 0.7269, 0], [0.21337, 0.72102, 0], [0.21954, 0.71473, 0], [0.22534, 0.70805, 0], [0.23075, 0.70101, 0], [0.23576, 0.69362, 0], [0.24038, 0.68591, 0], [0.24457, 0.67789, 0], [0.24835, 0.66959, 0], [0.25169, 0.66102, 0], [0.2546, 0.6522, 0], [0.25705, 0.64315, 0], [0.25906, 0.63389, 0], [0.26059, 0.62444, 0], [0.26166, 0.61481, 0], [0.26224, 0.60503, 0], [0.26234, 0.59511, 0], [0.26194, 0.58507, 0], [0.26104, 0.57493, 0], [0.25963, 0.5647, 0], [0.25771, 0.55441, 0], [0.25526, 0.54407, 0], [0.25229, 0.53369, 0], [0.24877, 0.52328, 0], [0.2447, 0.51283, 0], [0.24006, 0.50233, 0], [0.23484, 0.49174, 0], [0.229, 0.48104, 0], [0.22252, 0.47016, 0], [0.21538, 0.45904, 0], [0.20755, 0.44763, 0], [0.19898, 0.43583, 0], [0.18965, 0.42356, 0], [0.17951, 0.4107, 0], [0.16852, 0.39715, 0], [0.15663, 0.38278, 0], [0.14379, 0.36746, 0], [0.12995, 0.35103, 0], [0.11505, 0.33335, 0], [0.09904, 0.31423, 0], [0.08186, 0.29351, 0], [0.06343, 0.271, 0], [0.04369, 0.24649, 0], [0.02257, 0.21977, 0], [0.0, 0.19062, 0]]
2-
[[0.0, 0.19062, 0], [0.02704, 0.19084, 0], [0.05408, 0.19106, 0], [0.08111, 0.19128, 0], [0.10815, 0.19151, 0], [0.13519, 0.19173, 0], [0.16223, 0.19195, 0], [0.18926, 0.19217, 0], [0.2163, 0.1924, 0], [0.24334, 0.19262, 0], [0.27038, 0.19284, 0], [0.29741, 0.19306, 0]]
1+
[[0.00436, 0.52182, 0], [0.00476, 0.53266, 0], [0.00629, 0.54267, 0], [0.00882, 0.55187, 0], [0.01226, 0.56028, 0], [0.01649, 0.56792, 0], [0.02144, 0.57482, 0], [0.02699, 0.58099, 0], [0.03307, 0.58645, 0], [0.0396, 0.59122, 0], [0.04648, 0.59533, 0], [0.05366, 0.59879, 0], [0.06106, 0.60162, 0], [0.06861, 0.60384, 0], [0.07626, 0.60548, 0], [0.08394, 0.60654, 0], [0.09162, 0.60706, 0], [0.09924, 0.60704, 0], [0.10677, 0.60651, 0], [0.11416, 0.60548, 0], [0.12138, 0.60398, 0], [0.1284, 0.60201, 0], [0.13521, 0.5996, 0], [0.14178, 0.59677, 0], [0.1481, 0.59353, 0], [0.15416, 0.58989, 0], [0.15995, 0.58588, 0], [0.16547, 0.58152, 0], [0.1707, 0.57681, 0], [0.17563, 0.57178, 0], [0.18027, 0.56644, 0], [0.1846, 0.56081, 0], [0.18861, 0.5549, 0], [0.1923, 0.54873, 0], [0.19566, 0.54232, 0], [0.19868, 0.53567, 0], [0.20135, 0.52881, 0], [0.20368, 0.52176, 0], [0.20564, 0.51452, 0], [0.20724, 0.50711, 0], [0.20847, 0.49955, 0], [0.20933, 0.49185, 0], [0.20979, 0.48402, 0], [0.20987, 0.47609, 0], [0.20955, 0.46806, 0], [0.20883, 0.45994, 0], [0.20771, 0.45176, 0], [0.20617, 0.44353, 0], [0.20421, 0.43526, 0], [0.20183, 0.42695, 0], [0.19902, 0.41862, 0], [0.19576, 0.41027, 0], [0.19205, 0.40186, 0], [0.18787, 0.39339, 0], [0.1832, 0.38483, 0], [0.17802, 0.37612, 0], [0.17231, 0.36724, 0], [0.16604, 0.35811, 0], [0.15919, 0.34867, 0], [0.15172, 0.33885, 0], [0.14361, 0.32856, 0], [0.13481, 0.31772, 0], [0.1253, 0.30623, 0], [0.11503, 0.29397, 0], [0.10396, 0.28083, 0], [0.09204, 0.26668, 0], [0.07923, 0.25139, 0], [0.06548, 0.23481, 0], [0.05074, 0.2168, 0], [0.03495, 0.19719, 0], [0.01806, 0.17581, 0], [0.0, 0.15249, 0]]
2+
[[0.0, 0.15249, 0], [0.02163, 0.15267, 0], [0.04326, 0.15285, 0], [0.06489, 0.15303, 0], [0.08652, 0.15321, 0], [0.10815, 0.15338, 0], [0.12978, 0.15356, 0], [0.15141, 0.15374, 0], [0.17304, 0.15392, 0], [0.19467, 0.15409, 0], [0.2163, 0.15427, 0], [0.23793, 0.15445, 0]]

0 commit comments

Comments
 (0)