jenkins-bot has submitted this change and it was merged.
Change subject: Merge master to debug
......................................................................
Merge master to debug
Change-Id: Ieb4776469841fd428f885917d1b98c2b4e823b4b
---
M MathLaTeXML.php
M MathMathML.php
M MathRenderer.php
3 files changed, 22 insertions(+), 10 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathLaTeXML.php b/MathLaTeXML.php
index e8eaa62..318d652 100644
--- a/MathLaTeXML.php
+++ b/MathLaTeXML.php
@@ -182,7 +182,7 @@
* No cache is used.
* @return boolean
*/
- public function calulateSvg() {
+ public function calculateSvg() {
$renderer = new MathMathML( $this->getTex() );
$renderer->setMathml( $this->getMathml() );
$renderer->setMode( MW_MATH_LATEXML );
@@ -196,16 +196,22 @@
return $res;
}
+
/**
* Gets the SVG image
- * Lazy evaluation: If no SVG image exists it's generated on the fly
+ *
+ * @param string $render if set to 'render' (default) and no SVG image
exists, the function
+ * tries to generate it on the fly.
+ * Otherwise, if set to 'cached', and there is no
SVG in the database
+ * cache, an empty string is returned.
+ *
* @return string XML-Document of the rendered SVG
*/
- public function getSvg( $render = true ) {
- if ( $render && ( $this->isPurge() || $this->svg == '' ) ) {
- $this->calulateSvg();
+ public function getSvg( $render = 'render' ) {
+ if ( $render == 'render' && ( $this->isPurge() || $this->svg ==
'' ) ) {
+ $this->calculateSvg();
}
- return $this->svg;
+ return parent::getSvg( $render );
}
protected function getMathTableName() {
diff --git a/MathMathML.php b/MathMathML.php
index 03bdd05..c32e796 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -214,8 +214,8 @@
// default preserve the (broken) layout as it
was
$out = 'type=inline-TeX&q=' .rawurlencode(
'{\\displaystyle ' . $input . '}' );
} else {
- $out = 'type=tex&q=' . rawurlencode( $input );
- }
+ $out = 'type=tex&q=' . rawurlencode( $input );
+ }
}
wfDebugLog( 'Math', 'Get post data: ' . $out );
return $out;
diff --git a/MathRenderer.php b/MathRenderer.php
index fbab530..2654298 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -675,10 +675,16 @@
}
/**
+ * Gets the SVG image
*
- * @return type
+ * @param string $render if set to 'render' (default) and no SVG image
exists, the function
+ * tries to generate it on the fly.
+ * Otherwise, if set to 'cached', and there is no
SVG in the database
+ * cache, an empty string is returned.
+ *
+ * @return string XML-Document of the rendered SVG
*/
- public function getSvg() {
+ public function getSvg( $render = 'render' ) {
// Spaces will prevent the image from being displayed correctly
in the browser
return trim( $this->svg );
}
--
To view, visit https://gerrit.wikimedia.org/r/189437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb4776469841fd428f885917d1b98c2b4e823b4b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: debug
Gerrit-Owner: Physikerwelt <[email protected]>
Gerrit-Reviewer: Physikerwelt <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
