JMEPart.getCorrectAnswer runs expandJuxtapositions

Author: christianp

runtime/scripts/jme-display.js

@@ -174,7 +174,7 @@ jme.display = /** @lends Numbas.jme.display */ {
             }
             if(tree.args) {
                 var args = tree.args.map(replace_subvars);
-                return {tok: tree.tok, args: args};
+                return {tok: tree.tok, args: args, bracketed: tree.bracketed};
             }
             return tree;
         }

runtime/scripts/parts/jme.js

@@ -285,6 +285,16 @@ JMEPart.prototype = /** @lends Numbas.JMEPart.prototype */
         var settings = this.settings;
         var answerSimplification = Numbas.jme.collectRuleset(settings.answerSimplificationString,scope.allRulesets());
         var tree = jme.display.subvars(settings.correctAnswerString, scope);
+        tree = scope.expandJuxtapositions(
+            tree, 
+            {
+                singleLetterVariables: settings.singleLetterVariables,
+                noUnknownFunctions: !settings.allowUnknownFunctions,
+                implicitFunctionComposition: settings.implicitFunctionComposition,
+                normaliseSubscripts: true
+            }
+        );
+
         if(!tree && this.marks>0) {
             this.error('part.jme.answer missing');
         }

tests/jme-runtime.js

@@ -17614,7 +17614,7 @@ jme.display = /** @lends Numbas.jme.display */ {
             }
             if(tree.args) {
                 var args = tree.args.map(replace_subvars);
-                return {tok: tree.tok, args: args};
+                return {tok: tree.tok, args: args, bracketed: tree.bracketed};
             }
             return tree;
         }

tests/numbas-runtime.js

@@ -16950,7 +16950,7 @@ jme.display = /** @lends Numbas.jme.display */ {
             }
             if(tree.args) {
                 var args = tree.args.map(replace_subvars);
-                return {tok: tree.tok, args: args};
+                return {tok: tree.tok, args: args, bracketed: tree.bracketed};
             }
             return tree;
         }
