Skip to content

Commit

Permalink
FIXED issue #128: Question about rendering unicode in plot labels: Un…
Browse files Browse the repository at this point in the history
…icode 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

FIXED font rendering was not always anti-aliased
  • Loading branch information
jkriege2 committed Mar 28, 2024
1 parent 6ca2e6e commit aa4ac4c
Show file tree
Hide file tree
Showing 306 changed files with 72 additions and 70 deletions.
110 changes: 55 additions & 55 deletions doc/dox/jkqtmathtext_supportedlatexsymbols.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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:
<table>
<tr>
<td><code>\\Downarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png
<td><code>\\Leftarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png
<td><code>\\Leftrightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\Longleftarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png
<td><code>\\Longleftrightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png
<td><code>\\Longrightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\Rightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png
<td><code>\\Uparrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png
<td><code>\\Updownarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\downarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_downarrow_XITS_MATHANDTEXT.png
Expand Down Expand Up @@ -184,75 +217,42 @@
<td><code>\\updownarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_updownarrow_FIRA_MATHANDTEXT.png
<td><code>\\Downarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_ddownarrow_FIRA_MATHANDTEXT.png
<td><code>\\Leftarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftarrow_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\Leftrightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_lleftrightarrow_FIRA_MATHANDTEXT.png
<td><code>\\Longleftarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftarrow_FIRA_MATHANDTEXT.png
<td><code>\\Longleftrightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongleftrightarrow_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\Longrightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_llongrightarrow_FIRA_MATHANDTEXT.png
<td><code>\\Rightarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_rrightarrow_FIRA_MATHANDTEXT.png
<td><code>\\Uparrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_uuparrow_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\Updownarrow</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_uupdownarrow_FIRA_MATHANDTEXT.png
<td><code>\\upharpoonleft</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png
<td><code>\\upharpoonright</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\downharpoonleft</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonleft_FIRA_MATHANDTEXT.png
<td><code>\\downharpoonright</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\rightleftharpoon</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png
<td><code>\\leftharpoondown</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoondown_FIRA_MATHANDTEXT.png
<td><code>\\leftharpoonup</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\leftrightharpoon</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png
<td><code>\\rightharpoondown</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoondown_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\rightharpoonup</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightharpoonup_FIRA_MATHANDTEXT.png
<td><code>\\leftharpoonup</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftharpoonup_FIRA_MATHANDTEXT.png
<td><code>\\leftrightharpoon</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_leftrightharpoon_FIRA_MATHANDTEXT.png
</tr>
<tr>
<td><code>\\rightleftharpoon</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_rightleftharpoon_FIRA_MATHANDTEXT.png
<td><code>\\downharpoonright</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_downharpoonright_FIRA_MATHANDTEXT.png
<td><code>\\upharpoonleft</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonleft_FIRA_MATHANDTEXT.png
<td><code>\\upharpoonright</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_upharpoonright_FIRA_MATHANDTEXT.png
<td><code>\\mapsto</code>:
<td>\image html jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_XITS_MATHANDTEXT.png
\image html jkqtmathtext/symbols/jkqtmathtext_greek_mapsto_FIRA_MATHANDTEXT.png
Expand Down
1 change: 1 addition & 0 deletions doc/dox/whatsnew.dox
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
<li>FIXED: \c \\sum and \c \\prod used the wrong symbol in XITS-mode</li>
<li>FIXED issue <a href="https://github.com/jkriege2/JKQtPlotter/issues/117">#117: Unnecessary printing of tilde symbol in math</a> (thanks to <a href="https://github.com/igormironchik">user:igormironchik</a> for reporting):<br/>Tilde was not recognized as a LaTeX instruction, now is interpreted as non-breaking whitespace</li>
<li>FIXED issue <a href="https://github.com/jkriege2/JKQtPlotter/issues/118">#118: Dangerous warning in MacOS and clang</a> (thanks to <a href="https://github.com/igormironchik">user:igormironchik</a> for reporting):<br/>a forward-declared class (i.e. incomplete type) was deleted</li>
<li><a href="https://github.com/jkriege2/JKQtPlotter/issues/128">FIXED issue #128: Question about rendering unicode in plot labels</a>: 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 <a href="https://github.com/fpalazzolo">user:fpalazzolo</a> for reporting this bug</li>
<li>IMPROVED: high-dpr-support in JKQTMathText</li>
<li>IMPROVED: typesetting of sub-/supercripts, especially for large math operators and braces</li>
<li>MODIFIED: brace node now calculates the extension of the child height above or below the strikeoutPos, in order to center braces around the strikeoutPos</li>
Expand Down
Binary file modified doc/images/JKQTBasePlotter_addSecondaryXAxis.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTBasePlotter_addSecondaryYAxis.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalAutoscaleMaxWidthOnly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalAutoscaleShrinkOnly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalErrorGraph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalErrorGraph_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraphCustomDrawFunctor_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraphFunctorFilling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraphFunctorFilling_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraphTwoColorFilling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraphTwoColorFilling_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarHorizontalGraph_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalAutoscaleMaxWidthOnly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalAutoscaleShrinkOnly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalErrorGraph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalErrorGraph_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphBaseline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphCustomDrawFunctor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphCustomDrawFunctor_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphFunctorFilling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphFunctorFilling_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphNoBaseline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/JKQTPBarVerticalGraphTwoColorFilling.png
Binary file modified doc/images/JKQTPBarVerticalGraphTwoColorFilling_small.png
Binary file modified doc/images/JKQTPBarVerticalGraph_small.png
Binary file modified doc/images/JKQTPBoxplotHorizontalGraph.png
Binary file modified doc/images/JKQTPBoxplotHorizontalGraph_small.png
Binary file modified doc/images/JKQTPBoxplotVerticalGraph.png
Binary file modified doc/images/JKQTPBoxplotVerticalGraph_small.png
Binary file modified doc/images/JKQTPColumnContourPlot.png
Binary file modified doc/images/JKQTPColumnContourPlot_small.png
Binary file modified doc/images/JKQTPCoordinateAxisStyleDrawMode0.png
Binary file modified doc/images/JKQTPFilledCurveXErrorGraph.png
Binary file modified doc/images/JKQTPFilledCurveXErrorGraph_small.png
Binary file modified doc/images/JKQTPFilledCurveXGraph.png
Binary file modified doc/images/JKQTPFilledCurveXGraph_small.png
Binary file modified doc/images/JKQTPFilledCurveXGraph_wiggle.png
Binary file modified doc/images/JKQTPFilledCurveYErrorGraph.png
Binary file modified doc/images/JKQTPFilledCurveYErrorGraph_small.png
Binary file modified doc/images/JKQTPFilledCurveYGraph.png
Binary file modified doc/images/JKQTPFilledCurveYGraph_small.png
Binary file modified doc/images/JKQTPFilledCurveYGraph_wiggle.png
Binary file modified doc/images/JKQTPFinancialGraph.png
Binary file modified doc/images/JKQTPFinancialGraphCandleStick.png
Binary file modified doc/images/JKQTPFinancialGraphOHLC.png
Binary file modified doc/images/JKQTPFinancialGraphSetCandlestickOneColor.png
Binary file modified doc/images/JKQTPFinancialGraphSetCandlestickTwoColor.png
Binary file modified doc/images/JKQTPFinancialGraphSetCandlestickTwoColor2.png
Binary file modified doc/images/JKQTPFinancialGraphSetOHLCTwoColor.png
Binary file modified doc/images/JKQTPFinancialGraphSidyBySide.png
Binary file modified doc/images/JKQTPGLSimpleBox.png
Binary file modified doc/images/JKQTPGLSimpleBoxAndLine.png
Binary file modified doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS.png
Binary file modified doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical.png
Binary file modified doc/images/JKQTPGLSimpleBoxAndLineONLYLABELSVertical_small.png
Binary file modified doc/images/JKQTPGLSimpleBoxAndLineONLYLABELS_small.png
Binary file modified doc/images/JKQTPGLSimpleBoxAndLineVertical.png
Binary file modified doc/images/JKQTPGLSimpleBoxVertical.png
Binary file modified doc/images/JKQTPGLabelAboveData.png
Binary file modified doc/images/JKQTPGLabelAwayFromXAxis.png
Binary file modified doc/images/JKQTPGLabelAwayFromYAxis.png
Binary file modified doc/images/JKQTPGLabelBelowData.png
Binary file modified doc/images/JKQTPGLabelCenteredOnData.png
Binary file modified doc/images/JKQTPGLabelHalfwaysToXAxis.png
Binary file modified doc/images/JKQTPGLabelHalfwaysToYAxis.png
Binary file modified doc/images/JKQTPGLabelLeftHandSide.png
Binary file modified doc/images/JKQTPGLabelRightHandSide.png
Binary file modified doc/images/JKQTPGLabelTowardsXAxis.png
Binary file modified doc/images/JKQTPGLabelTowardsYAxis.png
Binary file modified doc/images/JKQTPGeoBezierCurveGraphic.png
Binary file modified doc/images/JKQTPGeoBezierCurveLogGraphic.png
Binary file modified doc/images/JKQTPGeoBezierCurveLogMath.png
Binary file modified doc/images/JKQTPGeoBezierCurveMath.png
Binary file modified doc/images/JKQTPImpulsesHorizontalErrorGraph.png
Binary file modified doc/images/JKQTPImpulsesHorizontalErrorGraph_small.png
Binary file modified doc/images/JKQTPImpulsesHorizontalGraph.png
Binary file modified doc/images/JKQTPImpulsesHorizontalGraphBaseline.png
Binary file modified doc/images/JKQTPImpulsesHorizontalGraphNoBaseline.png
Binary file modified doc/images/JKQTPImpulsesHorizontalGraph_small.png
Binary file modified doc/images/JKQTPImpulsesVerticalErrorGraph.png
Binary file modified doc/images/JKQTPImpulsesVerticalErrorGraph_small.png
Binary file modified doc/images/JKQTPImpulsesVerticalGraph.png
Binary file modified doc/images/JKQTPImpulsesVerticalGraphBaseline.png
Binary file modified doc/images/JKQTPImpulsesVerticalGraphNoBaseline.png
Binary file modified doc/images/JKQTPImpulsesVerticalGraph_Symbols.png
Binary file modified doc/images/JKQTPImpulsesVerticalGraph_Symbols_small.png
Binary file modified doc/images/JKQTPImpulsesVerticalGraph_small.png
Binary file modified doc/images/JKQTPParametrizedVectorFieldGraph.png
Binary file modified doc/images/JKQTPParametrizedVectorFieldGraphColorFromAngle.png
Binary file modified doc/images/JKQTPParametrizedVectorFieldGraphColorFromMagnitude.png
Binary file modified doc/images/JKQTPParametrizedVectorFieldGraphDefaultColor.png
Binary file modified doc/images/JKQTPVectorFieldGraph.png
Binary file modified doc/images/JKQTPVectorFieldGraphAnchorBottom.png
Binary file modified doc/images/JKQTPVectorFieldGraphAnchorMid.png
Binary file modified doc/images/JKQTPVectorFieldGraphAnchorTip.png
Binary file modified doc/images/JKQTPVectorFieldGraphAutoscaleLength.png
Binary file modified doc/images/JKQTPVectorFieldGraphIgnoreLength.png
Binary file modified doc/images/JKQTPVectorFieldGraphLengthFromData.png
Binary file modified doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars.png
Binary file modified doc/images/JKQTPXYLineErrorGraph_JKQTPErrorBars_small.png
Binary file modified doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines.png
Binary file modified doc/images/JKQTPXYLineErrorGraph_JKQTPErrorLines_small.png
Binary file modified doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons.png
Binary file modified doc/images/JKQTPXYLineErrorGraph_JKQTPErrorPolygons_small.png
Binary file modified doc/images/JKQTPXYLineGraph.png
Binary file modified doc/images/JKQTPXYLineGraph_small.png
Binary file modified doc/images/JKQTPXYScatterErrorGraph.png
Binary file modified doc/images/JKQTPXYScatterErrorGraph_small.png
Binary file modified doc/images/JKQTPXYScatterGraph.png
Binary file modified doc/images/JKQTPXYScatterGraph_small.png
Binary file modified doc/images/JKQTPbarHorizontalGraphStacked.png
Binary file modified doc/images/JKQTPbarHorizontalGraphStacked_small.png
Binary file modified doc/images/JKQTPbarVerticalGraphStacked.png
Binary file modified doc/images/JKQTPbarVerticalGraphStacked_small.png
Binary file modified doc/images/axisstyle/JKQTPCADMAxisLabel.png
Binary file modified doc/images/axisstyle/JKQTPCADMLineTicksTickLabels.png
Binary file modified doc/images/axisstyle/JKQTPCADMTickLabels.png
Binary file modified doc/images/axisstyle/JKQTPCADMTickLabelsAxisLabel.png
Binary file modified doc/images/axisstyle/JKQTPCADMTicksTickLabels.png
Binary file modified doc/images/axisstyle/JKQTPCADMTicksTickLabelsAxisLabel.png
Binary file modified doc/images/axisstyle/JKQTPCADMcomplete.png
Binary file modified doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png
Binary file modified doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png
Binary file modified doc/images/axisstyle/JKQTPCALTdate.png
Binary file modified doc/images/axisstyle/JKQTPCALTdatetime.png
Binary file modified doc/images/axisstyle/JKQTPCALTdefault.png
Binary file modified doc/images/axisstyle/JKQTPCALTexponent.png
Binary file modified doc/images/axisstyle/JKQTPCALTexponentCharacter.png
Binary file modified doc/images/axisstyle/JKQTPCALTfrac.png
Binary file modified doc/images/axisstyle/JKQTPCALTintfrac.png
Binary file modified doc/images/axisstyle/JKQTPCALTintsfrac.png
Binary file modified doc/images/axisstyle/JKQTPCALTintslashfrac.png
Binary file modified doc/images/axisstyle/JKQTPCALTprintf.png
Binary file modified doc/images/axisstyle/JKQTPCALTscientific.png
Binary file modified doc/images/axisstyle/JKQTPCALTsfrac.png
Binary file modified doc/images/axisstyle/JKQTPCALTslashfrac.png
Binary file modified doc/images/axisstyle/JKQTPCALTtime.png
Binary file modified doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle-15Degree.png
Binary file modified doc/images/axisstyle/JKQTPCoordinateAxisTickLabelAngle15Degree.png
Binary file modified doc/images/axisstyle/JKQTPLTMLin.png
Binary file modified doc/images/axisstyle/JKQTPLTMLinOrPower.png
Binary file modified doc/images/axisstyle/JKQTPLTMPower.png
Binary file modified doc/images/axisstyle/axis_unit_scaling_none.png
Binary file modified doc/images/axisstyle/axis_unit_scaling_pi.png
Binary file modified doc/images/jkqtmathtext/jkqtmathtext_bb.png
Binary file modified doc/images/jkqtmathtext/jkqtmathtext_bb_unicode_or_simulate.png
Binary file modified doc/images/jkqtmathtext/jkqtmathtext_computermodern.png
Binary file modified doc/images/jkqtmathtext/jkqtmathtext_mssegoeui.png
Binary file modified doc/images/jkqtmathtext/jkqtmathtext_unicode.png
Binary file modified doc/images/jkqtmathtext/jkqtmathtext_utf8.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_multi_column.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_multi_row.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_one_column.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_one_row.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_column.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_multi_row.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_column.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsidebottom_one_row.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_column.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsideright_multi_row.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_column.png
Binary file modified doc/images/keylayouts/JKQTPKeyLayout_outsideright_one_row.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideBottom.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideBottomLeft.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideBottomRight.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideLeft.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideRight.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideTop.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideTopLeft.png
Binary file modified doc/images/keypositions/JKQTPKeyInsideTopRight.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideBottomCenter.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideBottomLeft.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideBottomRight.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideLeftBottom.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideLeftCenter.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideLeftTop.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideRightBottom.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideRightCenter.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideRightTop.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideTopCenter.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideTopLeft.png
Binary file modified doc/images/keypositions/JKQTPKeyOutsideTopRight.png
Binary file modified doc/images/labelstyles/JKQTPLabelCenter.png
Binary file modified doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png
Binary file modified doc/images/labelstyles/JKQTPLabelMax.png
Binary file modified doc/images/labelstyles/JKQTPLabelMaxBesides.png
Binary file modified doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png
Binary file modified doc/images/labelstyles/JKQTPLabelMax_zeroaxis.png
Binary file modified doc/images/labelstyles/JKQTPLabelMin.png
Binary file modified doc/images/labelstyles/JKQTPLabelMinBesides.png
Binary file modified doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png
Binary file modified doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png
Binary file modified doc/images/styles/blackandwhite.ini.png
Binary file modified doc/images/styles/blackandwhite.ini.symbols.png
Binary file modified doc/images/styles/blueprint.ini.png
Binary file modified doc/images/styles/blueprint.ini.symbols.png
Binary file modified doc/images/styles/cyberpunk.ini.png
Binary file modified doc/images/styles/cyberpunk.ini.symbols.png
Binary file modified doc/images/styles/dark.ini.png
Binary file modified doc/images/styles/dark.ini.symbols.png
Binary file modified doc/images/styles/default.ini.png
Binary file modified doc/images/styles/default.ini.symbols.png
Binary file modified doc/images/styles/legacy_default_style.ini.png
Binary file modified doc/images/styles/legacy_default_style.ini.symbols.png
Binary file modified doc/images/styles/seaborn.ini.png
Binary file modified doc/images/styles/seaborn.ini.symbols.png
Binary file modified doc/images/styles/simple_arrowsaxes.ini.png
Binary file modified doc/images/styles/simple_arrowsaxes.ini.symbols.png
Binary file modified doc/images/styles/simple_axesoffset.ini.png
Binary file modified doc/images/styles/simple_axesoffset.ini.symbols.png
Binary file modified doc/images/styles/simple_axesoffset_plotbox.ini.png
Binary file modified doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png
Binary file modified doc/images/styles/simple_gridandticks.ini.png
Binary file modified doc/images/styles/simple_gridandticks.ini.symbols.png
Binary file modified doc/images/styles/simple_noaxes.ini.png
Binary file modified doc/images/styles/simple_noaxes.ini.symbols.png
4 changes: 2 additions & 2 deletions examples/multithreaded/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ This test results in the following numbers (on my AMD Ryzen5 8/16-core laptop):
<b>VERSION:</b> 5.0.0
<b>BUILD MODE:</b> Release

