[MediaWiki-commits] [Gerrit] URL to Mathimage - change (mediawiki...Math)

2014-04-17 Thread Physikerwelt (Code Review)
Physikerwelt has uploaded a new change for review.

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

Change subject: URL to Mathimage
..

URL to Mathimage

A new parameter called 'tex' is introduced to the
specialpage SpecialShowMathImage.
For exammple you can now use
a href=”http://localhost:8080/wiki/Special:MathShowImage?tex=E=mc^2”  /a
to include an SVG-image of the rendering of the input
E=mc^2 wherever you like.

Change-Id: I6a0b310792db04401bd36c0661db862c8b5d34b1
---
M SpecialMathShowImage.php
1 file changed, 26 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/65/126965/1

diff --git a/SpecialMathShowImage.php b/SpecialMathShowImage.php
index 73c8164..8b44197 100644
--- a/SpecialMathShowImage.php
+++ b/SpecialMathShowImage.php
@@ -41,32 +41,37 @@
 
function execute( $par ) {
$request = $this-getRequest();
-   $output = '';
$hash = $request-getText( 'hash', '' );
+   $tex = $request-getText( 'tex', '');
$this-mode = $request-getInt( 'mode', MW_MATH_MATHML );
-   if ( !$hash ) {
+   if ( $hash === ''  $tex === '') {
$this-setHeaders( false );
-   $output = $this-printSvgError( 'No Inputhash 
specified' );
+   echo $this-printSvgError( 'No Inputhash specified' );
} else {
-   switch ( $this-mode ){
-   case MW_MATH_PNG:
-   $this-renderer = MathTexvc::newFromMd5( $hash 
);
-   break;
-   case MW_MATH_LATEXML:
-   $this-renderer = MathLaTeXML::newFromMd5( 
$hash );
-   break;
-   default:
-   $this-renderer = MathMathML::newFromMd5( $hash 
);
-   }
-   $this-noRender = $request-getBool( 'noRender', false 
);
-   if ( $this-noRender ) {
-   $success = $this-renderer-readFromDatabase();
-   } else {
-   if ( $this-mode == MW_MATH_PNG ) {
-   $mmlRenderer = MathMathML::newFromMd5( 
$hash );
-   $mmlRenderer-readFromDatabase();
-   $this-renderer = new 
MathTexvc($mmlRenderer-getUserInputTex());
+   if ( $tex === ''){
+   switch ( $this-mode ){
+   case MW_MATH_PNG:
+   $this-renderer = 
MathTexvc::newFromMd5( $hash );
+   break;
+   case MW_MATH_LATEXML:
+   $this-renderer = 
MathLaTeXML::newFromMd5( $hash );
+   break;
+   default:
+   $this-renderer = 
MathMathML::newFromMd5( $hash );
}
+   $this-noRender = $request-getBool( 
'noRender', false );
+   if ( $this-noRender ) {
+   $success = 
$this-renderer-readFromDatabase();
+   } else {
+   if ( $this-mode == MW_MATH_PNG ) {
+   $mmlRenderer = 
MathMathML::newFromMd5( $hash );
+   
$mmlRenderer-readFromDatabase();
+   $this-renderer = new 
MathTexvc($mmlRenderer-getUserInputTex());
+   }
+   $success = $this-renderer-render();
+   }
+   } else {
+   $this-renderer = MathRenderer::getRenderer( 
$tex , array(), $this-mode);
$success = $this-renderer-render();
}
if ( $success ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a0b310792db04401bd36c0661db862c8b5d34b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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


[MediaWiki-commits] [Gerrit] URL to Mathimage - change (mediawiki...Math)

2014-04-17 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: URL to Mathimage
..


URL to Mathimage

A new parameter called 'tex' is introduced to the
specialpage SpecialShowMathImage.
For exammple you can now use
a href=http://localhost:8080/wiki/Special:MathShowImage?tex=E=mc^2;  /a
to include an SVG-image of the rendering of the input
E=mc^2 wherever you like.

Change-Id: I6a0b310792db04401bd36c0661db862c8b5d34b1
---
M SpecialMathShowImage.php
1 file changed, 26 insertions(+), 21 deletions(-)

Approvals:
  Physikerwelt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SpecialMathShowImage.php b/SpecialMathShowImage.php
index 73c8164..8b44197 100644
--- a/SpecialMathShowImage.php
+++ b/SpecialMathShowImage.php
@@ -41,32 +41,37 @@
 
function execute( $par ) {
$request = $this-getRequest();
-   $output = '';
$hash = $request-getText( 'hash', '' );
+   $tex = $request-getText( 'tex', '');
$this-mode = $request-getInt( 'mode', MW_MATH_MATHML );
-   if ( !$hash ) {
+   if ( $hash === ''  $tex === '') {
$this-setHeaders( false );
-   $output = $this-printSvgError( 'No Inputhash 
specified' );
+   echo $this-printSvgError( 'No Inputhash specified' );
} else {
-   switch ( $this-mode ){
-   case MW_MATH_PNG:
-   $this-renderer = MathTexvc::newFromMd5( $hash 
);
-   break;
-   case MW_MATH_LATEXML:
-   $this-renderer = MathLaTeXML::newFromMd5( 
$hash );
-   break;
-   default:
-   $this-renderer = MathMathML::newFromMd5( $hash 
);
-   }
-   $this-noRender = $request-getBool( 'noRender', false 
);
-   if ( $this-noRender ) {
-   $success = $this-renderer-readFromDatabase();
-   } else {
-   if ( $this-mode == MW_MATH_PNG ) {
-   $mmlRenderer = MathMathML::newFromMd5( 
$hash );
-   $mmlRenderer-readFromDatabase();
-   $this-renderer = new 
MathTexvc($mmlRenderer-getUserInputTex());
+   if ( $tex === ''){
+   switch ( $this-mode ){
+   case MW_MATH_PNG:
+   $this-renderer = 
MathTexvc::newFromMd5( $hash );
+   break;
+   case MW_MATH_LATEXML:
+   $this-renderer = 
MathLaTeXML::newFromMd5( $hash );
+   break;
+   default:
+   $this-renderer = 
MathMathML::newFromMd5( $hash );
}
+   $this-noRender = $request-getBool( 
'noRender', false );
+   if ( $this-noRender ) {
+   $success = 
$this-renderer-readFromDatabase();
+   } else {
+   if ( $this-mode == MW_MATH_PNG ) {
+   $mmlRenderer = 
MathMathML::newFromMd5( $hash );
+   
$mmlRenderer-readFromDatabase();
+   $this-renderer = new 
MathTexvc($mmlRenderer-getUserInputTex());
+   }
+   $success = $this-renderer-render();
+   }
+   } else {
+   $this-renderer = MathRenderer::getRenderer( 
$tex , array(), $this-mode);
$success = $this-renderer-render();
}
if ( $success ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a0b310792db04401bd36c0661db862c8b5d34b1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot 

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