asciidoctor-pdf-linewrap-ja 0.3.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 106b114729d658fe2805aa3dad294cf5f8dbe202
-  data.tar.gz: e67e9a76a391a44ae716133c6344ddb241248bbf
+  metadata.gz: beab95b686c5c3eedfefacf0554aa7199abbf793
+  data.tar.gz: ab8b6781990426cecd3bb3869be12c066ecfabc4
 SHA512:
-  metadata.gz: 9937982fe7976d50ff05ced68216195082107c38ba654550e32b9c138092221d8c69747ab254944d72fae30d53c502d026ad1c8eb7d063546d3965270ebfab2f
-  data.tar.gz: b1ad88372d54dc3a7c8e0e3c6b5060a384ddb8952d6bea581d43b6cd3963bc548e08d82eb662ac65cb1783bdfc19c326abcb5833fb320a8b9b5941f6f642924e
+  metadata.gz: e9ff04c97eb37c6ef32731e69904d4bc3ec498d6148626f67db3e1b8a47ca4ba25362e85b3c38df2e9fb43484f29d2a8e1d61d1421be94b4173ca96c63427e09
+  data.tar.gz: 5d5d6a78325739d19a9e3191d516748ed44653f77f60aed65132fcc9a760b610d85fd734e4e1e13fa3ecda93b6aac3b46d288ed0cf41ff46af32639f84ec04a0

data/asciidoctor-pdf-linewrap-ja.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor-pdf", "~> 1.5.0.alpha.16"
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/asciidoctor-pdf-linewrap-ja.rb

@@ -1 +1 @@
-require_relative 'asciidoctor/pdf/linewrap/ja'
+require_relative 'asciidoctor/pdf/linewrap/ja'

data/lib/asciidoctor/pdf/linewrap/ja.rb

@@ -9,6 +9,31 @@ Extensions.register do
   treeprocessor do
 
     process do |document|
+
+      tables = document.find_by context: :table
+        tables.each do |table|
+        table.rows.head.each do |head|
+          head.each do |cell|
+            raw_text = get_raw_text(cell)
+            cell.text = Asciidoctor::Pdf::Linewrap::Ja::Converter::insert_zero_width_space(raw_text)
+          end
+        end
+
+        table.rows.body.each do |body|
+          body.each do |cell|
+            raw_text = get_raw_text(cell)
+            cell.text = Asciidoctor::Pdf::Linewrap::Ja::Converter::insert_zero_width_space(raw_text)
+          end
+        end
+
+        table.rows.foot.each do |foot|
+          foot.each do |cell|
+            raw_text = get_raw_text(cell)
+            cell.text = Asciidoctor::Pdf::Linewrap::Ja::Converter::insert_zero_width_space(raw_text)
+          end
+        end
+      end
+
       paragraphs = document.find_by context: :paragraph
       paragraphs.each do |paragraph|
         paragraph.lines.each_with_index do |line, i|
@@ -18,7 +43,23 @@ Extensions.register do
 
       list_items = document.find_by context: :list_item
       list_items.each do |list_item|
-        list_item.text = Asciidoctor::Pdf::Linewrap::Ja::Converter::insert_zero_width_space(list_item.text)
+        raw_text = get_raw_text(list_item)
+        list_item.text = Asciidoctor::Pdf::Linewrap::Ja::Converter::insert_zero_width_space(raw_text)
+      end
+
+      admonitions = document.find_by context: :admonition
+      admonitions.each do |admonition|
+        admonition.lines.each_with_index do |line, i|
+          admonition.lines[i] = Asciidoctor::Pdf::Linewrap::Ja::Converter::insert_zero_width_space(line)
+        end
+      end
+    end
+
+    def get_raw_text(item)
+      if item.instance_variable_defined?('@text')
+        return item.instance_variable_get('@text')
+      else
+        return item.text
       end
     end
   end

data/lib/asciidoctor/pdf/linewrap/ja/converter.rb

@@ -6,29 +6,24 @@ module Asciidoctor
 
           # 行頭禁則文字
           PROHIBIT_LINE_BREAK_BEFORE =
