nora_mark 0.2beta3 → 0.2beta4

data/spec/nora_mark_spec.rb

@@ -8,7 +8,7 @@ describe NoraMark do
   describe 'convert' do
     it 'should generate valid xhtml' do
       text = 'some text'
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       xhtml = Nokogiri::XML::Document.parse(noramark.html[0])
       expect(xhtml.root.name).to eq('html')
       expect(xhtml.root.namespaces['xmlns']).to eq('http://www.w3.org/1999/xhtml')
@@ -19,7 +19,7 @@ describe NoraMark do
     end
     it 'should convert simple paragraph' do
       text = "ここから、パラグラフがはじまります。\n「二行目です。」\n三行目です。\n\n\n ここから、次のパラグラフです。"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 2
@@ -38,7 +38,27 @@ describe NoraMark do
     end
     it 'should convert simple paragraph in english mode' do
       text = "paragraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
-      noramark = NoraMark::Document.parse(text, :lang => 'en', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'en', title: 'the title')
+      converted = noramark.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 english mode specified in frontmatter' do
+      text = "---\nlang: en\ntitle: the title\n---\nparagraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
+      noramark = NoraMark::Document.parse(text)
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 2
@@ -57,7 +77,26 @@ describe NoraMark do
 
     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."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title', :paragraph_style => :default)
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title', paragraph_style: :default)
+      converted = noramark.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 (using frontmatter)' do
+      text = "---\nlang: ja\ntitle: the title\nparagraph_style: default\n---\nparagraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title', paragraph_styl: :default)
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 2
@@ -76,7 +115,7 @@ describe NoraMark do
 
     it 'should convert paragraph with header' do
       text = "h1: タイトルです。\r\nここから、パラグラフがはじまります。\n\nh2.column:ふたつめの見出しです。\n ここから、次のパラグラフです。\nh3.third.foo: クラスが複数ある見出しです"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 5
@@ -97,7 +136,7 @@ describe NoraMark do
 
     it 'should convert div and paragraph' do
       text = "d {\n1st line. \n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the document title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the document title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -109,9 +148,10 @@ describe NoraMark do
       )
     end
 
+
     it 'should convert div without pgroup' do
-      text = "d(wo-pgroup) {\n1st line. \n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      text = "d('wo-pgroup') {\n1st line. \n}"
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -123,7 +163,7 @@ describe NoraMark do
 
     it 'should nest div without pgroup' do
       text = "d(wo-pgroup) {\nd {\nnested.\n} \n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -137,7 +177,7 @@ describe NoraMark do
 
     it 'should nest div without pgroup and with pgroup' do
       text = "d(wo-pgroup) {\nd {\nnested.\n} \n}\nd {\nin pgroup\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -157,7 +197,7 @@ describe NoraMark do
 
     it 'should convert div with class' do
       text = "d.preface-one {\n h1: title.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -169,7 +209,7 @@ describe NoraMark do
 
     it 'should convert div with id and class' do
       text = "d#thecontents.preface-one {\nh1: title.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -181,7 +221,7 @@ describe NoraMark do
 
     it 'should convert nested div' do
       text = "d.preface {\n outer div. \n d.nested {\n nested!\n}\nouter div again.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -203,7 +243,7 @@ describe NoraMark do
 
     it 'should convert article' do
       text = "art {\n in the article.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
@@ -217,7 +257,7 @@ describe NoraMark do
 
     it 'should convert article with other notation' do
       text = "arti {\n in the article.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
@@ -231,7 +271,7 @@ describe NoraMark do
 
     it 'should convert article with yet anther notation' do
       text = "article {\n in the article.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
@@ -245,7 +285,7 @@ describe NoraMark do
 
     it 'should convert section ' do
       text = "art {\nsec {\n section in the article. \n}\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -261,7 +301,7 @@ describe NoraMark do
 
     it 'should convert section with other notation' do
       text = "art {\nsect {\n section in the article. \n}\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -277,7 +317,7 @@ describe NoraMark do
 
     it 'should convert section with yet other notation' do
       text = "art {\nsection {\n section in the article. \n}\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -291,11 +331,9 @@ describe NoraMark do
      ) 
     end
 
-
-
     it 'should handle block image' do
