zine_brewer 1.8.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec1e562956e0815a826a59cef79390646e78600d8a63e00d77561813596a20d
-  data.tar.gz: f3f4a11911c859b2d86b8f69f53167a922355b213500ace38fffb0c672d309df
+  metadata.gz: acc53bca60e0672756e165ad78c244050d3fcbf9aac968ea3cb842b9e3352ee9
+  data.tar.gz: dcd432bec401c8064f31b1350e5d24dfd2a3046cfe23e69b2fa083466ba544ad
 SHA512:
-  metadata.gz: 973130be4a6996dcde4d97683711aee2c6827c1910b3414a21389c8493a920a31fdf2289c5171a00a5587307f9a0bf14a7df32f449ff68681f2280902069c020
-  data.tar.gz: 2ebbd32bf872e1c4cfb570b7b0f26c6a1c759e2fe97d1b5adfde6136c2f95f342495753df3d22cba0a297ff79c0af78b0f07e402926ffa5d45eff4087a90e3d5
+  metadata.gz: 55d5263353cbab4604547eb9a0497381933f2d1303d909eb667fc9b5c74e09f00f1c2477c92d3a401f4f9b50708d42166bd1e90960e21d9f399e288291feef87
+  data.tar.gz: ac5871e89764f0888dd5642a1fb8a1d49e98c60007c0eac914739b5ed6e8049df7a0e0eb33ab6c4f8fb99187768f364fa90f3617ae1ba751de16099d4f70170b

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")

data/lib/zine_brewer/main.rb

@@ -42,18 +42,19 @@ module ZineBrewer
 
       @article_id = $+ if header.sub!(/^■記事ID■[^0-9]+(\d+)$/, '')
       h = header.strip.split(/\n\n+/)
-      @corner = set_header_item(h[0], 'IT人材ラボの記事・ニュース')
+      @corner = set_header_item(h[0], '記事・ニュースのコーナー')
       @title  = set_header_item(h[1], 'タイトル' )
       @lead   = set_header_item(h[2], 'リード')
       @pic    = set_header_item(h[3], 'dummy.png')
       @author = set_header_item(h[4], '著者 クレジット')
       @css    = set_header_item(h[5], '')
 
+      @pp_header = make_pp_header
       @converted = convert(body)
     end
 
     def set_header_item(target, default)
-      if /\A[\-%]+\Z/ =~ target || target.nil?
+      if /\A\ufeff?[\-%]+\Z/ =~ target || target.nil?
         default.define_singleton_method(:is_complete?){ false }
         default
       else
@@ -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.8.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine_brewer
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Akinori Ichigo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -47,6 +47,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt