Changeset 363

Timestamp:

03/22/08 17:14:52 (16 years ago)

Author:

sacha

Message:

Remote Latex - local cache support; Latex server location is now a Dotclear setting

Location:

plugins/remotelatex

Files:

• _admin.php (modified) (3 diffs)
• _define.php (modified) (2 diffs)

plugins/remotelatex/_admin.php

@@ -1 @@
-<?php
+<?php /* -*- tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
 /***************************************************************\
- *  This is RemoteLatex, a plugin for DotClear.                *
+ *  This is 'Remote Latex', a plugin for Dotclear              *
  *                                                             *
- *  Copyright (c) 2007                                         *
- *  Oleksandr Syenchuk                                         *
+ *  Copyright (c) 2007-2008                                    *
+ *  Oleksandr Syenchuk and contributors.                       *
  *                                                             *
  *  This is an open source software, distributed under the GNU *
@@ -10 +10 @@
  *                                                             *
  *  You should have received a copy of the GNU General Public  *
- *  License along with RemoteLatex (see COPYING.txt);          *
+ *  License along with 'Remote Latex' (see COPYING.txt);       *
  *  if not, write to the Free Software Foundation, Inc.,       *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    *
 \***************************************************************/
-
-# WARNING :
-# RemoteLatex is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
 
 $core->addBehavior('coreInitWikiPost',array('remoteLatex','coreInitWikiPost'));
@@ -27 +21 @@
      public static function coreInitWikiPost(&$wiki2xhtml)
      {
-          $wiki2xhtml->registerFunction('macro:latex',
+          $wiki2xhtml->registerFunction('macro:math',
                array('remoteLatex','render'));
      }
      
-     public static function render($texte,$args)
+     public static function render($tex,$args)
      {
-          $texte = rawurlencode($texte);
-          $texServer = 'http://math.spip.org/tex.php?';
-          return '<img src="'.$texServer.$texte.'" />';
+          global $core;
+          
+          $hash = md5($tex = trim($tex));
+          
+          try {
+               self::getSettings($latex_server,$root_path,$root_url);
+               
+               $file_name = sprintf('%s/%s/%s.png',
+                    $root_path,
+                    substr($hash,0,2),
+                    $hash
+               );
+               
+               $file_url = sprintf('%s/%s/%s.png',
+                    $root_url,
+                    substr($hash,0,2),
+                    $hash
+               );
+               
+               if (file_exists($file_name)) {
+                    return self::getHtml($tex,$file_url);
+               }
+               
+               # File doesn't exist : we need create one
+               
+               if (!is_dir(dirname($file_name))) {
+                    files::makeDir(dirname($file_name),true);
+               }
+               
+               $dist_url = $latex_server.rawurlencode($tex);
+               
+               # Get rendered PNG picture
+               if (netHttp::quickGet($dist_url,$file_name) === false) {
+                    throw new Exception(sprintf(
+                         __('Unable to get Latex image from the server %s.'),
+                         html::escapeHTML($latex_server)
+                    ));
+               }
+               
+               # Verify that we got a correct PNG file
+               $signature = file_get_contents($file_name,false,null,0,8);
+               
+               if ($signature != "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a") {
+                    @unlink($file_name);
+                    throw new Exception(__('File is not a valid PNG image'));
+               }
+          }
+          catch (Exception $e) {
+               # If something is wrong, Laex code is returned in plain text
+               #$core->error->add($e->getMessage());
+               return self::getHtml($tex);
+          }
+          
+          return self::getHtml($tex,$file_url);
+     }
+     
+     public static function getHtml($tex,$file_url=null)
+     {
+          $tex = html::escapeHTML($tex);
+          
+          if ($file_url) {
+               return '<img src="'.$file_url.'" alt="'.$tex.'" />';
+          }
+          else {
+               return '<pre>'.$tex.'</pre>';
+          }
+     }
+     
+     public static function getSettings(&$latex_server,&$root_path,&$root_url)
+     {
+          global $core;
+          
+          $root_path = path::real($core->blog->public_path).'/latex-images';
+          $root_url = $core->blog->host.
+               path::clean($core->blog->settings->public_url).'/latex-images';
+          
+          $latex_server = $core->blog->settings->latex_server;
+          if ($latex_server === null) {
+               $latex_server = 'http://math.spip.org/tex.php?';
+               $core->blog->settings->setNamespace('latex');
+               $core->blog->settings->put(
+                    'latex_server',
+                    $latex_server,
+                    'string',
+                    'Latex server URL'
+               );
+          }
      }
 }

plugins/remotelatex/_define.php

@@ -1 +1 @@
 <?php /* -*- tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
 /***************************************************************\
- *  This is 'Remote Latex', a plugin for Dotclear 2            *
+ *  This is 'Remote Latex', a plugin for Dotclear              *
  *                                                             *
- *  Copyright (c) 2007                                         *
+ *  Copyright (c) 2007-2008                                    *
  *  Oleksandr Syenchuk and contributors.                       *
  *                                                             *
@@ -15 +15 @@
 \***************************************************************/
 
+# WARNING :
+# Remote Latex is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
 $this->registerModule(
      /* Name */          "Remote Latex",
-     /* Description*/    "Latex render for Dotclear",
+     /* Description*/    "Latex rendering for Dotclear",
      /* Author */        "Oleksandr Syenchuk",
-     /* Version */       '0.1',
+     /* Version */       '1.0',
      /* Permissions */   'usage,contentadmin'
 );