Skip to content

Commit

Permalink
Merge pull request #24 from sepandhaghighi/dev
Browse files Browse the repository at this point in the history 
Version 2.4
  • Loading branch information
@sepandhaghighi
sepandhaghighi authored Oct 30, 2018
2 parents a01d079 + 49336ed commit 7ba5fd1
Show file tree
Hide file tree
Showing 10 changed files with 1,082 additions and 25 deletions.
2 changes: 1 addition & 1 deletion ArtList.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 2.3"
"### Version : 2.4"
]
},
{
Expand Down
19 changes: 18 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ 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]
## [2.4] - 2018-10-30
### Added
- 10 new fonts
1. alpha
2. alligator3
3. amc3liv1
4. ascii_new_roman
5. B1FF
6. dwhistled
7. eftiwall
8. fire_font-k
9. fire_font-s
10. gradient
### Changed
- `requirements.txt` modified

## [2.3] - 2018-09-30
### Added
- 35 new fonts
Expand Down Expand Up @@ -533,7 +549,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/v2.3...HEAD
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v2.4...HEAD
[2.4]: https://github.com/sepandhaghighi/art/compare/v2.3...v2.4
[2.3]: https://github.com/sepandhaghighi/art/compare/v2.2...v2.3
[2.2]: https://github.com/sepandhaghighi/art/compare/v2.1...v2.2
[2.1]: https://github.com/sepandhaghighi/art/compare/v2.0...v2.1
Expand Down
103 changes: 101 additions & 2 deletions FontList.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 2.3"
"### Version : 2.4"
]
},
{
Expand All @@ -38,7 +38,7 @@
{
"data": {
"text/plain": [
"225"
"235"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -121,6 +121,9 @@
" / / // \\ \\ / / \n",
"/ / ((____ // ) ) / / \n",
"\n",
"B1FF : \n",
"T35T\n",
"\n",
"ICL-1900 : \n",
"test\n",
" * \n",
Expand Down Expand Up @@ -168,6 +171,39 @@
" #+# #+# #+# #+# #+# \n",
" ### ########## ######## ### \n",
"\n",
"alligator3 : \n",
"::::::::::: :::::::::: :::::::: ::::::::::: \n",
" :+: :+: :+: :+: :+: \n",
" +:+ +:+ +:+ +:+ \n",
" +#+ +#++:++# +#++:++#++ +#+ \n",
" +#+ +#+ +#+ +#+ \n",
" #+# #+# #+# #+# #+# \n",
" ### ########## ######## ### \n",
"\n",
"alpha : \n",
" _____ _____ _____ _____ \n",
" /\\ \\ /\\ \\ /\\ \\ /\\ \\ \n",
" /::\\ \\ /::\\ \\ /::\\ \\ /::\\ \\ \n",
" \\:::\\ \\ /::::\\ \\ /::::\\ \\ \\:::\\ \\ \n",
" \\:::\\ \\ /::::::\\ \\ /::::::\\ \\ \\:::\\ \\ \n",
" \\:::\\ \\ /:::/\\:::\\ \\ /:::/\\:::\\ \\ \\:::\\ \\ \n",
" \\:::\\ \\ /:::/__\\:::\\ \\ /:::/__\\:::\\ \\ \\:::\\ \\ \n",
" /::::\\ \\ /::::\\ \\:::\\ \\ \\:::\\ \\:::\\ \\ /::::\\ \\ \n",
" /::::::\\ \\ /::::::\\ \\:::\\ \\ ___\\:::\\ \\:::\\ \\ /::::::\\ \\ \n",
" /:::/\\:::\\ \\ /:::/\\:::\\ \\:::\\ \\ /\\ \\:::\\ \\:::\\ \\ /:::/\\:::\\ \\ \n",
" /:::/ \\:::\\____\\/:::/__\\:::\\ \\:::\\____\\/::\\ \\:::\\ \\:::\\____\\ /:::/ \\:::\\____\\\n",
" /:::/ \\::/ /\\:::\\ \\:::\\ \\::/ /\\:::\\ \\:::\\ \\::/ / /:::/ \\::/ /\n",
" /:::/ / \\/____/ \\:::\\ \\:::\\ \\/____/ \\:::\\ \\:::\\ \\/____/ /:::/ / \\/____/ \n",
" /:::/ / \\:::\\ \\:::\\ \\ \\:::\\ \\:::\\ \\ /:::/ / \n",
"/:::/ / \\:::\\ \\:::\\____\\ \\:::\\ \\:::\\____\\ /:::/ / \n",
"\\::/ / \\:::\\ \\::/ / \\:::\\ /:::/ / \\::/ / \n",
" \\/____/ \\:::\\ \\/____/ \\:::\\/:::/ / \\/____/ \n",
" \\:::\\ \\ \\::::::/ / \n",
" \\:::\\____\\ \\::::/ / \n",
" \\::/ / \\::/ / \n",
" \\/____/ \\/____/ \n",
" \n",
"\n",
"alphabet : \n",
" t t \n",
" t t \n",
Expand All @@ -183,6 +219,12 @@
" ' `-' `-' ' \n",
" \n",
"\n",
"amc3liv1 : \n",
". .: S;:. . \n",
"S:;s;:' S S S S S S S:;s;:' \n",
"` `:;S;:' `:;S :' ` \n",
" \n",
"\n",
"amcaaa01 : \n",
"sdSS_SSSSSSbs sSSs sSSs sdSS_SSSSSSbs \n",
"YSSS~S%SSSSSP d%%SP d%%SP YSSS~S%SSSSSP \n",
Expand Down Expand Up @@ -283,6 +325,12 @@
" >=> >====> >=> >=> >=> \n",
" \n",
"\n",
"ascii_new_roman : \n",
" ____, ____, ____, ____, \n",
"(-| (-|_, (-(__ (-| \n",
" _|, _|__, ____) _|, \n",
"( ( ( ( \n",
"\n",
"avatar : \n",
" _____ _____ ____ _____ \n",
"/__ __\\/ __// ___\\/__ __\\\n",
Expand Down Expand Up @@ -777,6 +825,18 @@
" |_| \\___./__/ |_| \n",
" \n",
"\n",
"dwhistled : \n",
"t st\n",
" X \n",
" X \n",
" X \n",
" X \n",
" X \n",
" . \n",
" \n",
"test\n",
" \n",
"\n",
"eftifont : \n",
" \n",
"|| _ _ || \n",
Expand Down Expand Up @@ -804,6 +864,12 @@
"// |_( /__)// \n",
" \n",
"\n",
"eftiwall : \n",
" |\"| \n",
" ()_() _|_|_ ` _ , ' ()_() \n",
" (o o) (o o) - (o)o) - (o o) \n",
"ooO--`o'--Ooo-ooO--(_)--Ooo--ooO'(_)--Ooo-ooO--`o'--Ooo-\n",
"\n",
"eftiwater : \n",
" _ _ \n",
" )L __ __ )L\n",
Expand All @@ -828,6 +894,28 @@
"'88p 88bdPPP 8888888P '88p \n",
" \n",
"\n",
"fire_font-k : \n",
" \n",
" ) ) \n",
" ( /( ( ( /( \n",
" )\\()) ))\\ ( )\\()) \n",
"(_))/ /((_) )\\ (_))/ \n",
"| |_ (_)) ((_) | |_ \n",
"| _| / -_) (_-< | _| \n",
" \\__| \\___| /__/ \\__| \n",
" \n",
"\n",
"fire_font-s : \n",
" \n",
" ) ) \n",
" ( /( ( ( /( \n",
" )\\()) ))\\ ( )\\()) \n",
"(_))/ /((_) )\\ (_))/ \n",
"| |_ (_)) ((_) | |_ \n",
"| _| / -_) (_-< | _| \n",
" \\__| \\___| /__/ \\__| \n",
" \n",
"\n",
"flipped : \n",
" _ ____ _ __ _ \n",
" __| || || | \\ __| |\n",
Expand Down Expand Up @@ -966,6 +1054,17 @@
" )( ) _) \\___ \\ )( \n",
" (__) (____)(____/ (__) \n",
"\n",
"gradient : \n",
"eeeeeeeee.eeeeee..eeeeee.eeeeeeeee.\n",
"@@@@@@@@@:@@@@@@:@@@@@@@:@@@@@@@@@:\n",
"---%%%----%%%----%%%--------%%%----\n",
"+++&&&++++&&&&&++&&&&&&+++++&&&++++\n",
"***|||****|||||***||||||****|||****\n",
"===!!!====!!!========!!!====!!!====\n",
"###:::####::::::#:::::::####:::####\n",
"@@@...@@@@......@......@@@@@...@@@@\n",
" \n",
"\n",
"graffiti : \n",
" __ __ \n",
"_/ |_ ____ _______/ |_ \n",
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
## Installation

### Source Code
- Download [Version 2.3](https://github.com/sepandhaghighi/art/archive/v2.3.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
- Download [Version 2.4](https://github.com/sepandhaghighi/art/archive/v2.4.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
- `python3 setup.py install --upgrade` or `python setup.py install --upgrade` (Need root access)

### PyPI


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

### Easy Install

- Run `easy_install "art==2.3"` (Need root access)
- Run `easy_install "art==2.4"` (Need root access)
34 changes: 26 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<a href="https://codecov.io/gh/sepandhaghighi/art">
<img src="https://codecov.io/gh/sepandhaghighi/art/branch/master/graph/badge.svg" alt="Codecov" />
</a>
<a href="https://travis-ci.org/sepandhaghighi/art"><img src="https://travis-ci.org/sepandhaghighi/art.svg?branch=master"></a>
<a href="https://ci.appveyor.com/project/sepandhaghighi/art"><img src="https://ci.appveyor.com/api/projects/status/n350ntyjthc2gil3?svg=true"></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-225-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-235-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-250-orange.svg"></a>
<a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
</div>
Expand Down Expand Up @@ -56,7 +56,7 @@ letters to make a visual shape that is spread over multiple lines of text.

Art is a Python lib for text converting to ASCII ART fancy. ;-)

<html>

<table>
<tr>
<td align="center">Open Hub</td>
Expand All @@ -72,14 +72,34 @@ Art is a Python lib for text converting to ASCII ART fancy. ;-)
</tr>
<tr>
<td align="center">Font Counter</td>
<td align="center">225</td>
<td align="center">235</td>
</tr>
<tr>
<td align="center">1-Line-Art Counter</td>
<td align="center">250</td>
</tr>
</table>
</html>



<table>
<tr>
<td align="center">Branch</td>
<td align="center">master</td>
<td align="center">dev</td>
</tr>
<tr>
<td align="center">Travis</td>
<td align="center"><a href="https://travis-ci.org/sepandhaghighi/art"><img src="https://travis-ci.org/sepandhaghighi/art.svg?branch=master"></a></td>
<td align="center"><a href="https://travis-ci.org/sepandhaghighi/art"><img src="https://travis-ci.org/sepandhaghighi/art.svg?branch=dev"></a></td>
</tr>
<tr>
<td align="center">AppVeyor</td>
<td align="center"><a href="https://ci.appveyor.com/project/sepandhaghighi/art"><img src="https://ci.appveyor.com/api/projects/status/n350ntyjthc2gil3/branch/master?svg=true"></a></td>
<td align="center"><a href="https://ci.appveyor.com/project/sepandhaghighi/art"><img src="https://ci.appveyor.com/api/projects/status/n350ntyjthc2gil3/branch/dev?svg=true"></a></td>
</tr>
</table>



## Usage
Expand Down Expand Up @@ -351,7 +371,6 @@ _/ _ _ _/
</pre>
* Note : Functions error response updated in `Version 0.8`

<html>
<table>
<tr>
<td align="center">Function</td>
Expand Down Expand Up @@ -390,7 +409,6 @@ _/ _ _ _/
<td align="center">raise artError</td>
</tr>
</table>
</html>

### CLI
- List of arts : `python -m art list` or `python -m art arts`
Expand Down
14 changes: 12 additions & 2 deletions art/art.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import random

version = "2.3"
version = "2.4"


description = '''ASCII art is also known as "computer text art".
Expand Down Expand Up @@ -189,7 +189,17 @@ class artError(Exception):
"wavy": [wavy_dic, False],
"wetletter": [wetletter_dic, True],
"whimsy": [whimsy_dic, True],
"wow": [wow_dic, True]
"wow": [wow_dic, True],
"alligator3": [alligator3_dic, True],
"alpha": [alpha_dic, True],
"amc3liv1": [amc3liv1_dic, True],
"ascii_new_roman": [ascii_new_roman_dic, True],
"B1FF": [B1FF_dic, True],
"dwhistled": [dwhistled_dic, False],
"eftiwall": [eftiwall_dic, False],
"fire_font-k": [fire_font_k_dic, False],
"fire_font-s": [fire_font_s_dic, False],
"gradient": [gradient_dic, True]
}
font_counter = len(font_map)
DEFAULT_FONT = "standard"
Expand Down
Loading

0 comments on commit 7ba5fd1

Please sign in to comment.