zine_brewer 1.3.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4a2d9b8d3b0420e7f00e67d9cd814b9d47dee6ee7597468357143e677d2be63
-  data.tar.gz: dfada5d6c981ac3686f670c83e52fe86f2351859e2217bef2f49d929888b64a8
+  metadata.gz: ee3ba68f6148bff1354914fd0f2b98c5e60b70341aae73cc113d4aed2b1aa5a4
+  data.tar.gz: 7d25319819a05e422cdb9504e173bdfa455b938c3015a3ea6c84c58b73bcf6c3
 SHA512:
-  metadata.gz: a5cbb3db19f9d1626cb9439fe4b2ff26910e76c04f512f915e7c1599798a727a663a34bdf9cb0d0eaa3cec3c5571867ba0833e823b35ba46653f5eacf7b44d5a
-  data.tar.gz: e0dd6c0e92d1fe3204f7e904b5edb133479d597772d08c6024b2773802768b3e37335d9aadbebffced13375ba97c2341225c3f8ef12a88384cbb2e50cb3f8912
+  metadata.gz: 26a77c54ce06edc09849fbca363d08eff80b428e811d9ec3e95b0866dd192453be50e9aca6a16d7a0a8ca27dcf48b8917482a2d50ad723d71404fab472848b27
+  data.tar.gz: 2c7f9293f59f9caa63243f042b9803d5518c1886de8ef043cf3f22b427712b812619ce31e44018d179b00441be1b2bf8c910ce83719cb59b761f6a03ea951845

data/README.md

@@ -20,8 +20,18 @@ Or install it yourself as:
 
 ## Usage
 
+As the converting command:
+
     $ zine_brewer [kramdown_document_filepath]
 
+As the converting server:
+
+    $ zine_brewing_server
+
+When you run the command above,
+or send kramdown_document_filepath to the zine_brewing_server,
+the convertion is done as below.
+
 * The header part is converted and written out as "proof/header.txt".
 * The body part is converted and written out as "proof/body.txt".
 
@@ -327,7 +337,7 @@ width: 200px
 
 #### ■脚注の書き方
 
