Skip to content

Commit 8ff3b75

Browse files
akirakylennicandro
authored andcommitted
Fix jupyter-org--parse-latex-element again
Upstream org commit 4fcdcb4 changed the behavior of org-element-context which now uses org-element-deferred-create which is incompatible with inserting elements created from with-temp-buffer outside its scope.
1 parent 547bf7d commit 8ff3b75

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

jupyter-org-client.el

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -811,14 +811,6 @@ Otherwise, return VALUE formated as a fixed-width `org-element'."
811811
(t
812812
(org-element-create 'fixed-width (list :value (format "%S" value))))))
813813

814-
(defun jupyter-org-latex-fragment (value)
815-
"Return a latex-fragment `org-element' consisting of VALUE."
816-
(org-element-create 'latex-fragment (list :value value)))
817-
818-
(defun jupyter-org-latex-environment (value)
819-
"Return a latex-fragment `org-element' consisting of VALUE."
820-
(org-element-create 'latex-environment (list :value value)))
821-
822814
(defun jupyter-org-results-drawer (&rest results)
823815
"Return a drawer `org-element' containing RESULTS.
824816
RESULTS can be either strings or other `org-element's. Newlines
@@ -1048,17 +1040,15 @@ fragment or environment is parsed and returned. If neither can be
10481040
parsed, wrap DATA in a minipage environment and return it."
10491041
(with-temp-buffer
10501042
(insert data)
1051-
(goto-char (point-min))
1052-
(let ((context (org-element-context)))
1053-
(cond ((memq (org-element-type context) '(latex-fragment latex-environment))
1054-
context)
1043+
(let ((elts (org-element-map (org-element-parse-buffer)
1044+
'(latex-fragment latex-environment) 'identity)))
1045+
(cond ((and (= (length elts) 1) (car elts)))
10551046
(t
10561047
;; If all else fails, wrap DATA in a minipage environment
1057-
(jupyter-org-latex-environment
1058-
(concat "\
1048+
(org-element-create 'latex-environment (list :value (concat "\
10591049
\\begin{minipage}{\\textwidth}
10601050
\\begin{flushright}\n" data "\n\\end{flushright}
1061-
\\end{minipage}")))))))
1051+
\\end{minipage}"))))))))
10621052

10631053
(cl-defmethod jupyter-org-result ((_mime (eql :text/latex)) content params)
10641054
(if (member "raw" (alist-get :result-params params))

0 commit comments

Comments
 (0)