Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1250aa86 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Put line feed to the test case 

ascent10em-descent10em.ttf covers U+000A but must not be included as the
line spaceing.

Bug: 73625594
Test: bit FrameworksCoreTests:android.text.
Test: atest CtsWidgetTestCases:EditTextTest
    CtsWidgetTestCases:TextViewFadingEdgeTest
    FrameworksCoreTests:TextViewFallbackLineSpacingTest
    FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
    CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
    CtsTextTestCases

Change-Id: I5cccd596d660c1f3ee34b0b81a44a7e4b64f3d01
parent eb2c082e

core/tests/coretests/assets/fonts/ascent10em-descent10em.ttf

0 → 100644
+1.73 KiB

File added.

No diff preview for this file type.

View file

core/tests/coretests/assets/fonts/ascent10em-descent10em.ttx

0 → 100644
+181 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project



     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.

-->

<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">



  <GlyphOrder>

    <GlyphID id="0" name=".notdef"/>

    <GlyphID id="1" name="1em"/>

  </GlyphOrder>



  <head>

    <tableVersion value="1.0"/>

    <fontRevision value="1.0"/>

    <checkSumAdjustment value="0x640cdb2f"/>

    <magicNumber value="0x5f0f3cf5"/>

    <flags value="00000000 00000011"/>

    <unitsPerEm value="1000"/>

    <created value="Fri Mar 17 07:26:00 2017"/>

    <macStyle value="00000000 00000000"/>

    <lowestRecPPEM value="7"/>

    <fontDirectionHint value="2"/>

    <glyphDataFormat value="0"/>

  </head>



  <hhea>

    <tableVersion value="0x10000"/>

    <ascent value="10000"/>

    <descent value="-10000"/>

    <lineGap value="0"/>

    <caretSlopeRise value="1"/>

    <caretSlopeRun value="0"/>

    <caretOffset value="0"/>

    <reserved0 value="0"/>

    <reserved1 value="0"/>

    <reserved2 value="0"/>

    <reserved3 value="0"/>

    <metricDataFormat value="0"/>

  </hhea>



  <maxp>

    <tableVersion value="0x10000"/>

    <maxZones value="0"/>

    <maxTwilightPoints value="0"/>

    <maxStorage value="0"/>

    <maxFunctionDefs value="0"/>

    <maxInstructionDefs value="0"/>

    <maxStackElements value="0"/>

    <maxSizeOfInstructions value="0"/>

    <maxComponentElements value="0"/>

  </maxp>



  <OS_2>

    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'

         will be recalculated by the compiler -->

    <version value="3"/>

    <xAvgCharWidth value="594"/>

    <usWeightClass value="400"/>

    <usWidthClass value="5"/>

    <fsType value="00000000 00001000"/>

    <ySubscriptXSize value="650"/>

    <ySubscriptYSize value="600"/>

    <ySubscriptXOffset value="0"/>

    <ySubscriptYOffset value="75"/>

    <ySuperscriptXSize value="650"/>

    <ySuperscriptYSize value="600"/>

    <ySuperscriptXOffset value="0"/>

    <ySuperscriptYOffset value="350"/>

    <yStrikeoutSize value="50"/>

    <yStrikeoutPosition value="300"/>

    <sFamilyClass value="0"/>

    <panose>

      <bFamilyType value="0"/>

      <bSerifStyle value="0"/>

      <bWeight value="5"/>

      <bProportion value="0"/>

      <bContrast value="0"/>

      <bStrokeVariation value="0"/>

      <bArmStyle value="0"/>

      <bLetterForm value="0"/>

      <bMidline value="0"/>

      <bXHeight value="0"/>

    </panose>

    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>

    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>

    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>

    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>

    <achVendID value="UKWN"/>

    <fsSelection value="00000000 01000000"/>

    <usFirstCharIndex value="32"/>

    <usLastCharIndex value="122"/>

    <sTypoAscender value="800"/>

    <sTypoDescender value="-200"/>

    <sTypoLineGap value="200"/>

    <usWinAscent value="1000"/>

    <usWinDescent value="200"/>

    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>

    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>

    <sxHeight value="500"/>

    <sCapHeight value="700"/>

    <usDefaultChar value="0"/>

    <usBreakChar value="32"/>

    <usMaxContext value="0"/>

  </OS_2>



  <hmtx>

    <mtx name=".notdef" width="1000" lsb="0"/>

    <mtx name="1em" width="1000" lsb="0"/>

  </hmtx>



  <cmap>

    <tableVersion version="0"/>

    <cmap_format_4 platformID="3" platEncID="10" language="0">

      <map code="0x000A" name="1em" /> <!-- LINE FEED -->

      <map code="0x000D" name="1em" /> <!-- CARRIAGE RETURN -->

    </cmap_format_4>

  </cmap>



  <loca>

    <!-- The 'loca' table will be calculated by the compiler -->

  </loca>



  <glyf>

    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />

    <TTGlyph name="1em" xMin="0" yMin="0" xMax="0" yMax="0" />

  </glyf>



  <name>

    <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">

      Copyright (C) 2017 The Android Open Source Project

    </namerecord>

    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">

      Sample Font

    </namerecord>

    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">

      Regular

    </namerecord>

    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">

      Sample Font

    </namerecord>

    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">

      SampleFont-Regular

    </namerecord>

    <namerecord nameID="13" platformID="3" platEncID="1" langID="0x409">

      Licensed under the Apache License, Version 2.0 (the "License");

      you may not use this file except in compliance with the License.

      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.

    </namerecord>

    <namerecord nameID="14" platformID="3" platEncID="1" langID="0x409">

      http://www.apache.org/licenses/LICENSE-2.0

    </namerecord>

  </name>



  <post>

    <formatType value="3.0"/>

    <italicAngle value="0.0"/>

    <underlinePosition value="-75"/>

    <underlineThickness value="50"/>

    <isFixedPitch value="0"/>

    <minMemType42 value="0"/>

    <maxMemType42 value="0"/>

    <minMemType1 value="0"/>

    <maxMemType1 value="0"/>

  </post>



