Skip to content

Commit c6408cc

Browse files
authored
Merge branch 'main' into main
2 parents e5bc9b7 + 13ade95 commit c6408cc

File tree

5 files changed

+206
-174
lines changed

5 files changed

+206
-174
lines changed

Fonts/Straight/straight.h

Lines changed: 66 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,16 @@ class Straight : public Fonts
160160
return character;
161161
}
162162

163-
char **M()
164-
{
165-
char **character = getCharGrid(2,4);
163+
char **M()
164+
{
165+
char **character = getCharGrid(2, 4);
166166

167-
character[0][0] = character[1][0] = character[0][3] = character[1][3] = '|';
168-
character[0][1] = '\\';
169-
character[0][2] = '/';
167+
character[0][0] = character[1][0] = character[0][3] = character[1][3] = '|';
168+
character[0][1] = '\\';
169+
character[0][2] = '/';
170170

171-
return character;
172-
}
171+
return character;
172+
}
173173

174174
char **N()
175175
{
@@ -187,16 +187,14 @@ class Straight : public Fonts
187187
return character;
188188
}
189189

190-
191-
char **O()
192-
{
193-
char **character = getCharGrid(3,4);
194-
character[0][1] = character[0][2] = character[2][1] = character[2][2] = '_';
195-
character[1][0] = character[2][3] = '/';
196-
character[2][0] = character[1][3] = '\\';
197-
return character;
198-
}
199-
190+
char **O()
191+
{
192+
char **character = getCharGrid(3, 4);
193+
character[0][1] = character[0][2] = character[2][1] = character[2][2] = '_';
194+
character[1][0] = character[2][3] = '/';
195+
character[2][0] = character[1][3] = '\\';
196+
return character;
197+
}
200198

201199
/*
202200
char **P()
@@ -541,18 +539,15 @@ class Straight : public Fonts
541539
542540
*/
543541

544-
545-
char **t()
546-
{
547-
char **character = getCharGrid(3,3);
548-
549-
character[1][0]=character[2][0]='|';
550-
character[1][1]=character[2][1]='_';
542+
char **t()
543+
{
544+
char **character = getCharGrid(3, 3);
551545

552-
return character;
553-
}
546+
character[1][0] = character[2][0] = '|';
547+
character[1][1] = character[2][1] = '_';
554548

555-
549+
return character;
550+
}
556551

557552
char **u()
558553
{
@@ -649,17 +644,17 @@ class Straight : public Fonts
649644
return character;
650645
}
651646

652-
/*
653-
char **two()
654-
{
655-
char **character = getCharGrid(ROWS,COLS);
656-
657-
//Enter the character grid in ROWS X COLS
647+
char **two()
648+
{
649+
char **character = getCharGrid(3, 4);
658650

659-
return character;
660-
}
651+
// Enter the character grid in ROWS X COLS
652+
character[0][1] = character[0][2] = character[2][2] = character[2][3] = character[1][2] = '_';
653+
character[1][3] = ')';
654+
character[2][1] = '/';
661655

662-
*/
656+
return character;
657+
}
663658

664659
/*
665660
char **three()
@@ -673,17 +668,15 @@ class Straight : public Fonts
673668
674669
*/
675670

676-
/*
677-
char **four()
678-
{
679-
char **character = getCharGrid(ROWS,COLS);
680-
681-
//Enter the character grid in ROWS X COLS
682-
683-
return character;
684-
}
671+
char **four()
672+
{
673+
char **character = getCharGrid(3, 4);
674+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = ' ';
675+
character[1][1] = character[1][2] = '_';
676+
character[1][0] = character[1][3] = character[2][3] = '|';
685677

686-
*/
678+
return character;
679+
}
687680

688681
/*
689682
char **five()
@@ -697,17 +690,17 @@ class Straight : public Fonts
697690
698691
*/
699692

700-
/*
701-
char **six()
702-
{
703-
char **character = getCharGrid(ROWS,COLS);
704-
705-
//Enter the character grid in ROWS X COLS
693+
char **six()
694+
{
695+
char **character = getCharGrid(3, 4);
706696

707-
return character;
708-
}
697+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
698+
character[1][0] = '/';
699+
character[2][0] = '\\';
700+
character[2][3] = ')';
709701

710-
*/
702+
return character;
703+
}
711704

712705
/*
713706
char **seven()
@@ -721,31 +714,27 @@ class Straight : public Fonts
721714
722715
*/
723716

724-
/*
725-
char **eight()
726-
{
727-
char **character = getCharGrid(ROWS,COLS);
728-
729-
//Enter the character grid in ROWS X COLS
730-
731-
return character;
732-
}
717+
char **eight()
718+
{
719+
char **character = getCharGrid(3, 4);
733720

734-
*/
721+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
722+
character[1][0] = character[2][0] = '(';
723+
character[1][3] = character[2][3] = ')';
735724

736-
737-
char **nine()
738-
{
739-
char **character = getCharGrid(3,4);
725+
return character;
726+
}
740727

741-
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
742-
character[1][0] = '(';
743-
character[2][3] = '/';
744-
character[1][3] = '\\';
728+
char **nine()
729+
{
730+
char **character = getCharGrid(3, 4);
745731

746-
return character;
747-
}
732+
character[0][1] = character[0][2] = character[1][1] = character[1][2] = character[2][1] = character[2][2] = '_';
733+
character[1][0] = '(';
734+
character[2][3] = '/';
735+
character[1][3] = '\\';
748736

749-
737+
return character;
738+
}
750739
};
751740
#endif

0 commit comments

Comments
 (0)