Compare commits

...

224 commits

Author SHA1 Message Date
Dave Crossland
9e5a57d167
Update CONTRIBUTING.md
Some checks failed
Continuous Test + Deploy / health_check (push) Has been cancelled
2025-05-28 13:32:04 -06:00
Rod
22e5646262
Merge pull request #486 from googlefonts/u16
U16
2024-10-03 08:38:07 -07:00
Rod S
c3ca238295 More resolutions 2024-10-02 15:18:03 -07:00
rsheeter
60ac8a9e2f v2.047 2024-10-02 15:18:03 -07:00
rsheeter
be664c7417 Fix bug in full_rebuild.sh 2024-10-02 15:18:03 -07:00
rsheeter
84440686ad Make rebuilding a bit simpler 2024-10-02 15:18:03 -07:00
Rod S
124c7d40bb Update for unicode 16.0 2024-10-02 15:18:02 -07:00
Dave Crossland
254596e5f8
Update LICENSE to OFL 2024-07-29 12:02:03 -06:00
Rod
41e31b110b
Merge pull request #458 from googlefonts/flags-only
Add flags-only CBDT font
2024-02-15 10:14:44 -08:00
rsheeter
8eb7491de6 Flags-only name values 2024-02-14 13:28:31 -08:00
rsheeter
797dbcf1ff Add flags-only CBDT font 2024-02-09 14:31:58 -08:00
Rod
9cde38ef5e
Merge pull request #449 from googlefonts/wilderwells-patch-1
Update README.md
2023-12-08 09:35:24 -08:00
wilder
45b211a7c6
Update README.md 2023-12-06 20:43:20 -07:00
Rod
d79d23e682
Merge pull request #448 from googlefonts/flag
Update the flag of Martinique
2023-11-29 20:13:46 -08:00
Rod S
f06dfe7cfb v2.042 2023-11-29 19:56:59 -08:00
Rod S
461ec390d8 Updated flag of Martinique 2023-11-29 19:56:59 -08:00
Rod
6b236020c7
Merge pull request #447 from googlefonts/bug
Rebuild with mistaken change to 1fae5 reverted
2023-11-27 13:01:41 -08:00
Rod S
8a5d56d7b8 Rebuild as v2.041
Update postproc to update head.fontRevision
2023-11-20 19:33:22 -08:00
Rod S
69db164275 Bad change to 1fae5 2023-11-20 17:41:37 -08:00
Rod
144e84dbc2
Merge pull request #440 from googlefonts/e151
v2.040
2023-11-16 23:07:07 -08:00
Rod
30b7912f47
Merge pull request #13 from googlefonts/emoji151
Emoji 15.1
2023-11-16 22:39:06 -08:00
Rod S
95e82d4812 Add a test for fsType and fix fsType in COLRv1 2023-11-16 22:34:40 -08:00
Rod S
9ea961ce40 Fix head version which should make shiny new CI pass 2023-11-16 22:25:04 -08:00
Rod S
4b5ed4b8c7 Add CI to capture version silliness 2023-11-16 22:25:03 -08:00
Rod S
9a5d7de132 Additional resolutions 2023-11-16 22:25:03 -08:00
Rod S
3cf77fc485 v2.040, emoji 15.1 2023-11-16 22:24:59 -08:00
Rod
83d60b6b75
Merge pull request #15 from googlefonts/catchup
Catch up with downstream
2023-11-16 22:22:45 -08:00
Cosimo Lupo
934a5706f1
Merge pull request #418 from googlefonts/colrv1-allow-embedding
colrv1_postproc.py: set OS/2.fsType=0 to remove font embedding restrictions
2023-03-10 18:35:14 +00:00
Cosimo Lupo
b55be68324
colrv1_postproc.py: set OS/2.fsType=0 to remove font embedding restrictions
The old CBDT/CBLC font similarly has no font embedding restrictions (OS/2.fsType=0), so the COLRv1 font needs to match that.

