[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 8589de94d8 3/3: Merge branch 'bugfix'
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/org 8589de94d8 3/3: Merge branch 'bugfix' |
|
Date: |
Tue, 7 Mar 2023 08:59:07 -0500 (EST) |
branch: externals/org
commit 8589de94d8a44cd566eb3fe128f8091d7e958ee9
Merge: c0a9c9edea eb6379a417
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>
Merge branch 'bugfix'
---
etc/ORG-NEWS | 6 +++---
lisp/ob-latex.el | 2 +-
lisp/ol-bibtex.el | 22 +++++++++++-----------
lisp/org-element.el | 4 ++--
lisp/ox-ascii.el | 4 ++--
lisp/ox-html.el | 4 ++--
lisp/ox-latex.el | 4 ++--
lisp/ox-md.el | 4 ++--
lisp/ox-odt.el | 4 ++--
testing/examples/ob-maxima-test.org | 2 +-
testing/lisp/test-org-element.el | 6 +++---
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 988dfea93a..b9d7b3459d 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -437,7 +437,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.
*** 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]].
This is done by adding =#+ATTR_LATEX: :mode tabbing= at the top
of the table.
@@ -4388,7 +4388,7 @@ parameters specific to some pre-defined translators, e.g.,
~:environment~ and ~:booktabs~ for ~orgtbl-to-latex~. See translators
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
with source blocks exported by the minted package.
@@ -6644,7 +6644,7 @@ that Calc formulas can operate on them.
*** Hyperlinks
-**** Org-Bibtex -- major improvements
+**** Org-BibTeX -- major improvements
Provides support for managing bibtex bibliographical references
data in headline properties. Each headline corresponds to a
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index a0154bf26d..a2c24b3d9b 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -141,7 +141,7 @@ exporting the literal LaTeX source."
(org-trim body))
(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'."
(setq body (org-babel-expand-body:latex body params))
(if (cdr (assq :file params))
diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el
index 7d6ed85345..fd9517233e 100644
--- a/lisp/ol-bibtex.el
+++ b/lisp/ol-bibtex.el
@@ -86,8 +86,8 @@
;; the active region, then call `org-bibtex-write' in a .org file to
;; insert a heading for the read bibtex entry
;;
-;; - All Bibtex information is taken from the document compiled by
-;; Andrew Roberts from the Bibtex manual, available at
+;; - All BibTeX information is taken from the document compiled by
+;; Andrew Roberts from the BibTeX manual, available at
;; https://www.andy-roberts.net/res/writing/latex/bibentries.pdf
;;
;;; History:
@@ -99,7 +99,7 @@
;; and then implemented by Bastien Guerry.
;;
;; 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.
;;
;; 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))
-;;; Bibtex data
+;;; BibTeX data
(defvar org-bibtex-types
'((:article
(:description . "An article from a journal or magazine")
@@ -202,7 +202,7 @@
(:description . "A document having an author and title, but not formally
published.")
(:required :author :title :note)
(: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
'((: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.")
(: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)'"))
- "Bibtex fields with descriptions.")
+ "BibTeX fields with descriptions.")
(defvar org-bibtex-entries nil
"List to hold parsed bibtex entries.")
@@ -439,7 +439,7 @@ at point."
(error "Field:%s is not known" field))
(save-window-excursion
(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
(princ (cdr (assoc field org-bibtex-fields))))
(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)))
-;;; Bibtex link functions
+;;; BibTeX link functions
(org-link-set-parameters "bibtex"
:follow #'org-bibtex-open
: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)
-;;; Bibtex <-> Org headline translation functions
+;;; BibTeX <-> Org headline translation functions
(defun org-bibtex (filename)
"Export each headline in the current file to a bibtex entry.
Headlines are exported using `org-bibtex-headline'."
(interactive
(list (read-file-name
- "Bibtex file: " nil nil nil
+ "BibTeX file: " nil nil nil
(let ((file (buffer-file-name (buffer-base-buffer))))
(and file
(file-name-nondirectory
@@ -619,7 +619,7 @@ Headlines are exported using `org-bibtex-headline'."
nil))))
(when 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)
"Check the current headline for required fields.
diff --git a/lisp/org-element.el b/lisp/org-element.el
index f8442511cf..7ccdb103db 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -2469,7 +2469,7 @@ CDR is a plist containing `:key', `:value', `:begin',
`:end',
(org-element-property :value keyword)))
-;;;; Latex Environment
+;;;; LaTeX Environment
(defconst org-element--latex-begin-environment
"^[ \t]*\\\\begin{\\([A-Za-z0-9*]+\\)}"
@@ -3419,7 +3419,7 @@ CONTENTS is the contents of the object."
(format "/%s/" contents))
-;;;; Latex Fragment
+;;;; LaTeX Fragment
(defun org-element-latex-fragment-parser ()
"Parse LaTeX fragment at point, if any.
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index e5bdf92cba..e267b004b3 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -1549,7 +1549,7 @@ information."
keyword info)))))
-;;;; Latex Environment
+;;;; LaTeX Environment
(defun org-ascii-latex-environment (latex-environment _contents info)
"Transcode a LATEX-ENVIRONMENT element from Org to ASCII.
@@ -1561,7 +1561,7 @@ information."
latex-environment info)))
-;;;; Latex Fragment
+;;;; LaTeX Fragment
(defun org-ascii-latex-fragment (latex-fragment _contents info)
"Transcode a LATEX-FRAGMENT object from Org to ASCII.
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 37c4744096..82e266dde4 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2968,7 +2968,7 @@ CONTENTS is nil. INFO is a plist holding contextual
information."
((string= "listings" value) (org-html-list-of-listings info))
((string= "tables" value) (org-html-list-of-tables info))))))))
-;;;; Latex Environment
+;;;; LaTeX Environment
(defun org-html-format-latex (latex-frag processing-type info)
"Format a LaTeX fragment LATEX-FRAG into HTML.
@@ -3085,7 +3085,7 @@ CONTENTS is nil. INFO is a plist holding contextual
information."
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)
"Transcode a LATEX-FRAGMENT object from Org to HTML.
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index dc2062df50..b84fe89db1 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -2618,7 +2618,7 @@ CONTENTS is nil. INFO is a plist holding contextual
information."
(otherwise "\\lstlistoflistings")))))))))
-;;;; Latex Environment
+;;;; LaTeX Environment
(defun org-latex--environment-type (latex-environment)
"Return the TYPE of LATEX-ENVIRONMENT.
@@ -2676,7 +2676,7 @@ CONTENTS is nil. INFO is a plist holding contextual
information."
(insert caption)
(buffer-string))))))
-;;;; Latex Fragment
+;;;; LaTeX Fragment
(defun org-latex-latex-fragment (latex-fragment _contents _info)
"Transcode a LATEX-FRAGMENT object from Org to LaTeX.
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index 5cb79ef239..5be0ca22e0 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -486,7 +486,7 @@ channel."
(_ (org-export-with-backend 'html keyword contents info))))
-;;;; Latex Environment
+;;;; LaTeX Environment
(defun org-md-latex-environment (latex-environment _contents info)
"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 Fragment
+;;;; LaTeX Fragment
(defun org-md-latex-fragment (latex-fragment _contents info)
"Transcode a LATEX-FRAGMENT object from Org to Markdown.
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 949c8f9b5b..cf217c9e78 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -1986,7 +1986,7 @@ information."
(ignore))))))))
-;;;; Latex Environment
+;;;; LaTeX Environment
;; (eval-after-load 'ox-odt '(ad-deactivate 'org-format-latex-as-mathml))
;; (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)))
-;;;; Latex Fragment
+;;;; LaTeX Fragment
;; (when latex-frag ; FIXME
;; (setq href (propertize href :title "LaTeX Fragment"
diff --git a/testing/examples/ob-maxima-test.org
b/testing/examples/ob-maxima-test.org
index b6be52b5bc..b83114a4f8 100644
--- a/testing/examples/ob-maxima-test.org
+++ b/testing/examples/ob-maxima-test.org
@@ -79,7 +79,7 @@ m: genmatrix (lambda([i,j], i+j-1), 3, 3)$
write_data(m, "/dev/stdout")$
#+end_src
-* Latex output
+* LaTeX output
#+begin_src maxima :exports both :results latex :results verbatim
assume(x>0);
tex(ratsimp(diff(%e^(a*x), x)));
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 957e991944..304059c673 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1686,7 +1686,7 @@ Paragraph"
(= (org-element-property :end (org-element-at-point)) (point-max)))))
-;;;; Latex Environment
+;;;; LaTeX Environment
(ert-deftest test-org-element/latex-environment-parser ()
"Test `latex-environment' parser."
@@ -1751,7 +1751,7 @@ e^{i\\pi}+1=0
(= (org-element-property :end (org-element-at-point)) (point-max)))))
-;;;; Latex Fragment
+;;;; LaTeX Fragment
(ert-deftest test-org-element/latex-fragment-parser ()
"Test `latex-fragment' parser."
@@ -4162,7 +4162,7 @@ Text
(org-element-type (org-element-at-point))))))
(should-not (eq 'headline
(org-test-with-temp-text "* H1\nP1\n<point>*H2\n"
- (let ((org-element-use-cache t))
+ (let ((org-element-use-cache t))
(org-element-cache-map #'ignore :granularity 'element)
(backward-delete-char 1)
(org-element-type (org-element-at-point))))))