Skip to content

Commit ca0cc3b

Browse files
AnshumanMahatoAnshumanMahato
committed
conflict
2 parents 18f431e + f3615b3 commit ca0cc3b

File tree

6 files changed

+124
-51
lines changed

6 files changed

+124
-51
lines changed

‎Fonts/Straight/straight.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,17 +507,18 @@ char **Z()
507507
508508
*/
509509

510-
/*
510+
511511
char **p()
512512
{
513513
char **character = getCharGrid();
514514

515-
//Enter the character grid in ROWS X COLS
516-
515+
character[1][0]=character[2][0]='|';
516+
character[0][1]=character[1][1]='_';
517+
character[1][2]=')';
517518
return character;
518519
}
519520

520-
*/
521+
521522

522523
/*
523524
char **q()

‎Fonts/banner/banner.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,16 @@ class Banner : public Fonts
263263
}
264264
*/
265265

266-
/*
266+
267267
char **W()
268268
{
269269
char **character = getCharGrid();
270270

271-
//Enter the character grid in ROWS X COLS
271+
character[0][0] = character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[0][6] = character[1][6] = character[2][6] = character[3][6] = character[4][6] = character[5][6] = character[1][3] = character[2][3] = character[3][3] = character[4][3] = character[5][3] = character[6][1] = character[6][2] = character[6][4] = character[6][5] = '#';
272272

273273
return character;
274274
}
275-
*/
275+
276276

277277
/*
278278
char **X()
@@ -285,27 +285,27 @@ class Banner : public Fonts
285285
}
286286
*/
287287

288-
/*
288+
289289
char **Y()
290290
{
291291
char **character = getCharGrid();
292292

293-
//Enter the character grid in ROWS X COLS
293+
character[3][3] = character[4][3] = character[5][3] = character[6][3] = character[0][0] = character[0][6] = character[1][1] = character[1][5] = character[2][2] = character[2][4] = '#';
294294

295295
return character;
296296
}
297-
*/
297+
298298

299-
/*
299+
300300
char **Z()
301301
{
302302
char **character = getCharGrid();
303303

304-
//Enter the character grid in ROWS X COLS
304+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[6][0] = character[6][1] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = character[0][3] = character[1][5] = character[2][4] = character[3][3] = character[4][2] = character[5][1] = '#';
305305

306306
return character;
307307
}
308-
*/
308+
309309

310310
// Lowercase
311311

‎Fonts/carlos/carlos.h

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,16 +364,50 @@ class Carlos : public Fonts
364364
}
365365
*/
366366

367-
/*
368-
char **S()
367+
char **S()
369368
{
370369
char **character = getCharGrid();
371370

372-
//Enter the character grid in ROWS X COL
371+
//Enter the character grid in ROWS X COL
372+
character[0][3] = '_';
373+
character[0][4] = '_';
374+
character[0][5] = '_';
375+
character[0][6] = '_';
376+
character[0][7] = ' ';
377+
character[1][1] = '/';
378+
character[1][3] = '_';
379+
character[1][4] = '_';
380+
character[1][5] = '_';
381+
character[1][6] = '_';
382+
character[1][7] = '\\';
383+
character[2][0] = '(';
384+
character[2][1] = ' ';
385+
character[2][2] = '(';
386+
character[2][3] = '_';
387+
character[2][4] = '_';
388+
character[2][5] = '_';
389+
character[3][1] = '\\';
390+
character[3][2] = '_';
391+
character[3][3] = '_';
392+
character[3][4] = '_';
393+
character[3][5] = '_';
394+
character[3][7] = '\\';
395+
character[4][6] = ')';
396+
character[4][8] = ')';
397+
character[5][4] = '_';
398+
character[5][3] = '_';
399+
character[5][2] = '_';
400+
character[5][5] = '/';
401+
character[5][7] = '/';
402+
character[6][1] = '/';
403+
character[6][2] = '_';
404+
character[6][3] = '_';
405+
character[6][4] = '_';
406+
character[6][5] = '_';
407+
character[6][6] = '/';
373408

374409
return character;
375410
}
376-
*/
377411

378412
/*
379413
char **T()

‎Fonts/starwar/starwar.h

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,18 @@ class Starwar : public Fonts
267267
}
268268
*/
269269

270-
/*
271-
char **T()
270+
char **T()
272271
{
273272
char **character = getCharGrid();
274273

275274
//Enter the character grid in ROWS X COLS
276-
275+
character[0][1] = 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[0][10] = character[0][11] = character[2][1] = character[2][2] = character[2][3] = character[2][8] = character[2][9] = character[2][10] = character[2][11] =character[5][5] =character[5][6] ='-';
276+
character[0][0] = character[0][12] = '.';
277+
character[2][0] = character[2][12] = '`';
278+
character[1][0] = character[1][12] = character[2][4] = character[2][7] = character[3][4] = character[3][7] = character[4][4] = character[4][7] = character[5][4] = character[5][7] = '|';
277279
return character;
278280
}
279-
*/
281+
280282