-      text = "this is normal line.\nimage(./image1.jpg, alt text): caption text"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      text = "this is normal line.\nimage(./image1.jpg, \"alt text\"): caption text"
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -313,7 +351,7 @@ describe NoraMark 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"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -331,7 +369,7 @@ describe NoraMark do
 
     it 'should handle block image without caption' do
       text = "this is normal line.\nimage(./image1.jpg, alt text):"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -345,10 +383,10 @@ describe NoraMark do
        ]
       )      
     end
-    
+
     it 'should handle page change article' do
       text = "this is start.\nnewpage(page changed):\nthis is second page.\nnewpage:\nand the third."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       expect(converted.size).to eq 3
       body1 = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
@@ -379,7 +417,7 @@ describe NoraMark do
 
     it 'should handle stylesheets' do
       text = "d.styled {\n this is styled document.\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the document title', :stylesheets => ['reset.css', 'mystyle.css'])
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the document title', stylesheets: ['reset.css', 'mystyle.css'])
       converted = noramark.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']
@@ -389,7 +427,7 @@ describe NoraMark do
 
     it 'should handle link' do
       text = " link to [link(http://github.com/skoji/noramark){noramark repository}]. \ncan you see this?"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -406,7 +444,7 @@ describe NoraMark do
 
     it 'should handle link with l' do
       text = "link to [l(http://github.com/skoji/noramark){noramark repository}]. \ncan you see this?"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -423,7 +461,7 @@ describe NoraMark do
 
     it 'should handle custom paragraph' do
       text = "this is normal line.\np.custom: this text is in custom class."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -436,7 +474,7 @@ describe NoraMark do
 
     it 'should handle span' do
       text = "p.custom: this text is in [s.keyword{custom}] class."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -448,7 +486,7 @@ describe NoraMark do
 
     it 'should handle any block' do
       text = "this is normal line.\ncite {\n this block should be in cite. \n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -467,7 +505,7 @@ describe NoraMark do
 
     it 'should handle inline image' do
       text = "simple image [img(./image1.jpg, alt)]."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -479,7 +517,7 @@ describe NoraMark do
 
     it 'should handle any inline' do
       text = "should be [strong{marked as strong}]."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -490,7 +528,7 @@ describe NoraMark do
 
     it 'should convert inline command within line block' do
       text = "h1: [tcy{20}]縦中横タイトル"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.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'], '縦中横タイトル']
@@ -498,7 +536,7 @@ describe NoraMark do
 
     it 'should handle ruby' do
       text = "[ruby(とんぼ){蜻蛉}]の[ruby(めがね){眼鏡}]はみずいろめがね"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.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', 
@@ -510,7 +548,7 @@ describe NoraMark do
 
     it 'should handle tatechuyoko' do
       text = "[tcy{10}]年前のことだった"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -521,7 +559,7 @@ describe NoraMark 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."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 3
@@ -543,7 +581,7 @@ describe NoraMark 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."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 3
@@ -565,7 +603,7 @@ describe NoraMark 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."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 3
@@ -585,9 +623,31 @@ describe NoraMark do
         ])
     end
 
