X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=syntax.php;h=c5bd599e4b683486f9c54fca5c703c96beca054f;hb=9b4c1b747f8f3550d55065c618f130085aa2c3c6;hp=2d9e69e05ff645099c6c2306f0e28b9ec9c13d5e;hpb=b3a6ad9d8ae6d6a835ceab584a3ad870b9d7caa9;p=mirrors%2FDokuWiki-Plugin-SVGEdit.git

diff --git a/syntax.php b/syntax.php
index 2d9e69e..c5bd599 100755
--- a/syntax.php
+++ b/syntax.php
@@ -52,24 +52,36 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
 				if ($format!='xhtml') return;
 				global $ID;
 
+				$svg_wiki_page = trim(substr($data[1], 6, -2)); //name of wiki page containing SVG image
+
+				//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];
+
+				//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="';
+				else
+					$svgtag='<object '.$svg_dimensions.' data="';
+
+
 				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" /><img src="'.$svgenc.'" alt="svg-image@'.$ID.'" /></a>'."<br />";
+					$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="svg-image@'.$ID.'" /></a>'."<br />";
 					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" /><img src="'.$svgenc.'" alt="image:'.htmlspecialchars($data[1]).'" type="image/svg+xml"/></a><br />';
-					//$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" /><object data="'.$svgenc.'" type="image/svg+xml" width="100%"><img src="'.$svgenc.'" alt="image:'.htmlspecialchars($data[1]).'" type="image/svg+xml"/></object></a><br />'; //scrollbars on webkit :-(
-					$renderer->doc .= html_wikilink($data[1],'svg@'.$data[1]);
+					$svgenc = exportlink($svg_wiki_page,'svg');
+					$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($svg_wiki_page).'" type="image/svg+xml"/></a><br />';
+					$renderer->doc .= html_wikilink($svg_wiki_page,'svg@'.$svg_wiki_page);
         	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" /><img src="'.$svgenc.'" alt="image:'.htmlspecialchars($data[1]).'" /></a><br />';
-					$renderer->doc .= html_wikilink($data[1],'SVG@'.$data[1]);
+					$svgenc = 'data:image/svg+xml;base64,'.base64_encode(rawWiki($svg_wiki_page)).'" type="image/svg+xml';
+					$renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($svg_wiki_page).'" /></a><br />'; 
+					$renderer->doc .= html_wikilink($svg_wiki_page,'SVG@'.$svg_wiki_page);
         	return true;
 				}
     }