Fixes https://github.com/google/fonts/issues/5729
2023-03-10 18:19:13 +00:00
Rod
341cf6add6
Merge pull request #413 from googlefonts/no0
No 0 dims
2023-01-17 12:37:55 -08:00
Rod S
dbd072ec5d No 0 dims 2023-01-12 22:46:20 -08:00
Rod
b312b3dea8
Merge pull request #412 from googlefonts/ec
CBDT header version
2022-12-14 18:43:08 -08:00
Rod S
cfc299192e CBDT header version 2022-12-14 16:44:31 -08:00
Rod
412b9edf8a
Merge pull request #409 from googlefonts/ec
Add noflags and emojicompat variants
2022-12-02 09:14:16 -08:00
Rod S
db0e393433 Ran fix_colr_font_revision.py 2022-11-16 21:54:33 -08:00
Rod S
e8f3ab2060 Add emojicompat metadata 2022-11-16 21:18:23 -08:00
Rod S
9090ff0673 Create no-flags CBDT font 2022-11-16 20:57:30 -08:00
Rod
f826707b28
Merge pull request #404 from googlefonts/asset_fix
Asset fix
2022-09-19 18:20:37 -07:00
Rod S
c79f4f80c5 Rebuilt CBDT fonts 2022-09-19 18:13:46 -07:00
Rod S
df5f8f637d Surely nobody would forget to run the size check 2022-09-19 18:13:27 -07:00
Rod S
c853280d92 Fix 1fa76, 1fa77 resolutions 2022-09-19 18:01:33 -07:00
Rod S
c3acfdf12d Generate additional resolutions for recently modified assets 2022-09-19 18:01:33 -07:00
Rod
e8073ab740
Merge pull request #401 from googlefonts/e15
15.0
2022-09-15 19:47:56 -07:00
Rod
98f588d6a7
Merge pull request #9 from googlefonts/emoji15
Emoji 15, take 1
2022-09-06 11:40:33 -07:00
Rod S
e9a146586b Consolidate instructions 2022-09-06 11:33:22 -07:00
Rod S
1b5d40344a Rebuilt COLRv1 fonts 2022-09-06 11:25:08 -07:00
Rod S
7f2b4d6c31 Update the CBDT fonts 2022-09-06 11:02:15 -07:00
Rod S
45edf6ddde Use latest nanoemoji 2022-09-06 10:56:53 -07:00
Rod S
5dc1825cf3 v2.038 2022-09-06 10:55:46 -07:00
Rod S
4b1c5bfb0d Late breaking changes to clapping hands 2022-09-06 10:48:25 -07:00
Rod
cf08fde618
Merge pull request #11 from googlefonts/postproc_script
Update postproc script and instructions
2022-09-06 10:39:04 -07:00
Rod S
58e371b3d4 Update postproc script and instructions 2022-09-06 10:37:41 -07:00
Rod S
9aca844e1b Rebuild COLRv1 and CBDT fonts 2022-08-22 18:47:47 -07:00
Rod S
232b1e2038 Update version 2022-08-22 18:07:45 -07:00
Rod S
f36b1f6a92 Updated shaking face 2022-08-22 18:01:24 -07:00
Rod S
a80e47fb2e Updated the COLRv1 fonts 2022-08-17 19:50:31 -07:00
Rod S
289444b585 2.036 CBDT 2022-08-17 14:08:35 -07:00
Rod S
5cb1a131c6 Update version 2022-08-17 14:03:24 -07:00
Rod S
1456cb03b8 Update png/128 and svg/ with Jennifer's latest changes 2022-08-17 13:55:20 -07:00
Rod S
d2df12fccd Rebuilt COLR fonts 2022-08-12 14:14:26 -07:00
Rod S
adc89f825b Update COLRv1 config to include U15 content 2022-08-12 14:14:26 -07:00
Rod S
e6941f8d1d Rebuild CBDT after catching up repo with downstream changes 2022-08-12 14:14:26 -07:00
Rod S
59e94e9e78 Update the CBDT font 2022-08-12 14:14:25 -07:00
Rod S
d08111dcbf We need nototools to support U15 2022-08-12 14:14:25 -07:00
Rod S
eabd1f54c6 v2.035 2022-08-12 14:14:25 -07:00
Rod S
7aef3417cb Emoji 15 assets, take 1 2022-08-12 14:14:25 -07:00
Rod
14d0d1f243
Update README.md 2022-08-12 14:13:45 -07:00
Rod
14359c8a98
Merge pull request #10 from googlefonts/catch_ds
Pull changes made to downstream back up
2022-08-12 11:46:02 -07:00
Jennifer Daniel
3ee516e14f
Update README.md 2022-08-11 07:35:56 -04:00
Cosimo Lupo
86c19b00b7
Merge pull request #399 from googlefonts/generate-colrv1-configs
add script to generate colrv1 configs by globbing the relevant *.svg files
2022-07-21 17:41:21 +01:00
Cosimo Lupo
93be998cac colrv1/README.md: recommend to regenerate configs as initial step before build 2022-07-21 15:42:55 +02:00
Cosimo Lupo
b0a855e2db regenerate colrv1/*.toml files using new colrv1_generate_configs.py script 2022-07-21 15:30:15 +02:00
Cosimo Lupo
e5666815c1 [colrv1] add script to regenerate nanoemoji configs by globbing source *.svg sources
Fixes https://github.com/googlefonts/noto-emoji/issues/397
2022-07-21 15:30:15 +02:00
Cosimo Lupo
81a3995aa3
Merge pull request #389 from googlefonts/colrv1
COLRv1 edition
2022-07-21 09:57:05 +01:00
rsheeter
c0040cb09c
Merge pull request #387 from SaveTheRbtz/mistypes1
Fix trivial mistypes w/ codespell
2022-05-05 19:32:36 -07:00
Rod S
bc8671f7c9 Update to latest compiler 2022-05-04 21:32:55 -07:00
Rod S
dc8968de5f Remove now unnecessary files per code review 2022-05-04 21:02:17 -07:00
rsheeter
2203a22176
Merge pull request #388 from SaveTheRbtz/removeOldFont
Remove outdated NotoEmoji-Regular.ttf
2022-04-03 19:11:05 -07:00
Alexey Ivanov
1442f6acc8 Remove outdated NotoEmoji-Regular.ttf
B/W font was not updated for quite a while and stuck at 1.05 (fontversion 68813). Should it be deprecated at this point and removed from the repo?
2022-04-03 15:07:51 -07:00
Alexey Ivanov
e0aa941257 fix trivial mistypes w/ codespell 2022-04-02 22:05:51 -07:00
Cosimo Lupo
dc4a1a9ac7 Rebuild Noto-COLRv1 fonts
The only change is the .notdef glyph now has an outline thanks to https://github.com/googlefonts/nanoemoji/pull/379
2022-02-22 15:13:20 +00:00
Cosimo Lupo
8598b69ad3 requirements.txt: bump nanoemoji==0.12.2 2022-02-22 11:40:11 +00:00
Rod S
5bf4fd2a7e Config for a very large emoji font 2022-02-19 18:49:14 -08:00
Rod S
558c02485a Font files 2022-02-19 18:48:54 -08:00
rsheeter
e667644ec5
Merge pull request #378 from googlefonts/colrv1-handle-unknown-flags
Colrv1 handle unknown flags and don't include region indicators in noflags build
2022-02-03 19:16:10 -08:00
Cosimo Lupo
083b7fcad7 colrv1_postproc.py: handle missing regional indicators in noflags font
don't bother to do textwrap.dedent, as whitespace doesn't matter in FEA code
2022-02-03 19:13:48 +00:00
Cosimo Lupo
ec10159d1f colrv1/noflags.toml: exclude regional indicator symbols from noflags font 2022-02-03 19:05:13 +00:00
Cosimo Lupo
631766222f empty subdivision flag (1F3F4+E007F) should be mapped to uknown flag, not the black flag
The substitution BLACK_FLAG + CANCEL_TAG => UNKNOWN_FLAG is alrady handled by the _add_fallback_subs_for_unknown_flags method, added in the previous commit.
There's no BLACK_FLAG + CANCEL_TAG => BLACK_FLAG substituion in the current NotoColorEmoji.ttf CBDT font.
In fact, it makes much more sense that all unsupported subdivision flag sequences, i.e. BLACK_FLAG + (zero or more non-cancel tags) + CANCEL_TAG, are all displayed with the unknown flag. No reason to special case BLACK_FLAG + CANCEL_TAG.
I'm not sure where the conclusion about the BLACK_FLAG + CANCEL_TAG => BLACK_FLAG came from (got to ask Rod).
2022-02-03 12:28:16 +00:00
Cosimo Lupo
f8ec04e4a3 colrv1_postproc: add GSUB lookups replacing unsupported flags with the 'unknown flag'
Any invalid/unsupported emoji flag sequence (whether using regional indicators or subdivision tags) gets replaced by the 'unknown flag' (PUA 0xFE28B), a flag with a blue question mark in the middle.

The logic is mutated from the GSUB table of NotoColorEmoji.tmpl.ttx. We build these extra lookups using feaLib on an temporary empty font (that matches the glyph order of our destination CORLv1 font), then update our font's GSUB with them.
The PUA for the unknown flag is then removed from the cmap, as it's no longer needed. It's also deleted from the CBDT NotoColorEmoji (see emoji_builder.py).
2022-02-03 12:15:46 +00:00
Rod S
2a9ee805d6 Rebuilt with nanoemoji==0.11.1, picosvg==0.20.1 2022-02-02 17:46:51 -08:00
Cosimo Lupo
7de262169b Rebuilt Noto-COLRv1 fonts with nanoemoji 0.11.1 2022-02-02 10:59:57 +00:00
Cosimo Lupo
1136b6a210 Update nanoemoji >=0.11.1 in requirements.txt 2022-02-02 10:58:36 +00:00
Rod S
4fac75b218 Exploratory font with many color tables 2022-01-31 17:33:15 -08:00
Rod S
16f5f57a79 Rebuilt w/soft light 2022-01-28 21:32:55 -08:00
Cosimo Lupo
b83718269e colrv1_postproc: add vhea and vmtx to colrv1 font
copy values from CBDT font, adapt to the different UPEM (CBDT has 2048, COLRv1 has 1024, nanoemoji's default)
Maybe we shold just make the UPEM the same for both?
2022-01-26 16:47:00 +00:00
Cosimo Lupo
5d4f4d6b38 run black on colrv1_postproc.py script to fix indentation 2022-01-26 16:09:18 +00:00
rsheeter
831faf480d
Merge pull request #377 from googlefonts/colrv1-waved
Colrv1 waved => colrv1
2022-01-25 09:48:11 -08:00
Cosimo Lupo
5a04ef08ee call add_soft_light_to_flags from colrv1_postproc.py script 2022-01-24 18:07:11 +00:00
Cosimo Lupo
2188c2d237 also add soft-light to flags from emoji_aliases.txt 2022-01-24 18:06:46 +00:00
Cosimo Lupo
33f930ba7f add symlinks for flags from emoji_aliases.txt
Run command:
python add_aliases.py -e svg -a emoji_aliases.txt -s third_party/region-flags/waved-svg
2022-01-24 15:43:26 +00:00
Cosimo Lupo
43f5cc0153 delete svg files for flags' border and soft-light
they are no longer needed because the border is already in the original waved flags, and the soft ligth is added by a script
2022-01-24 15:40:06 +00:00
Cosimo Lupo
e4df897e53 rebuild waved flags with border using latest rsheeter/warp
https://github.com/rsheeter/warp/pull/24
2022-01-19 12:50:52 +00:00
Cosimo Lupo
13892a930c only post-process soft-light for flags, border will be added in the input SVGs and thus in COLRv1 font
the border can be added directly to the input waved flags SVGs like a regular path, we don't need to use PaintComposite multiply operator, regular alpha blending produces the same effect since the border is a semi transparent shade of gray.

I renamed the script colrv1_add_soft_light_to_flags.py, and modified so that it doesn't require any additional glyphs to be present; an unbounded PaintLinearGradient is built on the fly and clipped using the flag as a mask (using SRC_IN compositing mode).
2022-01-19 10:52:28 +00:00
Cosimo Lupo
24ccbd2377 rebuild all waved flags with new aspect ratio and margins
https://github.com/rsheeter/warp/pull/21
2022-01-14 17:18:20 +00:00
Cosimo Lupo
bc3a2584ad Add script to update NotoColorEmoji-COLRv1 with flags' border and soft-light effect 2022-01-14 16:53:37 +00:00
Cosimo Lupo
2e0c03e28c Add flag border and soft-light SVGs to colrv1/*.toml 2022-01-14 16:22:16 +00:00
Cosimo Lupo
1e662ddf9c colrv1/all.toml: add line breaks so diffs are more legible 2022-01-14 16:21:07 +00:00
Cosimo Lupo
5101367204 add border and soft-light SVGs in colrv1/flags-border 2022-01-14 16:14:42 +00:00
Cosimo Lupo
1f8201c939 Makefile: add print-% special command to print Makefile variables
I need to extract the content of SELECTED_FLAGS to know which of the flags actually get built into the emoji font
2022-01-14 16:07:03 +00:00
Cosimo Lupo
c839aba00d colrv1/noflags.toml: use subdivision flags from third_party/region-flags/waved-svg dir 2022-01-14 16:05:04 +00:00
Cosimo Lupo
dc1398866c Merge remote-tracking branch 'origin/svg_flags2' into colrv1-waved 2022-01-14 15:55:37 +00:00
Rod S
a17b1b474b Tweaks to make fontchain_lint happier 2022-01-06 21:54:41 -08:00
Rod S
a8f13094d0 Add non-regional flags 2022-01-06 20:28:57 -08:00
Rod S
49c85d1ac9 Add line breaks so diffs are legible 2022-01-05 21:52:46 -08:00
Rod S
9d0db6366a One more map to space 2022-01-05 21:14:23 -08:00
Rod S
48aa43748d Exploratory mapping of things to space to match observed shaping in CBDT 2021-12-29 19:08:03 -08:00
Rod S
d0bcf99532 Fixmore fontchain_lint issues 2021-12-23 17:44:08 -08:00
Rod S
f46188ee49 Script to derive somewhat more correct COLRv1 font from a good CBDT one 2021-12-22 15:43:23 -08:00
Rod S
8130ead956 Update svg paths 2021-12-22 14:45:26 -08:00
Rod S
9572d1c70e Start of a readme 2021-12-22 14:45:06 -08:00
Rod S
f868356f54 Init all and noflags nanoemoji configs from noto-glyf_colr_1.toml and noto_noflags-glyf_colr_1.toml in https://github.com/googlefonts/color-fonts at 24f193c. 2021-12-22 14:37:12 -08:00
Cosimo Lupo
17d694950f
Merge pull request #373 from anthrotype/svg_flags3
Rebuild all waved SVG flags with latest picosvg and rsheeter/warp tool
2021-12-15 12:28:55 +00:00
Cosimo Lupo
84a33221ec rebuild all waved flags after picosvg PR258 and 259
https://github.com/googlefonts/picosvg/pull/258
https://github.com/googlefonts/picosvg/pull/259
2021-12-14 16:44:40 +00:00
Cosimo Lupo
013b3fe5ca Rebuild all waved SVG flags with latest picosvg and rsheeter/warp tool
Fixes https://github.com/googlefonts/color-fonts/issues/86 among others
2021-12-07 15:56:46 +00:00
Cosimo Lupo
44850e02c0 Merge remote-tracking branch 'origin/main' into svg_flags2 2021-11-16 16:05:52 +00:00
rsheeter
9a5261d871
Merge pull request #369 from googlefonts/u14
U14
2021-11-01 11:50:28 -07:00
Rod S
be75986a58 Fix 1fae5 2021-10-29 15:25:50 -07:00
Rod S
317f03b41a Generate 32, 72, 512 sizes for U14 2021-10-28 20:55:25 -07:00
Rod S
eace274972 Binary v2.034 2021-10-28 20:55:25 -07:00
Rod S
79c9d18d75 v2.034 2021-10-28 20:55:25 -07:00
Rod S
b43c76ae0b Fix mk3 for 1fae5 2021-10-28 20:55:25 -07:00
Rod S
2e77677923 Binary v2.033 2021-10-28 20:55:25 -07:00
Rod S
395932ec12 Update to 2.033 2021-10-28 20:55:24 -07:00
Rod S
b9ed695ca7 1fae5 fix mk2 2021-10-28 20:55:24 -07:00
Rod S
c8ead26229 Binary v2.032 2021-10-28 20:55:24 -07:00
Rod S
b3765bf31e Update version to 2.032 2021-10-28 20:55:24 -07:00
Rod S
47ca3e25fe Rebuitl 1fae5 from updated ai 2021-10-28 20:55:24 -07:00
Rod S
8f48e32b07 v2.031 binaries 2021-10-28 20:55:24 -07:00
Rod S
8066412817 v2.031 2021-10-28 20:55:23 -07:00
Rod S
a6958e6682 Emoji fix from Jennifer 2021-10-28 20:55:23 -07:00
Rod S
0564f04afd Binaries for v2.030 2021-10-28 20:55:23 -07:00
Rod S
b5d185d4c5 v2.030 2021-10-28 20:55:23 -07:00
Rod S
5fd113856d Add missing 1f979 2021-10-28 20:55:23 -07:00
Rod S
4e3bdfe01a Binaries for v2.029 2021-10-28 20:55:23 -07:00
Rod S
0fb3e11347 v2.029 2021-10-28 20:55:23 -07:00
Rod S
59b294a971 Update notofonttools to one that knows about U14 2021-10-28 20:55:22 -07:00
Rod S
ac600ad695 U14 2021-10-28 20:55:22 -07:00
Dave Crossland
e022fd6573
Add prominent link to read me 2021-10-07 17:07:05 -06:00
Cosimo Lupo
b960563a02 Merge remote-tracking branch 'origin/main' into svg_flags2 2021-10-06 18:59:02 +02:00
Cosimo Lupo
7e734ad350
Merge pull request #366 from anthrotype/fix-orangutan
fix orangutan's arm, revert to good state from 24a33c4
2021-10-06 17:54:36 +01:00
Cosimo Lupo
bdf9594da1
Merge pull request #364 from googlefonts/strip-text-element
remove unsupported <text> element in emoji_u1f4b0.svg
2021-10-06 17:54:17 +01:00
Cosimo Lupo
39cb9b3564 fix orangutan's arm, revert to good state from 24a33c4
Fixes https://github.com/googlefonts/noto-emoji/issues/363
2021-09-23 10:11:01 +01:00
Cosimo Lupo
b3f06239c3
remove unsupported <text> element in emoji_u1f4b0.svg
An unsupported and apparently unused `<text>` element sneaked in emoji_u1f4b0.svg unnoticed along with the latest design changes (65dc359a).
This PR removes the offending line.
2021-09-22 15:49:52 +01:00
rsheeter
c05b4b47c8
Merge pull request #355 from googlefonts/design_update
Design update
2021-07-15 09:23:33 -07:00
rsheeter
59a388c867
Merge pull request #4 from googlefonts/missing
Add assets that were missing at some resolutions
2021-06-25 21:11:50 -07:00
Rod S
795b3b98cb Add additional resolutions for new assets 2021-06-25 21:09:45 -07:00
Rod S
c3b9453a5b Add a touch more detail to size check 2021-06-25 21:01:47 -07:00
rsheeter
9cba93e278
Merge pull request #3 from googlefonts/addtl_resolutions
Compile images at additional resolutions
2021-06-25 20:09:50 -07:00
Rod S
9481ce20ef Compile images at additional resolutions 2021-06-25 20:05:48 -07:00
rsheeter
e53053e624
Merge pull request #2 from googlefonts/june16_2021
Android S build
2021-06-25 13:16:48 -07:00
Rod S
6f11c8db69 Binary v2.028 2021-06-25 09:04:49 -07:00
Rod S
7d28153a40 Merge branch 'june16_2021' of github.com:googlefonts/noto-emoji-next into june16_2021 2021-06-25 09:00:30 -07:00
Rod S
a15e80decd v2.028 2021-06-25 09:00:06 -07:00
Rod S
aeb780b76c Potentially final design updates 2021-06-25 08:58:45 -07:00
Rod S
cbe971fd16 Font binaries for v2.027 2021-06-24 21:41:04 -07:00
Rod S
4164d2dde2 Merge branch 'june16_2021' of github.com:googlefonts/noto-emoji-next into june16_2021 2021-06-24 21:28:27 -07:00
Rod S
d3187eefe0 v2.027 2021-06-24 21:28:13 -07:00
Rod S
5c44f57fec 6/24 design updates 2021-06-24 21:27:06 -07:00
Rod S
298821f2ac Font binaries v2.026 2021-06-23 18:55:07 -07:00
Rod S
8a15aa2900 Bump version to 2.026 2021-06-23 18:50:07 -07:00
Rod S
26495b8580 Merge branch 'june16_2021' of github.com:googlefonts/noto-emoji-next into june16_2021 2021-06-23 18:48:27 -07:00
Rod S
14dc148e18 June 23rd design updates 2021-06-23 18:47:23 -07:00
Rod S
e99a2dc05a Update to hopefully fix bbox issues 2021-06-17 22:11:34 -07:00
Rod S
63a4b03a49 v2.025, fixes for bbox issues 2021-06-17 22:06:15 -07:00
Rod S
a064dc5388 Updated font build 2021-06-17 10:28:58 -07:00
Rod S
79b15596a7 Update version 2021-06-17 10:19:21 -07:00
Rod S
ec6f17d2ad June 16 emoji update. Some files rolled back for bad sizing. 2021-06-17 10:17:56 -07:00
Rod S
ec11827b63 Utility to confirm sizing 2021-06-17 10:17:07 -07:00
Rod S
6c4b81abcf Build v2.023, updated facemask 2021-05-17 13:25:23 -07:00
rsheeter
3a9d757dcb Update version to 2.023 2021-05-17 12:50:30 -07:00
rsheeter
fa537f08d5 Fix outdated face with mask 2021-05-17 12:47:27 -07:00
Rod S
f9e4c30634 Rebuilt font binaries 2021-05-14 23:11:20 -07:00
rsheeter
b786af768e Update to v2.022 2021-05-14 23:07:07 -07:00
rsheeter
d3e03595e4 Updated images with design updates 2021-05-14 23:02:31 -07:00
Rod S
87d96e953e Rebuilt font w/design updates 2021-05-14 22:51:49 -07:00
rsheeter
65dc359a15 Design updates 2021-05-14 22:51:48 -07:00
Cosimo Lupo
a2f11b307d update waved flags with new default --precision=1000
https://github.com/rsheeter/warp/pull/19
2021-05-13 16:56:25 +01:00
Cosimo Lupo
d97331d2f7 update waved flags using latest warp script
degenerate curves are turned into lines, thus saving more then 20% file size
2021-05-13 16:00:33 +01:00
rsheeter
948b1a7f1e
Merge pull request #346 from googlefonts/img_updates
A bad name snuck in
2021-05-10 20:30:45 -07:00
rsheeter
94764bb16d A bad name snuck in 2021-05-10 20:29:58 -07:00
rsheeter
ee66e5ec16
Merge pull request #345 from googlefonts/img_updates
Update some stale images
2021-05-10 19:57:44 -07:00
rsheeter
9bdaf2e265 Update some stale images 2021-05-10 19:55:46 -07:00
Cosimo Lupo
fb7279dac0 re-warp and update all the waved flags using latest picosvg 0.15.1 2021-04-23 14:23:00 +01:00
Cosimo Lupo
56f460154d Merge remote-tracking branch 'origin/main' into svg_flags2 2021-04-23 14:22:25 +01:00
Cosimo Lupo
5ccb3c2c39
Merge pull request #343 from googlefonts/south-georgia-flag
update flag of South Georgia and South Sandwich Islands
2021-04-23 09:00:42 +01:00
Cosimo Lupo
3c031c3dba update flag of South Georgia and South Sandwich Islands
The upstream copy on Wikipedia has been updated, so I'm updating it here as well.
The original SVG contained <text> element that referenced an external font (which is not web-safe and that doesn't exist on Wikimedia servers). The text was converted to paths to fix inconsistent renderings on different environments depending on the fallback font used.
2021-04-22 18:25:19 +01:00
rsheeter
fec0ef8478 Reran flag_preflight to strip unexpected whitespace 2021-03-01 20:45:16 -08:00
rsheeter
058c440bb2 Last two svgs that fail picosvg (https://github.com/googlefonts/color-fonts/issues/10); if this works then on to flags 2021-03-01 20:27:22 -08:00
rsheeter
a2640c381a Extremely preliminary build of waved flags 2021-03-01 20:03:25 -08:00
rsheeter
41ae6686ac
Merge pull request #334 from googlefonts/components
Create additional resolutions of component images
2021-02-23 16:15:33 -08:00
Rod S
dca24ebaa6 Create additional resolutions of component images 2021-02-23 16:13:51 -08:00
Rod S
aa34092a72 Syringe update 2021-02-16 20:46:04 -08:00
rsheeter
55420aed4f
Merge pull request #330 from googlefonts/img
Fix new resolutions of honey; there was a bad src
2021-01-29 23:29:40 -08:00
rsheeter
f250f4fa7a Fix new resolutions of honey; there was a bad src 2021-01-29 23:27:10 -08:00
rsheeter
8cf8514a66
Merge pull request #329 from googlefonts/img
Correct images rendered from wrong src
2021-01-29 22:15:23 -08:00
rsheeter
eaf1ea6861 Correct images rendered from wrong src 2021-01-29 22:13:44 -08:00
rsheeter
239cb8a08e
Merge pull request #328 from googlefonts/res
More resolutions
2021-01-27 21:26:40 -08:00
rsheeter
de7f127a26 More resolutions 2021-01-27 20:28:16 -08:00
Cosimo Lupo
e7ac893b33
Merge pull request #325 from kabisa/windows-font-readme
Explain extra Windows font
2020-12-14 14:47:00 +00:00
Roel Nieskens
3d67520e80 Add some more detail about Windows font specifics 2020-12-14 15:35:42 +01:00
Roel Nieskens
6bef0d5a44 Explain extra Windows font 2020-12-14 11:15:54 +01:00
Cosimo Lupo
750cf68f2d
Merge pull request #323 from kabisa/windows-compat
Build Windows compatible font
2020-12-08 09:22:57 +00:00
Roel Nieskens
7f7c086c7c Add code style tweaks 2020-11-17 15:07:26 +01:00
Roel Nieskens
175188712d Use enTable to create glyf + loca tables 2020-11-17 15:06:17 +01:00
rsheeter
24a33c4970 Fix 3 bad svgs 2020-11-13 21:06:21 -08:00
Roel Nieskens
385846bb4f Add glyf table on the fly
Instead of using a separate template, add_glyphs.py will add a
`glyf` and `loca` table when requested via a flag.
2020-11-04 11:36:01 +01:00
Roel Nieskens
f6be200765 Refactor glyf and cmap code
Thanks @anthrotype!
2020-11-03 10:32:25 +01:00
Roel Nieskens
a6543c344a Add new Noto Emoji binary font files 2020-11-02 14:28:00 +01:00
Roel Nieskens
6c222b5917 Add cmap format 4 3/1 table for Windows compatibility 2020-11-02 14:26:54 +01:00
Roel Nieskens
d453af82c9 Output Windows compatible font with glyf + loca table 2020-11-02 14:26:15 +01:00
Tomas
2881a5b2cc
Add missing dependency
Fixes #305

`convert` is coming from ImageMagick.
2020-10-27 11:44:17 +01:00
Tomas
4a6a3ca625
Merge pull request #320 from corollari/master
Add missing build dep & fix link
2020-10-27 11:12:29 +01:00
Albert
5b38436393 Fix link 2020-08-27 23:34:20 +02:00
Albert
90b08daa32 Add missing dependency 2020-08-27 23:33:19 +02:00
14147 changed files with 132392 additions and 48401 deletions

20
.github/workflows/ci.yml vendored Normal file
View file

@ -0,0 +1,20 @@
name: Continuous Test + Deploy
on:
push:
branches: [main]
tags: ["v*.*.*"]
pull_request:
branches: [main]
jobs:
health_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3
uses: actions/setup-python@v2
- name: Install FontTools
run: pip install fonttools pytest
- name: pytest
run: pytest

1
.gitignore vendored
View file

@ -3,3 +3,4 @@ __pycache__/
waveflag
build/
venv/
emojicompat/

47
BUILD.md Normal file
View file

@ -0,0 +1,47 @@
# Build instructions
Typically build the CBDT then the COLRv1 as COLRv1 copies some information from CBDT.
## Is this a Unicode rev?
* Update https://github.com/notofonts/nototools, publish the new version
* Must be done by a Googler. See internal instructions.
* Update emojicompat
* https://github.com/googlefonts/emojicompat?tab=readme-ov-file#support-new-unicode-sequences
* Update artwork
* Must be done by a Googler. Work with the emoji design team using internal instructions.
## Update version
Edit `NotoColorEmoji.tmpl.ttx.tmpl`
* In `<head>` find `fontRevision`.
* It should be of the form 2.xxx
* Increment xxx by 1
* In `<name>` find `<namerecord nameID="5" platformID="3" platEncID="1"
langID="0x409">`
* It should look like `Version
2.017;GOOG;noto-emoji:20180810:f1da3bc656f9`
* Update Version to match `<head>` (`Version 2.017` in the example)
* Update the date (`20180810` in the example)
* Update the commit
## Update new flags
* Add new flags to list in Makefile ([example](https://github.com/googlefonts/noto-emoji-next/commit/21bdd6107fac60979737ac95c2655cb02824d144))
* Update `third_party/region-flags`. For example, for CQ (Sark) update:
* `third_party/region-flags/png/CQ.png`
* This file can be highres, it will be resized by the CBDT build process
* This file should have the proportions of the flag
* `third_party/region-flags/svg/CQ.svg`
* This file is *not* required to have the `0 0 128 128` viewbox files in `/svg` have to have
* `third_party/region-flags/waved-svg/emoji_u1f1e8_1f1f6.svg`
* This file is produced using https://github.com/rsheeter/warp
* New flags are added to `wave_list.txt`
* To wave only the new flag delete other entries locally
## Rebuild the fonts
```bash
# Build CBDT, COLR, flags-only, and emojicompat fonts
$ ./full_rebuild.sh
```

View file

@ -1,27 +1,3 @@
Want to contribute? Great! First, read this page (including the small print
at the end).
We don't accept pull requests, or design requests in general.
### Before you contribute
Before we can use your code, you must sign the
[Google Individual Contributor License
Agreement](https://cla.developers.google.com/about/google-individual)
(CLA), which you can do online. The CLA is necessary mainly because you own the
copyright to your changes, even after your contribution becomes part of our
codebase, so we need your permission to use and distribute your code. We also
need to be sure of various other things—for instance that you'll tell us if you
know that your code infringes on other people's patents. You don't have to sign
the CLA until after you've submitted your code for review and a member has
approved it, but you must do it before we can put your code into our codebase.
Before you start working on a larger contribution, you should get in touch with
us first through the issue tracker with your idea so that we can help out and
possibly guide you. Coordinating up front makes it much easier to avoid
frustration later on.
### Code reviews
All submissions, including submissions by project members, require review.
We use Github pull requests for this purpose.
### The small print
Contributions made by corporations are covered by a different agreement than
the one above, the [Software Grant and Corporate Contributor License
Agreement](https://cla.developers.google.com/about/google-corporate).
The Google Emoji team leads this project internally, and this repo exists to ease integration of the Emoji font binaries (and SVG 'binaries', which are not true sources).

258
LICENSE
View file

@ -1,201 +1,93 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Copyright 2013 Google LLC
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://scripts.sil.org/OFL
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

View file

@ -13,7 +13,8 @@
# limitations under the License.
EMOJI = NotoColorEmoji
font: $(EMOJI).ttf
EMOJI_WINDOWS = NotoColorEmoji_WindowsCompatible
all: $(EMOJI).ttf $(EMOJI_WINDOWS).ttf
CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
LDFLAGS = -lm `pkg-config --libs cairo`
@ -54,7 +55,7 @@ COMPRESSED_DIR := $(BUILD_DIR)/compressed_pngs
LIMITED_FLAGS = CN DE ES FR GB IT JP KR RU US
SELECTED_FLAGS = AC AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ \
BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ \
CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ \
CA CC CD CF CG CH CI CK CL CM CN CO CQ CR CU CV CW CX CY CZ \
DE DJ DK DM DO DZ \
EC EE EG EH ER ES ET EU \
FI FJ FK FM FO FR \
@ -108,7 +109,7 @@ RESIZED_FLAG_FILES = $(addprefix $(RESIZED_FLAGS_DIR)/, $(FLAG_NAMES))
ifndef MISSING_PY_TOOLS
FLAG_GLYPH_NAMES = $(shell $(PYTHON) flag_glyph_name.py $(FLAGS))
else
FLAG_GLYPH_NAMES =
FLAG_GLYPH_NAMES =
endif
RENAMED_FLAG_NAMES = $(FLAG_GLYPH_NAMES:%=emoji_%.png)
RENAMED_FLAG_FILES = $(addprefix $(RENAMED_FLAGS_DIR)/, $(RENAMED_FLAG_NAMES))
@ -199,8 +200,11 @@ $(COMPRESSED_DIR)/%.png: $(QUANTIZED_DIR)/%.png | check_tools $(COMPRESSED_DIR)
# ...
# Run make without -j if this happens.
%.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES)
@$(PYTHON) $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS)
$(EMOJI).tmpl.ttx: $(EMOJI).tmpl.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES)
$(PYTHON) $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS)
$(EMOJI_WINDOWS).tmpl.ttx: $(EMOJI).tmpl.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES)
$(PYTHON) $(ADD_GLYPHS) --add_cmap4 --add_glyf -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS)
%.ttf: %.ttx
@rm -f "$@"
@ -215,6 +219,16 @@ $(EMOJI).ttf: check_sequence $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \
@mv "$@-with-pua-varsel" "$@"
@rm "$@-with-pua"
$(EMOJI_WINDOWS).ttf: check_sequence $(EMOJI_WINDOWS).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \
$(ALL_COMPRESSED_FILES) | check_tools
@$(PYTHON) $(EMOJI_BUILDER) -O $(SMALL_METRICS) -V $(word 2,$^) "$@" "$(COMPRESSED_DIR)/emoji_u"
@$(PYTHON) $(PUA_ADDER) "$@" "$@-with-pua"
@$(VS_ADDER) -vs 2640 2642 2695 --dstdir '.' -o "$@-with-pua-varsel" "$@-with-pua"
@mv "$@-with-pua-varsel" "$@"
@rm "$@-with-pua"
check_sequence:
ifdef BYPASS_SEQUENCE_CHECK
@echo Bypassing the emoji sequence checks
@ -223,10 +237,15 @@ else
endif
clean:
rm -f $(EMOJI).ttf $(EMOJI).tmpl.ttf $(EMOJI).tmpl.ttx
rm -f $(EMOJI).ttf $(EMOJI_WINDOWS).ttf $(EMOJI).tmpl.ttf $(EMOJI_WINDOWS).tmpl.ttf $(EMOJI).tmpl.ttx $(EMOJI_WINDOWS).tmpl.ttx
rm -f waveflag
rm -rf $(BUILD_DIR)
# This prints the value of a Makefile variable: e.g. `make print-SELECTED_FLAGS`
# will print the content of SELECTED_FLAGS.
# Source: https://apprize.best/linux/gnu/3.html
print-%: ; @echo $* = $($*)
.SECONDARY: $(EMOJI_FILES) $(FLAG_FILES) $(RESIZED_FLAG_FILES) $(RENAMED_FLAG_FILES) \
$(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES)

View file

@ -78,7 +78,7 @@
<head>
<!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="1.0"/>
<fontRevision value="2.020"/>
<fontRevision value="2.047"/>
<checkSumAdjustment value="0x4d5a161a"/>
<magicNumber value="0x5f0f3cf5"/>
<flags value="00000000 00001011"/>
@ -231,7 +231,7 @@
<name>
<namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
Copyright 2013 Google Inc.
Copyright 2022 Google Inc.
</namerecord>
<namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
Noto Color Emoji
@ -246,7 +246,7 @@
Noto Color Emoji
</namerecord>
<namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
Version 2.020;GOOG;noto-emoji:20200914:BETA
Version 2.047;GOOG;noto-emoji:20240827:6c211821b8442ab3683a502f9a79b2034293fced
</namerecord>
<namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
NotoColorEmoji

View file

@ -1,31 +1,18 @@
![Noto](images/noto.png)
![Noto](https://substackcdn.com/image/fetch/w_1456,c_limit,f_webp,q_auto:good,fl_progressive:steep/https%3A%2F%2Fbucketeer-e05bbc84-baa3-437e-9518-adb32be77984.s3.amazonaws.com%2Fpublic%2Fimages%2Fab4b4276-9bb0-42a6-a675-510fcb6055df_1940x1088.png)
# Noto Emoji
Color and Black-and-White Noto emoji fonts, and tools for working with them.
Noto Emoji (Stands for No Tofu) is an open source (Open Font License 1.1) emoji library that provides standard Unicode emoji support and tools for working with them including:
## Prerequisites
Building Noto Color Emoji requires:
- Python 3
- [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
- [pngquant](https://pngquant.org/)
- [zopflipng](https://github.com/google/zopfli)
- A Unicode compliant color emoji [font](https://github.com/googlefonts/noto-emoji/raw/main/fonts/NotoColorEmoji.ttf).
- A full library of Noto color emoji font files including vector svgs and pngs
- [Metadata](https://github.com/googlefonts/emoji-metadata) for Emoji Input (including shortcodes, emoji ordering, ascii equivalents)
## Building NotoColorEmoji
This project uses a virtual environment to manage dependencies. Use the following steps to get up and running:
## Color Font
```shell
# make sure you have the Prerequisites
The latest font file is found [here](https://github.com/googlefonts/noto-emoji/raw/main/fonts/NotoColorEmoji.ttf). If you want to download a specific version, please look at the gh-pages branch, where you will find the built assets for both our latest and older versions.
# create & activate a virtual environment
python3 -m venv venv
source venv/bin/activate
## Monochrome Font
# install python requirements
pip install -r requirements.txt
time make -j
```
Intermediate products (compressed image files, for example) will be put into a build subdirectory; the font will be at the top level.
The black-and-white emoji font is back under active development and is available as a [variable font](https://fonts.google.com/noto/specimen/Noto+Emoji)
## Using NotoColorEmoji
@ -34,25 +21,9 @@ and Chrome/Chromium OS. Windows supports it starting with Windows 10 Anniversar
Update in Chrome and Edge. On macOS, only Chrome supports it, while on Linux it will
support it with some fontconfig tweaking, see [issue #36](https://github.com/googlei18n/noto-emoji/issues/36). Currently we do not build other color font formats.
## Color emoji assets
## A note about PNGs
The assets provided in the repo are all those used to build the NotoColorEmoji
font. Note however that NotoColorEmoji often uses the same assets to represent
different character sequences-- notably, most gender-neutral characters or
sequences are represented using assets named after one of the gendered
sequences. This means that some sequences appear to be missing. Definitions of
the aliasing used appear in the emoji_aliases.txt file.
Also note that the images in the font might differ from the original assets. In
particular the flag images in the font are PNG images to which transforms have
been applied to standardize the size and generate the wave and border shadow. We
do not have SVG versions that reflect these transforms.
## B/W emoji font
The black-and-white emoji font is not under active development. Its repertoire of
emoji is now several years old, and the design does not reflect the current color
emoji design. Currently we have no plans to update this font.
The assets provided in the repo are all those used to build the NotoColorEmoji font. With one exception: the flag images in the font are PNG images to which transforms have been applied to standardize the size and generate the wave and border shadow. We do not have SVG versions that reflect these transforms.
## License
@ -65,9 +36,3 @@ otherwise exempt from copyright ([more info](third_party/region-flags/LICENSE)).
## Contributing
Please read [CONTRIBUTING](CONTRIBUTING.md) if you are thinking of contributing to this project.
## News
* 2017-09-13: Emoji redesign released.
* 2015-12-09: Unicode 7 and 8 emoji image data (.png format) added.
* 2015-09-29: All Noto fonts now licensed under the SIL Open Font License.

37
about_fonts.py Normal file
View file

@ -0,0 +1,37 @@
"""Prints info about emoji fonts."""
from fontTools import ttLib
from pathlib import Path
import sys
NAME_ID_VERSION = 5
def name(font, name_id):
return ",".join(n.toUnicode() for n in font["name"].names if n.isUnicode() and n.nameID == name_id)
def main():
font_files = sorted(p for p in (Path(__file__).parent / "fonts").iterdir() if p.suffix == ".ttf")
max_name_len = max(len(p.name) for p in font_files)
for font_file in font_files:
font = ttLib.TTFont(font_file)
font_type = []
if "CBDT" in font:
font_type.append("CBDT")
if "COLR" in font:
font_type.append("COLR")
if "meta" in font and "Emji" in font["meta"].data:
font_type.append("EmojiCompat")
font_type.append(f"fontRevision:{font['head'].fontRevision:.3f}")
font_type.append(name(font, NAME_ID_VERSION))
font_type = ", ".join(font_type)
print(f"{font_file.name:{max_name_len + 1}} {font_type}")
if __name__ == '__main__':
main()

View file

@ -140,7 +140,7 @@ def create_simple_gsub(lookups, script='DFLT', feature='ccmp'):
def reg_indicator(letter):
"""Return a regional indicator charater from corresponing capital letter.
"""Return a regional indicator character from corresponding capital letter.
"""
return 0x1F1E6 + ord(letter) - ord('A')

View file

@ -18,6 +18,9 @@ import sys
from fontTools import ttx
from fontTools.ttLib.tables import otTables
from fontTools.pens.ttGlyphPen import TTGlyphPen
from fontTools.ttLib.tables._c_m_a_p import CmapSubtable
from fontTools.ttLib import newTable
import add_emoji_gsub
import add_aliases
@ -139,7 +142,7 @@ def get_font_cmap(font):
return font['cmap'].tables[0].cmap
def add_glyph_data(font, seqs, seq_to_advance, vadvance):
def add_glyph_data(font, seqs, seq_to_advance, vadvance, add_glyf):
"""Add hmtx and GlyphOrder data for all sequences in seqs, and ensures there's
a cmap entry for each single-codepoint sequence. Seqs not in seq_to_advance
will get a zero advance."""
@ -163,6 +166,16 @@ def add_glyph_data(font, seqs, seq_to_advance, vadvance):
hmtx = font['hmtx'].metrics
vmtx = font['vmtx'].metrics
# Add glyf table so empty glyphs will be added to ensure compatibility
# with systems requiring a glyf table, like Windows 10.
if add_glyf:
pen = TTGlyphPen(None)
empty_glyph = pen.glyph()
font['loca'] = newTable("loca")
font['glyf'] = glyf_table = newTable("glyf")
glyf_table.glyphOrder = font.getGlyphOrder()
glyf_table.glyphs = {g: empty_glyph for g in glyf_table.glyphOrder}
# We don't expect sequences to be in the glyphOrder, since we removed all the
# single-cp sequences from it and don't expect it to already contain names
# corresponding to multiple-cp sequencess. But just in case, we use
@ -186,11 +199,12 @@ def add_glyph_data(font, seqs, seq_to_advance, vadvance):
if name not in reverseGlyphMap:
font.glyphOrder.append(name)
updatedGlyphOrder=True
if add_glyf:
glyf_table[name] = empty_glyph
if updatedGlyphOrder:
delattr(font, '_reverseGlyphOrderDict')
def add_aliases_to_cmap(font, aliases):
"""Some aliases might map a single codepoint to some other sequence. These
should map directly to the glyph for that sequence in the cmap. (Others will
@ -327,14 +341,30 @@ def add_ligature_sequences(font, seqs, aliases):
for seq, name in pairs:
add_ligature(lookup, cmap, seq, name)
def add_cmap_format_4(font):
"""Add cmap format 4 table for Windows support, based on the
format 12 cmap."""
def update_font_data(font, seq_to_advance, vadvance, aliases):
cmap = get_font_cmap(font)
newtable = CmapSubtable.newSubtable(4)
newtable.platformID = 3
newtable.platEncID = 1
newtable.language = 0
# Format 4 only has unicode values 0x0000 to 0xFFFF
newtable.cmap = {cp: name for cp, name in cmap.items() if cp <= 0xFFFF}
font['cmap'].tables.append(newtable)
def update_font_data(font, seq_to_advance, vadvance, aliases, add_cmap4, add_glyf):
"""Update the font's cmap, hmtx, GSUB, and GlyphOrder tables."""
seqs = get_all_seqs(font, seq_to_advance)
add_glyph_data(font, seqs, seq_to_advance, vadvance)
add_glyph_data(font, seqs, seq_to_advance, vadvance, add_glyf)
add_aliases_to_cmap(font, aliases)
add_ligature_sequences(font, seqs, aliases)
if add_cmap4:
add_cmap_format_4(font)
def apply_aliases(seq_dict, aliases):
"""Aliases is a mapping from sequence to replacement sequence. We can use
@ -350,7 +380,7 @@ def apply_aliases(seq_dict, aliases):
return usable_aliases
def update_ttx(in_file, out_file, image_dirs, prefix, ext, aliases_file):
def update_ttx(in_file, out_file, image_dirs, prefix, ext, aliases_file, add_cmap4, add_glyf):
if ext != '.png':
raise Exception('extension "%s" not supported' % ext)
@ -374,7 +404,7 @@ def update_ttx(in_file, out_file, image_dirs, prefix, ext, aliases_file):
vadvance = font['vhea'].advanceHeightMax if 'vhea' in font else lineheight
update_font_data(font, seq_to_advance, vadvance, aliases)
update_font_data(font, seq_to_advance, vadvance, aliases, add_cmap4, add_glyf)
font.saveXML(out_file)
@ -397,11 +427,15 @@ def main():
parser.add_argument(
'-a', '--aliases', help='process alias table', const='emoji_aliases.txt',
nargs='?', metavar='file')
parser.add_argument(
'--add_cmap4', help='add cmap format 4 table', dest='add_cmap4', action='store_true')
parser.add_argument(
'--add_glyf', help='add glyf and loca tables', dest='add_glyf', action='store_true')
args = parser.parse_args()
update_ttx(
args.in_file, args.out_file, args.image_dirs, args.prefix, args.ext,
args.aliases)
args.aliases, args.add_cmap4, args.add_glyf)
if __name__ == '__main__':

View file

@ -122,7 +122,7 @@ def _check_valid_emoji_cps(sorted_seq_to_filepath, unicode_version):
coverage_pass = False
if not coverage_pass:
exit("Please fix the problems metioned above or run: make BYPASS_SEQUENCE_CHECK='True'")
exit("Please fix the problems mentioned above or run: make BYPASS_SEQUENCE_CHECK='True'")
def _check_zwj(sorted_seq_to_filepath):
@ -144,7 +144,7 @@ def _check_zwj(sorted_seq_to_filepath):
pcp = seq[i-1]
if pcp != EMOJI_VS and not unicode_data.is_emoji(pcp):
print(
f'check zwj: non-emoji {pcp} preceeds ZWJ in {fp}',
f'check zwj: non-emoji {pcp} precedes ZWJ in {fp}',
file=sys.stderr)
if i < len(seq) - 1:
fcp = seq[i+1]
@ -313,7 +313,7 @@ def _check_coverage(seq_to_filepath, unicode_version):
coverage_pass = False
if not coverage_pass:
exit("Please fix the problems metioned above or run: make BYPASS_SEQUENCE_CHECK='True'")
exit("Please fix the problems mentioned above or run: make BYPASS_SEQUENCE_CHECK='True'")
def check_sequence_to_filepath(seq_to_filepath, unicode_version, coverage):

View file

@ -98,7 +98,7 @@ def copy_with_rename(src_dir, dst_dir, accept_pred=None, rename=None):
def build_svg_dir(dst_dir, clean=False, emoji_dir='', flags_dir=''):
"""Copies/renames files from emoji_dir and then flags_dir, giving them the
standard format and prefix ('emoji_u' followed by codepoints expressed in hex
separated by underscore). If clean, removes the target dir before proceding.
separated by underscore). If clean, removes the target dir before proceeding.
If either emoji_dir or flags_dir are empty, skips them."""
dst_dir = tool_utils.ensure_dir_exists(dst_dir, clean=clean)

3862
colrv1/all.toml Normal file

File diff suppressed because it is too large Load diff

3577
colrv1/noflags.toml Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,188 @@
"""Utility to add soft-light effect to NotoColorEmoji-COLRv1 region flags."""
import sys
import subprocess
from fontTools import ttLib
from fontTools.ttLib.tables import otTables as ot
from fontTools.ttLib.tables.C_P_A_L_ import Color
from fontTools.colorLib.builder import LayerListBuilder
from add_aliases import read_default_emoji_aliases
from flag_glyph_name import flag_code_to_glyph_name
from map_pua_emoji import get_glyph_name_from_gsub
REGIONAL_INDICATOR_RANGE = range(0x1F1E6, 0x1F1FF + 1)
BLACK_FLAG = 0x1F3F4
CANCEL_TAG = 0xE007F
TAG_RANGE = range(0xE0000, CANCEL_TAG + 1)
def is_flag(sequence):
# regular region flags are comprised of regional indicators
if all(cp in REGIONAL_INDICATOR_RANGE for cp in sequence):
return True
# subdivision flags start with black flag, contain some tag characters and end with
# a cancel tag
if (
len(sequence) > 2
and sequence[0] == BLACK_FLAG
and sequence[-1] == CANCEL_TAG
and all(cp in TAG_RANGE for cp in sequence[1:-1])
):
return True
return False
def read_makefile_variable(var_name):
# see `print-%` command in Makefile
value = subprocess.run(
["make", f"print-{var_name}"], capture_output=True, check=True
).stdout.decode("utf-8")
return value[len(var_name) + len(" = ") :].strip()
def flag_code_to_sequence(flag_code):
# I use the existing code to first convert from flag code to glyph name,
# and then convert names back to integer codepoints since it already
# handles both the region indicators and subdivision tags.
name = flag_code_to_glyph_name(flag_code)
assert name.startswith("u")
return tuple(int(v, 16) for v in name[1:].split("_"))
def all_flag_sequences():
"""Return the set of all noto-emoji's region and subdivision flag sequences.
These include those in SELECTED_FLAGS Makefile variable plus those listed
in the 'emoji_aliases.txt' file.
"""
result = {
flag_code_to_sequence(flag_code)
for flag_code in read_makefile_variable("SELECTED_FLAGS").split()
}
result.update(seq for seq in read_default_emoji_aliases() if is_flag(seq))
return result
_builder = LayerListBuilder()
def _build_paint(source):
return _builder.buildPaint(source)
def _paint_composite(source, mode, backdrop):
return _build_paint(
{
"Format": ot.PaintFormat.PaintComposite,
"SourcePaint": source,
"CompositeMode": mode,
"BackdropPaint": backdrop,
}
)
def _palette_index(cpal, color):
assert len(cpal.palettes) == 1
palette = cpal.palettes[0]
try:
i = palette.index(color)
except ValueError:
i = len(palette)
palette.append(color)
cpal.numPaletteEntries += 1
assert len(palette) == cpal.numPaletteEntries
return i
WHITE = Color.fromHex("#FFFFFFFF")
GRAY = Color.fromHex("#808080FF")
BLACK = Color.fromHex("#000000FF")
def _soft_light_gradient(cpal):
return _build_paint(
{
"Format": ot.PaintFormat.PaintLinearGradient,
"ColorLine": {
"Extend": "pad",
"ColorStop": [
{
"StopOffset": 0.0,
"PaletteIndex": _palette_index(cpal, WHITE),
"Alpha": 0.5,
},
{
"StopOffset": 0.5,
"PaletteIndex": _palette_index(cpal, GRAY),
"Alpha": 0.5,
},
{
"StopOffset": 1.0,
"PaletteIndex": _palette_index(cpal, BLACK),
"Alpha": 0.5,
},
],
},
"x0": 47,
"y0": 790,
"x1": 890,
"y1": -342,
"x2": -1085,
"y2": -53,
},
)
def flag_ligature_glyphs(font):
"""Yield ligature glyph names for all the region/subdivision flags in the font."""
for flag_sequence in all_flag_sequences():
flag_name = get_glyph_name_from_gsub(flag_sequence, font)
if flag_name is not None:
yield flag_name
def add_soft_light_to_flags(font, flag_glyph_names=None):
"""Add soft-light effect to region and subdivision flags in CORLv1 font."""
if flag_glyph_names is None:
flag_glyph_names = flag_ligature_glyphs(font)
colr_glyphs = {
rec.BaseGlyph: rec
for rec in font["COLR"].table.BaseGlyphList.BaseGlyphPaintRecord
}
cpal = font["CPAL"]
for flag_name in flag_glyph_names:
flag = colr_glyphs[flag_name]
flag.Paint = _paint_composite(
source=_paint_composite(
source=_soft_light_gradient(cpal),
mode=ot.CompositeMode.SRC_IN,
backdrop=flag.Paint,
),
mode=ot.CompositeMode.SOFT_LIGHT,
backdrop=flag.Paint,
)
def main():
try:
input_file, output_file = sys.argv[1:]
except ValueError:
print("usage: colrv1_add_soft_light_to_flags.py INPUT_FONT OUTPUT_FONT")
return 2
font = ttLib.TTFont(input_file)
if "COLR" not in font or font["COLR"].version != 1:
print("error: missing required COLRv1 table")
return 1
add_soft_light_to_flags(font)
font.save(output_file)
if __name__ == "__main__":
sys.exit(main())

View file

@ -0,0 +1,99 @@
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Generate config files for Noto-COLRv1
from nanoemoji.util import rel
from pathlib import Path
_NOTO_FAMILY_NAME = "Noto Color Emoji"
_NOTO_SVG_DIR = Path("svg")
_REGIONAL_INDICATORS = {
Path(_NOTO_SVG_DIR / f"emoji_u{i:x}.svg") for i in range(0x1F1E6, 0x1F1FF + 1)
}
_NOTO_WAVED_FLAG_SVG_DIR = Path("third_party/region-flags/waved-svg")
_NOTO_SUBDIVISION_FLAGS = (
_NOTO_WAVED_FLAG_SVG_DIR / "emoji_u1f3f4_e0067_e0062_e0065_e006e_e0067_e007f.svg",
_NOTO_WAVED_FLAG_SVG_DIR / "emoji_u1f3f4_e0067_e0062_e0073_e0063_e0074_e007f.svg",
_NOTO_WAVED_FLAG_SVG_DIR / "emoji_u1f3f4_e0067_e0062_e0077_e006c_e0073_e007f.svg",
)
_CONFIG_DIR = Path("colrv1")
def _write_config(config_name, output_file, svg_files):
svg_files = [rel(_CONFIG_DIR, Path(f)) for f in svg_files]
config_file = f"{config_name}.toml"
for svg_file in svg_files:
assert _CONFIG_DIR.joinpath(
svg_file
).is_file(), f"{svg_file} not found relative to {_CONFIG_DIR}"
svg_list = ",\n ".join(f'"{f}"' for f in sorted(svg_files)).rstrip()
with open(_CONFIG_DIR / config_file, "w") as f:
f.write(
f"""
family = "{_NOTO_FAMILY_NAME}"
output_file = "{output_file}"
color_format = "glyf_colr_1"
clipbox_quantization = 32
[axis.wght]
name = "Weight"
default = 400
[master.regular]
style_name = "Regular"
srcs = [
{svg_list},
]
[master.regular.position]
wght = 400
"""
)
def _write_all_noto_configs():
# includes all of noto-emoji svgs plus all the waved region flags
regular = tuple(_NOTO_SVG_DIR.glob("*.svg"))
flags = tuple(_NOTO_WAVED_FLAG_SVG_DIR.glob("*.svg"))
dups = {p.name for p in regular} & {p.name for p in flags}
if dups:
raise ValueError(f"Flags *and* regular have {dups}")
svgs = regular + flags
_write_config("all", "NotoColorEmoji.ttf", svgs)
def _write_noto_noflag_configs():
# Does not contain regional indicators and the region flags that are
# composed with them. It still includes the England, Scotland and Wales
# 'subdivision' flags, as those are not composed with Unicode regional
# indicators, but use sequences of Unicode Tag letters prefixed with
# the Black Flag and ending with a Cancel Tag.
svgs = (
tuple(p for p in _NOTO_SVG_DIR.glob("*.svg") if p not in _REGIONAL_INDICATORS)
+ _NOTO_SUBDIVISION_FLAGS
)
_write_config("noflags", "NotoColorEmoji-noflags.ttf", svgs)
def main():
_write_all_noto_configs()
_write_noto_noflag_configs()
if __name__ == "__main__":
main()

345
colrv1_postproc.py Normal file
View file

@ -0,0 +1,345 @@
"""
Post-nanoemoji processing of the Noto COLRv1 Emoji files.
Adds additional sequences to properly support Safari, corrects 'name', etc.
For now substantially based on copying from a correct bitmap build.
"""
from absl import app
import functools
from fontTools.feaLib.builder import addOpenTypeFeaturesFromString
from fontTools import ttLib
from fontTools.ttLib.tables import _g_l_y_f as glyf
from fontTools.ttLib.tables import otTables as ot
import map_pua_emoji
from nototools import add_vs_cmap
from nototools import font_data
from nototools import unicode_data
from pathlib import Path
import re
from colrv1_add_soft_light_to_flags import add_soft_light_to_flags
_CBDT_FILE = Path("fonts/NotoColorEmoji.ttf")
_COLR_FILES = {
Path("fonts/Noto-COLRv1-noflags.ttf"),
Path("fonts/Noto-COLRv1.ttf"),
}
def _is_colrv1(font):
return "COLR" in font and font["COLR"].version == 1
def _is_cbdt(font):
return "CBDT" in font
def _set_name(name_table, nameID):
name_table.getName(value, nameID, 3, 1, 0x409)
def _set_name(name_table, nameID, value):
name_table.setName(value, nameID, 3, 1, 0x409)
def _copy_names(colr_font, cbdt_font):
colr_font["name"] = cbdt_font["name"]
name_table = colr_font["name"]
assert all(
(n.platformID, n.platEncID, n.langID) == (3, 1, 0x409) for n in name_table.names
), "Should only have names Android uses"
# Amendments
_set_name(name_table, 10, "Color emoji font using COLRv1.")
_set_name(name_table, 11, "https://github.com/googlefonts/noto-emoji")
_set_name(name_table, 12, "https://github.com/googlefonts/noto-emoji")
# CBDT build step: @$(VS_ADDER) -vs 2640 2642 2695 --dstdir '.' -o "$@-with-pua-varsel" "$@-with-pua"
def _add_vs_cmap(colr_font):
emoji_variants = unicode_data.get_unicode_emoji_variants() | {
0x2640,
0x2642,
0x2695,
}
add_vs_cmap.modify_font("COLRv1 Emoji", colr_font, "emoji", emoji_variants)
def _is_variation_selector_cmap_table(table):
assert table.format in {4, 12, 14}
return table.format == 14
def _lookup_in_cmap(colr_font, codepoint):
result = set()
for table in colr_font["cmap"].tables:
if _is_variation_selector_cmap_table(table):
continue
assert codepoint in table.cmap
result.add(table.cmap[codepoint])
assert len(result) == 1, f"Ambiguous mapping for {codepoint}: {result}"
return next(iter(result))
def _add_cmap_entries(colr_font, codepoint, glyph_name):
for table in colr_font["cmap"].tables:
if _is_variation_selector_cmap_table(table):
continue
if not _is_bmp(codepoint) and table.format == 4:
continue
table.cmap[codepoint] = glyph_name
#print(f"Map 0x{codepoint:04x} to {glyph_name}, format {table.format}")
FLAG_TAGS = set(range(0xE0030, 0xE0039 + 1)) | set(range(0xE0061, 0xE007A + 1))
CANCEL_TAG = 0xE007F
def _map_missing_flag_tag_chars_to_empty_glyphs(colr_font):
# Add all tag characters used in flags + cancel tag
tag_cps = FLAG_TAGS | {CANCEL_TAG}
# Anything already cmap'd is fine
tag_cps -= set(_Cmap(colr_font).keys())
# CBDT maps these to blank glyphs
glyf_table = colr_font["glyf"]
hmtx_table = colr_font["hmtx"]
glyph_order_size = len(glyf_table.glyphOrder)
for cp in tag_cps:
#print(f"Map 0x{cp:04x} to a blank glyf")
glyph_name = f"u{cp:04X}"
assert glyph_name not in glyf_table, f"{glyph_name} already in glyf"
assert glyph_name not in hmtx_table.metrics, f"{glyph_name} already in hmtx"
glyf_table[glyph_name] = glyf.Glyph()
hmtx_table[glyph_name] = (0, 0)
_add_cmap_entries(colr_font, cp, glyph_name)
def _is_bmp(cp):
return cp in range(0x0000, 0xFFFF + 1)
def _ligaset_for_glyph(lookup_list, glyph_name):
for lookup in lookup_list.Lookup:
if lookup.LookupType != 4:
continue
for liga_set in lookup.SubTable:
if glyph_name in liga_set.ligatures:
return liga_set.ligatures[glyph_name]
return None
def _Cmap(ttfont):
def _Reducer(acc, u):
acc.update(u)
return acc
unicode_cmaps = (t.cmap for t in ttfont["cmap"].tables if t.isUnicode())
return functools.reduce(_Reducer, unicode_cmaps, {})
def _add_vertical_layout_tables(cbdt_font, colr_font):
upem_scale = colr_font["head"].unitsPerEm / cbdt_font["head"].unitsPerEm
vhea = colr_font["vhea"] = ttLib.newTable("vhea")
vhea.tableVersion = 0x00010000
vhea.ascent = round(cbdt_font["vhea"].ascent * upem_scale)
vhea.descent = round(cbdt_font["vhea"].descent * upem_scale)
vhea.lineGap = 0
# most of the stuff below is recalculated by the compiler, but still needs to be
# initialized... ¯\_(ツ)_/¯
vhea.advanceHeightMax = 0
vhea.minTopSideBearing = 0
vhea.minBottomSideBearing = 0
vhea.yMaxExtent = 0
vhea.caretSlopeRise = 0
vhea.caretSlopeRun = 0
vhea.caretOffset = 0
vhea.reserved0 = 0
vhea.reserved1 = 0
vhea.reserved2 = 0
vhea.reserved3 = 0
vhea.reserved4 = 0
vhea.metricDataFormat = 0
vhea.numberOfVMetrics = 0
# emoji font is monospaced -- except for an odd uni0000 (NULL) glyph which happens
# to have height=0; but colrv1 font doesn't have that anyway, so I just skip it
cbdt_heights = set(h for h, _ in cbdt_font["vmtx"].metrics.values() if h != 0)
assert len(cbdt_heights) == 1, "NotoColorEmoji CBDT font should be monospaced!"
height = round(cbdt_heights.pop() * upem_scale)
vmtx = colr_font["vmtx"] = ttLib.newTable("vmtx")
vmtx.metrics = {}
for gn in colr_font.getGlyphOrder():
vmtx.metrics[gn] = height, 0
UNKNOWN_FLAG_PUA = 0xFE82B
BLACK_FLAG = 0x1F3F4
REGIONAL_INDICATORS = set(range(0x1F1E6, 0x1F1FF + 1))
def _add_fallback_subs_for_unknown_flags(colr_font):
"""Add GSUB lookups to replace unsupported flag sequences with the 'unknown flag'.
In order to locate the unknown flag, the glyph must be mapped to 0xFE82B PUA code;
the latter is removed from the cmap table after the GSUB has been updated.
"""
cmap = _Cmap(colr_font)
unknown_flag = cmap[UNKNOWN_FLAG_PUA]
black_flag = cmap[BLACK_FLAG]
cancel_tag = cmap[CANCEL_TAG]
flag_tags = sorted(cmap[cp] for cp in FLAG_TAGS)
# in the *-noflags.ttf font there are no region flags thus this list is empty
regional_indicators = sorted(cmap[cp] for cp in REGIONAL_INDICATORS if cp in cmap)
classes = f'@FLAG_TAGS = [{" ".join(flag_tags)}];\n'
if regional_indicators:
classes += f"""
@REGIONAL_INDICATORS = [{" ".join(regional_indicators)}];
@UNKNOWN_FLAG = [{" ".join([unknown_flag] * len(regional_indicators))}];
"""
lookups = (
# the first lookup is a dummy that stands for the emoji sequences ligatures
# from the destination font; we only use it to ensure the lookup indices match.
# We can't leave it empty otherwise feaLib optimizes it away.
f"""
lookup placeholder {{
sub {unknown_flag} {unknown_flag} by {unknown_flag};
}} placeholder;
"""
+ "\n".join(
["lookup delete_glyph {"]
+ [f" sub {g} by NULL;" for g in sorted(regional_indicators + flag_tags)]
+ ["} delete_glyph;"]
)
+ (
"""
lookup replace_with_unknown_flag {
sub @REGIONAL_INDICATORS by @UNKNOWN_FLAG;
} replace_with_unknown_flag;
"""
if regional_indicators
else "\n"
)
)
features = (
"languagesystem DFLT dflt;\n"
+ classes
+ lookups
+ "feature ccmp {"
+ f"""
lookup placeholder;
sub {black_flag} @FLAG_TAGS' lookup delete_glyph;
sub {black_flag} {cancel_tag} by {unknown_flag};
"""
+ (
"""
sub @REGIONAL_INDICATORS' lookup replace_with_unknown_flag
@REGIONAL_INDICATORS' lookup delete_glyph;
"""
if regional_indicators
else ""
)
+ "} ccmp;"
)
# feaLib always builds a new GSUB table (can't update one in place) so we have to
# use an empty TTFont and then update our GSUB with the newly built lookups
temp_font = ttLib.TTFont()
temp_font.setGlyphOrder(colr_font.getGlyphOrder())
addOpenTypeFeaturesFromString(temp_font, features)
temp_gsub = temp_font["GSUB"].table
# sanity check
assert len(temp_gsub.FeatureList.FeatureRecord) == 1
assert temp_gsub.FeatureList.FeatureRecord[0].FeatureTag == "ccmp"
temp_ccmp = temp_gsub.FeatureList.FeatureRecord[0].Feature
colr_gsub = colr_font["GSUB"].table
ccmps = [
r.Feature for r in colr_gsub.FeatureList.FeatureRecord if r.FeatureTag == "ccmp"
]
assert len(ccmps) == 1, f"expected only 1 'ccmp' feature record, found {len(ccmps)}"
colr_ccmp = ccmps[0]
colr_lookups = colr_gsub.LookupList.Lookup
assert (
len(colr_lookups) == 1
), f"expected only 1 lookup in COLRv1's GSUB.LookupList, found {len(colr_lookups)}"
assert (
colr_lookups[0].LookupType == 4
), f"expected Lookup[0] of type 4 in COLRv1, found {colr_lookups[0].LookupType}"
colr_lookups.extend(temp_gsub.LookupList.Lookup[1:])
colr_gsub.LookupList.LookupCount = len(colr_lookups)
colr_ccmp.LookupListIndex = temp_ccmp.LookupListIndex
colr_ccmp.LookupCount = len(colr_ccmp.LookupListIndex)
# get rid of the Unknown Flag private codepoint as no longer needed
font_data.delete_from_cmap(colr_font, [UNKNOWN_FLAG_PUA])
def _set_no_font_embedding_restrictions(colr_font):
# The CBDT/CBLC NotoColorEmoji has OS/2.fsType = 0 (i.e. no embedding restrictions)
# so the COLRv1 variant must also have no such restrictions.
# https://github.com/notofonts/noto-fonts/issues/2408
# https://github.com/google/fonts/issues/5729
colr_font["OS/2"].fsType = 0
def _set_head_version_to_name_version(colr_font):
# head.fontRevision and the version on name 5 should match
name_version = colr_font['name'].getName(5, 3, 1, 0x409)
assert name_version is not None, "No version found in 'name'"
name_version = name_version.toUnicode()
match = re.match(r'^Version (\d+[.]\d+);GOOG;', name_version)
assert match is not None, f"Unable to parse version from '{name_version}'"
colr_font["head"].fontRevision = float(match.group(1))
def _font(path, check_fn, check_fail_str):
assert path.is_file(), path
font = ttLib.TTFont(path)
if not check_fn(font):
raise ValueError(path + check_fail_str)
return font
def main(_):
cbdt_font = _font(_CBDT_FILE, _is_cbdt, " must be a CBDT font")
for colr_file in _COLR_FILES:
colr_font = _font(colr_file, _is_colrv1, " must be a COLRv1 font")
print(f"Updating {colr_file} from {_CBDT_FILE}")
_copy_names(colr_font, cbdt_font)
# CBDT build step: @$(PYTHON) $(PUA_ADDER) "$@" "$@-with-pua"
map_pua_emoji.add_pua_cmap_to_font(colr_font)
_add_vs_cmap(colr_font)
_map_missing_flag_tag_chars_to_empty_glyphs(colr_font)
add_soft_light_to_flags(colr_font)
_add_vertical_layout_tables(cbdt_font, colr_font)
_add_fallback_subs_for_unknown_flags(colr_font)
_set_no_font_embedding_restrictions(colr_font)
_set_head_version_to_name_version(colr_font)
print("Writing", colr_file)
colr_font.save(colr_file)
if __name__ == "__main__":
app.run(main)

48
drop_flags.py Normal file
View file

@ -0,0 +1,48 @@
"""Removes regional indicators from a font."""
from fontTools import subset
from fontTools import ttLib
import functools
from pathlib import Path
import sys
from typing import Set
def codepoints(font: ttLib.TTFont) -> Set[int]:
unicode_cmaps = (t.cmap.keys() for t in font['cmap'].tables if t.isUnicode())
return functools.reduce(lambda acc, u: acc | u, unicode_cmaps, set())
def is_regional_indicator(cp: int) -> bool:
return 0x1F1E6 <= cp <= 0x1F1FF
def main(argv):
for font_file in sorted(argv[1:]):
font_file = Path(font_file)
assert font_file.is_file(), font_file
noflags_file = font_file.with_stem(font_file.stem + "-noflags")
if noflags_file.is_file():
print(font_file, "already has", noflags_file, "; nop")
continue
font = ttLib.TTFont(font_file)
cps = codepoints(font)
cps_without_flags = {cp for cp in cps if not is_regional_indicator(cp)}
if cps == cps_without_flags:
print(font_file, "has no regional indicators")
continue
subsetter = subset.Subsetter()
subsetter.populate(unicodes=cps_without_flags)
subsetter.subset(font)
font.save(noflags_file)
print(font_file, "=>" , noflags_file)
if __name__ == '__main__':
main(sys.argv)

36
fix_colr_font_revision.py Normal file
View file

@ -0,0 +1,36 @@
"""Set COLRv1 fontRevision from CBDT.
Used for bugfix, should fix to set properly on build instead.
"""
from fontTools import ttLib
from pathlib import Path
import sys
NAME_ID_VERSION = 5
def name(font, name_id):
return ",".join(n.toUnicode() for n in font["name"].names if n.isUnicode() and n.nameID == name_id)
def main():
colr_font_files = sorted(p for p in (Path(__file__).parent / "fonts").iterdir() if p.name.startswith("Noto-COLRv1"))
for colr_font_file in colr_font_files:
cbdt_font_file = colr_font_file.with_stem(colr_font_file.stem.replace("Noto-COLRv1", "NotoColorEmoji"))
colr_font = ttLib.TTFont(colr_font_file)
cbdt_font = ttLib.TTFont(cbdt_font_file)
assert "CBDT" in cbdt_font
assert "COLR" in colr_font
colr_font["head"].fontRevision = cbdt_font["head"].fontRevision
colr_font.save(colr_font_file)
if __name__ == '__main__':
main()

36
flags-only-unicodes.txt Normal file
View file

@ -0,0 +1,36 @@
U+1f1e6
U+1f1e7
U+1f1e8
U+1f1e9
U+1f1ea
U+1f1eb
U+1f1ec
U+1f1ed
U+1f1ee
U+1f1ef
U+1f1f0
U+1f1f1
U+1f1f2
U+1f1f3
U+1f1f4
U+1f1f5
U+1f1f6
U+1f1f7
U+1f1f8
U+1f1f9
U+1f1fa
U+1f1fb
U+1f1fc
U+1f1fd
U+1f1fe
U+1f1ff
U+fe4e5
U+fe4e6
U+fe4e7
U+fe4e8
U+fe4e9
U+fe4ea
U+fe4eb
U+fe4ec
U+fe4ed
U+fe4ee

Binary file not shown.

Binary file not shown.

BIN
fonts/Noto-COLRv1.ttf Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

60
full_rebuild.sh Executable file
View file

@ -0,0 +1,60 @@
#!/usr/bin/env bash
set -e
set -v
# We have to have hb-subset on PATH
which hb-subset
# Build the CBDT font
rm -rf venv # in case you have an old borked venv!
python3 -m venv venv
source venv/bin/activate
pip install -r requirements.txt
rm -rf emojicompat
git clone git@github.com:googlefonts/emojicompat.git
pip install emojicompat/
# Validation
python size_check.py
rm -rf build/ && time make -j 48
# Should take 2-3 minutes to create noto-emoji/NotoColorEmoji.ttf
mv *.ttf fonts/
# make noflags CBDT font
rm fonts/NotoColorEmoji-noflags.ttf
python drop_flags.py fonts/NotoColorEmoji.ttf
# Build the COLRv1 font (slow)
python colrv1_generate_configs.py
git diff colrv1/*.toml
# Compile the fonts
# Should take ~20 minutes
(cd colrv1 && rm -rf build/ && time nanoemoji *.toml)
cp colrv1/build/NotoColorEmoji.ttf fonts/Noto-COLRv1.ttf
cp colrv1/build/NotoColorEmoji-noflags.ttf fonts/Noto-COLRv1-noflags.ttf
# Post-process them
python colrv1_postproc.py
# Produce emojicompat variants
# Add support for new sequences per https://github.com/googlefonts/emojicompat#support-new-unicode-sequences
pushd fonts
cp NotoColorEmoji.ttf NotoColorEmoji-emojicompat.ttf
cp Noto-COLRv1.ttf Noto-COLRv1-emojicompat.ttf
emojicompat --op setup --font NotoColorEmoji-emojicompat.ttf
emojicompat --op setup --font Noto-COLRv1-emojicompat.ttf
emojicompat --op check --font NotoColorEmoji-emojicompat.ttf
emojicompat --op check --font Noto-COLRv1-emojicompat.ttf
popd
hb-subset --unicodes-file=flags-only-unicodes.txt \
--output-file=fonts/NotoColorEmoji-flagsonly.ttf \
fonts/NotoColorEmoji.ttf
python update_flag_name.py

View file

@ -29,15 +29,15 @@ at commit a8a215d2e889 and date 20170220 (since dates are a bit easier
to locate in time than commit hashes).
For building with external data we don't include the commit id as we
might be using different resoruces. Instead the version string is:
might be using different resources. Instead the version string is:
Version 1.39;GOOG;noto-emoji:20170518;BETA <msg>
Here the date is the current date, and the message after 'BETA ' is
provided using the '-b' flag. There's no commit hash. This also
bypasses some checks about the state of the repo.
The relase number should have 2 or 3 minor digits. Right now we've been
using 2 but at the next major relase we probably want to use 3. This
The release number should have 2 or 3 minor digits. Right now we've been
using 2 but at the next major release we probably want to use 3. This
supports both. It will bump the version number if none is provided,
maintaining the minor digit length.
"""
@ -153,7 +153,7 @@ def _replace_existing_version(lines, version, version_str):
def update_version(srcfile, dstfile, version, beta):
"""Update version in srcfile and write to dstfile. If version is None,
bumps the current version, else version must be greater than the
current verison."""
current version."""
with open(srcfile, 'r') as f:
lines = f.readlines()

View file

@ -50,9 +50,7 @@ def get_glyph_name_from_gsub(char_seq, font):
return None
def add_pua_cmap(source_file, target_file):
"""Add PUA characters to the cmap of the first font and save as second."""
font = ttLib.TTFont(source_file)
def add_pua_cmap_to_font(font):
cmap = font_data.get_cmap(font)
for pua, (ch1, ch2) in itertools.chain(
add_emoji_gsub.EMOJI_KEYCAPS.items(), add_emoji_gsub.EMOJI_FLAGS.items()
@ -61,6 +59,12 @@ def add_pua_cmap(source_file, target_file):
glyph_name = get_glyph_name_from_gsub([ch1, ch2], font)
if glyph_name is not None:
cmap[pua] = glyph_name
def add_pua_cmap(source_file, target_file):
"""Add PUA characters to the cmap of the first font and save as second."""
font = ttLib.TTFont(source_file)
add_pua_cmap_to_font(font)
font.save(target_file)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 5 KiB

Some files were not shown because too many files have changed in this diff Show more