[MediaWiki-commits] [Gerrit] WIP: Display MathML's png - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/284346

Change subject: WIP: Display MathML's png
......................................................................

WIP: Display MathML's png

Change-Id: Ibe11e179409d64a75b3a4aafb9633f192fcf0527
---
M FormulaInfo.php
M MathObject.php
2 files changed, 19 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/46/284346/1

diff --git a/FormulaInfo.php b/FormulaInfo.php
index 7cb7301..1d60833 100644
--- a/FormulaInfo.php
+++ b/FormulaInfo.php
@@ -176,7 +176,7 @@
        }
 
        public static function hasPngSupport( $mode ) {
-               if ( $mode === 'png' ) {
+               if ( $mode === 'png' or $mode === 'mathml' ) {
                        return true;
                } else {
                        return false;
@@ -237,9 +237,19 @@
                        $out->addHtml( "<br />\n" );
                }
                if ( self::hasPngSupport( $mode ) ) {
-                       $out->addWikiText( 'PNG (' . self::getlengh( 
$renderer->getPng() ) . ') :', false );
-                       $out->addHtml( $renderer->getHtmlOutput() );
-                       $out->addHtml( "<br />\n" );
+                       if ( method_exists( $renderer, 'getPng') ) {
+                               $out->addWikiText( 'PNG (' . self::getlengh( 
$renderer->getPng() ) . ') :', false );
+                               $out->addHtml( $renderer->getHtmlOutput() );
+                               $out->addHtml( "<br />\n" );
+                       } else {
+                               $renderer = MathObject::cloneFromRenderer( 
$renderer );
+                               $rbi = $renderer->getRbi();
+                               $pngUrl = preg_replace( '#/svg/#', '/png/', 
$rbi->getFullSvgUrl() );
+                               $png = file_get_contents( $pngUrl );
+                               $out->addWikiText( 'PNG (' . self::getlengh( 
$png) . ') :', false );
+                               $out->addHtml( "<img src='$pngUrl' />" );
+                               $out->addHtml( "<br />\n" );
+                       }
                }
                $renderer->writeCache();
        }
diff --git a/MathObject.php b/MathObject.php
index f4ae818..e19a6bf 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -63,6 +63,7 @@
                $instance->setSvg( $renderer->getSvg() );
                $instance->setMode( $renderer->getMode() );
                $instance->setMathStyle( $renderer->getMathStyle() );
+               $instance->setRestbaseInterface( $renderer->rbi );
                return $instance;
        }
 
@@ -552,4 +553,8 @@
                $fbi = preg_replace( "/height: (.*?)(ex|px|em)/", "height: 
$height", $fbi );
                return $fbi;
        }
+
+       public function getRbi(){
+               return $this->rbi;
+       }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/284346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe11e179409d64a75b3a4aafb9633f192fcf0527
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt <w...@physikerwelt.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits