Skip to content

Commit 3152dc2

Browse files
authored
Merge branch 'codewithnick:main' into main
2 parents ddee3cb + 54d1a54 commit 3152dc2

File tree

5 files changed

+72
-35
lines changed

5 files changed

+72
-35
lines changed

Fonts/Straight/straight.h

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,19 @@ class Straight : public Fonts
7373
return character;
7474
}
7575

76-
/*
76+
7777
char **F()
7878
{
7979
char **character = getCharGrid();
8080

8181
//Enter the character grid in ROWS X COLS
82+
character[1][0]=character[2][0]='|';
83+
character[0][1]=character[0][2]=character[1][1]='_';
84+
8285

8386
return character;
8487
}
85-
*/
88+
8689

8790
/*
8891
char **G()
@@ -337,16 +340,18 @@ char **Z()
337340
}
338341
*/
339342

340-
/*
343+
341344
char **b()
342345
{
343346
char **character = getCharGrid();
344347

345-
//Enter the character grid in ROWS X COLS
348+
character[1][0]=character[2][0]='|';
349+
character[1][1]=character[2][1]='_';
350+
character[2][2]=')';
346351

347352
return character;
348353
}
349-
*/
354+
350355

351356

352357
char **c()
@@ -404,16 +409,20 @@ char **Z()
404409
}
405410
*/
406411

407-
/*
412+
408413
char **h()
409414
{
410415
char **character = getCharGrid();
411416

412417
//Enter the character grid in ROWS X COLS
418+
character[1][0]='|';
419+
character[1][1]='_';
420+
character[2][0]='|';
421+
character[2][2]=')';
413422

414423
return character;
415424
}
416-
*/
425+
417426

418427
char **i()
419428
{
@@ -437,17 +446,18 @@ char **Z()
437446
438447
*/
439448

440-
/*
449+
441450
char **k()
442451
{
443452
char **character = getCharGrid();
444453

445-
//Enter the character grid in ROWS X COLS
454+
character[1][0]=character[2][0]='|';
455+
character[2][1]='(';
446456

447457
return character;
448458
}
449459

450-
*/
460+
451461

452462
char **l()
453463
{
@@ -472,17 +482,18 @@ char **Z()
472482
473483
*/
474484

475-
/*
476485
char **n()
477486
{
478487
char **character = getCharGrid();
479488

480489
//Enter the character grid in ROWS X COLS
490+
character[1][1]='_';
491+
character[2][0]='|';
492+
character[2][2]=')';
481493

482494
return character;
483495
}
484496

485-
*/
486497

487498
/*
488499
char **o()
@@ -645,18 +656,17 @@ char **Z()
645656
646657
*/
647658

648-
/*
649-
char **one()
659+
char **one()
650660
{
651661
char **character = getCharGrid();
652662

653663
//Enter the character grid in ROWS X COLS
664+
character[1][2] = '/';
665+
character[1][3] = character[2][3] = '|';
654666

655667
return character;
656668
}
657669

658-
*/
659-
660670
/*
661671
char **two()
662672
{
@@ -753,4 +763,4 @@ char **Z()
753763
754764
*/
755765
};
756-
#endif
766+
#endif

Fonts/banner/banner.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,14 @@ class Banner : public Fonts
121121
}
122122

123123

124-
/*
125124
char **J()
126125
{
127126
char **character = getCharGrid();
128-
129-
//Enter the character grid in ROWS X COLS
127+
character[0][6] = character[1][6] = character[2][6] = character[3][6] = character[4][6] = character[5][6] = character[6][5] = character[6][4] = character[6][3] = character[6][2] = character[6][1] = character[5][0] = character[4][0] = '#';
130128

131129
return character;
132130
}
133-
*/
131+
134132

135133
/*
136134
char **K()
@@ -164,16 +162,15 @@ class Banner : public Fonts
164162
}
165163

166164

167-
/*
165+
168166
char **N()
169167
{
170168
char **character = getCharGrid();
171-
172-
//Enter the character grid in ROWS X COLS
169+
character[0][0] = character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[6][0] = character[0][6] = character[1][6] = character[2][6] = character[3][6] = character[4][6] = character[5][6] = character[6][6] = character[1][1] = character[2][2] = character[3][3] = character[4][4] = character[5][5] = '#';
173170

174171
return character;
175172
}
176-
*/
173+
177174

178175

179176
char **O()