-            '）｝〕〉》」』】〙〗〟｠»' +
-            'ゝゞーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇷ゚ㇺㇻㇼㇽㇾㇿ々〻' +
-            'ｧｨｩｪｫｯｬｭｮ' +
-            '‐゠〜～' +
-            '‼⁇⁈⁉' +
-            '？！' +
-            '・' +
-            '、。'
-
-          # 行頭禁則文字（半角）
-          PROHIBIT_LINE_BREAK_BEFORE_HALF_WIDTH =
-            ')]>}' +
-            '-=~' +
-            '?!'
+          '’”）〕］｝〉》」』】｠〙〗»〟' +  # 終わり括弧類（cl-02）
+          '‐〜゠–' + # ハイフン類（cl-03）
+          '！？‼⁇⁈⁉' + # 区切り約物（cl-04）
+          '・：；' + # 中点類（cl-05）
+          '。．' + # 句点類（cl-06）
+          '、，' + # 読点類（cl-07）
+          'ヽヾゝゞ々〻' + # 繰返し記号（cl-09）
+          'ー' + # 長音記号（cl-10）
+          'ぁぃぅぇぉァィゥェォっゃゅょゎゕゖッャュョヮヵヶㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿㇷ゚' + # 小書きの仮名（cl-11）
+          '）〕］' # 割注終わり括弧類（cl-29）
 
           # 行末禁則文字
-          PROHIBIT_LINE_BREAK_AFTER = '（｛〔〈《「『【〘〖〝｟«'
-
-          # 行末禁則文字（半角）
-          PROHIBIT_LINE_BREAK_AFTER_HALF_WIDTH = '([<{'
+          PROHIBIT_LINE_BREAK_AFTER =
+            '‘“（〔［｛〈《「『【｟〘〖«〝' + # 始め括弧類（cl-01）
+            '（〔［' # 割注始め括弧類（cl-28）
 
           # 分離禁止文字
-          PROHIBIT_DIVIDE = '…‥〳〴〵'
+          PROHIBIT_DIVIDE = '—…‥〳〴〵' # 分離禁止文字（cl-08）
 
           # ゼロ幅スペース
           ZERO_WIDTH_SPACE = '{zwsp}'
@@ -36,6 +31,8 @@ module Asciidoctor
 
           def self.insert_zero_width_space(line)
 
+            return line if line.nil?
+
             new_line = ''
 
             line.each_char.with_index do |ch, idx|
@@ -44,7 +41,7 @@ module Asciidoctor
               new_line << ZERO_WIDTH_SPACE if insert_zero_width_space?(ch, line[idx + 1])
             end
 
-            return new_line
+            return remove_zero_width_space(new_line)
           end
 
           def self.insert_zero_width_space?(ch, next_ch)
@@ -58,6 +55,16 @@ module Asciidoctor
             return false
           end
 
+          def self.remove_zero_width_space(line)
+            line = line.gsub(/http.*?[\]\s]/) do |href|
+              href.gsub(/#{ZERO_WIDTH_SPACE}/, "")
+            end
+
+            line.gsub(/image:.*?\]/) do |image|
+              image.gsub(/#{ZERO_WIDTH_SPACE}/, "")
+            end
+          end
+
           def self.japanese_char?(ch)
             (/[\p{Han}\p{Hiragana}\p{Katakana}ー]/ === ch) \
             || PROHIBIT_LINE_BREAK_BEFORE.include?(ch) \
@@ -70,11 +77,11 @@ module Asciidoctor
           end
 
           def self.prohibit_line_break_after?(ch)
-            PROHIBIT_LINE_BREAK_AFTER.include?(ch) || PROHIBIT_LINE_BREAK_AFTER_HALF_WIDTH.include?(ch)
+            PROHIBIT_LINE_BREAK_AFTER.include?(ch)
           end
 
           def self.prohibit_line_break_before?(ch)
-            ch == nil || PROHIBIT_LINE_BREAK_BEFORE.include?(ch) || PROHIBIT_LINE_BREAK_BEFORE_HALF_WIDTH.include?(ch)
+            ch == nil || PROHIBIT_LINE_BREAK_BEFORE.include?(ch)
           end
 
           def self.prohibit_divide?(ch, next_ch)

data/lib/asciidoctor/pdf/linewrap/ja/version.rb

@@ -2,7 +2,7 @@ module Asciidoctor
   module Pdf
     module Linewrap
       module Ja
-        VERSION = "0.3.0"
+        VERSION = "0.7.1"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf-linewrap-ja
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.1
 platform: ruby
 authors:
 - y.fukazawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-pdf
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Asciidoctor PDF extension providing better line wrap for Japanese document.