@@ -21514,6 +21514,7 @@ if(res) { \
         this.stagedAnswer = answer;
         this.setDirty(true);
         this.removeWarnings();
+        this.display && this.display.showWarnings();
 
         if(!dontStore) {
             if(!this.question || !this.question.exam || !this.question.exam.loading) {
@@ -23224,9 +23225,7 @@ Question.prototype = /** @lends Numbas.Question.prototype */
         tryGetAttribute(q.variablesTest,q.xml,'variables',['condition','maxRuns'],[]);
         q.signals.trigger('variableDefinitionsLoaded');
         q.signals.on('variablesGenerated',function() {
-            var doc = Sarissa.getDomDocument();
-            doc.appendChild(q.originalXML.cloneNode(true));    //get a fresh copy of the original XML, to sub variables into
-            q.xml = doc.selectSingleNode('question');
+            q.xml = q.originalXML.cloneNode(true);    //get a fresh copy of the original XML, to sub variables into
             q.xml.setAttribute('number',q.number);
         });
         q.signals.on(['variablesGenerated', 'rulesetsMade'], function() {
@@ -26282,6 +26281,9 @@ Numbas.queueScript('diagnostic',['util','jme','localisation','jme-variables'], f
                     topic[x[0]] = x[1];
                 });
                 var group = dc.exam.question_groups.find(function(g) { return g.settings.name==topic_name; })
+                if(!group) {
+                    return;
+                }
                 topic.questions = [];
                 for(var i=0;i<group.numQuestions;i++) {
                     topic.questions.push({
@@ -26826,6 +26828,17 @@ Numbas.queueScript('marking',['util', 'jme','localisation','jme-variables','math
             } else {
                 var part_result = part.mark_answer(answer, part.getScope());
             }
+            if(part_result.waiting_for_pre_submit) {
+                return jme.wrapValue({
+                    marks: part.availableMarks(),
+                    credit: 0,
+                    feedback: [],
+                    valid: false,
+                    states: {},
+                    state_valid: {},
+                    values: {}
+                });
+            }
             var result = marking.finalise_state(part_result.states.mark);
             return jme.wrapValue({
                 marks: part.availableMarks(),
@@ -27323,7 +27336,7 @@ Copyright 2011-14 Newcastle University
 */
 /** @file Start the exam */
 // 'base' gives the third-party libraries on which Numbas depends
-Numbas.queueScript('base',['jquery','localisation','seedrandom','knockout','sarissa'],function() {
+Numbas.queueScript('base',['jquery','localisation','seedrandom','knockout'],function() {
 });
 Numbas.queueScript('start-exam',['base','util', 'exam','settings'],function() {
     for(var name in Numbas.custom_part_types) {
@@ -28979,7 +28992,7 @@ storage.init();
 });
 
 /*
-Copyright 2011-14 Newcastle University
+Copyright 2011-25 Newcastle University
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
@@ -29014,6 +29027,68 @@ Numbas.queueScript('xml',['base','jme'],function() {
  * @type {Object<XMLDocument>}
  */
 
+
+/**
+* Extends the XMLDocument to emulate IE's selectNodes.
+*
+* @param {string} xpath_selector - The XPath expression to use.
+* @param {Node} contextNode - The top node to match against.
+* @returns {Array.<Node>} - The nodes matching the XPath expression.
+*/
+XMLDocument.prototype.selectNodes = function(xpath_selector, contextNode){
+    var oResult = this.evaluate(
+        xpath_selector,
+        contextNode || this,
+        this.documentElement,
+        XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, 
+        null
+    );
+    var nodeList = new Array(oResult.snapshotLength);
+    for(var i=0; i<nodeList.length; i++){
+        nodeList[i] = oResult.snapshotItem(i);
+    }
+    return nodeList;
+}
+
+/**
+* Extends the XMLDocument to emulate IE's `selectSingleNode`.
+*
+* @param {string} xpath_selector - The XPath expression to use.
+* @param {Node} contextNode - this is for internal use only by the same method when called on Elements.
+* @returns {Node} - The first node matching the XPath expression.
+*/
+XMLDocument.prototype.selectSingleNode = function(xpath_selector, contextNode) {
+    return this.evaluate(
+        xpath_selector,
+        contextNode || this,
+        this.documentElement,
+        XPathResult.FIRST_ORDERED_NODE_TYPE, 
+        null
+    ).singleNodeValue;
+};
+
+
+/**
+* Extends the Element to emulate IE's selectNodes.
+* @param {string} xpath_selector - The XPath expression to use.
+* @returns {Array.<Node>} - The result of the XPath search.
+*/
+Element.prototype.selectNodes = function(xpath_selector){
+    return this.ownerDocument.selectNodes(xpath_selector, this);
+};
+
+
+/**
+* Extends the Element to emulate IE's `selectSingleNode`.
+*
+* @param {string} xpath_selector - The XPath expression to use.
+* @returns {Node} - The first node matching the XPath expression.
+*/
+Element.prototype.selectSingleNode = function(xpath_selector){
+    return this.ownerDocument.selectSingleNode(xpath_selector, this);
+};
+
+
 /** @namespace Numbas.xml */
 var xml = Numbas.xml = {
     /** DOM parser to use to parse XML.
@@ -29040,14 +29115,13 @@ var xml = Numbas.xml = {
     loadXML: function(xmlstring)
     {
         //parse the XML document
-        var doc = xml.dp.parseFromString(xmlstring,'text/xml');
+        const parser = new DOMParser();
+        var doc = parser.parseFromString(xmlstring,'text/xml');
         //check for errors
-        if(Sarissa.getParseErrorText(doc) != Sarissa.PARSED_OK)
-        {
-            throw(new Numbas.Error('xml.could not load',{message: Numbas.util.escapeHTML(Sarissa.getParseErrorText(doc))}));
+        const errorNode = doc.querySelector("parsererror");
+        if (errorNode) {
+            throw(new Numbas.Error('xml.could not load',{message: Numbas.util.escapeHTML(errorNode.textContent)}));
         }
-        //allow XPath to be used to select nodes
-        doc.setProperty('SelectionLanguage','XPath');
         //convert all the attribute names to lower case
         var es = doc.selectNodes('descendant::*');
         for(var i=0; i<es.length; i++)
@@ -29255,33 +29329,26 @@ var xml = Numbas.xml = {
             $(this).replaceWith(localString);
         });
         return template;
-     },
-     /** Transform an XML node using the given XSL template, returning a string representation of the transformed XML.
-      *
-      * @param {Element} template
-      * @param {Element} xml
-      * @returns {string}
-      */
-     transform: function(template,xml) {
-         /** Is the browser Internet Explorer?
-          *
-          * @returns {boolean}
-          */
-         function isIE() {
-             var ua = window.navigator.userAgent; //Check the userAgent property of the window.navigator object
-             var msie = ua.indexOf('MSIE '); // IE 10 or older
-             var trident = ua.indexOf('Trident/'); //IE 11
- 
-             return (msie > 0 || trident > 0);
-         }
-         var r;
-         if(!isIE()) {
-             r = $.xsl.transform(template,xml);
-         } else {
-             var s = xml.transformNode(template);
-             r = {string: s, error: ''};
-         }
-         return r.string;
+    },
+    /** Transform an XML node using the given XSL template, returning a string representation of the transformed XML.
+     *
+     * @param {Element} template
+     * @param {Element} xml
+     * @returns {string}
+     */
+    transform: function(template,xml) {
+        const container = xml.ownerDocument.createElement('container');
+        xml = xml.cloneNode(true);
+        container.append(xml);
+
+        const processor = new XSLTProcessor();
+        processor.importStylesheet(template);
+        const doc = processor.transformToDocument(container);
+        const serializer = new XMLSerializer();
+
+        const string = serializer.serializeToString(doc);
+
+        return string;
     },
     /** Is the given node empty? True if it has no children.
      *
@@ -32728,6 +32795,16 @@ JMEPart.prototype = /** @lends Numbas.JMEPart.prototype */
         var settings = this.settings;
         var answerSimplification = Numbas.jme.collectRuleset(settings.answerSimplificationString,scope.allRulesets());
         var tree = jme.display.subvars(settings.correctAnswerString, scope);
+        tree = scope.expandJuxtapositions(
+            tree, 
+            {
+                singleLetterVariables: settings.singleLetterVariables,
+                noUnknownFunctions: !settings.allowUnknownFunctions,
+                implicitFunctionComposition: settings.implicitFunctionComposition,
+                normaliseSubscripts: true
+            }
+        );
+
         if(!tree && this.marks>0) {
             this.error('part.jme.answer missing');
         }

tests/parts/part-tests.mjs

@@ -532,6 +532,11 @@ Numbas.queueScript('part_tests',['qunit','json','jme','localisation','parts/numb
         assert.equal(res.credit,1,'"1620000" correct');
     });
 
+    QUnit.test('Expand juxtapositions in the correct answer', async function(assert) {
+        var p = createPartFromJSON({type:'jme', answer: '(alpha(x))^2', allowUnknownFunctions: false});
+        assert.equal(p.getCorrectAnswer(p.getScope()), '(alpha*x)^2');
+    });
+
     QUnit.module('Pattern match');
     QUnit.test('Answer is "hi+"', async function(assert) {
         var p = createPartFromJSON({type:'patternmatch', answer: 'hi+', displayAnswer: 'hi'});