189 Commits

Author SHA1 Message Date
Raph Levien
3578ca0ccf Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE am: 30fca219e0 -s ours am: 43772d6ef2 -s ours
am: 13c1203c9d  -s ours

* commit '13c1203c9dc7ba3c8b3e6b43f816dd65be8d5355':
  Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
2015-11-19 05:46:01 +00:00
Raph Levien
0b5eefc1a0 Accept variation selector in emoji sequences - DO NOT MERGE am: 35e4ebec36 -s ours am: 562d243a71 -s ours
am: 805f849a35  -s ours

* commit '805f849a35eb82f83e2e31ee778fab5af9ec761c':
  Accept variation selector in emoji sequences - DO NOT MERGE
2015-11-19 05:45:59 +00:00
Raph Levien
13c1203c9d Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE am: 30fca219e0 -s ours
am: 43772d6ef2  -s ours

* commit '43772d6ef2e41cdd46a53a035dfab0407788c031':
  Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
2015-11-18 19:59:22 +00:00
Raph Levien
805f849a35 Accept variation selector in emoji sequences - DO NOT MERGE am: 35e4ebec36 -s ours
am: 562d243a71  -s ours

* commit '562d243a7149591f59e3b9306dafccd1cbe5dda4':
  Accept variation selector in emoji sequences - DO NOT MERGE
2015-11-18 19:59:17 +00:00
Raph Levien
43772d6ef2 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
am: 30fca219e0  -s ours

* commit '30fca219e07ba1059c5a782781c9c5f73e126bb6':
  Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
2015-11-18 19:52:27 +00:00
Raph Levien
562d243a71 Accept variation selector in emoji sequences - DO NOT MERGE
am: 35e4ebec36  -s ours

* commit '35e4ebec362b159b39dea1537c545418d57ea43c':
  Accept variation selector in emoji sequences - DO NOT MERGE
2015-11-18 19:52:21 +00:00
Raph Levien
30fca219e0 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
Due to the way emoji ZWJ sequences are defined, the ICU line breaking
algorithm determines that there are valid line breaks inside the
sequence. This patch suppresses these line breaks.

Bug: 25433289
Change-Id: I225ebebc0f4186e4b8f48fee399c4a62b3f0218a
2015-11-18 10:41:09 -08:00
Raph Levien
35e4ebec36 Accept variation selector in emoji sequences - DO NOT MERGE
This patch basically ignores variation selectors for the purpose of
itemization into font runs. This allows GSUB to be applied when input
sequences contain variation selectors.

Bug: 25368653
Change-Id: I9c1d325ae0cd322c21b7e850d0ec4d73551b2372
2015-11-18 10:41:03 -08:00
Seigo Nonaka
3dd8757fcf Fix invalid decrement range of KEYCAP handling in itemize.
This issue was introduced by I22ce0e9eadc941f84e3a9b23462f194e51dd7180.
Need to decrement the two utf16 chars in KEYCAP handling.

To add unit tests, this CL also addresses the Bug: 24184208 by
introducing self built fonts since there is no good example in system
installed fonts.

Bug: 24184208
Change-Id: I23fa008adbaced78a3cb96442a6bc8892ab84ce8
2015-11-13 14:39:06 +09:00
Raph Levien
bdd5ccf0e8 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
am: c65e6f1ee0  -s ours

* commit 'c65e6f1ee0b2f32183766726ac459188b1a37b35':
  Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
2015-11-04 00:34:13 +00:00
Raph Levien
c65e6f1ee0 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
Due to the way emoji ZWJ sequences are defined, the ICU line breaking
algorithm determines that there are valid line breaks inside the
sequence. This patch suppresses these line breaks.

Bug: 25433289
Change-Id: I225ebebc0f4186e4b8f48fee399c4a62b3f0218a
2015-11-03 05:16:31 +00:00
Raph Levien
39b51624ae Accept variation selector in emoji sequences - DO NOT MERGE
am: adaf42f0d3  -s ours

