emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/org d96e897 2/2: ox-html: Use <img> tags for svgs, not


From: ELPA Syncer
Subject: [elpa] externals/org d96e897 2/2: ox-html: Use <img> tags for svgs, not <object>
Date: Mon, 26 Apr 2021 03:57:11 -0400 (EDT)

branch: externals/org
commit d96e8975791bd3b1a5f8fdb75609d73f134dc831
Author: TEC <tec@tecosaur.com>
Commit: Bastien Guerry <bzg@gnu.org>

    ox-html: Use <img> tags for svgs, not <object>
    
    * lisp/ox-html.el (org-html--format-image, org-html--svg-image): Remove
    special treatment of SVGs with <object>, and just use <img>.  This used
    to be poorly supported, but since Firefox 4 / Chrome 28 / Safari 9 this
    is no longer a concern (https://caniuse.com/svg-img) and the last
    browser release that didn't support SVG images was in 2010 (SVG data
    URIs took until 2015 to be fully supported, but this is a lesser
    concern).
---
 lisp/ox-html.el | 49 ++++++++++++-------------------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 89da823..adda736 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1693,43 +1693,18 @@ SOURCE is a string specifying the location of the image.
 ATTRIBUTES is a plist, as returned by
 `org-export-read-attribute'.  INFO is a plist used as
 a communication channel."
-  (if (string= "svg" (file-name-extension source))
-      (org-html--svg-image source attributes info)
-    (org-html-close-tag
-     "img"
-     (org-html--make-attribute-string
-      (org-combine-plists
-       (list :src source
-            :alt (if (string-match-p
-                      (concat "^" org-preview-latex-image-directory) source)
-                     (org-html-encode-plain-text
-                      (org-find-text-property-in-string 'org-latex-src source))
-                   (file-name-nondirectory source)))
-       attributes))
-     info)))
-
-(defun org-html--svg-image (source attributes info)
-  "Return \"object\" embedding svg file SOURCE with given ATTRIBUTES.
-INFO is a plist used as a communication channel.
-
-The special attribute \"fallback\" can be used to specify a
-fallback image file to use if the object embedding is not
-supported.  CSS class \"org-svg\" is assigned as the class of the
-object unless a different class is specified with an attribute."
-  (let ((fallback (plist-get attributes :fallback))
-       (attrs (org-html--make-attribute-string
-               (org-combine-plists
-                 ;; Remove fallback attribute, which is not meant to
-                 ;; appear directly in the attributes string, and
-                 ;; provide a default class if none is set.
-                 '(:class "org-svg") attributes '(:fallback nil)))))
-    (format "<object type=\"image/svg+xml\" data=\"%s\" %s>\n%s</object>"
-           source
-           attrs
-           (if fallback
-               (org-html-close-tag
-                "img" (format "src=\"%s\" %s" fallback attrs) info)
-             "Sorry, your browser does not support SVG."))))
+  (org-html-close-tag
+   "img"
+   (org-html--make-attribute-string
+    (org-combine-plists
+     (list :src source
+           :alt (if (string-match-p
+                     (concat "^" org-preview-latex-image-directory) source)
+                    (org-html-encode-plain-text
+                     (org-find-text-property-in-string 'org-latex-src source))
+                  (file-name-nondirectory source)))
+     attributes))
+   info))
 
 (defun org-html--textarea-block (element)
   "Transcode ELEMENT into a textarea block.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]