Fonts/starwar/starwar.h

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,22 @@ class Starwar : public Fonts
209209
}
210210
*/
211211

212-
/*
212+
213213
char **P()
214214
{
215215
char **character = getCharGrid();
216216

217217
//Enter the character grid in ROWS X COLS
218+
character[2][4] =character[1][4] = character[2][4] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[5][2] = character[3][5] = character[3][4] = character[3][6]= '_';
219+
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[2][8] = character[2][3] = character[4][3] = character[5][3] = '|';
220+
character[1][7] = '\\';
221+
character[0][0] ='.';
222+
character[3][7] = '/';
223+
character[2][5] = ')';
218224

219225
return character;
220226
}
221-
*/
227+
222228

223229
/*
224230
char **Q()
@@ -231,16 +237,24 @@ class Starwar : public Fonts
231237
}
232238
*/
233239

234-
/*
240+
235241
char **R()
236242
{
237243
char **character = getCharGrid();
238244

239245
//Enter the character grid in ROWS X COLS
246+
character[2][4] =character[1][4] = character[2][4] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[5][2] = character[5][7] = character[5][8] = character[5][9] = character[5][10] = character[5][11] = '_';
247+
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[2][8] = character[2][3] = character[5][12] = character[5][3] = '|';
248+
character[4][8] = character[4][9] = character[4][10] = character[4][11] = '-';
249+
character[1][7] = character[4][4] = character[4][7] = '\\';
250+
character[0][0] = character[5][6] = character[4][12] = '.';
251+
character[3][7] = '/';
252+
character[2][5] = ')';
253+
character[5][5] = '`';
240254

241255
return character;
242256
}
243-
*/
257+
244258

245259
/*
246260
char **S()
@@ -285,7 +299,7 @@ class Starwar : public Fonts
285299
char **V()
286300
{
287301
char **character = getCharGrid();
288-
302+
289303
//Enter the character grid in ROWS X COLS
290304
291305
return character;

example.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ using namespace ascii;
66
int main()
77
{
88
Ascii a = Ascii(straight);
9-
a.print("Z");
9+
a.print("k");
1010
return 0;
1111
}

readme.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,13 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
182182
<sub><b>Pop</b></sub>
183183
</a>
184184
</td>
185+
<td align="center">
186+
<a href="https://github.com/Stunner33">
187+
<img src="https://avatars.githubusercontent.com/u/127297054?v=4" width="70;" alt="Stunner33"/>
188+
<br />
189+
<sub><b>Null</b></sub>
190+
</a>
191+
</td>
185192
<td align="center">
186193
<a href="https://github.com/codewithana">
187194
<img src="https://avatars.githubusercontent.com/u/144683532?v=4" width="70;" alt="codewithana"/>
@@ -209,6 +216,14 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
209216
<br />
210217
<sub><b>Ankit Kujur</b></sub>
211218
</a>
219+
</td></tr>
220+
<tr>
221+
<td align="center">
222+
<a href="https://github.com/gourshabrg">
223+
<img src="https://avatars.githubusercontent.com/u/143959353?v=4" width="70;" alt="gourshabrg"/>
224+
<br />
225+
<sub><b>Ravindra Gour</b></sub>
226+
</a>
212227
</td>
213228
<td align="center">
214229
<a href="https://github.com/gourshabrg">
@@ -252,7 +267,8 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
252267
<br />
253268
<sub><b>Jannik Schmidtke</b></sub>
254269
</a>
255-
</td>
270+
</td></tr>
271+
<tr>
256272
<td align="center">
257273
<a href="https://github.com/Arif20484423">
258274
<img src="https://avatars.githubusercontent.com/u/76733190?v=4" width="70;" alt="Arif20484423"/>
@@ -295,15 +311,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
295311
<br />
296312
<sub><b>Null</b></sub>
297313
</a>
298-
</td>
314+
</td></tr>
315+
<tr>
299316
<td align="center">
300317
<a href="https://github.com/prajjawal007">
301318
<img src="https://avatars.githubusercontent.com/u/144593090?v=4" width="70;" alt="prajjawal007"/>
302319
<br />
303320
<sub><b>Prajjawal Agrawal</b></sub>
304321
</a>
305-
</td></tr>
306-
<tr>
322+
</td>
307323
<td align="center">
308324
<a href="https://github.com/prateek00077">
309325
<img src="https://avatars.githubusercontent.com/u/147089488?v=4" width="70;" alt="prateek00077"/>

0 commit comments

Comments
 (0)