* commit 'adaf42f0d3444de2b0bb977ccc94801458497f46':
  Accept variation selector in emoji sequences - DO NOT MERGE
2015-10-29 21:42:01 +00:00
Raph Levien
adaf42f0d3 Accept variation selector in emoji sequences - DO NOT MERGE
This patch basically ignores variation selectors for the purpose of
itemization into font runs. This allows GSUB to be applied when input
sequences contain variation selectors.

Bug: 25368653
Change-Id: I9c1d325ae0cd322c21b7e850d0ec4d73551b2372
2015-10-29 12:30:57 -07:00
Seigo Nonaka
bae3476829 Add -Werror -Wall -Wextra to compiler option.
This is 2nd trial of I30a0914a4633bd93eb60957cdf378770f04d8428

- To suppress noisy unused parameter warnings, comment out unused
  arguments.
- Add -Werror for suppressing further warning.
- Add -Wall -Wextra for safety.
- Use "z" prefix for format string of size_t.

Verified that compile succeeded on all arm,arm64,mips,x86,x86_64.

Change-Id: I7ad208464486b8a35da53929cb1cfe541ed0052f
2015-10-28 04:52:49 +00:00
Bart Sears
b4c7991804 Revert "Add -Werror -Wall -Wextra to compiler option."
This reverts commit 63635cff5861dcaed963c7332eecf51b9d7d920a.

Change-Id: I2b4b10e8afedc85dbe2d07f3e47315652b65cd14
2015-10-28 03:16:55 +00:00
Seigo Nonaka
63635cff58 Add -Werror -Wall -Wextra to compiler option.
- To suppress noisy unused parameter warnings, comment out unused
  arguments.
- Add -Werror for suppressing further warning.
- Add -Wall -Wextra for safety.

Change-Id: I30a0914a4633bd93eb60957cdf378770f04d8428
2015-10-27 21:18:22 +09:00
Roozbeh Pournader
4b723bf22b Basic scaffolding for handling a language list.
The behavior hasn't changed much yet: all languages are ignored for
rendering text, except the very first supported language.

Change-Id: I1695fb985927ae5e28e4f59c1b531e4993af8688
2015-10-22 14:01:50 -07:00
Seigo Nonaka
16da66db74 Merge "Support Variation Selector in font selection." 2015-10-20 03:47:03 +00:00
Seigo Nonaka
bbdd73ec07 Support Variation Selector in font selection.
This CL contains the following changes:
- Add a variation selector argument into getFamilyForChar to be able to
  select fonts which support variation selector.
- In case no fonts support the codepoint and variation selector pair,
  add a fallback rule which selects font family with ignoring variation
  selector.
- Change FontCollection::itemize to not change the font family
  immediately preceding a variation selector.
- Introduce unit tests for variation selectors.

With this CL, TextView can render the variation selectors correctly.

Bug: 11256006
Change-Id: I22ce0e9eadc941f84e3a9b23462f194e51dd7180
2015-10-20 12:34:40 +09:00
Seigo Nonaka
82ceb82fe1 Merge "Remove MinikinFont::GetGlyph interface." 2015-10-19 04:07:45 +00:00
Roozbeh Pournader
786eac9c7f am e8264e06: (-s ours) Complete half-done cherry-picking of Android.mk. DO NOT MERGE
* commit 'e8264e065f0edd58a9fa04bbdd777f2af2794789':
  Complete half-done cherry-picking of Android.mk. DO NOT MERGE
2015-10-15 03:21:50 +00:00
Seigo Nonaka
210dfa01db Remove MinikinFont::GetGlyph interface.
MinikinFont:GetGlyph is no longer used.
No behavior chnages are expected with this CL.

Change-Id: I13398503841ac06f930b04815017d4b33338efa1
2015-10-15 02:54:18 +00:00
Roozbeh Pournader
e8264e065f Complete half-done cherry-picking of Android.mk. DO NOT MERGE
The previous commit, 6e2cccdc518f8d3424c84ae6fbe0e87ae3c3f66a, was
incompletely cherry-picked. This adds the missing parts.

