ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-02-17 13:41:18 +03:00
parent 74eb0f8bc9 eea8da0315
commit fff9239dc1
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
5 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob-octave.el
View File

@ -243,8 +243,8 @@ value of the last statement in BODY, as elisp."
(`output
(setq results
(if matlabp
(cdr (reverse (delq "" (mapcar #'org-strip-quotes
(mapcar #'org-trim raw)))))
(cdr (reverse (delete "" (mapcar #'org-strip-quotes
(mapcar #'org-trim raw)))))
(cdr (member org-babel-octave-eoe-output
(reverse (mapcar #'org-strip-quotes
(mapcar #'org-trim raw)))))))

2
lisp/org-agenda.el
View File

@ -7333,7 +7333,7 @@ Any match of REMOVE-RE will be removed from TXT."
(let ((s (org-format-outline-path (org-get-outline-path)
(1- (frame-width))
nil org-agenda-breadcrumbs-separator)))
(if (eq "" s) "" (concat s org-agenda-breadcrumbs-separator))))))
(if (equal "" s) "" (concat s org-agenda-breadcrumbs-separator))))))
(setq time (cond (s2 (concat
(org-agenda-time-of-day-to-ampm-maybe s1)
"-" (org-agenda-time-of-day-to-ampm-maybe s2)

6
lisp/org-element.el
View File

@ -7567,15 +7567,15 @@ the cache."
;; beginning.
(next-element-re (pcase granularity
((or `headline
(guard (eq '(headline)
restrict-elements)))
(guard (equal '(headline)
restrict-elements)))
(cons
(org-with-limited-levels
org-element-headline-re)
'match-beg))
(`headline+inlinetask
(cons
(if (eq '(inlinetask) restrict-elements)
(if (equal '(inlinetask) restrict-elements)
(org-inlinetask-outline-regexp)
org-element-headline-re)
'match-beg))

16
lisp/ox-texinfo.el
View File

@ -32,6 +32,8 @@
(require 'cl-lib)
(require 'ox)
(eval-when-compile (require 'subr-x))
(defvar orgtbl-exp-regexp)
(defvar org-texinfo-supports-math--cache)
@ -2025,12 +2027,14 @@ Once computed, the results remain cached."
(unless (boundp 'org-texinfo-supports-math--cache)
(setq org-texinfo-supports-math--cache
(let ((math-example "1 + 1 = 2"))
(let* ((input-file
(make-temp-file "test" nil ".info"))
(input-content
(concat (format "@setfilename %s" input-file) "\n"
"@node Top" "\n"
(format "@displaymath{%s}" math-example) "\n")))
(let* ((input-file (make-temp-file "test" nil ".info"))
(input-content (string-join
(list (format "@setfilename %s" input-file)
"@node Top"
"@displaymath"
math-example
"@end displaymath")
"\n")))
(with-temp-file input-file
(insert input-content))
(let* ((output-file (org-texinfo-compile input-file))

32
testing/lisp/test-ox-texinfo.el
View File

@ -24,6 +24,8 @@
(require 'cl-lib)
(require 'ox-texinfo)
(eval-when-compile (require 'subr-x))
(unless (featurep 'ox-texinfo)
(signal 'missing-test-dependency "org-export-texinfo"))
@ -292,5 +294,35 @@
nil
'(:with-latex t))))))
;;; End-to-end
(ert-deftest test-ox-texinfo/end-to-end-inline ()
"Test end-to-end with inline TeX fragment."
(should
(org-test-with-temp-text
"$a^2 = b$"
(let ((export-buffer "*Test Texinfo Export*")
(org-export-show-temporary-export-buffer nil))
(org-export-to-buffer 'texinfo export-buffer
nil nil nil nil nil
#'texinfo-mode)))))
(ert-deftest test-ox-texinfo/end-to-end-sanity-check-displayed ()
"Test end-to-end with LaTeX environment."
(should
(org-test-with-temp-text
(string-join
(list "\\begin{equation}"
"a ^ 2 = b"
"b ^ 2 = c"
"\\end{equation}")
"\n")
(let ((export-buffer "*Test Texinfo Export*")
(org-export-show-temporary-export-buffer nil))
(org-export-to-buffer 'texinfo export-buffer
nil nil nil nil nil
#'texinfo-mode)))))
(provide 'test-ox-texinfo)
;;; test-ox-texinfo.el end here