Merge branch 'iss1748' of https://github.com/maths/moodle-qtype_stack into iss1748

EJMFarrow · EJMFarrow · commit ba1e710866f9 · 2026-05-18T17:16:14.000+01:00
diff --git a/doc/en/Authoring/Inputs/Input_options.md b/doc/en/Authoring/Inputs/Input_options.md
@@ -29,12 +29,12 @@ min/max sf/dp     |  .  |  Y  |  Y    |   .    |   .    |   .   |   .   |   .  |
 `consolidatesubscripts` |  Y  |  .  |  Y    |   Y    |   Y    |   .   |   .   |   .  |  .  |    .     |   .   |   .    |   .   |   .
 `negpow`        |  .  |  .  |  Y    |   .    |   .    |   .   |   .   |   .  |  .  |    .     |   .   |   .    |   .   |   .
 `simp`            |  Y  |  Y  |  Y    |   Y    |   Y    |   .   |   .   |   .  |  .  |    Y     |   .   |   .    |   .   |   .
-`align`        |  Y  |  Y  |  Y    |   .    |   .    |   .   |   .   |   .  |  .  |    .     |   .   |   .    |   .   |   .
+`align`        |  Y  |  Y  |  Y    |   .    |   .    |   .   |   .   |   .  |  .  |    Y     |   Y   |   .    |   .   |   Y
 `nounits`      |  Y  |  Y  |  Y    |   Y    |   Y    |   Y   |   Y   |   Y  |  .  |    .     |   Y   |   .    |   .   |   .
 `checkvars`    |  Y  |  .  |  .    |   Y    |   Y    |   .   |   .   |   .  |  .  |    .     |   Y   |   .    |   .   |   .
 `validator`    |  Y  |  Y  |  Y    |   Y    |   Y    |   .   |   .   |   .  |  .  |    .     |   .   |   Y    |   .   |   Y
 `feedback`     |  Y  |  .  |  Y    |   Y    |   Y    |   .   |   .   |   .  |  .  |    .     |   .   |   .    |   .   |   .
-`monospace`    |  Y  |  Y  |  Y    |   .    |   Y    |   .   |   .   |   .  |  .  |    .     |   .   |   .    |   .   |   .
+`monospace`    |  Y  |  Y  |  Y    |   .    |   Y    |   .   |   .   |   .  |  .  |    Y     |   Y   |   .    |   .   |   Y
 `manualgraded` |  Y  |  Y  |  Y    |   Y    |   Y    |   .   |   .   |   .  |  .  |    Y     |   Y   |   Y    |   Y   |   Y
 
 For documentation about the various options not documented on this page look at the pages for the specific inputs in which each option is used.
@@ -149,7 +149,7 @@ Writing bespoke validators is an advanced feature, but offers two significant be
 
 ### Extra option: monospace ###
 
-This option is available for algebraic, numerical, units and varmatrix inputs. It controls if the student's answer is displayed using monospace font. `monospace` and `monospace:true` will force the input to use monospace. `monospace:false` will force proportional font.
+This option is available for many inputs, including algebraic, numerical, units, varmatrix, textare, equiv and freetext. It controls if the student's answer is displayed using monospace font. `monospace` and `monospace:true` will force the input to use monospace. `monospace:false` will force proportional font.
 
 If `monospace` is not specified, then the CURRENT system default for the given input type will be used when the question is displayed. 
 
