X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=syntax.php;h=f30659e415559574c55142553addb0995cf0a572;hb=f6377891544ef2a4d2706426556568553a15c77b;hp=442d45f360c302f8b444be0559a51b926b984ec7;hpb=34612ed6f43b1714c084992ad8de5c464b48f529;p=mirrors%2FDokuWiki-Plugin-SVGEdit.git

diff --git a/syntax.php b/syntax.php
index 442d45f..f30659e 100755
--- a/syntax.php
+++ b/syntax.php
@@ -26,7 +26,7 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
     function getInfo() { 
             return array('author' => 'Thomas Mudrunka',
                          'email'  => 'harvie--email-cz',
-                         'date'   => '2010-02-21',
+                         'date'   => '2010-06-20',
                          'name'   => 'SVG-Edit Plugin',
                          'desc'   => 'Nice way, to create, store, edit and embed SVG images into DokuWiki',
                          'url'    => 'http://www.dokuwiki.org/plugin:svgedit'
@@ -48,32 +48,50 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
         return array($type, $match); 
     }
 
-    function render($format, &$renderer, $data) {
-				if ($format!='xhtml') return;
+		function svg_base64_encode($svg) { //create base64 encoded svg for use as svglink in svg_format_embed
+			return 'data:image/svg+xml;base64,'.base64_encode($svg).'" type="image/svg+xml';
+		}
+
+		function svg_format_embed($svglink, $title, $svg_parameters) { //create xhtml code for svg embeding
 				global $ID;
 
-				$is_webkit= preg_match('/webkit/',  strtolower($_SERVER['HTTP_USER_AGENT'])  ); // dirty, but fast /n3k/
+				//use object tag for stupid browsers (like firefox) - ugly (relies on browser identification)
+				$is_webkit= preg_match('/webkit/', strtolower($_SERVER['HTTP_USER_AGENT']));
 				if ($is_webkit)
-					$svgtag='<img src="';
+					$svgtag='img src';
 				else
-					$svgtag='<object data="';
+					$svgtag='object '.$svg_parameters.' data';
+
+				return '<a href="'.$svglink.'" type="image/svg+xml" /><'.$svgtag.'="'.$svglink.'" alt="'.$title.'" title="'.$title.'" type="image/svg+xml" /></a>'."<br />";
+		}
+
+    function render($format, &$renderer, $data) {
+				if ($format!='xhtml') return;
+				global $ID;
+
+				$svg_wiki_page = trim(substr($data[1], 6, -2)); //name of wiki page containing SVG image
+				resolve_pageid(getNS($ID),$svg_wiki_page,$exists); //resolve relative IDs
+
+				//detect image size for stupid browsers (like firefox) - ugly (fails if svg does not contain information about it's size)
+				$svg_dimensions = '';
+				preg_match('/width="[0-9]+" height="[0-9]+"/', $data[1].rawWiki($svg_wiki_page), $_);
+				if(isset($_[0])) $svg_dimensions = $_[0];
+
 				if($data[0]==='<svg') {
-					$svgenc = 'data:image/svg+xml;base64,'.base64_encode($data[1]).'" type="image/svg+xml';
-					$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="svg-image@'.$ID.'" /></a>'."<br />";
+					$svgenc = $this->svg_base64_encode($data[1]);
+					$renderer->doc .= $this->svg_format_embed($svgenc, 'inline-svg@'.$ID, $svg_dimensions);
 					return true;
 				}
 				if($data[0]==='{{sv') {
-					$data[1] = trim(substr($data[1], 6, -2));
-					$svgenc = exportlink($data[1],'svg');
-					$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($data[1]).'" type="image/svg+xml"/></a><br />';
-					$renderer->doc .= html_wikilink($data[1],'svg@'.$data[1]);
+					$svglink = exportlink($svg_wiki_page,'svg');
+					$renderer->doc .= $this->svg_format_embed($svglink, 'image:'.htmlspecialchars($svg_wiki_page), $svg_dimensions);
+					$renderer->doc .= '<small>'.html_wikilink($svg_wiki_page,'svg@'.$svg_wiki_page).'</small>';
         	return true;
 				}
 				if($data[0]==='{{SV') {
-					$data[1] = trim(substr($data[1], 6, -2));
-					$svgenc = 'data:image/svg+xml;base64,'.base64_encode(rawWiki($data[1])).'" type="image/svg+xml';
-					$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($data[1]).'" /></a><br />'; 
-					$renderer->doc .= html_wikilink($data[1],'SVG@'.$data[1]);
+					$svgenc = $this->svg_base64_encode(rawWiki($svg_wiki_page));
+					$renderer->doc .= $this->svg_format_embed($svgenc, 'image:'.htmlspecialchars($svg_wiki_page), $svg_dimensions);
+					$renderer->doc .= '<small>'.html_wikilink($svg_wiki_page,'SVG@'.$svg_wiki_page).'</small>';
         	return true;
 				}
     }