Merge pull request #57 from mwhapples/CleanUp

Update MathCAT

Author: mwhapples

brailleblaster-app/pom.xml

@@ -253,8 +253,8 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>onl.mdw</groupId>
-                                    <artifactId>mathcat4j-core</artifactId>
-                                    <version>${mathcat4j.version}</version>
+                                    <artifactId>mathcat4j-jni</artifactId>
+                                    <version>${mathcat4j-jni.version}</version>
                                     <type>zip</type>
                                     <classifier>rules</classifier>
                                 </artifactItem>

brailleblaster-core/src/main/java/org/brailleblaster/search/DOMControl.kt

@@ -16,37 +16,22 @@
 package org.brailleblaster.search
 
 import nu.xom.Node
-import nu.xom.Nodes
 import nu.xom.Text
+import org.brailleblaster.utd.internal.xml.FastXPath
 import org.brailleblaster.utd.internal.xml.XMLHandler
 
 class DOMControl(private val click: Click) {
     val possiblesCorrectAttributes: MutableList<Node> = ArrayList()
     private val possiblesPastStart: MutableList<Node> = ArrayList()
 
     init {
-        val allNodes = click.initialView.mapElement.node.query("following::text()")
-        nodesToArrayList(allNodes)
+        val allNodes = FastXPath.following(click.initialView.mapElement.node).filterIsInstance<Text>()
+        possiblesPastStart += allNodes
         if (SearchUtils.checkCorrectAttributes(click.initialView.mapElement.node, click)) {
             possiblesCorrectAttributes.add(0, click.initialView.mapElement.node)
             // following::text will not add the current element
         }
-        getNodes(allNodes)
-    }
-
-    private fun nodesToArrayList(nodes: Nodes) {
-        for (i in 0 until nodes.size()) {
-            possiblesPastStart.add(nodes[i])
-        }
-    }
-
-    private fun getNodes(nodes: Nodes) {
-        for (i in 0 until nodes.size()) {
-            val node = nodes[i]
-            if (SearchUtils.checkCorrectAttributes(node, click)) {
-                possiblesCorrectAttributes.add(node)
-            }
-        }
+        possiblesCorrectAttributes += allNodes.filter { SearchUtils.checkCorrectAttributes(it, click) }
     }
 
     fun searchNoView(array: List<Node>): String {

brailleblaster-debug-tools/src/main/kotlin/org/brailleblaster/debug/XMLDebugger.kt

@@ -196,7 +196,7 @@ class XMLDebugger(private val parent: Shell, private val simpleManager: BBSimple
         if (n is nu.xom.Text) n = n.parent
         if (n == null) return
         curNode = n
-        activeDocument = if (n is Document) n else Document(n.copy() as Element)
+        activeDocument = n as? Document ?: Document(n.copy() as Element)
         if (!showBrlValue) UTDHelper.getDescendantBrlFast(activeDocument) { it.detach() }
         if (warnEmptyText) {
             FastXPath.descendant(activeDocument)

pom.xml

@@ -46,7 +46,6 @@ child.project.url.inherit.append.path="false">
         <revision>3.1.0</revision>
         <sha1/>
         <changelist>-SNAPSHOT</changelist>
-        <wrappermavenplugin.version>3.3.2</wrappermavenplugin.version>
         <versions.plugin.version>2.18.0</versions.plugin.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
@@ -60,7 +59,8 @@ child.project.url.inherit.append.path="false">
         <logback-core.version>1.5.20</logback-core.version>
         <logback-classic.version>1.5.20</logback-classic.version>
         <icu4j.version>77.1</icu4j.version>
-        <mathcat4j.version>0.6.8-1</mathcat4j.version>
+        <mathcat4j.version>1.0.0</mathcat4j.version>
+        <mathcat4j-jni.version>0.7.2-0</mathcat4j-jni.version>
         <jlouis.version>c75db74718cea465f839f7cb5b4bcf716ba3e3e3</jlouis.version>
         <libembosser.version>1.4.3</libembosser.version>
         <jaxbapi.version>4.0.4</jaxbapi.version>
@@ -122,11 +122,21 @@ child.project.url.inherit.append.path="false">
     <dependencies>
         <dependency>
             <groupId>onl.mdw</groupId>
-            <artifactId>mathcat4j-core</artifactId>
+            <artifactId>mathcat4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>onl.mdw</groupId>
-            <artifactId>mathcat4j-core</artifactId>
+            <artifactId>mathcat4j-jni-loader-jna</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>onl.mdw</groupId>
+            <artifactId>mathcat4j-jni</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>onl.mdw</groupId>
+            <artifactId>mathcat4j-jni</artifactId>
             <classifier>rules</classifier>
             <type>zip</type>
             <scope>runtime</scope>
@@ -273,7 +283,7 @@ child.project.url.inherit.append.path="false">
             </dependency>
             <dependency>
                 <groupId>org.graalvm.polyglot</groupId>
-                <artifactId>js-community</artifactId>
+                <artifactId>js</artifactId>
                 <version>${graalvm.version}</version>
                 <type>pom</type>
             </dependency>
@@ -324,26 +334,25 @@ child.project.url.inherit.append.path="false">
             </dependency>
             <dependency>
                 <groupId>onl.mdw</groupId>
-                <artifactId>mathcat4j-core</artifactId>
+                <artifactId>mathcat4j-api</artifactId>
                 <version>${mathcat4j.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-stdlib</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>onl.mdw</groupId>
-                <artifactId>mathcat4j-core</artifactId>
-                <version>${mathcat4j.version}</version>
+                <artifactId>mathcat4j-jni-loader-jna</artifactId>
+                <version>${mathcat4j-jni.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>onl.mdw</groupId>
+                <artifactId>mathcat4j-jni</artifactId>
+                <version>${mathcat4j-jni.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>onl.mdw</groupId>
+                <artifactId>mathcat4j-jni</artifactId>
+                <version>${mathcat4j-jni.version}</version>
                 <classifier>rules</classifier>
                 <type>zip</type>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-stdlib</artifactId>
-                    </exclusion></exclusions>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlinx</groupId>
@@ -478,13 +487,6 @@ child.project.url.inherit.append.path="false">
 
     <build>
         <plugins>
-            <!-- Generate a maven wrapper script, similar to gradle wrapper -->
-            <!-- Regenerate with wrapper:wrapper -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-wrapper-plugin</artifactId>
-                <version>${wrappermavenplugin.version}</version>
-            </plugin>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>

utd/pom.xml

@@ -29,7 +29,7 @@
         <!-- Needed for AsciiMathConverter -->
         <dependency>
             <groupId>org.graalvm.polyglot</groupId>
-            <artifactId>js-community</artifactId>
+            <artifactId>js</artifactId>
             <type>pom</type>
         </dependency>
         <dependency>

utils/src/main/kotlin/org/brailleblaster/utils/braille/MathCATUtils.kt

@@ -16,12 +16,13 @@
 package org.brailleblaster.utils.braille
 
 import onl.mdw.mathcat4j.api.MathCat
-import onl.mdw.mathcat4j.core.mathCAT
+import onl.mdw.mathcat4j.api.MathCatLoader
 import java.util.concurrent.Callable
 import java.util.concurrent.Executors
 
+private val mcManager = MathCatLoader.INSTANCE.mathCatFactory.orElseThrow().create()
 private val mathCATExecutor = Executors.newSingleThreadExecutor().also {
     Runtime.getRuntime().addShutdownHook(Thread(it::shutdown))
 }
 
-fun <T> singleThreadedMathCAT(block: MathCat.() -> T): T = mathCATExecutor.submit(Callable { mathCAT(block) }).get()
+fun <T> singleThreadedMathCAT(block: MathCat.() -> T): T = mathCATExecutor.submit(Callable { mcManager.run { it.block() } }).get()