From beec0fb84d03a7ce819af0d2e7d6f2bab488d266 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Fri, 20 Jan 2023 23:28:12 +0100 Subject: [PATCH 1/5] Add more relational operators to mathtext --- lib/matplotlib/_mathtext.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index 09f5c618794e..72112fb35eb6 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -1746,7 +1746,26 @@ class _MathStyle(enum.Enum): \sqsubset \sqsupset \neq \smile \sqsubseteq \sqsupseteq \doteq \frown \in \ni \propto \vdash - \dashv \dots \doteqdot'''.split()) + \dashv \dots \doteqdot + \leqq \geqq \lneqq \gneqq + \lessgtr \leqslant \eqgtr \eqless + \eqslantless \eqslantgtr \lesseqgtr + \backsim \backsimeq \lesssim \gtrsim + \precsim \precnsim \gnsim \lnsim + \succsim \succnsim \nsim + \lesseqqgtr \gtreqqless \gtreqless + \subseteqq \supseteqq \subsetneqq \supsetneqq + \lessapprox \approxeq \gtrapprox \precapprox + \succapprox \precnapprox \succnapprox + \lnapprox \gnapprox \napprox \approxeq + \approxident \lll \ggg \triangleeq + \triangleq \triangleleft \triangleright \ntriangleleft + \ntriangleright \trianglelefteq \ntrianglelefteq + \trianglerighteq \ntrianglerighteq \blacktriangleleft + \blacktriangleright \parallel \nparallel + \Vdash \Vvdash \nVdash \nvdash + \vDash \nvDash \nVDash + '''.split()) _arrow_symbols = set(r''' \leftarrow \longleftarrow \uparrow From d760bd4a9a4317c232fba45c525537851e7e0c4e Mon Sep 17 00:00:00 2001 From: Ratnabali Dutta Date: Sat, 13 May 2023 15:04:40 +0530 Subject: [PATCH 2/5] Add missing relational operator Co-authored-by: Oscar Gustafsson --- lib/matplotlib/_mathtext.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index 72112fb35eb6..3b2a07a3ff5b 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -1748,7 +1748,7 @@ class _MathStyle(enum.Enum): \in \ni \propto \vdash \dashv \dots \doteqdot \leqq \geqq \lneqq \gneqq - \lessgtr \leqslant \eqgtr \eqless + \lessgtr \leqslant \geqslant \eqgtr \eqless \eqslantless \eqslantgtr \lesseqgtr \backsim \backsimeq \lesssim \gtrsim \precsim \precnsim \gnsim \lnsim From 21bd168ef12bfab241b91acbd6d9d24442bb3160 Mon Sep 17 00:00:00 2001 From: Ratnabali Dutta Date: Sat, 20 May 2023 07:04:43 +0530 Subject: [PATCH 3/5] Add unicode mappings to binary operators --- lib/matplotlib/_mathtext_data.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py index 8befc7294754..fd044176db62 100644 --- a/lib/matplotlib/_mathtext_data.py +++ b/lib/matplotlib/_mathtext_data.py @@ -674,6 +674,13 @@ 'simeq' : 8771, 'napprox' : 8777, 'ast' : 8727, + 'amalg' : 10815, + 'lhd' : 9665, + 'rhd' : 9655, + 'ddagger' : 8225, + 'unlhd' : 8884, + 'unrhd' : 8885, + 'setminus' : 8726, 'twoheaduparrow' : 8607, 'doublebarwedge' : 8966, 'Sigma' : 931, From 2ad82fc31d701ee8db37a80da8cf7b05d9e09df2 Mon Sep 17 00:00:00 2001 From: Ratnabali Dutta Date: Mon, 29 May 2023 15:29:02 +0530 Subject: [PATCH 4/5] Arrange layout for relational operators --- lib/matplotlib/_mathtext.py | 55 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index 3b2a07a3ff5b..16cb2040a678 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -1737,34 +1737,33 @@ class _MathStyle(enum.Enum): _relation_symbols = set(r''' = < > : - \leq \geq \equiv \models - \prec \succ \sim \perp - \preceq \succeq \simeq \mid - \ll \gg \asymp \parallel - \subset \supset \approx \bowtie - \subseteq \supseteq \cong \Join - \sqsubset \sqsupset \neq \smile - \sqsubseteq \sqsupseteq \doteq \frown - \in \ni \propto \vdash - \dashv \dots \doteqdot - \leqq \geqq \lneqq \gneqq - \lessgtr \leqslant \geqslant \eqgtr \eqless - \eqslantless \eqslantgtr \lesseqgtr - \backsim \backsimeq \lesssim \gtrsim - \precsim \precnsim \gnsim \lnsim - \succsim \succnsim \nsim - \lesseqqgtr \gtreqqless \gtreqless - \subseteqq \supseteqq \subsetneqq \supsetneqq - \lessapprox \approxeq \gtrapprox \precapprox - \succapprox \precnapprox \succnapprox - \lnapprox \gnapprox \napprox \approxeq - \approxident \lll \ggg \triangleeq - \triangleq \triangleleft \triangleright \ntriangleleft - \ntriangleright \trianglelefteq \ntrianglelefteq - \trianglerighteq \ntrianglerighteq \blacktriangleleft - \blacktriangleright \parallel \nparallel - \Vdash \Vvdash \nVdash \nvdash - \vDash \nvDash \nVDash + \leq \geq \equiv \models + \prec \succ \sim \perp + \preceq \succeq \simeq \mid + \ll \gg \asymp \parallel + \subset \supset \approx \bowtie + \subseteq \supseteq \cong \Join + \sqsubset \sqsupset \neq \smile + \sqsubseteq \sqsupseteq \doteq \frown + \in \ni \propto \vdash + \dashv \dots \doteqdot \leqq + \geqq \lneqq \gneqq \lessgtr + \leqslant \geqslant \eqgtr \eqless + \eqslantless \eqslantgtr \lesseqgtr \backsim + \backsimeq \lesssim \gtrsim \precsim + \precnsim \gnsim \lnsim \succsim + \succnsim \nsim \lesseqqgtr \gtreqqless + \gtreqless \subseteqq \supseteqq \subsetneqq + \supsetneqq \lessapprox \approxeq \gtrapprox + \precapprox \succapprox \precnapprox \succnapprox + \lnapprox \gnapprox \napprox \approxeq + \approxident \lll \ggg \parallel + \nparallel \Vdash \Vvdash \nVdash + \nvdash \vDash \nvDash \nVDash + \triangleq \triangleeq \triangleleft + \triangleright \ntriangleleft \ntriangleright + \trianglelefteq \ntrianglelefteq \trianglerighteq + \ntrianglerighteq \blacktriangleleft \blacktriangleright '''.split()) _arrow_symbols = set(r''' From 8076a7740d29c01563e8e50ec107f9e632fbd2b5 Mon Sep 17 00:00:00 2001 From: Ratnabali Dutta Date: Mon, 5 Jun 2023 18:19:59 +0530 Subject: [PATCH 5/5] Add relation operators --- lib/matplotlib/_mathtext.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index 16cb2040a678..c3c28b733d28 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -1756,14 +1756,18 @@ class _MathStyle(enum.Enum): \gtreqless \subseteqq \supseteqq \subsetneqq \supsetneqq \lessapprox \approxeq \gtrapprox \precapprox \succapprox \precnapprox \succnapprox - \lnapprox \gnapprox \napprox \approxeq - \approxident \lll \ggg \parallel - \nparallel \Vdash \Vvdash \nVdash - \nvdash \vDash \nvDash \nVDash + \npreccurlyeq \nsucccurlyeq \nsqsubseteq \nsqsupseteq + \sqsubsetneq \sqsupsetneq \nlesssim \ngtrsim + \nlessgtr \ngtrless \lnapprox \gnapprox + \napprox \approxeq \approxident \lll + \ggg \nparallel \Vdash \Vvdash + \nVdash \nvdash \vDash \nvDash + \nVDash \oequal \simneqq \triangle \triangleq \triangleeq \triangleleft \triangleright \ntriangleleft \ntriangleright \trianglelefteq \ntrianglelefteq \trianglerighteq \ntrianglerighteq \blacktriangleleft \blacktriangleright + \equalparallel \measuredrightangle \varlrtriangle '''.split()) _arrow_symbols = set(r'''