You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by sj...@apache.org on 2013/01/24 21:40:31 UTC

svn commit: r1438171 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: resources/chaperon/grammars/wiki.grm resources/chaperon/stylesheets/wiki2xdoc.xsl status.xml

Author: sjur
Date: Thu Jan 24 20:40:31 2013
New Revision: 1438171

URL: http://svn.apache.org/viewvc?rev=1438171&view=rev
Log:
Some small changes to allow for colons in table titles.

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1438171&r1=1438170&r2=1438171&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Thu Jan 24 20:40:31 2013
@@ -241,7 +241,8 @@ tablehead
   ; 
 
 tabletitle
-  : tabletitleitem textblock
+  : tabletitleitem textblock deftermdefstart
+  | tabletitleitem textblock
   ;
 
 tablerows

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1438171&r1=1438170&r2=1438171&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Thu Jan 24 20:40:31 2013
@@ -201,7 +201,8 @@
   </xsl:template>
   <xsl:template match="st:tabletitle">
     <th>
-      <xsl:apply-templates select="st:textblock/*"/>
+      <xsl:value-of select="st:textblock"/>
+      <xsl:value-of select="st:deftermdefstart"/>
     </th>
   </xsl:template>
   <xsl:template match="st:tablecolumns">

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1438171&r1=1438170&r2=1438171&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Thu Jan 24 20:40:31 2013
@@ -24,6 +24,9 @@
   <changes>
     <release version="0.2-dev" date="not-released">
       <action type="fix" context="code" dev="SNM">
+        Some small changes to allow for colons in table titles.
+      </action>
+      <action type="fix" context="code" dev="SNM">
         Allow more items as (the first) symbol(s) within inline elements.
       </action>
       <action type="add" context="code" dev="SNM">