diff --git a/demo/org-mode-syntax.html b/demo/org-mode-syntax.html index 39960aa..4d82cb7 100755 --- a/demo/org-mode-syntax.html +++ b/demo/org-mode-syntax.html @@ -115,11 +115,11 @@
  • Videos
  • Admonitions
  • Centered text
  • @@ -1551,19 +1551,168 @@ Though, you can add an image with a link to the video like this:

    Admonitions

    -You can create several other boxes (info, tip, note or warning) which all have -a different default image. +Admonitions are statements taken out of the content’s flow and labeled with +a title.

    -Admonitions: attention, caution, danger, error, hint, important, note, tip, -warning and the generic admonition. +Common admonitions are:

    +
      +
    1. note
    2. +
    3. warning
    4. +
    5. tip
    6. +
    7. caution
    8. +
    9. important
    10. +
    +

    (Most themes style only note and warning specially.)

    +
    +
    +

    Note

    +
    +

    +A note box is displayed as follows: +

    + +
    + +
    #+begin_note
    +This is a useful note.
    +#+end_note
    +
    +
    + +
    +

    +This is a useful note. +

    + +
    + +
    + +
    #+begin_seealso
    +- Apples ::
    +     A kind of fruit.
    +#+end_seealso
    +
    +
    + +
    +
    +
    Apples
    A kind of fruit.
    +
    + +
    +
    +
    + +
    +

    Warning

    +
    +

    +A warning box is displayed as follows: +

    + +
    + +
    #+begin_warning
    +Be careful!  Check that you have...
    +#+end_warning
    +
    +
    + +
    +

    +Be careful! Check that you have… +

    + +
    + +
    + +
    #+begin_caution
    +Caution
    +#+end_caution
    +
    +
    + +
    +

    +Caution +

    + +
    +
    +
    + +
    +

    Tip

    +
    +

    +A tip box is displayed as follows: +

    + +
    + +
    #+begin_tip
    +Try doing it this way...
    +#+end_tip
    +
    +
    + +
    +

    +Try doing it this way… +

    + +
    + +
    + +
    #+begin_important
    +Important
    +#+end_important
    +
    +
    + +
    +

    +Important +

    + +
    +
    +
    + +
    +

    Error

    +
    +
    + +
    #+begin_error
    +Error
    +#+end_error
    +
    +
    + +
    +

    +Error +

    + +
    +
    +
    + +
    +

    Todo

    +

    Simple box (“inline task”):

    @@ -1582,6 +1731,10 @@ Description of inline task.

    END
    +
    TODO Do this task

    +Description of inline task. +

    +

    or:

    @@ -1603,329 +1756,6 @@ or: Admonitiontodo

    -
    -
    - -
    -

    List of supported admonitions

    -
    - - - --- -- -- -- -- -- -- -- -- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Total rSTRTDAsciiDocDocBookMoinMoin (Modern)DocOnceConfluenceSuperCollider
    6note11111 11
    7warning11111111
    6tip11111 1 
    5important11111   
    5caution11111   
    2attention11      
    2danger11      
    2error11      
    2hint11      
    #ERRORseealso ?      
    #ERRORtodo ?      
    1notice     1  
    1question     1  
    1summary     1  
    1info      1 
    -
    -
    - -
    -

    Note

    -
    -

    -A note box is displayed as follows: -

    - -
    -

    -This is a useful note. -

    - -
    - -
    -
    -
    Apples
    A kind of fruit.
    -
    - -
    -
    -
    - -
    -

    Warning

    -
    -

    -A warning box is displayed as follows: -

    - -
    -

    -Be careful! Check that you have… -

    - -
    - -
    -

    -Caution -

    - -
    -
    -
    - -
    -

    Tip

    -
    -

    -A tip box is displayed as follows: -

    - -
    -

    -Try doing it this way… -

    - -
    - -
    -

    -Important -

    - -
    -
    -
    - -
    -

    Error

    -
    -
    -

    -Error -

    -
    @@ -3090,7 +2920,7 @@ A one-liner result:
    -2015-03-04
    +2015-03-05
     
    diff --git a/demo/org-mode-syntax.org b/demo/org-mode-syntax.org index 1f71f10..d2da131 100755 --- a/demo/org-mode-syntax.org +++ b/demo/org-mode-syntax.org @@ -550,34 +550,20 @@ Though, you can add an image with a link to the video like this: * Admonitions -You can create several other boxes (~info~, ~tip~, ~note~ or ~warning~) which all have -a different default image. +Admonitions are statements taken out of the content's flow and labeled with +a title. -Admonitions: attention, caution, danger, error, hint, important, note, tip, -warning and the generic admonition. +Common admonitions are: + +1. ~note~ +2. ~warning~ +3. ~tip~ +4. ~caution~ +5. ~important~ (Most themes style only ~note~ and ~warning~ specially.) -Simple box ("inline task"): - -#+begin_src org -*************** TODO Do this task -Description of inline task. -*************** END -#+end_src - -or: - -#+begin_src org -*************** WAIT [#B] Do also this other task :phone: -*************** END -#+end_src - -#+begin_admonitiontodo -Admonitiontodo -#+end_admonitiontodo - -** List of supported admonitions +** List of supported admonitions :noexport: | Total | | rST | RTD | AsciiDoc | DocBook | MoinMoin (Modern) | DocOnce | Confluence | SuperCollider | |--------+-----------+-----+-----+----------+---------+-------------------+---------+------------+---------------| @@ -604,51 +590,87 @@ Admonitiontodo A note box is displayed as follows: -#+begin_note +#+begin_src org +,#+begin_note This is a useful note. -#+end_note +,#+end_note +#+end_src # #+attr_html: :options [By the way...] # #+begin_note # This is a useful note (with a title). # #+end_note -#+begin_seealso +#+begin_src org +,#+begin_seealso - [[http://en.wikipedia.org/wiki/Apple][Apples]] :: A kind of [[http://en.wikipedia.org/wiki/Fruit][fruit]]. -#+end_seealso +,#+end_seealso +#+end_src ** Warning A warning box is displayed as follows: -#+begin_warning +#+begin_src org +,#+begin_warning Be careful! Check that you have... -#+end_warning +,#+end_warning +#+end_src -# #+html: