You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2007/04/10 06:57:57 UTC

svn commit: r527028 [1/4] - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: ./ resources/chaperon/ resources/chaperon/misc/ resources/chaperon/stylesheets/ src/documentation/ src/documentation/content/xdocs/ src/documentation/content/xd...

Author: crossley
Date: Mon Apr  9 21:57:55 2007
New Revision: 527028

URL: http://svn.apache.org/viewvc?view=rev&rev=527028
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/edit.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/new.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/patterntext.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/samples.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/source.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/view.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/sitemap.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/class2html.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/egrm2xegrm.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error2html.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error2page.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error4wiki.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/grm2xgrm.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/grm2xlex.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/java2html.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/mathexp2html.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/moinwiki2xdoc.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/pattern2link.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/quote2page.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/remove4class.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/text4error.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/text4javadoc.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/text4javadoc2.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/text4regex.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2html.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/xdoc2html.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/src/documentation/content/xdocs/samples/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/src/documentation/content/xdocs/tabs.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/src/documentation/skinconf.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml Mon Apr  9 21:57:55 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
-
   <property name="plugin-name" value="org.apache.forrest.plugin.input.wiki"/>
   <property name="forrest.version" value="0.8"/>
   <property name="type" value="input"/>
@@ -26,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.input.wiki/"/>
   <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
   <property name="publish" value="true"/>
-    
   <import file="../build.xml"/>
-  
-  <!-- Add any additional installation work here in the build target, for example:
+<!-- Add any additional installation work here in the build target, for example:
   <target name="build"
           description="Extract the tools">
      <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
@@ -40,5 +37,3 @@
   </target>
   -->
 </project>
-  
-  

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Mon Apr  9 21:57:55 2007
@@ -21,18 +21,17 @@
       <map:transformer name="lexer" 
 	                     src="org.apache.cocoon.transformation.LexicalTransformer" 
 	                     logger="sitemap.transformer.lexer">
-	      <parameter name="localizable" value="true"/>
-	    </map:transformer>
- 	    <map:transformer name="parser" 
+        <parameter name="localizable" value="true"/>
+      </map:transformer>
+      <map:transformer name="parser" 
 	                     src="org.apache.cocoon.transformation.ParserTransformer" 
 	                     logger="sitemap.transformer.parser">
-	      <parameter name="flatten" value="true"/>
-	      <parameter name="recovery" value="true"/>
-	      <parameter name="localizable" value="true"/>
-	    </map:transformer>
+        <parameter name="flatten" value="true"/>
+        <parameter name="recovery" value="true"/>
+        <parameter name="localizable" value="true"/>
+      </map:transformer>
     </map:transformers>
   </map:components>
-    
   <map:resources>
     <map:resource name="file-resolver">
       <map:select type="exists">
@@ -78,18 +77,15 @@
       </map:select>
     </map:resource>
   </map:resources>
-  
   <map:pipelines>
     <map:pipeline internal="true">
       <map:match pattern="**.xml">
         <map:call resource="file-resolver">
-              <map:parameter name="uri" value="{1}"/>
+          <map:parameter name="uri" value="{1}"/>
         </map:call>
       </map:match>
     </map:pipeline>
-    
     <map:pipeline type="caching" internal-only="true">
-
       <map:match pattern="*.xlex">
         <map:select type="exists">
           <map:when test="{lm:wiki.grammar.{1}.xlex}">
@@ -107,7 +103,6 @@
           </map:otherwise>
         </map:select>
       </map:match>
-
       <map:match pattern="*.xgrm">
         <map:select type="exists">
           <map:when test="{lm:wiki.grammar.{1}.xgrm}">
@@ -125,22 +120,19 @@
           </map:otherwise>
         </map:select>
       </map:match>
-
-     <map:match pattern="*.xegrm">
+      <map:match pattern="*.xegrm">
         <map:select type="exists">
           <map:when test="{lm:wiki.grammar.{1}.xegrm}">
             <map:read src="{lm:wiki.grammar.{1}.xegrm}"/>
           </map:when>
           <map:otherwise>
-              <map:generate  type="text2xml"   src="{lm:wiki.grammar.{1}.egrm}"/>
-              <map:transform type="extparser" src="{lm:wiki.grammar.egrm.xegrm}"/>
-              <map:transform               src="{lm:wiki.transform.egrm.xegrm}"/>
-              <map:serialize type="xml"/>
+            <map:generate  type="text2xml"   src="{lm:wiki.grammar.{1}.egrm}"/>
+            <map:transform type="extparser" src="{lm:wiki.grammar.egrm.xegrm}"/>
+            <map:transform               src="{lm:wiki.transform.egrm.xegrm}"/>
+            <map:serialize type="xml"/>
           </map:otherwise>
         </map:select>
       </map:match>
     </map:pipeline>
-
   </map:pipelines>
-
 </map:sitemap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml Mon Apr  9 21:57:55 2007
@@ -15,11 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
       <matcher 
@@ -27,24 +24,21 @@
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
+      <selector name="exists" logger="sitemap.selector.exists"  
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
-  <locator>    
+  <locator>
     <match pattern="wiki.grammar.*.*">
       <select>
         <location src="resources/chaperon/grammars/{1}.{2}"/>
       </select>
-    </match>   
-    
+    </match>
     <match pattern="wiki.transform.text4regex">
       <location src="resources/chaperon/stylesheets/text4regex.xsl"/>
-    </match>   
-    
+    </match>
     <match pattern="wiki.transform.*.*">
       <location src="resources/chaperon/stylesheets/{1}2{2}.xsl"/>
-    </match>   
+    </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/edit.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/edit.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/edit.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/edit.xml Mon Apr  9 21:57:55 2007
@@ -16,20 +16,19 @@
   limitations under the License.
 -->
 <document>
- <header>
-  <title>Wiki example</title>
-  <tab title="back" href="."/>
- </header>
- <body>
-  <row>
-   <column title="Wiki content">
- 
-    <form action="${cocoon.continuation.id}.kont" method="post">
-     <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%">${text}</textarea><br/>
-     <input value="Save" type="submit" class="submit"/>
-    </form>
-
-   </column>
-  </row>
- </body>
+  <header>
+    <title>Wiki example</title>
+    <tab title="back" href="."/>
+  </header>
+  <body>
+    <row>
+      <column title="Wiki content">
+        <form action="${cocoon.continuation.id}.kont" method="post">
+          <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%">${text}</textarea>
+          <br/>
+          <input value="Save" type="submit" class="submit"/>
+        </form>
+      </column>
+    </row>
+  </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/new.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/new.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/new.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/new.xml Mon Apr  9 21:57:55 2007
@@ -16,20 +16,19 @@
   limitations under the License.
 -->
 <document>
- <header>
-  <title>Wiki example</title>
-  <tab title="back" href="."/>
- </header>
- <body>
-  <row>
-   <column title="Wiki content">
- 
-    <form action="${cocoon.continuation.id}.kont" method="post">
-     <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%"></textarea><br/>
-     <input value="Save" type="submit" class="submit"/>
-    </form>
-
-   </column>
-  </row>
- </body>
+  <header>
+    <title>Wiki example</title>
+    <tab title="back" href="."/>
+  </header>
+  <body>
+    <row>
+      <column title="Wiki content">
+        <form action="${cocoon.continuation.id}.kont" method="post">
+          <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%"></textarea>
+          <br/>
+          <input value="Save" type="submit" class="submit"/>
+        </form>
+      </column>
+    </row>
+  </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/patterntext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/patterntext.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/patterntext.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/patterntext.xml Mon Apr  9 21:57:55 2007
@@ -16,20 +16,23 @@
   limitations under the License.
 -->
 <document>
