Changeset 11139

Timestamp:

03/19/11 09:08:31 (14 months ago)

Author:

MichaelDaum

Message:

Item2436:Item1620:Item9656:Item2085:

• added Config.spec and DEPENDENCIES to ease installation and configuration
• improved compatibility to run this plugin on various Foswiki engines

Location:

trunk/MathModePlugin

Files:

• . (modified) (1 prop)
• data/System/MathModePlugin.txt (modified) (2 diffs)
• lib/Foswiki/Plugins/MathModePlugin.pm (modified) (2 diffs)
• lib/Foswiki/Plugins/MathModePlugin/Config.spec (added)
• lib/Foswiki/Plugins/MathModePlugin/Core.pm (modified) (5 diffs)
• lib/Foswiki/Plugins/MathModePlugin/DEPENDENCIES (modified) (1 diff)
• lib/Foswiki/Plugins/MathModePlugin/MANIFEST (modified) (1 diff)
• pub/System/MathModePlugin (modified) (1 prop)

trunk/MathModePlugin/data/System/MathModePlugin.txt

@@ -148 +148 @@
 |   | extension of the image type; \
            possible values are 'gif' and 'png' ||
-| =Latex2Img= | | '.../%SYSTEMWEB%/%TOPIC%/latex2img' |
-|   | the script to convert a latex formula to an image ||
+| =Latex2Img= | | '.../tools/MathModePlugin_latex2img' |
+|   | the command to convert a latex formula to an image ||
 | =LatexPreamble= | %<nop>LATEXPREAMBLE% | '\usepackage{latexsym}' |
 | &nbsp; | latex preamble to include additional packages \
@@ -169 +169 @@
 -->
 |  Plugin Author: | Graeme Lufkin, Foswiki:Main/MichaelDaum |
-|  Copyright &copy;: | 2002 Graeme Lufkin, gwl@u.washington.edu, 2006-2009, Michael Daum http://michaeldaumconsulting.com |
+|  Copyright &copy;: | 2002 Graeme Lufkin, gwl@u.washington.edu, 2006-2011, Michael Daum http://michaeldaumconsulting.com |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change History: | &nbsp; |
+|  19 Mar 2011: | added Config.spec and DEPENDENCIES to ease installation and configuration; \
+                  improved compatibility to run this plugin on various Foswiki engines |
 |  23 Apr 2009: | converted to foswiki plugin |
 |  07 Jan 2009: | certified for foswiki/compat; removed deprecated endRenderingHandler |

trunk/MathModePlugin/lib/Foswiki/Plugins/MathModePlugin.pm

@@ -1 +1 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2006-2009 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2006-2011 Michael Daum http://michaeldaumconsulting.com
 # Copyright (C) 2002 Graeme Lufkin, gwl@u.washington.edu
 #
@@ -25 +25 @@
 );
 $VERSION = '$Rev$';
-$RELEASE = '4.01';
+$RELEASE = '4.02';
 $NO_PREFS_IN_TOPIC = 1;
 $SHORTDESCRIPTION = 'Include <nop>LaTeX formatted math in your Foswiki pages';

trunk/MathModePlugin/lib/Foswiki/Plugins/MathModePlugin/Core.pm

@@ -1 +1 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2006-2009 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2006-2011 Michael Daum http://michaeldaumconsulting.com
 # Copyright (C) 2002 Graeme Lufkin, gwl@u.washington.edu
 #
@@ -22 +22 @@
 use Digest::MD5 qw( md5_hex );
 use File::Copy qw( move );
-use File::Temp;
-use FindBin;
-use Foswiki::Sandbox;
+use File::Temp ();
+#use FindBin ();
+use Foswiki::Sandbox ();
 
 use constant DEBUG => 0; # toggle me
@@ -146 +146 @@
   foreach my $dir (split(/\//, "$web/$topic")) {
     $topicPubDir .= '/'.$dir;
-    $topicPubDir = Foswiki::Sandbox::normalizeFileName($topicPubDir);
+    $topicPubDir = normalizeFileName($topicPubDir);
     unless (-d $topicPubDir) {
       mkdir $topicPubDir or die "can't create directory $topicPubDir";
@@ -274 +274 @@
   my @files = grep(/$this->{imagePrefix}.*\.$this->{imageType}$/,readdir(DIR));
   foreach my $fileName (@files) {
-    $fileName = Foswiki::Sandbox::normalizeFileName($fileName);
+    $fileName = normalizeFileName($fileName);
     #writeDebug( "found image: $fileName");
 
@@ -419 +419 @@
 }
 
+###############################################################################
+# wrapper
+sub normalizeFileName {
+  my $fileName = shift;
+
+  if (defined &Foswiki::Sandbox::_cleanUpFilePath) {
+    return Foswiki::Sandbox::_cleanUpFilePath($fileName);
+  }
+
+  if (defined &Foswiki::Sandbox::normalizeFileName) {
+    return Foswiki::Sandbox::normalizeFileName($fileName);
+  }
+
+  if (defined &Foswiki::normalizeFileName) {
+    return Foswiki::normalizeFileName($fileName);
+  }
+    
+  # outch
+  return $fileName;
+}
+
 1;

trunk/MathModePlugin/lib/Foswiki/Plugins/MathModePlugin/DEPENDENCIES

@@ +1 @@
+dvipng,>0,c,Required. Required to generate .png output
+latex2html,>0,c,Required. Required by the plugin for all output.

trunk/MathModePlugin/lib/Foswiki/Plugins/MathModePlugin/MANIFEST

@@ -1 +1 @@
 data/System/MathModePlugin.txt 0644
+lib/Foswiki/Plugins/MathModePlugin/Config.spec 0644
 lib/Foswiki/Plugins/MathModePlugin/Core.pm 0644
 lib/Foswiki/Plugins/MathModePlugin.pm 0644