README attribution updates

Reviewed-on: treehouse/emoji#6

README.md

@@ -7,32 +7,34 @@ All are welcome to use and re-purpose our emoji files as they see fit.
 
 ## Pride Set
 
-![:pride_agender:](dist/pride/pride-agender.png?raw=true ":pride_agender:")
+![:achillean:](dist/pride/achillean.png?raw=true ":achillean:")
-![:pride_aromantic:](dist/pride/pride-aromantic.png?raw=true ":pride_aromantic:")
+![:agender:](dist/pride/agender.png?raw=true ":agender:")
-![:pride_asexual:](dist/pride/pride-asexual.png?raw=true ":pride_asexual:")
+![:aromantic:](dist/pride/aromantic.png?raw=true ":aromantic:")
-![:pride_black_trans:](dist/pride/pride-black-trans.png?raw=true ":pride_black_trans:")
+![:asexual:](dist/pride/asexual.png?raw=true ":asexual:")
-![:pride_bigender:](dist/pride/pride-bigender.png?raw=true ":pride_bigender:")
+![:blacktrans:](dist/pride/blacktrans.png?raw=true ":blacktrans:")
-![:pride_bisexual:](dist/pride/pride-bisexual.png?raw=true ":pride_bisexual:")
+![:bigender:](dist/pride/bigender.png?raw=true ":bigender:")
-![:pride_demiboy:](dist/pride/pride-demiboy.png?raw=true ":pride_demiboy:")
+![:bisexual:](dist/pride/bisexual.png?raw=true ":bisexual:")
-![:pride_demigirl:](dist/pride/pride-demigirl.png?raw=true ":pride_demigirl:")
+![:demiboy:](dist/pride/demiboy.png?raw=true ":demiboy:")
-![:pride_demisexual:](dist/pride/pride-demisexual.png?raw=true ":pride_demisexual:")
+![:demigirl:](dist/pride/demigirl.png?raw=true ":demigirl:")
-![:pride_gay_male:](dist/pride/pride-gay-male.png?raw=true ":pride_gay_male:")
+![:demisexual:](dist/pride/demisexual.png?raw=true ":demisexual:")
-![:pride_genderfluid:](dist/pride/pride-genderfluid.png?raw=true ":pride_genderfluid:")
+![:genderfluid:](dist/pride/genderfluid.png?raw=true ":genderfluid:")
-![:pride_genderqueer:](dist/pride/pride-genderqueer.png?raw=true ":pride_genderqueer:")
+![:genderqueer:](dist/pride/genderqueer.png?raw=true ":genderqueer:")
-![:pride_intersex:](dist/pride/pride-intersex.png?raw=true ":pride_intersex:")
+![:intersex:](dist/pride/intersex.png?raw=true ":intersex:")
-![:pride_lesbian:](dist/pride/pride-lesbian.png?raw=true ":pride_lesbian:")
+![:lesbian:](dist/pride/lesbian.png?raw=true ":lesbian:")
-![:pride_lesbian2:](dist/pride/pride-lesbian2.png?raw=true ":pride_lesbian2:")
+![:lesbian2:](dist/pride/lesbian2.png?raw=true ":lesbian2:")
-![:pride_nonbinary:](dist/pride/pride-nonbinary.png?raw=true ":pride_nonbinary:")
+![:nonbinary:](dist/pride/nonbinary.png?raw=true ":nonbinary:")
-![:pride_omnisexual:](dist/pride/pride-omnisexual.png?raw=true ":pride_omnisexual:")
+![:omnisexual:](dist/pride/omnisexual.png?raw=true ":omnisexual:")
-![:pride_pansexual:](dist/pride/pride-pansexual.png?raw=true ":pride_pansexual:")
+![:pansexual:](dist/pride/pansexual.png?raw=true ":pansexual:")
-![:pride_polyamy:](dist/pride/pride-polyam.png?raw=true ":pride_polyam:")
+![:polyamy:](dist/pride/polyam.png?raw=true ":polyam:")
-![:pride_polyamy2:](dist/pride/pride-polyam2.png?raw=true ":pride_polyam2:")
+![:polyamy2:](dist/pride/polyam2.png?raw=true ":polyam2:")
-![:pride_prorgress:](dist/pride/pride-progress.png?raw=true ":pride_progress:")
+![:prorgress:](dist/pride/progress.png?raw=true ":progress:")
-![:pride_prorgress2:](dist/pride/pride-progress2.png?raw=true ":pride_progress2:")
+![:prorgress2:](dist/pride/progress2.png?raw=true ":progress2:")
-![:pride_rainbow:](dist/pride/pride-rainbow.png?raw=true ":pride_rainbow:")
+![:rainbow6:](dist/pride/rainbow6.png?raw=true ":rainbow6:")
-![:pride_trans:](dist/pride/pride-trans.png?raw=true ":pride_trans:")
+![:rainbow8:](dist/pride/rainbow8.png?raw=true ":rainbow8:")
-![:pride_transfemme:](dist/pride/pride-transfemme.png?raw=true ":pride_transfemme:")
+![:rainbow9:](dist/pride/rainbow9.png?raw=true ":rainbow9:")
-![:pride_transmasc:](dist/pride/pride-transmasc.png?raw=true ":pride_transmasc:")
+![:trans:](dist/pride/trans.png?raw=true ":trans:")
+![:transfemme:](dist/pride/transfemme.png?raw=true ":transfemme:")
+![:transmasc:](dist/pride/transmasc.png?raw=true ":transmasc:")
 
 
 ## Licenses
