asciidoctor-pdf 1.6.2 → 2.0.0.alpha.1

data/lib/asciidoctor/pdf/section_info_by_page.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Asciidoctor
+  module PDF
+    class SectionInfoByPage
+      def initialize title_method
+        @table = {}
+        @title_method = title_method
+      end
+
+      def []= pgnum, val
+        if ::Asciidoctor::Section === val
+          @table[pgnum] = { title: val.send(*@title_method), numeral: val.numeral }
+        else
+          @table[pgnum] = { title: val }
+        end
+      end
+
+      def [] pgnum
+        @table[pgnum]
+      end
+    end
+  end
+end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'safe_yaml/load'
 require 'ostruct'
 require_relative 'measurements'
 
@@ -14,21 +13,18 @@ module Asciidoctor
       ThemesDir = ::File.join DataDir, 'themes'
       FontsDir = ::File.join DataDir, 'fonts'
       BaseThemePath = ::File.join ThemesDir, 'base-theme.yml'
+      BundledThemeNames = (::Dir.children ThemesDir).map {|it| it.slice 0, it.length - 10 }
+      DeprecatedCategoryKeys = { 'blockquote' => 'quote', 'key' => 'kbd', 'literal' => 'codespan', 'outline_list' => 'list' }
 
       VariableRx = /\$([a-z0-9_-]+)/
       LoneVariableRx = /^\$([a-z0-9_-]+)$/
