Skip to content

Commit

Permalink
use Twemoji as default
Browse files Browse the repository at this point in the history
  • Loading branch information
raphamorim committed Sep 7, 2024
1 parent 8b189a7 commit dd732ce
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 97 deletions.
2 changes: 1 addition & 1 deletion docs/docs/config/fonts.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ weight = 800

## Emojis

You can also specify which emoji font you would like to use, by default will be loaded a built-in Noto Emoji.
You can also specify which emoji font you would like to use, by default will be loaded a built-in Twemoji color by Mozilla.

In case you would like to change:

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ language: 'en'
- Fix: Normalisation of size of nerd fonts width.
- Fix: sixel: Text doesn't overwrite sixels [#636](https://github.com/raphamorim/rio/issues/636).
- Initial support to Sixel protocol.
- Support to `fonts.emoji`. You can also specify which emoji font you would like to use, by default will be loaded a built-in Noto Emoji.
- Support to `fonts.emoji`. You can also specify which emoji font you would like to use, by default will be loaded a built-in Twemoji color by Mozilla.

In case you would like to change:

Expand Down
2 changes: 1 addition & 1 deletion sugarloaf/src/font/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ pub const FONT_CASCADIAMONO_SEMI_LIGHT_ITALIC: &[u8] =
pub const FONT_SYMBOLS_NERD_FONT_MONO: &[u8] =
font!("./resources/SymbolsNerdFontMono/SymbolsNerdFontMono-Regular.ttf");

pub const FONT_NOTO_EMOJI: &[u8] = font!("./resources/NotoEmoji/NotoEmoji.ttf");
pub const FONT_TWEMOJI_EMOJI: &[u8] = font!("./resources/Twemoji/Twemoji.Mozilla.ttf");
2 changes: 1 addition & 1 deletion sugarloaf/src/font/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ impl FontLibraryData {
}
} else {
self.inner.push(FontSource::Data(
FontData::from_slice(FONT_NOTO_EMOJI).unwrap(),
FontData::from_slice(FONT_TWEMOJI_EMOJI).unwrap(),
));
}

Expand Down
Binary file removed sugarloaf/src/font/resources/NotoEmoji/NotoEmoji.ttf
Binary file not shown.
93 changes: 0 additions & 93 deletions sugarloaf/src/font/resources/NotoEmoji/OFL.txt

This file was deleted.

32 changes: 32 additions & 0 deletions sugarloaf/src/font/resources/Twemoji/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## License for the Visual Design

The Emoji art in the twe-svg.zip archive comes from [Twemoji](https://twitter.github.io/twemoji),
and is used and redistributed under the CC-BY-4.0 [license terms](https://github.com/twitter/twemoji#license)
offered by the Twemoji project.

### Creative Commons Attribution 4.0 International (CC BY 4.0)
https://creativecommons.org/licenses/by/4.0/legalcode
or for the human readable summary: https://creativecommons.org/licenses/by/4.0/


#### You are free to:
**Share** — copy and redistribute the material in any medium or format

**Adapt** — remix, transform, and build upon the material for any purpose, even commercially.

The licensor cannot revoke these freedoms as long as you follow the license terms.


#### Under the following terms:
**Attribution** — You must give appropriate credit, provide a link to the license,
and indicate if changes were made.
You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.

**No additional restrictions** — You may not apply legal terms or **technological measures**
that legally restrict others from doing anything the license permits.

#### Notices:
You do not have to comply with the license for elements of the material in the public domain
or where your use is permitted by an applicable exception or limitation. No warranties are given.
The license may not give you all of the permissions necessary for your intended use.
For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
Binary file not shown.

0 comments on commit dd732ce

Please sign in to comment.