mirror of
https://github.com/emilk/egui.git
synced 2026-06-26 14:49:06 -04:00
699fc7e887
<!-- Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/main/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 N/A * [x] I have followed the instructions in the PR template This was mostly from last month, but I never got around to submitting it. This PR adds font variation coordinates to the `TextFormat` struct, and uses them when rendering text. The coordinates are stored in a `SmallVec`; I've chosen to store up to 2 inline, which makes it take up 24 bytes (the minimum possible for a `SmallVec`). The variation axis tags are stored as the `font_types::Tag` type, which I've chosen to re-export from `epaint::text`. The variation coordinates are resolved to a `skrifa::Location` during font rendering/scaling, and are cached in the same way as all the other scaled metrics. I've renamed the `ScaledMetrics` struct to `StyledMetrics`, since it now also contains the resolved variation coordinates. I haven't benchmarked the performance of text layout with variation coordinates, but the existing text layout performance is unchanged. I've replaced the API for manually overriding a font's weight (https://github.com/emilk/egui/pull/7790) with an API for manually overriding any variation coordinates via `FontTweak`. This should support the same use case as #7790 while being substantially more flexible. I have *not* yet added any higher-level API for mapping style attributes (weight, width, slant, etc) to variation coordinates or to different font faces within a single family. That's a pretty huge can of worms, and it'd involve rethinking the split between `FontId` and `TextFormat` (and whether `FontId` is so big that we should provide a way to reuse it). This API is intentionally pretty low-level for now. Likewise, I've intentionally not used variation coordinates when computing a font's row height. I can't think of any fonts that change their vertical metrics depending on variation axes, so this should be fine for now. --------- Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
154 lines
3.4 KiB
TOML
154 lines
3.4 KiB
TOML
# https://github.com/crate-ci/typos
|
|
# install: cargo install typos-cli
|
|
# run: typos
|
|
|
|
[default.extend-words]
|
|
ime = "ime" # Input Method Editor
|
|
nknown = "nknown" # part of @55nknown username
|
|
isse = "isse" # part of @IsseW username
|
|
tye = "tye" # part of @tye-exe username
|
|
ro = "ro" # read-only, also part of the username @Phen-Ro
|
|
typ = "typ" # Often used because `type` is a keyword in Rust
|
|
wdth = "wdth" # The `wdth` tag is used in variable fonts
|
|
|
|
# I mistype these so often
|
|
tesalator = "tessellator"
|
|
teselator = "tessellator"
|
|
tessalator = "tessellator"
|
|
tesselator = "tessellator"
|
|
tesalation = "tessellation"
|
|
teselation = "tessellation"
|
|
tessalation = "tessellation"
|
|
tesselation = "tessellation"
|
|
|
|
|
|
# Use the more common spelling
|
|
adaptor = "adapter"
|
|
adaptors = "adapters"
|
|
|
|
# For consistency we prefer American English:
|
|
aeroplane = "airplane"
|
|
analogue = "analog"
|
|
analyse = "analyze"
|
|
appetiser = "appetizer"
|
|
arbour = "arbor"
|
|
ardour = "arbor"
|
|
armour = "armor"
|
|
artefact = "artifact"
|
|
authorise = "authorize"
|
|
behaviour = "behavior"
|
|
behavioural = "behavioral"
|
|
British = "American"
|
|
calibre = "caliber"
|
|
# cancelled = "canceled" # winit uses this :(
|
|
candour = "candor"
|
|
capitalise = "capitalize"
|
|
catalogue = "catalog"
|
|
centre = "center"
|
|
characterise = "characterize"
|
|
chequerboard = "checkerboard"
|
|
chequered = "checkered"
|
|
civilise = "civilize"
|
|
clamour = "clamor"
|
|
colonise = "colonize"
|
|
colour = "color"
|
|
coloured = "colored"
|
|
cosy = "cozy"
|
|
criticise = "criticize"
|
|
defence = "defense"
|
|
demeanour = "demeanor"
|
|
dialogue = "dialog"
|
|
distil = "distill"
|
|
doughnut = "donut"
|
|
dramatise = "dramatize"
|
|
draught = "draft"
|
|
emphasise = "emphasize"
|
|
endeavour = "endeavor"
|
|
enrol = "enroll"
|
|
epilogue = "epilog"
|
|
equalise = "equalize"
|
|
favour = "favor"
|
|
favourite = "favorite"
|
|
fibre = "fiber"
|
|
flavour = "flavor"
|
|
fulfil = "fufill"
|
|
gaol = "jail"
|
|
grey = "gray"
|
|
greys = "grays"
|
|
greyscale = "grayscale"
|
|
harbour = "habor"
|
|
honour = "honor"
|
|
humour = "humor"
|
|
instalment = "installment"
|
|
instil = "instill"
|
|
jewellery = "jewelry"
|
|
kerb = "curb"
|
|
labour = "labor"
|
|
litre = "liter"
|
|
lustre = "luster"
|
|
meagre = "meager"
|
|
metre = "meter"
|
|
mobilise = "mobilize"
|
|
monologue = "monolog"
|
|
naturalise = "naturalize"
|
|
neighbour = "neighbor"
|
|
neighbourhood = "neighborhood"
|
|
normalise = "normalize"
|
|
normalised = "normalized"
|
|
odour = "odor"
|
|
offence = "offense"
|
|
organise = "organize"
|
|
parlour = "parlor"
|
|
plough = "plow"
|
|
popularise = "popularize"
|
|
pretence = "pretense"
|
|
programme = "program"
|
|
prologue = "prolog"
|
|
rancour = "rancor"
|
|
realise = "realize"
|
|
recognise = "recognize"
|
|
recognised = "recognized"
|
|
rigour = "rigor"
|
|
rumour = "rumor"
|
|
sabre = "saber"
|
|
satirise = "satirize"
|
|
saviour = "savior"
|
|
savour = "savor"
|
|
sceptical = "skeptical"
|
|
sceptre = "scepter"
|
|
sepulchre = "sepulcher"
|
|
serialisation = "serialization"
|
|
serialise = "serialize"
|
|
serialised = "serialized"
|
|
skilful = "skillful"
|
|
sombre = "somber"
|
|
specialisation = "specialization"
|
|
specialise = "specialize"
|
|
specialised = "specialized"
|
|
splendour = "splendor"
|
|
standardise = "standardize"
|
|
sulphur = "sulfur"
|
|
symbolise = "symbolize"
|
|
theatre = "theater"
|
|
tonne = "ton"
|
|
travelogue = "travelog"
|
|
tumour = "tumor"
|
|
valour = "valor"
|
|
vaporise = "vaporize"
|
|
vigour = "vigor"
|
|
|
|
# null-terminated is the name of the wikipedia article!
|
|
# https://en.wikipedia.org/wiki/Null-terminated_string
|
|
nullterminated = "null-terminated"
|
|
zeroterminated = "null-terminated"
|
|
zero-terminated = "null-terminated"
|
|
|
|
|
|
[files]
|
|
extend-exclude = ["web_demo/egui_demo_app.js"] # auto-generated
|
|
|
|
[default]
|
|
extend-ignore-re = [
|
|
"#\\[doc\\(alias = .*", # We suggest "grey" in some doc
|
|
]
|