branch: externals/org
commit 6dcddb1b6fcbfdeca751000865b3abaf5b5c118e
Author: Juan Manuel Macías <maciasch...@posteo.net>
Commit: Bastien <b...@gnu.org>
doc/org-manual.org: Fix Shakespeare's sonnet
* doc/org-manual.org (Verse blocks in LaTeX export): The previous
version of Shakespeare's sonnet is replaced by the version included in
Wikipedia (Shakespeare, William. Duncan-Jones, Katherine. Shakespeare’s
Sonnets. Bloomsbury Arden 2010. p. 113).
* etc/ORG-NEWS (Support verse blocks in LaTeX export): The last
sentence is superfluous. There is no explanation below.
---
doc/org-manual.org | 49 +++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 2002a05..5f0e81c 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -640,10 +640,10 @@ The following commands jump to other headlines in the
buffer.
where you can use the following keys to find your destination:
#+attr_texinfo: :columns 0.3 0.7
- | {{{kbd(TAB)}}} | Cycle visibility. |
+ | {{{kbd(TAB)}}} | Cycle visibility. |
| {{{kbd(DOWN)}}} / {{{kbd(UP)}}} | Next/previous visible headline. |
- | {{{kbd(RET)}}} | Select this location. |
- | {{{kbd(/)}}} | Do a Sparse-tree search |
+ | {{{kbd(RET)}}} | Select this location. |
+ | {{{kbd(/)}}} | Do a Sparse-tree search |
#+texinfo: @noindent
The following keys work if you turn off ~org-goto-auto-isearch~
@@ -651,9 +651,9 @@ The following commands jump to other headlines in the
buffer.
#+attr_texinfo: :columns 0.3 0.7
| {{{kbd(n)}}} / {{{kbd(p)}}} | Next/previous visible headline. |
| {{{kbd(f)}}} / {{{kbd(b)}}} | Next/previous headline same level. |
- | {{{kbd(u)}}} | One level up. |
+ | {{{kbd(u)}}} | One level up. |
| {{{kbd(0)}}} ... {{{kbd(9)}}} | Digit argument. |
- | {{{kbd(q)}}} | Quit. |
+ | {{{kbd(q)}}} | Quit. |
#+vindex: org-goto-interface
#+texinfo: @noindent
@@ -2178,7 +2178,7 @@ trailing white space and surrounded in double-quotes.
For example:
concatenates the content of columns 1 and column 2.
When the =N= flag is used, all referenced elements are parsed as
-numbers and interpolated as Lisp numbers, without quotes. Fields that
+numbers and interpolated as Lisp numbers, without quotes. Fields that
cannot be parsed as numbers are interpolated as zeros. For example:
: '(+ $1 $2);N
@@ -2186,7 +2186,7 @@ cannot be parsed as numbers are interpolated as zeros.
For example:
#+texinfo: @noindent
adds columns 1 and 2, equivalent to Calc's =$1+$2=. Ranges are
inserted as space-separated fields, so they can be embedded in list or
-vector syntax. For example:
+vector syntax. For example:
: '(apply '+ '($1..$4));N
@@ -2866,8 +2866,8 @@ For more information and examples see the
[[https://orgmode.org/worg/org-tutoria
- transpose ::
- When =y=, =yes=, or =t= attempt to transpose the table data before plotting.
Also
- recognises the shorthand option =trans=.
+ When =y=, =yes=, or =t= attempt to transpose the table data before
+ plotting. Also recognises the shorthand option =trans=.
- =type= ::
@@ -2901,15 +2901,17 @@ For more information and examples see the
[[https://orgmode.org/worg/org-tutoria
- min ::
- Provides a minimum axis value that may be used by a plot type. Implicitly
- assumes the =y= axis is being referred to. Can explicitly provide a value
for a
- either the =x= or =y= axis with =xmin= and =ymin=.
+ Provides a minimum axis value that may be used by a plot type.
+ Implicitly assumes the =y= axis is being referred to. Can
+ explicitly provide a value for a either the =x= or =y= axis with
+ =xmin= and =ymin=.
- max ::
- Provides a maximum axis value that may be used by a plot type. Implicitly
- assumes the =y= axis is being referred to. Can explicitly provide a value
for a
- either the =x= or =y= axis with =xmax= and =ymax=.
+ Provides a maximum axis value that may be used by a plot type.
+ Implicitly assumes the =y= axis is being referred to. Can
+ explicitly provide a value for a either the =x= or =y= axis with
+ =xmax= and =ymax=.
- ticks ::
@@ -13883,8 +13885,7 @@ The LaTeX export back-end converts horizontal rules by
the specified
The LaTeX export back-end accepts four attributes for verse blocks:
=:lines=, =:center=, =:versewidth= and =:latexcode=. The three first
require the external LaTeX package =verse.sty=, which is an extension
-of the standard LaTeX environment. The purpose of these attributes is
-explained below.
+of the standard LaTeX environment.
- =:lines= :: To add marginal verse numbering. Its value is an
integer, the sequence in which the verses should be numbered.
@@ -13901,20 +13902,20 @@ A complete example with Shakespeare's first sonnet:
#+begin_src org
,#+ATTR_LATEX: :center t :latexcode \color{red} :lines 5
-,#+ATTR_LATEX: :versewidth Feed’st thy light’st flame with self-substantial
fuel,
+,#+ATTR_LATEX: :versewidth Feed’st thy light’s flame with self-substantial
fuel,
,#+BEGIN_VERSE
From fairest creatures we desire increase,
That thereby beauty’s rose might never die,
-But as the riper should by time decrease,
-His tender heir mught bear his memeory:
+But as the riper should by time decease
+His tender heir might bear his memory
But thou, contracted to thine own bright eyes,
-Feed’st thy light’st flame with self-substantial fuel,
+Feed’st thy light’s flame with self-substantial fuel,
Making a famine where abundance lies,
Thyself thy foe, to thy sweet self too cruel.
-Thou that art now the world’s fresh ornament
+Thou that art now the world’s fresh ornament,
And only herald to the gaudy spring,
-Within thine own bud buriest thy content
-And, tender churl, makest waste in niggarding.
+Within thine own bud buriest thy content,
+And, tender churl, mak’st waste in niggardly.
Pity the world, or else this glutton be,
To eat the world’s due, by the grave and thee.
,#+END_VERSE