- <header>
-  <title>Chaperon examples</title>
-  <tab title="back" href="."/>
- </header>
- <body>
-  <section>
-   <title>Pattern test</title>
-
-   <p>Some links for the Apache project(http://xml.apache.org/):</p>
-   <ul>
-    <li>Here the link for Cocoon http://cocoon.apache.org/</li>
-    <li>And the link for Avalon http://jakarta.apache.org/avalon/</li>
-   </ul>
-   <p>This example was made by Stephan Michels(stephan@apache.org).</p>
-  </section>
- </body>
+  <header>
+    <title>Chaperon examples</title>
+    <tab title="back" href="."/>
+  </header>
+  <body>
+    <section>
+      <title>Pattern test</title>
+      <p>
+        Some links for the Apache project(http://xml.apache.org/):
+      </p>
+      <ul>
+        <li>Here the link for Cocoon http://cocoon.apache.org/</li>
+        <li>And the link for Avalon http://jakarta.apache.org/avalon/</li>
+      </ul>
+      <p>
+        This example was made by Stephan Michels(stephan@apache.org).
+      </p>
+    </section>
+  </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/samples.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/samples.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/samples.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/samples.xml Mon Apr  9 21:57:55 2007
@@ -16,68 +16,54 @@
   limitations under the License.
 -->
 <samples xmlns:xlink="http://www.w3.org/1999/xlink" name="Chaperon Block Samples">
-
- <group name="Back">
-  <sample name="Back" href="../..">to Cocoon Samples main page</sample>
-  <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
- </group>
-
- <group name="Mathexp example">
-  <sample name="Mathexp" href="mathexp.html">This example demonstrate how
+  <group name="Back">
+    <sample name="Back" href="../..">to Cocoon Samples main page</sample>
+    <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
+  </group>
+  <group name="Mathexp example">
+    <sample name="Mathexp" href="mathexp.html">This example demonstrate how
    the parser can be used to parse input text, like mathematical expressions.
   </sample>
- </group>
-
- <group name="Wiki examples">
-  <sample name="Wiki editor" href="view.do?page=index">In this example the parser is used
+  </group>
+  <group name="Wiki examples">
+    <sample name="Wiki editor" href="view.do?page=index">In this example the parser is used
    to build an online editor,
    which is based on the very popular syntax of Wiki.
   </sample>
-  <sample name="Wiki self-test" href="view.do?page=selftest">
+    <sample name="Wiki self-test" href="view.do?page=selftest">
   	A self-describing document that demonstrates and tests the Wiki grammar.
   </sample>
- </group>
-
- <group name="Pattern example">
-  <sample name="Pattern" href="pattern.html">In this example the
+  </group>
+  <group name="Pattern example">
+    <sample name="Pattern" href="pattern.html">In this example the
    PatternTransformer is used to replace links with HTML links.
   </sample>
- </group>
-
- <group name="Syntax highlighting example">
-  <sample name="Example 1" href="org/apache/cocoon/Cocoon.java.html">The parser can also
+  </group>
+  <group name="Syntax highlighting example">
+    <sample name="Example 1" href="org/apache/cocoon/Cocoon.java.html">The parser can also
    be used to colorize some source code.
   </sample>
-
-  <sample name="Example 2" href="org/apache/cocoon/Cocoon.class.html">
+    <sample name="Example 2" href="org/apache/cocoon/Cocoon.class.html">
    This example show a another view of a java class, similar to javadoc.
    (The first use takes 2-3 minutes, for the parser table generation process.)
   </sample>
- </group>
-
- <group name="Comma-Separated Values (CSV)">
-  <sample name="Stock Quote" href="quote1.html">
+  </group>
+  <group name="Comma-Separated Values (CSV)">
+    <sample name="Stock Quote" href="quote1.html">
    This example processes a CSV file and generates a table from it.
   </sample>
-  <sample name="Excel output" href="quote2.html">
+    <sample name="Excel output" href="quote2.html">
    This example processes a CSV file which was generated by MS Excel.
   </sample>
- </group>
-
- <group name="Documentation">
-  <sample name="Lexical Transformer"
-          href="../../../docs/userdocs/transformers/lexer-transformer.html">
-  </sample>
-  <sample name="Parser Transformer"
-          href="../../../docs/userdocs/transformers/parser-transformer.html">
-  </sample>
-  <sample name="Pattern Transformer"
-          href="../../../docs/userdocs/transformers/pattern-transformer.html">
-  </sample>
-  <sample name="Full Chaperon documentation"
-          href="http://chaperon.sourceforge.net/">
-  </sample>
- </group>
-
+  </group>
+  <group name="Documentation">
+    <sample name="Lexical Transformer"
+          href="../../../docs/userdocs/transformers/lexer-transformer.html"></sample>
+    <sample name="Parser Transformer"
+          href="../../../docs/userdocs/transformers/parser-transformer.html"></sample>
+    <sample name="Pattern Transformer"
+          href="../../../docs/userdocs/transformers/pattern-transformer.html"></sample>
+    <sample name="Full Chaperon documentation"
+          href="http://chaperon.sourceforge.net/"></sample>
+  </group>
 </samples>
-

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/source.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/source.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/source.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/source.xml Mon Apr  9 21:57:55 2007
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 <document>
- <header>
-  <title>Wiki example</title>
- </header>
- <body>
-  <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
- </body>
+  <header>
+    <title>Wiki example</title>
+  </header>
+  <body>
+    <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
+  </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/view.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/view.xml?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/view.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/misc/view.xml Mon Apr  9 21:57:55 2007
@@ -16,13 +16,13 @@
   limitations under the License.
 -->
 <document>
- <header>
-  <title>Wiki example</title>
-  <tab title="Edit" href="edit.do?page=${page}"/>
-  <tab title="Source" href="source.do?page=${page}"/>
-  <tab title="back" href="."/>
- </header>
- <body>
-  <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
- </body>
+  <header>
+    <title>Wiki example</title>
+    <tab title="Edit" href="edit.do?page=${page}"/>
+    <tab title="Source" href="source.do?page=${page}"/>
+    <tab title="back" href="."/>
+  </header>
+  <body>
+    <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
+  </body>
 </document>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/sitemap.xmap?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/sitemap.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/sitemap.xmap Mon Apr  9 21:57:55 2007
@@ -15,273 +15,223 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
 <!-- =========================== Components ================================ -->
-
- <map:components>
-
+  <map:components>
 <!-- =========================== Generators ================================= -->
-
-  <map:generators default="file">
-
-   <map:generator name="text" logger="sitemap.generator.textgenerator"
+    <map:generators default="file">
+      <map:generator name="text" logger="sitemap.generator.textgenerator"
                   src="org.apache.cocoon.generation.TextGenerator">
-    <parameter name="localizable" value="true"/>
-   </map:generator>
-
-   <map:generator name="exception"
+        <parameter name="localizable" value="true"/>
+      </map:generator>
+      <map:generator name="exception"
                   src="org.apache.cocoon.generation.ParseExceptionGenerator"/>
-
-  </map:generators>
-
+    </map:generators>
 <!-- =========================== Transformers ================================= -->
-
-  <map:transformers default="xsltc">
-
-   <map:transformer name="pattern" 
+    <map:transformers default="xsltc">
+      <map:transformer name="pattern" 
                     src="org.apache.cocoon.transformation.PatternTransformer" 
                     logger="sitemap.transformer.pattern">
-    <parameter name="groups" value="true"/>
-   </map:transformer>
-   <map:transformer name="lexer" 
+        <parameter name="groups" value="true"/>
+      </map:transformer>
+      <map:transformer name="lexer" 
                     src="org.apache.cocoon.transformation.LexicalTransformer" 
                     logger="sitemap.transformer.lexer">
-    <parameter name="localizable" value="true"/>
-   </map:transformer>
-   <map:transformer name="parser" 
+        <parameter name="localizable" value="true"/>
+      </map:transformer>
+      <map:transformer name="parser" 
                     src="org.apache.cocoon.transformation.ParserTransformer" 
                     logger="sitemap.transformer.parser">
-    <parameter name="flatten" value="true"/>
-    <parameter name="recovery" value="true"/>
-    <parameter name="localizable" value="true"/>
-   </map:transformer>
-
-   <map:transformer name="extparser"
+        <parameter name="flatten" value="true"/>
+        <parameter name="recovery" value="true"/>
+        <parameter name="localizable" value="true"/>
+      </map:transformer>
+      <map:transformer name="extparser"
                     src="org.apache.cocoon.transformation.ExtendedParserTransformer"
-                    logger="sitemap.transformer.extendedparser">
-   </map:transformer>
-
-  </map:transformers>
-
+                    logger="sitemap.transformer.extendedparser"></map:transformer>
+    </map:transformers>
 <!-- =========================== Selectors ================================ -->
-
-  <map:selectors default="browser">
-   <map:selector logger="sitemap.selector.exception" name="exception"
+    <map:selectors default="browser">
+      <map:selector logger="sitemap.selector.exception" name="exception"
                  src="org.apache.cocoon.selection.ExceptionSelector">
-     <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
-     <exception class="java.lang.Throwable" unroll="true"/>
-   </map:selector>
-  </map:selectors>
-
- </map:components>
-
+        <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
+        <exception class="java.lang.Throwable" unroll="true"/>
+      </map:selector>
+    </map:selectors>
+  </map:components>
 <!-- =========================== Views =================================== -->
-
- <map:views>
-  <map:view from-label="content" name="content">
-   <map:serialize type="xml"/>
-  </map:view>
-
-  <map:view from-label="ast" name="ast">
-   <map:serialize type="xml"/>
-  </map:view>
-  
-  <map:view from-label="xdoc" name="xdoc">
-   <map:serialize type="xml"/>
-  </map:view>
-  
-  <map:view from-position="last" name="links">
-   <map:serialize type="links"/>
-  </map:view>
-
- </map:views>
-
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml"/>
+    </map:view>
+    <map:view from-label="ast" name="ast">
+      <map:serialize type="xml"/>
+    </map:view>
+    <map:view from-label="xdoc" name="xdoc">
+      <map:serialize type="xml"/>
+    </map:view>
+    <map:view from-position="last" name="links">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
 <!-- =========================== Flow =================================== -->
-
- <map:flow language="javascript">
-  <map:script src="misc/wiki.js"/>
- </map:flow>
-
+  <map:flow language="javascript">
+    <map:script src="misc/wiki.js"/>
+  </map:flow>
 <!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
-
-  <map:pipeline type="caching" internal-only="true">
-   <!-- Hint: During development you could expose this pipeline, to help
+  <map:pipelines>
+    <map:pipeline type="caching" internal-only="true">
+<!-- Hint: During development you could expose this pipeline, to help
      with writing your grammars. Use a text grammar myapp.grm and request
      the myapp.xlex and myapp.xgrm URLs and then view source.
    -->
-   <map:match pattern="*.xlex">
-    <map:generate  type="text"   src="grammars/{1}.grm"/>
-    <map:transform type="lexer"  src="grammars/grm.xlex"/>
-    <map:transform type="parser" src="grammars/grm.xgrm"/>
-    <map:transform               src="stylesheets/text4regex.xsl"/>
-    <map:transform type="lexer"  src="grammars/regex.xlex"/>
-    <map:transform type="parser" src="grammars/regex.xgrm"/>
-    <map:transform               src="stylesheets/grm2xlex.xsl"/>
-    <map:serialize type="xml"/>
-   </map:match>
-
-   <map:match pattern="*.xgrm">
-    <map:generate  type="text"   src="grammars/{1}.grm"/>
-    <map:transform type="lexer"  src="grammars/grm.xlex"/>
-    <map:transform type="parser" src="grammars/grm.xgrm"/>
-    <map:transform               src="stylesheets/text4regex.xsl"/>
-    <map:transform type="lexer"  src="grammars/regex.xlex"/>
-    <map:transform type="parser" src="grammars/regex.xgrm"/>
-    <map:transform               src="stylesheets/grm2xgrm.xsl"/>
-    <map:serialize type="xml"/>
-   </map:match>
-
-   <map:match pattern="*.xegrm">
-    <map:generate  type="text"   src="grammars/{1}.egrm"/>
-    <map:transform type="extparser" src="grammars/egrm.xegrm"/>
-    <map:transform               src="stylesheets/egrm2xegrm.xsl"/>
-    <map:serialize type="xml"/>
-   </map:match>
-
-   <map:match pattern="wiki/*.html">
-    <map:generate  type="jx"      src="misc/{1}.xml" />
-    <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
-    <map:transform type="parser"  src="cocoon:/wiki.xgrm"         label="ast">
-     <map:parameter name="failsafe" value="true"/>
-    </map:transform>
-    <map:transform                src="stylesheets/error4wiki.xsl"/>
-    <map:transform type="lexer"   src="grammars/error.xlex"/>
-    <map:transform                src="stylesheets/error2page.xsl"/>
-    <map:transform                src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="wiki/source.xml">
-    <map:generate  type="jx"      src="misc/source.xml" />
-    <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
-    <map:transform type="parser"  src="cocoon:/wiki.xgrm"         label="ast"/>
-    <map:transform                src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
-    <map:serialize type="xml"/>
-   </map:match>
-
-  </map:pipeline>
-
-  <map:pipeline type="caching"> 
-
-   <map:match pattern="">
-    <map:redirect-to uri="welcome"/>
-   </map:match>
-   
-   <map:match pattern="welcome">
-    <map:generate                src="misc/samples.xml"/>
-    <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize/>
-   </map:match>
-
-   <map:match pattern="*.kont">
-    <map:call continuation="{1}"/>
-   </map:match>
-                                                                                                                                                                               
-   <map:match pattern="*.do">
-    <map:call function="{1}"/>
-   </map:match>
-
-   <map:match pattern="*.css">
-    <map:read src="misc/{1}.css"/>
-   </map:match>
-                                                                                                                                                                               
-   <map:match pattern="**/*.css">
-    <map:read src="misc/{2}.css"/>
-   </map:match>
-
+      <map:match pattern="*.xlex">
+        <map:generate  type="text"   src="grammars/{1}.grm"/>
+        <map:transform type="lexer"  src="grammars/grm.xlex"/>
+        <map:transform type="parser" src="grammars/grm.xgrm"/>
+        <map:transform               src="stylesheets/text4regex.xsl"/>
+        <map:transform type="lexer"  src="grammars/regex.xlex"/>
+        <map:transform type="parser" src="grammars/regex.xgrm"/>
+        <map:transform               src="stylesheets/grm2xlex.xsl"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="*.xgrm">
+        <map:generate  type="text"   src="grammars/{1}.grm"/>
+        <map:transform type="lexer"  src="grammars/grm.xlex"/>
+        <map:transform type="parser" src="grammars/grm.xgrm"/>
+        <map:transform               src="stylesheets/text4regex.xsl"/>
+        <map:transform type="lexer"  src="grammars/regex.xlex"/>
+        <map:transform type="parser" src="grammars/regex.xgrm"/>
+        <map:transform               src="stylesheets/grm2xgrm.xsl"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="*.xegrm">
+        <map:generate  type="text"   src="grammars/{1}.egrm"/>
+        <map:transform type="extparser" src="grammars/egrm.xegrm"/>
+        <map:transform               src="stylesheets/egrm2xegrm.xsl"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="wiki/*.html">
+        <map:generate  type="jx"      src="misc/{1}.xml" />
+        <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
+        <map:transform type="parser"  src="cocoon:/wiki.xgrm"         label="ast">
+          <map:parameter name="failsafe" value="true"/>
+        </map:transform>
+        <map:transform                src="stylesheets/error4wiki.xsl"/>
+        <map:transform type="lexer"   src="grammars/error.xlex"/>
+        <map:transform                src="stylesheets/error2page.xsl"/>
+        <map:transform                src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
+        <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="wiki/source.xml">
+        <map:generate  type="jx"      src="misc/source.xml" />
+        <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
+        <map:transform type="parser"  src="cocoon:/wiki.xgrm"         label="ast"/>
+        <map:transform                src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
+        <map:serialize type="xml"/>
+      </map:match>
+    </map:pipeline>
+    <map:pipeline type="caching">
+      <map:match pattern="">
+        <map:redirect-to uri="welcome"/>
+      </map:match>
+      <map:match pattern="welcome">
+        <map:generate                src="misc/samples.xml"/>
+        <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize/>
+      </map:match>
+      <map:match pattern="*.kont">
+        <map:call continuation="{1}"/>
+      </map:match>
+      <map:match pattern="*.do">
+        <map:call function="{1}"/>
+      </map:match>
+      <map:match pattern="*.css">
+        <map:read src="misc/{1}.css"/>
+      </map:match>
+      <map:match pattern="**/*.css">
+        <map:read src="misc/{2}.css"/>
+      </map:match>
 <!-- ========================= Chaperon ================================ -->
-
-   <map:match pattern="mathexp.html">
-    <map:generate type="serverpages" src="misc/mathexp.xsp"/>
-    <map:transform type="lexer"   src="grammars/mathexp.xlex"/>
-    <map:transform type="parser"  src="grammars/mathexp.xgrm"/>
-    <map:transform                src="stylesheets/mathexp2html.xsl"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="quote*.html">
-    <map:generate  type="text"    src="misc/quote{1}.txt"/>
-    <map:transform type="lexer"   src="cocoon:/quote.xlex"/>
-    <map:transform type="parser"  src="cocoon:/quote.xgrm" label="ast"/>
-    <map:transform                src="stylesheets/quote2page.xsl"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="pattern.html">
-    <map:generate                 src="misc/patterntext.xml"/>
-    <map:transform type="pattern" src="grammars/link.xlex"/>
-    <map:transform                src="stylesheets/pattern2link.xsl"/>
-    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="**/*.java.html">
-    <map:generate  type="text"    src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java"/>
-    <map:transform type="lexer"   src="grammars/java.xlex"/>
-    <map:transform                src="stylesheets/text4javadoc.xsl"/>
-    <map:transform type="lexer"   src="grammars/javadoc.xlex" label="ast"/>
-    <map:transform                src="stylesheets/java2html.xsl">
-     <map:parameter name="package" value="{1}"/>
-     <map:parameter name="class"   value="{2}"/>
-    </map:transform>
-    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="**/*.class.html">
-    <map:generate  type="text"    src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java"/>
-    <map:transform type="lexer"   src="grammars/java.xlex"/>
-    <map:transform                src="stylesheets/remove4class.xsl"/>
-    <map:transform type="parser"  src="cocoon:/java.xgrm"/>
-    <map:transform                src="stylesheets/text4javadoc2.xsl"/>
-    <map:transform type="lexer"   src="cocoon:/javadoc.xlex"/>
-    <map:transform type="parser"  src="cocoon:/javadoc.xgrm" label="ast"/>
-    <map:transform                src="stylesheets/class2html.xsl">
-     <map:parameter name="package" value="{1}"/>
-     <map:parameter name="class"   value="{2}"/>
-    </map:transform>
-    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-     <map:parameter name="contextPath" value="{request:contextPath}"/>
-    </map:transform>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:handle-errors>
-    <map:select type="exception">
-     <map:when test="syntax">
-      <map:generate  type="exception"/>
-      <map:transform                 src="stylesheets/text4error.xsl"/>
-      <map:transform type="xinclude"/>
-      <map:transform type="lexer"    src="grammars/error.xlex"/>
-      <map:transform                 src="stylesheets/error2html.xsl">
-       <map:parameter name="contextPath" value="{request:contextPath}"/>
-      </map:transform>
-      <map:serialize type="html"/>
-     </map:when>
-    </map:select>
-   </map:handle-errors>
-                                                                                                                                                             
-  </map:pipeline>
-
- </map:pipelines>
-
+      <map:match pattern="mathexp.html">
+        <map:generate type="serverpages" src="misc/mathexp.xsp"/>
+        <map:transform type="lexer"   src="grammars/mathexp.xlex"/>
+        <map:transform type="parser"  src="grammars/mathexp.xgrm"/>
+        <map:transform                src="stylesheets/mathexp2html.xsl"/>
+        <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="quote*.html">
+        <map:generate  type="text"    src="misc/quote{1}.txt"/>
+        <map:transform type="lexer"   src="cocoon:/quote.xlex"/>
+        <map:transform type="parser"  src="cocoon:/quote.xgrm" label="ast"/>
+        <map:transform                src="stylesheets/quote2page.xsl"/>
+        <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="pattern.html">
+        <map:generate                 src="misc/patterntext.xml"/>
+        <map:transform type="pattern" src="grammars/link.xlex"/>
+        <map:transform                src="stylesheets/pattern2link.xsl"/>
+        <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="**/*.java.html">
+        <map:generate  type="text"    src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java"/>
+        <map:transform type="lexer"   src="grammars/java.xlex"/>
+        <map:transform                src="stylesheets/text4javadoc.xsl"/>
+        <map:transform type="lexer"   src="grammars/javadoc.xlex" label="ast"/>
+        <map:transform                src="stylesheets/java2html.xsl">
+          <map:parameter name="package" value="{1}"/>
+          <map:parameter name="class"   value="{2}"/>
+        </map:transform>
+        <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:match pattern="**/*.class.html">
+        <map:generate  type="text"    src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java"/>
+        <map:transform type="lexer"   src="grammars/java.xlex"/>
+        <map:transform                src="stylesheets/remove4class.xsl"/>
+        <map:transform type="parser"  src="cocoon:/java.xgrm"/>
+        <map:transform                src="stylesheets/text4javadoc2.xsl"/>
+        <map:transform type="lexer"   src="cocoon:/javadoc.xlex"/>
+        <map:transform type="parser"  src="cocoon:/javadoc.xgrm" label="ast"/>
+        <map:transform                src="stylesheets/class2html.xsl">
+          <map:parameter name="package" value="{1}"/>
+          <map:parameter name="class"   value="{2}"/>
+        </map:transform>
+        <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+      <map:handle-errors>
+        <map:select type="exception">
+          <map:when test="syntax">
+            <map:generate  type="exception"/>
+            <map:transform                 src="stylesheets/text4error.xsl"/>
+            <map:transform type="xinclude"/>
+            <map:transform type="lexer"    src="grammars/error.xlex"/>
+            <map:transform                 src="stylesheets/error2html.xsl">
+              <map:parameter name="contextPath" value="{request:contextPath}"/>
+            </map:transform>
+            <map:serialize type="html"/>
+          </map:when>
+        </map:select>
+      </map:handle-errors>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/class2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/class2html.xsl?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/class2html.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/class2html.xsl Mon Apr  9 21:57:55 2007
@@ -18,15 +18,11 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
                 xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0">
-
- <xsl:output indent="no"/>
-
- <xsl:param name="package"/>
- <xsl:param name="class"/>
-
- <xsl:param name="prefix">cocoon/samples/chaperon/</xsl:param>
-
- <xsl:template match="/st:output">
+  <xsl:output indent="no"/>
+  <xsl:param name="package"/>
+  <xsl:param name="class"/>
+  <xsl:param name="prefix">cocoon/samples/chaperon/</xsl:param>
+  <xsl:template match="/st:output">
     <document>
       <header>
         <title>Java2HTML example</title>
@@ -34,275 +30,300 @@
       </header>
       <body>
         <row>
-         <column title="Source file: {$class}">
-
-       <xsl:call-template name="header"/>
-   
-       <xsl:call-template name="declaration"/>
-
-         </column>
-                                                                                                                                                             
+          <column title="Source file: {$class}">
+            <xsl:call-template name="header"/>
+            <xsl:call-template name="declaration"/>
+          </column>
         </row>
       </body>
     </document>
-
- </xsl:template>
-
- <xsl:template match="package">
-  <a href="/{$prefix}{translate(@full,'.','/')}/index.html"><xsl:value-of select="@full"/></a><br/>
- </xsl:template>
-
- <xsl:template match="class">
-  <a href="/{$prefix}{translate(@full,'.','/')}.class.html"><xsl:value-of select="@name"/></a><br/>
- </xsl:template>
-
- <xsl:template name="header">
-  <p>
-   <table width="100%" cellpadding="3" cellspacing="0" class="view">
-    <tbody>
-     <tr>
-      <td class="headerTitle" colspan="4"><b>&#160;Summary&#160;</b></td>
-     </tr>
-     <tr>
-      <td class="headerLeft"><b><nobr>&#160;Package&#160;</nobr></b></td>
-      <td class="header"><b>&#160;Type&#160;</b></td>
-      <td class="header"><b>&#160;Name&#160;</b></td>
-      <td class="headerRight"><b>&#160;Description&#160;</b></td>
-     </tr>
-     <tr>
-      <td class="itemLeft"><xsl:value-of select="st:CompilationUnit/st:ProgramFile/
-                  st:PackageStatement/st:QualifiedName"/></td>
-      <td class="item"><xsl:value-of select="st:CompilationUnit/st:ProgramFile/
+  </xsl:template>
+  <xsl:template match="package"><a href="/{$prefix}{translate(@full,'.','/')}/index.html">
+    <xsl:value-of select="@full"/></a>
+    <br/>
+  </xsl:template>
+  <xsl:template match="class"><a href="/{$prefix}{translate(@full,'.','/')}.class.html">
+    <xsl:value-of select="@name"/></a>
+    <br/>
+  </xsl:template>
+  <xsl:template name="header">
+    <p>
+      <table width="100%" cellpadding="3" cellspacing="0" class="view">
+        <tbody>
+          <tr>
+            <td class="headerTitle" colspan="4">
+              <b>&#160;Summary&#160;</b>
+            </td>
+          </tr>
+          <tr>
+            <td class="headerLeft">
+              <b>
+                <nobr>&#160;Package&#160;</nobr>
+              </b>
+            </td>
+            <td class="header">
+              <b>&#160;Type&#160;</b>
+            </td>
+            <td class="header">
+              <b>&#160;Name&#160;</b>
+            </td>
+            <td class="headerRight">
+              <b>&#160;Description&#160;</b>
+            </td>
+          </tr>
+          <tr>
+            <td class="itemLeft">
+              <xsl:value-of select="st:CompilationUnit/st:ProgramFile/
+                  st:PackageStatement/st:QualifiedName"/>
+            </td>
+            <td class="item">
+              <xsl:value-of select="st:CompilationUnit/st:ProgramFile/
                                             st:TypeDeclarations/st:TypeDeclarationOptSemi/
-                                        st:TypeDeclaration/st:ClassHeader/st:ClassWord"/></td>
-      <td class="item"><xsl:value-of select="st:CompilationUnit/st:ProgramFile/
+                                        st:TypeDeclaration/st:ClassHeader/st:ClassWord"/>
+            </td>
+            <td class="item">
+              <xsl:value-of select="st:CompilationUnit/st:ProgramFile/
                                             st:TypeDeclarations/st:TypeDeclarationOptSemi/
-                                        st:TypeDeclaration/st:ClassHeader/st:IDENTIFIER"/></td>
-      <td class="itemRight"><xsl:apply-templates select="st:CompilationUnit/st:ProgramFile/
+                                        st:TypeDeclaration/st:ClassHeader/st:IDENTIFIER"/>
+            </td>
+            <td class="itemRight">
+              <xsl:apply-templates select="st:CompilationUnit/st:ProgramFile/
                                             st:TypeDeclarations/st:TypeDeclarationOptSemi/
                                         st:TypeDeclaration/st:output/st:JavaDoc" mode="short"/>&#160;</td>
-     </tr>
-    </tbody>
-   </table>
-  </p>
- </xsl:template>
-
- <xsl:template name="declaration">
-  <xsl:apply-templates select="st:CompilationUnit/st:ProgramFile/st:TypeDeclarations/
+          </tr>
+        </tbody>
+      </table>
+    </p>
+  </xsl:template>
+  <xsl:template name="declaration">
+    <xsl:apply-templates select="st:CompilationUnit/st:ProgramFile/st:TypeDeclarations/
                                st:TypeDeclarationOptSemi/st:TypeDeclaration/st:FieldDeclarations"/>
- </xsl:template>
-
- 
-
- <xsl:template match="st:FieldDeclarations">
-  <p>
-   <table width="100%" cellpadding="3" cellspacing="0" class="view">
-    <tbody>
-     <tr>
-      <td class="headerTitle" colspan="4"><b>&#160;Field Summary&#160;</b></td>
-     </tr>
-     <tr>
-      <td class="headerLeft"><b><nobr>&#160;Modifier&#160;</nobr></b></td>
-      <td class="header"><b>&#160;Type&#160;</b></td>
-      <td class="header"><b>&#160;Name&#160;</b></td>
-      <td class="headerRight"><b>&#160;Description&#160;</b></td>
-     </tr>
-     <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:FieldVariableDeclaration"/>
-    </tbody>
-   </table>
-  </p>
-
-  <p>
-   <table width="100%" cellpadding="3" cellspacing="0" class="view">
-    <tbody>
-     <tr>
-      <td class="headerTitle" colspan="3"><b>&#160;Constructor Summary&#160;</b></td>
-     </tr>
-     <tr>
-      <td class="headerLeft"><b><nobr>&#160;Modifier&#160;</nobr></b></td>
-      <td class="header"><b>&#160;Name&#160;</b></td>
-      <td class="headerRight"><b>&#160;Description&#160;</b></td>
-     </tr>
-     <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:ConstructorDeclaration"/>
-    </tbody>
-   </table>
-  </p>
-
-  <p>
-   <table width="100%" cellpadding="3" cellspacing="0" class="view">
-    <tbody>
-     <tr>
-      <td class="headerTitle" colspan="4"><b>&#160;Method Summary&#160;</b></td>
-     </tr>
-     <tr>
-      <td class="headerLeft"><b><nobr>&#160;Modifier&#160;</nobr></b></td>
-      <td class="header"><b>&#160;Type&#160;</b></td>
-      <td class="header"><b>&#160;Name&#160;</b></td>
-      <td class="headerRight"><b>&#160;Description&#160;</b></td>
-     </tr>
-     <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:MethodDeclaration"/>
-    </tbody>
-   </table>
-  </p>
-
-  <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:MethodDeclaration" mode="detail"/>
-
- </xsl:template>
-
- <xsl:template match="st:FieldVariableDeclaration">
-  <xsl:if test="not(contains(st:Modifiers/st:Modifier,'private'))">
-  <tr>
-   <td class="itemLeft">
-    <nobr>
-     <xsl:for-each select="st:Modifiers/st:Modifier">
-      <xsl:value-of select="."/>&#160;
+  </xsl:template>
+  <xsl:template match="st:FieldDeclarations">
+    <p>
+      <table width="100%" cellpadding="3" cellspacing="0" class="view">
+        <tbody>
+          <tr>
+            <td class="headerTitle" colspan="4">
+              <b>&#160;Field Summary&#160;</b>
+            </td>
+          </tr>
+          <tr>
+            <td class="headerLeft">
+              <b>
+                <nobr>&#160;Modifier&#160;</nobr>
+              </b>
+            </td>
+            <td class="header">
+              <b>&#160;Type&#160;</b>
+            </td>
+            <td class="header">
+              <b>&#160;Name&#160;</b>
+            </td>
+            <td class="headerRight">
+              <b>&#160;Description&#160;</b>
+            </td>
+          </tr>
+          <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:FieldVariableDeclaration"/>
+        </tbody>
+      </table>
+    </p>
+    <p>
+      <table width="100%" cellpadding="3" cellspacing="0" class="view">
+        <tbody>
+          <tr>
+            <td class="headerTitle" colspan="3">
+              <b>&#160;Constructor Summary&#160;</b>
+            </td>
+          </tr>
+          <tr>
+            <td class="headerLeft">
+              <b>
+                <nobr>&#160;Modifier&#160;</nobr>
+              </b>
+            </td>
+            <td class="header">
+              <b>&#160;Name&#160;</b>
+            </td>
+            <td class="headerRight">
+              <b>&#160;Description&#160;</b>
+            </td>
+          </tr>
+          <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:ConstructorDeclaration"/>
+        </tbody>
+      </table>
+    </p>
+    <p>
+      <table width="100%" cellpadding="3" cellspacing="0" class="view">
+        <tbody>
+          <tr>
+            <td class="headerTitle" colspan="4">
+              <b>&#160;Method Summary&#160;</b>
+            </td>
+          </tr>
+          <tr>
+            <td class="headerLeft">
+              <b>
+                <nobr>&#160;Modifier&#160;</nobr>
+              </b>
+            </td>
+            <td class="header">
+              <b>&#160;Type&#160;</b>
+            </td>
+            <td class="header">
+              <b>&#160;Name&#160;</b>
+            </td>
+            <td class="headerRight">
+              <b>&#160;Description&#160;</b>
+            </td>
+          </tr>
+          <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:MethodDeclaration"/>
+        </tbody>
+      </table>
+    </p>
+    <xsl:apply-templates select="st:FieldDeclarationOptSemi/st:FieldDeclaration/st:MethodDeclaration" mode="detail"/>
+  </xsl:template>
+  <xsl:template match="st:FieldVariableDeclaration">
+    <xsl:if test="not(contains(st:Modifiers/st:Modifier,'private'))">
+      <tr>
+        <td class="itemLeft">
+          <nobr>
+            <xsl:for-each select="st:Modifiers/st:Modifier">
+              <xsl:value-of select="."/>&#160;
      </xsl:for-each>
-    </nobr>
-   </td>
-   <td class="item">&#160;<xsl:value-of select="st:TypeSpecifier"/></td>
-   <td class="item">
-    <xsl:value-of select="st:VariableDeclarators/st:VariableDeclarator/st:DeclaratorName"/>
-   </td>
-   <td class="itemRight">
-    <xsl:apply-templates select="st:output/st:JavaDoc" mode="short"/>&#160;
+          </nobr>
+        </td>
+        <td class="item">&#160;<xsl:value-of select="st:TypeSpecifier"/>
+        </td>
+        <td class="item">
+          <xsl:value-of select="st:VariableDeclarators/st:VariableDeclarator/st:DeclaratorName"/>
+        </td>
+        <td class="itemRight">
+          <xsl:apply-templates select="st:output/st:JavaDoc" mode="short"/>&#160;
    </td>
-  </tr>
-  </xsl:if>
- </xsl:template>
-
- <xsl:template match="st:FieldVariableDeclaration" mode="detail">
- </xsl:template>
-
- <xsl:template match="st:ConstructorDeclaration">
-  <tr>
-   <td class="itemLeft">
-    <nobr>
-     <xsl:for-each select="st:Modifiers/st:Modifier">
-      <xsl:value-of select="."/>&#160;
+      </tr>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="st:FieldVariableDeclaration" mode="detail"></xsl:template>
+  <xsl:template match="st:ConstructorDeclaration">
+    <tr>
+      <td class="itemLeft">
+        <nobr>
+          <xsl:for-each select="st:Modifiers/st:Modifier">
+            <xsl:value-of select="."/>&#160;
      </xsl:for-each>
-    </nobr>
-   </td>
-   <td class="item">
-    <nobr>
-     <xsl:value-of select="st:ConstructorDeclarator/st:IDENTIFIER"/>
+        </nobr>
+      </td>
+      <td class="item">
+        <nobr>
+          <xsl:value-of select="st:ConstructorDeclarator/st:IDENTIFIER"/>
      (<xsl:for-each select="st:ConstructorDeclarator/st:ParameterList/st:Parameter">
-      <xsl:if test="position()!=1">&#160;,</xsl:if>
-       <xsl:value-of select="st:TypeSpecifier/st:TypeName"/>&#160;<xsl:value-of select="st:DeclaratorName"/>
-     </xsl:for-each>)
+            <xsl:if test="position()!=1">&#160;,</xsl:if>
+            <xsl:value-of select="st:TypeSpecifier/st:TypeName"/>&#160;<xsl:value-of select="st:DeclaratorName"/>
+          </xsl:for-each>)
     </nobr>
+      </td>
+      <td class="itemRight">
+        <xsl:apply-templates select="st:output/st:JavaDoc" mode="short"/>&#160;
    </td>
-   <td class="itemRight">
-    <xsl:apply-templates select="st:output/st:JavaDoc" mode="short"/>&#160;
-   </td>
-  </tr>
- </xsl:template>
-
- <xsl:template match="st:ConstructorDeclaration" mode="detail">
- </xsl:template>
-
- <xsl:template match="st:MethodDeclaration">
-  <tr>
-   <td class="itemLeft">
-    <nobr>
-     <xsl:for-each select="st:Modifiers/st:Modifier">
-      <xsl:value-of select="."/>&#160;
+    </tr>
+  </xsl:template>
+  <xsl:template match="st:ConstructorDeclaration" mode="detail"></xsl:template>
+  <xsl:template match="st:MethodDeclaration">
+    <tr>
+      <td class="itemLeft">
+        <nobr>
+          <xsl:for-each select="st:Modifiers/st:Modifier">
+            <xsl:value-of select="."/>&#160;
      </xsl:for-each>
-    </nobr>
-   </td>
-   <td class="item"><xsl:value-of select="st:TypeSpecifier"/></td>
-   <td class="item">
-    <nobr>
-     <xsl:value-of select="st:MethodDeclarator/st:DeclaratorName"/>
+        </nobr>
+      </td>
+      <td class="item">
+        <xsl:value-of select="st:TypeSpecifier"/>
+      </td>
+      <td class="item">
+        <nobr>
+          <xsl:value-of select="st:MethodDeclarator/st:DeclaratorName"/>
      (<xsl:for-each select="st:MethodDeclarator/st:ParameterList/st:Parameter">
-      <xsl:if test="position()!=1">&#160;,</xsl:if>
-       <xsl:value-of select="st:TypeSpecifier/st:TypeName"/>&#160;<xsl:value-of select="st:DeclaratorName"/>
-     </xsl:for-each>)
+            <xsl:if test="position()!=1">&#160;,</xsl:if>
+            <xsl:value-of select="st:TypeSpecifier/st:TypeName"/>&#160;<xsl:value-of select="st:DeclaratorName"/>
+          </xsl:for-each>)
     </nobr>
