diff options
author | Brad Erickson <eosrei@gmail.com> | 2016-06-10 01:46:44 +0300 |
---|---|---|
committer | Brad Erickson <eosrei@gmail.com> | 2016-06-10 01:46:44 +0300 |
commit | c470e82d3943e7064209019a50b5ec9bd05d3956 (patch) | |
tree | 410f5708ddee781676b2b5c02fe8f2db3b09b408 /linux | |
parent | 55c1ca587aa01024808f6c9be847e35d2ddf3d0e (diff) |
build/readme: Rename "Emoji One" to "EmojiOne"
Ranks Inc. rebranded to remove the space in the title.
Diffstat (limited to 'linux')
-rw-r--r-- | linux/debian/control | 4 | ||||
-rw-r--r-- | linux/debian/copyright | 5 | ||||
-rw-r--r-- | linux/fontconfig/56-emojione-color.conf | 24 | ||||
-rwxr-xr-x | linux/install.sh | 2 | ||||
-rw-r--r-- | linux/tests/expected-results.test | 29 | ||||
-rwxr-xr-x | linux/tests/tests.sh | 4 | ||||
-rwxr-xr-x | linux/uninstall.sh | 2 |
7 files changed, 34 insertions, 36 deletions
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 |