Commit Graph

32 Commits (11868c62b70b6b1184053dcf2f58246b20503b74)

Author SHA1 Message Date
Doug Felt 11868c62b7 Fix location of new flag resources, and also update Makefile. 2017-01-24 14:27:29 -08:00
Doug Felt 41fa8181f5 Update for new waveflag semantics.
Previously our copy of waveflag took just an input and output filename.
Upstream takes a prefix and one or more input filenames, and concatenates
the prefix to the input filename as the output.

The makefile is changed to pass a prefix and the input filename, instead
of the input filename and the output filename as it formerly did.

Unfortunately for us, our inputs have a directory prefix since they're
not in the current directory, and we don't want this prefix in the output
file path.  So we tweak our copy of waveflag.c to call basename on the
input file path before we append it to the prefix.

We also make the tool a little less noisy by putting more printfs
under the debug flag.
2016-10-07 14:31:12 -07:00
Doug Felt 741f8b92c9 Update waveflag.c to upstream version.
Also updates LDFLAGS to match upstream.
2016-10-07 14:21:32 -07:00
Doug Felt e16b39e492 Bump version, specify additional chars in varsel cmap.
The additional variation chars option makes it easier to build prototype
versions of the emoji font.
2016-07-13 11:36:25 -07:00
Doug Felt 343e9ffbf4 Add 'unknown flag' glyph.
This uses PUA character U+FE82B for the unknown flag during processing.
Currently I don't yet remove this from the cmap when we're done.
2016-03-13 14:56:02 -07:00
Doug Felt 3a57df2ac6 Improve flag support.
This adds some additional flags to the default set.  In addition,
it contains code that creates ligatures for some flag sequences to
others, for a few cases where we want different regions to share
the same flag.  Finally, it adds default ligatures so that pairs of
regional indicator characters for which there's no predefined glyph
get a 'missing flag' glyph.  This avoids cases where sequences of
regional indicator sequences accidentally match at odd locations
because of a previous mismatch.

There is no actual 'missing flag' glyph yet.  The code uses an
existing emoji as a placeholder.
2016-03-11 19:02:15 -08:00
Doug Felt 6caa07aaae Minor tweaks to quiet makefile and fix bug in add_glyphs. 2016-01-28 14:03:21 -08:00
Doug Felt fc0ab7f36d Update NotoColorEmoji template so that it passes lint, bump version.
- fix ascent/descent in hhea and os/2 to match noto UI expectations,
  zero linegap, clear useTypoMetrics bit, set weight to regular (400).
- add missing entries to name table, update revision
- map U+0000 to null glyph (not .notdef)