+      </td>
+      <td class="itemRight">
+        <xsl:apply-templates select="st:output/st:JavaDoc" mode="short"/>&#160;
    </td>
-   <td class="itemRight">
-    <xsl:apply-templates select="st:output/st:JavaDoc" mode="short"/>&#160;
-   </td>
-  </tr>
- </xsl:template>
-
- <xsl:template match="st:MethodDeclaration" mode="detail">
-  <p>
-   <table width="100%" cellpadding="3" cellspacing="0" class="view">
-    <tr>
-     <td class="headerTitle" colspan="4">
-      <b>
-      <nobr>
-       <xsl:for-each select="st:Modifiers/st:Modifier">
-        <xsl:value-of select="."/>&#160;
+    </tr>
+  </xsl:template>
+  <xsl:template match="st:MethodDeclaration" mode="detail">
+    <p>
+      <table width="100%" cellpadding="3" cellspacing="0" class="view">
+        <tr>
+          <td class="headerTitle" colspan="4">
+            <b>
+              <nobr>
+                <xsl:for-each select="st:Modifiers/st:Modifier">
+                  <xsl:value-of select="."/>&#160;
        </xsl:for-each>
-       <xsl:value-of select="st:TypeSpecifier"/>&#160;
+                <xsl:value-of select="st:TypeSpecifier"/>&#160;
        <xsl:value-of select="st:MethodDeclarator/st:DeclaratorName"/>
        (<xsl:for-each select="st:MethodDeclarator/st:ParameterList/st:Parameter">
-        <xsl:if test="position()!=1">&#160;,</xsl:if>
-         <xsl:value-of select="st:TypeSpecifier/st:TypeName"/>&#160;<xsl:value-of select="st:DeclaratorName"/>
-       </xsl:for-each>)
+                  <xsl:if test="position()!=1">&#160;,</xsl:if>
+                  <xsl:value-of select="st:TypeSpecifier/st:TypeName"/>&#160;<xsl:value-of select="st:DeclaratorName"/>
+                </xsl:for-each>)
       </nobr>
