nora_mark 0.2beta13 → 0.2beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beaac139078706a425464ffe4808407b65fb0c4a
-  data.tar.gz: 2fe396e897a4e1ab00a4bbe5440e5c81177e4d55
+  metadata.gz: 76d472396b1e19fe29839504931e2a0bf98232c9
+  data.tar.gz: de110cb90daac76340084bec401ac96178586911
 SHA512:
-  metadata.gz: ffea896a52306f5f375561c28ba9c386dd0b9862caacc23ff6a4dc548654b52e1523af0727965d450f03c478634ec955bbd7babaeacaed26bf5c8d7abe4a294b
-  data.tar.gz: 995d5952fed0f74b682857473920847b3286c227fc41d37e6bca73df02ca31c053a96bba75fd3fefe46efdc75d1045a5544e62e7b4ba860afeedcfd72ba7edc8
+  metadata.gz: c763fb0bdb6865ae5eba947996575f393ebad661b7911f6995e24b66d4141d7ef77845e18120fd45849cf3728c8e6b635716625ef4a76402efcb1b9194bd4996
+  data.tar.gz: b398c5108846f929f5e963ddcd0d627cc7d300d3c6da03a4d1dcbcd1b99433d4fb3f4c8694ffb56d999fe0ae7ce5893ced967f1a2f032808d9bda37a78c72d57

data/bin/nora2html

@@ -8,8 +8,21 @@ opt.on('--kconv') {
   auto_convert_encode = true
 }
 
-args = opt.parse(ARGV)
+opt.parse(ARGV)
+
+transformer_name = File.join(
+                          File.dirname(ARGV[0]),
+                          File.basename(ARGV[0], '.txt') + '-transform.rb') if !ARGV[0].nil?
+
+if !transformer_name.nil? and File.exist? transformer_name
+  transformer = File.open(transformer_name).read
+end
+
 input = ARGF.read
 input = Kconv.toutf8(input) if auto_convert_encode
 
-puts NoraMark::Document::parse(input).render_parameter(nonpaged: true).html[0]
+doc =  NoraMark::Document::parse(input)
+
+doc.add_transformer(text: transformer) unless transformer.nil?
+
+puts doc.render_parameter(nonpaged: true).html[0]

data/example/noramark-reference-ja_00001.xhtml

@@ -24,7 +24,7 @@
 <section><h3 id='heading_index_4'>Gemfile</h3>
 <div class='pgroup'><p>Gemfileに次のように書きます</p>
 </div>
-<pre><code>gem 'nora_mark' </code>
+<pre><code>gem &#39;nora_mark&#39; </code>
 </pre>
 <div class='pgroup'><p>そして、</p>
 </div>
@@ -48,9 +48,9 @@
 </div>
 </section>
 <section><h3 id='heading_index_8'>コードから</h3>
-<pre class='code-ruby' data-code-language='ruby'><code>require 'nora_mark'
+<pre class='code-ruby' data-code-language='ruby'><code>require &#39;nora_mark&#39;
 