diff --git a/doc/en/Developer/Development_track.md b/doc/en/Developer/Development_track.md
@@ -14,6 +14,7 @@ Issues with [github milestone 4.13.0](https://github.com/maths/moodle-qtype_stac
 3. Question tests can now test the whole route through a PRT, rather than just the final node.  This is a significant improvement on the ability to test questions.  This is back-compatible with older questions.
 4. Add in a new "free-text" input to allow student to input typed free-text proof.
 5. Allow most input types to use the extra option 'manualgraded'.
+6. Expand the use of "align" and "monospace" input options to textarea and equiv inputs.
 
 ## Better testing
 
diff --git a/mobile.css b/mobile.css
@@ -1101,6 +1101,7 @@ table.HELM_table th:last-child {
 .que.stack .equivinput,
 .que.stack .varmatrixinput,
 .que.stack .matrixtable,
+.que.stack .freetextinput,
 /* Question authoring form */
 #page-question-type-stack textarea#id_questionvariables,
 #page-question-type-stack input#id_variantsselectionseed,
diff --git a/samplequestions/stacklibrary/Features/input-type-sample-questions/Free-text_final_answer.xml b/samplequestions/stacklibrary/Features/input-type-sample-questions/Free-text_final_answer.xml
@@ -55,7 +55,7 @@ ta2:4*sqrt(2*x^2+1)+1;
       <text>{@ta1@}</text>
     </questionnote>
     <questiondescription format="html">
-      <text>[[todo]]Link ans2 automatically from the free-text input[[/todo]]</text>
+      <text></text>
     </questiondescription>
     <questionsimplify>1</questionsimplify>
     <assumepositive>0</assumepositive>
@@ -95,7 +95,7 @@ ta2:4*sqrt(2*x^2+1)+1;
       <checkanswertype>0</checkanswertype>
       <mustverify>0</mustverify>
       <showvalidation>0</showvalidation>
-      <options></options>
+      <options>monospace:true</options>
     </input>
     <input>
       <name>ans2</name>
diff --git a/samplequestions/stacklibrary/Features/input-type-sample-questions/Free-text_input.xml b/samplequestions/stacklibrary/Features/input-type-sample-questions/Free-text_input.xml
@@ -85,7 +85,7 @@ The teacher's answer contains newline white space, ASCIImath, LaTeX, unicode etc
       <checkanswertype>0</checkanswertype>
       <mustverify>1</mustverify>
       <showvalidation>1</showvalidation>
-      <options>manualgraded:true</options>
+      <options>monospace:true</options>
     </input>
     <prt>
       <name>prt1</name>
diff --git a/stack/input/equiv/equiv.class.php b/stack/input/equiv/equiv.class.php
@@ -54,6 +54,8 @@ class stack_equiv_input extends stack_input {
         'calculus' => false,
         'consolidatesubscripts' => false,
         'checkvars' => 0,
+        'align' => 'left',
+        'monospace' => false,
         'manualgraded' => false,
     ];
 
@@ -111,6 +113,13 @@ public function render(stack_input_state $state, $fieldname, $readonly, $tavalue
             'autocapitalize' => 'none',
             'spellcheck'     => 'false',
         ];
+        if ($this->extraoptions['align'] === 'right') {
+            $attributes['class'] .= ' algebraic-right';
+        }
+        if ($this->extraoptions['monospace']) {
+            $attributes['class'] .= ' input-monospace';
+        }
+
         if ($placeholder) {
             $attributes['placeholder'] = $placeholder;
         }
diff --git a/stack/input/freetext/freetext.class.php b/stack/input/freetext/freetext.class.php
@@ -33,6 +33,8 @@ class stack_freetext_input extends stack_string_input {
         'hideanswer' => false,
         'allowempty' => false,
         'validator' => false,
+        'align' => 'left',
+        'monospace' => false,
         'manualgraded' => true,
     ];
 
@@ -67,11 +69,18 @@ public function render(stack_input_state $state, $fieldname, $readonly, $tavalue
         // Note that at the moment, $this->boxHeight and $this->boxWidth are only
         // used as minimums. If the current input is bigger, the box is expanded.
         $attributes = [
+            'class'          => 'freetextinput',
             'name'           => $fieldname,
             'id'             => $fieldname,
             'autocapitalize' => 'none',
             'spellcheck'     => 'false',
         ];
+        if ($this->extraoptions['align'] === 'right') {
+            $attributes['class'] .= ' algebraic-right';
+        }
+        if ($this->extraoptions['monospace']) {
+            $attributes['class'] .= ' input-monospace';
+        }
 
         $value = stack_utils::maxima_string_to_php_string($this->contents_to_maxima($state->contents));
         if ($this->is_blank_response($state->contents)) {
@@ -83,7 +92,7 @@ public function render(stack_input_state $state, $fieldname, $readonly, $tavalue
         }
 
         // TODO: sort out size of text area.
-        $attributes['rows'] = 3;
+        $attributes['rows'] = 5;
         $attributes['cols'] = $this->parameters['boxWidth'];
 
         if ($readonly) {
diff --git a/stack/input/textarea/textarea.class.php b/stack/input/textarea/textarea.class.php
@@ -35,6 +35,8 @@ class stack_textarea_input extends stack_input {
         'nounits' => true,
         'simp' => false,
         'consolidatesubscripts' => false,
+        'align' => 'left',
+        'monospace' => false,
         'manualgraded' => false,
     ];
 
@@ -54,6 +56,12 @@ public function render(stack_input_state $state, $fieldname, $readonly, $tavalue
             'spellcheck'     => 'false',
             'class'     => 'maxima-list',
         ];
+        if ($this->extraoptions['align'] === 'right') {
+            $attributes['class'] .= ' algebraic-right';
+        }
+        if ($this->extraoptions['monospace']) {
+            $attributes['class'] .= ' input-monospace';
+        }
 
         if ($this->is_blank_response($state->contents)) {
             $current = $this->maxima_to_raw_input($this->parameters['syntaxHint']);
diff --git a/stack/options.class.php b/stack/options.class.php
@@ -386,6 +386,9 @@ public static function get_monospace_options() {
             '1' => get_string('inputtypenumerical', 'qtype_stack'),
             '2' => get_string('inputtypeunits', 'qtype_stack'),
             '3' => get_string('inputtypevarmatrix', 'qtype_stack'),
+            '4' => get_string('inputtypetextarea', 'qtype_stack'),
+            '5' => get_string('inputtypeequiv', 'qtype_stack'),
+            '6' => get_string('inputtypefreetext', 'qtype_stack'),
         ];
     }
 
@@ -405,6 +408,9 @@ public static function is_monospace($class) {
             '1' => 'numerical',
             '2' => 'units',
             '3' => 'varmatrix',
+            '4' => 'textarea',
+            '5' => 'equiv',
+            '6' => 'freetext',
         ];
         $optionkey = array_search(explode('_', $class)[1], $options);
         if ($optionkey === false) {
diff --git a/stack/prt.evaluatable.class.php b/stack/prt.evaluatable.class.php
@@ -273,7 +273,7 @@ public function get_answernotes($atnotes = true) {
         $i = 0;
         foreach ($path as $atresult) {
             if ($atnotes) {
-                // Some answer test notes are non-empty whitespace string, e.g. "    ";
+                // Some answer test notes are a non-empty whitespace string, e.g. "    ".
                 $note = trim($atresult[2]);
                 // Strip off "" and trim.
                 $note = trim(substr($note, 1, strlen($note) - 2));
diff --git a/styles.css b/styles.css
@@ -1102,6 +1102,7 @@ table.HELM_table th:last-child {
 .que.stack .equivinput,
 .que.stack .varmatrixinput,
 .que.stack .matrixtable,
+.que.stack .freetextinput,
 /* Question authoring form */
 #page-question-type-stack textarea#id_questionvariables,
 #page-question-type-stack input#id_variantsselectionseed,
diff --git a/tests/input_equiv_test.php b/tests/input_equiv_test.php
@@ -148,6 +148,22 @@ public function test_render_hint(): void {
         );
     }
 
+    public function test_render_monospace(): void {
+        $el = stack_input_factory::make('equiv', 'ans1', '[]');
+        $el->set_parameter('options', 'monospace:true');
+        $this->assertEquals(
+            '<textarea class="equivinput input-monospace" name="stack1__ans1" id="stack1__ans1" rows="3" cols="25" ' .
+            'autocapitalize="none" spellcheck="false" data-stack-input-type="equiv" ' .
+            'data-stack-input-decimal-separator="." data-stack-input-list-separator=","></textarea>',
+            $el->render(
+                new stack_input_state(stack_input::VALID, [], '', '', '', '', ''),
+                'stack1__ans1',
+                false,
+                '[x^2=4,x=2 or x=-2]'
+                )
+            );
+    }
+
     public function test_validate_student_response_1(): void {
 
         $options = new stack_options();
diff --git a/tests/input_freetext_test.php b/tests/input_freetext_test.php
@@ -46,8 +46,8 @@ public function test_render_blank(): void {
 
         $el = stack_input_factory::make('freetext', 'ans1', 'x^2');
         $this->assertEquals(
-            '<textarea name="stack1__ans1" id="stack1__ans1" autocapitalize="none" ' .
-            'spellcheck="false" rows="3" cols="80" data-stack-input-type="freetext">' .
+            '<textarea class="freetextinput" name="stack1__ans1" id="stack1__ans1" autocapitalize="none" ' .
+            'spellcheck="false" rows="5" cols="80" data-stack-input-type="freetext">' .
             '</textarea><div class="clearfix"></div>',
             $el->render(
                 new stack_input_state(stack_input::VALID, [], '', '', '', '', ''),
@@ -62,8 +62,8 @@ public function test_render_hello_world(): void {
 
         $el = stack_input_factory::make('freetext', 'ans1', '"Hello world"');
         $this->assertEquals(
-            '<textarea name="stack1__ans1" id="stack1__ans1" autocapitalize="none" ' .
-            'spellcheck="false" rows="3" cols="80" data-stack-input-type="freetext">' .
+            '<textarea class="freetextinput" name="stack1__ans1" id="stack1__ans1" autocapitalize="none" ' .
+            'spellcheck="false" rows="5" cols="80" data-stack-input-type="freetext">' .
             '000</textarea><div class="clearfix"></div>',
             $el->render(
                 new stack_input_state(stack_input::VALID, ['000'], '', '', '', '', ''),
@@ -78,6 +78,22 @@ public function test_render_hello_world(): void {
         );
     }
 
+    public function test_render_monospace(): void {
+        $el = stack_input_factory::make('freetext', 'ans1', '"Hello world"');
+        $el->set_parameter('options', 'monospace:true');
+        $this->assertEquals(
+            '<textarea class="freetextinput input-monospace" name="stack1__ans1" id="stack1__ans1" autocapitalize="none" ' .
+            'spellcheck="false" rows="5" cols="80" data-stack-input-type="freetext">' .
+            '000</textarea><div class="clearfix"></div>',
+            $el->render(
+                new stack_input_state(stack_input::VALID, ['000'], '', '', '', '', ''),
+                'stack1__ans1',
+                false,
+                null
+                )
+            );
+    }
+
     public function test_validate_string_input(): void {
 
         $options = new stack_options();
diff --git a/tests/input_textarea_test.php b/tests/input_textarea_test.php
@@ -145,6 +145,23 @@ public function test_render_disabled(): void {
         );
     }
 
+    public function test_render_monospace(): void {
+        $el = stack_input_factory::make('textArea', 'ans1', '[]');
+        $el->set_parameter('options', 'monospace:true');
+        $this->assertEquals(
+            '<textarea name="stack1__ans1" id="stack1__ans1" autocapitalize="none" spellcheck="false" ' .
+            'class="maxima-list input-monospace" ' .
+            'rows="5" cols="20" data-stack-input-type="textarea" data-stack-input-decimal-separator="." ' .
+            'data-stack-input-list-separator=","></textarea>',
+            $el->render(
+                new stack_input_state(stack_input::VALID, [], '', '', '', '', ''),
+                'stack1__ans1',
+                false,
+                null
+                )
+            );
+    }
+
     public function test_maxima_to_response_array_1(): void {
 
         $el = stack_input_factory::make('textArea', 'input', '[x=1,x=2]');
