diff --git a/doc/dox/jkqtmathtext_supportedlatexsymbols.dox b/doc/dox/jkqtmathtext_supportedlatexsymbols.dox index cbf047205a..2bf276ee68 100644 --- a/doc/dox/jkqtmathtext_supportedlatexsymbols.dox +++ b/doc/dox/jkqtmathtext_supportedlatexsymbols.dox @@ -136,6 +136,39 @@ \section jkqtmathtext_supportedlatexsymbols_arrows Arrows The following table lists all arrow-typed symbols available in JKQTMathParser. They are defined in the node-class JKQTMathTextSymbolNode: + + + + + + - - - - - - - - -
\\Downarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png + \\Leftarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png + \\Leftrightarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png +
\\Longleftarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png + \\Longleftrightarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png + \\Longrightarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png +
\\Rightarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png + \\Uparrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png + \\Updownarrow: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png +
\\downarrow: \image html jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_XITS_MATHANDTEXT.png @@ -184,75 +217,42 @@ \\updownarrow: \image html jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_XITS_MATHANDTEXT.png \image html jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_FIRA_MATHANDTEXT.png - \\Downarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png - \\Leftarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png + \\downharpoonleft: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png + \\downharpoonright: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png
\\Leftrightarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png - \\Longleftarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png - \\Longleftrightarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png + \\rightleftharpoon: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png + \\leftharpoondown: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png + \\rightharpoondown: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png
\\Longrightarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png - \\Rightarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png - \\Uparrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png + \\rightharpoonup: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png + \\leftharpoonup: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png + \\leftrightharpoon: + \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png + \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png
\\Updownarrow: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png \\upharpoonleft: \image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png \image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png \\upharpoonright: \image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png \image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png -
\\downharpoonleft: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png - \\leftharpoondown: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png - \\leftharpoonup: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png -
\\leftrightharpoon: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png - \\rightharpoondown: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png - \\rightharpoonup: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png -
\\rightleftharpoon: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png - \\downharpoonright: - \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png - \image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png \\mapsto: \image html jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_XITS_MATHANDTEXT.png \image html jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_FIRA_MATHANDTEXT.png diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index c7e3a93cac..adbacfd2ec 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -148,6 +148,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • FIXED: \c \\sum and \c \\prod used the wrong symbol in XITS-mode
  • FIXED issue #117: Unnecessary printing of tilde symbol in math (thanks to user:igormironchik for reporting):
    Tilde was not recognized as a LaTeX instruction, now is interpreted as non-breaking whitespace
  • FIXED issue #118: Dangerous warning in MacOS and clang (thanks to user:igormironchik for reporting):
    a forward-declared class (i.e. incomplete type) was deleted
    • +
  • FIXED issue #128: Question about rendering unicode in plot labels: Unicode characters were not rendered if they are not in the currently active font, as fallback-rendering was switched off. It is now switched on again for text and verbatim nodes. Thanks to user:fpalazzolo for reporting this bug
  • IMPROVED: high-dpr-support in JKQTMathText
  • IMPROVED: typesetting of sub-/supercripts, especially for large math operators and braces
  • MODIFIED: brace node now calculates the extension of the child height above or below the strikeoutPos, in order to center braces around the strikeoutPos
    • diff --git a/doc/images/JKQTBasePlotter_addSecondaryXAxis.png b/doc/images/JKQTBasePlotter_addSecondaryXAxis.png index 2d0fd4bb98..588884fac5 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 e1ee1c0282..6681a08c17 100644 Binary files a/doc/images/JKQTBasePlotter_addSecondaryYAxis.png and b/doc/images/JKQTBasePlotter_addSecondaryYAxis.png differ diff --git a/doc/images/JKQTPBarHorizontalAutoscaleMaxWidthOnly.png b/doc/images/JKQTPBarHorizontalAutoscaleMaxWidthOnly.png index 243488bc46..3f997cea8a 100644 Binary files a/doc/images/JKQTPBarHorizontalAutoscaleMaxWidthOnly.png and b/doc/images/JKQTPBarHorizontalAutoscaleMaxWidthOnly.png differ diff --git a/doc/images/JKQTPBarHorizontalAutoscaleShrinkOnly.png b/doc/images/JKQTPBarHorizontalAutoscaleShrinkOnly.png index 6b41fe1f01..6f0344a9fa 100644 Binary files a/doc/images/JKQTPBarHorizontalAutoscaleShrinkOnly.png and b/doc/images/JKQTPBarHorizontalAutoscaleShrinkOnly.png differ diff --git a/doc/images/JKQTPBarHorizontalErrorGraph.png b/doc/images/JKQTPBarHorizontalErrorGraph.png index d0384e1442..c7342b9278 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 9e31d591f9..d074ba2e2a 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 ffa6397a29..0761cfc465 100644 Binary files a/doc/images/JKQTPBarHorizontalGraph.png and b/doc/images/JKQTPBarHorizontalGraph.png differ diff --git a/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor.png b/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor.png index 8edd73acc5..f9f01d8574 100644 Binary files a/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor.png and b/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor.png differ diff --git a/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor_small.png b/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor_small.png index ff0e120842..9e5545f4cc 100644 Binary files a/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor_small.png and b/doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor_small.png differ diff --git a/doc/images/JKQTPBarHorizontalGraphFunctorFilling.png b/doc/images/JKQTPBarHorizontalGraphFunctorFilling.png index d820c41157..4f0c053f16 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 432163044f..21e1990374 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 ce8d55477e..63074c5573 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 ea8b773d7c..945652678e 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 6f003e9cf5..3db0a22c82 100644 Binary files a/doc/images/JKQTPBarHorizontalGraph_small.png and b/doc/images/JKQTPBarHorizontalGraph_small.png differ diff --git a/doc/images/JKQTPBarVerticalAutoscaleMaxWidthOnly.png b/doc/images/JKQTPBarVerticalAutoscaleMaxWidthOnly.png index 59d5ad5967..4970653879 100644 Binary files a/doc/images/JKQTPBarVerticalAutoscaleMaxWidthOnly.png and b/doc/images/JKQTPBarVerticalAutoscaleMaxWidthOnly.png differ diff --git a/doc/images/JKQTPBarVerticalAutoscaleShrinkOnly.png b/doc/images/JKQTPBarVerticalAutoscaleShrinkOnly.png index 5698ced10b..1792e8ece6 100644 Binary files a/doc/images/JKQTPBarVerticalAutoscaleShrinkOnly.png and b/doc/images/JKQTPBarVerticalAutoscaleShrinkOnly.png differ diff --git a/doc/images/JKQTPBarVerticalErrorGraph.png b/doc/images/JKQTPBarVerticalErrorGraph.png index d1cc5d499a..24f341457a 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 d2c3709f7c..e16781259f 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 fa101c3543..ea0a294c9c 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 2c42ccaa95..10bbe5bfa6 100644 Binary files a/doc/images/JKQTPBarVerticalGraphBaseline.png and b/doc/images/JKQTPBarVerticalGraphBaseline.png differ diff --git a/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor.png b/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor.png index b95bc00c19..5809767c3f 100644 Binary files a/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor.png and b/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor.png differ diff --git a/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor_small.png b/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor_small.png index 83c6f54a34..f358c0d6f8 100644 Binary files a/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor_small.png and b/doc/images/JKQTPBarVerticalGraphCustomDrawFunctor_small.png differ diff --git a/doc/images/JKQTPBarVerticalGraphFunctorFilling.png b/doc/images/JKQTPBarVerticalGraphFunctorFilling.png index edb3d9e2b2..31a2f7e2da 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 d2929f939f..8d2e5370b1 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 fa101c3543..ea0a294c9c 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 5b72bf4442..a25c75710e 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 2978b993f8..020ca43552 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 5e76c3629c..b4d228c2ca 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 568b0d3692..933d771d8e 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 b7da771759..3ad85cdb4d 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 df16b3eb99..3a5a801896 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 5059514b48..6a3e900d05 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 4d8f5e53fc..3ec06fc635 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 cd7e97a566..99726fa45e 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 c3b5f54303..83415268fe 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 de375f1f0b..1c463a538a 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 5439b19739..7411209d61 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 36d07cead9..42f0d6a09c 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 1803a33c45..e243fc1518 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 fa90a13478..7a0b38e30a 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 a2adba20a2..0afefd107b 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 9c8f9aaf7f..44da896e8a 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 6147dfb417..9e12a613a3 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 3d274d0c44..6a2130f74f 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 caa016bea0..f5c627f3c2 100644 Binary files a/doc/images/JKQTPFilledCurveYGraph_wiggle.png and b/doc/images/JKQTPFilledCurveYGraph_wiggle.png differ diff --git a/doc/images/JKQTPFinancialGraph.png b/doc/images/JKQTPFinancialGraph.png index 616eb5aeb1..987aec98d5 100644 Binary files a/doc/images/JKQTPFinancialGraph.png and b/doc/images/JKQTPFinancialGraph.png differ diff --git a/doc/images/JKQTPFinancialGraphCandleStick.png b/doc/images/JKQTPFinancialGraphCandleStick.png index e7ef1b607a..7d7d7673aa 100644 Binary files a/doc/images/JKQTPFinancialGraphCandleStick.png and b/doc/images/JKQTPFinancialGraphCandleStick.png differ diff --git a/doc/images/JKQTPFinancialGraphOHLC.png b/doc/images/JKQTPFinancialGraphOHLC.png index e80ce0c594..ab007265e5 100644 Binary files a/doc/images/JKQTPFinancialGraphOHLC.png and b/doc/images/JKQTPFinancialGraphOHLC.png differ diff --git a/doc/images/JKQTPFinancialGraphSetCandlestickOneColor.png b/doc/images/JKQTPFinancialGraphSetCandlestickOneColor.png index e2ecf85893..a80101d9d6 100644 Binary files a/doc/images/JKQTPFinancialGraphSetCandlestickOneColor.png and b/doc/images/JKQTPFinancialGraphSetCandlestickOneColor.png differ diff --git a/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor.png b/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor.png index 04a16c8d1e..1c40db7364 100644 Binary files a/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor.png and b/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor.png differ diff --git a/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor2.png b/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor2.png index 57a28d2466..6b792b16a9 100644 Binary files a/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor2.png and b/doc/images/JKQTPFinancialGraphSetCandlestickTwoColor2.png differ diff --git a/doc/images/JKQTPFinancialGraphSetOHLCTwoColor.png b/doc/images/JKQTPFinancialGraphSetOHLCTwoColor.png index e10c844153..775aa02a99 100644 Binary files a/doc/images/JKQTPFinancialGraphSetOHLCTwoColor.png and b/doc/images/JKQTPFinancialGraphSetOHLCTwoColor.png differ diff --git a/doc/images/JKQTPFinancialGraphSidyBySide.png b/doc/images/JKQTPFinancialGraphSidyBySide.png index 0aadc55096..56cd444641 100644 Binary files a/doc/images/JKQTPFinancialGraphSidyBySide.png and b/doc/images/JKQTPFinancialGraphSidyBySide.png differ diff --git a/doc/images/JKQTPGLSimpleBox.png b/doc/images/JKQTPGLSimpleBox.png index fd8475b241..628a250093 100644 Binary files a/doc/images/JKQTPGLSimpleBox.png and b/doc/images/JKQTPGLSimpleBox.png differ diff --git a/doc/images/JKQTPGLSimpleBoxAndLine.png b/doc/images/JKQTPGLSimpleBoxAndLine.png index 4b90381b84..d1b2756d82 100644 Binary files a/doc/images/JKQTPGLSimpleBoxAndLine.png and b/doc/images/JKQTPGLSimpleBoxAndLine.png differ diff --git a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS.png b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS.png index b49ee75c0c..35f7218d33 100644 Binary files a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS.png and b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS.png differ diff --git a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical.png b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical.png index b480931879..4b70e685a2 100644 Binary files a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical.png and b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical.png differ diff --git a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical_small.png b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical_small.png index 371503b92b..edcd543cd1 100644 Binary files a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical_small.png and b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical_small.png differ diff --git a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS_small.png b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS_small.png index 9f28f3ad69..fba1cd3fab 100644 Binary files a/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS_small.png and b/doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS_small.png differ diff --git a/doc/images/JKQTPGLSimpleBoxAndLineVertical.png b/doc/images/JKQTPGLSimpleBoxAndLineVertical.png index d446b6aa2d..55836aab95 100644 Binary files a/doc/images/JKQTPGLSimpleBoxAndLineVertical.png and b/doc/images/JKQTPGLSimpleBoxAndLineVertical.png differ diff --git a/doc/images/JKQTPGLSimpleBoxVertical.png b/doc/images/JKQTPGLSimpleBoxVertical.png index 7922c47439..427067c3b4 100644 Binary files a/doc/images/JKQTPGLSimpleBoxVertical.png and b/doc/images/JKQTPGLSimpleBoxVertical.png differ diff --git a/doc/images/JKQTPGLabelAboveData.png b/doc/images/JKQTPGLabelAboveData.png index f24bd96373..6b4ab55d96 100644 Binary files a/doc/images/JKQTPGLabelAboveData.png and b/doc/images/JKQTPGLabelAboveData.png differ diff --git a/doc/images/JKQTPGLabelAwayFromXAxis.png b/doc/images/JKQTPGLabelAwayFromXAxis.png index 02e597e615..c5fcc3da8a 100644 Binary files a/doc/images/JKQTPGLabelAwayFromXAxis.png and b/doc/images/JKQTPGLabelAwayFromXAxis.png differ diff --git a/doc/images/JKQTPGLabelAwayFromYAxis.png b/doc/images/JKQTPGLabelAwayFromYAxis.png index e8189718d8..7a82b8b100 100644 Binary files a/doc/images/JKQTPGLabelAwayFromYAxis.png and b/doc/images/JKQTPGLabelAwayFromYAxis.png differ diff --git a/doc/images/JKQTPGLabelBelowData.png b/doc/images/JKQTPGLabelBelowData.png index f3c439d301..d96ad42254 100644 Binary files a/doc/images/JKQTPGLabelBelowData.png and b/doc/images/JKQTPGLabelBelowData.png differ diff --git a/doc/images/JKQTPGLabelCenteredOnData.png b/doc/images/JKQTPGLabelCenteredOnData.png index 54a2da863d..6cacb8ecad 100644 Binary files a/doc/images/JKQTPGLabelCenteredOnData.png and b/doc/images/JKQTPGLabelCenteredOnData.png differ diff --git a/doc/images/JKQTPGLabelHalfwaysToXAxis.png b/doc/images/JKQTPGLabelHalfwaysToXAxis.png index 9f33d20bb8..df98839108 100644 Binary files a/doc/images/JKQTPGLabelHalfwaysToXAxis.png and b/doc/images/JKQTPGLabelHalfwaysToXAxis.png differ diff --git a/doc/images/JKQTPGLabelHalfwaysToYAxis.png b/doc/images/JKQTPGLabelHalfwaysToYAxis.png index 57b4cd2299..e6312fcc8a 100644 Binary files a/doc/images/JKQTPGLabelHalfwaysToYAxis.png and b/doc/images/JKQTPGLabelHalfwaysToYAxis.png differ diff --git a/doc/images/JKQTPGLabelLeftHandSide.png b/doc/images/JKQTPGLabelLeftHandSide.png index 9c6f8a0eb9..f0f73b2300 100644 Binary files a/doc/images/JKQTPGLabelLeftHandSide.png and b/doc/images/JKQTPGLabelLeftHandSide.png differ diff --git a/doc/images/JKQTPGLabelRightHandSide.png b/doc/images/JKQTPGLabelRightHandSide.png index f0d327d48e..b7dcab2e22 100644 Binary files a/doc/images/JKQTPGLabelRightHandSide.png and b/doc/images/JKQTPGLabelRightHandSide.png differ diff --git a/doc/images/JKQTPGLabelTowardsXAxis.png b/doc/images/JKQTPGLabelTowardsXAxis.png index 83ab271389..6b8b1b29b7 100644 Binary files a/doc/images/JKQTPGLabelTowardsXAxis.png and b/doc/images/JKQTPGLabelTowardsXAxis.png differ diff --git a/doc/images/JKQTPGLabelTowardsYAxis.png b/doc/images/JKQTPGLabelTowardsYAxis.png index bcd0f0c3a9..f8a4c2a719 100644 Binary files a/doc/images/JKQTPGLabelTowardsYAxis.png and b/doc/images/JKQTPGLabelTowardsYAxis.png differ diff --git a/doc/images/JKQTPGeoBezierCurveGraphic.png b/doc/images/JKQTPGeoBezierCurveGraphic.png index 3b76e9a32d..b8b257f367 100644 Binary files a/doc/images/JKQTPGeoBezierCurveGraphic.png and b/doc/images/JKQTPGeoBezierCurveGraphic.png differ diff --git a/doc/images/JKQTPGeoBezierCurveLogGraphic.png b/doc/images/JKQTPGeoBezierCurveLogGraphic.png index dab8f437ba..f7e0946bc1 100644 Binary files a/doc/images/JKQTPGeoBezierCurveLogGraphic.png and b/doc/images/JKQTPGeoBezierCurveLogGraphic.png differ diff --git a/doc/images/JKQTPGeoBezierCurveLogMath.png b/doc/images/JKQTPGeoBezierCurveLogMath.png index 7e07db43c8..04f727dc53 100644 Binary files a/doc/images/JKQTPGeoBezierCurveLogMath.png and b/doc/images/JKQTPGeoBezierCurveLogMath.png differ diff --git a/doc/images/JKQTPGeoBezierCurveMath.png b/doc/images/JKQTPGeoBezierCurveMath.png index 3b76e9a32d..b8b257f367 100644 Binary files a/doc/images/JKQTPGeoBezierCurveMath.png and b/doc/images/JKQTPGeoBezierCurveMath.png differ diff --git a/doc/images/JKQTPImpulsesHorizontalErrorGraph.png b/doc/images/JKQTPImpulsesHorizontalErrorGraph.png index 68423748cf..aaced4ca02 100644 Binary files a/doc/images/JKQTPImpulsesHorizontalErrorGraph.png and b/doc/images/JKQTPImpulsesHorizontalErrorGraph.png differ diff --git a/doc/images/JKQTPImpulsesHorizontalErrorGraph_small.png b/doc/images/JKQTPImpulsesHorizontalErrorGraph_small.png index 97415b7bf2..2630087d65 100644 Binary files a/doc/images/JKQTPImpulsesHorizontalErrorGraph_small.png and b/doc/images/JKQTPImpulsesHorizontalErrorGraph_small.png differ diff --git a/doc/images/JKQTPImpulsesHorizontalGraph.png b/doc/images/JKQTPImpulsesHorizontalGraph.png index 6d62abb965..b7251c613a 100644 Binary files a/doc/images/JKQTPImpulsesHorizontalGraph.png and b/doc/images/JKQTPImpulsesHorizontalGraph.png differ diff --git a/doc/images/JKQTPImpulsesHorizontalGraphBaseline.png b/doc/images/JKQTPImpulsesHorizontalGraphBaseline.png index 9cccc9b8f6..813c92e38a 100644 Binary files a/doc/images/JKQTPImpulsesHorizontalGraphBaseline.png and b/doc/images/JKQTPImpulsesHorizontalGraphBaseline.png differ diff --git a/doc/images/JKQTPImpulsesHorizontalGraphNoBaseline.png b/doc/images/JKQTPImpulsesHorizontalGraphNoBaseline.png index 6d62abb965..b7251c613a 100644 Binary files a/doc/images/JKQTPImpulsesHorizontalGraphNoBaseline.png and b/doc/images/JKQTPImpulsesHorizontalGraphNoBaseline.png differ diff --git a/doc/images/JKQTPImpulsesHorizontalGraph_small.png b/doc/images/JKQTPImpulsesHorizontalGraph_small.png index 88c6caf0a2..e66d96d838 100644 Binary files a/doc/images/JKQTPImpulsesHorizontalGraph_small.png and b/doc/images/JKQTPImpulsesHorizontalGraph_small.png differ diff --git a/doc/images/JKQTPImpulsesVerticalErrorGraph.png b/doc/images/JKQTPImpulsesVerticalErrorGraph.png index 30747d4853..cc8311384f 100644 Binary files a/doc/images/JKQTPImpulsesVerticalErrorGraph.png and b/doc/images/JKQTPImpulsesVerticalErrorGraph.png differ diff --git a/doc/images/JKQTPImpulsesVerticalErrorGraph_small.png b/doc/images/JKQTPImpulsesVerticalErrorGraph_small.png index 8971ccdb48..a3c0414803 100644 Binary files a/doc/images/JKQTPImpulsesVerticalErrorGraph_small.png and b/doc/images/JKQTPImpulsesVerticalErrorGraph_small.png differ diff --git a/doc/images/JKQTPImpulsesVerticalGraph.png b/doc/images/JKQTPImpulsesVerticalGraph.png index e90d305b4b..8a772d804b 100644 Binary files a/doc/images/JKQTPImpulsesVerticalGraph.png and b/doc/images/JKQTPImpulsesVerticalGraph.png differ diff --git a/doc/images/JKQTPImpulsesVerticalGraphBaseline.png b/doc/images/JKQTPImpulsesVerticalGraphBaseline.png index ab30097bdb..7c3704f4c1 100644 Binary files a/doc/images/JKQTPImpulsesVerticalGraphBaseline.png and b/doc/images/JKQTPImpulsesVerticalGraphBaseline.png differ diff --git a/doc/images/JKQTPImpulsesVerticalGraphNoBaseline.png b/doc/images/JKQTPImpulsesVerticalGraphNoBaseline.png index e90d305b4b..8a772d804b 100644 Binary files a/doc/images/JKQTPImpulsesVerticalGraphNoBaseline.png and b/doc/images/JKQTPImpulsesVerticalGraphNoBaseline.png differ diff --git a/doc/images/JKQTPImpulsesVerticalGraph_Symbols.png b/doc/images/JKQTPImpulsesVerticalGraph_Symbols.png index 3b50a5b876..f3594d9a43 100644 Binary files a/doc/images/JKQTPImpulsesVerticalGraph_Symbols.png and b/doc/images/JKQTPImpulsesVerticalGraph_Symbols.png differ diff --git a/doc/images/JKQTPImpulsesVerticalGraph_Symbols_small.png b/doc/images/JKQTPImpulsesVerticalGraph_Symbols_small.png index 2b96ef4ef1..7d001e91fa 100644 Binary files a/doc/images/JKQTPImpulsesVerticalGraph_Symbols_small.png and b/doc/images/JKQTPImpulsesVerticalGraph_Symbols_small.png differ diff --git a/doc/images/JKQTPImpulsesVerticalGraph_small.png b/doc/images/JKQTPImpulsesVerticalGraph_small.png index 81121ca03f..bc9ccc6cc0 100644 Binary files a/doc/images/JKQTPImpulsesVerticalGraph_small.png and b/doc/images/JKQTPImpulsesVerticalGraph_small.png differ diff --git a/doc/images/JKQTPParametrizedVectorFieldGraph.png b/doc/images/JKQTPParametrizedVectorFieldGraph.png index 5ee2e56ded..ca5342c3f3 100644 Binary files a/doc/images/JKQTPParametrizedVectorFieldGraph.png and b/doc/images/JKQTPParametrizedVectorFieldGraph.png differ diff --git a/doc/images/JKQTPParametrizedVectorFieldGraphColorFromAngle.png b/doc/images/JKQTPParametrizedVectorFieldGraphColorFromAngle.png index 397827aa47..723d0613ad 100644 Binary files a/doc/images/JKQTPParametrizedVectorFieldGraphColorFromAngle.png and b/doc/images/JKQTPParametrizedVectorFieldGraphColorFromAngle.png differ diff --git a/doc/images/JKQTPParametrizedVectorFieldGraphColorFromMagnitude.png b/doc/images/JKQTPParametrizedVectorFieldGraphColorFromMagnitude.png index f4e4354da3..a6988c2c08 100644 Binary files a/doc/images/JKQTPParametrizedVectorFieldGraphColorFromMagnitude.png and b/doc/images/JKQTPParametrizedVectorFieldGraphColorFromMagnitude.png differ diff --git a/doc/images/JKQTPParametrizedVectorFieldGraphDefaultColor.png b/doc/images/JKQTPParametrizedVectorFieldGraphDefaultColor.png index 199291869c..e3fc48536e 100644 Binary files a/doc/images/JKQTPParametrizedVectorFieldGraphDefaultColor.png and b/doc/images/JKQTPParametrizedVectorFieldGraphDefaultColor.png differ diff --git a/doc/images/JKQTPVectorFieldGraph.png b/doc/images/JKQTPVectorFieldGraph.png index 6ec88dbf95..92b00f7dd2 100644 Binary files a/doc/images/JKQTPVectorFieldGraph.png and b/doc/images/JKQTPVectorFieldGraph.png differ diff --git a/doc/images/JKQTPVectorFieldGraphAnchorBottom.png b/doc/images/JKQTPVectorFieldGraphAnchorBottom.png index 1b2af6d65a..7be04238a0 100644 Binary files a/doc/images/JKQTPVectorFieldGraphAnchorBottom.png and b/doc/images/JKQTPVectorFieldGraphAnchorBottom.png differ diff --git a/doc/images/JKQTPVectorFieldGraphAnchorMid.png b/doc/images/JKQTPVectorFieldGraphAnchorMid.png index 24552809e8..a143e13a54 100644 Binary files a/doc/images/JKQTPVectorFieldGraphAnchorMid.png and b/doc/images/JKQTPVectorFieldGraphAnchorMid.png differ diff --git a/doc/images/JKQTPVectorFieldGraphAnchorTip.png b/doc/images/JKQTPVectorFieldGraphAnchorTip.png index 2510826fe6..774383a575 100644 Binary files a/doc/images/JKQTPVectorFieldGraphAnchorTip.png and b/doc/images/JKQTPVectorFieldGraphAnchorTip.png differ diff --git a/doc/images/JKQTPVectorFieldGraphAutoscaleLength.png b/doc/images/JKQTPVectorFieldGraphAutoscaleLength.png index 1b2af6d65a..7be04238a0 100644 Binary files a/doc/images/JKQTPVectorFieldGraphAutoscaleLength.png and b/doc/images/JKQTPVectorFieldGraphAutoscaleLength.png differ diff --git a/doc/images/JKQTPVectorFieldGraphAutoscaleLengthAutoscaleLineWidthFromLength.png b/doc/images/JKQTPVectorFieldGraphAutoscaleLengthAutoscaleLineWidthFromLength.png index 12a661eb4e..0b29295963 100644 Binary files a/doc/images/JKQTPVectorFieldGraphAutoscaleLengthAutoscaleLineWidthFromLength.png and b/doc/images/JKQTPVectorFieldGraphAutoscaleLengthAutoscaleLineWidthFromLength.png differ diff --git a/doc/images/JKQTPVectorFieldGraphIgnoreLength.png b/doc/images/JKQTPVectorFieldGraphIgnoreLength.png index 8ae8d66a49..50687d9fa6 100644 Binary files a/doc/images/JKQTPVectorFieldGraphIgnoreLength.png and b/doc/images/JKQTPVectorFieldGraphIgnoreLength.png differ diff --git a/doc/images/JKQTPVectorFieldGraphIgnoreLengthAutoscaleLineWidthFromLength.png b/doc/images/JKQTPVectorFieldGraphIgnoreLengthAutoscaleLineWidthFromLength.png index 33aaf8df76..021277177b 100644 Binary files a/doc/images/JKQTPVectorFieldGraphIgnoreLengthAutoscaleLineWidthFromLength.png and b/doc/images/JKQTPVectorFieldGraphIgnoreLengthAutoscaleLineWidthFromLength.png differ diff --git a/doc/images/JKQTPVectorFieldGraphLengthFromData.png b/doc/images/JKQTPVectorFieldGraphLengthFromData.png index 5b22eac1cb..8f7fb457b4 100644 Binary files a/doc/images/JKQTPVectorFieldGraphLengthFromData.png and b/doc/images/JKQTPVectorFieldGraphLengthFromData.png differ diff --git a/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png b/doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png index 3b0f8ba0ea..d11f22e784 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 2f6f0c4421..93ead9fbe9 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 eb649adbd8..9379087f49 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 89b9f54511..583ef66591 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 7778bedd2b..3206dccb2f 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 9ddfd3f0cd..9063f3166b 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 ed377e0f9d..e215a07cb9 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 6537e02a90..94ea9800a0 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 2717959a65..700c66a5a1 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 7b250aeace..753639315f 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 a9a00ae759..987777ae70 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 9121c7cd58..7c20063b53 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 c66e364ccf..f94bb1c8d4 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 c516c0e96d..578fed4bf1 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 06b2e6e1e1..e87bb9e97f 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 53ebd67574..44e2d85248 100644 Binary files a/doc/images/JKQTPbarVerticalGraphStacked_small.png and b/doc/images/JKQTPbarVerticalGraphStacked_small.png differ diff --git a/doc/images/axisstyle/JKQTPCADMAxisLabel.png b/doc/images/axisstyle/JKQTPCADMAxisLabel.png index 2a9b6ad91f..344b5ac17b 100644 Binary files a/doc/images/axisstyle/JKQTPCADMAxisLabel.png and b/doc/images/axisstyle/JKQTPCADMAxisLabel.png differ diff --git a/doc/images/axisstyle/JKQTPCADMLineTicksTickLabels.png b/doc/images/axisstyle/JKQTPCADMLineTicksTickLabels.png index 5bef4c53e6..9e2525d023 100644 Binary files a/doc/images/axisstyle/JKQTPCADMLineTicksTickLabels.png and b/doc/images/axisstyle/JKQTPCADMLineTicksTickLabels.png differ diff --git a/doc/images/axisstyle/JKQTPCADMTickLabels.png b/doc/images/axisstyle/JKQTPCADMTickLabels.png index ee862e7a4d..64c7faa51e 100644 Binary files a/doc/images/axisstyle/JKQTPCADMTickLabels.png and b/doc/images/axisstyle/JKQTPCADMTickLabels.png differ diff --git a/doc/images/axisstyle/JKQTPCADMTickLabelsAxisLabel.png b/doc/images/axisstyle/JKQTPCADMTickLabelsAxisLabel.png index 7900b9f730..cae0331322 100644 Binary files a/doc/images/axisstyle/JKQTPCADMTickLabelsAxisLabel.png and b/doc/images/axisstyle/JKQTPCADMTickLabelsAxisLabel.png differ diff --git a/doc/images/axisstyle/JKQTPCADMTicksTickLabels.png b/doc/images/axisstyle/JKQTPCADMTicksTickLabels.png index db70451ad9..bfc570366b 100644 Binary files a/doc/images/axisstyle/JKQTPCADMTicksTickLabels.png and b/doc/images/axisstyle/JKQTPCADMTicksTickLabels.png differ diff --git a/doc/images/axisstyle/JKQTPCADMTicksTickLabelsAxisLabel.png b/doc/images/axisstyle/JKQTPCADMTicksTickLabelsAxisLabel.png index 1b1ed97912..3f1926361c 100644 Binary files a/doc/images/axisstyle/JKQTPCADMTicksTickLabelsAxisLabel.png and b/doc/images/axisstyle/JKQTPCADMTicksTickLabelsAxisLabel.png differ diff --git a/doc/images/axisstyle/JKQTPCADMcomplete.png b/doc/images/axisstyle/JKQTPCADMcomplete.png index 5afc74cc02..0695661a1b 100644 Binary files a/doc/images/axisstyle/JKQTPCADMcomplete.png and b/doc/images/axisstyle/JKQTPCADMcomplete.png differ diff --git a/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png b/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png index 64f0742a42..2a33524d50 100644 Binary files a/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png and b/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png b/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png index ed021379fd..8e03eb1762 100644 Binary files a/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png and b/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCALTdate.png b/doc/images/axisstyle/JKQTPCALTdate.png index 33093254ff..87e2405100 100644 Binary files a/doc/images/axisstyle/JKQTPCALTdate.png and b/doc/images/axisstyle/JKQTPCALTdate.png differ diff --git a/doc/images/axisstyle/JKQTPCALTdatetime.png b/doc/images/axisstyle/JKQTPCALTdatetime.png index 82a1a0b26b..a067fc20bc 100644 Binary files a/doc/images/axisstyle/JKQTPCALTdatetime.png and b/doc/images/axisstyle/JKQTPCALTdatetime.png differ diff --git a/doc/images/axisstyle/JKQTPCALTdefault.png b/doc/images/axisstyle/JKQTPCALTdefault.png index a524b2e6d0..675922b3f7 100644 Binary files a/doc/images/axisstyle/JKQTPCALTdefault.png and b/doc/images/axisstyle/JKQTPCALTdefault.png differ diff --git a/doc/images/axisstyle/JKQTPCALTexponent.png b/doc/images/axisstyle/JKQTPCALTexponent.png index f5ab8c3be9..2c5f7a67cf 100644 Binary files a/doc/images/axisstyle/JKQTPCALTexponent.png and b/doc/images/axisstyle/JKQTPCALTexponent.png differ diff --git a/doc/images/axisstyle/JKQTPCALTexponentCharacter.png b/doc/images/axisstyle/JKQTPCALTexponentCharacter.png index 9c76720553..f6e5bc5c56 100644 Binary files a/doc/images/axisstyle/JKQTPCALTexponentCharacter.png and b/doc/images/axisstyle/JKQTPCALTexponentCharacter.png differ diff --git a/doc/images/axisstyle/JKQTPCALTfrac.png b/doc/images/axisstyle/JKQTPCALTfrac.png index 68c713c5d0..5aeb699529 100644 Binary files a/doc/images/axisstyle/JKQTPCALTfrac.png and b/doc/images/axisstyle/JKQTPCALTfrac.png differ diff --git a/doc/images/axisstyle/JKQTPCALTintfrac.png b/doc/images/axisstyle/JKQTPCALTintfrac.png index ddedd1f105..79edfa6dc2 100644 Binary files a/doc/images/axisstyle/JKQTPCALTintfrac.png and b/doc/images/axisstyle/JKQTPCALTintfrac.png differ diff --git a/doc/images/axisstyle/JKQTPCALTintsfrac.png b/doc/images/axisstyle/JKQTPCALTintsfrac.png index 667fd04d83..d7575b310b 100644 Binary files a/doc/images/axisstyle/JKQTPCALTintsfrac.png and b/doc/images/axisstyle/JKQTPCALTintsfrac.png differ diff --git a/doc/images/axisstyle/JKQTPCALTintslashfrac.png b/doc/images/axisstyle/JKQTPCALTintslashfrac.png index d433d3bfd7..6375517deb 100644 Binary files a/doc/images/axisstyle/JKQTPCALTintslashfrac.png and b/doc/images/axisstyle/JKQTPCALTintslashfrac.png differ diff --git a/doc/images/axisstyle/JKQTPCALTprintf.png b/doc/images/axisstyle/JKQTPCALTprintf.png index 5db029fe31..2115080bf9 100644 Binary files a/doc/images/axisstyle/JKQTPCALTprintf.png and b/doc/images/axisstyle/JKQTPCALTprintf.png differ diff --git a/doc/images/axisstyle/JKQTPCALTscientific.png b/doc/images/axisstyle/JKQTPCALTscientific.png index 3730914d10..6d092ec7f6 100644 Binary files a/doc/images/axisstyle/JKQTPCALTscientific.png and b/doc/images/axisstyle/JKQTPCALTscientific.png differ diff --git a/doc/images/axisstyle/JKQTPCALTsfrac.png b/doc/images/axisstyle/JKQTPCALTsfrac.png index 5b2ab9c1cb..439bc3dc90 100644 Binary files a/doc/images/axisstyle/JKQTPCALTsfrac.png and b/doc/images/axisstyle/JKQTPCALTsfrac.png differ diff --git a/doc/images/axisstyle/JKQTPCALTslashfrac.png b/doc/images/axisstyle/JKQTPCALTslashfrac.png index 37ff8911c5..1d19d99d3b 100644 Binary files a/doc/images/axisstyle/JKQTPCALTslashfrac.png and b/doc/images/axisstyle/JKQTPCALTslashfrac.png differ diff --git a/doc/images/axisstyle/JKQTPCALTtime.png b/doc/images/axisstyle/JKQTPCALTtime.png index 04a2193297..449cbe1a97 100644 Binary files a/doc/images/axisstyle/JKQTPCALTtime.png and b/doc/images/axisstyle/JKQTPCALTtime.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-15Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-15Degree.png index 68e0f8e382..702ad184de 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-15Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-15Degree.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-45Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-45Degree.png index bab1734d06..dd0e7c8aac 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-45Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-45Degree.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-75Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-75Degree.png index 002d5eac23..404e4a2f70 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-75Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-75Degree.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle0Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle0Degree.png index 3ce254fb23..bac0f94117 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle0Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle0Degree.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle15Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle15Degree.png index 477e1d0750..5326af31b7 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle15Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle15Degree.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle45Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle45Degree.png index 9e5c5cb1a8..9ef1a0ca60 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle45Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle45Degree.png differ diff --git a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle75Degree.png b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle75Degree.png index 0b153a3e08..385dd35e60 100644 Binary files a/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle75Degree.png and b/doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle75Degree.png differ diff --git a/doc/images/axisstyle/JKQTPLTMLin.png b/doc/images/axisstyle/JKQTPLTMLin.png index 7648b3b597..c02197274f 100644 Binary files a/doc/images/axisstyle/JKQTPLTMLin.png and b/doc/images/axisstyle/JKQTPLTMLin.png differ diff --git a/doc/images/axisstyle/JKQTPLTMLinOrPower.png b/doc/images/axisstyle/JKQTPLTMLinOrPower.png index 5ced69e69b..6837b1bcb7 100644 Binary files a/doc/images/axisstyle/JKQTPLTMLinOrPower.png and b/doc/images/axisstyle/JKQTPLTMLinOrPower.png differ diff --git a/doc/images/axisstyle/JKQTPLTMPower.png b/doc/images/axisstyle/JKQTPLTMPower.png index 5eebdf2c97..b8aea16e74 100644 Binary files a/doc/images/axisstyle/JKQTPLTMPower.png and b/doc/images/axisstyle/JKQTPLTMPower.png differ diff --git a/doc/images/axisstyle/axis_unit_scaling_none.png b/doc/images/axisstyle/axis_unit_scaling_none.png index bd6dcf4271..3d77905381 100644 Binary files a/doc/images/axisstyle/axis_unit_scaling_none.png and b/doc/images/axisstyle/axis_unit_scaling_none.png differ diff --git a/doc/images/axisstyle/axis_unit_scaling_pi.png b/doc/images/axisstyle/axis_unit_scaling_pi.png index 83b3f3d96f..f06afd7a4f 100644 Binary files a/doc/images/axisstyle/axis_unit_scaling_pi.png and b/doc/images/axisstyle/axis_unit_scaling_pi.png differ diff --git a/doc/images/jkqtmathtext/jkqtmathtext_bb.png b/doc/images/jkqtmathtext/jkqtmathtext_bb.png index 8881414bad..48727784ee 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_unicode_or_font_directly.png b/doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_font_directly.png index 971a5d2558..213cb5f652 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 5ec642ac3c..c328a47ace 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_computermodern.png b/doc/images/jkqtmathtext/jkqtmathtext_computermodern.png index 8d90ac1732..9fc67bd3e3 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_mssegoeui.png b/doc/images/jkqtmathtext/jkqtmathtext_mssegoeui.png index da228515b2..36e6d1a1f6 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_unicode.png b/doc/images/jkqtmathtext/jkqtmathtext_unicode.png index e10bba73c9..3f7c7dce1b 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_utf8.png b/doc/images/jkqtmathtext/jkqtmathtext_utf8.png index 59808b41c7..2800af14cb 100644 Binary files a/doc/images/jkqtmathtext/jkqtmathtext_utf8.png and b/doc/images/jkqtmathtext/jkqtmathtext_utf8.png differ diff --git a/doc/images/keylayouts/JKQTPKeyLayout_multi_column.png b/doc/images/keylayouts/JKQTPKeyLayout_multi_column.png index 7aabf633ef..01793257b0 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_multi_column.png 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 index b73240f51b..2dc2091208 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_multi_row.png 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 index 5caa4841c8..3cf8f004d6 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_one_column.png 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 index 51b6fecf53..203abf5eb0 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_one_row.png 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 index bb0629229c..3eb889e718 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_column.png 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 index 4a75c9c595..904e2fe931 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_row.png 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 index 3e24a85145..6c38dc4672 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_column.png 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 index 6da01507db..8ac4a9ef5d 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_row.png 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 index d8b3155808..04d050c056 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_column.png 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 index 1adddd594b..2e282fc97f 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_row.png 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 index 41a42e3925..eccb112e63 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_column.png 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 index ff71813669..4f56f057dd 100644 Binary files a/doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_row.png 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 index 7497194a60..af61648a25 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideBottom.png and b/doc/images/keypositions/JKQTPKeyInsideBottom.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png b/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png index 49fdef1e27..92f65154c1 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png and b/doc/images/keypositions/JKQTPKeyInsideBottomLeft.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideBottomRight.png b/doc/images/keypositions/JKQTPKeyInsideBottomRight.png index 7a08019adc..6588e25d54 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideBottomRight.png and b/doc/images/keypositions/JKQTPKeyInsideBottomRight.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideLeft.png b/doc/images/keypositions/JKQTPKeyInsideLeft.png index 73368846c2..d6840eb693 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideLeft.png and b/doc/images/keypositions/JKQTPKeyInsideLeft.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideRight.png b/doc/images/keypositions/JKQTPKeyInsideRight.png index f3c98e1288..bf38fd2ca9 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideRight.png and b/doc/images/keypositions/JKQTPKeyInsideRight.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideTop.png b/doc/images/keypositions/JKQTPKeyInsideTop.png index 02b7e4e3e8..7dee34ebc8 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideTop.png and b/doc/images/keypositions/JKQTPKeyInsideTop.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideTopLeft.png b/doc/images/keypositions/JKQTPKeyInsideTopLeft.png index 954e9ea290..59d5865469 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideTopLeft.png and b/doc/images/keypositions/JKQTPKeyInsideTopLeft.png differ diff --git a/doc/images/keypositions/JKQTPKeyInsideTopRight.png b/doc/images/keypositions/JKQTPKeyInsideTopRight.png index 1edd164039..f8e0cce23a 100644 Binary files a/doc/images/keypositions/JKQTPKeyInsideTopRight.png and b/doc/images/keypositions/JKQTPKeyInsideTopRight.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png b/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png index 32bedc8698..aa7a7f81b4 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png and b/doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png b/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png index 7cef511a23..182a44f054 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png and b/doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png b/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png index b6a0d5c91e..136c158af1 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png and b/doc/images/keypositions/JKQTPKeyOutsideBottomRight.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png b/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png index 3424cd7568..f4afb1dd84 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png and b/doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png b/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png index afb21282c9..d52c6bcaaf 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png and b/doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png b/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png index b8909fe4c6..31f909f262 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png and b/doc/images/keypositions/JKQTPKeyOutsideLeftTop.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png b/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png index 2885e41eed..2ab30b9ad0 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png and b/doc/images/keypositions/JKQTPKeyOutsideRightBottom.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png b/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png index 6e95932ea7..5e31dfdb02 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png and b/doc/images/keypositions/JKQTPKeyOutsideRightCenter.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideRightTop.png b/doc/images/keypositions/JKQTPKeyOutsideRightTop.png index 341d5bb2ee..4c57e60ef6 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideRightTop.png and b/doc/images/keypositions/JKQTPKeyOutsideRightTop.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png b/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png index c868033ceb..e7a5f0117e 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png and b/doc/images/keypositions/JKQTPKeyOutsideTopCenter.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png b/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png index 3afcbae5aa..0f6853ecae 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png and b/doc/images/keypositions/JKQTPKeyOutsideTopLeft.png differ diff --git a/doc/images/keypositions/JKQTPKeyOutsideTopRight.png b/doc/images/keypositions/JKQTPKeyOutsideTopRight.png index df4503d560..ab64dc044e 100644 Binary files a/doc/images/keypositions/JKQTPKeyOutsideTopRight.png and b/doc/images/keypositions/JKQTPKeyOutsideTopRight.png differ diff --git a/doc/images/labelstyles/JKQTPLabelCenter.png b/doc/images/labelstyles/JKQTPLabelCenter.png index 8c3053e266..02ec89933d 100644 Binary files a/doc/images/labelstyles/JKQTPLabelCenter.png and b/doc/images/labelstyles/JKQTPLabelCenter.png differ diff --git a/doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png index d66dccaf81..32d5d64cfa 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/JKQTPLabelMax.png b/doc/images/labelstyles/JKQTPLabelMax.png index 97adefdcac..8a0adca14c 100644 Binary files a/doc/images/labelstyles/JKQTPLabelMax.png and b/doc/images/labelstyles/JKQTPLabelMax.png differ diff --git a/doc/images/labelstyles/JKQTPLabelMaxBesides.png b/doc/images/labelstyles/JKQTPLabelMaxBesides.png index e145af8979..7dd6cac8e0 100644 Binary files a/doc/images/labelstyles/JKQTPLabelMaxBesides.png and b/doc/images/labelstyles/JKQTPLabelMaxBesides.png differ diff --git a/doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png index 4fed268df1..9e0a917376 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 478c365c7d..ddbfb28771 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/JKQTPLabelMin.png b/doc/images/labelstyles/JKQTPLabelMin.png index 49dadeac53..6dd0197daf 100644 Binary files a/doc/images/labelstyles/JKQTPLabelMin.png and b/doc/images/labelstyles/JKQTPLabelMin.png differ diff --git a/doc/images/labelstyles/JKQTPLabelMinBesides.png b/doc/images/labelstyles/JKQTPLabelMinBesides.png index 2367cfa212..5bea8c6279 100644 Binary files a/doc/images/labelstyles/JKQTPLabelMinBesides.png and b/doc/images/labelstyles/JKQTPLabelMinBesides.png differ diff --git a/doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png b/doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png index 3c6951d778..4fc2d3d15a 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 c8eeaf781e..c288e95555 100644 Binary files a/doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png and b/doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png differ diff --git a/doc/images/styles/blackandwhite.ini.png b/doc/images/styles/blackandwhite.ini.png index 26f81611f3..18e1988629 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/blackandwhite.ini.symbols.png b/doc/images/styles/blackandwhite.ini.symbols.png index 453fc6116e..777fcf6882 100644 Binary files a/doc/images/styles/blackandwhite.ini.symbols.png and b/doc/images/styles/blackandwhite.ini.symbols.png differ diff --git a/doc/images/styles/blueprint.ini.png b/doc/images/styles/blueprint.ini.png index a6237e988a..225e6664f8 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/blueprint.ini.symbols.png b/doc/images/styles/blueprint.ini.symbols.png index 75353c5081..336d99f392 100644 Binary files a/doc/images/styles/blueprint.ini.symbols.png and b/doc/images/styles/blueprint.ini.symbols.png differ diff --git a/doc/images/styles/cyberpunk.ini.png b/doc/images/styles/cyberpunk.ini.png index c0fac0cb11..4ea9503b42 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/cyberpunk.ini.symbols.png b/doc/images/styles/cyberpunk.ini.symbols.png index 7a1dbc996a..df9ab37536 100644 Binary files a/doc/images/styles/cyberpunk.ini.symbols.png and b/doc/images/styles/cyberpunk.ini.symbols.png differ diff --git a/doc/images/styles/dark.ini.png b/doc/images/styles/dark.ini.png index bb08ce39f2..c51ff2b429 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/dark.ini.symbols.png b/doc/images/styles/dark.ini.symbols.png index 42a02582d5..122afea2be 100644 Binary files a/doc/images/styles/dark.ini.symbols.png and b/doc/images/styles/dark.ini.symbols.png differ diff --git a/doc/images/styles/default.ini.png b/doc/images/styles/default.ini.png index 17451a3842..2e44c75e4e 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/default.ini.symbols.png b/doc/images/styles/default.ini.symbols.png index b1befb2af3..ca0409da29 100644 Binary files a/doc/images/styles/default.ini.symbols.png and b/doc/images/styles/default.ini.symbols.png differ diff --git a/doc/images/styles/legacy_default_style.ini.png b/doc/images/styles/legacy_default_style.ini.png index 6000d0b63c..11883dc725 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/legacy_default_style.ini.symbols.png b/doc/images/styles/legacy_default_style.ini.symbols.png index 944fb2fa84..ff55cdeadf 100644 Binary files a/doc/images/styles/legacy_default_style.ini.symbols.png and b/doc/images/styles/legacy_default_style.ini.symbols.png differ diff --git a/doc/images/styles/seaborn.ini.png b/doc/images/styles/seaborn.ini.png index 04b05dd9e8..5dbeb3bd81 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/seaborn.ini.symbols.png b/doc/images/styles/seaborn.ini.symbols.png index ce22b98379..a10c94c68c 100644 Binary files a/doc/images/styles/seaborn.ini.symbols.png and b/doc/images/styles/seaborn.ini.symbols.png differ diff --git a/doc/images/styles/simple_arrowsaxes.ini.png b/doc/images/styles/simple_arrowsaxes.ini.png index 3a23e6891d..82b889f3e1 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_arrowsaxes.ini.symbols.png b/doc/images/styles/simple_arrowsaxes.ini.symbols.png index b1befb2af3..ca0409da29 100644 Binary files a/doc/images/styles/simple_arrowsaxes.ini.symbols.png and b/doc/images/styles/simple_arrowsaxes.ini.symbols.png differ diff --git a/doc/images/styles/simple_axesoffset.ini.png b/doc/images/styles/simple_axesoffset.ini.png index 5c458f8623..6180f321a7 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.ini.symbols.png b/doc/images/styles/simple_axesoffset.ini.symbols.png index b1befb2af3..ca0409da29 100644 Binary files a/doc/images/styles/simple_axesoffset.ini.symbols.png and b/doc/images/styles/simple_axesoffset.ini.symbols.png differ diff --git a/doc/images/styles/simple_axesoffset_plotbox.ini.png b/doc/images/styles/simple_axesoffset_plotbox.ini.png index 40cf090dc4..3ffb480e99 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_axesoffset_plotbox.ini.symbols.png b/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png index b1befb2af3..ca0409da29 100644 Binary files a/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png and b/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png differ diff --git a/doc/images/styles/simple_gridandticks.ini.png b/doc/images/styles/simple_gridandticks.ini.png index aac7b75329..81af0641cc 100644 Binary files a/doc/images/styles/simple_gridandticks.ini.png and b/doc/images/styles/simple_gridandticks.ini.png differ diff --git a/doc/images/styles/simple_gridandticks.ini.symbols.png b/doc/images/styles/simple_gridandticks.ini.symbols.png index b1befb2af3..ca0409da29 100644 Binary files a/doc/images/styles/simple_gridandticks.ini.symbols.png and b/doc/images/styles/simple_gridandticks.ini.symbols.png differ diff --git a/doc/images/styles/simple_noaxes.ini.png b/doc/images/styles/simple_noaxes.ini.png index fcdec85be0..1afcaadf0f 100644 Binary files a/doc/images/styles/simple_noaxes.ini.png and b/doc/images/styles/simple_noaxes.ini.png differ diff --git a/doc/images/styles/simple_noaxes.ini.symbols.png b/doc/images/styles/simple_noaxes.ini.symbols.png index b1befb2af3..ca0409da29 100644 Binary files a/doc/images/styles/simple_noaxes.ini.symbols.png and b/doc/images/styles/simple_noaxes.ini.symbols.png differ diff --git a/examples/multithreaded/README.md b/examples/multithreaded/README.md index d0dfe0e637..1d90e23406 100644 --- a/examples/multithreaded/README.md +++ b/examples/multithreaded/README.md @@ -97,10 +97,10 @@ This test results in the following numbers (on my AMD Ryzen5 8/16-core laptop): VERSION: 5.0.0 BUILD MODE: Release -SERIAL RESULTS:
    runtime, overall = 3532.2ms
    single runtimes = (147.1 +/- 366.4) ms
    speedup = 1.00x
    threads / available = 1 / 16


    +SERIAL RESULTS:
    runtime, overall = 12130.5ms
    single runtimes = (505.3 +/- 1773.2) ms
    speedup = 1.00x
    threads / available = 1 / 16


    PARALLEL RESULTS:
    -runtime, overall = 617.1ms
    single runtimes = (195.3 +/- 5.8) ms
    speedup = 7.60x
    threads / available = 8 / 16
    batch runs = 3

    speedup vs. serial = 5.7x +runtime, overall = 5495.3ms
    single runtimes = (1657.1 +/- 391.4) ms
    speedup = 7.24x
    threads / available = 8 / 16
    batch runs = 3

    speedup vs. serial = 2.2x [comment]:RESULTS_END diff --git a/lib/jkqtmathtext/jkqtmathtexttools.cpp b/lib/jkqtmathtext/jkqtmathtexttools.cpp index 3cfcda0ca4..8868bbc30a 100644 --- a/lib/jkqtmathtext/jkqtmathtexttools.cpp +++ b/lib/jkqtmathtext/jkqtmathtexttools.cpp @@ -711,7 +711,8 @@ QFont JKQTMathTextEnvironment::getFont(const JKQTMathText* parent) const { f.setCapitalization(capitalization); if (fontSizeUnit==POINTS) f.setPointSizeF(fontSize); else if (fontSizeUnit==PIXELS) f.setPixelSize(static_cast(fontSize)); - f.setStyleStrategy(QFont::NoFontMerging); + const QFont::StyleStrategy strat=static_cast(QFont::NoFontMerging|QFont::PreferAntialias); + f.setStyleStrategy(strat); return f; } diff --git a/lib/jkqtmathtext/nodes/jkqtmathtexttextnode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtexttextnode.cpp index a229a23a66..b8c5d8f0dc 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtexttextnode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtexttextnode.cpp @@ -138,10 +138,10 @@ JKQTMathTextTextNode::LayoutInfo JKQTMathTextTextNode::calcLayout(QPainter &pain const QString txt=textTransform(text, currentEv); splitTextForLayout(painter, currentEv, txt, l.textpart, l.fontMode); - const QFont f=currentEv.getFont(parentMathText); - const QFont fUpright=JKQTMathTextGetNonItalic(f); - const QFont fFallbackSym=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); - const QFont fRoman=currentEv.exchangedFontForRoman().getFont(parentMathText); + const QFont f=[&](){ auto ff=currentEv.getFont(parentMathText); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fUpright=[&](){ auto ff=JKQTMathTextGetNonItalic(f); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fFallbackSym=[&](){ auto ff=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fRoman=[&](){ auto f=currentEv.exchangedFontForRoman().getFont(parentMathText); f.setStyleStrategy(static_cast(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return f; }(); //const double sp=JKQTMathTextGetHorAdvance(f, " ", painter.device()); l.width=0; double ascent=0; @@ -206,8 +206,8 @@ void JKQTMathTextTextNode::splitTextForLayout(QPainter &painter, JKQTMathTextEnv //const QFont f=currentEv.getFont(parentMathText); //const QFont fUpright=JKQTMathTextGetNonItalic(f); - const QFont fFallbackSym=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); - const QFont fRoman=currentEv.exchangedFontForRoman().getFont(parentMathText); + const QFont fFallbackSym=[&](){ auto ff=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fRoman=[&](){ auto f=currentEv.exchangedFontForRoman().getFont(parentMathText); f.setStyleStrategy(static_cast(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return f; }(); //const QFontMetricsF fm(f, painter.device()); //const QFontMetricsF fmUpright(fUpright, painter.device()); const QFontMetricsF fmFallbackSym(fFallbackSym, painter.device()); @@ -291,10 +291,10 @@ double JKQTMathTextTextNode::draw(QPainter& painter, double x, double y, JKQTMat doDrawBoxes(painter, x, y, l); - const QFont f=currentEv.getFont(parentMathText); - const QFont fUpright=JKQTMathTextGetNonItalic(f); - const QFont fFallbackSym=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); - const QFont fRoman=currentEv.exchangedFontForRoman().getFont(parentMathText); + const QFont f=[&](){ auto ff=currentEv.getFont(parentMathText); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fUpright=[&](){ auto ff=JKQTMathTextGetNonItalic(f); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fFallbackSym=[&](){ auto ff=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); ff.setStyleStrategy(static_cast(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }(); + const QFont fRoman=[&](){ auto f=currentEv.exchangedFontForRoman().getFont(parentMathText); f.setStyleStrategy(static_cast(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return f; }(); //const QFontMetricsF fm(f, painter.device()); //const QFontMetricsF fmUpright(fUpright, painter.device()); //const QFontMetricsF fmFallbackSym(fFallbackSym, painter.device()); diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextverbatimnode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextverbatimnode.cpp index 1400a758b1..8b2aa49d1a 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextverbatimnode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextverbatimnode.cpp @@ -89,7 +89,7 @@ double JKQTMathTextVerbatimNode::draw(QPainter &painter, double x, double y, JKQ const LayoutInfo l=calcLayout(painter, currentEv); doDrawBoxes(painter, x, y, l); QFont f=currentEv.getFont(parentMathText); - f.setStyleStrategy(QFont::PreferDefault); + f.setStyleStrategy(static_cast(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); f.setFixedPitch(true); painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();}); painter.setFont(f); @@ -136,7 +136,7 @@ JKQTMathTextVerbatimNode::LayoutInfo JKQTMathTextVerbatimNode::calcLayout(QPaint { LayoutInfo l; QFont f=currentEv.getFont(parentMathText); - f.setStyleStrategy(QFont::PreferDefault); + f.setStyleStrategy(static_cast(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); f.setFixedPitch(true); const qreal fascent=JKQTMathTextGetFontAscent(f, painter.device()); const double linespacing=JKQTMathTextGetFontLineSpacing(f, painter.device())*lineSpacingFactor; diff --git a/screenshots/advancedlineandfillstyling_small.png b/screenshots/advancedlineandfillstyling_small.png index c9e81651e9..9cc908b330 100644 Binary files a/screenshots/advancedlineandfillstyling_small.png and b/screenshots/advancedlineandfillstyling_small.png differ diff --git a/screenshots/barchart_customdrawfunctor_hor_small.png b/screenshots/barchart_customdrawfunctor_hor_small.png index ff0e120842..9e5545f4cc 100644 Binary files a/screenshots/barchart_customdrawfunctor_hor_small.png and b/screenshots/barchart_customdrawfunctor_hor_small.png differ diff --git a/screenshots/barchart_customdrawfunctor_small.png b/screenshots/barchart_customdrawfunctor_small.png index 83c6f54a34..f358c0d6f8 100644 Binary files a/screenshots/barchart_customdrawfunctor_small.png and b/screenshots/barchart_customdrawfunctor_small.png differ diff --git a/screenshots/barchart_errorbars_hor_small.png b/screenshots/barchart_errorbars_hor_small.png index 9e31d591f9..d074ba2e2a 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 d2c3709f7c..e16781259f 100644 Binary files a/screenshots/barchart_errorbars_small.png and b/screenshots/barchart_errorbars_small.png differ diff --git a/screenshots/barchart_functorfill_hor_small.png b/screenshots/barchart_functorfill_hor_small.png index 432163044f..21e1990374 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 d2929f939f..8d2e5370b1 100644 Binary files a/screenshots/barchart_functorfill_small.png and b/screenshots/barchart_functorfill_small.png differ diff --git a/screenshots/barchart_hor_small.png b/screenshots/barchart_hor_small.png index 6f003e9cf5..3db0a22c82 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 5e76c3629c..b4d228c2ca 100644 Binary files a/screenshots/barchart_small.png and b/screenshots/barchart_small.png differ diff --git a/screenshots/barchart_twocolor_hor_small.png b/screenshots/barchart_twocolor_hor_small.png index ea8b773d7c..945652678e 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 2978b993f8..020ca43552 100644 Binary files a/screenshots/barchart_twocolor_small.png and b/screenshots/barchart_twocolor_small.png differ diff --git a/screenshots/boxplot_small.png b/screenshots/boxplot_small.png index a067f14356..c2c2ad0385 100644 Binary files a/screenshots/boxplot_small.png and b/screenshots/boxplot_small.png differ diff --git a/screenshots/contourplot_small.png b/screenshots/contourplot_small.png index cd7e97a566..99726fa45e 100644 Binary files a/screenshots/contourplot_small.png and b/screenshots/contourplot_small.png differ diff --git a/screenshots/datastore_iterators_cosine_yreplaced_small.png b/screenshots/datastore_iterators_cosine_yreplaced_small.png index 7afddef5c4..1679be243f 100644 Binary files a/screenshots/datastore_iterators_cosine_yreplaced_small.png and b/screenshots/datastore_iterators_cosine_yreplaced_small.png differ diff --git a/screenshots/datastore_iterators_small.png b/screenshots/datastore_iterators_small.png index 2a6829a8e6..8517639090 100644 Binary files a/screenshots/datastore_iterators_small.png and b/screenshots/datastore_iterators_small.png differ diff --git a/screenshots/datastore_small.png b/screenshots/datastore_small.png index 6f63da3bac..94b11282d0 100644 Binary files a/screenshots/datastore_small.png and b/screenshots/datastore_small.png differ diff --git a/screenshots/dateaxes_small.png b/screenshots/dateaxes_small.png index 25b49bc22e..674d459616 100644 Binary files a/screenshots/dateaxes_small.png and b/screenshots/dateaxes_small.png differ diff --git a/screenshots/dateaxes_timeaxis_small.png b/screenshots/dateaxes_timeaxis_small.png index 079f523ad4..ebe0dd9c8f 100644 Binary files a/screenshots/dateaxes_timeaxis_small.png and b/screenshots/dateaxes_timeaxis_small.png differ diff --git a/screenshots/errorbarstyles_impulses_horizontal_small.png b/screenshots/errorbarstyles_impulses_horizontal_small.png index 97415b7bf2..2630087d65 100644 Binary files a/screenshots/errorbarstyles_impulses_horizontal_small.png and b/screenshots/errorbarstyles_impulses_horizontal_small.png differ diff --git a/screenshots/errorbarstyles_impulses_small.png b/screenshots/errorbarstyles_impulses_small.png index 8971ccdb48..a3c0414803 100644 Binary files a/screenshots/errorbarstyles_impulses_small.png and b/screenshots/errorbarstyles_impulses_small.png differ diff --git a/screenshots/errorbarstyles_small.png b/screenshots/errorbarstyles_small.png index e3701133ec..0f9c98327d 100644 Binary files a/screenshots/errorbarstyles_small.png and b/screenshots/errorbarstyles_small.png differ diff --git a/screenshots/filledgraphs_errors_small.png b/screenshots/filledgraphs_errors_small.png index 5439b19739..7411209d61 100644 Binary files a/screenshots/filledgraphs_errors_small.png and b/screenshots/filledgraphs_errors_small.png differ diff --git a/screenshots/filledgraphs_errors_y_small.png b/screenshots/filledgraphs_errors_y_small.png index 9c8f9aaf7f..44da896e8a 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 1803a33c45..e243fc1518 100644 Binary files a/screenshots/filledgraphs_small.png and b/screenshots/filledgraphs_small.png differ diff --git a/screenshots/filledgraphs_y_small.png b/screenshots/filledgraphs_y_small.png index 3d274d0c44..6a2130f74f 100644 Binary files a/screenshots/filledgraphs_y_small.png and b/screenshots/filledgraphs_y_small.png differ diff --git a/screenshots/financialgraphs_small.png b/screenshots/financialgraphs_small.png index 9f5cdb7c48..c1c5077af7 100644 Binary files a/screenshots/financialgraphs_small.png and b/screenshots/financialgraphs_small.png differ diff --git a/screenshots/geo_arrows_small.png b/screenshots/geo_arrows_small.png index 38ace62b72..789b0e6faa 100644 Binary files a/screenshots/geo_arrows_small.png and b/screenshots/geo_arrows_small.png differ diff --git a/screenshots/geo_bezier_small.png b/screenshots/geo_bezier_small.png index e3e79c5fdb..4f97221174 100644 Binary files a/screenshots/geo_bezier_small.png and b/screenshots/geo_bezier_small.png differ diff --git a/screenshots/geo_coordinateaxis0_small.png b/screenshots/geo_coordinateaxis0_small.png index 314eded8c2..7f4456b126 100644 Binary files a/screenshots/geo_coordinateaxis0_small.png and b/screenshots/geo_coordinateaxis0_small.png differ diff --git a/screenshots/graphlabels_hor_small.png b/screenshots/graphlabels_hor_small.png index 170c59cb90..500cfb65f1 100644 Binary files a/screenshots/graphlabels_hor_small.png and b/screenshots/graphlabels_hor_small.png differ diff --git a/screenshots/graphlabels_small.png b/screenshots/graphlabels_small.png index ff34eeef00..780519b163 100644 Binary files a/screenshots/graphlabels_small.png and b/screenshots/graphlabels_small.png differ diff --git a/screenshots/imageplot_modifier_small.png b/screenshots/imageplot_modifier_small.png index fbc95f7052..010b590fb3 100644 Binary files a/screenshots/imageplot_modifier_small.png and b/screenshots/imageplot_modifier_small.png differ diff --git a/screenshots/imageplot_nodatastore_small.png b/screenshots/imageplot_nodatastore_small.png index 4c606410b3..e176d3d2f3 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 ae14b24813..f021d34a0f 100644 Binary files a/screenshots/imageplot_small.png and b/screenshots/imageplot_small.png differ diff --git a/screenshots/impulsesplot_horizontal_small.png b/screenshots/impulsesplot_horizontal_small.png index 88c6caf0a2..e66d96d838 100644 Binary files a/screenshots/impulsesplot_horizontal_small.png and b/screenshots/impulsesplot_horizontal_small.png differ diff --git a/screenshots/impulsesplot_small.png b/screenshots/impulsesplot_small.png index 81121ca03f..bc9ccc6cc0 100644 Binary files a/screenshots/impulsesplot_small.png and b/screenshots/impulsesplot_small.png differ diff --git a/screenshots/impulsesplot_symbols_small.png b/screenshots/impulsesplot_symbols_small.png index 2b96ef4ef1..7d001e91fa 100644 Binary files a/screenshots/impulsesplot_symbols_small.png and b/screenshots/impulsesplot_symbols_small.png differ diff --git a/screenshots/logaxes.png b/screenshots/logaxes.png index 5de912e606..d08842be6b 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 4bec448ecf..b320e74ac4 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 6f8abd3fab..14dd512ee4 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 e877a40fb9..44ac757779 100644 Binary files a/screenshots/logaxes_small.png and b/screenshots/logaxes_small.png differ diff --git a/screenshots/multiplot_controlwindow.png b/screenshots/multiplot_controlwindow.png index b1c1d1251b..4a0d16491f 100644 Binary files a/screenshots/multiplot_controlwindow.png and b/screenshots/multiplot_controlwindow.png differ diff --git a/screenshots/multiplot_controlwindow_small.png b/screenshots/multiplot_controlwindow_small.png index 0edfd9d63b..0d972b18c4 100644 Binary files a/screenshots/multiplot_controlwindow_small.png and b/screenshots/multiplot_controlwindow_small.png differ diff --git a/screenshots/multithreaded.png b/screenshots/multithreaded.png index 7844efebd2..8b3902c3ec 100644 Binary files a/screenshots/multithreaded.png and b/screenshots/multithreaded.png differ diff --git a/screenshots/multithreaded_small.png b/screenshots/multithreaded_small.png index 5695b7ea93..59c58740c9 100644 Binary files a/screenshots/multithreaded_small.png and b/screenshots/multithreaded_small.png differ diff --git a/screenshots/parametriccurve1_small.png b/screenshots/parametriccurve1_small.png index 3c4dab36e1..d3b74b56d3 100644 Binary files a/screenshots/parametriccurve1_small.png and b/screenshots/parametriccurve1_small.png differ diff --git a/screenshots/parametriccurve2_small.png b/screenshots/parametriccurve2_small.png index 9e15706af0..aa1f79487e 100644 Binary files a/screenshots/parametriccurve2_small.png and b/screenshots/parametriccurve2_small.png differ diff --git a/screenshots/paramscatterplot_customsymbol_small.png b/screenshots/paramscatterplot_customsymbol_small.png index fafda7b5c1..9dd7d3670d 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 9eaa79122f..03d6f5110e 100644 Binary files a/screenshots/paramscatterplot_small.png and b/screenshots/paramscatterplot_small.png differ diff --git a/screenshots/paramvectorfield_small.png b/screenshots/paramvectorfield_small.png index 6b9f6b79f8..9dc1f7f338 100644 Binary files a/screenshots/paramvectorfield_small.png and b/screenshots/paramvectorfield_small.png differ diff --git a/screenshots/parsedfunctionplot.png b/screenshots/parsedfunctionplot.png index e8fcbb7718..fbbfc1eb92 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 63380a80ea..1306dd4480 100644 Binary files a/screenshots/parsedfunctionplot_small.png and b/screenshots/parsedfunctionplot_small.png differ diff --git a/screenshots/rgbimageplot_qt_small.png b/screenshots/rgbimageplot_qt_small.png index dae044acfc..1a27e2fc63 100644 Binary files a/screenshots/rgbimageplot_qt_small.png and b/screenshots/rgbimageplot_qt_small.png differ diff --git a/screenshots/rgbimageplot_qt_upsidedown_small.png b/screenshots/rgbimageplot_qt_upsidedown_small.png index d708b461ab..857a4025e0 100644 Binary files a/screenshots/rgbimageplot_qt_upsidedown_small.png and b/screenshots/rgbimageplot_qt_upsidedown_small.png differ diff --git a/screenshots/rgbimageplot_small.png b/screenshots/rgbimageplot_small.png index f3fb723616..c3966b55a4 100644 Binary files a/screenshots/rgbimageplot_small.png and b/screenshots/rgbimageplot_small.png differ diff --git a/screenshots/scatter_customsymbol_small.png b/screenshots/scatter_customsymbol_small.png index d5c251161a..063b4ff5c2 100644 Binary files a/screenshots/scatter_customsymbol_small.png and b/screenshots/scatter_customsymbol_small.png differ diff --git a/screenshots/scatter_error_small.png b/screenshots/scatter_error_small.png index 7b250aeace..753639315f 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 9121c7cd58..7c20063b53 100644 Binary files a/screenshots/scatter_small.png and b/screenshots/scatter_small.png differ diff --git a/screenshots/second_axis_hor_small.png b/screenshots/second_axis_hor_small.png index 383f3cb778..7a1e1a6d83 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 88b1dbe706..71ebcfdaf0 100644 Binary files a/screenshots/second_axis_small.png and b/screenshots/second_axis_small.png differ diff --git a/screenshots/simpletest_small.png b/screenshots/simpletest_small.png index 6537e02a90..94ea9800a0 100644 Binary files a/screenshots/simpletest_small.png and b/screenshots/simpletest_small.png differ diff --git a/screenshots/stackedbars_hor_small.png b/screenshots/stackedbars_hor_small.png index c516c0e96d..578fed4bf1 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 53ebd67574..44e2d85248 100644 Binary files a/screenshots/stackedbars_small.png and b/screenshots/stackedbars_small.png differ diff --git a/screenshots/stepplots_small.png b/screenshots/stepplots_small.png index b9df8dd559..ab4de40d0d 100644 Binary files a/screenshots/stepplots_small.png and b/screenshots/stepplots_small.png differ diff --git a/screenshots/symbols_and_errors_small.png b/screenshots/symbols_and_errors_small.png index 911d112184..02559287e2 100644 Binary files a/screenshots/symbols_and_errors_small.png and b/screenshots/symbols_and_errors_small.png differ diff --git a/screenshots/symbols_and_styles_small.png b/screenshots/symbols_and_styles_small.png index 1be0fb9f7f..d39999d6d9 100644 Binary files a/screenshots/symbols_and_styles_small.png and b/screenshots/symbols_and_styles_small.png differ diff --git a/screenshots/test_distributionplot_small.png b/screenshots/test_distributionplot_small.png index 90c64cda63..eca89e1fb0 100644 Binary files a/screenshots/test_distributionplot_small.png and b/screenshots/test_distributionplot_small.png differ diff --git a/screenshots/test_styledboxplot_small.png b/screenshots/test_styledboxplot_small.png index c0d703687d..8e46e05743 100644 Binary files a/screenshots/test_styledboxplot_small.png and b/screenshots/test_styledboxplot_small.png differ diff --git a/screenshots/vectorfield_small.png b/screenshots/vectorfield_small.png index 0be99b4478..6b895e5269 100644 Binary files a/screenshots/vectorfield_small.png and b/screenshots/vectorfield_small.png differ diff --git a/screenshots/violinplot_hor_small.png b/screenshots/violinplot_hor_small.png index 2201161485..63efbbca2b 100644 Binary files a/screenshots/violinplot_hor_small.png and b/screenshots/violinplot_hor_small.png differ diff --git a/screenshots/violinplot_vert_small.png b/screenshots/violinplot_vert_small.png index 890258f5ef..a45c79784b 100644 Binary files a/screenshots/violinplot_vert_small.png and b/screenshots/violinplot_vert_small.png differ diff --git a/screenshots/wiggleplot_x_small.png b/screenshots/wiggleplot_x_small.png index 469130d23e..5ed59124ac 100644 Binary files a/screenshots/wiggleplot_x_small.png and b/screenshots/wiggleplot_x_small.png differ diff --git a/screenshots/wiggleplot_y_small.png b/screenshots/wiggleplot_y_small.png index 84b00159f1..11cc1fadb5 100644 Binary files a/screenshots/wiggleplot_y_small.png and b/screenshots/wiggleplot_y_small.png differ