From 8e8e635ebab8569f657a36b92198f354bbe98ead Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Mon, 3 Jun 2024 11:14:31 +0200 Subject: [PATCH] Revert "lisp/ox-html.el: Convert :alt to :aria-label attribute in svg images" This reverts commit 0e5ac433246be43c8ac52549e543154115c30fc5. --- lisp/ox-html.el | 65 ++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 6b515ef34..b4ac83601 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1772,60 +1772,43 @@ 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." - (let ((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)))) - (if (string= "svg" (file-name-extension source)) - (org-html--svg-image - source - (org-combine-plists - (list :alt alt) ; fallback when no :alt in attributes - attributes) - info) - (org-html-close-tag - "img" - (org-html--make-attribute-string - (org-combine-plists - (list :src source :alt alt) ; fallback when no :alt in attributes - attributes)) - info)))) + (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. ALT is the -alternative text to be used as a fallback when image is not suitable -for display. +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. Attribute :alt can be specified and will be transformed -into :aria-label. CSS class \"org-svg\" is assigned as the class of -the object unless a different class is specified with an attribute." +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 - '(:class "org-svg") - ;; Replace :alt attribute not allowed in object tags - ;; with :aria-label. :aria-label in attributes, if - ;; any, takes priority. - (when-let ((alt (plist-get attributes :alt))) - `(:aria-label ,alt)) - attributes ;; Remove fallback attribute, which is not meant to ;; appear directly in the attributes string, and ;; provide a default class if none is set. - '(:fallback nil) - ;; Remove :alt attribute not allowed in object tags. - '(:alt nil) - `(:type "image/svg+xml" :data ,source))))) - (format "\n%s" + '(:class "org-svg") attributes '(:fallback nil))))) + (format "\n%s" + source attrs - (cond - (fallback (org-html--format-image fallback attrs info)) - (t "Sorry, your browser does not support SVG."))))) + (if fallback + (org-html-close-tag + "img" (format "src=\"%s\" %s" fallback attrs) info) + "Sorry, your browser does not support SVG.")))) (defun org-html--textarea-block (element) "Transcode ELEMENT into a textarea block.