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

Merge branch 'bugfix'

This commit is contained in:
Bastien 2021-09-30 23:20:04 +02:00
parent 2cdd930a7b f5b297292e
commit 6c8f8f6225
2 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lisp/ob-julia.el
View File

@ -44,7 +44,7 @@
(raw org html latex code pp wrap) (raw org html latex code pp wrap)
(replace silent append prepend) (replace silent append prepend)
(output value graphics)))) (output value graphics))))
"julia-specific header arguments.") "Julia-specific header arguments.")
(add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl")) (add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl"))
@ -58,8 +58,8 @@
:type 'string) :type 'string)
(defvar ess-current-process-name) ; dynamically scoped (defvar ess-current-process-name) ; dynamically scoped
(defvar ess-local-process-name) ; dynamically scoped (defvar ess-local-process-name) ; dynamically scoped
(defvar ess-eval-visibly-p) ; dynamically scoped (defvar ess-eval-visibly-p) ; dynamically scoped
(defun org-babel-edit-prep:julia (info) (defun org-babel-edit-prep:julia (info)
(let ((session (cdr (assq :session (nth 2 info))))) (let ((session (cdr (assq :session (nth 2 info)))))
(when (and session (when (and session
@ -69,7 +69,7 @@
(defun org-babel-expand-body:julia (body params &optional _graphics-file) (defun org-babel-expand-body:julia (body params &optional _graphics-file)
"Expand BODY according to PARAMS, return the expanded body." "Expand BODY according to PARAMS, return the expanded body."
(mapconcat 'identity (mapconcat #'identity
(append (append
(when (cdr (assq :prologue params)) (when (cdr (assq :prologue params))
(list (cdr (assq :prologue params)))) (list (cdr (assq :prologue params))))
@ -143,15 +143,15 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-julia-quote-csv-field (s) (defun org-babel-julia-quote-csv-field (s)
"Quote field S for export to julia." "Quote field S for export to julia."
(if (stringp s) (if (stringp s)
(concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") (concat "\"" (mapconcat #'identity (split-string s "\"") "\"\"") "\"")
(format "%S" s))) (format "%S" s)))
(defun org-babel-julia-assign-elisp (name value) (defun org-babel-julia-assign-elisp (name value)
"Construct julia code assigning the elisp VALUE to a variable named NAME." "Construct julia code assigning the elisp VALUE to a variable named NAME."
(if (listp value) (if (listp value)
(let* ((lengths (mapcar 'length (cl-remove-if-not 'sequencep value))) (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value)))
(max (if lengths (apply 'max lengths) 0)) (max (if lengths (apply #'max lengths) 0))
(min (if lengths (apply 'min lengths) 0))) (min (if lengths (apply #'min lengths) 0)))
;; Ensure VALUE has an orgtbl structure (depth of at least 2). ;; Ensure VALUE has an orgtbl structure (depth of at least 2).
(unless (listp (car value)) (setq value (list value))) (unless (listp (car value)) (setq value (list value)))
(let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field)))) (let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field))))
@ -173,11 +173,15 @@ end"
(unless (string= session "none") (unless (string= session "none")
(let ((session (or session "*Julia*")) (let ((session (or session "*Julia*"))
(ess-ask-for-ess-directory (ess-ask-for-ess-directory
(and (boundp 'ess-ask-for-ess-directory) (and (bound-and-true-p ess-ask-for-ess-directory)
ess-ask-for-ess-directory (not (cdr (assq :dir params))))))
(not (cdr (assq :dir params))))))
(if (org-babel-comint-buffer-livep session) (if (org-babel-comint-buffer-livep session)
session session
;; FIXME: Depending on `display-buffer-alist', (julia) may end up
;; popping up a new frame which `save-window-excursion' won't be able
;; to "undo", so we really should call a kind of
;; `julia-no-select' instead so we don't need to undo any
;; window-changes afterwards.
(save-window-excursion (save-window-excursion
(when (get-buffer session) (when (get-buffer session)
;; Session buffer exists, but with dead process ;; Session buffer exists, but with dead process
@ -191,14 +195,6 @@ end"
(buffer-name)))) (buffer-name))))
(current-buffer)))))) (current-buffer))))))
; (defun org-babel-julia-associate-session (session)
; "Associate julia code buffer with a julia session.
; Make SESSION be the inferior ESS process associated with the
; current code buffer."
; (setq ess-local-process-name
; (process-name (get-buffer-process session)))
; (ess-make-buffer-current))
(defun org-babel-julia-graphical-output-file (params) (defun org-babel-julia-graphical-output-file (params)
"Name of file to which julia should send graphical output." "Name of file to which julia should send graphical output."
(and (member "graphics" (cdr (assq :result-params params))) (and (member "graphics" (cdr (assq :result-params params)))
@ -304,7 +300,7 @@ last statement in BODY, as elisp."
column-names-p))) column-names-p)))
(output (output
(mapconcat (mapconcat
'org-babel-chomp #'org-babel-chomp
(butlast (butlast
(delq nil (delq nil
(mapcar (mapcar
@ -317,13 +313,14 @@ last statement in BODY, as elisp."
(substring line (match-end 1)) (substring line (match-end 1))
line)) line))
(org-babel-comint-with-output (session org-babel-julia-eoe-output) (org-babel-comint-with-output (session org-babel-julia-eoe-output)
(insert (mapconcat 'org-babel-chomp (insert (mapconcat #'org-babel-chomp
(list body org-babel-julia-eoe-indicator) (list body org-babel-julia-eoe-indicator)
"\n")) "\n"))
(inferior-ess-send-input)))))) "\n")))) (inferior-ess-send-input))))))
"\n"))))
(defun org-babel-julia-process-value-result (result column-names-p) (defun org-babel-julia-process-value-result (result column-names-p)
"julia-specific processing of return value. "Julia-specific processing of return value.
Insert hline if column names in output have been requested." Insert hline if column names in output have been requested."
(if column-names-p (if column-names-p
(cons (car result) (cons 'hline (cdr result))) (cons (car result) (cons 'hline (cdr result)))

26
lisp/ox-koma-letter.el
View File

@ -184,7 +184,6 @@
(defcustom org-koma-letter-class-option-file "NF" (defcustom org-koma-letter-class-option-file "NF"
"Letter Class Option File. "Letter Class Option File.
This option can also be set with the LCO keyword." This option can also be set with the LCO keyword."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-author 'user-full-name (defcustom org-koma-letter-author 'user-full-name
@ -196,7 +195,6 @@ Alternatively a string, nil or a function may be given.
Functions must return a string. Functions must return a string.
This option can also be set with the AUTHOR keyword." This option can also be set with the AUTHOR keyword."
:group 'org-export-koma-letter
:type '(radio (function-item user-full-name) :type '(radio (function-item user-full-name)
(string) (string)
(function) (function)
@ -210,7 +208,6 @@ returns `user-mail-address'. Alternatively a string, nil or
a function may be given. Functions must return a string. a function may be given. Functions must return a string.
This option can also be set with the EMAIL keyword." This option can also be set with the EMAIL keyword."
:group 'org-export-koma-letter
:type '(radio (function-item org-koma-letter-email) :type '(radio (function-item org-koma-letter-email)
(string) (string)
(function) (function)
@ -220,33 +217,28 @@ This option can also be set with the EMAIL keyword."
"Sender's address, as a string. "Sender's address, as a string.
This option can also be set with one or more FROM_ADDRESS This option can also be set with one or more FROM_ADDRESS
keywords." keywords."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-phone-number "" (defcustom org-koma-letter-phone-number ""
"Sender's phone number, as a string. "Sender's phone number, as a string.
This option can also be set with the PHONE_NUMBER keyword." This option can also be set with the PHONE_NUMBER keyword."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-url "" (defcustom org-koma-letter-url ""
"Sender's URL, e. g., the URL of her homepage. "Sender's URL, e. g., the URL of her homepage.
This option can also be set with the URL keyword." This option can also be set with the URL keyword."
:group 'org-export-koma-letter
:type 'string :type 'string
:safe #'stringp) :safe #'stringp)
(defcustom org-koma-letter-from-logo "" (defcustom org-koma-letter-from-logo ""
"Commands for inserting the sender's logo, e. g., \\includegraphics{logo}. "Commands for inserting the sender's logo, e. g., \\includegraphics{logo}.
This option can also be set with the FROM_LOGO keyword." This option can also be set with the FROM_LOGO keyword."
:group 'org-export-koma-letter
:type 'string :type 'string
:safe #'stringp) :safe #'stringp)
(defcustom org-koma-letter-place "" (defcustom org-koma-letter-place ""
"Place from which the letter is sent, as a string. "Place from which the letter is sent, as a string.
This option can also be set with the PLACE keyword." This option can also be set with the PLACE keyword."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-location "" (defcustom org-koma-letter-location ""
@ -264,7 +256,6 @@ special heading.
The location field is typically printed right of the address The location field is typically printed right of the address
field (See Figure 4.9. in the English manual of 2015-10-03)." field (See Figure 4.9. in the English manual of 2015-10-03)."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-opening "" (defcustom org-koma-letter-opening ""
@ -278,7 +269,6 @@ when:
(3) the letter contains a headline without a special (3) the letter contains a headline without a special
tag (e.g. \"to\" or \"ps\"); tag (e.g. \"to\" or \"ps\");
then the opening will be implicitly set as the untagged headline title." then the opening will be implicitly set as the untagged headline title."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-closing "" (defcustom org-koma-letter-closing ""
@ -292,7 +282,6 @@ when:
tag \"closing\"; tag \"closing\";
then the opening will be set as the title of the closing special then the opening will be set as the title of the closing special
heading title." heading title."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-signature "" (defcustom org-koma-letter-signature ""
@ -308,14 +297,12 @@ then the signature will be set as the content of the
closing special heading. closing special heading.
Note if the content is empty the signature will not be set." Note if the content is empty the signature will not be set."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-prefer-special-headings nil (defcustom org-koma-letter-prefer-special-headings nil
"Non-nil means prefer headlines over keywords for TO and FROM. "Non-nil means prefer headlines over keywords for TO and FROM.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"special-headings:t\"." \"special-headings:t\"."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defcustom org-koma-letter-subject-format t (defcustom org-koma-letter-subject-format t
@ -353,14 +340,12 @@ This option can also be set with the OPTIONS keyword, e.g.:
(const :tag "Subject right-justified" right) (const :tag "Subject right-justified" right)
(const :tag "Add title or description to subject" underlined) (const :tag "Add title or description to subject" underlined)
(const :tag "Set subject underlined" titled) (const :tag "Set subject underlined" titled)
(const :tag "Do not add title or description to subject" untitled))) (const :tag "Do not add title or description to subject" untitled))))
:group 'org-export-koma-letter)
(defcustom org-koma-letter-use-backaddress nil (defcustom org-koma-letter-use-backaddress nil
"Non-nil prints return address in line above to address. "Non-nil prints return address in line above to address.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"backaddress:t\"." \"backaddress:t\"."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defcustom org-koma-letter-use-foldmarks t (defcustom org-koma-letter-use-foldmarks t
@ -393,7 +378,6 @@ following ones:
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"foldmarks:(b l m t)\"." \"foldmarks:(b l m t)\"."
:group 'org-export-koma-letter
:type '(choice :type '(choice
(const :tag "Activate default folding marks" t) (const :tag "Activate default folding marks" t)
(const :tag "Deactivate folding marks" nil) (const :tag "Deactivate folding marks" nil)
@ -418,14 +402,12 @@ This option can also be set with the OPTIONS keyword, e.g.:
"Non-nil prints sender's phone number. "Non-nil prints sender's phone number.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"phone:t\"." \"phone:t\"."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defcustom org-koma-letter-use-url nil (defcustom org-koma-letter-use-url nil
"Non-nil prints sender's URL. "Non-nil prints sender's URL.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"url:t\"." \"url:t\"."
:group 'org-export-koma-letter
:type 'boolean :type 'boolean
:safe #'booleanp) :safe #'booleanp)
@ -433,7 +415,6 @@ This option can also be set with the OPTIONS keyword, e.g.:
"Non-nil prints sender's FROM_LOGO. "Non-nil prints sender's FROM_LOGO.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"from-logo:t\"." \"from-logo:t\"."
:group 'org-export-koma-letter
:type 'boolean :type 'boolean
:safe #'booleanp) :safe #'booleanp)
@ -441,34 +422,29 @@ This option can also be set with the OPTIONS keyword, e.g.:
"Non-nil prints sender's email address. "Non-nil prints sender's email address.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"email:t\"." \"email:t\"."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defcustom org-koma-letter-use-place t (defcustom org-koma-letter-use-place t
"Non-nil prints the letter's place next to the date. "Non-nil prints the letter's place next to the date.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"place:nil\"." \"place:nil\"."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defcustom org-koma-letter-default-class "default-koma-letter" (defcustom org-koma-letter-default-class "default-koma-letter"
"Default class for `org-koma-letter'. "Default class for `org-koma-letter'.
The value must be a member of `org-latex-classes'." The value must be a member of `org-latex-classes'."
:group 'org-export-koma-letter
:type 'string) :type 'string)
(defcustom org-koma-letter-headline-is-opening-maybe t (defcustom org-koma-letter-headline-is-opening-maybe t
"Non-nil means a headline may be used as an opening and closing. "Non-nil means a headline may be used as an opening and closing.
See also `org-koma-letter-opening' and See also `org-koma-letter-opening' and
`org-koma-letter-closing'." `org-koma-letter-closing'."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defcustom org-koma-letter-prefer-subject nil (defcustom org-koma-letter-prefer-subject nil
"Non-nil means title should be interpreted as subject if subject is missing. "Non-nil means title should be interpreted as subject if subject is missing.
This option can also be set with the OPTIONS keyword, This option can also be set with the OPTIONS keyword,
e.g. \"title-subject:t\"." e.g. \"title-subject:t\"."
:group 'org-export-koma-letter
:type 'boolean) :type 'boolean)
(defconst org-koma-letter-special-tags-in-letter '(to from closing location) (defconst org-koma-letter-special-tags-in-letter '(to from closing location)