Skip to content

Commit b405fe7

Browse files
AnshumanMahatoAnshumanMahato
authored
Merge branch 'main' into main
2 parents 7c9bbc0 + d3ae238 commit b405fe7

File tree

4 files changed

+109
-82
lines changed

4 files changed

+109
-82
lines changed

‎Fonts/Straight/straight.h

Lines changed: 58 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,16 @@ class Straight : public Fonts
147147
return character;
148148
}
149149

150-
char **M()
151-
{
152-
char **character = getCharGrid(2,4);
150+
char **M()
151+
{
152+
char **character = getCharGrid(2, 4);
153153

154-
character[0][0] = character[1][0] = character[0][3] = character[1][3] = '|';
155-
character[0][1] = '\\';
156-
character[0][2] = '/';
154+
character[0][0] = character[1][0] = character[0][3] = character[1][3] = '|';
155+
character[0][1] = '\\';
156+
character[0][2] = '/';
157157

158-
return character;
159-
}
158+
return character;
159+
}
160160

161161
char **N()
162162
{
@@ -174,16 +174,14 @@ class Straight : public Fonts
174174
return character;
175175
}
176176

177-
178-
char **O()
179-
{
180-
char **character = getCharGrid(3,4);
181-
character[0][1] = character[0][2] = character[2][1] = character[2][2] = '_';
182-
character[1][0] = character[2][3] = '/';
183-
character[2][0] = character[1][3] = '\\';
184-
return character;
185-
}
186-
177+
char **O()
178+
{
179+
char **character = getCharGrid(3, 4);
180+
character[0][1] = character[0][2] = character[2][1] = character[2][2] = '_';
181+
character[1][0] = character[2][3] = '/';
182+
character[2][0] = character[1][3] = '\\';
183+
return character;
184+
}
187185

188186
/*
189187
char **P()
@@ -528,18 +526,15 @@ class Straight : public Fonts
528526
529527
*/
530528

531-
532-
char **t()
533-
{
534-
char **character = getCharGrid(3,3);
535-
536-
character[1][0]=character[2][0]='|';
537-
character[1][1]=character[2][1]='_';
529+
char **t()
530+
{
531+
char **character = getCharGrid(3, 3);
538532

539-
return character;
540-
}
533+
character[1][0] = character[2][0] = '|';
534+
character[1][1] = character[2][1] = '_';
541535

542-
536+
return character;
537+
}
543538

544539
char **u()
545540
{
@@ -636,17 +631,17 @@ class Straight : public Fonts
636631
return character;
637632
}
638633

639-
/*
640-
char **two()
641-
{
642-
char **character = getCharGrid(ROWS,COLS);
643-
644-
//Enter the character grid in ROWS X COLS
634+
char **two()
635+
{
636+
char **character = getCharGrid(3, 4);
645637

646-
return character;
647-
}
638+
// Enter the character grid in ROWS X COLS
639+
character[0][1] = character[0][2] = character[2][2] = character[2][3] = character[1][2] = '_';
640+
character[1][3] = ')';
641+
character[2][1] = '/';
648642

649-
*/
643+
return character;
644+
}
650645

651646
/*
652647
char **three()
@@ -684,17 +679,17 @@ class Straight : public Fonts
684679
685680
*/
686681

687-
/*
688-
char **six()
689-
{
690-
char **character = getCharGrid(ROWS,COLS);
691-
692-
//Enter the character grid in ROWS X COLS
682+
char **six()
683+
{
684+
char **character = getCharGrid(3, 4);
693685

694-
return character;
695-
}
686+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
687+
character[1][0] = '/';
688+
character[2][0] = '\\';
689+
character[2][3] = ')';
696690

697-
*/
691+
return character;
692+
}
698693

699694
/*
700695
char **seven()
@@ -708,31 +703,27 @@ class Straight : public Fonts
708703
709704
*/
710705

711-
/*
712-
char **eight()
713-
{
714-
char **character = getCharGrid(ROWS,COLS);
715-
716-
//Enter the character grid in ROWS X COLS
717-
718-
return character;
719-
}
706+
char **eight()
707+
{
708+
char **character = getCharGrid(3, 4);
720709

721-
*/
710+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
711+
character[1][0] = character[2][0] = '(';
712+
character[1][3] = character[2][3] = ')';
722713

723-
724-
char **nine()
725-
{
726-
char **character = getCharGrid(3,4);
714+
return character;
715+
}
727716

728-
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
729-
character[1][0] = '(';
730-
character[2][3] = '/';
731-
character[1][3] = '\\';
717+
char **nine()
718+
{
719+
char **character = getCharGrid(3, 4);
732720

733-
return character;
734-
}
721+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
722+
character[1][0] = '(';
723+
character[2][3] = '/';
724+
character[1][3] = '\\';
735725

736-
726+
return character;
727+
}
737728
};
738729
#endif

‎Fonts/carlos/carlos.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,16 +374,21 @@ class Carlos : public Fonts
374374
return character;
375375
}
376376

377-
/*
377+
378378
char **R()
379379
{
380-
char **character = getCharGrid(ROWS,COLS);
380+
char **character = getCharGrid(7,10);
381381

382-
//Enter the character grid in ROWS X COL
382+
character[1][0] = character[3][0] = character[5][0] = character[2][3] = character[5][2] = '(';
383+
character[2][1] = character[4][1] = character[6][1] = character[6][3] = character[5][8] = character[5][9] = character[2][6] = character[2][8] = ')';
384+
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = '_';
385+
character[1][4] = character[1][5] = character[2][4] = character[2][5] = character[3][5] = character[3][6] = character[4][8] = character[5][7] = character[6][2] = character[6][6] = character[6][7] = '_';
386+
character[1][7] = character[4][3] = character[5][4] = character[6][5] = character[4][5] = character[5][6] = character[1][7] = '\\';
387+
character[3][7] = character[6][8] = '/';
383388

384389
return character;
385390
}
386-
*/
391+
387392

