Changes between Version 19 and Version 20 of WikiFormatting


Ignore:
Timestamp:
Oct 31, 2024, 5:14:18 PM (23 months ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WikiFormatting

    v19 v20  
    159159|| `ticket:1, ticket:1#comment:1, comment:1:ticket:1` ||\
    160160|| ticket:1, ticket:1#comment:1, comment:1:ticket:1 ||
    161 || `Ticket [ticket:1]`, `[ticket:1 ticket one]` ||\
    162 || Ticket [ticket:1], [ticket:1 ticket one] ||
    163 || `Ticket [[ticket:1]]`, `[[ticket:1|ticket one]]` ||\
    164 || Ticket [[ticket:1]], [[ticket:1|ticket one]] ||
     161|| `Ticket [ticket:1]`, `[ticket:1 ticket one]` ||\
     162|| Ticket [ticket:1], [ticket:1 ticket one] ||
     163|| `Ticket [[ticket:1]]`, `[[ticket:1|ticket one]]` ||\
     164|| Ticket [[ticket:1]], [[ticket:1|ticket one]] ||
    165165|-----------------------------------------------------------
    166166{{{#!th rowspan=2
     
    182182|| `{{{-}}}` triple curly brackets ||
    183183|-----------------------------------------------------------
    184 ||= [#Images Images] =|| `[[Image( ... )]]` || [[Image( "/chrome/common/trac_logo_mini.png" )]] ||
     184||= [#Images Images] =|| `[[Image(`''link''`)]]` || [[Image(htdocs:../common/trac_logo_mini.png)]] ||
    185185|-----------------------------------------------------------
    186186{{{#!th rowspan=2
     
    662662== Setting Anchors
    663663
    664 E.g. https://trac.ffmpeg.org/wiki/Seeking?action=diff&version=33
    665 
    666664An anchor, or more correctly speaking, an [https://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, to uniquely identify a position in the document:
    667665
     
    693691  ...
    694692
    695   Point2: [=#point2] Jump here
     693  Point2:  [=#point2] Jump here
    696694  }}}
    697695}}}
     
    701699  ...
    702700
    703   Point2: [=#point2] Jump here
    704 }}}
    705 
    706 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)^)]]`.\\
    707 ͏    E.g.\\
    708 ͏    https://trac.ffmpeg.org/ticket/11002?action=comment-diff&cnum=5&version=1\\
    709 ͏    https://trac.ffmpeg.org/ticket/11055?action=comment-diff&cnum=2&version=9\\
    710 ͏    https://trac.ffmpeg.org/wiki/colorspace?action=diff&version=43
    711 
    712 ͏    Caveat:\\
    713 ͏    The "span" macro doesn't handle quote/space parsing for attributes' value.\\
    714 ͏    I.e. !`[[span( id= "x", Text )]]` would have !` "x"` literally (HTML escaped) as "id"...
    715 
    716 See also [ https://trac.ffmpeg.org/wiki/colorspace?action=diff&contextlines=8&version=31 ] for known limitations.
     701  Point2:  [=#point2] Jump here
     702}}}
     703
     704For 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)^)]]`.
    717705
    718706== Escaping Links, WikiPageNames and other Markup == #Escaping
     
    729717Various forms of escaping for list markup:
    730718 ^^- escaped minus sign \\
    731  ^^1. escaped number \\
     719 ^^1. escaped number  \\
    732720 ^^* escaped asterisk sign
    733721  }}}
     
    739727Various forms of escaping for list markup:
    740728 ^^- escaped minus sign \\
    741  ^^1. escaped number \\
     729 ^^1. escaped number  \\
    742730 ^^* escaped asterisk sign
    743731}}}
     
    747735Urls ending with `.png`, `.gif` or `.jpg` are no longer automatically interpreted as image links, and converted to `<img>` tags.
    748736
    749 You now have to use the ![[Image]] macro. The simplest way to include an image is to upload it as attachment to the current page, and put the filename in a macro call like `[[Image( "picture.gif" )]]`.
     737You now have to use the ![[Image]] macro. The simplest way to include an image is to upload it as attachment to the current page, and put the filename in a macro call like `[[Image(picture.gif)]]`.
    750738
    751739In addition to the current page, it is possible to refer to other resources:
    752 * `[[Image( "wiki:WikiFormatting:picture.gif" )]]` (referring to attachment on another page)
    753 * `[[Image( "ticket:1:picture.gif" )]]` (file attached to a ticket)
    754 * `[[Image( "htdocs:picture.gif" )]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory)
    755 * `[[Image( "source:/trunk/trac/htdocs/trac_logo_mini.png" )]]` (a file in repository)\\
    756   See also: https://github.com/orgs/community/discussions/108088#discussioncomment-8678990
    757 
    758 [ MasterQuestionable:\\
    759 ͏    Personally, I think the "!wiki:" "!ticket:" "htdocs:" alike prefixes are unnecessary.\\
    760 ͏    Using the more standard "/" type addressing is recommended. ]
    761 
    762 ||= Wiki Markup =||= Display =||
    763 {{{#!td
    764   {{{
    765   [[Image( "htdocs:../common/trac_logo_mini.png" )]]
    766   }}}
    767 }}}
    768 {{{#!td
    769 [[Image( "htdocs:../common/trac_logo_mini.png" )]]
    770 }}}
    771 
    772 ͏    See [/wiki/WikiMacros#Image-macro WikiMacros] for further documentation on "`[[Image( ... )]]`" macro: which has several useful options ("title", "link" etc.).\\
    773 ͏    Bunch mentioned in "`[[Image( ... )]]`" are invalid. Use with caution.\\
    774 ͏    Note also: https://trac.ffmpeg.org/ticket/10928
    775 
    776 Examples:\\
    777 ͏    https://trac.ffmpeg.org/wiki/Scaling?action=diff&contextlines=5&old_version=30&version=34\\
    778 ͏    It's recommended to quote the source URI: as which might contain "," that may cause misinterpretation of the macro.\\
    779 ͏    .\\
    780 ͏    Caveat [ https://trac.ffmpeg.org/wiki/Scaling?action=diff&contextlines=4&version=49 ] for the letterboxing example:\\
    781 ͏    !`width="100%"` wouldn't be necessary with [ https://trac.ffmpeg.org/ticket/10928#comment:3 ] deployed.
    782 
    783 ͏    See also:\\
    784 ͏    https://trac.ffmpeg.org/attachment/ticket/10928\\
    785 ͏    https://trac.ffmpeg.org/attachment/wiki/WikiFormatting/raw.txt\\
    786 ͏    https://trac.ffmpeg.org/attachment/wiki/WikiFormatting/raw2.txt\\
    787 ͏    https://trac.ffmpeg.org/attachment/wiki/WikiFormatting/raw3.txt
     740 * `[[Image(wiki:WikiFormatting:picture.gif)]]` (referring to attachment on another page)
     741 * `[[Image(ticket:1:picture.gif)]]` (file attached to a ticket)
     742 * `[[Image(htdocs:picture.gif)]]` (referring to a file inside the [TracEnvironment environment] `htdocs` directory)
     743 * `[[Image(source:/trunk/trac/htdocs/trac_logo_mini.png)]]` (a file in repository)
     744
     745||= Wiki Markup =||= Display =||
     746{{{#!td
     747  {{{
     748  [[Image(htdocs:../common/trac_logo_mini.png)]]
     749  }}}
     750}}}
     751{{{#!td
     752[[Image(htdocs:../common/trac_logo_mini.png)]]
     753}}}
     754
     755See WikiMacros for further documentation on the `[[Image()]]` macro, which has several useful options (`title=`, `link=`, etc.)
    788756
    789757== Macros
     
    837805  }}}
    838806}}}
    839 {{{#!td valign="top" style="border: 0px"
     807{{{#!td valign="top"  style="border: 0px"
    840808
    841809{{{#!html
     
    863831  }}}
    864832}}}
    865 {{{#!td valign="top" style="border: 0px"
     833{{{#!td valign="top"  style="border: 0px"
    866834
    867835{{{#!python
     
    912880  }}}
    913881}}}
    914 {{{#!td valign="top" style="border: 0px"
     882{{{#!td  valign="top" style="border: 0px"
    915883
    916884  {{{#!th rowspan=4 align=justify
     
    943911
    944912}}}
    945 ͏    See WikiProcessors for more information.\\
    946 ͏    See also: https://trac.ffmpeg.org/wiki/Scaling?action=diff&contextlines=7&version=50
    947 
    948 [ MasterQuestionable:\\
    949 ͏    If things have to eventually fallback to HTML...\\
    950 ͏    Why bother these clumsily coined hardly exchangeable workaround? ]
     913
     914See WikiProcessors for more information.
    951915
    952916== Comments