Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Update to FA 5.6.3 and new "update_fa5" setup.py subcommand #104

Merged
merged 10 commits into from
Jan 3, 2019
Merged
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ The following prefixes are currently available to use:

- [**FontAwesome**](https://fontawesome.com):

- FA 5.4.2 features 1,393 free icons in different styles:
- FA 5.6.3 features 1,480 free icons in different styles:

- `fa5` prefix has [151 icons in the "**regular**" style.](https://fontawesome.com/icons?d=gallery&s=regular&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2&m=free)
- `fa5s` prefix has [852 icons in the "**solid**" style.](https://fontawesome.com/icons?d=gallery&s=solid&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2&m=free)
- `fa5b` prefix has [390 icons of various **brands**.](https://fontawesome.com/icons?d=gallery&s=brands&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2&m=free)
- `fa5` prefix has [151 icons in the "**regular**" style.](https://fontawesome.com/icons?d=gallery&s=regular&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free)
- `fa5s` prefix has [915 icons in the "**solid**" style.](https://fontawesome.com/icons?d=gallery&s=solid&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free)
- `fa5b` prefix has [414 icons of various **brands**.](https://fontawesome.com/icons?d=gallery&s=brands&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free)

- `fa` is the legacy [FA 4.7 version with its 675 icons](https://fontawesome.com/v4.7.0/icons/) but **all** of them (*and more!*) are part of FA 5.x so you should probably use the newer version above.

Expand Down
30 changes: 23 additions & 7 deletions UPDATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
To update font-awesome or elusive icons, one must
# How to update font packs

## FontAwesome

To update _FontAwesome_ icons, one must:

- check what is the latest released version here: https://github.com/FortAwesome/Font-Awesome/releases/
- run: python setup.py update_fa5 --fa-version X.X.X
- update FA version number, icon counts and URLs inside:
- README.md
- qtawesome/docs/source/usage.rst

## Elusive Icons

To update _Elusive Icons_, one must:

- replace the ttf font file with the new version
- regenerate the json charmap with the `icons.yml` file from the upstream
repository:
- regenerate the json charmap with the `icons.yml` file from the upstream repository:

```Python
import yaml, json
Expand All @@ -21,10 +34,13 @@ with open('charmap.json', 'w') as file:
json.dump(charmap, file, indent=4, sort_keys=True)
```

To update material design icons, you must:
- download ttf from https://github.com/Templarian/MaterialDesign-Webfont
- regenerate the json charmap with the `materialdesignicons.css` file

## Material Design Icons

To update _Material Design Icons_, you must:

- download ttf from https://github.com/Templarian/MaterialDesign-Webfont
- regenerate the json charmap with the `materialdesignicons.css` file.

```Python
import re
import json
Expand Down
12 changes: 6 additions & 6 deletions docs/source/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ The following prefixes are currently available to use:

- `FontAwesome`_:

- FA 5.4.2 features 1,393 free icons in different styles:
- FA 5.6.3 features 1,480 free icons in different styles:

- ``fa5`` prefix has `151 icons in the "regular" style.`_
- ``fa5s`` prefix has `852 icons in the "solid" style.`_
- ``fa5b`` prefix has `390 icons of various brands.`_
- ``fa5s`` prefix has `915 icons in the "solid" style.`_
- ``fa5b`` prefix has `414 icons of various brands.`_

- ``fa`` is the legacy `FA 4.7 version with its 675 icons`_ but
**all** of them (*and more!*) are part of FA 5.x so you should
Expand All @@ -26,9 +26,9 @@ The following prefixes are currently available to use:
icons.`_

.. _FontAwesome: https://fontawesome.com
.. _151 icons in the "regular" style.: https://fontawesome.com/icons?d=gallery&s=regular&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2&m=free
.. _852 icons in the "solid" style.: https://fontawesome.com/icons?d=gallery&s=solid&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2&m=free
.. _390 icons of various brands.: https://fontawesome.com/icons?d=gallery&s=brands&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2&m=free
.. _151 icons in the "regular" style.: https://fontawesome.com/icons?d=gallery&s=regular&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free
.. _915 icons in the "solid" style.: https://fontawesome.com/icons?d=gallery&s=solid&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free
.. _414 icons of various brands.: https://fontawesome.com/icons?d=gallery&s=brands&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free
.. _FA 4.7 version with its 675 icons: https://fontawesome.com/v4.7.0/icons/
.. _Elusive Icons 2.0 with its 304 icons: http://elusiveicons.com/icons/
.. _Material Design Icons 2.7.94 with its 2794 icons.: https://cdn.materialdesignicons.com/2.7.94/
Expand Down
25 changes: 25 additions & 0 deletions qtawesome/fonts/fontawesome5-brands-webfont-charmap.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"accusoft": "f369",
"acquisitions-incorporated": "f6af",
"adn": "f170",
"adobe": "f778",
"adversal": "f36a",
"affiliatetheme": "f36b",
"algolia": "f36c",
Expand All @@ -20,7 +21,9 @@
"apper": "f371",
"apple": "f179",
"apple-pay": "f415",
"artstation": "f77a",
"asymmetrik": "f372",
"atlassian": "f77b",
"audible": "f373",
"autoprefixer": "f41c",
"avianex": "f374",
Expand All @@ -42,6 +45,7 @@
"btc": "f15a",
"buromobelexperte": "f37f",
"buysellads": "f20d",
"canadian-maple-leaf": "f785",
"cc-amazon-pay": "f42d",
"cc-amex": "f1f3",
"cc-apple-pay": "f416",
Expand All @@ -53,12 +57,14 @@
"cc-stripe": "f1f5",
"cc-visa": "f1f0",
"centercode": "f380",
"centos": "f789",
"chrome": "f268",
"cloudscale": "f383",
"cloudsmith": "f384",
"cloudversify": "f385",
"codepen": "f1cb",
"codiepie": "f284",
"confluence": "f78d",
"connectdevelop": "f20e",
"contao": "f26d",
"cpanel": "f388",
Expand Down Expand Up @@ -88,6 +94,8 @@
"deskpro": "f38f",
"dev": "f6cc",
"deviantart": "f1bd",
"dhl": "f790",
"diaspora": "f791",
"digg": "f1a6",
"digital-ocean": "f391",
"discord": "f392",
Expand Down Expand Up @@ -117,6 +125,9 @@
"facebook-messenger": "f39f",
"facebook-square": "f082",
"fantasy-flight-games": "f6dc",
"fedex": "f797",
"fedora": "f798",
"figma": "f799",
"firefox": "f269",
"first-order": "f2b0",
"first-order-alt": "f50a",
Expand Down Expand Up @@ -180,13 +191,16 @@
"hubspot": "f3b2",
"imdb": "f2d8",
"instagram": "f16d",
"intercom": "f7af",
"internet-explorer": "f26b",
"invision": "f7b0",
"ioxhost": "f208",
"itunes": "f3b4",
"itunes-note": "f3b5",
"java": "f4e4",
"jedi-order": "f50e",
"jenkins": "f3b6",
"jira": "f7b1",
"joget": "f3b7",
"joomla": "f1aa",
"js": "f3b8",
Expand Down Expand Up @@ -221,6 +235,7 @@
"medrt": "f3c8",
"meetup": "f2e0",
"megaport": "f5a3",
"mendeley": "f7b3",
"microsoft": "f3ca",
"mix": "f3cb",
"mixcloud": "f289",
Expand Down Expand Up @@ -270,14 +285,17 @@
"quinscape": "f459",
"quora": "f2c4",
"r-project": "f4f7",
"raspberry-pi": "f7bb",
"ravelry": "f2d9",
"react": "f41b",
"reacteurope": "f75d",
"readme": "f4d5",
"rebel": "f1d0",
"red-river": "f3e3",
"reddit": "f1a1",
"reddit-alien": "f281",
"reddit-square": "f1a2",
"redhat": "f7bc",
"renren": "f18b",
"replyd": "f3e6",
"researchgate": "f4f8",
Expand All @@ -298,6 +316,7 @@
"simplybuilt": "f215",
"sistrix": "f3ee",
"sith": "f512",
"sketch": "f7c6",
"skyatlas": "f216",
"skype": "f17e",
"slack": "f198",
Expand All @@ -307,6 +326,7 @@
"snapchat-ghost": "f2ac",
"snapchat-square": "f2ad",
"soundcloud": "f1be",
"sourcetree": "f7d3",
"speakap": "f3f3",
"spotify": "f1bc",
"squarespace": "f5be",
Expand All @@ -325,6 +345,7 @@
"stumbleupon-circle": "f1a3",
"superpowers": "f2dd",
"supple": "f3f9",
"suse": "f7d6",
"teamspeak": "f4f9",
"telegram": "f2c6",
"telegram-plane": "f3fe",
Expand All @@ -343,10 +364,13 @@
"twitter-square": "f081",
"typo3": "f42b",
"uber": "f402",
"ubuntu": "f7df",
"uikit": "f403",
"uniregistry": "f404",
"untappd": "f405",
"ups": "f7e0",
"usb": "f287",
"usps": "f7e1",
"ussunnah": "f407",
"vaadin": "f408",
"viacoin": "f237",
Expand Down Expand Up @@ -384,6 +408,7 @@
"yahoo": "f19e",
"yandex": "f413",
"yandex-international": "f414",
"yarn": "f7e3",
"yelp": "f1e9",
"yoast": "f2b1",
"youtube": "f167",
Expand Down
Binary file modified qtawesome/fonts/fontawesome5-brands-webfont.ttf
Binary file not shown.
Binary file modified qtawesome/fonts/fontawesome5-regular-webfont.ttf
Binary file not shown.
Loading