masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-17 09:25:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Org 9.6.1-48-g92471e

Browse source
This commit is contained in:
Kyle Meyer 2023-03-18 21:41:22 -04:00
parent e84f878e19
commit 829e5dfabe
13 changed files with 41 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/ORG-NEWS
View file

@ -332,7 +332,7 @@ When the block type starts from the upper case, structure template
will now insert =#+BEGIN_TYPE=. Previously, lower-case =#+begin_type= was inserted unconditionally. will now insert =#+BEGIN_TYPE=. Previously, lower-case =#+begin_type= was inserted unconditionally.
*** New ox-latex tabbing support for tables. *** New ox-latex tabbing support for tables.
Latex tables can now be exported to the latex tabbing environment LaTeX tables can now be exported to the latex tabbing environment
tabbing environment]]. tabbing environment]].
This is done by adding =#+ATTR_LATEX: :mode tabbing= at the top This is done by adding =#+ATTR_LATEX: :mode tabbing= at the top
of the table. of the table.
@ -4284,7 +4284,7 @@ parameters specific to some pre-defined translators, e.g.,
~:environment~ and ~:booktabs~ for ~orgtbl-to-latex~. See translators ~:environment~ and ~:booktabs~ for ~orgtbl-to-latex~. See translators
docstrings (including ~orgtbl-to-generic~) for details. docstrings (including ~orgtbl-to-generic~) for details.
*** Non-floating minted listings in Latex export *** Non-floating minted listings in LaTeX export
It is not possible to specify =#+attr_latex: :float nil= in conjunction It is not possible to specify =#+attr_latex: :float nil= in conjunction
with source blocks exported by the minted package. with source blocks exported by the minted package.
@ -6540,7 +6540,7 @@ that Calc formulas can operate on them.
*** Hyperlinks *** Hyperlinks
**** Org-Bibtex -- major improvements **** Org-BibTeX -- major improvements
Provides support for managing bibtex bibliographical references Provides support for managing bibtex bibliographical references
data in headline properties. Each headline corresponds to a data in headline properties. Each headline corresponds to a

17
lisp/org/ob-latex.el
View file