-      </b>
-     </td>
-    </tr>
-    <tr>
-     <td class="itemRight">
- 
-      <dl>
-       <dd><xsl:apply-templates select="st:output/st:JavaDoc"/></dd>
-
-       <dt><b>Parameters:</b></dt>
-
-       <xsl:for-each select="st:MethodDeclarator/st:ParameterList/st:Parameter">
-        <dd>
-         <code><xsl:value-of select="st:DeclaratorName"/></code><xsl:text> - </xsl:text>
-         <xsl:variable name="name"><xsl:value-of select="st:DeclaratorName"/></xsl:variable> 
-         <xsl:for-each select="../../../st:output/st:JavaDoc/st:Properties/
+            </b>
+          </td>
+        </tr>
+        <tr>
+          <td class="itemRight">
+            <dl>
+              <dd><xsl:apply-templates select="st:output/st:JavaDoc"/></dd>
+              <dt><b>Parameters:</b></dt>
+              <xsl:for-each select="st:MethodDeclarator/st:ParameterList/st:Parameter">
+                <dd><code>
+                  <xsl:value-of select="st:DeclaratorName"/></code>
+<xsl:text> - </xsl:text>
+                  <xsl:variable name="name">
+                    <xsl:value-of select="st:DeclaratorName"/>
+                  </xsl:variable>
+                  <xsl:for-each select="../../../st:output/st:JavaDoc/st:Properties/
               st:Property[substring-after(st:PROPERTYNAME,'@')='param']/st:Description">
