Attachment #8366499 for bug #945254

Attachment #8366499: Patch V6 for bug #945254

View | Details | Raw Unified | Return to bug 945254
Collapse All | Expand All





        // If italics correction is applied, we always add "a little to spare"
        // (see TeXbook Ch.11, p.64), as we estimate the italic creation
        // ourselves and it isn't the same as TeX.
        italicCorrection += onePixel;
      }

      // we update boundingMetrics.{ascent,descent} with that
      // of the baseFrame only after processing all the sup/sub pairs
      boundingMetrics.width = bmBase.width;
      boundingMetrics.width = bmBase.width + italicCorrection;
      boundingMetrics.rightBearing = bmBase.rightBearing;
      boundingMetrics.leftBearing = bmBase.leftBearing; // until overwritten
    } else {
      // super/subscript block
      if ( childTag == nsGkAtoms::none) {
        foundNoneTag = true;
      }


        bmMultiSup.ascent = std::max(bmMultiSup.ascent, bmSupScript.ascent);
        bmMultiSup.descent = std::max(bmMultiSup.descent, bmSupScript.descent);
        multiSupSize.Height() = 
          std::max(multiSupSize.Height(),
                   supScriptSize.Height() - supScriptSize.TopAscent());

        if (bmSupScript.width)
          width = std::max(width, bmSupScript.width + aScriptSpace);
        rightBearing = std::max(rightBearing, bmSupScript.rightBearing);

        if (!prescriptsFrame) { // we are still looping over base & postscripts
          rightBearing = std::max(rightBearing,
                                  italicCorrection + bmSupScript.rightBearing);
          boundingMetrics.rightBearing = boundingMetrics.width + rightBearing;
          boundingMetrics.width += width;
        } else {
          rightBearing = std::max(rightBearing, bmSupScript.rightBearing);
          prescriptsWidth += width;
          if (firstPrescriptsPair) {
            firstPrescriptsPair = false;
            boundingMetrics.leftBearing =
              std::min(bmSubScript.leftBearing, bmSupScript.leftBearing);
          }
        }
        width = rightBearing = 0;

        // place the base ...
        childFrame = baseFrame;
        dy = aDesiredSize.TopAscent() - baseSize.TopAscent();
        FinishReflowChild (baseFrame, aPresContext, baseSize, nullptr,
                           aFrame->MirrorIfRTL(aDesiredSize.Width(),
                                               baseSize.Width(),
                                               dx),
                           dy, 0);
        dx += bmBase.width;
      } else if (prescriptsFrame != childFrame) {
        // process each sup/sub pair
        if (0 == count) {
          subScriptFrame = childFrame;
          count = 1;
        } else if (1 == count) {
          if (tag != nsGkAtoms::msub_)
            supScriptFrame = childFrame;

                               aFrame->MirrorIfRTL(aDesiredSize.Width(),
                                                   subScriptSize.Width(),
                                                   x),
                               dy, 0);
          }

          if (supScriptFrame) {
            nscoord x = dx;
            if (isPreScript) {
              x += width - supScriptSize.Width();
            } else {
              // post superscripts are shifted by the italic correction value
              x += italicCorrection;
            }
            dy = aDesiredSize.TopAscent() - supScriptSize.TopAscent() -
              maxSupScriptShift;
            FinishReflowChild (supScriptFrame, aPresContext, supScriptSize,
                               nullptr,
                               aFrame->MirrorIfRTL(aDesiredSize.Width(),
                                                   supScriptSize.Width(),
                                                   x),
                               dy, 0);





== operator-1.xhtml operator-1-ref.xhtml
== scriptshift-1.xhtml scriptshift-1-ref.xhtml
== number-size-1.xhtml number-size-1-ref.xhtml
== multiscripts-1.html multiscripts-1-ref.html
== mathml-mmultiscript-base.html mathml-mmultiscript-base-ref.html
== mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript-ref.html
!= menclose-1.html menclose-1-ref.html
== mmultiscript-align.html mmultiscript-align-ref.html
== subscript-italic-correction.html subscript-italic-correction-ref.html
== mathvariant-1a.html mathvariant-1a-ref.html
== mathvariant-1b.html mathvariant-1b-ref.html
== mathvariant-1c.html mathvariant-1c-ref.html
== mathvariant-1d.html mathvariant-1d-ref.html
== mathvariant-2.html mathvariant-2-ref.html
== mathvariant-3.html mathvariant-3-ref.html
== mathvariant-4.html mathvariant-4-ref.html
== mathvariant-5.html mathvariant-5-ref.html

-      Line
+  Link Here
-      Line 0
+  Link Here
+<!doctype html>
+<html>
+  <head>
+    <title>subscript</title>
+    <meta charset="utf-8"/>
+  </head>
+  <body style="background: #5f5; font-size: 50px;">
+    <div>
+      <math>
+        <msubsup>
+          <mi>f</mi>
+          <mspace id="s0" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s1" width="50px" height="50px" mathbackground="blue"/>
+        </msubsup>
+      </math>
+    </div>
+    <br/>
+    <div>
+      <math>
+        <mmultiscripts>
+          <mi>f</mi>
+          <mspace id="s2" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s3" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s4" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s5" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s6" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s7" width="50px" height="50px" mathbackground="blue"/>
+        </mmultiscripts>
+      </math>
+    </div>
+  </body>
+</html>

-      Line
+  Link Here
-      Line 0
+  Link Here
+<!doctype html>
+<html class="reftest-wait">
+  <head>
+    <title>subscript</title>
+    <meta charset="utf-8"/>
+    <script type="text/javascript">
+      function verifyItalicCorrections()
+      {
+        var epsilon = 5;
+        for (var i = 0; i < 8; i += 2) {
+          var sub = document.getElementById("s" + i);
+          var sup = document.getElementById("s" + (i+1));
+          var italicCorrection =
+           sup.getBoundingClientRect().left - sub.getBoundingClientRect().left;
+           if (italicCorrection < epsilon) {
+             return false;
+           }
+        }
+        return true;
+      }
+      function doTest()
+      {
+        if (verifyItalicCorrections()) {
+          document.body.style.background = "#5f5";
+        }
+        document.documentElement.removeAttribute("class");
+      }
+      window.addEventListener("MozReftestInvalidate", doTest, false);
+    </script>
+  </head>
+  <body style="background: #f00; font-size: 50px;">
+    <div>
+      <math>
+        <msubsup>
+          <mi>f</mi>
+          <mspace id="s0" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s1" width="50px" height="50px" mathbackground="blue"/>
+        </msubsup>
+      </math>
+    </div>
+    <br/>
+    <div>
+      <math>
+        <mmultiscripts>
+          <mi>f</mi>
+          <mspace id="s2" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s3" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s4" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s5" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s6" width="50px" height="50px" mathbackground="blue"/>
+          <mspace id="s7" width="50px" height="50px" mathbackground="blue"/>
+        </mmultiscripts>
+      </math>
+    </div>
+  </body>
+</html>

Return to bug 945254