From c7ffdacfcc0f081d5e937d67b52f504a19a18cc1 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Wed, 3 Aug 2022 09:55:45 +0200 Subject: [PATCH] JKQTMathText: added support for \\bigl,\\bigr,\\Bigr,... commands for fixed-size but enlarged paramtheses --- doc/dox/jkqtmathtext_supportedlatex.dox | 17 ++- doc/dox/todo.dox | 1 - doc/dox/whatsnew.dox | 1 + .../jkqtmathtext/jkqtmathtext_brace_bbig.png | Bin 0 -> 3316 bytes .../jkqtmathtext/jkqtmathtext_brace_bbigg.png | Bin 0 -> 4848 bytes .../jkqtmathtext/jkqtmathtext_brace_big.png | Bin 0 -> 3207 bytes .../jkqtmathtext_brace_bigfamily.png | Bin 0 -> 6557 bytes .../jkqtmathtext/jkqtmathtext_brace_bigg.png | Bin 0 -> 4125 bytes .../jkqtmathtext_brace_lcorner.png | Bin 0 -> 748 bytes .../jkqtmathtext_brace_ucorner.png | Bin 0 -> 731 bytes examples/jkqtmathtext_test/testform.cpp | 4 + lib/jkqtmathtext/jkqtmathtext.cpp | 94 +++++++++++++++- lib/jkqtmathtext/jkqtmathtext.h | 4 + lib/jkqtmathtext/jkqtmathtexttools.cpp | 33 ++++-- lib/jkqtmathtext/jkqtmathtexttools.h | 2 +- .../nodes/jkqtmathtextinstructionnode.cpp | 26 +++++ .../nodes/jkqtmathtextwhitespacenode.cpp | 101 +++++++++++++++++- .../nodes/jkqtmathtextwhitespacenode.h | 51 ++++++++- 18 files changed, 312 insertions(+), 22 deletions(-) create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_big.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_lcorner.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png diff --git a/doc/dox/jkqtmathtext_supportedlatex.dox b/doc/dox/jkqtmathtext_supportedlatex.dox index a1cb01dcce..d92a1299d1 100644 --- a/doc/dox/jkqtmathtext_supportedlatex.dox +++ b/doc/dox/jkqtmathtext_supportedlatex.dox @@ -109,13 +109,24 @@ - \c \\left( \c \\right) : default meaning (), \image html jkqtmathtext/jkqtmathtext_brace_round.png - \c \\left[ \c \\right] : default meaning [], \image html jkqtmathtext/jkqtmathtext_brace_rect.png - \c \\left\\{ \c \\right\\} : default meaning {}, \image html jkqtmathtext/jkqtmathtext_brace_curly.png - - \c \\left< \c \\right> : "averaging" braces , \image html jkqtmathtext/jkqtmathtext_brace_tri.png + - \c \\left\\langle \c \\right\\rangle : "averaging" braces , \image html jkqtmathtext/jkqtmathtext_brace_tri.png - \c \\left\\lfloor \c \\right\\rfloor : floor braces , \image html jkqtmathtext/jkqtmathtext_brace_floor.png - - \c \\left~ \c \\right~ \c \\left\\lceil \c \\right\\rceil : ceil braces , \image html jkqtmathtext/jkqtmathtext_brace_ceil.png - - \c \\left| \c \\right| : absolute value braces | |, \image html jkqtmathtext/jkqtmathtext_brace_oneline.png + - \c \\left\\lceil \c \\right\\rceil : ceil braces , \image html jkqtmathtext/jkqtmathtext_brace_ceil.png + - \c \\left| \c \\right| : absolute value braces | |, \image html jkqtmathtext/jkqtmathtext_bracejkqtmathtext_brace_ucorner_oneline.png - \c \\left\\| \c \\right\\| \endcode : norm braces || ||, \image html jkqtmathtext/jkqtmathtext_brace_dblline.png + - \c \\left\\llcorner \c \\right\\lrcorner : lower corner braces , \image html jkqtmathtext/jkqtmathtext_brace_lcorner.png + - \c \\left\\ulcorner \c \\right\\urcorner : upper corner braces , \image html jkqtmathtext/.png - You can use \c \\left. or \c \\right. to have only right or only left brace . + + In additional fixed-size parantheses are available with the following family of instructions: + - \c \\bigl([\\{\\langle... , \c \\big([\\{\\langle... and \c \\bigr)]\\}\\rangle... \image html jkqtmathtext/jkqtmathtext_brace_big.png + - \c \\Bigl([\\{\\langle... , \c \\Big([\\{\\langle... and \c \\Bigr)]\\}\\rangle... \image html jkqtmathtext/jkqtmathtext_brace_bbig.png + - \c \\biggl([\\{\\langle... , \c \\bigg([\\{\\langle... and \c \\biggr)]\\}\\rangle... \image html jkqtmathtext/jkqtmathtext_brace_bigg.png + - \c \\Biggl([\\{\\langle... , \c \\Bigg([\\{\\langle... and \c \\Biggr)]\\}\\rangle... \image html jkqtmathtext/jkqtmathtext_brace_bbigg.png + . + They use the same rendering code as the standard \c \\left and \c \\right instructions. Here is an example: + \image html jkqtmathtext/jkqtmathtext_brace_bigfamily.png generated by $\Biggl\langle\biggl\{\Bigl[\bigl( r^{123}\bigr)\Bigr]\biggr\}\Biggr\rangle$ \subsection JKQTMathTextSuppoertedLaTeXRoots Roots There are also instructions that allow to write roots: diff --git a/doc/dox/todo.dox b/doc/dox/todo.dox index 558cb9ce4f..e29a488cf0 100644 --- a/doc/dox/todo.dox +++ b/doc/dox/todo.dox @@ -40,7 +40,6 @@ This page lists several todos and wishes for future version of JKQTPlotter
  • JKQTMathText:
    • diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bbig.png new file mode 100644 index 0000000000000000000000000000000000000000..21940b3f4c3ae69609769349765a0448d69dabf0 GIT binary patch literal 3316 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 literal 0 HcmV?d00001 diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bbigg.png new file mode 100644 index 0000000000000000000000000000000000000000..6be7aa544b6040520d557c294194332d219ea447 GIT binary patch literal 4848 zcmY*dc|26#`=7zs8cRwHWgSFenCyGjDa06AvW#_9lYN(jm}G);s=iGaq=Xt;1Pn?;lAsZ_nD+mN)LmBCzfqNBDh|F}r zwa%8~D{uq*p$)Hs%Bbg8feHgo$3zDNsz^L_FDn%h2$3wXw5mt%Y@@%77SKIzaT)e5*+ zkND$W`Bp-RfJ}71@3KrsGxGP&%wf#objbAYu$jZ@^$<&22t@ZH)eJ$LheA63=K&go zJFnuqxLT0?G(J8)G4WGxudt=ZgZ()sL&NT)qx(`H1wE7=uf)r?w zEdQ8&V4z~E4P^v2yYcWLNIB8W#Ok8F?0VYe$WSMxNu&HrlzLz7cP8gu@Qk3mz3Ds*)ehme5KK}Nn~Xem9`oI?tWlPh~JN50~I5EL$HBCd0Jf|6f)&CwI9N0I9 zroso4Dv+9ge_43Eq0!8!L5JU%?QUEh@-DjSHked`q_EA+&Cv`dYwwBnYW7g6v4w_- z0@8aaXX{lLHs?BM+TPr_tW~oAL)3c$fvK~_YetjQsZ&O+TYedq6OeY<=BiuReEssv z=rIYC3_UlWq}NF5ON~<|^qI;&QSh+&QOAf6oAFPc7;%AZR2QD(UPcDORDAR82Q+ru z)C}U{;xOmH2P*V3W3lWPSl72dUzbgGjlhqUgKe?1lt>d36F5u4QD!7h2`JOTs8Xx1 zudn=cXXE|UY~)7Ep{GakEwAR(zP-K+L0`e^LeuIPcj`rH>ER1f#r^%pq#vno-(JQ) znV)wiG3dKftt*@%)iJiEwFEb1Z($dm!7D8sGބ`%F_Hzq*m&z3_O#h&B8hbS&~6&07&&#%Wgm#JBz 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 literal 0 HcmV?d00001 diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_big.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_big.png new file mode 100644 index 0000000000000000000000000000000000000000..493bcd06d1682b22843769bf88d225dafae3725a GIT binary patch literal 3207 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 literal 0 HcmV?d00001 diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bigfamily.png new file mode 100644 index 0000000000000000000000000000000000000000..8e8ca580afd7a2ae446f90eb0b9ea591af819579 GIT binary patch literal 6557 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 literal 0 HcmV?d00001 diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_bigg.png new file mode 100644 index 0000000000000000000000000000000000000000..2c405302512c694a0fc4e820ed5d4a9503e43829 GIT binary patch literal 4125 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 U?z(LbFflTCy85}Sb4q9e07OwrbN~PV literal 0 HcmV?d00001 diff --git a/doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png b/doc/images/jkqtmathtext/jkqtmathtext_brace_ucorner.png new file mode 100644 index 0000000000000000000000000000000000000000..8513bb52291b5c8292fb9e8ec5c4ed249261e05d GIT binary patch literal 731 zcmeAS@N?(olHy`uVBq!ia0vp^SwL*g!2~3;gFRjXDaPU;cPEB*=VU+}mUKs7M+SzC z{oH>NS%G}c0*}aI1_m)z5N7lYQuzQB6e@9zC<)F_D=AMbN@Z{_N=?lx&d4u`3*`W6 zVG8neaSW-5dwavTugO57#x4dF?mJ>gZUBW3g+aP0)e{{%jMTc zd=b^?H`=oAzhBPGhtHXfjjM}VX7r1Eo|t48bjH2wr-$dh!w)~aepg}hYH4P<)!YY7 z8^8UwU9(#Kr&#yVGk2@@Uh}@3xBKoP*5tF#izC9{AKf0cwr;~Go9o{0t4^eCPK`UH zy~Zg1Rre)Ry=m#Iv!Zt1e*2*5b*`E8#?5ozSM7b}{D11wNBhp1?^?B{fi=w3N_g9b zmABujmHE!`U&UeE{PB-M8^Omh_nr$sGzvA4y^Ur_(UB~}7-S&r+d`5wtwf~{xj};5_rgQIEr~XrIiuwFo z7amrI@h&*?{pWMNynX8`1fHrL>z?VKRlzrjQ6}r(qNkI!t9d4V`~B(V>rC}a_6Zx> z<6CO-b{n0)<#Y8*?fY=|!*@7mZtDzLF3*>rRkPsvCu9D)@T=>tJDv8D%lZ5@SF2`6 zkF7>-nd$6T#T%rGUilpS`M_z_eOcL_4DRFM^TkrX+6jMTW_#%T&RFqlWyuTmi$7TR zR<6xFZPd7Yx$e^2=5IEim)r5foj22D-w$=(Y@K~3UuX1-A>zX&oJ?(w#a<4*$<`0Sgwak~Awk77@dy))|aD-x!&w^EU{~44Y{(igTV|foS?J;<| L`njxgN@xNAc7I&{ literal 0 HcmV?d00001 diff --git a/examples/jkqtmathtext_test/testform.cpp b/examples/jkqtmathtext_test/testform.cpp index 06239d8dcb..272039dd75 100644 --- a/examples/jkqtmathtext_test/testform.cpp +++ b/examples/jkqtmathtext_test/testform.cpp @@ -195,6 +195,7 @@ TestForm::TestForm(QWidget *parent) : ui->cmbTestset->addItem("text/math: brace test: non-left/right top-corner", "text: \\ulcorner\\ulcorner\\ulcorner r^{123}\\urcorner\\urcorner\\urcorner -- math: $\\ulcorner\\ulcorner\\ulcorner r^{123}\\urcorner\\urcorner\\urcorner$"); ui->cmbTestset->addItem("text/math: brace test: non-left/right bottom-corner", "text: \\llcorner\\llcorner\\llcorner r^{123}\\lrcorner\\lrcorner\\lrcorner -- math: $\\llcorner\\llcorner\\llcorner r^{123}\\lrcorner\\lrcorner\\lrcorner$"); ui->cmbTestset->addItem("text/math: brace test: non-left/right { | }", "text: \\{r^{123}|r\\equiv 5\\} -- math: $\\{r^{123}|r\\equiv 5\\}$"); + ui->cmbTestset->addItem("math: brace test: bigl/Bigl/... mixed", "math: $\\Biggl\\langle\\biggl\\{\\Bigl[\\bigl(( r^{123})\\bigr)\\Bigr]\\biggr\\}\\Biggr\\rangle$"); ui->cmbTestset->addItem("text/math: sub-, superscript test", "text: r^{1234}_{321} r_{321}^{1234} -- math: $r^{1234}_{321} r_{321}^{1234} -- \\kappa^2 -- \\kappa_2 -- \\kappa_2^2$"); ui->cmbTestset->addItem("text/math: super-, subscript test", "text: r^{123}_{4321} r_{4321}^{123} -- math: $r^{123}_{4321} r_{4321}^{123} -- \\kappa^2 -- \\kappa_2 -- \\kappa_2^2$"); //ui->cmbTestset->addItem("", ""); @@ -462,6 +463,7 @@ QTreeWidgetItem *TestForm::createTree(JKQTMathTextNode *node, QTreeWidgetItem* p JKQTMathTextFracNode* fracN=dynamic_cast(node); JKQTMathTextMatrixNode* matrixN=dynamic_cast(node); JKQTMathTextDecoratedNode* decoN=dynamic_cast(node); + JKQTMathTextEmptyBoxNode* emptyN=dynamic_cast(node); QTreeWidgetItem* ti=nullptr; if (parent) ti=new QTreeWidgetItem(parent); @@ -527,6 +529,8 @@ QTreeWidgetItem *TestForm::createTree(JKQTMathTextNode *node, QTreeWidgetItem* p name=QString("WhitespaceNode :type=%1, count=%2").arg(spN->Type2String(spN->getWhitespaceType())).arg(spN->getWhitespaceCount()); } else if (txtN) { name=QString("TextNode: \'%1\'").arg(txtN->getText()); + } else if (emptyN) { + name=QString("EmptyBoxNode %1%2 x %3%4").arg(emptyN->getWidth()).arg(JKQTMathTextEmptyBoxNode::Units2String(emptyN->getWidthUnit())).arg(emptyN->getHeight()).arg(JKQTMathTextEmptyBoxNode::Units2String(emptyN->getHeightUnit())); } else { name=QString("unknown"); } diff --git a/lib/jkqtmathtext/jkqtmathtext.cpp b/lib/jkqtmathtext/jkqtmathtext.cpp index 43c62d4b0b..8db92080e2 100644 --- a/lib/jkqtmathtext/jkqtmathtext.cpp +++ b/lib/jkqtmathtext/jkqtmathtext.cpp @@ -1008,8 +1008,10 @@ JKQTMathText::tokenType JKQTMathText::getToken() { auto fAddUml=[](const QString& cmd, const QChar& letter, const QChar& ch) { QString i; if (cmd.size()>0 && !letter.isNull()) { - i="\\"+cmd+letter; - accentLetters[i]=ch; accentLetters_LenBackslash.insert(i.size()); + if (cmd.size()==1 && !cmd[0].isLetter()) { + i="\\"+cmd+letter; + accentLetters[i]=ch; accentLetters_LenBackslash.insert(i.size()); + } i="{\\"+cmd+letter+"}"; accentLetters[i]=ch; accentLetters_LenCurly.insert(i.size()); i="\\"+cmd+"{"+letter+"}"; @@ -1490,6 +1492,11 @@ JKQTMathText::tokenType JKQTMathText::getToken() { return currentToken=MTTnone; } +void JKQTMathText::giveBackToTokenizer(size_t count) +{ + currentTokenID-=count; +} + JKQTMathTextNode* JKQTMathText::parseLatexString(bool get, JKQTMathTextBraceType quitOnClosingBrace, const QString& quitOnEnvironmentEnd, bool quitOnClosingBracket) { //std::cout<<" entering parseLatexString()\n"; JKQTMathTextHorizontalListNode* nl=new JKQTMathTextHorizontalListNode(this); @@ -1499,7 +1506,7 @@ JKQTMathTextNode* JKQTMathText::parseLatexString(bool get, JKQTMathTextBraceType // initialize some static sets for easy and fast character lookup static QSet mathEnvironmentSpecialText; if (mathEnvironmentSpecialText.size()==0) { - mathEnvironmentSpecialText<<"+"<<"-"<<"="<<"*"<<"<"<<">"<<"|"<<"/"; + mathEnvironmentSpecialText<<"+"<<"-"<<"="<<"*"<<"<"<<">"; } bool getNew=true; @@ -1769,6 +1776,28 @@ JKQTMathTextNode* JKQTMathText::parseLatexString(bool get, JKQTMathTextBraceType } JKQTMathTextNode* JKQTMathText::parseInstruction(bool *_foundError, bool* getNew) { + static QHash big_instructions_family; + if (big_instructions_family.size()==0) { + big_instructions_family["big"]=0.85;//1.2; + big_instructions_family["bigl"]=0.85;//1.2; + big_instructions_family["bigm"]=0.85;//1.2; + big_instructions_family["bigr"]=0.85;//1.2; + + big_instructions_family["Big"]=1.15;//1.85; + big_instructions_family["Bigl"]=1.15;//1.85; + big_instructions_family["Bigm"]=1.15;//1.85; + big_instructions_family["Bigr"]=1.15;//1.85; + + big_instructions_family["bigg"]=1.45;//2.4; + big_instructions_family["biggl"]=1.45;//2.4; + big_instructions_family["biggm"]=1.45;//2.4; + big_instructions_family["biggr"]=1.45;//2.4; + + big_instructions_family["Bigg"]=1.75;//3.1; + big_instructions_family["Biggl"]=1.75;//3.1; + big_instructions_family["Biggm"]=1.75;//3.1; + big_instructions_family["Biggr"]=1.75;//3.1; + } if (currentToken!=MTTinstruction) { if (_foundError) *_foundError=true; if (getNew) *getNew=false; @@ -1788,6 +1817,42 @@ JKQTMathTextNode* JKQTMathText::parseInstruction(bool *_foundError, bool* getNew child->setSubSuperscriptAboveBelowNode(true); } if (getNew) *getNew=true; + } else if (big_instructions_family.contains(currentInstructionName)) { + // after \big,\bigl... we expect a symbol-instruction or at least one character of text + while (getToken()==MTTwhitespace);// eat whitespace + + JKQTMathTextBraceType bracetype=MTBTUnknown; + bool openbrace=true; + if (currentToken==MTTinstruction) { + bracetype=TokenName2JKQTMathTextBraceType(currentTokenName, &openbrace); + } else if (currentToken==MTTtext) { + const QString firstTokenChar(currentTokenName[0]); + bracetype=TokenName2JKQTMathTextBraceType(firstTokenChar, &openbrace); + if (bracetype!=MTBTUnknown) { + giveBackToTokenizer(currentTokenName.size()-1); + } else { + giveBackToTokenizer(currentTokenName.size()); + } + } else if (currentToken==MTTopenbracket) { + bracetype=MTBTSquareBracket; + openbrace=true; + } else if (currentToken==MTTclosebracket) { + bracetype=MTBTSquareBracket; + openbrace=false; + } else { + error_list.append(tr("error @ ch. %1: expected symbol-encoding instruction or a character after '\\%2' command, but found token type %3").arg(currentTokenID).arg(currentInstructionName).arg(tokenType2String(currentToken))); + } + if (bracetype!=MTBTUnknown) { + JKQTMathTextEmptyBoxNode* sizeChild=new JKQTMathTextEmptyBoxNode(this, 0, JKQTMathTextEmptyBoxNode::EBUem, big_instructions_family[currentInstructionName], JKQTMathTextEmptyBoxNode::EBUem); + if (openbrace) { + child=new JKQTMathTextBraceNode(this, bracetype, MTBTNone, sizeChild); + } else { + child=new JKQTMathTextBraceNode(this, MTBTNone, bracetype, sizeChild); + } + } else { + error_list.append(tr("error @ ch. %1: expected symbol-encoding instruction or character after '\\%2' command").arg(currentTokenID).arg(currentInstructionName)); + } + if (getNew) *getNew=true; } else if (JKQTMathTextModifiedTextPropsInstructionNode::supportsInstructionName(currentInstructionName)) { const size_t Nparams=JKQTMathTextModifiedTextPropsInstructionNode::countParametersOfInstruction(currentInstructionName); bool foundError=false; @@ -2128,6 +2193,29 @@ JKQTMathTextNode *JKQTMathText::getNodeTree() const { return parsedNode; } +QString JKQTMathText::tokenType2String(tokenType type) +{ + switch(type) { + case MTTnone: return "MTTnone"; + case MTTtext: return "MTTtext"; + case MTTinstruction: return "MTTinstruction"; + case MTTinstructionNewline: return "MTTinstructionNewline"; + case MTTunderscore: return "MTTunderscore"; + case MTThat: return "MTThat"; + case MTTdollar: return "MTTdollar"; + case MTTopenbrace: return "MTTopenbrace"; + case MTTclosebrace: return "MTTclosebrace"; + case MTTopenbracket: return "MTTopenbracket"; + case MTTclosebracket: return "MTTclosebracket"; + case MTTwhitespace: return "MTTwhitespace"; + case MTTampersand: return "MTTampersand"; + case MTThyphen: return "MTThyphen"; + case MTTendash: return "MTTendash"; + case MTTemdash: return "MTTemdash"; + } + return "???"; +} + diff --git a/lib/jkqtmathtext/jkqtmathtext.h b/lib/jkqtmathtext/jkqtmathtext.h index 10b958c200..84877bb8a6 100644 --- a/lib/jkqtmathtext/jkqtmathtext.h +++ b/lib/jkqtmathtext/jkqtmathtext.h @@ -729,9 +729,13 @@ class JKQTMATHTEXT_LIB_EXPORT JKQTMathText : public QObject { MTTendash, /*!< \brief the en-dash character sequence \c "--" in text-mode */ MTTemdash, /*!< \brief the em-dash character sequence \c "---" in text-mode */ }; + /** \biref convert a tokenType into a string, e.g. for debugging output */ + static QString tokenType2String(tokenType type); /** \brief tokenizer for the LaTeX parser */ tokenType getToken(); + /** \brief returns some characters to the Tokenizer */ + void giveBackToTokenizer(size_t count); /** \brief parse a LaTeX string * * \param get if \c true this calls getToken() diff --git a/lib/jkqtmathtext/jkqtmathtexttools.cpp b/lib/jkqtmathtext/jkqtmathtexttools.cpp index 0ca129faa5..124c0558dc 100644 --- a/lib/jkqtmathtext/jkqtmathtexttools.cpp +++ b/lib/jkqtmathtext/jkqtmathtexttools.cpp @@ -358,18 +358,29 @@ QString JKQTMathTextBraceType2String(JKQTMathTextBraceType type) { return "???"; } -JKQTMathTextBraceType TokenName2JKQTMathTextBraceType(const QString &tokenName) +JKQTMathTextBraceType TokenName2JKQTMathTextBraceType(const QString &tokenName, bool* isOpening) { - if (tokenName=="(" || tokenName==")") return MTBTParenthesis; - if (tokenName=="[" || tokenName=="]") return MTBTSquareBracket; - if (tokenName=="{" || tokenName=="}") return MTBTCurlyBracket; - if (tokenName=="|") return MTBTSingleLine; - if (tokenName=="||" || tokenName=="#") return MTBTDoubleLine; - if (tokenName=="<" || tokenName==">" || tokenName=="langle" || tokenName=="rangle") return MTBTAngleBracket; - if (tokenName=="_" || tokenName=="lfloor" || tokenName=="rfloor") return MTBTFloorBracket; - if (tokenName=="~" || tokenName=="lceil" || tokenName=="rceil") return MTBTCeilBracket; - if (tokenName=="ulcorner" || tokenName=="urcorner"||tokenName=="tlcorner" || tokenName=="trcorner") return MTBTTopCorner; - if (tokenName=="blcorner" || tokenName=="brcorner"||tokenName=="llcorner" || tokenName=="lrcorner") return MTBTBottomCorner; + if (tokenName=="(") { if (isOpening) *isOpening=true; return MTBTParenthesis; } + if (tokenName==")") { if (isOpening) *isOpening=false; return MTBTParenthesis; } + if (tokenName=="[") { if (isOpening) *isOpening=true; return MTBTSquareBracket; } + if (tokenName=="]") { if (isOpening) *isOpening=false; return MTBTSquareBracket; } + if (tokenName=="{") { if (isOpening) *isOpening=true; return MTBTCurlyBracket; } + if (tokenName=="}") { if (isOpening) *isOpening=false; return MTBTCurlyBracket; } + if (tokenName=="|") { if (isOpening) *isOpening=true; return MTBTSingleLine; } + if (tokenName=="||" || tokenName=="#") { if (isOpening) *isOpening=true; return MTBTDoubleLine; } + + if (tokenName=="<" || tokenName=="langle") { if (isOpening) *isOpening=true; return MTBTAngleBracket; } + if (tokenName==">" || tokenName=="rangle") { if (isOpening) *isOpening=false; return MTBTAngleBracket; } + if (tokenName=="_" || tokenName=="lfloor") { if (isOpening) *isOpening=true; return MTBTFloorBracket; } + if (tokenName=="_" || tokenName=="rfloor") { if (isOpening) *isOpening=false; return MTBTFloorBracket; } + if (tokenName=="~" || tokenName=="lceil") { if (isOpening) *isOpening=true; return MTBTCeilBracket; } + if (tokenName=="~" || tokenName=="rceil") { if (isOpening) *isOpening=false; return MTBTCeilBracket; } + if (tokenName=="ulcorner" || tokenName=="tlcorner") { if (isOpening) *isOpening=true; return MTBTTopCorner; } + if (tokenName=="urcorner" || tokenName=="trcorner") { if (isOpening) *isOpening=false; return MTBTTopCorner; } + if (tokenName=="blcorner" || tokenName=="llcorner") { if (isOpening) *isOpening=true; return MTBTBottomCorner; } + if (tokenName=="brcorner" || tokenName=="lrcorner") { if (isOpening) *isOpening=false; return MTBTBottomCorner; } + if (isOpening) *isOpening=true; + if (tokenName=="any") return MTBTAny; if (tokenName=="." || tokenName=="" || tokenName=="none") return MTBTNone; return MTBTUnknown; diff --git a/lib/jkqtmathtext/jkqtmathtexttools.h b/lib/jkqtmathtext/jkqtmathtexttools.h index 80944d1eaa..4e564107f3 100644 --- a/lib/jkqtmathtext/jkqtmathtexttools.h +++ b/lib/jkqtmathtext/jkqtmathtexttools.h @@ -169,7 +169,7 @@ JKQTMATHTEXT_LIB_EXPORT QString JKQTMathTextBraceType2String(JKQTMathTextBraceTy /** \brief convert a string \a tokenName describing a LaTeX Token or Instruction into an opening or closing JKQTMathTextBraceType * \ingroup jkqtmathtext_tools */ -JKQTMATHTEXT_LIB_EXPORT JKQTMathTextBraceType TokenName2JKQTMathTextBraceType(const QString& tokenName); +JKQTMATHTEXT_LIB_EXPORT JKQTMathTextBraceType TokenName2JKQTMathTextBraceType(const QString& tokenName, bool *isOpening=nullptr); /** \brief convert a string \a tokenName describing a LaTeX Instruction into an opening JKQTMathTextBraceType * \ingroup jkqtmathtext_tools * diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp index 36c1fc9eac..84f41cf5ec 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp @@ -591,6 +591,32 @@ void JKQTMathTextModifiedTextPropsInstructionNode::fillInstructions() }, 0); instructions["scriptscriptstyle"]= i; } + + + { + InstructionProperties i([](JKQTMathTextEnvironment& ev, const QStringList& /*parameters*/) { + ev.fontSize=ev.fontSize*1.2; + }, 0); + instructions["bigsize"]= i; + } + { + InstructionProperties i([](JKQTMathTextEnvironment& ev, const QStringList& /*parameters*/) { + ev.fontSize=ev.fontSize*1.85; + }, 0); + instructions["Bigsize"]= i; + } + { + InstructionProperties i([](JKQTMathTextEnvironment& ev, const QStringList& /*parameters*/) { + ev.fontSize=ev.fontSize*2.4; + }, 0); + instructions["biggsize"]= i; + } + { + InstructionProperties i([](JKQTMathTextEnvironment& ev, const QStringList& /*parameters*/) { + ev.fontSize=ev.fontSize*3.1; + }, 0); + instructions["Biggsize"]= i; + } } JKQTMathTextModifiedTextPropsInstructionNode::InstructionProperties::InstructionProperties(): diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.cpp index 16aaf27427..ad053203e9 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.cpp @@ -102,8 +102,9 @@ size_t JKQTMathTextWhitespaceNode::getWhitespaceCount() const return whitespace.count; } -double JKQTMathTextWhitespaceNode::draw(QPainter &painter, double x, double /*y*/, JKQTMathTextEnvironment currentEv, const JKQTMathTextNodeSize *prevNodeSize) +double JKQTMathTextWhitespaceNode::draw(QPainter &painter, double x, double y, JKQTMathTextEnvironment currentEv, const JKQTMathTextNodeSize *prevNodeSize) { + doDrawBoxes(painter, x,y,currentEv); double width=0, bh=0, oh=0, sp=0; getSize(painter, currentEv, width, bh, oh, sp, prevNodeSize); return x+width; @@ -215,3 +216,101 @@ QString JKQTMathTextWhitespaceNode::Type2HTML(Types type) return " "; } + +QString JKQTMathTextEmptyBoxNode::Units2String(Units type) +{ + switch(type) { + case EBUem: return "em"; + case EBUex: return "ex"; + } + return "?"; +} + +JKQTMathTextEmptyBoxNode::Units JKQTMathTextEmptyBoxNode::String2Units(QString type) +{ + type=type.toLower().trimmed(); + if (type=="ex") return EBUex; + if (type=="em") return EBUem; + return EBUem; +} + +double JKQTMathTextEmptyBoxNode::Units2PixelWidth(double value, Units unit, JKQTMathTextEnvironment currentEv, QPaintDevice *pd) const +{ + const QFontMetricsF fm(currentEv.getFont(parentMathText), pd); + if (unit==EBUem) { +#if (QT_VERSION>=QT_VERSION_CHECK(5, 15, 0)) + const double em=fm.horizontalAdvance(QChar(0x2003));//currentEv.fontSize; +#else + const double em=fm.width(QChar(0x2003));//currentEv.fontSize; +#endif + return value*em; + } else if (unit==EBUex) { + const double ex=fm.xHeight(); + return value*ex; + } + return 0; +} + +JKQTMathTextEmptyBoxNode::JKQTMathTextEmptyBoxNode(JKQTMathText *parent, double width_, Units widthUnit_, double height_, Units heightUnit_): + JKQTMathTextNode(parent), + width(width_), widthUnit(widthUnit_), + height(height_),heightUnit(heightUnit_) +{ + +} + +JKQTMathTextEmptyBoxNode::~JKQTMathTextEmptyBoxNode() +{ + +} + +QString JKQTMathTextEmptyBoxNode::getTypeName() const +{ + return QString("JKQTMathTextEmptyBoxNode(%1%2 x %3%4)").arg(getWidth()).arg(JKQTMathTextEmptyBoxNode::Units2String(getWidthUnit())).arg(getHeight()).arg(JKQTMathTextEmptyBoxNode::Units2String(getHeightUnit())); +} + +bool JKQTMathTextEmptyBoxNode::toHtml(QString &html, JKQTMathTextEnvironment currentEv, JKQTMathTextEnvironment defaultEv) +{ + return true; +} + +JKQTMathTextEmptyBoxNode::Units JKQTMathTextEmptyBoxNode::getWidthUnit() const +{ + return widthUnit; +} + +double JKQTMathTextEmptyBoxNode::getWidth() const +{ + return width; +} + +JKQTMathTextEmptyBoxNode::Units JKQTMathTextEmptyBoxNode::getHeightUnit() const +{ + return heightUnit; +} + +double JKQTMathTextEmptyBoxNode::getHeight() const +{ + return height; +} + +double JKQTMathTextEmptyBoxNode::draw(QPainter &painter, double x, double y, JKQTMathTextEnvironment currentEv, const JKQTMathTextNodeSize *prevNodeSize) +{ + doDrawBoxes(painter, x,y,currentEv); + double width=0, bh=0, oh=0, sp=0; + getSize(painter, currentEv, width, bh, oh, sp, prevNodeSize); + return x+width; +} + +void JKQTMathTextEmptyBoxNode::getSizeInternal(QPainter &painter, JKQTMathTextEnvironment currentEv, double &width, double &baselineHeight, double &overallHeight, double &strikeoutPos, const JKQTMathTextNodeSize */*prevNodeSize*/) +{ + const QFontMetricsF fm(currentEv.getFont(parentMathText), painter.device()); + width=Units2PixelWidth(width, widthUnit, currentEv, painter.device()); + overallHeight=Units2PixelWidth(height, heightUnit, currentEv, painter.device()); + if (height>0) { + baselineHeight=overallHeight; + } else { + baselineHeight=0; + } + strikeoutPos=fm.strikeOutPos(); +} diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.h b/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.h index 1080946b6f..7275acf754 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.h +++ b/lib/jkqtmathtext/nodes/jkqtmathtextwhitespacenode.h @@ -76,9 +76,9 @@ class JKQTMATHTEXT_LIB_EXPORT JKQTMathTextWhitespaceNode: public JKQTMathTextNod virtual QString getTypeName() const override; /** \copydoc JKQTMathTextNode::toHtml() */ virtual bool toHtml(QString& html, JKQTMathTextEnvironment currentEv, JKQTMathTextEnvironment defaultEv) override; - /** \brief copydoc WhitespaceProps::type */ + /** \copydoc WhitespaceProps::type */ Types getWhitespaceType() const; - /** \brief copydoc WhitespaceProps::count */ + /** \copydoc WhitespaceProps::count */ size_t getWhitespaceCount() const; /** \copydoc JKQTMathTextNode::draw() */ virtual double draw(QPainter& painter, double x, double y, JKQTMathTextEnvironment currentEv, const JKQTMathTextNodeSize* prevNodeSize=nullptr) override; @@ -103,6 +103,53 @@ class JKQTMATHTEXT_LIB_EXPORT JKQTMathTextWhitespaceNode: public JKQTMathTextNod static void fillSupportedInstructions(); }; + +/** \brief subclass representing an empty bbox with defined width/height in the syntax tree + * \ingroup jkqtmathtext_items + * + */ +class JKQTMATHTEXT_LIB_EXPORT JKQTMathTextEmptyBoxNode: public JKQTMathTextNode { + public: + enum Units { + EBUem, /*!< \brief 1em = width('M') */ + EBUex, /*!< \brief 1ex = xHeight */ + }; + /** \brief converts Types \a type into a string */ + static QString Units2String(Units type); + /** \brief converts Types \a type into a string */ + static Units String2Units(QString type); + /** \brief converts Types \a type into its width in pixels, based on \a currentEv and \a pd */ + double Units2PixelWidth(double value, Units unit, JKQTMathTextEnvironment currentEv, QPaintDevice *pd) const; + /** \brief constructs a node */ + explicit JKQTMathTextEmptyBoxNode(JKQTMathText* parent, double width_, Units widthUnit_, double height_, Units heightUnit_); + virtual ~JKQTMathTextEmptyBoxNode() override; + /** \copydoc JKQTMathTextNode::getTypeName() */ + virtual QString getTypeName() const override; + /** \copydoc JKQTMathTextNode::toHtml() */ + virtual bool toHtml(QString& html, JKQTMathTextEnvironment currentEv, JKQTMathTextEnvironment defaultEv) override; + /** \copydoc widthUnit */ + Units getWidthUnit() const; + /** \copydoc width */ + double getWidth() const; + /** \copydoc heightUnit */ + Units getHeightUnit() const; + /** \copydoc height */ + double getHeight() const; + /** \copydoc JKQTMathTextNode::draw() */ + virtual double draw(QPainter& painter, double x, double y, JKQTMathTextEnvironment currentEv, const JKQTMathTextNodeSize* prevNodeSize=nullptr) override; + protected: + /** \copydoc JKQTMathTextNode::getSizeInternal() */ + virtual void getSizeInternal(QPainter& painter, JKQTMathTextEnvironment currentEv, double& width, double& baselineHeight, double& overallHeight, double& strikeoutPos, const JKQTMathTextNodeSize* prevNodeSize=nullptr) override; + /** \brief width of the (empty) box, units of this value defined in widthUnit */ + double width; + /** \biref units to interpret width */ + Units widthUnit; + /** \brief height of the (empty) box, units of this value defined in heightUnit */ + double height; + /** \biref units to interpret height */ + Units heightUnit; +}; + #endif // JKQTMATHTEXTWHITESPACENODE_H