diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 833725c740..adca7470da 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -155,6 +155,22 @@ if(JKQtPlotter_BUILD_TOOLS)
)
add_dependencies(JKQTPlotter_GenerateDocImages JKQTPlotter_GenerateDocImages_liststyles)
+ add_custom_target(JKQTPlotter_GenerateDocImages_listkeypos
+ COMMENT "Building JKQTPlotter Documentation Images: listkeypos"
+ COMMAND ${JKQTPlotter_GenerateDocImages_COMMAND} --listkeypos --iconsize=225 --outputdir="${JKQTPlotter_GenerateDocImages_OutputDir}/keypositions/"
+ WORKING_DIRECTORY ${JKQtPlotter_QT_BINDIR}
+ DEPENDS jkqtplotter_doc_imagegenerator
+ )
+ add_dependencies(JKQTPlotter_GenerateDocImages JKQTPlotter_GenerateDocImages_listkeypos)
+
+ add_custom_target(JKQTPlotter_GenerateDocImages_listkeylayout
+ COMMENT "Building JKQTPlotter Documentation Images: listkeylayout"
+ COMMAND ${JKQTPlotter_GenerateDocImages_COMMAND} --listkeylayout --iconsize=225 --outputdir="${JKQTPlotter_GenerateDocImages_OutputDir}/keylayouts/"
+ WORKING_DIRECTORY ${JKQtPlotter_QT_BINDIR}
+ DEPENDS jkqtplotter_doc_imagegenerator
+ )
+ add_dependencies(JKQTPlotter_GenerateDocImages JKQTPlotter_GenerateDocImages_listkeylayout)
+
endif(JKQtPlotter_BUILD_TOOLS)
diff --git a/doc/dox/todo.dox b/doc/dox/todo.dox
index de9ca87a2b..dea405515c 100644
--- a/doc/dox/todo.dox
+++ b/doc/dox/todo.dox
@@ -5,6 +5,11 @@
This page lists several todos and wishes for future version of JKQTPlotter
+ - General:
+ - build system: provide general targets JKQTPlotter::JKQTPlotter, JKQTPlotter::JKQTMathText, instead of targets which differ by linking option
+ - build system: refactor CMake-Code, so static/dynamic switch is done on compile and only one variant is built
+ - build system: maybe prepare for CMake's FetchContent-API (+ possibly providing a reduced source-package for each release)
+
- JKQTPlotter:
- data management: allow for other datatypes than double, would be good to have, double, float, ints, bool, string ... as for images
- data management: binding for the Eigen library
@@ -25,9 +30,7 @@ This page lists several todos and wishes for future version of JKQTPlotter
- plot: axes with symlog (see http://dx.doi.org/10.1088/0957-0233/24/2/027001) and logit (https://de.m.wikipedia.org/wiki/Logit) scaling?
- plot: axis labels above/below/centered around tick
- plot: elongated grid to left of tick labels
- - plot: legend positioning as combination of 3 values: inside|outside + left|center|right + top|vcenter|bottom
- plot: refactor print preview/export preview code
- - plot: rework layouting of legends: there are some inconsistencies/too large gaps ...
- sryling: better styling/more styling options for data-tooltips
- styling: color gradients as fill-styles in style-INIs
- user interactions: dialog(s) to edit x/y-range
diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox
index 85e3123398..d7faecdc1d 100644
--- a/doc/dox/whatsnew.dox
+++ b/doc/dox/whatsnew.dox
@@ -30,6 +30,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
- BREAKING/FIXED: fixed issue #96: JKQTPlotter::saveAsPixelImage() does not add a border around the image any longer (can be reacivated by a new optional function parameter), thanks to user:nmielcarek for reporting
- BREAKING/FIXED: JKQTPXFunctionLineGraph and JKQTPYFunctionLineGraph do no longer contribute to auto-scaling, as that depends on the current plot-axes (hen-egg-problem).
- FIXED/BREAKING: graph symbols were not properly applied when reading styles (in fact they were shuffled under some circumstances)
+ - NEW/BREAKING: rework layouting of keys/legends: new classes JKQTPBaseKey, JKQTPMainKey ... and removed several styling function for the main key from JKQTBasePlotter and JKQTPlotter (these are now accessible via JKQTBasePlotter::getMainKey()
- FIXED issue described in #62: Fix custom labels draw, because giving exactly two label-strings did not display all of them, thanks to user:FalsinSoft
- FIXED issue #70: Typo in jkqtplotter/CMakeLists.txt, thanks to user:tedlinlab
- FIXED issue #80: Bug with multiple inheritance with Q_GDAGET with CLANG, thanks to user:igormironchik, caused by QTBUG-104874
@@ -55,6 +56,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
- IMPROVED/REWORKED: coordinate axis code was refactored
- IMPROVED/REWORKED: zomm/pan by mouse-wheel: now there are modes that support zoomin AND panning by trakpad and mouse-wheel simultaneously! This can only be implemented using heuristics, due to the way that Qt handles track-pad events, but the current solution should at least improve the behaviour seen before. Mainly
jkqtpmwaZoomByWheelAndTrackpadPan
was introduced into JKQTPMouseWheelActions
und is set as default mode: Here JKQTPlotter tries to distinguish the QWheelEvent s sent by an actual mouse wheel and a trackpad.
- IMPROVED/REWORKED: better example graphs in \link JKQTPlotterStyling.
+ - IMPROVED/REWORKED: legend/key positioning as combination of 3 values, e.g. \c JKQTPKeyOutsideTop|JKQTPKeyTop|JKQTPKeyRight or \c JKQTPKeyInside|JKQTPKeyTopJKQTPKeyRight
- IMPROVED: documentation of styles: automatized doc image generation.
- NEW: JKQTPFilledCurveXGraph and JKQTPFilledCurveYGraph can now plot wiggle plots with different fill styles above and below the baseline (feature request #68 Wiggle Plots from user:xichaoqiang
- NEW/BREAKING CHANGE: data tooltip can now also be shown when "just" moving the mouse (so far this was only possible when dragging the mouse with a button pressed). This also removes JKQtPlotter::getActMouseLeftAsToolTip() and adds JKQtPlotter::getActMouseMoveToolTip() instead! Also the default toolbars and context menus changed!
diff --git a/doc/images/JKQTBasePlotter_addSecondaryXAxis.png b/doc/images/JKQTBasePlotter_addSecondaryXAxis.png
index 9ae3809437..c420ee008a 100644
Binary files a/doc/images/JKQTBasePlotter_addSecondaryXAxis.png and b/doc/images/JKQTBasePlotter_addSecondaryXAxis.png differ
diff --git a/doc/images/JKQTBasePlotter_addSecondaryYAxis.png b/doc/images/JKQTBasePlotter_addSecondaryYAxis.png
index 68c5296b6f..a3730f616d 100644
Binary files a/doc/images/JKQTBasePlotter_addSecondaryYAxis.png and b/doc/images/JKQTBasePlotter_addSecondaryYAxis.png differ
diff --git a/doc/images/JKQTPBarHorizontalErrorGraph.png b/doc/images/JKQTPBarHorizontalErrorGraph.png
index 0933d2b68f..05e419d76f 100644
Binary files a/doc/images/JKQTPBarHorizontalErrorGraph.png and b/doc/images/JKQTPBarHorizontalErrorGraph.png differ
diff --git a/doc/images/JKQTPBarHorizontalErrorGraph_small.png b/doc/images/JKQTPBarHorizontalErrorGraph_small.png
index e615b4f23b..c27b727255 100644
Binary files a/doc/images/JKQTPBarHorizontalErrorGraph_small.png and b/doc/images/JKQTPBarHorizontalErrorGraph_small.png differ
diff --git a/doc/images/JKQTPBarHorizontalGraph.png b/doc/images/JKQTPBarHorizontalGraph.png
index 6cd930b7c6..79c83f4452 100644
Binary files a/doc/images/JKQTPBarHorizontalGraph.png and b/doc/images/JKQTPBarHorizontalGraph.png differ
diff --git a/doc/images/JKQTPBarHorizontalGraphFunctorFilling.png b/doc/images/JKQTPBarHorizontalGraphFunctorFilling.png
index d567022b71..500716454b 100644
Binary files a/doc/images/JKQTPBarHorizontalGraphFunctorFilling.png and b/doc/images/JKQTPBarHorizontalGraphFunctorFilling.png differ
diff --git a/doc/images/JKQTPBarHorizontalGraphFunctorFilling_small.png b/doc/images/JKQTPBarHorizontalGraphFunctorFilling_small.png
index f837030adc..48e125fe36 100644
Binary files a/doc/images/JKQTPBarHorizontalGraphFunctorFilling_small.png and b/doc/images/JKQTPBarHorizontalGraphFunctorFilling_small.png differ
diff --git a/doc/images/JKQTPBarHorizontalGraphTwoColorFilling.png b/doc/images/JKQTPBarHorizontalGraphTwoColorFilling.png
index e6355f3e60..ef54305445 100644
Binary files a/doc/images/JKQTPBarHorizontalGraphTwoColorFilling.png and b/doc/images/JKQTPBarHorizontalGraphTwoColorFilling.png differ
diff --git a/doc/images/JKQTPBarHorizontalGraphTwoColorFilling_small.png b/doc/images/JKQTPBarHorizontalGraphTwoColorFilling_small.png
index bfb4b41f0c..a068d920d8 100644
Binary files a/doc/images/JKQTPBarHorizontalGraphTwoColorFilling_small.png and b/doc/images/JKQTPBarHorizontalGraphTwoColorFilling_small.png differ
diff --git a/doc/images/JKQTPBarHorizontalGraph_small.png b/doc/images/JKQTPBarHorizontalGraph_small.png
index 9503bb6457..0d94e12b09 100644
Binary files a/doc/images/JKQTPBarHorizontalGraph_small.png and b/doc/images/JKQTPBarHorizontalGraph_small.png differ
diff --git a/doc/images/JKQTPBarVerticalErrorGraph.png b/doc/images/JKQTPBarVerticalErrorGraph.png
index f186997bb8..00f27df4a0 100644
Binary files a/doc/images/JKQTPBarVerticalErrorGraph.png and b/doc/images/JKQTPBarVerticalErrorGraph.png differ
diff --git a/doc/images/JKQTPBarVerticalErrorGraph_small.png b/doc/images/JKQTPBarVerticalErrorGraph_small.png
index 7faa68bb48..d174fd00cf 100644
Binary files a/doc/images/JKQTPBarVerticalErrorGraph_small.png and b/doc/images/JKQTPBarVerticalErrorGraph_small.png differ
diff --git a/doc/images/JKQTPBarVerticalGraph.png b/doc/images/JKQTPBarVerticalGraph.png
index 6123d9a7a4..05ba5378fa 100644
Binary files a/doc/images/JKQTPBarVerticalGraph.png and b/doc/images/JKQTPBarVerticalGraph.png differ
diff --git a/doc/images/JKQTPBarVerticalGraphBaseline.png b/doc/images/JKQTPBarVerticalGraphBaseline.png
index aed83b0721..9447a5603c 100644
Binary files a/doc/images/JKQTPBarVerticalGraphBaseline.png and b/doc/images/JKQTPBarVerticalGraphBaseline.png differ
diff --git a/doc/images/JKQTPBarVerticalGraphFunctorFilling.png b/doc/images/JKQTPBarVerticalGraphFunctorFilling.png
index 10a0f77715..3c263937e0 100644
Binary files a/doc/images/JKQTPBarVerticalGraphFunctorFilling.png and b/doc/images/JKQTPBarVerticalGraphFunctorFilling.png differ
diff --git a/doc/images/JKQTPBarVerticalGraphFunctorFilling_small.png b/doc/images/JKQTPBarVerticalGraphFunctorFilling_small.png
index fc6fd108ba..59a45d8825 100644
Binary files a/doc/images/JKQTPBarVerticalGraphFunctorFilling_small.png and b/doc/images/JKQTPBarVerticalGraphFunctorFilling_small.png differ
diff --git a/doc/images/JKQTPBarVerticalGraphNoBaseline.png b/doc/images/JKQTPBarVerticalGraphNoBaseline.png
index 6123d9a7a4..05ba5378fa 100644
Binary files a/doc/images/JKQTPBarVerticalGraphNoBaseline.png and b/doc/images/JKQTPBarVerticalGraphNoBaseline.png differ
diff --git a/doc/images/JKQTPBarVerticalGraphTwoColorFilling.png b/doc/images/JKQTPBarVerticalGraphTwoColorFilling.png
index bf4b753d59..203b6d3b97 100644
Binary files a/doc/images/JKQTPBarVerticalGraphTwoColorFilling.png and b/doc/images/JKQTPBarVerticalGraphTwoColorFilling.png differ
diff --git a/doc/images/JKQTPBarVerticalGraphTwoColorFilling_small.png b/doc/images/JKQTPBarVerticalGraphTwoColorFilling_small.png
index e3f2a7c7de..b8c3c876eb 100644
Binary files a/doc/images/JKQTPBarVerticalGraphTwoColorFilling_small.png and b/doc/images/JKQTPBarVerticalGraphTwoColorFilling_small.png differ
diff --git a/doc/images/JKQTPBarVerticalGraph_small.png b/doc/images/JKQTPBarVerticalGraph_small.png
index eb01651d9b..327fbd1bb5 100644
Binary files a/doc/images/JKQTPBarVerticalGraph_small.png and b/doc/images/JKQTPBarVerticalGraph_small.png differ
diff --git a/doc/images/JKQTPBoxplotHorizontalGraph.png b/doc/images/JKQTPBoxplotHorizontalGraph.png
index ba341c22ec..df870deb9d 100644
Binary files a/doc/images/JKQTPBoxplotHorizontalGraph.png and b/doc/images/JKQTPBoxplotHorizontalGraph.png differ
diff --git a/doc/images/JKQTPBoxplotHorizontalGraph_small.png b/doc/images/JKQTPBoxplotHorizontalGraph_small.png
index 1b72bafa03..74e3f5cbd1 100644
Binary files a/doc/images/JKQTPBoxplotHorizontalGraph_small.png and b/doc/images/JKQTPBoxplotHorizontalGraph_small.png differ
diff --git a/doc/images/JKQTPBoxplotVerticalGraph.png b/doc/images/JKQTPBoxplotVerticalGraph.png
index a8094220ad..8d26d73f16 100644
Binary files a/doc/images/JKQTPBoxplotVerticalGraph.png and b/doc/images/JKQTPBoxplotVerticalGraph.png differ
diff --git a/doc/images/JKQTPBoxplotVerticalGraph_small.png b/doc/images/JKQTPBoxplotVerticalGraph_small.png
index 349724d467..645fc88793 100644
Binary files a/doc/images/JKQTPBoxplotVerticalGraph_small.png and b/doc/images/JKQTPBoxplotVerticalGraph_small.png differ
diff --git a/doc/images/JKQTPColumnContourPlot.png b/doc/images/JKQTPColumnContourPlot.png
index c4c52e17a2..441b16c47a 100644
Binary files a/doc/images/JKQTPColumnContourPlot.png and b/doc/images/JKQTPColumnContourPlot.png differ
diff --git a/doc/images/JKQTPColumnContourPlot_small.png b/doc/images/JKQTPColumnContourPlot_small.png
index fec6c2f5f9..866fe7b86c 100644
Binary files a/doc/images/JKQTPColumnContourPlot_small.png and b/doc/images/JKQTPColumnContourPlot_small.png differ
diff --git a/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png b/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png
index a9cd55a8ba..812240ef74 100644
Binary files a/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png and b/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png differ
diff --git a/doc/images/JKQTPFilledCurveXErrorGraph.png b/doc/images/JKQTPFilledCurveXErrorGraph.png
index cfb5f034d7..1b29af9ba3 100644
Binary files a/doc/images/JKQTPFilledCurveXErrorGraph.png and b/doc/images/JKQTPFilledCurveXErrorGraph.png differ
diff --git a/doc/images/JKQTPFilledCurveXErrorGraph_small.png b/doc/images/JKQTPFilledCurveXErrorGraph_small.png
index 649d2c7f1f..f2aa9ebf35 100644
Binary files a/doc/images/JKQTPFilledCurveXErrorGraph_small.png and b/doc/images/JKQTPFilledCurveXErrorGraph_small.png differ
diff --git a/doc/images/JKQTPFilledCurveXGraph.png b/doc/images/JKQTPFilledCurveXGraph.png
index 90ab7458a6..1fe258ca5e 100644
Binary files a/doc/images/JKQTPFilledCurveXGraph.png and b/doc/images/JKQTPFilledCurveXGraph.png differ
diff --git a/doc/images/JKQTPFilledCurveXGraph_small.png b/doc/images/JKQTPFilledCurveXGraph_small.png
index 468d64c00a..cf9ebf1721 100644
Binary files a/doc/images/JKQTPFilledCurveXGraph_small.png and b/doc/images/JKQTPFilledCurveXGraph_small.png differ
diff --git a/doc/images/JKQTPFilledCurveXGraph_wiggle.png b/doc/images/JKQTPFilledCurveXGraph_wiggle.png
index 77785849cb..1cfd99ba19 100644
Binary files a/doc/images/JKQTPFilledCurveXGraph_wiggle.png and b/doc/images/JKQTPFilledCurveXGraph_wiggle.png differ
diff --git a/doc/images/JKQTPFilledCurveYErrorGraph.png b/doc/images/JKQTPFilledCurveYErrorGraph.png
index d6d07906e8..90c9bfd929 100644
Binary files a/doc/images/JKQTPFilledCurveYErrorGraph.png and b/doc/images/JKQTPFilledCurveYErrorGraph.png differ
diff --git a/doc/images/JKQTPFilledCurveYErrorGraph_small.png b/doc/images/JKQTPFilledCurveYErrorGraph_small.png
index 28d71dbc43..3825cdaab6 100644
Binary files a/doc/images/JKQTPFilledCurveYErrorGraph_small.png and b/doc/images/JKQTPFilledCurveYErrorGraph_small.png differ
diff --git a/doc/images/JKQTPFilledCurveYGraph.png b/doc/images/JKQTPFilledCurveYGraph.png
index e17e3db392..544db7b9a6 100644
Binary files a/doc/images/JKQTPFilledCurveYGraph.png and b/doc/images/JKQTPFilledCurveYGraph.png differ
diff --git a/doc/images/JKQTPFilledCurveYGraph_small.png b/doc/images/JKQTPFilledCurveYGraph_small.png
index 0b72b737e8..1b22a51fa5 100644
Binary files a/doc/images/JKQTPFilledCurveYGraph_small.png and b/doc/images/JKQTPFilledCurveYGraph_small.png differ
diff --git a/doc/images/JKQTPFilledCurveYGraph_wiggle.png b/doc/images/JKQTPFilledCurveYGraph_wiggle.png
index bc15662ecb..c6b8cb2da3 100644
Binary files a/doc/images/JKQTPFilledCurveYGraph_wiggle.png and b/doc/images/JKQTPFilledCurveYGraph_wiggle.png differ
diff --git a/doc/images/JKQTPXYFunctionLineGraph.png b/doc/images/JKQTPXYFunctionLineGraph.png
index 031963e8a3..bee3ec1826 100644
Binary files a/doc/images/JKQTPXYFunctionLineGraph.png and b/doc/images/JKQTPXYFunctionLineGraph.png differ
diff --git a/doc/images/JKQTPXYFunctionLineGraph_small.png b/doc/images/JKQTPXYFunctionLineGraph_small.png
index d828cbd52d..7cedb080ce 100644
Binary files a/doc/images/JKQTPXYFunctionLineGraph_small.png and b/doc/images/JKQTPXYFunctionLineGraph_small.png differ
diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png
index ee46361633..a1f939bb92 100644
Binary files a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png and b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png differ
diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars_small.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars_small.png
index 2f74f6bcac..f1fc4fe931 100644
Binary files a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars_small.png and b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars_small.png differ
diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines.png
index feeaeadf59..475f5f846c 100644
Binary files a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines.png and b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines.png differ
diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines_small.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines_small.png
index 971913f444..ec1ce6ea2e 100644
Binary files a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines_small.png and b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines_small.png differ
diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons.png
index e9ddbd2138..b44e11ccbe 100644
Binary files a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons.png and b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons.png differ
diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons_small.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons_small.png
index a57aff4650..df66d82165 100644
Binary files a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons_small.png and b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons_small.png differ
diff --git a/doc/images/JKQTPXYLineGraph.png b/doc/images/JKQTPXYLineGraph.png
index 82b9af953e..8af25097f0 100644
Binary files a/doc/images/JKQTPXYLineGraph.png and b/doc/images/JKQTPXYLineGraph.png differ
diff --git a/doc/images/JKQTPXYLineGraph_small.png b/doc/images/JKQTPXYLineGraph_small.png
index 888eb9939f..a9810f658a 100644
Binary files a/doc/images/JKQTPXYLineGraph_small.png and b/doc/images/JKQTPXYLineGraph_small.png differ
diff --git a/doc/images/JKQTPXYScatterErrorGraph.png b/doc/images/JKQTPXYScatterErrorGraph.png
index 095c2b1b44..be48389dd3 100644
Binary files a/doc/images/JKQTPXYScatterErrorGraph.png and b/doc/images/JKQTPXYScatterErrorGraph.png differ
diff --git a/doc/images/JKQTPXYScatterErrorGraph_small.png b/doc/images/JKQTPXYScatterErrorGraph_small.png
index bfe1c50a0a..12ee7c2a59 100644
Binary files a/doc/images/JKQTPXYScatterErrorGraph_small.png and b/doc/images/JKQTPXYScatterErrorGraph_small.png differ
diff --git a/doc/images/JKQTPXYScatterGraph.png b/doc/images/JKQTPXYScatterGraph.png
index 8e53bdda23..8fd1ae6ac3 100644
Binary files a/doc/images/JKQTPXYScatterGraph.png and b/doc/images/JKQTPXYScatterGraph.png differ
diff --git a/doc/images/JKQTPXYScatterGraph_small.png b/doc/images/JKQTPXYScatterGraph_small.png
index 9ae5c5b7db..7ef55f4124 100644
Binary files a/doc/images/JKQTPXYScatterGraph_small.png and b/doc/images/JKQTPXYScatterGraph_small.png differ
diff --git a/doc/images/JKQTPbarHorizontalGraphStacked.png b/doc/images/JKQTPbarHorizontalGraphStacked.png
index 0ded7e4667..0555be2031 100644
Binary files a/doc/images/JKQTPbarHorizontalGraphStacked.png and b/doc/images/JKQTPbarHorizontalGraphStacked.png differ
diff --git a/doc/images/JKQTPbarHorizontalGraphStacked_small.png b/doc/images/JKQTPbarHorizontalGraphStacked_small.png
index 94c2d0df9c..9e0b0f7203 100644
Binary files a/doc/images/JKQTPbarHorizontalGraphStacked_small.png and b/doc/images/JKQTPbarHorizontalGraphStacked_small.png differ
diff --git a/doc/images/JKQTPbarVerticalGraphStacked.png b/doc/images/JKQTPbarVerticalGraphStacked.png
index 5119d24ba7..994a006365 100644
Binary files a/doc/images/JKQTPbarVerticalGraphStacked.png and b/doc/images/JKQTPbarVerticalGraphStacked.png differ
diff --git a/doc/images/JKQTPbarVerticalGraphStacked_small.png b/doc/images/JKQTPbarVerticalGraphStacked_small.png
index a57b59c5ea..efa9222293 100644
Binary files a/doc/images/JKQTPbarVerticalGraphStacked_small.png and b/doc/images/JKQTPbarVerticalGraphStacked_small.png differ
diff --git a/doc/images/jkqtmathtext/MTDacute.png b/doc/images/jkqtmathtext/MTDacute.png
index 00ca23d911..d3ffe42dc6 100644
Binary files a/doc/images/jkqtmathtext/MTDacute.png and b/doc/images/jkqtmathtext/MTDacute.png differ
diff --git a/doc/images/jkqtmathtext/MTDarrow.png b/doc/images/jkqtmathtext/MTDarrow.png
index 7eb44fd98c..a56367991e 100644
Binary files a/doc/images/jkqtmathtext/MTDarrow.png and b/doc/images/jkqtmathtext/MTDarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDbar.png b/doc/images/jkqtmathtext/MTDbar.png
index 9db6042a5e..4bfaf3b2d2 100644
Binary files a/doc/images/jkqtmathtext/MTDbar.png and b/doc/images/jkqtmathtext/MTDbar.png differ
diff --git a/doc/images/jkqtmathtext/MTDbcancel.png b/doc/images/jkqtmathtext/MTDbcancel.png
index c5be16d3ff..2a3840ebe7 100644
Binary files a/doc/images/jkqtmathtext/MTDbcancel.png and b/doc/images/jkqtmathtext/MTDbcancel.png differ
diff --git a/doc/images/jkqtmathtext/MTDbreve.png b/doc/images/jkqtmathtext/MTDbreve.png
index 6d11809838..8252fcfc7e 100644
Binary files a/doc/images/jkqtmathtext/MTDbreve.png and b/doc/images/jkqtmathtext/MTDbreve.png differ
diff --git a/doc/images/jkqtmathtext/MTDcancel.png b/doc/images/jkqtmathtext/MTDcancel.png
index fb82ae6ae3..193a436676 100644
Binary files a/doc/images/jkqtmathtext/MTDcancel.png and b/doc/images/jkqtmathtext/MTDcancel.png differ
diff --git a/doc/images/jkqtmathtext/MTDcheck.png b/doc/images/jkqtmathtext/MTDcheck.png
index e4d0e51ed7..997c3aee79 100644
Binary files a/doc/images/jkqtmathtext/MTDcheck.png and b/doc/images/jkqtmathtext/MTDcheck.png differ
diff --git a/doc/images/jkqtmathtext/MTDddot.png b/doc/images/jkqtmathtext/MTDddot.png
index c82d82105d..2955c3a120 100644
Binary files a/doc/images/jkqtmathtext/MTDddot.png and b/doc/images/jkqtmathtext/MTDddot.png differ
diff --git a/doc/images/jkqtmathtext/MTDdot.png b/doc/images/jkqtmathtext/MTDdot.png
index 7c9f4a2942..1f6d2e0a12 100644
Binary files a/doc/images/jkqtmathtext/MTDdot.png and b/doc/images/jkqtmathtext/MTDdot.png differ
diff --git a/doc/images/jkqtmathtext/MTDdoubleoverline.png b/doc/images/jkqtmathtext/MTDdoubleoverline.png
index 267f7682f8..2cc392ab13 100644
Binary files a/doc/images/jkqtmathtext/MTDdoubleoverline.png and b/doc/images/jkqtmathtext/MTDdoubleoverline.png differ
diff --git a/doc/images/jkqtmathtext/MTDdoubleunderline.png b/doc/images/jkqtmathtext/MTDdoubleunderline.png
index 3376ce4c64..8f7d3ae3d3 100644
Binary files a/doc/images/jkqtmathtext/MTDdoubleunderline.png and b/doc/images/jkqtmathtext/MTDdoubleunderline.png differ
diff --git a/doc/images/jkqtmathtext/MTDgrave.png b/doc/images/jkqtmathtext/MTDgrave.png
index b1550ae926..cab374893b 100644
Binary files a/doc/images/jkqtmathtext/MTDgrave.png and b/doc/images/jkqtmathtext/MTDgrave.png differ
diff --git a/doc/images/jkqtmathtext/MTDhat.png b/doc/images/jkqtmathtext/MTDhat.png
index 03ce94c761..da532f4d9c 100644
Binary files a/doc/images/jkqtmathtext/MTDhat.png and b/doc/images/jkqtmathtext/MTDhat.png differ
diff --git a/doc/images/jkqtmathtext/MTDocirc.png b/doc/images/jkqtmathtext/MTDocirc.png
index 9d8944321c..f2e185ec77 100644
Binary files a/doc/images/jkqtmathtext/MTDocirc.png and b/doc/images/jkqtmathtext/MTDocirc.png differ
diff --git a/doc/images/jkqtmathtext/MTDoverleftarrow.png b/doc/images/jkqtmathtext/MTDoverleftarrow.png
index 425f1233ce..6f5380ff7d 100644
Binary files a/doc/images/jkqtmathtext/MTDoverleftarrow.png and b/doc/images/jkqtmathtext/MTDoverleftarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDoverleftrightarrow.png b/doc/images/jkqtmathtext/MTDoverleftrightarrow.png
index a2983810c3..f857bec8cb 100644
Binary files a/doc/images/jkqtmathtext/MTDoverleftrightarrow.png and b/doc/images/jkqtmathtext/MTDoverleftrightarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDoverline.png b/doc/images/jkqtmathtext/MTDoverline.png
index e7b0a3022f..765e7d7919 100644
Binary files a/doc/images/jkqtmathtext/MTDoverline.png and b/doc/images/jkqtmathtext/MTDoverline.png differ
diff --git a/doc/images/jkqtmathtext/MTDoverrightarrow.png b/doc/images/jkqtmathtext/MTDoverrightarrow.png
index b65b127062..10eec9cf94 100644
Binary files a/doc/images/jkqtmathtext/MTDoverrightarrow.png and b/doc/images/jkqtmathtext/MTDoverrightarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDstrike.png b/doc/images/jkqtmathtext/MTDstrike.png
index cd502d3e08..086c4c93de 100644
Binary files a/doc/images/jkqtmathtext/MTDstrike.png and b/doc/images/jkqtmathtext/MTDstrike.png differ
diff --git a/doc/images/jkqtmathtext/MTDtilde.png b/doc/images/jkqtmathtext/MTDtilde.png
index fb1bcb1479..35a094fd49 100644
Binary files a/doc/images/jkqtmathtext/MTDtilde.png and b/doc/images/jkqtmathtext/MTDtilde.png differ
diff --git a/doc/images/jkqtmathtext/MTDunderleftarrow.png b/doc/images/jkqtmathtext/MTDunderleftarrow.png
index aff61e69a7..c55615d041 100644
Binary files a/doc/images/jkqtmathtext/MTDunderleftarrow.png and b/doc/images/jkqtmathtext/MTDunderleftarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDunderleftrightarrow.png b/doc/images/jkqtmathtext/MTDunderleftrightarrow.png
index ed1ec302b3..3f53ba6bc8 100644
Binary files a/doc/images/jkqtmathtext/MTDunderleftrightarrow.png and b/doc/images/jkqtmathtext/MTDunderleftrightarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDunderline.png b/doc/images/jkqtmathtext/MTDunderline.png
index 16b1072dab..81edf707bc 100644
Binary files a/doc/images/jkqtmathtext/MTDunderline.png and b/doc/images/jkqtmathtext/MTDunderline.png differ
diff --git a/doc/images/jkqtmathtext/MTDunderlineDashed.png b/doc/images/jkqtmathtext/MTDunderlineDashed.png
index 79f0165b3a..0a3369f78d 100644
Binary files a/doc/images/jkqtmathtext/MTDunderlineDashed.png and b/doc/images/jkqtmathtext/MTDunderlineDashed.png differ
diff --git a/doc/images/jkqtmathtext/MTDunderlineDotted.png b/doc/images/jkqtmathtext/MTDunderlineDotted.png
index db5722b87b..14ab5656d9 100644
Binary files a/doc/images/jkqtmathtext/MTDunderlineDotted.png and b/doc/images/jkqtmathtext/MTDunderlineDotted.png differ
diff --git a/doc/images/jkqtmathtext/MTDunderrightarrow.png b/doc/images/jkqtmathtext/MTDunderrightarrow.png
index ae0f560de0..ed84699814 100644
Binary files a/doc/images/jkqtmathtext/MTDunderrightarrow.png and b/doc/images/jkqtmathtext/MTDunderrightarrow.png differ
diff --git a/doc/images/jkqtmathtext/MTDvec.png b/doc/images/jkqtmathtext/MTDvec.png
index cf7277c1bf..2984de25a5 100644
Binary files a/doc/images/jkqtmathtext/MTDvec.png and b/doc/images/jkqtmathtext/MTDvec.png differ
diff --git a/doc/images/jkqtmathtext/MTDwidecheck.png b/doc/images/jkqtmathtext/MTDwidecheck.png
index 88f1a94089..c560ca52b3 100644
Binary files a/doc/images/jkqtmathtext/MTDwidecheck.png and b/doc/images/jkqtmathtext/MTDwidecheck.png differ
diff --git a/doc/images/jkqtmathtext/MTDwidehat.png b/doc/images/jkqtmathtext/MTDwidehat.png
index 935fe68323..20cabda87d 100644
Binary files a/doc/images/jkqtmathtext/MTDwidehat.png and b/doc/images/jkqtmathtext/MTDwidehat.png differ
diff --git a/doc/images/jkqtmathtext/MTDwidetilde.png b/doc/images/jkqtmathtext/MTDwidetilde.png
index d62a058616..3332b898bb 100644
Binary files a/doc/images/jkqtmathtext/MTDwidetilde.png and b/doc/images/jkqtmathtext/MTDwidetilde.png differ
diff --git a/doc/images/jkqtmathtext/MTDxcancel.png b/doc/images/jkqtmathtext/MTDxcancel.png
index 7b6b692521..5b62cbbeda 100644
Binary files a/doc/images/jkqtmathtext/MTDxcancel.png and b/doc/images/jkqtmathtext/MTDxcancel.png differ
diff --git a/doc/images/jkqtmathtext/MTFMdfrac.png b/doc/images/jkqtmathtext/MTFMdfrac.png
index 0992fff85c..e1101949cb 100644
Binary files a/doc/images/jkqtmathtext/MTFMdfrac.png and b/doc/images/jkqtmathtext/MTFMdfrac.png differ
diff --git a/doc/images/jkqtmathtext/MTFMfrac.png b/doc/images/jkqtmathtext/MTFMfrac.png
index a27685403f..b2670ad032 100644
Binary files a/doc/images/jkqtmathtext/MTFMfrac.png and b/doc/images/jkqtmathtext/MTFMfrac.png differ
diff --git a/doc/images/jkqtmathtext/MTFMoverbrace.png b/doc/images/jkqtmathtext/MTFMoverbrace.png
index b128e50195..9fa0a18ada 100644
Binary files a/doc/images/jkqtmathtext/MTFMoverbrace.png and b/doc/images/jkqtmathtext/MTFMoverbrace.png differ
diff --git a/doc/images/jkqtmathtext/MTFMoverbracket.png b/doc/images/jkqtmathtext/MTFMoverbracket.png
index d66ee03566..17e05c5ac1 100644
Binary files a/doc/images/jkqtmathtext/MTFMoverbracket.png and b/doc/images/jkqtmathtext/MTFMoverbracket.png differ
diff --git a/doc/images/jkqtmathtext/MTFMoverset.png b/doc/images/jkqtmathtext/MTFMoverset.png
index 0ae40193a2..57aed41684 100644
Binary files a/doc/images/jkqtmathtext/MTFMoverset.png and b/doc/images/jkqtmathtext/MTFMoverset.png differ
diff --git a/doc/images/jkqtmathtext/MTFMsfrac.png b/doc/images/jkqtmathtext/MTFMsfrac.png
index 2b894daa4a..a3b87779a3 100644
Binary files a/doc/images/jkqtmathtext/MTFMsfrac.png and b/doc/images/jkqtmathtext/MTFMsfrac.png differ
diff --git a/doc/images/jkqtmathtext/MTFMstackrel.png b/doc/images/jkqtmathtext/MTFMstackrel.png
index 4b96a10d8d..a76c62e76e 100644
Binary files a/doc/images/jkqtmathtext/MTFMstackrel.png and b/doc/images/jkqtmathtext/MTFMstackrel.png differ
diff --git a/doc/images/jkqtmathtext/MTFMstfrac.png b/doc/images/jkqtmathtext/MTFMstfrac.png
index 98f5f6013b..6a4b7f8e1f 100644
Binary files a/doc/images/jkqtmathtext/MTFMstfrac.png and b/doc/images/jkqtmathtext/MTFMstfrac.png differ
diff --git a/doc/images/jkqtmathtext/MTFMtfrac.png b/doc/images/jkqtmathtext/MTFMtfrac.png
index 563048c21e..01668489ac 100644
Binary files a/doc/images/jkqtmathtext/MTFMtfrac.png and b/doc/images/jkqtmathtext/MTFMtfrac.png differ
diff --git a/doc/images/jkqtmathtext/MTFMunderbrace.png b/doc/images/jkqtmathtext/MTFMunderbrace.png
index 327529ce36..cfc35b6987 100644
Binary files a/doc/images/jkqtmathtext/MTFMunderbrace.png and b/doc/images/jkqtmathtext/MTFMunderbrace.png differ
diff --git a/doc/images/jkqtmathtext/MTFMunderbracket.png b/doc/images/jkqtmathtext/MTFMunderbracket.png
index 673262f6c1..e0fbcd664e 100644
Binary files a/doc/images/jkqtmathtext/MTFMunderbracket.png and b/doc/images/jkqtmathtext/MTFMunderbracket.png differ
diff --git a/doc/images/jkqtmathtext/MTFMunderset.png b/doc/images/jkqtmathtext/MTFMunderset.png
index b99e66157b..cad4e0d97e 100644
Binary files a/doc/images/jkqtmathtext/MTFMunderset.png and b/doc/images/jkqtmathtext/MTFMunderset.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSans.png b/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSans.png
index a1acc3d9d6..f91737d9ec 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSans.png and b/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSans.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSerif.png b/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSerif.png
index 422e91f8ff..eb4b6f4464 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSerif.png and b/doc/images/jkqtmathtext/jkqtmathtext_DejaVuSerif.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_OldEnglish.png b/doc/images/jkqtmathtext/jkqtmathtext_OldEnglish.png
index 09ae267d0f..420b8325db 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_OldEnglish.png and b/doc/images/jkqtmathtext/jkqtmathtext_OldEnglish.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_arial.png b/doc/images/jkqtmathtext/jkqtmathtext_arial.png
index f0b7d1ba33..aa188c94ac 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_arial.png and b/doc/images/jkqtmathtext/jkqtmathtext_arial.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_array.png b/doc/images/jkqtmathtext/jkqtmathtext_array.png
index ba40588cd1..3a4b3c6192 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_array.png and b/doc/images/jkqtmathtext/jkqtmathtext_array.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_asana.png b/doc/images/jkqtmathtext/jkqtmathtext_asana.png
index 9ef6b22fa3..8b9ab9e062 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_asana.png and b/doc/images/jkqtmathtext/jkqtmathtext_asana.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bb.png b/doc/images/jkqtmathtext/jkqtmathtext_bb.png
index da820b7a00..8526c7076a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bb.png and b/doc/images/jkqtmathtext/jkqtmathtext_bb.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bb_font_directly.png b/doc/images/jkqtmathtext/jkqtmathtext_bb_font_directly.png
index 7caf3df1b3..dd53f5ee2b 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bb_font_directly.png and b/doc/images/jkqtmathtext/jkqtmathtext_bb_font_directly.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bb_simulate.png b/doc/images/jkqtmathtext/jkqtmathtext_bb_simulate.png
index ecc2dc59c7..e8d3442c48 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bb_simulate.png and b/doc/images/jkqtmathtext/jkqtmathtext_bb_simulate.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_font_directly.png b/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_font_directly.png
index 36f0390f82..981ef73c3c 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_font_directly.png and b/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_font_directly.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_simulate.png b/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_simulate.png
index cc86982f0a..78a356abb7 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_simulate.png and b/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_simulate.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bbmatrix.png b/doc/images/jkqtmathtext/jkqtmathtext_bbmatrix.png
index d60b377572..8cab08d9ac 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bbmatrix.png and b/doc/images/jkqtmathtext/jkqtmathtext_bbmatrix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_begincenter.png b/doc/images/jkqtmathtext/jkqtmathtext_begincenter.png
index 2e38c226e1..7af1ce8791 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_begincenter.png and b/doc/images/jkqtmathtext/jkqtmathtext_begincenter.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginflushleft.png b/doc/images/jkqtmathtext/jkqtmathtext_beginflushleft.png
index e25dec0e26..bc89ff0adf 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_beginflushleft.png and b/doc/images/jkqtmathtext/jkqtmathtext_beginflushleft.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginflushright.png b/doc/images/jkqtmathtext/jkqtmathtext_beginflushright.png
index 17ebadfeb1..eacde40c89 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_beginflushright.png and b/doc/images/jkqtmathtext/jkqtmathtext_beginflushright.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginframed.png b/doc/images/jkqtmathtext/jkqtmathtext_beginframed.png
index 34d37ce1a0..deceac2f11 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_beginframed.png and b/doc/images/jkqtmathtext/jkqtmathtext_beginframed.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginshaded.png b/doc/images/jkqtmathtext/jkqtmathtext_beginshaded.png
index 28882eeb4f..54597ebafa 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_beginshaded.png and b/doc/images/jkqtmathtext/jkqtmathtext_beginshaded.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png b/doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png
index 90c37ee67b..45cebe3d0a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png and b/doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bmatrix.png b/doc/images/jkqtmathtext/jkqtmathtext_bmatrix.png
index 497914cd20..929f14ff07 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bmatrix.png and b/doc/images/jkqtmathtext/jkqtmathtext_bmatrix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bold.png b/doc/images/jkqtmathtext/jkqtmathtext_bold.png
index 5457f1ce93..bce16ee4dc 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_bold.png and b/doc/images/jkqtmathtext/jkqtmathtext_bold.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_boxed.png b/doc/images/jkqtmathtext/jkqtmathtext_boxed.png
index eaf09c8361..c2a89a2186 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_boxed.png and b/doc/images/jkqtmathtext/jkqtmathtext_boxed.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png
index 9c1e365f41..ff4094b2d6 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png
index 2713dba647..fe0b38d463 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_begincases.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_begincases.png
index 6842a96923..cefc09b9d2 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_begincases.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_begincases.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_big.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_big.png
index 5698e6d32e..34d6c47d69 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_big.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_big.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png
index a68c284d59..774f6d1e70 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png
index 41f16e87f4..f5435f1bdf 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_ceil.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_ceil.png
index d73ef42491..06e0ab415f 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_ceil.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_ceil.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_curly.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_curly.png
index b53e4cb6d1..2b48b61538 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_curly.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_curly.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_dblline.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_dblline.png
index 830c290f63..4d793f05e2 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_dblline.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_dblline.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_dot.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_dot.png
index 3beba3e708..3a245e72bd 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_dot.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_dot.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_floor.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_floor.png
index ab4562172f..0a1996fc33 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_floor.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_floor.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_lcorner.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_lcorner.png
index 5371ad4f14..4edaca03b7 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_lcorner.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_lcorner.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_oneline.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_oneline.png
index 5c6a50df4f..98ced158f9 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_oneline.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_oneline.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_rect.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_rect.png
index 953786e076..4006039c6d 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_rect.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_rect.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_round.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_round.png
index d71537b3a5..475aa875b3 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_round.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_round.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_stackrel.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_stackrel.png
index d118b850d8..5aea162a48 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_stackrel.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_stackrel.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_tri.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_tri.png
index d0e2b78f80..02cbee1ae0 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_tri.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_tri.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png
index 5557ac48da..cbefb6c90d 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png and b/doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_cal.png b/doc/images/jkqtmathtext/jkqtmathtext_cal.png
index 4d4336109e..464bc936da 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_cal.png and b/doc/images/jkqtmathtext/jkqtmathtext_cal.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_cbrt.png b/doc/images/jkqtmathtext/jkqtmathtext_cbrt.png
index 7f38ee9b60..9911a38184 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_cbrt.png and b/doc/images/jkqtmathtext/jkqtmathtext_cbrt.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_char.png b/doc/images/jkqtmathtext/jkqtmathtext_char.png
index 5b906dc096..2f4e6b06bd 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_char.png and b/doc/images/jkqtmathtext/jkqtmathtext_char.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_colorbox.png b/doc/images/jkqtmathtext/jkqtmathtext_colorbox.png
index 89596fdd20..c4441ba689 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_colorbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_colorbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_colored.png b/doc/images/jkqtmathtext/jkqtmathtext_colored.png
index 1ad794e4f9..049be22150 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_colored.png and b/doc/images/jkqtmathtext/jkqtmathtext_colored.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_comicsans.png b/doc/images/jkqtmathtext/jkqtmathtext_comicsans.png
index 3566ab78d6..cc66016654 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_comicsans.png and b/doc/images/jkqtmathtext/jkqtmathtext_comicsans.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_comicsans_mathonly.png b/doc/images/jkqtmathtext/jkqtmathtext_comicsans_mathonly.png
index d240f86b17..1e04e93f20 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_comicsans_mathonly.png and b/doc/images/jkqtmathtext/jkqtmathtext_comicsans_mathonly.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_comicsans_textonly.png b/doc/images/jkqtmathtext/jkqtmathtext_comicsans_textonly.png
index e47bcdf90d..999b3fdd95 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_comicsans_textonly.png and b/doc/images/jkqtmathtext/jkqtmathtext_comicsans_textonly.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_computermodern.png b/doc/images/jkqtmathtext/jkqtmathtext_computermodern.png
index 854fb75712..58d604172a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_computermodern.png and b/doc/images/jkqtmathtext/jkqtmathtext_computermodern.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_couriernew.png b/doc/images/jkqtmathtext/jkqtmathtext_couriernew.png
index 7d72311b9d..85e4f47b18 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_couriernew.png and b/doc/images/jkqtmathtext/jkqtmathtext_couriernew.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_dashbox.png b/doc/images/jkqtmathtext/jkqtmathtext_dashbox.png
index f8067ae7d0..a9e4124e9e 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_dashbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_dashbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_dashuline.png b/doc/images/jkqtmathtext/jkqtmathtext_dashuline.png
index 7b3029add1..51146d6eb6 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_dashuline.png and b/doc/images/jkqtmathtext/jkqtmathtext_dashuline.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq.png b/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq.png
index 9dd8320933..c3276709f1 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq.png and b/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq_boxes.png b/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq_boxes.png
index c5f133682e..421632da58 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq_boxes.png and b/doc/images/jkqtmathtext/jkqtmathtext_doc_quadraticeq_boxes.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection.png b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection.png
index 9120148e77..b8641fbfce 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection.png and b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection_boxes.png b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection_boxes.png
index 25acb093b4..a696908b12 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection_boxes.png and b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsuper_italiccorrection_boxes.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral.png b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral.png
index 9712e8edc1..36663223a9 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral.png and b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral_boxes.png b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral_boxes.png
index 5d16d0a682..2382e34ed6 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral_boxes.png and b/doc/images/jkqtmathtext/jkqtmathtext_doc_subsupershift_integral_boxes.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_dottedbox.png b/doc/images/jkqtmathtext/jkqtmathtext_dottedbox.png
index f3cc5a90e1..094a8c454e 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_dottedbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_dottedbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_dotuline.png b/doc/images/jkqtmathtext/jkqtmathtext_dotuline.png
index ebc8d54046..4d567304dd 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_dotuline.png and b/doc/images/jkqtmathtext/jkqtmathtext_dotuline.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doublebox.png b/doc/images/jkqtmathtext/jkqtmathtext_doublebox.png
index b534fd8c3d..b2fcacbc0c 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doublebox.png and b/doc/images/jkqtmathtext/jkqtmathtext_doublebox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_doubleovalbox.png b/doc/images/jkqtmathtext/jkqtmathtext_doubleovalbox.png
index 3f8772e38f..12badb5575 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_doubleovalbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_doubleovalbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_emdash.png b/doc/images/jkqtmathtext/jkqtmathtext_emdash.png
index 928c757030..365bc84649 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_emdash.png and b/doc/images/jkqtmathtext/jkqtmathtext_emdash.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_emph.png b/doc/images/jkqtmathtext/jkqtmathtext_emph.png
index fe5451abe3..173f1a26d0 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_emph.png and b/doc/images/jkqtmathtext/jkqtmathtext_emph.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_endash.png b/doc/images/jkqtmathtext/jkqtmathtext_endash.png
index 8503ab2404..e340d368b7 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_endash.png and b/doc/images/jkqtmathtext/jkqtmathtext_endash.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_fcolorbox.png b/doc/images/jkqtmathtext/jkqtmathtext_fcolorbox.png
index 7dabdea3da..30a9d2bba1 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_fcolorbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_fcolorbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_fira.png b/doc/images/jkqtmathtext/jkqtmathtext_fira.png
index 0a00be4014..30f9c78bab 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_fira.png and b/doc/images/jkqtmathtext/jkqtmathtext_fira.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_fonts.png b/doc/images/jkqtmathtext/jkqtmathtext_fonts.png
index 5c761e5d5e..32f80fd929 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_fonts.png and b/doc/images/jkqtmathtext/jkqtmathtext_fonts.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_fontsizes.png b/doc/images/jkqtmathtext/jkqtmathtext_fontsizes.png
index 11db76ab19..85954a672d 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_fontsizes.png and b/doc/images/jkqtmathtext/jkqtmathtext_fontsizes.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_frak.png b/doc/images/jkqtmathtext/jkqtmathtext_frak.png
index 067e1b18da..966e598bf1 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_frak.png and b/doc/images/jkqtmathtext/jkqtmathtext_frak.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_greek.png b/doc/images/jkqtmathtext/jkqtmathtext_greek.png
index 183bea2ad4..db90b3cacb 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_greek.png and b/doc/images/jkqtmathtext/jkqtmathtext_greek.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_hyphen.png b/doc/images/jkqtmathtext/jkqtmathtext_hyphen.png
index d3e1fa0580..6c1465bc6e 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_hyphen.png and b/doc/images/jkqtmathtext/jkqtmathtext_hyphen.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_italic.png b/doc/images/jkqtmathtext/jkqtmathtext_italic.png
index d68edfc574..dcb5a66b67 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_italic.png and b/doc/images/jkqtmathtext/jkqtmathtext_italic.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_limits.png b/doc/images/jkqtmathtext/jkqtmathtext_limits.png
index 369df524c6..378b2315cd 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_limits.png and b/doc/images/jkqtmathtext/jkqtmathtext_limits.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_lowercase.png b/doc/images/jkqtmathtext/jkqtmathtext_lowercase.png
index f99f9a3564..907f6fc579 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_lowercase.png and b/doc/images/jkqtmathtext/jkqtmathtext_lowercase.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_lstlisting.png b/doc/images/jkqtmathtext/jkqtmathtext_lstlisting.png
index c10508c6f0..0b663b44ac 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_lstlisting.png and b/doc/images/jkqtmathtext/jkqtmathtext_lstlisting.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_lsubstack.png b/doc/images/jkqtmathtext/jkqtmathtext_lsubstack.png
index 633d0950a7..15b7e7daf6 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_lsubstack.png and b/doc/images/jkqtmathtext/jkqtmathtext_lsubstack.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png b/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png
index 08ddbf63b8..e2606c5fb5 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png b/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png
index d5d034f412..725cc490c8 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathfontsizes.png b/doc/images/jkqtmathtext/jkqtmathtext_mathfontsizes.png
index 5cc8d4701b..2e79f033b2 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathfontsizes.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathfontsizes.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathmode_and_textmode.png b/doc/images/jkqtmathtext/jkqtmathtext_mathmode_and_textmode.png
index 0477e38d78..246657327d 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathmode_and_textmode.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathmode_and_textmode.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathoperator_width_factor.png b/doc/images/jkqtmathtext/jkqtmathtext_mathoperator_width_factor.png
index 8c8f8f7e3a..8eb42d44bf 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathoperator_width_factor.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathoperator_width_factor.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathstyle.png b/doc/images/jkqtmathtext/jkqtmathtext_mathstyle.png
index 28400a6e36..29b2829b94 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathstyle.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathstyle.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_matrix.png b/doc/images/jkqtmathtext/jkqtmathtext_matrix.png
index bbdbc384c7..87935f46fa 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_matrix.png and b/doc/images/jkqtmathtext/jkqtmathtext_matrix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mssegoeui.png b/doc/images/jkqtmathtext/jkqtmathtext_mssegoeui.png
index 2a882b4576..20b46439b9 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mssegoeui.png and b/doc/images/jkqtmathtext/jkqtmathtext_mssegoeui.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_notosans.png b/doc/images/jkqtmathtext/jkqtmathtext_notosans.png
index ce6fe6c5f4..1c4001bb84 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_notosans.png and b/doc/images/jkqtmathtext/jkqtmathtext_notosans.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_notoserif.png b/doc/images/jkqtmathtext/jkqtmathtext_notoserif.png
index 5491223e6a..a3575a2846 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_notoserif.png and b/doc/images/jkqtmathtext/jkqtmathtext_notoserif.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_ol.png b/doc/images/jkqtmathtext/jkqtmathtext_ol.png
index e3f592f0d6..c561c0d774 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_ol.png and b/doc/images/jkqtmathtext/jkqtmathtext_ol.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_ool.png b/doc/images/jkqtmathtext/jkqtmathtext_ool.png
index c13947a687..0d38ba08bc 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_ool.png and b/doc/images/jkqtmathtext/jkqtmathtext_ool.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_oovalbox.png b/doc/images/jkqtmathtext/jkqtmathtext_oovalbox.png
index 36633fdd66..bc9abf8ecf 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_oovalbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_oovalbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_ovalboxed.png b/doc/images/jkqtmathtext/jkqtmathtext_ovalboxed.png
index fe1de381d0..5f35d65415 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_ovalboxed.png and b/doc/images/jkqtmathtext/jkqtmathtext_ovalboxed.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_pmatrix.png b/doc/images/jkqtmathtext/jkqtmathtext_pmatrix.png
index 702abe0716..c24cd7484f 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_pmatrix.png and b/doc/images/jkqtmathtext/jkqtmathtext_pmatrix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_rsubstack.png b/doc/images/jkqtmathtext/jkqtmathtext_rsubstack.png
index 56e23d4e42..f309d3b972 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_rsubstack.png and b/doc/images/jkqtmathtext/jkqtmathtext_rsubstack.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_sc.png b/doc/images/jkqtmathtext/jkqtmathtext_sc.png
index e3abc9791f..ef48e145e8 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_sc.png and b/doc/images/jkqtmathtext/jkqtmathtext_sc.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_script.png b/doc/images/jkqtmathtext/jkqtmathtext_script.png
index 20b1c6212f..e416ffb182 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_script.png and b/doc/images/jkqtmathtext/jkqtmathtext_script.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_shaded.png b/doc/images/jkqtmathtext/jkqtmathtext_shaded.png
index 832ea8144a..b44ca5d9b3 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_shaded.png and b/doc/images/jkqtmathtext/jkqtmathtext_shaded.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_snugbox.png b/doc/images/jkqtmathtext/jkqtmathtext_snugbox.png
index dcc563c8b6..0b0d797b26 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_snugbox.png and b/doc/images/jkqtmathtext/jkqtmathtext_snugbox.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_snugshade.png b/doc/images/jkqtmathtext/jkqtmathtext_snugshade.png
index 55719653de..cc9f225e03 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_snugshade.png and b/doc/images/jkqtmathtext/jkqtmathtext_snugshade.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_specialsubsuper.png b/doc/images/jkqtmathtext/jkqtmathtext_specialsubsuper.png
index c22a2bfbf8..4a85b9f6a6 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_specialsubsuper.png and b/doc/images/jkqtmathtext/jkqtmathtext_specialsubsuper.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_sqrt.png b/doc/images/jkqtmathtext/jkqtmathtext_sqrt.png
index 3eecb24c98..3c77a33825 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_sqrt.png and b/doc/images/jkqtmathtext/jkqtmathtext_sqrt.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_stix.png b/doc/images/jkqtmathtext/jkqtmathtext_stix.png
index bb1a1da5bb..e389f89c47 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_stix.png and b/doc/images/jkqtmathtext/jkqtmathtext_stix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_substack.png b/doc/images/jkqtmathtext/jkqtmathtext_substack.png
index b005cd2230..182b067572 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_substack.png and b/doc/images/jkqtmathtext/jkqtmathtext_substack.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_supersub.png b/doc/images/jkqtmathtext/jkqtmathtext_supersub.png
index c2d59b72d9..a573840d3a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_supersub.png and b/doc/images/jkqtmathtext/jkqtmathtext_supersub.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_symbols.png b/doc/images/jkqtmathtext/jkqtmathtext_symbols.png
index 3d65952a59..9d82e4ddc3 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_symbols.png and b/doc/images/jkqtmathtext/jkqtmathtext_symbols.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_tabular.png b/doc/images/jkqtmathtext/jkqtmathtext_tabular.png
index 1aeb97f038..6e91e74f10 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_tabular.png and b/doc/images/jkqtmathtext/jkqtmathtext_tabular.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_textaccents.png b/doc/images/jkqtmathtext/jkqtmathtext_textaccents.png
index 50d1e2a843..7b92e25511 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_textaccents.png and b/doc/images/jkqtmathtext/jkqtmathtext_textaccents.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_textgreek.png b/doc/images/jkqtmathtext/jkqtmathtext_textgreek.png
index 497cd680f0..f4b6eaf42f 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_textgreek.png and b/doc/images/jkqtmathtext/jkqtmathtext_textgreek.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_timesnewroman.png b/doc/images/jkqtmathtext/jkqtmathtext_timesnewroman.png
index 6ff9317523..22744ca1ae 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_timesnewroman.png and b/doc/images/jkqtmathtext/jkqtmathtext_timesnewroman.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_tt.png b/doc/images/jkqtmathtext/jkqtmathtext_tt.png
index f770359e8e..4e4ce9a593 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_tt.png and b/doc/images/jkqtmathtext/jkqtmathtext_tt.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_ul.png b/doc/images/jkqtmathtext/jkqtmathtext_ul.png
index 783f12f8ae..041e1a955e 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_ul.png and b/doc/images/jkqtmathtext/jkqtmathtext_ul.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_unicode.png b/doc/images/jkqtmathtext/jkqtmathtext_unicode.png
index 3f8f971062..26019cbe59 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_unicode.png and b/doc/images/jkqtmathtext/jkqtmathtext_unicode.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_upgreek.png b/doc/images/jkqtmathtext/jkqtmathtext_upgreek.png
index 8c7b52ff22..886daed47f 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_upgreek.png and b/doc/images/jkqtmathtext/jkqtmathtext_upgreek.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_uppercase.png b/doc/images/jkqtmathtext/jkqtmathtext_uppercase.png
index 3c27f3e21a..7935f23a11 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_uppercase.png and b/doc/images/jkqtmathtext/jkqtmathtext_uppercase.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_usefira.png b/doc/images/jkqtmathtext/jkqtmathtext_usefira.png
index b6b80268cd..1645a2600a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_usefira.png and b/doc/images/jkqtmathtext/jkqtmathtext_usefira.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_useguifonts.png b/doc/images/jkqtmathtext/jkqtmathtext_useguifonts.png
index 52616ae86d..d791f22fd8 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_useguifonts.png and b/doc/images/jkqtmathtext/jkqtmathtext_useguifonts.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_userfont.png b/doc/images/jkqtmathtext/jkqtmathtext_userfont.png
index ee556bdbf8..73183ce50a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_userfont.png and b/doc/images/jkqtmathtext/jkqtmathtext_userfont.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_utf8.png b/doc/images/jkqtmathtext/jkqtmathtext_utf8.png
index 1c4ac3cacc..acb1c23c25 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_utf8.png and b/doc/images/jkqtmathtext/jkqtmathtext_utf8.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_uul.png b/doc/images/jkqtmathtext/jkqtmathtext_uul.png
index 63d248d238..8d0a3731c3 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_uul.png and b/doc/images/jkqtmathtext/jkqtmathtext_uul.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_verb.png b/doc/images/jkqtmathtext/jkqtmathtext_verb.png
index 149f57e105..1164e3da2d 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_verb.png and b/doc/images/jkqtmathtext/jkqtmathtext_verb.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_verbatim.png b/doc/images/jkqtmathtext/jkqtmathtext_verbatim.png
index f8eba1bb3c..c8dbee2cb9 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_verbatim.png and b/doc/images/jkqtmathtext/jkqtmathtext_verbatim.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_verbatimast.png b/doc/images/jkqtmathtext/jkqtmathtext_verbatimast.png
index 21c7573d3d..3ce42e94e6 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_verbatimast.png and b/doc/images/jkqtmathtext/jkqtmathtext_verbatimast.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_vmatrix.png b/doc/images/jkqtmathtext/jkqtmathtext_vmatrix.png
index 251906b9c2..fdd9a2614f 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_vmatrix.png and b/doc/images/jkqtmathtext/jkqtmathtext_vmatrix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_vvmatrix.png b/doc/images/jkqtmathtext/jkqtmathtext_vvmatrix.png
index a5822b903b..f137ea162f 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_vvmatrix.png and b/doc/images/jkqtmathtext/jkqtmathtext_vvmatrix.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_emspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_emspace.png
index e6539a35bf..188573d214 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_emspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_emspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_enspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_enspace.png
index c40c7f0b9a..a9726906bb 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_enspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_enspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_hphantom.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_hphantom.png
index 17619811fa..21bdeab68a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_hphantom.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_hphantom.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_medspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_medspace.png
index 6614b4d232..3278b2e030 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_medspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_medspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negmedspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negmedspace.png
index 78d9a6fd1c..fe6077d047 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negmedspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negmedspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthickspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthickspace.png
index 6b23ce8ea3..0857e5cc4b 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthickspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthickspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthinspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthinspace.png
index 52cb6265c5..35fa412337 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthinspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_negthinspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_none.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_none.png
index 9a90464596..6dc902fb19 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_none.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_none.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_phantom.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_phantom.png
index 02dcead6e9..4d69e7159a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_phantom.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_phantom.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_qquad.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_qquad.png
index 19d99e04a8..069ee1137a 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_qquad.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_qquad.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thicker.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thicker.png
index 9f4a4f8694..e2d999f04b 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thicker.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thicker.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thickspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thickspace.png
index 738bbf97e0..5a85fa3714 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thickspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thickspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thinspace.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thinspace.png
index 9300c79ac4..19c9dbe9cc 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thinspace.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_thinspace.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_vphantom.png b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_vphantom.png
index 52532803a3..8064a4190b 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_whitespace_vphantom.png and b/doc/images/jkqtmathtext/jkqtmathtext_whitespace_vphantom.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_xits.png b/doc/images/jkqtmathtext/jkqtmathtext_xits.png
index fec43b62bf..833a7d6955 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_xits.png and b/doc/images/jkqtmathtext/jkqtmathtext_xits.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_xits_all.png b/doc/images/jkqtmathtext/jkqtmathtext_xits_all.png
index fec43b62bf..833a7d6955 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_xits_all.png and b/doc/images/jkqtmathtext/jkqtmathtext_xits_all.png differ
diff --git a/doc/images/jkqtmathtext/schreq_mathmode.png b/doc/images/jkqtmathtext/schreq_mathmode.png
index b0043cb237..3022759d58 100644
Binary files a/doc/images/jkqtmathtext/schreq_mathmode.png and b/doc/images/jkqtmathtext/schreq_mathmode.png differ
diff --git a/doc/images/jkqtmathtext/schreq_normalmode.png b/doc/images/jkqtmathtext/schreq_normalmode.png
index fc98adc5a7..d86d4e5660 100644
Binary files a/doc/images/jkqtmathtext/schreq_normalmode.png and b/doc/images/jkqtmathtext/schreq_normalmode.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_FIRA_MATHANDTEXT.png
index a66db4620f..879c1b30c5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_XITS_MATHANDTEXT.png
index ff0e72b5f5..219ca22601 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aa_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_FIRA_MATHANDTEXT.png
index 8c71b511fe..79584bfb37 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_XITS_MATHANDTEXT.png
index 30c84cc0af..e86fff3ad3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaaa_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_FIRA_MATHANDTEXT.png
index 4540614760..cd66c9bd14 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_XITS_MATHANDTEXT.png
index f2fe91341c..41f68bc9bb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aacc_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_FIRA_MATHANDTEXT.png
index 678c3d76b7..ece59d89f8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_XITS_MATHANDTEXT.png
index 7cc1f16123..243bc33e74 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaee_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_FIRA_MATHANDTEXT.png
index bfc9c5fadf..5639ddcecd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_XITS_MATHANDTEXT.png
index aac6295622..2f6facf769 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aalef_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_FIRA_MATHANDTEXT.png
index bfc9c5fadf..5639ddcecd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_XITS_MATHANDTEXT.png
index aac6295622..2f6facf769 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aaleph_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_FIRA_MATHANDTEXT.png
index a1d5cf3537..73f17dad98 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_XITS_MATHANDTEXT.png
index a08ac4e8d7..6a5ad806b7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aangstrom_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_FIRA_MATHANDTEXT.png
index 803efa015f..f520386945 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_XITS_MATHANDTEXT.png
index 64b1da13a3..57c296b305 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_accurrent_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_FIRA_MATHANDTEXT.png
index c4b468ec91..390117b326 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_XITS_MATHANDTEXT.png
index 36be7e5bde..c9cbec93d4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_acos_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_FIRA_MATHANDTEXT.png
index 5a367ffde2..fa5bcb10f7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_XITS_MATHANDTEXT.png
index 0ab10b8b23..2729ce59d2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ae_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_FIRA_MATHANDTEXT.png
index bfc9c5fadf..5639ddcecd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_XITS_MATHANDTEXT.png
index aac6295622..2f6facf769 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alef_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_FIRA_MATHANDTEXT.png
index bfc9c5fadf..5639ddcecd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_XITS_MATHANDTEXT.png
index aac6295622..2f6facf769 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_aleph_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_FIRA_MATHANDTEXT.png
index 9c3b0f8733..5f8c69e89c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_XITS_MATHANDTEXT.png
index 308a661377..470f97a939 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_alpha_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_FIRA_MATHANDTEXT.png
index b718c2a707..5e2a261c35 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_XITS_MATHANDTEXT.png
index d729ec584e..ec768cec43 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_FIRA_MATHANDTEXT.png
index a1d5cf3537..73f17dad98 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_XITS_MATHANDTEXT.png
index a08ac4e8d7..6a5ad806b7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_angstrom_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_FIRA_MATHANDTEXT.png
index 96d04cc56f..dde4b061b7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_XITS_MATHANDTEXT.png
index 777ddab8a0..1f9fd29532 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_approx_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_FIRA_MATHANDTEXT.png
index 29c25158f0..772ef0303a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_XITS_MATHANDTEXT.png
index 4417be124c..128b47f27a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arccos_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_FIRA_MATHANDTEXT.png
index cdec49e818..5525511f66 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_XITS_MATHANDTEXT.png
index a6a6ad83bd..8f47970dc2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcminute_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_FIRA_MATHANDTEXT.png
index b5b2d94073..cd10afa1bf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_XITS_MATHANDTEXT.png
index 5f354a3a90..290f3b8b2f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsecond_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_FIRA_MATHANDTEXT.png
index e1d23ad634..ab18d488d9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_XITS_MATHANDTEXT.png
index 5738a5d27b..7a75fe4ad3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arcsin_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_FIRA_MATHANDTEXT.png
index af030e9147..9da7a347a4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_XITS_MATHANDTEXT.png
index d262026f38..d90fcaac43 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arctan_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_FIRA_MATHANDTEXT.png
index 5c8f567180..bcbd80242e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_XITS_MATHANDTEXT.png
index 1ff7c9ea43..be8659e6ac 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_arg_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_FIRA_MATHANDTEXT.png
index cd8dcf4a9f..0088e3d623 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_XITS_MATHANDTEXT.png
index 45d8f357de..a30ed6b4c5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmax_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_FIRA_MATHANDTEXT.png
index 2991bcafe5..8ba8e0cda9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_XITS_MATHANDTEXT.png
index de25cb2cca..63bdd38b87 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_argmin_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_FIRA_MATHANDTEXT.png
index e92c0ddf87..17b9334f26 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_XITS_MATHANDTEXT.png
index 0ae6894f75..adfdccaa18 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asin_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_FIRA_MATHANDTEXT.png
index cd6c31436a..9b6179499b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_XITS_MATHANDTEXT.png
index 56dd03d4d6..821bfc31b9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ast_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_FIRA_MATHANDTEXT.png
index cd6c31436a..9b6179499b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_XITS_MATHANDTEXT.png
index 56dd03d4d6..821bfc31b9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_asterisk_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_FIRA_MATHANDTEXT.png
index a2df6dcdee..2dc734656c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_XITS_MATHANDTEXT.png
index 5db5cf9572..3a8804ba09 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_atan_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_FIRA_MATHANDTEXT.png
index 7147e02dfd..928b599b8c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_XITS_MATHANDTEXT.png
index 420923d96a..5bd7bf60d1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_backslash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_FIRA_MATHANDTEXT.png
index b9ddc6e2f8..533e63d19f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_XITS_MATHANDTEXT.png
index 7e187120a3..22e934cf30 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbcc_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_FIRA_MATHANDTEXT.png
index f8760e0c2e..0d7b2dc64d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_XITS_MATHANDTEXT.png
index cc706fd06f..a3b02f2314 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbet_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_FIRA_MATHANDTEXT.png
index f8760e0c2e..0d7b2dc64d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_XITS_MATHANDTEXT.png
index cc706fd06f..a3b02f2314 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbeth_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_FIRA_MATHANDTEXT.png
index 14a1f76f4e..075f86360e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_XITS_MATHANDTEXT.png
index 5fe0e20c3d..d25d995d06 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbhh_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_FIRA_MATHANDTEXT.png
index 7cf10bc6f7..1dcc54e54d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_XITS_MATHANDTEXT.png
index b31c7c3e04..f54882ae90 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbnn_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_FIRA_MATHANDTEXT.png
index 857a9a07ac..f2398ade48 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_XITS_MATHANDTEXT.png
index c00a0039c0..0709ab597c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbox_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_FIRA_MATHANDTEXT.png
index b26c38ff61..7747c6e05e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_XITS_MATHANDTEXT.png
index 41df79a075..e6c562f83e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbpp_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_FIRA_MATHANDTEXT.png
index bb377a44ea..d7e2706ec2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_XITS_MATHANDTEXT.png
index 4807f1cd65..dde61510ab 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_FIRA_MATHANDTEXT.png
index a714b1343d..73d1ec5c06 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_XITS_MATHANDTEXT.png
index 0f68e7ce0f..a3ceaecd13 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbrr_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_FIRA_MATHANDTEXT.png
index 1420ae30c0..ea5dab3b7a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_XITS_MATHANDTEXT.png
index 5065a78633..34baf680ae 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bbzz_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_FIRA_MATHANDTEXT.png
index 3f1f03f450..100a4fbec7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_XITS_MATHANDTEXT.png
index d9133d13a3..0ead7efb8d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_because_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_FIRA_MATHANDTEXT.png
index 772274fe12..ea4834f60b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_XITS_MATHANDTEXT.png
index e00c5877c6..670c103f0f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzene_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_FIRA_MATHANDTEXT.png
index 46c755295e..0502fb6639 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_XITS_MATHANDTEXT.png
index fd992bc713..7bff400c82 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_benzenr_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_FIRA_MATHANDTEXT.png
index f8760e0c2e..0d7b2dc64d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_XITS_MATHANDTEXT.png
index cc706fd06f..a3b02f2314 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bet_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_FIRA_MATHANDTEXT.png
index 44b6db9693..5f3dd5a8af 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_XITS_MATHANDTEXT.png
index 1e476a9344..39acc967b5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beta_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_FIRA_MATHANDTEXT.png
index f8760e0c2e..0d7b2dc64d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_XITS_MATHANDTEXT.png
index cc706fd06f..a3b02f2314 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_beth_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_FIRA_MATHANDTEXT.png
index 38278c63a5..5acd57e578 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_XITS_MATHANDTEXT.png
index 1f26fa0d85..99abb167b0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcap_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_FIRA_MATHANDTEXT.png
index d43a0d7940..e7319636f7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_XITS_MATHANDTEXT.png
index 5159c06497..f071eddb1c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigcup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_FIRA_MATHANDTEXT.png
index 804775eebe..0de7391113 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_XITS_MATHANDTEXT.png
index 827db5d62f..596d9b4807 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bighat_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_FIRA_MATHANDTEXT.png
index ed32b4ac8c..0fd1111950 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_XITS_MATHANDTEXT.png
index 67d05cd610..4f50fb53d5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigodot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_FIRA_MATHANDTEXT.png
index e7c2d7ed66..f84add8585 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_XITS_MATHANDTEXT.png
index f941b572b1..7359e03036 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigoplus_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_FIRA_MATHANDTEXT.png
index cc7549a77b..59e5f7add5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_XITS_MATHANDTEXT.png
index 0ed96c4b6c..3a10d83d69 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigotimes_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_FIRA_MATHANDTEXT.png
index e0701d1a36..351bb3312d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_XITS_MATHANDTEXT.png
index a61061af73..6ab12ae50f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigsqcup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_FIRA_MATHANDTEXT.png
index f323024403..6c9451acf0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_XITS_MATHANDTEXT.png
index e98e0c00d5..d289cd4275 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_biguplus_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_FIRA_MATHANDTEXT.png
index 46dbaa57bb..202c5123bc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_XITS_MATHANDTEXT.png
index 2591260d91..10b89649c4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigvee_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_FIRA_MATHANDTEXT.png
index 804775eebe..0de7391113 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_XITS_MATHANDTEXT.png
index 827db5d62f..596d9b4807 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bigwedge_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_FIRA_MATHANDTEXT.png
index 0c68764a4a..f5edfb5733 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_XITS_MATHANDTEXT.png
index 107f02e1a4..c986108db9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blacksquare_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_FIRA_MATHANDTEXT.png
index 26071fb637..497bd88f37 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_XITS_MATHANDTEXT.png
index b76bc42b45..9bd4f5a363 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_blcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bot_XITS_MATHANDTEXT.png
index 5a84da56a1..a0ef9b5d15 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_FIRA_MATHANDTEXT.png
index a5830010ac..e204bd4824 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_XITS_MATHANDTEXT.png
index 3c9b2ec4a6..9549a1c911 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_brcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_FIRA_MATHANDTEXT.png
index bab8b71637..f47232d11b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_XITS_MATHANDTEXT.png
index 6a3d83382e..495e7733ba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_bullet_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_FIRA_MATHANDTEXT.png
index f1bea58a5c..c329a90daa 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_XITS_MATHANDTEXT.png
index 3448e70f54..9ce212350e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cap_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_FIRA_MATHANDTEXT.png
index 26762ce8e8..3168990f3f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_XITS_MATHANDTEXT.png
index 91c12d7de6..44fd8a89cb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_FIRA_MATHANDTEXT.png
index e505dc4bd6..6bcff2c072 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_XITS_MATHANDTEXT.png
index 2fe13c6866..91bd9c714b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cdots_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_FIRA_MATHANDTEXT.png
index 17f270df87..39bdaac5eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_XITS_MATHANDTEXT.png
index 067b501c68..ce277b9e9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_celsius_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_FIRA_MATHANDTEXT.png
index 239fb16bae..960da15cb8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_XITS_MATHANDTEXT.png
index 26553c5eb9..8c2efd753e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cent_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_checkmark_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_checkmark_XITS_MATHANDTEXT.png
index 9395ef5993..1addb4187d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_checkmark_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_checkmark_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_FIRA_MATHANDTEXT.png
index d246a94e5d..87b059c3a5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_XITS_MATHANDTEXT.png
index ef0de4cd33..c4b89026b4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_chi_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_FIRA_MATHANDTEXT.png
index 9efb7d70d5..10ff9dd31b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_XITS_MATHANDTEXT.png
index aa0b06a5f4..efbfb69ce6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circ_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_FIRA_MATHANDTEXT.png
index eb00325ac8..fdf880a025 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_XITS_MATHANDTEXT.png
index fd64f5467d..e8d1616786 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledcc_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_FIRA_MATHANDTEXT.png
index adda645de9..4240e82526 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_XITS_MATHANDTEXT.png
index e53871530d..778134cf49 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circledrr_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_FIRA_MATHANDTEXT.png
index b7e6996a30..aca371066f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_XITS_MATHANDTEXT.png
index 42c7d4ff2a..e8a22955fe 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_circonflex_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_FIRA_MATHANDTEXT.png
index 99eeefdd4c..cefd23e14f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_XITS_MATHANDTEXT.png
index 28d8e12c28..a5d1c75b5d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_co_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_FIRA_MATHANDTEXT.png
index f374b5c087..b8bed7f668 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_XITS_MATHANDTEXT.png
index ad27c7bdcf..8a0c81e83f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_complement_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_FIRA_MATHANDTEXT.png
index 40be4bd4e4..39f26e5fc7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_XITS_MATHANDTEXT.png
index ffba5fefb9..14af7117ec 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cong_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_FIRA_MATHANDTEXT.png
index 4bb32220ba..f2035b2da7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_XITS_MATHANDTEXT.png
index d7b01cb559..e393b0a65b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coprod_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_FIRA_MATHANDTEXT.png
index eb00325ac8..fdf880a025 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_XITS_MATHANDTEXT.png
index fd64f5467d..e8d1616786 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_copyright_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_FIRA_MATHANDTEXT.png
index 7b0d226834..bb296db949 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_XITS_MATHANDTEXT.png
index a331787852..7f09b5194a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cos_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_FIRA_MATHANDTEXT.png
index 0273de5628..7ce31cc69a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_XITS_MATHANDTEXT.png
index e53ba9e96a..9d69a2ad99 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cosh_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_FIRA_MATHANDTEXT.png
index afe33a3804..a45c329e46 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_XITS_MATHANDTEXT.png
index 52b9ea2520..c4a9f086ab 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_FIRA_MATHANDTEXT.png
index 35f7103fbf..2aa61f139d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_XITS_MATHANDTEXT.png
index fecac177e3..1e1c10f1cd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_coth_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_FIRA_MATHANDTEXT.png
index fa904f4b61..1ddf92ecaa 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_XITS_MATHANDTEXT.png
index 40137379b0..01de399528 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_cup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_FIRA_MATHANDTEXT.png
index bb0785a4c8..308f8b9afd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_XITS_MATHANDTEXT.png
index 7408ca8854..cbf02d1a5c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dag_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_FIRA_MATHANDTEXT.png
index bb0785a4c8..308f8b9afd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_XITS_MATHANDTEXT.png
index 7408ca8854..cbf02d1a5c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dagger_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_FIRA_MATHANDTEXT.png
index 11362b293e..a126a66f05 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_XITS_MATHANDTEXT.png
index c590c161b5..f2838485f6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dalet_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_FIRA_MATHANDTEXT.png
index 11362b293e..a126a66f05 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_XITS_MATHANDTEXT.png
index c590c161b5..f2838485f6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_daleth_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dashv_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dashv_XITS_MATHANDTEXT.png
index d0a7466739..f172effdc9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dashv_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dashv_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dblhyphen_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dblhyphen_FIRA_MATHANDTEXT.png
index a0b70d41cd..2b8e6702b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dblhyphen_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dblhyphen_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_FIRA_MATHANDTEXT.png
index 415ee445af..40877cf8e3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_XITS_MATHANDTEXT.png
index a7ae56d7f6..88e4078084 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dd_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_FIRA_MATHANDTEXT.png
index 69f7edf4de..283a63f0e6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_XITS_MATHANDTEXT.png
index fd86ece497..8ec5bc503c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddag_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_FIRA_MATHANDTEXT.png
index 69f7edf4de..283a63f0e6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_XITS_MATHANDTEXT.png
index fd86ece497..8ec5bc503c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddagger_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_FIRA_MATHANDTEXT.png
index 11362b293e..a126a66f05 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_XITS_MATHANDTEXT.png
index c590c161b5..f2838485f6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddalet_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_FIRA_MATHANDTEXT.png
index 11362b293e..a126a66f05 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_XITS_MATHANDTEXT.png
index c590c161b5..f2838485f6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddaleth_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_FIRA_MATHANDTEXT.png
index d6675da61a..a58cc98779 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_XITS_MATHANDTEXT.png
index 06fd768519..5d50ff6ca1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddcc_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddots_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddots_XITS_MATHANDTEXT.png
index a161c24b25..9a30640c01 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddots_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddots_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png
index efc39ad34a..22d04862df 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png
index 6ec52dddaf..8a09694705 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_FIRA_MATHANDTEXT.png
index 84b40337af..9d894da1d4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_XITS_MATHANDTEXT.png
index 5ba3898ffa..b429e0fa76 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_deg_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_FIRA_MATHANDTEXT.png
index 17f270df87..39bdaac5eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_XITS_MATHANDTEXT.png
index 067b501c68..ce277b9e9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degcc_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_FIRA_MATHANDTEXT.png
index b944fa7da3..7e3e7e77a4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_XITS_MATHANDTEXT.png
index 5de1534f35..7abdec313a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degree_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_FIRA_MATHANDTEXT.png
index 17f270df87..39bdaac5eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_XITS_MATHANDTEXT.png
index 067b501c68..ce277b9e9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_degreeccelsius_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_FIRA_MATHANDTEXT.png
index b67f686809..d9db44d7c6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_XITS_MATHANDTEXT.png
index ffdb31c6f3..9bd2934d46 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_delta_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_FIRA_MATHANDTEXT.png
index 65df01d0b7..9d543ec14c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_XITS_MATHANDTEXT.png
index a06cdf2258..0f494c9846 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_det_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_diamond_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_diamond_XITS_MATHANDTEXT.png
index b928de6efa..2cc1de463c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_diamond_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_diamond_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_FIRA_MATHANDTEXT.png
index c1c46bb663..74752a1825 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_XITS_MATHANDTEXT.png
index 753b7e9fb9..c5de90e02c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dim_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_FIRA_MATHANDTEXT.png
index 704f530ccb..9a9efdeb9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_XITS_MATHANDTEXT.png
index fb7d21210f..a706a2a03a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_div_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_FIRA_MATHANDTEXT.png
index 898695460f..7cbc6ccd85 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_XITS_MATHANDTEXT.png
index 0641f2f48b..e85205d7b4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dollar_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_FIRA_MATHANDTEXT.png
index 03a50b7b2f..49de3a5c6e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_XITS_MATHANDTEXT.png
index b562850ecf..4fe88b186e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dots_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_FIRA_MATHANDTEXT.png
index 48884d8850..b458be5c78 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_XITS_MATHANDTEXT.png
index dedf9eb2cc..52bff289eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png
index 614017acaa..95ebc8b639 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png
index 44ad7763ad..17160729ae 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png
index 0ea2ccaa2f..09235df77f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png
index 7957af389f..3eb4fe0fdf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_FIRA_MATHANDTEXT.png
index b5b2d94073..cd10afa1bf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_XITS_MATHANDTEXT.png
index 5f354a3a90..290f3b8b2f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_dprime_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_FIRA_MATHANDTEXT.png
index 88dae44e6f..147bf6638b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_XITS_MATHANDTEXT.png
index f819cadbe2..23481a5aac 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ee_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_FIRA_MATHANDTEXT.png
index b9ecc10f26..7f001df08f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_XITS_MATHANDTEXT.png
index 58e2e6207d..0db41ca74b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eeuurr_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_FIRA_MATHANDTEXT.png
index 290cb46011..7b7e223423 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_XITS_MATHANDTEXT.png
index cc4fcebb35..4da32aa28b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ell_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_FIRA_MATHANDTEXT.png
index 03a50b7b2f..49de3a5c6e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_XITS_MATHANDTEXT.png
index b562850ecf..4fe88b186e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ellipsis_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emdash_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emdash_FIRA_MATHANDTEXT.png
index a0b70d41cd..2b8e6702b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emdash_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emdash_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_FIRA_MATHANDTEXT.png
index 3dccfa6f73..faf496e298 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_XITS_MATHANDTEXT.png
index 68bd96a7a7..332577c4f9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_emptyset_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_FIRA_MATHANDTEXT.png
index 477485478b..37d660c94d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_XITS_MATHANDTEXT.png
index 6549ea6617..9c0e36025a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_endash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_FIRA_MATHANDTEXT.png
index d23e41101d..2c8bec4bbc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_XITS_MATHANDTEXT.png
index 9cde1de1f4..a84fccf64f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_epsilon_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_FIRA_MATHANDTEXT.png
index 2af7afdb22..537ef335a7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_XITS_MATHANDTEXT.png
index 3aeb51fe24..eecd1d82b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_equiv_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_FIRA_MATHANDTEXT.png
index d4baa8fc3e..cc0e561c79 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_XITS_MATHANDTEXT.png
index 64c69fc2b4..c980e6a23e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_eta_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_FIRA_MATHANDTEXT.png
index b9ecc10f26..7f001df08f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_XITS_MATHANDTEXT.png
index 58e2e6207d..0db41ca74b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_euro_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_FIRA_MATHANDTEXT.png
index 2584f948e9..0e9d5816e4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_XITS_MATHANDTEXT.png
index 8067d714e9..490c79d480 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exists_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_FIRA_MATHANDTEXT.png
index 662cb6e4bf..060d7526f8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_XITS_MATHANDTEXT.png
index 87030dea5e..6914ce71ce 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_exp_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_FIRA_MATHANDTEXT.png
index 77ca8af097..21acb32aa6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_XITS_MATHANDTEXT.png
index 2010c25790..a51af32167 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_female_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_FIRA_MATHANDTEXT.png
index 5ecb764292..a3ce1aea43 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_XITS_MATHANDTEXT.png
index d264231f4c..458c9a76be 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_FIRA_MATHANDTEXT.png
index 908c02f04b..6b9a8d3d6d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_XITS_MATHANDTEXT.png
index 5e42e01e04..8edc27c7c4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_flqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_FIRA_MATHANDTEXT.png
index 0f9391567f..83fb1bb722 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_XITS_MATHANDTEXT.png
index 1e0ff57951..d5f5bdefe8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_forall_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_FIRA_MATHANDTEXT.png
index e52df2dbcf..edac3ab953 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_XITS_MATHANDTEXT.png
index 13baafcaf3..8cbe2e6c93 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_FIRA_MATHANDTEXT.png
index 39a5c09774..ab559fd1fe 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_XITS_MATHANDTEXT.png
index 447c46f923..7b976f63cb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_frqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_FIRA_MATHANDTEXT.png
index e728688dff..bab54305d8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_XITS_MATHANDTEXT.png
index f03e373860..e6b2fc740b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gamma_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_FIRA_MATHANDTEXT.png
index cba2de9d1a..95fee4fbfc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_XITS_MATHANDTEXT.png
index e232c7393a..faa416441d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gcd_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_FIRA_MATHANDTEXT.png
index 74b7912711..6a075b2eb5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_XITS_MATHANDTEXT.png
index 0e46d77161..3710bfe90b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ge_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_FIRA_MATHANDTEXT.png
index 74b7912711..6a075b2eb5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_XITS_MATHANDTEXT.png
index 0e46d77161..3710bfe90b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_FIRA_MATHANDTEXT.png
index 200e11e124..315bf9224e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_XITS_MATHANDTEXT.png
index 809720427f..260dd2ea08 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_geqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_FIRA_MATHANDTEXT.png
index 1f78547bde..9e99f60d7d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_XITS_MATHANDTEXT.png
index fc514af961..704380e81a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gg_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_FIRA_MATHANDTEXT.png
index 97a5e31e60..adc78344c3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_XITS_MATHANDTEXT.png
index 03ec74507d..fb8c6abf70 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ggimel_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_FIRA_MATHANDTEXT.png
index 97a5e31e60..adc78344c3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_XITS_MATHANDTEXT.png
index 03ec74507d..fb8c6abf70 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_gimel_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_FIRA_MATHANDTEXT.png
index 5d66b88d11..d8eb48e1c7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_XITS_MATHANDTEXT.png
index e84d3a25e5..976280ed44 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_FIRA_MATHANDTEXT.png
index ea431a891d..eb43b2e379 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_XITS_MATHANDTEXT.png
index 64794e9700..fa93133c07 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_glqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_FIRA_MATHANDTEXT.png
index 652ddb2a98..19a2157152 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_XITS_MATHANDTEXT.png
index 964bd42eac..da55a4e433 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_FIRA_MATHANDTEXT.png
index d60bdf4352..1618451d60 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_XITS_MATHANDTEXT.png
index 728ce9eaa8..c35d564b71 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_grqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_FIRA_MATHANDTEXT.png
index a4eaa92156..ce768e353c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_XITS_MATHANDTEXT.png
index 16b4b33a62..5ecfd61d09 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hbar_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_FIRA_MATHANDTEXT.png
index f006028752..d4bf4c4ce6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_XITS_MATHANDTEXT.png
index ffffbb70b7..8905cf30ae 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hexagon_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_FIRA_MATHANDTEXT.png
index 4ca90ab171..b3c0cf990a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_XITS_MATHANDTEXT.png
index 27fa7a9ba1..23f9afd73c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandlleft_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_FIRA_MATHANDTEXT.png
index 6c865bb7ae..f3c44f8864 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_XITS_MATHANDTEXT.png
index 35670ca582..872bd0a388 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hhandrright_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_FIRA_MATHANDTEXT.png
index bceb7cbbf8..60a9dd03f7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_XITS_MATHANDTEXT.png
index 500c5f9b78..3482c5e4bb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hom_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_FIRA_MATHANDTEXT.png
index 7788f00e51..945ca465ab 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_XITS_MATHANDTEXT.png
index c01c429c7b..bc25ed35f4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_hyphen_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iddots_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iddots_XITS_MATHANDTEXT.png
index bd1b488e6f..7b1d549a9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iddots_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iddots_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_FIRA_MATHANDTEXT.png
index c5d531d949..f39f2b189c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_XITS_MATHANDTEXT.png
index cb50bd06d3..71066b6146 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iff_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_FIRA_MATHANDTEXT.png
index 8674627fc7..8268aee60d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_XITS_MATHANDTEXT.png
index 53066afbff..d5824182d7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ii_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_FIRA_MATHANDTEXT.png
index 6865e1860d..42c73250e6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_XITS_MATHANDTEXT.png
index b54b433885..2a3832f0d3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iiint_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iim_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iim_XITS_MATHANDTEXT.png
index af11f8c6f4..7ef4fdffa0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iim_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iim_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_FIRA_MATHANDTEXT.png
index cd3a0f9a43..2c17e3c798 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_XITS_MATHANDTEXT.png
index a290708dea..3ba9924990 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iint_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_FIRA_MATHANDTEXT.png
index 646024fc2c..6cfc14f103 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_XITS_MATHANDTEXT.png
index ab21bd90d4..a1f4cf698c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_in_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_FIRA_MATHANDTEXT.png
index 920741eeb5..bb23044a55 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_XITS_MATHANDTEXT.png
index aca6f7958d..79aa2a01a5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_infty_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_FIRA_MATHANDTEXT.png
index e0beb63b22..a8511c14e5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_XITS_MATHANDTEXT.png
index 662a8857bb..f903c6cc3c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_int_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_FIRA_MATHANDTEXT.png
index 0ba04b3b03..cce4ca278f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_XITS_MATHANDTEXT.png
index 91d4044b38..98508e629e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_iota_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_FIRA_MATHANDTEXT.png
index eaba02e599..4c3bb20eec 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_XITS_MATHANDTEXT.png
index efa4a00197..ddc83c272e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_kappa_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_FIRA_MATHANDTEXT.png
index 578b380f4d..54fe49cd3f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_XITS_MATHANDTEXT.png
index f3367ce4c2..5705eb7fa7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ker_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_FIRA_MATHANDTEXT.png
index b94fcc79b9..7dd4e7f41c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_XITS_MATHANDTEXT.png
index 3e45b6cfbd..55bf136eac 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_l_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_FIRA_MATHANDTEXT.png
index b795d4def4..891169eba0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_XITS_MATHANDTEXT.png
index 57deeeaf16..94b9a9a4c0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lambda_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_FIRA_MATHANDTEXT.png
index f1bea58a5c..c329a90daa 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_XITS_MATHANDTEXT.png
index 3448e70f54..9ce212350e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_land_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_FIRA_MATHANDTEXT.png
index ca813c4380..d998c3c875 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_XITS_MATHANDTEXT.png
index 1d82360c68..bf30f7e640 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_langle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_FIRA_MATHANDTEXT.png
index 034e5f4258..4b97fea0a9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_XITS_MATHANDTEXT.png
index 9bb362c2e7..f5dfac5ce7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lb_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_FIRA_MATHANDTEXT.png
index 2a0c57dbca..6715bd060e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_XITS_MATHANDTEXT.png
index 480adb7abc..d3fcb4d63e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lceil_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_FIRA_MATHANDTEXT.png
index 2cf0e2015d..5d8f981634 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_XITS_MATHANDTEXT.png
index a203dbe54c..70f6359cdd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ld_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_FIRA_MATHANDTEXT.png
index 03a50b7b2f..49de3a5c6e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_XITS_MATHANDTEXT.png
index b562850ecf..4fe88b186e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ldots_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_FIRA_MATHANDTEXT.png
index 0cd4f55e04..2ae184eb6d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_XITS_MATHANDTEXT.png
index 294a16a340..a72fbd8a3f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_le_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_FIRA_MATHANDTEXT.png
index a1b2f3efaf..2dccf0f89f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_XITS_MATHANDTEXT.png
index 1bb7313a33..e879f7f86d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_FIRA_MATHANDTEXT.png
index 6c865bb7ae..f3c44f8864 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_XITS_MATHANDTEXT.png
index 35670ca582..872bd0a388 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lefthand_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png
index 140de8b82e..9367d34b8d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png
index c48a884919..536c0a3d82 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png
index 71ff8a7eff..b8e8840fbd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png
index 8667210df0..b7e47a3ebf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_FIRA_MATHANDTEXT.png
index b2dcda27e8..6f07889d3f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_XITS_MATHANDTEXT.png
index c1afe3e525..3b4d902786 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png
index e8e1d2b83f..307801e05f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png
index 41b143c247..eb96d7a5eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_FIRA_MATHANDTEXT.png
index 0cd4f55e04..2ae184eb6d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_XITS_MATHANDTEXT.png
index 294a16a340..a72fbd8a3f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_FIRA_MATHANDTEXT.png
index 4b0f821037..1176a0578e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_XITS_MATHANDTEXT.png
index c367ad5b1f..ceec959af2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_leqq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_FIRA_MATHANDTEXT.png
index 5d72bb3a14..540cb03f20 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_XITS_MATHANDTEXT.png
index dc644b5fe2..b456665529 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lfloor_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_FIRA_MATHANDTEXT.png
index e0fc7c2652..518cbe6fd3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_XITS_MATHANDTEXT.png
index bda72acdb5..e360c60e1a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lightning_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_FIRA_MATHANDTEXT.png
index c3ce44b989..99898fa537 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_XITS_MATHANDTEXT.png
index 7dde5f459f..efa04b59d8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lim_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_FIRA_MATHANDTEXT.png
index 55b9d62e33..28b43bcac0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_XITS_MATHANDTEXT.png
index 26d798b64b..2cae04f431 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_liminf_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_FIRA_MATHANDTEXT.png
index 8356966047..fce54a44d3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_XITS_MATHANDTEXT.png
index ed21263417..fdae4599be 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_limsup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_FIRA_MATHANDTEXT.png
index c904243e0d..f63b3a0a2b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_XITS_MATHANDTEXT.png
index 7739a5a8f6..b56897a931 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ll_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_FIRA_MATHANDTEXT.png
index 26071fb637..497bd88f37 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_XITS_MATHANDTEXT.png
index b76bc42b45..9bd4f5a363 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png
index b17a732037..710c0a4ef5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png
index c4c943f1a2..cf59bf70b6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png
index c5d531d949..f39f2b189c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png
index cb50bd06d3..71066b6146 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png
index 8043802ca4..89015aa7b4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png
index 25d5da5db1..4cae86322f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png
index 2739690647..a7d5a4df35 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png
index e66894a634..b4b4e62451 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png
index 8e0aaca871..0c63d75c36 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png
index e25d52e48c..b776b573c5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_FIRA_MATHANDTEXT.png
index d9438d6a16..1d9c2323d8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_XITS_MATHANDTEXT.png
index 0d8919c2ba..40b68309bf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ln_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_FIRA_MATHANDTEXT.png
index 5d447bb564..99bdc8cfba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_XITS_MATHANDTEXT.png
index 10039840ce..26c75a2c9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lnot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_FIRA_MATHANDTEXT.png
index f9cdcad6d8..9efe29694c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_XITS_MATHANDTEXT.png
index 7ba8b640c9..d93641597b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_log_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_FIRA_MATHANDTEXT.png
index f0b4fe9d6f..b66d5f0cef 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_XITS_MATHANDTEXT.png
index e5308679ed..0fb3ee6fe5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_FIRA_MATHANDTEXT.png
index 5c77ab82e5..35688ff4fc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_XITS_MATHANDTEXT.png
index e6d021abe7..f4a65b432d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longleftrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_FIRA_MATHANDTEXT.png
index 9f5aeb2438..58aa165dd8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_XITS_MATHANDTEXT.png
index 1441b7ed73..b89a2e3529 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_longrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_FIRA_MATHANDTEXT.png
index fa904f4b61..1ddf92ecaa 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_XITS_MATHANDTEXT.png
index 40137379b0..01de399528 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lor_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_FIRA_MATHANDTEXT.png
index 147ced87ff..ae73f07321 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_XITS_MATHANDTEXT.png
index 6d0d7f6f27..89a8f7ec04 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lozenge_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_FIRA_MATHANDTEXT.png
index a5830010ac..e204bd4824 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_XITS_MATHANDTEXT.png
index 3c9b2ec4a6..9549a1c911 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_lrcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_FIRA_MATHANDTEXT.png
index 871205c8fb..f2539c34cb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_XITS_MATHANDTEXT.png
index 986a4ed61d..8050e637df 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_male_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapimage_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapimage_XITS_MATHANDTEXT.png
index 40ecd0c3b4..6a3c9071b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapimage_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapimage_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_maporiginal_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_maporiginal_XITS_MATHANDTEXT.png
index eef806eb5e..8c0b879205 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_maporiginal_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_maporiginal_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_FIRA_MATHANDTEXT.png
index 0bce3101e5..da00ab6519 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_XITS_MATHANDTEXT.png
index af25d52819..686b9d2510 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_FIRA_MATHANDTEXT.png
index b30d1dfb8d..1994032bef 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_XITS_MATHANDTEXT.png
index d07f9bd42d..2b033f64a0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_max_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_FIRA_MATHANDTEXT.png
index 78704e09fd..71b73ccb5e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_XITS_MATHANDTEXT.png
index 63849fb1b4..aa1e048eac 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_measuredangle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_FIRA_MATHANDTEXT.png
index 92eea26f44..a8e5e41916 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_XITS_MATHANDTEXT.png
index 695d1c282c..bc27719bba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_median_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_FIRA_MATHANDTEXT.png
index 38ee407b29..0c3098892b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_XITS_MATHANDTEXT.png
index b4b6c047dd..c2d67ba3f1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mho_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_FIRA_MATHANDTEXT.png
index 2b3bf466f0..1d92b41954 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_XITS_MATHANDTEXT.png
index f8aa2e5c06..7413249118 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_micro_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_FIRA_MATHANDTEXT.png
index 4581b1b349..cefee26007 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_XITS_MATHANDTEXT.png
index be2a884ed7..69941c1e9f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mid_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_FIRA_MATHANDTEXT.png
index b54ccd1d2f..81466cdbb8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_XITS_MATHANDTEXT.png
index 737c51b707..c440f617d3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_min_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_FIRA_MATHANDTEXT.png
index 3e479d1af7..0e08493c94 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_XITS_MATHANDTEXT.png
index 9e30eba23f..53c889f292 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mod_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_models_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_models_XITS_MATHANDTEXT.png
index f264ae6c71..ffd27de7bf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_models_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_models_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_FIRA_MATHANDTEXT.png
index 6c13d5e190..b6360e2a4c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_XITS_MATHANDTEXT.png
index fe47f7580c..a7e044374c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mp_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_FIRA_MATHANDTEXT.png
index 18b432bd55..6585bd3eea 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_XITS_MATHANDTEXT.png
index f4504982e0..d40ae5536b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_mu_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_multimap_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_multimap_XITS_MATHANDTEXT.png
index ef400156b6..38cbdc799c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_multimap_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_multimap_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_FIRA_MATHANDTEXT.png
index 07967d09e8..31005d91a7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_XITS_MATHANDTEXT.png
index 62ce326d4e..091cbcdfba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nabla_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_FIRA_MATHANDTEXT.png
index 9d4a0aff94..627e72d7eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_XITS_MATHANDTEXT.png
index 9cfadd7166..f40f5832e0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ne_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_FIRA_MATHANDTEXT.png
index 1b4f247943..ea030a47d7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_XITS_MATHANDTEXT.png
index 46b2d83abb..f275c013e7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nearrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_FIRA_MATHANDTEXT.png
index 5d447bb564..99bdc8cfba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_XITS_MATHANDTEXT.png
index 10039840ce..26c75a2c9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neg_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_FIRA_MATHANDTEXT.png
index 9d4a0aff94..627e72d7eb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_XITS_MATHANDTEXT.png
index 9cfadd7166..f40f5832e0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_neq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_FIRA_MATHANDTEXT.png
index 61b38c1a45..62ebcabd70 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_XITS_MATHANDTEXT.png
index 6385045ffb..9cf6e0645c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nexists_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_FIRA_MATHANDTEXT.png
index b6becfa669..d514cbe6bb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_XITS_MATHANDTEXT.png
index f3975d5965..12bb66b1fe 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ni_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_FIRA_MATHANDTEXT.png
index bd07e94139..a445f725ec 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_XITS_MATHANDTEXT.png
index 40d3b9af2c..9a0b2aa834 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nmid_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_FIRA_MATHANDTEXT.png
index 5523b270fc..5a1007b696 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_XITS_MATHANDTEXT.png
index d0a72ad6bb..39b1358634 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nno_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_FIRA_MATHANDTEXT.png
index 007b66ced1..9ec05673e1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_XITS_MATHANDTEXT.png
index 4c3b0247b8..6906249f6c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notin_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_FIRA_MATHANDTEXT.png
index 0dc7488d44..c649f8cb05 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_XITS_MATHANDTEXT.png
index 9f76e69edd..936465f04d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_notni_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_FIRA_MATHANDTEXT.png
index 8966fef97a..91c9cd0508 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_XITS_MATHANDTEXT.png
index 1979eb1b23..e2ccde600a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nparallel_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_FIRA_MATHANDTEXT.png
index 139434cfcd..38fbdc02bd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_XITS_MATHANDTEXT.png
index ca0154b918..00be83101e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nu_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nvdash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nvdash_XITS_MATHANDTEXT.png
index 261ff85b12..f1587caa8d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nvdash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nvdash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_FIRA_MATHANDTEXT.png
index c19808fcf0..2936f1598e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_XITS_MATHANDTEXT.png
index 56a471d6d5..071018713d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_nwarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_FIRA_MATHANDTEXT.png
index b7c0cc2358..aa785081bc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_XITS_MATHANDTEXT.png
index e4cbe5f2a7..509b4f27cd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_o_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_FIRA_MATHANDTEXT.png
index a4e194b51f..52ccc0b561 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_XITS_MATHANDTEXT.png
index dc38babac4..2d7aea6288 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_odot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_FIRA_MATHANDTEXT.png
index 56aafff39b..45376c771c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_XITS_MATHANDTEXT.png
index b2127f638c..17dbd96bb5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oe_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_FIRA_MATHANDTEXT.png
index 4ed67a6b50..9b3d7cc92b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_XITS_MATHANDTEXT.png
index 565bd307bb..03b82af70d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ohm_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_FIRA_MATHANDTEXT.png
index 2007ce2ae8..b247c70091 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_XITS_MATHANDTEXT.png
index fa6d7470e8..aa3420ae8e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiiint_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_FIRA_MATHANDTEXT.png
index 0c13ff0647..c073aeec92 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_XITS_MATHANDTEXT.png
index aa09d871b9..5ea316b55d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oiint_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_FIRA_MATHANDTEXT.png
index 16098c3aa2..0d39103677 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_XITS_MATHANDTEXT.png
index 672b8eb4ad..9e5a836013 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oint_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_FIRA_MATHANDTEXT.png
index c2955fbdd0..02d13e2309 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_XITS_MATHANDTEXT.png
index 7a13ed84aa..7cb56362ba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_omega_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_FIRA_MATHANDTEXT.png
index 2df6820ed4..4112d4022b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_XITS_MATHANDTEXT.png
index 77250d691a..a8b22ceb83 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ominus_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_FIRA_MATHANDTEXT.png
index 6e839f742d..f0a58c5cd4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_XITS_MATHANDTEXT.png
index 9f2d7e5cbb..e666a5718a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oo_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_FIRA_MATHANDTEXT.png
index 308b851875..7e10996e57 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_XITS_MATHANDTEXT.png
index 78e85a9bea..7f83858c74 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ooee_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_FIRA_MATHANDTEXT.png
index 4ed67a6b50..9b3d7cc92b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_XITS_MATHANDTEXT.png
index 565bd307bb..03b82af70d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oohm_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_FIRA_MATHANDTEXT.png
index 277220889b..5c5d441fd3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_XITS_MATHANDTEXT.png
index ccc2d98f5a..0ee8c101c6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oplus_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_FIRA_MATHANDTEXT.png
index b9d2077dbc..82a782fc1e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_XITS_MATHANDTEXT.png
index 4492eb0391..037e1fa7f9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_oslash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_FIRA_MATHANDTEXT.png
index 6e2c4fca32..9cdada38cd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_XITS_MATHANDTEXT.png
index 46edc6d303..6bd95dabfe 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_otimes_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_FIRA_MATHANDTEXT.png
index eeede757fa..7b1a23e070 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_XITS_MATHANDTEXT.png
index e442465678..ecc84836ef 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_parallel_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_FIRA_MATHANDTEXT.png
index 8978abd283..7bfeee9d75 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_XITS_MATHANDTEXT.png
index 6f2638f8fe..4d6eab80c2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_partial_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_FIRA_MATHANDTEXT.png
index 9048465136..b2ddd3991a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_XITS_MATHANDTEXT.png
index 0cdb697d86..d993a349f9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_permil_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perp_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perp_XITS_MATHANDTEXT.png
index 5a84da56a1..a0ef9b5d15 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perp_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perp_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_FIRA_MATHANDTEXT.png
index 9048465136..b2ddd3991a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_XITS_MATHANDTEXT.png
index 0cdb697d86..d993a349f9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_perthousand_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_FIRA_MATHANDTEXT.png
index e6a4b4cc0d..bdd760b688 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_XITS_MATHANDTEXT.png
index 94af24a891..119de7eb45 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_phi_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_FIRA_MATHANDTEXT.png
index 7dd2a2a89d..22a9bf531c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_XITS_MATHANDTEXT.png
index 621eecaf46..18c2d7404f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pi_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_FIRA_MATHANDTEXT.png
index 33ac023640..d5e65836cb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_XITS_MATHANDTEXT.png
index 5ad66325b0..5cabed3d02 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pm_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_FIRA_MATHANDTEXT.png
index 88812cbffc..9028bcbd99 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_XITS_MATHANDTEXT.png
index 709da4c526..ce92378954 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pound_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_FIRA_MATHANDTEXT.png
index 158ec33267..d9fa7812f9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_XITS_MATHANDTEXT.png
index 7a1f85d6b5..9eeacfea36 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_pp_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_FIRA_MATHANDTEXT.png
index ccf6703ec0..96033f3ed2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_XITS_MATHANDTEXT.png
index a1a15306ab..c0e789d5db 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ppr_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_FIRA_MATHANDTEXT.png
index 49899fad00..09cdbf9d8f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_XITS_MATHANDTEXT.png
index 60aea04d1d..4c0bd9681b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prec_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_FIRA_MATHANDTEXT.png
index cdec49e818..5525511f66 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_XITS_MATHANDTEXT.png
index a6a6ad83bd..8f47970dc2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prime_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_FIRA_MATHANDTEXT.png
index 900e232615..dd25a60b4f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_XITS_MATHANDTEXT.png
index 9a2cb28b58..10e226c922 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_prod_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_FIRA_MATHANDTEXT.png
index d6a1870c2d..7087ca4562 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_XITS_MATHANDTEXT.png
index 6d97ada8a4..311cfd6f4e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_propto_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_FIRA_MATHANDTEXT.png
index 6feaeba714..4f97030d7f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_XITS_MATHANDTEXT.png
index daf9f4a179..1e8c276a54 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_psi_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_FIRA_MATHANDTEXT.png
index 0090a5c58a..a069ccde0c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_XITS_MATHANDTEXT.png
index 76c567b11b..bac2cf3d3f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rangle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_FIRA_MATHANDTEXT.png
index 4a8e1d747e..c01cbff787 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_XITS_MATHANDTEXT.png
index 3282e6190b..ab1500d6c6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rceil_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_FIRA_MATHANDTEXT.png
index adda645de9..4240e82526 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_XITS_MATHANDTEXT.png
index e53871530d..778134cf49 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_registered_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_FIRA_MATHANDTEXT.png
index 5859f3b764..73343501fd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_XITS_MATHANDTEXT.png
index d9d93634d6..4bc5db3255 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rfloor_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_FIRA_MATHANDTEXT.png
index ff802a77a9..fc687bb2f5 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_XITS_MATHANDTEXT.png
index 1bc528ad3e..5cd6bf0045 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rho_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_FIRA_MATHANDTEXT.png
index 9ece4a7c05..b82d5df3d8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_XITS_MATHANDTEXT.png
index f15bb52fe9..a294097237 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightangle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_FIRA_MATHANDTEXT.png
index 18dfacba94..3a71bbd7d9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_XITS_MATHANDTEXT.png
index d4442afc0b..4ee153fc93 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_FIRA_MATHANDTEXT.png
index 4ca90ab171..b3c0cf990a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_XITS_MATHANDTEXT.png
index 27fa7a9ba1..23f9afd73c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_righthand_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png
index 0963fb295f..7db74f3fca 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png
index 90fca982ef..4cac3b1c29 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png
index 7dbc55c2eb..36c32d402f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png
index f5fdce5838..0463d91edc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png
index 7a63bdf428..bb7c36d24c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png
index 0e6db8ed4f..989a3194fc 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rre_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rre_XITS_MATHANDTEXT.png
index 05d57cefb4..06c560e844 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rre_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rre_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png
index 281ef14ee5..940c2d65d4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png
index 422c443237..51c924f1e7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_FIRA_MATHANDTEXT.png
index a62bbba582..d1f921563a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_XITS_MATHANDTEXT.png
index 48f2010426..d18dd690cb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_searrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_FIRA_MATHANDTEXT.png
index fdebf1afe1..efbe21dc5b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_XITS_MATHANDTEXT.png
index b06036a8e7..8d4e87da8d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sec_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_setminus_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_setminus_XITS_MATHANDTEXT.png
index 3d857d4423..e5f25547b8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_setminus_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_setminus_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_FIRA_MATHANDTEXT.png
index 0a10d36ffc..595f107f71 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_XITS_MATHANDTEXT.png
index 6c98bf9685..78277f96aa 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sgn_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_FIRA_MATHANDTEXT.png
index 6119284988..c1df9086ba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_XITS_MATHANDTEXT.png
index 8d0960875c..ef9cac5ff0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sigma_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_FIRA_MATHANDTEXT.png
index 5e225774a3..7372141595 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_XITS_MATHANDTEXT.png
index cd78e3a9fd..1b810ce626 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sign_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_FIRA_MATHANDTEXT.png
index 44e36f6299..c72ececb8d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_XITS_MATHANDTEXT.png
index 4b7ef80b54..159034df9f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sim_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_FIRA_MATHANDTEXT.png
index e974d70f91..69652aacda 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_XITS_MATHANDTEXT.png
index 035f7121fb..7ae20ecdc4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_simeq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_FIRA_MATHANDTEXT.png
index 450ff204e9..1353efec79 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_XITS_MATHANDTEXT.png
index 0c0ce5a3b0..68e8eafcf6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sin_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_FIRA_MATHANDTEXT.png
index b8447d451a..b00bc90d05 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_XITS_MATHANDTEXT.png
index e496a9d407..48b8dead7b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sinh_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_FIRA_MATHANDTEXT.png
index 6d0f3e8a79..22db114e7a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_XITS_MATHANDTEXT.png
index 398fc36f5c..d0b2eb5d59 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sphericalangle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_FIRA_MATHANDTEXT.png
index 3e5124bae5..04870b964d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_XITS_MATHANDTEXT.png
index 17e174c2e1..62996c43d1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcap_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_FIRA_MATHANDTEXT.png
index 4a821ba6aa..2cb906c844 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_XITS_MATHANDTEXT.png
index d1b5e64462..80c56a9e0e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sqcup_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_FIRA_MATHANDTEXT.png
index 857a9a07ac..f2398ade48 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_XITS_MATHANDTEXT.png
index c00a0039c0..0709ab597c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_square_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_FIRA_MATHANDTEXT.png
index c361dcd587..72c1173415 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_XITS_MATHANDTEXT.png
index 32809ae057..1288a8de5a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ss_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_star_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_star_XITS_MATHANDTEXT.png
index 1092716450..7a40577923 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_star_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_star_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_FIRA_MATHANDTEXT.png
index fa53e1049a..dc72ac72dd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_XITS_MATHANDTEXT.png
index 42874c0acd..de9ae8e82a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subset_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_FIRA_MATHANDTEXT.png
index 147308380f..2b6ff8f4c2 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_XITS_MATHANDTEXT.png
index 9814d9d413..91f7c22b42 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subseteq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_FIRA_MATHANDTEXT.png
index 0f96c8b283..3d64e5dbc9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_XITS_MATHANDTEXT.png
index 9c19fb69c5..664bb773f3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_subsetnot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_FIRA_MATHANDTEXT.png
index e660a079dc..896d42f767 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_XITS_MATHANDTEXT.png
index 2fb7914e57..a33e66a5b6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_succ_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_FIRA_MATHANDTEXT.png
index 9216c8cbc0..63b4fc624a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_XITS_MATHANDTEXT.png
index 7fb239108c..af13f45223 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_sum_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_FIRA_MATHANDTEXT.png
index 84865fea3b..5748213325 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_XITS_MATHANDTEXT.png
index cab8f70295..fa39c7f49e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supset_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_FIRA_MATHANDTEXT.png
index cec8c871c5..d52d817faf 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_XITS_MATHANDTEXT.png
index e80785fef3..4bd078cc92 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supseteq_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_FIRA_MATHANDTEXT.png
index a2199b755e..92dcfe5284 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_XITS_MATHANDTEXT.png
index 1b7601711c..6ac124c9d6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_supsetnot_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_FIRA_MATHANDTEXT.png
index b098cbe0f7..1cff6370d9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_XITS_MATHANDTEXT.png
index cb185fd87c..cedd78b1b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_swarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_FIRA_MATHANDTEXT.png
index 7db9ec19e1..711413c033 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_XITS_MATHANDTEXT.png
index a7a103fa47..712033e613 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tan_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_FIRA_MATHANDTEXT.png
index e6cbf55db4..2b576c4883 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_XITS_MATHANDTEXT.png
index c11e931e90..e5e4834997 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tanh_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_FIRA_MATHANDTEXT.png
index 8a868a66bd..0b119a9119 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_XITS_MATHANDTEXT.png
index 7bdc7ed6cc..475ca3eaf9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tau_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_FIRA_MATHANDTEXT.png
index 4ed67a6b50..9b3d7cc92b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_XITS_MATHANDTEXT.png
index 565bd307bb..03b82af70d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tcohm_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_FIRA_MATHANDTEXT.png
index 4581b1b349..cefee26007 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_XITS_MATHANDTEXT.png
index 7875842cdc..1d5971471d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbar_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_FIRA_MATHANDTEXT.png
index bab8b71637..f47232d11b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_XITS_MATHANDTEXT.png
index 6a3d83382e..495e7733ba 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textbullet_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_FIRA_MATHANDTEXT.png
index eb00325ac8..fdf880a025 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_XITS_MATHANDTEXT.png
index fd64f5467d..e8d1616786 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textcopyright_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_FIRA_MATHANDTEXT.png
index bb0785a4c8..308f8b9afd 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_XITS_MATHANDTEXT.png
index 7408ca8854..cbf02d1a5c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdagger_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_FIRA_MATHANDTEXT.png
index 69f7edf4de..283a63f0e6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_XITS_MATHANDTEXT.png
index fd86ece497..8ec5bc503c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdaggerdbl_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphen_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphen_FIRA_MATHANDTEXT.png
index a0b70d41cd..2b8e6702b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphen_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphen_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphenchar_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphenchar_FIRA_MATHANDTEXT.png
index a0b70d41cd..2b8e6702b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphenchar_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdblhyphenchar_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_FIRA_MATHANDTEXT.png
index b944fa7da3..7e3e7e77a4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_XITS_MATHANDTEXT.png
index 5de1534f35..7abdec313a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textdegree_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textemdash_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textemdash_FIRA_MATHANDTEXT.png
index a0b70d41cd..2b8e6702b3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textemdash_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textemdash_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_FIRA_MATHANDTEXT.png
index 477485478b..37d660c94d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_XITS_MATHANDTEXT.png
index 6549ea6617..9c0e36025a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textendash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_FIRA_MATHANDTEXT.png
index a46a6e5d0b..5cb9417d26 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_XITS_MATHANDTEXT.png
index 84af71804d..3842e5af9b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textexclamdown_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_FIRA_MATHANDTEXT.png
index 601c331ffd..fbe6d27792 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_XITS_MATHANDTEXT.png
index 864a04562f..79ec6b3ec7 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textgreater_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_FIRA_MATHANDTEXT.png
index 7788f00e51..945ca465ab 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_XITS_MATHANDTEXT.png
index c01c429c7b..bc25ed35f4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_texthyphen_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_FIRA_MATHANDTEXT.png
index adf57779f7..0421977d5d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_XITS_MATHANDTEXT.png
index 8f34a19ead..273a937758 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textless_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_FIRA_MATHANDTEXT.png
index 34f1f1fab4..6b6291b699 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_XITS_MATHANDTEXT.png
index 6553873e99..0c315460e9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textquestiondown_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_FIRA_MATHANDTEXT.png
index adda645de9..4240e82526 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_XITS_MATHANDTEXT.png
index e53871530d..778134cf49 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_textregistered_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_FIRA_MATHANDTEXT.png
index 08f8af6243..eaad765b5a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_XITS_MATHANDTEXT.png
index 31d8a168a8..f305ba4986 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_therefore_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_FIRA_MATHANDTEXT.png
index 110cada3ad..58a279dc10 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_XITS_MATHANDTEXT.png
index 2ff76a2e57..b28e2ca301 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_theta_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_FIRA_MATHANDTEXT.png
index f4bbc4350e..e067fe8a98 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_XITS_MATHANDTEXT.png
index cfc4c34dee..b1e556a124 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_times_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_FIRA_MATHANDTEXT.png
index c87316698d..cf5c49b035 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_XITS_MATHANDTEXT.png
index 3387969bb2..f0dfb8e241 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_tlcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_FIRA_MATHANDTEXT.png
index 18dfacba94..3a71bbd7d9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_XITS_MATHANDTEXT.png
index d4442afc0b..4ee153fc93 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_to_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_FIRA_MATHANDTEXT.png
index 051054ca9b..34c2471eb0 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_XITS_MATHANDTEXT.png
index 7ab8970937..6804338f02 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_top_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_FIRA_MATHANDTEXT.png
index ffeae51d65..9baff465d8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_XITS_MATHANDTEXT.png
index ca0b85a232..9658b64819 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trademark_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_FIRA_MATHANDTEXT.png
index e304789101..709d9e1278 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_XITS_MATHANDTEXT.png
index da34308183..31962e9648 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trapezium_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_FIRA_MATHANDTEXT.png
index 22e4fe6587..653261334a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_XITS_MATHANDTEXT.png
index b7a0d129bb..471c985908 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_FIRA_MATHANDTEXT.png
index f212f431a1..03366442e9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_XITS_MATHANDTEXT.png
index 02711e611c..4dfc2ef409 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_triangle_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_FIRA_MATHANDTEXT.png
index 4ce8b274ac..095abf7d9d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_XITS_MATHANDTEXT.png
index bc8bcab7f5..83260fe57f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_trprime_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_FIRA_MATHANDTEXT.png
index c87316698d..cf5c49b035 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_XITS_MATHANDTEXT.png
index 3387969bb2..f0dfb8e241 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_ulcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_FIRA_MATHANDTEXT.png
index 760e636ebe..afa53a4317 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_XITS_MATHANDTEXT.png
index 602d975f4b..28a6ebb6c9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uparrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_FIRA_MATHANDTEXT.png
index a8b87e5ad8..0b4f89da4d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_XITS_MATHANDTEXT.png
index 10bd297b3a..ec8438d9be 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png
index 35b25ee628..dc9efab43f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png
index db88091e71..bdd98e28a8 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png
index f84dde7ff9..db75387df4 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png
index 52772c8006..dde435b9e6 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_FIRA_MATHANDTEXT.png
index fdb7d77865..b35344737c 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_XITS_MATHANDTEXT.png
index b5e6c017e0..92b4d59b03 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_upsilon_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_FIRA_MATHANDTEXT.png
index 22e4fe6587..653261334a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_XITS_MATHANDTEXT.png
index b7a0d129bb..471c985908 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_urcorner_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png
index 9337db1e79..9909dc8de3 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png
index ef7816a7ee..759af9da2b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png
index 1be1faa955..e9e19e8a07 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png
index 805c76b8f0..c43bd43deb 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varcarriagereturn_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varcarriagereturn_XITS_MATHANDTEXT.png
index 5c4475394e..bdba1c84b1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varcarriagereturn_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varcarriagereturn_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_FIRA_MATHANDTEXT.png
index 772274fe12..ea4834f60b 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_XITS_MATHANDTEXT.png
index e00c5877c6..670c103f0f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varhexagonlrbonds_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_FIRA_MATHANDTEXT.png
index 3dccfa6f73..faf496e298 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_XITS_MATHANDTEXT.png
index 68bd96a7a7..332577c4f9 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_varnothing_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vartriangleleft_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vartriangleleft_XITS_MATHANDTEXT.png
index 5ba012eb52..94ce1a866a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vartriangleleft_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vartriangleleft_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdash_XITS_MATHANDTEXT.png
index 71012d9d10..800626fe9a 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vddash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vddash_XITS_MATHANDTEXT.png
index e48647c88e..d85b90f28f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vddash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vddash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdots_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdots_XITS_MATHANDTEXT.png
index 77b4890293..a2ea01563f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdots_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vdots_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_FIRA_MATHANDTEXT.png
index b319e23302..7de8b459f1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_XITS_MATHANDTEXT.png
index bf3534352e..2e612e7f6e 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vee_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vvdash_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vvdash_XITS_MATHANDTEXT.png
index 6972751715..45f56eaca1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vvdash_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_vvdash_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_FIRA_MATHANDTEXT.png
index 68ecffe8c0..a735597653 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_XITS_MATHANDTEXT.png
index 33ee7cc51a..6606e52030 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wedge_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wp_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wp_XITS_MATHANDTEXT.png
index ce85b52d64..3daeb502ab 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wp_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_wp_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_FIRA_MATHANDTEXT.png
index 8041f436a0..d61e5d9354 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_XITS_MATHANDTEXT.png
index 4b676ca317..037eeb8fda 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_xi_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_FIRA_MATHANDTEXT.png
index a1e2eb392d..14147c2949 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_XITS_MATHANDTEXT.png
index 5da232646c..748d0e775f 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_yen_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_FIRA_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_FIRA_MATHANDTEXT.png
index 9a1c965e45..3b132399e1 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_FIRA_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_FIRA_MATHANDTEXT.png differ
diff --git a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_XITS_MATHANDTEXT.png b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_XITS_MATHANDTEXT.png
index b8b1844694..046c2f4e8d 100644
Binary files a/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_XITS_MATHANDTEXT.png and b/doc/images/jkqtmathtext/symbols/jkqtmathtext_greek_zeta_XITS_MATHANDTEXT.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_multi_column.png b/doc/images/keylayouts/JKQTPKeyLayout_multi_column.png
new file mode 100644
index 0000000000..74d9868ad8
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_multi_column.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_multi_row.png b/doc/images/keylayouts/JKQTPKeyLayout_multi_row.png
new file mode 100644
index 0000000000..e348bdd215
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_multi_row.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_one_column.png b/doc/images/keylayouts/JKQTPKeyLayout_one_column.png
new file mode 100644
index 0000000000..4fef67734e
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_one_column.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_one_row.png b/doc/images/keylayouts/JKQTPKeyLayout_one_row.png
new file mode 100644
index 0000000000..5d645bbf94
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_one_row.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_column.png b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_column.png
new file mode 100644
index 0000000000..b33e303322
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_column.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_row.png b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_row.png
new file mode 100644
index 0000000000..c37153b0b8
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_row.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_column.png b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_column.png
new file mode 100644
index 0000000000..270a6505f1
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_column.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_row.png b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_row.png
new file mode 100644
index 0000000000..08fad7fb12
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_row.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_column.png b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_column.png
new file mode 100644
index 0000000000..4b83132b3c
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_column.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_row.png b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_row.png
new file mode 100644
index 0000000000..34c67530a8
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_row.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_column.png b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_column.png
new file mode 100644
index 0000000000..21b7b038ec
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_column.png differ
diff --git a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_row.png b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_row.png
new file mode 100644
index 0000000000..58095ba9de
Binary files /dev/null and b/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_row.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideBottom.png b/doc/images/keypositions/JKQTPKeyInsideBottom.png
new file mode 100644
index 0000000000..d6b3319775
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideBottom.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png b/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png
new file mode 100644
index 0000000000..91d55d1e84
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideBottomRight.png b/doc/images/keypositions/JKQTPKeyInsideBottomRight.png
new file mode 100644
index 0000000000..b02c8cc095
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideBottomRight.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideLeft.png b/doc/images/keypositions/JKQTPKeyInsideLeft.png
new file mode 100644
index 0000000000..2415de2e33
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideLeft.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideRight.png b/doc/images/keypositions/JKQTPKeyInsideRight.png
new file mode 100644
index 0000000000..6f28189cea
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideRight.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideTop.png b/doc/images/keypositions/JKQTPKeyInsideTop.png
new file mode 100644
index 0000000000..689e65d217
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideTop.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideTopLeft.png b/doc/images/keypositions/JKQTPKeyInsideTopLeft.png
new file mode 100644
index 0000000000..25a87facfe
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideTopLeft.png differ
diff --git a/doc/images/keypositions/JKQTPKeyInsideTopRight.png b/doc/images/keypositions/JKQTPKeyInsideTopRight.png
new file mode 100644
index 0000000000..1a5115defb
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyInsideTopRight.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png b/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png
new file mode 100644
index 0000000000..86824c5a30
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png b/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png
new file mode 100644
index 0000000000..4b9bf394e0
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png b/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png
new file mode 100644
index 0000000000..ac0a4d95b8
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png b/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png
new file mode 100644
index 0000000000..47a3a2a2b8
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png b/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png
new file mode 100644
index 0000000000..2572373d68
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png b/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png
new file mode 100644
index 0000000000..ade99c2c00
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png b/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png
new file mode 100644
index 0000000000..4bc692dd2d
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png b/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png
new file mode 100644
index 0000000000..69761fe8a0
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideRightTop.png b/doc/images/keypositions/JKQTPKeyOutsideRightTop.png
new file mode 100644
index 0000000000..5339919def
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideRightTop.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png b/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png
new file mode 100644
index 0000000000..cc01b70c27
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png b/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png
new file mode 100644
index 0000000000..2ccdf5de43
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png differ
diff --git a/doc/images/keypositions/JKQTPKeyOutsideTopRight.png b/doc/images/keypositions/JKQTPKeyOutsideTopRight.png
new file mode 100644
index 0000000000..13cda96be4
Binary files /dev/null and b/doc/images/keypositions/JKQTPKeyOutsideTopRight.png differ
diff --git a/doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png
index fc93db23d7..22abdd32ea 100644
Binary files a/doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png and b/doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png differ
diff --git a/doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png
index 06398542df..73d0c82e1f 100644
Binary files a/doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png and b/doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png differ
diff --git a/doc/images/labelstyles/JKQTPLabelMax_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelMax_zeroaxis.png
index 5d4434df89..7159f60fd8 100644
Binary files a/doc/images/labelstyles/JKQTPLabelMax_zeroaxis.png and b/doc/images/labelstyles/JKQTPLabelMax_zeroaxis.png differ
diff --git a/doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png
index a690e68d19..90b1c8c17d 100644
Binary files a/doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png and b/doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png differ
diff --git a/doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png
index 696ce508cb..43fcac6d60 100644
Binary files a/doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png and b/doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png differ
diff --git a/doc/images/plot_key.cdr b/doc/images/plot_key.cdr
index 100dcc0516..ec978ec40f 100644
Binary files a/doc/images/plot_key.cdr and b/doc/images/plot_key.cdr differ
diff --git a/doc/images/plot_key.png b/doc/images/plot_key.png
index 9e6b1bda78..58fa1723fa 100644
Binary files a/doc/images/plot_key.png and b/doc/images/plot_key.png differ
diff --git a/doc/images/plot_widget_orientation.cdr b/doc/images/plot_widget_orientation.cdr
index 5e0bad27be..e6a8d11bbc 100644
Binary files a/doc/images/plot_widget_orientation.cdr and b/doc/images/plot_widget_orientation.cdr differ
diff --git a/doc/images/plot_widget_orientation.png b/doc/images/plot_widget_orientation.png
index f177eb202b..827ae95d9f 100644
Binary files a/doc/images/plot_widget_orientation.png and b/doc/images/plot_widget_orientation.png differ
diff --git a/doc/images/styles/blackandwhite.ini.png b/doc/images/styles/blackandwhite.ini.png
index 9b2ac9d0d7..419b6c241d 100644
Binary files a/doc/images/styles/blackandwhite.ini.png and b/doc/images/styles/blackandwhite.ini.png differ
diff --git a/doc/images/styles/blueprint.ini.png b/doc/images/styles/blueprint.ini.png
index e75dfe0c38..082e7bc9a0 100644
Binary files a/doc/images/styles/blueprint.ini.png and b/doc/images/styles/blueprint.ini.png differ
diff --git a/doc/images/styles/cyberpunk.ini.png b/doc/images/styles/cyberpunk.ini.png
index a296eda924..ae0685c26d 100644
Binary files a/doc/images/styles/cyberpunk.ini.png and b/doc/images/styles/cyberpunk.ini.png differ
diff --git a/doc/images/styles/dark.ini.png b/doc/images/styles/dark.ini.png
index 0d257f3bf5..4e0c65ef85 100644
Binary files a/doc/images/styles/dark.ini.png and b/doc/images/styles/dark.ini.png differ
diff --git a/doc/images/styles/default.ini.png b/doc/images/styles/default.ini.png
index 98c58391ad..87167bb2ef 100644
Binary files a/doc/images/styles/default.ini.png and b/doc/images/styles/default.ini.png differ
diff --git a/doc/images/styles/legacy_default_style.ini.png b/doc/images/styles/legacy_default_style.ini.png
index 65239b3b9d..e20f6edb6e 100644
Binary files a/doc/images/styles/legacy_default_style.ini.png and b/doc/images/styles/legacy_default_style.ini.png differ
diff --git a/doc/images/styles/seaborn.ini.png b/doc/images/styles/seaborn.ini.png
index beebdbc580..ba58efd8ec 100644
Binary files a/doc/images/styles/seaborn.ini.png and b/doc/images/styles/seaborn.ini.png differ
diff --git a/doc/images/styles/simple_arrowsaxes.ini.png b/doc/images/styles/simple_arrowsaxes.ini.png
index e15699de61..56a7fd29ca 100644
Binary files a/doc/images/styles/simple_arrowsaxes.ini.png and b/doc/images/styles/simple_arrowsaxes.ini.png differ
diff --git a/doc/images/styles/simple_axesoffset.ini.png b/doc/images/styles/simple_axesoffset.ini.png
index 89b818a007..c4d13ea675 100644
Binary files a/doc/images/styles/simple_axesoffset.ini.png and b/doc/images/styles/simple_axesoffset.ini.png differ
diff --git a/doc/images/styles/simple_axesoffset_plotbox.ini.png b/doc/images/styles/simple_axesoffset_plotbox.ini.png
index 3318a33853..a1532f4d72 100644
Binary files a/doc/images/styles/simple_axesoffset_plotbox.ini.png and b/doc/images/styles/simple_axesoffset_plotbox.ini.png differ
diff --git a/doc/images/styles/simple_gridandticks.ini.png b/doc/images/styles/simple_gridandticks.ini.png
index c4c562b0d1..26a13b9b74 100644
Binary files a/doc/images/styles/simple_gridandticks.ini.png and b/doc/images/styles/simple_gridandticks.ini.png differ
diff --git a/examples/barchart/barchart.cpp b/examples/barchart/barchart.cpp
index c85a4c864b..364e37ea33 100644
--- a/examples/barchart/barchart.cpp
+++ b/examples/barchart/barchart.cpp
@@ -91,7 +91,7 @@ std::vector doExample(JKQTPlotter& plot, const QString& title)
// So many properties of the plot are only available in this internal
// object, which you can access by plot.getPlotter().
plot.getPlotter()->setKeyPosition(JKQTPKeyOutsideTopRight);
- plot.getPlotter()->setKeyLayout(JKQTPKeyLayoutOneRow);
+ plot.getMainKey()->setLayout(JKQTPKeyLayoutOneRow);
// 9 autoscale the plot so the graph is contained
plot.zoomToFit();
diff --git a/examples/datastore_groupedstat/datastore_groupedstat.cpp b/examples/datastore_groupedstat/datastore_groupedstat.cpp
index 21d0c6a524..1621b1e82a 100644
--- a/examples/datastore_groupedstat/datastore_groupedstat.cpp
+++ b/examples/datastore_groupedstat/datastore_groupedstat.cpp
@@ -248,18 +248,18 @@ int main(int argc, char* argv[])
plotboxplot->zoomToFit();
plotboxplot->setGrid(false);
plotboxplot->setShowZeroAxes(false);
- plotboxplot->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plotboxplot->getMainKey()->setBackgroundBrush(QBrush(QColorWithAlphaF("white", 0.25), Qt::SolidPattern));
plotbarchart->setAbsoluteY(0,5);
plotboxplot->setAbsoluteY(0,5);
plotbarchart->zoomToFit();
plotbarchart->setGrid(false);
plotbarchart->setShowZeroAxes(false);
- plotbarchart->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plotbarchart->getMainKey()->setBackgroundBrush(QBrush(QColorWithAlphaF("white", 0.25), Qt::SolidPattern));
plotbarchart->moveGraphTop(gScatterForBar);
plotscattererrors->zoomToFit();
plotscattererrors->setGrid(false);
plotscattererrors->setShowZeroAxes(false);
- plotscattererrors->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plotscattererrors->getMainKey()->setBackgroundBrush(QBrush(QColorWithAlphaF("white", 0.25), Qt::SolidPattern));
// show plotter and make it a decent size
diff --git a/examples/datastore_regression/datastore_regression.cpp b/examples/datastore_regression/datastore_regression.cpp
index 925bd74625..c432f3585b 100644
--- a/examples/datastore_regression/datastore_regression.cpp
+++ b/examples/datastore_regression/datastore_regression.cpp
@@ -336,29 +336,29 @@ int main(int argc, char* argv[])
plot1->zoomToFit();
plot1->getXAxis()->setShowZeroAxis(false);
plot1->getYAxis()->setShowZeroAxis(false);
- plot1->getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyInsideTopLeft);
+ plot1->getPlotter()->setKeyPosition(JKQTPKeyInsideTopLeft);
plot2->zoomToFit();
plot2->getXAxis()->setShowZeroAxis(false);
plot2->getYAxis()->setShowZeroAxis(false);
- plot2->getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyInsideTopLeft);
+ plot2->getPlotter()->setKeyPosition(JKQTPKeyInsideTopLeft);
plot3->zoomToFit();
plot3->getXAxis()->setShowZeroAxis(false);
plot3->getYAxis()->setShowZeroAxis(false);
- plot3->getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyInsideTopLeft);
+ plot3->getPlotter()->setKeyPosition(JKQTPKeyInsideTopLeft);
plot4->zoomToFit();
plot4->getXAxis()->setShowZeroAxis(false);
plot4->getYAxis()->setShowZeroAxis(false);
- plot4->getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyInsideTopLeft);
+ plot4->getPlotter()->setKeyPosition(JKQTPKeyInsideTopLeft);
plot4->setAbsoluteX(0.05, plot4->getXMax());
plot4->zoomToFit();
plot5->getXAxis()->setShowZeroAxis(false);
plot5->getYAxis()->setShowZeroAxis(false);
- plot5->getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyInsideTopLeft);
+ plot5->getPlotter()->setKeyPosition(JKQTPKeyInsideTopLeft);
plot5->setAbsoluteX(0.05, plot5->getXMax());
plot5->zoomToFit();
plot6->getXAxis()->setShowZeroAxis(false);
plot6->getYAxis()->setShowZeroAxis(false);
- plot6->getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyInsideBottomRight);
+ plot6->getPlotter()->setKeyPosition(JKQTPKeyInsideBottomRight);
plot6->zoomToFit();
// show plotter and make it a decent size
diff --git a/examples/datastore_statistics/datastore_statistics.cpp b/examples/datastore_statistics/datastore_statistics.cpp
index 3da2a53c9a..e68eafbbca 100644
--- a/examples/datastore_statistics/datastore_statistics.cpp
+++ b/examples/datastore_statistics/datastore_statistics.cpp
@@ -272,21 +272,21 @@ int main(int argc, char* argv[])
plot1->zoomToFit();
plot1->setGrid(false);
plot1->getXAxis()->setShowZeroAxis(false);
- plot1->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plot1->getMainKey()->setBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
plot1->setY(-0.25, 0.45);
plot1cum->zoomToFit();
plot1cum->setGrid(false);
plot1cum->getXAxis()->setShowZeroAxis(false);
- plot1cum->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plot1cum->getMainKey()->setBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
plot1kde->zoomToFit();
plot1kde->setGrid(false);
plot1kde->getXAxis()->setShowZeroAxis(false);
- plot1kde->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plot1kde->getMainKey()->setBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
plot1kde->setY(-0.155, 0.45);
plot1box->zoomToFit();
plot1box->setGrid(false);
plot1box->getXAxis()->setShowZeroAxis(false);
- plot1box->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plot1box->getMainKey()->setBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
plot1box->setY(-0.4, 0.0);
// show plotter and make it a decent size
diff --git a/examples/datastore_statistics_2d/datastore_statistics_2d.cpp b/examples/datastore_statistics_2d/datastore_statistics_2d.cpp
index 05b392d7cb..234276a74a 100644
--- a/examples/datastore_statistics_2d/datastore_statistics_2d.cpp
+++ b/examples/datastore_statistics_2d/datastore_statistics_2d.cpp
@@ -257,7 +257,7 @@ int main(int argc, char* argv[])
plothist->setGrid(false);
plothist->getXAxis()->setShowZeroAxis(false);
plothist->getYAxis()->setShowZeroAxis(false);
- plothist->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plothist->getMainKey()->setBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
plothist->getPlotter()->moveGraphTop(gDataHist);
plothist->getPlotter()->moveGraphTop(gEll1Hist);
plothist->getPlotter()->moveGraphTop(gEll2Hist);
@@ -267,7 +267,7 @@ int main(int argc, char* argv[])
plotkde->setGrid(false);
plotkde->getXAxis()->setShowZeroAxis(false);
plotkde->getYAxis()->setShowZeroAxis(false);
- plotkde->getPlotter()->setKeyBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
+ plotkde->getMainKey()->setBackgroundColor(QColorWithAlphaF("white", 0.25), Qt::SolidPattern);
plotkde->getPlotter()->moveGraphTop(gDataKDE);
plotkde->getPlotter()->moveGraphTop(gEll1KDE);
plotkde->getPlotter()->moveGraphTop(gEll2KDE);
diff --git a/examples/jkqtplot_test/TestWidgetGeometry.cpp b/examples/jkqtplot_test/TestWidgetGeometry.cpp
index 4410d455ee..6ef88ad7f0 100644
--- a/examples/jkqtplot_test/TestWidgetGeometry.cpp
+++ b/examples/jkqtplot_test/TestWidgetGeometry.cpp
@@ -82,7 +82,6 @@ TestWidgetGeometry::TestWidgetGeometry(QWidget *parent) :
plotGeo->setPlotUpdateEnabled(true);
plotGeo->getPlotter()->zoomToFit();
- plotGeo->getPlotter()->setKeyAutosize(true);
QCheckBox* chkAspect=new QCheckBox("keep aspect ratio", this);
diff --git a/examples/jkqtplot_test/TestWidgetGraphs.cpp b/examples/jkqtplot_test/TestWidgetGraphs.cpp
index 039011aa10..1af7739d46 100644
--- a/examples/jkqtplot_test/TestWidgetGraphs.cpp
+++ b/examples/jkqtplot_test/TestWidgetGraphs.cpp
@@ -249,7 +249,6 @@ TestWidgetGraphs::TestWidgetGraphs(QWidget *parent) :
plot->setPlotUpdateEnabled(true);
plot->getPlotter()->zoomToFit(true, false);//, true);
- plot->getPlotter()->setKeyAutosize(true);
QCheckBox* chklogX=new QCheckBox("logarithmic X-axis", this);
QCheckBox* chklogY=new QCheckBox("logarithmic Y-axis", this);
@@ -348,9 +347,9 @@ void TestWidgetGraphs::setSortOrder2(int index)
void TestWidgetGraphs::setKeyLayout2(JKQTPKeyLayout layout)
{
- plot->getPlotter()->setKeyLayout(layout);
- plotBot->getPlotter()->setKeyLayout(layout);
- plotBot2->getPlotter()->setKeyLayout(layout);
+ plot->getMainKey()->setLayout(layout);
+ plotBot->getMainKey()->setLayout(layout);
+ plotBot2->getMainKey()->setLayout(layout);
plot->redrawPlot();
plotBot->redrawPlot();
plotBot2->redrawPlot();
diff --git a/examples/jkqtplot_test/TestWidgetLogGraphs.cpp b/examples/jkqtplot_test/TestWidgetLogGraphs.cpp
index 61f7f65850..0265b4d6a5 100644
--- a/examples/jkqtplot_test/TestWidgetLogGraphs.cpp
+++ b/examples/jkqtplot_test/TestWidgetLogGraphs.cpp
@@ -47,7 +47,6 @@ TestWidgetLogGraphs::TestWidgetLogGraphs(QWidget *parent) :
plotLOG->setPlotUpdateEnabled(true);
plotLOG->getPlotter()->zoomToFit(true, true);//, true);
- plotLOG->getPlotter()->setKeyAutosize(true);
QCheckBox* chklogX=new QCheckBox("logarithmic X-axis", this);
QCheckBox* chklogY=new QCheckBox("logarithmic Y-axis", this);
diff --git a/examples/paramscatterplot/paramscatterplot.cpp b/examples/paramscatterplot/paramscatterplot.cpp
index dfddca84a2..94d0f6c7ed 100644
--- a/examples/paramscatterplot/paramscatterplot.cpp
+++ b/examples/paramscatterplot/paramscatterplot.cpp
@@ -170,7 +170,7 @@ int main(int argc, char* argv[])
// 4. autoscale the plot so the graph is contained and format the coordinate system and key
plot.getPlotter()->setKeyPosition(JKQTPKeyOutsideBottomLeft);
- plot.getPlotter()->setKeyLayout(JKQTPKeyLayoutOneRow);
+ plot.getMainKey()->setLayout(JKQTPKeyLayoutOneRow);
plot.getXAxis()->setAxisLabel("x-axis");
plot.getYAxis()->setAxisLabel("y-axis");
plot.getXAxis()->setDrawGrid(false);
diff --git a/examples/stackedbars/stackedbars.cpp b/examples/stackedbars/stackedbars.cpp
index a5313e5b16..4ff6642543 100644
--- a/examples/stackedbars/stackedbars.cpp
+++ b/examples/stackedbars/stackedbars.cpp
@@ -90,7 +90,7 @@ void addGraph(JKQTPlotter& plot, bool swapXY) {
// So many properties of the plot are only available in this internal
// object, which you can access by plot.getPlotter().
plot.getPlotter()->setKeyPosition(JKQTPKeyOutsideTopRight);
- plot.getPlotter()->setKeyLayout(JKQTPKeyLayoutOneRow);
+ plot.getMainKey()->setLayout(JKQTPKeyLayoutOneRow);
// 8 autoscale the plot so the graph is contained
plot.zoomToFit();
diff --git a/examples/styling/build_test_graphs.h b/examples/styling/build_test_graphs.h
index 5773437b29..bc9cacca3d 100644
--- a/examples/styling/build_test_graphs.h
+++ b/examples/styling/build_test_graphs.h
@@ -137,7 +137,7 @@ inline void buildPlots(QVector& plots) {
graphI->setY(-2.0);
graphI->setWidth(5);
graphI->setHeight(1);
- graphI->setTitle(QObject::tr("2{\\times}Gauss"));
+ graphI->setTitle(QObject::tr("$2\\times$ Gauss"));
plots.last()->addGraph(graphI);
JKQTPXYLineErrorGraph* graph1=new JKQTPXYLineErrorGraph(plots[0]);
diff --git a/examples/styling/jkqtpstyleplaintextedit.cpp b/examples/styling/jkqtpstyleplaintextedit.cpp
index 87610b479b..85002ac8a7 100644
--- a/examples/styling/jkqtpstyleplaintextedit.cpp
+++ b/examples/styling/jkqtpstyleplaintextedit.cpp
@@ -522,9 +522,7 @@ void JKQTPStylePlainTextEdit::contextMenuEvent(QContextMenuEvent *event)
} else if (currentLinePartsLower[0].endsWith("key\\position")) {
submenu->setEnabled(true);
QAction* act;
- JKQTPKeyPosition st;
- for (int i=0; i<=static_cast(JKQTPKeyPositionMax); i++) {
- st=static_cast(i);
+ for (const auto st: JKQTPGetTypicalKeyPositions()) {
act=new QAction(JKQTPKeyPosition2String(st));
connect(act, &QAction::triggered, std::bind(std::mem_fn(&JKQTPStylePlainTextEdit::changeCurrentLineValueTo), this, act->text()));
submenu->addAction(act);
diff --git a/examples/symbols_and_styles/symbols_and_styles.cpp b/examples/symbols_and_styles/symbols_and_styles.cpp
index b2fa2e602b..aa9a0d8d0a 100644
--- a/examples/symbols_and_styles/symbols_and_styles.cpp
+++ b/examples/symbols_and_styles/symbols_and_styles.cpp
@@ -92,8 +92,8 @@ int main(int argc, char* argv[])
// 4. autoscale the plot so the graph is contained
- plot.getPlotter()->setKeyPosition(JKQTPKeyPosition::JKQTPKeyOutsideBottomLeft);
- plot.getPlotter()->setKeyLayout(JKQTPKeyLayout::JKQTPKeyLayoutMultiColumn);
+ plot.getPlotter()->setKeyPosition(JKQTPKeyOutsideBottomLeft);
+ plot.getMainKey()->setLayout(JKQTPKeyLayout::JKQTPKeyLayoutMultiColumn);
plot.getXAxis()->setShowZeroAxis(false);
plot.getYAxis()->setShowZeroAxis(false);
plot.setGrid(false);
diff --git a/lib/jkqtcommon/jkqtpenhancedpainter.cpp b/lib/jkqtcommon/jkqtpenhancedpainter.cpp
index 843380239f..1f2d752cc3 100644
--- a/lib/jkqtcommon/jkqtpenhancedpainter.cpp
+++ b/lib/jkqtcommon/jkqtpenhancedpainter.cpp
@@ -105,6 +105,15 @@ void JKQTPEnhancedPainter::drawComplexRoundedRect(const QRectF &rin, double rTop
drawPath(path);
}
+void JKQTPEnhancedPainter::drawRoundedRectOrRect(const QRectF &r, double radius, Qt::SizeMode mode)
+{
+ if (radius<=0) {
+ drawRect(r);
+ } else {
+ drawRoundedRect(r, radius, radius);
+ }
+}
+
JKQTPEnhancedPainter::PainterFlags JKQTPEnhancedPainter::painterFlags() const {
return m_flags;
}
diff --git a/lib/jkqtcommon/jkqtpenhancedpainter.h b/lib/jkqtcommon/jkqtpenhancedpainter.h
index 0df75878ac..32d15ee589 100644
--- a/lib/jkqtcommon/jkqtpenhancedpainter.h
+++ b/lib/jkqtcommon/jkqtpenhancedpainter.h
@@ -71,6 +71,8 @@ class JKQTCOMMON_LIB_EXPORT JKQTPEnhancedPainter : public QPainter {
/** \brief draw a rounded rect, where each corner has a separate radius */
void drawComplexRoundedRect(const QRectF& r, double rTopLeft, double rTopRight, double rBottomLeft, double rBottomRight, Qt::SizeMode mode = Qt::AbsoluteSize);
+ /** \brief draw a rounded rect (\a radius >0 ), or a simple rect (\a radius <=0 ) */
+ void drawRoundedRectOrRect(const QRectF& r, double radius, Qt::SizeMode mode = Qt::AbsoluteSize);
protected:
void initQEnhacedPainter();
private:
diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt
index 718c12952d..af2c319a64 100644
--- a/lib/jkqtplotter/CMakeLists.txt
+++ b/lib/jkqtplotter/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SOURCES_BASE
${CMAKE_CURRENT_LIST_DIR}/jkqtplotter.cpp
${CMAKE_CURRENT_LIST_DIR}/jkqtplotterstyle.cpp
${CMAKE_CURRENT_LIST_DIR}/jkqtpkeystyle.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/jkqtpkey.cpp
${CMAKE_CURRENT_LIST_DIR}/jkqtpbaseplotterstyle.cpp
${CMAKE_CURRENT_LIST_DIR}/jkqtpcoordinateaxes.cpp
${CMAKE_CURRENT_LIST_DIR}/jkqtpcoordinateaxesstyle.cpp
@@ -98,6 +99,8 @@ set(HEADERS_BASE
$
$
$
+ $
+ $
$
$
$
diff --git a/lib/jkqtplotter/graphs/jkqtpbarchartbase.cpp b/lib/jkqtplotter/graphs/jkqtpbarchartbase.cpp
index a1aaf7a877..373e537551 100644
--- a/lib/jkqtplotter/graphs/jkqtpbarchartbase.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpbarchartbase.cpp
@@ -59,10 +59,16 @@ JKQTPBarGraphBase::JKQTPBarGraphBase(JKQTPlotter* parent):
{
}
-void JKQTPBarGraphBase::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPBarGraphBase::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& r) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getLinePenForRects(painter, parent);
QBrush b=getFillBrush(painter, parent);
+ QRectF rect=r;
+ rect.setWidth(rect.width()-p.widthF());
+ rect.setHeight(rect.height()-p.widthF());
+ rect.setX(rect.x()+p.widthF()/2.0);
+ rect.setY(rect.y()+p.widthF()/2.0);
+
//int y=rect.top()+rect.height()/2.0;
painter.setPen(p);
painter.setBrush(b);
diff --git a/lib/jkqtplotter/graphs/jkqtpbarchartbase.h b/lib/jkqtplotter/graphs/jkqtpbarchartbase.h
index 67b7a31767..bf8f6f52fd 100644
--- a/lib/jkqtplotter/graphs/jkqtpbarchartbase.h
+++ b/lib/jkqtplotter/graphs/jkqtpbarchartbase.h
@@ -124,7 +124,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarGraphBase: public JKQTPXYBaselineGraph, pub
JKQTPBarGraphBase(JKQTPlotter* parent);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
diff --git a/lib/jkqtplotter/graphs/jkqtpboxplot.cpp b/lib/jkqtplotter/graphs/jkqtpboxplot.cpp
index d81369fdd5..b2c9ef91a2 100644
--- a/lib/jkqtplotter/graphs/jkqtpboxplot.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpboxplot.cpp
@@ -296,7 +296,7 @@ bool JKQTPBoxplotVerticalGraph::getYMinMax(double& miny, double& maxy, double& s
return !start;
}
-void JKQTPBoxplotVerticalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPBoxplotVerticalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
plotVerticalKeyMarker(parent, painter, rect);
}
@@ -312,7 +312,7 @@ JKQTPBoxplotHorizontalGraph::JKQTPBoxplotHorizontalGraph(JKQTPlotter *parent):
JKQTPBoxplotHorizontalGraph(parent->getPlotter())
{
}
-void JKQTPBoxplotHorizontalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPBoxplotHorizontalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
plotHorizontalKeyMarker(parent, painter, rect);
}
@@ -763,7 +763,7 @@ bool JKQTPBoxplotVerticalElement::getYMinMax(double& miny, double& maxy, double&
return true;
}
-void JKQTPBoxplotVerticalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPBoxplotVerticalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
plotVerticalKeyMarker(parent, painter, rect);
}
@@ -781,7 +781,7 @@ JKQTPBoxplotHorizontalElement::JKQTPBoxplotHorizontalElement(JKQTPlotter *parent
{
}
-void JKQTPBoxplotHorizontalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPBoxplotHorizontalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
plotHorizontalKeyMarker(parent, painter, rect);
}
diff --git a/lib/jkqtplotter/graphs/jkqtpboxplot.h b/lib/jkqtplotter/graphs/jkqtpboxplot.h
index 4d2c6b7c82..9db83e6386 100644
--- a/lib/jkqtplotter/graphs/jkqtpboxplot.h
+++ b/lib/jkqtplotter/graphs/jkqtpboxplot.h
@@ -112,7 +112,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotVerticalGraph: public JKQTPBoxplotGraph
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
*
@@ -153,7 +153,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotHorizontalGraph: public JKQTPBoxplotGra
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
@@ -208,7 +208,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotVerticalElement: public JKQTPBoxplotEle
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
@@ -255,7 +255,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotHorizontalElement: public JKQTPBoxplotE
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
diff --git a/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp
index 1c15f3c04f..2f679c6d80 100644
--- a/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp
@@ -772,8 +772,8 @@ void JKQTPGraphBoxplotStyleMixin::plotVerticalKeyMarker(JKQTBasePlotter *parent,
const double x=rect.left()+rect.width()/2.0;
const double xma=x+rect.width()/2.5;
const double xmi=x-rect.width()/2.5;
- const double min=rect.bottom();
- const double max=rect.top();
+ const double min=rect.bottom()-pw.widthF()/2.0;
+ const double max=rect.top()+pw.widthF()/2.0;
const double median=max+rect.height()/2.0;
const double w=fabs(xma-xmi);
const double p25=max+0.75*rect.height();
diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp
index 0ec36c44bd..9f60a4cdd4 100644
--- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp
@@ -71,7 +71,8 @@ JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase::~JKQTPEvaluatedFunctionWithErr
}
-void JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& r) {
+ QRectF rect=r;
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getLinePen(painter, parent);
p.setJoinStyle(Qt::RoundJoin);
@@ -81,6 +82,10 @@ void JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase::drawKeyMarker(JKQTPEnhanc
QBrush b=getFillBrush(painter, parent);
const double y=rect.top()+rect.height()/2.0;
painter.setPen(np);
+ rect.setWidth(rect.width()-p.widthF());
+ rect.setHeight(rect.height()-p.widthF());
+ rect.setX(rect.x()+p.widthF()/2.0);
+ rect.setY(rect.y()+p.widthF()/2.0);
if (getDrawLine()) painter.setPen(p);
painter.setBrush(b);
if (getFillCurve()) painter.drawRect(rect);
diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h
index ab911373cf..5804c015e7 100644
--- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h
+++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h
@@ -58,7 +58,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase: p
virtual ~JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase() override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp
index b3b37cb3be..8e6cdef9ce 100644
--- a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp
@@ -67,7 +67,7 @@ JKQTPXYFunctionLineGraphBase::~JKQTPXYFunctionLineGraphBase()
-void JKQTPXYFunctionLineGraphBase::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPXYFunctionLineGraphBase::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getLinePen(painter, parent);
p.setJoinStyle(Qt::RoundJoin);
diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h
index 44a6df9d4f..fe48c5fdf8 100644
--- a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h
+++ b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h
@@ -74,7 +74,7 @@ public:
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
diff --git a/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp b/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp
index 64d8be9685..dbf421dcc0 100644
--- a/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp
@@ -46,13 +46,18 @@ QColor JKQTPFilledCurveGraphBase::getKeyLabelColor() const
return getLineColor();
}
-void JKQTPFilledCurveGraphBase::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPFilledCurveGraphBase::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &r)
{
+ QRectF rect=r;
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getLinePen(painter, parent);
p.setWidthF(getKeyLineWidthPx(painter, rect, parent));
QPen np(Qt::NoPen);
QBrush b=getFillBrush(painter, parent);
+ rect.setWidth(rect.width()-p.widthF());
+ rect.setHeight(rect.height()-p.widthF());
+ rect.setX(rect.x()+p.widthF()/2.0);
+ rect.setY(rect.y()+p.widthF()/2.0);
const double y=rect.top()+rect.height()/2.0;
painter.setPen(np);
if (getDrawLine()) painter.setPen(p);
@@ -528,7 +533,7 @@ void JKQTPFilledVerticalRangeGraph::draw(JKQTPEnhancedPainter &painter)
drawErrorsAfter(painter);
}
-void JKQTPFilledVerticalRangeGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPFilledVerticalRangeGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QRectF r=rect;
@@ -643,7 +648,7 @@ void JKQTPFilledHorizontalRangeGraph::draw(JKQTPEnhancedPainter &painter)
drawErrorsAfter(painter);
}
-void JKQTPFilledHorizontalRangeGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPFilledHorizontalRangeGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QRectF r=rect;
diff --git a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h
index 2f2e50dacf..1c5d507c39 100644
--- a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h
+++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h
@@ -57,7 +57,7 @@ public:
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \copydoc m_fillStyleBelow */
JKQTPGraphFillStyleMixin& fillStyleBelow();
/** \copydoc m_fillStyleBelow */
@@ -328,7 +328,7 @@ public:
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
@@ -368,7 +368,7 @@ public:
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
diff --git a/lib/jkqtplotter/graphs/jkqtpgeoannotations.cpp b/lib/jkqtplotter/graphs/jkqtpgeoannotations.cpp
index a0c33b3065..0d72329986 100644
--- a/lib/jkqtplotter/graphs/jkqtpgeoannotations.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpgeoannotations.cpp
@@ -134,7 +134,7 @@ void JKQTPGeoText::draw(JKQTPEnhancedPainter& painter) {
}
-void JKQTPGeoText::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPGeoText::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
painter.setPen(QPen(getTextColor()));
double y=rect.top()+rect.height()/2.0;
@@ -281,7 +281,7 @@ void JKQTPGeoSymbol::draw(JKQTPEnhancedPainter &painter)
addHitTestData(x,y);
}
-void JKQTPGeoSymbol::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPGeoSymbol::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
JKQTPPlotSymbol(painter, rect.left()+rect.width()/2.0, rect.top()+rect.height()/2.0, getSymbolType(), getKeySymbolSizePx(painter, rect, parent), getKeySymbolLineWidthPx(painter, rect, parent), getKeyLabelColor(), getSymbolFillColor(),getSymbolFont());
diff --git a/lib/jkqtplotter/graphs/jkqtpgeoannotations.h b/lib/jkqtplotter/graphs/jkqtpgeoannotations.h
index 7b16ab3f8c..a027474c1b 100644
--- a/lib/jkqtplotter/graphs/jkqtpgeoannotations.h
+++ b/lib/jkqtplotter/graphs/jkqtpgeoannotations.h
@@ -153,7 +153,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPGeoSymbol: public JKQTPPlotAnnotationElement,
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
public Q_SLOTS:
@@ -262,7 +262,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPGeoText: public JKQTPPlotAnnotationElement, pu
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
public Q_SLOTS:
diff --git a/lib/jkqtplotter/graphs/jkqtpgeobase.cpp b/lib/jkqtplotter/graphs/jkqtpgeobase.cpp
index 5f38dc9fe3..24f351d4b3 100644
--- a/lib/jkqtplotter/graphs/jkqtpgeobase.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpgeobase.cpp
@@ -64,7 +64,7 @@ void JKQTPGeoBaseLine::setColor(QColor c)
}
-void JKQTPGeoBaseLine::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPGeoBaseLine::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
painter.setPen(getKeyLinePen(painter, rect, parent));
const double y=rect.top()+rect.height()/2.0;
@@ -173,7 +173,7 @@ void JKQTPGeoBaseFilled::setStyleTransparentFill(QColor color)
}
-void JKQTPGeoBaseFilled::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPGeoBaseFilled::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
painter.setPen(getKeyLinePen(painter, rect, parent));
painter.setBrush(getFillBrush(painter, parent));
@@ -226,7 +226,7 @@ void JKQTPGeoBaseDecoratedHeadLine::setColor(QColor c)
setLineColor(c);
}
-void JKQTPGeoBaseDecoratedHeadLine::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPGeoBaseDecoratedHeadLine::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
painter.setPen(getLinePen(painter, parent));
@@ -287,7 +287,7 @@ void JKQTPGeoBaseDecoratedLine::setColor(QColor c)
setLineColor(c);
}
-void JKQTPGeoBaseDecoratedLine::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPGeoBaseDecoratedLine::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getLinePen(painter, parent);
diff --git a/lib/jkqtplotter/graphs/jkqtpgeobase.h b/lib/jkqtplotter/graphs/jkqtpgeobase.h
index b1189f3dfb..73260744bb 100644
--- a/lib/jkqtplotter/graphs/jkqtpgeobase.h
+++ b/lib/jkqtplotter/graphs/jkqtpgeobase.h
@@ -62,7 +62,7 @@ public:
virtual void setColor(QColor c);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
@@ -111,7 +111,7 @@ public:
virtual void setColor(QColor c);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
@@ -160,7 +160,7 @@ public:
virtual void setColor(QColor c);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
@@ -210,7 +210,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPGeoBaseFilled: public JKQTPGeoBaseLine, public
void setStyleTransparentFill(QColor color);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
protected:
diff --git a/lib/jkqtplotter/graphs/jkqtpimage.cpp b/lib/jkqtplotter/graphs/jkqtpimage.cpp
index cc2532d205..03b665ad22 100644
--- a/lib/jkqtplotter/graphs/jkqtpimage.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpimage.cpp
@@ -62,7 +62,7 @@ JKQTPImageBase::JKQTPImageBase(JKQTPlotter *parent):
{
}
-void JKQTPImageBase::drawKeyMarker(JKQTPEnhancedPainter& /*painter*/, QRectF& /*rect*/) {
+void JKQTPImageBase::drawKeyMarker(JKQTPEnhancedPainter& /*painter*/, const QRectF& /*rect*/) {
}
@@ -264,7 +264,7 @@ void JKQTPImage::draw(JKQTPEnhancedPainter& painter) {
if (image) plotImage(painter, *image, x, y, width, height);
}
-void JKQTPImage::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPImage::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.drawImage(rect, QPixmap(":/JKQTPlotter/jkqtp_plot_image.png").toImage());
}
@@ -404,7 +404,7 @@ JKQTPMathImageBase::JKQTPMathImageBase(double x, double y, double width, double
dataModifier=nullptr;
datatypeModifier=JKQTPMathImageDataType::DoubleArray;
}
-void JKQTPMathImageBase::drawKeyMarker(JKQTPEnhancedPainter &/*painter*/, QRectF &/*rect*/)
+void JKQTPMathImageBase::drawKeyMarker(JKQTPEnhancedPainter &/*painter*/, const QRectF &/*rect*/)
{
}
@@ -964,7 +964,7 @@ void JKQTPMathImage::getModifierMinMax(double &imin, double &imax)
-void JKQTPMathImage::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPMathImage::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.drawImage(rect, getPaletteKeyImage(palette, 32,32));
}
diff --git a/lib/jkqtplotter/graphs/jkqtpimage.h b/lib/jkqtplotter/graphs/jkqtpimage.h
index a66f2dd4c3..c9c4ad0eae 100644
--- a/lib/jkqtplotter/graphs/jkqtpimage.h
+++ b/lib/jkqtplotter/graphs/jkqtpimage.h
@@ -71,7 +71,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImageBase: public JKQTPGraph {
*/
JKQTPImageBase(double x, double y, double width, double height, JKQTPlotter* parent);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
*
@@ -203,7 +203,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPMathImageBase: public JKQTPImageBase {
JKQTPMathImageBase(double x, double y, double width, double height, JKQTPMathImageDataType datatype, const void* data, int Nx, int Ny, JKQTPlotter* parent);
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \copydoc Nx */
void setNx(int __value);
@@ -364,7 +364,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImage: public JKQTPImageBase {
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief copy an external image into an internally owned copy */
virtual void setImage(const QImage& image);
@@ -531,7 +531,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPMathImage: public JKQTPMathImageBase, public J
inline double getModifierPixelValue(int xIdx, int yIdx) const;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief determine min/max data value of the image */
virtual void cbGetDataMinMax(double& imin, double& imax) override;
/** \brief determine min/max data value of the modifier image */
diff --git a/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp b/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp
index e06a1567d6..8dba12165e 100644
--- a/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp
@@ -116,7 +116,7 @@ QImage JKQTPOverlayImage::drawImage() {
return img;
}
-void JKQTPOverlayImage::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPOverlayImage::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
double w=rect.width()/2;
QRectF r1=QRectF(rect.topLeft(), QSizeF(w, rect.height()));
QRectF r2=QRectF(QPointF(rect.left()+w, rect.top()), QSizeF(w, rect.height()));
@@ -244,7 +244,7 @@ JKQTPOverlayImageEnhanced::JKQTPOverlayImageEnhanced(JKQTPlotter *parent):
}
-void JKQTPOverlayImageEnhanced::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPOverlayImageEnhanced::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
if (drawMode!=OverlayImageEnhancedDrawMode::DrawAsSymbols) JKQTPOverlayImage::drawKeyMarker(painter, rect);
else JKQTPPlotSymbol(painter, rect.center().x(), rect.center().y(), symbol, qMin(rect.width(), rect.height()), parent->pt2px(painter, symbolLineWidth*parent->getLineWidthMultiplier()), trueColor, trueColor.lighter(), m_symbolFontName);
}
diff --git a/lib/jkqtplotter/graphs/jkqtpimageoverlays.h b/lib/jkqtplotter/graphs/jkqtpimageoverlays.h
index aacc679392..9ad04c0012 100644
--- a/lib/jkqtplotter/graphs/jkqtpimageoverlays.h
+++ b/lib/jkqtplotter/graphs/jkqtpimageoverlays.h
@@ -60,7 +60,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPOverlayImage: public JKQTPImageBase {
virtual QImage drawImage();
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
@@ -155,7 +155,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPOverlayImageEnhanced: public JKQTPOverlayImage
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \copydoc symbol */
void setSymbolType(JKQTPGraphSymbols __value);
diff --git a/lib/jkqtplotter/graphs/jkqtpimagergb.cpp b/lib/jkqtplotter/graphs/jkqtpimagergb.cpp
index e231b863f6..36c5537c30 100644
--- a/lib/jkqtplotter/graphs/jkqtpimagergb.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpimagergb.cpp
@@ -59,7 +59,7 @@ void JKQTPRGBMathImage::initObject()
this->colorBarTopVisible=true;
this->colorBarRightVisible=true;
- this->imageNameFontSize=parent->getKeyFontSize();
+ this->imageNameFontSize=parent->getMainKey()->getFontSize();
this->imageNameR="";
this->showColorBar=true;
this->colorBarWidth=14;
@@ -992,7 +992,7 @@ double JKQTPRGBMathImage::getValueAt(double x, double y, int channel)
return 0.0;
}
-void JKQTPRGBMathImage::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPRGBMathImage::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.drawImage(rect, QPixmap(":/JKQTPlotter/jkqtp_plot_rgbimage.png").toImage());
}
diff --git a/lib/jkqtplotter/graphs/jkqtpimagergb.h b/lib/jkqtplotter/graphs/jkqtpimagergb.h
index f3ea5c9bab..759822566b 100644
--- a/lib/jkqtplotter/graphs/jkqtpimagergb.h
+++ b/lib/jkqtplotter/graphs/jkqtpimagergb.h
@@ -325,7 +325,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPRGBMathImage: public JKQTPMathImageBase {
double getValueAt(double x, double y, int channel=0) ;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
protected:
void initObject();
diff --git a/lib/jkqtplotter/graphs/jkqtpimpulses.cpp b/lib/jkqtplotter/graphs/jkqtpimpulses.cpp
index c40c1cdf4c..d11e5ff7a9 100644
--- a/lib/jkqtplotter/graphs/jkqtpimpulses.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpimpulses.cpp
@@ -253,7 +253,7 @@ void JKQTPImpulsesHorizontalGraph::draw(JKQTPEnhancedPainter& painter) {
drawErrorsAfter(painter);
}
-void JKQTPImpulsesHorizontalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPImpulsesHorizontalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
@@ -317,7 +317,7 @@ JKQTPImpulsesVerticalGraph::JKQTPImpulsesVerticalGraph(JKQTPlotter *parent):
}
-void JKQTPImpulsesVerticalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPImpulsesVerticalGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
diff --git a/lib/jkqtplotter/graphs/jkqtpimpulses.h b/lib/jkqtplotter/graphs/jkqtpimpulses.h
index cc245bb47d..3f6ab0ab17 100644
--- a/lib/jkqtplotter/graphs/jkqtpimpulses.h
+++ b/lib/jkqtplotter/graphs/jkqtpimpulses.h
@@ -119,7 +119,7 @@ public:
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the column used as "key" for the current graph (typically this call getXColumn(), but for horizontal graphs like filled curves or barcharts it may call getYColumn() ) */
virtual int getKeyColumn() const override;
/** \brief returns the column used as "value" for the current graph (typically this call getXColumn(), but for horizontal graphs like filled curves or barcharts it may call getYColumn() ) */
@@ -213,7 +213,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImpulsesVerticalGraph: public JKQTPImpulsesGra
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \copydoc JKQTPXYGraph::getXMinMax() */
virtual bool getXMinMax(double& minx, double& maxx, double& smallestGreaterZero) override;
/** \copydoc JKQTPXYGraph::getYMinMax() */
diff --git a/lib/jkqtplotter/graphs/jkqtplines.cpp b/lib/jkqtplotter/graphs/jkqtplines.cpp
index 1b06c13073..f538f57be5 100644
--- a/lib/jkqtplotter/graphs/jkqtplines.cpp
+++ b/lib/jkqtplotter/graphs/jkqtplines.cpp
@@ -157,7 +157,7 @@ void JKQTPXYLineGraph::draw(JKQTPEnhancedPainter& painter) {
//qDebug()<<"JKQTPXYLineGraph::draw() ... done";
}
-void JKQTPXYLineGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPXYLineGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getLinePen(painter, parent);
p.setWidthF(getKeyLineWidthPx(painter,rect,parent));
diff --git a/lib/jkqtplotter/graphs/jkqtplines.h b/lib/jkqtplotter/graphs/jkqtplines.h
index d9fbc24eab..408e1965b5 100644
--- a/lib/jkqtplotter/graphs/jkqtplines.h
+++ b/lib/jkqtplotter/graphs/jkqtplines.h
@@ -69,7 +69,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXYLineGraph: public JKQTPXYGraph, public JKQTP
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
diff --git a/lib/jkqtplotter/graphs/jkqtppeakstream.cpp b/lib/jkqtplotter/graphs/jkqtppeakstream.cpp
index 3c14f52864..582a9ecbf3 100644
--- a/lib/jkqtplotter/graphs/jkqtppeakstream.cpp
+++ b/lib/jkqtplotter/graphs/jkqtppeakstream.cpp
@@ -142,7 +142,7 @@ void JKQTPPeakStreamGraph::draw(JKQTPEnhancedPainter &painter)
drawErrorsAfter(painter);
}
-void JKQTPPeakStreamGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPPeakStreamGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getKeyLinePen(painter, rect, parent);
diff --git a/lib/jkqtplotter/graphs/jkqtppeakstream.h b/lib/jkqtplotter/graphs/jkqtppeakstream.h
index 16b87e4262..3a135a06f6 100644
--- a/lib/jkqtplotter/graphs/jkqtppeakstream.h
+++ b/lib/jkqtplotter/graphs/jkqtppeakstream.h
@@ -67,7 +67,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPPeakStreamGraph: public JKQTPSingleColumnGraph
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
/** \brief set symbol color and fill color at the same time */
diff --git a/lib/jkqtplotter/graphs/jkqtprange.cpp b/lib/jkqtplotter/graphs/jkqtprange.cpp
index 7da34bac70..675a1accc3 100644
--- a/lib/jkqtplotter/graphs/jkqtprange.cpp
+++ b/lib/jkqtplotter/graphs/jkqtprange.cpp
@@ -309,12 +309,17 @@ void JKQTPHorizontalRange::draw(JKQTPEnhancedPainter& painter) {
}
-void JKQTPHorizontalRange::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPHorizontalRange::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& r) {
+ QRectF rect=r;
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getKeyLinePen(painter, rect, parent);
QPen np(Qt::NoPen);
QBrush nb(Qt::NoBrush);
QBrush b=getFillBrush(painter, parent);
+ rect.setWidth(rect.width()-p.widthF());
+ rect.setHeight(rect.height()-p.widthF());
+ rect.setX(rect.x()+p.widthF()/2.0);
+ rect.setY(rect.y()+p.widthF()/2.0);
//int y=rect.top()+rect.height()/2.0;
if (plotRange) {
painter.setPen(np);
@@ -428,12 +433,17 @@ void JKQTPVerticalRange::draw(JKQTPEnhancedPainter& painter) {
}
-void JKQTPVerticalRange::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPVerticalRange::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& r) {
+ QRectF rect=r;
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getKeyLinePen(painter, rect, parent);
QPen np(Qt::NoPen);
QBrush nb(Qt::NoBrush);
QBrush b=getFillBrush(painter, parent);
+ rect.setWidth(rect.width()-p.widthF());
+ rect.setHeight(rect.height()-p.widthF());
+ rect.setX(rect.x()+p.widthF()/2.0);
+ rect.setY(rect.y()+p.widthF()/2.0);
//int y=rect.top()+rect.height()/2.0;
if (plotRange) {
painter.setPen(np);
diff --git a/lib/jkqtplotter/graphs/jkqtprange.h b/lib/jkqtplotter/graphs/jkqtprange.h
index 500582c86d..32b21e5947 100644
--- a/lib/jkqtplotter/graphs/jkqtprange.h
+++ b/lib/jkqtplotter/graphs/jkqtprange.h
@@ -226,7 +226,7 @@ public:
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
*
@@ -266,7 +266,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPVerticalRange: public JKQTPRangeBase {
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
*
diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.cpp b/lib/jkqtplotter/graphs/jkqtpscatter.cpp
index 398d1584b7..5a9e4b7f0b 100644
--- a/lib/jkqtplotter/graphs/jkqtpscatter.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpscatter.cpp
@@ -115,7 +115,7 @@ void JKQTPXYScatterGraph::draw(JKQTPEnhancedPainter& painter) {
//qDebug()<<"JKQTPXYScatterGraph::draw() ... done";
}
-void JKQTPXYScatterGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPXYScatterGraph::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
JKQTPPlotSymbol(painter, rect.left()+rect.width()/2.0, rect.top()+rect.height()/2.0, getSymbolType(), getKeySymbolSizePx(painter, rect, parent), getKeySymbolLineWidthPx(painter, rect, parent), getKeyLabelColor(), getSymbolFillColor(),getSymbolFont());
}
@@ -421,7 +421,7 @@ void JKQTPXYParametrizedScatterGraph::draw(JKQTPEnhancedPainter &painter)
drawErrorsAfter(painter);
}
-void JKQTPXYParametrizedScatterGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPXYParametrizedScatterGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
double symbolSize1=getKeySymbolSizePx(painter, rect, parent, 0.75);
double symbolSize2=symbolSize1*0.8;
diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.h b/lib/jkqtplotter/graphs/jkqtpscatter.h
index fe9e08f75f..96e6c73f3d 100644
--- a/lib/jkqtplotter/graphs/jkqtpscatter.h
+++ b/lib/jkqtplotter/graphs/jkqtpscatter.h
@@ -67,7 +67,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXYScatterGraph: public JKQTPXYGraph, public JK
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
/** \brief set color of line and symbol */
@@ -168,7 +168,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXYParametrizedScatterGraph: public JKQTPXYGrap
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
diff --git a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp
index 652bc2ebc4..ebd0d94bc7 100644
--- a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp
@@ -219,7 +219,7 @@ void JKQTPSingleColumnSymbolsGraph::draw(JKQTPEnhancedPainter &painter)
drawErrorsAfter(painter);
}
-void JKQTPSingleColumnSymbolsGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rect)
+void JKQTPSingleColumnSymbolsGraph::drawKeyMarker(JKQTPEnhancedPainter &painter, const QRectF &rect)
{
const double minSize=qMin(rect.width(), rect.height());
//const double maxSize=qMax(rect.width(), rect.height());
diff --git a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h
index 9337d9aff7..5357ca92df 100644
--- a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h
+++ b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h
@@ -80,7 +80,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPSingleColumnSymbolsGraph: public JKQTPSingleCo
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
/** \brief set symbol color and fill color at the same time */
diff --git a/lib/jkqtplotter/graphs/jkqtpspecialline.cpp b/lib/jkqtplotter/graphs/jkqtpspecialline.cpp
index 9bb65e9dd2..56951f3eab 100644
--- a/lib/jkqtplotter/graphs/jkqtpspecialline.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpspecialline.cpp
@@ -44,12 +44,17 @@ JKQTPSpecialLineGraphBase::JKQTPSpecialLineGraphBase(JKQTBasePlotter* parent):
setFillCurve(false);
}
-void JKQTPSpecialLineGraphBase::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPSpecialLineGraphBase::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& r) {
+ QRectF rect=r;
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p=getKeyLinePen(painter, rect, parent);
QPen np(Qt::NoPen);
QBrush b=getFillBrush(painter, parent);
const double y=rect.top()+rect.height()/2.0;
+ rect.setWidth(rect.width()-p.widthF());
+ rect.setHeight(rect.height()-p.widthF());
+ rect.setX(rect.x()+p.widthF()/2.0);
+ rect.setY(rect.y()+p.widthF()/2.0);
painter.setPen(np);
if (getDrawLine()) painter.setPen(p);
painter.setBrush(b);
diff --git a/lib/jkqtplotter/graphs/jkqtpspecialline.h b/lib/jkqtplotter/graphs/jkqtpspecialline.h
index ba78c17747..5d7484ac38 100644
--- a/lib/jkqtplotter/graphs/jkqtpspecialline.h
+++ b/lib/jkqtplotter/graphs/jkqtpspecialline.h
@@ -59,7 +59,7 @@ public:
/** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() const override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \copydoc m_drawSymbols */
diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp b/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp
index b047097a8f..f267d790b3 100644
--- a/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp
+++ b/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp
@@ -338,7 +338,7 @@ bool JKQTPViolinplotVerticalElement::getYMinMax(double& miny, double& maxy, doub
return true;
}
-void JKQTPViolinplotVerticalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPViolinplotVerticalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
plotVerticalKeyMarker(parent, painter, rect);
}
@@ -356,7 +356,7 @@ JKQTPViolinplotHorizontalElement::JKQTPViolinplotHorizontalElement(JKQTPlotter *
{
}
-void JKQTPViolinplotHorizontalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) {
+void JKQTPViolinplotHorizontalElement::drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) {
plotHorizontalKeyMarker(parent, painter, rect);
}
diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplot.h b/lib/jkqtplotter/graphs/jkqtpviolinplot.h
index 38160403a5..c71e0061ac 100644
--- a/lib/jkqtplotter/graphs/jkqtpviolinplot.h
+++ b/lib/jkqtplotter/graphs/jkqtpviolinplot.h
@@ -174,7 +174,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPViolinplotVerticalElement: public JKQTPViolinp
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
@@ -230,7 +230,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPViolinplotHorizontalElement: public JKQTPVioli
/** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect) override;
/** \brief get the maximum and minimum x-value of the graph
diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp
index 097db4fd5d..45bbd36a47 100644
--- a/lib/jkqtplotter/jkqtpbaseplotter.cpp
+++ b/lib/jkqtplotter/jkqtpbaseplotter.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2008-2022 Jan W. Krieger ()
+ Copyright (c) 2008-2023 Jan W. Krieger ()
@@ -51,6 +51,7 @@
#include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/graphs/jkqtpimagergb.h"
#include "jkqtmathtext/jkqtmathtext.h"
+#include "jkqtplotter/jkqtpkey.h"
#include
QString JKQTBasePlotter::globalUserSettigsFilename="";
@@ -178,7 +179,7 @@ QSizeF JKQTBasePlotter::getTextSizeSize(const QString &fontName, double fontSize
* JKQTBasePlotter
**************************************************************************************************************************/
JKQTBasePlotter::JKQTBasePlotter(bool datastore_internal, QObject* parent, JKQTPDatastore* datast):
- QObject(parent), plotterStyle(JKQTPGetSystemDefaultBaseStyle()), m_plotsModel(nullptr), xAxis(nullptr), yAxis(nullptr)
+ QObject(parent), plotterStyle(JKQTPGetSystemDefaultBaseStyle()), m_plotsModel(nullptr), xAxis(nullptr), yAxis(nullptr), mainKey(nullptr)
{
initJKQTBasePlotterResources();
dataColumnsListWidget=nullptr;
@@ -228,6 +229,7 @@ JKQTBasePlotter::JKQTBasePlotter(bool datastore_internal, QObject* parent, JKQTP
m_plotsModel=new JKQTPGraphsModel(this);
connect(this, SIGNAL(plotUpdated()), m_plotsModel, SLOT(plotUpdated()));
+ mainKey=new JKQTPMainKey(this);
emitSignals=false;
@@ -310,6 +312,7 @@ JKQTBasePlotter::JKQTBasePlotter(bool datastore_internal, QObject* parent, JKQTP
JKQTBasePlotter::~JKQTBasePlotter(){
clearGraphs(false);
if (datastoreInternal && datastore!=nullptr) delete datastore;
+ delete mainKey;
delete xAxis;
delete yAxis;
for (const auto& ax: qAsConst(secondaryYAxis)) {
@@ -429,10 +432,10 @@ void JKQTBasePlotter::initSettings() {
gridPrintingCurrentY=0;
- internalPlotBorderLeft_notIncludingAxisAndOutsidePlotSections=internalPlotBorderLeft_notIncludingOutsidePlotSections=internalPlotBorderLeft=plotterStyle.plotBorderLeft;
- internalPlotBorderRight_notIncludingAxisAndOutsidePlotSections=internalPlotBorderRight_notIncludingOutsidePlotSections=internalPlotBorderRight=plotterStyle.plotBorderRight;
- internalPlotBorderTop_notIncludingAxisAndOutsidePlotSections=internalPlotBorderTop_notIncludingOutsidePlotSections=internalPlotBorderTop=plotterStyle.plotBorderTop;
- internalPlotBorderBottom_notIncludingAxisAndOutsidePlotSections=internalPlotBorderBottom_notIncludingOutsidePlotSections=internalPlotBorderBottom=plotterStyle.plotBorderBottom;
+ internalPlotBorderLeft=plotterStyle.plotBorderLeft;
+ internalPlotBorderRight=plotterStyle.plotBorderRight;
+ internalPlotBorderTop=plotterStyle.plotBorderTop;
+ internalPlotBorderBottom=plotterStyle.plotBorderBottom;
//plotWidth=700;
//plotHeight=150;
@@ -610,6 +613,7 @@ void JKQTBasePlotter::setCurrentPlotterStyle(const JKQTBasePlotterStyle &style)
void JKQTBasePlotter::propagateStyle() {
bool old=emitPlotSignals;
emitPlotSignals=false;
+ mainKey->setCurrentKeyStyle(plotterStyle.keyStyle);
xAxis->setCurrentAxisStyle(plotterStyle.xAxisStyle);
yAxis->setCurrentAxisStyle(plotterStyle.yAxisStyle);
for (int i=0; i0.0) {
+ switch (side) {
+ case sideLeft:
+ return QRectF(internalPlotMargins.calcLeft(muOutermost, use)-marginSize, allTop, marginSize, internalPlotHeight);
+ case sideRight:
+ return QRectF(allWidth-internalPlotMargins.calcRight(muOutermost, use), allTop, marginSize, internalPlotHeight);
+ case sideTop:
+ return QRectF(allLeft, internalPlotMargins.calcTop(muOutermost, use)-marginSize, internalPlotWidth, marginSize);
+ case sideBottom:
+ return QRectF(allLeft, allHeight-internalPlotMargins.calcBottom(muOutermost, use), internalPlotWidth, marginSize);
+ }
+ }
+ }
+ return r;
+}
+
+QRectF JKQTBasePlotter::calcPlotRect() const
+{
+ return QRectF(internalPlotBorderLeft, internalPlotBorderTop, internalPlotWidth, internalPlotHeight);
+}
+
void JKQTBasePlotter::loadCurrentPlotterStyle(const QSettings &settings, const QString &group)
{
plotterStyle.loadSettings(settings, group);
@@ -752,6 +788,16 @@ void JKQTBasePlotter::correctXYRangeForAspectRatio(double& xminn, double& xmaxx,
}
}
+JKQTPBaseKey *JKQTBasePlotter::getMainKey()
+{
+ return mainKey;
+}
+
+const JKQTPBaseKey *JKQTBasePlotter::getMainKey() const
+{
+ return mainKey;
+}
+
void JKQTBasePlotter::setXY(double xminn, double xmaxx, double yminn, double ymaxx, bool affectsSecondaryAxes) {
@@ -811,147 +857,127 @@ void JKQTBasePlotter::calcPlotScaling(JKQTPEnhancedPainter& painter){
if (emitSignals) emit beforePlotScalingRecalculate();
//qDebug()<<"start JKQTBasePlotter::calcPlotScaling";
// if the key is plotted outside , then we have to add place for it (i.e. change the plotBorders
- internalPlotBorderBottom=plotterStyle.plotBorderBottom;
- internalPlotBorderLeft=plotterStyle.plotBorderLeft;
- internalPlotBorderRight=plotterStyle.plotBorderRight;
- internalPlotBorderTop=plotterStyle.plotBorderTop;
- internalTitleHeight=0;
-
+ internalPlotMargins.clear();
+ internalPlotMargins[PlotMarginUse::muUserBorder]=PlotMargin(plotterStyle.plotBorderLeft, plotterStyle.plotBorderRight, plotterStyle.plotBorderTop, plotterStyle.plotBorderBottom);
+ // calculate plot label size (if required)
+ internalPlotMargins[PlotMarginUse::muPlotTitle]=PlotMargin();
if (!plotLabel.isEmpty()) {
QSizeF s=getTextSizeSize(plotterStyle.plotLabelFontName, plotterStyle.plotLabelFontSize*fontSizeMultiplier, plotLabel, painter);
- internalTitleHeight=s.height()+pt2px(painter, plotterStyle.plotLabelOffset)+pt2px(painter, plotterStyle.plotLabelTopBorder);
- internalPlotBorderTop+=internalTitleHeight;
-
+ internalPlotMargins[PlotMarginUse::muPlotTitle].top=s.height()+pt2px(painter, plotterStyle.plotLabelOffset)+pt2px(painter, plotterStyle.plotLabelTopBorder);
}
- double keyWidth, keyHeight;
- QFont f=painter.font();
- f.setFamily(JKQTMathTextFontSpecifier::fromFontSpec(plotterStyle.defaultFontName).fontName());
- f.setPointSizeF(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- QFontMetricsF kfm(f, painter.device());
- getKeyExtent(painter, &keyWidth, &keyHeight);
- internalPlotKeyBorderTop=0;
- internalPlotKeyBorderBottom=0;
- internalPlotKeyBorderLeft=0;
- internalPlotKeyBorderRight=0;
- const qreal Xwid=kfm.boundingRect('X').width();
- if (plotterStyle.keyStyle.position==JKQTPKeyOutsideTopRight) {
- internalPlotKeyBorderTop=keyHeight+2*plotterStyle.keyStyle.yMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.yOffset*Xwid+2;
- internalPlotBorderTop = internalPlotBorderTop + internalPlotKeyBorderTop;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideTopLeft) {
- internalPlotKeyBorderTop=keyHeight+2*plotterStyle.keyStyle.yMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.yOffset*Xwid+2;
- internalPlotBorderTop = internalPlotBorderTop + internalPlotKeyBorderTop;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideLeftTop) {
- internalPlotKeyBorderLeft=keyWidth+2*plotterStyle.keyStyle.xMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.xOffset*Xwid+2;
- internalPlotBorderLeft = internalPlotBorderLeft + internalPlotKeyBorderLeft;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideLeftBottom) {
- internalPlotKeyBorderLeft=keyWidth+2*plotterStyle.keyStyle.xMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.xOffset*Xwid+2;
- internalPlotBorderLeft = internalPlotBorderLeft + internalPlotKeyBorderLeft;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideBottomRight) {
- internalPlotKeyBorderBottom=keyHeight+2*plotterStyle.keyStyle.yMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.yOffset*Xwid+2;
- internalPlotBorderBottom = internalPlotBorderBottom + internalPlotKeyBorderBottom;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideBottomLeft) {
- internalPlotKeyBorderBottom=keyHeight+2*plotterStyle.keyStyle.yMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.yOffset*Xwid+2;
- internalPlotBorderBottom = internalPlotBorderBottom + internalPlotKeyBorderBottom;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideRightTop) {
- internalPlotKeyBorderRight = keyWidth+2*plotterStyle.keyStyle.xMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.xOffset*Xwid+2;
- internalPlotBorderRight = internalPlotBorderRight + internalPlotKeyBorderRight;
- } else if (plotterStyle.keyStyle.position==JKQTPKeyOutsideRightBottom) {
- internalPlotKeyBorderRight = keyWidth+2*plotterStyle.keyStyle.xMargin*Xwid+ceil(2*plotterStyle.keyStyle.frameWidth)+plotterStyle.keyStyle.xOffset*Xwid+2;
- internalPlotBorderRight = internalPlotBorderRight + internalPlotKeyBorderRight;
- }
+ // calculate key/legend size (if required)
+ internalPlotKeyDescription = mainKey->getSize(painter);
+ // this needs to be done twice, as the kay size calculation needs the internalPlotWidth and internalPlotHeight
+ // for a second step
+ for (int i=0; i<2; i++) {
-
- /*if (displayMousePosition) {
- QFontMetrics fm=fontMetrics();
- QString test="Aquator";
- int labelHeight=fm.size(Qt::TextSingleLine, test).height()*1.5;
- //if (mousePosLabel!=nullptr) labelHeight=mousePosLabel->height();
- internalPlotBorderTop=internalPlotBorderTop+(labelHeight-plotBorderTop)*1.1;
- }*/
-
- // read additional size required for coordinate axes
- double elongateLeft=0,elongateRight=0;
- auto s=xAxis->getSize1(painter);
- internalPlotBorderBottom+=s.requiredSize;
- if (s.elongateMin>0) elongateLeft=qMax(elongateLeft,s.elongateMin);
- if (s.elongateMax>0) elongateRight=qMax(elongateRight,s.elongateMax);
- s=xAxis->getSize2(painter);
- if (s.elongateMin>0) elongateLeft=qMax(elongateLeft,s.elongateMin);
- if (s.elongateMax>0) elongateRight=qMax(elongateRight,s.elongateMax);
- internalPlotBorderTop+=s.requiredSize;
-
- double elongateBottom=0,elongateTop=0;
- s=yAxis->getSize1(painter);
- if (s.elongateMin>0) elongateBottom=qMax(elongateBottom,s.elongateMin);
- if (s.elongateMax>0) elongateTop=qMax(elongateTop,s.elongateMax);
- internalPlotBorderLeft+=s.requiredSize;
- s=yAxis->getSize2(painter);
- if (s.elongateMin>0) elongateBottom=qMax(elongateBottom,s.elongateMin);
- if (s.elongateMax>0) elongateTop=qMax(elongateTop,s.elongateMax);
- internalPlotBorderRight+=s.requiredSize;
-
- internalPlotBorderTop_notIncludingAxisAndOutsidePlotSections=internalPlotBorderTop;
- internalPlotBorderLeft_notIncludingAxisAndOutsidePlotSections=internalPlotBorderLeft;
- internalPlotBorderBottom_notIncludingAxisAndOutsidePlotSections=internalPlotBorderBottom;
- internalPlotBorderRight_notIncludingAxisAndOutsidePlotSections=internalPlotBorderRight;
-
-
- // read size required by secondary axes
- for (const auto& ax: qAsConst(secondaryYAxis)) {
- internalPlotBorderLeft+=ax->getSize1(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
- internalPlotBorderRight+=ax->getSize2(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
- }
- for (const auto& ax: qAsConst(secondaryXAxis)) {
- internalPlotBorderBottom+=ax->getSize1(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
- internalPlotBorderTop+=ax->getSize2(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
- }
-
- if (internalPlotBorderRightisVisible()) {
- int leftSpace, rightSpace, topSpace, bottomSpace;
- graphs[i]->getOutsideSize(painter, leftSpace, rightSpace, topSpace, bottomSpace);
- internalPlotBorderBottom+=bottomSpace;
- internalPlotBorderTop+=topSpace;
- internalPlotBorderLeft+=leftSpace;
- internalPlotBorderRight+=rightSpace;
+ internalPlotMargins[PlotMarginUse::muKey]=PlotMargin();
+ switch(internalPlotKeyDescription.keyLocation) {
+ case JKQTPBaseKey::KeySizeDescription::keyInside:
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideLeft:
+ internalPlotMargins[PlotMarginUse::muKey].left=internalPlotKeyDescription.requiredSize.width();
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideRight:
+ internalPlotMargins[PlotMarginUse::muKey].right=internalPlotKeyDescription.requiredSize.width();
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideTop:
+ internalPlotMargins[PlotMarginUse::muKey].top=internalPlotKeyDescription.requiredSize.height();
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideBottom:
+ internalPlotMargins[PlotMarginUse::muKey].bottom=internalPlotKeyDescription.requiredSize.height();
+ break;
+ }
+
+
+
+ // read additional size required for coordinate axes
+ internalPlotMargins[PlotMarginUse::muAxesOutside]=PlotMargin();
+ internalPlotMargins[PlotMarginUse::muAxesOutsideExtend]=PlotMargin();
+ internalPlotMargins[PlotMarginUse::muGraphsOutside]=PlotMargin();
+ double elongateLeft=0,elongateRight=0;
+ auto s=xAxis->getSize1(painter);
+ internalPlotMargins[PlotMarginUse::muAxesOutside].bottom+=s.requiredSize;
+ if (s.elongateMin>0) elongateLeft=qMax(elongateLeft,s.elongateMin);
+ if (s.elongateMax>0) elongateRight=qMax(elongateRight,s.elongateMax);
+ s=xAxis->getSize2(painter);
+ if (s.elongateMin>0) elongateLeft=qMax(elongateLeft,s.elongateMin);
+ if (s.elongateMax>0) elongateRight=qMax(elongateRight,s.elongateMax);
+ internalPlotMargins[PlotMarginUse::muAxesOutside].top+=s.requiredSize;
+
+ double elongateBottom=0,elongateTop=0;
+ s=yAxis->getSize1(painter);
+ if (s.elongateMin>0) elongateBottom=qMax(elongateBottom,s.elongateMin);
+ if (s.elongateMax>0) elongateTop=qMax(elongateTop,s.elongateMax);
+ internalPlotMargins[PlotMarginUse::muAxesOutside].left+=s.requiredSize;
+ s=yAxis->getSize2(painter);
+ if (s.elongateMin>0) elongateBottom=qMax(elongateBottom,s.elongateMin);
+ if (s.elongateMax>0) elongateTop=qMax(elongateTop,s.elongateMax);
+ internalPlotMargins[PlotMarginUse::muAxesOutside].right+=s.requiredSize;
+
+
+ // read size required by secondary axes
+ for (const auto& ax: qAsConst(secondaryYAxis)) {
+ internalPlotMargins[PlotMarginUse::muAxesOutside].left+=ax->getSize1(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
+ internalPlotMargins[PlotMarginUse::muAxesOutside].right+=ax->getSize2(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
+ }
+ for (const auto& ax: qAsConst(secondaryXAxis)) {
+ internalPlotMargins[PlotMarginUse::muAxesOutside].bottom+=ax->getSize1(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
+ internalPlotMargins[PlotMarginUse::muAxesOutside].top+=ax->getSize2(painter).requiredSize+plotterStyle.secondaryAxisSeparation;
+ }
+
+ if (internalPlotMargins.calcRight()isVisible()) {
+ int leftSpace, rightSpace, topSpace, bottomSpace;
+ graphs[i]->getOutsideSize(painter, leftSpace, rightSpace, topSpace, bottomSpace);
+ internalPlotMargins[PlotMarginUse::muGraphsOutside].bottom+=bottomSpace;
+ internalPlotMargins[PlotMarginUse::muGraphsOutside].top+=topSpace;
+ internalPlotMargins[PlotMarginUse::muGraphsOutside].left+=leftSpace;
+ internalPlotMargins[PlotMarginUse::muGraphsOutside].right+=rightSpace;
+ }
}
- }
//qDebug()<<" end JKQTBasePlotter::calcPlotScaling";
+ // sum up all borders and store the sums
+ internalPlotBorderLeft=internalPlotMargins.calcLeft();
+ internalPlotBorderRight=internalPlotMargins.calcRight();
+ internalPlotBorderTop=internalPlotMargins.calcTop();
+ internalPlotBorderBottom=internalPlotMargins.calcBottom();
- // synchronize to a master-plotter
- if (masterPlotterX) {
- if (masterSynchronizeWidth) {
- internalPlotBorderLeft=masterPlotterX->internalPlotBorderLeft;
- internalPlotBorderRight=masterPlotterX->internalPlotBorderRight;
+ // synchronize to a master-plotter
+ if (masterPlotterX) {
+ if (masterSynchronizeWidth) {
+ internalPlotBorderLeft=masterPlotterX->internalPlotBorderLeft;
+ internalPlotBorderRight=masterPlotterX->internalPlotBorderRight;
+ }
}
- }
- if (masterPlotterY) {
- if (masterSynchronizeHeight) {
- internalPlotBorderTop=masterPlotterY->internalPlotBorderTop;
- internalPlotBorderBottom=masterPlotterY->internalPlotBorderBottom;
+ if (masterPlotterY) {
+ if (masterSynchronizeHeight) {
+ internalPlotBorderTop=masterPlotterY->internalPlotBorderTop;
+ internalPlotBorderBottom=masterPlotterY->internalPlotBorderBottom;
+ }
}
- }
- // first we calculate the width and height of the plot from the widget dimensions and
- // the supplied border sizes
- internalPlotWidth=jkqtp_roundTo(static_cast(widgetWidth)/paintMagnification-internalPlotBorderLeft-internalPlotBorderRight);
- internalPlotHeight=jkqtp_roundTo(static_cast(widgetHeight)/paintMagnification-internalPlotBorderTop-internalPlotBorderBottom);
+ // first we calculate the width and height of the plot from the widget dimensions and
+ // the supplied border sizes
+ internalPlotWidth=jkqtp_roundTo(static_cast(widgetWidth)/paintMagnification-internalPlotBorderLeft-internalPlotBorderRight);
+ internalPlotHeight=jkqtp_roundTo(static_cast(widgetHeight)/paintMagnification-internalPlotBorderTop-internalPlotBorderBottom);
+
+ // recalculate key size
+ if (i==0) mainKey->modifySize(painter, internalPlotKeyDescription, QSizeF(internalPlotWidth, internalPlotHeight));
+
+ }
////////////////////////////////////////////////////////////////////
@@ -1167,175 +1193,69 @@ int JKQTBasePlotter::getNextStyle() {
void JKQTBasePlotter::drawKey(JKQTPEnhancedPainter& painter) {
#ifdef JKQTBP_AUTOTIMER
- JKQTPAutoOutputTimer jkaaot("JKQTBasePlotter::plotKey");
+ JKQTPAutoOutputTimer jkaaot("JKQTBasePlotter::drawKey");
#endif
- //qDebug()<<"start JKQTBasePlotter::plotKey";
-
- QFont kf(JKQTMathTextFontSpecifier::fromFontSpec(plotterStyle.defaultFontName).fontName(), 10);
- kf.setPointSizeF(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- QFontMetricsF kfm(kf, painter.device());
- const qreal Xwid=kfm.boundingRect('X').width();
-
- // get the size of the key and if keyWidth>0 && keyHeight>0 draw the frame and the contents
- double keyWidth=0;
- double keyHeight=0;
- getKeyExtent(painter, &keyWidth, &keyHeight);
- double keyRectangleWidth=keyWidth+2.0*plotterStyle.keyStyle.xMargin*Xwid+2.0*plotterStyle.keyStyle.frameWidth*lineWidthPrintMultiplier;
- double keyRectangleHeight=keyHeight+2.0*plotterStyle.keyStyle.yMargin*Xwid+2.0*plotterStyle.keyStyle.frameWidth*lineWidthPrintMultiplier;
-
- if ((keyWidth>0) && (keyHeight>0)) {
- // key position
- //double x0,y0; // Position without plotterStyle.keyStyle.xOffset/plotterStyle.keyStyle.yOffset
- //double x,y; // position of the key rectangle (=x0+plotterStyle.keyStyle.xOffset, y0+plotterStyle.keyStyle.yOffset)
-
- // default: inside top-right
- double x0=internalPlotBorderLeft+internalPlotWidth-keyRectangleWidth;
- double x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- double y0=internalPlotBorderTop;
- double y=y0+plotterStyle.keyStyle.yOffset*Xwid;
-
- switch(plotterStyle.keyStyle.position) {
- case JKQTPKeyOutsideTopRight:
- x0=internalPlotBorderLeft+internalPlotWidth+internalPlotBorderRight-keyRectangleWidth;
- x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalTitleHeight;
- y=y0+plotterStyle.keyStyle.yOffset*Xwid;
- break;
-
- case JKQTPKeyOutsideTopLeft:
- x0=internalPlotBorderLeft;
- x=x0+plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalTitleHeight;
- y=y0+plotterStyle.keyStyle.yOffset*Xwid;
- break;
-
- case JKQTPKeyOutsideBottomRight:
- x0=internalPlotBorderLeft+internalPlotWidth-keyRectangleWidth;
- x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop+internalPlotHeight+internalPlotBorderBottom-keyRectangleHeight;
- y=y0-plotterStyle.keyStyle.yOffset*Xwid;
- break;
- case JKQTPKeyOutsideBottomLeft:
- x0=internalPlotBorderLeft;
- x=x0+plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop+internalPlotHeight+internalPlotBorderBottom-keyRectangleHeight;
- y=y0-plotterStyle.keyStyle.yOffset*Xwid;
- break;
-
-
-
- case JKQTPKeyOutsideRightTop:
- x0=internalPlotBorderLeft+internalPlotWidth+internalPlotBorderRight-keyRectangleWidth;
- x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop;
- y=y0+plotterStyle.keyStyle.yOffset*Xwid;
- break;
- case JKQTPKeyOutsideRightBottom:
- x0=internalPlotBorderLeft+internalPlotWidth+internalPlotBorderRight-keyRectangleWidth;
- x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop+internalPlotHeight-keyRectangleHeight;
- y=y0-plotterStyle.keyStyle.yOffset*Xwid;
- break;
-
- case JKQTPKeyOutsideLeftTop:
- x0=0;
- x=x0+plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop;
- y=y0+plotterStyle.keyStyle.yOffset*Xwid;
- break;
- case JKQTPKeyOutsideLeftBottom:
- x0=0;
- x=x0+plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop+internalPlotHeight-keyRectangleHeight;
- y=y0-plotterStyle.keyStyle.yOffset*Xwid;
- break;
-
-
-
-
- case JKQTPKeyInsideBottomRight:
- x0=internalPlotBorderLeft+internalPlotWidth-keyRectangleWidth;
- x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop+internalPlotHeight-keyRectangleHeight;
- y=y0-plotterStyle.keyStyle.yOffset*Xwid;
- break;
- case JKQTPKeyInsideBottomLeft:
- x0=internalPlotBorderLeft;
- x=x0+plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop+internalPlotHeight-keyRectangleHeight;
- y=y0-plotterStyle.keyStyle.yOffset*Xwid;
- break;
- case JKQTPKeyInsideTopLeft:
- x0=internalPlotBorderLeft;
- x=x0+plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop;
- y=y0+plotterStyle.keyStyle.yOffset*Xwid;
- break;
- case JKQTPKeyInsideTopRight:
- x0=internalPlotBorderLeft+internalPlotWidth-keyRectangleWidth;
- x=x0-plotterStyle.keyStyle.xOffset*Xwid;
- y0=internalPlotBorderTop;
- y=y0+plotterStyle.keyStyle.yOffset*Xwid;
- break;
- }
- QRectF rectKey;
- {
- // save old brushes and pens
- painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
- QPen pf=painter.pen();
- pf.setColor(plotterStyle.keyStyle.frameColor);
- pf.setWidthF(qMax(JKQTPlotterDrawingTools::ABS_MIN_LINEWIDTH, pt2px(painter, plotterStyle.keyStyle.frameWidth*lineWidthMultiplier)));
- pf.setStyle(Qt::SolidLine);
-
- painter.setBrush(plotterStyle.keyStyle.backgroundBrush);
- if (!plotterStyle.keyStyle.frameVisible) {
- painter.setPen(Qt::NoPen);
- } else {
- painter.setPen(pf);
- }
-
- rectKey=QRectF(x,y,keyRectangleWidth, keyRectangleHeight);
- if (plotterStyle.keyStyle.frameRounding<=0) {
- painter.drawRect(rectKey);
- } else {
- painter.drawRoundedRect(rectKey, pt2px(painter, plotterStyle.keyStyle.frameRounding), pt2px(painter, plotterStyle.keyStyle.frameRounding));
- }
- y=y+plotterStyle.keyStyle.yMargin*Xwid+plotterStyle.keyStyle.frameWidth*lineWidthMultiplier/2.0;
- x=x+plotterStyle.keyStyle.xMargin*Xwid+plotterStyle.keyStyle.frameWidth*lineWidthMultiplier/2.0;
-
- painter.setPen(pf);
-
- if (useClipping) {
- QRegion cregion(static_cast(x),static_cast(y),static_cast(keyRectangleWidth), static_cast(keyRectangleHeight));
- painter.setClipping(true);
- painter.setClipRegion(cregion);
- painter.setClipping(true);
- }
-
- drawKeyContents(painter, x, y, keyWidth, keyHeight);
-
- if (useClipping) painter.setClipping(false);
- }
+ // calculate rect of the actual plot
+ QRectF rPlotRect;
+ switch(internalPlotKeyDescription.keyLocation) {
+ case JKQTPBaseKey::KeySizeDescription::keyInside:
+ rPlotRect=calcPlotRect();
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideLeft:
+ rPlotRect=calcPlotMarginRect(muKey, sideLeft);
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideRight:
+ rPlotRect=calcPlotMarginRect(muKey, sideRight);
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideTop:
+ rPlotRect=calcPlotMarginRect(muKey, sideTop);
+ break;
+ case JKQTPBaseKey::KeySizeDescription::keyOutsideBottom:
+ rPlotRect=calcPlotMarginRect(muKey, sideBottom);
+ break;
+ }
+ if (!rPlotRect.isEmpty()) {
+ mainKey->drawKey(painter, rPlotRect, internalPlotKeyDescription);
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
- QPen p("orange");
+ QPen p("darkblue");
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth);
- p.setStyle(Qt::DashLine);
- painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
- painter.drawRect(rectKey);
- p.setStyle(Qt::SolidLine);
painter.setPen(p);
- painter.drawLine(QLineF(x0,y0,rectKey.x(), rectKey.y()));
+ painter.drawRect(rPlotRect);
}
+ }
+}
+void JKQTBasePlotter::drawPlotLabel(JKQTPEnhancedPainter& painter) {
+#ifdef JKQTBP_AUTOTIMER
+ JKQTPAutoOutputTimer jkaaot("JKQTBasePlotter::drawPlotLabel");
+#endif
+ if (plotLabel.isEmpty()) return;
+ mathText.setFontSize(plotterStyle.plotLabelFontSize*fontSizeMultiplier);
+ mathText.setFontSpecial(plotterStyle.plotLabelFontName);
+ mathText.setFontColor(plotterStyle.plotLabelColor);
+
+ mathText.parse(plotLabel);
+ QRectF rPlotLabel=calcPlotMarginRect(muPlotTitle, sideTop);
+ rPlotLabel.setTop(rPlotLabel.top()+pt2px(painter, plotterStyle.plotLabelTopBorder));
+ mathText.draw(painter, Qt::AlignHCenter | Qt::AlignTop, rPlotLabel, plotterStyle.debugShowTextBoxes);
+ if (plotterStyle.debugShowRegionBoxes) {
+ painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
+ QPen p("blue");
+ QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
+ p.setWidthF(plotterStyle.debugRegionLineWidth);
+ painter.setBrush(QBrush(QColor(Qt::transparent)));
+ painter.setPen(p);
+ painter.drawRect(rPlotLabel);
+ rPlotLabel.setTop(rPlotLabel.top()-pt2px(painter, plotterStyle.plotLabelTopBorder));
+ painter.drawRect(rPlotLabel);
}
- //qDebug()<<" end JKQTBasePlotter::plotKey";
}
@@ -1344,83 +1264,63 @@ void JKQTBasePlotter::drawPlot(JKQTPEnhancedPainter& painter) {
#ifdef JKQTBP_AUTOTIMER
JKQTPAutoOutputTimer jkaaot("JKQTBasePlotter::paintPlot");
#endif
- //qDebug()<<"start JKQTBasePlotter::paintPlot";
+
+#if QT_VERSIONplotterStyle.keyStyle.fontSize , __value)) {
- this->plotterStyle.keyStyle.fontSize = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyFontSize() const
-{
- return this->plotterStyle.keyStyle.fontSize;
-}
-
-
-void JKQTBasePlotter::setKeyTextColor(const QColor& __value)
-{
- if (this->plotterStyle.keyStyle.textColor != __value) {
- this->plotterStyle.keyStyle.textColor = __value;
- redrawPlot();
- }
-}
-
-QColor JKQTBasePlotter::getKeyTextColor() const
-{
- return this->plotterStyle.keyStyle.textColor;
-}
-
-void JKQTBasePlotter::setKeyItemWidth(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.itemWidth , __value)) {
- this->plotterStyle.keyStyle.itemWidth = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyItemWidth() const
-{
- return this->plotterStyle.keyStyle.itemWidth;
-}
-
-void JKQTBasePlotter::setKeyItemHeight(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.itemHeight , __value)) {
- this->plotterStyle.keyStyle.itemHeight = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyItemHeight() const
-{
- return this->plotterStyle.keyStyle.itemHeight;
-}
-
-void JKQTBasePlotter::setKeyYSeparation(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.ySeparation , __value)) {
- this->plotterStyle.keyStyle.ySeparation = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyYSeparation() const
-{
- return this->plotterStyle.keyStyle.ySeparation;
-}
-
-void JKQTBasePlotter::setKeyLineLength(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.sampleLineLength , __value)) {
- this->plotterStyle.keyStyle.sampleLineLength = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyLineLength() const
-{
- return this->plotterStyle.keyStyle.sampleLineLength;
-}
-
-void JKQTBasePlotter::setKeyXMargin(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.xMargin , __value)) {
- this->plotterStyle.keyStyle.xMargin = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyXMargin() const
-{
- return this->plotterStyle.keyStyle.xMargin;
-}
-
-void JKQTBasePlotter::setKeyYMargin(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.yMargin , __value)) {
- this->plotterStyle.keyStyle.yMargin = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyYMargin() const
-{
- return this->plotterStyle.keyStyle.yMargin;
-}
-
-void JKQTBasePlotter::setKeyXSeparation(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.xSeparation , __value)) {
- this->plotterStyle.keyStyle.xSeparation = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyXSeparation() const
-{
- return this->plotterStyle.keyStyle.xSeparation;
-}
-
-void JKQTBasePlotter::setKeyXOffset(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.xOffset , __value)) {
- this->plotterStyle.keyStyle.xOffset = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyXOffset() const
-{
- return this->plotterStyle.keyStyle.xOffset;
-}
-
-void JKQTBasePlotter::setKeyYOffset(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.yOffset , __value)) {
- this->plotterStyle.keyStyle.yOffset = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyYOffset() const
-{
- return this->plotterStyle.keyStyle.yOffset;
-}
-
void JKQTBasePlotter::setShowKey(bool __value)
{
- if (this->plotterStyle.keyStyle.visible != __value) {
- this->plotterStyle.keyStyle.visible = __value;
- redrawPlot();
- }
+ mainKey->setVisible(__value);
}
bool JKQTBasePlotter::getShowKey() const
{
- return this->plotterStyle.keyStyle.visible;
-}
-
-void JKQTBasePlotter::setShowKeyFrame(bool __value)
-{
- if (this->plotterStyle.keyStyle.frameVisible != __value) {
- this->plotterStyle.keyStyle.frameVisible = __value;
- redrawPlot();
- }
-}
-
-bool JKQTBasePlotter::getShowKeyFrame() const
-{
- return this->plotterStyle.keyStyle.frameVisible;
-}
-
-void JKQTBasePlotter::setKeyFrameColor(const QColor &__value)
-{
- if (this->plotterStyle.keyStyle.frameColor != __value) {
- this->plotterStyle.keyStyle.frameColor = __value;
- redrawPlot();
- }
-}
-
-QColor JKQTBasePlotter::getKeyFrameColor() const
-{
- return this->plotterStyle.keyStyle.frameColor;
-}
-
-void JKQTBasePlotter::setKeyBackgroundColor(const QColor &__value, Qt::BrushStyle __style)
-{
- if (this->plotterStyle.keyStyle.backgroundBrush != QBrush(__value, __style)) {
- this->plotterStyle.keyStyle.backgroundBrush = QBrush(__value, __style);
- redrawPlot();
- }
-}
-
-void JKQTBasePlotter::setKeyBackgroundBrush(const QBrush &__value)
-{
- if (this->plotterStyle.keyStyle.backgroundBrush != __value) {
- this->plotterStyle.keyStyle.backgroundBrush = __value;
- redrawPlot();
- }
-}
-
-void JKQTBasePlotter::setKeyBackgroundGradient(const QGradient &__value)
-{
- if (this->plotterStyle.keyStyle.backgroundBrush != QBrush(__value)) {
- this->plotterStyle.keyStyle.backgroundBrush = QBrush(__value);
- redrawPlot();
- }
-}
-
-void JKQTBasePlotter::setKeyBackgroundTexture(const QImage &__value)
-{
- if (this->plotterStyle.keyStyle.backgroundBrush != QBrush(__value)) {
- this->plotterStyle.keyStyle.backgroundBrush = QBrush(__value);
- redrawPlot();
- }
-}
-
-void JKQTBasePlotter::setKeyBackgroundTexture(const QPixmap &__value)
-{
- if (this->plotterStyle.keyStyle.backgroundBrush != QBrush(__value)) {
- this->plotterStyle.keyStyle.backgroundBrush = QBrush(__value);
- redrawPlot();
- }
-}
-
-
-void JKQTBasePlotter::setKeyFrameWidth(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.frameWidth , __value)) {
- this->plotterStyle.keyStyle.frameWidth = __value;
- redrawPlot();
- }
-}
-
-void JKQTBasePlotter::setKeyFrameRounding(double __value)
-{
- if (jkqtp_approximatelyUnequal(this->plotterStyle.keyStyle.frameRounding , __value)) {
- this->plotterStyle.keyStyle.frameRounding = __value;
- redrawPlot();
- }
-}
-
-double JKQTBasePlotter::getKeyFrameWidth() const
-{
- return this->plotterStyle.keyStyle.frameWidth;
-}
-
-double JKQTBasePlotter::getKeyFrameRounding() const
-{
- return this->plotterStyle.keyStyle.frameRounding;
-}
-
-void JKQTBasePlotter::setKeyAutosize(bool __value)
-{
- if (this->plotterStyle.keyStyle.autosize != __value) {
- this->plotterStyle.keyStyle.autosize = __value;
- redrawPlot();
- }
-}
-
-bool JKQTBasePlotter::getKeyAutosize() const
-{
- return this->plotterStyle.keyStyle.autosize;
+ return mainKey->getVisible();
}
void JKQTBasePlotter::setKeyPosition(const JKQTPKeyPosition &__value)
{
- if (this->plotterStyle.keyStyle.position != __value) {
- this->plotterStyle.keyStyle.position = __value;
- redrawPlot();
- }
+ mainKey->setPosition(__value);
}
JKQTPKeyPosition JKQTBasePlotter::getKeyPosition() const
{
- return this->plotterStyle.keyStyle.position;
-}
-
-void JKQTBasePlotter::setKeyLayout(const JKQTPKeyLayout &__value)
-{
- if (this->plotterStyle.keyStyle.layout != __value) {
- this->plotterStyle.keyStyle.layout = __value;
- redrawPlot();
- }
-}
-
-JKQTPKeyLayout JKQTBasePlotter::getKeyLayout() const
-{
- return this->plotterStyle.keyStyle.layout;
+ return mainKey->getPosition();
}
QColor JKQTBasePlotter::getDefaultTextColor() const
@@ -3078,15 +2696,6 @@ QString JKQTBasePlotter::getPlotLabel() const
return this->plotLabel;
}
-QColor JKQTBasePlotter::getKeyBackgroundColor() const
-{
- return this->plotterStyle.keyStyle.backgroundBrush.color();
-}
-
-QBrush JKQTBasePlotter::getKeyBackgroundBrush() const
-{
- return this->plotterStyle.keyStyle.backgroundBrush;
-}
void JKQTBasePlotter::setPlotBackgroundColor(const QColor &__value)
{
@@ -3615,6 +3224,16 @@ double JKQTBasePlotter::getLineWidthMultiplier() const {
return this->lineWidthMultiplier;
}
+const JKQTPKeyStyle &JKQTBasePlotter::getMainKeyStyle() const
+{
+ return plotterStyle.keyStyle;
+}
+
+JKQTPKeyStyle &JKQTBasePlotter::getMainKeyStyle()
+{
+ return plotterStyle.keyStyle;
+}
+
void JKQTBasePlotter::copyData() {
loadUserSettings();
QString result="";
@@ -4408,10 +4027,14 @@ void JKQTBasePlotter::drawGraphs(JKQTPEnhancedPainter& painter){
painter.setClipRegion(cregion);
}
- int ibTop=jkqtp_roundTo(internalPlotBorderTop_notIncludingOutsidePlotSections-plotterStyle.plotBorderTop-internalTitleHeight);
- int ibLeft=jkqtp_roundTo(internalPlotBorderLeft_notIncludingOutsidePlotSections-plotterStyle.plotBorderLeft);
- int ibBottom=jkqtp_roundTo(internalPlotBorderBottom_notIncludingOutsidePlotSections-plotterStyle.plotBorderBottom);
- int ibRight=jkqtp_roundTo(internalPlotBorderRight_notIncludingOutsidePlotSections-plotterStyle.plotBorderRight);
+ const QRectF rGOTop=calcPlotMarginRect(muGraphsOutside, sideTop);
+ const QRectF rGOBottom=calcPlotMarginRect(muGraphsOutside, sideBottom);
+ const QRectF rGOLeft=calcPlotMarginRect(muGraphsOutside, sideLeft);
+ const QRectF rGORight=calcPlotMarginRect(muGraphsOutside, sideRight);
+ double ibTop=rGOTop.bottom();
+ double ibLeft=rGOLeft.right();
+ double ibBottom=rGOBottom.top();
+ double ibRight=rGORight.left();
for (int j=0; jisVisible()) {
- int leftSpace, rightSpace, topSpace, bottomSpace;
+ int leftSpace=0, rightSpace=0, topSpace=0, bottomSpace=0;
g->getOutsideSize(painter, leftSpace, rightSpace, topSpace, bottomSpace);
- ibTop+=topSpace;
- ibLeft+=leftSpace;
- QRectF rleft(internalPlotBorderLeft+internalPlotKeyBorderLeft-ibLeft, internalPlotBorderTop, leftSpace, internalPlotHeight);
- QRectF rright(internalPlotBorderLeft+internalPlotWidth+ibRight-internalPlotKeyBorderRight, internalPlotBorderTop, rightSpace, internalPlotHeight);
- QRectF rtop(internalPlotBorderLeft, internalPlotBorderTop-ibTop+internalPlotKeyBorderTop, internalPlotWidth, topSpace);
- QRectF rbottom(internalPlotBorderLeft, internalPlotBorderTop+internalPlotHeight+ibBottom, internalPlotWidth, bottomSpace);
+ ibTop-=topSpace;
+ ibLeft-=leftSpace;
+ const QRectF rleft(ibLeft, internalPlotBorderTop, leftSpace, internalPlotHeight);
+ const QRectF rright(ibRight, internalPlotBorderTop, rightSpace, internalPlotHeight);
+ const QRectF rtop(internalPlotBorderLeft, ibTop, internalPlotWidth, topSpace);
+ const QRectF rbottom(internalPlotBorderLeft, ibBottom, internalPlotWidth, bottomSpace);
g->drawOutside(painter, rleft.toRect(), rright.toRect(), rtop.toRect(), rbottom.toRect() );
if (plotterStyle.debugShowRegionBoxes) {
@@ -4459,322 +4082,6 @@ void JKQTBasePlotter::drawGraphs(JKQTPEnhancedPainter& painter){
}
-void JKQTBasePlotter::drawKeyContents(JKQTPEnhancedPainter& painter, double x, double y, double /*width*/, double /*height*/){
-#ifdef JKQTBP_AUTOTIMER
- JKQTPAutoOutputTimer jkaaot(QString("JKQTBasePlotter::plotKeyContents(%1, %2, %3, %4)").arg(x).arg(y).arg(width).arg(height));
-#endif
- painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
-
- double key_text_width=0;
- double key_text_height=0;
- double dw, dh;
- int columns=1;
- int lines=1;
- getKeyExtent(painter, &dw, &dh, &key_text_width, &key_text_height, &columns, &lines);
-
-#ifdef SHOW_JKQTPLOTTER_DEBUG
- qDebug()<<"key_item_height="<getTitle()));
-#endif
- const auto Xwid=kfm.boundingRect('X').width();
- if (!g->getTitle().isEmpty() && g->isVisible()) {
- QSizeF fs=getTextSizeSize(plotterStyle.defaultFontName,plotterStyle.keyStyle.fontSize*fontSizeMultiplier,g->getTitle(),painter);// mt.getSize(painter);
- double itheight=qMax(plotterStyle.keyStyle.itemHeight*Xwid, fs.height());
- QRectF markerRect(x, y+1.5*lineWidthMultiplier, plotterStyle.keyStyle.sampleLineLength*Xwid, itheight-3.0*lineWidthMultiplier);
- g->drawKeyMarker(painter, markerRect);
- mathText.setFontColor(plotterStyle.keyStyle.textColor);
- mathText.setFontSize(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- mathText.setFontSpecial(plotterStyle.defaultFontName);
-
- mathText.parse(g->getTitle());
- QRectF txtRect(x+(plotterStyle.keyStyle.sampleLineLength+plotterStyle.keyStyle.xSeparation)*Xwid,y, key_text_width, itheight);
- mathText.draw(painter, Qt::AlignLeft|Qt::AlignVCenter, txtRect, plotterStyle.debugShowTextBoxes);
- //if (itheightgetTitle()));
-#endif
- if (!g->getTitle().isEmpty() && g->isVisible()) {
- const auto Xwid=kfm.boundingRect('X').width();
- QSizeF fs=getTextSizeSize(plotterStyle.defaultFontName,plotterStyle.keyStyle.fontSize*fontSizeMultiplier,g->getTitle(),painter);// mt.getSize(painter);
- double itheight=qMax(plotterStyle.keyStyle.itemHeight*Xwid, fs.height());
- QRectF markerRect(x, y+1.5*lineWidthMultiplier, plotterStyle.keyStyle.sampleLineLength*Xwid, itheight-3.0*lineWidthMultiplier);
- g->drawKeyMarker(painter, markerRect);
- mathText.setFontColor(plotterStyle.keyStyle.textColor);
- mathText.setFontSize(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- mathText.setFontSpecial(plotterStyle.defaultFontName);
-
- mathText.parse(g->getTitle());
- QRectF txtRect(x+(plotterStyle.keyStyle.sampleLineLength+plotterStyle.keyStyle.xSeparation)*Xwid,y, fs.width(), itheight);
- mathText.draw(painter, Qt::AlignLeft|Qt::AlignVCenter, txtRect, plotterStyle.debugShowTextBoxes);
- if (plotterStyle.debugShowRegionBoxes) {
- painter.save(); auto __finalpaintinner=JKQTPFinally([&painter]() {painter.restore();});
- QPen p("orange");
- QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
- p.setWidthF(plotterStyle.debugRegionLineWidth/2.0);
- p.setStyle(Qt::DashLine);
- painter.setPen(p);
- painter.setBrush(QBrush(QColor(Qt::transparent)));
- painter.drawRect(txtRect);
- painter.drawRect(markerRect);
-
- }
- //if (itheight(plotWidth)/static_cast(key_item_width*Xwid));
- bool colfirst=true;
-
- if (plotterStyle.keyStyle.position==JKQTPKeyInsideTopLeft || plotterStyle.keyStyle.position==JKQTPKeyInsideTopRight
- || plotterStyle.keyStyle.position==JKQTPKeyOutsideTopLeft || plotterStyle.keyStyle.position==JKQTPKeyOutsideTopRight) {
- colfirst=false;
- }
-
- int l=1;
- int c=1;
- double xx=x;
- double yy=y;
- const auto Xwid=kfm.boundingRect('X').width();
- for (int i=0; igetTitle()));
-#endif
- if (!g->getTitle().isEmpty() && g->isVisible()) {
- //QSizeF fs=getTextSizeSize(plotterStyle.defaultFontName,plotterStyle.keyStyle.fontSize*fontSizeMultiplier,g->getTitle(),painter);// mt.getSize(painter);
- double itheight=qMax(plotterStyle.keyStyle.itemHeight*Xwid, key_text_height);
- QRectF markerRect(xx, yy+1.5*lineWidthMultiplier, plotterStyle.keyStyle.sampleLineLength*Xwid, itheight-3.0*lineWidthMultiplier);
- g->drawKeyMarker(painter, markerRect);
- mathText.setFontColor(plotterStyle.keyStyle.textColor);
- mathText.setFontSize(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- mathText.setFontSpecial(plotterStyle.defaultFontName);
- mathText.parse(g->getTitle());
- //QSizeF fs=mt.getSize(painter);
- QRectF txtRect(xx+(plotterStyle.keyStyle.sampleLineLength+plotterStyle.keyStyle.xSeparation)*Xwid,yy, key_text_width, key_text_height);
- mathText.draw(painter, Qt::AlignLeft|Qt::AlignVCenter, txtRect, plotterStyle.debugShowTextBoxes);
-
- if (plotterStyle.debugShowRegionBoxes) {
- painter.save(); auto __finalpaintinner=JKQTPFinally([&painter]() {painter.restore();});
- QPen p("orange");
- QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
- p.setWidthF(plotterStyle.debugRegionLineWidth/2.0);
- p.setStyle(Qt::DashLine);
- painter.setPen(p);
- painter.setBrush(QBrush(QColor(Qt::transparent)));
- painter.drawRect(txtRect);
- painter.drawRect(markerRect);
-
- }
-
- if (colfirst) {
- yy=yy+key_text_height+(plotterStyle.keyStyle.ySeparation)*Xwid;
- l++;
- if (l>lines) {
- l=1;
- c++;
- xx=xx+key_text_width+(plotterStyle.keyStyle.sampleLineLength+2.0*plotterStyle.keyStyle.xSeparation)*Xwid;
- /*if (plotterStyle.keyStyle.autosize) xx=xx+key_text_width+(key_line_length+3.0*plotterStyle.keyStyle.xSeparation)*Xwid;
- else xx=xx+(key_item_width+2.0*plotterStyle.keyStyle.xSeparation)*Xwid;*/
- yy=y;
- }
- } else {
- /*if (plotterStyle.keyStyle.autosize) xx=xx+key_text_width+(key_line_length+3.0*plotterStyle.keyStyle.xSeparation)*Xwid;
- else xx=xx+(key_item_width+2.0*plotterStyle.keyStyle.xSeparation)*Xwid;*/
- xx=xx+key_text_width+(plotterStyle.keyStyle.sampleLineLength+2.0*plotterStyle.keyStyle.xSeparation)*Xwid;
- c++;
- if (c>columns) {
- c=1;
- l++;
- //yy=yy+(key_item_height+plotterStyle.keyStyle.ySeparation)*kfm.height();
- yy=yy+itheight+(plotterStyle.keyStyle.ySeparation)*Xwid;
- xx=x;
- }
- }
- }
- }
- }
-
- /*painter.setPen(pold);
- painter.setBrush(bold);*/
-
-
-}
-
-void JKQTBasePlotter::getKeyExtent(JKQTPEnhancedPainter& painter, double* width, double* height, double* text_width, double* text_height, int* columns_count, int *lines_count) {
-#ifdef JKQTBP_AUTOTIMER
- JKQTPAutoOutputTimer jkaaot("JKQTBasePlotter::getKeyExtent");
-#endif
- QFont f=painter.font();
- f.setFamily(JKQTMathTextFontSpecifier::fromFontSpec(plotterStyle.defaultFontName).fontName());
- f.setPointSizeF(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- QFontMetricsF kfm(f, painter.device());
- const qreal Xwid=kfm.boundingRect('X').width();
- if (text_height!=nullptr) *text_height=plotterStyle.keyStyle.itemHeight*Xwid;
- if (plotterStyle.keyStyle.layout==JKQTPKeyLayoutOneColumn) {
- int keyHeight=graphs.size();
- double w=0;
- double h=0;
- painter.setFont(f);
- //if (text_height!=nullptr) *text_height=0;
-
-
- for (int i=0; igetTitle().isEmpty() || !graphs[i]->isVisible()) {
- keyHeight--;
- } else {
- //mt.parse(graphs[i]->getTitle());
- //QSizeF fs=mt.getSize(painter);
- QSizeF fs=getTextSizeSize(plotterStyle.defaultFontName, plotterStyle.keyStyle.fontSize*fontSizeMultiplier, graphs[i]->getTitle(), painter);
- if (fs.width()>w) w=fs.width();
- if (text_height && fs.height()>*text_height) *text_height=fs.height();
- h=h+qMax(plotterStyle.keyStyle.itemHeight*Xwid, fs.height())+plotterStyle.keyStyle.ySeparation*Xwid;
- }
- }
- if (plotterStyle.keyStyle.autosize) {
- if (width) *width=w+(plotterStyle.keyStyle.sampleLineLength+2.0*plotterStyle.keyStyle.xSeparation)*Xwid;
- if (text_width!=nullptr) *text_width=w+2.0*Xwid;
- } else {
- if (width) *width=plotterStyle.keyStyle.itemWidth*Xwid;
- if (text_width!=nullptr) *text_width=(plotterStyle.keyStyle.itemWidth-(plotterStyle.keyStyle.sampleLineLength+plotterStyle.keyStyle.xSeparation))*Xwid;
- }
- if (h>plotterStyle.keyStyle.ySeparation*Xwid) h=h-plotterStyle.keyStyle.ySeparation*Xwid;
- if (height) *height=h;//keyHeight*key_item_height*Xwid;
- if (columns_count) *columns_count=1;
- if (lines_count) *lines_count=keyHeight;
- } else if (plotterStyle.keyStyle.layout==JKQTPKeyLayoutOneRow) {
- int keyWidth=graphs.size();
- double w=0;
- double h=0;
- painter.setFont(f);
- if (text_width!=nullptr) *text_width=0;
-
-
- for (int i=0; igetTitle().isEmpty() || !graphs[i]->isVisible()) {
- keyWidth--;
- } else {
- //mt.parse(graphs[i]->getTitle());
- //QSizeF fs=mt.getSize(painter);
- QSizeF fs=getTextSizeSize(plotterStyle.defaultFontName, plotterStyle.keyStyle.fontSize*fontSizeMultiplier, graphs[i]->getTitle(), painter);
- if (fs.height()>h) h=fs.height();
- if (text_width && fs.width()>*text_width) *text_width=fs.width();
- w=w+fs.width()+(plotterStyle.keyStyle.sampleLineLength+2.0*plotterStyle.keyStyle.xSeparation)*Xwid;
- }
- }
- if (h(plotterStyle.keyStyle.xSeparation)*Xwid) w=w-(plotterStyle.keyStyle.xSeparation)*Xwid;
- if (width) *width=w;//keyHeight*key_item_height*Xwid;
- if (columns_count) *columns_count=keyWidth;
- if (lines_count) *lines_count=1;
- } else if (plotterStyle.keyStyle.layout==JKQTPKeyLayoutMultiColumn) {
-
- // copied code in plotKeyContents()!!!
- double keyHeight=graphs.size();
- double w=0;
- double txtH=0;
- QFont floc=painter.font();
- floc.setFamily(JKQTMathTextFontSpecifier::fromFontSpec(plotterStyle.defaultFontName).fontName());
- floc.setPointSizeF(plotterStyle.keyStyle.fontSize*fontSizeMultiplier);
- painter.setFont(floc);
-
-
- for (int i=0; igetTitle().isEmpty() || !graphs[i]->isVisible()) {
- keyHeight--;
- } else {
- //mt.parse(graphs[i]->getTitle());
- //QSizeF fs=mt.getSize(painter);
- QSizeF fs=getTextSizeSize(plotterStyle.defaultFontName, plotterStyle.keyStyle.fontSize*fontSizeMultiplier, graphs[i]->getTitle(), painter);
- if (fs.width()>w) w=fs.width();
- if ( fs.height()>txtH) txtH=fs.height();
- }
- }
-
- if (text_height) {
- if (plotterStyle.keyStyle.autosize) *text_height=txtH;
- else *text_height=plotterStyle.keyStyle.itemHeight*Xwid;
- }
-
-
- double columns=floor(double(internalPlotWidth)/(w+(2.0*plotterStyle.keyStyle.xSeparation+plotterStyle.keyStyle.sampleLineLength)*Xwid));
- if (!plotterStyle.keyStyle.autosize) columns=floor(double(internalPlotWidth)/((plotterStyle.keyStyle.itemWidth+2.0*plotterStyle.keyStyle.xSeparation+plotterStyle.keyStyle.sampleLineLength)*Xwid));
- columns=qMin(columns, keyHeight);
- int lines=static_cast(ceil(static_cast(keyHeight)/static_cast(columns)));
- lines=jkqtp_roundTo(qMin(static_cast(lines), keyHeight));
-
- if (plotterStyle.keyStyle.position==JKQTPKeyInsideTopLeft || plotterStyle.keyStyle.position==JKQTPKeyInsideTopRight
- || plotterStyle.keyStyle.position==JKQTPKeyOutsideTopLeft || plotterStyle.keyStyle.position==JKQTPKeyOutsideTopRight) {
- if (plotterStyle.keyStyle.autosize) {
- lines=static_cast(floor(static_cast(internalPlotHeight)/static_cast(txtH+(plotterStyle.keyStyle.ySeparation)*Xwid)));
- } else {
- lines=static_cast(floor(static_cast(internalPlotHeight)/static_cast((plotterStyle.keyStyle.itemHeight+plotterStyle.keyStyle.ySeparation)*Xwid)));
- }
- columns=static_cast(ceil(static_cast(keyHeight)/static_cast(lines)));
- lines=jkqtp_roundTo(qMin(static_cast(lines), keyHeight));
-
- }
-
- if (columns_count) *columns_count=jkqtp_roundTo(columns);
- if (lines_count) *lines_count=lines;
-
- if (plotterStyle.keyStyle.autosize) {
- if (width) *width=(w+(plotterStyle.keyStyle.sampleLineLength+3.0*plotterStyle.keyStyle.xSeparation)*Xwid)*columns;
- if (height) *height=lines*(txtH+plotterStyle.keyStyle.ySeparation*Xwid);
- if (lines>0) *height=*height-plotterStyle.keyStyle.ySeparation*Xwid;
- if (text_width!=nullptr) *text_width=w;
- } else {
- if (width) *width=(plotterStyle.keyStyle.itemWidth+2.0*plotterStyle.keyStyle.xSeparation)*Xwid*columns;
- if (height) *height=lines*(plotterStyle.keyStyle.itemHeight+plotterStyle.keyStyle.ySeparation)*Xwid;
- if (lines>0) *height=*height-plotterStyle.keyStyle.ySeparation*Xwid;
- if (text_width!=nullptr) *text_width=(plotterStyle.keyStyle.itemWidth-(plotterStyle.keyStyle.sampleLineLength+plotterStyle.keyStyle.xSeparation))*Xwid;
- }
-#ifdef SHOW_JKQTPLOTTER_DEBUG
- qDebug()<<"getKeyExtent(): mult-column: columns="<internalPlotWidth; }
/** \copydoc internalPlotHeight */
inline int getPlotHeight() const { return this->internalPlotHeight; }
- /** \brief returns the internal JKQTMathText, used to render text with LaTeX markup */
- JKQTMathText* getMathText();
- /** \brief returns the internal JKQTMathText, used to render text with LaTeX markup */
- const JKQTMathText *getMathText() const;
+
+ /**@}*/
+
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ /** @name Coordinate Axis Management */
+ /**@{*/
+
/** \brief returns the x-axis objet of the plot
*
* \see \ref jkqtplotter_base_grids_baseplotter
@@ -1304,6 +1282,15 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
/**@}*/
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/** @name Key Management Management */
+/**@{*/
+ /** \brief retuns the main key object */
+ JKQTPBaseKey* getMainKey();
+ /** \brief retuns the main key object */
+ const JKQTPBaseKey* getMainKey() const;
+/**@}*/
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
/** @name QActions Management */
@@ -1465,6 +1452,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
* \internal
*/
QSizeF getTextSizeSize(const QString& fontName, double fontSize, const QString& text, QPainter &painter);
+ /** \brief returns the internal JKQTMathText, used to render text with LaTeX markup */
+ JKQTMathText* getMathText();
+ /** \brief returns the internal JKQTMathText, used to render text with LaTeX markup */
+ const JKQTMathText *getMathText() const;
/**@}*/
@@ -1948,8 +1939,6 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
void setExportBackgroundTexture(const QImage & __value);
/** \copydoc JKQTBasePlotterStyle::plotBackgroundBrush */
void setPlotBackgroundTexture(const QImage & __value);
- /** \copydoc JKQTPKeyStyle::textColor */
- void setKeyTextColor(const QColor & __value);
/** \copydoc JKQTBasePlotterStyle::plotFrameWidth */
@@ -1962,52 +1951,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
void setPlotFrameVisible(bool enabled);
- /** \copydoc JKQTPKeyStyle::fontSize */
- void setKeyFontSize(double __value);
- /** \copydoc JKQTPKeyStyle::itemWidth */
- void setKeyItemWidth(double __value);
- /** \copydoc JKQTPKeyStyle::itemHeight */
- void setKeyItemHeight(double __value);
- /** \copydoc JKQTPKeyStyle::ySeparation */
- void setKeyYSeparation(double __value);
- /** \copydoc JKQTPKeyStyle::sampleLineLength */
- void setKeyLineLength(double __value);
- /** \copydoc JKQTPKeyStyle::xMargin */
- void setKeyXMargin(double __value);
- /** \copydoc JKQTPKeyStyle::yMargin */
- void setKeyYMargin(double __value);
- /** \copydoc JKQTPKeyStyle::xSeparation */
- void setKeyXSeparation(double __value);
- /** \copydoc JKQTPKeyStyle::yOffset */
- void setKeyXOffset(double __value);
- /** \copydoc JKQTPKeyStyle::xOffset */
- void setKeyYOffset(double __value);
/** \copydoc JKQTPKeyStyle::visible */
void setShowKey(bool __value);
- /** \copydoc JKQTPKeyStyle::frameVisible */
- void setShowKeyFrame(bool __value);
- /** \copydoc JKQTPKeyStyle::frameColor */
- void setKeyFrameColor(const QColor & __value);
- /** \copydoc JKQTPKeyStyle::backgroundBrush */
- void setKeyBackgroundColor(const QColor & __value, Qt::BrushStyle __style);
- /** \copydoc JKQTPKeyStyle::backgroundBrush */
- void setKeyBackgroundBrush(const QBrush & __value);
- /** \copydoc JKQTPKeyStyle::backgroundBrush */
- void setKeyBackgroundGradient(const QGradient & __value);
- /** \copydoc JKQTPKeyStyle::backgroundBrush */
- void setKeyBackgroundTexture(const QImage & __value);
- /** \copydoc JKQTPKeyStyle::backgroundBrush */
- void setKeyBackgroundTexture(const QPixmap & __value);
- /** \copydoc JKQTPKeyStyle::frameWidth */
- void setKeyFrameWidth(double __value);
- /** \copydoc JKQTPKeyStyle::frameRounding */
- void setKeyFrameRounding(double __value);
- /** \copydoc JKQTPKeyStyle::autosize */
- void setKeyAutosize(bool __value);
/** \copydoc JKQTPKeyStyle::position */
void setKeyPosition(const JKQTPKeyPosition & __value);
- /** \copydoc JKQTPKeyStyle::layout */
- void setKeyLayout(const JKQTPKeyLayout & __value);
/** \copydoc JKQTBasePlotterStyle::plotLabelFontSize */
void setPlotLabelFontSize(double __value);
/** \copydoc JKQTBasePlotterStyle::plotLabelOffset */
@@ -2091,31 +2038,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
void drawGraphs(JKQTPEnhancedPainter& painter);
/** \brief plot a key */
void drawKey(JKQTPEnhancedPainter& painter);
-
- /** \brief plot the key contents
- *
- * This function does not do anything and has to be overwritten in child classes if they want to plot a key.
- * The implementation should draw the contents of the key, not its frame as this is done in plotKey().
- *
- * \param painter draw the key on this painter
- * \param x left-most coordinate of the key [pixels]
- * \param y top-most coordinate of the key [pixels]
- * \param width width of the key [pixels]
- * \param height height of the key [pixels]
- *
- * So any implementation should only draw inside the rectangle [x..x+width, y..y+hieght]
- */
- void drawKeyContents(JKQTPEnhancedPainter& painter, double x, double y, double width, double height);
-
- /** \brief returns the size of the key (as call-by-reference parameters
- *
- * Any implementation of key plotting has to overwrite this function and use it to return the size of the key that would be
- * plotted by plotKeyContents(). This class will use the return values to plot the frame of the key and also supply them to
- * plotKeyContents(). If height or width are returned 0, no key is plotted
- *
- * The implementation in here returns zero size!
- */
- void getKeyExtent(JKQTPEnhancedPainter& painter, double *width, double *height, double *text_width=nullptr, double *text_height=nullptr, int *columns_count=nullptr, int* lines_count=nullptr);
+ /** \brief plot the plot label */
+ void drawPlotLabel(JKQTPEnhancedPainter& painter);
/** \brief show the print preview window for a given print \a p */
bool printpreviewNew(QPaintDevice* paintDevice, bool setAbsolutePaperSize=false, double printsizeX_inMM=-1.0, double printsizeY_inMM=-1.0, bool displayPreview=true);
@@ -2271,6 +2195,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
/** \brief objects used a secondary y-axes */
QMap secondaryYAxis;
+ /** \brief key objects used for the main plot key */
+ JKQTPBaseKey* mainKey;
+
/** \brief filename for the ini file in which to save the user settings
* \see jkqtplotter_base_userprops
*/
@@ -2332,22 +2259,117 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
int widgetHeight;
+ /** \brief used for calculated value:describing what freespace outside the graph area is used for
+ * \internal
+ */
+ enum PlotMarginUse {
+ muOutermost=0,
+ muUserBorder=0,
+ muPlotTitle,
+ muKey,
+ muGraphsOutside,
+ muAxesOutsideExtend,
+ muAxesOutside,
+
+ // this is always the last one
+ muUsesCount,
+ muInnermost=muUsesCount-1
+ };
+ /** \brief enum to indicate relative position from a central position */
+ enum PlotMarginSide {
+ sideLeft,
+ sideRight,
+ sideTop,
+ sideBottom
+ };
+
+ /** \brief used for calculated value: describing a section in the freespace outside the graph area
+ * \internal
+ */
+ struct PlotMargin {
+ double left;
+ double right;
+ double top;
+ double bottom;
+
+ inline PlotMargin(double l=0, double r=0, double t=0, double b=0) : left(l), right(r), top(t), bottom(b) {};
+
+ /** \brief select left,right, top, bottom, depending on \a side */
+ inline double getMargin(PlotMarginSide side) const
+ {
+ switch (side) {
+ case sideLeft:
+ return left;
+ case sideRight:
+ return right;
+ case sideTop:
+ return top;
+ case sideBottom:
+ return bottom;
+ }
+ return 0;
+ }
+ };
+
+ /** \brief used for calculated value: describing all sections of freespace outside the graph area
+ * \internal
+ */
+ class PlotMargins: public QMap {
+ public:
+ inline PlotMargins(): QMap() {};
+ /** \brief claculate size of plot margins on the left (sums all) */
+ double calcLeft() const;
+ double calcLeft(PlotMarginUse start, PlotMarginUse stop) const;
+ /** \brief claculate size of plot margins on the right (sums all) */
+ double calcRight() const;
+ double calcRight(PlotMarginUse start, PlotMarginUse stop) const;
+ /** \brief claculate size of plot margins at the top (sums all) */
+ double calcTop() const;
+ double calcTop(PlotMarginUse start, PlotMarginUse stop) const;
+ /** \brief claculate size of plot margins at the bottom (sums all) */
+ double calcBottom() const;
+ double calcBottom(PlotMarginUse start, PlotMarginUse stop) const;
+ };
+
+ /** \brief calculated value: description of free space between actual plot and widget borders
+ * \internal
+ *
+ * \image html plot_widget_orientation.png
+ *
+ * \note This property is an intermediate storage for calculated values. Do not change directly!
+ *
+ * \see calcPlotMarginRect()
+ */
+ PlotMargins internalPlotMargins;
+
+ /** \brief calculate the rectangle to be used for a given PlotMarginUse on the indicated side of the plot
+ *
+ * This function evaluates the data in internalPlotMargins also using the other properties known in this class.
+ * Basically it therefore defines the ordering and interpretation of PlotMarginUse.
+ *
+ * \image html plot_widget_orientation.png
+ *
+ * \see internalPlotMargins
+ */
+ QRectF calcPlotMarginRect(PlotMarginUse use, PlotMarginSide side) const;
+ /** \brief calculate the rectangle of the plot (excluding all margins) */
+ QRectF calcPlotRect() const;
+
+
/** \brief calculated value: free space between widget top border and plot top border, as used to plot the graph
* \internal
*
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderTop;
- /** \brief calculated value: free space between widget top border and top border of the key/legend
- * \internal
+ * \image html plot_widget_orientation.png
*
* \note This property is an intermediate storage for calculated values. Do not change directly!
*/
- double internalPlotKeyBorderTop;
+ double internalPlotBorderTop;
/** \brief calculated value: height of the plot title (or 0 if no title)
* \internal
*
+ * \image html plot_widget_orientation.png
+ *
* \note This property is an intermediate storage for calculated values. Do not change directly!
*/
double internalTitleHeight;
@@ -2355,110 +2377,42 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
/** \brief calculated value: free space between widget top border and plot top border, as used to plot the graph
* \internal
*
+ * \image html plot_widget_orientation.png
+ *
* \note This property is an intermediate storage for calculated values. Do not change directly!
*/
double internalPlotBorderLeft;
- /** \brief calculated value: free space between widget left border and left border of the key/legend
- * \internal
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotKeyBorderLeft;
/** \brief calculated value: free space between widget top border and plot top border, as used to plot the graph
* \internal
*
+ * \image html plot_widget_orientation.png
+ *
* \note This property is an intermediate storage for calculated values. Do not change directly!
*/
double internalPlotBorderBottom;
- /** \brief calculated value: free space between widget bottom border and bottom border of the key/legend
- * \internal
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotKeyBorderBottom;
/** \brief calculated value: free space between widget top border and plot top border, as used to plot the graph
* \internal
*
+ * \image html plot_widget_orientation.png
+ *
* \note This property is an intermediate storage for calculated values. Do not change directly!
*/
double internalPlotBorderRight;
- /** \brief calculated value: free space between widget right border and right border of the key/legend
- * \internal
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotKeyBorderRight;
-
-
- /** \brief calculated value: free space between widget top border and (plot+drawOutside) top border (including coordinate axes)
+ /** \brief calculated value: size and location of the plot key
* \internal
*
* \image html plot_widget_orientation.png
*
* \note This property is an intermediate storage for calculated values. Do not change directly!
*/
- double internalPlotBorderTop_notIncludingOutsidePlotSections;
- /** \brief calculated value: free space between widget left border and (plot+drawOutside) left border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderLeft_notIncludingOutsidePlotSections;
- /** \brief calculated value: free space between widget right border and (plot+drawOutside) right border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderBottom_notIncludingOutsidePlotSections;
- /** \brief calculated value: free space between widget bottom border and (plot+drawOutside) bottom border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderRight_notIncludingOutsidePlotSections;
+ JKQTPBaseKey::KeySizeDescription internalPlotKeyDescription;
+
+
- /** \brief calculated value: free space between widget top border and (plot+drawOutside) top border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderTop_notIncludingAxisAndOutsidePlotSections;
- /** \brief calculated value: free space between widget left border and (plot+drawOutside) left border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderLeft_notIncludingAxisAndOutsidePlotSections;
- /** \brief calculated value: free space between widget right border and (plot+drawOutside) right border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderBottom_notIncludingAxisAndOutsidePlotSections;
- /** \brief calculated value: free space between widget bottom border and (plot+drawOutside) bottom border (including coordinate axes)
- * \internal
- *
- * \image html plot_widget_orientation.png
- *
- * \note This property is an intermediate storage for calculated values. Do not change directly!
- */
- double internalPlotBorderRight_notIncludingAxisAndOutsidePlotSections;
/** \brief calculated value: plot width in pixel inside the widget (calculated by calcPlotScaling() from plotBorderLeft, plotBorderRight and widgetWidth)
*
diff --git a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
index e66e055c6d..7e65510939 100644
--- a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
+++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
@@ -122,6 +122,7 @@ void JKQTBasePlotterStyle::saveSettings(QSettings &settings, const QString &grou
}
+
JKQTBasePlotterStyle &JKQTPGetSystemDefaultBaseStyle()
{
static JKQTBasePlotterStyle instance=JKQTBasePlotterStyle();
diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
index 31565f8aad..bfbc362a84 100644
--- a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
+++ b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
@@ -80,18 +80,20 @@ void JKQTPCoordinateAxis::setParent(JKQTBasePlotter* parent) {
}
void JKQTPCoordinateAxis::redrawPlot() {
- //if (paramsChanged) {
- calcPlotScaling();
+ calcPlotScaling();
+ if (parent) {
parent->updateSecondaryAxes();
parent->redrawPlot();
- //}
+ }
}
JKQTMathText* JKQTPCoordinateAxis::getParentMathText() {
+ if (!parent) return nullptr;
return parent->getMathText();
}
const JKQTMathText* JKQTPCoordinateAxis::getParentMathText() const {
+ if (!parent) return nullptr;
return parent->getMathText();
}
diff --git a/lib/jkqtplotter/jkqtpgraphsbase.h b/lib/jkqtplotter/jkqtpgraphsbase.h
index 74e7c710cc..37ff287411 100644
--- a/lib/jkqtplotter/jkqtpgraphsbase.h
+++ b/lib/jkqtplotter/jkqtpgraphsbase.h
@@ -42,7 +42,7 @@ class JKQTPGraphErrorStyleMixin;
* Each possible graph is represented by a child of this class. So additional plots may be created by
* deriving new JKQTPGraph classes. To do so implement/overwrite these functions:
* - void draw(JKQTPEnhancedPainter& painter);
- * - void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect);
+ * - void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect);
* - bool getXMinMax(double& minx, double& maxx, double& smallestGreaterZero);
* - bool getYMinMax(double& miny, double& maxy, double& smallestGreaterZero);
* - QColor getKeyLabelColor() const=0;
@@ -73,7 +73,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPPlotElement: public QObject {
virtual void draw(JKQTPEnhancedPainter& painter)=0;
/** \brief plots a key marker inside the specified rectangle \a rect */
- virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect)=0;
+ virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, const QRectF& rect)=0;
/** \brief returns an image with a key marker inside */
QImage generateKeyMarker(QSize size=QSize(16,16));
diff --git a/lib/jkqtplotter/jkqtpkey.cpp b/lib/jkqtplotter/jkqtpkey.cpp
new file mode 100644
index 0000000000..3c4fdfbd25
--- /dev/null
+++ b/lib/jkqtplotter/jkqtpkey.cpp
@@ -0,0 +1,593 @@
+/*
+ Copyright (c) 2008-2022 Jan W. Krieger ()
+
+
+
+ This software is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License (LGPL) as published by
+ the Free Software Foundation, either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License (LGPL) for more details.
+
+ You should have received a copy of the GNU Lesser General Public License (LGPL)
+ along with this program. If not, see .
+*/
+
+#include "jkqtplotter/jkqtpkey.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpgraphsbase.h"
+#include "jkqtcommon/jkqtpdrawingtools.h"
+#include
+#include
+#include
+#include "jkqtplotter/jkqtptools.h"
+#include "jkqtmathtext/jkqtmathtext.h"
+
+
+
+JKQTPBaseKey::JKQTPBaseKey(JKQTBasePlotter* _parent):
+ QObject(_parent),
+ parent(_parent),
+ localKeyStyle()
+{
+
+}
+
+JKQTPBaseKey::~JKQTPBaseKey() {
+
+}
+
+void JKQTPBaseKey::setParent(JKQTBasePlotter* parent) {
+ this->parent=parent;
+ QObject::setParent(parent);
+}
+
+void JKQTPBaseKey::redrawPlot() {
+ if (parent) {
+ parent->updateSecondaryAxes();
+ parent->redrawPlot();
+ }
+}
+
+void JKQTPBaseKey::loadSettings(const QSettings& settings, const QString& group) {
+ keyStyle().loadSettings(settings, group);
+}
+
+void JKQTPBaseKey::saveSettings(QSettings& settings, const QString& group) const {
+ keyStyle().saveSettings(settings, group);
+}
+
+void JKQTPBaseKey::drawKey(JKQTPEnhancedPainter &painter, const QRectF &rect, const KeySizeDescription& layout)
+{
+ if (!keyStyle().visible) return;
+
+ QFont kf(JKQTMathTextFontSpecifier::fromFontSpec(keyStyle().fontName).fontName(), keyStyle().fontSize);
+ kf.setPointSizeF(keyStyle().fontSize*getParent()->getFontSizeMultiplier());
+ const QFontMetricsF kfm(kf, painter.device());
+ const qreal Xwid=kfm.boundingRect('X').width();
+ const qreal FHeight=kfm.height();
+
+ // determine layouting info and size
+ QPointF internalOffset(0,0);
+ const QSizeF keySize=extendLayoutSize(QSizeF(layout.d->calcOverallWidth(keyStyle().sampleLineLength*Xwid, keyStyle().xSeparation*Xwid, keyStyle().columnSeparation*Xwid),
+ layout.d->calcOverallHeight(keyStyle().ySeparation*FHeight, keyStyle().sampleHeight*FHeight)), painter, &internalOffset);
+ if (keySize.isEmpty() || keySize.isNull() || !keySize.isValid()) return;
+
+ const double frameWidth=qMax(JKQTPlotterDrawingTools::ABS_MIN_LINEWIDTH, getParent()->pt2px(painter, keyStyle().frameWidth*getParent()->getLineWidthMultiplier()));
+
+ const bool drawDebugRects=getParent()->isDebugShowRegionBoxesEnabled();
+
+ // calculate start position for drawing
+ QPointF x0(0,0);
+ if (keyStyle().position.testFlag(JKQTPKeyLeft)) {
+ x0.setX(rect.left()+keyStyle().xOffset*Xwid);
+ } else if (keyStyle().position.testFlag(JKQTPKeyHCenter)) {
+ x0.setX(rect.left()+(rect.width()-keySize.width())/2.0+keyStyle().xOffset*Xwid);
+ } else if (keyStyle().position.testFlag(JKQTPKeyRight)) {
+ x0.setX(rect.right()-keySize.width()-keyStyle().xOffset*Xwid);
+ }
+ if (keyStyle().position.testFlag(JKQTPKeyTop)) {
+ x0.setY(rect.top()+keyStyle().yOffset*Xwid);
+ } else if (keyStyle().position.testFlag(JKQTPKeyVCenter)) {
+ x0.setY(rect.top()+(rect.height()-keySize.height())/2.0+keyStyle().yOffset*Xwid);
+ } else if (keyStyle().position.testFlag(JKQTPKeyBottom)) {
+ x0.setY(rect.bottom()-keySize.height()-keyStyle().yOffset*Xwid);
+ }
+
+
+ const QRectF rectKey(x0, keySize);
+
+ // construct necessary pens ...
+ QPen pf;
+ if (keyStyle().frameVisible) {
+ pf.setColor(keyStyle().frameColor);
+ pf.setWidthF(frameWidth);
+ pf.setStyle(keyStyle().frameLineStyle);
+ } else {
+ pf=Qt::NoPen;
+ }
+
+ // start drawing
+ {
+ painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
+
+ // draw background rectangle
+ {
+ painter.save(); auto __finalbackpaint=JKQTPFinally([&painter]() {painter.restore();});
+ painter.setBrush(keyStyle().backgroundBrush);
+ painter.setPen(pf);
+ if (keyStyle().frameRounding<=0) {
+ painter.drawRect(rectKey);
+ } else {
+ painter.drawRoundedRect(rectKey, getParent()->pt2px(painter, keyStyle().frameRounding), getParent()->pt2px(painter, keyStyle().frameRounding));
+ }
+ }
+
+ // draw key table/contents
+ x0=x0+internalOffset;
+ QPointF xi=x0;
+ for (const auto& c: layout.d->columns) {
+ xi.setY(x0.y());
+ int ir=0;
+ for (const auto& r: c.rows) {
+ const QRectF sampleRect(xi, QSizeF(keyStyle().sampleLineLength*Xwid, keyStyle().sampleHeight*FHeight));
+ const double rowHeight=layout.d->calcRowHeight(ir, sampleRect.height());
+ const QRectF textRect(xi+QPointF((keyStyle().sampleLineLength+keyStyle().xSeparation)*Xwid, 0), QSize(r.size.width(), rowHeight));
+ drawEntrySample(r.id, painter, sampleRect),
+ getParentMathText()->setFontColor(keyStyle().textColor);
+ getParentMathText()->setFontPointSize(keyStyle().fontSize*getParent()->getFontSizeMultiplier());
+ getParentMathText()->setFontSpecial(keyStyle().fontName);
+ getParentMathText()->parse(r.text);
+ getParentMathText()->draw(painter, Qt::AlignLeft|Qt::AlignVCenter, textRect, getParent()->isDebugShowTextBoxesEnabled());
+
+ if (drawDebugRects) {
+ painter.save(); auto __finalpaintinner=JKQTPFinally([&painter]() {painter.restore();});
+ QPen p("orange");
+ QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
+ p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth/2.0);
+ p.setStyle(Qt::DashLine);
+ painter.setPen(p);
+ painter.setBrush(QBrush(QColor(Qt::transparent)));
+ painter.drawRect(textRect);
+ painter.drawRect(sampleRect);
+ }
+
+ xi.setY(xi.y()+rowHeight+keyStyle().ySeparation*FHeight);
+ ir++;
+ }
+ xi.setX(xi.x()+c.calcColumnWidth(keyStyle().sampleLineLength*Xwid, keyStyle().xSeparation*Xwid)+keyStyle().columnSeparation*Xwid);
+ }
+
+ }
+}
+
+JKQTPBaseKey::KeySizeDescription JKQTPBaseKey::getSize(JKQTPEnhancedPainter &painter)
+{
+ KeySizeDescription size;
+ if (!keyStyle().visible) return size;
+
+ QFont kf(JKQTMathTextFontSpecifier::fromFontSpec(keyStyle().fontName).fontName(), keyStyle().fontSize);
+ kf.setPointSizeF(keyStyle().fontSize*getParent()->getFontSizeMultiplier());
+ const QFontMetricsF kfm(kf, painter.device());
+ const qreal Xwid=kfm.boundingRect('X').width();
+
+ // calculate layout of the "table" of samples and labels
+ const KeyLayoutDescription layout=getKeyLayout(painter);
+ size.d->operator=(layout);
+
+ // calculate size of full key
+ calcLayoutSize(painter, size);
+
+ return size;
+}
+
+
+void JKQTPBaseKey::calcLayoutSize(JKQTPEnhancedPainter &painter, KeySizeDescription &layout) const
+{
+ QFont kf(JKQTMathTextFontSpecifier::fromFontSpec(keyStyle().fontName).fontName(), keyStyle().fontSize);
+ kf.setPointSizeF(keyStyle().fontSize*getParent()->getFontSizeMultiplier());
+ const QFontMetricsF kfm(kf, painter.device());
+ const qreal Xwid=kfm.boundingRect('X').width();
+ const qreal FHeight=kfm.height();
+
+ layout.requiredSize=extendLayoutSize(QSizeF(layout.d->calcOverallWidth(keyStyle().sampleLineLength*Xwid, keyStyle().xSeparation*Xwid, keyStyle().columnSeparation*Xwid),
+ layout.d->calcOverallHeight(keyStyle().ySeparation*FHeight, keyStyle().sampleHeight*FHeight)), painter);
+
+ // determine location of key from keySTyle().positon
+ if (keyStyle().position.testFlag(JKQTPKeyInside)) layout.keyLocation=KeySizeDescription::keyInside;
+ else if (keyStyle().position.testFlag(JKQTPKeyOutsideTop)) { layout.keyLocation=KeySizeDescription::keyOutsideTop; layout.requiredSize+=QSizeF(0,keyStyle().yOffset*Xwid); }
+ else if (keyStyle().position.testFlag(JKQTPKeyOutsideBottom)) { layout.keyLocation=KeySizeDescription::keyOutsideBottom; layout.requiredSize+=QSizeF(0,keyStyle().yOffset*Xwid); }
+ else if (keyStyle().position.testFlag(JKQTPKeyOutsideLeft)) { layout.keyLocation=KeySizeDescription::keyOutsideLeft; layout.requiredSize+=QSizeF(0,keyStyle().xOffset*Xwid); }
+ else if (keyStyle().position.testFlag(JKQTPKeyOutsideRight)) { layout.keyLocation=KeySizeDescription::keyOutsideRight; layout.requiredSize+=QSizeF(0,keyStyle().xOffset*Xwid); }
+}
+
+void JKQTPBaseKey::modifySize(JKQTPEnhancedPainter &painter, KeySizeDescription ¤tKeyLayout, QSizeF preliminaryPlotSize)
+{
+ const auto lay=getLayout();
+ if (lay==JKQTPKeyLayoutMultiColumn || lay==JKQTPKeyLayoutMultiRow) {
+ std::function fCompare=[](const QSizeF& requiredSize, const QSizeF& preliminaryPlotSize) {
+ return true;
+ };
+
+ if (currentKeyLayout.keyLocation==KeySizeDescription::keyInside) {
+ fCompare=[](const QSizeF& requiredSize, const QSizeF& preliminaryPlotSize) {
+ return (requiredSize.width()>preliminaryPlotSize.width() || requiredSize.height()>preliminaryPlotSize.height());
+ };
+ } else if (currentKeyLayout.keyLocation==KeySizeDescription::keyOutsideTop || currentKeyLayout.keyLocation==KeySizeDescription::keyOutsideBottom) {
+ fCompare=[](const QSizeF& requiredSize, const QSizeF& preliminaryPlotSize) {
+ return (requiredSize.height()>preliminaryPlotSize.height());
+ };
+ } else if (currentKeyLayout.keyLocation==KeySizeDescription::keyOutsideLeft || currentKeyLayout.keyLocation==KeySizeDescription::keyOutsideRight) {
+ fCompare=[](const QSizeF& requiredSize, const QSizeF& preliminaryPlotSize) {
+ return (requiredSize.width()>preliminaryPlotSize.width());
+ };
+ }
+
+ const int itemCnt=currentKeyLayout.d->countItems();
+ int newCount=1;
+ while ((newCount<=itemCnt) && (currentKeyLayout.requiredSize.width()>preliminaryPlotSize.width() || currentKeyLayout.requiredSize.height()>preliminaryPlotSize.height())) {
+ newCount++;
+ if (lay==JKQTPKeyLayoutMultiColumn) {
+ currentKeyLayout.d->redistributeOverColumns(newCount);
+ } else if (lay==JKQTPKeyLayoutMultiRow) {
+ currentKeyLayout.d->redistributeOverRows(newCount);
+ }
+ calcLayoutSize(painter, currentKeyLayout);
+ }
+ }
+}
+
+JKQTMathText* JKQTPBaseKey::getParentMathText() {
+ if (!parent) return nullptr;
+ return parent->getMathText();
+}
+
+const JKQTMathText* JKQTPBaseKey::getParentMathText() const {
+ if (!parent) return nullptr;
+ return parent->getMathText();
+}
+
+const JKQTPKeyStyle &JKQTPBaseKey::getCurrentKeyStyle() const
+{
+ return keyStyle();
+}
+
+void JKQTPBaseKey::setCurrentKeyStyle(const JKQTPKeyStyle &style)
+{
+ keyStyle()=style;
+ redrawPlot();
+}
+
+JKQTPBaseKey::KeyLayoutDescription JKQTPBaseKey::getKeyLayout(JKQTPEnhancedPainter &painter)
+{
+ QFont kf(JKQTMathTextFontSpecifier::fromFontSpec(keyStyle().fontName).fontName(), keyStyle().fontSize);
+ kf.setPointSizeF(keyStyle().fontSize*getParent()->getFontSizeMultiplier());
+ QFontMetricsF kfm(kf, painter.device());
+ //const qreal Xwid=kfm.boundingRect('X').width();
+ const qreal Fheight=kfm.height();
+ //const double frameWidth=qMax(JKQTPlotterDrawingTools::ABS_MIN_LINEWIDTH, getParent()->pt2px(painter, keyStyle().frameWidth*getParent()->getLineWidthMultiplier()));
+
+
+ JKQTPBaseKey::KeyLayoutDescription layout;
+
+ KeyColumnDescription allItems;
+
+ // first collect all items into one column
+ const int NItems=getEntryCount();
+ for (int i=0; igetTextSizeSize(keyStyle().fontName, keyStyle().fontSize, item.text, painter);
+ item.size.setHeight(qMax(item.size.height(), keyStyle().sampleHeight*Fheight));
+ allItems.rows.push_back(item);
+ }
+
+ // now redistrbute accordint to keyStyle().layout
+ if (keyStyle().layout==JKQTPKeyLayoutOneColumn || keyStyle().layout==JKQTPKeyLayoutMultiColumn) {
+ layout.columns.append(allItems);
+ } else if (keyStyle().layout==JKQTPKeyLayoutOneRow || keyStyle().layout==JKQTPKeyLayoutMultiRow) {
+ for (const auto& r: allItems.rows) {
+ layout.columns.emplaceBack(r);
+ }
+ }
+
+
+ return layout;
+}
+
+
+QSizeF JKQTPBaseKey::extendLayoutSize(QSizeF rawLayoutSize, JKQTPEnhancedPainter& painter, QPointF *offset) const
+{
+ QFont kf(JKQTMathTextFontSpecifier::fromFontSpec(keyStyle().fontName).fontName(), keyStyle().fontSize);
+ kf.setPointSizeF(keyStyle().fontSize*getParent()->getFontSizeMultiplier());
+ QFontMetricsF kfm(kf, painter.device());
+ const qreal Xwid=kfm.boundingRect('X').width();
+ const double frameWidth=qMax(JKQTPlotterDrawingTools::ABS_MIN_LINEWIDTH, getParent()->pt2px(painter, keyStyle().frameWidth*getParent()->getLineWidthMultiplier()));
+
+ if (rawLayoutSize.width()>0) rawLayoutSize.setWidth(rawLayoutSize.width()+2.0*keyStyle().xMargin*Xwid+2.0*frameWidth);
+ if (rawLayoutSize.height()>0) rawLayoutSize.setHeight(rawLayoutSize.height()+2.0*keyStyle().yMargin*Xwid+2.0*frameWidth);
+ if (offset) *offset=QPointF(keyStyle().xMargin*Xwid+frameWidth, keyStyle().yMargin*Xwid+frameWidth);
+ return rawLayoutSize;
+}
+
+const JKQTPKeyStyle &JKQTPBaseKey::keyStyle() const
+{
+ return localKeyStyle;
+}
+
+JKQTPKeyStyle &JKQTPBaseKey::keyStyle()
+{
+ return localKeyStyle;
+}
+
+JKQTPBaseKey::KeyItemData::KeyItemData(int _id, const QString &_text, const QSizeF _size):
+ id(_id),
+ text(_text),
+ size(_size)
+{
+
+}
+
+
+JKQTPBaseKey::KeySizeDescription::KeySizeDescription(QSize _requiredSize, KeyLocation _keyLocation):
+ requiredSize(_requiredSize),
+ keyLocation(_keyLocation),
+ d(new JKQTPBaseKey::KeyLayoutDescription)
+{
+
+}
+
+JKQTPBaseKey::KeySizeDescription::KeySizeDescription(const KeySizeDescription &other):
+ requiredSize(),
+ keyLocation(KeyLocation::keyInside),
+ d(new JKQTPBaseKey::KeyLayoutDescription)
+{
+ operator=(other);
+}
+
+JKQTPBaseKey::KeySizeDescription &JKQTPBaseKey::KeySizeDescription::operator=(const KeySizeDescription &other)
+{
+ requiredSize=other.requiredSize;
+ keyLocation=other.keyLocation;
+ d->operator=(*(other.d));
+ return *this;
+}
+
+JKQTPBaseKey::KeyColumnDescription::KeyColumnDescription():
+ rows()
+{
+
+}
+
+JKQTPBaseKey::KeyColumnDescription::KeyColumnDescription(const KeyItemData &item1):
+ KeyColumnDescription()
+{
+ rows.append(item1);
+}
+
+double JKQTPBaseKey::KeyColumnDescription::calcMaxLabelWidth() const
+{
+ double w=0;
+ for (const auto& r: rows) {
+ w=qMax(w, r.size.width());
+ }
+ return w;
+}
+
+double JKQTPBaseKey::KeyColumnDescription::calcColumnWidth(double sampleLineLength, double xSeparation) const
+{
+ return calcMaxLabelWidth()+sampleLineLength+xSeparation;
+}
+
+double JKQTPBaseKey::KeyLayoutDescription::calcOverallWidth(double sampleLineLength, double xSeparation, double columnSeparation) const
+{
+ double w=0;
+ for (const auto& c: columns) {
+ if (w>0) w+=columnSeparation;
+ w+=sampleLineLength;
+ w+=xSeparation;
+ w+=c.calcMaxLabelWidth();
+ }
+ return w;
+}
+
+double JKQTPBaseKey::KeyLayoutDescription::calcOverallHeight(double ySeparation, double sampleHeight) const
+{
+ double h=0;
+ const int N=calcRowCount();
+ for (int i=0; i0) h+=ySeparation;
+ }
+ return h;
+}
+
+double JKQTPBaseKey::KeyLayoutDescription::calcRowHeight(int i, double sampleHeight) const
+{
+ double h=0;
+ for (const auto& c: columns) {
+ if (i>=0 && i0) h=qMax(sampleHeight, h);
+ return h;
+
+}
+
+int JKQTPBaseKey::KeyLayoutDescription::calcRowCount() const
+{
+ int n=0;
+ for (const auto& c: columns) {
+ n=qMax(n, c.rows.size());
+ }
+ return n;
+}
+
+int JKQTPBaseKey::KeyLayoutDescription::countItems() const
+{
+ int n=0;
+ for (const auto& c: columns) {
+ n+=c.rows.size();
+ }
+ return n;
+}
+
+void JKQTPBaseKey::KeyLayoutDescription::redistributeIntoOneColumn()
+{
+ if (countItems()>1) {
+ for (int i=1; i=1; i--) {
+ columns.remove(i);
+ }
+ }
+}
+
+void JKQTPBaseKey::KeyLayoutDescription::redistributeOverRows(int rowCnt)
+{
+ const int itemCnt=countItems();
+ if (itemCnt>1) {
+ const int colCnt=static_cast(ceil(static_cast(itemCnt)/static_cast(rowCnt)));
+ if (colCnt>1) {
+ redistributeIntoOneColumn();
+ const auto items=columns[0].rows;
+ columns.clear();
+
+ int i=0;
+ for (int c=0; c1) {
+ const int rowCnt=static_cast(ceil(static_cast(itemCnt)/static_cast(colCnt)));
+ if (colCnt>1) {
+ redistributeIntoOneColumn();
+ const auto items=columns[0].rows;
+ columns.clear();
+ int i=0;
+ for (int c=0; cgetTitle();
+ return s;
+}
+
+QColor JKQTPMainKey::getEntryColor(int item) const
+{
+ QColor s=keyStyle().textColor;
+ const auto g=getPlotElement(item);
+ if (g) s=g->getKeyLabelColor();
+ return s;
+}
+
+void JKQTPMainKey::drawEntrySample(int item, JKQTPEnhancedPainter &painter, const QRectF &rect)
+{
+ auto g=getPlotElement(item);
+ if (g) g->drawKeyMarker(painter, rect);
+}
+
+QList JKQTPMainKey::getPlotElements() const
+{
+ const auto p=getParent();
+ QList l;
+ if (!p) return l;
+ l.reserve(p->getGraphCount());
+ for (size_t i=0; igetGraphCount(); i++) {
+ const auto g=p->getGraph(i);
+ if (g && g->isVisible() && !g->getTitle().isEmpty()) {
+ l<getMainKeyStyle();
+}
+
+JKQTPKeyStyle &JKQTPMainKey::keyStyle()
+{
+ return getParent()->getMainKeyStyle();
+}
+
+const JKQTPPlotElement* JKQTPMainKey::getPlotElement(int item) const
+{
+ const auto p=getParent();
+ if (!p) return nullptr;
+ int curitem=0;
+ for (size_t i=0; igetGraphCount(); i++) {
+ const auto g=p->getGraph(i);
+ if (g && g->isVisible() && !g->getTitle().isEmpty()) {
+ if (curitem==item) return g;
+ curitem++;
+ }
+ }
+ return nullptr;
+}
+
+
+JKQTPPlotElement* JKQTPMainKey::getPlotElement(int item)
+{
+ auto p=getParent();
+ if (!p) return nullptr;
+ int curitem=0;
+ for (size_t i=0; igetGraphCount(); i++) {
+ auto g=p->getGraph(i);
+ if (g && g->isVisible() && !g->getTitle().isEmpty()) {
+ if (curitem==item) return g;
+ curitem++;
+ }
+ }
+ return nullptr;
+}
+
diff --git a/lib/jkqtplotter/jkqtpkey.h b/lib/jkqtplotter/jkqtpkey.h
new file mode 100644
index 0000000000..cca0ee0f9e
--- /dev/null
+++ b/lib/jkqtplotter/jkqtpkey.h
@@ -0,0 +1,372 @@
+/*
+ Copyright (c) 2023-2023 Jan W. Krieger ()
+
+
+
+ This software is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License (LGPL) as published by
+ the Free Software Foundation, either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License (LGPL) for more details.
+
+ You should have received a copy of the GNU Lesser General Public License (LGPL)
+ along with this program. If not, see .
+*/
+
+
+
+
+#ifndef JKQTPKEY_H
+#define JKQTPKEY_H
+
+
+#include
+#include
+#include "jkqtplotter/jkqtplotter_imexport.h"
+#include "jkqtplotter/jkqtpkeystyle.h"
+
+// forward declarations
+class JKQTBasePlotter;
+class JKQTPPlotElement;
+class JKQTMathText;
+
+
+
+/*! \brief base class for drawing a key (or legend)
+ \ingroup jkqtpbaseplotter_elements
+
+ This class immplements the basic layouting and drawing of a key/legend:
+
+ \image html plot_key.png
+
+ It relies on these protected virtual functions to determine the contents of the legend items:
+ - getEntryCount()
+ - getEntryTextExtent()
+ - getEntryText()
+ - drawEntrySample()
+ .
+ So you can derive from JKQTPBaseKey and implement these to provide a new source of data.
+
+ There are additional customization points in this class. You can also override the
+ default implementations of these functions to change the way keys/legends are drawn:
+ - drawKey()
+ - getLayout()
+ - modifySize()
+ .
+
+ \see JKQTPKeyStyle
+
+ */
+class JKQTPLOTTER_LIB_EXPORT JKQTPBaseKey: public QObject {
+ Q_OBJECT
+ protected:
+ struct KeyLayoutDescription; // forward
+ public:
+
+ /** \brief class constructor */
+ explicit JKQTPBaseKey(JKQTBasePlotter* parent);
+ /** \brief class destructor */
+ virtual ~JKQTPBaseKey();
+ virtual void setParent(JKQTBasePlotter* parent);
+ /** \brief loads the plot properties from a QSettings object */
+ virtual void loadSettings(const QSettings &settings, const QString& group=QString("plots/key/"));
+
+ /** \brief saves the plot properties into a QSettings object.
+ *
+ * This method only saves those properties that differ from their default value.
+ */
+ virtual void saveSettings(QSettings& settings, const QString& group=QString("plots/key/")) const;
+
+
+
+ /** \brief describes a single key entry */
+ struct JKQTPLOTTER_LIB_EXPORT KeyItemData {
+ KeyItemData(int _id=-1, const QString& _text="", const QSizeF _size=QSizeF());
+ /** \brief id of the item, used to call drawEntrySample() etc. */
+ int id;
+ /** \brief text/label text/markup in the enry */
+ QString text;
+ /** \brief size of \a text in pixels */
+ QSizeF size;
+
+ };
+
+
+ /** \brief struct, describing basic layout and size properties of a key/legend, mostly used as return value of getSize(). */
+ struct JKQTPLOTTER_LIB_EXPORT KeySizeDescription {
+
+ /** \brief type describing the position of the key */
+ enum KeyLocation {
+ keyInside, /*!< \brief somewhere inside the plot */
+ keyOutsideLeft, /*!< \brief on the left of the plot */
+ keyOutsideRight, /*!< \brief on the right of the plot */
+ keyOutsideTop, /*!< \brief above the plot */
+ keyOutsideBottom /*!< \brief below the plot */
+ };
+
+ KeySizeDescription(QSize _requiredSize=QSize(), KeyLocation _keyLocation=keyInside);
+ KeySizeDescription(const KeySizeDescription& other);
+ KeySizeDescription& operator=(const KeySizeDescription& other);
+
+ /** \brief required spacefor the key/legend [pixels] */
+ QSizeF requiredSize;
+ /** \brief where the size requiredSize has to be resevred for the key */
+ KeyLocation keyLocation;
+
+ /** \brief private data \internal */
+ std::unique_ptr d;
+
+ };
+
+ /** \brief calculates the size required for the key
+ *
+ * This function internally calls getLayout(), which is (together with drawKey() )
+ * a customization point for key layout.
+ */
+ KeySizeDescription getSize(JKQTPEnhancedPainter& painter) ;
+ /** \brief econd stage of size calculation
+ *
+ * This functions allows to again modify the KeySizeDescription \a currentSize in a second step,
+ * when the preliminary size of the plot is known (given as \a preliminaryPlotSize ).
+ *
+ * This is used to implement the JKQTPKeyLayout::JKQTPKeyLayoutMultiColumn and JKQTPKeyLayout::JKQTPKeyLayoutMultiRow,
+ * where the distribution of entries over rows/columns is calculated here.
+ *
+ * \note This function is declared virtual so it can be used as a customization point!
+ */
+ virtual void modifySize(JKQTPEnhancedPainter& painter, KeySizeDescription& currentSize, QSizeF preliminaryPlotSize) ;
+
+ /** \brief draw the key
+ *
+ * \param painter the painter to use for drawing
+ * \param rect the rectangle to plot the key into, depending on JKQTPKeyStyle::position this is either the plot rectangle itself, or
+ * a rectangle outside the plot that fits the key
+ * \param layout output of getSize(), possibly modified by modifySize()
+ *
+ * \note It is expected that the owning JKQTBasePlotter first calls getSize() and the determmines a QREct that fits the legend. The latter is the supplied as \a rect to this function for subsequent drawing.
+ * It is also expected that the legends contents does not changed in the meantime!
+ */
+ virtual void drawKey(JKQTPEnhancedPainter& painter, const QRectF &rect, const KeySizeDescription &layout);
+
+
+ /** \copydoc parent */
+ inline const JKQTBasePlotter* getParent() const { return parent; }
+ /** \copydoc parent */
+ inline JKQTBasePlotter* getParent() { return parent; }
+
+ /** \brief current style properties (JKQTPKeyStyle) for this JKQTPKey
+ *
+ * \see JKQTPKeyStyle
+ */
+ const JKQTPKeyStyle &getCurrentKeyStyle() const;
+
+ /** \brief replace the current style properties for this JKQTPKey
+ *
+ * \see JKQTPSetSystemDefaultBaseStyle(), JKQTPSetSystemDefaultBaseStyle(), setCurrentAxisStyle(), getCurrentAxisStyle(), \ref jkqtpplotter_styling
+ */
+ void setCurrentKeyStyle(const JKQTPKeyStyle& style);
+
+ /** \copydoc JKQTPKeyStyle::frameVisible */
+ inline bool getFrameVisible() const { return keyStyle().frameVisible; }
+ /** \copydoc JKQTPKeyStyle::visible */
+ inline bool getVisible() const { return keyStyle().visible; }
+ /** \copydoc JKQTPKeyStyle::xMargin */
+ inline double getXMargin() const { return keyStyle().xMargin; }
+ /** \copydoc JKQTPKeyStyle::yMargin */
+ inline double getYMargin() const { return keyStyle().yMargin; }
+ /** \copydoc JKQTPKeyStyle::xOffset */
+ inline double getXOffset() const { return keyStyle().xOffset; }
+ /** \copydoc JKQTPKeyStyle::yOffset */
+ inline double getYOffset() const { return keyStyle().yOffset; }
+ /** \copydoc JKQTPKeyStyle::xSeparation */
+ inline double getXSeparation() const { return keyStyle().xSeparation; }
+ /** \copydoc JKQTPKeyStyle::ySeparation */
+ inline double getYSeparation() const { return keyStyle().ySeparation; }
+ /** \copydoc JKQTPKeyStyle::columnSeparation */
+ inline double getColumnSeparation() const { return keyStyle().columnSeparation; }
+ /** \copydoc JKQTPKeyStyle::position */
+ inline JKQTPKeyPosition getPosition() const { return keyStyle().position; }
+ /** \copydoc JKQTPKeyStyle::layout */
+ inline JKQTPKeyLayout getLayout() const { return keyStyle().layout; }
+ /** \copydoc JKQTPKeyStyle::frameColor */
+ inline QColor getFrameColor() const { return keyStyle().frameColor; }
+ /** \copydoc JKQTPKeyStyle::frameLineStyle */
+ inline Qt::PenStyle getFrameLineStyle() const { return keyStyle().frameLineStyle; }
+ /** \copydoc JKQTPKeyStyle::textColor */
+ inline QColor getTextColor() const { return keyStyle().textColor; }
+ /** \copydoc JKQTPKeyStyle::backgroundColor */
+ inline QColor getBackgroundColor() const { return keyStyle().backgroundBrush.color(); }
+ /** \copydoc JKQTPKeyStyle::backgroundBrush */
+ inline const QBrush& getBackgroundBrush() const { return keyStyle().backgroundBrush; }
+ /** \copydoc JKQTPKeyStyle::frameWidth */
+ inline double getFrameWidth() const { return keyStyle().frameWidth; }
+ /** \copydoc JKQTPKeyStyle::fontSize */
+ inline double getFontSize() const { return keyStyle().fontSize; }
+ /** \copydoc JKQTPKeyStyle::frameRounding */
+ inline double getFrameRounding() const { return keyStyle().frameRounding; }
+ /** \copydoc JKQTPKeyStyle::sampleLineLength */
+ inline double getSampleLineLength() const { return keyStyle().sampleLineLength; }
+ public Q_SLOTS:
+ /** \copydoc JKQTPKeyStyle::visible */
+ inline void setVisible(bool __value) { keyStyle().visible = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::frameVisible */
+ inline void setFrameVisible(bool __value) { keyStyle().frameVisible = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::frameWidth */
+ inline void setFrameWidth(double __value) { keyStyle().frameWidth = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::frameRounding */
+ inline void setFrameRounding(double __value) { keyStyle().frameRounding = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::fontSize */
+ inline void setFontSize(double __value) { keyStyle().fontSize = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::sampleLineLength */
+ inline void setSampleLineLength(double __value) { keyStyle().sampleLineLength = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::xMargin */
+ inline void setXMargin(double __value) { keyStyle().xMargin = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::yMargin */
+ inline void setYMargin(double __value) { keyStyle().yMargin = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::xOffset */
+ inline void setXOffset(double __value) { keyStyle().xOffset = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::yOffset */
+ inline void setYOffset(double __value) { keyStyle().yOffset = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::xSeparation */
+ inline void setXSeparation(double __value) { keyStyle().xSeparation = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::ySeparation */
+ inline void setYSeparation(double __value) { keyStyle().ySeparation = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::columnSeparation */
+ inline void setColumnSeparation(double __value) { keyStyle().columnSeparation = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::position */
+ inline void setPosition(JKQTPKeyPosition __value) { keyStyle().position = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::layout */
+ inline void setLayout(JKQTPKeyLayout __value) { keyStyle().layout = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::frameColor */
+ inline void setFrameColor(QColor __value) { keyStyle().frameColor = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::frameLineStyle */
+ inline void setFrameLineStyle(Qt::PenStyle __value) { keyStyle().frameLineStyle = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::textColor */
+ inline void setTextColor(QColor __value) { keyStyle().textColor = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::backgroundColor */
+ inline void setBackgroundColor(QColor __value) { keyStyle().backgroundBrush = __value; redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::backgroundColor */
+ inline void setBackgroundColor(QColor __value, Qt::BrushStyle __style) { keyStyle().backgroundBrush = QBrush(__value, __style); redrawPlot(); }
+ /** \copydoc JKQTPKeyStyle::backgroundBrush */
+ inline void setBackgroundBrush(const QBrush& __value) { keyStyle().backgroundBrush = __value; redrawPlot(); }
+
+ protected:
+ /** \brief returns the number of legend entries */
+ virtual int getEntryCount() const =0;
+ /** \brief returns the label text (my contain markup for a JKQTMathText) of legend entry \a item 's text part */
+ virtual QString getEntryText(int item) const =0;
+ /** \brief returns the label color of legend entry \a item 's text part */
+ virtual QColor getEntryColor(int item) const =0;
+ /** \brief draws the sample for legend entry \a item into the given \a rect, using the given \a painter */
+ virtual void drawEntrySample(int item, JKQTPEnhancedPainter& painter, const QRectF& rect) =0;
+
+ /** \brief describes one column of items in the key */
+ struct JKQTPLOTTER_LIB_EXPORT KeyColumnDescription {
+ KeyColumnDescription();
+ KeyColumnDescription(const KeyItemData& item1);
+ /** \brief list of all items in this row of key items */
+ QList rows;
+
+ /** \brief calculates the max. text width of the column in pixels */
+ double calcMaxLabelWidth() const;
+ /** \brief calculates the width of the column in pixels */
+ double calcColumnWidth(double sampleLineLength, double xSeparation) const;
+ };
+
+ /** \brief struct, describing basic layout and size properties of a key/legend, mostly used as return value of getSize(). */
+ struct JKQTPLOTTER_LIB_EXPORT KeyLayoutDescription {
+ /** \brief list of all columns with items in the key */
+ QList columns;
+ /** \brief calculates the width over all columns */
+ double calcOverallWidth(double sampleLineLength, double xSeparation, double columnSeparation) const;
+ /** \brief calculates the width over all columns */
+ double calcOverallHeight(double ySeparation, double sampleHeight) const;
+ /** \brief calculate the hieght of the \a i -th column */
+ double calcRowHeight(int i, double sampleHeight) const;
+ /** \brief calculates the number of rows */
+ int calcRowCount() const;
+ /** \brief calculate the number of items */
+ int countItems() const;
+ /** \brief put all items into one column */
+ void redistributeIntoOneColumn();
+ /** \brief takes all elements in columns and redistributes them over the given number of rows, items are distributed as equally as possible (last row may have fewer items) */
+ void redistributeOverRows(int rows);
+ /** \brief takes all elements in columns and redistributes them over the given number of columns, items are distributed as equally as possible (last column may have fewer items) */
+ void redistributeOverColumns(int cols);
+ };
+
+ /** \brief calculates all layout properties of the key/legend,necessary to size and draw it
+ *
+ * This is internally called by getSize() and drawKey().
+ */
+ virtual KeyLayoutDescription getKeyLayout(JKQTPEnhancedPainter& painter) ;
+ /** \brief fill KeySizeDescription::requiredSize */
+ void calcLayoutSize(JKQTPEnhancedPainter& painter, KeySizeDescription& layout) const;
+ /** \brief takes the size calculated by KeyLayoutDescription::calcOverallWidth() and KeyLayoutDescription::calcOverallHeight() and extends it with margins, line widths, ... optionally returns the one-sided offset*/
+ virtual QSizeF extendLayoutSize(QSizeF rawLayoutSize, JKQTPEnhancedPainter &painter, QPointF* offset=nullptr) const;
+ /** \brief provides the keyStyle to use for sizing/drawing this object */
+ virtual const JKQTPKeyStyle& keyStyle() const;
+ /** \brief provides the keyStyle to use for sizing/drawing this object */
+ virtual JKQTPKeyStyle& keyStyle();
+
+ /** \brief signals the parent JKQTBasePlotter to redraw */
+ void redrawPlot();
+ /** \brief retun parents JKQTMathText* object */
+ JKQTMathText* getParentMathText();
+ /** \brief retun parents JKQTMathText* object */
+ const JKQTMathText* getParentMathText() const;
+
+
+ /** \brief parent plotter class */
+ JKQTBasePlotter* parent;
+ private:
+ /** \brief current style properties for this key/legend
+ *
+ * \see JKQTPKeyStyle
+ */
+ JKQTPKeyStyle localKeyStyle;
+};
+
+
+/*! \brief concrete class for drawing the main plot key (or legend).
+ * This class reads the key entries fromm the graphs list of its parent JKQTBasePlotter.
+ \ingroup jkqtpbaseplotter_elements
+
+
+ \see JKQTPKeyStyle
+
+ */
+class JKQTPLOTTER_LIB_EXPORT JKQTPMainKey: public JKQTPBaseKey {
+ Q_OBJECT
+ protected:
+ public:
+
+ /** \brief class constructor */
+ explicit JKQTPMainKey(JKQTBasePlotter* parent);
+ /** \brief class destructor */
+ virtual ~JKQTPMainKey();
+ protected:
+ /** \copydoc JKQTPBaseKey::getEntryCount() */
+ virtual int getEntryCount() const override;
+ /** \copydoc JKQTPBaseKey::getEntryText() */
+ virtual QString getEntryText(int item) const override;
+ /** \copydoc JKQTPBaseKey::getEntryColor() */
+ virtual QColor getEntryColor(int item) const override;
+ /** \copydoc JKQTPBaseKey::drawEntrySample() */
+ virtual void drawEntrySample(int item, JKQTPEnhancedPainter& painter, const QRectF& rect) override;
+ /** \brief returns the graph class from parent JKQTBasePlotter for the given \a item in the key */
+ const JKQTPPlotElement* getPlotElement(int item) const;
+ /** \brief returns the graph class from parent JKQTBasePlotter for the given \a item in the key */
+ JKQTPPlotElement* getPlotElement(int item);
+ /** \brief returns all graph classes from parent JKQTBasePlotter for the key */
+ QList getPlotElements() const;
+ /** \brief provides the keyStyle to use for sizing/drawing this object (extracted from the parent JKQTBasePlotters's */
+ virtual const JKQTPKeyStyle& keyStyle() const;
+ /** \brief provides the keyStyle to use for sizing/drawing this object */
+ virtual JKQTPKeyStyle& keyStyle();
+};
+#endif // JKQTPKEY_H
diff --git a/lib/jkqtplotter/jkqtpkeystyle.cpp b/lib/jkqtplotter/jkqtpkeystyle.cpp
index f0a4107e5a..07c870e7a7 100644
--- a/lib/jkqtplotter/jkqtpkeystyle.cpp
+++ b/lib/jkqtplotter/jkqtpkeystyle.cpp
@@ -25,24 +25,25 @@
JKQTPKeyStyle::JKQTPKeyStyle():
frameVisible(true),
frameColor(QColor("black")),
+ frameLineStyle(Qt::SolidLine),
frameWidth(1),
frameRounding(0),
backgroundBrush(QColor("white")),
visible(true),
fontSize(QApplication::font().pointSizeF()),
+ fontName("GUI"),
textColor(QColor("black")),
- itemWidth(20),
- itemHeight(2.2),
sampleLineLength(3),
+ sampleHeight(1),
xMargin(0.5),
yMargin(0.5),
xOffset(1),
yOffset(1),
- xSeparation(0.75),
- ySeparation(0.75),
+ xSeparation(0.85),
+ columnSeparation(0.75),
+ ySeparation(0.35),
position(JKQTPKeyInsideTopRight),
- layout(JKQTPKeyLayoutOneColumn),
- autosize(true)
+ layout(JKQTPKeyLayoutOneColumn)
{
@@ -54,6 +55,7 @@ JKQTPKeyStyle::JKQTPKeyStyle(const JKQTBasePlotterStyle &baseStyle):
{
fontSize=baseStyle.defaultFontSize;
textColor=baseStyle.defaultTextColor;
+ fontName=baseStyle.defaultFontName;
}
void JKQTPKeyStyle::loadSettings(const QSettings &settings, const QString &group, const JKQTPKeyStyle &defaultStyle)
@@ -64,7 +66,9 @@ void JKQTPKeyStyle::loadSettings(const QSettings &settings, const QString &group
yMargin = settings.value(group+"ymargin", defaultStyle.yMargin).toDouble();
xSeparation = settings.value(group+"xseparation", defaultStyle.xSeparation).toDouble();
ySeparation = settings.value(group+"yseparation", defaultStyle.ySeparation).toDouble();
+ columnSeparation = settings.value(group+"column_separation", defaultStyle.columnSeparation).toDouble();
frameColor = jkqtp_String2QColor(settings.value(group+"frame_color", jkqtp_QColor2String(defaultStyle.frameColor)).toString());
+ frameLineStyle=jkqtp_String2QPenStyle(settings.value(group+"frame_linestyle", jkqtp_QPenStyle2String(frameLineStyle)).toString());
textColor = jkqtp_String2QColor(settings.value(group+"text_color", jkqtp_QColor2String(defaultStyle.textColor)).toString());
frameWidth = settings.value(group+"frame_width", defaultStyle.frameWidth).toDouble();
frameRounding = settings.value(group+"frame_rounding", defaultStyle.frameRounding).toDouble();
@@ -74,10 +78,9 @@ void JKQTPKeyStyle::loadSettings(const QSettings &settings, const QString &group
position = String2JKQTPKeyPosition(settings.value(group+"position", JKQTPKeyPosition2String(defaultStyle.position)).toString());
layout = String2JKQTPKeyLayout(settings.value(group+"layout", JKQTPKeyLayout2String(defaultStyle.layout)).toString());
fontSize = settings.value(group+"fontsize", defaultStyle.fontSize).toDouble();
- itemWidth = settings.value(group+"item_width", defaultStyle.itemWidth).toDouble();
- itemHeight = settings.value(group+"item_height", defaultStyle.itemHeight).toDouble();
- sampleLineLength = settings.value(group+"line_width", defaultStyle.sampleLineLength).toDouble();
- autosize = settings.value(group+"autosize", defaultStyle.autosize).toBool();
+ fontName = settings.value(group+"fontname", defaultStyle.fontName).toString();
+ sampleLineLength = settings.value(group+"sample_width", settings.value(group+"line_width", defaultStyle.sampleLineLength).toDouble()).toDouble();
+ sampleHeight = settings.value(group+"sample_height", defaultStyle.sampleHeight).toDouble();
}
void JKQTPKeyStyle::saveSettings(QSettings &settings, const QString &group) const
@@ -88,8 +91,10 @@ void JKQTPKeyStyle::saveSettings(QSettings &settings, const QString &group) cons
settings.setValue(group+"ymargin", yMargin);
settings.setValue(group+"xseparation", xSeparation);
settings.setValue(group+"yseparation", ySeparation);
+ settings.setValue(group+"column_separation", columnSeparation);
settings.setValue(group+"frame_visible", frameVisible);
settings.setValue(group+"frame_color", jkqtp_QColor2String(frameColor));
+ settings.setValue(group+"frame_linestyle", jkqtp_QPenStyle2String(frameLineStyle));
settings.setValue(group+"frame_width", frameWidth);
settings.setValue(group+"frame_rounding", frameRounding);
settings.setValue(group+"background_color", jkqtp_QColor2String(backgroundBrush.color()));
@@ -97,9 +102,8 @@ void JKQTPKeyStyle::saveSettings(QSettings &settings, const QString &group) cons
settings.setValue(group+"position", JKQTPKeyPosition2String(position));
settings.setValue(group+"layout", JKQTPKeyLayout2String(layout));
settings.setValue(group+"fontsize", fontSize);
+ settings.setValue(group+"fontname", fontName);
settings.setValue(group+"text_color", jkqtp_QColor2String(textColor));
- settings.setValue(group+"item_width", itemWidth);
- settings.setValue(group+"item_height", itemHeight);
- settings.setValue(group+"line_width", sampleLineLength);
- settings.setValue(group+"autosize", autosize);
+ settings.setValue(group+"sample_width", sampleLineLength);
+ settings.setValue(group+"sample_height", sampleHeight);
}
diff --git a/lib/jkqtplotter/jkqtpkeystyle.h b/lib/jkqtplotter/jkqtpkeystyle.h
index 174dd249d5..065d405589 100644
--- a/lib/jkqtplotter/jkqtpkeystyle.h
+++ b/lib/jkqtplotter/jkqtpkeystyle.h
@@ -17,8 +17,8 @@
along with this program. If not, see .
*/
-#ifndef JKQTPSTYLE_H
-#define JKQTPSTYLE_H
+#ifndef JKQTPKEYSTYLE_H
+#define JKQTPKEYSTYLE_H
#include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtplotter_imexport.h"
@@ -34,7 +34,9 @@ class JKQTBasePlotterStyle; // forward
/** \brief Support Class for JKQTBasePlotter, which summarizes all properties that define the visual styling of the key in a JKQTBasePlotter
* \ingroup jkqtpplotter_styling_classes
*
- * \see JKQTBasePlotter, JKQTBasePlotterStyle, \ref jkqtpplotter_styling
+ * \image html plot_key.png
+ *
+ * \see JKQTPKey, JKQTBasePlotter, JKQTBasePlotterStyle, \ref jkqtpplotter_styling
*/
class JKQTPLOTTER_LIB_EXPORT JKQTPKeyStyle {
Q_GADGET
@@ -64,6 +66,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPKeyStyle {
bool frameVisible;
/** \brief color of the key frame line */
QColor frameColor;
+ /** \brief linestyle for the frame */
+ Qt::PenStyle frameLineStyle;
/** \brief width of the key frame line [pt] */
double frameWidth;
/** \brief rounding radius of the key frame rectangle (<=0 -> no rounded rectangle) [pt] */
@@ -74,32 +78,33 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPKeyStyle {
bool visible;
/** \brief font size for key labels [in points] */
double fontSize;
+ /** \brief font name */
+ QString fontName;
/** \brief color of the key entries' text */
QColor textColor;
- /** \brief width of a key item in pt [in units of width of 'X' set in font, fontSize] */
- double itemWidth;
- /** \brief height of a key item in pt [in units of height of font, fontSize] */
- double itemHeight;
- /** \brief length of the line samples in the key in pt [in units of width of 'X' set in font, fontSize] */
+ /** \brief length of the line samples in the key [in units of width of 'X' set in fontName, fontSize] */
double sampleLineLength;
- /** \brief x-distance between key frame and key content [in units of width of 'X' set in font, fontSize] */
+ /** \brief height of a line sample [in units of height of fontName, fontSize] */
+ double sampleHeight;
+ /** \brief x-distance between key frame and key content [in units of width of 'X' set in fontName, fontSize] */
double xMargin;
- /** \brief y-distance between key frame and key content [in units of width of 'x' set in font, fontSize] */
+ /** \brief y-distance between key frame and key content [in units of width of 'X' set in fontName, fontSize] */
double yMargin;
- /** \brief x-offset of the key from the border of the plot [in units of width of 'X' set in font, fontSize] */
+ /** \brief x-offset of the key from the border of the plot [in units of width of 'X' set in fontName, fontSize] */
double xOffset;
- /** \brief y-offset of the key from the border of the plot [in units of width of 'x' set in font, fontSize] */
+ /** \brief y-offset of the key from the border of the plot [in units of width of 'X' set in fontName, fontSize] */
double yOffset;
- /** \brief distance between key line example and key text [in units of width of 'X' set in font, fontSize] */
+ /** \brief distance between key line example and key text [in units of width of 'X' set in fontName, fontSize] */
double xSeparation;
- /** \brief distance between two key entries [in units of height of font, fontSize] */
+ /** \brief distance between two key entries [in units of height of fontName, fontSize] */
double ySeparation;
+ /** \brief distance between two columns of key entries [in units of width of 'X' set in fontName, fontSize] */
+ double columnSeparation;
+
/** \brief key position */
JKQTPKeyPosition position;
/** \brief the key layout */
JKQTPKeyLayout layout;
- /** \brief determine width of the key automatically */
- bool autosize;
};
-#endif // JKQTPSTYLE_H
+#endif // JKQTPKEYSTYLE_H
diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h
index 304c562b36..7dd2c66cb1 100644
--- a/lib/jkqtplotter/jkqtplotter.h
+++ b/lib/jkqtplotter/jkqtplotter.h
@@ -400,13 +400,32 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
/** \brief get the width/height of the icons in the toolbar in pt */
int getToolbarIconSize() const;
- /** \brief returns the class internally used for plotting */
+ /** \brief returns the JKQTBasePlotter object internally used for plotting */
JKQTBasePlotter* getPlotter() { return plotter; }
- /** \brief returns the class internally used for plotting */
+ /** \brief returns the JKQTBasePlotter object internally used for plotting */
const JKQTBasePlotter* getPlotter() const { return plotter; }
- /** \brief returns the class internally used for plotting */
+ /** \brief returns the JKQTBasePlotter object internally used for plotting */
const JKQTBasePlotter* getConstplotter() const { return const_cast(plotter); }
+
+ /** \brief returns the JKQTPBaseKey object representing the main plot key/legend
+ *
+ * \see JKQTBasePlotter::getMainKey()
+ */
+ inline JKQTPBaseKey* getMainKey()
+ {
+ return plotter->getMainKey();
+ }
+
+ /** \brief returns the JKQTPBaseKey object representing the main plot key/legend
+ *
+ * \see JKQTBasePlotter::getMainKey()
+ */
+ inline const JKQTPBaseKey* getMainKey() const
+ {
+ return plotter->getMainKey();
+ }
+
/** \brief returns whether the toolbar is enabled
*
* \copydetails JKQTPlotterStyle::toolbarEnabled
@@ -839,10 +858,6 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
}
- /** \copydoc JKQTBasePlotter::getKeyFontSize() */
- inline double getKeyFontSize() const {
- return getConstplotter()->getKeyFontSize();
- }
/** \brief returns the currently set mode for the context menu \see JKQTPContextMenuModes, \ref JKQTPLOTTER_CONTEXTMENU , \ref JKQTPLOTTER_SPECIALCONTEXTMENU , \ref JKQTPLOTTER_USERMOUSEINTERACTION */
JKQTPContextMenuModes getContextMenuMode() const;
diff --git a/lib/jkqtplotter/jkqtptools.cpp b/lib/jkqtplotter/jkqtptools.cpp
index 39ce337c8b..b048b0759e 100644
--- a/lib/jkqtplotter/jkqtptools.cpp
+++ b/lib/jkqtplotter/jkqtptools.cpp
@@ -162,30 +162,63 @@ JKQTPLabelPosition String2JKQTPLabelPosition(const QString& pos) {
QString JKQTPKeyPosition2String(JKQTPKeyPosition pos) {
switch(pos) {
case JKQTPKeyOutsideLeftBottom: return "outside_leftbottom";
+ case JKQTPKeyOutsideLeftTop: return "outside_lefttop";
+ case JKQTPKeyOutsideLeftCenter: return "outside_leftcenter";
+
case JKQTPKeyOutsideTopLeft: return "outside_topleft";
case JKQTPKeyOutsideTopRight: return "outside_topright";
- case JKQTPKeyOutsideLeftTop: return "outside_lefttop";
+ case JKQTPKeyOutsideTopCenter: return "outside_topcenter";
case JKQTPKeyOutsideRightBottom: return "outside_rightbottom";
+ case JKQTPKeyOutsideRightTop: return "outside_righttop";
+ case JKQTPKeyOutsideRightCenter: return "outside_rightcenter";
+
case JKQTPKeyOutsideBottomLeft: return "outside_bottomleft";
case JKQTPKeyOutsideBottomRight: return "outside_bottomright";
- case JKQTPKeyOutsideRightTop: return "outside_righttop";
+ case JKQTPKeyOutsideBottomCenter: return "outside_bottomcenter";
case JKQTPKeyInsideBottomRight: return "inside_bottomright";
case JKQTPKeyInsideTopLeft: return "inside_topleft";
case JKQTPKeyInsideTopRight: return "inside_topright";
case JKQTPKeyInsideBottomLeft: return "inside_bottomleft";
+ case JKQTPKeyInsideTop: return "inside_top";
+ case JKQTPKeyInsideBottom: return "inside_bottom";
+ case JKQTPKeyInsideLeft: return "inside_left";
+ case JKQTPKeyInsideRight: return "inside_right";
}
- return "";
+
+ QString res;
+ if (pos.testFlag(JKQTPKeyInside)) res+=std::string(res.size()>0?"|":"")+"inside";
+ else if (pos.testFlag(JKQTPKeyOutsideTop)) res+=std::string(res.size()>0?"|":"")+"outside_top";
+ else if (pos.testFlag(JKQTPKeyOutsideBottom)) res+=std::string(res.size()>0?"|":"")+"outside_bottom";
+ else if (pos.testFlag(JKQTPKeyOutsideLeft)) res+=std::string(res.size()>0?"|":"")+"outside_left";
+ else if (pos.testFlag(JKQTPKeyOutsideRight)) res+=std::string(res.size()>0?"|":"")+"outside_right";
+
+ if (pos.testFlag(JKQTPKeyLeft)) res+=std::string(res.size()>0?"|":"")+"left";
+ else if (pos.testFlag(JKQTPKeyHCenter)) res+=std::string(res.size()>0?"|":"")+"hcenter";
+ else if (pos.testFlag(JKQTPKeyRight)) res+=std::string(res.size()>0?"|":"")+"right";
+
+ if (pos.testFlag(JKQTPKeyTop)) res+=std::string(res.size()>0?"|":"")+"top";
+ else if (pos.testFlag(JKQTPKeyVCenter)) res+=std::string(res.size()>0?"|":"")+"vcenter";
+ else if (pos.testFlag(JKQTPKeyBottom)) res+=std::string(res.size()>0?"|":"")+"bottom";
+
+ return res;
}
+
+
JKQTPKeyPosition String2JKQTPKeyPosition(const QString& pos) {
- QString s=pos.trimmed().toLower();
+ const QString s=pos.trimmed().toLower();
if (s=="outside_bottom" || s=="outsidebottom" || s=="outside_leftbottom" || s=="outsideleftbottom" || s=="olb") return JKQTPKeyOutsideLeftBottom;
if (s=="outside_left" || s=="outsideleft" || s=="outside_topleft" || s=="outsidetopleft" || s=="otl") return JKQTPKeyOutsideTopLeft;
if (s=="outside_right" || s=="outsideright" || s=="outside_topright" || s=="outsidetopright" || s=="otr") return JKQTPKeyOutsideTopRight;
if (s=="outside_top" || s=="outsidetop" || s=="outside_lefttop" || s=="outsidelefttop" || s=="olt") return JKQTPKeyOutsideLeftTop;
+ if (s=="outside_leftcenter" || s=="outsideleftcenter" || s=="olc") return JKQTPKeyOutsideLeftCenter;
+ if (s=="outside_rightcenter" || s=="outsiderightcenter" || s=="orc") return JKQTPKeyOutsideRightCenter;
+ if (s=="outside_topcenter" || s=="outsidetopcenter" || s=="otc") return JKQTPKeyOutsideTopCenter;
+ if (s=="outside_bottomcenter" || s=="outsidebottomcenter" || s=="obc") return JKQTPKeyOutsideBottomCenter;
+
if (s=="outside_rightbottom" || s=="outsiderightbottom" || s=="orb" ) return JKQTPKeyOutsideRightBottom;
if (s=="outside_bottomleft" || s=="outsidebottomleft" || s=="obl" ) return JKQTPKeyOutsideBottomLeft;
if (s=="outside_bottomright" || s=="outsidebottomright" || s=="obr" ) return JKQTPKeyOutsideBottomRight;
@@ -195,6 +228,28 @@ JKQTPKeyPosition String2JKQTPKeyPosition(const QString& pos) {
if (s=="inside_top" || s=="insidetop" || s=="inside_left" || s=="insideleft" || s=="inside_topleft" || s=="insidetopleft" || s=="itl") return JKQTPKeyInsideTopLeft;
if (s=="inside_right" || s=="insideright" || s=="inside_topright" || s=="insidetopright" || s=="itr") return JKQTPKeyInsideTopRight;
if (s=="inside_bottomleft" || s=="insidebottomleft" || s=="ibl") return JKQTPKeyInsideBottomLeft;
+
+ if (s.contains("|")) {
+ JKQTPKeyPosition pos;
+ const QStringList ss=s.split("|");
+ for (const auto& i: ss) {
+ if (i=="inside") pos|=JKQTPKeyInside;
+ if (i=="outside_top") pos|=JKQTPKeyOutsideTop;
+ if (i=="outside_bottom") pos|=JKQTPKeyOutsideBottom;
+ if (i=="outside_left") pos|=JKQTPKeyOutsideLeft;
+ if (i=="outside_right") pos|=JKQTPKeyOutsideRight;
+
+ if (i=="left") pos|=JKQTPKeyLeft;
+ if (i=="hcenter") pos|=JKQTPKeyHCenter;
+ if (i=="right") pos|=JKQTPKeyRight;
+
+ if (i=="top") pos|=JKQTPKeyTop;
+ if (i=="vcenter") pos|=JKQTPKeyVCenter;
+ if (i=="bottom") pos|=JKQTPKeyBottom;
+ }
+ return pos;
+ }
+
return JKQTPKeyInsideTopRight;
}
@@ -204,6 +259,7 @@ QString JKQTPKeyLayout2String(JKQTPKeyLayout pos) {
case JKQTPKeyLayoutOneColumn: return "one_column";
case JKQTPKeyLayoutOneRow: return "one_row";
case JKQTPKeyLayoutMultiColumn: return "multi_column";
+ case JKQTPKeyLayoutMultiRow: return "multi_row";
}
return "";
}
@@ -212,7 +268,8 @@ JKQTPKeyLayout String2JKQTPKeyLayout(const QString& pos) {
QString s=pos.trimmed().toLower();
if (s=="one_column" || s=="onecolumn" || s=="one") return JKQTPKeyLayoutOneColumn;
if (s=="one_row" || s=="onerow") return JKQTPKeyLayoutOneRow;
- if (s=="multi_column" || s=="multicolumn" || s=="multi") return JKQTPKeyLayoutMultiColumn;
+ if (s=="multi_column" || s=="multicolumn" || s=="multi_columns" || s=="multicolumns" || s=="multi" || s=="columns") return JKQTPKeyLayoutMultiColumn;
+ if (s=="multi_row" || s=="multirow" || s=="multi_rows" || s=="multirows" || s=="rows") return JKQTPKeyLayoutMultiRow;
return JKQTPKeyLayoutOneColumn;
}
@@ -855,3 +912,30 @@ JKQTPMouseMoveActions String2JKQTPMouseMoveActions(const QString &s)
if (s=="jkqtpmmatooltipforclosestdatapoint"||s=="closestdatapointtooltip"||s=="tooltipforclosestdatapoint"||s=="tooltip") return jkqtpmmaToolTipForClosestDataPoint;
return jkqtpmmaToolTipForClosestDataPoint;
}
+
+QList JKQTPGetTypicalKeyPositions()
+{
+ static QList pos = {
+ JKQTPKeyInsideTopRight,
+ JKQTPKeyInsideTopLeft,
+ JKQTPKeyInsideBottomLeft,
+ JKQTPKeyInsideBottomRight,
+ JKQTPKeyInsideTop,
+ JKQTPKeyInsideBottom,
+ JKQTPKeyInsideLeft,
+ JKQTPKeyInsideRight,
+ JKQTPKeyOutsideTopLeft,
+ JKQTPKeyOutsideTopCenter,
+ JKQTPKeyOutsideTopRight,
+ JKQTPKeyOutsideLeftTop,
+ JKQTPKeyOutsideLeftCenter,
+ JKQTPKeyOutsideLeftBottom,
+ JKQTPKeyOutsideRightTop,
+ JKQTPKeyOutsideRightCenter,
+ JKQTPKeyOutsideRightBottom,
+ JKQTPKeyOutsideBottomLeft,
+ JKQTPKeyOutsideBottomCenter,
+ JKQTPKeyOutsideBottomRight
+ };
+ return pos;
+}
diff --git a/lib/jkqtplotter/jkqtptools.h b/lib/jkqtplotter/jkqtptools.h
index d33eb398f6..bf0be301e2 100644
--- a/lib/jkqtplotter/jkqtptools.h
+++ b/lib/jkqtplotter/jkqtptools.h
@@ -535,24 +535,84 @@ JKQTPLOTTER_LIB_EXPORT JKQTPLabelPosition String2JKQTPLabelPosition(const QStrin
/** \brief position of the key
* \ingroup jkqtpplottersupprt
+ *
+ * \see JKQTPKeyPosition, JKQTPKeyStyle, JKQTPKeyBase, JKQTPGetTypicalKeyPositions()
*/
-enum JKQTPKeyPosition {
- JKQTPKeyOutsideTopRight=0, /*!< \brief the key is positioned on the right side of the graph */
- JKQTPKeyOutsideTopLeft, /*!< \brief the key is positioned on the left side of the graph */
- JKQTPKeyOutsideLeftTop, /*!< \brief the key is positioned above the graph */
- JKQTPKeyOutsideLeftBottom, /*!< \brief the key is positioned below the graph */
- JKQTPKeyOutsideRightBottom, /*!< \brief the key is positioned on the right side of the graph */
- JKQTPKeyOutsideRightTop, /*!< \brief the key is positioned on the left side of the graph */
- JKQTPKeyOutsideBottomLeft, /*!< \brief the key is positioned above the graph */
- JKQTPKeyOutsideBottomRight, /*!< \brief the key is positioned below the graph */
- JKQTPKeyInsideTopRight, /*!< \brief the key is positioned inside on the right side of the graph, but inside the graph*/
- JKQTPKeyInsideTopLeft, /*!< \brief the key is positioned inside on the left side of the graph */
- JKQTPKeyInsideBottomLeft, /*!< \brief the key is positioned inside on the upper bound of the graph */
- JKQTPKeyInsideBottomRight, /*!< \brief the key is positioned inside on the lower bound of the graph */
+enum JKQTPKeyPositions {
+ JKQTPKeyInside =0x0001, /*!< \brief key is drawn inside the plot rectangle */
+ JKQTPKeyOutsideTop =0x0010, /*!< \brief key is drawn outside and above of the plot rectangle */
+ JKQTPKeyOutsideBottom=0x0020, /*!< \brief key is drawn outside and below of the plot rectangle */
+ JKQTPKeyOutsideLeft =0x0040, /*!< \brief key is drawn outside and on the left of the plot rectangle */
+ JKQTPKeyOutsideRight =0x0080, /*!< \brief key is drawn outside and on the rightof the plot rectangle */
+ JKQTPKeyLeft =0x0100, /*!< \brief key is drawn to the left */
+ JKQTPKeyHCenter =0x0200, /*!< \brief key is drawn to the horizontal center */
+ JKQTPKeyRight =0x0400, /*!< \brief key is drawn to the right */
+ JKQTPKeyTop =0x1000, /*!< \brief key is drawn to the top */
+ JKQTPKeyVCenter =0x2000, /*!< \brief key is drawn to the vertical center */
+ JKQTPKeyBottom =0x4000, /*!< \brief key is drawn to the bottom */
+
+
+ JKQTPKeyOutsideTopRight=JKQTPKeyOutsideTop|JKQTPKeyBottom|JKQTPKeyRight, /*!< \brief the key is positioned above the graph, on the right
+ \image html keypositions/JKQTPKeyOutsideTopRight.png */
+ JKQTPKeyOutsideTopLeft=JKQTPKeyOutsideTop|JKQTPKeyBottom|JKQTPKeyLeft, /*!< \brief the key is positioned above the graph, on the left
+ \image html keypositions/JKQTPKeyOutsideTopLeft.png */
+ JKQTPKeyOutsideTopCenter=JKQTPKeyOutsideTop|JKQTPKeyBottom|JKQTPKeyHCenter, /*!< \brief the key is positioned above the graph, in the center
+ \image html keypositions/JKQTPKeyOutsideTopCenter.png */
+ JKQTPKeyOutsideBottomLeft=JKQTPKeyOutsideBottom|JKQTPKeyTop|JKQTPKeyLeft, /*!< \brief the key is positioned below the graph, on the left
+ \image html keypositions/JKQTPKeyOutsideBottomLeft.png */
+ JKQTPKeyOutsideBottomRight=JKQTPKeyOutsideBottom|JKQTPKeyTop|JKQTPKeyRight, /*!< \brief the key is positioned below the graph, on the right
+ \image html keypositions/JKQTPKeyOutsideBottomRight.png */
+ JKQTPKeyOutsideBottomCenter=JKQTPKeyOutsideBottom|JKQTPKeyTop|JKQTPKeyHCenter, /*!< \brief the key is positioned below the graph, in the center
+ \image html keypositions/JKQTPKeyOutsideBottomCenter.png */
+ JKQTPKeyOutsideLeftTop=JKQTPKeyOutsideLeft|JKQTPKeyTop|JKQTPKeyRight, /*!< \brief the key is positioned on the left side of the graph, towards the top
+ \image html keypositions/JKQTPKeyOutsideLeftTop.png */
+ JKQTPKeyOutsideLeftCenter=JKQTPKeyOutsideLeft|JKQTPKeyVCenter|JKQTPKeyRight, /*!< \brief the key is positioned on the left side of the graph, in the center
+ \image html keypositions/JKQTPKeyOutsideLeftCenter.png */
+ JKQTPKeyOutsideLeftBottom=JKQTPKeyOutsideLeft|JKQTPKeyBottom|JKQTPKeyRight, /*!< \brief the key is positioned on the left side of the graph, towards the Bottom
+ \image html keypositions/JKQTPKeyOutsideLeftBottom.png */
+ JKQTPKeyOutsideRightBottom=JKQTPKeyOutsideRight|JKQTPKeyBottom|JKQTPKeyLeft, /*!< \brief the key is positioned on the right side of the graph, towards the bottom
+ \image html keypositions/JKQTPKeyOutsideRightBottom.png */
+ JKQTPKeyOutsideRightCenter=JKQTPKeyOutsideRight|JKQTPKeyVCenter|JKQTPKeyLeft, /*!< \brief the key is positioned on the right side of the graph, in the center
+ \image html keypositions/JKQTPKeyOutsideRightCenter.png */
+ JKQTPKeyOutsideRightTop=JKQTPKeyOutsideRight|JKQTPKeyTop|JKQTPKeyLeft, /*!< \brief the key is positioned on the left side of the graph, towards the top
+ \image html keypositions/JKQTPKeyOutsideRightTop.png */
+ JKQTPKeyInsideTopRight=JKQTPKeyInside|JKQTPKeyTop|JKQTPKeyRight, /*!< \brief the key is positioned inside on the top-right
+ \image html keypositions/JKQTPKeyInsideTopRight.png */
+ JKQTPKeyInsideTopLeft=JKQTPKeyInside|JKQTPKeyTop|JKQTPKeyLeft, /*!< \brief the key is positioned inside on the top-left
+ \image html keypositions/JKQTPKeyInsideTopLeft.png */
+ JKQTPKeyInsideBottomLeft=JKQTPKeyInside|JKQTPKeyBottom|JKQTPKeyLeft, /*!< \brief the key is positioned inside on the bottom-left
+ \image html keypositions/JKQTPKeyInsideBottomLeft.png */
+ JKQTPKeyInsideBottomRight=JKQTPKeyInside|JKQTPKeyBottom|JKQTPKeyRight, /*!< \brief the key is positioned inside on the bottom-right
+ \image html keypositions/JKQTPKeyInsideBottomRight.png */
+ JKQTPKeyInsideTop=JKQTPKeyInside|JKQTPKeyTop|JKQTPKeyHCenter, /*!< \brief the key is positioned inside on the top-center
+ \image html keypositions/JKQTPKeyInsideTop.png */
+ JKQTPKeyInsideBottom=JKQTPKeyInside|JKQTPKeyBottom|JKQTPKeyHCenter, /*!< \brief the key is positioned inside on the bottom-center
+ \image html keypositions/JKQTPKeyInsideBottom.png */
+ JKQTPKeyInsideLeft=JKQTPKeyInside|JKQTPKeyVCenter|JKQTPKeyLeft, /*!< \brief the key is positioned inside on the center-left
+ \image html keypositions/JKQTPKeyInsideLeft.png */
+ JKQTPKeyInsideRight=JKQTPKeyInside|JKQTPKeyVCenter|JKQTPKeyRight, /*!< \brief the key is positioned inside on the center-right
+ \image html keypositions/JKQTPKeyInsideRight.png */
+ JKQTPKeyDefaultPosition=JKQTPKeyInsideTopRight
- JKQTPKeyPositionMax=JKQTPKeyInsideBottomRight
};
+/** \brief position of the key
+ * \ingroup jkqtpplottersupprt
+ *
+ * \qFlagsNote{JKQTPKeyPosition,JKQTPKeyPositions}
+ *
+ * \see JKQTPKeyPositions, JKQTPKeyStyle, JKQTPKeyBase, JKQTPGetTypicalKeyPositions()
+ */
+Q_DECLARE_FLAGS(JKQTPKeyPosition, JKQTPKeyPositions)
+Q_DECLARE_OPERATORS_FOR_FLAGS(JKQTPKeyPosition)
+/** \brief returns a list of typical positions of the main key
+ * \ingroup jkqtpplottersupprt
+ *
+ * \qFlagsNote{JKQTPKeyPosition,JKQTPKeyPositions}
+ *
+ * \see JKQTPKeyPositions, JKQTPKeyStyle, JKQTPKeyBase
+ */
+JKQTPLOTTER_LIB_EXPORT QList JKQTPGetTypicalKeyPositions();
/** \brief converts a JKQTPLabelPosition variable into a human-readable string
* \ingroup jkqtpplottersupprt
@@ -568,11 +628,16 @@ JKQTPLOTTER_LIB_EXPORT JKQTPKeyPosition String2JKQTPKeyPosition(const QString& p
* \ingroup jkqtpplottersupprt
*/
enum JKQTPKeyLayout {
- JKQTPKeyLayoutOneColumn=0, /*!< \brief the key consists of one column */
- JKQTPKeyLayoutOneRow, /*!< \brief the key consists of one row */
- JKQTPKeyLayoutMultiColumn, /*!< \brief the key consists of multiple columns */
+ JKQTPKeyLayoutOneColumn=0, /*!< \brief the key consists of one column
+ \image html keylayouts/JKQTPKeyLayout_one_column.png */
+ JKQTPKeyLayoutOneRow, /*!< \brief the key consists of one row
+ \image html keylayouts/JKQTPKeyLayout_one_row.png */
+ JKQTPKeyLayoutMultiColumn, /*!< \brief the key consists of multiple columns, (top->bottom, top->bottom, ...)
+ \image html keylayouts/JKQTPKeyLayout_multi_column.png */
+ JKQTPKeyLayoutMultiRow, /*!< \brief the key consists of multiple rows (left->right,left->right,...)
+ \image html keylayouts/JKQTPKeyLayout_multi_row.png */
- JKQTPKeyLayoutMax=JKQTPKeyLayoutMultiColumn
+ JKQTPKeyLayoutMax=JKQTPKeyLayoutMultiRow
};
diff --git a/screenshots/barchart.png b/screenshots/barchart.png
index 31c4b13d82..66e8159b54 100644
Binary files a/screenshots/barchart.png and b/screenshots/barchart.png differ
diff --git a/screenshots/barchart_errorbars.png b/screenshots/barchart_errorbars.png
index 9a49b3a674..81373661d5 100644
Binary files a/screenshots/barchart_errorbars.png and b/screenshots/barchart_errorbars.png differ
diff --git a/screenshots/barchart_errorbars_hor.png b/screenshots/barchart_errorbars_hor.png
index b86b5f7756..14add948d2 100644
Binary files a/screenshots/barchart_errorbars_hor.png and b/screenshots/barchart_errorbars_hor.png differ
diff --git a/screenshots/barchart_errorbars_hor_small.png b/screenshots/barchart_errorbars_hor_small.png
index e615b4f23b..c27b727255 100644
Binary files a/screenshots/barchart_errorbars_hor_small.png and b/screenshots/barchart_errorbars_hor_small.png differ
diff --git a/screenshots/barchart_errorbars_small.png b/screenshots/barchart_errorbars_small.png
index 7faa68bb48..d174fd00cf 100644
Binary files a/screenshots/barchart_errorbars_small.png and b/screenshots/barchart_errorbars_small.png differ
diff --git a/screenshots/barchart_functorfill.png b/screenshots/barchart_functorfill.png
index dbc72c405c..e688c88698 100644
Binary files a/screenshots/barchart_functorfill.png and b/screenshots/barchart_functorfill.png differ
diff --git a/screenshots/barchart_functorfill_hor.png b/screenshots/barchart_functorfill_hor.png
index e5862a36ec..e2fe2b4fee 100644
Binary files a/screenshots/barchart_functorfill_hor.png and b/screenshots/barchart_functorfill_hor.png differ
diff --git a/screenshots/barchart_functorfill_hor_small.png b/screenshots/barchart_functorfill_hor_small.png
index f837030adc..48e125fe36 100644
Binary files a/screenshots/barchart_functorfill_hor_small.png and b/screenshots/barchart_functorfill_hor_small.png differ
diff --git a/screenshots/barchart_functorfill_small.png b/screenshots/barchart_functorfill_small.png
index fc6fd108ba..59a45d8825 100644
Binary files a/screenshots/barchart_functorfill_small.png and b/screenshots/barchart_functorfill_small.png differ
diff --git a/screenshots/barchart_hor.png b/screenshots/barchart_hor.png
index 0d9b7b7ec5..e10356d361 100644
Binary files a/screenshots/barchart_hor.png and b/screenshots/barchart_hor.png differ
diff --git a/screenshots/barchart_hor_small.png b/screenshots/barchart_hor_small.png
index 9503bb6457..0d94e12b09 100644
Binary files a/screenshots/barchart_hor_small.png and b/screenshots/barchart_hor_small.png differ
diff --git a/screenshots/barchart_small.png b/screenshots/barchart_small.png
index eb01651d9b..327fbd1bb5 100644
Binary files a/screenshots/barchart_small.png and b/screenshots/barchart_small.png differ
diff --git a/screenshots/barchart_twocolor.png b/screenshots/barchart_twocolor.png
index b01432b4c5..5f6b0633d0 100644
Binary files a/screenshots/barchart_twocolor.png and b/screenshots/barchart_twocolor.png differ
diff --git a/screenshots/barchart_twocolor_hor.png b/screenshots/barchart_twocolor_hor.png
index 3afb6512bd..9af7d42939 100644
Binary files a/screenshots/barchart_twocolor_hor.png and b/screenshots/barchart_twocolor_hor.png differ
diff --git a/screenshots/barchart_twocolor_hor_small.png b/screenshots/barchart_twocolor_hor_small.png
index bfb4b41f0c..a068d920d8 100644
Binary files a/screenshots/barchart_twocolor_hor_small.png and b/screenshots/barchart_twocolor_hor_small.png differ
diff --git a/screenshots/barchart_twocolor_small.png b/screenshots/barchart_twocolor_small.png
index e3f2a7c7de..b8c3c876eb 100644
Binary files a/screenshots/barchart_twocolor_small.png and b/screenshots/barchart_twocolor_small.png differ
diff --git a/screenshots/boxplot.png b/screenshots/boxplot.png
index 7a1d1d661f..9327e86e10 100644
Binary files a/screenshots/boxplot.png and b/screenshots/boxplot.png differ
diff --git a/screenshots/boxplot_small.png b/screenshots/boxplot_small.png
index d23acd4668..04534f7400 100644
Binary files a/screenshots/boxplot_small.png and b/screenshots/boxplot_small.png differ
diff --git a/screenshots/contourplot.png b/screenshots/contourplot.png
index ee675a992d..64e4848c49 100644
Binary files a/screenshots/contourplot.png and b/screenshots/contourplot.png differ
diff --git a/screenshots/contourplot_small.png b/screenshots/contourplot_small.png
index fec6c2f5f9..866fe7b86c 100644
Binary files a/screenshots/contourplot_small.png and b/screenshots/contourplot_small.png differ
diff --git a/screenshots/datastore.png b/screenshots/datastore.png
index 2e32b924aa..48c27649bc 100644
Binary files a/screenshots/datastore.png and b/screenshots/datastore.png differ
diff --git a/screenshots/datastore_groupedstat.png b/screenshots/datastore_groupedstat.png
index 36bd98b3a1..17b197b499 100644
Binary files a/screenshots/datastore_groupedstat.png and b/screenshots/datastore_groupedstat.png differ
diff --git a/screenshots/datastore_groupedstat_scatter.png b/screenshots/datastore_groupedstat_scatter.png
index 11c763e383..4268004c07 100644
Binary files a/screenshots/datastore_groupedstat_scatter.png and b/screenshots/datastore_groupedstat_scatter.png differ
diff --git a/screenshots/datastore_groupedstat_scatterrawdata.png b/screenshots/datastore_groupedstat_scatterrawdata.png
index 77e75838cd..61caca45fb 100644
Binary files a/screenshots/datastore_groupedstat_scatterrawdata.png and b/screenshots/datastore_groupedstat_scatterrawdata.png differ
diff --git a/screenshots/datastore_groupedstat_small.png b/screenshots/datastore_groupedstat_small.png
index ca58beee2a..9df1f39500 100644
Binary files a/screenshots/datastore_groupedstat_small.png and b/screenshots/datastore_groupedstat_small.png differ
diff --git a/screenshots/datastore_image.png b/screenshots/datastore_image.png
index 127d3ab201..57f28c64c3 100644
Binary files a/screenshots/datastore_image.png and b/screenshots/datastore_image.png differ
diff --git a/screenshots/datastore_image_sorted.png b/screenshots/datastore_image_sorted.png
index 127d3ab201..57f28c64c3 100644
Binary files a/screenshots/datastore_image_sorted.png and b/screenshots/datastore_image_sorted.png differ
diff --git a/screenshots/datastore_iterators.png b/screenshots/datastore_iterators.png
index 97aac37eb3..4e892f46db 100644
Binary files a/screenshots/datastore_iterators.png and b/screenshots/datastore_iterators.png differ
diff --git a/screenshots/datastore_iterators_cosine.png b/screenshots/datastore_iterators_cosine.png
index 97aac37eb3..4e892f46db 100644
Binary files a/screenshots/datastore_iterators_cosine.png and b/screenshots/datastore_iterators_cosine.png differ
diff --git a/screenshots/datastore_iterators_cosine_ysorted.png b/screenshots/datastore_iterators_cosine_ysorted.png
index 3c2a8aa7f8..539bd617c9 100644
Binary files a/screenshots/datastore_iterators_cosine_ysorted.png and b/screenshots/datastore_iterators_cosine_ysorted.png differ
diff --git a/screenshots/datastore_iterators_small.png b/screenshots/datastore_iterators_small.png
index 8db3acc0c3..23f35d0065 100644
Binary files a/screenshots/datastore_iterators_small.png and b/screenshots/datastore_iterators_small.png differ
diff --git a/screenshots/datastore_regression.png b/screenshots/datastore_regression.png
index 9f6b7b5b57..139a16ba7c 100644
Binary files a/screenshots/datastore_regression.png and b/screenshots/datastore_regression.png differ
diff --git a/screenshots/datastore_regression_lin.png b/screenshots/datastore_regression_lin.png
index 7ce00604a9..a44aacffa0 100644
Binary files a/screenshots/datastore_regression_lin.png and b/screenshots/datastore_regression_lin.png differ
diff --git a/screenshots/datastore_regression_linrobust.png b/screenshots/datastore_regression_linrobust.png
index 3ac490e281..00b0703ab6 100644
Binary files a/screenshots/datastore_regression_linrobust.png and b/screenshots/datastore_regression_linrobust.png differ
diff --git a/screenshots/datastore_regression_linrobust_p.png b/screenshots/datastore_regression_linrobust_p.png
index 8c4aae3d50..cf525b6925 100644
Binary files a/screenshots/datastore_regression_linrobust_p.png and b/screenshots/datastore_regression_linrobust_p.png differ
diff --git a/screenshots/datastore_regression_linweight.png b/screenshots/datastore_regression_linweight.png
index af698fa376..8c2e57fa98 100644
Binary files a/screenshots/datastore_regression_linweight.png and b/screenshots/datastore_regression_linweight.png differ
diff --git a/screenshots/datastore_regression_nonlinreg_exp.png b/screenshots/datastore_regression_nonlinreg_exp.png
index dc8d8d8563..40b0191d83 100644
Binary files a/screenshots/datastore_regression_nonlinreg_exp.png and b/screenshots/datastore_regression_nonlinreg_exp.png differ
diff --git a/screenshots/datastore_regression_nonlinreg_pow.png b/screenshots/datastore_regression_nonlinreg_pow.png
index d6e68955a5..10c059aa22 100644
Binary files a/screenshots/datastore_regression_nonlinreg_pow.png and b/screenshots/datastore_regression_nonlinreg_pow.png differ
diff --git a/screenshots/datastore_regression_polynom.png b/screenshots/datastore_regression_polynom.png
index 6fbbaa4120..48e8a0d9d1 100644
Binary files a/screenshots/datastore_regression_polynom.png and b/screenshots/datastore_regression_polynom.png differ
diff --git a/screenshots/datastore_regression_polynom_errros.png b/screenshots/datastore_regression_polynom_errros.png
index 5c28e5fcbe..d31d7bd475 100644
Binary files a/screenshots/datastore_regression_polynom_errros.png and b/screenshots/datastore_regression_polynom_errros.png differ
diff --git a/screenshots/datastore_regression_small.png b/screenshots/datastore_regression_small.png
index 2a4f3bb9be..cfcc7e8eda 100644
Binary files a/screenshots/datastore_regression_small.png and b/screenshots/datastore_regression_small.png differ
diff --git a/screenshots/datastore_sineimg.png b/screenshots/datastore_sineimg.png
index f8f006297e..aae7dfa0cf 100644
Binary files a/screenshots/datastore_sineimg.png and b/screenshots/datastore_sineimg.png differ
diff --git a/screenshots/datastore_small.png b/screenshots/datastore_small.png
index 9d4c6c989c..cdd63610d6 100644
Binary files a/screenshots/datastore_small.png and b/screenshots/datastore_small.png differ
diff --git a/screenshots/datastore_statistics.png b/screenshots/datastore_statistics.png
index ada95eb2d3..14f0f52ffa 100644
Binary files a/screenshots/datastore_statistics.png and b/screenshots/datastore_statistics.png differ
diff --git a/screenshots/datastore_statistics_2d.png b/screenshots/datastore_statistics_2d.png
index b493dc61a0..44afa6a333 100644
Binary files a/screenshots/datastore_statistics_2d.png and b/screenshots/datastore_statistics_2d.png differ
diff --git a/screenshots/datastore_statistics_2d_small.png b/screenshots/datastore_statistics_2d_small.png
index f588df7e64..e84b5b34dd 100644
Binary files a/screenshots/datastore_statistics_2d_small.png and b/screenshots/datastore_statistics_2d_small.png differ
diff --git a/screenshots/datastore_statistics_boxplots_outliers.png b/screenshots/datastore_statistics_boxplots_outliers.png
index 709bc5f26d..cbc83d7927 100644
Binary files a/screenshots/datastore_statistics_boxplots_outliers.png and b/screenshots/datastore_statistics_boxplots_outliers.png differ
diff --git a/screenshots/datastore_statistics_boxplots_simple.png b/screenshots/datastore_statistics_boxplots_simple.png
index f379cc2212..b2eef1fcdb 100644
Binary files a/screenshots/datastore_statistics_boxplots_simple.png and b/screenshots/datastore_statistics_boxplots_simple.png differ
diff --git a/screenshots/datastore_statistics_cumhistkde.png b/screenshots/datastore_statistics_cumhistkde.png
index f737e97abb..70aa12f567 100644
Binary files a/screenshots/datastore_statistics_cumhistkde.png and b/screenshots/datastore_statistics_cumhistkde.png differ
diff --git a/screenshots/datastore_statistics_dataonly.png b/screenshots/datastore_statistics_dataonly.png
index 39de624f20..feff191af6 100644
Binary files a/screenshots/datastore_statistics_dataonly.png and b/screenshots/datastore_statistics_dataonly.png differ
diff --git a/screenshots/datastore_statistics_hist.png b/screenshots/datastore_statistics_hist.png
index 43288b5201..4f8ccabec3 100644
Binary files a/screenshots/datastore_statistics_hist.png and b/screenshots/datastore_statistics_hist.png differ
diff --git a/screenshots/datastore_statistics_kde.png b/screenshots/datastore_statistics_kde.png
index 20bbf46b16..d5995d3758 100644
Binary files a/screenshots/datastore_statistics_kde.png and b/screenshots/datastore_statistics_kde.png differ
diff --git a/screenshots/datastore_statistics_small.png b/screenshots/datastore_statistics_small.png
index 93fdae6d6f..620841ea0e 100644
Binary files a/screenshots/datastore_statistics_small.png and b/screenshots/datastore_statistics_small.png differ
diff --git a/screenshots/dateaxes.png b/screenshots/dateaxes.png
index fb56780a6a..b1e36379df 100644
Binary files a/screenshots/dateaxes.png and b/screenshots/dateaxes.png differ
diff --git a/screenshots/dateaxes_small.png b/screenshots/dateaxes_small.png
index 3ab5b58f90..ac41f0403f 100644
Binary files a/screenshots/dateaxes_small.png and b/screenshots/dateaxes_small.png differ
diff --git a/screenshots/dateaxes_timeaxis.png b/screenshots/dateaxes_timeaxis.png
index 616bfd7a05..057a8b1731 100644
Binary files a/screenshots/dateaxes_timeaxis.png and b/screenshots/dateaxes_timeaxis.png differ
diff --git a/screenshots/dateaxes_timeaxis_small.png b/screenshots/dateaxes_timeaxis_small.png
index 4314372b36..3216b6c22b 100644
Binary files a/screenshots/dateaxes_timeaxis_small.png and b/screenshots/dateaxes_timeaxis_small.png differ
diff --git a/screenshots/errorbarstyles.png b/screenshots/errorbarstyles.png
index 2807d78aa1..27a5cdfe2e 100644
Binary files a/screenshots/errorbarstyles.png and b/screenshots/errorbarstyles.png differ
diff --git a/screenshots/errorbarstyles_small.png b/screenshots/errorbarstyles_small.png
index 26376f0816..bf63e9cc6f 100644
Binary files a/screenshots/errorbarstyles_small.png and b/screenshots/errorbarstyles_small.png differ
diff --git a/screenshots/evalcurve.png b/screenshots/evalcurve.png
index 031963e8a3..bee3ec1826 100644
Binary files a/screenshots/evalcurve.png and b/screenshots/evalcurve.png differ
diff --git a/screenshots/evalcurve_small.png b/screenshots/evalcurve_small.png
index d828cbd52d..7cedb080ce 100644
Binary files a/screenshots/evalcurve_small.png and b/screenshots/evalcurve_small.png differ
diff --git a/screenshots/filledgraphs.png b/screenshots/filledgraphs.png
index 5d2834be8e..ff26dd5f6c 100644
Binary files a/screenshots/filledgraphs.png and b/screenshots/filledgraphs.png differ
diff --git a/screenshots/filledgraphs_errors.png b/screenshots/filledgraphs_errors.png
index b7d9294c5a..df5d2f8a8e 100644
Binary files a/screenshots/filledgraphs_errors.png and b/screenshots/filledgraphs_errors.png differ
diff --git a/screenshots/filledgraphs_errors_small.png b/screenshots/filledgraphs_errors_small.png
index 649d2c7f1f..f2aa9ebf35 100644
Binary files a/screenshots/filledgraphs_errors_small.png and b/screenshots/filledgraphs_errors_small.png differ
diff --git a/screenshots/filledgraphs_errors_y.png b/screenshots/filledgraphs_errors_y.png
index 063152f411..6d545ca4b9 100644
Binary files a/screenshots/filledgraphs_errors_y.png and b/screenshots/filledgraphs_errors_y.png differ
diff --git a/screenshots/filledgraphs_errors_y_small.png b/screenshots/filledgraphs_errors_y_small.png
index 28d71dbc43..3825cdaab6 100644
Binary files a/screenshots/filledgraphs_errors_y_small.png and b/screenshots/filledgraphs_errors_y_small.png differ
diff --git a/screenshots/filledgraphs_small.png b/screenshots/filledgraphs_small.png
index 468d64c00a..cf9ebf1721 100644
Binary files a/screenshots/filledgraphs_small.png and b/screenshots/filledgraphs_small.png differ
diff --git a/screenshots/filledgraphs_y.png b/screenshots/filledgraphs_y.png
index 2cb7ed1f15..5457b5a039 100644
Binary files a/screenshots/filledgraphs_y.png and b/screenshots/filledgraphs_y.png differ
diff --git a/screenshots/filledgraphs_y_small.png b/screenshots/filledgraphs_y_small.png
index 0b72b737e8..1b22a51fa5 100644
Binary files a/screenshots/filledgraphs_y_small.png and b/screenshots/filledgraphs_y_small.png differ
diff --git a/screenshots/functionplot.png b/screenshots/functionplot.png
index a9f03ca036..6fd1fb6c50 100644
Binary files a/screenshots/functionplot.png and b/screenshots/functionplot.png differ
diff --git a/screenshots/functionplot_fy.png b/screenshots/functionplot_fy.png
index c0a5bbdbe8..088cef8ac4 100644
Binary files a/screenshots/functionplot_fy.png and b/screenshots/functionplot_fy.png differ
diff --git a/screenshots/functionplot_fy_small.png b/screenshots/functionplot_fy_small.png
index 937a5a4656..a6ee298fd6 100644
Binary files a/screenshots/functionplot_fy_small.png and b/screenshots/functionplot_fy_small.png differ
diff --git a/screenshots/functionplot_small.png b/screenshots/functionplot_small.png
index 1cff7d22e7..726abdfc5d 100644
Binary files a/screenshots/functionplot_small.png and b/screenshots/functionplot_small.png differ
diff --git a/screenshots/geo_coordinateaxis0.png b/screenshots/geo_coordinateaxis0.png
index 4d0b2fdbf4..580c0b6e89 100644
Binary files a/screenshots/geo_coordinateaxis0.png and b/screenshots/geo_coordinateaxis0.png differ
diff --git a/screenshots/geo_coordinateaxis0_small.png b/screenshots/geo_coordinateaxis0_small.png
index af99536d34..454dc656ba 100644
Binary files a/screenshots/geo_coordinateaxis0_small.png and b/screenshots/geo_coordinateaxis0_small.png differ
diff --git a/screenshots/imageplot.png b/screenshots/imageplot.png
index 52e6d0c91f..0f3a479eb7 100644
Binary files a/screenshots/imageplot.png and b/screenshots/imageplot.png differ
diff --git a/screenshots/imageplot__scale02.png b/screenshots/imageplot__scale02.png
index 899ed96506..fedbe6ed3d 100644
Binary files a/screenshots/imageplot__scale02.png and b/screenshots/imageplot__scale02.png differ
diff --git a/screenshots/imageplot__smallscalecolor.png b/screenshots/imageplot__smallscalecolor.png
index 399fdefcae..625b55f896 100644
Binary files a/screenshots/imageplot__smallscalecolor.png and b/screenshots/imageplot__smallscalecolor.png differ
diff --git a/screenshots/imageplot__smallscalelimitcolor.png b/screenshots/imageplot__smallscalelimitcolor.png
index fb3d990610..6620c4da20 100644
Binary files a/screenshots/imageplot__smallscalelimitcolor.png and b/screenshots/imageplot__smallscalelimitcolor.png differ
diff --git a/screenshots/imageplot__smallscaletransparent.png b/screenshots/imageplot__smallscaletransparent.png
index 392ebec771..0d6f5f9d6c 100644
Binary files a/screenshots/imageplot__smallscaletransparent.png and b/screenshots/imageplot__smallscaletransparent.png differ
diff --git a/screenshots/imageplot_modifier.png b/screenshots/imageplot_modifier.png
index 2b3a1341b0..3c736c4f79 100644
Binary files a/screenshots/imageplot_modifier.png and b/screenshots/imageplot_modifier.png differ
diff --git a/screenshots/imageplot_modifier_small.png b/screenshots/imageplot_modifier_small.png
index 1021bd050e..a1a3a8a6be 100644
Binary files a/screenshots/imageplot_modifier_small.png and b/screenshots/imageplot_modifier_small.png differ
diff --git a/screenshots/imageplot_nodatastore.png b/screenshots/imageplot_nodatastore.png
index 9d38a20a19..351901778c 100644
Binary files a/screenshots/imageplot_nodatastore.png and b/screenshots/imageplot_nodatastore.png differ
diff --git a/screenshots/imageplot_nodatastore_small.png b/screenshots/imageplot_nodatastore_small.png
index 12a350d132..35d5e5c031 100644
Binary files a/screenshots/imageplot_nodatastore_small.png and b/screenshots/imageplot_nodatastore_small.png differ
diff --git a/screenshots/imageplot_small.png b/screenshots/imageplot_small.png
index 35fe87af20..638b4b74a6 100644
Binary files a/screenshots/imageplot_small.png and b/screenshots/imageplot_small.png differ
diff --git a/screenshots/imageplot_userpal_program.png b/screenshots/imageplot_userpal_program.png
index a040a09f06..bec0a5184a 100644
Binary files a/screenshots/imageplot_userpal_program.png and b/screenshots/imageplot_userpal_program.png differ
diff --git a/screenshots/imageplot_userpal_program_small.png b/screenshots/imageplot_userpal_program_small.png
index 94fcd6b82d..ebce6780a9 100644
Binary files a/screenshots/imageplot_userpal_program_small.png and b/screenshots/imageplot_userpal_program_small.png differ
diff --git a/screenshots/logaxes.png b/screenshots/logaxes.png
index 4eafd36825..e90625bd13 100644
Binary files a/screenshots/logaxes.png and b/screenshots/logaxes.png differ
diff --git a/screenshots/logaxes_nolog.png b/screenshots/logaxes_nolog.png
index f6cda8b088..9dff0403c7 100644
Binary files a/screenshots/logaxes_nolog.png and b/screenshots/logaxes_nolog.png differ
diff --git a/screenshots/logaxes_nominorgrid.png b/screenshots/logaxes_nominorgrid.png
index 4960d1cade..c545981b2d 100644
Binary files a/screenshots/logaxes_nominorgrid.png and b/screenshots/logaxes_nominorgrid.png differ
diff --git a/screenshots/logaxes_small.png b/screenshots/logaxes_small.png
index 688ef57299..ad3a5c9f74 100644
Binary files a/screenshots/logaxes_small.png and b/screenshots/logaxes_small.png differ
diff --git a/screenshots/mandelbrot.png b/screenshots/mandelbrot.png
index 710ce94a54..558dcc1d6b 100644
Binary files a/screenshots/mandelbrot.png and b/screenshots/mandelbrot.png differ
diff --git a/screenshots/mandelbrot_small.png b/screenshots/mandelbrot_small.png
index eb29244b76..41d254daa3 100644
Binary files a/screenshots/mandelbrot_small.png and b/screenshots/mandelbrot_small.png differ
diff --git a/screenshots/multiplot.png b/screenshots/multiplot.png
index 9957ef04c9..22969ab9b4 100644
Binary files a/screenshots/multiplot.png and b/screenshots/multiplot.png differ
diff --git a/screenshots/multiplot_small.png b/screenshots/multiplot_small.png
index 28e99935fc..ec7aa994f1 100644
Binary files a/screenshots/multiplot_small.png and b/screenshots/multiplot_small.png differ
diff --git a/screenshots/parametriccurve1.png b/screenshots/parametriccurve1.png
index 0feca603a3..6b1809fbb4 100644
Binary files a/screenshots/parametriccurve1.png and b/screenshots/parametriccurve1.png differ
diff --git a/screenshots/parametriccurve1_small.png b/screenshots/parametriccurve1_small.png
index 6006c03ea7..1001539dc4 100644
Binary files a/screenshots/parametriccurve1_small.png and b/screenshots/parametriccurve1_small.png differ
diff --git a/screenshots/parametriccurve2.png b/screenshots/parametriccurve2.png
index b7f5bcae0c..056f88bb40 100644
Binary files a/screenshots/parametriccurve2.png and b/screenshots/parametriccurve2.png differ
diff --git a/screenshots/parametriccurve2_small.png b/screenshots/parametriccurve2_small.png
index c6907f3991..c5b3811415 100644
Binary files a/screenshots/parametriccurve2_small.png and b/screenshots/parametriccurve2_small.png differ
diff --git a/screenshots/paramscatterplot.png b/screenshots/paramscatterplot.png
index c28449bdf4..3eecbd3a0b 100644
Binary files a/screenshots/paramscatterplot.png and b/screenshots/paramscatterplot.png differ
diff --git a/screenshots/paramscatterplot_customsymbol.png b/screenshots/paramscatterplot_customsymbol.png
index 312d2ab2cb..6ba64fca22 100644
Binary files a/screenshots/paramscatterplot_customsymbol.png and b/screenshots/paramscatterplot_customsymbol.png differ
diff --git a/screenshots/paramscatterplot_customsymbol_small.png b/screenshots/paramscatterplot_customsymbol_small.png
index a096eb202a..13d4ebd783 100644
Binary files a/screenshots/paramscatterplot_customsymbol_small.png and b/screenshots/paramscatterplot_customsymbol_small.png differ
diff --git a/screenshots/paramscatterplot_small.png b/screenshots/paramscatterplot_small.png
index 96394f7195..23bcf19540 100644
Binary files a/screenshots/paramscatterplot_small.png and b/screenshots/paramscatterplot_small.png differ
diff --git a/screenshots/parsedfunctionplot.png b/screenshots/parsedfunctionplot.png
index 5abfc0292c..a854f55bd1 100644
Binary files a/screenshots/parsedfunctionplot.png and b/screenshots/parsedfunctionplot.png differ
diff --git a/screenshots/parsedfunctionplot_small.png b/screenshots/parsedfunctionplot_small.png
index dfe3648400..e8d7c24c34 100644
Binary files a/screenshots/parsedfunctionplot_small.png and b/screenshots/parsedfunctionplot_small.png differ
diff --git a/screenshots/rgbimageplot.png b/screenshots/rgbimageplot.png
index f4a941fe52..d3e2a005c1 100644
Binary files a/screenshots/rgbimageplot.png and b/screenshots/rgbimageplot.png differ
diff --git a/screenshots/rgbimageplot_small.png b/screenshots/rgbimageplot_small.png
index 55562ee6c7..8dad1cb919 100644
Binary files a/screenshots/rgbimageplot_small.png and b/screenshots/rgbimageplot_small.png differ
diff --git a/screenshots/scatter.png b/screenshots/scatter.png
index 55b142ea73..d41bfdd343 100644
Binary files a/screenshots/scatter.png and b/screenshots/scatter.png differ
diff --git a/screenshots/scatter_customsymbol.png b/screenshots/scatter_customsymbol.png
index 6ee6a90cf3..71767a7684 100644
Binary files a/screenshots/scatter_customsymbol.png and b/screenshots/scatter_customsymbol.png differ
diff --git a/screenshots/scatter_customsymbol_small.png b/screenshots/scatter_customsymbol_small.png
index 921a8aa5b0..f71cfa286a 100644
Binary files a/screenshots/scatter_customsymbol_small.png and b/screenshots/scatter_customsymbol_small.png differ
diff --git a/screenshots/scatter_error.png b/screenshots/scatter_error.png
index 2fea8b8a26..c91e16f29d 100644
Binary files a/screenshots/scatter_error.png and b/screenshots/scatter_error.png differ
diff --git a/screenshots/scatter_error_small.png b/screenshots/scatter_error_small.png
index bfe1c50a0a..12ee7c2a59 100644
Binary files a/screenshots/scatter_error_small.png and b/screenshots/scatter_error_small.png differ
diff --git a/screenshots/scatter_small.png b/screenshots/scatter_small.png
index 9ae5c5b7db..7ef55f4124 100644
Binary files a/screenshots/scatter_small.png and b/screenshots/scatter_small.png differ
diff --git a/screenshots/second_axis.png b/screenshots/second_axis.png
index d8391aedfb..c318dfcc8b 100644
Binary files a/screenshots/second_axis.png and b/screenshots/second_axis.png differ
diff --git a/screenshots/second_axis_hor.png b/screenshots/second_axis_hor.png
index e6b097a514..3d13df5915 100644
Binary files a/screenshots/second_axis_hor.png and b/screenshots/second_axis_hor.png differ
diff --git a/screenshots/second_axis_hor_small.png b/screenshots/second_axis_hor_small.png
index 209b5f0a0d..0c94cd931f 100644
Binary files a/screenshots/second_axis_hor_small.png and b/screenshots/second_axis_hor_small.png differ
diff --git a/screenshots/second_axis_small.png b/screenshots/second_axis_small.png
index 1c5f8de544..43e093ecb4 100644
Binary files a/screenshots/second_axis_small.png and b/screenshots/second_axis_small.png differ
diff --git a/screenshots/simpletest.png b/screenshots/simpletest.png
index fd28ed337e..9d3df8e0b3 100644
Binary files a/screenshots/simpletest.png and b/screenshots/simpletest.png differ
diff --git a/screenshots/simpletest_small.png b/screenshots/simpletest_small.png
index 888eb9939f..a9810f658a 100644
Binary files a/screenshots/simpletest_small.png and b/screenshots/simpletest_small.png differ
diff --git a/screenshots/stackedbars.png b/screenshots/stackedbars.png
index c265ef811f..17400fa809 100644
Binary files a/screenshots/stackedbars.png and b/screenshots/stackedbars.png differ
diff --git a/screenshots/stackedbars_hor.png b/screenshots/stackedbars_hor.png
index f99aef1a59..17811d5c25 100644
Binary files a/screenshots/stackedbars_hor.png and b/screenshots/stackedbars_hor.png differ
diff --git a/screenshots/stackedbars_hor_small.png b/screenshots/stackedbars_hor_small.png
index 94c2d0df9c..9e0b0f7203 100644
Binary files a/screenshots/stackedbars_hor_small.png and b/screenshots/stackedbars_hor_small.png differ
diff --git a/screenshots/stackedbars_small.png b/screenshots/stackedbars_small.png
index a57b59c5ea..efa9222293 100644
Binary files a/screenshots/stackedbars_small.png and b/screenshots/stackedbars_small.png differ
diff --git a/screenshots/stepplots.png b/screenshots/stepplots.png
index 8d5a555bd8..15f82ffced 100644
Binary files a/screenshots/stepplots.png and b/screenshots/stepplots.png differ
diff --git a/screenshots/stepplots_small.png b/screenshots/stepplots_small.png
index fcc347db02..767083c7b9 100644
Binary files a/screenshots/stepplots_small.png and b/screenshots/stepplots_small.png differ
diff --git a/screenshots/symbols_and_errors.png b/screenshots/symbols_and_errors.png
index b6d5750a95..e2339dc613 100644
Binary files a/screenshots/symbols_and_errors.png and b/screenshots/symbols_and_errors.png differ
diff --git a/screenshots/symbols_and_errors_small.png b/screenshots/symbols_and_errors_small.png
index f4bb9dc8c9..b92f141bae 100644
Binary files a/screenshots/symbols_and_errors_small.png and b/screenshots/symbols_and_errors_small.png differ
diff --git a/screenshots/test_distributionplot.png b/screenshots/test_distributionplot.png
index 4c4b822e42..8aaa32c75f 100644
Binary files a/screenshots/test_distributionplot.png and b/screenshots/test_distributionplot.png differ
diff --git a/screenshots/test_distributionplot_small.png b/screenshots/test_distributionplot_small.png
index c8e3bc3a09..8486e44601 100644
Binary files a/screenshots/test_distributionplot_small.png and b/screenshots/test_distributionplot_small.png differ
diff --git a/screenshots/violinplot_hor.png b/screenshots/violinplot_hor.png
index 7a90bcd746..408c536448 100644
Binary files a/screenshots/violinplot_hor.png and b/screenshots/violinplot_hor.png differ
diff --git a/screenshots/violinplot_hor_small.png b/screenshots/violinplot_hor_small.png
index 72cc0c0eda..f436216992 100644
Binary files a/screenshots/violinplot_hor_small.png and b/screenshots/violinplot_hor_small.png differ
diff --git a/screenshots/violinplot_vert.png b/screenshots/violinplot_vert.png
index e8b458f22b..0ba5e8cccc 100644
Binary files a/screenshots/violinplot_vert.png and b/screenshots/violinplot_vert.png differ
diff --git a/screenshots/violinplot_vert_small.png b/screenshots/violinplot_vert_small.png
index 048d3112b3..5bdfbbf021 100644
Binary files a/screenshots/violinplot_vert_small.png and b/screenshots/violinplot_vert_small.png differ
diff --git a/screenshots/wiggleplot_x.png b/screenshots/wiggleplot_x.png
index 535aeff0ef..22f45c2587 100644
Binary files a/screenshots/wiggleplot_x.png and b/screenshots/wiggleplot_x.png differ
diff --git a/screenshots/wiggleplot_x_small.png b/screenshots/wiggleplot_x_small.png
index 7bfd06edce..b9ea44ece8 100644
Binary files a/screenshots/wiggleplot_x_small.png and b/screenshots/wiggleplot_x_small.png differ
diff --git a/screenshots/wiggleplot_y.png b/screenshots/wiggleplot_y.png
index 6f52d2537e..df25411ce7 100644
Binary files a/screenshots/wiggleplot_y.png and b/screenshots/wiggleplot_y.png differ
diff --git a/screenshots/wiggleplot_y_small.png b/screenshots/wiggleplot_y_small.png
index 1b780eee4b..b221a0967f 100644
Binary files a/screenshots/wiggleplot_y_small.png and b/screenshots/wiggleplot_y_small.png differ
diff --git a/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp b/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
index 9cbc5990e4..7f93fcfafc 100644
--- a/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
+++ b/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
@@ -575,6 +575,146 @@ void doListStyles(const QDir& outputDir, const QStringList& doctomodify, int ico
}
}
+inline QString JKQTPKeyPosition2CPPString(JKQTPKeyPosition pos) {
+ switch(pos) {
+ case JKQTPKeyOutsideLeftBottom: return "JKQTPKeyOutsideLeftBottom";
+ case JKQTPKeyOutsideLeftCenter: return "JKQTPKeyOutsideLeftCenter";
+ case JKQTPKeyOutsideLeftTop: return "JKQTPKeyOutsideLeftTop";
+ case JKQTPKeyOutsideTopLeft: return "JKQTPKeyOutsideTopLeft";
+ case JKQTPKeyOutsideTopRight: return "JKQTPKeyOutsideTopRight";
+ case JKQTPKeyOutsideTopCenter: return "JKQTPKeyOutsideTopCenter";
+
+ case JKQTPKeyOutsideRightBottom: return "JKQTPKeyOutsideRightBottom";
+ case JKQTPKeyOutsideRightTop: return "JKQTPKeyOutsideRightTop";
+ case JKQTPKeyOutsideRightCenter: return "JKQTPKeyOutsideRightCenter";
+ case JKQTPKeyOutsideBottomLeft: return "JKQTPKeyOutsideBottomLeft";
+ case JKQTPKeyOutsideBottomRight: return "JKQTPKeyOutsideBottomRight";
+ case JKQTPKeyOutsideBottomCenter: return "JKQTPKeyOutsideBottomCenter";
+
+ case JKQTPKeyInsideBottomRight: return "JKQTPKeyInsideBottomRight";
+ case JKQTPKeyInsideTopLeft: return "JKQTPKeyInsideTopLeft";
+ case JKQTPKeyInsideTopRight: return "JKQTPKeyInsideTopRight";
+ case JKQTPKeyInsideBottomLeft: return "JKQTPKeyInsideBottomLeft";
+
+ case JKQTPKeyInsideTop: return "JKQTPKeyInsideTop";
+ case JKQTPKeyInsideBottom: return "JKQTPKeyInsideBottom";
+ case JKQTPKeyInsideLeft: return "JKQTPKeyInsideLeft";
+ case JKQTPKeyInsideRight: return "JKQTPKeyInsideRight";
+ }
+
+ QString res;
+ if (pos.testFlag(JKQTPKeyInside)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyInside";
+ else if (pos.testFlag(JKQTPKeyOutsideTop)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideTop";
+ else if (pos.testFlag(JKQTPKeyOutsideBottom)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideBottom";
+ else if (pos.testFlag(JKQTPKeyOutsideLeft)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideLeft";
+ else if (pos.testFlag(JKQTPKeyOutsideRight)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideRight";
+
+ if (pos.testFlag(JKQTPKeyLeft)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyLeft";
+ else if (pos.testFlag(JKQTPKeyHCenter)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyHCenter";
+ else if (pos.testFlag(JKQTPKeyRight)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyRight";
+
+ if (pos.testFlag(JKQTPKeyTop)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyTop";
+ else if (pos.testFlag(JKQTPKeyVCenter)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyVCenter";
+ else if (pos.testFlag(JKQTPKeyBottom)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyBottom";
+
+ return res;
+ return "";
+}
+
+
+void doListKeyPositions(const QDir& outputDir, int iconsize, QColor backgroundColor) {
+ JKQTBasePlotter plot(true);
+
+ plot.setWidgetSize(iconsize,iconsize);
+ plot.setShowKey(true);
+ plot.getMainKey()->setBackgroundColor(QColor("yellow").lighter());
+ plot.setGrid(false);
+ plot.setExportBackgroundColor(QColor("lightgrey"));
+ plot.getXAxis()->setShowZeroAxis(false);
+ plot.getYAxis()->setShowZeroAxis(false);
+ plot.getYAxis()->setAxisLabel("y-axis-label");
+ plot.getXAxis()->setAxisLabel("x-axis-label");
+
+
+ const size_t colX=plot.getDatastore()->addLinearColumn(30,0,1);
+ const size_t colY1=plot.getDatastore()->addColumnCalculatedFromColumn(colX, [](double x) { return x; });
+ const size_t colY2=plot.getDatastore()->addColumnCalculatedFromColumn(colX, [](double x) { return x*x; });
+ const size_t colY3=plot.getDatastore()->addColumnCalculatedFromColumn(colX, [](double x) { return sqrt(x); });
+ JKQTPXYLineGraph* g;
+ plot.addGraph(g=new JKQTPXYLineGraph(&plot));
+ g->setTitle("linear");
+ g->setDrawLine(true);
+ g->setSymbolType(JKQTPNoSymbol);
+ g->setXYColumns(colX, colY1);
+ plot.addGraph(g=new JKQTPXYLineGraph(&plot));
+ g->setTitle("square");
+ g->setDrawLine(true);
+ g->setSymbolType(JKQTPNoSymbol);
+ g->setXYColumns(colX, colY2);
+ plot.addGraph(g=new JKQTPXYLineGraph(&plot));
+ g->setTitle("square root");
+ g->setDrawLine(true);
+ g->setSymbolType(JKQTPNoSymbol);
+ g->setXYColumns(colX, colY3);
+
+
+ plot.setXY(0,1,0,1);
+ for (const auto keypos: JKQTPGetTypicalKeyPositions()) {
+ if (keypos.testFlag(JKQTPKeyInside)) plot.setWidgetSize(iconsize,iconsize);
+ else plot.setWidgetSize(1.5*iconsize,iconsize);
+
+
+ plot.setKeyPosition(keypos);
+ plot.setPlotLabel(JKQTPKeyPosition2CPPString(keypos));
+ plot.redrawPlot();
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).save(outputDir.absoluteFilePath(JKQTPKeyPosition2CPPString(keypos)+".png"), "png");
+ }
+}
+
+void doListKeyLayouts(const QDir& outputDir, int iconsize, QColor backgroundColor) {
+ JKQTBasePlotter plot(true);
+
+ plot.setWidgetSize(iconsize*2.0,iconsize);
+ plot.setShowKey(true);
+ plot.getMainKey()->setBackgroundColor(QColor("yellow").lighter());
+ plot.setGrid(false);
+ plot.setExportBackgroundColor(QColor("lightgrey"));
+ plot.getXAxis()->setShowZeroAxis(false);
+ plot.getYAxis()->setShowZeroAxis(false);
+ plot.getYAxis()->setAxisLabel("y-axis-label");
+ plot.getXAxis()->setAxisLabel("x-axis-label");
+
+
+ JKQTPXYLineGraph* g;
+ const size_t colX=plot.getDatastore()->addLinearColumn(70,0,1);
+ for (int i=0; i<8; i++) {
+ const size_t colY1=plot.getDatastore()->addColumnCalculatedFromColumn(colX, [i](double x) { return pow(x, pow(2,(i-4)/4.0)); });
+ plot.addGraph(g=new JKQTPXYLineGraph(&plot));
+ g->setTitle(QString::number(i+1)+": $f(x)=x^{"+QString::number(pow(2,(i-4)/4.0), 'f', 2)+"}$");
+ g->setDrawLine(true);
+ g->setSymbolType(JKQTPNoSymbol);
+ g->setXYColumns(colX, colY1);
+ }
+
+
+ plot.zoomToFit();
+ for (int i=0; i<=JKQTPKeyLayoutMax; i++) {
+ const auto l=static_cast(i);
+
+ plot.getMainKey()->setLayout(l);
+ plot.setPlotLabel("\\verb|"+JKQTPKeyLayout2String(l)+"|");
+ plot.redrawPlot();
+
+ plot.getMainKey()->setPosition(JKQTPKeyInsideTopRight);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).save(outputDir.absoluteFilePath("JKQTPKeyLayout_"+JKQTPKeyLayout2String(l)+".png"), "png");
+ plot.getMainKey()->setPosition(JKQTPKeyOutsideRightCenter);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).save(outputDir.absoluteFilePath("JKQTPKeyLayout_outsideright_"+JKQTPKeyLayout2String(l)+".png"), "png");
+ plot.getMainKey()->setPosition(JKQTPKeyOutsideBottomCenter);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).save(outputDir.absoluteFilePath("JKQTPKeyLayout_outsidebottom_"+JKQTPKeyLayout2String(l)+".png"), "png");
+ }
+
+}
+
int main(int argc, char* argv[])
{
// 1. create Qt Appcilation object and a QCommandLineParser to go with it
@@ -603,6 +743,10 @@ int main(int argc, char* argv[])
parser.addOption(listpalettesOption);
QCommandLineOption liststylesOption("liststyles", "generate example images for all predefined style INI files.");
parser.addOption(liststylesOption);
+ QCommandLineOption listkeyposOption("listkeypos", "generate example images for all standard key positions.");
+ parser.addOption(listkeyposOption);
+ QCommandLineOption listkeylayoutOption("listkeylayout", "generate example images for all key layouts.");
+ parser.addOption(listkeylayoutOption);
QCommandLineOption iconsizeOption("iconsize", "typical size of the generatued images.", "iconsize", "24");
parser.addOption(iconsizeOption);
QCommandLineOption backgroundOption("background", "background color.", "background", "white");
@@ -619,6 +763,8 @@ int main(int argc, char* argv[])
const bool listaxisticklabelangles=parser.isSet(listAxisTickLabelAnglesOption);
const bool listlabelpositions=parser.isSet(listlabelpositionsOption);
const bool liststyles=parser.isSet(liststylesOption);
+ const bool listkeypos=parser.isSet(listkeyposOption);
+ const bool listkeylayout=parser.isSet(listkeylayoutOption);
const int iconsize=parser.value(iconsizeOption).toInt();
const QColor backgroundColor = jkqtp_String2QColor(parser.value(backgroundOption));
@@ -632,6 +778,8 @@ int main(int argc, char* argv[])
if (listaxisticklabelangles) doListAxisTickLabelAngles(outputDir, iconsize, backgroundColor);
if (liststyles) doListStyles(outputDir, doctomodify, iconsize, backgroundColor);
if (listpalettes) doListPalettes(outputDir, QSize(iconsize,qMax(5,iconsize/16)));
+ if (listkeypos) doListKeyPositions(outputDir, iconsize, backgroundColor);
+ if (listkeylayout) doListKeyLayouts(outputDir, iconsize, backgroundColor);
return EXIT_SUCCESS;
}