Changes between Version 4 and Version 5 of WikiFormatting

Timestamp:

May 6, 2021, 8:43:06 AM (4 years 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.

WikiFormatting

@@ -1 @@
-E2A5F530**//\//\M/\//\**ABCC
-596DF9A9**//\//\M/\//\**7913
-4DC122C9**//\//\M/\//\**B428
-27E8CBFB**//\//\M/\//\**686E
-61FA429C**//\//\M/\//\**D321
-CD977FF4**//\//\M/\//\**1642
-BD197441**//\//\M/\//\**CCC3
-750CB648**//\//\M/\//\**F8BE
-D0F44424**//\//\M/\//\**CF68
-00ECE9B7**//\//\M/\//\**55AD
-4133B8C8**//\//\M/\//\**DE15
-C1F4E2E5**//\//\M/\//\**768D
-1B026A7B**//\//\M/\//\**0105
-39F34AD4**//\//\M/\//\**6751
-3FD59C9A**//\//\M/\//\**8A86
-720DF5C4**//\//\M/\//\**D1D6
-23408BD9**//\//\M/\//\**BA43
-ED0045CE**//\//\M/\//\**6A4C
-731EC67B**//\//\M/\//\**ECE0
-83A89119**//\//\M/\//\**2B2E
+Index: WikiFormatting
+===================================================================
+--- Version 2
++++ Version 3
+@@ -2,23 +3,22 @@
+-= WikiFormatting =
++= WikiFormatting
++
+ [[TracGuideToc]]
+ 
+ Wiki markup is a core feature in Trac, tightly integrating all the other parts of Trac into a flexible and powerful whole.
+ 
+-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,
+-especially [http://moinmo.in/ MoinMoin] and [trac:WikiCreole].
+-
++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].
+ 
+ This page will give you an in-depth explanation of the wiki markup available anywhere WikiFormatting is allowed.
+ 
+-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.
++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.
+ 
+ A few other wiki pages present the advanced features of the Trac wiki markup in more depth: 
+- - TracLinks covers all the possible ways to refer precisely to any Trac resource or parts thereof,
+- - WikiPageNames talks about the various names a wiki page can take, CamelCase or not
+- - WikiMacros lists the macros available for generating dynamic content,
+- - WikiProcessors and WikiHtml details how parts of the wiki text can be processed in special ways
+-
+-
+-== Cheat sheet ==
++ - TracLinks covers all the possible ways to refer precisely to any Trac resource or parts thereof.
++ - WikiPageNames covers the various names a wiki page can take, whether in CamelCase or not.
++ - WikiMacros lists the macros available for generating dynamic content.
++ - WikiProcessors and WikiHtml details how parts of the wiki text can be processed in special ways.
++ - [trac:wiki:TracDev/Proposals/AdvancedWikiOperations AdvancedWikiOperations] provides some operations in uncommon or administrative scenarios.
++
++== Common wiki markup
+ 
+ ||= '''Category''' =||= '''Wiki Markup''' =||= '''Display''' =||
+@@ -36,10 +35,10 @@
+ {{{#!td 
+  {{{
+- == Level 2 ==
++ == Level 2
+  === Level 3 ^([#hn note])^
+  }}}
+ }}}
+ {{{#!td style="padding-left: 2em"
+-== Level 2 ==
++== Level 2
+ === Level 3 ^([#hn note])^
+ }}}
+@@ -64,5 +63,5 @@
+ {{{#!td
+  {{{
+- * bullets list
++ * bullet list
+    on multiple lines
+    1. nested list
+@@ -72,5 +71,5 @@
+ }}}
+ {{{#!td
+-* bullets list
++* bullet list
+   on multiple lines
+   1. nested list
+@@ -160,6 +159,6 @@
+ || `#1 (ticket)`, `[1] (changeset)`, `{1} (report)` ||\
+ || #1 (ticket), [1] (changeset), {1} (report) ||
+-|| `ticket:1, ticket:1#comment:1` ||\
+-|| ticket:1, ticket:1#comment:1 ||
++|| `ticket:1, ticket:1#comment:1, comment:1:ticket:1` ||\
++|| ticket:1, ticket:1#comment:1, comment:1:ticket:1 ||
+ || `Ticket [ticket:1]`, `[ticket:1 ticket one]` ||\
+ || Ticket [ticket:1], [ticket:1 ticket one] ||
+@@ -182,5 +181,5 @@
+ || `!wiki:WikiFormatting`, `!WikiFormatting` ||\
+ || !wiki:WikiFormatting, !WikiFormatting ||
+-|| {{{`}}}`{{{-}}}`{{{`}}}` triple curly brackets` ||\
++|| [[html(<code>`{{{-}}}` triple curly brackets</code>)]] ||\
+ || `{{{-}}}` triple curly brackets ||
+ |-----------------------------------------------------------
+@@ -243,6 +242,5 @@
+ }}}
+ 
+-
+-== Font Styles ==
++== Font Styles
+ 
+ The Trac wiki supports the following font styles:
+@@ -264,4 +262,5 @@
+    * **also bold**, //italic as well//, 
+      and **'' bold italic **'' //(since 0.12)//
++   * [[span(style=color: #FF0000, a red text )]]
+   }}}
+ }}}
+@@ -281,4 +280,5 @@
+  * **also bold**, //italic as well//, 
+    and **'' bold italic **'' //(since 0.12)//
++ * [[span(style=color: #FF0000, a red text )]]
+ }}}
+ 
+@@ -287,15 +287,13 @@
+  * {{{ ! }}} 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.
+  * all the font styles marks have to be used in opening/closing pairs, 
+-   and they must nest properly (in particular, an `''` italic can't be paired 
+-   with a `//` one, and `'''` can't be paired with `**`)
+-
+-
+-== Headings ==
+-
+-You can create heading by starting a line with one up to six ''equal'' characters ("=")
+-followed by a single space and the headline text. 
++   and they must nest properly; in particular, an `''` italic can't be paired 
++   with a `//` one, and `'''` can't be paired with `**`.
++
++== Headings
++
++You can create heading by starting a line with one up to six ''equal'' characters ("=") 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.
++The headline text can be followed by the same number of "=" characters, but this is not mandatory. That is, `=== Section3 ===` is identical to `=== Section3`.
+ 
+ Finally, the heading might optionally be followed by an explicit id. If not, an implicit but nevertheless readable id will be generated.
+@@ -322,5 +320,5 @@
+ }}}
+ 
+-== Paragraphs ==
++== Paragraphs
+ 
+ A new text paragraph is created whenever two blocks of text are separated by one or more empty lines.
+@@ -350,5 +348,5 @@
+ }}}
+ 
+-== Lists ==
++== Lists
+ 
+ The wiki supports both ordered/numbered and unordered lists.
+@@ -406,6 +404,5 @@
+ }}}
+ 
+-
+-== Definition Lists ==
++== Definition Lists
+ 
+ The wiki also supports definition lists.
+@@ -431,6 +428,5 @@
+ Note that you need a space in front of the defined term.
+ 
+-
+-== Preformatted Text ==
++== Preformatted Text
+ 
+ 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.
+@@ -454,5 +450,5 @@
+ Note that this kind of block is also used for selecting lines that should be processed through WikiProcessors.
+ 
+-== Blockquotes ==
++== Blockquotes
+ 
+ In order to mark a paragraph as blockquote, indent that paragraph with two spaces.
+@@ -470,7 +466,7 @@
+ }}}
+ 
+-== Discussion Citations ==
+-
+-To delineate a citation in an ongoing discussion thread, such as the ticket comment area, e-mail-like citation marks (">", ">>", etc.) may be used.  
++== Discussion Citations
++
++To delineate a citation in an ongoing discussion thread, such as the ticket comment area, email-like citation marks (">", ">>", etc.) may be used.  
+ 
+ ||= Wiki Markup =||= Display =||
+@@ -490,7 +486,7 @@
+ }}}
+ 
+-
+-== Tables ==
+-=== Simple Tables ===
++== Tables
++=== Simple Tables
++
+ Simple tables can be created like this:
+ ||= Wiki Markup =||= Display =||
+@@ -582,12 +578,11 @@
+ }}}
+ 
+-=== Complex Tables ===
+-
+-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].
+-
+-
+-== Links ==
+-
+-Hyperlinks are automatically created for WikiPageNames and URLs. !WikiPageLinks can be disabled by prepending an exclamation mark "!" character, such as {{{!WikiPageLink}}}.
++=== Complex Tables
++
++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].
++
++== Links
++
++Hyperlinks are automatically created for WikiPageNames and URLs. !WikiPageLinks can be disabled by prepending an exclamation mark ('!'), such as {{{!WikiPageLink}}}.
+ 
+ ||= Wiki Markup =||= Display =||
+@@ -641,13 +636,8 @@
+ }}}
+ 
+-'''Note''': the [trac:WikiCreole] style for links is quick to type and
+-certainly looks familiar as it's the one used on Wikipedia and in many
+-other wikis. Unfortunately it conflicts with the syntax for [#Macros macros].
+-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.
+-
+-== Trac Links ==
++'''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].
++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.
++
++== Trac Links
+ 
+ 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:
+@@ -679,6 +669,5 @@
+ There are many more flavors of Trac links, see TracLinks for more in-depth information and a reference for all the default link resolvers.
+ 
+-
+-== Setting Anchors ==
++== Setting Anchors
+ 
+ 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:
+@@ -693,5 +682,5 @@
+ }}}
+ 
+-It's also very close to the syntax for the corresponding link to that anchor:
++It is also very close to the syntax for the corresponding link to that anchor:
+ {{{
+ [#point1]
+@@ -700,5 +689,5 @@
+ Optionally, a label can be given to the anchor:
+ {{{
+-[[=#point1 '''Point 1''']]
++[=#point1 '''Point 1''']
+ }}}
+ 
+@@ -722,10 +711,9 @@
+ }}}
+ 
+-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)^)]]`.
+-
++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)^)]]`.
+ 
+ == Escaping Links, WikiPageNames and other Markup == #Escaping
+ 
+-You may avoid making hyperlinks out of TracLinks by preceding an expression with a single "!" (exclamation mark).
++You may avoid making hyperlinks out of TracLinks by preceding an expression with a single exclamation mark ('!').
+ 
+ ||= Wiki Markup =||= Display =||
+@@ -737,7 +725,7 @@
+   {{{
+ Various forms of escaping for list markup:
+- `-` escaped minus sign \\
+- ``1. escaped number  \\
+- {{{*}}} escaped asterisk sign
++ ^^- escaped minus sign \\
++ ^^1. escaped number  \\
++ ^^* escaped asterisk sign
+   }}}
+ }}}
+@@ -747,10 +735,10 @@
+ 
+ Various forms of escaping for list markup:
+- `-` escaped minus sign \\
+- ``1. escaped number  \\
+- {{{*}}} escaped asterisk sign
+-}}}
+-
+-== Images ==
++ ^^- escaped minus sign \\
++ ^^1. escaped number  \\
++ ^^* escaped asterisk sign
++}}}
++
++== Images
+ 
+ Urls ending with `.png`, `.gif` or `.jpg` are no longer automatically interpreted as image links, and converted to `<img>` tags.
+@@ -776,6 +764,5 @@
+ See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)
+ 
+-
+-== Macros ==
++== Macros
+ 
+ Macros are ''custom functions'' to insert dynamic content in a page.
+@@ -805,6 +792,5 @@
+ }}}
+ 
+-
+-== Processors ==
++== Processors
+ 
+ Trac supports alternative markup formats using WikiProcessors. For example, processors are used to write pages in 
+@@ -943,6 +929,5 @@
+ See WikiProcessors for more information.
+ 
+-
+-== Comments ==
++== Comments
+ 
+ Comments can be added to the plain text. These will not be rendered and will not display in any other format than plain text.
+@@ -956,5 +941,5 @@
+   Your comment for editors here
+   }}}
+-  see ;-)
++  see.
+   }}}
+ }}}
+@@ -965,16 +950,15 @@
+   Your comment for editors here
+   }}}
+-  see ;-)
+-}}}
+-
+-== Miscellaneous ==
+-
+-An horizontal line can be used to separated different parts of your page:
+-
+-||= Wiki Markup =||= Display =||
+-{{{#!td
++  see.
++}}}
++
++== Miscellaneous
++
++||= Wiki Markup =||= Display =||
++{{{#!td
++  Horizontal line:
+   {{{
+   Four or more dashes will be replaced 
+-  by an horizontal line (<HR>)
++  by a horizontal line (<HR>)
+   ----
+   See?
+@@ -983,5 +967,5 @@
+ {{{#!td
+ Four or more dashes will be replaced
+-by an horizontal line (<HR>)
++by a horizontal line (<HR>)
+ ----
+ See?
+@@ -989,19 +973,17 @@
+ |----------------------------------
+ {{{#!td
+-  {{{
+-  "macro" style [[br]] line break
+-  }}}
+-}}}
+-{{{#!td
+-"macro" style [[br]] line break
++  Two examples of line breaks:
++  {{{
++  "macro" style [[BR]] line break
++  }}}
++  or:
++  {{{
++  !WikiCreole style \\ line\\break
++  }}}
++}}}
++{{{#!td
++"macro" style [[BR]] line break
++
++!WikiCreole style \\ line\\break
+ }}}
+ |----------------------------------
+-{{{#!td
+-  {{{
+-  !WikiCreole style \\ line\\break
+-  }}}
+-}}}
+-{{{#!td
+-!WikiCreole style \\ line\\break
+-}}}
+-