Changes between Version 1 and Version 2 of WikiFormatting

Timestamp:

10/08/16 19:26:26 (8 years ago)

Author:

trac

Comment:

--

WikiFormatting

@@ -28 +28 @@
 || `'''bold'''`, `''italic''`, `'''''Wikipedia style'''''` || \
 || '''bold''', ''italic'', '''''Wikipedia style''''' ||
-|| {{{`monospaced and ''nowiki''`}}} || \
-|| `monospaced and nowiki` ||
+|| {{{`monospaced (''other markup ignored'')`}}} || \
+|| `monospaced (''other markup ignored'')` ||
 || `**bold**`, `//italic//`, `**//!WikiCreole style//**` || \
 || **bold**, //italic//, **//!WikiCreole style//** ||
@@ -41 +41 @@
 }}}
 {{{#!td style="padding-left: 2em"
-== Level 2
+== Level 2 ==
 === Level 3 ^([#hn note])^
 }}}
@@ -65 +65 @@
  {{{
  * bullets list
-   on multiple paragraphs
+   on multiple lines
    1. nested list
      a. different numbering 
@@ -73 +73 @@
 {{{#!td
 * bullets list
-  on multiple paragraphs
+  on multiple lines
   1. nested list
     a. different numbering
@@ -85 +85 @@
  {{{
   term:: definition on
-         multiple paragraphs
+         multiple lines
  }}}
 }}}
 {{{#!td
  term:: definition on
-        multiple paragraphs
+        multiple lines
 }}}
 |-----------------------------------------------------------
@@ -175 +175 @@
 || see [#point1 (1)] ||
 |-----------------------------------------------------------
-{{{#!th rowspan=2
-[#EscapingLinksandWikiPageNames Escaping Markup]
+{{{#!th rowspan=3
+[#Escaping Escaping Markup]
 }}}
 || `!'' doubled quotes` ||\
@@ -182 +182 @@
 || `!wiki:WikiFormatting`, `!WikiFormatting` ||\
 || !wiki:WikiFormatting, !WikiFormatting ||
+|| {{{`}}}`{{{-}}}`{{{`}}}` triple curly brackets` ||\
+|| `{{{-}}}` triple curly brackets ||
 |-----------------------------------------------------------
 ||= [#Images Images] =|| `[[Image(`''link''`)]]` || [[Image(htdocs:../common/trac_logo_mini.png)]] ||
@@ -262 +264 @@
    * **also bold**, //italic as well//, 
      and **'' bold italic **'' //(since 0.12)//
+   * [[span(style=color: #FF0000, a red text )]]
   }}}
 }}}
@@ -279 +282 @@
  * **also bold**, //italic as well//, 
    and **'' bold italic **'' //(since 0.12)//
+ * [[span(style=color: #FF0000, a red text )]]
 }}}
 
@@ -294 +298 @@
 followed by a single space and the headline text. 
 
-[=#hn] The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
+[=#hn]
+The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
 
 Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
@@ -311 +316 @@
   {{{
   #!div
+  = Heading =
   == Subheading
   === About ''this'' ===
@@ -721 +727 @@
 
 
-== Escaping Links and WikiPageNames ==
+== Escaping Links, WikiPageNames and other Markup == #Escaping
 
 You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark).
@@ -731 +737 @@
    !#42 is not a link
   }}}
+  {{{
+Various forms of escaping for list markup:
+ ^^- escaped minus sign \\
+ ^^1. escaped number  \\
+ ^^* escaped asterisk sign
+  }}}
 }}}
 {{{#!td
  !NoHyperLink
  !#42 is not a link
+
+Various forms of escaping for list markup:
+ ^^- escaped minus sign \\
+ ^^1. escaped number  \\
+ ^^* escaped asterisk sign
 }}}
 
@@ -746 +763 @@
  * `[[Image(wiki:WikiFormatting:picture.gif)]]` (referring to attachment on another page)
  * `[[Image(ticket:1:picture.gif)]]` (file attached to a ticket)
- * `[[Image(htdocs:picture.gif)]]` (referring to a file inside project htdocs)
+ * `[[Image(htdocs:picture.gif)]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory)
  * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository)
 
@@ -759 +776 @@
 }}}
 
-See WikiMacros for further documentation on the `[[Image()]]` macro.
+See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)