diff --git a/doc/images/jkqtmathtext/MTDacute.png b/doc/images/jkqtmathtext/MTDacute.png index f31d25c8ef..ced5d67524 100644 Binary files a/doc/images/jkqtmathtext/MTDacute.png and b/doc/images/jkqtmathtext/MTDacute.png differ diff --git a/doc/images/jkqtmathtext/MTDarrow.png b/doc/images/jkqtmathtext/MTDarrow.png index 7eb8e5c477..dce514218a 100644 Binary files a/doc/images/jkqtmathtext/MTDarrow.png and b/doc/images/jkqtmathtext/MTDarrow.png differ diff --git a/doc/images/jkqtmathtext/MTDbar.png b/doc/images/jkqtmathtext/MTDbar.png index 061bfde162..77d2713e4c 100644 Binary files a/doc/images/jkqtmathtext/MTDbar.png and b/doc/images/jkqtmathtext/MTDbar.png differ diff --git a/doc/images/jkqtmathtext/MTDbcancel.png b/doc/images/jkqtmathtext/MTDbcancel.png index 1d3f53a6b1..6a99661810 100644 Binary files a/doc/images/jkqtmathtext/MTDbcancel.png and b/doc/images/jkqtmathtext/MTDbcancel.png differ diff --git a/doc/images/jkqtmathtext/MTDbreve.png b/doc/images/jkqtmathtext/MTDbreve.png index e880884b63..75afcbdb87 100644 Binary files a/doc/images/jkqtmathtext/MTDbreve.png and b/doc/images/jkqtmathtext/MTDbreve.png differ diff --git a/doc/images/jkqtmathtext/MTDcancel.png b/doc/images/jkqtmathtext/MTDcancel.png index 63928a49d7..de750a173f 100644 Binary files a/doc/images/jkqtmathtext/MTDcancel.png and b/doc/images/jkqtmathtext/MTDcancel.png differ diff --git a/doc/images/jkqtmathtext/MTDcheck.png b/doc/images/jkqtmathtext/MTDcheck.png index 3f645da3c8..0d6cbdb375 100644 Binary files a/doc/images/jkqtmathtext/MTDcheck.png and b/doc/images/jkqtmathtext/MTDcheck.png differ diff --git a/doc/images/jkqtmathtext/MTDdot.png b/doc/images/jkqtmathtext/MTDdot.png index fc3aaab9fc..f58aef72a3 100644 Binary files a/doc/images/jkqtmathtext/MTDdot.png and b/doc/images/jkqtmathtext/MTDdot.png differ diff --git a/doc/images/jkqtmathtext/MTDdoubleoverline.png b/doc/images/jkqtmathtext/MTDdoubleoverline.png index 094cb6288d..b4aaaf2459 100644 Binary files a/doc/images/jkqtmathtext/MTDdoubleoverline.png and b/doc/images/jkqtmathtext/MTDdoubleoverline.png differ diff --git a/doc/images/jkqtmathtext/MTDdoubleunderline.png b/doc/images/jkqtmathtext/MTDdoubleunderline.png index b3f88c6c30..f435e2a7e7 100644 Binary files a/doc/images/jkqtmathtext/MTDdoubleunderline.png and b/doc/images/jkqtmathtext/MTDdoubleunderline.png differ diff --git a/doc/images/jkqtmathtext/MTDgrave.png b/doc/images/jkqtmathtext/MTDgrave.png index 6811a215d3..fdc04a0908 100644 Binary files a/doc/images/jkqtmathtext/MTDgrave.png and b/doc/images/jkqtmathtext/MTDgrave.png differ diff --git a/doc/images/jkqtmathtext/MTDhat.png b/doc/images/jkqtmathtext/MTDhat.png index ab9e7eb72e..b7f844be3c 100644 Binary files a/doc/images/jkqtmathtext/MTDhat.png and b/doc/images/jkqtmathtext/MTDhat.png differ diff --git a/doc/images/jkqtmathtext/MTDocirc.png b/doc/images/jkqtmathtext/MTDocirc.png index 407c7c8427..1e300b9934 100644 Binary files a/doc/images/jkqtmathtext/MTDocirc.png and b/doc/images/jkqtmathtext/MTDocirc.png differ diff --git a/doc/images/jkqtmathtext/MTDoverline.png b/doc/images/jkqtmathtext/MTDoverline.png index 82826a7e25..995b57c098 100644 Binary files a/doc/images/jkqtmathtext/MTDoverline.png and b/doc/images/jkqtmathtext/MTDoverline.png differ diff --git a/doc/images/jkqtmathtext/MTDtilde.png b/doc/images/jkqtmathtext/MTDtilde.png index 9fe7009309..cb7925e886 100644 Binary files a/doc/images/jkqtmathtext/MTDtilde.png and b/doc/images/jkqtmathtext/MTDtilde.png differ diff --git a/doc/images/jkqtmathtext/MTDunderline.png b/doc/images/jkqtmathtext/MTDunderline.png index 99aa0348f7..f4aa725b91 100644 Binary files a/doc/images/jkqtmathtext/MTDunderline.png and b/doc/images/jkqtmathtext/MTDunderline.png differ diff --git a/doc/images/jkqtmathtext/MTDvec.png b/doc/images/jkqtmathtext/MTDvec.png index 56e1181592..88537a5add 100644 Binary files a/doc/images/jkqtmathtext/MTDvec.png and b/doc/images/jkqtmathtext/MTDvec.png differ diff --git a/doc/images/jkqtmathtext/MTDwidecheck.png b/doc/images/jkqtmathtext/MTDwidecheck.png index 0b5516e180..bd00a08a89 100644 Binary files a/doc/images/jkqtmathtext/MTDwidecheck.png and b/doc/images/jkqtmathtext/MTDwidecheck.png differ diff --git a/doc/images/jkqtmathtext/MTDwidehat.png b/doc/images/jkqtmathtext/MTDwidehat.png index 412e5146d0..7cadcbd4cb 100644 Binary files a/doc/images/jkqtmathtext/MTDwidehat.png and b/doc/images/jkqtmathtext/MTDwidehat.png differ diff --git a/doc/images/jkqtmathtext/MTDwidetilde.png b/doc/images/jkqtmathtext/MTDwidetilde.png index c7bc5aeeea..42a0ba1b00 100644 Binary files a/doc/images/jkqtmathtext/MTDwidetilde.png and b/doc/images/jkqtmathtext/MTDwidetilde.png differ diff --git a/doc/images/jkqtmathtext/MTDxcancel.png b/doc/images/jkqtmathtext/MTDxcancel.png index 9562c1240a..d713bd62f0 100644 Binary files a/doc/images/jkqtmathtext/MTDxcancel.png and b/doc/images/jkqtmathtext/MTDxcancel.png differ diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png b/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png index ac8f1e9b13..f48a94696e 100644 Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathaccents.png differ diff --git a/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png b/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png index bc2750a895..b7348d92cb 100644 Binary files a/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png and b/doc/images/jkqtmathtext/jkqtmathtext_mathdeco.png differ diff --git a/doc/images/jkqtmathtext/jkqtmathtext_ool.png b/doc/images/jkqtmathtext/jkqtmathtext_ool.png index dfdd844ccb..9e698f6b87 100644 Binary files a/doc/images/jkqtmathtext/jkqtmathtext_ool.png and b/doc/images/jkqtmathtext/jkqtmathtext_ool.png differ diff --git a/doc/images/jkqtmathtext/jkqtmathtext_uul.png b/doc/images/jkqtmathtext/jkqtmathtext_uul.png index 2a867d69ba..d1299d5bf2 100644 Binary files a/doc/images/jkqtmathtext/jkqtmathtext_uul.png and b/doc/images/jkqtmathtext/jkqtmathtext_uul.png differ diff --git a/doc/jkqtmathtext_docimages_accents.jkmt b/doc/jkqtmathtext_docimages_accents.jkmt index 9ba4405cd0..ea933a9603 100644 --- a/doc/jkqtmathtext_docimages_accents.jkmt +++ b/doc/jkqtmathtext_docimages_accents.jkmt @@ -57,7 +57,7 @@ MTDwidetilde.png $\widetilde{x}\widetilde{i}\widetilde{X}\widetilde{\psi}\widetilde{abc}$ --- jkqtmathtext_mathdeco.png -$\vec{x} \dot{x} \ddot{x} \overline{x} \underline{x} \hat{x} \tilde{x} \uul{x} \ool{x} \bar{x} \arrow{x} \widehat{x} \widetilde{x} ...$ +$\vec{x}\ \dot{x}\ \ddot{x}\ \overline{x}\ \underline{x}\ \hat{x}\ \tilde{x}\ \uul{x}\ \ool{x}\ \bar{x}\ \arrow{x}\ \widehat{x}\ \widetilde{x}\ ...$ --- jkqtmathtext_textaccents.png \begin{array} diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextdecoratednode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextdecoratednode.cpp index 54135f68a2..ec63fe1cdf 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextdecoratednode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextdecoratednode.cpp @@ -217,8 +217,8 @@ double JKQTMathTextDecoratedNode::draw(QPainter& painter, double x, double y, JK const double italic_xcorrection=getNonItalicXCorretion(painter, cwidth, ev, getChild()); const double deco_xoffset=parentMathText->getDecorationWidthReductionXFactor()*width_X/2.0; const double deco_width=std::max(width_x*0.5,cwidth-2.0*deco_xoffset-italic_xcorrection); - const double deco_vecwidth=width_x*0.33; - const double deco_vecheight=deco_height*0.33; + const double deco_vecwidth=width_x*0.18; + const double deco_vecheight=deco_height*0.25; const double deco_accentwidth=deco_height/4.0; const double deco_miniwidth=((decoration==MTDtilde||decoration==MTDbreve)?fm.boundingRect("j").width():fm.boundingRect("^").width())-italic_xcorrection; const double decotop_xcenter=x+italic_xcorrection+(cwidth-italic_xcorrection)/2.0; @@ -236,7 +236,7 @@ double JKQTMathTextDecoratedNode::draw(QPainter& painter, double x, double y, JK QPen pold=painter.pen(); QPen p=pold; p.setColor(ev.color); - p.setWidthF(linewidth);//ceil(currentEv.fontSize/16.0)); + p.setWidthF(linewidth*0.75); p.setCapStyle(Qt::RoundCap); p.setJoinStyle(Qt::RoundJoin); @@ -246,7 +246,7 @@ double JKQTMathTextDecoratedNode::draw(QPainter& painter, double x, double y, JK if (!aDirect.isNull() && fm.inFont(aDirect)) { painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();}); const QRectF tbra=fm.tightBoundingRect(aDirect); - painter.translate(decotop_xcenter-tbra.width()/2.0, (deco_ytopcenter+deco_ytopbot)/2.0); + painter.translate(decotop_xcenter-tbra.width()/2.0, (deco_ytopcenter+deco_ytoptop)/2.0); //painter.setPen("red"); //painter.drawEllipse(0-2,0-2,4,4); painter.translate(-tbra.x(), -tbra.y()); @@ -264,7 +264,7 @@ double JKQTMathTextDecoratedNode::draw(QPainter& painter, double x, double y, JK if (!aFallback.isNull() && fm.inFont(aFallback)) { painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();}); const QRectF tbra=fm.tightBoundingRect(aFallback); - painter.translate(decotop_xcenter-tbra.width()/2.0, deco_ytopcenter); + painter.translate(decotop_xcenter-tbra.width()/2.0, (deco_ytopcenter+deco_ytoptop)/2.0); //painter.setPen("yellow"); //painter.drawEllipse(0-2,0-2,4,4); painter.translate(-tbra.x(), -tbra.y()); @@ -302,7 +302,7 @@ double JKQTMathTextDecoratedNode::draw(QPainter& painter, double x, double y, JK painter.setPen(p); const QLineF l(decotop_xstart, deco_ytopbot, decotop_xend, deco_ytopbot); if (l.length()>0) painter.drawLine(l); - const QLineF l2(decotop_xstart, deco_ytopbot-2.0*p.widthF(), decotop_xend, deco_ytopbot-2.0*p.widthF()); + const QLineF l2(decotop_xstart, deco_ytopbot-3.0*p.widthF(), decotop_xend, deco_ytopbot-3.0*p.widthF()); if (l2.length()>0) painter.drawLine(l2); painter.setPen(pold); } else if (decoration==MTDunderline) { @@ -314,7 +314,7 @@ double JKQTMathTextDecoratedNode::draw(QPainter& painter, double x, double y, JK painter.setPen(p); const QLineF l(decobot_xstart, decobelow_ypos, decobot_xend, decobelow_ypos); if (l.length()>0) painter.drawLine(l); - QLineF l2(decobot_xstart, decobelow_ypos+2.0*p.widthF(), decobot_xend, decobelow_ypos+2.0*p.widthF()); + QLineF l2(decobot_xstart, decobelow_ypos+3.0*p.widthF(), decobot_xend, decobelow_ypos+3.0*p.widthF()); if (l2.length()>0) painter.drawLine(l2); painter.setPen(pold); } else if (decoration==MTDarrow) { diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp index c5ad04f948..40e3ffd49b 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp @@ -341,7 +341,6 @@ void JKQTMathTextModifiedTextPropsInstructionNode::fillInstructions() ev.underlined=true; }, 0); instructions["ul"] = i; - instructions["underline"] = i; instructions["underlined"]= i; } { @@ -349,7 +348,6 @@ void JKQTMathTextModifiedTextPropsInstructionNode::fillInstructions() ev.overline=true; }, 0); instructions["ol"] = i; - instructions["overline"] = i; instructions["overlined"]= i; } {