update of packages
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
;;; ox.el --- Export Framework for Org Mode -*- lexical-binding: t; -*-
|
||||
|
||||
;; Copyright (C) 2012-2022 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2012-2023 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
@@ -264,13 +264,17 @@ See `org-export-inline-image-p' for more information about
|
||||
rules.")
|
||||
|
||||
(defconst org-export-ignored-local-variables
|
||||
'( org-font-lock-keywords org-element--cache-change-tic
|
||||
org-element--cache-change-tic org-element--cache-size
|
||||
org-element--headline-cache-size
|
||||
org-element--cache-sync-keys-value
|
||||
org-element--cache-change-warning org-element--headline-cache
|
||||
org-element--cache org-element--cache-sync-keys
|
||||
org-element--cache-sync-requests org-element--cache-sync-timer)
|
||||
'( org-font-lock-keywords
|
||||
org-element--cache org-element--cache-size
|
||||
org-element--headline-cache org-element--headline-cache-size
|
||||
org-element--cache-hash-left org-element--cache-hash-right
|
||||
org-element--cache-sync-requests org-element--cache-sync-timer
|
||||
org-element--cache-sync-keys-value org-element--cache-change-tic
|
||||
org-element--cache-last-buffer-size
|
||||
org-element--cache-diagnostics-ring
|
||||
org-element--cache-diagnostics-ring-size
|
||||
org-element--cache-gapless
|
||||
org-element--cache-change-warning)
|
||||
"List of variables not copied through upon buffer duplication.
|
||||
Export process takes place on a copy of the original buffer.
|
||||
When this copy is created, all Org related local variables not in
|
||||
@@ -2559,7 +2563,7 @@ variable and do not do anything that might alter it (like calling a
|
||||
major mode) to prevent data corruption. Also, do note that Emacs may
|
||||
jump into the created buffer if the original file buffer is closed and
|
||||
then re-opened. Making edits in the buffer copy may also trigger
|
||||
Emacs save dialogue. Prefer using `org-export-with-buffer-copy' macro
|
||||
Emacs save dialog. Prefer using `org-export-with-buffer-copy' macro
|
||||
when possible.
|
||||
|
||||
When optional key `:to-buffer' is non-nil, copy into BUFFER.
|
||||
@@ -3036,6 +3040,11 @@ Return code as a string."
|
||||
(org-narrow-to-subtree)
|
||||
(goto-char (point-min))
|
||||
(org-end-of-meta-data)
|
||||
;; Make the region include top heading in the subtree.
|
||||
;; This way, we will be able to retrieve its export
|
||||
;; options when calling
|
||||
;; `org-export--get-subtree-options'.
|
||||
(when (bolp) (backward-char))
|
||||
(narrow-to-region (point) (point-max))))
|
||||
;; Initialize communication channel with original buffer
|
||||
;; attributes, unavailable in its copy.
|
||||
@@ -4607,12 +4616,17 @@ If LINK refers to a remote resource, modify it to point to a local
|
||||
downloaded copy. Otherwise, return unchanged LINK."
|
||||
(when (org-export-link-remote-p link)
|
||||
(let* ((local-path (org-export-link--remote-local-copy link)))
|
||||
(setcdr link
|
||||
(thread-first (cadr link)
|
||||
(plist-put :type "file")
|
||||
(plist-put :path local-path)
|
||||
(plist-put :raw-link (concat "file:" local-path))
|
||||
list))))
|
||||
(if local-path
|
||||
(setcdr link
|
||||
(thread-first (cadr link)
|
||||
(plist-put :type "file")
|
||||
(plist-put :path local-path)
|
||||
(plist-put :raw-link (concat "file:" local-path))
|
||||
list))
|
||||
(display-warning
|
||||
'(org export)
|
||||
(format "unable to obtain local copy of %s"
|
||||
(org-element-property :raw-link link))))))
|
||||
link)
|
||||
|
||||
;;;; For References
|
||||
@@ -4748,23 +4762,27 @@ objects of the same type."
|
||||
(let ((counter 0))
|
||||
;; Increment counter until ELEMENT is found again.
|
||||
(org-element-map (plist-get info :parse-tree)
|
||||
(or types (org-element-type element))
|
||||
(or (and types (cons (org-element-type element) types))
|
||||
(org-element-type element))
|
||||
(lambda (el)
|
||||
(let ((cached (org-element-property :org-export--counter el)))
|
||||
(cond
|
||||
((eq element el) (1+ counter))
|
||||
;; Use cached result.
|
||||
((and cached (equal predicate (car cached)))
|
||||
(cdr cached))
|
||||
((and cached
|
||||
(equal predicate (car cached))
|
||||
(equal types (cadr cached)))
|
||||
(setq counter (nth 2 cached))
|
||||
nil)
|
||||
((not predicate)
|
||||
(cl-incf counter)
|
||||
(org-element-put-property
|
||||
el :org-export--counter (cons predicate counter))
|
||||
el :org-export--counter (list predicate types counter))
|
||||
nil)
|
||||
((funcall predicate el info)
|
||||
(cl-incf counter)
|
||||
(org-element-put-property
|
||||
el :org-export--counter (cons predicate counter))
|
||||
el :org-export--counter (list predicate types counter))
|
||||
nil))))
|
||||
info 'first-match)))))
|
||||
|
||||
@@ -5670,11 +5688,8 @@ transcoding it."
|
||||
(primary-closing
|
||||
:utf-8 " »" :html " »" :latex "\\fg{}"
|
||||
:texinfo "@tie{}@guillemetright{}")
|
||||
(secondary-opening
|
||||
:utf-8 "« " :html "« " :latex "\\og "
|
||||
:texinfo "@guillemetleft{}@tie{}")
|
||||
(secondary-closing :utf-8 " »" :html " »" :latex "\\fg{}"
|
||||
:texinfo "@tie{}@guillemetright{}")
|
||||
(secondary-opening :utf-8 "“" :html "“" :latex "``" :texinfo "``")
|
||||
(secondary-closing :utf-8 "”" :html "”" :latex "''" :texinfo "''")
|
||||
(apostrophe :utf-8 "’" :html "’"))
|
||||
("is"
|
||||
(primary-opening
|
||||
@@ -6393,7 +6408,7 @@ them."
|
||||
("nb" :default "Innhold")
|
||||
("nn" :default "Innhald")
|
||||
("pl" :html "Spis treści")
|
||||
("pt_BR" :html "Índice" :utf8 "Índice" :ascii "Indice")
|
||||
("pt_BR" :html "Índice" :utf-8 "Índice" :ascii "Indice")
|
||||
("ro" :default "Cuprins")
|
||||
("ru" :html "Содержание"
|
||||
:utf-8 "Содержание")
|
||||
@@ -6586,14 +6601,14 @@ see.
|
||||
Optional argument POST-PROCESS is a function which should accept
|
||||
no argument. It is always called within the current process,
|
||||
from BUFFER, with point at its beginning. Export back-ends can
|
||||
use it to set a major mode there, e.g,
|
||||
use it to set a major mode there, e.g.,
|
||||
|
||||
(defun org-latex-export-as-latex
|
||||
(&optional async subtreep visible-only body-only ext-plist)
|
||||
(interactive)
|
||||
(org-export-to-buffer \\='latex \"*Org LATEX Export*\"
|
||||
async subtreep visible-only body-only ext-plist
|
||||
#'LaTeX-mode))
|
||||
#\\='LaTeX-mode))
|
||||
|
||||
When expressed as an anonymous function, using `lambda',
|
||||
POST-PROCESS needs to be quoted.
|
||||
@@ -6680,6 +6695,11 @@ or FILE."
|
||||
',ext-plist)))
|
||||
(with-temp-buffer
|
||||
(insert output)
|
||||
;; Ensure final newline. This is what was done
|
||||
;; historically, when we used `write-file'.
|
||||
;; Note that adding a newline is only safe for
|
||||
;; non-binary data.
|
||||
(unless (bolp) (insert "\n"))
|
||||
(let ((coding-system-for-write ',encoding))
|
||||
(write-region (point-min) (point-max) ,file)))
|
||||
(or (ignore-errors (funcall ',post-process ,file)) ,file)))
|
||||
@@ -6687,6 +6707,11 @@ or FILE."
|
||||
backend subtreep visible-only body-only ext-plist)))
|
||||
(with-temp-buffer
|
||||
(insert output)
|
||||
;; Ensure final newline. This is what was done
|
||||
;; historically, when we used `write-file'.
|
||||
;; Note that adding a newline is only safe for
|
||||
;; non-binary data.
|
||||
(unless (bolp) (insert "\n"))
|
||||
(let ((coding-system-for-write encoding))
|
||||
(write-region (point-min) (point-max) file)))
|
||||
(when (and (org-export--copy-to-kill-ring-p) (org-string-nw-p output))
|
||||
@@ -6743,7 +6768,6 @@ Return file name as a string."
|
||||
(cond
|
||||
(pub-dir (concat (file-name-as-directory pub-dir)
|
||||
(file-name-nondirectory base-name)))
|
||||
((file-name-absolute-p base-name) base-name)
|
||||
(t base-name))))
|
||||
;; If writing to OUTPUT-FILE would overwrite original file, append
|
||||
;; EXTENSION another time to final name.
|
||||
|
||||
Reference in New Issue
Block a user