Skip to content

Commit

Permalink
fix: ASCIIMathTeXImg.java
Browse files Browse the repository at this point in the history 
Report to java the diff from last `plantuml/ASCIIMathTeXImg.js`:
- https://github.com/plantuml/plantuml/blob/d55c9c6ca744e9a8f0ab1a74dd52fc8a635a7729/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.js
[just before deletion of plantuml/plantuml@442d313#diff-23be7b2fb3cce49b7d992debcb281011cde6fb4ff79c22979bea8aa18c5448b9]
with last `asciimath/ASCIIMathTeXImg.js`:
- https://github.com/asciimath/asciimathml/blob/36b3cb0a1bac755b4f66a0b49e2e7c9e85cf55bb/asciimath-based/ASCIIMathTeXImg.js

Add new tests.

Known issues:
- Matrix and Array (see `splice`)
  • Loading branch information
@The-Lum
The-Lum committed Apr 29, 2024
1 parent 207c926 commit 137b3e0
Show file tree
Hide file tree
Showing 5 changed files with 635 additions and 503 deletions.
21 changes: 21 additions & 0 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.6/userguide/building_java_projects.html in the Gradle documentation.
*/

import java.time.LocalDate

plugins {
// Apply the application plugin to add support for building a CLI application in Java.
application
Expand Down Expand Up @@ -80,6 +82,25 @@ tasks.register<Test>("runUnitTestGen") {
}
}

tasks.register<Test>("ASCIIMathTeXImgUnitTest") {
description = "Runs the 'ASCIIMathTeXImgUnitTest'."
group = "verification"
useJUnitPlatform()
filter {
includeTestsMatching("math.ASCIIMathTeXImgUnitTest")
}
}

tasks.register<Zip>("reportZip") {
description = "Makes archive of reports on distib. directory."
group = "verification"
dependsOn(tasks.jacocoTestReport)
dependsOn(tasks.jacocoTestReportMarkdown)
archiveFileName = "" + LocalDate.now() + "_reports.zip"
destinationDirectory = layout.buildDirectory.dir("distributions")
from(layout.buildDirectory.dir("reports"))
}

pmd {
isConsoleOutput = true
toolVersion = "7.0.0-rc4"
Expand Down
133 changes: 87 additions & 46 deletions app/src/main/java/math/ASCIIMathTeXImg.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ public boolean hasFlag(Flag flagName) {
new Tupple("lt=" , "mo", "\u2264" , "leq" , Ttype.CONST ), //
new Tupple("gt=" , "mo", "\u2265" , "geq" , Ttype.CONST ), //
new Tupple(">=" , "mo", "\u2265" , "ge" , Ttype.CONST ), //
new Tupple("mlt" , "mo", "\u226A" , "ll" , Ttype.CONST ), //
new Tupple("mgt" , "mo", "\u226B" , "gg" , Ttype.CONST ), //
new Tupple("-<" , "mo", "\u227A" , "prec" , Ttype.CONST ), //
new Tupple("-lt" , "mo", "\u227A" , null , Ttype.CONST ), //
new Tupple(">-" , "mo", "\u227B" , "succ" , Ttype.CONST ), //
Expand All @@ -242,8 +244,9 @@ public boolean hasFlag(Flag flagName) {
new Tupple("sube" , "mo", "\u2286" , "subseteq" , Ttype.CONST ), //
new Tupple("supe" , "mo", "\u2287" , "supseteq" , Ttype.CONST ), //
new Tupple("-=" , "mo", "\u2261" , "equiv" , Ttype.CONST ), //
new Tupple("~=" , "mo", "\u2245" , "stackrel{\\sim}{=}", Ttype.CONST ), //
new Tupple("~=" , "mo", "\u2245" , "stackrel{\\sim}{=}", Ttype.CONST , Flag.NOTEXCOPY), //
new Tupple("cong" , "mo", "~=" , null , Ttype.DEFINITION), //
new Tupple("~" , "mo", "\u223C" , "sim" , Ttype.CONST ), //
new Tupple("~~" , "mo", "\u2248" , "approx" , Ttype.CONST ), //
new Tupple("prop" , "mo", "\u221D" , "propto" , Ttype.CONST ), //

Expand All @@ -264,19 +267,26 @@ public boolean hasFlag(Flag flagName) {
new Tupple("|==" , "mo" , "\u22A8", "models" , Ttype.CONST ), //

// grouping brackets
new Tupple("(" , "mo", "(" , null , Ttype.LEFTBRACKET , Flag.VAL ), //
new Tupple(")" , "mo", ")" , null , Ttype.RIGHTBRACKET, Flag.VAL ), //
new Tupple("[" , "mo", "[" , null , Ttype.LEFTBRACKET , Flag.VAL ), //
new Tupple("]" , "mo", "]" , null , Ttype.RIGHTBRACKET, Flag.VAL ), //
new Tupple("{" , "mo", "{" , "lbrace", Ttype.LEFTBRACKET ), //
new Tupple("}" , "mo", "}" , "rbrace", Ttype.RIGHTBRACKET ), //
new Tupple("|" , "mo", "|" , null , Ttype.LEFTRIGHT , Flag.VAL ), //
new Tupple("(:", "mo", "\u2329", "langle", Ttype.LEFTBRACKET ), //
new Tupple(":)", "mo", "\u232A", "rangle", Ttype.RIGHTBRACKET ), //
new Tupple("<<", "mo", "\u2329", "langle", Ttype.LEFTBRACKET ), //
new Tupple(">>", "mo", "\u232A", "rangle", Ttype.RIGHTBRACKET ), //
new Tupple("{:", "mo", "{:" , null , Ttype.LEFTBRACKET , Flag.INVISIBLE), //
new Tupple(":}", "mo", ":}" , null , Ttype.RIGHTBRACKET, Flag.INVISIBLE), //
new Tupple("(" , "mo", "(" , null , Ttype.LEFTBRACKET , Flag.VAL ), //
new Tupple(")" , "mo", ")" , null , Ttype.RIGHTBRACKET , Flag.VAL ), //
new Tupple("[" , "mo", "[" , null , Ttype.LEFTBRACKET , Flag.VAL ), //
new Tupple("]" , "mo", "]" , null , Ttype.RIGHTBRACKET , Flag.VAL ), //
new Tupple("left(" , "mo", "(" , "(" , Ttype.LEFTBRACKET , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple("right)" , "mo", ")" , ")" , Ttype.RIGHTBRACKET , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple("left[" , "mo", "[" , "[" , Ttype.LEFTBRACKET , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple("right]" , "mo", "]" , "]" , Ttype.RIGHTBRACKET , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple("{" , "mo", "{" , "lbrace", Ttype.LEFTBRACKET ), //
new Tupple("}" , "mo", "}" , "rbrace", Ttype.RIGHTBRACKET ), //
new Tupple("|" , "mo", "|" , null , Ttype.LEFTRIGHT , Flag.VAL ), //
new Tupple("|:" , "mo", "|" , "|" , Ttype.LEFTRIGHT , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple(":|" , "mo", "|" , "|" , Ttype.RIGHTBRACKET , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple(":|:" , "mo", "|" , "|" , Ttype.CONST , Flag.VAL, Flag.NOTEXCOPY), //
new Tupple("(:" , "mo", "\u2329" , "langle", Ttype.LEFTBRACKET ), //
new Tupple(":)" , "mo", "\u232A" , "rangle", Ttype.RIGHTBRACKET ), //
new Tupple("<<" , "mo", "\u2329" , "langle", Ttype.LEFTBRACKET ), //
new Tupple(">>" , "mo", "\u232A" , "rangle", Ttype.RIGHTBRACKET ), //
new Tupple("{:" , "mo", "{:" , null , Ttype.LEFTBRACKET , Flag.INVISIBLE ), //
new Tupple(":}" , "mo", ":}" , null , Ttype.RIGHTBRACKET , Flag.INVISIBLE ), //

// miscellaneous symbols
new Tupple("int" , "mo", "\u222B" , null , Ttype.CONST ), //
Expand All @@ -288,6 +298,7 @@ public boolean hasFlag(Flag flagName) {
new Tupple("del" , "mo", "\u2202" , "partial" , Ttype.CONST ), //
new Tupple("grad" , "mo", "\u2207" , "nabla" , Ttype.CONST ), //
new Tupple("+-" , "mo", "\u00B1" , "pm" , Ttype.CONST ), //
new Tupple("-+" , "mo", "\u2213" , "mp" , Ttype.CONST ), //
new Tupple("O/" , "mo", "\u2205" , "emptyset" , Ttype.CONST ), //
new Tupple("oo" , "mo", "\u221E" , "infty" , Ttype.CONST ), //
new Tupple("aleph" , "mo", "\u2135" , null , Ttype.CONST ), //
Expand Down Expand Up @@ -319,6 +330,7 @@ public boolean hasFlag(Flag flagName) {
new Tupple("ZZ" , "mo", "\u2124" , "mathbb{Z}", Ttype.CONST , Flag.NOTEXCOPY ), //
new Tupple("f" , "mi", "f" , null , Ttype.UNARY , Flag.FUNC, Flag.VAL), //
new Tupple("g" , "mi", "g" , null , Ttype.UNARY , Flag.FUNC, Flag.VAL), //
new Tupple("prime" , "mo", "\u2032" , "'" , Ttype.CONST , Flag.VAL , Flag.NOTEXCOPY), //
new Tupple("''" , "mo", "''" , null , Ttype.CONST , Flag.VAL ), //
new Tupple("'''" , "mo", "'''" , null , Ttype.CONST , Flag.VAL ), //
new Tupple("''''" , "mo", "''''" , null , Ttype.CONST , Flag.VAL ), //
Expand Down Expand Up @@ -347,20 +359,20 @@ public boolean hasFlag(Flag flagName) {
new Tupple(new String[] { "\\|" , "\\|" }, "norm" , "mo", "norm" , null, Ttype.UNARY, Flag.NOTEXCOPY), //
new Tupple(new String[] { "\\lfloor", "\\rfloor" }, "floor", "mo", "floor", null, Ttype.UNARY, Flag.NOTEXCOPY), //
new Tupple(new String[] { "\\lceil" , "\\rceil" }, "ceil" , "mo", "ceil" , null, Ttype.UNARY, Flag.NOTEXCOPY), //
new Tupple("Sin" , "mo", "sin" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Cos" , "mo", "cos" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Tan" , "mo", "tan" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Arcsin", "mo", "arcsin", null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Arccos", "mo", "arccos", null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Arctan", "mo", "arctan", null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Sinh" , "mo", "sinh" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Sosh" , "mo", "cosh" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Tanh" , "mo", "tanh" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Cot" , "mo", "cot" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Sec" , "mo", "sec" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Csc" , "mo", "csc" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Log" , "mo", "log" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Ln" , "mo", "ln" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Sin" , "mo", "Sin" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Cos" , "mo", "Cos" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Tan" , "mo", "Tan" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Arcsin", "mo", "Arcsin", null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Arccos", "mo", "Arccos", null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Arctan", "mo", "Arctan", null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Sinh" , "mo", "Sinh" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Cosh" , "mo", "Cosh" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Tanh" , "mo", "Tanh" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Cot" , "mo", "Cot" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Sec" , "mo", "Sec" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Csc" , "mo", "Csc" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Log" , "mo", "Log" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple("Ln" , "mo", "Ln" , null, Ttype.UNARY, Flag.FUNC), //
new Tupple(new String[] { "|", "|" }, "Abs", "mo", "abs", null, Ttype.UNARY, Flag.NOTEXCOPY), //
new Tupple("det", "mo", "det", null , Ttype.UNARY , Flag.FUNC ), //
new Tupple("exp", "mo", "exp", null , Ttype.UNARY , Flag.FUNC ), //
Expand All @@ -384,25 +396,42 @@ public boolean hasFlag(Flag flagName) {
new Tupple("|->" , "mo", "\u21A6", "mapsto" , Ttype.CONST), //
new Tupple("larr", "mo", "\u2190", "leftarrow" , Ttype.CONST), //
new Tupple("harr", "mo", "\u2194", "leftrightarrow" , Ttype.CONST), //
new Tupple("uArr", "mo", "\u21D1", "Uparrow" , Ttype.CONST), //
new Tupple("dArr", "mo", "\u21D3", "Downarrow" , Ttype.CONST), //
new Tupple("rArr", "mo", "\u21D2", "Rightarrow" , Ttype.CONST), //
new Tupple("lArr", "mo", "\u21D0", "Leftarrow" , Ttype.CONST), //
new Tupple("hArr", "mo", "\u21D4", "Leftrightarrow" , Ttype.CONST), //


// commands with argument
aAMsqrt, aAMroot, aAMfrac, aAMdiv, aAMover, aAMsub, aAMsup,
new Tupple("cancel", "menclose", "cancel", null , Ttype.UNARY ), //
new Tupple("Sqrt" , "msqrt" , "sqrt" , null , Ttype.UNARY ), //
new Tupple("hat" , "mover" , "\u005E", null , Ttype.UNARY, Flag.ACC), //
new Tupple("bar" , "mover" , "\u00AF", "overline" , Ttype.UNARY, Flag.ACC), //
new Tupple("vec" , "mover" , "\u2192", null , Ttype.UNARY, Flag.ACC), //
new Tupple("tilde" , "mover" , "~" , null , Ttype.UNARY, Flag.ACC), //
new Tupple("dot" , "mover" , "." , null , Ttype.UNARY, Flag.ACC), //
new Tupple("ddot" , "mover" , ".." , null , Ttype.UNARY, Flag.ACC), //
new Tupple("ul" , "munder" , "\u0332", "underline" , Ttype.UNARY, Flag.ACC), //
new Tupple("ubrace", "munder" , "\u23DF", "underbrace", Ttype.UNARY, Flag.ACC), //
new Tupple("obrace", "mover" , "\u23DE", "overbrace" , Ttype.UNARY, Flag.ACC), //
new Tupple("cancel" , "menclose", "cancel", null , Ttype.UNARY ), //
new Tupple("Sqrt" , "msqrt" , "sqrt" , null , Ttype.UNARY ), //
new Tupple("hat" , "mover" , "\u005E", null , Ttype.UNARY, Flag.ACC ), //
new Tupple("bar" , "mover" , "\u00AF", "overline" , Ttype.UNARY, Flag.ACC ), //
new Tupple("vec" , "mover" , "\u2192", null , Ttype.UNARY, Flag.ACC ), //
new Tupple("tilde" , "mover" , "~" , null , Ttype.UNARY, Flag.ACC ), //
new Tupple("dot" , "mover" , "." , null , Ttype.UNARY, Flag.ACC ), //
new Tupple("ddot" , "mover" , ".." , null , Ttype.UNARY, Flag.ACC ), //
new Tupple("overarc" , "mover" , "\u23DC", "stackrel{\\frown}", Ttype.UNARY, Flag.ACC, Flag.NOTEXCOPY), //
new Tupple("overparen", "mover" , "\u23DC", "stackrel{\\frown}", Ttype.UNARY, Flag.ACC, Flag.NOTEXCOPY), //
new Tupple("ul" , "munder" , "\u0332", "underline" , Ttype.UNARY, Flag.ACC ), //
new Tupple("ubrace" , "munder" , "\u23DF", "underbrace" , Ttype.UNARY, Flag.ACC ), //
new Tupple("obrace" , "mover" , "\u23DE", "overbrace" , Ttype.UNARY, Flag.ACC ), //
aAMtext, aAMmbox, aAMquote, //
new Tupple("color", "mstyle", null, null, Ttype.BINARY), //
new Tupple("color" , "mstyle", null , null , Ttype.BINARY ), //
new Tupple("bb" , "mstyle", "bb" , "mathbf" , Ttype.UNARY , Flag.NOTEXCOPY), //
new Tupple("mathbf" , "mstyle", "mathbf" , null , Ttype.UNARY ), //
new Tupple("sf" , "mstyle", "sf" , "mathsf" , Ttype.UNARY , Flag.NOTEXCOPY), //
new Tupple("mathsf" , "mstyle", "mathsf" , null , Ttype.UNARY ), //
new Tupple("bbb" , "mstyle", "bbb" , "mathbb" , Ttype.UNARY , Flag.NOTEXCOPY), //
new Tupple("mathbb" , "mstyle", "mathbb" , null , Ttype.UNARY ), //
new Tupple("cc" , "mstyle", "cc" , "mathcal" , Ttype.UNARY , Flag.NOTEXCOPY), //
new Tupple("mathcal" , "mstyle", "mathcal" , null , Ttype.UNARY ), //
new Tupple("tt" , "mstyle", "tt" , "mathtt" , Ttype.UNARY , Flag.NOTEXCOPY), //
new Tupple("mathtt" , "mstyle", "mathtt" , null , Ttype.UNARY ), //
new Tupple("fr" , "mstyle", "fr" , "mathfrak", Ttype.UNARY , Flag.NOTEXCOPY), //
new Tupple("mathfrak", "mstyle", "mathfrak", null , Ttype.UNARY ), //
} //
));

Expand Down Expand Up @@ -525,7 +554,7 @@ private Tupple aAMgetSymbol(String str) {
tagst = (("A".compareTo(st) > 0 || st.compareTo("Z") > 0)
&& ("a".compareTo(st) > 0 || st.compareTo("z") > 0) ? "mo" : "mi");
}
if (st.equals("-") && aAMpreviousSymbol == Ttype.INFIX) {
if (st.equals("-") && str.length() > 1 && str.charAt(1) != ' ' && aAMpreviousSymbol == Ttype.INFIX) {
aAMcurrentSymbol = Ttype.INFIX;
return new Tupple(st, tagst, st, null, Ttype.UNARY, Flag.FUNC, Flag.VAL);
}
Expand Down Expand Up @@ -555,7 +584,7 @@ private String aAMTremoveBrackets(String node) {
leftchop = 2;
}
}
if (leftchop > 0) {
if (leftchop > 0 && node.length() > 8) {
st = node.substring(node.length() - 8);
if (st.equals("\\right)}") || st.equals("\\right]}") || st.equals("\\right.}")) {
node = "{" + node.substring(leftchop);
Expand Down Expand Up @@ -737,7 +766,7 @@ else if (symbol == aAMquote)
result = aAMTparseExpr(str, false);
aAMnestingDepth--;
st = "" + result[0].charAt(result[0].length() - 1);
if (st.equals("|")) { // its an absolute value subterm
if (st.equals("|") && str.charAt(0) != ',') { // its an absolute value subterm
node = "{\\left|" + result[0] + "}";
return new String[] { node, result[1] };
} else { // the "|" is a \mid
Expand Down Expand Up @@ -791,7 +820,8 @@ private String[] aAMTparseIexpr(String str) {
}
if (sym1.hasFlag(Flag.FUNC)) {
sym2 = aAMgetSymbol(str);
if (sym2.ttype != Ttype.INFIX && sym2.ttype != Ttype.RIGHTBRACKET) {
if (sym2.ttype != Ttype.INFIX && sym2.ttype != Ttype.RIGHTBRACKET &&
(sym1.input.length() > 1 || sym2.ttype == Ttype.LEFTBRACKET)) {
result = aAMTparseIexpr(str);
node = "{" + node + result[0] + "}";
str = result[1];
Expand Down Expand Up @@ -842,7 +872,7 @@ private String[] aAMTparseExpr(String str, boolean rightbracket) {
if (right == ')' || right == ']') {
char left = newFrag.charAt(6);
if ((left == '(' && right == ')' && !symbol.output.equals("}")) || (left == '[' && right == ']')) {
String mxout = "\\begin{matrix}";
String mxout = "";
List<Integer> pos = new ArrayList<>(); // position of commas
pos.add(0);
boolean matrix = true;
Expand All @@ -851,6 +881,7 @@ private String[] aAMTparseExpr(String str, boolean rightbracket) {
subpos.add(new ArrayList<>(Arrays.asList(0)));
int lastsubposstart = 0;
int mxanynestingd = 0;
String columnaligns = "";

for (int i = 1; i < len - 1; i++) {
if (newFrag.charAt(i) == left)
Expand Down Expand Up @@ -923,6 +954,16 @@ private String[] aAMTparseExpr(String str, boolean rightbracket) {
subpos.get(pos.get(i)).get(subpos.get(pos.get(i)).size() - 1) + 1,
pos.get(i + 1) - 8));
}
}
for (int j = subarr.size() - 1; j >= 0; j--) {
if (subarr.get(j) == "{\\mid}") {
if (i == 0) {
columnaligns = "|" + columnaligns;
}
//subarr.splice(j,1);
} else if (i == 0) {
columnaligns = "c" + columnaligns;
}
}
if (lastmxsubcnt > 0 && subarr.size() != lastmxsubcnt) {
matrix = false;
Expand All @@ -937,7 +978,7 @@ private String[] aAMTparseExpr(String str, boolean rightbracket) {
}
}
}
mxout += "\\end{matrix}";
mxout = "\\begin{array}{" + columnaligns + "} " + mxout + "\\end{array}";

if (matrix) {
newFrag = mxout;
Expand Down
Loading

0 comments on commit 137b3e0

Please sign in to comment.