zine_brewer 1.7.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3ba68f6148bff1354914fd0f2b98c5e60b70341aae73cc113d4aed2b1aa5a4
-  data.tar.gz: 7d25319819a05e422cdb9504e173bdfa455b938c3015a3ea6c84c58b73bcf6c3
+  metadata.gz: d64a3c71ecba43de692fa711576fa4c5a218a7f62850e42cb500d82de3d0c022
+  data.tar.gz: cd5305ccb1c290a1235420a449778bd186c51be507107e7fc4ec24403a34cac5
 SHA512:
-  metadata.gz: 26a77c54ce06edc09849fbca363d08eff80b428e811d9ec3e95b0866dd192453be50e9aca6a16d7a0a8ca27dcf48b8917482a2d50ad723d71404fab472848b27
-  data.tar.gz: 2c7f9293f59f9caa63243f042b9803d5518c1886de8ef043cf3f22b427712b812619ce31e44018d179b00441be1b2bf8c910ce83719cb59b761f6a03ea951845
+  metadata.gz: 7ac8faad841af5e80530b2e23789987370d47c5417538c10717548c1264873dd31d24c72d703ce34b9a11ed5f90372c540d18feb7fba1de3924c99e4d8e61100
+  data.tar.gz: a56c967e8b54bf99df7125dccddd2a77a269f8c3e31757db124431120e92cc5ff18182fbec484f6d328e693f1f2f64805472c0ca723497857c21acbc124c155d

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/Gemfile

@@ -4,3 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
+
+gem "rspec", "~> 3.0"
+
+gem "pry"

data/README.md

@@ -1,6 +1,6 @@
 # ZineBrewer
 
-ZineBrewer converts Kramdown (=exhanced Markdown) document to HTML for Shoeisha Web Media.
+ZineBrewer converts Kramdown (=exhanced Markdown) document to HTML for a web media.
 
 ## Installation
 
@@ -353,12 +353,12 @@ width: 200px
 
 #### ■定義表の書き方
 