Bug: 24570591
Change-Id: I1097c60587fb8a88cfe6b8ffed5b1689d9bdd429
2015-10-14 19:37:47 -07:00
Raph Levien
8925a8c30a am e5e7aa0e: Explicitly set utf-8 encoding for hyb file verification
* commit 'e5e7aa0e8031f6f1c0ed370f70e49778f3570527':
  Explicitly set utf-8 encoding for hyb file verification
2015-10-15 01:56:15 +00:00
Raph Levien
ed833cff3b am 6e2cccdc: (-s ours) Binary format for hyphenation patterns
* commit '6e2cccdc518f8d3424c84ae6fbe0e87ae3c3f66a':
  Binary format for hyphenation patterns
2015-10-15 01:56:14 +00:00
Raph Levien
e5e7aa0e80 Explicitly set utf-8 encoding for hyb file verification
Not all platforms default to UTF-8 encoding, so we set it explicitly.
This patch should fix build breakages resulting from failed verification
of binary hyb files for hyphenation patterns.

Bug: 24570591
Change-Id: I65ac4536d3436586c2633e2b57554fc6ff16d3a8
(cherry picked from commit 138b93f094584212dd6978a1822d078f93574022)
2015-10-14 16:32:17 -07:00
Raph Levien
6e2cccdc51 Binary format for hyphenation patterns
In the current state, hyphenation in all languages than Sanskrit seems
to work (case-folding edge cases). Thus, we just disable Sanskrit.
Packed tries are implemented, but not the finite state machine
(space/speed tradeoff).

This commit contains a throw-away test app, which runs on the host.
I think I want to replace it with unit tests, but I'm including it in
the CL because it's useful during development.

Bug: 21562869
Bug: 21826930
Bug: 23317038
Bug: 23317904
Bug: 24570591
Change-Id: I7479a565a4a062fa319651c2c14c0fa18c5ceaea
(cherry picked from commit f0be43de02a1e07308d3d95408349c3c7f973430)
2015-10-14 16:26:37 -07:00
Seigo Nonaka
0f2a025d13 Introduce FontFamily::hasVariationSelector
This CL introduces new method hasVariationSelector into FontFamily but it
is not used in production code. So no behavior changes are expected.

This CL contains the following changes:
- Introduce hasVariationSelector which returns true if the corresponding
  font has a glyph for a code point and variation selector pair.
- Introduce purgeHbFontCache since hb_face_t won't be released by
  keeping hb_font_t.
- Introduce unit tests with self-built font.

Change-Id: I659a6d03d9ec446b409e1fba2758452abb9f44fa
2015-10-12 18:53:45 +09:00
Keisuke Kuroyanagi
7c8ac67a90 Merge "Refactoring: Introduce helper class to iterate runs." 2015-10-01 20:11:50 +00:00
Raph Levien
741694870a Merge "Explicitly set utf-8 encoding for hyb file verification" 2015-10-01 06:36:47 +00:00
Raph Levien
138b93f094 Explicitly set utf-8 encoding for hyb file verification
Not all platforms default to UTF-8 encoding, so we set it explicitly.
This patch should fix build breakages resulting from failed verification
of binary hyb files for hyphenation patterns.

Change-Id: I65ac4536d3436586c2633e2b57554fc6ff16d3a8
2015-09-30 23:26:54 -07:00
Raph Levien
6ac8ca4ce7 Merge "Binary format for hyphenation patterns" 2015-10-01 04:53:44 +00:00
Raph Levien
f0be43de02 Binary format for hyphenation patterns
In the current state, hyphenation in all languages than Sanskrit seems
to work (case-folding edge cases). Thus, we just disable Sanskrit.
Packed tries are implemented, but not the finite state machine
(space/speed tradeoff).

This commit contains a throw-away test app, which runs on the host.
I think I want to replace it with unit tests, but I'm including it in
the CL because it's useful during development.