388393
char **S()
389394
{

‎Fonts/starwar/starwar.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,18 +222,27 @@ class Starwar : public Fonts
222222
return character;
223223
}
224224

225-
/*
225+
226226
char **Q()
227227
{
228-
char **character = getCharGrid(ROWS,COLS);
228+
char **character = getCharGrid(6,14);
229229

230230
//Enter the character grid in ROWS X COLS
231+
character[1][4] = character[1][5] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = character[5][6] = character[5][7] = character[5][8] = character[5][9] = character[5][10] = character[5][11] = character[5][12] = '_';
232+
character[2][0] = character[3][0] = character[4][0] = character[2][3] = character[3][3] = character[2][6] = character[3][6] = character[2][9] = character[3][9] = '|';
233+
character[4][4] = character[4][5] = character[4][10] = character[4][11] = '-';
234+
character[1][8] = character[5][1] = character[5][7] = '\\';
235+
character[4][6] = character[4][9] = '\'';
236+
character[5][13] = '\\';
237+
character[4][12] = '.';
238+
character[4][3] = '`';
239+
character[1][1] = '/';
231240

232241
return character;
233242
}
234243

235244

236-
*/
245+
237246

238247
char **R()
239248
{

‎readme.md

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,14 +259,21 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
259259
<sub><b>miragearush</b></sub>
260260
</a>
261261
</td>
262+
<td align="center">
263+
<a href="https://github.com/s-xiae">
264+
<img src="https://avatars.githubusercontent.com/u/146371043?v=4" width="70;" alt="s-xiae"/>
265+
<br />
266+
<sub><b>s-xiae</b></sub>
267+
</a>
268+
</td></tr>
269+
<tr>
262270
<td align="center">
263271
<a href="https://github.com/som02esh">
264272
<img src="https://avatars.githubusercontent.com/u/106095040?v=4" width="70;" alt="som02esh"/>
265273
<br />
266274
<sub><b>som02esh</b></sub>
267275
</a>
268-
</td></tr>
269-
<tr>
276+
</td>
270277
<td align="center">
271278
<a href="https://github.com/akashKumar06">
272279
<img src="https://avatars.githubusercontent.com/u/117292434?v=4" width="70;" alt="akashKumar06"/>
@@ -308,15 +315,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
308315
<br />
309316
<sub><b>AmitRajput1772</b></sub>
310317
</a>
311-
</td>
318+
</td></tr>
319+
<tr>
312320
<td align="center">
313321
<a href="https://github.com/avi-dey">
314322
<img src="https://avatars.githubusercontent.com/u/97702087?v=4" width="70;" alt="avi-dey"/>
315323
<br />
316324
<sub><b>avi-dey</b></sub>
317325
</a>
318-
</td></tr>
319-
<tr>
326+
</td>
320327
<td align="center">
321328
<a href="https://github.com/FreemRL">
322329
<img src="https://avatars.githubusercontent.com/u/66525499?v=4" width="70;" alt="FreemRL"/>
@@ -358,15 +365,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
358365
<br />
359366
<sub><b>hellomohit722</b></sub>
360367
</a>
361-
</td>
368+
</td></tr>
369+
<tr>
362370
<td align="center">
363371
<a href="https://github.com/NANDANA-S-P">
364372
<img src="https://avatars.githubusercontent.com/u/79624565?v=4" width="70;" alt="NANDANA-S-P"/>
365373
<br />
366374
<sub><b>NANDANA-S-P</b></sub>
367375
</a>
368-
</td></tr>
369-
<tr>
376+
</td>
370377
<td align="center">
371378
<a href="https://github.com/prajjawal007">
372379
<img src="https://avatars.githubusercontent.com/u/144593090?v=4" width="70;" alt="prajjawal007"/>
@@ -395,13 +402,28 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
395402
<sub><b>abhishekyadav76</b></sub>
396403
</a>
397404
</td>
405+
<td align="center">
406+
<a href="https://github.com/gaurav12devloper">
407+
<img src="https://avatars.githubusercontent.com/u/55048950?v=4" width="70;" alt="gaurav12devloper"/>
408+
<br />
409+
<sub><b>gaurav12devloper</b></sub>
410+
</a>
411+
</td>
398412
<td align="center">
399413
<a href="https://github.com/pronajit">
400414
<img src="https://avatars.githubusercontent.com/u/98771979?v=4" width="70;" alt="pronajit"/>
401415
<br />
402416
<sub><b>pronajit</b></sub>
403417
</a>
404418
</td></tr>
419+
<tr>
420+
<td align="center">
421+
<a href="https://github.com/Shivansh-243">
422+
<img src="https://avatars.githubusercontent.com/u/125989942?v=4" width="70;" alt="Shivansh-243"/>
423+
<br />
424+
<sub><b>Shivansh-243</b></sub>
425+
</a>
426+
</td></tr>
405427
</table>
406428
<!-- readme: contributors,codewithnick/-,vkumar8192449/-,vishu567/-,sachinkumar911/-,AnshumanMahato/- -end -->
407429

0 commit comments

Comments
 (0)