Closes #11
diff --git a/cli/pom.xml b/cli/pom.xml
index eb1b0d0..9f65782 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.0</version>
+ <version>1.2.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/pom.xml b/core/pom.xml
index b37ada2..4fe09e2 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.0</version>
+ <version>1.2.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/src/main/jjtree/Markdown.jjt b/core/src/main/jjtree/Markdown.jjt
index 604e70c..59d2cae 100644
--- a/core/src/main/jjtree/Markdown.jjt
+++ b/core/src/main/jjtree/Markdown.jjt
@@ -363,7 +363,7 @@
| LOOKAHEAD( Ruler() ( <EOL> | <EOF> ) ) Ruler()
| LOOKAHEAD( Header() ( <EOL> | <EOF> ) ) Header()
| LOOKAHEAD( Comment() ) Comment()
- | HtmlBlock()
+ | LOOKAHEAD( TagOpen() ) HtmlBlock()
| LOOKAHEAD(2) List()
| Paragraph()
)
@@ -685,10 +685,21 @@
( "/" { buff.append("/"); } )*
t = <CHAR_SEQUENCE> { buff.append(t.image); }
(
- t = <CHAR_SEQUENCE> { buff.append(t.image); }
- | "/" { buff.append("/"); }
- | "&" { buff.append("&"); }
- | "=" { buff.append("="); }
+ (
+ t = <CHAR_SEQUENCE>
+ | t = <AMPERSAND>
+ | t = <BACKSLASH>
+ | t = <COLON>
+ | t = <EQ>
+ | t = <LBRACKET>
+ | t = <LPAREN>
+ | t = <MINUS>
+ | t = <RBRACKET>
+ | t = <RPAREN>
+ | t = <SHARP>
+ | t = <SLASH>
+ | t = <UNDERSCORE>
+ ) { buff.append(t.image); }
)*
">"
{ jjtThis.setUrl(buff.toString()); }
@@ -792,6 +803,10 @@
}
}
+void TagOpen() : {} {
+ "<" <CHAR_SEQUENCE> ( ( <SPACE> )+ TagAttribute() )* ( <SPACE> )* ( "/" )? ">"
+}
+
String refname() : {
Token t;
StringBuilder buff = new StringBuilder();
@@ -855,6 +870,7 @@
| t = <EQ>
| t = <LBRACKET>
| t = <LPAREN> { parentheses++; }
+ | t = <MINUS>
| t = <RBRACKET>
| LOOKAHEAD({parentheses > 0}) t = <RPAREN> { parentheses--; }
| t = <SHARP>
diff --git a/core/src/test/java/org/tautua/markdownpapers/MarkdownPapersTest.java b/core/src/test/java/org/tautua/markdownpapers/MarkdownPapersTest.java
index 8d52b55..7250d1d 100644
--- a/core/src/test/java/org/tautua/markdownpapers/MarkdownPapersTest.java
+++ b/core/src/test/java/org/tautua/markdownpapers/MarkdownPapersTest.java
@@ -48,7 +48,8 @@
{"rulers"},
{"snippets"},
{"tags"},
- {"underscore"}
+ {"underscore"},
+ {"inlineUrls"}
});
}
}
diff --git a/core/src/test/resources/others/inlineUrls.html b/core/src/test/resources/others/inlineUrls.html
new file mode 100644
index 0000000..20fb47f
--- /dev/null
+++ b/core/src/test/resources/others/inlineUrls.html
@@ -0,0 +1,8 @@
+<p>
+<a href="http://domain.com">http://domain.com</a>
+<a href="http://domain.com/file_path.html">http://domain.com/file_path.html</a>
+<a href="http://domain.com/file-path.html">http://domain.com/file-path.html</a>
+<a href="http://domain.com/path?p1=v1&p2=v2">http://domain.com/path?p1=v1&p2=v2</a>
+<a href="http://domain.com/path#section1">http://domain.com/path#section1</a>
+<a href="http://domain.com:8080/path#section1">http://domain.com:8080/path#section1</a>
+</p>
\ No newline at end of file
diff --git a/core/src/test/resources/others/inlineUrls.text b/core/src/test/resources/others/inlineUrls.text
new file mode 100644
index 0000000..d961344
--- /dev/null
+++ b/core/src/test/resources/others/inlineUrls.text
@@ -0,0 +1,6 @@
+<http://domain.com>
+<http://domain.com/file_path.html>
+<http://domain.com/file-path.html>
+<http://domain.com/path?p1=v1&p2=v2>
+<http://domain.com/path#section1>
+<http://domain.com:8080/path#section1>
\ No newline at end of file
diff --git a/core/src/test/resources/others/links.html b/core/src/test/resources/others/links.html
index a4a9d2f..ea9565f 100644
--- a/core/src/test/resources/others/links.html
+++ b/core/src/test/resources/others/links.html
@@ -6,4 +6,6 @@
<p><a href="http://localhost/path#id">text 4</a></p>
-<p><a href="http://localhost/path#id" title="title">text 5</a></p>
\ No newline at end of file
+<p><a href="http://localhost/path#id" title="title">text 5</a></p>
+
+<p><a href="http://localhost/another-path.jpg">text 6</a></p>
\ No newline at end of file
diff --git a/core/src/test/resources/others/links.text b/core/src/test/resources/others/links.text
index d3e7045..7bba543 100644
--- a/core/src/test/resources/others/links.text
+++ b/core/src/test/resources/others/links.text
@@ -8,6 +8,8 @@
[text 5]( http://localhost/path#id "title" )
+[text 6](http://localhost/another-path.jpg)
+
[id]: http://localhost/path_to#id
[id_2]: http://localhost/path_to_file#id "title"
diff --git a/doxia-module/pom.xml b/doxia-module/pom.xml
index a674401..686cabb 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.0</version>
+ <version>1.2.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.tautua.markdownpapers</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 80bcee1..c7c95a3 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.0</version>
+ <version>1.2.1</version>
<name>MarkdownPapers Parent POM</name>
<description>Markdown parser and transformer</description>
<url>http://markdown.tautua.org</url>
diff --git a/pom.xml b/pom.xml
index c0ccd81..0593af5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.tautua.markdownpapers</groupId>
<artifactId>markdownpapers-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<relativePath>parent</relativePath>
</parent>
<groupId>org.tautua.markdownpapers</groupId>
diff --git a/www/pom.xml b/www/pom.xml
index 35be809..d42c6e1 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.0</version>
+ <version>1.2.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.tautua.markdownpapers</groupId>