@ -141,7 +141,7 @@ exporting the literal LaTeX source."
(org-trim body)) (org-trim body))
(defun org-babel-execute:latex (body params) (defun org-babel-execute:latex (body params)
"Execute a block of Latex code with Babel. "Execute a block of LaTeX code with Babel.
This function is called by `org-babel-execute-src-block'." This function is called by `org-babel-execute-src-block'."
(setq body (org-babel-expand-body:latex body params)) (setq body (org-babel-expand-body:latex body params))
(if (cdr (assq :file params)) (if (cdr (assq :file params))
@ -180,7 +180,7 @@ This function is called by `org-babel-execute-src-block'."
tmp-pdf tmp-pdf
(list org-babel-latex-pdf-svg-process) (list org-babel-latex-pdf-svg-process)
extension err-msg log-buf))) extension err-msg log-buf)))
(shell-command (format "mv %s %s" img-out out-file))))) (rename-file img-out out-file t))))
((string-suffix-p ".tikz" out-file) ((string-suffix-p ".tikz" out-file)
(when (file-exists-p out-file) (delete-file out-file)) (when (file-exists-p out-file) (delete-file out-file))
(with-temp-file out-file (with-temp-file out-file
@ -218,17 +218,14 @@ This function is called by `org-babel-execute-src-block'."
(if (string-suffix-p ".svg" out-file) (if (string-suffix-p ".svg" out-file)
(progn (progn
(shell-command "pwd") (shell-command "pwd")
(shell-command (format "mv %s %s" (rename-file (concat (file-name-sans-extension tex-file) "-1.svg")
(concat (file-name-sans-extension tex-file) "-1.svg") out-file t))
out-file)))
(error "SVG file produced but HTML file requested"))) (error "SVG file produced but HTML file requested")))
((file-exists-p (concat (file-name-sans-extension tex-file) ".html")) ((file-exists-p (concat (file-name-sans-extension tex-file) ".html"))
(if (string-suffix-p ".html" out-file) (if (string-suffix-p ".html" out-file)
(shell-command "mv %s %s" (rename-file (concat (file-name-sans-extension tex-file) ".html")
(concat (file-name-sans-extension tex-file) out-file t)
".html") (error "HTML file produced but SVG file requested")))))
out-file)
(error "HTML file produced but SVG file requested")))))
((or (string= "pdf" extension) imagemagick) ((or (string= "pdf" extension) imagemagick)
(with-temp-file tex-file (with-temp-file tex-file
(require 'ox-latex) (require 'ox-latex)

22
lisp/org/ol-bibtex.el
View file

@ -86,8 +86,8 @@
;; the active region, then call `org-bibtex-write' in a .org file to ;; the active region, then call `org-bibtex-write' in a .org file to
;; insert a heading for the read bibtex entry ;; insert a heading for the read bibtex entry
;; ;;
;; - All Bibtex information is taken from the document compiled by ;; - All BibTeX information is taken from the document compiled by
;; Andrew Roberts from the Bibtex manual, available at ;; Andrew Roberts from the BibTeX manual, available at
;; https://www.andy-roberts.net/res/writing/latex/bibentries.pdf ;; https://www.andy-roberts.net/res/writing/latex/bibentries.pdf
;; ;;
;;; History: ;;; History:
@ -99,7 +99,7 @@
;; and then implemented by Bastien Guerry. ;; and then implemented by Bastien Guerry.
;; ;;
;; Eric Schulte eventually added the functions for translating between ;; Eric Schulte eventually added the functions for translating between
;; Org headlines and Bibtex entries, and for fleshing out the Bibtex ;; Org headlines and BibTeX entries, and for fleshing out the BibTeX
;; fields of existing Org headlines. ;; fields of existing Org headlines.
;; ;;
;; Org mode loads this module by default - if this is not what you want, ;; Org mode loads this module by default - if this is not what you want,
@ -144,7 +144,7 @@
(declare-function org-search-view "org-agenda" (&optional todo-only string edit-at)) (declare-function org-search-view "org-agenda" (&optional todo-only string edit-at))
;;; Bibtex data ;;; BibTeX data
(defvar org-bibtex-types (defvar org-bibtex-types
'((:article '((:article
(:description . "An article from a journal or magazine") (:description . "An article from a journal or magazine")
@ -202,7 +202,7 @@
(:description . "A document having an author and title, but not formally published.") (:description . "A document having an author and title, but not formally published.")
(:required :author :title :note) (:required :author :title :note)
(:optional :month :year :doi :url))) (:optional :month :year :doi :url)))
"Bibtex entry types with required and optional parameters.") "BibTeX entry types with required and optional parameters.")
(defvar org-bibtex-fields (defvar org-bibtex-fields
'((:address . "Usually the address of the publisher or other type of institution. For major publishing houses, van Leunen recommends omitting the information entirely. For small publishers, on the other hand, you can help the reader by giving the complete address.") '((:address . "Usually the address of the publisher or other type of institution. For major publishing houses, van Leunen recommends omitting the information entirely. For small publishers, on the other hand, you can help the reader by giving the complete address.")
@ -231,7 +231,7 @@
(:url . "Uniform resource locator.") (:url . "Uniform resource locator.")
(:volume . "The volume of a journal or multi-volume book.") (:volume . "The volume of a journal or multi-volume book.")
(:year . "The year of publication or, for an unpublished work, the year it was written. Generally it should consist of four numerals, such as 1984, although the standard styles can handle any year whose last four nonpunctuation characters are numerals, such as '(about 1984)'")) (:year . "The year of publication or, for an unpublished work, the year it was written. Generally it should consist of four numerals, such as 1984, although the standard styles can handle any year whose last four nonpunctuation characters are numerals, such as '(about 1984)'"))
"Bibtex fields with descriptions.") "BibTeX fields with descriptions.")
(defvar org-bibtex-entries nil (defvar org-bibtex-entries nil
"List to hold parsed bibtex entries.") "List to hold parsed bibtex entries.")
@ -439,7 +439,7 @@ at point."
(error "Field:%s is not known" field)) (error "Field:%s is not known" field))
(save-window-excursion (save-window-excursion
(let* ((name (substring (symbol-name field) 1)) (let* ((name (substring (symbol-name field) 1))
(buf-name (format "*Bibtex Help %s*" name))) (buf-name (format "*BibTeX Help %s*" name)))
(with-output-to-temp-buffer buf-name (with-output-to-temp-buffer buf-name
(princ (cdr (assoc field org-bibtex-fields)))) (princ (cdr (assoc field org-bibtex-fields))))
(with-current-buffer buf-name (visual-line-mode 1)) (with-current-buffer buf-name (visual-line-mode 1))
@ -496,7 +496,7 @@ With optional argument OPTIONAL, also prompt for optional fields."
(org-bibtex-autokey))) (org-bibtex-autokey)))
;;; Bibtex link functions ;;; BibTeX link functions
(org-link-set-parameters "bibtex" (org-link-set-parameters "bibtex"
:follow #'org-bibtex-open :follow #'org-bibtex-open
:store #'org-bibtex-store-link) :store #'org-bibtex-store-link)
@ -593,13 +593,13 @@ ARG, when non-nil, is a universal prefix argument. See
(add-hook 'org-execute-file-search-functions 'org-execute-file-search-in-bibtex) (add-hook 'org-execute-file-search-functions 'org-execute-file-search-in-bibtex)
;;; Bibtex <-> Org headline translation functions ;;; BibTeX <-> Org headline translation functions
(defun org-bibtex (filename) (defun org-bibtex (filename)
"Export each headline in the current file to a bibtex entry. "Export each headline in the current file to a bibtex entry.
Headlines are exported using `org-bibtex-headline'." Headlines are exported using `org-bibtex-headline'."
(interactive (interactive
(list (read-file-name (list (read-file-name
"Bibtex file: " nil nil nil "BibTeX file: " nil nil nil
(let ((file (buffer-file-name (buffer-base-buffer)))) (let ((file (buffer-file-name (buffer-base-buffer))))
(and file (and file
(file-name-nondirectory (file-name-nondirectory
@ -619,7 +619,7 @@ Headlines are exported using `org-bibtex-headline'."
nil)))) nil))))
(when error-point (when error-point
(goto-char error-point) (goto-char error-point)
(message "Bibtex error at %S" (nth 4 (org-heading-components)))))) (message "BibTeX error at %S" (nth 4 (org-heading-components))))))
(defun org-bibtex-check (&optional optional) (defun org-bibtex-check (&optional optional)
"Check the current headline for required fields. "Check the current headline for required fields.

2
lisp/org/org-agenda.el
View file

@ -3348,7 +3348,7 @@ s Search for keywords M Like m, but only TODO entries
(`agenda (`agenda
(call-interactively 'org-agenda-list)) (call-interactively 'org-agenda-list))
(`agenda* (`agenda*
(funcall 'org-agenda-list nil nil t)) (funcall 'org-agenda-list nil nil nil t))
(`alltodo (`alltodo
(call-interactively 'org-todo-list)) (call-interactively 'org-todo-list))
(`search (`search

4
lisp/org/org-element.el
View file

@ -2462,7 +2462,7 @@ CDR is a plist containing `:key', `:value', `:begin', `:end',
(org-element-property :value keyword))) (org-element-property :value keyword)))
;;;; Latex Environment ;;;; LaTeX Environment
(defconst org-element--latex-begin-environment (defconst org-element--latex-begin-environment
"^[ \t]*\\\\begin{\\([A-Za-z0-9*]+\\)}" "^[ \t]*\\\\begin{\\([A-Za-z0-9*]+\\)}"
@ -3412,7 +3412,7 @@ CONTENTS is the contents of the object."
(format "/%s/" contents)) (format "/%s/" contents))
;;;; Latex Fragment ;;;; LaTeX Fragment
(defun org-element-latex-fragment-parser () (defun org-element-latex-fragment-parser ()
"Parse LaTeX fragment at point, if any. "Parse LaTeX fragment at point, if any.

8
lisp/org/org-persist.el
View file

@ -540,13 +540,13 @@ COLLECTION is the plist holding data collection."
(defun org-persist-read:file (_ path __) (defun org-persist-read:file (_ path __)
"Read file container from PATH." "Read file container from PATH."
(when (and path (file-exists-p (concat org-persist-directory path))) (when (and path (file-exists-p (org-file-name-concat org-persist-directory path)))
(concat org-persist-directory path))) (org-file-name-concat org-persist-directory path)))
(defun org-persist-read:url (_ path __) (defun org-persist-read:url (_ path __)
"Read file container from PATH." "Read file container from PATH."
(when (and path (file-exists-p (concat org-persist-directory path))) (when (and path (file-exists-p (org-file-name-concat org-persist-directory path)))
(concat org-persist-directory path))) (org-file-name-concat org-persist-directory path)))
(defun org-persist-read:index (cont index-file _) (defun org-persist-read:index (cont index-file _)
"Read index container CONT from INDEX-FILE." "Read index container CONT from INDEX-FILE."

2
lisp/org/org-src.el
View file

@ -315,7 +315,7 @@ is 0.")
(defun org-src--construct-edit-buffer-name (org-buffer-name lang) (defun org-src--construct-edit-buffer-name (org-buffer-name lang)
"Construct the buffer name for a source editing buffer. "Construct the buffer name for a source editing buffer.
Format is \"*Org Src ORG-BUFFER-NAME [ LANG ]*\"." Format is \"*Org Src ORG-BUFFER-NAME[ LANG ]*\"."
(concat "*Org Src " org-buffer-name "[ " lang " ]*")) (concat "*Org Src " org-buffer-name "[ " lang " ]*"))
(defun org-src--edit-buffer (beg end) (defun org-src--edit-buffer (beg end)

2
lisp/org/org-version.el
View file

@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." Inserted by installing Org or when a release is made."
(let ((org-git-version "release_9.6.1-40-g3d817c")) (let ((org-git-version "release_9.6.1-48-g92471e"))
org-git-version)) org-git-version))
(provide 'org-version) (provide 'org-version)

4
lisp/org/ox-ascii.el
View file

@ -1549,7 +1549,7 @@ information."
keyword info))))) keyword info)))))
;;;; Latex Environment ;;;; LaTeX Environment
(defun org-ascii-latex-environment (latex-environment _contents info) (defun org-ascii-latex-environment (latex-environment _contents info)
"Transcode a LATEX-ENVIRONMENT element from Org to ASCII. "Transcode a LATEX-ENVIRONMENT element from Org to ASCII.
@ -1561,7 +1561,7 @@ information."
latex-environment info))) latex-environment info)))
;;;; Latex Fragment ;;;; LaTeX Fragment
(defun org-ascii-latex-fragment (latex-fragment _contents info) (defun org-ascii-latex-fragment (latex-fragment _contents info)
"Transcode a LATEX-FRAGMENT object from Org to ASCII. "Transcode a LATEX-FRAGMENT object from Org to ASCII.

4
lisp/org/ox-html.el
View file

@ -2969,7 +2969,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
((string= "listings" value) (org-html-list-of-listings info)) ((string= "listings" value) (org-html-list-of-listings info))
((string= "tables" value) (org-html-list-of-tables info)))))))) ((string= "tables" value) (org-html-list-of-tables info))))))))
;;;; Latex Environment ;;;; LaTeX Environment
(defun org-html-format-latex (latex-frag processing-type info) (defun org-html-format-latex (latex-frag processing-type info)
"Format a LaTeX fragment LATEX-FRAG into HTML. "Format a LaTeX fragment LATEX-FRAG into HTML.
@ -3086,7 +3086,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
info caption label))))) info caption label)))))
(t (org-html--wrap-latex-environment latex-frag info caption label))))) (t (org-html--wrap-latex-environment latex-frag info caption label)))))
;;;; Latex Fragment ;;;; LaTeX Fragment
(defun org-html-latex-fragment (latex-fragment _contents info) (defun org-html-latex-fragment (latex-fragment _contents info)
"Transcode a LATEX-FRAGMENT object from Org to HTML. "Transcode a LATEX-FRAGMENT object from Org to HTML.

6
lisp/org/ox-latex.el
View file

@ -1272,7 +1272,7 @@ used. When nil, no theme is applied."
(defun org-latex-generate-engraved-preamble (info) (defun org-latex-generate-engraved-preamble (info)
"Generate the preamble to setup engraved code. "Generate the preamble to setup engraved code.
The result is constructed from the :latex-engraved-preamble and The result is constructed from the :latex-engraved-preamble and
:latex-engraved-optionsn export options, the default values of :latex-engraved-options export options, the default values of
which are given by `org-latex-engraved-preamble' and which are given by `org-latex-engraved-preamble' and
`org-latex-engraved-options' respectively." `org-latex-engraved-options' respectively."
(let* ((engraved-options (let* ((engraved-options
@ -2600,7 +2600,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(otherwise "\\lstlistoflistings"))))))))) (otherwise "\\lstlistoflistings")))))))))
;;;; Latex Environment ;;;; LaTeX Environment
(defun org-latex--environment-type (latex-environment) (defun org-latex--environment-type (latex-environment)
"Return the TYPE of LATEX-ENVIRONMENT. "Return the TYPE of LATEX-ENVIRONMENT.
@ -2658,7 +2658,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(insert caption) (insert caption)
(buffer-string)))))) (buffer-string))))))
;;;; Latex Fragment ;;;; LaTeX Fragment
(defun org-latex-latex-fragment (latex-fragment _contents _info) (defun org-latex-latex-fragment (latex-fragment _contents _info)
"Transcode a LATEX-FRAGMENT object from Org to LaTeX. "Transcode a LATEX-FRAGMENT object from Org to LaTeX.

4
lisp/org/ox-md.el
View file

@ -486,7 +486,7 @@ channel."
(_ (org-export-with-backend 'html keyword contents info)))) (_ (org-export-with-backend 'html keyword contents info))))
;;;; Latex Environment ;;;; LaTeX Environment
(defun org-md-latex-environment (latex-environment _contents info) (defun org-md-latex-environment (latex-environment _contents info)
"Transcode a LATEX-ENVIRONMENT object from Org to Markdown. "Transcode a LATEX-ENVIRONMENT object from Org to Markdown.
@ -501,7 +501,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
latex-frag) latex-frag)
latex-frag)))) latex-frag))))
;;;; Latex Fragment ;;;; LaTeX Fragment
(defun org-md-latex-fragment (latex-fragment _contents info) (defun org-md-latex-fragment (latex-fragment _contents info)
"Transcode a LATEX-FRAGMENT object from Org to Markdown. "Transcode a LATEX-FRAGMENT object from Org to Markdown.

4
lisp/org/ox-odt.el
View file

@ -1986,7 +1986,7 @@ information."
(ignore)))))))) (ignore))))))))
;;;; Latex Environment ;;;; LaTeX Environment
;; (eval-after-load 'ox-odt '(ad-deactivate 'org-format-latex-as-mathml)) ;; (eval-after-load 'ox-odt '(ad-deactivate 'org-format-latex-as-mathml))
;; (advice-add 'org-format-latex-as-mathml ; FIXME ;; (advice-add 'org-format-latex-as-mathml ; FIXME
@ -2007,7 +2007,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(org-odt-do-format-code latex-frag info))) (org-odt-do-format-code latex-frag info)))
;;;; Latex Fragment ;;;; LaTeX Fragment
;; (when latex-frag ; FIXME ;; (when latex-frag ; FIXME
;; (setq href (propertize href :title "LaTeX Fragment" ;; (setq href (propertize href :title "LaTeX Fragment"