Changes between Version 4 and Version 5 of WikiFormatting


Ignore:
Timestamp:
May 6, 2021, 8:43:06 AM (14 months ago)
Author:
TheDragonFire961
Comment:

(Manually) revert vandalism. Not too familiar with Trac wiki software so not sure if there was a MediaWiki? undo equivalent I could've used instead, or if I missed restoring anything that was vandalised.

Legend:

Unmodified
Added
Removed
Modified
  • WikiFormatting

    v4 v5  
    1 E2A5F530**//\//\M/\//\**ABCC
    2 596DF9A9**//\//\M/\//\**7913
    3 4DC122C9**//\//\M/\//\**B428
    4 27E8CBFB**//\//\M/\//\**686E
    5 61FA429C**//\//\M/\//\**D321
    6 CD977FF4**//\//\M/\//\**1642
    7 BD197441**//\//\M/\//\**CCC3
    8 750CB648**//\//\M/\//\**F8BE
    9 D0F44424**//\//\M/\//\**CF68
    10 00ECE9B7**//\//\M/\//\**55AD
    11 4133B8C8**//\//\M/\//\**DE15
    12 C1F4E2E5**//\//\M/\//\**768D
    13 1B026A7B**//\//\M/\//\**0105
    14 39F34AD4**//\//\M/\//\**6751
    15 3FD59C9A**//\//\M/\//\**8A86
    16 720DF5C4**//\//\M/\//\**D1D6
    17 23408BD9**//\//\M/\//\**BA43
    18 ED0045CE**//\//\M/\//\**6A4C
    19 731EC67B**//\//\M/\//\**ECE0
    20 83A89119**//\//\M/\//\**2B2E
     1Index: WikiFormatting
     2===================================================================
     3--- Version 2
     4+++ Version 3
     5@@ -2,23 +3,22 @@
     6-= WikiFormatting =
     7+= WikiFormatting
     8+
     9 [[TracGuideToc]]
     10 
     11 Wiki markup is a core feature in Trac, tightly integrating all the other parts of Trac into a flexible and powerful whole.
     12 
     13-Trac has a built in small and powerful wiki rendering engine. This wiki engine implements an ever growing subset of the commands from other popular Wikis,
     14-especially [http://moinmo.in/ MoinMoin] and [trac:WikiCreole].
     15-
     16+Trac has a built-in small and powerful wiki rendering engine. This wiki engine implements a growing subset of the commands from other popular Wikis, especially [http://moinmo.in/ MoinMoin] and [trac:WikiCreole].
     17 
     18 This page will give you an in-depth explanation of the wiki markup available anywhere WikiFormatting is allowed.
     19 
     20-The ''Cheat sheet'' below gives you a quick overview for the most common syntax, each link in the ''Category'' column will lead you to the more detailed explanation later in this page.
     21+The sections below provide an overview for the most common syntax, each link in the ''Category'' column will lead you to the more detailed explanation later in this page.
     22 
     23 A few other wiki pages present the advanced features of the Trac wiki markup in more depth:
     24- - TracLinks covers all the possible ways to refer precisely to any Trac resource or parts thereof,
     25- - WikiPageNames talks about the various names a wiki page can take, CamelCase or not
     26- - WikiMacros lists the macros available for generating dynamic content,
     27- - WikiProcessors and WikiHtml details how parts of the wiki text can be processed in special ways
     28-
     29-
     30-== Cheat sheet ==
     31+ - TracLinks covers all the possible ways to refer precisely to any Trac resource or parts thereof.
     32+ - WikiPageNames covers the various names a wiki page can take, whether in CamelCase or not.
     33+ - WikiMacros lists the macros available for generating dynamic content.
     34+ - WikiProcessors and WikiHtml details how parts of the wiki text can be processed in special ways.
     35+ - [trac:wiki:TracDev/Proposals/AdvancedWikiOperations AdvancedWikiOperations] provides some operations in uncommon or administrative scenarios.
     36+
     37+== Common wiki markup
     38 
     39 ||= '''Category''' =||= '''Wiki Markup''' =||= '''Display''' =||
     40@@ -36,10 +35,10 @@
     41 {{{#!td
     42  {{{
     43- == Level 2 ==
     44+ == Level 2
     45  === Level 3 ^([#hn note])^
     46  }}}
     47 }}}
     48 {{{#!td style="padding-left: 2em"
     49-== Level 2 ==
     50+== Level 2
     51 === Level 3 ^([#hn note])^
     52 }}}
     53@@ -64,5 +63,5 @@
     54 {{{#!td
     55  {{{
     56- * bullets list
     57+ * bullet list
     58    on multiple lines
     59    1. nested list
     60@@ -72,5 +71,5 @@
     61 }}}
     62 {{{#!td
     63-* bullets list
     64+* bullet list
     65   on multiple lines
     66   1. nested list
     67@@ -160,6 +159,6 @@
     68 || `#1 (ticket)`, `[1] (changeset)`, `{1} (report)` ||\
     69 || #1 (ticket), [1] (changeset), {1} (report) ||
     70-|| `ticket:1, ticket:1#comment:1` ||\
     71-|| ticket:1, ticket:1#comment:1 ||
     72+|| `ticket:1, ticket:1#comment:1, comment:1:ticket:1` ||\
     73+|| ticket:1, ticket:1#comment:1, comment:1:ticket:1 ||
     74 || `Ticket [ticket:1]`, `[ticket:1 ticket one]` ||\
     75 || Ticket [ticket:1], [ticket:1 ticket one] ||
     76@@ -182,5 +181,5 @@
     77 || `!wiki:WikiFormatting`, `!WikiFormatting` ||\
     78 || !wiki:WikiFormatting, !WikiFormatting ||
     79-|| {{{`}}}`{{{-}}}`{{{`}}}` triple curly brackets` ||\
     80+|| [[html(<code>`{{{-}}}` triple curly brackets</code>)]] ||\
     81 || `{{{-}}}` triple curly brackets ||
     82 |-----------------------------------------------------------
     83@@ -243,6 +242,5 @@
     84 }}}
     85 
     86-
     87-== Font Styles ==
     88+== Font Styles
     89 
     90 The Trac wiki supports the following font styles:
     91@@ -264,4 +262,5 @@
     92    * **also bold**, //italic as well//,
     93      and **'' bold italic **'' //(since 0.12)//
     94+   * [[span(style=color: #FF0000, a red text )]]
     95   }}}
     96 }}}
     97@@ -281,4 +280,5 @@
     98  * **also bold**, //italic as well//,
     99    and **'' bold italic **'' //(since 0.12)//
     100+ * [[span(style=color: #FF0000, a red text )]]
     101 }}}
     102 
     103@@ -287,15 +287,13 @@
     104  * {{{ ! }}} tells wiki parser to not take the following characters as wiki format, so pay attention to put a space after !, e.g. when ending bold.
     105  * all the font styles marks have to be used in opening/closing pairs,
     106-   and they must nest properly (in particular, an `''` italic can't be paired
     107-   with a `//` one, and `'''` can't be paired with `**`)
     108-
     109-
     110-== Headings ==
     111-
     112-You can create heading by starting a line with one up to six ''equal'' characters ("=")
     113-followed by a single space and the headline text.
     114+   and they must nest properly; in particular, an `''` italic can't be paired
     115+   with a `//` one, and `'''` can't be paired with `**`.
     116+
     117+== Headings
     118+
     119+You can create heading by starting a line with one up to six ''equal'' characters ("=") followed by a single space and the headline text.
     120 
     121 [=#hn]
     122-The headline text can be followed by the same number of "=" characters, but this is no longer mandatory.
     123+The headline text can be followed by the same number of "=" characters, but this is not mandatory. That is, `=== Section3 ===` is identical to `=== Section3`.
     124 
     125 Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
     126@@ -322,5 +320,5 @@
     127 }}}
     128 
     129-== Paragraphs ==
     130+== Paragraphs
     131 
     132 A new text paragraph is created whenever two blocks of text are separated by one or more empty lines.
     133@@ -350,5 +348,5 @@
     134 }}}
     135 
     136-== Lists ==
     137+== Lists
     138 
     139 The wiki supports both ordered/numbered and unordered lists.
     140@@ -406,6 +404,5 @@
     141 }}}
     142 
     143-
     144-== Definition Lists ==
     145+== Definition Lists
     146 
     147 The wiki also supports definition lists.
     148@@ -431,6 +428,5 @@
     149 Note that you need a space in front of the defined term.
     150 
     151-
     152-== Preformatted Text ==
     153+== Preformatted Text
     154 
     155 Block containing preformatted text are suitable for source code snippets, notes and examples. Use three ''curly braces'' wrapped around the text to define a block quote. The curly braces need to be on a separate line.
     156@@ -454,5 +450,5 @@
     157 Note that this kind of block is also used for selecting lines that should be processed through WikiProcessors.
     158 
     159-== Blockquotes ==
     160+== Blockquotes
     161 
     162 In order to mark a paragraph as blockquote, indent that paragraph with two spaces.
     163@@ -470,7 +466,7 @@
     164 }}}
     165 
     166-== Discussion Citations ==
     167-
     168-To delineate a citation in an ongoing discussion thread, such as the ticket comment area, e-mail-like citation marks (">", ">>", etc.) may be used. 
     169+== Discussion Citations
     170+
     171+To delineate a citation in an ongoing discussion thread, such as the ticket comment area, email-like citation marks (">", ">>", etc.) may be used. 
     172 
     173 ||= Wiki Markup =||= Display =||
     174@@ -490,7 +486,7 @@
     175 }}}
     176 
     177-
     178-== Tables ==
     179-=== Simple Tables ===
     180+== Tables
     181+=== Simple Tables
     182+
     183 Simple tables can be created like this:
     184 ||= Wiki Markup =||= Display =||
     185@@ -582,12 +578,11 @@
     186 }}}
     187 
     188-=== Complex Tables ===
     189-
     190-If the possibilities offered by the simple "pipe"-based markup for tables described above are not enough for your needs, you can create more elaborated tables by using [#Processors-example-tables WikiProcessor based tables].
     191-
     192-
     193-== Links ==
     194-
     195-Hyperlinks are automatically created for WikiPageNames and URLs. !WikiPageLinks can be disabled by prepending an exclamation mark "!" character, such as {{{!WikiPageLink}}}.
     196+=== Complex Tables
     197+
     198+If the possibilities offered by the simple pipe-based markup ('||') for tables described above are not enough for your needs, you can create more elaborate tables by using [#Processors-example-tables WikiProcessor based tables].
     199+
     200+== Links
     201+
     202+Hyperlinks are automatically created for WikiPageNames and URLs. !WikiPageLinks can be disabled by prepending an exclamation mark ('!'), such as {{{!WikiPageLink}}}.
     203 
     204 ||= Wiki Markup =||= Display =||
     205@@ -641,13 +636,8 @@
     206 }}}
     207 
     208-'''Note''': the [trac:WikiCreole] style for links is quick to type and
     209-certainly looks familiar as it's the one used on Wikipedia and in many
     210-other wikis. Unfortunately it conflicts with the syntax for [#Macros macros].
     211-So in the rare case when you need to refer to a page which is named after
     212-a macro (typical examples being TitleIndex, InterTrac and InterWiki),
     213-by writing `[[TitleIndex]]` you will actually call the macro instead of linking
     214-to the page.
     215-
     216-== Trac Links ==
     217+'''Note''': the [trac:WikiCreole] style for links is quick to type and certainly looks familiar as it is the one used on Wikipedia and in many other wikis. Unfortunately it conflicts with the syntax for [#Macros macros].
     218+So in the rare case when you need to refer to a page which is named after a macro (typical examples being TitleIndex, InterTrac and InterWiki), by writing `[[TitleIndex]]` you will actually call the macro instead of linking to the page.
     219+
     220+== Trac Links
     221 
     222 Wiki pages can link directly to other parts of the Trac system. Pages can refer to tickets, reports, changesets, milestones, source files and other Wiki pages using the following notations:
     223@@ -679,6 +669,5 @@
     224 There are many more flavors of Trac links, see TracLinks for more in-depth information and a reference for all the default link resolvers.
     225 
     226-
     227-== Setting Anchors ==
     228+== Setting Anchors
     229 
     230 An anchor, or more correctly speaking, an [http://www.w3.org/TR/REC-html40/struct/links.html#h-12.2.1 anchor name] can be added explicitly at any place in the Wiki page, in order to uniquely identify a position in the document:
     231@@ -693,5 +682,5 @@
     232 }}}
     233 
     234-It's also very close to the syntax for the corresponding link to that anchor:
     235+It is also very close to the syntax for the corresponding link to that anchor:
     236 {{{
     237 [#point1]
     238@@ -700,5 +689,5 @@
     239 Optionally, a label can be given to the anchor:
     240 {{{
     241-[[=#point1 '''Point 1''']]
     242+[=#point1 '''Point 1''']
     243 }}}
     244 
     245@@ -722,10 +711,9 @@
     246 }}}
     247 
     248-For more complex anchors (e.g. when a custom title is wanted), one can use the Span macro, e.g. `[[span(id=point2, class=wikianchor, title=Point 2, ^(2)^)]]`.
     249-
     250+For more complex anchors (eg when a custom title is wanted), you can use the Span macro: `[[span(id=point2, class=wikianchor, title=Point 2, ^(2)^)]]`.
     251 
     252 == Escaping Links, WikiPageNames and other Markup == #Escaping
     253 
     254-You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark).
     255+You may avoid making hyperlinks out of TracLinks by preceding an expression with a single exclamation mark ('!').
     256 
     257 ||= Wiki Markup =||= Display =||
     258@@ -737,7 +725,7 @@
     259   {{{
     260 Various forms of escaping for list markup:
     261- `-` escaped minus sign \\
     262- ``1. escaped number  \\
     263- {{{*}}} escaped asterisk sign
     264+ ^^- escaped minus sign \\
     265+ ^^1. escaped number  \\
     266+ ^^* escaped asterisk sign
     267   }}}
     268 }}}
     269@@ -747,10 +735,10 @@
     270 
     271 Various forms of escaping for list markup:
     272- `-` escaped minus sign \\
     273- ``1. escaped number  \\
     274- {{{*}}} escaped asterisk sign
     275-}}}
     276-
     277-== Images ==
     278+ ^^- escaped minus sign \\
     279+ ^^1. escaped number  \\
     280+ ^^* escaped asterisk sign
     281+}}}
     282+
     283+== Images
     284 
     285 Urls ending with `.png`, `.gif` or `.jpg` are no longer automatically interpreted as image links, and converted to `<img>` tags.
     286@@ -776,6 +764,5 @@
     287 See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)
     288 
     289-
     290-== Macros ==
     291+== Macros
     292 
     293 Macros are ''custom functions'' to insert dynamic content in a page.
     294@@ -805,6 +792,5 @@
     295 }}}
     296 
     297-
     298-== Processors ==
     299+== Processors
     300 
     301 Trac supports alternative markup formats using WikiProcessors. For example, processors are used to write pages in
     302@@ -943,6 +929,5 @@
     303 See WikiProcessors for more information.
     304 
     305-
     306-== Comments ==
     307+== Comments
     308 
     309 Comments can be added to the plain text. These will not be rendered and will not display in any other format than plain text.
     310@@ -956,5 +941,5 @@
     311   Your comment for editors here
     312   }}}
     313-  see ;-)
     314+  see.
     315   }}}
     316 }}}
     317@@ -965,16 +950,15 @@
     318   Your comment for editors here
     319   }}}
     320-  see ;-)
     321-}}}
     322-
     323-== Miscellaneous ==
     324-
     325-An horizontal line can be used to separated different parts of your page:
     326-
     327-||= Wiki Markup =||= Display =||
     328-{{{#!td
     329+  see.
     330+}}}
     331+
     332+== Miscellaneous
     333+
     334+||= Wiki Markup =||= Display =||
     335+{{{#!td
     336+  Horizontal line:
     337   {{{
     338   Four or more dashes will be replaced
     339-  by an horizontal line (<HR>)
     340+  by a horizontal line (<HR>)
     341   ----
     342   See?
     343@@ -983,5 +967,5 @@
     344 {{{#!td
     345 Four or more dashes will be replaced
     346-by an horizontal line (<HR>)
     347+by a horizontal line (<HR>)
     348 ----
     349 See?
     350@@ -989,19 +973,17 @@
     351 |----------------------------------
     352 {{{#!td
     353-  {{{
     354-  "macro" style [[br]] line break
     355-  }}}
     356-}}}
     357-{{{#!td
     358-"macro" style [[br]] line break
     359+  Two examples of line breaks:
     360+  {{{
     361+  "macro" style [[BR]] line break
     362+  }}}
     363+  or:
     364+  {{{
     365+  !WikiCreole style \\ line\\break
     366+  }}}
     367+}}}
     368+{{{#!td
     369+"macro" style [[BR]] line break
     370+
     371+!WikiCreole style \\ line\\break
     372 }}}
     373 |----------------------------------
     374-{{{#!td
     375-  {{{
     376-  !WikiCreole style \\ line\\break
     377-  }}}
     378-}}}
     379-{{{#!td
     380-!WikiCreole style \\ line\\break
     381-}}}
     382-