commit 7615d23b357f3a2b025929e8eaece1b8fe732e2f
author Larry Ruiz <larry.b.ruiz@gmail.com> Fri Oct 14 22:46:04 2011 -0600
committer Larry Ruiz <larry.b.ruiz@gmail.com> Fri Oct 14 22:46:04 2011 -0600
tree f72739e00398499587ab136ed10d17777e42fae7
parent 22af940cddc5a18582b112373c760aa21edfa5cd

Fixes #15

cli/pom.xml

diff --git a/cli/pom.xml b/cli/pom.xml
index 2338a48..50f72e5 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.tautua.markdownpapers</groupId>
         <artifactId>markdownpapers-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

core/pom.xml

diff --git a/core/pom.xml b/core/pom.xml
index 1a6dfb7..ba55ed0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.tautua.markdownpapers</groupId>
         <artifactId>markdownpapers-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

core/src/main/java/org/tautua/markdownpapers/HtmlEmitter.java

diff --git a/core/src/main/java/org/tautua/markdownpapers/HtmlEmitter.java b/core/src/main/java/org/tautua/markdownpapers/HtmlEmitter.java
index 58c9e2e..94579ea 100644
--- a/core/src/main/java/org/tautua/markdownpapers/HtmlEmitter.java
+++ b/core/src/main/java/org/tautua/markdownpapers/HtmlEmitter.java
@@ -254,7 +254,11 @@
     }
 
     public void visit(Text node) {
-        escapeAndAppend(node.getValue());
+        if(node.jjtGetParent() instanceof Tag) {
+            append(node.getValue());
+        } else {
+            escapeAndAppend(node.getValue());
+        }
     }
 
     void visitChildrenAndAppendSeparator(Node node, char separator){

core/src/main/jjtree/Markdown.jjt

diff --git a/core/src/main/jjtree/Markdown.jjt b/core/src/main/jjtree/Markdown.jjt
index 3bad399..7e7028c 100644
--- a/core/src/main/jjtree/Markdown.jjt
+++ b/core/src/main/jjtree/Markdown.jjt
@@ -1041,6 +1041,7 @@
         | t = <BACKSLASH>
         | t = <BACKTICK>
         | t = <BANG>
+        | t = <CHAR_ENTITY_REF>
         | t = <CODE_SPAN>
         | t = <COLON>
         | t = <EOL>
@@ -1049,6 +1050,7 @@
         | t = <GT>
         | t = <LPAREN>
         | t = <MINUS>
+        | t = <NUMERIC_CHAR_REF>
         | t = <NUMBERING>
         | t = <PLUS>
         | t = <RPAREN>
@@ -1070,6 +1072,7 @@
         | t = <BACKSLASH>
         | t = <BACKTICK>
         | t = <BANG>
+        | t = <CHAR_ENTITY_REF>
         | t = <CODE_SPAN>
         | t = <COLON>
         | t = <COMMENT_CLOSE>
@@ -1082,6 +1085,7 @@
         | t = <LBRACKET>
         | t = <LPAREN>
         | t = <MINUS>
+        | t = <NUMERIC_CHAR_REF>
         | t = <NUMBERING>
         | t = <PLUS>
         | t = <RBRACKET>

core/src/test/resources/others/tags.html

diff --git a/core/src/test/resources/others/tags.html b/core/src/test/resources/others/tags.html
index 6b2b7ac..9c3c608 100644
--- a/core/src/test/resources/others/tags.html
+++ b/core/src/test/resources/others/tags.html
@@ -2,4 +2,5 @@
 <p>
 ABC
 </p>
+<ul><li custom="&lt;">&lt;*Markdown* formatting `syntax` is not processed within block-level HTML **tags**&gt;</li></ul>
 </div>

core/src/test/resources/others/tags.text

diff --git a/core/src/test/resources/others/tags.text b/core/src/test/resources/others/tags.text
index 4c837f1..e023776 100644
--- a/core/src/test/resources/others/tags.text
+++ b/core/src/test/resources/others/tags.text
@@ -2,4 +2,5 @@
 <p>
 ABC
 </p>
+<ul><li custom="&lt;">&lt;*Markdown* formatting `syntax` is not processed within block-level HTML **tags**&gt;</li></ul>
 </div>
\ No newline at end of file

doxia-module/pom.xml

diff --git a/doxia-module/pom.xml b/doxia-module/pom.xml
index 778e00d..78da9fc 100644
--- a/doxia-module/pom.xml
+++ b/doxia-module/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.tautua.markdownpapers</groupId>
         <artifactId>markdownpapers-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.tautua.markdownpapers</groupId>

parent/pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index f5c65ff..6c855c4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.tautua.markdownpapers</groupId>
     <artifactId>markdownpapers-parent</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
     <name>MarkdownPapers Parent POM</name>
     <description>Markdown parser and transformer</description>
     <url>http://markdown.tautua.org</url>

pom.xml

diff --git a/pom.xml b/pom.xml
index 9b1531a..8ee1281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.tautua.markdownpapers</groupId>
         <artifactId>markdownpapers-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>parent</relativePath>
     </parent>
     <groupId>org.tautua.markdownpapers</groupId>

www/pom.xml

diff --git a/www/pom.xml b/www/pom.xml
index 946be1b..de085e8 100644
--- a/www/pom.xml
+++ b/www/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.tautua.markdownpapers</groupId>
         <artifactId>markdownpapers-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.tautua.markdownpapers</groupId>