Skip to content

Commit

Permalink
version: Bump to v14.0.2
Browse files Browse the repository at this point in the history
Move from eosrei to 13rac1.
fixes #114
  • Loading branch information
13rac1 committed Oct 27, 2022
1 parent f917191 commit e451b5d
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 39 deletions.
2 changes: 1 addition & 1 deletion LICENSE-MIT.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Applies to "EmojiOne SVGinOT Font" code only
Copyright (c) 2016 Brad Erickson
Copyright (c) 2022 Brad Erickson

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Licenses

* Copyright 2016 Brad Erickson CC-BY-4.0/MIT
* Copyright 2016 Twitter, Inc. CC-BY-4.0
* Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT
* Copyright 2016-2022 Twitter, Inc. CC-BY-4.0
* Copyright 2013 Joe Loughry and Terence Eden MIT

## Artwork
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ TMP := /dev/shm
# Where to find scfbuild?
SCFBUILD := SCFBuild/bin/scfbuild

VERSION := 13.1.0
VERSION := 14.0.2
FONT_PREFIX := TwitterColorEmoji-SVGinOT
REGULAR_FONT := build/$(FONT_PREFIX).ttf
REGULAR_PACKAGE := build/$(FONT_PREFIX)-$(VERSION)
Expand Down Expand Up @@ -46,10 +46,16 @@ SVG_STAGE_FILES := $(patsubst $(SVG_EXTRA)/%.svg, build/stage/%.svg, $(SVG_STAGE
SVG_BW_FILES := $(patsubst build/stage/%.svg, build/svg-bw/%.svg, $(SVG_STAGE_FILES))
SVG_COLOR_FILES := $(patsubst build/stage/%.svg, build/svg-color/%.svg, $(SVG_STAGE_FILES))

CPU_CORES := $(shell cat /proc/cpuinfo | grep processor | wc -l)

.PHONY: all update package regular-package linux-package macos-package windows-package copy-extra clean

all: package

# Run the build concurrently against all available cores
fast:
make -j $(CPU_CORES)

update:
cp ../twemoji/assets/svg/* assets/twemoji-svg/

Expand Down
31 changes: 16 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ A color and B&W emoji SVG-OpenType / SVGinOT font built from the
[skin tone diversity][3] and [country flags][4].

The font works in all operating systems, but will *currently* only show color
emoji in Firefox, Thunderbird, Photoshop CC 2017+, and Windows Edge V38.14393+.
emoji in Firefox, Thunderbird, and Photoshop CC 2017+.
This is not a limitation of the font, but of the operating systems and
applications. [Why doesn't it work on Chrome?][why-not-chrome] Regular B&W
outline emoji are included for backwards/fallback compatibility.
Expand Down Expand Up @@ -49,7 +49,7 @@ SVGinOT Font demos (Firefox only):

## Install on Linux
The font can be installed for a user or system-wide. Get the latest version
from releases: https://github.com/eosrei/twemoji-color-font/releases
from releases: https://github.com/13rac1/twemoji-color-font/releases

*Note: This requires `Bitstream Vera` is installed and will change your
systems default serif, sans-serif and monospace fonts.*
Expand Down Expand Up @@ -79,19 +79,19 @@ want to try them. Primary issues are the 0x2639 and 0x263a characters.
[Note: May cause crashes in Firefox <48.][11]

[8]:https://bugzilla.gnome.org/show_bug.cgi?id=757785
[9]:https://github.com/eosrei/emojione-color-font/issues/31
[9]:https://github.com/13rac1/emojione-color-font/issues/31
[10]:https://bugzilla.mozilla.org/show_bug.cgi?id=1245811
[11]:https://bugzilla.mozilla.org/show_bug.cgi?id=1266341

### Manual install on any Linux
Install for the current user without root:
```sh
# 1. Download the latest version
wget https://github.com/eosrei/twemoji-color-font/releases/download/v13.1.0/TwitterColorEmoji-SVGinOT-Linux-13.1.0.tar.gz
wget https://github.com/13rac1/twemoji-color-font/releases/download/v14.0.2/TwitterColorEmoji-SVGinOT-Linux-14.0.2.tar.gz
# 2. Uncompress the file
tar zxf TwitterColorEmoji-SVGinOT-Linux-13.1.0.tar.gz
tar zxf TwitterColorEmoji-SVGinOT-Linux-14.0.2.tar.gz
# 3. Run the installer
cd TwitterColorEmoji-SVGinOT-Linux-13.1.0
cd TwitterColorEmoji-SVGinOT-Linux-14.0.2
./install.sh
```

Expand Down Expand Up @@ -124,12 +124,12 @@ emerge twemoji-color-font

## Install on MacOS
Both SVGinOT versions are available from releases:
https://github.com/eosrei/twemoji-color-font/releases
https://github.com/13rac1/twemoji-color-font/releases

1. `TwitterColorEmoji-SVGinOT-13.1.0.zip` - The regular version of the font
1. `TwitterColorEmoji-SVGinOT-14.0.2.zip` - The regular version of the font
installs like any other font and can be specifically selected, but MacOS will
default to the `Apple Color Emoji` font for emojis.
2. `TwitterColorEmoji-SVGinOT-MacOS-13.1.0.zip` - A hack to replace the `Apple
2. `TwitterColorEmoji-SVGinOT-MacOS-14.0.2.zip` - A hack to replace the `Apple
Color Emoji` font by [using the same internal name][12]. Install and accept
the warning in Font Book.

Expand All @@ -151,10 +151,11 @@ Chrome will use the fallback black and white emoji.*

## Install on Windows

There are two standard install options for Windows. Both SVGinOT versions are available
from releases: https://github.com/eosrei/twemoji-color-font/releases
There are two standdard install options for Windows. Both SVGinOT versions are available
from releases: https://github.com/13rac1/twemoji-color-font/releases

You can also use the [Chocolatey package](https://community.chocolatey.org/packages/twemoji) to handle the installation and the future updates.
You can also use the [Chocolatey package](https://community.chocolatey.org/packages/twemoji)
to handle the installation and the future updates.
```powershell
choco install twemoji
```
Expand All @@ -164,7 +165,7 @@ choco install twemoji
The regular version of the font installs like any other font and can be
specifically selected, but Windows will default to the `Segoe UI Emoji`
font for emoji characters. Download:
https://github.com/eosrei/twemoji-color-font/releases/download/v13.1.0/TwitterColorEmoji-SVGinOT-13.1.0.zip
https://github.com/13rac1/twemoji-color-font/releases/download/v14.0.2/TwitterColorEmoji-SVGinOT-14.0.2.zip

### Replace the default Windows emoji fonts

Expand All @@ -179,7 +180,7 @@ install script requires both [Python][16] and pip in the PATH.
1. Download the most recent Python 3 for Windows: https://www.python.org/downloads/windows/
2. Start the installer, select "Add Python 3.6 to PATH", finish the install process, then reboot.
3. Download Twitter Color Emoji Windows package from releases:
https://github.com/eosrei/twemoji-color-font/releases/download/v13.1.0/TwitterColorEmoji-SVGinOT-Win-13.1.0.zip
https://github.com/13rac1/twemoji-color-font/releases/download/v14.0.2/TwitterColorEmoji-SVGinOT-Win-14.0.2.zip
4. Uncompress the file.
5. Open the new TwitterColorEmoji directory.
6. Run install.cmd. *Note: This will take some time.*
Expand Down Expand Up @@ -230,7 +231,7 @@ devscripts python3-fontforge python3-pip python3-yaml imagemagick \
git make debhelper build-essential
sudo npm install -g svgo
sudo pip3 install fonttools
git clone https://github.com/eosrei/twemoji-color-font.git
git clone https://github.com/13rac1/twemoji-color-font.git
cd twemoji-color-font
git clone https://github.com/13rac1/scfbuild.git SCFBuild
make -j 4
Expand Down
6 changes: 6 additions & 0 deletions linux/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
fonts-twemoji-svginot (14.0.2-1) bionic; urgency=medium

* Update to twemoji 14.0.2.

-- Brad Erickson <[email protected]> Mon, 27 Oct 2022 13:37:13 -0700

fonts-twemoji-svginot (13.1.0-1) bionic; urgency=medium

* Update to twemoji 13.1.0.
Expand Down
9 changes: 2 additions & 7 deletions linux/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: extra
Standards-Version: 3.9.5
Maintainer: Brad Erickson <[email protected]>
Build-Depends: debhelper (>= 9)
Homepage: https://github.com/eosrei/twemoji-color-font
Homepage: https://github.com/13rac1/twemoji-color-font

Package: fonts-twemoji-svginot
Architecture: all
Expand All @@ -16,9 +16,4 @@ Depends:
Enhances:
firefox
Description: Twitter Emoji color emoji SVGinOT font
A color emoji SVGinOT font using Twitter for Everyone graphics with diversity
and country flags.
.
Currently only Mozilla Firefox and Thunderbird support SVGinOT fonts.
.
Should not be installed at the same time as: fonts-emojione-svginot
A color emoji SVGinOT font created from Twitter for Everyone emoji graphics
2 changes: 1 addition & 1 deletion linux/fontconfig/46-twemoji-color.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Twitter Color Emoji SVGinOT Font
Fontconfig fonts.conf for a Bitstream Vera default
https://github.com/eosrei/twemoji-color-font
https://github.com/13rac1/twemoji-color-font
The DejaVu font family is based on the Bitstream Vera font family to provide
greater unicode coverage. The only way to override the emoji it includes is
Expand Down
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
#https://github.com/eosrei/twemoji-color-font
#https://github.com/13rac1/twemoji-color-font
echo -e "Twitter Color Emoji font installer for Linux\n"

# Check for Bitstream Vera
Expand Down
2 changes: 1 addition & 1 deletion linux/uninstall.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
#https://github.com/eosrei/twemoji-color-font
#https://github.com/13rac1/twemoji-color-font
echo "Twitter Color Emoji font uninstaller for Linux\n"

set -v
Expand Down
10 changes: 5 additions & 5 deletions scfbuild-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ color_transform: translate(0 -6.75)
width_space: 561
table_name:
copyright: >
Copyright 2021 Brad Erickson CC-BY-4.0
Copyright 2021 Twitter, Inc. CC-BY-4.0
Copyright 2022 Brad Erickson CC-BY-4.0
Copyright 2022 Twitter, Inc. CC-BY-4.0
family: Twitter Color Emoji
# Subfamily is also called Style or Weight. Often set to: Regular
subfamily: Regular
unique_id: Twitter Color Emoji SVGinOT eosrei.net
unique_id: Twitter Color Emoji SVGinOT 13rac1.com
full_name: Twitter Color Emoji SVGinOT
#version:
# Use the same postscript name as the Apple Color Emoji font to overide it.
Expand All @@ -30,8 +30,8 @@ table_name:
designer: Twitter, Inc.
description: >
A SVGinOT color emoji font using the Twitter Emoji for Everyone set:
https://github.com/eosrei/twemoji-color-font
url_vendor: https://github.com/eosrei/twemoji-color-font
https://github.com/13rac1/twemoji-color-font
url_vendor: https://github.com/13rac1/twemoji-color-font
url_designer: https://github.com/twitter/twemoji
license: Creative Commons Attribution 4.0 International
url_license: http://creativecommons.org/licenses/by/4.0/
10 changes: 5 additions & 5 deletions scfbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ color_transform: translate(0 -6.75)
width_space: 561
table_name:
copyright: >
Copyright 2021 Brad Erickson CC-BY-4.0
Copyright 2021 Twitter, Inc. CC-BY-4.0
Copyright 2022 Brad Erickson CC-BY-4.0
Copyright 2022 Twitter, Inc. CC-BY-4.0
family: Twitter Color Emoji
# Subfamily is also called Style or Weight. Often set to: Regular
subfamily: Regular
unique_id: Twitter Color Emoji SVGinOT eosrei.net
unique_id: Twitter Color Emoji SVGinOT 13rac1.com
full_name: Twitter Color Emoji SVGinOT
#version:
# No spaces in PostScript Names
Expand All @@ -30,8 +30,8 @@ table_name:
designer: Twitter, Inc.
description: >
A SVGinOT color emoji font using the Twitter Emoji for Everyone set:
https://github.com/eosrei/twemoji-color-font
url_vendor: https://github.com/eosrei/twemoji-color-font
https://github.com/13rac1/twemoji-color-font
url_vendor: https://github.com/13rac1/twemoji-color-font
url_designer: https://github.com/twitter/twemoji
license: Creative Commons Attribution 4.0 International
url_license: http://creativecommons.org/licenses/by/4.0/

0 comments on commit e451b5d

Please sign in to comment.