@@ -52,10 +54,10 @@ Intersex Flag is based on Morgan Carpenter's [SVG design](https://ihra.org.au/22
 
 New Polyamory Flag courtesy of [PolyAmProud](https://polyamproud.com/flag) (CC0).
 
+Old Polyamory Flag design (`polyam2`) is based on Jim Evan's SVG (CC0 1.0).
+
 Omnisexual flag based on Pastelmemer's design (since taken down).
 
-Old Polyamory Flag design (`pride_polyamory2`) is based on Jim Evan's SVG (CC0 1.0).
+Progress flags are based on @Nikki@wikimedia.org's [Intersex Progress Flag SVG](https://commons.wikimedia.org/wiki/File:Intersex-inclusive_pride_flag.svg) (CC0 1.0).
-
-Progress Flag is based on @Nikki@wikimedia.org's SVG (CC0 1.0).
 
 Transgender Flag is based on Dlloyd's SVG (Public Domain).

emoji-convert.sh

@@ -8,7 +8,7 @@ HEIGHT=84
 TEMP=`mktemp -d -p ""`
 
 # pride flags
-for svg_path in src/pride/pride-*.svg; do
+for svg_path in src/pride/*.svg; do
     svg=${svg_path#"src/pride/"}
     # resize
     convert ${svg_path} \
@@ -39,3 +39,10 @@ rm -rf $TEMP
 
 # fix and remove metadata
 exiftool -all= -overwrite_original ./dist/pride/*
+
+# create tarball for tootctl
+tar -C dist/pride/ -czf dist/pride.tar.gz .
+# import emojis with:
+# <mastodon-dir>/bin/tootctl emoji import \
+#     --category "Pride" <emoji-dir>/dist/pride.tar.gz
+# or import each PNG via webadmin interface

src/pride/rainbow8.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 840 600">
+  <path fill="#ff69b4" d="M0 0h840v75H0z"/>
+  <path fill="#ff0000" d="M0 75h840v75H0z"/>
+  <path fill="#ff8e00" d="M0 150h840v75H0z"/>
+  <path fill="#ffff00" d="M0 225h840v75H0z"/>
+  <path fill="#008e00" d="M0 300h840v75H0z"/>
+  <path fill="#00c0c0" d="M0 375h840v75H0z"/>
+  <path fill="#2d0296" d="M0 450h840v75H0z"/>
+  <path fill="#8e008e" d="M0 525h840v75H0z"/>
+</svg>

src/pride/rainbow9.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 840 600">
+  <path d="M0 0h840v66.67H0V0Z" fill="#cd66ff"/>
+  <path d="M0 66.67h840v66.67H0V66.67Z" fill="#ff69b4"/>
+  <path d="M0 133.33h840V200H0v-66.67Z" fill="#ff0000"/>
+  <path d="M0 200h840v66.67H0V200Z" fill="#ff8e00"/>
+  <path d="M0 266.67h840v66.67H0v-66.67Z" fill="#ffff00"/>
+  <path d="M0 333.33h840V400H0v-66.67Z" fill="#008e00"/>
+  <path d="M0 400h840v66.67H0V400Z" fill="#00c0c0"/>
+  <path d="M0 466.67h840v66.67H0v-66.67Z" fill="#2d0296"/>
+  <path d="M0 533.33h840V600H0v-66.67Z" fill="#8e008e"/>
+</svg>