arti_mark 0.1.beta3 → 0.1.beta5

data/lib/arti_mark/version.rb

@@ -1,3 +1,3 @@
 module ArtiMark
-  VERSION = "0.1.beta3"
+  VERSION = "0.1.beta5"
 end

data/spec/arti_mark_spec.rb

@@ -8,8 +8,8 @@ describe ArtiMark do
   describe 'convert' do
     it 'should generate valid xhtml' do
       text = 'some text'
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the title')
-      xhtml = Nokogiri::XML::Document.parse(artimark.convert(text)[0])
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      xhtml = Nokogiri::XML::Document.parse(artimark.html[0])
       expect(xhtml.root.name).to eq('html')
       expect(xhtml.root.namespaces['xmlns']).to eq('http://www.w3.org/1999/xhtml')
       expect(xhtml.root['xml:lang']).to eq('ja')
@@ -19,8 +19,8 @@ describe ArtiMark do
     end
     it 'should convert simple paragraph' do
       text = "ここから、パラグラフがはじまります。\n「二行目です。」\n三行目です。\n\n\n ここから、次のパラグラフです。"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 2
       expect(body.element_children[0].selector_and_children).to eq(
@@ -36,10 +36,48 @@ describe ArtiMark do
           ['p', 'ここから、次のパラグラフです。']]
       )
     end
+    it 'should convert simple paragraph in english mode' do
+      text = "paragraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
+      artimark = ArtiMark::Document.parse(text, :lang => 'en', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children.size).to eq 2
+      expect(body.element_children[0].selector_and_children).to eq(
+        ['p', 
+         'paragraph begins.', ['br', ''],
+         '2nd line.', ['br', ''],
+         '3rd line.'
+        ]
+      )
+
+      expect(body.element_children[1].selector_and_children).to eq(
+        ['p', 'next paragraph.']
+      )
+    end
+
+    it 'should convert simple paragraph in japanese mode, but paragraph mode is default' do
+      text = "paragraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title', :paragraph_style => :default)
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children.size).to eq 2
+      expect(body.element_children[0].selector_and_children).to eq(
+        ['p', 
+         'paragraph begins.', ['br', ''],
+         '2nd line.', ['br', ''],
+         '3rd line.'
+        ]
+      )
+
+      expect(body.element_children[1].selector_and_children).to eq(
+        ['p', 'next paragraph.']
+      )
+    end
+
     it 'should convert paragraph with header' do
       text = "h1: タイトルです。\r\nここから、パラグラフがはじまります。\n\nh2.column:ふたつめの見出しです。\n ここから、次のパラグラフです。\nh3.third.foo: クラスが複数ある見出しです"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 5
       expect(body.element_children[0].a).to eq ['h1', 'タイトルです。']
@@ -59,8 +97,8 @@ describe ArtiMark do
 
     it 'should convert div and paragraph' do
       text = "d {\n1st line. \n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the document title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div',
@@ -73,8 +111,8 @@ describe ArtiMark do
 
     it 'should convert div without pgroup' do
       text = "d(wo-pgroup) {\n1st line. \n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div',
@@ -85,8 +123,8 @@ describe ArtiMark do
 
     it 'should nest div without pgroup' do
       text = "d(wo-pgroup) {\nd {\nnested.\n} \n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div',
@@ -99,8 +137,8 @@ describe ArtiMark do
 
     it 'should nest div without pgroup and with pgroup' do
       text = "d(wo-pgroup) {\nd {\nnested.\n} \n}\nd {\nin pgroup\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div',
@@ -119,8 +157,8 @@ describe ArtiMark do
 
     it 'should convert div with class' do
       text = "d.preface-one {\n h1: title.\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.preface-one',
@@ -131,8 +169,8 @@ describe ArtiMark do
 
     it 'should convert div with id and class' do
       text = "d#thecontents.preface-one {\nh1: title.\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div#thecontents.preface-one',
@@ -143,8 +181,8 @@ describe ArtiMark do
 
     it 'should convert nested div' do
       text = "d.preface {\n outer div. \n d.nested {\n nested!\n}\nouter div again.\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.preface',
@@ -165,8 +203,8 @@ describe ArtiMark do
 
     it 'should convert article' do
       text = "art {\n in the article.\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
       ['article',
@@ -179,8 +217,22 @@ describe ArtiMark do
 
     it 'should convert article with other notation' do
       text = "arti {\n in the article.\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+     expect(body.element_children[0].selector_and_children).to eq(
+      ['article',
+       ['div.pgroup',
+        ['p', 'in the article.']
+       ]
+      ]
+     ) 
+    end
+
+    it 'should convert article with yet anther notation' do
+      text = "article {\n in the article.\n}"
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
       ['article',
@@ -191,11 +243,60 @@ describe ArtiMark do
      ) 
     end
 
