From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarmo Hurri Subject: Patch: default CSS class for SVG images in HTML export Date: Mon, 25 Jul 2016 08:48:59 +0300 Message-ID: <87h9bep8s4.fsf@iki.fi> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRYlN-0004uU-SH for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 01:49:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRYlI-0004T7-NU for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 01:49:12 -0400 Received: from plane.gmane.org ([80.91.229.3]:43815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRYlI-0004T2-Eq for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 01:49:08 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1bRYlG-0007AA-31 for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 07:49:06 +0200 Received: from 82-181-168-52.bb.dnainternet.fi ([82.181.168.52]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jul 2016 07:49:06 +0200 Received: from jarmo.hurri by 82-181-168-52.bb.dnainternet.fi with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jul 2016 07:49:06 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Greetings. The attached patch - adds a default CSS class org-svg to SVG images embedded in exported HTML if no other class is set for the image using attr_html - documents the existence of this class. The second attachment is an org-file that can be used to verify that the patch works as expected. I have tested that it works in Safari, Firefox and Chrome (Chromium). If this patch is ok, then what is missing are the default CSS settings for the new class org-svg in constant org-html-style-default. I simply did not know what to put there. The manual says that this constant has basic settings for _all_ defined CSS entities. Either defaults need to be set for the new class, or the text in the manual needs to be changed. Or we have to accept that the manual is not logically coherent. :-) Jarmo --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-lisp-ox-html.el-Provide-a-default-CSS-class-for-embe.patch Content-Description: patch >From 087dd280932867b2820f1b87ff2535732615b920 Mon Sep 17 00:00:00 2001 From: Jarmo Hurri Date: Mon, 25 Jul 2016 08:25:58 +0300 Subject: [PATCH] lisp/ox-html.el: Provide a default CSS class for embedded SVG images * lisp/ox-html.el (org-html--svg-image): Set CSS class of embedded SVG images to be org-svg if no other class is set in attributes. * doc/org.texi (CSS support): Documentation of default CSS class org-svg for SVG images embedded into exported HTML. --- doc/org.texi | 1 + lisp/ox-html.el | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index 1c3868c..75f5eac 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -11750,6 +11750,7 @@ div.footnotes @r{footnote section headline} p.footnote @r{footnote definition paragraph, containing a footnote} .footref @r{a footnote reference number (always a )} .footnum @r{footnote number in footnote definition (always )} +.org-svg @r{default class for a linked SVG image} @end example @vindex org-html-style-default diff --git a/lisp/ox-html.el b/lisp/ox-html.el index ce4694d..79ac7e8 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1629,16 +1629,24 @@ a communication channel." (defun org-html--svg-image (source attributes info) "Return \"object\" appropriate for embedding svg file SOURCE -with assoicated ATTRIBUTES. INFO is a plist used as a +with associated 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." +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)) + (css-class (plist-get attributes :class)) (attrs (org-html--make-attribute-string (plist-put attributes :fallback nil)))) - (format "\n%s" - source attrs + (format "\n%s" + source + attrs + (if css-class + "" + "class=\"org-svg\"") (if fallback (org-html-close-tag "img" (format "src=\"%s\" %s" fallback attrs) info) -- 2.4.11 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=svg-class-test.org Content-Description: test file #+HTML_HEAD_EXTRA: * styling with default class #+BEGIN_SRC asymptote :file svg-image.svg size (1cm, 0); fill (unitsquare, red); #+END_SRC #+RESULTS: [[file:svg-image.svg]] * styling with class specified with attribute #+ATTR_HTML: :class my-svg-class [[file:svg-image.svg]] * going back to default class [[file:svg-image.svg]] --=-=-=--