Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configurable location of texvc; detect failure to produce PNG output when

Browse source 
texvc returns otherwise correctly; clean up whitespace.
This commit is contained in:
Brion Vibber 2004-01-11 23:14:20 +00:00
parent aefd27cc23
commit 08395634fa
3 changed files with 47 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/DefaultSettings.php
View file

@ -132,7 +132,13 @@ $wgDisableCookieCheck = false;
$wgAllowExternalImages = true;
$wgMiserMode = false; # Disable database-intensive features
# To use inline TeX, you need to compile 'texvc' (in the 'math' subdirectory
# of the MediaWiki package and have latex, dvips, gs (ghostscript), and
# convert (ImageMagick) installed and available in the PATH.
# Please see math/README for more information.
$wgUseTeX = false;
$wgTexvc = "./math/texvc"; # Location of the texvc binary
# Profiling / debugging
$wgProfiling = false; # Enable for more detailed by-function times in debug log

64
includes/Math.php
View file

@ -8,42 +8,52 @@ function linkToMathImage ( $tex, $outputhash )
function renderMath( $tex )
{
global $wgUser, $wgMathDirectory, $wgTmpDirectory, $wgInputEncoding;
$mf = wfMsg( "math_failure" );
$munk = wfMsg( "math_unknown_error" );
global $wgUser, $wgMathDirectory, $wgTmpDirectory, $wgInputEncoding;
global $wgTexvc;
$mf = wfMsg( "math_failure" );
$munk = wfMsg( "math_unknown_error" );
$fname = "renderMath";
$fname = "renderMath";
$math = $wgUser->getOption("math");
if ($math == 3)
return ('$ '.wfEscapeHTML($tex).' $');
$math = $wgUser->getOption("math");
if( $math == 3 ) {
return ('$ '.wfEscapeHTML($tex).' $');
}
$md5 = md5($tex);
$md5_sql = mysql_escape_string(pack("H32", $md5));
if ($math == 0)
$sql = "SELECT math_outputhash FROM math WHERE math_inputhash = '".$md5_sql."'";
else
$sql = "SELECT math_outputhash,math_html_conservativeness,math_html FROM math WHERE math_inputhash = '".$md5_sql."'";
$md5 = md5($tex);
$md5_sql = mysql_escape_string(pack("H32", $md5));
if ($math == 0) {
$sql = "SELECT math_outputhash FROM math WHERE math_inputhash = '$md5_sql'";
} else {
$sql = "SELECT math_outputhash,math_html_conservativeness,math_html FROM math WHERE math_inputhash = '$md5_sql'";
}
$res = wfQuery( $sql, DB_READ, $fname );
$res = wfQuery( $sql, DB_READ, $fname );
if( $rpage = wfFetchObject ( $res ) ) {
$outputhash = unpack( "H32md5", $rpage->math_outputhash . " " );
$outputhash = $outputhash ['md5'];
if( file_exists( "$wgMathDirectory/$outputhash.png" ) ) {
if (($math == 0) || ($rpage->math_html == '') || (($math == 1) && ($rpage->math_html_conservativeness != 2)) || (($math == 4) && ($rpage->math_html_conservativeness == 0)))
return linkToMathImage ( $tex, $outputhash );
else
return $rpage->math_html;
if (($math == 0) || ($rpage->math_html == '') || (($math == 1) && ($rpage->math_html_conservativeness != 2)) || (($math == 4) && ($rpage->math_html_conservativeness == 0))) {
return linkToMathImage ( $tex, $outputhash );
} else {
return $rpage->math_html;
}
}
}
$cmd = "./math/texvc ".escapeshellarg($wgTmpDirectory)." ".
escapeshellarg($wgMathDirectory)." ".escapeshellarg($tex)." ".escapeshellarg($wgInputEncoding);
$cmd = $wgTexvc." ".
escapeshellarg($wgTmpDirectory)." ".
escapeshellarg($wgMathDirectory)." ".
escapeshellarg($tex)." ".
escapeshellarg($wgInputEncoding);
wfDebug( "TeX: $cmd" );
$contents = `$cmd`;
if (strlen($contents) == 0)
return "<b>".$mf." (".$munk."): ".wfEscapeHTML($tex)."</b>";
if (strlen($contents) == 0) {
return "<b>".$mf." (".$munk."): ".wfEscapeHTML($tex)."</b>";
}
$retval = substr ($contents, 0, 1);
if (($retval == "C") || ($retval == "M") || ($retval == "L")) {
if ($retval == "C")
@ -97,8 +107,14 @@ function renderMath( $tex )
}
$outmd5 = substr ($contents, 1, 32);
if (!preg_match("/^[a-f0-9]{32}$/", $outmd5))
return "<b>".$mf." (".$munk."): ".wfEscapeHTML($tex)."</b>";
if (!preg_match("/^[a-f0-9]{32}$/", $outmd5)) {
return "<b>".$mf." (".$munk."): ".wfEscapeHTML($tex)."</b>";
}
if( !file_exists( "$wgMathDirectory/$outmd5.png" ) ) {
$errmsg = wfMsg( "math_image_error" );
return "<h3>$mf ($errmsg): " . wfEscapeHTML($tex) . "</h3>";
}
$outmd5_sql = mysql_escape_string(pack("H32", $outmd5));

1
languages/Language.php
View file

@ -788,6 +788,7 @@ See [[$wgMetaNamespace:User preferences help]] for help deciphering the options.
"math_unknown_function" => "unknown function ",
"math_lexing_error" => "lexing error",
"math_syntax_error" => "syntax error",
"math_image_error" => "PNG conversion failed",
"saveprefs" => "Save preferences",
"resetprefs" => "Reset preferences",
"oldpassword" => "Old password",