281283

282284
char **U()
@@ -295,16 +297,20 @@ class Starwar : public Fonts
295297
}
296298

297299

298-
/*
300+
299301
char **V()
300302
{
301303
char **character = getCharGrid();
302304

303305
//Enter the character grid in ROWS X COLS
306+
307+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][8] = character[0][9] = character[0][10] = character[0][11] = character[5][5] = character[5][6] = '_';
308+
character[1][0] = character[2][1] = character[3][2] = character[4][3] = character[5][4] = character[1][4] = character[2][5] = '\\';
309+
character[1][11] = character[2][10] = character[3][9] = character[4][8] = character[5][7] = character[1][7] = character[2][6] = '/';
304310

305311
return character;
306312
}
307-
*/
313+
308314

309315
/*
310316
char **W()
@@ -690,17 +696,20 @@ class Starwar : public Fonts
690696

691697

692698

693-
/*
699+
700+
694701
char **two()
695702
{
696703
char **character = getCharGrid();
697-
698704
//Enter the character grid in ROWS X COLS
699-
705+
character[0][1] = character[0][2] = character[0][3] = character[1][1] = character[1][2] = character[4][4] = character[5][1] = character [5][2] = character [5][3] = character [5][4] = '_';
706+
character[1][4] = '\\';
707+
character[3][2] = character[3][4] = character[4][1] = character[4][3] = '/';
708+
character[2][3] = ')';
709+
character[1][0] = character[2][5] = character[5][0] = character[5][5] = '|';
700710
return character;
701711
}
702712

703-
*/
704713

