Fixed generated image tags.

Author: chirino

changelog.md

@@ -1,6 +1,11 @@
 Scala Markdown
 ==============
 
+[Scala Markdown 1.4](http://scalamd.fusesource.org/maven/1.4), December 22, 2010
+----
+
+* Generated image tags were broken
+
 [Scala Markdown 1.3](http://scalamd.fusesource.org/maven/1.3), December 16, 2010
 ----
 

src/main/scala/md.scala

@@ -79,7 +79,7 @@ object Markdown {
       "(?:" + htmlNameTokenExpr + "\\s*=\\s*\"[^\"]*\")|" +
       "(?:" + htmlNameTokenExpr + "\\s*=\\s*'[^']*')|" +
       "(?:" + htmlNameTokenExpr + "\\s*=\\s*[a-z0-9_:.\\-]+)" +
-      ")\\s*)*)>", Pattern.DOTALL | Pattern.CASE_INSENSITIVE)
+      ")\\s*)*)/?>", Pattern.DOTALL | Pattern.CASE_INSENSITIVE)
   // Headers
   val rH1 = Pattern.compile("^ {0,3}(\\S.*?)( *\\{#(.*?)\\})?\\n=+(?=\\n+|\\Z)", Pattern.MULTILINE)
   val rH2 = Pattern.compile("^ {0,3}(\\S.*?)( *\\{#(.*?)\\})?\\n-+(?=\\n+|\\Z)", Pattern.MULTILINE)
@@ -255,10 +255,11 @@ class MarkdownText(source: CharSequence) {
    * Encodes specially-treated characters inside the HTML tags.
    */
   protected def encodeCharsInsideTags(text: StringEx) =
-    text.replaceAll(rInsideTags, m =>
+    text.replaceAll(rInsideTags, { m =>
+      val tail = if( m.group(0).endsWith("/>") ) "/>" else ">"
       "<" + encodeUnsafeChars(new StringEx(m.group(1)))
           .replaceAll(rEscAmp, "&amp;")
-          .toString + ">")
+          .toString + tail})
 
   // ## Processing methods
 

src/test/resources/Images.html

@@ -0,0 +1,2 @@
+<p><img src="/path/to/img.jpg" alt="Alt text"/>
+<img src="/path/to/img.jpg" alt="Alt text" title="Optional title"/></p>

src/test/resources/Images.text

@@ -0,0 +1,2 @@
+![Alt text](/path/to/img.jpg)
+![Alt text](/path/to/img.jpg "Optional title")

src/test/scala/test.scala

@@ -20,6 +20,7 @@ object MarkdownSpec extends Specification {
       val textFile = new File(this.getClass.getResource("/" + name + ".text").toURI)
       val htmlFile = new File(this.getClass.getResource("/" + name + ".html").toURI)
       val text = Markdown(FileUtils.readFileToString(textFile, "UTF-8")).trim
+//      println("[%s]".format(text))
       val html = FileUtils.readFileToString(htmlFile, "UTF-8").trim
       val diffIndex = StringUtils.indexOfDifference(text, html)
       val diff = StringUtils.difference(text, html)
@@ -32,6 +33,9 @@ object MarkdownSpec extends Specification {
   def process = addToSusVerb("process")
 
   "MarkdownProcessor" should process {
+    "Images" in {
+      "Images" must beFine
+    }
     "TOC" in {
       "TOC" must beFine
     }