</ttFont>

core/tests/coretests/src/android/text/StaticLayoutTest.java

+37 −4
Original line number Diff line number Diff line
@@ -822,6 +822,9 @@ public class StaticLayoutTest { 
                + "  <family>"

                + "    <font weight='400' style='normal'>ascent3em-descent4em.ttf</font>"

                + "  </family>"

                + "  <family>"

                + "    <font weight='400' style='normal'>ascent10em-descent10em.ttf</font>"

                + "  </family>"

                + "</familyset>";



        try (FontFallbackSetup setup =
@@ -833,7 +836,7 @@ public class StaticLayoutTest { 
            assertEquals(2 * textSize, paint.descent(), 0.0f);



            final int paraWidth = 5 * textSize;

            final String text = "aaaaa aabaa aaaaa"; // This should result in three lines.

            final String text = "aaaaa\naabaa\naaaaa\n"; // This should result in three lines.



            // Old line spacing. All lines should get their ascent and descents from the first font.

            StaticLayout layout = StaticLayout.Builder
@@ -841,13 +844,17 @@ public class StaticLayoutTest { 
                    .setIncludePad(false)

                    .setUseLineSpacingFromFallbacks(false)

                    .build();

            assertEquals(3, layout.getLineCount());

            assertEquals(4, layout.getLineCount());

            assertEquals(-textSize, layout.getLineAscent(0));

            assertEquals(2 * textSize, layout.getLineDescent(0));

            assertEquals(-textSize, layout.getLineAscent(1));

            assertEquals(2 * textSize, layout.getLineDescent(1));

            assertEquals(-textSize, layout.getLineAscent(2));

            assertEquals(2 * textSize, layout.getLineDescent(2));

            // The last empty line spacing should be the default line spacing.

            // Maybe good to be a previous line spacing?

            assertEquals(-textSize, layout.getLineAscent(3));

            assertEquals(2 * textSize, layout.getLineDescent(3));



            // New line spacing. The second line has a 'b', so it needs more ascent and descent.

            layout = StaticLayout.Builder
@@ -855,26 +862,52 @@ public class StaticLayoutTest { 
                    .setIncludePad(false)

                    .setUseLineSpacingFromFallbacks(true)

                    .build();

            assertEquals(3, layout.getLineCount());

            assertEquals(4, layout.getLineCount());

            assertEquals(-textSize, layout.getLineAscent(0));

            assertEquals(2 * textSize, layout.getLineDescent(0));

            assertEquals(-3 * textSize, layout.getLineAscent(1));

            assertEquals(4 * textSize, layout.getLineDescent(1));

            assertEquals(-textSize, layout.getLineAscent(2));

            assertEquals(2 * textSize, layout.getLineDescent(2));

            assertEquals(-textSize, layout.getLineAscent(3));

            assertEquals(2 * textSize, layout.getLineDescent(3));



            // The default is the old line spacing, for backward compatibility.

            layout = StaticLayout.Builder

                    .obtain(text, 0, text.length(), paint, paraWidth)

                    .setIncludePad(false)

                    .build();

            assertEquals(3, layout.getLineCount());

            assertEquals(4, layout.getLineCount());

            assertEquals(-textSize, layout.getLineAscent(0));

            assertEquals(2 * textSize, layout.getLineDescent(0));

            assertEquals(-textSize, layout.getLineAscent(1));

            assertEquals(2 * textSize, layout.getLineDescent(1));

            assertEquals(-textSize, layout.getLineAscent(2));

            assertEquals(2 * textSize, layout.getLineDescent(2));

            assertEquals(-textSize, layout.getLineAscent(3));

            assertEquals(2 * textSize, layout.getLineDescent(3));



            layout = StaticLayout.Builder

                    .obtain("\n", 0, 1, paint, textSize)

                    .setIncludePad(false)

                    .setUseLineSpacingFromFallbacks(false)

                    .build();

            assertEquals(2, layout.getLineCount());

            assertEquals(-textSize, layout.getLineAscent(0));

            assertEquals(2 * textSize, layout.getLineDescent(0));

            assertEquals(-textSize, layout.getLineAscent(1));

            assertEquals(2 * textSize, layout.getLineDescent(1));



            layout = StaticLayout.Builder

                    .obtain("\n", 0, 1, paint, textSize)

                    .setIncludePad(false)

                    .setUseLineSpacingFromFallbacks(true)

                    .build();

            assertEquals(2, layout.getLineCount());

            assertEquals(-textSize, layout.getLineAscent(0));

            assertEquals(2 * textSize, layout.getLineDescent(0));

            assertEquals(-textSize, layout.getLineAscent(1));

            assertEquals(2 * textSize, layout.getLineDescent(1));

        }

    }