+    it 'should handle long definition list ' do
+      text = "this is normal line.\n;: 1st {\n this is the first definition\n}\n;: 2nd { \nblah :blah.\n}\n;: 3rd{\n this term is the last.\n}\nthe list ends."
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
+      converted = noramark.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(
+        ['div.pgroup', 
+         ['p', 'this is normal line.']
+        ])
+      expect(body.element_children[1].selector_and_children).to eq(
+        ['dl', 
+         ['dt', '1st'],['dd', ['div.pgroup', ['p', 'this is the first definition']]],
+         ['dt', '2nd'],['dd', ['div.pgroup', ['p', 'blah :blah.']]],
+         ['dt', '3rd'],['dd', ['div.pgroup', ['p', 'this term is the last.']]]
+        ])
+      expect(body.element_children[2].selector_and_children).to eq(
+        ['div.pgroup', 
+         ['p', 'the list ends.']
+        ])
+    end
+
     it 'should escape html' do
       text = ";:definition<div>:</div>&"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children[0].selector_and_children).to eq(
@@ -597,8 +657,14 @@ describe NoraMark do
     end
 
     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."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the document title')
+      text = <<EOF
+---
+stylesheets: [ css/default.css, css/specific.css, [ css/iphone.css, 'only screen and (min-device-width : 320px) and (max-device-width : 480px)']]
+---
+text.
+
+EOF
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the document title')
       converted = noramark.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']
@@ -614,8 +680,8 @@ describe NoraMark do
     end
 
     it 'should specify title' do
-      text = "title:the title of the book in the text.\n\ntext."
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      text = "---\ntitle: the title of the book in the text.\n---\n\ntext."
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.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.']
@@ -628,8 +694,8 @@ describe NoraMark do
     end
 
     it 'should specify title on each page' do
-      text = "title:page1\n\n1st page.\nnewpage:\ntitle:page2\nh1:2nd page"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title', :paragraph_style => :use_paragraph_group)
+      text = "---\ntitle: page1\n---\n\n1st page.\nnewpage:\n---\ntitle: page2\n---\nh1:2nd page"
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title', paragraph_style: :use_paragraph_group)
       converted = noramark.html
       # 1st page
       head = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:head')
@@ -649,8 +715,8 @@ describe NoraMark do
 
 
     it 'should ignore comments' do
-      text = "# この行はコメントです\nここから、パラグラフがはじまります。\n # これもコメント\n「二行目です。」\n三行目です。\n\n# これもコメント\n\n ここから、次のパラグラフです。"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      text = "# この行はコメントです\nここから、パラグラフがはじまります。\n # これもコメント\n「二行目です。」\n三行目です。\n\n# これもコメント\n\n ここから、次のパラグラフです。\n#最後のコメントです"
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
       expect(body.element_children.size).to eq 2
@@ -671,7 +737,7 @@ describe NoraMark do
 
     it 'should handle preprocessor' do
       text = "pre-preprocess text"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title') do
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title') do
         |nora|
         nora.preprocessor do
           |text|
@@ -688,8 +754,8 @@ describe NoraMark do
     end
 
     it 'should convert h1 in article after title' do
-      text = "stylesheets: css/default.css\ntitle: foo\narticle.atogaki {\n\nh1: あとがき。\n\natogaki\n}"
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      text = "---\nstylesheets: css/default.css\ntitle: foo\n---\narticle.atogaki {\n\nh1: あとがき。\n\natogaki\n}"
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
      expect(body.element_children[0].selector_and_children).to eq(
@@ -703,31 +769,32 @@ describe NoraMark do
     it 'should convert preformatted text' do
       text = <<EOF
 normal line.
-pre <<END
+  pre {//
 d {
    this will not converted to div or p or pgroup.
 line_command: this will be not converted too.
 }
-END
+  //}
 EOF
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.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
+code {//
 d {
    this will not converted to div or p or pgroup.
 line_command: this will be not converted too.
 }
-END
+//}
 normal line again.
 EOF
-      noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.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."]])
@@ -735,28 +802,89 @@ EOF
       expect(body.element_children[2].selector_and_children).to eq(["div.pgroup", ["p", "normal line again."]])
     end
 
+    it 'should convert preformatted code with language' do
+      text = <<EOF
+normal line.
+code {//ruby
+# ruby code example.
+"Hello, World".split(',').map(&:strip).map(&:to_sym) # => [:Hello, :World]
+//}
+normal line again.
+EOF
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
+      converted = noramark.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-ruby[data-code-language='ruby']", ["code", "# ruby code example.\n\"Hello, World\".split(',').map(&:strip).map(&:to_sym) # => [:Hello, :World]"]])
+      expect(body.element_children[2].selector_and_children).to eq(["div.pgroup", ["p", "normal line again."]])
+    end
+
+    it 'should convert preformatted text (simple notation)' do
+      text = <<EOF
+normal line.
+pre {
+this [l(link){link}] will not be converted.
+line_command: this will be not converted too.
+}
+normal line again.
+EOF
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
+      converted = noramark.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", "this [l(link){link}] will not be converted.\nline_command: this will be not converted too."])
+      expect(body.element_children[2].selector_and_children).to eq(["div.pgroup", ["p", "normal line again."]])
+    end
+    it 'should convert preformatted code (simple notation)' do
+      text = <<EOF
+normal line.
+code {
+line_command: this will be not converted too.
+}
+normal line again.
+EOF
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
+      converted = noramark.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", "line_command: this will be not converted too."]])
+      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 { NoraMark::Document.parse(text, :lang => 'ja', :title => 'foo') }.to raise_error KPeg::CompiledParser::ParseError
+      expect { NoraMark::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これは、セクションの中です。"
-        noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        text = "=: タイトル です。\r\n\r\nこれは、セクションの中です。"
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
         converted = noramark.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', 'タイトルです。'],
+          ['h1', 'タイトル です。'],
           ['div.pgroup', 
            ['p', 'これは、セクションの中です。']]]
       )
       end
+      it 'should convert markdown style heading with empty body' do
+        text = "=: タイトルです。\n==: 次のタイトルです。これから書きます。"
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
+        converted = noramark.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', 'タイトルです。'],
+         ['section',
+          ['h2', '次のタイトルです。これから書きます。']]])
+      end
       it 'should markdown style heading interrupted by other headed section' do
         text = "=: タイトルです。\r\nこれは、セクションの中です。\n =: また次のセクションです。\n次のセクションの中です。"
-        noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
         converted = noramark.html
         body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
         expect(body.element_children.size).to eq 2
@@ -774,7 +902,7 @@ EOF
       end
       it 'should markdown style heading not interrupted by other explicit section' do
         text = "=: タイトルです。\r\nこれは、セクションの中です。\n section {\n h2: また次のセクションです。\n入れ子になります。\n}\nこのように。"
-        noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
         converted = noramark.html
         body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
         expect(body.element_children.size).to eq 1
@@ -793,7 +921,7 @@ EOF
       end
       it 'should markdown style heading not interrupted by smaller section' do
         text = "=: タイトルです。\r\nこれは、セクションの中です。\n ==: また次のセクションです。\n 入れ子になります。\n===: さらに中のセクション \nさらに入れ子になっているはず。\n=:ここで次のセクションです。\n脱出しているはずです。"
-        noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
         converted = noramark.html
         body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
         expect(body.element_children.size).to eq 2
@@ -818,23 +946,56 @@ EOF
 
       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"
-        noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the title')
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
         noramark.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"
-        noramark = NoraMark::Document.parse(text, :lang => 'ja', :title => 'the document title', filename_base: 'nora-test-file', sequence_format: '%03d' )
+        noramark = NoraMark::Document.parse(text, lang: 'ja', title:'the document title', document_name: 'nora-test-file', sequence_format: '%03d' )
         noramark.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
+    describe 'parse and create manual' do
+      before {
+        @here = File.dirname(__FILE__)
+        @basedir = File.join(File.dirname(__FILE__), 'created_files') 
+        @exampledir = File.join(@here, '..', 'example')
+      }
+      after { Dir.glob(File.join(@basedir, '*.xhtml')) { |file| File.delete file } }
+      it 'should create valid html5' do
+        noramark = NoraMark::Document.parse(File.open(File.join(@exampledir, 'noramark-reference-ja.nora')).read, document_name: 'noramark-reference-ja')
+        noramark.html.write_as_files(directory: @exampledir)
+        jar = File.join(@here, 'jing-20091111/bin/jing.jar')
+        schema = File.join(@here, 'epub30-schemas/epub-xhtml-30.rnc')
+        original_file = File.join(@exampledir, 'noramark-reference-ja_00001.xhtml')
+        file_to_validate = File.join(@basedir, 'noramark-reference-ja_00001.xhtml')
+        File.open(original_file) do
+          |original|
+          nokogiri_doc = Nokogiri::XML::Document.parse(original)
+          set = nokogiri_doc.xpath('//xmlns:pre[@data-code-language]')
+          set.remove_attr('data-code-language')
+          File.open(file_to_validate, 'w+') do
+            |to_validate|
+            to_validate << nokogiri_doc.to_s
+          end
+        end
+
+        @stdout = capture(:stdout) do 
+          puts %x(java -jar #{jar} -c #{schema} #{file_to_validate})
+        end
+        expect(@stdout.strip).to eq ""
+      end
+    end
   end
 end
+