In addition, this tweaks the Makefile in some small ways:
- quiet zopflipng output somewhat (listen to your cpu fan to know
  that something's happening) :-)
- make flag-symlinks target an order-only dependency (it was triggering
  quantize+compress even when images hadn't changed)
- add comment about how to bypass make bug if multithread hangs
2015-11-30 17:49:52 -08:00
Doug Felt c67a8c3fa6 small fixes 2015-11-13 18:15:09 -08:00
Doug Felt ed31eb2a9f fix emoji source path 2015-11-13 17:57:17 -08:00
Doug Felt 34fbef4348 Rewrite makefile
Change the build process to provide more intermediate steps and maintain
intermediate targets.  This slows down make's analysis phase, though.
Make can be run with -j to parallelize the building, but  be careful
with multiple targets on the command line (e.g. 'make clean font') since
clean's deletion of the output tree can sometimes occur after some of
the output directories get built.

This is preparatory to replacing the png images with the original internal
set.  These require a bit more cleanup and processing, which is what these
changes do.  The overall flow is:
- convert all emoji to desired size (136x128).  All are smaller than this,
  most are 128x128 but there are some others.
- run waveflag on the flags
- convert all flags to desired size(136x128).  The flags are 128x128
  originally.
- 'rename' the flags by creating softlinks with the desired names
- run pngquant on all the images and copy them into a single directory,
  this reduces slight antialiasing differences.
- compress all the images, using zopflipng if available, else optipng.
  zopflipng saves about 10%, but is 10x slower.

The remaining steps of building the font are unchanged, for the moment.

The intermediate image files are put into a 'build' subdirectory to organize
them and keep them out of the way.
2015-11-13 17:35:50 -08:00
Doug Felt d9e320acb5 updates to support tr51 emoji sequences 2015-11-05 11:15:15 -08:00
Doug Felt 0f227e7834 wip - update emoji tooling to support tr51 sequences 2015-11-03 18:40:19 -08:00
Doug Felt deff1a6545 Reintroduce check for missing binary, using a different method.
Another way to do this is to create a target, but when I tried that
it reintroduced the dependency analysis problem-- rules with this
dependency always triggered. Of course I might have missed something
subtle.  Both the target approach and this approach come from
http://stackoverflow.com/questions/5618615/check-if-a-program-exists-from-a-makefile)

This always runs, but unless you're just running clean you'd always want to
perform this check, so I think that's ok.
2015-10-14 17:43:18 -07:00
Doug Felt 4a90607d2d Remove VS_ADDER as a dependency since it is not local 2015-10-14 17:26:44 -07:00
Doug Felt 43a7990b6a Change Makefile to be smarter about dependencies.
This reverts some changes in commit b257b6647d that were causing build
issues.  Those changes quoted the path to pngquant in order to deal
with spaces in the path, but as a side effect that prevented
build-dependency analysis (gnu 3.81 on ubuntu) from recognizing that
the .png files didn't need to be built, and so rebuilt them every
time, which takes several minutes.  Apparently make doesn't like
quotes-- strings passed to the shell are fine, but things make itself
processes (like names of targets) are treated literally.

Since the path to pngquant is (now, anyway) a local subpath of the
current directory that has no spaces, it should be ok to use the
subpath and not bother to quote.

Another change replaces two dependencies on flag-symlinks with a
dependency on PNG128_FLAGS, for the same reason: after flag-symlinks
executed it was not recognized as being up to date and so the rules
with these dependencies always executed.
2015-10-14 17:18:29 -07:00
Doug Felt bbfb0c22ee fix missing rename 2015-10-14 17:10:34 -07:00
Doug Felt 6bd9cc4a9b Remove format 14 cmap tool and ucd data, and update Makefile
The tool and data was moved to nototools.

Makefile now needs to invoke the tool as a script, rather than passing
it to python, since the tool is no longer local.  Running setup.py in
nototools will make the script accessible.  Setup (apparently) copies
the script to /usr/local/bin and it is not automatically updated when
nototools changes, still need to figure out how to address this.
2015-10-14 16:56:44 -07:00
Doug Felt 3d1173340a Change Makefile to also build the variation selector cmap. 2015-10-13 18:27:24 -07:00
Khaled Hosny 1140041c2b Further speed up make
Similar to cee85f422b.
2015-07-07 11:51:37 +02:00
Dāvis b257b6647d Quote $PNGQUANTDIR and $PNGQUANT
Quoting is necessary so that can build from path which contains spaces
2015-06-24 12:31:51 +03:00
Khaled Hosny cee85f422b Speed up make by calling flag_glyph_name.py once
This script takes ~1 second for startup, so calling it repeatedly for
each flag slows the Makefile considerably, and unnecessarily since it
can be called for all the flags at once.

Now make clean takes about 1.2s, instead of 3m45s.
2015-06-20 01:50:25 +02:00
Khaled Hosny e58a66978a Fix build
Fix the paths after repo split.
2015-06-19 22:01:26 +02:00
Roozbeh Pournader 4654a37dd2 Pass Noto Color Emoji bitmaps through pngquant. 2014-09-17 19:31:16 -07:00
Roozbeh Pournader 459d1cd472 Reverting Behdad's changes to the color Emoji Makefile.
They sped things up, but also broke the build. Will reconsider when
had time to analyse the issue.
2014-09-14 17:04:18 -07:00
Behdad Esfahbod 2d181916d8 [color_emoji] Speed up Makefile
It was running flag_glyph_name.py for each flag every time you ran make,
loading fonttools Python library each time; was taking over ten seconds!
2014-08-18 18:39:23 -04:00
Roozbeh Pournader e2d9f72ae9 Add variable to color emoji Makefile for ten old flags only. 2014-08-14 12:02:14 -07:00
Roozbeh Pournader 085b3b2841 Add flags for 200+ regions.
This change also reorganized how the NotoColorEmoji font is created.
2014-08-12 19:28:00 -07:00
Roozbeh Pournader 0810eacb07 Add flag waver and make rules for 64px PNGs. 2014-07-31 11:19:11 -07:00
Roozbeh Pournader ec0ef72f6d Make color emoji use character sequences instead of PUA.
The bitmap emoji tools are extended to create GSUB rules for character
sequences.  The images are renamed to code the character sequence in their
filenames.  New images are created for ASCII digits and number sign.  A new
script is added to add cmaps to the files for backward compatibility.
2014-07-09 23:24:42 -07:00
Roozbeh Pournader 428e2914fa Rename variables in Makefile. 2014-07-09 21:04:19 -07:00
Roozbeh Pournader 99cb625705 Add the sources of the color emoji font. 2014-07-09 00:21:11 -07:00