From b38ccc5fbcf880c56a39c1f522a947eb31a9522c Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Mon, 1 Aug 2022 15:17:34 +0200 Subject: [PATCH] JKQTMathText: added \dashbox() and \dotbox{} --- doc/dox/whatsnew.dox | 2 ++ .../jkqtmathtext/jkqtmathtext_dashbox.png | Bin 0 -> 1423 bytes .../jkqtmathtext/jkqtmathtext_dottedbox.png | Bin 0 -> 1384 bytes examples/jkqtmathtext_test/testform.cpp | 2 +- lib/jkqtmathtext/jkqtmathtext.h | 2 ++ .../nodes/jkqtmathtextinstructionnode.cpp | 27 ++++++++++++++++++ 6 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_dashbox.png create mode 100644 doc/images/jkqtmathtext/jkqtmathtext_dottedbox.png diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 68b19c3566..75ce7912c5 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -64,6 +64,8 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: added top-corner (\c \\ulcorner/\c \\urcorner ) and bottom-corner brackets (\c \\llcorner/\c \\lrcorner )
  • NEW: added \c \\overbracket and \c \\underbracket
  • NEW: added \c \\shaded{color}{...}
    • +
  • NEW: added \c \\dashbox{...}
    • +
  • NEW: added \c \\dottedbox{...}
  • NEW: added \c \\acute{X}, \c \\grave{X}, \c \\acute{X}
  • NEW: added functions to set the font-size in pixels (as alternative to the existing functions that set them in points), implements request #76 from user:igormironchik
  • NEW: added \c \\userfont{SystemFontName}{Text} instruction
    • diff --git a/doc/images/jkqtmathtext/jkqtmathtext_dashbox.png b/doc/images/jkqtmathtext/jkqtmathtext_dashbox.png new file mode 100644 index 0000000000000000000000000000000000000000..cba434387e561c8f56698b7733454223cf3f39a4 GIT binary patch literal 1423 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"math: operator test (textmode)", "x=0\\ \\ y>0\\ \\ x+y\\ \\ -1\\ \\ x-2\\ \\ x\\cdot y\\ \\ x\\geq 4\\ \\ x~4"); ui->cmbTestset->addItem("math: operator test (mathmode)", "$x=0\\ \\ y>0\\ \\ x+y\\ \\ -1\\ \\ x-2\\ \\ x\\cdot y\\ \\ x\\geq 4\\ \\ x~4$"); ui->cmbTestset->addItem("text: color test", "\\textcolor{red}{RED}\\textcolor{blue}{BLUE}"); - ui->cmbTestset->addItem("text: boxed test", "test: {\\backslash}boxed: \\boxed{boxed text} {\\backslash}doublebox: \\doublebox{boxed text} {\\backslash}ovalbox: \\ovalbox{boxed text} {\\backslash}Ovalbox: \\Ovalbox{boxed text} {\\backslash}ovaldoublebox: \\ovaldoublebox{boxed text} {\\backslash}colorbox\\{red\\}: \\colorbox{red}{boxed text} {\\backslash}shaded\\{AliceBlue\\}: \\shaded{AliceBlue}{boxed text} {\\backslash}fcolorbox\\{red\\}\\{AliceBlue\\}: \\fcolorbox{red}{AliceBlue}{boxed text} in the middle"); + ui->cmbTestset->addItem("text: boxed test", "test: {\\backslash}boxed: \\boxed{boxed text} {\\backslash}doublebox: \\doublebox{boxed text} {\\backslash}ovalbox: \\ovalbox{boxed text} {\\backslash}Ovalbox: \\Ovalbox{boxed text} {\\backslash}ovaldoublebox: \\ovaldoublebox{boxed text} {\\backslash}dashbox\\{...\\}: \\dashbox{boxed text} {\\backslash}dottedbox\\{...\\}: \\dottedbox{boxed text} {\\backslash}colorbox\\{red\\}: \\colorbox{red}{boxed text} {\\backslash}shaded\\{AliceBlue\\}: \\shaded{AliceBlue}{boxed text} {\\backslash}fcolorbox\\{red\\}\\{AliceBlue\\}: \\fcolorbox{red}{AliceBlue}{boxed text} in the middle"); ui->cmbTestset->addItem("mathboxed test", "$\\fbox{2^{2^{\\colorbox{red}{2^{x}}}}}$"); ui->cmbTestset->addItem("axiom of power test", "$\\forall A \\, \\exists P \\, \\forall B \\, [B \\in P \\iff \\forall C \\, (C \\in B \\Rightarrow C \\in A)]$"); ui->cmbTestset->addItem("math: De Morgan's law", "$\\neg(P\\land Q)\\iff(\\neg P)\\lor(\\neg Q)$ or $\\overline{\\bigcap_{i \\in I} A_{i}}\\equiv\\bigcup_{i \\in I} \\overline{A_{i}}$ or $\\overline{A \\cup B}\\equiv\\overline{A} \\cap \\overline{B}$"); diff --git a/lib/jkqtmathtext/jkqtmathtext.h b/lib/jkqtmathtext/jkqtmathtext.h index 30efdf5052..1e409dc73e 100644 --- a/lib/jkqtmathtext/jkqtmathtext.h +++ b/lib/jkqtmathtext/jkqtmathtext.h @@ -127,6 +127,8 @@ class JKQTMathTextNode; // forward - \c \\doublebox{...} : draw text with a rounded box around it \image html jkqtmathtext/jkqtmathtext_doublebox.png - \c \\ovalbox{...} : draw text with a rounded box around it \image html jkqtmathtext/jkqtmathtext_ovalboxed.png - \c \\Ovalbox{...} : draw a thick oval box \image html jkqtmathtext/jkqtmathtext_oovalbox.png + - \c \\dashbox{...} , \c \\dbox{...} : draw a dashed box \image html jkqtmathtext/jkqtmathtext_dashbox.png + - \c \\dottedbox{...} : draw a dottted box \image html jkqtmathtext/jkqtmathtext_dottedbox.png - \c \\ovaldoublebox{...} : draw a double oval box \image html jkqtmathtext/jkqtmathtext_doubleovalbox.png - \c \\colorbox{bordercolor}{...} : draw a colored box \image html jkqtmathtext/jkqtmathtext_colorbox.png - \c \\shaded{backgroundcolor}{...} : draw a filled box \image html jkqtmathtext/jkqtmathtext_shaded.png diff --git a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp index 62fe27060a..51bf8dd183 100644 --- a/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp +++ b/lib/jkqtmathtext/nodes/jkqtmathtextinstructionnode.cpp @@ -788,6 +788,33 @@ void JKQTMathTextBoxInstructionNode::fillInstructions() /*Nparams=*/1); instructions["colorbox"] = i; } + { + InstructionProperties i(InstructionProperties::NoModification, + [](JKQTMathTextEnvironment& ev, const QStringList& parameters, JKQTMathText* parent){ + QPen p=InstructionProperties::DefaultPen(ev, parameters, parent); + p.setStyle(Qt::DashLine); + return p; + }, + InstructionProperties::NoBrush, + InstructionProperties::DefaultPadding, + /*Nparams=*/0); + instructions["dashbox"] = i; + instructions["dashedbox"] = i; + instructions["dbox"] = i; + } + { + InstructionProperties i(InstructionProperties::NoModification, + [](JKQTMathTextEnvironment& ev, const QStringList& parameters, JKQTMathText* parent){ + QPen p=InstructionProperties::DefaultPen(ev, parameters, parent); + p.setStyle(Qt::DotLine); + return p; + }, + InstructionProperties::NoBrush, + InstructionProperties::DefaultPadding, + /*Nparams=*/0); + instructions["dottedbox"] = i; + instructions["dotbox"] = i; + } { InstructionProperties i(InstructionProperties::NoModification, InstructionProperties::NoPen,