From ab2016462cb7204f8e5e7fb6e5b9bdf1f4db68c6 Mon Sep 17 00:00:00 2001
From: Jean-Michel Vedrine <vedrine@vedrine.org>
Date: Sat, 8 Nov 2014 20:07:03 +0100
Subject: CONTRIB-5337 Wrong display of the multiply operator

---
 lang/en/qtype_algebra.php | 1 -
 parser.php                | 4 ++--
 version.php               | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lang/en/qtype_algebra.php b/lang/en/qtype_algebra.php
index fefb0b2..7a5729f 100644
--- a/lang/en/qtype_algebra.php
+++ b/lang/en/qtype_algebra.php
@@ -34,7 +34,6 @@ $string['mismatchedopenb'] = 'Mismatched brackets: Open bracket without a close
 $string['missingonearg'] = 'Syntax Error: Operator \'{$a}\' missing its argument';
 $string['missingtwoargs'] = 'Syntax Error: Operator \'{$a}\' requires two arguments';
 $string['morethantwoargs'] = 'Trying to compare a term with more than 2 arguments - no code to handle this case!';
-$string['multiply'] = '\\\\times';
 $string['nargswrong'] = 'Incorrect number of arguments for the term \'{$a}\'';
 $string['noevaluate'] = 'The evaluate method for term \'{$a}\' has not been implemented';
 $string['notopterm'] = 'Syntax Error: Unable to condense to a single, top level operator';
diff --git a/parser.php b/parser.php
index 451fe3b..6a81fe6 100644
--- a/parser.php
+++ b/parser.php
@@ -491,7 +491,7 @@ class qtype_algebra_parser_number extends qtype_algebra_parser_term {
             $this->_base=$m[1];
             $this->_exp=$m[2];
             $eformats=array('str' => '%sE%s',
-                            'tex' => '%s '.get_string('multiply','qtype_algebra').' 10^{%s}');
+                            'tex' => '%s \\times 10^{%s}');
             parent::qtype_algebra_parser_term(self::NARGS,$eformats,$text);
         } else {
             $this->_base=$text;
@@ -865,7 +865,7 @@ class qtype_algebra_parser_multiply extends qtype_algebra_parser_term {
      */
     function qtype_algebra_parser_multiply($text) {
         $this->mformats=array('*' =>  array('str' => '%s*%s',
-                                            'tex' => '%s '.get_string('multiply','qtype_algebra').' %s'),
+                                            'tex' => '%s \\times %s'),
                               '.' =>  array('str' => '%s %s',
                                             'tex' => '%s %s',
                                             'sage'=> '%s*%s')
diff --git a/version.php b/version.php
index e5ccc83..2f734d9 100644
--- a/version.php
+++ b/version.php
@@ -23,8 +23,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'qtype_algebra';
-$plugin->version   = 2014092700;
+$plugin->version   = 2014110800;
 
 $plugin->requires  = 2013050100;
-$plugin->release   = '1.32 for Moodle 2.5, 2.6 and 2.7';
+$plugin->release   = '1.33 for Moodle 2.5, 2.6 and 2.7';
 $plugin->maturity  = MATURITY_STABLE;
-- 
cgit v1.2.3