Changes between Version 1 and Version 2 of WikiFormatting


Ignore:
Timestamp:
2015-01-17 17:25:10 (10 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • WikiFormatting

    v1 v2  
    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|| `{{{-}}} curly brackets` ||\ 
     185|| {{{-}}} curly brackets || 
    184186|----------------------------------------------------------- 
    185187||= [#Images Images] =|| `[[Image(`''link''`)]]` || [[Image(htdocs:../common/trac_logo_mini.png)]] || 
    … …  
    294296followed by a single space and the headline text.  
    295297 
    296 [=#hn] The headline text can be followed by the same number of "=" characters, but this is no longer mandatory. 
     298[=#hn] 
     299The headline text can be followed by the same number of "=" characters, but this is no longer mandatory. 
    297300 
    298301Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated. 
    … …  
    311314  {{{ 
    312315  #!div 
     316  = Heading = 
    313317  == Subheading 
    314318  === About ''this'' === 
    … …  
    721725 
    722726 
    723 == Escaping Links and WikiPageNames == 
     727== Escaping Links, WikiPageNames and other Markup == #Escaping 
    724728 
    725729You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark). 
    … …  
    731735   !#42 is not a link 
    732736  }}} 
     737  {{{ 
     738Various forms of escaping for list markup: 
     739 `-` escaped minus sign \\ 
     740 ``1. escaped number  \\ 
     741 {{{*}}} escaped asterisk sign 
     742  }}} 
    733743}}} 
    734744{{{#!td 
    735745 !NoHyperLink 
    736746 !#42 is not a link 
     747 
     748Various forms of escaping for list markup: 
     749 `-` escaped minus sign \\ 
     750 ``1. escaped number  \\ 
     751 {{{*}}} escaped asterisk sign 
    737752}}} 
    738753 
    … …  
    746761 * `[[Image(wiki:WikiFormatting:picture.gif)]]` (referring to attachment on another page) 
    747762 * `[[Image(ticket:1:picture.gif)]]` (file attached to a ticket) 
    748  * `[[Image(htdocs:picture.gif)]]` (referring to a file inside project htdocs) 
     763 * `[[Image(htdocs:picture.gif)]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory) 
    749764 * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository) 
    750765 
    … …  
    759774}}} 
    760775 
    761 See WikiMacros for further documentation on the `[[Image()]]` macro. 
     776See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.) 
    762777 
    763778 
    … …  
    9901005!WikiCreole style \\ line\\break 
    9911006}}} 
     1007