Redmine

Looks ok, but why do the actual RE has such a limitation preventing a closing curly brace to be present in the argument list ?

(source:trunk/lib/redmine/wiki_formatting.rb#L74)

Looks like it has been fixed with r10178, could you please confirm?

Indeed, I missed the modifier (you committed the "allow curly braces as argument" part, still).

Wouldn't it make sense to parse macro tags first?

Etienne Massip wrote:

Wouldn't it make sense to parse macro tags first?

Sure, but that's not that simple. Formatted text is cached and macro output must not be parsed by textile and redmine links. The solution would be to "catch" macro at the beginning then substitue with their output at the very end of the process.

Implemented in r10209, r10210. Macros now optionally accept a block of text as a third argument. Examples from the doc:

Redmine::WikiFormatting::Macros.register do
  # Declaring a macro that do not accept a block of text
  macro :my_macro do |obj, args|
    "My macro output" 
  end

  # Declaring a macro that accepts a block of text (as third argument)
  macro :my_macro2 do |obj, args, text|
    "My macro output" 
  end
end

# Macros are invoked in formatted text using the following
# syntax:
#
#   No arguments:
#   {{my_macro}}
#
#   With arguments:
#   {{my_macro(arg1, arg2)}}
#
#   With a block of text:
#   {{my_macro2
#   multiple lines
#   of text
#   }}
#
#   With arguments and a block of text
#   {{my_macro2(arg1, arg2)
#   multiple lines
#   of text
#   }}
#
# Note that the closing tag }} must be at the start of a new line

With r10209, the output of macros is automatically escaped. Use #html_safe if the generated output contains html tags that should not be escaped. Examples:

Redmine::WikiFormatting::Macros.register do
  macro :my_macro do |obj, args|
    "Unsafe <tag>" 
  end

  macro :my_macro2 do |obj, args|
    "Safe <tag>".html_safe
  end
end

# Then:
#
#   {{my_macro}}
#   produces: Unsafe &lt;tag&gt;
#
#   {{my_macro2}}
#   produces: Safe <tag>