Changes between Version 5 and Version 6 of WikiMacros


Ignore:
Timestamp:
2019-02-22T10:54:47+10:00 (6 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • WikiMacros

    v5 v6  
    33[[PageOutline(2-5,Contents,pullout)]]
    44
    5 '''Trac macros''' extend the Trac engine with custom functionality. Macros are a special type of plugin and are written in Python. A macro inserts dynamic HTML data in any context supporting WikiFormatting.
     5'''Trac macros''' extend Trac with custom functionality. Macros are a special type of plugin and are written in Python. A macro generates HTML in any context supporting WikiFormatting.
    66
    77The macro syntax is `[[macro-name(optional-arguments)]]`.
    88
    9 '''WikiProcessors''' are another kind of macros. They are typically used for source code highlighting, such as `!#python` or `!#apache` and when the source code spans multiple lines, such as:
     9'''WikiProcessors''' are another kind of macro, commonly used for source code highlighting using a processor like `!#python` or `!#apache`:
    1010
    1111{{{
    … …  
    1717== Using Macros
    1818
    19 Macro calls are enclosed in double-square brackets `[[..]]`. Like Python functions, macros can have arguments, which is then a comma separated list within parentheses `[[..(,)]]`.
     19Macro calls are enclosed in double-square brackets `[[..]]`. Like Python functions macros can have arguments, which take the form of a comma separated list within parentheses `[[..(,)]]`.
    2020
    2121=== Getting Detailed Help
    2222
    23 The list of available macros and the full help can be obtained using the !MacroList macro, as seen [#AvailableMacros below].
     23The list of available macros and the full help can be obtained using the !MacroList macro, see [#AvailableMacros below].
    2424
    2525A brief list can be obtained via `[[MacroList(*)]]` or `[[?]]`.
    2626
    27 Detailed help on a specific macro can be obtained by passing it as an argument to !MacroList, e.g. `[[MacroList(MacroList)]]`, or, more conveniently, by appending a question mark (`?`) to the macro's name, like in `[[MacroList?]]`.
     27Detailed help on a specific macro can be obtained by passing it as an argument to !MacroList, e.g. `[[MacroList(MacroList)]]`, or more conveniently, by appending a question mark (`?`) to the macro's name, like in `[[MacroList?]]`.
    2828
    2929=== Example
    … …  
    7171== Available Macros
    7272
    73 ''Note that the following list will only contain the macro documentation if you've not enabled `-OO` optimizations, or not set the `PythonOptimize` option for [wiki:TracModPython mod_python].''
    74 
    7573[[MacroList]]
    7674
    7775== Macros from around the world
    7876
    79 The [http://trac-hacks.org/ Trac Hacks] site provides a wide collection of macros and other Trac [TracPlugins plugins] contributed by the Trac community. If you are looking for new macros, or have written one that you would like to share, please visit that site.
     77The [http://trac-hacks.org/ Trac Hacks] site provides a large collection of macros and other Trac [TracPlugins plugins] contributed by the Trac community. If you are looking for new macros, or have written one that you would like to share, please visit that site.
    8078
    8179== Developing Custom Macros
    8280
    83 Macros, like Trac itself, are written in the [http://python.org/ Python programming language] and are developed as part of TracPlugins.
     81Macros, like Trac itself, are written in the [http://python.org/ Python programming language] and are a type of [TracPlugins plugin].
    8482
    85 For more information about developing macros, see the [trac:TracDev development resources] on the main project site.
    86 
    87 Here are 2 simple examples showing how to create a Macro. Also, have a look at [trac:source:tags/trac-1.0.2/sample-plugins/Timestamp.py Timestamp.py] for an example that shows the difference between old style and new style macros and at the [trac:source:tags/trac-0.11/wiki-macros/README macros/README] which provides more insight about the transition.
     83Here are 2 simple examples showing how to create a Macro. For more information about developing macros, see the [trac:TracDev development resources].
    8884
    8985=== Macro without arguments
    9086
    91 To test the following code, save it in a `timestamp_sample.py` file located in the TracEnvironment's `plugins/` directory.
     87To test the following code, copy it to `timestamp_sample.py` in the TracEnvironment's `plugins/` directory.
    9288
    9389{{{#!python
    94 from datetime import datetime
    95 # Note: since Trac 0.11, datetime objects are used internally
    96 
    97 from trac.util.datefmt import format_datetime, utc
     90from trac.util.datefmt import datetime_now, format_datetime, utc
    9891from trac.util.html import tag
    9992from trac.wiki.macros import WikiMacroBase
    10093
    101 class TimeStampMacro(WikiMacroBase):
    102     """Inserts the current time (in seconds) into the wiki page."""
    10394
    104     revision = "$Rev$"
    105     url = "$URL$"
     95class TimestampMacro(WikiMacroBase):
     96    _description = "Inserts the current time (in seconds) into the wiki page."
    10697
    107     def expand_macro(self, formatter, name, text):
    108         t = datetime.now(utc)
     98    def expand_macro(self, formatter, name, content, args=None):
     99        t = datetime_now(utc)
    109100        return tag.strong(format_datetime(t, '%c'))
    110101}}}
    … …  
    112103=== Macro with arguments
    113104
    114 To test the following code, save it in a `helloworld_sample.py` file located in the TracEnvironment's `plugins/` directory.
     105To test the following code, copy it to `helloworld_sample.py` in the TracEnvironment's `plugins/` directory.
    115106
    116107{{{#!python
    117 from trac.util.html import Markup
     108from trac.util.translation import cleandoc_
    118109from trac.wiki.macros import WikiMacroBase
    119110
     111
    120112class HelloWorldMacro(WikiMacroBase):
     113    _description = cleandoc_(
    121114    """Simple HelloWorld macro.
    122115
    … …  
    128121    will become the documentation of the macro, as shown by
    129122    the !MacroList macro (usually used in the WikiMacros page).
    130     """
     123    """)
    131124
    132     revision = "$Rev$"
    133     url = "$URL$"
    134 
    135     def expand_macro(self, formatter, name, text, args):
     125    def expand_macro(self, formatter, name, content, args=None):
    136126        """Return some output that will be displayed in the Wiki content.
    137127
    138128        `name` is the actual name of the macro (no surprise, here it'll be
    139129        `'HelloWorld'`),
    140         `text` is the text enclosed in parenthesis at the call of the macro.
    141           Note that if there are ''no'' parenthesis (like in, e.g.
    142           [[HelloWorld]]), then `text` is `None`.
    143         `args` are the arguments passed when HelloWorld is called using a
    144         `#!HelloWorld` code block.
     130        `content` is the text enclosed in parenthesis at the call of the
     131          macro. Note that if there are ''no'' parenthesis (like in, e.g.
     132          [[HelloWorld]]), then `content` is `None`.
     133        `args` will contain a dictionary of arguments when called using the
     134          Wiki processor syntax and will be `None` if called using the
     135          macro syntax.
    145136        """
    146         return 'Hello World, text = %s, args = %s' % \
    147             (Markup.escape(text), Markup.escape(repr(args)))
    148 
     137        return 'Hello World, content = ' + unicode(content)
    149138}}}
    150139
    151 Note that `expand_macro` optionally takes a 4^th^ parameter ''`args`''. When the macro is called as a [WikiProcessors WikiProcessor], it is also possible to pass `key=value` [WikiProcessors#UsingProcessors processor parameters]. If given, those are stored in a dictionary and passed in this extra `args` parameter. In the other case, when called as a macro, `args` is `None`. (''since 0.12'').
     140Note that `expand_macro` optionally takes a 4^th^ parameter ''`args`''. When the macro is called as a [WikiProcessors WikiProcessor], it is also possible to pass `key=value` [WikiProcessors#UsingProcessors processor parameters]. If given, those are stored in a dictionary and passed in this extra `args` parameter. When called as a macro, `args` is `None`.
    152141
    153142For example, when writing:
    … …  
    171160}}}
    172161
    173 Note that the return value of `expand_macro` is '''not''' HTML escaped. Depending on the expected result, you should escape it yourself (using `return Markup.escape(result)`) or, if this is indeed HTML, wrap it in a Markup object: `return Markup(result)` (`from trac.util.html import Markup`).
     162Note that the return value of `expand_macro` is '''not''' HTML escaped. Depending on the expected result, you should escape it yourself (using `return Markup.escape(result)`), or if this is indeed HTML, wrap it in a Markup object: `return Markup(result)` (`from trac.util.html import Markup`).
    174163
    175 You can also recursively use a wiki Formatter (`from trac.wiki import Formatter`) to process the `text` as wiki markup:
     164You can also recursively use a wiki formatter to process the `content` as wiki markup:
    176165
    177166{{{#!python
    178 from trac.util.html import Markup
     167from trac.wiki.formatter import format_to_html
    179168from trac.wiki.macros import WikiMacroBase
    180 from trac.wiki import Formatter
    181 import StringIO
    182169
    183170class HelloWorldMacro(WikiMacroBase):
    184     def expand_macro(self, formatter, name, text, args):
    185         text = "whatever '''wiki''' markup you want, even containing other macros"
    186         # Convert Wiki markup to HTML, new style
    187         out = StringIO.StringIO()
    188         Formatter(self.env, formatter.context).format(text, out)
    189         return Markup(out.getvalue())
     171    def expand_macro(self, formatter, name, content, args):
     172        content = "any '''wiki''' markup you want, even containing other macros"
     173        # Convert Wiki markup to HTML
     174        return format_to_html(self.env, formatter.context, content)
    190175}}}