Skip to content

Commit 8e11c8b

Browse files
AnshumanMahatoAnshumanMahato
authored
Merge branch 'main' into main
2 parents 4e7d463 + c2ca0bf commit 8e11c8b

File tree

3 files changed

+52
-43
lines changed

3 files changed

+52
-43
lines changed

‎Fonts/Straight/straight.h

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

177-
/*
177+
178178
char **O()
179179
{
180-
char **character = getCharGrid(ROWS,COLS);
181-
182-
//Enter the character grid in ROWS X COLS
183-
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] = '\\';
184184
return character;
185185
}
186-
*/
186+
187187

188188
/*
189189
char **P()

‎Fonts/starwar/starwar.h

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,25 @@ class Starwar : public Fonts
8484

8585
char **F()
8686
{
87-
char **character = getCharGrid(ROWS, COLS);
87+
char **character = getCharGrid();
8888

8989
// Enter the character grid in ROWS X COLS
9090
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[1][4] = character[1][5] = character[1][6] = character[1][7] = character[2][4] = character[2][5] = character[3][4] = character[3][5] = character[5][1] = character[5][2] = '_';
9191
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[2][3] = character[4][3] = character[5][3] = character[1][8] = character[3][6] = '|';
9292
return character;
9393
}
9494

95-
/*
96-
char **G()
97-
{
98-
char **character = getCharGrid(ROWS,COLS);
95+
char **G()
96+
{
97+
char **character = getCharGrid(6,10);
9998

100-
//Enter the character grid in ROWS X COLS
99+
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[0][8] = character[1][4] = character[1][5] = character[1][6] = character[1][7] = character[1][8] = character[2][6] = character[2][7] = character[3][6] = character[4][4] = character[4][5] = character[5][2] = character[5][3] = character[5][4] = character[5][5] = character[5][6] = character[5][7] = '_';
100+
character[1][1] = '/';
101+
character[5][1] = '\\';
102+
character[1][9] = character[2][0] = character[2][3] = character[3][0] = character[3][3] = character[3][5] = character[3][8] = character[4][0] = character[4][3] = character[4][6] = character[4][8] = character[5][8] = '|';
101103

102-
return character;
103-
}
104-
*/
104+
return character;
105+
}
105106

106107
char **H()
107108
{
@@ -192,7 +193,7 @@ class Starwar : public Fonts
192193

193194
char **O()
194195
{
195-
char **character = getCharGrid(ROWS, COLS);
196+
char **character = getCharGrid();
196197

197198
// Enter the character grid in ROWS X COLS
198199
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] = '_';
@@ -357,16 +358,18 @@ class Starwar : public Fonts
357358

358359
// Lowercase
359360

360-
/*
361-
char **a()
362-
{
363-
char **character = getCharGrid(ROWS,COLS);
364361

365-
//Enter the character grid in ROWS X COLS
362+
char **a()
363+
{
364+
char **character = getCharGrid(6,13);
366365

367-
return character;
368-
}
369-
*/
366+
character[5][0] = character[4][1] = character[3][2] = character[2][3] = character[1][4] = character[5][3] = character[3][5] = '/';
367+
character[1][8] = character[2][9] = character[3][10] = character[4][11] = character[5][12] = character[3][7] = character[5][9] = '\\';
368+
character[0][5] = character[0][6] = character[0][7] = character[3][6] = character[4][4] = character[4][5] = character[4][6] = character[4][7] = character[4][8] = character[5][1] = character[5][2] = character[5][10] = character[5][11] = '_';
369+
character[2][6] = '^';
370+
371+
return character;
372+
}
370373

371374
/*
372375
char **b()
@@ -734,17 +737,23 @@ class Starwar : public Fonts
734737
return character;
735738
}
736739

737-
/*
740+
738741
char **six()
739742
{
740-
char **character = getCharGrid(ROWS,COLS);
743+
char **character = getCharGrid(6,7);
741744

742745
//Enter the character grid in ROWS X COLS
743-
746+
character[0][3] = character[0][4] = character[2][4] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[5][4] = '_';
747+
character[1][2] = character[1][4] = character[2][1] = character[2][3] = character[5][5] = '/';
748+
character[3][0] = character[4][0] = character[4][6] = '|';
749+
character[3][5] = character[5][1] = '\\';
750+
character[4][2] = '(';
751+
character[4][4] = ')';
752+
character[3][2] = '.';
744753
return character;
745754
}
746755

747-
*/
756+
748757

749758
char **seven()
750759
{

‎readme.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,17 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
132132
</a>
133133
</td>
134134
<td align="center">
135-
<a href="https://github.com/Rishisihare90">
136-
<img src="https://avatars.githubusercontent.com/u/146431939?v=4" width="70;" alt="Rishisihare90"/>
135+
<a href="https://github.com/Harry121199">
136+
<img src="https://avatars.githubusercontent.com/u/117886160?v=4" width="70;" alt="Harry121199"/>
137137
<br />
138-
<sub><b>Rishisihare90</b></sub>
138+
<sub><b>Harry121199</b></sub>
139139
</a>
140140
</td>
141141
<td align="center">
142-
<a href="https://github.com/Harry121199">
143-
<img src="https://avatars.githubusercontent.com/u/117886160?v=4" width="70;" alt="Harry121199"/>
142+
<a href="https://github.com/Rishisihare90">
143+
<img src="https://avatars.githubusercontent.com/u/146431939?v=4" width="70;" alt="Rishisihare90"/>
144144
<br />
145-
<sub><b>Harry121199</b></sub>
145+
<sub><b>Rishisihare90</b></sub>
146146
</a>
147147
</td>
148148
<td align="center">
@@ -209,14 +209,21 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
209209
<sub><b>itsAbhishekpatel01</b></sub>
210210
</a>
211211
</td>
212+
<td align="center">
213+
<a href="https://github.com/vishalmishraa">
214+
<img src="https://avatars.githubusercontent.com/u/64027486?v=4" width="70;" alt="vishalmishraa"/>
215+
<br />
216+
<sub><b>vishalmishraa</b></sub>
217+
</a>
218+
</td></tr>
219+
<tr>
212220
<td align="center">
213221
<a href="https://github.com/Atul-Xalxo">
214222
<img src="https://avatars.githubusercontent.com/u/144574009?v=4" width="70;" alt="Atul-Xalxo"/>
215223
<br />
216224
<sub><b>Atul-Xalxo</b></sub>
217225
</a>
218-
</td></tr>
219-
<tr>
226+
</td>
220227
<td align="center">
221228
<a href="https://github.com/Priyanshu-kr-gupta">
222229
<img src="https://avatars.githubusercontent.com/u/114975117?v=4" width="70;" alt="Priyanshu-kr-gupta"/>
@@ -231,13 +238,6 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
231238
<sub><b>PranjalKhatri</b></sub>
232239
</a>
233240
</td>
234-
<td align="center">
235-
<a href="https://github.com/vishalmishraa">
236-
<img src="https://avatars.githubusercontent.com/u/64027486?v=4" width="70;" alt="vishalmishraa"/>
237-
<br />
238-
<sub><b>vishalmishraa</b></sub>
239-
</a>
240-
</td>
241241
<td align="center">
242242
<a href="https://github.com/Stunner33">
243243
<img src="https://avatars.githubusercontent.com/u/127297054?v=4" width="70;" alt="Stunner33"/>

0 commit comments

Comments
 (0)