From b5e53e8ce694ddffda98f4bb8a53e50b52254b02 Mon Sep 17 00:00:00 2001 From: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> Date: Thu, 23 Apr 2015 15:52:41 +0200 Subject: [PATCH] Add admonitions (attention, danger and hint) --- demo/org-mode-syntax.html | 32 ++++++++++++++++-- demo/org-mode-syntax.org | 71 ++++++++++++++++++++++++++------------- 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/demo/org-mode-syntax.html b/demo/org-mode-syntax.html index f7d5006..3795ada 100755 --- a/demo/org-mode-syntax.html +++ b/demo/org-mode-syntax.html @@ -11,6 +11,7 @@ + @@ -1084,7 +1085,7 @@ See: 
-#+CAPTION: Org mode logo
+#+caption: Org mode logo
 file:images/org-mode-unicorn.png
@@ -1265,6 +1266,15 @@ Caution

Caution

+
+
+#+begin_attention
+Attention
+#+end_attention
+
+
+

Attention

+
@@ -1289,6 +1299,15 @@ Important

Important

+
+
+#+begin_hint
+Hint
+#+end_hint
+
+
+

Hint

+
@@ -1303,6 +1322,15 @@ Error

Error

+
+
+#+begin_danger
+Danger
+#+end_danger
+
+
+

Danger

+
@@ -1941,7 +1969,7 @@ Did you know... It is possible to define named footnotes[fn:myfootnote], or ones with automatic anchors[fn:2].
-

It is possible to define named footnotes1, or ones with automatic anchors2.

+

It is possible to define named footnotes1, or ones with automatic anchors2. It is possible to define named footnotes1, or ones with automatic anchors2.

diff --git a/demo/org-mode-syntax.org b/demo/org-mode-syntax.org index 5930aa3..b1dae16 100755 --- a/demo/org-mode-syntax.org +++ b/demo/org-mode-syntax.org @@ -538,7 +538,7 @@ You can insert *image* files of different *formats* to a document: ** Inline picture #+begin_src org -#+CAPTION: Org mode logo +#+caption: Org mode logo [[file:images/org-mode-unicorn.png]] #+end_src @@ -556,13 +556,13 @@ Books usually align/float images on the right/left of the contents. *** Image is centered -#+NAME: test +#+name: test #+begin_src R :exports results :file-ext pdf :results graphics :width 8 :height 3 plot(runif(100)) #+end_src #+attr_latex: :float t :placement [b] -#+RESULTS: test +#+results: test [[file:test.pdf]] ** Image attributes and values @@ -620,27 +620,28 @@ Common admonitions are: ** List of supported admonitions :noexport: -| Total | | rST | RTD | AsciiDoc | DocBook | MoinMoin (Modern) | Bootstrap | DocOnce | Confluence | SuperCollider | -|--------+-----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| -| 6 | note | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | -| 8 | warning | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | -| 6 | tip | 1 | 1 | 1 | 1 | 1 | | | 1 | | -|--------+-----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| -| 5 | important | 1 | 1 | 1 | 1 | 1 | | | | | -| 5 | caution | 1 | 1 | 1 | 1 | 1 | | | | | -|--------+-----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| -| 3 | danger | 1 | 1 | | | | 1 | | | | -| 2 | attention | 1 | 1 | | | | | | | | -| 2 | error | 1 | 1 | | | | | | | | -| 2 | hint | 1 | 1 | | | | | | | | -| #ERROR | seealso | | ? | | | | | | | | -| #ERROR | todo | | ? | | | | | | | | -| 2 | info | | | | | | 1 | | 1 | | -| 1 | notice | | | | | | | 1 | | | -| 1 | question | | | | | | | 1 | | | -| 1 | summary | | | | | | | 1 | | | -| 1 | success | | | | | | 1 | | | | -#+TBLFM: $1=vsum($3..$10) +| Total | | docutils | rST | RTD | AsciiDoc | DocBook | MoinMoin (Modern) | Bootstrap | DocOnce | Confluence | SuperCollider | +|--------+-----------+----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| +| 7 | note | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | +| 9 | warning | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | +| 7 | tip | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | | +|--------+-----------+----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| +| 6 | important | 1 | 1 | 1 | 1 | 1 | 1 | | | | | +| 6 | caution | 1 | 1 | 1 | 1 | 1 | 1 | | | | | +|--------+-----------+----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| +| 4 | danger | 1 | 1 | 1 | | | | 1 | | | | +| 3 | attention | 1 | 1 | 1 | | | | | | | | +| 3 | error | 1 | 1 | 1 | | | | | | | | +| 3 | hint | 1 | 1 | 1 | | | | | | | | +|--------+-----------+----------+-----+-----+----------+---------+-------------------+-----------+---------+------------+---------------| +| #ERROR | seealso | | | ? | | | | | | | | +| #ERROR | todo | | | ? | | | | | | | | +| 2 | info | | | | | | | 1 | | 1 | | +| 1 | notice | | | | | | | | 1 | | | +| 1 | question | | | | | | | | 1 | | | +| 1 | summary | | | | | | | | 1 | | | +| 1 | success | | | | | | | 1 | | | | +#+TBLFM: $1=vsum($3..$11) ** Note @@ -680,6 +681,12 @@ Caution ,#+end_caution #+end_src +#+begin_src org +,#+begin_attention +Attention +,#+end_attention +#+end_src + ** Tip A tip box is displayed as follows: @@ -696,6 +703,12 @@ Important ,#+end_important #+end_src +#+begin_src org +,#+begin_hint +Hint +,#+end_hint +#+end_src + ** Error #+begin_src org @@ -704,6 +717,12 @@ Error ,#+end_error #+end_src +#+begin_src org +,#+begin_danger +Danger +,#+end_danger +#+end_src + ** Todo # See example at http://docs.ckan.org/en/latest/contributing/python.html @@ -1244,6 +1263,10 @@ It is possible to define named footnotes[fn:myfootnote], or ones with automatic anchors[fn:2]. #+end_src +#+results: +It is possible to define named footnotes[fn:myfootnote], or ones with automatic +anchors[fn:2]. + * Useful extensions ** Todo extension