AutoLoad Math.php

diff --git a/includes/Math.php b/includes/Math.php
index e40abdf..1bf68b2 100644 (file)
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -249,14 +249,11 @@ class MathRenderer {
                return $path;
        }
 
-
-}
-
-function renderMath( $tex ) {
-       global $wgUser;
-       $math = new MathRenderer( $tex );
-       $math->setOutputMode( $wgUser->getOption('math'));
-       return $math->render();
+       function renderMath( $tex ) {
+               global $wgUser;
+               $math = new MathRenderer( $tex );
+               $math->setOutputMode( $wgUser->getOption('math'));
+               return $math->render();
+       }
 }
-
 ?>

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c155d38..e78c072 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -5,9 +5,6 @@ if ( ! defined( 'MEDIAWIKI' ) )
  * @package MediaWiki
  */
 
-if ( $wgUseTeX )
-       require_once 'Math.php';
-
 /**
  * @todo document
  * @package MediaWiki

diff --git a/includes/Parser.php b/includes/Parser.php
index f141df2..0c0d5ac 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -462,7 +462,7 @@ class Parser
                                        $output = wfEscapeHTMLTagsOnly( $content );
                                        break;
                                case 'math':
-                                       $output = renderMath( $content );
+                                       $output = MathRenderer::renderMath( $content );
                                        break;
                                case 'pre':
                                        // Backwards-compatibility hack

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index e8dfb8f..167956e 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -243,8 +243,6 @@ class ParserTest {
 
                if (preg_match('/\\bmath\\b/i', $opts)) {
                        # XXX this should probably be done by the ParserOptions
-                       require_once('Math.php');
-
                        $options->setUseTex(true);
                }