-次のように、本文テキスト中の脚注を付けたい言葉などに`[^1]`などとアンカーを付け、脚注を置きたい場所に`[^1]: 〜`という形で脚注本体を書きます。脚注本体のコロンを忘れなく。脚注番号で使えるのは半角数字のみです。
+次のように、本文テキスト中の脚注を付けたい言葉などに`[^1]`などとアンカーを付け、脚注を置きたい場所に`[^1]: 〜`という形で脚注本体を書きます。脚注本体のコロンを忘れなく。脚注番号には半角英数字が使えます（[^1]、[^imi01]など）。変換後は出現順に[1]、[2]という通し番号による表記に変わります。
 
 ```
 　ほら、ここに難しい専門用語[^1]が1つ。ここにも意味の分からない専門用語[^2]がもう1つ。

data/exe/zine_brewing_server

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "socket"
+require "zine_brewer"
+
+server = TCPServer.open('localhost', 53623)
+loop do
+  socket = server.accept
+  begin
+    filepath = socket.gets.chomp
+    zine = ZineBrewer::Application.new(filepath)
+    zine.write_out
+    socket.write 'Conversion from Markdown to HTML is done. The output files (header.txt / body.txt) are in proof directory.'
+  rescue => e
+    socket.write e.message
+  ensure
+    socket.close
+  end
+end
+

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

@@ -86,7 +86,12 @@ module Kramdown
           end
         format_as_indented_block_html('table', el.attr, rows, indent)
       end
-      
+
+      def convert_dt(el, indent)
+        result = super
+        result.sub(/<dt>\\/, '<dt>')
+      end
+
       def convert_div(el, indent)
         format_as_indented_block_html('div', el.attr, inner(el, indent), indent)
       end

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

@@ -36,6 +36,8 @@ module Kramdown
         @fn_number = Hash.new{|h, k| h[k] = (@fn_counter += 1).to_s }
       end
 
+      LIST_START_OL = /^(#{OPT_SPACE}(?:[^\\]|)\d+\.)(#{PATTERN_TAIL})/
+
       # Parse the fenced codeblock at the current location
       # code highlighting by Google Prettify.
       def parse_codeblock_fenced_sekd

data/lib/zine_brewer/main.rb

@@ -20,8 +20,7 @@ module ZineBrewer
         Encoding.default_external =  Kconv.guess(File.open(path, 'r:BINARY').read)
         input_data = File.open(path, 'rt').read.encode('UTF-8')
       rescue
-        puts 'ERROR: There is not the input file. Check the input file.'
-        exit
+        raise 'ERROR: The input file does not exist. Check it.'
       end
 
       @dir = File.dirname(path)

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}}" src="{{cover}}" style="border:1px solid #808080; width:100px;" title="{{title}}" /></a></figure>
+      <a href="{{url}}" target="_blank"><img alt="{{title}}" loading="lazy" src="{{cover}}" style="border:1px solid #808080;" width="100" title="{{title}}" /></a></figure>
     <p markdown="1">　{{& description}}</p>
   </div>
 EOT
@@ -25,7 +25,8 @@ EOT
   def cover
     case File.dirname(src)
     when ".", "images"
-      "/static/images/article/■記事ID■/#{File.basename(src)}"
+      f = File.basename(src)
+      "/static/images/article/■記事ID■/#{/^\d+_/ =~ f ? f : '■記事ID■_' + f}"
     when "common"
       "/static/images/article/common/#{File.basename(src)}"
     else

data/lib/zine_brewer/templates/casts.rb

@@ -6,10 +6,11 @@ class Casts < Mustache
 
   # <<Casts>>
   # casts:
-  #   src:  写真ファイル名
-  #   name: 姓 名
-  #   huri: ふり がな
-  #   cap:  プロフィール
+  #   title: 見出し
+  #   src:   写真ファイル名
+  #   name:  姓 名
+  #   huri:  ふり がな
+  #   cap:   プロフィール
 
   # CSSに下記の登録が必要
   # article#contents div.article div.casts>div ~ div { margin-top:8px; }
@@ -17,11 +18,12 @@ class Casts < Mustache
   @template = <<EOT
   <div class="casts" style="margin-bottom:30px; padding:13px 13px 3px; border:solid 2px #eee;">
   {{#prof_list}}
+    {{#title_sw}}<h4>{{title}}</h4>{{/title_sw}}
     <div class="imgLRBlock cf">
       <figure class="imgL">
-        <img src="{{fig_src}}" alt="{{name}}" style="height:135px;" />
+        <img src="{{fig_src}}" loading="lazy" alt="{{name}}" height="135" width="110" />
       </figure>
-      <p class="ovh" markdown="span" style="font-size:14px; line-height:1.7; margin-bottom:10px;"><strong>{{name}}（{{huri}}）氏</strong><br />{{& caption}}</p>
+      <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>
   {{/prof_list}}
   </div>
@@ -32,6 +34,8 @@ EOT
     (casts rescue a_cast_param).each do |h|
       a_cast = {}
       raise "Error: No src:" if h["src"].nil?
+      a_cast[:title] = h["title"]
+      a_cast[:title_sw] = !h["title"].nil?
       a_cast[:fig_src] = make_src(h["src"])
       a_cast[:name] = h["name"]
       a_cast[:huri] = h["huri"]
@@ -43,7 +47,8 @@ EOT
 
   private
   def a_cast_param
-    [{"src" => (src rescue nil),
+    [{"title" => (title rescue nil),
+      "src" => (src rescue nil),
       "name" => (name rescue nil),
       "huri" => (huri rescue nil),
       "cap" => (cap rescue nil)}]
@@ -52,7 +57,8 @@ EOT
   def make_src(l_src)
     case File.dirname(l_src)
     when ".", "images"
-      "/static/images/article/■記事ID■/#{File.basename(l_src)}"
+      f = File.basename(l_src)
+      "/static/images/article/■記事ID■/#{/^\d+_/ =~ f ? f : '■記事ID■_' + f}"
     when "common"
       "/static/images/article/common/#{File.basename(l_src)}"
     else
@@ -70,37 +76,3 @@ EOT
 
 end
 
-__END__
-
-{:.casts %margin-bottom:45px; %padding:13px 13px 3px; %border:solid 2px #eee;}
-===div
-
-{:.imgLRBlock .cf}
-===div
-{:.imgL}
-<<Fig_N>>
-src: 2096_misonou_p.jpg
-height: 135px
-
-{:.ovh markdown="1" %font-size:14px; %line-height:1.7; %margin-bottom:10px;}
-**御園生 銀平（みそのう ぎんぺい）氏**<br/>
-ソフトバンク株式会社[[ ]]{:%font-size:3px;}人事本部[[ ]]{:%font-size:3px;}戦略企画統括部[[ ]]{:%font-size:3px;}人材戦略部[[ ]]{:%font-size:3px;}デジタルHR推進課。<br/>
-（※御園生様のプロフィールを100〜150字程度でお願いいたします）。
-==/div
-
-{:.imgLRBlock .cf}
-===div
-{:.imgL}
-<<Fig_N>>
-src: 2096_shikauchi_p.jpg
-height: 135px
-
-{:.ovh markdown="1" %font-size:14px; %line-height:1.7; %margin-bottom:10px;}
-**鹿内 学（しかうち まなぶ）氏**<br/>
-博士（理学）。株式会社シンギュレイト 代表。<br/>
-働く中でのコミュニケーション・データから関係性に注目した次世代ピープルアナリティクスにとりくむ。代表を務めるシンギュレイトでは1 on 1や会議で利用できる可視化ツールを提供中。働く組織の科学と実用をめざす。情報量規準が好き、サッカー好き、漫画好き。
-==/div
-
-==/div
-
-

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

@@ -10,8 +10,7 @@ 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_style] = make_img_style(h["width"], h["height"]) \
-        unless h["width"].nil? && h["height"].nil?
+      a_img[:img_size] = make_img_size(h["width"], h["height"])
       result << a_img
     end
     result
@@ -54,13 +53,11 @@ module Fig_00
     end
   end
   
-  def make_img_style(l_width, l_height)
+  def make_img_size(l_width, l_height)
     s = []
-    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
+    s << %Q{width="#{l_width}"} unless l_width.nil?
+    s << %Q{height="#{l_height}"} unless l_height.nil?
+    s.join(' ').strip
   end
 
 end

data/lib/zine_brewer/templates/fig_a.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_A < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_A>>
   # src: 画像ファイル名
@@ -18,9 +17,9 @@ class Fig_A < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{fig_src}}" target="_blank"><img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/></a>
+  <a href="{{fig_src}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
   {{/imgs_list}}
-  <figcaption markdown="span">{{#figcaption_sw}}{{& caption}}<br/>{{/figcaption_sw}}［画像クリックで拡大表示］</figcaption>
+  <figcaption markdown="span">{{#caption}}{{& caption}}<br/>{{/caption}}［画像クリックで拡大表示］</figcaption>
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_h.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_H < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_H>>
   # src: 画像ファイル名
@@ -19,9 +18,9 @@ class Fig_H < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  {{#href}}<a href="{{href}}" target="_blank">{{/href}}<img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/>{{#href}}</a>{{/href}}
+  <a href="{{href}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
   {{/imgs_list}}
-  {{#figcaption_sw}}<figcaption markdown="span">{{& caption}}</figcaption>{{/figcaption_sw}}
+  {{#caption}}<figcaption markdown="span">{{& caption}}</figcaption>{{/caption}}
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_n.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_N < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_N>>
   # src: 画像ファイル名
@@ -19,9 +18,9 @@ class Fig_N < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/>
+  <img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} />
   {{/imgs_list}}
-  {{#figcaption_sw}}<figcaption markdown="span">{{caption}}{{& cited_from}}</figcaption>{{/figcaption_sw}}
+  {{#caption}}<figcaption markdown="span">{{caption}}</figcaption>{{/caption}}
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_p.rb

@@ -20,7 +20,7 @@ class Fig_P < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <img src="{{fig_src}}" alt="{{name}}氏" {{& img_style}} />
+  <img src="{{fig_src}}" loading="lazy" alt="{{name}}氏"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} />
   {{/imgs_list}}
   <div style="text-align:left; padding:0px 35px;">
     <figcaption><strong>{{name}}（{{huri}}）氏</strong></figcaption>

data/lib/zine_brewer/templates/fig_z.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_Z < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_Z>>
   # src: 画像ファイル名
@@ -18,9 +17,9 @@ class Fig_Z < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{fig_src}}" rel="lightbox" target="_blank"><img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/></a>
+  <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>
   {{/imgs_list}}
-  <figcaption markdown="span">{{#figcaption_sw}}{{& caption}}<br/>{{/figcaption_sw}}［画像クリックで拡大表示］</figcaption>
+  <figcaption markdown="span">{{#caption}}{{& caption}}<br/>{{/caption}}［画像クリックで拡大表示］</figcaption>
 </figure>
 EOT
 

data/lib/zine_brewer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine_brewer
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Akinori Ichigo
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -38,11 +38,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - akinori.ichigo@gmail.com
 executables:
 - zine_brewer
+- zine_brewing_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -54,6 +55,7 @@ files:
 - bin/console
 - bin/setup
 - exe/zine_brewer
+- exe/zine_brewing_server
 - lib/zine_brewer.rb
 - lib/zine_brewer/kramdown/converter/sehtml.rb
 - lib/zine_brewer/kramdown/parser/sekd.rb
@@ -61,7 +63,6 @@ files:
 - lib/zine_brewer/templates/bookranking.rb
 - lib/zine_brewer/templates/casts.rb
 - lib/zine_brewer/templates/fig/module_fig_base.rb
-- lib/zine_brewer/templates/fig/module_fig_plus.rb
 - lib/zine_brewer/templates/fig_a.rb
 - lib/zine_brewer/templates/fig_h.rb
 - lib/zine_brewer/templates/fig_n.rb
@@ -76,7 +77,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
@@ -91,8 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Kramdown to HTML converter for Shoeisha Web Media
 test_files: []

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

@@ -1,15 +0,0 @@
-# coding: utf-8
-
-module Fig_01
-  
-  def open_which
-    defined?(href)
-  end
-
-  def figcaption_sw
-    defined?(cap)
-  end
-
-end
-
-