-          <xsl:if test="starts-with(.,$name)">
-           <xsl:value-of select="substring(.,string-length($name)+1,string-length(.)-string-length($name))"/>
-          </xsl:if>
-         </xsl:for-each>
-        </dd>
-       </xsl:for-each>
-
-       <dt><b>Returns:</b></dt>
-       <dd>
-        <code><xsl:value-of select="st:TypeSpecifier"/></code>
-        <xsl:if test="st:output/st:JavaDoc/st:Properties/st:Property[substring-after(st:PROPERTYNAME,'@')='return']/st:Description">
-         <xsl:text> - </xsl:text>
-        </xsl:if>
-        <xsl:value-of select="st:output/st:JavaDoc/st:Properties/st:Property[substring-after(st:PROPERTYNAME,'@')='return']/st:Description"/>
-       </dd>
-      </dl>
-
-     </td>
-    </tr>
-   </table>
-  </p>
- </xsl:template>
-
- <xsl:template match="st:JavaDoc">
-  <xsl:apply-templates select="st:Description"/>
- </xsl:template>
-
- <xsl:template match="st:JavaDoc" mode="short">
-  <xsl:choose>
-   <xsl:when test="string-length(substring-before(st:Description,'.'))>0">
-    <xsl:value-of select="substring-before(st:Description,'.')"/>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="st:Description"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <xsl:template match="st:Description">
-  <xsl:apply-templates select="st:TEXT|st:TAG"/>
- </xsl:template>
-
- <xsl:template match="st:TAG">
-  <xsl:value-of select="." disable-output-escaping="yes"/>
- </xsl:template>
-
+                    <xsl:if test="starts-with(.,$name)">
+                      <xsl:value-of select="substring(.,string-length($name)+1,string-length(.)-string-length($name))"/>
+                    </xsl:if>
+                  </xsl:for-each></dd>
+              </xsl:for-each>
+              <dt><b>Returns:</b></dt>
+              <dd><code>
+                <xsl:value-of select="st:TypeSpecifier"/></code>
+                <xsl:if test="st:output/st:JavaDoc/st:Properties/st:Property[substring-after(st:PROPERTYNAME,'@')='return']/st:Description">
+<xsl:text> - </xsl:text>
+                </xsl:if>
+                <xsl:value-of select="st:output/st:JavaDoc/st:Properties/st:Property[substring-after(st:PROPERTYNAME,'@')='return']/st:Description"/></dd>
+            </dl>
+          </td>
+        </tr>
+      </table>
+    </p>
+  </xsl:template>
+  <xsl:template match="st:JavaDoc">
+    <xsl:apply-templates select="st:Description"/>
+  </xsl:template>
+  <xsl:template match="st:JavaDoc" mode="short">
+    <xsl:choose>
+      <xsl:when test="string-length(substring-before(st:Description,'.'))>0">
+        <xsl:value-of select="substring-before(st:Description,'.')"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="st:Description"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="st:Description">
+    <xsl:apply-templates select="st:TEXT|st:TAG"/>
+  </xsl:template>
+  <xsl:template match="st:TAG">
+    <xsl:value-of select="." disable-output-escaping="yes"/>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/egrm2xegrm.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/egrm2xegrm.xsl?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/egrm2xegrm.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/egrm2xegrm.xsl Mon Apr  9 21:57:55 2007
@@ -21,80 +21,65 @@
                 xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0"
                 xmlns="http://chaperon.sourceforge.net/schema/grammar/2.0"
                 exclude-result-prefixes="st text">
