X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=syntax.php;h=2b8c0028afd9c6bd5a27fcffd748597c41ea7898;hb=48693a0886d7844c154a420be8a0b2948b093fb6;hp=c5bd599e4b683486f9c54fca5c703c96beca054f;hpb=9b4c1b747f8f3550d55065c618f130085aa2c3c6;p=mirrors%2FDokuWiki-Plugin-SVGEdit.git
diff --git a/syntax.php b/syntax.php
index c5bd599..2b8c002 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,6 +48,23 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
return array($type, $match);
}
+ 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, $alt, $svg_parameters) { //create xhtml code for svg embeding
+ global $ID;
+
+ //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_parameters.' data';
+
+ return '<'.$svgtag.'="'.$svglink.'" alt="'.$alt.'" type="image/svg+xml" />'."
";
+ }
+
function render($format, &$renderer, $data) {
if ($format!='xhtml') return;
global $ID;
@@ -59,28 +76,20 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
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='
'.$svgtag.$svgenc.'" alt="svg-image@'.$ID.'" />'."
";
+ $svgenc = $this->svg_base64_encode($data[1]);
+ $renderer->doc .= $this->svg_format_embed($svgenc, 'svg-image@'.$ID, $svg_dimensions);
return true;
}
if($data[0]==='{{sv') {
- $svgenc = exportlink($svg_wiki_page,'svg');
- $renderer->doc .= ''.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($svg_wiki_page).'" type="image/svg+xml"/>
';
+ $svglink = exportlink($svg_wiki_page,'svg');
+ $renderer->doc .= $this->svg_format_embed($svglink, 'image:'.htmlspecialchars($svg_wiki_page), $svg_dimensions);
$renderer->doc .= html_wikilink($svg_wiki_page,'svg@'.$svg_wiki_page);
return true;
}
if($data[0]==='{{SV') {
- $svgenc = 'data:image/svg+xml;base64,'.base64_encode(rawWiki($svg_wiki_page)).'" type="image/svg+xml';
- $renderer->doc .= ''.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($svg_wiki_page).'" />
';
+ $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 .= html_wikilink($svg_wiki_page,'SVG@'.$svg_wiki_page);
return true;
}