Changes between Version 1 and Version 2 of WikiRestructuredText

Timestamp:

Oct 11, 2011, 3:34:27 PM (13 years ago)

Author:

trac

Comment:

--

WikiRestructuredText

@@ -27 +27 @@
 
  * Trac provides a custom RST directive `trac::` to allow TracLinks from within RST text.
-
- Example:
- {{{
- {{{
- #!rst
- This is a reference to |a ticket|
-
- .. |a ticket| trac:: #42
- }}}
- }}}
+   ||= Wiki Markup ||= Display ||
+   {{{#!td
+     {{{
+     {{{
+     #!rst
+     This is a reference to |a ticket|
+
+     .. |a ticket| trac:: #42
+     }}}
+     }}}
+   }}}
+   {{{#!td
+     {{{
+     #!rst
+     This is a reference to |a ticket|
+
+     .. |a ticket| trac:: #42
+     }}}
+   }}}
 
  * Trac allows an even easier way of creating TracLinks in RST, using the custom `:trac:` role.
-
- Example:
- {{{
- {{{
- #!rst
- This is a reference to ticket `#12`:trac:
-
- To learn how to use Trac, see `TracGuide`:trac:
- }}}
- }}}
+   ||= Wiki Markup ||= Display ||
+   {{{#!td
+     {{{
+     {{{
+     #!rst
+     This is a reference to ticket `#12`:trac:
+
+     To learn how to use Trac, see `TracGuide`:trac:
+     }}}
+     }}}
+   }}}
+   {{{#!td
+     {{{
+     #!rst
+     This is a reference to ticket `#12`:trac:
+
+     To learn how to use Trac, see `TracGuide`:trac:
+     }}}
+   }}}
 
  For a complete example of all uses of the `:trac:` role, please see WikiRestructuredTextLinks. 
@@ -58 +76 @@
 code-block
 
-Example
-
-{{{
-{{{
-#!rst
-
-.. code-block:: python
-
- class Test:
-
-    def TestFunction(self):
-        pass
-
-}}}
-}}}
-
-Will result in the below.
-
-{{{
-#!rst
-
-.. code-block:: python
-
- class Test:
-
-    def TestFunction(self):
-        pass
-
-}}}
+||= Wiki Markup ||= Display ||
+{{{#!td
+  {{{
+  {{{
+  #!rst
+
+  .. code-block:: python
+
+     class Test:
+
+         def TestFunction(self):
+             pass
+  
+  }}}
+  }}}
+}}}
+{{{#!td
+  {{{
+  #!rst
+
+  .. code-block:: python
+
+     class Test:
+
+         def TestFunction(self):
+             pass
+
+  }}}
+}}}
+Note the need to indent the code at least one character after the `.. code-block` directive.
 
 === Wiki Macros in reStructuredText ===
 
-For doing [WikiMacros Wiki Macros] in RST you use the same directive as for syntax highlighting i.e
-code-block. To work you must use a version of trac that has [trac:ticket:801 #801] applied. 
-
-=== Wiki Macro Example ===
-
-{{{
-{{{
-#!rst
-
-.. code-block:: RecentChanges
-
-   Trac,3
-
-}}}
-}}}
-
-Will result in the below:
-
-     [[RecentChanges(Trac,3)]]
-
-Or a more concise Wiki Macro like syntax is also available:
-
-{{{
-{{{
-#!rst
-
-:code-block:`RecentChanges:Trac,3`
-}}}
+For doing [WikiMacros Wiki Macros] in RST you use the same directive as for syntax highlighting i.e code-block.
+
+||= Wiki Markup ||= Display ||
+{{{#!td
+  {{{
+  {{{
+  #!rst
+
+  .. code-block:: RecentChanges
+
+     Trac,3
+
+  }}}
+  }}}
+}}}
+{{{#!td
+  {{{
+  #!rst
+
+  .. code-block:: RecentChanges
+
+     Trac,3
+
+  }}}
+}}}
+
+Or a more concise Wiki Macro like syntax is also available, using the `:code-block:` role:
+
+||= Wiki Markup ||= Display ||
+{{{#!td
+  {{{
+  {{{
+  #!rst
+
+  :code-block:`RecentChanges:Trac,3`
+  }}}
+  }}}
+}}}
+{{{#!td
+  {{{
+  #!rst
+
+  :code-block:`RecentChanges:Trac,3`
+  }}}
 }}}
 
 === Bigger RST Example ===
 The example below should be mostly self-explanatory:
+
+||= Wiki Markup ||= Display ||
+{{{#!td
 {{{
 #!html
@@ -151 +189 @@
 }}}</pre>
 }}}
-
-
-Results in:
+}}}
+{{{#!td
 {{{
 #!rst
@@ -180 +217 @@
 .. _webpage: http://docutils.sourceforge.net/rst.html
 }}}
-
+}}}
 
 ----