From de86049b87f8dc12c022406c201abb533bc78f68 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 8 Oct 2020 16:27:21 +0200
Subject: [PATCH] m.plots: update the regex hell for matplotlib 3.3.

---
 .../test_python/page_plugins/plots.html       |  4 +---
 plugins/m/plots.py                            | 24 ++++++++++++++++---
 plugins/m/test/plots/page-22.html             | 16 ++++---------
 plugins/m/test/plots/page-30.html             | 16 ++++---------
 plugins/m/test/plots/page-py35.html           | 16 ++++---------
 plugins/m/test/plots/page.html                | 16 ++++---------
 6 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/documentation/test_python/page_plugins/plots.html b/documentation/test_python/page_plugins/plots.html
index f60ed497..c1f9746c 100644
--- a/documentation/test_python/page_plugins/plots.html
+++ b/documentation/test_python/page_plugins/plots.html
@@ -27,9 +27,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 </style><div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
diff --git a/plugins/m/plots.py b/plugins/m/plots.py
index 83429905..df8fea46 100644
--- a/plugins/m/plots.py
+++ b/plugins/m/plots.py
@@ -72,14 +72,25 @@ style_mapping = {
 }
 
 # Patch to remove preamble and hardcoded sizes. Matplotlib 2.2 has a http URL
-# while matplotlib 3 has a https URL, check for both.
+# while matplotlib 3 has a https URL, check for both. Matplotlib 3.3 has a new
+# <metadata> field (which we're not interested in) and slightly different
+# formatting of the global style after (which we unify to the compact version).
 _patch_src = re.compile(r"""<\?xml version="1\.0" encoding="utf-8" standalone="no"\?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1\.1//EN"
   "http://www\.w3\.org/Graphics/SVG/1\.1/DTD/svg11\.dtd">
 <!-- Created with matplotlib \(https?://matplotlib.org/\) -->
-<svg height="\d+(\.\d+)?pt" version="1.1" (?P<viewBox>viewBox="0 0 \d+ \d+(\.\d+)?") width="\d+(\.\d+)?pt" xmlns="http://www\.w3\.org/2000/svg" xmlns:xlink="http://www\.w3\.org/1999/xlink">
-""")
+<svg height="\d+(\.\d+)?pt" version="1.1" (?P<viewBox>viewBox="0 0 \d+ \d+(\.\d+)?") width="\d+(\.\d+)?pt" xmlns="http://www\.w3\.org/2000/svg" xmlns:xlink="http://www\.w3\.org/1999/xlink">(
+ <metadata>.+</metadata>)?
+ <defs>
+  <style type="text/css">
+?\*{stroke-linecap:butt;stroke-linejoin:round;}(
+  )?</style>
+ </defs>
+""", re.DOTALL)
 _patch_dst = r"""<svg \g<viewBox>>
+ <defs>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
+ </defs>
 """
 
 # Remove needless newlines and trailing space in path data
@@ -98,14 +109,21 @@ _class_mapping = [
     # <use>, everything is defined in <defs>, no need to repeat
     ('<use style="fill:#cafe02;stroke:#cafe02;stroke-width:0.8;"', '<use'),
 
+    # Text styles have `font-stretch:normal;` added in matplotlib 3.3, so
+    # all of them are duplicated to handle this
+
     # Label text on left
     ('style="fill:#cafe02;font-family:{font};font-size:11px;font-style:normal;font-weight:normal;"', 'class="m-label"'),
+    ('style="fill:#cafe02;font-family:{font};font-size:11px;font-stretch:normal;font-style:normal;font-weight:normal;"', 'class="m-label"'),
     # Label text on bottom (has extra style params)
     ('style="fill:#cafe02;font-family:{font};font-size:11px;font-style:normal;font-weight:normal;', 'class="m-label" style="'),
+    ('style="fill:#cafe02;font-family:{font};font-size:11px;font-stretch:normal;font-style:normal;font-weight:normal;', 'class="m-label" style="'),
     # Secondary label text
     ('style="fill:#cafe0b;font-family:{font};font-size:11px;font-style:normal;font-weight:normal;"', 'class="m-label m-dim"'),
+    ('style="fill:#cafe0b;font-family:{font};font-size:11px;font-stretch:normal;font-style:normal;font-weight:normal;"', 'class="m-label m-dim"'),
     # Title text
     ('style="fill:#cafe02;font-family:{font};font-size:13px;font-style:normal;font-weight:normal;', 'class="m-title" style="'),
+    ('style="fill:#cafe02;font-family:{font};font-size:13px;font-stretch:normal;font-style:normal;font-weight:normal;', 'class="m-title" style="'),
 
     # Bar colors. Keep in sync with latex2svgextra.
     ('style="fill:#cafe03;"', 'class="m-bar m-default"'),
diff --git a/plugins/m/test/plots/page-22.html b/plugins/m/test/plots/page-22.html
index e6598208..989eff18 100644
--- a/plugins/m/test/plots/page-22.html
+++ b/plugins/m/test/plots/page-22.html
@@ -30,9 +30,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 </style><div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -163,9 +161,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 218.16">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -341,9 +337,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 142.56">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -516,9 +510,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
diff --git a/plugins/m/test/plots/page-30.html b/plugins/m/test/plots/page-30.html
index 6939e60d..2d6674ed 100644
--- a/plugins/m/test/plots/page-30.html
+++ b/plugins/m/test/plots/page-30.html
@@ -30,9 +30,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 </style><div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -163,9 +161,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 218.16">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -341,9 +337,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 142.56">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -516,9 +510,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
diff --git a/plugins/m/test/plots/page-py35.html b/plugins/m/test/plots/page-py35.html
index 3fa7caf9..0d64be21 100644
--- a/plugins/m/test/plots/page-py35.html
+++ b/plugins/m/test/plots/page-py35.html
@@ -30,9 +30,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 </style><div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -165,9 +163,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 324 218.16">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -344,9 +340,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 142.56">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -519,9 +513,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
diff --git a/plugins/m/test/plots/page.html b/plugins/m/test/plots/page.html
index 4ece1575..836e2966 100644
--- a/plugins/m/test/plots/page.html
+++ b/plugins/m/test/plots/page.html
@@ -30,9 +30,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 </style><div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -165,9 +163,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 324 218.16">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -344,9 +340,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 142.56">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
@@ -519,9 +513,7 @@ div.m-plot svg { font-family: DejaVu Sans; }
 <div class="m-plot">
 <svg viewBox="0 0 576 113.76">
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
  </defs>
  <g id="figure_1">
   <g id="axes_1">
-- 
2.30.2