From 57bf01bb82081495caf9ddee6448c09e704235e5 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Mon, 5 Mar 2018 10:07:13 +0200
Subject: [PATCH] linux: Remove Bitstream Vera dependency and mentioning

Bitstream Vera is not used/needed anymore, so readme,
tests and configs were adjusted accordingly.
---
 README.md                              |  3 +--
 linux/debian/control                   |  3 +--
 linux/fontconfig/56-twemoji-color.conf | 13 ++++-------
 linux/install.sh                       | 10 +-------
 linux/tests/expected-results.test      | 32 ++++++++------------------
 linux/tests/tests.sh                   | 13 ++++-------
 scfbuild-osx.yml                       |  2 +-
 scfbuild.yml                           |  2 +-
 8 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index 55e016b0..a2734ffd 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,7 @@ SVGinOT Font demos (Firefox only):
 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
 
-*Note: This requires `Bitstream Vera` is installed and will change your
-systems default serif, sans-serif and monospace fonts.*
+*Note: This will change your default serif, sans-serif and monospace fonts to `DejaVu`.*
 
 ### Change default font on Linux
 The default serif, sans-serif and monospace font for most Linux distributions is
diff --git a/linux/debian/control b/linux/debian/control
index 735bb615..ba5ab809 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -11,8 +11,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends:
   ${misc:Depends},
-  fontconfig,
-  ttf-bitstream-vera
+  fontconfig
 Enhances:
   firefox
 Description: Twitter Emoji color emoji SVGinOT font
diff --git a/linux/fontconfig/56-twemoji-color.conf b/linux/fontconfig/56-twemoji-color.conf
index 728f0df8..540b0679 100644
--- a/linux/fontconfig/56-twemoji-color.conf
+++ b/linux/fontconfig/56-twemoji-color.conf
@@ -2,23 +2,18 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!--
 Twitter Color Emoji SVGinOT Font
-Fontconfig fonts.conf for a Bitstream Vera default
+Fontconfig fonts.conf for a DejaVu default
 
 https://github.com/eosrei/twemoji-color-font
 
-The DejaVu font family is based on the Bitstream Vera font family to provide
+The DejaVu font family is based on the DejaVu font family to provide
 greater unicode coverage. The only way to override the emoji it includes is
 to make the emoji font the primary system font. This shouldn't be a problem,
 but a number of programs do not correctly use font fallback resulting in font
 rendering errors everywhere.
 
-This font.conf makes Bitstream Vera the default font for Serif, Sans-Serif,
-and Monospace font requests since it does not contain any Unicode Emoji
-characters. Twitter Color Emoji font is the first fallback, followed by DejaVu
-(or whatever the existing default is) to provide everything else.
-
-Install required fonts with:
-sudo apt-get install ttf-bitstream-vera
+This font.conf makes DejaVu the default font for Serif, Sans-Serif,
+and Monospace font requests.
 
 Test with:
 fc-match -s serif
diff --git a/linux/install.sh b/linux/install.sh
index 466c56dc..ee99d96a 100755
--- a/linux/install.sh
+++ b/linux/install.sh
@@ -2,15 +2,7 @@
 #https://github.com/eosrei/twemoji-color-font
 echo "Twitter Color Emoji font installer for Linux\n"
 
-# Check for Bitstream Vera
-fc-list | grep "Bitstream Vera" > /dev/null
-RETURN=$?
-if [ $RETURN -ne 0 ];then
-  echo "Bitstream Vera font family not found. Please install it:"
-  echo "sudo apt-get install ttf-bitstream-vera"
-  exit 1
-fi
-echo "NOTE: Changing default font family to Bitstream Vera"
+echo "NOTE: Changing default font family to DejaVu"
 
 # Stop on errors
 set -e
diff --git a/linux/tests/expected-results.test b/linux/tests/expected-results.test
index ea7df7f5..b293983e 100644
--- a/linux/tests/expected-results.test
+++ b/linux/tests/expected-results.test
@@ -1,52 +1,40 @@
 Font: sans
