Skip to content

Commit 5d059b7

Browse files
AnshumanMahatoAnshumanMahato
authored
Merge branch 'main' into main
2 parents 3d62b36 + f97863e commit 5d059b7

File tree

10 files changed

+144
-49
lines changed

10 files changed

+144
-49
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: 11 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
{
@@ -696,6 +697,15 @@ class Banner : public Fonts
696697
return character;
697698
}
698699

700+
// for space
701+
char **space()
702+
{
703+
char **character = getCharGrid(1,1);
704+
705+
character[0][0] = ' ';
706+
707+
return character;
708+
}
699709

700710
};
701711
#endif

‎Fonts/carlos/carlos.h

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,21 @@ class Carlos : public Fonts
235235
return character;
236236
}
237237

238-
/*
238+
239239
char **I()
240240
{
241-
char **character = getCharGrid(ROWS,COLS);
241+
char **character = getCharGrid(7,8);
242242

243243
//Enter the character grid in ROWS X COL
244+
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[1][2] = character[1][6] = character[5][2] = character[5][6] = character[5][7] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = '_';
245+
character[2][3] = character[2][5] = character[3][3] = character[3][5] = character[4][3] = character[4][5] = character[5][3] = character[5][5] = '|';
246+
character[1][1] = character[6][7] = '(';
247+
character[1][7] = ')';
248+
character[6][1] = '/';
244249

245250
return character;
246251
}
247-
*/
252+
248253

249254
char **J()
250255
{
@@ -1012,5 +1017,15 @@ class Carlos : public Fonts
10121017
}
10131018
10141019
*/
1020+
1021+
// for space
1022+
char **space()
1023+
{
1024+
char **character = getCharGrid(1,1);
1025+
1026+
character[0][0] = ' ';
1027+
1028+
return character;
1029+
}
10151030
};
10161031
#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

‎example.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ using namespace ascii;
55

66
int main()
77
{
8-
Ascii a = Ascii(starwar);
9-
a.print("K");
8+
Ascii a = Ascii(carlos);
9+
a.print("I");
1010
return 0;
1111
}

