build/readme: Rename "Emoji One" to "EmojiOne"

Ranks Inc. rebranded to remove the space in the title.

15 files changed, 65 insertions, 67 deletions

diff --git a/LICENSE.md b/LICENSE.md
index b90855b..8d2b34c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -4,7 +4,7 @@
 * Copyright 2015 Ranks.com Inc. CC-BY-4.0
 
 ## Artwork
-* Applies to SVG file and TTF font files
+* Applies to SVG files and TTF font files
 * License: Creative Commons Attribution 4.0 International
 * Human Readable License: http://creativecommons.org/licenses/by/4.0/
 * Complete Legal Terms: http://creativecommons.org/licenses/by/4.0/legalcode
@@ -14,8 +14,8 @@
 * License: MIT
 * Complete Legal Terms: http://opensource.org/licenses/MIT
 
-## Emoji One License
-The SVG files of the [Emoji One](http://emojione.com/) project have been
+## EmojiOne License
+The SVG files of the [EmojiOne](http://emojione.com/) project have been
 modified to create the fallback emoji glyphs and used as-is for the SVGinOT
 color glyphs. Files are stored in `assets/emojione-svg`.
 
@@ -23,4 +23,4 @@ color glyphs. Files are stored in `assets/emojione-svg`.
 * Art License: Creative Commons Attribution 4.0 International
 
 Please review the specific attribution requirements for commercial use of
-Emoji One icons: http://emojione.com/licensing/
+EmojiOne graphics: http://emojione.com/licensing/
diff --git a/Makefile b/Makefile
index 12c5829..3ee9dfd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Makefile to create all versions of the Emoji One Color SVGinOT font
+# Makefile to create all versions of the EmojiOne Color SVGinOT font
 # Run with: make -j [NUMBER_OF_CPUS]
 
 # Use Linux Shared Memory to avoid wasted disk writes. Use /tmp to disable.
diff --git a/README.md b/README.md
index 9ca5d60..56473aa 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Emoji One Color SVGinOT Font
-A color and B&W emoji SVGinOT font built from [Emoji One][1] artwork with
+# EmojiOne Color SVGinOT Font
+A color and B&W emoji SVGinOT font built from [EmojiOne][1] artwork with
 support for [ZWJ][2], [skin tone diversity][3] and [country flags][4].
 
 The font works in all operating systems, but will *currently* only show color
@@ -30,7 +30,7 @@ Regular B&W outline emoji are included for backwards/fallback compatibility.
 
 **Before**: Firefox in Ubuntu Linux.
 
-[![Before Emoji One Color in Firefox Linux](images/demo-before.png?raw=true)](images/before-linux-firefox.png?raw=true)
+[![Before EmojiOne Color in Firefox Linux](images/demo-before.png?raw=true)](images/before-linux-firefox.png?raw=true)
 
 **After**: Firefox in all three operating systems, plus fall back outline
 characters in the other browsers.
@@ -63,8 +63,8 @@ systems default serif, sans-serif and monospace fonts.*
 ### Why Bitstream Vera
 The default serif, sans-serif and monospace font for most Linux distributions is
 `DejaVu`. `DejaVu` includes a wide range of symbols which override the
-`Emoji One Color` characters. The previous solution was to make
-`Emoji One Color` the default system font, but that causes a number of issues.
+`EmojiOne Color` characters. The previous solution was to make
+`EmojiOne Color` the default system font, but that causes a number of issues.
 A better solution is a different font that doesn't override any emoji characters
 such as `Bitstream Vera`. `Bitstream Vera` is the source of the glyphs used in
 `DejaVu`, so it's not very different. 99%+ of people will not notice the
@@ -127,7 +127,7 @@ from releases: https://github.com/eosrei/emojione-color-font/releases
 2. ` EmojiOneColor-SVGinOT-OSX-1.0.zip` - A hack to replace the `Apple
    Color Emoji` font by [using the same internal name][9]. Install and accept
    the warning in Font Book.
-3. `emojione-apple.ttf` - A SBIX bitmap Apple-format Emoji One color font is
+3. `emojione-apple.ttf` - A SBIX bitmap Apple-format EmojiOne color font is
    [available in the emojione project][10].
 
 [9]:http://www.macissues.com/2014/11/21/how-to-change-the-default-system-font-in-mac-os-x/
diff --git a/assets/svg/README.md b/assets/svg/README.md
index 6718846..f6880f3 100644
--- a/assets/svg/README.md
+++ b/assets/svg/README.md
@@ -1,6 +1,6 @@
 ## Additional SVG files
 
-SVGs to fill in where the Emoji One is missing characters needed to create a
+SVGs to fill in where the EmojiOne is missing characters needed to create a
 complete font.
 
 * ‍👪 - `1f468-1f469-1f466.svg -> ../emojione-svg/1f46a.svg`: Symbolic link for
@@ -13,7 +13,7 @@ complete font.
   `../emojione-svg/1f441-1f538.svg`
 * 🗩 - `1f5e9.svg`: *Right Speech Bubble* from modified *Eye in Speech Bubble*
   `../emojione-svg/1f441-1f538.svg`
-* `20e3.svg`: Number Pad from modified SVGs in Emoji One.
+* `20e3.svg`: Number Pad from modified SVGs in EmojiOne.
 
 ### Todo
 1. Replace symlinks with substitutions.
diff --git a/full-demo.html b/full-demo.html
index 6c8dffe..b484906 100644
--- a/full-demo.html
+++ b/full-demo.html
@@ -5,7 +5,7 @@
   <style>
   body {
     font-size: 1em;
-    font-family: "Emoji One Color", sans-serif;
+    font-family: "EmojiOne Color", sans-serif;
   }
   .embiggen {
     font-size: 3em;
@@ -20,11 +20,11 @@
 <div>
 <p>
   <h2>Full set of color Unicode emoji supported by the
-    <a href="https://github.com/eosrei/EmojiOne-Color-Font">Emoji One Color SVG-in-OpenType font.</a>
+    <a href="https://github.com/eosrei/EmojiOne-Color-Font">EmojiOne Color SVG-in-OpenType font.</a>
   </h2>
 </p>
 
-<p>This will only show the <em>Emoji One Color</em> icons if you have the font
+<p>This will only show the <em>EmojiOne Color</em> icons if you have the font
 correctly installed. Please refer to the install instructions in the README.md
 file for details regarding your specific operating system.</p>
 </div>
diff --git a/linux/debian/control b/linux/debian/control
index 4a4d9b6..9926d36 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -15,8 +15,8 @@ Depends:
   ttf-bitstream-vera
 Enhances:
   firefox
-Description: Emoji One color emoji SVGinOT font
- A color emoji SVGinOT font using Emoji One graphics with diversity and country
+Description: EmojiOne color emoji SVGinOT font
+ A color emoji SVGinOT font using EmojiOne graphics with diversity and country
  flags.
  .
  Currently only Mozilla Firefox and Thunderbird support SVGinOT fonts.
diff --git a/linux/debian/copyright b/linux/debian/copyright
index 96f7aa6..80b018a 100644
--- a/linux/debian/copyright
+++ b/linux/debian/copyright
@@ -24,8 +24,7 @@ License: MIT
   OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: EmojiOneColor-SVGinOT.ttf
-Copyright: 2016 Brad Erickson
-  2016 Emoji One <https://github.com/Ranks/emojione>
-  2015 Twitter, Inc. <https://github.com/twitter/twemoji>
+Copyright: 2016 Brad Erickson <https://github.com/eosrei/emojione-color-font>
+  2016 Ranks.com Inc. <https://github.com/Ranks/emojione>
 License: CC-BY-4.0
   https://creativecommons.org/licenses/by/4.0/legalcode
diff --git a/linux/fontconfig/56-emojione-color.conf b/linux/fontconfig/56-emojione-color.conf
index 98b6f6e..8decf7e 100644
--- a/linux/fontconfig/56-emojione-color.conf
+++ b/linux/fontconfig/56-emojione-color.conf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!--
-Emoji One Color SVGinOT Font
+EmojiOne Color SVGinOT Font
 Fontconfig fonts.conf for a Bitstream Vera default
 
 https://github.com/eosrei/emojione-color-font
@@ -14,7 +14,7 @@ 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. Emoji One Color font is the first fallback, followed by DejaVu
+characters. EmojiOne Color font is the first fallback, followed by DejaVu
 (or whatever the existing default is) to provide everything else.
 
 Install required fonts with:
@@ -50,9 +50,9 @@ fc-match -s monospace
     <edit name="family" mode="prepend_first">
       <string>Bitstream Vera Serif</string>
     </edit>
-    <!-- Followed by Emoji One Color -->
+    <!-- Followed by EmojiOne Color -->
     <edit name="family" mode="prepend_first">
-      <string>Emoji One Color</string>
+      <string>EmojiOne Color</string>
     </edit>
   </match>
 
@@ -80,9 +80,9 @@ fc-match -s monospace
     <edit name="family" mode="prepend_first">
       <string>Bitstream Vera Sans</string>
     </edit>
-    <!-- Followed by Emoji One Color -->
+    <!-- Followed by EmojiOne Color -->
     <edit name="family" mode="prepend_first">
-      <string>Emoji One Color</string>
+      <string>EmojiOne Color</string>
     </edit>
   </match>
 
@@ -113,32 +113,32 @@ fc-match -s monospace
     <edit name="family" mode="prepend_first">
       <string>Bitstream Vera Sans Mono</string>
     </edit>
-    <!-- Followed by Emoji One Color -->
+    <!-- Followed by EmojiOne Color -->
     <edit name="family" mode="prepend_first">
-      <string>Emoji One Color</string>
+      <string>EmojiOne Color</string>
     </edit>
   </match>
 
   <!-- Add emoji generic family -->
   <alias binding="strong">
     <family>emoji</family>
-    <default><family>Emoji One Color</family></default>
+    <default><family>EmojiOne Color</family></default>
   </alias>
 
   <!-- Alias requests for the other emoji fonts -->
   <alias binding="strong">
     <family>Apple Color Emoji</family>
-    <prefer><family>Emoji One Color</family></prefer>
+    <prefer><family>EmojiOne Color</family></prefer>
     <default><family>sans-serif</family></default>
   </alias>
   <alias binding="strong">
     <family>Segoe UI Emoji</family>
-    <prefer><family>Emoji One Color</family></prefer>
+    <prefer><family>EmojiOne Color</family></prefer>
     <default><family>sans-serif</family></default>
   </alias>
   <alias binding="strong">
     <family>Noto Color Emoji</family>
-    <prefer><family>Emoji One Color</family></prefer>
+    <prefer><family>EmojiOne Color</family></prefer>
     <default><family>sans-serif</family></default>
   </alias>
 </fontconfig>
diff --git a/linux/install.sh b/linux/install.sh
index 6df56e7..7c05f23 100755
--- a/linux/install.sh
+++ b/linux/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #https://github.com/eosrei/emojione-color-font
-echo "Emoji One Color font installer for Linux\n"
+echo "EmojiOne Color font installer for Linux\n"
 
 # Check for Bitstream Vera
 fc-list | grep "Bitstream Vera" > /dev/null
diff --git a/linux/tests/expected-results.test b/linux/tests/expected-results.test
index b13b91a..29fadf0 100644
--- a/linux/tests/expected-results.test
+++ b/linux/tests/expected-results.test
@@ -1,52 +1,51 @@
 Font: sans
 Vera.ttf: "Bitstream Vera Sans" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: sans-serif
 Vera.ttf: "Bitstream Vera Sans" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: serif
 VeraSe.ttf: "Bitstream Vera Serif" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: mono
 VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: monospace
 VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: Bitstream Vera Sans
 Vera.ttf: "Bitstream Vera Sans" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: Bitstream Vera Serif
 VeraSe.ttf: "Bitstream Vera Serif" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: Bitstream Vera Sans Mono
 VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman"
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 
 Font: emoji
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 Vera.ttf: "Bitstream Vera Sans" "Roman"
 
-Font: Emoji One Color
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+Font: EmojiOne Color
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 Vera.ttf: "Bitstream Vera Sans" "Roman"
 
 Font: Apple Color Emoji
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 Vera.ttf: "Bitstream Vera Sans" "Roman"
 
 Font: Segoe UI Emoji
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 Vera.ttf: "Bitstream Vera Sans" "Roman"
 
 Font: Noto Color Emoji
-EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular"
+EmojiOneColor-SVGinOT.ttf: "EmojiOne Color" "Regular"
 Vera.ttf: "Bitstream Vera Sans" "Roman"
-
diff --git a/linux/tests/tests.sh b/linux/tests/tests.sh
index 3ae3c7a..94be00c 100755
--- a/linux/tests/tests.sh
+++ b/linux/tests/tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Tests of fontconfig configuration for Bitstream Vera and Emoji One Color.
+# Tests of fontconfig configuration for Bitstream Vera and EmojiOne Color.
 #
 # The first two lines of the results of fc-match for each font request are
 # are compared to known correct results. Any differences are shown.
@@ -18,7 +18,7 @@ FONTS[5]="Bitstream Vera Sans"
 FONTS[6]="Bitstream Vera Serif"
 FONTS[7]="Bitstream Vera Sans Mono"
 FONTS[8]="emoji"
-FONTS[9]="Emoji One Color"
+FONTS[9]="EmojiOne Color"
 FONTS[10]="Apple Color Emoji"
 FONTS[11]="Segoe UI Emoji"
 FONTS[12]="Noto Color Emoji"
diff --git a/linux/uninstall.sh b/linux/uninstall.sh
index 85aacab..8b6b4b6 100755
--- a/linux/uninstall.sh
+++ b/linux/uninstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #https://github.com/eosrei/emojione-color-font
-echo "Emoji One Color font uninstaller for Linux\n"
+echo "EmojiOne Color font uninstaller for Linux\n"
 
 set -v
 
diff --git a/mini-demo.html b/mini-demo.html
index d96cc48..7a44072 100644
--- a/mini-demo.html
+++ b/mini-demo.html
@@ -5,7 +5,7 @@
   <style>
   body {
     font-size: 1em;
-    font-family: "Emoji One Color", sans-serif;
+    font-family: "EmojiOne Color", sans-serif;
   }
   .embiggen {
     font-size: 3em;
@@ -17,7 +17,7 @@
 <div>
 <p>
   <strong>Demo set of color Unicode emoji supported by the
-    <a href="https://github.com/eosrei/EmojiOne-Color-Font">Emoji One Color SVG-in-OpenType font.</a>
+    <a href="https://github.com/eosrei/EmojiOne-Color-Font">EmojiOne Color SVG-in-OpenType font.</a>
   </strong>
 </p>
 </div>
@@ -30,7 +30,7 @@
 🇺🇸 🇧🇷 🇲🇹 🇸🇪 🇳🇬 🇰🇭 🇭🇷 🇮🇩 🇳🇿 🇪🇬 🇫🇮 🇨🇳<br/>
 </div>
 <div>
-  <p>This will only show the <em>Emoji One Color</em> font icons if you have the
+  <p>This will only show the <em>EmojiOne Color</em> font icons if you have the
   font correctly installed. Please refer to the install instructions in the
   README.md file for details regarding your specific operating system.</p>
 </div>
diff --git a/scfbuild-osx.yml b/scfbuild-osx.yml
index 272154d..d4ffe73 100644
--- a/scfbuild-osx.yml
+++ b/scfbuild-osx.yml
@@ -1,4 +1,4 @@
-# SCFBuild configuration file for Emoji One Color SVGinOT (OSX ONLY)
+# SCFBuild configuration file for EmojiOne Color SVGinOT (OSX ONLY)
 output_file: build/EmojiOneColor-SVGinOT-OSX.ttf
 verbose: False
 glyph_svg_dir: build/svg-trace
@@ -16,11 +16,11 @@ table_name:
   copyright: >
     Copyright 2016 Brad Erickson CC-BY-4.0
     Copyright 2015 Ranks.com Inc. CC-BY-4.0
-  family: Emoji One Color
+  family: EmojiOne Color
   # Subfamily is also called Style or Weight. Often set to: Regular
   subfamily: Regular
-  unique_id: Emoji One Color SVGinOT OSX eosrei.net
-  full_name: Emoji One Color SVGinOT OSX
+  unique_id: EmojiOne Color SVGinOT OSX eosrei.net
+  full_name: EmojiOne Color SVGinOT OSX
   # Use the same postscript name as the Apple Color Emoji font to overide it.
   postscript_name: AppleColorEmoji
   #trademark:
@@ -28,10 +28,10 @@ table_name:
   designer: Ranks.com Inc.
   description: >
     NOTE: This OSX specific font overrides Apple Color Emoji.
-    A SVGinOT color emoji font using the Emoji One set:
+    A SVGinOT color emoji font using the EmojiOne set:
     https://github.com/eosrei/emojione-color-font/
     Please review the attribution requirements for commercial
-    use of Emoji One icons:
+    use of EmojiOne graphics:
     http://emojione.com/licensing/
   url_vendor: https://github.com/eosrei/emojione-color-font/
   url_designer: http://emojione.com/
diff --git a/scfbuild.yml b/scfbuild.yml
index b1f3e61..ebc98e3 100644
--- a/scfbuild.yml
+++ b/scfbuild.yml
@@ -1,4 +1,4 @@
-# SCFBuild configuration file for Emoji One Color SVGinOT
+# SCFBuild configuration file for EmojiOne Color SVGinOT
 output_file: build/EmojiOneColor-SVGinOT.ttf
 verbose: False
 glyph_svg_dir: build/svg-trace
@@ -16,21 +16,21 @@ table_name:
   copyright: >
     Copyright 2016 Brad Erickson CC-BY-4.0
     Copyright 2015 Ranks.com Inc. CC-BY-4.0
-  family: Emoji One Color
+  family: EmojiOne Color
   # Subfamily is also called Style or Weight. Often set to: Regular
   subfamily: Regular
-  unique_id: Emoji One Color SVGinOT eosrei.net
-  full_name: Emoji One Color SVGinOT
+  unique_id: EmojiOne Color SVGinOT eosrei.net
+  full_name: EmojiOne Color SVGinOT
   # No spaces in PostScript Names
   postscript_name: EmojiOneColorSVGinOT
   #trademark:
   manufacturer: eosrei.net
   designer: Ranks.com Inc.
   description: >
-    A SVGinOT color emoji font using the Emoji One set:
+    A SVGinOT color emoji font using the EmojiOne set:
     https://github.com/eosrei/emojione-color-font/
     Please review the attribution requirements for commercial
-    use of Emoji One icons:
+    use of EmojiOne graphics:
     http://emojione.com/licensing/
   url_vendor: https://github.com/eosrei/emojione-color-font/
   url_designer: http://emojione.com/