This commit is contained in:
rjy7 2010-12-22 19:14:08 +00:00
parent f1ec7240bd
commit 546b214a86

View file

@ -13,11 +13,19 @@
<li> elements. An <li> element may span multiple lines. <li> elements. An <li> element may span multiple lines.
Usage: Usage:
<@firstLastList /> <@firstLastList>
<li>apples</li> <li>apples</li>
<li>bananas</li> <li>bananas</li>
<li>oranges</li> <li>oranges</li>
</@firstLastList /> </@firstLastList>
<@firstLastList>
<#list animals as animal>
<#if animal != "cow">
<li>${animal}</li>
</#if>
</#list>
</@firstLastList>
RY Consider rewriting in Java. Probably designers won't want to modify this. That would allow us to support RY Consider rewriting in Java. Probably designers won't want to modify this. That would allow us to support
nested <li> elements. nested <li> elements.
@ -29,7 +37,6 @@
</#assign> </#assign>
<@processListItems text?matches("<li>.*?</li>", "s") /> <@processListItems text?matches("<li>.*?</li>", "s") />
</#macro> </#macro>
<#----------------------------------------------------------------------------> <#---------------------------------------------------------------------------->
@ -49,19 +56,27 @@
indicate how to split the text. indicate how to split the text.
Usage: Usage:
<@firstLastListNested /> <@firstLastListNested>
<li>apples</li>, <li>apples</li>,
<li>bananas</li>, <li>bananas</li>,
<li>oranges</li> <li>oranges</li>
</@firstLastListNested /> </@firstLastListNested>
<@firstLastListNested delim="??" /> <@firstLastListNested>
<#list animals as animal>
<#if animal != "cow">
<li>${animal}</li>,
</#if>
</#list>
</@firstLastListNested>
<@firstLastListNested delim="??">
<li>apples, oranges</li>?? <li>apples, oranges</li>??
<li>bananas, lemons</li>?? <li>bananas, lemons</li>??
<li>grapefruit, limes</li> <li>grapefruit, limes</li>
</@firstLastListNested /> </@firstLastListNested>
<@firstLastListNested delim="??" /> <@firstLastListNested delim="??">
<li>Books <li>Books
<ul> <ul>
<li>Persuasion</li> <li>Persuasion</li>
@ -74,7 +89,7 @@
<li>Time</li> <li>Time</li>
</ul> </ul>
</li> </li>
</@firstLastListNested /> </@firstLastListNested>
RY Consider rewriting in Java. Probably designers won't want to modify this. RY Consider rewriting in Java. Probably designers won't want to modify this.
--> -->
@ -104,6 +119,7 @@
--> -->
<#macro processListItems items> <#macro processListItems items>
<#list items as item> <#list items as item>
<#-- A FreeMarker loop variable cannot have its value modified, so we use a new variable. --> <#-- A FreeMarker loop variable cannot have its value modified, so we use a new variable. -->
<#assign newItem = item?trim> <#assign newItem = item?trim>
@ -112,6 +128,7 @@
<#-- Keep any class value already assigned --> <#-- Keep any class value already assigned -->
<#assign currentClass = newItem?matches("^<li [^>]*(class=[\'\"](.*?)[\'\"])")> <#assign currentClass = newItem?matches("^<li [^>]*(class=[\'\"](.*?)[\'\"])")>
<#list currentClass as m> <#list currentClass as m>
${m?groups[2]}<br />
<#assign classVal = m?groups[2]> <#assign classVal = m?groups[2]>
<#assign newItem = newItem?replace(m?groups[1], "")> <#assign newItem = newItem?replace(m?groups[1], "")>
</#list> </#list>