From 22c45bcdea73ffe28ab2eb271c1ba2ba641fad56 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 31 Jul 2022 08:17:45 +0200 Subject: [PATCH] JKQTMathText: added support for framed/shaded/snugshade-environments with linebreaks and framed --- doc/dox/whatsnew.dox | 1 + .../jkqtmathtext/jkqtmathtext_beginframed.png | Bin 0 -> 1792 bytes .../jkqtmathtext/jkqtmathtext_beginshaded.png | Bin 0 -> 1713 bytes .../jkqtmathtext/jkqtmathtext_beginsnugshade.png | Bin 0 -> 1708 bytes examples/jkqtmathtext_test/testform.cpp | 3 +++ lib/jkqtmathtext/jkqtmathtext.cpp | 11 +++++++++++ lib/jkqtmathtext/jkqtmathtext.h | 5 ++++- .../nodes/jkqtmathtextinstructionnode.cpp | 10 ++++++++++ 8 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_beginframed.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_beginshaded.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index f9dca116c4..10274d6cc8 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -71,6 +71,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: JKQTMathTextVerticalListNode allows to typeset a vertical list of lines
  • NEW: added \c \\substack[lcr]{...\\\\...} , \c \\lsubstack{...\\\\...} , \c \\rsubstack{...\\\\...} instructions
  • NEW: added support for flushleft/flushright/center-environments with linebreaks
    • +
  • NEW: added support for framed/shaded/snugshade-environments with linebreaks and framed
    • diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginframed.png b/doc/images/jkqtmathtext/jkqtmathtext_beginframed.png new file mode 100644 index 0000000000000000000000000000000000000000..eff77889bdee9042a21037227ed980c00cfbd8eb GIT binary patch literal 1792 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 Hu0mjfv7`uK literal 0 HcmV?d00001 diff --git a/doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png b/doc/images/jkqtmathtext/jkqtmathtext_beginsnugshade.png new file mode 100644 index 0000000000000000000000000000000000000000..d0772b5dcc201af301a6808b637947ff99ecb95c GIT binary patch literal 1708 zcmV;d22=ToP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D01|XXSaefwW^{L9 za%BKVa%E+1b7*gLUR4MM000IfNkl9f*tDX7 zEOIA(?X+F{;8pqxD$_QgRvM)p;JIPUg!#2Em}EaRr9(7c?ndaB>H}_HGsQmIE>OD@ zJ4(-PUo+MI35V#vnB?{~ldpX%QGOnP$IA2qByjthNw51TR(cFQJRIiIVR-|%ea#5_ zpp7nZ@}J4VrCs!&_YK0J`4@2r8_-x9aK zCF|Nxul)WpUuE@cA2-15S8@AWGRr={uY3Sx~aQpqty!MmiqrAxRsXiX^ z^S#@zvWR_fn-5XB`pD(>tE^#P33vMgG}}+#5d^Z!s{N*GANzqch<*9ZASGU#hN@s>S|;`uZ3O4TLV%6&m||nEl5V z4{(M|VP9_GIpJl56Jt#k`Eg*Ot3sq|u>a+={2f(tHoKP6{zeG7H#C>{l`WO@m)s?A!c^PS+Q_Pm1 zi=kAuEvt=PEUH+39K^%EqA(N#DM)DM#MS8Ik^V-iLR3mPOoKcdd*a#BdWuwIul=(2 z$xy1aYTLFQee$igHYo3?E``kIPLb-dza!YC-( zmU5hXH0cDQIFr+)YPXLG#Tn*eY!+?XG2HBjSKO0!j{UxfJj2W}fvxtTWVO!OKj^m> z3M;1LZ71;&sD{d)QNL)W|QjA)Ak>J!~jEIt&Qjnl~44MeV6J) z;^Tv$+}J@7izsP83d**NxwbEV1pF>00fF3=PXM@)u;3&~MCs>vH0}RaQM}TVe7g+s6Wl z;Q`e%yoXYL4uc-pzX-+iuy!QRrAAt})f78e?R+NLS1r&Y8flh1hKQ4^FBF-u*o2gn zS`XVo^4T%6MgEzYZeOn&TV|2@k8L`l2V<;=ip?+{{>f+K0C~(!S;=Momsm4j_rZLG zRtobf6RnLJZSoJvqo_$7MocqyEcOf7MVa}!AKi#+AK@(#eK394ev5pWRFniK#6vp^ z8T@|FJ3g zXEVjV(Jh+#6IBeN7>KWlVOV|=Wg=_>S&%$t+CJND%^3T<`bs0Vj$QX_Xe13VB4@!! zT?@(2gB(C_mois`hC6&chgKf8lP{MR`}{o*0IR~~0#N}rz+UQ)NCR+(1VE;R5O#Uq(0voWhez%WQ zK97O^b>A@DelO9!U;7&Yk5MZ>E4lqX!ll3ZV~^XfBOid)!|hi&(>Ky?za(7u>tFVO z+qaza4>4|E5#DO;W#4t{-3O=bzr4Ksa~<5@?QVbmgBryB-Q7JMuE1&g*TKKP{Q%$W zSbqA8CY+Bew0}Xk{Vj3(TjKV&#O-g1+ux3lkN*L9NzBdi29R|C0000cmbTestset->addItem("text: flushleft", "\\begin{flushleft}text\\\\\\textbf{2^{nd} line of text}\\\\last \\textit{line!} $\\frac{1}{2}$\\end{flushleft}"); ui->cmbTestset->addItem("text: flushright", "\\begin{flushright}text\\\\\\textbf{2^{nd} line of text}\\\\last \\textit{line!} $\\frac{1}{2}$\\end{flushright}"); ui->cmbTestset->addItem("text: center", "\\begin{center}text\\\\\\textbf{2^{nd} line of text}\\\\last \\textit{line!} $\\frac{1}{2}$\\end{center}"); + ui->cmbTestset->addItem("text: framed", "\\begin{framed}text\\\\\\textbf{2^{nd} line of text}\\\\last \\textit{line!} $\\frac{1}{2}$\\end{framed}"); + ui->cmbTestset->addItem("text: shaded", "\\begin{shaded}text\\\\\\textbf{2^{nd} line of text}\\\\last \\textit{line!} $\\frac{1}{2}$\\end{shaded}"); + ui->cmbTestset->addItem("text: snugshade", "\\begin{snugshade}text\\\\\\textbf{2^{nd} line of text}\\\\last \\textit{line!} $\\frac{1}{2}$\\end{snugshade}"); ui->cmbTestset->addItem("mathtest", "This is normal text: $this is math:\\langle r^2(\\tau)\\rangle=\\left\\langle (\\vec{r}(t)-\\vec{r}(t+\\tau) )^2\\right\\rangle\\ \\ \\ g(\\tau)=\\frac{1}{N}\\cdot\\left(1+\\frac{2}{3}\\frac{\\langle r^2(\\tau)\\rangle}{w_{xy}^2}\\right)^{-1} \\lfloor\\rfloor\\lceil\\rceil\\langle\\rangle\\left\\{\\vec{a}\\left|\\|\\vec{a}\\|_2\\geq2\\right.\\right\\} \\vec{r}\\vec{R}\\frac{\\sqrt{\\sqrt{\\sqrt{\\sum_{i=0}^\\infty \\hat{i}^2}+y^\\alpha}+1}}{\\dot{v}\\equiv\\ddot{r}}\\argmin_{\\vec{k}}\\sum_{\\sqrt{i}=0}^{N}\\int_{x_0}^{x_1}\\left(\\left(\\left(x\\right)\\right)\\right)\\underbrace{\\left[\\left\\{\\frac{\\partial f}{\\partial x}\\right\\}\\cdot\\frac{1}{2}\\right]}{\\text{underbraced text \\hbar}}\\cdots\\frac{\\sqrt{\\sum_{i=0}^2 \\hat{i}^2}+y^\\alpha}{\\dot{v}\\equiv\\ddot{r}}, \\hat{t}\\hat{T} \\overbrace{\\left|\\sqrt{x\\cdot Y}\\right|}{\\propto\\bbN\\circ\\bbZ} \\left<\\arrow{x(\\tau)}\\cdot\\vec{R}(t+\\bar{\\tau})\\right> \\alpha\\beta\\gamma\\delta\\epsilon\\Gamma\\Delta\\Theta\\Omega \\left\\_\\left~\\cbrt{\\hbar\\omega}\\right~\\right\\_$"); ui->cmbTestset->addItem("math: upper/lower parantheses test:", "$\\text{bblabla} \\frac{1}{2}\\cdot\\left(\\frac{1}{\\mathrm{e}^x+\\mathrm{e}^{-x}}\\right)\\cdot\\left(\\frac{1}{\\frac{1+2}{5+x}}\\right)\\cdot\\left(\\frac{1}{\\exp\\left[-\\frac{y^2}{\\sqrt{x}}\\right]\\cdot\\exp\\left[-\\frac{1}{\\frac{1}{2}}\\right]}\\right) $"); ui->cmbTestset->addItem("math: ACF test", "$g_{rg}^{ab}(\\tau)=\\frac{1}{N}\\cdot\\left(1+\\frac{2}{3}\\frac{\\langle r^2(\\tau)\\rangle}{w_{xy}^2}\\right)^{-1}\\cdot\\left(1+\\frac{2}{3}\\frac{\\langle r^2(\\tau)\\rangle}{w_{xy}^2}\\right)^{-\\frac{1}{2}}$"); diff --git a/lib/jkqtmathtext/jkqtmathtext.cpp b/lib/jkqtmathtext/jkqtmathtext.cpp index 9bc550deca..adcc7b8ec9 100644 --- a/lib/jkqtmathtext/jkqtmathtext.cpp +++ b/lib/jkqtmathtext/jkqtmathtext.cpp @@ -1534,6 +1534,17 @@ JKQTMathTextNode* JKQTMathText::parseLatexString(bool get, JKQTMathTextBraceType vlist->addChild(parseLatexString(true, MTBTAny, envname)); first=false; } + } else if (envname=="framed" || envname=="shaded" || envname=="snugshade") { + JKQTMathTextHorizontalAlignment alignment=MTHALeft; + JKQTMathTextVerticalListNode* vlist = new JKQTMathTextVerticalListNode(this, alignment, 1.0, JKQTMathTextVerticalListNode::SMDefault, MTVOFirstLine ); + QStringList color; + color<addChild(new JKQTMathTextBoxInstructionNode(this, envname, vlist, color)); + bool first=true; + while (first || currentToken==MTTinstructionNewline) { + vlist->addChild(parseLatexString(true, MTBTAny, envname)); + first=false; + } } else { error_list.append(tr("error @ ch. %1: unknown environment '%2'").arg(currentTokenID).arg(envname)); } diff --git a/lib/jkqtmathtext/jkqtmathtext.h b/lib/jkqtmathtext/jkqtmathtext.h index d147d1b96f..731d367e52 100644 --- a/lib/jkqtmathtext/jkqtmathtext.h +++ b/lib/jkqtmathtext/jkqtmathtext.h @@ -202,12 +202,15 @@ class JKQTMathTextNode; // forward - $\\rsubstack{...\\\\...}$ \image html jkqtmathtext/jkqtmathtext_rsubstack.png . - \subsection JKQTMathTextSuppoertedLaTeXTextAlignment Environments with Multi-line text + \subsection JKQTMathTextSuppoertedLaTeXTextAlignment Environments for Multi-line text Several environments are supported that allow to layout text with linebreaks and different alignemnts: - $\\begin{document} ... \\\\ ... \\end{document}$ \image html jkqtmathtext/jkqtmathtext_beginflushleft.png - $\\begin{flushleft} ... \\\\ ... \\end{flushleft}$ \image html jkqtmathtext/jkqtmathtext_beginflushleft.png - $\\begin{flushright} ... \\\\ ... \\end{flushright}$ \image html jkqtmathtext/jkqtmathtext_beginflushright.png - $\\begin{center} ... \\\\ ... \\end{center}$ \image html jkqtmathtext/jkqtmathtext_begincenter.png + - $\\begin{framed} ... \\\\ ... \\end{framed}$ \image html jkqtmathtext/jkqtmathtext_beginframed.png + - $\\begin{shaded} ... \\\\ ... \\end{shaded}$ \image html jkqtmathtext/jkqtmathtext_beginshaded.png + - $\\begin{snugshade} ... \\\\ ... \\end{snugshade}$ \image html jkqtmathtext/jkqtmathtext_beginsnugshade.png . \section JKQTMathTextSuppoertedFonts Font Handling diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp index 412fdc55d7..62fe27060a 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp @@ -798,6 +798,16 @@ void JKQTMathTextBoxInstructionNode::fillInstructions() /*Nparams=*/1); instructions["shaded"] = i; } + { + InstructionProperties i(InstructionProperties::NoModification, + InstructionProperties::NoPen, + [](JKQTMathTextEnvironment& /*ev*/, const QStringList& parameters, JKQTMathText* /*parent*/){ + return QBrush(jkqtp_String2QColor(parameters.value(0, QColor(Qt::transparent).name())), Qt::SolidPattern); + }, + 0, + /*Nparams=*/1); + instructions["snugshade"] = i; + } { InstructionProperties i(InstructionProperties::NoModification, [](JKQTMathTextEnvironment& ev, const QStringList& parameters, JKQTMathText* parent){