705714
/*
706715
char **three()

‎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("k");
9+
a.print("p");
1010
return 0;
1111
}

‎readme.md

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,28 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
110110
<sub><b>Neeraj Sharma</b></sub>
111111
</a>
112112
</td>
113+
<td align="center">
114+
<a href="https://github.com/alucard017">
115+
<img src="https://avatars.githubusercontent.com/u/76940364?v=4" width="70;" alt="alucard017"/>
116+
<br />
117+
<sub><b>Apurba Sundar Nayak</b></sub>
118+
</a>
119+
</td>
113120
<td align="center">
114121
<a href="https://github.com/komal7141">
115122
<img src="https://avatars.githubusercontent.com/u/75818108?v=4" width="70;" alt="komal7141"/>
116123
<br />
117124
<sub><b>Komal Sharma</b></sub>
118125
</a>
119126
</td>
127+
<td align="center">
128+
<a href="https://github.com/XARTAN21">
129+
<img src="https://avatars.githubusercontent.com/u/124522194?v=4" width="70;" alt="XARTAN21"/>
130+
<br />
131+
<sub><b>Ayush Deshmukh</b></sub>
132+
</a>
133+
</td></tr>
134+
<tr>
120135
<td align="center">
121136
<a href="https://github.com/AlexWeb07">
122137
<img src="https://avatars.githubusercontent.com/u/93365089?v=4" width="70;" alt="AlexWeb07"/>
@@ -130,14 +145,6 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
130145
<br />
131146
<sub><b>Gulshan</b></sub>
132147
</a>
133-
</td></tr>
134-
<tr>
135-
<td align="center">
136-
<a href="https://github.com/alucard017">
137-
<img src="https://avatars.githubusercontent.com/u/76940364?v=4" width="70;" alt="alucard017"/>
138-
<br />
139-
<sub><b>Apurba Sundar Nayak</b></sub>
140-
</a>
141148
</td>
142149
<td align="center">
143150
<a href="https://github.com/vishallmaurya">
@@ -166,15 +173,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
166173
<br />
167174
<sub><b>Null</b></sub>
168175
</a>
169-
</td>
176+
</td></tr>
177+
<tr>
170178
<td align="center">
171179
<a href="https://github.com/Priyanshu-kr-gupta">
172180
<img src="https://avatars.githubusercontent.com/u/114975117?v=4" width="70;" alt="Priyanshu-kr-gupta"/>
173181
<br />
174182
<sub><b>Priyanshu Kumar</b></sub>
175183
</a>
176-
</td></tr>
177-
<tr>
184+
</td>
178185
<td align="center">
179186
<a href="https://github.com/PranjalKhatri">
180187
<img src="https://avatars.githubusercontent.com/u/68675142?v=4" width="70;" alt="PranjalKhatri"/>
@@ -196,13 +203,21 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
196203
<sub><b>Null</b></sub>
197204
</a>
198205
</td>
206+
<td align="center">
207+
<a href="https://github.com/miragearush">
208+
<img src="https://avatars.githubusercontent.com/u/80736891?v=4" width="70;" alt="miragearush"/>
209+
<br />
210+
<sub><b>Arush Kumar</b></sub>
211+
</a>
212+
</td>
199213
<td align="center">
200214
<a href="https://github.com/som02esh">
201215
<img src="https://avatars.githubusercontent.com/u/106095040?v=4" width="70;" alt="som02esh"/>
202216
<br />
203217
<sub><b>Null</b></sub>
204218
</a>
205-
</td>
219+
</td></tr>
220+
<tr>
206221
<td align="center">
207222
<a href="https://github.com/akashKumar06">
208223
<img src="https://avatars.githubusercontent.com/u/117292434?v=4" width="70;" alt="akashKumar06"/>
@@ -216,8 +231,7 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
216231
<br />
217232
<sub><b>Ankit Kujur</b></sub>
218233
</a>
219-
</td></tr>
220-
<tr>
234+
</td>
221235
<td align="center">
222236
<a href="https://github.com/gourshabrg">
223237
<img src="https://avatars.githubusercontent.com/u/143959353?v=4" width="70;" alt="gourshabrg"/>
@@ -254,21 +268,35 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
254268
<sub><b>Ahmad Kaif</b></sub>
255269
</a>
256270
</td>
271+
<td align="center">
272+
<a href="https://github.com/Raghav354">
273+
<img src="https://avatars.githubusercontent.com/u/137503421?v=4" width="70;" alt="Raghav354"/>
274+
<br />
275+
<sub><b>Raghavendra Sharma</b></sub>
276+
</a>
277+
</td>
257278
<td align="center">
258279
<a href="https://github.com/AmitRajput1772">
259280
<img src="https://avatars.githubusercontent.com/u/123803673?v=4" width="70;" alt="AmitRajput1772"/>
260281
<br />
261282
<sub><b>Amit Rajput</b></sub>
262283
</a>
284+
</td></tr>
285+
<tr>
286+
<td align="center">
287+
<a href="https://github.com/avi-dey">
288+
<img src="https://avatars.githubusercontent.com/u/97702087?v=4" width="70;" alt="avi-dey"/>
289+
<br />
290+
<sub><b>Avijit Dey</b></sub>
291+
</a>
263292
</td>
264293
<td align="center">
265294
<a href="https://github.com/FreemRL">
266295
<img src="https://avatars.githubusercontent.com/u/66525499?v=4" width="70;" alt="FreemRL"/>
267296
<br />
268297
<sub><b>Jannik Schmidtke</b></sub>
269298
</a>
270-
</td></tr>
271-
<tr>
299+
</td>
272300
<td align="center">
273301
<a href="https://github.com/Arif20484423">
274302
<img src="https://avatars.githubusercontent.com/u/76733190?v=4" width="70;" alt="Arif20484423"/>
@@ -285,10 +313,10 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
285313
</a>
286314
</td>
287315
<td align="center">
288-
<a href="https://github.com/miragearush">
289-
<img src="https://avatars.githubusercontent.com/u/80736891?v=4" width="70;" alt="miragearush"/>
316+
<a href="https://github.com/chengm405">
317+
<img src="https://avatars.githubusercontent.com/u/146371159?v=4" width="70;" alt="chengm405"/>
290318
<br />
291-
<sub><b>Arush Kumar</b></sub>
319+
<sub><b>Null</b></sub>
292320
</a>
293321
</td>
294322
<td align="center">
@@ -297,7 +325,8 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
297325
<br />
298326
<sub><b>Bidyasagar Mohapatra</b></sub>
299327
</a>
300-
</td>
328+
</td></tr>
329+
<tr>
301330
<td align="center">
302331
<a href="https://github.com/Divyanshu723">
303332
<img src="https://avatars.githubusercontent.com/u/112752057?v=4" width="70;" alt="Divyanshu723"/>
@@ -311,8 +340,7 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
311340
<br />
312341
<sub><b>Null</b></sub>
313342
</a>
314-
</td></tr>
315-
<tr>
343+
</td>
316344
<td align="center">
317345
<a href="https://github.com/prajjawal007">
318346
<img src="https://avatars.githubusercontent.com/u/144593090?v=4" width="70;" alt="prajjawal007"/>
@@ -340,7 +368,8 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
340368
<br />
341369
<sub><b>Abhishek Kumar Yadav</b></sub>
342370
</a>
343-
</td>
371+
</td></tr>
372+
<tr>
344373
<td align="center">
345374
<a href="https://github.com/pronajit">
346375
<img src="https://avatars.githubusercontent.com/u/98771979?v=4" width="70;" alt="pronajit"/>

0 commit comments

Comments
 (0)