From cf31ea16609fd37eed55e2b137009e5a78cb3203 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 19 Aug 2015 11:07:06 +0200 Subject: [PATCH] ox-html: Rename `org-html-html5-fancy-p' to `org-html--html5-fancy-p' * lisp/ox-html.el (org-html--html5-fancy-p): Renamed from `org-html-html5-fancy-p'. Add docstring. (org-html--wrap-image): (org-html-template): (org-html-toc): (org-html-special-block): Apply renaming. As an internal function, it should follow the convention of double hyphens in its name. --- lisp/ox-html.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 78c8e111f..476ffbec2 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1473,7 +1473,9 @@ CSS classes, then this prefix can be very useful." (let ((dt (downcase (plist-get info :html-doctype)))) (member dt '("html5" "xhtml5" "")))) -(defun org-html-html5-fancy-p (info) +(defun org-html--html5-fancy-p (info) + "Non-nil when exporting to HTML5 with fancy elements. +INFO is the current state of the export process, as a plist." (and (plist-get info :html-html5-fancy) (org-html-html5-p info))) @@ -1507,7 +1509,7 @@ attributes with a nil value will be omitted from the result." INFO is a plist used as a communication channel. When optional arguments CAPTION and LABEL are given, use them for caption and \"id\" attribute." - (let ((html5-fancy (org-html-html5-fancy-p info))) + (let ((html5-fancy (org-html--html5-fancy-p info))) (format (if html5-fancy "\n%s%s\n" "\n%s%s\n") ;; ID. @@ -1933,7 +1935,7 @@ holding export options." (when (plist-get info :with-title) (let ((title (plist-get info :title)) (subtitle (plist-get info :subtitle)) - (html5-fancy (org-html-html5-fancy-p info))) + (html5-fancy (org-html--html5-fancy-p info))) (when title (format (if html5-fancy @@ -2137,7 +2139,7 @@ of contents as a string, or nil if it is empty." (org-html--toc-text toc-entries) "\n"))) (if scope toc - (let ((outer-tag (if (org-html-html5-fancy-p info) + (let ((outer-tag (if (org-html--html5-fancy-p info) "nav" "div"))) (concat (format "<%s id=\"table-of-contents\">\n" outer-tag) @@ -3184,7 +3186,7 @@ CONTENTS holds the contents of the block. INFO is a plist holding contextual information." (let* ((block-type (org-element-property :type special-block)) (contents (or contents "")) - (html5-fancy (and (org-html-html5-fancy-p info) + (html5-fancy (and (org-html--html5-fancy-p info) (member block-type org-html-html5-elements))) (attributes (org-export-read-attribute :attr_html special-block))) (unless html5-fancy -- 2.11.4.GIT