Skip to content

Commit d7fa748

Browse files
AnshumanMahatoAnshumanMahato
authored
Merge branch 'main' into forFour
2 parents 66cc1c0 + fdf47d4 commit d7fa748

File tree

6 files changed

+183
-146
lines changed

6 files changed

+183
-146
lines changed

‎Fonts/Boomer/boomer.h

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -461,17 +461,14 @@ class Boomer : public Fonts
461461
return character;
462462
}
463463

464-
/*
465-
char **l()
466-
{
467-
char **character = getCharGrid(ROWS,COLS);
468-
469-
//Enter the character grid in ROWS X COLS
470-
471-
return character;
472-
}
464+
char **l()
465+
{
466+
char **character = getCharGrid(6, 3);
473467

474-
*/
468+
character[0][1] = character[5][1] = '_';
469+
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[1][2] = character[2][2] = character[3][2] = character[4][2] = character[5][0] = character[5][2] = '|';
470+
return character;
471+
}
475472

476473
/*
477474
char **m()
@@ -771,20 +768,18 @@ class Boomer : public Fonts
771768
return character;
772769
}
773770

774-
char **eight()
775-
{
776-
char **character = getCharGrid(6,7);
777-
778-
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[3][3] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = '_';
779-
character[1][0] = character[1][6] = character[4][0] = character[4][2] = character[4][4] = character[4][6] = '|';
780-
character[2][1] = character[3][5] = character[5][0] = '\\';
781-
character[2][5] = character[3][1] = character[5][6] = '/';
782-
character[2][3] = 'V';
783-
771+
char **eight()
772+
{
773+
char **character = getCharGrid(6, 7);
784774

785-
return character;
786-
}
775+
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[3][3] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = '_';
776+
character[1][0] = character[1][6] = character[4][0] = character[4][2] = character[4][4] = character[4][6] = '|';
777+
character[2][1] = character[3][5] = character[5][0] = '\\';
778+
character[2][5] = character[3][1] = character[5][6] = '/';
779+
character[2][3] = 'V';
787780

781+
return character;
782+
}
788783

789784
char **nine()
790785
{

‎Fonts/Straight/straight.h

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,14 @@ class Straight : public Fonts
174174
return character;
175175
}
176176

177-
/*
178-
char **O()
179-
{
180-
char **character = getCharGrid(ROWS,COLS);
181-
182-
//Enter the character grid in ROWS X COLS
183-
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()
@@ -633,17 +631,17 @@ class Straight : public Fonts
633631
return character;
634632
}
635633

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

643-
return character;
644-
}
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] = '/';
645642

646-
*/
643+
return character;
644+
}
647645

648646
/*
649647
char **three()
@@ -679,17 +677,17 @@ class Straight : public Fonts
679677
680678
*/
681679

682-
/*
683-
char **six()
684-
{
685-
char **character = getCharGrid(ROWS,COLS);
686-
687-
//Enter the character grid in ROWS X COLS
680+
char **six()
681+
{
682+
char **character = getCharGrid(3, 4);
688683

689-
return character;
690-
}
684+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
685+
character[1][0] = '/';
686+
character[2][0] = '\\';
687+
character[2][3] = ')';
691688

692-
*/
689+
return character;
690+
}
693691

694692
/*
695693
char **seven()
@@ -703,17 +701,16 @@ class Straight : public Fonts
703701
704702
*/
705703

706-
/*
707-
char **eight()
708-
{
709-
char **character = getCharGrid(ROWS,COLS);
710-
711-
//Enter the character grid in ROWS X COLS
704+
char **eight()
705+
{
706+
char **character = getCharGrid(3, 4);
712707

713-
return character;
714-
}
708+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
709+
character[1][0] = character[2][0] = '(';
710+
character[1][3] = character[2][3] = ')';
715711

716-
*/
712+
return character;
713+
}
717714

