forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: rev 9503 - in xml/forrest/trunk: etc src/core/context/resources/chaperon src/core/context/resources/chaperon/grammars src/core/context/resources/chaperon/misc src/core/context/resources/chaperon/stylesheets src/core/context/resources/chaperon/wiki
Date Tue, 16 Mar 2004 01:18:12 GMT
Author: crossley
Date: Mon Mar 15 17:18:10 2004
New Revision: 9503

Added:
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote1.txt
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote2.txt
Removed:
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/quote.xgrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/quote.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote.txt
Modified:
   xml/forrest/trunk/etc/relicense-tree.txt
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/egrm.xegrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/error.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xgrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.egrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xgrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xgrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/link.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xgrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/quote.grm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xgrm
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xlex
   xml/forrest/trunk/src/core/context/resources/chaperon/grammars/wiki.grm
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/edit.xml
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/error.css
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/java.css
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/mathexp.xsp
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/new.xml
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/patterntext.xml
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/samples.xml
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/source.xml
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/view.xml
   xml/forrest/trunk/src/core/context/resources/chaperon/misc/wiki.js
   xml/forrest/trunk/src/core/context/resources/chaperon/sitemap.xmap
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/class2html.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/egrm2xegrm.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2html.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2page.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error4wiki.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xgrm.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xlex.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/java2html.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/mathexp2html.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/pattern2link.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/quote2page.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/remove4class.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4error.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc2.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4regex.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2html.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2xdoc.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/xdoc2html.xsl
   xml/forrest/trunk/src/core/context/resources/chaperon/wiki/selftest.txt
Log:
Add Apache License 2.0 to resources/chaperon and sync with Cocoon.