-
- <xsl:output indent="yes" method="xml" encoding="ASCII"/>
-
- <xsl:template match="st:output/st:grammar">
-  <grammar start="{st:start/st:name}">
-
-   <xsl:if test="not (st:start)">
-    <xsl:message terminate="yes">
+  <xsl:output indent="yes" method="xml" encoding="ASCII"/>
+  <xsl:template match="st:output/st:grammar">
+    <grammar start="{st:start/st:name}">
+      <xsl:if test="not (st:start)">
+        <xsl:message terminate="yes">
      Start element is not defined!
     </xsl:message>
-   </xsl:if>
-
-   <xsl:comment>This file was generated! Don't edit!</xsl:comment>
-
-   <xsl:apply-templates select="st:definition"/>
-  </grammar>
- </xsl:template>
-
- <xsl:template match="st:definition">
-  <definition name="{st:name}">
-   <xsl:apply-templates select="st:regex"/>
-  </definition>
- </xsl:template>
-
- <xsl:template match="st:regex">
-  <xsl:apply-templates select="st:choice|st:sequence|st:quantifier"/>
- </xsl:template>
-
- <xsl:template match="st:element" >
-  <xsl:variable name="name" select="."/>
-  <xsl:choose>
-   <xsl:when test="/st:output/st:grammar/st:abbreviation[st:name=$name]">
-    <xsl:apply-templates select="/st:output/st:grammar/st:abbreviation[st:name=$name]/st:regex"/>
-   </xsl:when>
-   <xsl:otherwise>
-    <element name="{$name}"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <xsl:template match="st:choice" >
-  <choice>
-   <xsl:apply-templates select="st:sequence|st:quantifier"/>
-  </choice>
- </xsl:template>
-
- <xsl:template match="st:sequence">
-  <sequence>
-   <xsl:apply-templates select="st:quantifier"/>
-  </sequence>
- </xsl:template>
-
- <xsl:template match="st:quantifier" >
-  <xsl:apply-templates select="st:optional|st:one-or-more|st:zero-or-more|st:term"/>
- </xsl:template>
-
- <xsl:template match="st:optional" >
-  <optional>
-   <xsl:apply-templates select="st:term"/>
-  </optional>
- </xsl:template>
-
- <xsl:template match="st:one-or-more">
-  <one-or-more>
-   <xsl:apply-templates select="st:term"/>
-  </one-or-more>
- </xsl:template>
-
- <xsl:template match="st:zero-or-more">
-  <zero-or-more>
-   <xsl:apply-templates select="st:term"/>
-  </zero-or-more>
- </xsl:template>
-
+      </xsl:if>
+      <xsl:comment>This file was generated! Don't edit!</xsl:comment>
+      <xsl:apply-templates select="st:definition"/>
+    </grammar>
+  </xsl:template>
+  <xsl:template match="st:definition">
+    <definition name="{st:name}">
+      <xsl:apply-templates select="st:regex"/>
+    </definition>
+  </xsl:template>
+  <xsl:template match="st:regex">
+    <xsl:apply-templates select="st:choice|st:sequence|st:quantifier"/>
+  </xsl:template>
+  <xsl:template match="st:element" >
+    <xsl:variable name="name" select="."/>
+    <xsl:choose>
+      <xsl:when test="/st:output/st:grammar/st:abbreviation[st:name=$name]">
+        <xsl:apply-templates select="/st:output/st:grammar/st:abbreviation[st:name=$name]/st:regex"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <element name="{$name}"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="st:choice" >
+    <choice>
+      <xsl:apply-templates select="st:sequence|st:quantifier"/>
+    </choice>
+  </xsl:template>
+  <xsl:template match="st:sequence">
+    <sequence>
+      <xsl:apply-templates select="st:quantifier"/>
+    </sequence>
+  </xsl:template>
+  <xsl:template match="st:quantifier" >
+    <xsl:apply-templates select="st:optional|st:one-or-more|st:zero-or-more|st:term"/>
+  </xsl:template>
+  <xsl:template match="st:optional" >
+    <optional>
+      <xsl:apply-templates select="st:term"/>
+    </optional>
+  </xsl:template>
+  <xsl:template match="st:one-or-more">
+    <one-or-more>
+      <xsl:apply-templates select="st:term"/>
+    </one-or-more>
+  </xsl:template>
+  <xsl:template match="st:zero-or-more">
+    <zero-or-more>
+      <xsl:apply-templates select="st:term"/>
+    </zero-or-more>
+  </xsl:template>
 <!-- <xsl:template match="st:regexvar">
   <xsl:choose>
    <xsl:when test="count(st:regexmultiplicator/st:string)=2">