+    it 'should convert section ' do
+      text = "art {\nsec {\n section in the article. \n}\n}"
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+      ['article',
+       ['section',
+       ['div.pgroup',
+        ['p', 'section in the article.']
+       ]
+       ]
+      ]
+     ) 
+    end
+
+    it 'should convert section with other notation' do
+      text = "art {\nsect {\n section in the article. \n}\n}"
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+      ['article',
+       ['section',
+       ['div.pgroup',
+        ['p', 'section in the article.']
+       ]
+       ]
+      ]
+     ) 
+    end
+
+    it 'should convert section with yet other notation' do
+      text = "art {\nsection {\n section in the article. \n}\n}"
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+      ['article',
+       ['section',
+       ['div.pgroup',
+        ['p', 'section in the article.']
+       ]
+       ]
+      ]
+     ) 
+    end
+
+
 
     it 'should handle block image' do
       text = "this is normal line.\nimage(./image1.jpg, alt text): caption text"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
        ['div.pgroup',
@@ -212,8 +313,8 @@ describe ArtiMark do
 
     it 'should handle block image with before caption' do
       text = "this is normal line.\nimage(./image1.jpg, alt text, caption_before: true): caption text"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
        ['div.pgroup',
@@ -230,8 +331,8 @@ describe ArtiMark do
 
     it 'should handle block image without caption' do
       text = "this is normal line.\nimage(./image1.jpg, alt text):"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
        ['div.pgroup',
@@ -247,8 +348,8 @@ describe ArtiMark do
     
     it 'should handle page change article' do
       text = "this is start.\nnewpage(page changed):\nthis is second page.\nnewpage:\nand the third."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       expect(converted.size).to eq 3
       body1 = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body1.element_children[0].selector_and_children).to eq(
@@ -278,8 +379,8 @@ describe ArtiMark do
 
     it 'should handle stylesheets' do
       text = "d.styled {\n this is styled document.\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title', :stylesheets => ['reset.css', 'mystyle.css'])
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the document title', :stylesheets => ['reset.css', 'mystyle.css'])
+      converted = artimark.html
       head = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:head')
       expect(head.element_children[0].a).to eq ['title', 'the document title']
       expect(head.element_children[1].a).to eq ["link[rel='stylesheet'][type='text/css'][href='reset.css']", '']
@@ -288,8 +389,8 @@ describe ArtiMark do
 
     it 'should handle link' do
       text = " link to [link(http://github.com/skoji/artimark){artimark repository}]. \ncan you see this?"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
       ['div.pgroup',
@@ -305,8 +406,8 @@ describe ArtiMark do
 
     it 'should handle link with l' do
       text = "link to [l(http://github.com/skoji/artimark){artimark repository}]. \ncan you see this?"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
       ['div.pgroup',
@@ -322,8 +423,8 @@ describe ArtiMark do
 
     it 'should handle custom paragraph' do
       text = "this is normal line.\np.custom: this text is in custom class."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
       ['div.pgroup',
@@ -335,8 +436,8 @@ describe ArtiMark do
 
     it 'should handle span' do
       text = "p.custom: this text is in [s.keyword{custom}] class."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.pgroup',
@@ -347,8 +448,8 @@ describe ArtiMark do
 
     it 'should handle any block' do
       text = "this is normal line.\ncite {\n this block should be in cite. \n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.pgroup',
@@ -366,8 +467,8 @@ describe ArtiMark do
 
     it 'should handle inline image' do
       text = "simple image [img(./image1.jpg, alt)]."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.pgroup',
@@ -378,8 +479,8 @@ describe ArtiMark do
 
     it 'should handle any inline' do
       text = "should be [strong{marked as strong}]."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
       ['div.pgroup',
@@ -389,16 +490,16 @@ describe ArtiMark do
 
     it 'should convert inline command within line block' do
       text = "h1: [tcy{20}]縦中横タイトル"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq ['h1', ['span.tcy', '20'], '縦中横タイトル']
     end
 
     it 'should handle ruby' do
       text = "[ruby(とんぼ){蜻蛉}]の[ruby(めがね){眼鏡}]はみずいろめがね"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq ['div.pgroup', ['p', 
          ['ruby', '蜻蛉', ['rp','('],['rt','とんぼ'],['rp', ')']],
@@ -409,8 +510,8 @@ describe ArtiMark do
 
     it 'should handle tatechuyoko' do
       text = "[tcy{10}]年前のことだった"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.pgroup', 
@@ -420,8 +521,8 @@ describe ArtiMark do
 
     it 'should handle ordered list ' do
       text = "this is normal line.\n1: for the 1st.\n2: secondly, blah.\n3: and last...\nthe ordered list ends."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 3
       expect(body.element_children[0].selector_and_children).to eq(
@@ -442,8 +543,8 @@ describe ArtiMark do
 
     it 'should handle unordered list ' do
       text = "this is normal line.\n*: for the 1st.\n*: secondly, blah.\n*: and last...\nthe ordered list ends."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 3
       expect(body.element_children[0].selector_and_children).to eq(
@@ -464,8 +565,8 @@ describe ArtiMark do
 
     it 'should handle definition list ' do
       text = "this is normal line.\n;: 1st : this is the first definition\n;: 2nd : blah :blah.\n;: 3rd: this term is the last.\nthe list ends."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 3
       expect(body.element_children[0].selector_and_children).to eq(
@@ -486,8 +587,8 @@ describe ArtiMark do
 
     it 'should escape html' do
       text = ";:definition<div>:</div>&"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['dl', 
@@ -497,8 +598,8 @@ describe ArtiMark do
 
     it 'should specify stylesheets' do
       text = "stylesheets:css/default.css, css/specific.css, css/iphone.css:(only screen and (min-device-width : 320px) and (max-device-width : 480px))\n\ntext."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the document title')
+      converted = artimark.html
       head = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:head')
       expect(head.element_children[0].a).to eq ['title', 'the document title']
       expect(head.element_children[1].a).to eq ["link[rel='stylesheet'][type='text/css'][href='css/default.css']", '']
@@ -514,25 +615,43 @@ describe ArtiMark do
 
     it 'should specify title' do
       text = "title:the title of the book in the text.\n\ntext."
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       head = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:head')
       expect(head.element_children[0].a).to eq ['title', 'the title of the book in the text.']
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+        ['div.pgroup',
+          ['p',
+            'text.']])
+
     end
 
-    it 'should specify lang' do
-      text = "lang:ja\n\n日本語 text."
-      artimark = ArtiMark::Document.new(:lang => 'en', :title => 'the document title')
-      converted = artimark.convert(text)
-      root = Nokogiri::XML::Document.parse(converted[0]).root
-      expect(root['lang']).to eq 'ja'
+    it 'should specify title on each page' do
+      text = "title:page1\n\n1st page.\nnewpage:\ntitle:page2\nh1:2nd page"
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title', :paragraph_style => :use_paragraph_group)
+      converted = artimark.html
+      # 1st page
+      head = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:head')
+      expect(head.element_children[0].a).to eq ['title', 'page1']
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+        ['div.pgroup',
+          ['p',
+            '1st page.']])
+      # 2nd page
+      head = Nokogiri::XML::Document.parse(converted[1]).root.at_xpath('xmlns:head')
+      expect(head.element_children[0].a).to eq ['title', 'page2']
+      body = Nokogiri::XML::Document.parse(converted[1]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+        ['h1',"2nd page"])
     end
 
 
     it 'should ignore comments' do
-      text = "#この行はコメントです\nここから、パラグラフがはじまります。\n#これもコメント\n「二行目です。」\n三行目です。\n\n#これもコメント\n\n ここから、次のパラグラフです。"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      text = "# この行はコメントです\nここから、パラグラフがはじまります。\n # これもコメント\n「二行目です。」\n三行目です。\n\n# これもコメント\n\n ここから、次のパラグラフです。"
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 2
 
@@ -552,12 +671,14 @@ describe ArtiMark do
 
     it 'should handle preprocessor' do
       text = "pre-preprocess text"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      artimark.preprocessor do
-        |text|
-        text.gsub('pre-preprocess', 'post-process')
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title') do
+        |arti|
+        arti.preprocessor do
+          |text|
+          text.gsub('pre-preprocess', 'post-process')
+        end
       end
-      converted = artimark.convert(text)
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
         ['div.pgroup', 
@@ -568,8 +689,8 @@ describe ArtiMark do
 
     it 'should convert h1 in article after title' do
       text = "stylesheets: css/default.css\ntitle: foo\narticle.atogaki {\n\nh1: あとがき。\n\natogaki\n}"
-      artimark = ArtiMark::Document.new(:lang => 'ja', :title => 'the document title')
-      converted = artimark.convert(text)
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
 ["article.atogaki",
@@ -579,6 +700,141 @@ describe ArtiMark do
      ) 
     end
 
+    it 'should convert preformatted text' do
+      text = <<EOF
+normal line.
+pre <<END
+d {
+   this will not converted to div or p or pgroup.
+line_command: this will be not converted too.
+}
+END
+EOF
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(["div.pgroup", ["p", "normal line."]])
+      expect(body.element_children[1].selector_and_children).to eq(["pre", "d {\n   this will not converted to div or p or pgroup.\nline_command: this will be not converted too.\n}"])
+    end
+    it 'should convert preformatted code' do
+      text = <<EOF
+normal line.
+precode <<END
+d {
+   this will not converted to div or p or pgroup.
+line_command: this will be not converted too.
+}
+END
+normal line again.
+EOF
+      artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      converted = artimark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(["div.pgroup", ["p", "normal line."]])
+      expect(body.element_children[1].selector_and_children).to eq(["pre", ["code", "d {\n   this will not converted to div or p or pgroup.\nline_command: this will be not converted too.\n}"]])
+      expect(body.element_children[2].selector_and_children).to eq(["div.pgroup", ["p", "normal line again."]])
+    end
+
+    it 'should raise error' do
+      text = "d {\n block is\nd {\n nested but\nd {\n not terminated }"
+      expect { ArtiMark::Document.parse(text, :lang => 'ja', :title => 'foo') }.to raise_error KPeg::CompiledParser::ParseError
+    end
+
+    describe 'markdown style' do
+      it 'should convert markdown style heading' do
+        text = "=: タイトルです。\r\nこれは、セクションの中です。"
+        artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        converted = artimark.html
+        body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children.size).to eq 1
+        expect(body.element_children[0].selector_and_children).to eq(
+        ['section',
+          ['h1', 'タイトルです。'],
+          ['div.pgroup', 
+           ['p', 'これは、セクションの中です。']]]
+      )
+      end
+      it 'should markdown style heading interrupted by other headed section' do
+        text = "=: タイトルです。\r\nこれは、セクションの中です。\n =: また次のセクションです。\n次のセクションの中です。"
+        artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        converted = artimark.html
+        body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children.size).to eq 2
+        expect(body.element_children[0].selector_and_children).to eq(
+        ['section',
+          ['h1', 'タイトルです。'],
+          ['div.pgroup', 
+           ['p', 'これは、セクションの中です。']]])
+        expect(body.element_children[1].selector_and_children).to eq(
+        ['section',
+          ['h1', 'また次のセクションです。'],
+          ['div.pgroup', 
+           ['p', '次のセクションの中です。']]]
+      )
+      end
+      it 'should markdown style heading not interrupted by other explicit section' do
+        text = "=: タイトルです。\r\nこれは、セクションの中です。\n section {\n h2: また次のセクションです。\n入れ子になります。\n}\nこのように。"
+        artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        converted = artimark.html
+        body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children.size).to eq 1
+        expect(body.element_children[0].selector_and_children).to eq(
+        ['section',
+          ['h1', 'タイトルです。'],
+          ['div.pgroup', 
+           ['p', 'これは、セクションの中です。']],
+           ['section',
+             ['h2', 'また次のセクションです。'],
+             ['div.pgroup', 
+              ['p', '入れ子になります。']]],
+          ['div.pgroup', 
+           ['p', 'このように。']]]
+      )
+      end
+      it 'should markdown style heading not interrupted by smaller section' do
+        text = "=: タイトルです。\r\nこれは、セクションの中です。\n ==: また次のセクションです。\n 入れ子になります。\n===: さらに中のセクション \nさらに入れ子になっているはず。\n=:ここで次のセクションです。\n脱出しているはずです。"
+        artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        converted = artimark.html
+        body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children.size).to eq 2
+        expect(body.element_children[0].selector_and_children).to eq(
+        ['section',
+          ['h1', 'タイトルです。'],
+          ['div.pgroup', 
+           ['p', 'これは、セクションの中です。']],
+           ['section',
+             ['h2', 'また次のセクションです。'],
+             ['div.pgroup', 
+              ['p', '入れ子になります。']],
+            ['section',
+             ['h3', 'さらに中のセクション'],
+             ['div.pgroup', 
+              ['p', 'さらに入れ子になっているはず。']]]]] )
+        expect(body.element_children[1].selector_and_children).to eq(
+        ['section',
+          ['h1', 'ここで次のセクションです。'],
+          ['div.pgroup', 
+           ['p', '脱出しているはずです。']]])
 
+      end
+    end
+    describe 'create file' do
+      before { @basedir = File.join(File.dirname(__FILE__), 'created_files') }
+      after { Dir.glob(File.join(@basedir, '*.xhtml')) { |file| File.delete file } }
+      it 'should create default file' do
+        text = "some text"
+        artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        artimark.html.write_as_files(directory: @basedir)
+        expect(File.basename(Dir.glob(File.join(@basedir, '*.xhtml'))[0])).to match /noramark_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}_00001.xhtml/
+      end
+      it 'should create named file' do
+        text = "some text\nnewpage:\nnext page"
+        artimark = ArtiMark::Document.parse(text, :lang => 'ja', :title => 'the document title', filename_base: 'nora-test-file', sequence_format: '%03d' )
+        artimark.html.write_as_files(directory: @basedir)
+        files = Dir.glob(File.join(@basedir, '*.xhtml'))
+        expect(File.basename(files[0])).to eq 'nora-test-file_001.xhtml'
+        expect(File.basename(files[1])).to eq 'nora-test-file_002.xhtml'
+      end
+    end
   end
 end