0.1.6

diff --git a/build.sbt b/build.sbt
index 6eb4106..13e11f1 100644 (file)
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,7 @@ import sbtassembly.Plugin._
 
 name := "BlackQuill"
 
-version := "0.1.5"
+version := "0.1.6"
 
 scalaVersion := "2.10.0"
 

diff --git a/src/main/scala/org/blackquill/engine/BQParser.scala b/src/main/scala/org/blackquill/engine/BQParser.scala
index b7eaf0b..d16b35b 100644 (file)
--- a/src/main/scala/org/blackquill/engine/BQParser.scala
+++ b/src/main/scala/org/blackquill/engine/BQParser.scala
@@ -77,8 +77,8 @@ class BQParser {
        """^(.*?\\,)(.*?)(?:\{(.+?)\})?\\,(\-+|=+)\s*\\,(.*?)$$""".r("before","inTAG","id","style","following") -> ("h",surroundByHeadTAGUnderlineStyle _),//Speedup
        """^(.*?)(\{toc(:.+?)?\})(.*)$$""".r("before","toc","range","following") -> ("ul",generateTOC _),
        "^(.*\\\\,)((?:\\-|\\*){3,}|(?:(?:\\-|\\*)\\x20){3,})(.*?)$$".r("before","line","following") -> ("hr",putHrTAG _),
-       "^(.*?)\\*\\*([^\\,]{1,64}?)\\*\\*(.*?)$$".r("before","inTAG","following") -> ("strong",surroundByGeneralTAG _),
-       "^(.*?)\\*([^\\,]{1,64}?)\\*(.*?)$$".r("before","inTAG","following") -> ("em",surroundByGeneralTAG _),
+       "^(.*?)\\*\\*([^\\,|\\s]{1,64}?)\\*\\*(.*?)$$".r("before","inTAG","following") -> ("strong",surroundByGeneralTAG _),
+       "^(.*?)\\*([^\\,|\\s]{1,64}?)\\*(.*?)$$".r("before","inTAG","following") -> ("em",surroundByGeneralTAG _),
        """^(.*?\\,)(%{1,6})\x20(.*?)(\\,.*?)$$""".r("before","hSize","inTAG","following") -> ("h", autoNumberingHeader _),
        """^(.*?\\,)(((?:\x20{4,}|\t+)(.*?\\,))+?)(.*?)$$""".r("before","seq","inTAG","midInTag","following") -> ("code",surroundByPreCodeTAG _)
        //late
@@ -1222,7 +1222,7 @@ class BQParser {
          val m = p findFirstMatchIn(doc)
          if(m != None){title = m.get.group(1)}
 
-         s"<${headTAG}>\n<${titleTAG}>${title}</${titleTAG}>\n</${headTAG}>"
+         s"<${headTAG}>\n<${titleTAG}>${title}</${titleTAG}>\n</${headTAG}>\n"
        }
 
        def preProcessors(doc:String) :String = {

diff --git a/src/main/scala/org/blackquill/engine/HTMLMap.scala b/src/main/scala/org/blackquill/engine/HTMLMap.scala
index 8c95aec..284aa0c 100644 (file)
--- a/src/main/scala/org/blackquill/engine/HTMLMap.scala
+++ b/src/main/scala/org/blackquill/engine/HTMLMap.scala
@@ -19,7 +19,7 @@ class HTMLMap{
 
   val BLOCKTags = Set(
     "address","blockquote","center","div","dl","fieldset","form","h1","h2","h3","h4","h5","h6",
-    "header","noframes","noscript","ol","p","pre","table","ul")
+    "header","noframes","noscript","ol","p","pre","script","table","ul")
 
   private val HTMLTag = LinkedHashMap[String,(List[String],(String)=>String)](
     "hr"->Tuple2(List("xx"),passThrough _),
@@ -121,8 +121,8 @@ class HTMLMap{
     }
     str
   }
-  
-  
+
+
   def specialCharConvert(text:List[String]):List[String] = {
     if(text.isEmpty){return text}
     var str = text.head

diff --git a/src/main/scala/org/blackquill/main/BlackQuill.scala b/src/main/scala/org/blackquill/main/BlackQuill.scala
index c20eda9..0e7bf67 100644 (file)
--- a/src/main/scala/org/blackquill/main/BlackQuill.scala
+++ b/src/main/scala/org/blackquill/main/BlackQuill.scala
@@ -17,7 +17,7 @@ import java.io.File
 object BlackQuill{
   private val log:Log = LogFactory.getLog(BlackQuill.getClass)
 
-  val VERSION = "0.1.5"
+  val VERSION = "0.1.6"
   val lastDate = "Augus 15 2013"
 
   val wiki = "https://www.setminami.net/BlackQuill/"
@@ -35,7 +35,6 @@ object BlackQuill{
     "...and  Markdown file's suffix is .md|.markdown|.txt|.bq|.BlackQuill\n" +
     "e.g., BlackQuill --force foo.md"
 
-
   val description = "Welcome to BlackQuill.\n" +
     "BQ switches=> \n" + options +
     "\nPlease see also... \n" +