Skip to content

Commit 38f0cde

Browse files
AnshumanMahatoAnshumanMahato
authored
Merge branch 'main' into main
2 parents b11a740 + 278a364 commit 38f0cde

File tree

9 files changed

+136
-44
lines changed

9 files changed

+136
-44
lines changed

‎Ascii.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@ namespace ascii
206206
else if (c == '9')
207207
character = font->nine();
208208

209+
//for space
210+
else if (c == ' ')
211+
character = font->space();
212+
209213
font->pushChar(character);
210214
}
211215
font->printvector();

‎Fonts/Boomer/boomer.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,5 +793,15 @@ class Boomer : public Fonts
793793
character[3][0] = character[5][0] = '\\';
794794
return character;
795795
}
796+
797+
// for space
798+
char **space()
799+
{
800+
char **character = getCharGrid(1,1);
801+
802+
character[0][0] = ' ';
803+
804+
return character;
805+
}
796806
};
797807
#endif

‎Fonts/SevenStar/sevenstar.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2461,5 +2461,15 @@ class SevenStar : public Fonts
24612461
}
24622462
return character;
24632463
}
2464+
2465+
// for space
2466+
char **space()
2467+
{
2468+
char **character = getCharGrid(1,1);
2469+
2470+
character[0][0] = ' ';
2471+
2472+
return character;
2473+
}
24642474
};
24652475
#endif

‎Fonts/Straight/straight.h

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,40 @@ class Straight : public Fonts
114114
return character;
115115
}
116116

117-
/*
117+
118118
char **J()
119119
{
120-
char **character = getCharGrid(ROWS,COLS);
121-
120+
121+
char **character = getCharGrid(3,3);
122+
122123
//Enter the character grid in ROWS X COLS
124+
character[1][0] = character[1][1] = ' ';
125+
character[2][0] = character[2][1] = '_';
126+
character[2][2] = ')';
127+
character[1][2] ='|';
123128

124129
return character;
125130
}
126-
*/
131+
127132

128-
/*
133+
129134
char **K()
130135
{
131-
char **character = getCharGrid(ROWS,COLS);
136+
char **character = getCharGrid(3,3);
132137

133138
//Enter the character grid in ROWS X COLS
139+
140+
character[1][0] = character[2][0] = '|';
141+
character[1][1] = '_';
142+
character[1][2] = '/';
143+
character[2][2] ='\\';
144+
character[2][1] = ' ';
134145

135146
return character;
136147
}
137-
*/
148+
149+
150+
138151

139152
char **L()
140153
{
@@ -412,17 +425,16 @@ class Straight : public Fonts
412425
return character;
413426
}
414427

415-
/*
416-
char **j()
417-
{
418-
char **character = getCharGrid(ROWS,COLS);
419-
420-
//Enter the character grid in ROWS X COLS
428+
char **j()
429+
{
430+
char **character = getCharGrid(4, 3);
421431

422-
return character;
423-
}
432+
character[1][1] = '.';
433+
character[2][1] = '|';
434+
character[3][1] = '/';
424435

425-
*/
436+
return character;
437+
}
426438

427439
char **k()
428440
{
@@ -721,6 +733,16 @@ class Straight : public Fonts
721733
character[2][3] = '/';
722734
character[1][3] = '\\';
723735

736+
return character;
737+
}
738+
739+
// for space
740+
char **space()
741+
{
742+
char **character = getCharGrid(1,1);
743+
744+
character[0][0] = ' ';
745+
724746
return character;
725747
}
726748
};

‎Fonts/banner/banner.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Banner : public Fonts
116116
return character;
117117
}
118118

119-
/*
119+
/*
120120
char **K()
121121
{
122122
char **character = getCharGrid(ROWS,COLS);
@@ -126,6 +126,7 @@ class Banner : public Fonts
126126
return character;
127127
}
128128
*/
129+
129130

130131
char **L()
131132
{
@@ -693,5 +694,16 @@ class Banner : public Fonts
693694
}
694695
695696
*/
697+
698+
// for space
699+
char **space()
700+
{
701+
char **character = getCharGrid(1,1);
702+
703+
character[0][0] = ' ';
704+
705+
return character;
706+
}
707+
696708
};
697709
#endif

‎Fonts/carlos/carlos.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,5 +1017,15 @@ class Carlos : public Fonts
10171017
}
10181018
10191019
*/
1020+
1021+
// for space
1022+
char **space()
1023+
{
1024+
char **character = getCharGrid(1,1);
1025+
1026+
character[0][0] = ' ';
1027+
1028+
return character;
1029+
}
10201030
};
10211031
#endif

‎Fonts/fonts.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ class Fonts
8383
}
8484

8585
/********************************adding virtual functions********************************/
86+
// Virtual functions for space
87+
virtual char **space()
88+
{
89+
std::cout << "space not overridden?" << std::endl;
90+
return nullptr;
91+
}
92+
8693
// Virtual functions for lowercase letters
8794
virtual char **a()
8895
{

‎Fonts/starwar/starwar.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,5 +805,15 @@ class Starwar : public Fonts
805805
character[2][0] = character[2][6] = character[3][6] = '|';
806806
return character;
807807
}
808+
809+
// for space
810+
char **space()
811+
{
812+
char **character = getCharGrid(1,1);
813+
814+
character[0][0] = ' ';
815+
816+
return character;
817+
}
808818
};
809819
#endif

