summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Marin <thibault.marin@gmx.com>2019-12-09 21:29:56 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2019-12-09 21:29:56 +0100
commit91def2a211204ed0f641986a8b967cb81dd7d23e (patch)
treeaeeff25792afe45c424716167803986b6c871d8d
parentc7ad3f88454290ac072753f4158221db7323f2fe (diff)
downloadorg-mode-91def2a211204ed0f641986a8b967cb81dd7d23e.tar.gz
ox-html: Add equation numbers only for numbered environments
* lisp/ox-html.el (org-html-latex-environment): Add caption to numbered environments only (org-html--latex-environment-numbered-p): New function.
-rw-r--r--lisp/ox-html.el17
1 files changed, 13 insertions, 4 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 83d0fd2..4b5f307 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2903,6 +2903,12 @@ used as a predicate for `org-export-get-ordinal' or a value to
(string-match-p org-latex-math-environments-re
(org-element-property :value element)))
+(defun org-html--latex-environment-numbered-p (element)
+ "Non-nil when ELEMENT contains a numbered LaTeX math environment.
+Starred and \"displaymath\" environments are not numbered."
+ (not (string-match-p "\\`[ \t]*\\\\begin{\\(.*\\*\\|displaymath\\)}"
+ (org-element-property :value element))))
+
(defun org-html--unlabel-latex-environment (latex-frag)
"Change environment in LATEX-FRAG string to an unnumbered one.
For instance, change an 'equation' environment to 'equation*'."
@@ -2923,10 +2929,13 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(attributes (org-export-read-attribute :attr_html latex-environment))
(label (and (org-element-property :name latex-environment)
(org-export-get-reference latex-environment info)))
- (caption (number-to-string
- (org-export-get-ordinal
- latex-environment info nil
- #'org-html--math-environment-p))))
+ (caption (and (org-html--latex-environment-numbered-p latex-environment)
+ (number-to-string
+ (org-export-get-ordinal
+ latex-environment info nil
+ (lambda (l _)
+ (and (org-html--math-environment-p l)
+ (org-html--latex-environment-numbered-p l))))))))
(cond
((memq processing-type '(t mathjax))
(org-html-format-latex