‎readme.md

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,13 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
138138
<sub><b>Harry121199</b></sub>
139139
</a>
140140
</td>
141+
<td align="center">
142+
<a href="https://github.com/komal7141">
143+
<img src="https://avatars.githubusercontent.com/u/75818108?v=4" width="70;" alt="komal7141"/>
144+
<br />
145+
<sub><b>komal7141</b></sub>
146+
</a>
147+
</td>
141148
<td align="center">
142149
<a href="https://github.com/Rishisihare90">
143150
<img src="https://avatars.githubusercontent.com/u/146431939?v=4" width="70;" alt="Rishisihare90"/>
@@ -158,21 +165,14 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
158165
<br />
159166
<sub><b>XARTAN21</b></sub>
160167
</a>
161-
</td>
168+
</td></tr>
169+
<tr>
162170
<td align="center">
163171
<a href="https://github.com/chengm405">
164172
<img src="https://avatars.githubusercontent.com/u/146371159?v=4" width="70;" alt="chengm405"/>
165173
<br />
166174
<sub><b>chengm405</b></sub>
167175
</a>
168-
</td></tr>
169-
<tr>
170-
<td align="center">
171-
<a href="https://github.com/komal7141">
172-
<img src="https://avatars.githubusercontent.com/u/75818108?v=4" width="70;" alt="komal7141"/>
173-
<br />
174-
<sub><b>komal7141</b></sub>
175-
</a>
176176
</td>
177177
<td align="center">
178178
<a href="https://github.com/gulshankapse">
@@ -252,21 +252,28 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
252252
<sub><b>PranjalKhatri</b></sub>
253253
</a>
254254
</td>
255+
<td align="center">
256+
<a href="https://github.com/shlok-2003">
257+
<img src="https://avatars.githubusercontent.com/u/103599796?v=4" width="70;" alt="shlok-2003"/>
258+
<br />
259+
<sub><b>shlok-2003</b></sub>
260+
</a>
261+
</td>
255262
<td align="center">
256263
<a href="https://github.com/codewithana">
257264
<img src="https://avatars.githubusercontent.com/u/144683532?v=4" width="70;" alt="codewithana"/>
258265
<br />
259266
<sub><b>codewithana</b></sub>
260267
</a>
261-
</td>
268+
</td></tr>
269+
<tr>
262270
<td align="center">
263271
<a href="https://github.com/miragearush">
264272
<img src="https://avatars.githubusercontent.com/u/80736891?v=4" width="70;" alt="miragearush"/>
265273
<br />
266274
<sub><b>miragearush</b></sub>
267275
</a>
268-
</td></tr>
269-
<tr>
276+
</td>
270277
<td align="center">
271278
<a href="https://github.com/s-xiae">
272279
<img src="https://avatars.githubusercontent.com/u/146371043?v=4" width="70;" alt="s-xiae"/>
@@ -302,6 +309,14 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
302309
<sub><b>gourshabrg</b></sub>
303310
</a>
304311
</td>
312+
<td align="center">
313+
<a href="https://github.com/gaurav12devloper">
314+
<img src="https://avatars.githubusercontent.com/u/55048950?v=4" width="70;" alt="gaurav12devloper"/>
315+
<br />
316+
<sub><b>gaurav12devloper</b></sub>
317+
</a>
318+
</td></tr>
319+
<tr>
305320
<td align="center">
306321
<a href="https://github.com/ahmad-kaif">
307322
<img src="https://avatars.githubusercontent.com/u/113821761?v=4" width="70;" alt="ahmad-kaif"/>
@@ -315,8 +330,7 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
315330
<br />
316331
<sub><b>Raghav354</b></sub>
317332
</a>
318-
</td></tr>
319-
<tr>
333+
</td>
320334
<td align="center">
321335
<a href="https://github.com/AmitRajput1772">
322336
<img src="https://avatars.githubusercontent.com/u/123803673?v=4" width="70;" alt="AmitRajput1772"/>
@@ -351,22 +365,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
351365
<br />
352366
<sub><b>abhay5624</b></sub>
353367
</a>
354-
</td>
355-
<td align="center">
356-
<a href="https://github.com/gaurav12devloper">
357-
<img src="https://avatars.githubusercontent.com/u/55048950?v=4" width="70;" alt="gaurav12devloper"/>
358-
<br />
359-
<sub><b>gaurav12devloper</b></sub>
360-
</a>
361-
</td>
368+
</td></tr>
369+
<tr>
362370
<td align="center">
363371
<a href="https://github.com/BidyasagarAnupam">
364372
<img src="https://avatars.githubusercontent.com/u/68635333?v=4" width="70;" alt="BidyasagarAnupam"/>
365373
<br />
366374
<sub><b>BidyasagarAnupam</b></sub>
367375
</a>
368-
</td></tr>
369-
<tr>
376+
</td>
370377
<td align="center">
371378
<a href="https://github.com/Divyanshu723">
372379
<img src="https://avatars.githubusercontent.com/u/112752057?v=4" width="70;" alt="Divyanshu723"/>
@@ -408,15 +415,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
408415
<br />
409416
<sub><b>VikashBurman</b></sub>
410417
</a>
411-
</td>
418+
</td></tr>
419+
<tr>
412420
<td align="center">
413421
<a href="https://github.com/abhishekyadav76">
414422
<img src="https://avatars.githubusercontent.com/u/132427787?v=4" width="70;" alt="abhishekyadav76"/>
415423
<br />
416424
<sub><b>abhishekyadav76</b></sub>
417425
</a>
418-
</td></tr>
419-
<tr>
426+
</td>
420427
<td align="center">
421428
<a href="https://github.com/pronajit">
422429
<img src="https://avatars.githubusercontent.com/u/98771979?v=4" width="70;" alt="pronajit"/>

0 commit comments

Comments
 (0)