From 767b16ee79cc3c3f37ed218edab29d9dc7ea835a Mon Sep 17 00:00:00 2001
From: tfpf <vpaijc@gmail.com>
Date: Tue, 28 Jun 2022 11:39:27 +0530
Subject: [PATCH 1/2] Fixed decimal points not appearing at end of Mathtext
 string.

---
 lib/matplotlib/_mathtext.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
index 55397b1fd58c..3c4be2144533 100644
--- a/lib/matplotlib/_mathtext.py
+++ b/lib/matplotlib/_mathtext.py
@@ -2000,16 +2000,16 @@ def symbol(self, s, loc, toks):
                                self._make_space(0.2)],
                               do_kern=True)]
         elif c in self._punctuation_symbols:
+            prev_char = next((c for c in s[:loc][::-1] if c != ' '), '')
+            next_char = next((c for c in s[loc + 1:] if c != ' '), '')
 
             # Do not space commas between brackets
             if c == ',':
-                prev_char = next((c for c in s[:loc][::-1] if c != ' '), '')
-                next_char = next((c for c in s[loc + 1:] if c != ' '), '')
                 if prev_char == '{' and next_char == '}':
                     return [char]
 
             # Do not space dots as decimal separators
-            if c == '.' and s[loc - 1].isdigit() and s[loc + 1].isdigit():
+            if c == '.' and prev_char.isdigit() and next_char.isdigit():
                 return [char]
             else:
                 return [Hlist([char, self._make_space(0.2)], do_kern=True)]

From 7d427111ccc9d68d9610fd6069f65390b81535a6 Mon Sep 17 00:00:00 2001
From: tfpf <vpaijc@gmail.com>
Date: Wed, 29 Jun 2022 10:42:21 +0530
Subject: [PATCH 2/2] Added test for Mathtext strings ending with decimal
 point.

---
 .../test_mathtext/mathtext1_dejavusans_03.png    | Bin 0 -> 3853 bytes
 lib/matplotlib/tests/test_mathtext.py            |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_03.png

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_03.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..f28fb31c542f65f0e813c36bcfb2d1b21aa07939
GIT binary patch
literal 3853
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
D*xFF)

literal 0
HcmV?d00001

diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
index 52cd45e60b64..4125f2c54675 100644
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -128,6 +128,7 @@
     r'$\sqrt[ab]{123}$',  # github issue #8665
     r'$x \overset{f}{\rightarrow} \overset{f}{x} \underset{xx}{ff} \overset{xx}{ff} \underset{f}{x} \underset{f}{\leftarrow} x$',  # github issue #18241
     r'$\sum x\quad\sum^nx\quad\sum_nx\quad\sum_n^nx\quad\prod x\quad\prod^nx\quad\prod_nx\quad\prod_n^nx$',  # GitHub issue 18085
+    r'$1.$ $2.$ $19680801.$ $a.$ $b.$ $mpl.$',
 ]
 
 digits = "0123456789"