-      HexColorEntryRx = /^(?<k> *\p{Graph}+): +(?!null$)(?<q>["']?)(?<h>#)?(?<v>[a-fA-F0-9]{3,6})\k<q> *(?:#.*)?$/
-      MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
+      HexColorEntryRx = /^(?<k> *\p{Graph}+): +(?!null$)(?<q>["']?)(?<h>#)?(?<v>\h\h\h\h{0,3})\k<q> *(?:#.*)?$/
+      MultiplyDivideOpRx = %r((-?\d+(?:\.\d+)?) +([*/^]) +(-?\d+(?:\.\d+)?))
       AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
       PrecisionFuncRx = /^(round|floor|ceil)\(/
 
-      # TODO: implement white? & black? methods
       module ColorValue; end
 
-      class HexColorValue < String
-        include ColorValue
-      end
-
       # A marker module for a normalized CMYK array
       # Prevents normalizing CMYK value more than once
       module CMYKColorValue
@@ -38,9 +34,17 @@ module Asciidoctor
         end
       end
 
+      class HexColorValue < String
+        include ColorValue
+      end
+
+      class TransparentColorValue < String
+        include ColorValue
+      end
+
       def self.resolve_theme_file theme_name = nil, theme_dir = nil
-        # NOTE if .yml extension is given, assume it's a path (don't append -theme.yml)
-        if theme_name && (theme_name.end_with? '.yml')
+        # NOTE: if .yml extension is given, assume it's a path (don't append -theme.yml)
+        if theme_name&.end_with? '.yml'
           # FIXME: restrict to jail!
           if theme_dir
             theme_path = ::File.absolute_path theme_name, (theme_dir = ::File.expand_path theme_dir)
@@ -59,9 +63,11 @@ module Asciidoctor
         ::File.absolute_path asset_path, (theme_dir || ThemesDir)
       end
 
-      # NOTE base theme is loaded "as is" (no post-processing)
+      # NOTE: base theme is loaded "as is" (no post-processing)
       def self.load_base_theme
-        (::OpenStruct.new ::SafeYAML.load_file BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
+        ::File.open BaseThemePath, mode: 'r:UTF-8' do |io|
+          (::OpenStruct.new ::YAML.safe_load io, aliases: true, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
+        end
       end
 
       def self.load_theme theme_name = nil, theme_dir = nil
@@ -74,13 +80,14 @@ module Asciidoctor
             theme_data.base_align ||= 'left'
             theme_data.base_line_height ||= 1
             theme_data.base_font_color ||= '000000'
-            theme_data.code_font_family ||= (theme_data.literal_font_family || 'Courier')
-            theme_data.conum_font_family ||= (theme_data.literal_font_family || 'Courier')
+            theme_data.code_font_family ||= (theme_data.codespan_font_family || 'Courier')
+            theme_data.conum_font_family ||= (theme_data.codespan_font_family || 'Courier')
             if (heading_font_family = theme_data.heading_font_family)
               theme_data.abstract_title_font_family ||= heading_font_family
               theme_data.sidebar_title_font_family ||= heading_font_family
             end
           end
+          theme_data.delete_field :__loaded__
           theme_data.__dir__ = theme_dir
           theme_data
         end
@@ -88,28 +95,26 @@ module Asciidoctor
 
       def self.load_file filename, theme_data = nil, theme_dir = nil
         data = ::File.read filename, mode: 'r:UTF-8', newline: :universal
-        data = data.each_line.map {|line|
+        data = data.each_line.map do |line|
           line.sub(HexColorEntryRx) { %(#{(m = $~)[:k]}: #{m[:h] || (m[:k].end_with? 'color') ? "'#{m[:v]}'" : m[:v]}) }
-        }.join unless (::File.dirname filename) == ThemesDir
-        yaml_data = ::SafeYAML.load data, filename
-        if ::Hash === yaml_data && (yaml_data.key? 'extends')
-          if (extends = yaml_data.delete 'extends')
-            (Array extends).each do |extend_path|
-              if extend_path == 'base'
-                theme_data = theme_data ? (::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h) : load_base_theme
-                next
-              elsif extend_path == 'default' || extend_path == 'default-with-fallback-font'
-                extend_path, extend_theme_dir = resolve_theme_file extend_path, ThemesDir
-              elsif extend_path.start_with? './'
-                extend_path, extend_theme_dir = resolve_theme_file extend_path, (::File.dirname filename)
-              else
-                extend_path, extend_theme_dir = resolve_theme_file extend_path, theme_dir
-              end
-              theme_data = load_file extend_path, theme_data, extend_theme_dir
+        end.join unless (::File.dirname filename) == ThemesDir
+        yaml_data = ::YAML.safe_load data, aliases: true, filename: filename
+        (loaded = (theme_data ||= ::OpenStruct.new).__loaded__ ||= ::Set.new).add filename
+        if ::Hash === yaml_data && (extends = yaml_data.delete 'extends')
+          (Array extends).each do |extend_path|
+            extend_path = extend_path.slice 0, extend_path.length - 11 if (force = extend_path.end_with? ' !important')
+            if extend_path == 'base'
+              theme_data = ::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h if (loaded.add? 'base') || force
+              next
+            elsif BundledThemeNames.include? extend_path
+              extend_path, extend_theme_dir = resolve_theme_file extend_path, ThemesDir
+            elsif extend_path.start_with? './'
+              extend_path, extend_theme_dir = resolve_theme_file extend_path, (::File.dirname filename)
+            else
+              extend_path, extend_theme_dir = resolve_theme_file extend_path, theme_dir
             end
+            theme_data = load_file extend_path, theme_data, extend_theme_dir if (loaded.add? extend_path) || force
           end
-        else
-          theme_data ||= ((::File.dirname filename) == ThemesDir ? nil : load_base_theme)
         end
         new.load yaml_data, theme_data
       end
@@ -128,30 +133,46 @@ module Asciidoctor
           end if ::Hash === val
         elsif key == 'font_catalog'
           data[key] = ::Hash === val ? (val.reduce (val.delete 'merge') ? data[key] || {} : {} do |accum, (name, styles)| # rubocop:disable Style/EachWithObject
-            styles = %w(normal bold italic bold_italic).map {|style| [style, styles] }.to_h if ::String === styles
+            styles = { '*' => styles } if ::String === styles
             accum[name] = styles.reduce({}) do |subaccum, (style, path)| # rubocop:disable Style/EachWithObject
               if (path.start_with? 'GEM_FONTS_DIR') && (sep = path[13])
                 path = %(#{FontsDir}#{sep}#{path.slice 14, path.length})
               end
-              subaccum[style == 'regular' ? 'normal' : style] = expand_vars path, data
+              expanded_path = expand_vars path, data
+              case style
+              when '*'
+                %w(normal bold italic bold_italic).map {|it| subaccum[it] = expanded_path }
+              when 'regular'
+                subaccum['normal'] = expanded_path
+              else
+                subaccum[style] = expanded_path
+              end
               subaccum
             end if ::Hash === styles
             accum
-          end) : {}
+          end) : nil
         elsif key == 'font_fallbacks'
           data[key] = ::Array === val ? val.map {|name| expand_vars name.to_s, data } : []
         elsif key.start_with? 'admonition_icon_'
-          data[key] = val ? val.map {|(key2, val2)|
+          data[key] = val.map do |(key2, val2)|
             key2 = key2.tr '-', '_' if key2.include? '-'
             [key2.to_sym, (key2.end_with? '_color') ? (to_color evaluate val2, data) : (evaluate val2, data)]
-          }.to_h : {}
+          end.to_h if val
         elsif ::Hash === val
+          if (rekey = DeprecatedCategoryKeys[key])
+            logger.warn %(the #{key.tr '_', '-'} theme category is deprecated; use the #{rekey.tr '_', '-'} category instead)
+            key = rekey
+          end
           val.each do |subkey, subval|
             process_entry %(#{key}_#{key == 'role' || !(subkey.include? '-') ? subkey : (subkey.tr '-', '_')}), subval, data
           end
+        # QUESTION: do we really need to evaluate_math in this case?
         elsif key.end_with? '_color'
-          # QUESTION do we really need to evaluate_math in this case?
-          data[key] = to_color evaluate val, data
+          if key == 'table_grid_color' && (Array val).size == 2
+            data[key] = val.map {|it| to_color evaluate it, data }
+          else
+            data[key] = to_color evaluate val, data
+          end
         elsif key.end_with? '_content'
           data[key] = (expand_vars val.to_s, data).to_s
         else
@@ -171,46 +192,37 @@ module Asciidoctor
         end
       end
 
-      # NOTE we assume expr is a String
+      # NOTE: we assume expr is a String
       def expand_vars expr, vars
-        if (idx = (expr.index '$'))
-          if idx == 0 && expr =~ LoneVariableRx
-            if (key = $1).include? '-'
-              key = key.tr '-', '_'
-            end
-            if vars.respond_to? key
-              vars[key]
-            else
-              logger.warn %(unknown variable reference in PDF theme: $#{$1})
-              expr
-            end
-          else
-            expr.gsub VariableRx do
-              if (key = $1).include? '-'
-                key = key.tr '-', '_'
-              end
-              if vars.respond_to? key
-                vars[key]
-              else
-                logger.warn %(unknown variable reference in PDF theme: $#{$1})
-                $&
-              end
-            end
-          end
+        return expr unless (idx = expr.index '$')
+        if idx == 0
+          return resolve_var vars, expr, $1 if expr =~ LoneVariableRx
+        elsif idx == 1 && expr.chr == '-' && (negated_expr = expr.slice 1, expr.length) =~ LoneVariableRx
+          return Numeric === (val = resolve_var vars, negated_expr, $1) ? -val : '-' + val
+        end
+        expr.gsub(VariableRx) { resolve_var vars, $&, $1 }
+      end
+
+      def resolve_var vars, ref, var
+        var = var.tr '-', '_' if var.include? '-'
+        if (vars.respond_to? var) ||
+            DeprecatedCategoryKeys.any? {|old, new| (var.start_with? old + '_') && (vars.respond_to? (replace = new + (var.slice old.length, var.length))) && (var = replace) }
+          vars[var]
         else
-          expr
+          logger.warn %(unknown variable reference in PDF theme: #{ref})
+          ref
         end
       end
 
       def evaluate_math expr
         return expr if !(::String === expr) || ColorValue === expr
         # resolve measurement values (e.g., 0.5in => 36)
-        # QUESTION should we round the value? perhaps leave that to the precision functions
-        # NOTE leave % as a string; handled by converter for now
+        # QUESTION: should we round the value? perhaps leave that to the precision functions
+        # NOTE: leave % as a string; handled by converter for now
         original, expr = expr, (resolve_measurement_values expr)
-        loop do
-          if (expr.count '*/') > 0
-            result = expr.gsub(MultiplyDivideOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
+        while true
+          if (expr.count '*/^') > 0
+            result = expr.gsub(MultiplyDivideOpRx) { $1.to_f.send ($2 == '^' ? '**' : $2).to_sym, $3.to_f }
             unchanged = (result == expr)
             expr = result
             break if unchanged
@@ -218,7 +230,7 @@ module Asciidoctor
             break
           end
         end
-        loop do
+        while true
           if (expr.count '+-') > 0
             result = expr.gsub(AddSubtractOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
             unchanged = (result == expr)
@@ -253,7 +265,7 @@ module Asciidoctor
               if ::Numeric === e
                 e *= 100.0 unless e > 1
               else
-                e = e.to_s.chomp('%').to_f
+                e = (e.to_s.chomp '%').to_f
               end
               e == (int_e = e.to_i) ? int_e : e
             end
@@ -263,25 +275,23 @@ module Asciidoctor
             when [100, 100, 100, 100]
               return HexColorValue.new '000000'
             else
-              value.extend CMYKColorValue
-              return value
+              return value.extend CMYKColorValue
             end
           # RGB value
           when 3
-            return HexColorValue.new value.map {|e| '%02X' % e }.join
+            return HexColorValue.new value.map {|e| sprintf '%02X', e }.join
           # Nonsense array value; flatten to string
           else
             value = value.join
           end
         when ::String
           if value == 'transparent'
-            # FIXME: should we have a TransparentColorValue class?
-            return HexColorValue.new value
+            return TransparentColorValue.new value
           elsif value.length == 6
             return HexColorValue.new value.upcase
           end
         when ::NilClass
-          return nil
+          return
         else
           # Unknown type (usually Integer); coerce to String
           if (value = value.to_s).length == 6

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.6.2'
+    VERSION = '2.0.0.alpha.1'
   end
-  Pdf = PDF unless const_defined? :Pdf, false
 end

data/lib/asciidoctor/pdf.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 require_relative 'pdf/version'
-require 'asciidoctor' unless defined? Asciidoctor.load
+require 'asciidoctor'
 require 'prawn'
+# NOTE: patch float precision constant so prawn-table does not fail to arrange cells that span columns (see #1835)
 Prawn.send :remove_const, :FLOAT_PRECISION
 Prawn::FLOAT_PRECISION = 1e-3
 require 'prawn/templates'
 begin
   require 'prawn/gmagick'
-rescue LoadError
+rescue LoadError # rubocop:disable Lint/SuppressedException
 end unless defined? GMagick::Image
+autoload :Set, 'set'
+require 'time' unless defined? Time.parse
 require_relative 'pdf/measurements'
 require_relative 'pdf/sanitizer'
 require_relative 'pdf/text_transformer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 2.0.0.alpha.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +109,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
@@ -179,34 +179,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rouge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: coderay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -241,54 +213,51 @@ files:
 - data/fonts/ABOUT-mplus1mn-subset
 - data/fonts/ABOUT-mplus1p-subset
 - data/fonts/ABOUT-notoemoji-subset
+- data/fonts/ABOUT-notosans-subset
 - data/fonts/ABOUT-notoserif-subset
 - data/fonts/LICENSE-mplus
-- data/fonts/LICENSE-notoserif
-- data/fonts/mplus1mn-bold-ascii.ttf
+- data/fonts/LICENSE-noto
 - data/fonts/mplus1mn-bold-subset.ttf
-- data/fonts/mplus1mn-bold_italic-ascii.ttf
 - data/fonts/mplus1mn-bold_italic-subset.ttf
-- data/fonts/mplus1mn-italic-ascii.ttf
 - data/fonts/mplus1mn-italic-subset.ttf
-- data/fonts/mplus1mn-regular-ascii-conums.ttf
 - data/fonts/mplus1mn-regular-subset.ttf
 - data/fonts/mplus1p-regular-fallback.ttf
 - data/fonts/notoemoji-subset.ttf
+- data/fonts/notosans-bold-subset.ttf
+- data/fonts/notosans-bold_italic-subset.ttf
+- data/fonts/notosans-italic-subset.ttf
+- data/fonts/notosans-regular-subset.ttf
 - data/fonts/notoserif-bold-subset.ttf
 - data/fonts/notoserif-bold_italic-subset.ttf
 - data/fonts/notoserif-italic-subset.ttf
 - data/fonts/notoserif-regular-subset.ttf
 - data/themes/base-theme.yml
+- data/themes/default-for-print-theme.yml
+- data/themes/default-for-print-with-fallback-font-theme.yml
 - data/themes/default-theme.yml
 - data/themes/default-with-fallback-font-theme.yml
+- data/themes/sans-with-fallback-font-theme.yml
 - docs/theming-guide.adoc
 - lib/asciidoctor-pdf.rb
-- lib/asciidoctor-pdf/converter.rb
-- lib/asciidoctor-pdf/version.rb
 - lib/asciidoctor/pdf.rb
 - lib/asciidoctor/pdf/converter.rb
 - lib/asciidoctor/pdf/ext.rb
 - lib/asciidoctor/pdf/ext/asciidoctor.rb
-- lib/asciidoctor/pdf/ext/asciidoctor/abstract_block.rb
-- lib/asciidoctor/pdf/ext/asciidoctor/abstract_node.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/document.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/image.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/list.rb
-- lib/asciidoctor/pdf/ext/asciidoctor/list_item.rb
-- lib/asciidoctor/pdf/ext/asciidoctor/logging_shim.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/section.rb
 - lib/asciidoctor/pdf/ext/core.rb
-- lib/asciidoctor/pdf/ext/core/array.rb
 - lib/asciidoctor/pdf/ext/core/file.rb
-- lib/asciidoctor/pdf/ext/core/hash.rb
 - lib/asciidoctor/pdf/ext/core/object.rb
 - lib/asciidoctor/pdf/ext/core/quantifiable_stdout.rb
-- lib/asciidoctor/pdf/ext/core/regexp.rb
 - lib/asciidoctor/pdf/ext/core/string.rb
 - lib/asciidoctor/pdf/ext/pdf-core.rb
 - lib/asciidoctor/pdf/ext/pdf-core/page.rb
-- lib/asciidoctor/pdf/ext/pdf-core/pdf_object.rb
 - lib/asciidoctor/pdf/ext/prawn-svg.rb
+- lib/asciidoctor/pdf/ext/prawn-svg/loaders/data.rb
+- lib/asciidoctor/pdf/ext/prawn-svg/loaders/web.rb
+- lib/asciidoctor/pdf/ext/prawn-svg/url_loader.rb
 - lib/asciidoctor/pdf/ext/prawn-table.rb
 - lib/asciidoctor/pdf/ext/prawn-table/cell.rb
 - lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb
@@ -324,6 +293,7 @@ files:
 - lib/asciidoctor/pdf/pdfmark.rb
 - lib/asciidoctor/pdf/roman_numeral.rb
 - lib/asciidoctor/pdf/sanitizer.rb
+- lib/asciidoctor/pdf/section_info_by_page.rb
 - lib/asciidoctor/pdf/text_transformer.rb
 - lib/asciidoctor/pdf/theme_loader.rb
 - lib/asciidoctor/pdf/version.rb
@@ -346,11 +316,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn

data/lib/asciidoctor/pdf/ext/asciidoctor/abstract_block.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Asciidoctor::AbstractBlock
-  def sections?
-    !sections.empty?
-  end unless method_defined? :sections?
-end

data/lib/asciidoctor/pdf/ext/asciidoctor/abstract_node.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Asciidoctor::AbstractNode
-  def remove_attr name
-    @attributes.delete name
-  end unless method_defined? :remove_attr
-end

data/lib/asciidoctor/pdf/ext/asciidoctor/list_item.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: add these methods to Asciidoctor core
-class Asciidoctor::ListItem
-  # Check whether this list item has complex content (i.e., nested blocks other than an outline list).
-  #
-  # Return false if the list item contains no blocks or it contains a nested outline list. Otherwise, return true.
-  def complex?
-    !simple?
-  end unless method_defined? :complex?
-
-  # Check whether this list item has simple content (i.e., no nested blocks aside from an outline list).
-  #
-  # Return true if the list item contains no blocks or it contains a nested outline list. Otherwise, return false.
-  def simple?
-    @blocks.empty? || (@blocks.size == 1 && Asciidoctor::List === (blk = @blocks[0]) && blk.outline?)
-  end unless method_defined? :simple?
-end

data/lib/asciidoctor/pdf/ext/asciidoctor/logging_shim.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Asciidoctor
-  class StubLogger
-    class << self
-      def info message = nil
-        # ignore since this isn't a real logger
-      end
-
-      def info?
-        false
-      end
-
-      def warn message = nil
-        ::Kernel.warn %(asciidoctor: WARNING: #{message || (block_given? ? yield : '???')})
-      end
-
-      def error message = nil
-        ::Kernel.warn %(asciidoctor: ERROR: #{message || (block_given? ? yield : '???')})
-      end
-    end
-  end
-
-  module Logging
-    def logger
-      StubLogger
-    end
-
-    def message_with_context text, _context = {}
-      text
-    end
-  end
-end

data/lib/asciidoctor/pdf/ext/core/array.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class Array
-  def delete_all *entries
-    entries.map {|entry| delete entry }.compact
-  end unless method_defined? :delete_all
-
-  def sum
-    reduce(&:+)
-  end unless method_defined? :sum
-end

data/lib/asciidoctor/pdf/ext/core/hash.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Hash
-  def compact
-    select {|_, val| val }
-  end unless method_defined? :compact
-end

data/lib/asciidoctor/pdf/ext/core/regexp.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class Regexp
-  alias match? === unless Regexp.method_defined? :match?
-end