-document = NoraMark::Document.parse(string_or_io, lang: 'ja')
+document = NoraMark::Document.parse(string_or_io, lang: &#39;ja&#39;)
 document.html.write_as_files</code>
 </pre>
 </section>
@@ -60,9 +60,9 @@ document.html.write_as_files</code>
 <ol><li>normark-mode.elをEmacsのload-pathが通った場所に配置してください。</li>
 <li><code>~/.emacs.d/init.el</code>に次の記述をしてください。</li>
 </ol>
-<pre class='code-emacs-lisp' data-code-language='emacs-lisp'><code>(require 'noramark-mode)
-(setq auto-mode-alist (cons '(&quot;\\.nora$&quot; . noramark-mode) auto-mode-alist))
-(setq auto-mode-alist (cons '(&quot;-nora\\.txt$&quot; . noramark-mode) auto-mode-alist))</code>
+<pre class='code-emacs-lisp' data-code-language='emacs-lisp'><code>(require &#39;noramark-mode)
+(setq auto-mode-alist (cons &#39;(&quot;\\.nora$&quot; . noramark-mode) auto-mode-alist))
+(setq auto-mode-alist (cons &#39;(&quot;-nora\\.txt$&quot; . noramark-mode) auto-mode-alist))</code>
 </pre>
 </section>
 </section>
@@ -79,18 +79,18 @@ document.html.write_as_files</code>
 ふと気が付いて見ると書生はいない。たくさんおった兄弟が一疋ぴきも見えぬ。</pre>
 </div>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;div class='pgroup'&gt;
+<pre class='code-html' data-code-language='html'><code>&lt;div class=&#39;pgroup&#39;&gt;
 &lt;p&gt;吾輩は猫である。名前はまだ無い。&lt;/p&gt;
 &lt;p&gt;どこで生れたかとんと見当けんとうがつかぬ。何でも薄暗いじめじめした所でニャーニャー泣いていた事だけは記憶している。&lt;/p&gt;
 &lt;p&gt;＜中略＞&lt;/p&gt;
 &lt;p&gt;この書生の掌の裏うちでしばらくはよい心持に坐っておったが、しばらくすると非常な速力で運転し始めた。&lt;/p&gt;
 &lt;/div&gt;
-&lt;div class='pgroup'&gt;
+&lt;div class=&#39;pgroup&#39;&gt;
 &lt;p&gt;ふと気が付いて見ると書生はいない。たくさんおった兄弟が一疋ぴきも見えぬ。&lt;/p&gt;
 &lt;/div&gt;</code>
 </pre>
 </div>
-<div class='pgroup'><p>改行ごとに<code>&lt;p&gt;</code>要素がつくられます。空行で区切られると<code>&lt;div class='pgroup'&gt;</code>がつくられます。</p>
+<div class='pgroup'><p>改行ごとに<code>&lt;p&gt;</code>要素がつくられます。空行で区切られると<code>&lt;div class=&#39;pgroup&#39;&gt;</code>がつくられます。</p>
 </div>
 <div class='pgroup'><p>言語が日本語(ja)以外の場合は、次のようになります。</p>
 </div>
@@ -163,7 +163,7 @@ Ut enim ad minim veniam, quis nostrud exercitation </pre>
 </div>
 <div class='pre'><p class='caption'>変換結果</p>
 <pre class='code-html' data-code-language='html'><code>&lt;blockquote&gt;
-&lt;div class='pgroup'&gt;
+&lt;div class=&#39;pgroup&#39;&gt;
 &lt;p&gt;山路を登りながら、こう考えた。&lt;/p&gt;
 &lt;p&gt;智に働けば角が立つ。情に棹させば流される。意地を通せば窮屈だ。とかくに人の世は住みにくい&lt;/p&gt;
 &lt;/div&gt;
@@ -236,7 +236,7 @@ puts &quot;Hello, World.&quot;
 </pre>
 </div>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;pre class='code-ruby' data-code-language='ruby'&gt;&lt;code&gt;
+<pre class='code-html' data-code-language='html'><code>&lt;pre class=&#39;code-ruby&#39; data-code-language=&#39;ruby&#39;&gt;&lt;code&gt;
 puts &quot;Hello, World.&quot;
 &lt;/code&gt;&lt;/pre&gt;</code>
 </pre>
@@ -245,23 +245,23 @@ puts &quot;Hello, World.&quot;
 <section><h5 id='heading_index_15'>キャプションの指定</h5>
 <div class='pre'><p class='caption'>原稿</p>
 <pre>code(ソースコードはこちら) {
-puts 'Hello, World'
+puts &#39;Hello, World&#39;
 }</pre>
 </div>
 <div class='pgroup'><p>または、こんな書き方もできます。</p>
 </div>
 <div class='pre'><p class='caption'>原稿</p>
 <pre>```(ソースコードはこちら)
-puts 'Hello, World'
+puts &#39;Hello, World&#39;
 ```</pre>
 </div>
 <div class='pgroup'><p>こんな風になります。</p>
 </div>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;div class='pre'&gt;
-&lt;p class='caption'&gt;原稿はこちら&lt;/p&gt;
+<pre class='code-html' data-code-language='html'><code>&lt;div class=&#39;pre&#39;&gt;
+&lt;p class=&#39;caption&#39;&gt;原稿はこちら&lt;/p&gt;
 &lt;pre&gt;&lt;code&gt;
-puts 'Hello, World'
+puts &#39;Hello, World&#39;
 &lt;/code&gt;&lt;/pre&gt;
 &lt;/div&gt;</code>
 </pre>
@@ -280,7 +280,7 @@ puts 'Hello, World'
 </div>
 <pre>[l(http://github.com/skoji/noramark){NoraMarkのレポジトリ}]</pre>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;a href='http://github.com/skoji/noramark'&gt;NoraMarkのレポジトリ&lt;/a&gt;</code>
+<pre class='code-html' data-code-language='html'><code>&lt;a href=&#39;http://github.com/skoji/noramark&#39;&gt;NoraMarkのレポジトリ&lt;/a&gt;</code>
 </pre>
 </div>
 </dd>
@@ -289,7 +289,7 @@ puts 'Hello, World'
 </div>
 <pre>[sp.note{spanの中にはいる}]</pre>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;span class='note&quot;&gt;spanの中に入る&lt;/span&gt;</code>
+<pre class='code-html' data-code-language='html'><code>&lt;span class=&#39;note&quot;&gt;spanの中に入る&lt;/span&gt;</code>
 </pre>
 </div>
 </dd>
@@ -298,7 +298,7 @@ puts 'Hello, World'
 </div>
 <pre>[img(img/some_image.jpg,alternate text)]</pre>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;img src='img/some_image.jpg' alt='alternate text' /&gt;</code>
+<pre class='code-html' data-code-language='html'><code>&lt;img src=&#39;img/some_image.jpg&#39; alt=&#39;alternate text&#39; /&gt;</code>
 </pre>
 </div>
 </dd>
@@ -307,7 +307,7 @@ puts 'Hello, World'
 </div>
 <pre>FM TOWNSが登場してからすでに[tcy{25}]年がたった。</pre>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;p&gt;FM TOWNSが登場してからすでに&lt;span class='tcy'&gt;25&lt;/span&gt;年がたった。&lt;/p&gt;</code>
+<pre class='code-html' data-code-language='html'><code>&lt;p&gt;FM TOWNSが登場してからすでに&lt;span class=&#39;tcy&#39;&gt;25&lt;/span&gt;年がたった。&lt;/p&gt;</code>
 </pre>
 </div>
 </dd>
@@ -350,7 +350,7 @@ puts 'Hello, World'
 </div>
 <pre>p.caution: 用量に注意してご利用ください。</pre>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;p class='caution'&gt;用量に注意してご利用ください。&lt;/p&gt;</code>
+<pre class='code-html' data-code-language='html'><code>&lt;p class=&#39;caution&#39;&gt;用量に注意してご利用ください。&lt;/p&gt;</code>
 </pre>
 </div>
 <dl><dt>image</dt>
@@ -358,8 +358,8 @@ puts 'Hello, World'
 </div>
 <pre>image(path-to-image/img.jpg, 代替テキスト): イメージのキャプション</pre>
 <div class='pre'><p class='caption'>変換結果</p>
-<pre class='code-html' data-code-language='html'><code>&lt;figure class='img-wrap'&gt;
-&lt;img src='path-to-image/img.jpg' alt='代替テキスト' /&gt;
+<pre class='code-html' data-code-language='html'><code>&lt;figure class=&#39;img-wrap&#39;&gt;
+&lt;img src=&#39;path-to-image/img.jpg&#39; alt=&#39;代替テキスト&#39; /&gt;
 &lt;figcaption&gt;イメージのキャプション&lt;/figcaption&gt;
 &lt;/figure&gt;</code>
 </pre>
@@ -478,7 +478,7 @@ li: 第三の要素
 </div>
 <div class='pre'><p class='caption'>変換結果</p>
 <pre class='code-html' data-code-language='html'><code>&lt;h1&gt;単独の見出し&lt;/h1&gt;
-&lt;div class='pgroup'&gt;
+&lt;div class=&#39;pgroup&#39;&gt;
 &lt;p&gt;ここに本文&lt;/p&gt;
 &lt;/div&gt;</code>
 </pre>
@@ -494,7 +494,7 @@ li: 第三の要素
 <div class='pre'><p class='caption'>変換結果</p>
 <pre class='code-html' data-code-language='html'><code>&lt;section&gt;
   &lt;h1&gt;見出し&lt;/h1&gt;
-  &lt;div class='pgroup'&gt;
+  &lt;div class=&#39;pgroup&#39;&gt;
     &lt;p&gt;本文&lt;/p&gt;
   &lt;/div&gt;
 &lt;/section&gt;</code>
@@ -513,19 +513,19 @@ li: 第三の要素
 <div class='pre'><p class='caption'>変換結果</p>
 <pre class='code-html' data-code-language='html'><code>&lt;section&gt;
   &lt;h1&gt;見出し&lt;/h1&gt;
-  &lt;div class='pgroup'&gt;
+  &lt;div class=&#39;pgroup&#39;&gt;
     &lt;p&gt;本文&lt;/p&gt;
   &lt;/div&gt;
   &lt;section&gt;
     &lt;h2&gt;小見出し&lt;/h2&gt;
-      &lt;div class='pgroup'&gt;
+      &lt;div class=&#39;pgroup&#39;&gt;
         &lt;p&gt;次の本文&lt;/p&gt;
       &lt;/div&gt;
   &lt;/section&gt;
 &lt;/section&gt;
 &lt;section&gt;
   &lt;h1&gt;新しい章&lt;/h1&gt;
-  &lt;div class='pgroup'&gt;
+  &lt;div class=&#39;pgroup&#39;&gt;
     &lt;p&gt;新しい章の本文&lt;/p&gt;
   &lt;/div&gt;
 &lt;/section&gt;</code>
@@ -544,15 +544,15 @@ li: 第三の要素
 <div class='pre'><p class='caption'>変換結果</p>
 <pre class='code-html' data-code-language='html'><code>&lt;section&gt;
   &lt;h1&gt;第一のセクション&lt;/h1&gt;
-  &lt;div class='pgroup'&gt;
+  &lt;div class=&#39;pgroup&#39;&gt;
   &lt;p&gt;ここは第一のセクション&lt;/p&gt;
   &lt;/div&gt;
   &lt;section&gt;第二のセクション&lt;/h1&gt;
-    &lt;div class='pgroup'&gt;
+    &lt;div class=&#39;pgroup&#39;&gt;
     &lt;p&gt;ここは第二のセクション&lt;/p&gt;
     &lt;/div&gt;
   &lt;/section&gt;
-  &lt;div class='pgroup'&gt;
+  &lt;div class=&#39;pgroup&#39;&gt;
   &lt;p&gt;ここは再び第一のセクション&lt;/p&gt;
   &lt;/div&gt;
 &lt;/section&gt;</code>

data/lib/nora_mark/document.rb

@@ -59,9 +59,12 @@ module NoraMark
         end
       end
       frontmatter = instance.root.find_node :type => :Frontmatter
-      if (frontmatter&& frontmatter.yaml['generator'])
-        NoraMark::Extensions.register_generator(frontmatter.yaml['generator'].to_sym)
+      if (frontmatter)
+        if (frontmatter.yaml['generator'])
+          NoraMark::Extensions.register_generator(frontmatter.yaml['generator'].to_sym)
+        end
       end
+      
       instance
     end
 

data/lib/nora_mark/html/default_transformer.rb

@@ -31,6 +31,12 @@ module NoraMark
           (@node.attrs ||= {}).merge!({href: [@node.params[0].text]})
         end
 
+        replace 'noescape' do
+          node = text(@node.text)
+          node.noescape = true
+          node
+        end
+
         modify 'ruby' do
           @node.append_child inline 'rp', '('
           @node.append_child inline 'rt', escape_html(@node.params[0].text.strip)
@@ -50,10 +56,13 @@ module NoraMark
         end
 
         replace 'image' do
+          imagenode = inline('img', nil,
+                             body_empty: true,
+                             attrs: {src: [ @node.params[0].text.strip],  alt: [ (@node.params[1].text ||'').strip ] })
           newnode = block('figure',
                           class_if_empty:'img-wrap',
                           ids: @node.ids,
-                          children: [ inline('img', nil, attrs: {src: [ @node.params[0].text.strip],  alt: [ (@node.params[1].text ||'').strip ] }) ],
+                          children: [ imagenode],
                           template: @node) 
           if !@node.children_empty?
             if @node.n[:caption_before] 

data/lib/nora_mark/html/generator.rb

@@ -103,7 +103,11 @@ module NoraMark
 
       def to_html(node)
         if node.kind_of? Text
-          @context << escape_html(node.content)
+          if node.noescape
+            @context << node.content
+          else
+            @context << escape_html(node.content)
+          end
         else
           writer = @writers[node.class]
           if writer.nil?

data/lib/nora_mark/html/tag_writer.rb

@@ -31,11 +31,11 @@ module NoraMark
           if vals.nil?
             ''
           elsif !vals.is_a? Array
-            " #{name}='#{name}'"
+            " #{name}='#{escape_html(name)}'"
           elsif vals.size == 0
             ''
           else
-            " #{name}='#{vals.join(' ')}'"            
+            " #{name}='#{escape_html(vals.join(' '))}'"            
           end
         end.join('')
       end

data/lib/nora_mark/html/util.rb

@@ -5,7 +5,8 @@ module NoraMark
         string.to_s.gsub("&", "&").
           gsub("<", "&lt;").
           gsub(">", "&gt;").
-          gsub('"', "&quot;")
+          gsub('"', "&quot;").
+          gsub("'", "&#39;")
       end
     end
   end

data/lib/nora_mark/node.rb

@@ -356,6 +356,7 @@ module NoraMark
 
   end
   class Text < Node
+    attr_accessor :noescape
     def reparent
       # do nothing
     end

data/lib/nora_mark/rake_task.rb

@@ -0,0 +1,58 @@
+require 'nora_mark'
+require 'rake/tasklib'
+
+module NoraMark
+  class RakeTask < ::Rake::TaskLib
+    attr_accessor :lang, :page_number_digits
+    def initialize(lang: 'en')
+      @preprocessors = []
+      @transformers = []
+      yield self if block_given?
+      @lang ||= lang
+      @page_number_digits ||= 5
+      define
+    end
+
+    def add_preprocessor(&block)
+      @preprocessors << block;
+    end
+
+    def add_transformer(&block)
+      @transformers << block;
+    end
+
+    def define
+      desc "rule for *-nora.txt to *-nora_xxx.html. Use *-nora-transform.rb on same directory as transformer"
+      rule( /-((nora)|(arti))_[0-9]{#{page_number_digits}}\.xhtml/ =>
+            proc {|task_name|
+              task_name.sub(/^(.+?-((nora)|(arti)))_[0-9]{#{page_number_digits}}\.xhtml/, '\1.txt')
+            }) do
+        |t|
+
+        dir =  File.dirname File.expand_path(t.source)
+        transformer_name = File.join dir, File.basename(t.source, '.txt') + '-transform.rb'
+        nora =
+          NoraMark::Document.parse(
+                                   File.open(t.source),
+                                   :lang => @lang,
+                                   :sequence_format => "%0#{page_number_digits}d",
+                                   :document_name=>t.name.sub(/_[0-9]{3}\.xhtml/, '')) do
+          |doc|
+          @preprocessors.each do
+            |prepro|
+            doc.preprocessor(&prepro)
+          end
+          @transformers.each do
+            |transformer|
+            doc.add_transformer(&transformer)
+          end
+          if File.exist? transformer_name
+            doc.add_transformer(text: File.open(transformer_name).read)
+          end
+        end
+        nora.html.write_as_files
+      end
+      
+    end
+  end
+end

data/lib/nora_mark/version.rb

@@ -1,3 +1,3 @@
 module NoraMark
-  VERSION = "0.2beta13"
+  VERSION = "0.2beta14"
 end

data/spec/nora_mark_spec.rb

@@ -709,6 +709,17 @@ describe NoraMark::Document do
                   ['p', ['code.the-class', 'this is inside code and `backquote will not be parsed`'], '. you see?']
                  ])
       end
+      it 'handle non-escaped inline' do
+        text = "the text following will not be escaped: [noescape{©}]"
+        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', 'the text following will not be escaped: ©']
+                 ])
+      end
     end
     describe 'list' do
       it 'handle ordered list ' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora_mark
 version: !ruby/object:Gem::Version
-  version: 0.2beta13
+  version: 0.2beta14
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg
@@ -134,6 +134,7 @@ files:
 - lib/nora_mark/parser.kpeg
 - lib/nora_mark/parser.kpeg.rb
 - lib/nora_mark/parser.rb
+- lib/nora_mark/rake_task.rb
 - lib/nora_mark/transformer.rb
 - lib/nora_mark/version.rb
 - lib/tilt/nora_mark.rb