daniel/emacs-conf
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages and add valign

Browse Source
This commit is contained in:
Daniel Weschke
2026-04-05 20:00:27 +02:00
parent b062fb98e3
commit 03fb00e374
640 changed files with 109768 additions and 39311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
lisp/org/ox.el
View File

@@ -1,6 +1,6 @@
;;; ox.el --- Export Framework for Org Mode -*- lexical-binding: t; -*-
;; Copyright (C) 2012-2025 Free Software Foundation, Inc.
;; Copyright (C) 2012-2026 Free Software Foundation, Inc.
;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
;; Maintainer: Ihor Radchenko <yantar92 at posteo dot net>
@@ -90,9 +90,7 @@
(declare-function org-publish-all "ox-publish" (&optional force async))
(declare-function org-publish-current-file "ox-publish" (&optional force async))
(declare-function org-publish-current-project "ox-publish" (&optional force async))
(declare-function org-at-heading-p "org" (&optional _))
(declare-function org-back-to-heading "org" (&optional invisible-ok))
(declare-function org-next-visible-heading "org" (arg))
(defvar org-publish-project-alist)
(defvar org-table-number-fraction)
@@ -185,6 +183,20 @@ BEHAVIOR determines how Org should handle multiple keywords for
Values set through KEYWORD and OPTION have precedence over
DEFAULT.
When adding new export options to the alist, it is recommended to
provide OPTION and/or KEYWORD depending on the allowed values for a
given export option. For example,
(:with-tags nil \"tags\" org-export-with-tags)
takes short boolean values t/nil and can be succintly set as
#+OPTIONS: tags:t
So, using OPTION makes more sense than forcing something like
#+WITH_TAGS: t
On the other hand,
(:title \"TITLE\" nil nil parse)
may have very long string value and may better be set on a separate line
#+TITLE: Some very long title that would not fit well into #+OPTIONS
All these properties should be backend agnostic. Backend
specific properties are set through `org-export-define-backend'.
Properties redefined there have precedence over these.")
@@ -520,10 +532,10 @@ t Allow export of math snippets."
:safe (lambda (x) (memq x '(t nil verbatim))))
(defcustom org-export-headline-levels 3
"The last level which is still exported as a headline.
"This level and its ancestors will be exported as a headline.
Inferior levels will usually produce itemize or enumerate lists
when exported, but backend behavior may differ.
Descendants of this level will usually produce itemized or
enumerated lists when exported, but backend behavior may differ.
This option can also be set with the OPTIONS keyword,
e.g. \"H:2\"."
@@ -802,10 +814,11 @@ also be set with the OPTIONS keyword, e.g. \"timestamp:nil\"."
"Non-nil means allow timestamps in export.
It can be set to any of the following values:
t export all timestamps.
`active' export active timestamps only.
`inactive' export inactive timestamps only.
nil do not export timestamps
t export all timestamps.
`active' export active timestamps, including diary timestamps.
`active-exclude-diary' export active timestamps, excluding diary timestamps.
`inactive' export inactive timestamps only.
nil do not export timestamps
This only applies to timestamps isolated in a paragraph
containing only timestamps. Other timestamps are always
@@ -814,12 +827,15 @@ exported.
This option can also be set with the OPTIONS keyword, e.g.
\"<:nil\"."
:group 'org-export-general
:package-version '(Org . "9.8")
:type '(choice
(const :tag "All timestamps" t)
(const :tag "Only active timestamps" active)
(const :tag "Active timestamps, including diary timestamps" active)
(const :tag "Active timestamps, excluding diary timestamps"
active-exclude-diary)
(const :tag "Only inactive timestamps" inactive)
(const :tag "No timestamp" nil))
:safe (lambda (x) (memq x '(t nil active inactive))))
:safe (lambda (x) (memq x '(t nil active active-exclude-diary inactive))))
(defcustom org-export-with-todo-keywords t
"Non-nil means include TODO keywords in export.
@@ -864,6 +880,15 @@ This option can also be set with the OPTIONS keyword, e.g.,
:package-version '(Org . "9.7")
:type 'boolean)
(defcustom org-export-replace-macros t
"When non-nil, replace macros before export.
This variable does not affect {{{results}}} macros when processing
code block results."
:group 'org-export-general
:package-version '(Org . "9.8")
:type 'boolean
:safe (lambda (obj) (null obj)))
(defcustom org-export-snippet-translation-alist nil
"Alist between export snippets backends and exporter backends.
@@ -1131,7 +1156,7 @@ Return nil if BACKEND is unknown."
(let ((options (org-export-backend-options backend))
parent)
(while (setq parent (org-export-backend-parent backend))
(setq backend (org-export-get-backend parent))
(setq backend (if (symbolp parent) (org-export-get-backend parent) parent))
(setq options (append options (org-export-backend-options backend))))
options)))
@@ -1149,7 +1174,7 @@ returns filters inherited from parent backends, if any."
(let ((filters (org-export-backend-filters backend))
parent)
(while (setq parent (org-export-backend-parent backend))
(setq backend (org-export-get-backend parent))
(setq backend (if (symbolp parent) (org-export-get-backend parent) parent))
(setq filters (append filters (org-export-backend-filters backend))))
filters)))
@@ -1433,11 +1458,15 @@ specific items to read, if any."
;; Priority is given to backend specific options.
(all (append (org-export-get-all-options backend)
org-export-options-alist))
(plist))
(plist)
seen-options)
(when line
(dolist (entry all plist)
(let ((item (nth 2 entry)))
(when item
(when (and item
;; Only use the first option set by derived backend.
(not (memq (car entry) seen-options)))
(push (car entry) seen-options)
(let ((v (assoc-string item line t)))
(when v (setq plist (plist-put plist (car entry) (cdr v)))))))))))
@@ -1469,12 +1498,17 @@ for export. Return options as a plist."
;; Look for both general keywords and backend specific
;; options, with priority given to the latter.
(options (append (org-export-get-all-options backend)
org-export-options-alist)))
org-export-options-alist))
seen-properties)
;; Handle other keywords. Then return PLIST.
(dolist (option options plist)
(let ((property (car option))
(keyword (nth 1 option)))
(when keyword
(when (and keyword
;; Only consider the first instance of property
;; In other words, derived backend settings take precendence.
(not (memq property seen-properties)))
(push property seen-properties)
(let ((value
(or (cdr (assoc keyword cache))
(let ((v (org-entry-get (point)
@@ -1510,10 +1544,18 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
(let ((find-properties
(lambda (keyword)
;; Return all properties associated to KEYWORD.
(let (properties)
(let (properties seen-properties)
(dolist (option options properties)
(when (equal (nth 1 option) keyword)
(cl-pushnew (car option) properties)))))))
;; Ignore all but first :export-property
;; This is to avoid situations like
;; (:parent-backend-property "PARENT_KEYWORD" ...)
;; (:child-backend-property "CHILD_KEYWORD" ...)
;; where we should ignore #+PARENT_KEYWORD when child
;; backend is used.
(unless (memq (car option) seen-properties)
(push (car option) seen-properties)
(when (equal (nth 1 option) keyword)
(cl-pushnew (car option) properties))))))))
;; Read options in the current buffer and return value.
(dolist (entry (org-collect-keywords
(nconc (delq nil (mapcar #'cadr options))
@@ -1552,7 +1594,7 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
(newline
(mapconcat #'identity values "\n"))
(split
(cl-mapcan (lambda (v) (split-string v)) values))
(cl-mapcan #'split-string values))
((t)
(org-last values))
(otherwise
@@ -1849,13 +1891,23 @@ not exported."
(lambda (obj)
(or (not (stringp obj)) (org-string-nw-p obj)))
options t))))
(cl-case (plist-get options :with-timestamps)
((nil) t)
(active
(not (memq (org-element-property :type datum) '(active active-range))))
(inactive
(not (memq (org-element-property :type datum)
'(inactive inactive-range)))))))))
(org-export--skip-timestamp-p
(plist-get options :with-timestamps)
(org-element-property :type datum))))))
(defun org-export--skip-timestamp-p (with-timestamps timestamp-type)
"Decides whether to skip a timestamp during export.
WITH-TIMESTAMPS should be a valid option for
`org-export-with-timestamps'. TIMESTAMP-TYPE should be the
`:type' property of a timestamp element."
(cl-case with-timestamps
((nil) t)
(active
(not (memq timestamp-type '(active active-range diary))))
(active-exclude-diary
(not (memq timestamp-type '(active active-range))))
(inactive
(not (memq timestamp-type '(inactive inactive-range))))))
;;; The Transcoder
@@ -2123,8 +2175,8 @@ keywords before output."
;; Filters properties are installed in communication channel with
;; `org-export-install-filters' function.
;;
;; Eventually, two hooks (`org-export-before-processing-hook' and
;; `org-export-before-parsing-hook') are run at the beginning of the
;; Eventually, two hooks (`org-export-before-processing-functions' and
;; `org-export-before-parsing-functions') are run at the beginning of the
;; export process and just before parsing to allow for heavy structure
;; modifications.
@@ -3048,12 +3100,13 @@ still inferior to file-local settings."
org-export-options-alist))))
tree modified-tick)
;; Run first hook with current backend's name as argument.
(run-hook-with-args 'org-export-before-processing-hook
(run-hook-with-args 'org-export-before-processing-functions
(org-export-backend-name backend))
(org-export-expand-include-keyword nil nil nil nil (plist-get info :expand-links))
(org-export--delete-comment-trees)
(org-macro-initialize-templates org-export-global-macros)
(org-macro-replace-all org-macro-templates parsed-keywords)
(when org-export-replace-macros
(org-macro-initialize-templates org-export-global-macros)
(org-macro-replace-all org-macro-templates parsed-keywords))
;; Refresh buffer properties and radio targets after previous
;; potentially invasive changes.
(org-set-regexps-and-options)
@@ -3075,7 +3128,7 @@ still inferior to file-local settings."
;; before parsing.
(goto-char (point-min))
(save-excursion
(run-hook-with-args 'org-export-before-parsing-hook
(run-hook-with-args 'org-export-before-parsing-functions
(org-export-backend-name backend)))
(unless (eq modified-tick (buffer-chars-modified-tick))
(org-set-regexps-and-options)
@@ -3111,6 +3164,17 @@ still inferior to file-local settings."
(when result (setq info result)))))
;; Parse buffer.
(setq tree (org-element-parse-buffer nil visible-only 'defer))
;; Force parsing ALT_TITLE property of headlines.
(org-element-map tree '(headline inlinetask)
(lambda (h)
(when-let* ((alt-title (org-element-property :ALT_TITLE h)))
(org-element-put-property
h :ALT_TITLE
(org-element-parse-secondary-string
alt-title (org-element-restriction 'headline) h))
(org-element-put-property
h :secondary
(cons :ALT_TITLE (org-element-property :secondary h))))))
;; Prune tree from non-exported elements and transform
;; uninterpreted elements or objects in both parse tree and
;; communication channel.
@@ -3293,7 +3357,8 @@ variables in include file names."
(when (org-element-type-p element 'keyword)
(forward-line 0)
;; Extract arguments from keyword's value.
(let* ((value (org-element-property :value element))
(let* ((indentation (org-current-text-indentation))
(value (org-element-property :value element))
(parameters (org-export-parse-include-value value dir))
(file (if expand-env
(substitute-env-in-file-name
@@ -3318,7 +3383,8 @@ variables in include file names."
:file-prefix file-prefix
:footnotes footnotes
:already-included included
:expand-env expand-env)
:expand-env expand-env
:indentation indentation)
;; Expand footnotes after all files have been
;; included. Footnotes are stored at end of buffer.
(unless included
@@ -3413,7 +3479,8 @@ provided as the :unmatched parameter."
(cl-defun org-export--blindly-expand-include
(parameters
&key includer-file file-prefix footnotes already-included expand-env)
&key includer-file file-prefix footnotes
already-included expand-env indentation)
"Unconditionally include reference defined by PARAMETERS in the buffer.
PARAMETERS is a plist of the form returned by `org-export-parse-include-value'.
@@ -3425,7 +3492,7 @@ which when provided allows footnotes to be handled appropriately.
ALREADY-INCLUDED is a list of included names along with their
line restriction which prevents recursion. EXPAND-ENV is a flag to
expand environment variables for #+INCLUDE keywords in the included
file."
file. INDENTATION is the common indentation to be added."
(let* ((coding-system-for-read
(or (plist-get parameters :coding-system)
coding-system-for-read))
@@ -3433,7 +3500,7 @@ file."
(lines (plist-get parameters :lines))
(args (plist-get parameters :args))
(block (plist-get parameters :block))
(ind (org-current-text-indentation)))
(ind indentation))
(cond
((eq (plist-get parameters :env) 'literal)
(insert
@@ -4198,10 +4265,8 @@ fail, the fall-back value is \"???\"."
(defun org-export-get-alt-title (headline _)
"Return alternative title for HEADLINE, as a secondary string.
If no optional title is defined, fall-back to the regular title."
(let ((alt (org-element-property :ALT_TITLE headline)))
(if alt (org-element-parse-secondary-string
alt (org-element-restriction 'headline) headline)
(org-element-property :title headline))))
(or (org-element-property :ALT_TITLE headline)
(org-element-property :title headline)))
(defun org-export-first-sibling-p (blob info)
"Non-nil when BLOB is the first sibling in its parent.
@@ -4658,7 +4723,6 @@ Return value can be an object or an element:
(org-persist-register location-type path
:write-immediately t))))
(require 'subr-x) ;; FIXME: For `thread-first' in Emacs 26.
(defun org-export-link-localise (link)
"Convert remote LINK to local link.
If LINK refers to a remote resource, modify it to point to a local
@@ -5549,12 +5613,10 @@ Footnote sections are ignored."
(+ (org-export-get-relative-level scope info) n))
limit))))
(org-element-map (org-element-contents scope) 'headline
(lambda (h)
(and (not (org-element-property :footnote-section-p h))
(not (equal "notoc"
(org-export-get-node-property :UNNUMBERED h t)))
(>= n (org-export-get-relative-level h info))
h))
(lambda (headline)
(and (not (org-export-excluded-from-toc-p headline info))
(>= n (org-export-get-relative-level headline info))
headline))
info)))
(defun org-export-collect-elements (type info &optional predicate)
@@ -5619,7 +5681,11 @@ contents. However, it is useful if some additional processing is
required on headlines excluded from table of contents."
(or (org-element-property :footnote-section-p headline)
(org-export-low-level-p headline info)
(equal "notoc" (org-export-get-node-property :UNNUMBERED headline t))))
(equal "notoc" (org-export-get-node-property :UNNUMBERED headline t))
(let ((toc-depth (plist-get info :with-toc)))
(and (wholenump toc-depth)
(> (org-export-get-relative-level headline info)
toc-depth)))))
(defun org-export-toc-entry-backend (parent &rest transcoders)
"Return an export backend appropriate for table of contents entries.
@@ -6426,7 +6492,7 @@ them."
("it" :default "Riferimenti")
("nl" :default "Bronverwijzingen")
("nn" :default "Kjelder")
("pl" :default "Odwołania") ; could be "Referencje" but I think its too englishy
("pl" :default "Odwołania") ; could be "Referencje" but I think it's too Englishy
("pt_BR" :html "Refer&ecirc;ncias" :default "Referências" :ascii "Referencias")
("ro" :default "Bibliografie")
("sl" :default "Reference")
@@ -6677,7 +6743,10 @@ and `org-export-to-file' for more specialized functions."
;; buffer to a temporary file, as it may be too long for program
;; args in `start-process'.
(with-temp-message "Initializing asynchronous export process"
(let ((copy-fun (org-element--generate-copy-script (current-buffer)))
(let ((copy-fun (org-element--generate-copy-script
;; Text properties may contain unreadable Elisp
;; objects. Avoid them.
(current-buffer) :drop-text-properties t))
(temp-file (make-temp-file "org-export-process")))
(let ((coding-system-for-write 'emacs-internal))
(write-region
@@ -7291,14 +7360,14 @@ back to standard interface."
(lambda (sub-entry)
(cl-incf index)
(format
(if (zerop (mod index 2)) " [%s] %-26s"
(if (cl-evenp index) " [%s] %-26s"
"[%s] %s\n")
(funcall fontify-key
(char-to-string (car sub-entry))
top-key)
(nth 1 sub-entry)))
sub-menu "")
(when (zerop (mod index 2)) "\n"))))))))
(when (cl-evenp index) "\n"))))))))
entries ""))
;; Publishing menu is hard-coded.
(format "\n[%s] Publish
@@ -7386,9 +7455,22 @@ Toggle export options when required. Otherwise, return value is
a list with action as CAR and a list of interactive export
options as CDR."
(let (key)
;; Scrolling: when in non-expert mode, act on motion keys (C-n,
;; C-p, SPC, DEL).
(while (and (setq key (read-char-exclusive prompt))
;; Scrolling: When in non-expert mode, act on motion keys (C-n,
;; C-p, SPC, DEL), and translate down/up arrow keys and scroll
;; wheel to C-n/C-p, respectively.
(while (and (setq key
(pcase (read-event prompt)
((or 'up
`(wheel-up . ,_)
`(double-wheel-up . ,_)
`(triple-wheel-up . ,_))
?\C-p)
((or 'down
`(wheel-down . ,_)
`(double-wheel-down . ,_)
`(triple-wheel-down . ,_))
?\C-n)
(event event)))
(not expertp)
;; FIXME: Don't use C-v (22) here, as it is used as a
;; modifier key in the export dispatch.