Skip to content

Commit e1944ec

Browse files
committed
Added Letter K to carlos
2 parents b24d651 + 8634bf8 commit e1944ec

File tree

9 files changed

+200
-86
lines changed

9 files changed

+200
-86
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: 46 additions & 26 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
{
@@ -655,17 +667,15 @@ class Straight : public Fonts
655667
656668
*/
657669

658-
/*
659-
char **four()
660-
{
661-
char **character = getCharGrid(ROWS,COLS);
662-
663-
//Enter the character grid in ROWS X COLS
664-
665-
return character;
666-
}
670+
char **four()
671+
{
672+
char **character = getCharGrid(3, 4);
673+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = ' ';
674+
character[1][1] = character[1][2] = '_';
675+
character[1][0] = character[1][3] = character[2][3] = '|';
667676

668-
*/
677+
return character;
678+
}
669679

670680
/*
671681
char **five()
@@ -723,6 +733,16 @@ class Straight : public Fonts
723733
character[2][3] = '/';
724734
character[1][3] = '\\';
725735

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

Fonts/banner/banner.h

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,18 @@ class Banner : public Fonts
116116
return character;
117117
}
118118

119-
/*
119+
120120
char **K()
121121
{
122-
char **character = getCharGrid(ROWS,COLS);
122+
char **character = getCharGrid(7,7);
123123

124124
//Enter the character grid in ROWS X COLS
125+
character[0][0] = character[0][5] = character[1][0] = character[1][4] = character[2][0] = character[2][3] = character[3][0] = character[3][1] = character[3][2] = character[4][0] = character[4][3] = character[5][0] = character[5][4] = character[6][0] = character[6][5] ='#';
125126

126127
return character;
127128
}
128-
*/
129+
130+
129131

130132
char **L()
131133
{
@@ -613,17 +615,21 @@ class Banner : public Fonts
613615
614616
*/
615617

616-
/*
618+
617619
char **three()
618620
{
619-
char **character = getCharGrid(ROWS,COLS);
621+
char **character = getCharGrid(7,7);
620622

621623
//Enter the character grid in ROWS X COLS
624+
character[0][1]=character[0][2]=character[0][3]=character[0][4]=character[0][5]=character[1][0]=character[1][6]='#';
625+
character[2][6]=character[3][1]=character[3][2]=character[3][3]=character[3][4]=character[3][5]=character[4][6]='#';
626+
character[5][0]=character[6][1]=character[5][6]=character[6][2]=character[6][3]=character[6][4]=character[6][5]='#';
627+
622628

623629
return character;
624630
}
625631

626-
*/
632+
627633

628634
char **four()
629635
{
@@ -658,17 +664,16 @@ class Banner : public Fonts
658664
659665
*/
660666

661-
/*
667+
662668
char **seven()
663669
{
664-
char **character = getCharGrid(ROWS,COLS);
665-
666-
//Enter the character grid in ROWS X COLS
667-
670+
char **character = getCharGrid(7,7);
671+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] =character[1][0] =character[1][5] =character[2][4] =character[3][3] =character[4][2] =character[5][2] =character[6][2] ='#';
672+
character[1][1] = character[1][2] = character[1][3] = character[1][4] =character[2][0] =character[2][1] =character[2][2] =character[2][3] =character[2][5] =character[2][6] =character[3][0] =character[3][1] =character[3][2] =character[3][4] =character[3][5] =character[3][6] =character[4][0] =character[4][1] =character[4][3] =character[4][4] =character[4][5] =character[4][6] =character[5][0] =character[5][1] =character[5][3] =character[5][4] =character[5][5] =character[5][6] =character[6][0] =character[6][1] =character[6][3] =character[6][4] =character[6][5] =character[6][6] = ' ';
668673
return character;
669674
}
670675

671-
*/
676+
672677

673678
char **eight()
674679
{
@@ -682,16 +687,29 @@ class Banner : public Fonts
682687
return character;
683688
}
684689

685-
/*
690+
686691
char **nine()
687692
{
688-
char **character = getCharGrid(ROWS,COLS);
693+
char **character = getCharGrid(7,7);
689694

690695
//Enter the character grid in ROWS X COLS
696+
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][0] = character[1][6] = character[2][0] = character[2][6] = character[3][1] = character[3][2] =character[3][3] =character[3][4] =character[3][5] =character[3][6] =character[4][6] =character[5][0] =character[5][6] =character[6][1] =character[6][2] =character[6][3] =character[6][4] =character[6][5] =character[6][6] = '#';
697+
698+
character[0][0] = character[0][6] = character[1][1] = character[1][2] = character[1][3] = character[1][4] = character[1][5] = character[2][1] = character[2][2] = character[2][3] = character[2][4] =character[2][5] =character[3][0] =character[4][0] =character[4][1] =character[4][2] =character[4][3] =character[4][4] =character[4][5] =character[5][1] =character[5][2] =character[5][3] =character[5][4] =character[5][5] =character[6][0] =character[6][5] = ' ';
699+
691700

692701
return character;
693702
}
694703

695-
*/
704+
// for space
705+
char **space()
706+
{
707+
char **character = getCharGrid(1,1);
708+
709+
character[0][0] = ' ';
710+
711+
return character;
712+
}
713+
696714
};
697715
#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: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,17 +712,23 @@ class Starwar : public Fonts
712712
return character;
713713
}
714714

715-
/*
715+
716716
char **three()
717717
{
718-
char **character = getCharGrid(ROWS,COLS);
718+
char **character = getCharGrid(6,7);
719719

720720
//Enter the character grid in ROWS X COLS
721+
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[1][1] = character[1][2] = character[1][3] = character[2][2] = character[2][3] = character[3][2] = character[3][3] = character[4][1] = character[4][2] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = '_';
722+
character[1][0] = character[3][1] = character[5][0] = character[2][6] = character[4][6] = '|';
723+
character[2][4] = character[4][4] = ')';
724+
character[3][5] = '<';
725+
character[1][5] = '\\';
726+
character[5][5] = '/';
721727

722728
return character;
723729
}
724730

725-
*/
731+
726732

727733
char **four()
728734
{
@@ -799,5 +805,15 @@ class Starwar : public Fonts
799805
character[2][0] = character[2][6] = character[3][6] = '|';
800806
return character;
801807
}
808+
809+
// for space
810+
char **space()
811+
{
812+
char **character = getCharGrid(1,1);
813+
814+
character[0][0] = ' ';
815+
816+
return character;
817+
}
802818
};
803819
#endif

0 commit comments

Comments
 (0)