* [PATCH] ox-html: Restore wrongly omitted table attributes under HTML5.
@ 2013-06-29 15:06 Kodi Arfer
2013-06-29 22:37 ` Nicolas Goaziou
0 siblings, 1 reply; 5+ messages in thread
From: Kodi Arfer @ 2013-06-29 15:06 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-ox-html-Restore-wrongly-omitted-table-attributes-und.patch --]
[-- Type: text/x-patch, Size: 1375 bytes --]
From edd97671641e28c3e240efe6ea8fa8d77b4b7eae Mon Sep 17 00:00:00 2001
From: Kodi Arfer <git@arfer.net>
Date: Sat, 29 Jun 2013 10:43:07 -0400
Subject: [PATCH] ox-html: Restore wrongly omitted table attributes under
HTML5.
* lisp/ox-html.el (org-html-table): For HTML5,
omit :html-table-attributes but not :id or :attr_html.
TINYCHANGE
---
lisp/ox-html.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 4a2b6ec..bcf86ee 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -3163,12 +3163,12 @@ contextual information."
(number (org-export-get-ordinal
table info nil 'org-html--has-caption-p))
(attributes
- (if (org-html-html5-p info) ""
- (org-html--make-attribute-string
- (org-combine-plists
- (and label (list :id (org-export-solidify-link-text label)))
- (plist-get info :html-table-attributes)
- (org-export-read-attribute :attr_html table)))))
+ (org-html--make-attribute-string
+ (org-combine-plists
+ (and label (list :id (org-export-solidify-link-text label)))
+ (unless (org-html-html5-p info)
+ (plist-get info :html-table-attributes))
+ (org-export-read-attribute :attr_html table))))
(alignspec
(if (and (boundp 'org-html-format-table-no-css)
org-html-format-table-no-css)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ox-html: Restore wrongly omitted table attributes under HTML5.
2013-06-29 15:06 [PATCH] ox-html: Restore wrongly omitted table attributes under HTML5 Kodi Arfer
@ 2013-06-29 22:37 ` Nicolas Goaziou
2013-06-29 23:30 ` Kodi Arfer
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Goaziou @ 2013-06-29 22:37 UTC (permalink / raw)
To: Kodi Arfer; +Cc: emacs-orgmode
Hello,
Kodi Arfer <kodi@arfer.net> writes:
> From edd97671641e28c3e240efe6ea8fa8d77b4b7eae Mon Sep 17 00:00:00 2001
> From: Kodi Arfer <git@arfer.net>
> Date: Sat, 29 Jun 2013 10:43:07 -0400
> Subject: [PATCH] ox-html: Restore wrongly omitted table attributes under
> HTML5.
>
> * lisp/ox-html.el (org-html-table): For HTML5,
> omit :html-table-attributes but not :id or :attr_html.
Thank you for your patch. Could you rebase it against "maint"? I cannot
apply it at the moment.
> + (unless (org-html-html5-p info)
> + (plist-get info :html-table-attributes))
One nitpick. It is more explicit to use:
(and (not (org-html-html5-p info))
(plist-get info :html-table-attributes))
since you are using the returned value.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ox-html: Restore wrongly omitted table attributes under HTML5.
2013-06-29 22:37 ` Nicolas Goaziou
@ 2013-06-29 23:30 ` Kodi Arfer
2013-06-30 7:35 ` Nicolas Goaziou
0 siblings, 1 reply; 5+ messages in thread
From: Kodi Arfer @ 2013-06-29 23:30 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: emacs-orgmode
On 2013 Jun 29 Sat 6:37:33 PM -0400, Nicolas Goaziou
<n.goaziou@gmail.com> wrote:
> Kodi Arfer <kodi@arfer.net> writes:
>
>> From edd97671641e28c3e240efe6ea8fa8d77b4b7eae Mon Sep 17 00:00:00 2001
>> From: Kodi Arfer <git@arfer.net>
>> Date: Sat, 29 Jun 2013 10:43:07 -0400
>> Subject: [PATCH] ox-html: Restore wrongly omitted table attributes under
>> HTML5.
>>
>> * lisp/ox-html.el (org-html-table): For HTML5,
>> omit :html-table-attributes but not :id or :attr_html.
>
> Thank you for your patch. Could you rebase it against "maint"? I cannot
> apply it at the moment.
I don't think I can. I'm not clear about the relationship between maint
and master in general, but it looks like maint doesn't have the bug my
patch is supposed to fix, because it doesn't treat an HTML5 doctype
specially at all.
>> + (unless (org-html-html5-p info)
>> + (plist-get info :html-table-attributes))
>
> One nitpick. It is more explicit to use:
>
> (and (not (org-html-html5-p info))
> (plist-get info :html-table-attributes))
>
> since you are using the returned value.
Sure, I can change that. Should I base the patch off master again?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ox-html: Restore wrongly omitted table attributes under HTML5.
2013-06-29 23:30 ` Kodi Arfer
@ 2013-06-30 7:35 ` Nicolas Goaziou
2013-06-30 20:14 ` Bastien
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Goaziou @ 2013-06-30 7:35 UTC (permalink / raw)
To: Kodi Arfer; +Cc: emacs-orgmode
Hello,
Kodi Arfer <kodi@arfer.net> writes:
> I don't think I can. I'm not clear about the relationship between
> maint and master in general,
"maint" is for bugfixes only. "master" is for new features.
> but it looks like maint doesn't have the bug my patch is supposed to
> fix, because it doesn't treat an HTML5 doctype specially at all.
You're right. Never mind then.
>> One nitpick. It is more explicit to use:
>>
>> (and (not (org-html-html5-p info))
>> (plist-get info :html-table-attributes))
>>
>> since you are using the returned value.
>
> Sure, I can change that. Should I base the patch off master again?
I made the change before applying your patch to master.
Thank you again. Also, please consider signing FSF papers for more
contributions to Emacs.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-30 22:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-29 15:06 [PATCH] ox-html: Restore wrongly omitted table attributes under HTML5 Kodi Arfer
2013-06-29 22:37 ` Nicolas Goaziou
2013-06-29 23:30 ` Kodi Arfer
2013-06-30 7:35 ` Nicolas Goaziou
2013-06-30 20:14 ` Bastien
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).