Bug: 21562869
Bug: 21826930
Bug: 23317038
Bug: 23317904

Change-Id: I7479a565a4a062fa319651c2c14c0fa18c5ceaea
2015-09-30 21:37:31 -07:00
Seigo Nonaka
fb0d396929 Extract hb_face_t object cache mechanism from Layout.cpp.
This CL does following things:
- Extract hb_face_t object cache mechanism from Layout.cpp to be able to
  use it from other cpp file, especially from FontFamily.cpp.
  To address Bug 11256006 and Bug 17759267, need to touch
  hb_face_t from FontFamily.
- Make hb_face_t cache mechanism thread-safe.
- Add unit tests for HbFaceCache test cases.

Bug: 11256006
Bug: 17759267
Change-Id: Ic183634ef34326793bd9a32167236611d0af34d6
2015-09-30 17:36:44 +09:00
Seigo Nonaka
2ea397d74c Merge "Introduce unit tests for FontCollection::itemize." 2015-09-30 03:33:13 +00:00
Keisuke Kuroyanagi
6292e1a966 Refactoring: Introduce helper class to iterate runs.
This doesn't change current behavior. It's a preparation
for the following CLs.

Bug: 22408712
Change-Id: Ic018422254aa3904655f499194caad74f0c0fc5d
2015-09-29 16:05:15 -07:00
Seigo Nonaka
1c2bd209d1 Introduce unit tests for FontCollection::itemize.
Introduced tests depend on installed font list in running device.
I verified these test passed  on Nexus 5(hammerhead), Nexus 6(shamu)
and Nexus 9(volantis).

Bug: 11256006
Bug: 17759267
Change-Id: I6f806370e17f6c6d3dad8df0cb70bb475a827873
2015-09-18 15:40:51 +09:00
Seigo Nonaka
2a79f59e73 Resolve glyph ID by HarfBuzz function.
Currently codepoint to glyph ID resolution is done through MinikinFont
interface. To support variation selector, use HarfBuzz API instead of
calling this interface since one of its implementation Skia doesn't
support variation selector.

On the other hand, we don't want to get glyph horizontal advance values
by HarfBuzz since HarfBuzz doesn't return correct values when the hinting
is active.

Thus, use ot_font as a parent font and override
glyph_h_advance/glyph_h_origin functions as is.

With this change, MinikinFont::GetGlyph is no longer necessary but not
removing in this CL for easy reverting since removing interface requires
multi-repository commit.

This is a base work of b/11256006 and this patch doesn't provide any
user visible changes.

Bug: 11256006
Change-Id: I061172c0b674bb649ce8bc013ffecf38708bdc41
2015-09-11 16:44:37 +09:00
Seigo Nonaka
4e3adc6fb2 Update word breaker to be aware tone mark and variation selector.
This CL does:
1. Move the getNextWordBreak/getPrevWordBreak function to a separate source file.
2. Adding "ForCache" suffix for function name for making clear these function is
   for layout cache.
3. Introduce unit tests for them.

Bug: 11256006
Change-Id: I4138751a4570915f1a0d6c8921f89700f8ec7f35
2015-08-29 08:02:44 +09:00
Raph Levien
d8dd94b81e Add basic unit tests for Minikin
Initial unit tests for Minikin functionality. Also fixes an incorrect
Hangul case (uncovered in testing), and improves handling of broken
UTF-16.

Change-Id: I69b441d8e3b19ed06abcc56f13271abadf3d1010
2015-08-19 15:00:25 -07:00
Roozbeh Pournader
2967a13420 Clean up use of printf() in Layout.cpp.
Reported externally at https://code.google.com/p/android/issues/detail?id=167715.
Bug: 21498085

Change-Id: I73f22de03b0151ce31a6b3070d051a2a701b33d2
2015-08-11 17:46:18 -07:00
Roozbeh Pournader
71ec970553 Support three-letter language codes in FontLanguage.
Also handle the case of weird language code that we don't understand
properly better, by treating them not equal to each other.