@@ -113,89 +98,83 @@
    </xsl:otherwise>
   </xsl:choose>
  </xsl:template>-->
-
- <xsl:template match="st:term">
-  <xsl:apply-templates select="st:class|st:nested|st:string|st:element|st:dot"/>
- </xsl:template>
-
- <xsl:template match="st:nested">
-  <xsl:apply-templates select="st:choice|st:sequence|st:quantifier"/>
- </xsl:template>
-
- <xsl:template match="st:dot">
-  <class exclusive="true">
-   <char value="#10"/>
-   <char value="#13"/>
-  </class>
- </xsl:template>
-
+  <xsl:template match="st:term">
+    <xsl:apply-templates select="st:class|st:nested|st:string|st:element|st:dot"/>
+  </xsl:template>
+  <xsl:template match="st:nested">
+    <xsl:apply-templates select="st:choice|st:sequence|st:quantifier"/>
+  </xsl:template>
+  <xsl:template match="st:dot">
+    <class exclusive="true">
+      <char value="#10"/>
+      <char value="#13"/>
+    </class>
+  </xsl:template>
 <!-- <xsl:template match="st:regexabref">
   <xsl:variable name="ref" select="translate(normalize-space(st:string), ' ', '')"/>
   <xsl:apply-templates select="/st:output/st:grammar/st:token_decls/st:ab_decl[st:id=$ref]/st:output/st:regexexpression"/>
  </xsl:template>-->
-
- <xsl:template match="st:string">
-  <xsl:choose>
-   <xsl:when test="count(st:char|st:masked-char)>1">
-  <sequence>
-   <xsl:apply-templates select="st:char|st:masked-char"/>
-  </sequence>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:apply-templates select="st:char|st:masked-char"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <xsl:template match="st:class">
-  <class>
-   <xsl:if test="st:exclusive">
-    <xsl:attribute name="exclusive">true</xsl:attribute>
-   </xsl:if>
-   <xsl:apply-templates select="st:interval|st:class-char|st:masked-char"/>
-  </class>
- </xsl:template>
-
- <xsl:template match="st:class-char">
-  <char value="{.}"/>
- </xsl:template>
-
- <xsl:template match="st:masked-char">
-  <char>
-   <xsl:choose>
-    <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 'n'">
+  <xsl:template match="st:string">
+    <xsl:choose>
+      <xsl:when test="count(st:char|st:masked-char)>1">
+        <sequence>
+          <xsl:apply-templates select="st:char|st:masked-char"/>
+        </sequence>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="st:char|st:masked-char"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="st:class">
+    <class>
+      <xsl:if test="st:exclusive">
+        <xsl:attribute name="exclusive">true</xsl:attribute>
+      </xsl:if>
+      <xsl:apply-templates select="st:interval|st:class-char|st:masked-char"/>
+    </class>
+  </xsl:template>
+  <xsl:template match="st:class-char">
+    <char value="{.}"/>
+  </xsl:template>
+  <xsl:template match="st:masked-char">
+    <char>
+      <xsl:choose>
+        <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 'n'">
 <!--     <xsl:attribute name="content"><xsl:text disable-output-escaping="yes">&#10;</xsl:text></xsl:attribute>-->
-     <xsl:attribute name="value">#10</xsl:attribute>
-    </xsl:when>
-    <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 'r'">
+          <xsl:attribute name="value">#10</xsl:attribute>
+        </xsl:when>
+        <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 'r'">
 <!--     <xsl:attribute name="content"><xsl:text disable-output-escaping="yes">&#13;</xsl:text></xsl:attribute>-->
-     <xsl:attribute name="value">#13</xsl:attribute>
-    </xsl:when>
-    <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 't'">
+          <xsl:attribute name="value">#13</xsl:attribute>
+        </xsl:when>
+        <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 't'">
 <!--     <xsl:attribute name="content"><xsl:text disable-output-escaping="yes">&#9;</xsl:text></xsl:attribute>-->
