golem
/
Math
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Improve PNG fallback"

This commit is contained in:
Frédéric Wang 2014-08-01 14:14:44 +00:00 committed by Gerrit Code Review
parent 6cb52f9190 27ce24e736
commit 57facce780
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MathMathML.php
View File

@ -466,4 +466,14 @@ class MathMathML extends MathRenderer {
}
return $out;
}
protected function initializeFromDatabaseRow( $rpage ) {
// mathoid allows different input formats
// therefore the column name math_inputtex was changed to math_input
if ( $this->getMathTableName() == 'mathoid' && ! empty( $rpage->math_input ) ) {
$this->userInputTex = $rpage->math_input;
}
parent::initializeFromDatabaseRow( $rpage );
}
}

19
SpecialMathShowImage.php
View File

@ -59,13 +59,17 @@ class SpecialMathShowImage extends SpecialPage {
$this->renderer = MathMathML::newFromMd5( $hash );
}
$this->noRender = $request->getBool( 'noRender', false );
if ( $this->noRender ) {
$success = $this->renderer->readFromDatabase();
$isInDatabase = $this->renderer->readFromDatabase();
if ( $isInDatabase || $this->noRender ) {
$success = $isInDatabase;
} else {
if ( $this->mode == MW_MATH_PNG ) {
// get the texvc input from the mathoid database table
// and render the conventional way
$mmlRenderer = MathMathML::newFromMd5( $hash );
$mmlRenderer->readFromDatabase();
$this->renderer = new MathTexvc( $mmlRenderer->getUserInputTex() );
$this->renderer = MathRenderer::getRenderer( $mmlRenderer->getUserInputTex(), array(), MW_MATH_PNG );
$this->renderer->setMathStyle( $mmlRenderer->getMathStyle() );
}
$success = $this->renderer->render();
}
@ -78,6 +82,11 @@ class SpecialMathShowImage extends SpecialPage {
}
if ( $success ) {
if ( $this->mode == MW_MATH_PNG ) {
// Workaround for bugfix for Bug 56769
if ( !isset( $wgHooks['ParserAfterParse']['FlushMathBackend'] ) ) {
// saves the PNG-file
wfRunHooks('ParserAfterParse');
}
$output = $this->renderer->getPng();
} else {
$output = $this->renderer->getSvg();
@ -92,7 +101,9 @@ class SpecialMathShowImage extends SpecialPage {
}
$this->setHeaders( $success );
echo $output;
$this->renderer->writeCache();
if ( $success ){
$this->renderer->writeCache();
}
}
}