asciidoctor-pdf-linewrap-ja 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a619d460c8bd19a422ebe31801a8413642221e60
-  data.tar.gz: 624d57daabf8e921621568c7a860381fff671f6c
+SHA256:
+  metadata.gz: 4b04bd147272f78f22c84293142a431b424ae3b6594b123c091b679c057be248
+  data.tar.gz: '08160ea233cddfd75ddc7d79f9fd4cb1c30d34cd20375ef2a65f20372a563b64'
 SHA512:
-  metadata.gz: 3bd6a9a827ed4f00bf46c43cdbdba8794aa4f99e0b4da46333d634a2717bd55e8dec4d2ce7354ce154a6fb9b470772e9dbff4d5611306297dba61201b910cd20
-  data.tar.gz: cb6ad32fcb3c0a916a2fde75d813bc1dd26e64826914a5cb5cafc014fd513b72d8818afb83b3ac80a91050c015df30c89f3824c592ed6f84ec2f41c43342679a
+  metadata.gz: afceaa124938ac6e65dd1c3601485d80fffc751e181fe409b267d8d7540c03cf34d2c6cfebbdc8776830a4488cbbb0d524f52a9491156f92651fc742f26250d5
+  data.tar.gz: 849e665eeac18586ba2fd28d2a46bfed402d80ced0b75d85b303f0f16d75ca3d4d5f4ee484d3958b5665331a5463d2e29ae7574c29ae2bff72059067a940870d

data/asciidoctor-pdf-linewrap-ja.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  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_dependency "asciidoctor-pdf", "~> 1.6.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 13.0.0"
   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

@@ -46,6 +46,13 @@ Extensions.register do
         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)

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}'
@@ -51,7 +46,9 @@ module Asciidoctor
 
           def self.insert_zero_width_space?(ch, next_ch)
 
-            if japanese_char?(ch)
+            if ch == '\\'
+              return false
+            elsif japanese_char?(ch)
               return !prohibit_line_break?(ch, next_ch)
             elsif next_ch != nil && japanese_char?(next_ch)
               return !prohibit_line_break_before?(next_ch)
@@ -61,9 +58,13 @@ module Asciidoctor
           end
 
           def self.remove_zero_width_space(line)
-            line.gsub(/http.*?[\]\s]/) do |href|
+            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)
@@ -78,11 +79,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.5.0"
+        VERSION = "0.8.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf-linewrap-ja
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - y.fukazawa
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-pdf
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.alpha.16
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.alpha.16
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: 
+description:
 email:
 - fuka@backport.net
 executables: []
@@ -90,7 +90,7 @@ homepage: https://github.com/fuka/asciidoctor-pdf-linewrap-ja
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Asciidoctor PDF extension providing better line wrap for Japanese document.
 test_files: []