-     <xsl:attribute name="value">#9</xsl:attribute>
-    </xsl:when>
-    <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 'u'">
-     <xsl:attribute name="value">#<xsl:value-of select="substring(translate(normalize-space(.), ' ', ''),3,6)"/></xsl:attribute>
-    </xsl:when>
-    <xsl:when test="contains(.,'\ ')">
-     <xsl:attribute name="value"><xsl:text disable-output-escaping="yes">&#32;</xsl:text></xsl:attribute>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:attribute name="value"><xsl:value-of select="substring(translate(normalize-space(.), ' ', ''), 2,1)"/></xsl:attribute>
-    </xsl:otherwise>
-   </xsl:choose>
-  </char>
- </xsl:template>
-
- <xsl:template match="st:char">
-  <char value="{.}"/>
- </xsl:template>
- 
- <xsl:template match="st:interval">
-  <interval>
-   <xsl:apply-templates select="st:class-char|st:masked-char"/>
-  </interval>
- </xsl:template>
-
+          <xsl:attribute name="value">#9</xsl:attribute>
+        </xsl:when>
+        <xsl:when test="substring(translate(normalize-space(.), ' ', ''), 2,1) = 'u'">
+          <xsl:attribute name="value">#<xsl:value-of select="substring(translate(normalize-space(.), ' ', ''),3,6)"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:when test="contains(.,'\ ')">
+          <xsl:attribute name="value">
+<xsl:text disable-output-escaping="yes">&#32;</xsl:text>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="value">
+            <xsl:value-of select="substring(translate(normalize-space(.), ' ', ''), 2,1)"/>
+          </xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+    </char>
+  </xsl:template>
+  <xsl:template match="st:char">
+    <char value="{.}"/>
+  </xsl:template>
+  <xsl:template match="st:interval">
+    <interval>
+      <xsl:apply-templates select="st:class-char|st:masked-char"/>
+    </interval>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error2html.xsl?view=diff&rev=527028&r1=527027&r2=527028
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error2html.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/error2html.xsl Mon Apr  9 21:57:55 2007
@@ -15,23 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:lex="http://chaperon.sourceforge.net/schema/lexer/2.0">
-
   <xsl:param name="contextPath"/>
-
-  <!-- let sitemap override default page title -->
+<!-- let sitemap override default page title -->
   <xsl:param name="pageTitle" select="//parse-exception/message"/>
-
   <xsl:template match="parse-exception">
     <html>
       <head>
-        <title>
-          <xsl:value-of select="$pageTitle"/>
-        </title>
-        <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
+        <title><xsl:value-of select="$pageTitle"/></title><link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
         <style>
           h1 { color: #336699; text-align: left; margin: 0px 0px 30px 0px; padding: 0px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
           p.message { padding: 10px 30px 10px 30px; font-weight: bold; font-size: 130%; border-width: 1px; border-style: dashed; border-color: #336699; }
@@ -48,80 +41,85 @@
       </head>
       <body>
         <h1>Error</h1>
-
         <p class="message">
           <xsl:value-of select="message"/>
         </p>
-
         <p class="topped"/>
-
-        <p class="extra"><span class="description">column&#160;</span><xsl:value-of select="@column-number"/></p>
-        <p class="extra"><span class="description">line&#160;</span><xsl:value-of select="@line-number"/></p>
+        <p class="extra">
+          <span class="description">column&#160;</span>
+          <xsl:value-of select="@column-number"/>
+        </p>
+        <p class="extra">
+          <span class="description">line&#160;</span>
+          <xsl:value-of select="@line-number"/>
+        </p>
         <xsl:if test="source">
-         <p class="extra"><span class="description">source&#160;</span><xsl:value-of select="source/@ref"/></p>
+          <p class="extra">
+            <span class="description">source&#160;</span>
+            <xsl:value-of select="source/@ref"/>
+          </p>
         </xsl:if>
-
         <xsl:apply-templates select="source"/>
-
         <p class="topped">
-          For more detailed technical information, take a look at the log
-          files in the log directory of Cocoon, which is placed by default in
-          the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
-          If the logs don't give you enough information, you might want to increase the
-          log level by changing the Logging configuration which is by default the
-          <code>WEB-INF/logkit.xconf</code> file.
+          For more detailed technical information, take a look at the log files
+          in the log directory of Cocoon, which is placed by default in the
+          <code>WEB-INF/logs/</code> folder of your cocoon webapp context.
+          <br/>
+          If the logs don't give you enough information, you might want to
+          increase the log level by changing the Logging configuration which is
+          by default the <code>WEB-INF/logkit.xconf</code> file.
         </p>
-
         <p>
           If you think you found a bug, please report it to
-          <a href="http://issues.apache.org/bugzilla/">Apache's Bugzilla</a>;
-          a message will automatically be sent to the developer mailing list and you'll
-          be kept in contact automatically with the further progress on that bug.
+          <a href="http://issues.apache.org/bugzilla/">Apache's Bugzilla</a>; a
+          message will automatically be sent to the developer mailing list and
+          you'll be kept in contact automatically with the further progress on
+          that bug.
         </p>
-
         <p>
           Thanks, and sorry for the trouble if this is our fault.
         </p>
-
         <p class="topped">
           The <a href="http://cocoon.apache.org/">Apache Cocoon</a> Project
         </p>
       </body>
     </html>
   </xsl:template>
-
   <xsl:template match="source">
-   <xsl:variable name="line-number" select="number(../@line-number)"/>
-
-   <p class="topped">
-    <pre>
-     <xsl:apply-templates select="lex:output/lex:lexeme[(number(@line) &lt; $line-number) and (number(@line) &gt; number($line-number - 10))]" mode="lt"/>
-     <xsl:apply-templates select="lex:output/lex:lexeme[number(@line) = $line-number]" mode="eq"/>
-     <xsl:apply-templates select="lex:output/lex:lexeme[(number(@line) &gt; $line-number) and (number(@line) &lt; number($line-number + 10))]" mode="gt"/>
-    </pre>
-   </p>
-
+    <xsl:variable name="line-number" select="number(../@line-number)"/>
+    <p class="topped">
+      <pre>
+        <xsl:apply-templates select="lex:output/lex:lexeme[(number(@line) &lt; $line-number) and (number(@line) &gt; number($line-number - 10))]" mode="lt"/>
+        <xsl:apply-templates select="lex:output/lex:lexeme[number(@line) = $line-number]" mode="eq"/>
+        <xsl:apply-templates select="lex:output/lex:lexeme[(number(@line) &gt; $line-number) and (number(@line) &lt; number($line-number + 10))]" mode="gt"/>
+      </pre>
+    </p>
   </xsl:template>
-
   <xsl:template match="lex:lexeme" mode="lt">
-   <xsl:value-of select="@line"/>&#160;:&#160;<span class="lt"><xsl:value-of select="@text"/></span>
+    <xsl:value-of select="@line"/>&#160;:&#160;<span class="lt">
+      <xsl:value-of select="@text"/>
+    </span>
   </xsl:template>
-
   <xsl:template match="lex:lexeme" mode="eq">
-   <xsl:variable name="column-number" select="number(../../../@column-number)"/>
-   <xsl:value-of select="@line"/>&#160;:&#160;<span class="lt"><xsl:value-of select="substring(@text, 1, $column-number - 1)"/></span>
-   <span class="eq"><xsl:value-of select="substring(@text, $column-number, 1)"/></span>
-   <span class="gt"><xsl:value-of select="substring(@text, $column-number + 1, string-length(@text) - $column-number)"/></span>
+    <xsl:variable name="column-number" select="number(../../../@column-number)"/>
+    <xsl:value-of select="@line"/>&#160;:&#160;<span class="lt">
+      <xsl:value-of select="substring(@text, 1, $column-number - 1)"/>
+    </span>
+    <span class="eq">
+      <xsl:value-of select="substring(@text, $column-number, 1)"/>
+    </span>
+    <span class="gt">
+      <xsl:value-of select="substring(@text, $column-number + 1, string-length(@text) - $column-number)"/>
+    </span>
   </xsl:template>
-
   <xsl:template match="lex:lexeme" mode="gt">
-   <xsl:value-of select="@line"/>&#160;:&#160;<span class="gt"><xsl:value-of select="@text"/></span>
+    <xsl:value-of select="@line"/>&#160;:&#160;<span class="gt">
+      <xsl:value-of select="@text"/>
+    </span>
+  </xsl:template>
+  <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
+    </xsl:copy>
   </xsl:template>
-
- <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
-  <xsl:copy>
-   <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
-  </xsl:copy>
- </xsl:template>
-
 </xsl:stylesheet>