718715
char **nine()
719716
{

‎Fonts/carlos/carlos.h

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Carlos : public Fonts
1212

1313
char **A()
1414
{
15-
char **character = getCharGrid(7,10);
15+
char **character = getCharGrid(7, 10);
1616

1717
character[0][3] = character[0][4] = character[0][5] = character[0][6] = '_';
1818
character[1][2] = '(';
@@ -38,7 +38,7 @@ class Carlos : public Fonts
3838

3939
char **B()
4040
{
41-
char **character = getCharGrid(7,9);
41+
char **character = getCharGrid(7, 9);
4242

4343
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[2][5] = character[4][5] = character[5][5] = '_';
4444
character[0][5] = character[0][6] = character[1][1] = character[1][5] = character[3][6] = character[5][1] = '_';
@@ -52,7 +52,7 @@ class Carlos : public Fonts
5252

5353
char **C()
5454
{
55-
char **character = getCharGrid(7,8);
55+
char **character = getCharGrid(7, 8);
5656

5757
character[0][0] = character[0][1] = character[0][2] = character[1][0] = character[1][1] = character[1][3] = character[2][0] = character[2][2] = character[3][1] = character[4][1] = character[5][0] = character[5][2] = character[6][0] = character[6][1] = ' ';
5858
character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[1][4] = character[1][5] = character[1][6] = character[5][4] = character[5][5] = character[5][6] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = '_';
@@ -66,7 +66,7 @@ class Carlos : public Fonts
6666

6767
char **D()
6868
{
69-
char **character = getCharGrid(7,10);
69+
char **character = getCharGrid(7, 10);
7070

7171
character[0][1] = '_';
7272
character[0][2] = '_';
@@ -117,7 +117,7 @@ class Carlos : public Fonts
117117

118118
char **E()
119119
{
120-
char **character = getCharGrid(7,8);
120+
char **character = getCharGrid(7, 8);
121121
character[0][2] = '_';
122122
character[0][3] = '_';
123123
character[0][4] = '_';
@@ -172,7 +172,7 @@ class Carlos : public Fonts
172172

173173
char **G()
174174
{
175-
char **character = getCharGrid(7,10);
175+
char **character = getCharGrid(7, 10);
176176
character[0][3] = '_';
177177
character[0][4] = '_';
178178
character[0][5] = '_';
@@ -223,7 +223,7 @@ class Carlos : public Fonts
223223

224224
char **H()
225225
{
226-
char **character = getCharGrid(7,10);
226+
char **character = getCharGrid(7, 10);
227227

228228
character[0][0] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[1][1] = character[1][2] = character[1][4] = character[1][5] = character[1][7] = character[1][8] = character[2][0] = character[2][2] = character[2][7] = character[3][0] = character[3][1] = character[3][3] = character[3][6] = character[4][0] = character[4][2] = character[4][4] = character[4][5] = character[4][7] = character[5][0] = character[5][1] = character[5][3] = character[5][6] = character[6][0] = character[6][4] = character[6][5] = ' ';
229229
character[0][1] = character[0][2] = character[0][7] = character[0][8] = character[2][4] = character[2][5] = character[3][4] = character[3][5] = character[6][2] = character[6][7] = '_';
@@ -246,16 +246,18 @@ class Carlos : public Fonts
246246
}
247247
*/
248248

249-
/*
250-
char **J()
251-
{
252-
char **character = getCharGrid(ROWS,COLS);
249+
char **J()
250+
{
251+
char **character = getCharGrid(7, 11);
253252

254-
//Enter the character grid in ROWS X COL
253+
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[0][8] = character[0][9] = character[1][2] = character[1][3] = character[1][4] = character[1][7] = character[1][8] = character[1][9] = character[4][1] = character[4][2] = character[5][3] = character[6][2] = character[6][3] = character[6][4] = '_';
254+
character[1][1] = character[3][4] = character[3][6] = character[5][0] = character[5][2] = '(';
255+
character[1][10] = character[2][5] = character[2][7] = character[4][5] = character[4][7] = ')';
256+
character[5][4] = character[5][6] = character[6][5] = '/';
257+
character[6][1] = '\\';
255258

256-
return character;
257-
}
258-
*/
259+
return character;
260+
}
259261

260262
/*
261263
char **K()
@@ -325,7 +327,7 @@ class Carlos : public Fonts
325327

326328
char **Q()
327329
{
328-
char **character = getCharGrid(8,11);
330+
char **character = getCharGrid(8, 11);
329331

330332
character[0][3] = '_';
331333
character[0][4] = '_';
@@ -372,20 +374,25 @@ class Carlos : public Fonts
372374
return character;
373375
}
374376

375-
/*
377+
376378
char **R()
377379
{
378-
char **character = getCharGrid(ROWS,COLS);
380+
char **character = getCharGrid(7,10);
379381

380-
//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] = '/';
381388

382389
return character;
383390
}
384-
*/
391+
385392

386393
char **S()
387394
{
388-
char **character = getCharGrid(7,9);
395+
char **character = getCharGrid(7, 9);
389396

390397
// Enter the character grid in ROWS X COL
391398
character[0][3] = '_';
@@ -474,7 +481,7 @@ class Carlos : public Fonts
474481

475482
char **X()
476483
{
477-
char **character = getCharGrid(7,11);
484+
char **character = getCharGrid(7, 11);
478485

479486
// Enter the character grid in ROWS X COL
480487
character[0][0] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[0][8] = character[1][2] = character[1][4] = character[1][5] = character[1][7] = character[1][8] = character[2][0] = character[2][2] = character[2][7] = character[3][0] = character[3][1] = character[3][3] = character[3][6] = character[4][0] = character[4][2] = character[4][4] = character[4][5] = character[4][7] = character[5][0] = character[5][1] = character[5][3] = character[5][6] = character[6][0] = character[6][4] = character[6][5] = ' ';
@@ -500,7 +507,7 @@ class Carlos : public Fonts
500507

501508
char **Z()
502509
{
503-
char **character = getCharGrid(7,10);
510+
char **character = getCharGrid(7, 10);
504511
character[0][8] = '_';
505512
character[0][2] = '_';
506513
character[0][3] = '_';
@@ -568,7 +575,7 @@ class Carlos : public Fonts
568575

569576
char **a()
570577
{
571-
char **character = getCharGrid(7,10);
578+
char **character = getCharGrid(7, 10);
572579

573580
character[0][3] = character[0][4] = character[0][5] = character[0][6] = '_';
574581
character[1][2] = '(';
@@ -888,7 +895,7 @@ class Carlos : public Fonts
888895
// Numbers
889896
char **zero()
890897
{
891-
char **character = getCharGrid(7,8);
898+
char **character = getCharGrid(7, 8);
892899

893900
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[1][4] = character[5][3] = character[5][4] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = '_';
894901
character[2][0] = character[2][2] = character[3][0] = character[3][2] = character[4][0] = character[4][2] = character[5][0] = character[5][2] = '(';
@@ -897,20 +904,18 @@ class Carlos : public Fonts
897904
character[1][6] = character[6][1] = '\\';
898905
return character;
899906
}
900-
901-
char **one()
902-
{
903-
char **character = getCharGrid(7,7);
904907

905-
character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[3][1] = character[6][4] = character[6][5] = '_';
906-
character[1][2] = character[2][1] = character[3][0] = character[1][6] = character[2][3] = character[3][2] = character[6][3] = '/';
907-
character[6][6] = '\\';
908-
character[2][4] = character[4][4] = character[2][6] = character[4][6] = ')';
909-
character[3][3] = character[5][3] = character[3][5] = character[5][5] = '(';
910-
return character;
911-
}
908+
char **one()
909+
{
910+
char **character = getCharGrid(7, 7);
912911

913-
912+
character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[3][1] = character[6][4] = character[6][5] = '_';
913+
character[1][2] = character[2][1] = character[3][0] = character[1][6] = character[2][3] = character[3][2] = character[6][3] = '/';
914+
character[6][6] = '\\';
915+
character[2][4] = character[4][4] = character[2][6] = character[4][6] = ')';
916+
character[3][3] = character[5][3] = character[3][5] = character[5][5] = '(';
917+
return character;
918+
}
914919

915920
/*
916921
char **two()

0 commit comments

Comments
 (0)