Changeset 169617 in webkit

Timestamp:

Jun 5, 2014 9:23:08 AM (10 years ago)

Author:

fred.wang@free.fr

Message:

Apply Character-level mirroring to stretchy operators in RTL mode.
​https://bugs.webkit.org/show_bug.cgi?id=130839

Reviewed by Chris Fleizach.

Source/WebCore:
We add support for character-level mirroring for stretchy MathML operators in RTL mode.
Glyph-level mirroring (via the rtlm OpenType feature) will be handled in bug 130840.

Test: mathml/presentation/stretchy-rtl.html

• rendering/mathml/RenderMathMLOperator.cpp: reorganize the Unicode stretchyCharacters table to make mirroring easy.

(WebCore::RenderMathMLOperator::computePreferredLogicalWidths): pass the right boolean to glyphDataForCharacter.
(WebCore::RenderMathMLOperator::getDisplayStyleLargeOperator): ditto
(WebCore::RenderMathMLOperator::findStretchyData): ditto and change the index for the stretchyCharacters fallback.
(WebCore::RenderMathMLOperator::updateStyle): pass the right boolean to glyphDataForCharacter.
(WebCore::RenderMathMLOperator::paint): remove the FIXME comment.
(WebCore::RenderMathMLOperator::paintVerticalGlyphAssembly): switch the leading/trailing space in RTL mode.

LayoutTests:
Add some tests to verify that stretchy operators are correctly mirrored in RTL mode.

• mathml/presentation/stretchy-rtl-expected.html: Added.
• mathml/presentation/stretchy-rtl.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/mathml/presentation/stretchy-rtl-expected.html (added)
• LayoutTests/mathml/presentation/stretchy-rtl.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (modified) (8 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-06-05  Frédéric Wang  <fred.wang@free.fr>
+
+        Apply Character-level mirroring to stretchy operators in RTL mode.
+        https://bugs.webkit.org/show_bug.cgi?id=130839
+
+        Reviewed by Chris Fleizach.
+
+        Add some tests to verify that stretchy operators are correctly mirrored in RTL mode.
+
+        * mathml/presentation/stretchy-rtl-expected.html: Added.
+        * mathml/presentation/stretchy-rtl.html: Added.
+
 2014-06-05  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-05  Frédéric Wang  <fred.wang@free.fr>
+
+        Apply Character-level mirroring to stretchy operators in RTL mode.
+        https://bugs.webkit.org/show_bug.cgi?id=130839
+
+        Reviewed by Chris Fleizach.
+
+        We add support for character-level mirroring for stretchy MathML operators in RTL mode.
+        Glyph-level mirroring (via the rtlm OpenType feature) will be handled in bug 130840.
+
+        Test: mathml/presentation/stretchy-rtl.html
+
+        * rendering/mathml/RenderMathMLOperator.cpp: reorganize the Unicode stretchyCharacters table to make mirroring easy.
+        (WebCore::RenderMathMLOperator::computePreferredLogicalWidths): pass the right boolean to glyphDataForCharacter.
+        (WebCore::RenderMathMLOperator::getDisplayStyleLargeOperator): ditto
+        (WebCore::RenderMathMLOperator::findStretchyData): ditto and change the index for the stretchyCharacters fallback.
+        (WebCore::RenderMathMLOperator::updateStyle): pass the right boolean to glyphDataForCharacter.
+        (WebCore::RenderMathMLOperator::paint): remove the FIXME comment.
+        (WebCore::RenderMathMLOperator::paintVerticalGlyphAssembly): switch the leading/trailing space in RTL mode.
+
 2014-06-05  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp

@@ -56 +56 @@
     UChar middleChar;
 };
