JAMWiki

Revision: 2126
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2126&view=rev
Author:   wrh2
Date:     2008-03-29 09:23:29 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
Parser:
  * Use the tag stack when parsing <pre> tags.
  * Add an additional unit test for unclosed <pre> tags.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-spliceprocessor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParsePreTest.java

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/PreformattedInvalid2
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/PreformattedInvalid2

Removed Paths:
-------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlPreTag.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2129
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2129&view=rev
Author:   wrh2
Date:     2008-03-29 21:56:38 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
Parser:
  * Fix an issue when parsing unmatched wikibold tags (''''').
  * Add a unit test for unmatched wiki bold tags.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParseWikiSyntaxTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/WikiSyntax1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/WikiSyntax1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2130
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2130&view=rev
Author:   wrh2
Date:     2008-03-29 22:28:12 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
Parser:
  * Use the tag stack when parsing paragraph tags.
  * Remove several unnecessary JFlex eofval directives.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-spliceprocessor.jflex
    wiki/trunk/jamwiki-core/src/test/resources/data/results/UnorderedList2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2131
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2131&view=rev
Author:   wrh2
Date:     2008-03-29 23:08:33 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
Unit Testing:
  * Convert the TableOfContentsTest unit testing code to use the new
    testing framework (ie read an input file, parse it, and compare the
    output to a results file).
  * Add some newlines to the TOC HTML output to improve readability.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/TableOfContentsTest.java

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents2
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents3
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents4
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/TableOfContents1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/TableOfContents2
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/TableOfContents3
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/TableOfContents4


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2132
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2132&view=rev
Author:   wrh2
Date:     2008-03-29 23:59:25 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
Parser:
  * Add more robust handling for wiki bold/italic.
  * Add a new bold/italic unit test, but disable it for now as it does
    not currently pass.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParseWikiSyntaxTest.java

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/WikiSyntax2
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/WikiSyntax2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2146
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2146&view=rev
Author:   wrh2
Date:     2008-04-05 12:33:59 -0700 (Sat, 05 Apr 2008)

Log Message:
-----------
Parser:
  * Fix parsing of complex instances of bold and italic syntax such as
    "'''''bold''' then italic''" that the parser previous failed on.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParseWikiSyntaxTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/WikiSyntax2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2170
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2170&view=rev
Author:   wrh2
Date:     2008-04-12 12:53:25 -0700 (Sat, 12 Apr 2008)

Log Message:
-----------
Parser:
  * Update the wiki table start/end patterns to hopefully avoid extra
    newlines in parser output.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents5


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2171
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2171&view=rev
Author:   wrh2
Date:     2008-04-12 13:02:08 -0700 (Sat, 12 Apr 2008)

Log Message:
-----------
Parser:
  * Add unit tests and a minor fix for the previous commit to better
    handle newlines around wiki tables.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Table10
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Table11
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Table10
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Table11


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2176
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2176&view=rev
Author:   wrh2
Date:     2008-04-13 01:16:05 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Parser:
  * Move paragraph parsing into jamwiki-processor.jflex.
  * Add a new parser mode for paragraph parsing.
  * Add a unit test to catch a case where table parsing broke as a result
    of changes made during implementation of this enhancement.
  * The next step is to fix unit tests that are breaking.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferencesTag.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Table12
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Table12


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2177
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2177&view=rev
Author:   wrh2
Date:     2008-04-13 01:55:21 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Parser:
  * Properly handle paragraphs containing multiple empty lines
    ("<p><br />text</p>").
  * Make sure block-level HTML elements generate the correct number of
    newlines.
  * Three of the five unit tests that were previously failing now pass.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2178
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2178&view=rev
Author:   wrh2
Date:     2008-04-13 10:40:58 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Parser:
  * Remove all line-feed characters ('\r') prior to parsing, and remove
    all occurrences of '\r' from the JFlex patterns.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-spliceprocessor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2180
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2180&view=rev
Author:   wrh2
Date:     2008-04-13 12:28:51 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Parser:
  * Update newline handling with <pre> tags to better match Mediawiki.
    Previously output was of the form "<pre>text</pre>", now the open
    and close tags are placed on their own lines.
  * Note that a couple of the unit tests for <pre> fail, but the failures
    are primarily cosmetic and the HTML generated is functionally the same.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Preformatted1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Preformatted2
    wiki/trunk/jamwiki-core/src/test/resources/data/results/PreformattedInvalid1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/PreformattedInvalid2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2181
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2181&view=rev
Author:   wrh2
Date:     2008-04-13 14:18:44 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Parser:
  * Resolve a newline-in-paragraph issue that fixes another unit test
    that was previously failing.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlCommentTest1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Paragraph7
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Table12
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/HtmlCommentTest1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2182
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2182&view=rev
Author:   wrh2
Date:     2008-04-13 22:40:37 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Parser:
  * Update <br /> tag handling to exactly match Mediawiki.  This change
    fixes another unit test that was failing.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlMismatchTest4

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlTags1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/HtmlTags1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2185
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2185&view=rev
Author:   wrh2
Date:     2008-04-19 13:04:39 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
Parser:
  * Fix some issues around handling of HTML <p> and </p> tags.
  * This change will eventually need some cleanup, but for now the focus
    is on fixing existing paragraph parsing bugs.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Paragraph10
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Paragraph9
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Paragraph10
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Paragraph9


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2186
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2186&view=rev
Author:   wrh2
Date:     2008-04-19 13:08:02 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
Parser:
  * Add a hack to make sure that generated HTML does not contain
    unnecessary newlines and thus matches Mediawiki.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2187
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2187&view=rev
Author:   wrh2
Date:     2008-04-19 23:43:44 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
Parser:
  * The empty-line paragraph pattern ("<p><br />...</p>") was in some
    cases breaking list and table parsing.
  * Add additional parser test cases.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Table3
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Table3

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Table13
    wiki/trunk/jamwiki-core/src/test/resources/data/results/UnorderedList3
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Table13
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/UnorderedList3


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2188
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2188&view=rev
Author:   wrh2
Date:     2008-04-19 23:45:02 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
Parser:
  * Update the empty line paragraph pattern ("<p><br />...</p>") to
    handle multiple empty lines, matching Mediawiki's behavior.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Paragraph11
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Paragraph11


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2193
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2193&view=rev
Author:   wrh2
Date:     2008-04-20 12:10:33 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
Parser:
  * Fix another paragraph parsing issue - closing block level tags
    should also close any open paragraph within that tag.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Paragraph12
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Paragraph12


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2195
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2195&view=rev
Author:   wrh2
Date:     2008-04-20 20:11:21 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
Parser:
  * Fix handling of multi-line wikipre syntax.  Previously the
    opening space character (" ") was not being suppressed after
    the first line.
  * Enable the unit test that was previously failing for this case.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2196
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2196&view=rev
Author:   wrh2
Date:     2008-04-20 22:42:44 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
Parser:
  * Allow HTML list tags to be used.
  * Add code to catch unclosed HTML list tags (needs cleanup).

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2199
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2199&view=rev
Author:   wrh2
Date:     2008-04-28 21:15:34 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
Parser:
  * Fix another corner case that broke parsing - a heading tag
    preceded by two newlines was not parsed as a heading.
  * The parser is still not entirely correct - it should take three
    empty newlines to produce an empty paragraph, and an extra newline
    is being added - but at least now the heading is properly parsed.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Heading5
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Heading5


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2208
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2208&view=rev
Author:   wrh2
Date:     2008-05-02 23:08:53 -0700 (Fri, 02 May 2008)

Log Message:
-----------
Parser:
  * Update the JFlexParserUtil.isNonInlineTag() method to return true
    for div and hr tags.  This fixes the Paragraph9 unit test, which
    was previously failing.
  * Simplify jamwiki-processor.jflex slightly by moving some newline
    handling out to JFlexLexer.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2225
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2225&view=rev
Author:   wrh2
Date:     2008-05-25 23:14:38 -0700 (Sun, 25 May 2008)

Log Message:
-----------
Parser:
  * Do not throw an exception in the case of a parser tag stack mis-match;
    instead log an error.
  * Add a parser unit test for topics that contain only an invalid closing
    HTML tag.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlMismatchTest5
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/HtmlMismatchTest5


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.