<u><b>SERIAL RESULTS:</b></u><br/>runtime, overall = 3532.2ms<br/>single runtimes = (147.1 +/- 366.4) ms<br/>speedup = 1.00x<br/>threads / available = 1 / 16<br/><br/><br/>
<u><b>SERIAL RESULTS:</b></u><br/>runtime, overall = 12130.5ms<br/>single runtimes = (505.3 +/- 1773.2) ms<br/>speedup = 1.00x<br/>threads / available = 1 / 16<br/><br/><br/>

<u><b>PARALLEL RESULTS:</b></u><br/>
runtime, overall = 617.1ms<br/>single runtimes = (195.3 +/- 5.8) ms<br/>speedup = 7.60x<br/>threads / available = 8 / 16<br/>batch runs = 3<br/><br/><b>speedup vs. serial = 5.7x</b>
runtime, overall = 5495.3ms<br/>single runtimes = (1657.1 +/- 391.4) ms<br/>speedup = 7.24x<br/>threads / available = 8 / 16<br/>batch runs = 3<br/><br/><b>speedup vs. serial = 2.2x</b>

[comment]:RESULTS_END

Expand Down
3 changes: 2 additions & 1 deletion lib/jkqtmathtext/jkqtmathtexttools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>(fontSize));
f.setStyleStrategy(QFont::NoFontMerging);
const QFont::StyleStrategy strat=static_cast<QFont::StyleStrategy>(QFont::NoFontMerging|QFont::PreferAntialias);
f.setStyleStrategy(strat);
return f;
}

