autodetection of image size for stupid browsers

diff --git a/syntax.php b/syntax.php
index 442d45f360c302f8b444be0559a51b926b984ec7..f814a3270729bfbd8544de3eeef7963f50830d6f 100755 (executable)
--- a/syntax.php
+++ b/syntax.php
@@ -52,28 +52,36 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
                                if ($format!='xhtml') return;
                                global $ID;
 
-                               $is_webkit= preg_match('/webkit/',  strtolower($_SERVER['HTTP_USER_AGENT'])  ); // dirty, but fast /n3k/
+                               $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]+"/', 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 data="';
+                                       $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" />'.$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" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($data[1]).'" type="image/svg+xml"/></a><br />';
-                                       $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" />'.$svgtag.$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;
                                }
     }