Changes between Version 2 and Version 3 of WikiFormatting


Ignore:
Timestamp:
Nov 18, 2014 10:44:13 PM (5 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WikiFormatting

    v2 v3  
    2828|| `'''bold'''`, `''italic''`, `'''''Wikipedia style'''''` || \
    2929|| '''bold''', ''italic'', '''''Wikipedia style''''' ||
    30 || {{{`monospaced and ''nowiki''`}}} || \
    31 || `monospaced and nowiki` ||
     30|| {{{`monospaced (''other markup ignored'')`}}} || \
     31|| `monospaced (''other markup ignored'')` ||
    3232|| `**bold**`, `//italic//`, `**//!WikiCreole style//**` || \
    3333|| **bold**, //italic//, **//!WikiCreole style//** ||
     
    4141}}}
    4242{{{#!td style="padding-left: 2em"
    43 == Level 2
     43== Level 2 ==
    4444=== Level 3 ^([#hn note])^
    4545}}}
     
    6565 {{{
    6666 * bullets list
    67    on multiple paragraphs
     67   on multiple lines
    6868   1. nested list
    6969     a. different numbering
     
    7373{{{#!td
    7474* bullets list
    75   on multiple paragraphs
     75  on multiple lines
    7676  1. nested list
    7777    a. different numbering
     
    8585 {{{
    8686  term:: definition on
    87          multiple paragraphs
     87         multiple lines
    8888 }}}
    8989}}}
    9090{{{#!td
    9191 term:: definition on
    92         multiple paragraphs
     92        multiple lines
    9393}}}
    9494|-----------------------------------------------------------
     
    175175|| see [#point1 (1)] ||
    176176|-----------------------------------------------------------
    177 {{{#!th rowspan=2
    178 [#EscapingLinksandWikiPageNames Escaping Markup]
     177{{{#!th rowspan=3
     178[#Escaping Escaping Markup]
    179179}}}
    180180|| `!'' doubled quotes` ||\
     
    182182|| `!wiki:WikiFormatting`, `!WikiFormatting` ||\
    183183|| !wiki:WikiFormatting, !WikiFormatting ||
     184|| {{{`}}}`{{{-}}}`{{{`}}}` triple curly brackets` ||\
     185|| `{{{-}}}` triple curly brackets ||
    184186|-----------------------------------------------------------
    185187||= [#Images Images] =|| `[[Image(`''link''`)]]` || [[Image(htdocs:../common/trac_logo_mini.png)]] ||
     
    262264   * **also bold**, //italic as well//,
    263265     and **'' bold italic **'' //(since 0.12)//
     266   * [[span(style=color: #FF0000, a red text )]]
    264267  }}}
    265268}}}
     
    279282 * **also bold**, //italic as well//,
    280283   and **'' bold italic **'' //(since 0.12)//
     284 * [[span(style=color: #FF0000, a red text )]]
    281285}}}
    282286
     
    294298followed by a single space and the headline text.
    295299
    296 [=#hn] The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
     300[=#hn]
     301The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
    297302
    298303Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
     
    311316  {{{
    312317  #!div
     318  = Heading =
    313319  == Subheading
    314320  === About ''this'' ===
     
    721727
    722728
    723 == Escaping Links and WikiPageNames ==
     729== Escaping Links, WikiPageNames and other Markup == #Escaping
    724730
    725731You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark).
     
    731737   !#42 is not a link
    732738  }}}
     739  {{{
     740Various forms of escaping for list markup:
     741 ^^- escaped minus sign \\
     742 ^^1. escaped number  \\
     743 ^^* escaped asterisk sign
     744  }}}
    733745}}}
    734746{{{#!td
    735747 !NoHyperLink
    736748 !#42 is not a link
     749
     750Various forms of escaping for list markup:
     751 ^^- escaped minus sign \\
     752 ^^1. escaped number  \\
     753 ^^* escaped asterisk sign
    737754}}}
    738755
     
    746763 * `[[Image(wiki:WikiFormatting:picture.gif)]]` (referring to attachment on another page)
    747764 * `[[Image(ticket:1:picture.gif)]]` (file attached to a ticket)
    748  * `[[Image(htdocs:picture.gif)]]` (referring to a file inside project htdocs)
     765 * `[[Image(htdocs:picture.gif)]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory)
    749766 * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository)
    750767
     
    759776}}}
    760777
    761 See WikiMacros for further documentation on the `[[Image()]]` macro.
     778See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)
    762779
    763780