Merge branch 'maint'
This commit is contained in:
commit
a36d18caa4
|
@ -49,11 +49,12 @@
|
|||
|
||||
(defcustom org-babel-stan-cmdstan-directory nil
|
||||
"CmdStan source directory.
|
||||
'make' will be called from this directory to compile the Stan
|
||||
block. When nil, executing Stan blocks dumps the content to a
|
||||
plain text file."
|
||||
Call \"make\" from this directory to compile the Stan block.
|
||||
When nil, executing Stan blocks dumps the content to a file."
|
||||
:group 'org-babel
|
||||
:type 'string)
|
||||
:type '(choice
|
||||
(directory :tag "Compilation directory")
|
||||
(const :tag "Dump to a file" nil)))
|
||||
|
||||
(defvar org-babel-default-header-args:stan
|
||||
'((:results . "file")))
|
||||
|
|
|
@ -4115,7 +4115,10 @@ A string will be inserted as-is in the header of the document."
|
|||
(list :tag "options/package pair"
|
||||
(string :tag "options")
|
||||
(string :tag "package")
|
||||
(boolean :tag "Snippet"))
|
||||
(boolean :tag "Snippet")
|
||||
(choice
|
||||
(const :tag "For all compilers" nil)
|
||||
(repeat :tag "Allowed compiler" string)))
|
||||
(string :tag "A line of LaTeX"))))
|
||||
|
||||
(defcustom org-latex-packages-alist nil
|
||||
|
|
|
@ -721,16 +721,17 @@ nil Ignore math snippets.
|
|||
imagemagick to convert pdf files to png files.
|
||||
`mathjax' Do MathJax preprocessing and arrange for MathJax.js to
|
||||
be loaded.
|
||||
t Synonym for `mathjax'."
|
||||
|
||||
Any other symbol is a synonym for `mathjax'."
|
||||
:group 'org-export-odt
|
||||
:version "24.4"
|
||||
:package-version '(Org . "8.0")
|
||||
:type '(choice
|
||||
(const :tag "Do not process math in any way" nil)
|
||||
(const :tag "Leave math verbatim" verbatim)
|
||||
(const :tag "Use dvipng to make images" dvipng)
|
||||
(const :tag "Use imagemagick to make images" imagemagick)
|
||||
(const :tag "Use MathJax to display math" mathjax)
|
||||
(const :tag "Leave math verbatim" verbatim)))
|
||||
(other :tag "Use MathJax to display math" mathjax)))
|
||||
|
||||
|
||||
;;;; Links
|
||||
|
|
Loading…
Reference in New Issue