Skip to content

Commit 8ff2baf

Browse files
yihleegoyihleego
authored
Merge pull request #6 from yihleego/2.0.x
[Fix] Incorrect rendering (#5)
2 parents d3a93d9 + c1ebb75 commit 8ff2baf

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ Being free software, FIGlet is commonly included as part of many Unix-like opera
1717
<dependency>
1818
<groupId>io.leego</groupId>
1919
<artifactId>banana</artifactId>
20-
<version>2.0.0</version>
20+
<version>2.0.1</version>
2121
</dependency>
2222
```
2323

2424
### Gradle
2525

2626
```xml
27-
implementation 'io.leego:banana:2.0.0'
27+
implementation 'io.leego:banana:2.0.1'
2828
```
2929

3030
## Usage

‎docs/FONTS.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ BananaUtils.bananaify("Hello, World!", Font.DEF_LEPPARD);
13651365
E#t E#t ,WW; .K#D .K#D f#D#; ; E###; L###j f#D#; E#f,t#Wi,,, .K#D E#tiW#G. i#W.
13661366
f#t f#t .D#; .W#G .W#G G#t t#i E#K: L#W; G#t E#t ;#W: .W#G E#K##i ,i.
13671367
ii ii tt :W##########Wt :W##########Wt t .W. EG LE. t DWi ,KK: :W##########Wt E##D. :G#:
1368-
:,,,,,,,,,,,,,.:,,,,,,,,,,,,,. : ; ; :,,,,,,,,,,,,,.E#t iKt
1368+
:,,,,,,,,,,,,,.:,,,,,,,,,,,,,. : ; ;@ :,,,,,,,,,,,,,.E#t iKt
13691369
L:
13701370
```
13711371

@@ -1803,23 +1803,23 @@ BananaUtils.bananaify("Hello, World!", Font.FOUR_TOPS);
18031803
Fraktur
18041804

18051805
```java
1806-
BananaUtils.bananaify("Hello, World!", Font.FRAKTUR);
1806+
BananaUtils.bananaify("Hello, World!",Font.FRAKTUR);
18071807
```
18081808

18091809
```
18101810
.. .. ... . ... .. .. ..
18111811
.xHL x .d88" x .d88" .~`"888x.!**h.-``888h. x .d88" dF 888B.
18121812
.-`8888hxxx~ 5888R 5888R u. dX `8888 :X 48888> u. .u . 5888R '88bu. 48888E
1813-
.H8X `888*" .u '888R '888R ...ue888b '888x 8888 X88. '8888> ...ue888b .d88B :@8c '888R '*88888bu '8888'
1813+
.H8X `%888*" .u '888R '888R ...ue888b '888x 8888 X88. '8888> ...ue888b .d88B :@8c '888R '*88888bu '8888'
18141814
888X ..x.. ud8888. 888R 888R 888R Y888r '88888 8888X:8888: )?""` 888R Y888r ="8888f8888r 888R ^"*8888N Y88F
18151815
'8888k .x8888888x :888'8888. 888R 888R 888R I888> `8888>8888 '88888>.88h. 888R I888> 4888>'88" 888R beWE "888L '88
1816-
?8888X "88888X d888 '88" 888R 888R 888R I888> `8" 888f `8888>X88888. 888R I888> 4888> ' 888R 888E 888E 8F
1817-
?8888X '88888> 8888.+" 888R 888R 888R I888> -~` '8" 88" `88888X 888R I888> 4888> 888R 888E 888E 4
1818-
H8H 8888 `8888> 8888L 888R 888R u8888cJ888 . .H888n. XHn. `*88! u8888cJ888 .d888L .+ 888R 888E 888F .
1816+
?8888X "88888X d888 '88%" 888R 888R 888R I888> `8" 888f `8888>X88888. 888R I888> 4888> ' 888R 888E 888E 8F
1817+
?8888X '88888> 8888.+" 888R 888R 888R I888> -~` '8%" 88" `88888X 888R I888> 4888> 888R 888E 888E 4
1818+
H8H %8888 `8888> 8888L 888R 888R u8888cJ888 . .H888n. XHn. `*88! u8888cJ888 .d888L .+ 888R 888E 888F .
18191819
'888> 888" 8888 '8888c. .+ .888B . .888B . "*888*P" z8k :88888888x..x88888X. `! "*888*P" ^"8888*" .888B . .888N..888 u8N.
1820-
"8` .8" .. 88* "88888 ^*888 ^*888 'Y" 888*" f ^888888 `*88888nx" 'Y" "Y" ^*888 `"888*"" "*88
1821-
` x8888h. d*" "YP' " " ?8F `"**"` `"**"" " "" ""
1822-
!""*888~ .8
1820+
"8` .8" .. 88* "88888% ^*888% ^*888% 'Y" %888*" f ^%888888% `*88888nx" 'Y" "Y" ^*888% `"888*"" "*88%
1821+
` x8888h. d*" "YP' "% "% ?8F `"**"` `"**"" "% "" ""
1822+
!""*888%~ .8
18231823
! `" . d"
18241824
'-....:~ ~
18251825
```
@@ -3178,17 +3178,17 @@ BananaUtils.bananaify("Hello, World!", Font.PEPPER);
31783178
Poison
31793179

31803180
```java
3181-
BananaUtils.bananaify("Hello, World!", Font.POISON);
3181+
BananaUtils.bananaify("Hello, World!",Font.POISON);
31823182
```
31833183

31843184
```
31853185
3186-
3187-
3188-
! ! ! ! ! ! ! ! ! ! ! ! !
3189-
!! ! !! !! !! !! ! !! !! !! !! ! !! ! !! !! ! !
3190-
!!!! !!!:! !! !! ! !! !! !! ! ! !! !!!! !! ! !! !
3191-
!!!!!!! !!!!!: !!! !!! !! !!! !! !!! !! !! !!! !!!! !!! !! !!! !!!
3186+
@@@ @@@ @@@@@@@@ @@@ @@@ @@@@@@ @@@ @@@ @@@ @@@@@@ @@@@@@@ @@@ @@@@@@@ @@@
3187+
@@@ @@@ @@@@@@@@ @@@ @@@ @@@@@@@@ @@@ @@@ @@@ @@@@@@@@ @@@@@@@@ @@@ @@@@@@@@ @@@
3188+
@@! @@@ @@! @@! @@! @@! @@@ @@! @@! @@! @@! @@@ @@! @@@ @@! @@! @@@ @@!
3189+
!@! @!@ !@! !@! !@! !@! @!@ !@! !@! !@! !@! @!@ !@! @!@ !@! !@! @!@ !@
3190+
@!@!@!@! @!!!:! @!! @!! @!@ !@! @!! !!@ @!@ @!@ !@! @!@!!@! @!! @!@ !@! @!@
3191+
!!!@!!!! !!!!!: !!! !!! !@! !!! !@! !!! !@! !@! !!! !!@!@! !!! !@! !!! !!!
31923192
!!: !!! !!: !!: !!: !!: !!! !!: !!: !!: !!: !!! !!: :!! !!: !!: !!!
31933193
:!: !:! :!: :!: :!: :!: !:! :!: :!: :!: :!: :!: !:! :!: !:! :!: :!: !:! :!:
31943194
:: ::: :: :::: :: :::: :: :::: ::::: :: :: :::: :: ::: ::::: :: :: ::: :: :::: :::: :: ::
@@ -3653,14 +3653,14 @@ BananaUtils.bananaify("Hello, World!", Font.SMALL_KEYBOARD);
36533653
Small Poison
36543654

36553655
```java
3656-
BananaUtils.bananaify("Hello, World!", Font.SMALL_POISON);
3656+
BananaUtils.bananaify("Hello, World!",Font.SMALL_POISON);
36573657
```
36583658

36593659
```
36603660
3661-
3662-
! ! ! ! ! ! ! ! ! ! ! !
3663-
!!!! !!!:! !! !! ! !! !! !! ! ! !! !!!! !! ! !! !!
3661+
@@@ @@@ @@@@@@@@ @@@ @@@ @@@@@@ @@@ @@@ @@@ @@@@@@ @@@@@@@ @@@ @@@@@@@ @@@
3662+
@@! @@@ @@! @@! @@! @@! @@@ @@! @@! @@! @@! @@@ @@! @@@ @@! @@! @@@ @@@
3663+
@!@!@!@! @!!!:! @!! @!! @!@ !@! @!! !!@ @!@ @!@ !@! @!@!!@! @!! @!@ !@! !@!
36643664
!!: !!! !!: !!: !!: !!: !!! !:! !: !!: !! !!: !!! !!: :!! !!: !!: !!!
36653665
: : : : :: :: : ::.: : : ::.: : : :. : :: ::.: ::: : :. : : : : : ::.: : :: : : :.:
36663666
:

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<groupId>io.leego</groupId>
1010
<artifactId>banana</artifactId>
11-
<version>2.0.0</version>
11+
<version>2.0.1</version>
1212
<packaging>jar</packaging>
1313
<name>${project.artifactId}</name>
1414
<description>A FIGlet utility for Java that generates text banners, in a variety of typefaces, composed of letters made up of conglomerations of smaller ASCII characters.</description>

‎src/main/java/io/leego/banana/BananaUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ private static Meta buildMeta(Font font) {
250250
figletMap.remove(code);
251251
break;
252252
}
253-
figlet[j] = data.get(row).replace(mark, EMPTY);
253+
figlet[j] = data.get(row).replaceAll("[" + mark + "]+$", EMPTY);
254254
}
255255
}
256256
data.clear();

0 commit comments

Comments
 (0)