Change-Id: Iaccb251fa38d700932f6eadac254d3d1fa09b3ea
2015-08-07 22:16:25 -07:00
Roozbeh Pournader
c02138bf55 Gold plate grapheme cluster breaks.
This tailors Unicode's Grapheme_Cluster_Break property to better
classify characters currently with the Control property value.

Also adds support for rule GB9b of UAX #29, needed since there are
now characters we are tailoring to be Prepend. The rule was
previously ommited in our implementation because there was no
characters in the Prepend class.

Bug: 15653110
Change-Id: If10da88df0980f7d676c8c0b950eda5fb8dbe741
2015-08-06 14:28:38 -07:00
Raph Levien
90a09c3f36 Improve fallback where explicit variant is not given
In computing scores for which fallback font to choose, a match of a
variant given explicitly in the xml config file scores higher than a
family with no explicit variant. One consequence is that U+2010
HYPHEN is chosen from the Naskh Arabic font in the fallback case.

This patch scores families with no variants as a match (effectively
the same as if the xml file specified both variants). Thus, it will
choose the first matching font (Roboto), which is a better choice.

This patch also revises the list of "sticky" characters to include
various hyphens, so Arabic (and potentially other scripts) text that
includes hyphens can access the script-specific variants matched to
the underlying text.

Bug: 22824219
Change-Id: I6ec1043037f89cad50ca99ac24c473395546bcdf
2015-07-29 14:36:33 -07:00
Raph Levien
5ba60b1c25 Merge "Revert "Allow clusters to start with zero-width characters"" into mnc-dev 2015-07-21 16:55:08 +00:00
Raph Levien
542572394d Revert "Allow clusters to start with zero-width characters"
This reverts commit 3e0fc64da064b8c4156daf53242b8eeb47830f64.

Bug: 22589743
Bug: 22121742
Change-Id: I7b482ffb8a0ee174ddc804aa890de45bdbd758e3
2015-07-21 16:08:08 +00:00
Raph Levien
e9ec9a1d1b Consistently apply break opportunities in text spans
It's essential not to apply a break opportunity within a replacement
span, otherwise things can happen such as displaying the span twice.
The old code tested this case based on zero-width characters.
However, this test was both imprecise, and also in some cases read
uninitialized values from the mCharWidths array, which in turn led
to inconsistent line breaking of the same text.

This patch applies all line break opportunities (as identified by
ICU) within text (as opposed to replacement spans), and also applies
break opportunities at the beginning and end of replacement spans,
but avoids breaks within a replacement span.

Bug: 20138621
Change-Id: I36baeb44d6808356649e1bb69ca57f093fc8c723
2015-07-20 15:37:54 -07:00
Roozbeh Pournader
cdd19dadd1 Use ICU to lowercase words to hyphenate.
Previously, the standard C tolower() function was used, which
didn't support any characters beyond the basic ASCII letters.

Bug: 22506121
Change-Id: Ibb81121caa29be44fbb59aa98891e9faafc57592
2015-07-15 16:31:07 -07:00
Roozbeh Pournader
daf62d0eef Add missing hyphen-like characters.
This adds various hyphen-like characters missed in the previous
patch, that should disallow automatic hyphenation of words containing
them.

Bug: 22484266
Change-Id: Ie972cb50384dbe0aa1ab5ec50286b75f9877953a
2015-07-15 10:59:59 -07:00
Roozbeh Pournader
baf6d0a41f Avoid re-hyphenating already-hyphenated phrases.
Previously, automatic hyphenation blindly took almost every line
breaking opportunity as a word break, so words like "low-budget" were
treated as two separate words, "low-", and "budget", each
automatically hyphenated.

This patch makes sure the subwords in already-hyphenated phrases are
not passed to the automatic hyphenator, while keeping the possibility
of a potential line break where a hyphen already exists.

Bug: 22484266
Bug: 22287425
Change-Id: Ie46dbdd70e993d64a9b9cf44b4ae93b21459dbc2
2015-07-14 13:04:49 -07:00