Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move default fonts to new crate epaint_default_fonts #4853

Merged
merged 3 commits into from
Jul 31, 2024

Conversation

alex-pinkus
Copy link
Contributor

@alex-pinkus alex-pinkus commented Jul 20, 2024

This allows license checking tools to omit the OFL and UFL licenses when default_fonts are turned off.

There was some discussion of versioning on the original issue; I have chosen to label this version as 0.28.1 to match the other crates. Happy to adjust the version as needed.

This allows license checking tools to omit the OFL and UFL licenses when
`default_fonts` are turned off.

Fixes emilk#2321
@alex-pinkus alex-pinkus force-pushed the epaint_default_fonts branch from 2606b9a to 7046a7b Compare July 20, 2024 21:25
@alex-pinkus alex-pinkus marked this pull request as ready for review July 20, 2024 21:25
Copy link
Owner

@emilk emilk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very thorough ⭐

All notable changes to the `epaint_default_fonts` crate will be documented in this file.

This file is updated upon each release.
Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we need to also add epaint_default_fonts to the crate_names field in scripts/generate_changelog.py

Comment on lines 5 to 8
pub const HACK_REGULAR: &[u8] = include_bytes!("../fonts/Hack-Regular.ttf");
pub const NOTO_EMOJI_REGULAR: &[u8] = include_bytes!("../fonts/NotoEmoji-Regular.ttf");
pub const UBUNTU_LIGHT: &[u8] = include_bytes!("../fonts/Ubuntu-Light.ttf");
pub const EMOJI_ICON: &[u8] = include_bytes!("../fonts/emoji-icon-font.ttf");
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For bonus points, add some nice docstrings to these :) But only if you want

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll see what I can come up with without having much context on these choices :)

@emilk emilk added dev-experience epaint_default_fonts Default fonts embedded with epaint/eguu labels Jul 30, 2024
@emilk
Copy link
Owner

emilk commented Jul 30, 2024

We should also add epaint_default_fonts to

labels: "CI, dependencies, docs and examples, ecolor, eframe, egui_extras, egui_glow, egui-wgpu, egui-winit, egui, epaint, exclude from changelog, typo"

@alex-pinkus
Copy link
Contributor Author

Ok, comments addressed!

@emilk emilk changed the title Migrate default fonts to a new crate Move default fonts to new crate epaint_default_fonts Jul 31, 2024
@emilk emilk merged commit ae7672e into emilk:master Jul 31, 2024
19 checks passed
@emilk
Copy link
Owner

emilk commented Jul 31, 2024

Thanks!

@alex-pinkus alex-pinkus deleted the epaint_default_fonts branch July 31, 2024 13:34
486c pushed a commit to 486c/egui that referenced this pull request Oct 9, 2024
This allows license checking tools to omit the OFL and UFL licenses when
`default_fonts` are turned off.

There was some discussion of versioning on the original issue; I have
chosen to label this version as `0.28.1` to match the other crates.
Happy to adjust the version as needed.

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to test and add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

* Closes <emilk#2321>
* [X] I have followed the instructions in the PR template

---------

Co-authored-by: Alex Pinkus <pinkus@amazon.com>
hacknus pushed a commit to hacknus/egui that referenced this pull request Oct 30, 2024
This allows license checking tools to omit the OFL and UFL licenses when
`default_fonts` are turned off.

There was some discussion of versioning on the original issue; I have
chosen to label this version as `0.28.1` to match the other crates.
Happy to adjust the version as needed.

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to test and add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

* Closes <emilk#2321>
* [X] I have followed the instructions in the PR template

---------

Co-authored-by: Alex Pinkus <pinkus@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dev-experience epaint_default_fonts Default fonts embedded with epaint/eguu
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Licenses for default embedded fonts not included in epaint crate license
2 participants