Expand Down
20 changes: 10 additions & 10 deletions lib/jkqtmathtext/nodes/jkqtmathtexttextnode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fUpright=[&](){ auto ff=JKQTMathTextGetNonItalic(f); ff.setStyleStrategy(static_cast<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fFallbackSym=[&](){ auto ff=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); ff.setStyleStrategy(static_cast<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fRoman=[&](){ auto f=currentEv.exchangedFontForRoman().getFont(parentMathText); f.setStyleStrategy(static_cast<QFont::StyleStrategy>(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return f; }();
//const double sp=JKQTMathTextGetHorAdvance(f, " ", painter.device());
l.width=0;
double ascent=0;
Expand Down Expand Up @@ -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<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fRoman=[&](){ auto f=currentEv.exchangedFontForRoman().getFont(parentMathText); f.setStyleStrategy(static_cast<QFont::StyleStrategy>(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());
Expand Down Expand Up @@ -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<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fUpright=[&](){ auto ff=JKQTMathTextGetNonItalic(f); ff.setStyleStrategy(static_cast<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fFallbackSym=[&](){ auto ff=currentEv.exchangedFontFor(MTEFallbackSymbols).getFont(parentMathText); ff.setStyleStrategy(static_cast<QFont::StyleStrategy>(ff.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging))); return ff; }();
const QFont fRoman=[&](){ auto f=currentEv.exchangedFontForRoman().getFont(parentMathText); f.setStyleStrategy(static_cast<QFont::StyleStrategy>(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());
Expand Down
4 changes: 2 additions & 2 deletions lib/jkqtmathtext/nodes/jkqtmathtextverbatimnode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<QFont::StyleStrategy>(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging)));
f.setFixedPitch(true);
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
painter.setFont(f);
Expand Down Expand Up @@ -136,7 +136,7 @@ JKQTMathTextVerbatimNode::LayoutInfo JKQTMathTextVerbatimNode::calcLayout(QPaint
{
LayoutInfo l;
QFont f=currentEv.getFont(parentMathText);
f.setStyleStrategy(QFont::PreferDefault);
f.setStyleStrategy(static_cast<QFont::StyleStrategy>(f.styleStrategy()&(~QFont::StyleStrategy::NoFontMerging)));
f.setFixedPitch(true);
const qreal fascent=JKQTMathTextGetFontAscent(f, painter.device());
const double linespacing=JKQTMathTextGetFontLineSpacing(f, painter.device())*lineSpacingFactor;
Expand Down
Binary file modified screenshots/advancedlineandfillstyling_small.png
Binary file modified screenshots/barchart_customdrawfunctor_hor_small.png
Binary file modified screenshots/barchart_customdrawfunctor_small.png
Binary file modified screenshots/barchart_errorbars_hor_small.png
Binary file modified screenshots/barchart_errorbars_small.png
Binary file modified screenshots/barchart_functorfill_hor_small.png
Binary file modified screenshots/barchart_functorfill_small.png
Binary file modified screenshots/barchart_hor_small.png
Binary file modified screenshots/barchart_small.png
Binary file modified screenshots/barchart_twocolor_hor_small.png
Binary file modified screenshots/barchart_twocolor_small.png
Binary file modified screenshots/boxplot_small.png
Binary file modified screenshots/contourplot_small.png
Binary file modified screenshots/datastore_iterators_cosine_yreplaced_small.png
Binary file modified screenshots/datastore_iterators_small.png
Binary file modified screenshots/datastore_small.png
Binary file modified screenshots/dateaxes_small.png
Binary file modified screenshots/dateaxes_timeaxis_small.png
Binary file modified screenshots/errorbarstyles_impulses_horizontal_small.png
Binary file modified screenshots/errorbarstyles_impulses_small.png
Binary file modified screenshots/errorbarstyles_small.png
Binary file modified screenshots/filledgraphs_errors_small.png
Binary file modified screenshots/filledgraphs_errors_y_small.png
Binary file modified screenshots/filledgraphs_small.png
Binary file modified screenshots/filledgraphs_y_small.png
Binary file modified screenshots/financialgraphs_small.png
Binary file modified screenshots/geo_arrows_small.png
Binary file modified screenshots/geo_bezier_small.png
Binary file modified screenshots/geo_coordinateaxis0_small.png
Binary file modified screenshots/graphlabels_hor_small.png
Binary file modified screenshots/graphlabels_small.png
Binary file modified screenshots/imageplot_modifier_small.png
Binary file modified screenshots/imageplot_nodatastore_small.png
Binary file modified screenshots/imageplot_small.png
Binary file modified screenshots/impulsesplot_horizontal_small.png
Binary file modified screenshots/impulsesplot_small.png
Binary file modified screenshots/impulsesplot_symbols_small.png
Binary file modified screenshots/logaxes.png
Binary file modified screenshots/logaxes_nolog.png
Binary file modified screenshots/logaxes_nominorgrid.png
Binary file modified screenshots/logaxes_small.png
Binary file modified screenshots/multiplot_controlwindow.png
Binary file modified screenshots/multiplot_controlwindow_small.png
Binary file modified screenshots/multithreaded.png
Binary file modified screenshots/multithreaded_small.png
Binary file modified screenshots/parametriccurve1_small.png
Binary file modified screenshots/parametriccurve2_small.png
Binary file modified screenshots/paramscatterplot_customsymbol_small.png
Binary file modified screenshots/paramscatterplot_small.png
Binary file modified screenshots/paramvectorfield_small.png
Binary file modified screenshots/parsedfunctionplot.png
Binary file modified screenshots/parsedfunctionplot_small.png
Binary file modified screenshots/rgbimageplot_qt_small.png
Binary file modified screenshots/rgbimageplot_qt_upsidedown_small.png
Binary file modified screenshots/rgbimageplot_small.png
Binary file modified screenshots/scatter_customsymbol_small.png
Binary file modified screenshots/scatter_error_small.png
Binary file modified screenshots/scatter_small.png
Binary file modified screenshots/second_axis_hor_small.png
Binary file modified screenshots/second_axis_small.png
Binary file modified screenshots/simpletest_small.png
Binary file modified screenshots/stackedbars_hor_small.png
Binary file modified screenshots/stackedbars_small.png
Binary file modified screenshots/stepplots_small.png
Binary file modified screenshots/symbols_and_errors_small.png
Binary file modified screenshots/symbols_and_styles_small.png
Binary file modified screenshots/test_distributionplot_small.png
Loading

0 comments on commit aa4ac4c

Please sign in to comment.