bug fix

diff --git a/.cache b/.cache
index 6b9d49b..dd32422 100644 (file)
Binary files a/.cache and b/.cache differ

diff --git a/mdTest/test16.html b/mdTest/test16.html
index 27b82c7..cc5a3f8 100644 (file)
--- a/mdTest/test16.html
+++ b/mdTest/test16.html
@@ -52,7 +52,7 @@
 <h2 id="2:aaa:21">aaa</h2>
 <h2 id="foo">aaa</h2>
 <p>aaaaaaa <math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mn>1</mn><mo>+</mo><mn>2</mn></mrow><annotation encoding="SnuggleTeX">$1+2 $</annotation></semantics></math> bbbbbbbb</p>
-<p><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>A</mi><mo>=</mo><mfrac><mrow><mi>&alpha;</mi><mo>+</mo><mi>&beta;</mi></mrow><mrow><mi>&gamma;</mi><mo>+</mo><mi>&delta;</mi></mrow></mfrac></mrow><annotation encoding="SnuggleTeX">$ A = \frac{\alpha + \beta}{\gamma + \delta} $</annotation></semantics></math></p>
+<p><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>A</mi><mo>=</mo><mfrac><mrow><mi>?</mi><mo>+</mo><mi>?</mi></mrow><mrow><mi>?</mi><mo>+</mo><mi>?</mi></mrow></mfrac></mrow><annotation encoding="SnuggleTeX">$ A = \frac{\alpha + \beta}{\gamma + \delta} $</annotation></semantics></math></p>
 <p>aaaaaaaaaaaaa</p>
 <h2 id="2:1. &rarr; 1:28">1. &rarr; 1</h2>
 <h2 id="2:2. &rarr; 2:29">2. &rarr; 2</h2>

diff --git a/src/main/scala/org/blackquill/engine/BQParser.scala b/src/main/scala/org/blackquill/engine/BQParser.scala
index dd4ab73..1171d1d 100644 (file)
--- a/src/main/scala/org/blackquill/engine/BQParser.scala
+++ b/src/main/scala/org/blackquill/engine/BQParser.scala
@@ -204,10 +204,10 @@ class BQParser {
        }
 
        private def autoNumberSetting(doc:String):String = {
-               val p = """^(.*?)(\{nrange(:h?\d?\-h?\d?)?\})(.*?)$$""".r
+               val p = """^(.*)(\{nrange(:h?\d?\-h?\d?)?\})(.*)$$""".r
                val m = p findFirstMatchIn(doc)
                if(m != None){
-                       lazy val ret = m.get.group(1) + m.get.group(4)
+                       val ret = m.get.group(1) + m.get.group(4)
                        if(Option(m.get.group(3)) != None){
                                val p2 = """:(h?(\d)?\-h?(\d)?)""".r
                                val m2 = p2 findFirstMatchIn(m.get.group(3))
@@ -220,7 +220,7 @@ class BQParser {
                                                m2.get.group(3).toInt
                                        }else{6}
                                        nRange = (start,end)
-                                       ret
+                                       return ret
                                }else{
                                        return ret
                                }