Modified: xml/forrest/trunk/etc/relicense-tree.txt
==============================================================================
--- xml/forrest/trunk/etc/relicense-tree.txt	(original)
+++ xml/forrest/trunk/etc/relicense-tree.txt	Mon Mar 15 17:18:10 2004
@@ -85,12 +85,12 @@
 L    |   |   |   |           `-- apache
 L    |   |   |   |               `-- cocoon
 L    |   |   |   |                   `-- util
-     |   |   |   |-- resources
-     |   |   |   |   |-- chaperon
-     |   |   |   |   |   |-- grammars
-     |   |   |   |   |   |-- misc
-     |   |   |   |   |   |-- stylesheets
-     |   |   |   |   |   `-- wiki
+L    |   |   |   |-- resources
+L    |   |   |   |   |-- chaperon
+L    |   |   |   |   |   |-- grammars
+L    |   |   |   |   |   |-- misc
+L    |   |   |   |   |   |-- stylesheets
+L    |   |   |   |   |   `-- wiki
 *    |   |   |   |   |-- schema     # to do catalog and catalog.xcat
 N    |   |   |   |   |   |-- docbook
 L    |   |   |   |   |   |-- dtd

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/egrm.xegrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/egrm.xegrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/egrm.xegrm	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/2.0"                                                                                          
          start="grammar">
 

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/error.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/error.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/error.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
  <lexeme symbol="line">
   <alt>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xgrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xgrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xgrm	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" standalone="no"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/1.0">
 
  <production symbol="grammar">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/grm.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" standalone="no"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
 
  <lexeme symbol="token_decl">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.egrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.egrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.egrm	Mon Mar 15 17:18:10 2004
@@ -1,3 +1,18 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 /* Java Grammar */
 
 %ab HexDigit        : [0-9a-fA-F];

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xgrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xgrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xgrm	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="US-ASCII"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 
 <grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/1.0">
 <!--This file was generated! Don't edit!-->

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/java.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
 <lexeme symbol="DOPEN">
 <cstring content="("/>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xgrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xgrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xgrm	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/1.0">
 <priority>
 <terminal symbol="ASTERISK"/>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/javadoc.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
 <lexeme symbol="ASTERISK">
 <cstring content="*"/>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/link.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/link.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/link.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
  <!-- (([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? -->
  <lexeme symbol="link">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xgrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xgrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xgrm	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/1.0">
  <production symbol="E">
   <nonterminal symbol="E"/><terminal symbol="plus"/><nonterminal symbol="T"/>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/mathexp.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
  <lexeme symbol="plus">
   <cclass><cset content="+-"/></cclass>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/quote.grm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/quote.grm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/quote.grm	Mon Mar 15 17:18:10 2004
@@ -1,7 +1,7 @@
 %ignore          "^#(.*)";
 %token Comma     "\,";
 %token Value     "[^\n\r\,]+";
-%token Break "\r(\n?) | \n";
+%token Break     "\r(\n?) | \n";
 
 %start document;
 
@@ -11,6 +11,7 @@
 document
   : rows Break
   | rows
+  | /* empty */
   ;
 
 // each row seprated with one break
@@ -22,6 +23,13 @@
                                                                                                                                                                                
 // values separated by spaces
 row
-  : row Comma Value
-  | Value
+  : row Comma column
+  | column
   ;
+
+// allow empty columns
+column
+  : Value
+  | /* empty */
+  ;
+

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xgrm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xgrm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xgrm	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" standalone="no"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/1.0">
  <priority>
   <terminal symbol="plus"/>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xlex
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xlex	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/regex.xlex	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" standalone="no"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
 
  <lexeme symbol="alt">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/grammars/wiki.grm
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/grammars/wiki.grm	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/grammars/wiki.grm	Mon Mar 15 17:18:10 2004
@@ -1,12 +1,6 @@
 
 %token line "\-\-\-\- (\-*)";
 
-%token bulleteditem "\*+";
-
-%token numbered1item "#";
-%token numbered2item "##";
-%token numbered3item "###";
-
 %token tabletitleitem  "\|\|";
 %token tablecolumnitem "\|";
 
@@ -38,6 +32,12 @@
 
 %right hardbreak "(\r(\n?) | \n) (\r(\n?) | \n)+";
 
+%token bulleteditem "\*+";
+
+%token numbered1item "#";
+%token numbered2item "##";
+%token numbered3item "###";
+
 %ignore "[\ \t]+";
 
 %start document;
@@ -213,4 +213,3 @@
 codeblock 
   : codeopenitem text codecloseitem
   ;
-

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/edit.xml
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/edit.xml	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/edit.xml	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <document>
  <header>
   <title>Wiki example</title>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/error.css
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/error.css	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/error.css	Mon Mar 15 17:18:10 2004
@@ -1,3 +1,18 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 pre.error {
   //font-size: 10pt;
   font-size: 120%;

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/java.css
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/java.css	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/java.css	Mon Mar 15 17:18:10 2004
@@ -1,3 +1,18 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 TD.titleText {
 	 BACKGROUND: #eff7ff; PADDING-left: 5px;
 }

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/mathexp.xsp
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/mathexp.xsp	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/mathexp.xsp	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 
 <xsp:page language="java"
           xmlns:xsp="http://apache.org/xsp"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/new.xml
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/new.xml	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/new.xml	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <document>
  <header>
   <title>Wiki example</title>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/patterntext.xml
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/patterntext.xml	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/patterntext.xml	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <document>
  <header>
   <title>Chaperon examples</title>

Added: xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote1.txt
==============================================================================
--- (empty file)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote1.txt	Mon Mar 15 17:18:10 2004
@@ -0,0 +1,65 @@
+Date,Open,High,Low,Close,Volume
+20021101,0.11,0.11,0.11,0.11,74000
+20021104,0.11,0.11,0.1,0.105,1166900
+20021105,0.1,0.105,0.1,0.105,759670
+20021106,0.1,0.105,0.1,0.105,101000
+20021107,0.105,0.105,0.097,0.097,808230
+20021108,0.1,0.105,0.1,0.1,685199
+20021111,0.105,0.11,0.1,0.1,1109000
+20021112,0.105,0.105,0.1,0.1,0
+20021113,0.105,0.11,0.105,0.105,564856
+20021114,0.105,0.105,0.1,0.105,617400
+20021115,0.105,0.11,0.105,0.11,343500
+20021118,0.11,0.11,0.105,0.11,427602
+20021119,0.11,0.11,0.105,0.105,458679
+20021120,0.11,0.115,0.11,0.115,669019
+20021121,0.115,0.14,0.115,0.135,2906144
+20021122,0.135,0.135,0.125,0.13,749000
+20021125,0.13,0.13,0.12,0.12,1417533
+20021126,0.125,0.125,0.12,0.12,505800
+20021127,0.12,0.12,0.115,0.115,195472
+20021128,0.115,0.12,0.11,0.12,322800
+20021129,0.12,0.12,0.115,0.115,371600
+20021202,0.115,0.115,0.11,0.11,1112575
+20021203,0.11,0.11,0.105,0.105,252652
+20021204,0.11,0.115,0.11,0.115,829171
+20021205,0.115,0.115,0.11,0.11,390148
+20021206,0.11,0.11,0.105,0.105,640881
+20021209,0.11,0.115,0.11,0.11,1809529
+20021210,0.11,0.11,0.105,0.105,1251090
+20021211,0.105,0.11,0.1,0.1,515300
+20021212,0.105,0.105,0.105,0.105,139000
+20021213,0.11,0.115,0.11,0.11,2567966
+20021216,0.115,0.115,0.11,0.115,605650
+20021217,0.115,0.115,0.105,0.11,1219014
+20021218,0.115,0.115,0.11,0.115,718090
+20021219,0.12,0.125,0.115,0.12,2068299
+20021220,0.12,0.125,0.12,0.125,954000
+20021223,0.12,0.12,0.115,0.12,153300
+20021224,0.12,0.12,0.12,0.12,554900
+20021225,0.12,0.12,0.12,0.12,0
+20021226,0.12,0.12,0.12,0.12,0
+20021227,0.12,0.125,0.12,0.12,537133
+20021230,0.12,0.125,0.115,0.115,1012467
+20021231,0.12,0.12,0.115,0.115,442733
+20030101,0.115,0.115,0.115,0.115,0
+20030102,0.12,0.12,0.115,0.115,218000
+20030103,0.12,0.12,0.115,0.12,640134
+20030106,0.12,0.12,0.115,0.12,922506
+20030107,0.125,0.125,0.115,0.12,529170
+20030108,0.12,0.12,0.11,0.115,586026
+20030109,0.12,0.135,0.115,0.135,6947552
+20030110,0.14,0.155,0.14,0.145,7828670
+20030113,0.15,0.15,0.135,0.14,3047764
+20030114,0.14,0.14,0.125,0.125,2840680
+20030115,0.125,0.13,0.12,0.125,1365666
+20030116,0.13,0.13,0.12,0.13,1208000
+20030117,0.13,0.13,0.12,0.12,1387520
+20030120,0.125,0.125,0.12,0.12,664292
+20030121,0.12,0.12,0.115,0.12,2164262
+20030122,0.12,0.13,0.12,0.13,2751434
+20030123,0.125,0.135,0.125,0.13,2718754
+20030124,0.135,0.135,0.13,0.13,1035888
+20030128,0.130,0.135,0.130,0.135,1933154
+20030129,0.135,0.135,0.130,0.130,681900
+20030130,0.130,0.130,0.125,0.125,661360

Added: xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote2.txt
==============================================================================
--- (empty file)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/quote2.txt	Mon Mar 15 17:18:10 2004
@@ -0,0 +1,10 @@
+DATE,EVENT,VENUE,RACE DISTANCE,ORGANISER,CONTAC No.
+JAN,,,,,
+17th,GAUTENG NORTH AQUATHLON CHAMPS,Blue Bay quarry,Standard (run-swim-run),JOHAN KOK,072 659 2014
+24th,TUKKIES TRIATHLON,ROODEPLAAT,1/2 Standard,ALBIE DE LANGE,082 453 0096
+31st,TRI CHAMPS  GAUTENG NORTH,ROODEPLAAT,Standard(swim-cycle-run),JEAN-PIERRE TEN NAPEL,082 358 4005
+FEB,,,,,
+8th,GARY WHITEHOUSE MEMORIAL,ROODEPLAAT,1/2 Standard(swim-cycle-run),HENNING VAN ASWEGEN,082 344 5641
+14th,GAUTENG NORTH TRIATHLON CLINIC,LC DE VILLIERS,,JAN VAN ROOYEN,083 601 8103
+28th,S.A. TRIATHLON CHAMPS,TBA,Standard (swim-cycle-run),,
+MAR,,,,,

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/samples.xml
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/samples.xml	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/samples.xml	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <samples xmlns:xlink="http://www.w3.org/1999/xlink">
 
  <group name="Main examples page.">
@@ -39,8 +54,11 @@
  </group>
 
  <group name="Comma-Separated Values (CSV)">
-  <sample name="Stock Quote" href="quote.html">
+  <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">
+   This example processes a CSV file generate by MS Excel.
   </sample>
  </group>
 

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/source.xml
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/source.xml	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/source.xml	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <document>
  <header>
   <title>Wiki example</title>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/view.xml
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/view.xml	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/view.xml	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <document>
  <header>
   <title>Wiki example</title>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/misc/wiki.js
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/misc/wiki.js	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/misc/wiki.js	Mon Mar 15 17:18:10 2004
@@ -1,3 +1,18 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 importPackage(Packages.org.apache.excalibur.source);
 //importPackage(Packages.java.io);
 

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/sitemap.xmap
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/sitemap.xmap	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/sitemap.xmap	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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">
 
@@ -22,7 +37,7 @@
 
 <!-- =========================== Transformers ================================= -->
 
-  <map:transformers default="xslt">
+  <map:transformers default="xsltc">
 
    <map:transformer name="pattern" 
                     src="org.apache.cocoon.transformation.PatternTransformer" 
@@ -152,7 +167,7 @@
 
   </map:pipeline>
 
-  <map:pipeline type="caching">  
+  <map:pipeline type="caching"> 
 
    <map:match pattern="">
     <map:redirect-to uri="welcome"/>
@@ -195,10 +210,10 @@
     <map:serialize type="html"/>
    </map:match>
 
-   <map:match pattern="quote.html">
-    <map:generate  type="text"    src="misc/quote.txt"/>
-    <map:transform type="lexer"   src="grammars/quote.xlex"/>
-    <map:transform type="parser"  src="grammars/quote.xgrm" label="ast"/>
+   <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}"/>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/class2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/class2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/class2html.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/egrm2xegrm.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/egrm2xegrm.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/egrm2xegrm.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:text="http://chaperon.sourceforge.net/schema/text/1.0"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2html.xsl	Mon Mar 15 17:18:10 2004
@@ -1,6 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
 
-<!-- CVS $Id: error2html.xsl,v 1.1 2004/01/23 09:50:31 nicolaken Exp $ -->
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- CVS $Id: error2html.xsl,v 1.2 2004/03/06 02:25:33 antonio Exp $ -->
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2page.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2page.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error2page.xsl	Mon Mar 15 17:18:10 2004
@@ -1,6 +1,21 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
 
-<!-- CVS $Id: error2page.xsl,v 1.1 2004/01/23 09:50:31 nicolaken Exp $ -->
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- CVS $Id: error2page.xsl,v 1.2 2004/03/06 02:25:33 antonio Exp $ -->
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error4wiki.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error4wiki.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/error4wiki.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:xi="http://www.w3.org/2001/XInclude"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xgrm.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xgrm.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xgrm.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:text="http://chaperon.sourceforge.net/schema/text/1.0"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xlex.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xlex.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/grm2xlex.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:text="http://chaperon.sourceforge.net/schema/text/1.0"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/java2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/java2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/java2html.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/mathexp2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/mathexp2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/mathexp2html.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
                 xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0"
                 version="1.0">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/pattern2link.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/pattern2link.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/pattern2link.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/quote2page.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/quote2page.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/quote2page.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0"
@@ -12,58 +27,37 @@
    </header>
    <body>
     <section>
-     <title>Stock quote</title>
+     <title>CSV Example</title>
 
-     <p>
-      The example Comma-Separated Values (CSV) file is three months of end-of-day
-      data for one particular stock symbol (data such as that obtained from
-      <a href="http://finance.yahoo.com/">Yahoo Finance</a>).
-     </p>
-     <p>
-      Here are the first 5 lines (total 64) of the input file ...
-     </p>
-     <pre>--------------------------------------------
-20021101,0.11,0.11,0.11,0.11,74000
-20021104,0.11,0.11,0.1,0.105,1166900
-20021105,0.1,0.105,0.1,0.105,759670
-20021106,0.1,0.105,0.1,0.105,101000
-20021107,0.105,0.105,0.097,0.097,808230
-...
---------------------------------------------</pre>
-     <p>
-      After processing with the Lexer Transformer and the Parser Transformer,
-      here is the result ...
-     </p>
      <table cellpadding="3" border="1">
-      <tr>
-       <th>Line #</th>
-       <th>Date</th>
-       <th>Open</th>
-       <th>High</th>
-       <th>Low</th>
-       <th>Close</th>
-       <th>Volume</th>
-      </tr>
-      <xsl:apply-templates select="st:document/st:rows"/>
+      <xsl:apply-templates select="st:document/st:rows/st:row[1]" mode="title"/>
+      <xsl:apply-templates select="st:document/st:rows/st:row[position()>1]"/>
      </table>
     </section>
    </body>
   </document>
  </xsl:template>
 
- <xsl:template match="st:rows">
-  <xsl:apply-templates select="st:row"/>
+ <xsl:template match="st:row" mode="title">
+  <tr>
+   <th>Line #</th>
+   <xsl:apply-templates select="st:column" mode="title"/>
+  </tr>
  </xsl:template>
 
  <xsl:template match="st:row">
   <tr>
-   <td><xsl:number/></td>
-   <xsl:apply-templates select="st:Value"/>
+   <td><xsl:value-of select="position()"/></td>
+   <xsl:apply-templates select="st:column"/>
   </tr>
  </xsl:template>
 
- <xsl:template match="st:Value">
-  <td><xsl:value-of select="."/></td>
+ <xsl:template match="st:column" mode="title">
+  <th><xsl:value-of select="st:Value"/></th>
+ </xsl:template>
+
+ <xsl:template match="st:column">
+  <td><xsl:value-of select="st:Value"/></td>
  </xsl:template>
 
  <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/remove4class.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/remove4class.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/remove4class.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4error.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4error.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4error.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc2.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc2.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4javadoc2.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4regex.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4regex.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/text4regex.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2html.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0"

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2xdoc.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2xdoc.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/wiki2xdoc.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0"
@@ -11,15 +26,8 @@
              cdata-section-elements="source"/>
 
  <xsl:template match="st:output">
-  <document>
-   <header>
-    <title><xsl:value-of select="st:document/st:section/st:title/st:textsequence"/></title>
-   </header>
-   <body>
-    <xsl:apply-templates select="st:document/st:paragraphs/st:paragraph/*" mode="paragraph"/>  
-    <xsl:apply-templates select="st:document/st:section"/>
-   </body>
-  </document>
+  <xsl:apply-templates select="st:document/st:paragraphs/st:paragraph/*" mode="paragraph"/>  
+  <xsl:apply-templates select="st:document/st:section"/>
  </xsl:template>
 
  <xsl:template match="st:section">
@@ -116,7 +124,7 @@
       </link>
      </xsl:when>
      <xsl:otherwise>
-      <link href="{$href}.html">
+      <link href="view.do?page={$href}">
        <xsl:value-of select="$text"/>
       </link>
      </xsl:otherwise>

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/xdoc2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/xdoc2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/stylesheets/xdoc2html.xsl	Mon Mar 15 17:18:10 2004
@@ -1,4 +1,19 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0">

Modified: xml/forrest/trunk/src/core/context/resources/chaperon/wiki/selftest.txt
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/chaperon/wiki/selftest.txt	(original)
+++ xml/forrest/trunk/src/core/context/resources/chaperon/wiki/selftest.txt	Mon Mar 15 17:18:10 2004
@@ -66,6 +66,13 @@
 and this is not part of bullet one.
 * But this is bullet two.
 
+Test 3.3 This should be followed by 4 bullet points with no text in between them:
+
+* Bullet 3.3.1, adding some ''italic'' should not break the bullet point in two
+* Bullet 3.3.2, adding some __bold__ should not break the bullet point in two
+* Bullet 3.3.3, adding some {{monospaced}} should not break the bullet point in two
+* Bullet 3.3.4, adding some ''italic'', __bold__, and {{monospaced}} should not break the bullet point in two
+
 -- 4.TEXT ATTRIBUTES --
 
 Test 4.1 The words __bold__, ''italic'' and {{monospaced}} in this phrase should be displayed with the corresponding attributes.

Mime
View raw message