Skip to content

Commit

Permalink
Merge pull request #206 from sepandhaghighi/dev
Browse files Browse the repository at this point in the history
Version 5.7
  • Loading branch information
sepandhaghighi authored Jul 6, 2022
2 parents c8f0332 + efe9950 commit ba4f6c4
Show file tree
Hide file tree
Showing 15 changed files with 577 additions and 31 deletions.
3 changes: 2 additions & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@

# Other Contributors #
----------
- [@heidecjj](https://github.com/heidecjj)
- [@heidecjj](https://github.com/heidecjj)
- [@noobkoder](https://github.com/n00bkoder)
18 changes: 9 additions & 9 deletions ArtList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 5.6"
"### Version : 5.7"
]
},
{
Expand Down Expand Up @@ -2044,13 +2044,7 @@
"tie-fighter\n",
"|โ€”Oโ€”| \n",
"******************************\n",
"tired\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"tired\n",
"( อกเฒ  ส–ฬฏ อกเฒ ) \n",
"******************************\n",
"touchy feely\n",
Expand All @@ -2070,7 +2064,13 @@
"******************************\n",
"tripping out\n",
"q(โ‚โ€ฟโ‚)p \n",
"******************************\n",
"******************************\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"trolling\n",
"เผผโˆตเผฝ เผผโจเผฝ เผผโขเผฝ เผผโคเผฝ \n",
"******************************\n",
Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [5.7] - 2022-07-06
### Added
- 5 new font
1. fancy144
2. fancy145
3. fancy146
4. fancy147
5. fancy148
- `ASCII_FONTS` list
- `ASCII_ARTS` list
## [5.6] - 2022-04-20
### Added
- 7 new font
Expand Down Expand Up @@ -2008,7 +2018,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- 1-Line art
- CLI commands

[Unreleased]: https://github.com/sepandhaghighi/art/compare/v5.6...dev
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v5.7...dev
[5.7]: https://github.com/sepandhaghighi/art/compare/v5.6...v5.7
[5.6]: https://github.com/sepandhaghighi/art/compare/v5.5...v5.6
[5.5]: https://github.com/sepandhaghighi/art/compare/v5.4...v5.5
[5.4]: https://github.com/sepandhaghighi/art/compare/v5.3...v5.4
Expand Down
2 changes: 1 addition & 1 deletion DecorList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 5.6"
"### Version : 5.7"
]
},
{
Expand Down
19 changes: 17 additions & 2 deletions FontList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 5.6"
"### Version : 5.7"
]
},
{
Expand All @@ -38,7 +38,7 @@
{
"data": {
"text/plain": [
"627"
"632"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -3923,6 +3923,21 @@
"fancy143 : \n",
"๐Ÿ†ƒ๐Ÿ…ด๐Ÿ†‚๐Ÿ†ƒ123\n",
"\n",
"fancy144 : \n",
"๐Ÿ…ฃ๐Ÿ…”๐Ÿ…ข๐Ÿ…ฃโžŠโž‹โžŒ\n",
"\n",
"fancy145 : \n",
"โ“‰โ’บโ“ˆโ“‰โ‘ โ‘กโ‘ข\n",
"\n",
"fancy146 : \n",
"ใ„’ใ ชไธ‚ใ„’ไธจๅทฑใ‡Œ\n",
"\n",
"fancy147 : \n",
"TEST123\n",
"\n",
"fancy148 : \n",
"Tโ‚‘STโ‚โ‚‚โ‚ƒ\n",
"\n",
"fancy15 : \n",
"โœžฦŽฦงโœž123\n",
"\n",
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
โš ๏ธ **PyPI** support of these versions will be removed in a **future release**

### Source code
- Download [Version 5.6](https://github.com/sepandhaghighi/art/archive/v5.6.zip) or [Latest Source](https://github.com/sepandhaghighi/art/archive/dev.zip)
- Download [Version 5.7](https://github.com/sepandhaghighi/art/archive/v5.7.zip) or [Latest Source](https://github.com/sepandhaghighi/art/archive/dev.zip)
- `python3 setup.py install` or `python setup.py install` (Need root access)

### PyPI


- Check [Python Packaging User Guide](https://packaging.python.org/installing/)
- `pip install art==5.6` or `pip3 install art==5.6` (Need root access)
- `pip install art==5.7` or `pip3 install art==5.7` (Need root access)

* Note : On `--upgrade` error install latest version of `setuptools` : `pip install setuptools` and retry

Expand All @@ -23,7 +23,7 @@

### Easy install

- Run `easy_install "art==5.6"` (Need root access)
- Run `easy_install "art==5.7"` (Need root access)

### MATLAB

Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</a>
<a href="https://badge.fury.io/py/art"><img src="https://badge.fury.io/py/art.svg" alt="PyPI version" height="18"></a>
<a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3" /></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-627-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-632-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-710-orange.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/DecorList.ipynb"><img src="https://img.shields.io/badge/Decor List-218-green.svg"></a>
<a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
Expand Down Expand Up @@ -65,7 +65,7 @@ ART is a Python lib for text converting to ASCII art fancy. ;-)
</tr>
<tr>
<td align="center">Font Counter</td>
<td align="center">627</td>
<td align="center">632</td>
</tr>
<tr>
<td align="center">1-Line-Art Counter</td>
Expand Down Expand Up @@ -171,6 +171,7 @@ art.art.artError: The 'number' type must be int.

* Note1 : Use `ART_NAMES` to access all arts name list (new in `Version 4.2`)
* Note2 : Use `NON_ASCII_ARTS` to access all Non-ASCII arts name list (new in `Version 4.6`)
* Note3 : Use `ASCII_ARTS` to access all ASCII arts name list (new in `Version 5.7`)

### ASCII text

Expand Down Expand Up @@ -347,6 +348,7 @@ Filename: test.txt

* Note1 : Use `FONT_NAMES` to access all fonts name list (new in `Version 4.2`)
* Note2 : Use `NON_ASCII_FONTS` to access all Non-ASCII fonts name list (new in `Version 4.4`)
* Note3 : Use `ASCII_FONTS` to access all ASCII fonts name list (new in `Version 5.7`)

### Decoration

Expand Down Expand Up @@ -806,7 +808,7 @@ Just send your text to one of these bots. ๐Ÿ‘‡๐Ÿ‘‡๐Ÿ‘‡๐Ÿ‘‡

1. [FIGlet](http://www.figlet.org/)
2. [1 Line Art](http://1lineart.kulaone.com/#/)
3. [Text To ASCII](http://patorjk.com/software/taag/#p=display&f=Blocks&t=ART)
3. [Text to ASCII](http://patorjk.com/software/taag/#p=display&f=Blocks&t=ART)
4. [ASCII Generator](http://www.network-science.de/ascii/)
5. [Asky](https://asky.io/)
6. [Flipyourtext](https://www.flipyourtext.com/)
Expand All @@ -828,10 +830,11 @@ Just send your text to one of these bots. ๐Ÿ‘‡๐Ÿ‘‡๐Ÿ‘‡๐Ÿ‘‡
22. [Instagram Fonts2](https://www.instagramfonts.com/)
23. [Emotiworld](http://en.emotiworld.com/)
24. [Fancy Text Pro](https://www.fancytextpro.com/)
25. [Playing cards in Unicode](https://en.m.wikipedia.org/wiki/Playing_cards_in_Unicode)
25. [Playing Cards in Unicode](https://en.m.wikipedia.org/wiki/Playing_cards_in_Unicode)
26. [Text Generator](https://coolfonts.text-generator.org/)
27. [GOGOTEXT](https://instafontsgen.codesdetail.com)
28. [Fsymbols](https://fsymbols.com/)
29. [Font Copy and Paste](https://www.fontcopypaste.com/)


* Logo designed by [Arta Khanalizadeh](https://www.linkedin.com/in/artakhanalizadeh)
Expand Down
2 changes: 1 addition & 1 deletion art/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
from .art import get_font_dic, set_default, help_func, art_list, font_list, decor_list
from .art_param import ART_VERSION, FONT_NAMES, ART_NAMES, DECORATION_NAMES, DEFAULT_FONT
from .art_param import ART_COUNTER, FONT_COUNTER, DECORATION_COUNTER
from .art_param import NON_ASCII_ARTS, NON_ASCII_FONTS
from .art_param import NON_ASCII_ARTS, NON_ASCII_FONTS, ASCII_FONTS, ASCII_ARTS
__version__ = ART_VERSION
14 changes: 13 additions & 1 deletion art/art_param.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from .decor_dic import *
from .art_dic import *

ART_VERSION = "5.6" # pragma: no cover
ART_VERSION = "5.7" # pragma: no cover
FONT_SMALL_THRESHOLD = 50 # pragma: no cover
FONT_MEDIUM_THRESHOLD = 100 # pragma: no cover
FONT_LARGE_THRESHOLD = 200 # pragma: no cover
Expand Down Expand Up @@ -796,6 +796,11 @@
"fancy141",
"fancy142",
"fancy143",
"fancy144",
"fancy145",
"fancy146",
"fancy147",
"fancy148",
"foxy",
"white_square",
"black_square",
Expand Down Expand Up @@ -1491,6 +1496,11 @@
"fancy141": [fancy141_dic, False],
"fancy142": [fancy142_dic, False],
"fancy143": [fancy143_dic, False],
"fancy144": [fancy144_dic, False],
"fancy145": [fancy145_dic, False],
"fancy146": [fancy146_dic, False],
"fancy147": [fancy147_dic, False],
"fancy148": [fancy148_dic, False],
"tarty1": [tarty1_dic, False],
"tarty2": [tarty2_dic, False],
"tarty3": [tarty3_dic, False],
Expand Down Expand Up @@ -1722,8 +1732,10 @@
"wave9": wave9}

FONT_NAMES = sorted(list(FONT_MAP.keys())) # pragma: no cover
ASCII_FONTS = sorted(set(FONT_NAMES) - set(NON_ASCII_FONTS))
DECORATION_NAMES = sorted(list(DECORATIONS_MAP.keys())) # pragma: no cover
ART_NAMES = sorted(list(art_dic.keys())) # pragma: no cover
ASCII_ARTS = sorted(set(ART_NAMES) - set(NON_ASCII_ARTS))
FONT_COUNTER = len(FONT_NAMES) # pragma: no cover
ART_COUNTER = len(ART_NAMES) # pragma: no cover
DECORATION_COUNTER = len(DECORATION_NAMES) # pragma: no cover
Expand Down
10 changes: 5 additions & 5 deletions art/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4366,11 +4366,11 @@
\__,_||_| \__|
<BLANKLINE>
<BLANKLINE>
____ __
__ __| ___| / /_
\ \ / /|___ \ | '_ \
\ V / ___) | _ | (_) |
\_/ |____/ (_) \___/
____ _____
__ __| ___| |___ |
\ \ / /|___ \ / /
\ V / ___) | _ / /
\_/ |____/ (_) /_/
<BLANKLINE>
<BLANKLINE>
ASCII art is also known as "computer text art".
Expand Down
19 changes: 19 additions & 0 deletions art/test2.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,21 @@
fancy143 :
๐Ÿ†ƒ๐Ÿ…ด๐Ÿ†‚๐Ÿ†ƒ
<BLANKLINE>
fancy144 :
๐Ÿ…ฃ๐Ÿ…”๐Ÿ…ข๐Ÿ…ฃ
<BLANKLINE>
fancy145 :
โ“ฃโ“”โ“ขโ“ฃ
<BLANKLINE>
fancy146 :
ใ‚ป๐Ÿ—ไธ‚ใ‚ป
<BLANKLINE>
fancy147 :
ฦšาฝส‚ฦš
<BLANKLINE>
fancy148 :
๐šโ‚‘๐˜ด๐š
<BLANKLINE>
fancy15 :
โœžฦŽฦงโœž
<BLANKLINE>
Expand Down Expand Up @@ -3008,6 +3023,10 @@
'OK'
>>> Data["Status"]
True
>>> FONT_COUNTER == (len(ASCII_FONTS) + len(NON_ASCII_FONTS))
True
>>> ART_COUNTER == (len(ASCII_ARTS) + len(NON_ASCII_ARTS))
True
>>> os.remove("antrophobia.txt")
>>> os.remove("fancy37.txt")
>>> os.remove("fancy6dec.txt")
Expand Down
Loading

0 comments on commit ba4f6c4

Please sign in to comment.