Return-Path: Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org Received: (qmail 14294 invoked by uid 500); 26 Apr 2003 12:23:16 -0000 Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: forrest-dev@xml.apache.org Delivered-To: mailing list forrest-cvs@xml.apache.org Received: (qmail 14281 invoked from network); 26 Apr 2003 12:23:15 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 26 Apr 2003 12:23:15 -0000 Received: (qmail 93995 invoked by uid 1352); 26 Apr 2003 12:23:15 -0000 Date: 26 Apr 2003 12:23:15 -0000 Message-ID: <20030426122315.93994.qmail@icarus.apache.org> From: jefft@apache.org To: xml-forrest-cvs@apache.org Subject: cvs commit: xml-forrest/src/resources/stylesheets wiki2document.xsl X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jefft 2003/04/26 05:23:15 Modified: . build.xml status.xml src/documentation/content/xdocs site.xml src/resources/conf forrest.xmap sitemap.xmap src/resources/forrest-shbat forrest.build.xml src/resources/fresh-site/src/documentation/content/xdocs site.xml Added: src/documentation/content/xdocs wiki-sample.cwiki src/resources/fresh-site/src/documentation/content/xdocs wiki-sample.cwiki src/resources/grammars grammar-v20.dtd grm.xgrm grm.xlex grm2xgrm.xsl grm2xlex.xsl lexicon-v20.dtd link.xlex regex.xgrm regex.xlex text4regex.xsl wiki.grm wiki.xgrm wiki.xlex src/resources/stylesheets wiki2document.xsl Log: Wiki syntax should now work Revision Changes Path 1.65 +6 -0 xml-forrest/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-forrest/build.xml,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- build.xml 11 Apr 2003 14:46:19 -0000 1.64 +++ build.xml 26 Apr 2003 12:23:14 -0000 1.65 @@ -267,6 +267,12 @@ + + + + + + 1.148 +3 -0 xml-forrest/status.xml Index: status.xml =================================================================== RCS file: /home/cvs/xml-forrest/status.xml,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- status.xml 24 Apr 2003 09:10:32 -0000 1.147 +++ status.xml 26 Apr 2003 12:23:14 -0000 1.148 @@ -24,6 +24,9 @@ + + Get the Wiki syntax support working again. + Created new document-v12 DTD module, containing all DTD improvements made since 0.4 was released, and use it to define new v12 versions of 1.11 +3 -1 xml-forrest/src/documentation/content/xdocs/site.xml Index: site.xml =================================================================== RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/site.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- site.xml 24 Apr 2003 09:07:42 -0000 1.10 +++ site.xml 26 Apr 2003 12:23:14 -0000 1.11 @@ -47,8 +47,10 @@ + - + + 1.1 xml-forrest/src/documentation/content/xdocs/wiki-sample.cwiki Index: wiki-sample.cwiki =================================================================== !!!Forrest's Wiki Support Forrest now has partial support for documentation in Wiki format, thanks to the [Chaperon parser|http://chaperon.sf.net]. Wiki is a simple text format that can be learned in minutes. This page provides an overview of the syntax that Forrest supports, namely a subset of that used by the [Cocoon Wiki|http://wiki.cocoondev.org]. !Quick reference {{{ ---- = Make a horizontal ruler. Extra '-' is ignored. \\ = force a line break, \\\=force line break and clear. [link] = creates a hyperlink to an internal WikiPage called 'Link'. [this is also a link] = creates a hyperlink to an internal WikiPage called 'ThisIsAlsoALink'. [click here|link] = creates a hyperlink to an internal WikiPage called 'Link', but displays the text 'click here' to the user instead of 'Link'. [1] = Makes a reference to a footnote numbered 1. [#1] = Marks the footnote number 1. [[link] = creates text '[link]'. !heading = small heading with text 'heading' !!heading = medium heading with text 'heading' !!!heading = large heading with text 'heading' ''text'' = prints 'text' in italic. __text__ = prints 'text' in bold. {{text}} = prints 'text' in monospaced font. * text = makes a bulleted list item with 'text' # text = makes a numbered list item with 'text' ;term:ex = makes a definition for 'term' with the explanation 'ex' }}} !Writing text You don't need to know anything about the Wiki text formatting rules to use Wiki. Just write normal text, and then use an empty line to mark a paragraph. It's just like writing an email. !Hyperlinks The link can also be a direct URL starting with http:, ftp:, mailto:, https:, or news:, in which case the link points to an external entity. For example, to point at the java.sun.com home page, use [[http://java.sun.com], which becomes [http://java.sun.com/] or [[Java home page|http://java.sun.com], which becomes [Java home page|http://java.sun.com]. To add a new page you just create a link to it from somewhere else. After all, there isn't much point in having a page if you can't access it! You'll then see a small question mark after the page name when you return to that page. Then click on it and you have created a new page! It's allowed to use almost any kind of characters inside a [[WikiName], as long as they are letters or numbers. Note also that this Wiki can be configured to support standard CamelCase linking (if it's supported, the word CamelCase should be a link). It's off by default, but if your friendly administrator has turned it on, then well, CamelCase all you want =). !Adding pictures For security reasons uploading images is not permitted, but you can embed any image in the wiki code by putting the image available somewhere on the web in one of the allowed formats, and then just linking to it. For example, this is an inlined PNG image: [http://www.ecyrd.com/~jalkanen/test.png]. If you specify a link text ([[this one here|http://example.com/example.png]) it becomes the ALT text for those who either can't or don't want to view images. !Bulleted lists Use an asterisk (*) in the first column to make bulleted lists. Use more asterisks for deeper indentation. For example: {{{ * One * Two * Three ** Three.One }}} creates * One * Two * Three ** Three.One !Numbered lists Just like with bulleted lists, but use a hash (#) instead of the asterisk. Like this: {{{ # One # Two # Three ## Three.One }}} creates # One # Two # Three ## Three.One If you want to write the list item on multiple lines, just add one or more spaces on the next line and the line will be automatically added to the previous item. If this sounds complicated, edit this page for an example, below. * This is a single-line item. * This is actually a multi-line item. We continue the second sentence on a line on a line of its own. We might as well do a third line while we're at it... Notice, however, as all these sentences get put inside a single item! * The third line is again a single-line item for your convinience. !Definition lists and comments A simple way to make definition lists is to use the ';:' -construct: ;__Construct__:''Something you use to do something with'' Another nice use for the ';:' is that you can use it to comment shortly on other people's text, by having an empty 'term' in the definition, like this: {{{ ;:''Comment here.'' }}} Which would be seen as ;:''Comment here.'' !Text effects You may use __bold__ text or ''italic'' text, by using two underscores (_) and two single quotes ('), respectively. If you're on a Windows computer, make sure that you are using the correct quote sign, as there is one that looks the same, but really isn't. !Preformatted text If you want to add preformatted text (like code) just use three consecutive braces ({) to open a block, and three consecutive braces (}) to close a block. Edit this page for an example. !Tables You can do simple tables by using using pipe signs ('|'). Use double pipe signs to start the heading of a table, and single pipe signs to then write the rows of the table. End with a line that is not a table. For example: {{{ || Heading 1 || Heading 2 | ''Gobble'' | Bar | [[Main] | [[SandBox] }}} gives you the following table. Note how you can use links also inside tables. || Heading 1 || Heading 2 | ''Gobble'' | Bar | [[Main] | [[SandBox] 1.13 +52 -17 xml-forrest/src/resources/conf/forrest.xmap Index: forrest.xmap =================================================================== RCS file: /home/cvs/xml-forrest/src/resources/conf/forrest.xmap,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- forrest.xmap 24 Apr 2003 09:10:32 -0000 1.12 +++ forrest.xmap 26 Apr 2003 12:23:14 -0000 1.13 @@ -4,9 +4,19 @@ + - + + + + + + + + + + @@ -134,22 +144,6 @@ - - - @@ -163,6 +157,20 @@ + + + + + + + + + + @@ -170,6 +178,33 @@ + + + 1.91 +0 -3 xml-forrest/src/resources/conf/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sitemap.xmap 10 Apr 2003 14:22:31 -0000 1.90 +++ sitemap.xmap 26 Apr 2003 12:23:14 -0000 1.91 @@ -41,9 +41,6 @@ - - - 1.61 +12 -3 xml-forrest/src/resources/forrest-shbat/forrest.build.xml Index: forrest.build.xml =================================================================== RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- forrest.build.xml 11 Apr 2003 11:26:29 -0000 1.60 +++ forrest.build.xml 26 Apr 2003 12:23:14 -0000 1.61 @@ -82,6 +82,7 @@ + @@ -104,6 +105,7 @@ + @@ -373,11 +375,11 @@ param: location to make temporary context-dir ${project.ctxt-dir} =============================================================== --> @@ -421,6 +423,13 @@ + + + + + + 1.14 +1 -0 xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/site.xml Index: site.xml =================================================================== RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/site.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- site.xml 24 Apr 2003 09:10:32 -0000 1.13 +++ site.xml 26 Apr 2003 12:23:14 -0000 1.14 @@ -23,6 +23,7 @@
+ 1.1 xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/wiki-sample.cwiki Index: wiki-sample.cwiki =================================================================== !!!Forrest's Wiki Support Forrest now has partial support for documentation in Wiki format, thanks to the [Chaperon parser|http://chaperon.sf.net]. Wiki is a simple text format that can be learned in minutes. This page provides an overview of the syntax that Forrest supports, namely a subset of that used by the [Cocoon Wiki|http://wiki.cocoondev.org]. !Quick reference {{{ ---- = Make a horizontal ruler. Extra '-' is ignored. \\ = force a line break, \\\=force line break and clear. [link] = creates a hyperlink to an internal WikiPage called 'Link'. [this is also a link] = creates a hyperlink to an internal WikiPage called 'ThisIsAlsoALink'. [click here|link] = creates a hyperlink to an internal WikiPage called 'Link', but displays the text 'click here' to the user instead of 'Link'. [1] = Makes a reference to a footnote numbered 1. [#1] = Marks the footnote number 1. [[link] = creates text '[link]'. !heading = small heading with text 'heading' !!heading = medium heading with text 'heading' !!!heading = large heading with text 'heading' ''text'' = prints 'text' in italic. __text__ = prints 'text' in bold. {{text}} = prints 'text' in monospaced font. * text = makes a bulleted list item with 'text' # text = makes a numbered list item with 'text' ;term:ex = makes a definition for 'term' with the explanation 'ex' }}} !Writing text You don't need to know anything about the Wiki text formatting rules to use Wiki. Just write normal text, and then use an empty line to mark a paragraph. It's just like writing an email. !Hyperlinks The link can also be a direct URL starting with http:, ftp:, mailto:, https:, or news:, in which case the link points to an external entity. For example, to point at the java.sun.com home page, use [[http://java.sun.com], which becomes [http://java.sun.com/] or [[Java home page|http://java.sun.com], which becomes [Java home page|http://java.sun.com]. To add a new page you just create a link to it from somewhere else. After all, there isn't much point in having a page if you can't access it! You'll then see a small question mark after the page name when you return to that page. Then click on it and you have created a new page! It's allowed to use almost any kind of characters inside a [[WikiName], as long as they are letters or numbers. Note also that this Wiki can be configured to support standard CamelCase linking (if it's supported, the word CamelCase should be a link). It's off by default, but if your friendly administrator has turned it on, then well, CamelCase all you want =). !Adding pictures For security reasons uploading images is not permitted, but you can embed any image in the wiki code by putting the image available somewhere on the web in one of the allowed formats, and then just linking to it. For example, this is an inlined PNG image: [http://www.ecyrd.com/~jalkanen/test.png]. If you specify a link text ([[this one here|http://example.com/example.png]) it becomes the ALT text for those who either can't or don't want to view images. !Bulleted lists Use an asterisk (*) in the first column to make bulleted lists. Use more asterisks for deeper indentation. For example: {{{ * One * Two * Three ** Three.One }}} creates * One * Two * Three ** Three.One !Numbered lists Just like with bulleted lists, but use a hash (#) instead of the asterisk. Like this: {{{ # One # Two # Three ## Three.One }}} creates # One # Two # Three ## Three.One If you want to write the list item on multiple lines, just add one or more spaces on the next line and the line will be automatically added to the previous item. If this sounds complicated, edit this page for an example, below. * This is a single-line item. * This is actually a multi-line item. We continue the second sentence on a line on a line of its own. We might as well do a third line while we're at it... Notice, however, as all these sentences get put inside a single item! * The third line is again a single-line item for your convinience. !Definition lists and comments A simple way to make definition lists is to use the ';:' -construct: ;__Construct__:''Something you use to do something with'' Another nice use for the ';:' is that you can use it to comment shortly on other people's text, by having an empty 'term' in the definition, like this: {{{ ;:''Comment here.'' }}} Which would be seen as ;:''Comment here.'' !Text effects You may use __bold__ text or ''italic'' text, by using two underscores (_) and two single quotes ('), respectively. If you're on a Windows computer, make sure that you are using the correct quote sign, as there is one that looks the same, but really isn't. !Preformatted text If you want to add preformatted text (like code) just use three consecutive braces ({) to open a block, and three consecutive braces (}) to close a block. Edit this page for an example. !Tables You can do simple tables by using using pipe signs ('|'). Use double pipe signs to start the heading of a table, and single pipe signs to then write the rows of the table. End with a line that is not a table. For example: {{{ || Heading 1 || Heading 2 | ''Gobble'' | Bar | [[Main] | [[SandBox] }}} gives you the following table. Note how you can use links also inside tables. || Heading 1 || Heading 2 | ''Gobble'' | Bar | [[Main] | [[SandBox] 1.1 xml-forrest/src/resources/grammars/grammar-v20.dtd Index: grammar-v20.dtd =================================================================== 1.1 xml-forrest/src/resources/grammars/grm.xgrm Index: grm.xgrm =================================================================== 1.1 xml-forrest/src/resources/grammars/grm.xlex Index: grm.xlex =================================================================== 1.1 xml-forrest/src/resources/grammars/grm2xgrm.xsl Index: grm2xgrm.xsl =================================================================== This file was generated! Don't edit! 1.1 xml-forrest/src/resources/grammars/grm2xlex.xsl Index: grm2xlex.xsl =================================================================== This file was generated! Don't edit! left right 10 13 9 # 1.1 xml-forrest/src/resources/grammars/lexicon-v20.dtd Index: lexicon-v20.dtd =================================================================== 1.1 xml-forrest/src/resources/grammars/link.xlex Index: link.xlex =================================================================== 1.1 xml-forrest/src/resources/grammars/regex.xgrm Index: regex.xgrm =================================================================== 1.1 xml-forrest/src/resources/grammars/regex.xlex Index: regex.xlex =================================================================== 1.1 xml-forrest/src/resources/grammars/text4regex.xsl Index: text4regex.xsl =================================================================== 1.1 xml-forrest/src/resources/grammars/wiki.grm Index: wiki.grm =================================================================== %token line "\-\-\-\- (\-+)"; %token bulleteditem "\*+"; %token numbered1item "#"; %token numbered2item "##"; %token numbered3item "###"; %token tabletitleitem "\|\|"; %token tablecolumnitem "\|"; %token titleitem "!+"; %token emitem "''"; %token codeopenitem "\{\{"; %token codecloseitem "\}\}"; %token strongitem "__"; %token source "\{\{\{ (\}{0,2}[^\}])* \}\}\}"; %token anchor "\[( [^\[\|\]]* \| )? # [^\[\|\]]* \]"; %token link "\[( [^\[\|\]]* \| )? [^\[\|\]]* \]"; %token text "([^\ \t\n\r\[\{\}\|\*_!#'] | _[^_] | \{[^\{] | \}[^\}] | '[^'] | \[\[) ([^ \n\r\[\{\}\|_'] | _[^_] | \{[^\{] | \}[^\}] | '[^'] | \[\[ | \|[^\|\ \t])*"; %right softbreak "\r(\n?) | \n"; %right hardbreak "(\r(\n?) | \n) (\r(\n?) | \n)+"; %ignore "[\ \t]+"; %start document; %% document : document section | section | paragraphs ; section : title paragraphs | title hardbreak paragraphs ; paragraphs : paragraphs paragraph hardbreak | paragraphs paragraph | paragraph hardbreak | paragraph ; paragraph : bulletedlist | numberedlist1 | textsequence | line | source %prec softbreak | source softbreak | table ; bulletedlist : bulletedlist bulletedlistitem | bulletedlistitem ; bulletedlistitem : bulleteditem textsequence ; numberedlist1 : numberedlist1 numberedlistitem1 | numberedlistitem1 | numberedlist1 numberedlist2 | numberedlist2 ; numberedlistitem1 : numbered1item textsequence ; numberedlist2 : numberedlist2 numberedlistitem2 | numberedlistitem2 | numberedlist2 numberedlist3 | numberedlist3 ; numberedlistitem2 : numbered2item textsequence ; numberedlist3 : numberedlist3 numberedlistitem3 | numberedlistitem3 ; numberedlistitem3 : numbered3item textsequence ; table : tablehead softbreak tablerows | tablehead softbreak tablerows softbreak ; tablehead : tablehead tabletitle | tabletitle ; tabletitle : tabletitleitem textblock ; tablerows : tablerows softbreak tablecolumns | tablecolumns ; tablecolumns : tablecolumns tablecolumn | tablecolumn ; tablecolumn : tablecolumnitem textblock ; title : titleitem textsequence ; textsequence : textsequence textblock softbreak | textsequence textblock | textblock softbreak | textblock ; textblock : link | anchor | strongblock | emblock | text | codeblock ; emblock : emitem text emitem ; strongblock : strongitem text strongitem ; codeblock : codeopenitem text codecloseitem ; 1.1 xml-forrest/src/resources/grammars/wiki.xgrm Index: wiki.xgrm =================================================================== 1.1 xml-forrest/src/resources/grammars/wiki.xlex Index: wiki.xlex =================================================================== 1.1 xml-forrest/src/resources/stylesheets/wiki2document.xsl Index: wiki2document.xsl ===================================================================
<xsl:value-of select="st:section/st:title//st:text"/>
<xsl:value-of select="st:title/st:textsequence"/>

[]