-定義リストの記述を`===dtable`〜`==/dtable`で挟むと、左に項目、右に内容のテーブル（表）ができます。
+定義リストの記述を`===dtable`〜`==/dtable`で挟むと、左に項目、右に内容のテーブル（表）ができます。キャプション（caption）を定義できるほか、1列目の幅を`th-width`属性で指定できます。
 
 例えば、次のように記述すると、
 
 ```
-{:caption="イベント概要"}
+{:caption="イベント概要" th-width="20%"}
 ===dtable
 イベント名
 :  HRzine Day 2020 Autumn
@@ -376,7 +376,7 @@ width: 200px
 
 次のように表示されます。
 
-![dtable](https://user-images.githubusercontent.com/24837059/94995269-32e6e680-05d8-11eb-86ed-074e650ff2eb.png)
+![dtable](https://user-images.githubusercontent.com/24837059/133894991-59887c24-3c2f-402d-a854-b56c55d7da8c.png)
 
 #### ■スタイルの書き方
 

data/lib/zine_brewer/kramdown/converter/sehtml.rb

@@ -75,10 +75,12 @@ module Kramdown
       end
 
       def convert_definition_table(el, indent)
+        th_width = el.attr.delete('th-width')
+        th = th_width.nil? ? "<th>" : "<th width=\"#{th_width}\">"
         raw_caption = el.attr.delete('caption')
         rows = raw_caption.nil? ? '' : table_caption(raw_caption)
         inner(el.children.first, indent).scan(/(<dt>.+?<\/dt>|<dd>.+?<\/dd>)/m).
-          map{|x| x.first.sub(/\A<dt>(.+)<\/dt>\z/m, "<th>\\1</th>")}.
+          map{|x| x.first.sub(/\A<dt>(.+)<\/dt>\z/m, "#{th}\\1</th>")}.
           map{|x| x.sub(/\A<dd>(.+)<\/dd>\z/m, "<td>\\1</td>")}.
           each_slice(2) do |x|
             row = x.map{|c| ('  '*(indent + 2)) + c}.join("\n")
@@ -121,10 +123,6 @@ module Kramdown
         format_as_span_html(el.type, attr, res)
       end
 
-      def convert_span(el, indent)
-        format_as_span_html('span', el.attr, inner(el, indent))
-      end
-
       def convert_em(el, indent)
         format_as_span_html('strong', el.attr, inner(el, indent))
       end

data/lib/zine_brewer/kramdown/parser/sekd.rb

@@ -29,7 +29,6 @@ module Kramdown
         end
 
         @block_parsers.insert(5, :column, :definition_table, :wraparound,:div, :page)
-        @span_parsers.insert(5, :span)
 
         @page = 0
         @fn_counter = 0
@@ -159,7 +158,7 @@ module Kramdown
         if @fn_number.has_key?(@src[1])
           warning("Duplicate footnote name '#{@src[1]}' on line #{start_line_number} - overwriting")
         end
-        a = %!<a href="#fnref:#{@fn_number[@src[1]]}">[#{@fn_number[@src[1]]}]</a>: #{@src[2].strip}!
+        a = %!<a href="#fnref:#{@fn_number[@src[1]]}">\\[#{@fn_number[@src[1]]}\\]</a>: #{@src[2].strip}!
         p = new_block_el(:p, nil, {'id' => "fn:#{@fn_number[@src[1]]}"})
         p.children << new_block_el(:raw_text, a, nil)
         if @tree.children.last.type == :footnote_definition_sekd

data/lib/zine_brewer/main.rb

@@ -49,6 +49,7 @@ module ZineBrewer
       @author = set_header_item(h[4], '著者 クレジット')
       @css    = set_header_item(h[5], '')
 
+      @pp_header = make_pp_header
       @converted = convert(body)
     end
 
@@ -62,6 +63,17 @@ module ZineBrewer
       end
     end
 
+    def make_pp_header
+      header_output = []
+      header_output << "［コーナー］\n#{@corner}" if @corner.is_complete?
+      header_output << "［タイトル］\n#{@title}" if @title.is_complete?
+      header_output << "［リード］\n<p>#{@lead}</p>" if @lead.is_complete?
+      header_output << "［タイトル画像］\n#{@pic}" if @pic.is_complete?
+      header_output << "［著者クレジット］\n#{@author}" if @author.is_complete?
+      header_output << "［追加CSS］\n#{@css}" if @css.is_complete?
+      header_output.join("\n\n")
+    end
+
     ## Writing out header and body to each file
     def write_out
       make_proof_directory
@@ -78,15 +90,8 @@ module ZineBrewer
     end
 
     def write_proof_header
-      header_output = ""
-      header_output << "［コーナー］\n#{@corner}\n\n" if @corner.is_complete?
-      header_output << "［タイトル］\n#{@title}\n\n" if @title.is_complete?
-      header_output << "［リード］\n<p>#{@lead}</p>\n\n" if @lead.is_complete?
-      header_output << "［タイトル画像］\n#{@pic}\n\n" if @pic.is_complete?
-      header_output << "［著者クレジット］\n#{@author}\n\n" if @author.is_complete?
-      header_output << "［追加CSS］\n#{@css}\n\n" if @css.is_complete?
       File.open("#{@proof_dir}/header.txt", 'wb') do |f|
-        f.write(header_output)
+        f.write(@pp_header)
       end
     end
 
@@ -120,6 +125,11 @@ module ZineBrewer
       ### Converts a markdown document and returns that converted body
       dkmn.convert
     end
+
+    ### pretty print of the converted document
+    def pretty_print
+      @pp_header + "\n\n" + @converted
+    end
   end
 end
 

data/lib/zine_brewer/templates/bookranking.rb

@@ -13,7 +13,7 @@ class BookRanking < Mustache
   @template = <<EOT
   <div class="imgLRBlock cf">
     <figure class="imgR">
-      <a href="{{url}}" target="_blank"><img alt="{{title}}" loading="lazy" src="{{cover}}" style="border:1px solid #808080;" width="100" title="{{title}}" /></a></figure>
+      <a href="{{url}}" target="_blank"><img alt="{{title}}" loading="lazy" src="{{cover}}" style="border:1px solid #808080; width:100px;" title="{{title}}" /></a></figure>
     <p markdown="1">　{{& description}}</p>
   </div>
 EOT

data/lib/zine_brewer/templates/casts.rb

@@ -13,7 +13,7 @@ class Casts < Mustache
   #   cap:   プロフィール
 
   # CSSに下記の登録が必要
-  # article#contents div.article div.casts>div ~ div { margin-top:8px; }
+  # .c-article_content div.casts>div ~ div { margin-top:8px; }
 
   @template = <<EOT
   <div class="casts" style="margin-bottom:30px; padding:13px 13px 3px; border:solid 2px #eee;">
@@ -21,7 +21,7 @@ class Casts < Mustache
     {{#title_sw}}<h4>{{title}}</h4>{{/title_sw}}
     <div class="imgLRBlock cf">
       <figure class="imgL">
-        <img src="{{fig_src}}" loading="lazy" alt="{{name}}" height="135" width="110" />
+        <img src="{{fig_src}}" loading="lazy" alt="{{name}}" style="height:135px;" />
       </figure>
       <p class="ovh" markdown="span" style="font-size:14px; line-height:1.7; margin-bottom:10px;"><strong style="font-size:15px;">{{name}}（{{huri}}）氏</strong><br />{{& caption}}</p>
     </div>
@@ -68,7 +68,7 @@ EOT
   
   def make_caption(l_cap)
     begin
-      l_cap.chomp.sub(/^\\/, '').gsub(/\n/, '(((BR)))')
+      l_cap.chomp.sub(/^\\/, '').gsub(/\n/, '<br/>')
     rescue
       nil
     end

data/lib/zine_brewer/templates/fig/module_fig_base.rb

@@ -10,7 +10,8 @@ module Fig_00
       a_img[:fig_src] = make_src(h["src"])
       a_img[:href] = h["href"]
       a_img[:alt] = make_alt(h["alt"])
-      a_img[:img_size] = make_img_size(h["width"], h["height"])
+      a_img[:img_style] = make_img_style(h["width"], h["height"]) \
+        unless h["width"].nil? && h["height"].nil?
       result << a_img
     end
     result
@@ -18,7 +19,7 @@ module Fig_00
 
   def caption
     begin
-      cap.chomp.sub(/^\\/, '').gsub(/\n/,'(((BR)))')
+      cap.chomp.sub(/^\\/, '').gsub(/\n/,'<br/>')
     rescue
       nil
     end
@@ -53,11 +54,13 @@ module Fig_00
     end
   end
   
-  def make_img_size(l_width, l_height)
+  def make_img_style(l_width, l_height)
     s = []
-    s << %Q{width="#{l_width}"} unless l_width.nil?
-    s << %Q{height="#{l_height}"} unless l_height.nil?
-    s.join(' ').strip
+    s << "width:#{l_width};" unless l_width.nil?
+    s << "height:#{l_height};" unless l_height.nil?
+    unless s.all?{|v| v.nil? }
+      %Q{style="#{s.join(' ').strip}" }
+    end
   end
 
 end

data/lib/zine_brewer/templates/fig_a.rb

@@ -17,7 +17,7 @@ class Fig_A < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{fig_src}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
+  <a href="{{fig_src}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}" {{& img_style}} /></a>
   {{/imgs_list}}
   <figcaption markdown="span">{{#caption}}{{& caption}}<br/>{{/caption}}［画像クリックで拡大表示］</figcaption>
 </figure>

data/lib/zine_brewer/templates/fig_h.rb

@@ -18,7 +18,7 @@ class Fig_H < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{href}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
+  <a href="{{href}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}" {{& img_style}} /></a>
   {{/imgs_list}}
   {{#caption}}<figcaption markdown="span">{{& caption}}</figcaption>{{/caption}}
 </figure>

data/lib/zine_brewer/templates/fig_n.rb

@@ -13,12 +13,11 @@ class Fig_N < Mustache
   # width: 画像幅
   # height: 画像高さ
   # cap: キャプション
-  # from: 出典 << 出典URL
 
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} />
+  <img src="{{fig_src}}" loading="lazy" alt="{{alt}}" {{& img_style}} />
   {{/imgs_list}}
   {{#caption}}<figcaption markdown="span">{{caption}}</figcaption>{{/caption}}
 </figure>

data/lib/zine_brewer/templates/fig_p.rb

@@ -10,22 +10,26 @@ class Fig_P < Mustache
 
   # <<Fig_P>>
   # src: 画像ファイル名
-  # name: 姓 名
-  # huri: ふり・がな
   # width: 画像幅
   # height: 画像高さ
+  # name: 姓 名
+  # huri: ふり・がな
+  # title: 肩書き
   # cap: |
-  #  キャプション
+  #      プロフィール
 
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <img src="{{fig_src}}" loading="lazy" alt="{{name}}氏"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} />
+  <img src="{{fig_src}}" loading="lazy" alt="{{name}}氏" {{& img_style}} />
   {{/imgs_list}}
-  <div style="text-align:left; padding:0px 35px;">
-    <figcaption><strong>{{name}}（{{huri}}）氏</strong></figcaption>
-    <figcaption markdown="span">{{caption}}</figcaption>
-  </div>
+  <figcaption style="text-align:left;">
+    <strong>{{name}}（{{huri}}）氏</strong><br/>
+    <span markdown="span">{{title}}</span>
+    <div markdown="span" style="margin-top:6px;">
+      {{{caption}}}
+    </div>
+  </figcaption>
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_z.rb

@@ -17,7 +17,7 @@ class Fig_Z < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{fig_src}}" rel="lightbox" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
+  <a href="{{fig_src}}" rel="lightbox" target="_blank"><img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/></a>
   {{/imgs_list}}
   <figcaption markdown="span">{{#caption}}{{& caption}}<br/>{{/caption}}［画像クリックで拡大表示］</figcaption>
 </figure>

data/lib/zine_brewer/version.rb

@@ -1,3 +1,3 @@
 module ZineBrewer
-  VERSION = "1.7.0"
+  VERSION = "1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine_brewer
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Akinori Ichigo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - akinori.ichigo@gmail.com
 executables:
@@ -47,6 +47,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -77,7 +78,7 @@ metadata:
   homepage_uri: https://github.com/akinori-ichigo/zine_brewer
   source_code_uri: https://github.com/akinori-ichigo/zine_brewer
   changelog_uri: https://github.com/akinori-ichigo/zine_brewer
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Kramdown to HTML converter for Shoeisha Web Media
 test_files: []