Skip to content

Commit

Permalink
Added 'catchall' in the model.
Browse files Browse the repository at this point in the history
Added 'catchall' parameter for the macro so that it can be documented.
Updated doco about @ tags.
  • Loading branch information
nguillaumin committed Aug 1, 2011
1 parent bb463ac commit 9e354ec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Example:
<#/macro>
```

You can use any `@` tags you want such as `@author`, or `@mytag`. These tags will be parsed and available in the template on the `macro` or `comment` objects (i.e. `macro.@author` ...).

### Global comment

A global comment for a given `.ftl` file can be written at the top of the file. The first comment found that isn't followed by a `<#macro />` is considered the global comment.
Expand Down
1 change: 1 addition & 0 deletions src/main/java/freemarker/tools/ftldoc/FtlDoc.java
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ private Map createCommentedMacro(Macro macro, Comment comment, File file) {
result.put("isfunction", new Boolean(macro.isFunction()));
result.put("type",macro.isFunction()?"function":"macro");
result.put("arguments",macro.getArgumentNames());
result.put("catchall", macro.getCatchAll());
result.put("node",new TemplateElementModel(macro));
result.put("filename", file.getName());
return result;
Expand Down

0 comments on commit 9e354ec

Please sign in to comment.