‎readme.md

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
110110
<sub><b>Harry121199</b></sub>
111111
</a>
112112
</td>
113+
<td align="center">
114+
<a href="https://github.com/komal7141">
115+
<img src="https://avatars.githubusercontent.com/u/75818108?v=4" width="70;" alt="komal7141"/>
116+
<br />
117+
<sub><b>komal7141</b></sub>
118+
</a>
119+
</td>
113120
<td align="center">
114121
<a href="https://github.com/Rishisihare90">
115122
<img src="https://avatars.githubusercontent.com/u/146431939?v=4" width="70;" alt="Rishisihare90"/>
@@ -130,21 +137,14 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
130137
<br />
131138
<sub><b>XARTAN21</b></sub>
132139
</a>
133-
</td>
140+
</td></tr>
141+
<tr>
134142
<td align="center">
135143
<a href="https://github.com/chengm405">
136144
<img src="https://avatars.githubusercontent.com/u/146371159?v=4" width="70;" alt="chengm405"/>
137145
<br />
138146
<sub><b>chengm405</b></sub>
139147
</a>
140-
</td></tr>
141-
<tr>
142-
<td align="center">
143-
<a href="https://github.com/komal7141">
144-
<img src="https://avatars.githubusercontent.com/u/75818108?v=4" width="70;" alt="komal7141"/>
145-
<br />
146-
<sub><b>komal7141</b></sub>
147-
</a>
148148
</td>
149149
<td align="center">
150150
<a href="https://github.com/gulshankapse">
@@ -224,21 +224,28 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
224224
<sub><b>PranjalKhatri</b></sub>
225225
</a>
226226
</td>
227+
<td align="center">
228+
<a href="https://github.com/shlok-2003">
229+
<img src="https://avatars.githubusercontent.com/u/103599796?v=4" width="70;" alt="shlok-2003"/>
230+
<br />
231+
<sub><b>shlok-2003</b></sub>
232+
</a>
233+
</td>
227234
<td align="center">
228235
<a href="https://github.com/codewithana">
229236
<img src="https://avatars.githubusercontent.com/u/144683532?v=4" width="70;" alt="codewithana"/>
230237
<br />
231238
<sub><b>codewithana</b></sub>
232239
</a>
233-
</td>
240+
</td></tr>
241+
<tr>
234242
<td align="center">
235243
<a href="https://github.com/miragearush">
236244
<img src="https://avatars.githubusercontent.com/u/80736891?v=4" width="70;" alt="miragearush"/>
237245
<br />
238246
<sub><b>miragearush</b></sub>
239247
</a>
240-
</td></tr>
241-
<tr>
248+
</td>
242249
<td align="center">
243250
<a href="https://github.com/s-xiae">
244251
<img src="https://avatars.githubusercontent.com/u/146371043?v=4" width="70;" alt="s-xiae"/>
@@ -274,6 +281,14 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
274281
<sub><b>gourshabrg</b></sub>
275282
</a>
276283
</td>
284+
<td align="center">
285+
<a href="https://github.com/gaurav12devloper">
286+
<img src="https://avatars.githubusercontent.com/u/55048950?v=4" width="70;" alt="gaurav12devloper"/>
287+
<br />
288+
<sub><b>gaurav12devloper</b></sub>
289+
</a>
290+
</td></tr>
291+
<tr>
277292
<td align="center">
278293
<a href="https://github.com/ahmad-kaif">
279294
<img src="https://avatars.githubusercontent.com/u/113821761?v=4" width="70;" alt="ahmad-kaif"/>
@@ -287,8 +302,7 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
287302
<br />
288303
<sub><b>Raghav354</b></sub>
289304
</a>
290-
</td></tr>
291-
<tr>
305+
</td>
292306
<td align="center">
293307
<a href="https://github.com/AmitRajput1772">
294308
<img src="https://avatars.githubusercontent.com/u/123803673?v=4" width="70;" alt="AmitRajput1772"/>
@@ -323,22 +337,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
323337
<br />
324338
<sub><b>abhay5624</b></sub>
325339
</a>
326-
</td>
327-
<td align="center">
328-
<a href="https://github.com/gaurav12devloper">
329-
<img src="https://avatars.githubusercontent.com/u/55048950?v=4" width="70;" alt="gaurav12devloper"/>
330-
<br />
331-
<sub><b>gaurav12devloper</b></sub>
332-
</a>
333-
</td>
340+
</td></tr>
341+
<tr>
334342
<td align="center">
335343
<a href="https://github.com/BidyasagarAnupam">
336344
<img src="https://avatars.githubusercontent.com/u/68635333?v=4" width="70;" alt="BidyasagarAnupam"/>
337345
<br />
338346
<sub><b>BidyasagarAnupam</b></sub>
339347
</a>
340-
</td></tr>
341-
<tr>
348+
</td>
342349
<td align="center">
343350
<a href="https://github.com/Divyanshu723">
344351
<img src="https://avatars.githubusercontent.com/u/112752057?v=4" width="70;" alt="Divyanshu723"/>
@@ -380,15 +387,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
380387
<br />
381388
<sub><b>VikashBurman</b></sub>
382389
</a>
383-
</td>
390+
</td></tr>
391+
<tr>
384392
<td align="center">
385393
<a href="https://github.com/abhishekyadav76">
386394
<img src="https://avatars.githubusercontent.com/u/132427787?v=4" width="70;" alt="abhishekyadav76"/>
387395
<br />
388396
<sub><b>abhishekyadav76</b></sub>
389397
</a>
390-
</td></tr>
391-
<tr>
398+
</td>
392399
<td align="center">
393400
<a href="https://github.com/pronajit">
394401
<img src="https://avatars.githubusercontent.com/u/98771979?v=4" width="70;" alt="pronajit"/>

0 commit comments

Comments
 (0)