Merge pull request #19499 from anntzer/overunder

story645 · web-flow · commit aec7ec813aff · 2021-05-20T16:51:50.000-04:00
Fully fold overset/underset into _genset.
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -2813,29 +2813,28 @@ def binom(self, s, loc, toks):
         return self._genfrac('(', ')', 0.0, self._MathStyle.TEXTSTYLE,
                              num, den)
 
-    def _genset(self, state, annotation, body, overunder):
+    def _genset(self, s, loc, toks):
+        (annotation, body), = toks
+        state = self.get_state()
         thickness = state.font_output.get_underline_thickness(
             state.font, state.fontsize, state.dpi)
 
         annotation.shrink()
-
         cannotation = HCentered([annotation])
         cbody = HCentered([body])
         width = max(cannotation.width, cbody.width)
         cannotation.hpack(width, 'exactly')
         cbody.hpack(width, 'exactly')
 
         vgap = thickness * 3
-        if overunder == "under":
+        if s[loc + 1] == "u":  # \underset
             vlist = Vlist([cbody,                       # body
                            Vbox(0, vgap),               # space
                            cannotation                  # annotation
                            ])
             # Shift so the body sits in the same vertical position
-            shift_amount = cbody.depth + cannotation.height + vgap
-
-            vlist.shift_amount = shift_amount
-        else:
+            vlist.shift_amount = cbody.depth + cannotation.height + vgap
+        else:  # \overset
             vlist = Vlist([cannotation,                 # annotation
                            Vbox(0, vgap),               # space
                            cbody                        # body
@@ -2845,6 +2844,8 @@ def _genset(self, state, annotation, body, overunder):
         # an Hlist and extend it with an Hbox(0, horizontal_gap)
         return vlist
 
+    overset = underset = _genset
+
     def sqrt(self, s, loc, toks):
         (root, body), = toks
         state = self.get_state()
@@ -2905,24 +2906,6 @@ def overline(self, s, loc, toks):
         hlist = Hlist([rightside])
         return [hlist]
 
-    def overset(self, s, loc, toks):
-        assert len(toks) == 1
-        assert len(toks[0]) == 2
-
-        state = self.get_state()
-        annotation, body = toks[0]
-
-        return self._genset(state, annotation, body, overunder="over")
-
-    def underset(self, s, loc, toks):
-        assert len(toks) == 1
-        assert len(toks[0]) == 2
-
-        state = self.get_state()
-        annotation, body = toks[0]
-
-        return self._genset(state, annotation, body, overunder="under")
-
     def _auto_sized_delimiter(self, front, middle, back):
         state = self.get_state()
         if len(middle):