+// The first leftRightPairsCount pairs correspond to left/right fences that can easily be mirrored in RTL.
+static const short leftRightPairsCount = 5;
 static const StretchyCharacter stretchyCharacters[14] = {
     { 0x28  , 0x239b, 0x239c, 0x239d, 0x0    }, // left parenthesis
     { 0x29  , 0x239e, 0x239f, 0x23a0, 0x0    }, // right parenthesis
     { 0x5b  , 0x23a1, 0x23a2, 0x23a3, 0x0    }, // left square bracket
+    { 0x5d  , 0x23a4, 0x23a5, 0x23a6, 0x0    }, // right square bracket
+    { 0x7b  , 0x23a7, 0x23aa, 0x23a9, 0x23a8 }, // left curly bracket
+    { 0x7d  , 0x23ab, 0x23aa, 0x23ad, 0x23ac }, // right curly bracket
     { 0x2308, 0x23a1, 0x23a2, 0x23a2, 0x0    }, // left ceiling
+    { 0x2309, 0x23a4, 0x23a5, 0x23a5, 0x0    }, // right ceiling
     { 0x230a, 0x23a2, 0x23a2, 0x23a3, 0x0    }, // left floor
-    { 0x5d  , 0x23a4, 0x23a5, 0x23a6, 0x0    }, // right square bracket
-    { 0x2309, 0x23a4, 0x23a5, 0x23a5, 0x0    }, // right ceiling
     { 0x230b, 0x23a5, 0x23a5, 0x23a6, 0x0    }, // right floor
-    { 0x7b  , 0x23a7, 0x23aa, 0x23a9, 0x23a8 }, // left curly bracket
     { 0x7c  , 0x7c,   0x7c,   0x7c,   0x0    }, // vertical bar
     { 0x2016, 0x2016, 0x2016, 0x2016, 0x0    }, // double vertical line
     { 0x2225, 0x2225, 0x2225, 0x2225, 0x0    }, // parallel to
-    { 0x7d  , 0x23ab, 0x23aa, 0x23ad, 0x23ac }, // right curly bracket
     { 0x222b, 0x2320, 0x23ae, 0x2321, 0x0    } // integral sign
 };
@@ -1340 +1342 @@
     }
 
-    GlyphData data = style().font().glyphDataForCharacter(m_operator, false);
+    GlyphData data = style().font().glyphDataForCharacter(m_operator, !style().isLeftToRightDirection());
     float maximumGlyphWidth = advanceForGlyph(data);
     if (!m_isVertical) {
@@ -1515 +1517 @@
 
     const auto& primaryFontData = style().font().primaryFont();
-    GlyphData baseGlyph = style().font().glyphDataForCharacter(character, false);
+    GlyphData baseGlyph = style().font().glyphDataForCharacter(character, !style().isLeftToRightDirection());
     if (!primaryFontData || !primaryFontData->mathData() || baseGlyph.fontData != primaryFontData)
         return data;
@@ -1547 +1549 @@
 
     const auto& primaryFontData = style().font().primaryFont();
-    GlyphData baseGlyph = style().font().glyphDataForCharacter(character, false);
+    GlyphData baseGlyph = style().font().glyphDataForCharacter(character, !style().isLeftToRightDirection());
     
     if (primaryFontData && primaryFontData->mathData() && baseGlyph.fontData == primaryFontData) {
@@ -1581 +1583 @@
             if (stretchyCharacters[index].character == character) {
                 stretchyCharacter = &stretchyCharacters[index];
+                if (!style().isLeftToRightDirection() && index < leftRightPairsCount * 2) {
+                    // If we are in right-to-left direction we select the mirrored form by adding -1 or +1 according to the parity of index.
+                    index += index % 2 ? -1 : 1;
+                }
                 break;
             }
@@ -1654 +1660 @@
     else {
         // We do not stretch if the base glyph is large enough.
-        GlyphData baseGlyph = style().font().glyphDataForCharacter(m_operator, false);
+        GlyphData baseGlyph = style().font().glyphDataForCharacter(m_operator, !style().isLeftToRightDirection());
         float baseSize = m_isVertical ? heightForGlyph(baseGlyph) : advanceForGlyph(baseGlyph);
         if (stretchSize() <= baseSize)
@@ -1862 +1868 @@
         return;
 
-    // FIXME: This painting should work in RTL mode too (https://bugs.webkit.org/show_bug.cgi?id=123018).
-
     GraphicsContextStateSaver stateSaver(*info.context);
     info.context->setFillColor(style().visitedDependentColor(CSSPropertyColor), style().colorSpace());
@@ -1893 +1897 @@
     // We are positioning the glyphs so that the edge of the tight glyph bounds line up exactly with the edges of our paint box.
     LayoutPoint operatorTopLeft = paintOffset + location();
-    operatorTopLeft.move(m_leadingSpace, 0);
+    operatorTopLeft.move(style().isLeftToRightDirection() ? m_leadingSpace : m_trailingSpace, 0);
     operatorTopLeft = ceiledIntPoint(operatorTopLeft);
     FloatRect topGlyphBounds = boundsForGlyph(m_stretchyData.top());