-Vera.ttf: "Bitstream Vera Sans" "Roman"
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
 Font: sans-serif
-Vera.ttf: "Bitstream Vera Sans" "Roman"
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
 Font: serif
-VeraSe.ttf: "Bitstream Vera Serif" "Roman"
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
+DejaVuSerif.ttf: "DejaVu Serif" "Book"
 
 Font: mono
-VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman"
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
+DejaVuSansMono.ttf: "DejaVu Sans Mono" "Book"
 
 Font: monospace
-VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman"
-TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-
-Font: Bitstream Vera Sans
-Vera.ttf: "Bitstream Vera Sans" "Roman"
-TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-
-Font: Bitstream Vera Serif
-VeraSe.ttf: "Bitstream Vera Serif" "Roman"
-TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-
-Font: Bitstream Vera Sans Mono
-VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman"
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
+DejaVuSansMono.ttf: "DejaVu Sans Mono" "Book"
 
 Font: emoji
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-Vera.ttf: "Bitstream Vera Sans" "Roman"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
 Font: Twitter Color Emoji
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-Vera.ttf: "Bitstream Vera Sans" "Roman"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
 Font: Apple Color Emoji
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-Vera.ttf: "Bitstream Vera Sans" "Roman"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
 Font: Segoe UI Emoji
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-Vera.ttf: "Bitstream Vera Sans" "Roman"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
 Font: Noto Color Emoji
 TwitterColorEmoji-SVGinOT.ttf: "Twitter Color Emoji" "Regular"
-Vera.ttf: "Bitstream Vera Sans" "Roman"
+DejaVuSans.ttf: "DejaVu Sans" "Book"
 
diff --git a/linux/tests/tests.sh b/linux/tests/tests.sh
index 6c6c4bed..df25362c 100755
--- a/linux/tests/tests.sh
+++ b/linux/tests/tests.sh
@@ -14,14 +14,11 @@ FONTS[1]="sans-serif"
 FONTS[2]="serif"
 FONTS[3]="mono"
 FONTS[4]="monospace"
-FONTS[5]="Bitstream Vera Sans"
-FONTS[6]="Bitstream Vera Serif"
-FONTS[7]="Bitstream Vera Sans Mono"
-FONTS[8]="emoji"
-FONTS[9]="Twitter Color Emoji"
-FONTS[10]="Apple Color Emoji"
-FONTS[11]="Segoe UI Emoji"
-FONTS[12]="Noto Color Emoji"
+FONTS[5]="emoji"
+FONTS[6]="Twitter Color Emoji"
+FONTS[7]="Apple Color Emoji"
+FONTS[8]="Segoe UI Emoji"
+FONTS[9]="Noto Color Emoji"
 
 rm -f $TMP
 
diff --git a/scfbuild-osx.yml b/scfbuild-osx.yml
index 6f4dd7c3..96e338dc 100644
--- a/scfbuild-osx.yml
+++ b/scfbuild-osx.yml
@@ -11,7 +11,7 @@ glyph_translate_y: 150
 # Glyphs height is 2048, SVGs height is 45 x 2.048.
 # color_transform(y) = - 150/2048*45*2.048
 color_transform: translate(0 -6.75)
-# Space width matching DejaVu Sans and Bitstream Vera Sans.
+# Space width matching DejaVu Sans.
 width_space: 561
 table_name:
   copyright: >
diff --git a/scfbuild.yml b/scfbuild.yml
index 292588fa..a9c61894 100644
--- a/scfbuild.yml
+++ b/scfbuild.yml
@@ -11,7 +11,7 @@ glyph_translate_y: 150
 # Glyphs height is 2048, SVGs height is 45 x 2.048.
 # color_transform(y) = - 150/2048*45*2.048
 color_transform: translate(0 -6.75)
-# Space width matching DejaVu Sans and Bitstream Vera Sans.
+# Space width matching DejaVu Sans.
 width_space: 561
 table_name:
   copyright: >