asciidoctor-pdf 1.5.0.beta.1 → 1.5.0.beta.2

data/lib/asciidoctor-pdf/prawn_ext/font/afm.rb

@@ -1,10 +1,17 @@
+# frozen_string_literal: true
 class Prawn::Font::AFM
+  if defined? ::Asciidoctor::Logging
+    include ::Asciidoctor::Logging
+  else
+    include ::Asciidoctor::LoggingShim
+  end
+
   FALLBACK_CHARS = {
-    %(\u200b) => '',
-    %(\u202f) => %(\u00a0),
-    %(\u2009) => ' ',
-    %(\u25e6) => '-',
-    %(\u25aa) => %(\u00b7)
+    ?\u200b => '',
+    ?\u202f => ?\u00a0,
+    ?\u2009 => ' ',
+    ?\u25e6 => '-',
+    ?\u25aa => ?\u00b7
   }
 
   remove_method :normalize_encoding
@@ -17,9 +24,9 @@ class Prawn::Font::AFM
   def normalize_encoding text
     text.encode 'windows-1252', fallback: FALLBACK_CHARS
   rescue ::Encoding::UndefinedConversionError
-    warn 'The following text could not be fully converted to the Windows-1252 character set:'
-    warn %(#{text.gsub(/^/, '| ').rstrip})
-    text.encode 'windows-1252', undef: :replace, replace: %(\u00ac)
+    logger.warn %(The following text could not be fully converted to the Windows-1252 character set:
+#{text.gsub(/^/, '| ').rstrip})
+    text.encode 'windows-1252', undef: :replace, replace: ?\u00ac
   rescue ::Encoding::InvalidByteSequenceError
     raise Prawn::Errors::IncompatibleStringEncoding,
           %(Your document includes text which is not compatible with the Windows-1252 character set.

data/lib/asciidoctor-pdf/prawn_ext/formatted_text/fragment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Asciidoctor
 module Prawn
 module FormattedText

data/lib/asciidoctor-pdf/prawn_ext/images.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Asciidoctor
 module Prawn
 module Images
@@ -13,7 +14,7 @@ module Images
     if ::String === file && (((opts = opts.dup).delete :format) == 'svg' || (file.downcase.end_with? '.svg'))
       #opts[:enable_file_requests_with_root] = (::File.dirname file) unless opts.key? :enable_file_requests_with_root
       #opts[:enable_web_requests] = allow_uri_read if !(opts.key? :enable_web_requests) && (respond_to? :allow_uri_read)
-      #opts[:fallback_font_name] = default_svg_font if !(opts.key? :fallback_font_name) && (respond_to? :default_svg_font)
+      #opts[:fallback_font_name] = fallback_svg_font_name if !(opts.key? :fallback_font_name) && (respond_to? :fallback_svg_font_name)
       if (opts.key? :fit) && (fit = opts.delete :fit) && !opts[:width] && !opts[:height]
         svg (::File.read file), opts do |svg_doc|
           max_width, max_height = fit

data/lib/asciidoctor-pdf/roman_numeral.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ########################################################################
 #
 # This file was copied from roman-numerals and modified for use with

data/lib/asciidoctor-pdf/rouge_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rouge'
 require_relative 'rouge_ext/formatters/prawn'
 require_relative 'rouge_ext/themes/asciidoctor_pdf_default'

data/lib/asciidoctor-pdf/rouge_ext/formatters/prawn.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rouge
 module Formatters
 # Transforms a token stream into an array of

data/lib/asciidoctor-pdf/rouge_ext/themes/asciidoctor_pdf_default.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rouge
   module Themes
     # A variation on the pastie style from Pygments, customized for Asciidoctor PDF

data/lib/asciidoctor-pdf/rouge_ext/themes/bw.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rouge
   module Themes
     # A port of the bw style from Pygments.

data/lib/asciidoctor-pdf/sanitizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 unless RUBY_VERSION >= '2.4'
   begin
     require 'unicode' unless defined? Unicode::VERSION

data/lib/asciidoctor-pdf/temporary_path.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Asciidoctor
 module PDF
 module TemporaryPath

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 require 'safe_yaml/load'
 require 'ostruct'
-require_relative 'core_ext/ostruct'
 require_relative 'measurements'
 
 module Asciidoctor
@@ -16,12 +16,11 @@ class ThemeLoader
   DataDir = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', 'data'))
   ThemesDir = ::File.join DataDir, 'themes'
   FontsDir = ::File.join DataDir, 'fonts'
-  DefaultThemePath = ::File.expand_path 'default-theme.yml', ThemesDir
   BaseThemePath = ::File.expand_path 'base-theme.yml', ThemesDir
 
   VariableRx = /\$([a-z0-9_-]+)/
   LoneVariableRx = /^\$([a-z0-9_-]+)$/
-  HexColorEntryRx = /^(?<k> *\p{Graph}+): +(?!null$)(?<q>["']?)(?<h>#)?(?<v>[a-f0-9]{3,6})\k<q> *(?:#.*)?$/
+  HexColorEntryRx = /^(?<k> *\p{Graph}+): +(?!null$)(?<q>["']?)(?<h>#)?(?<v>[a-fA-F0-9]{3,6})\k<q> *(?:#.*)?$/
   MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
   AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
   PrecisionFuncRx = /^(round|floor|ceil)\(/
@@ -44,12 +43,12 @@ class ThemeLoader
 
   def self.resolve_theme_file theme_name = nil, theme_path = nil
     # if .yml extension is given, assume it's a path (don't append -theme.yml)
-    if ((theme_name ||= 'default').end_with? '.yml')
+    if theme_name && (theme_name.end_with? '.yml')
       # FIXME restrict to jail!
       theme_file = ::File.expand_path theme_name, theme_path
       theme_path ||= ::File.dirname theme_file
     else
-      theme_file = ::File.expand_path %(#{theme_name}-theme.yml), (theme_path || (theme_path = ThemesDir))
+      theme_file = ::File.expand_path %(#{theme_name || 'default'}-theme.yml), (theme_path ||= ThemesDir)
     end
     [theme_file, theme_path]
   end
@@ -69,9 +68,10 @@ class ThemeLoader
       load_base_theme
     else
       theme_data = load_file theme_file, nil, theme_path
-      unless theme_file == DefaultThemePath
-        # QUESTION should we enforce any other fallback values?
+      unless (::File.dirname theme_file) == ThemesDir
         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')
       end
@@ -82,9 +82,9 @@ class ThemeLoader
 
   def self.load_file filename, theme_data = nil, theme_path = nil
     data = ::File.read filename, encoding: ::Encoding::UTF_8
-    data = data.each_line.map {|l|
-      l.sub(HexColorEntryRx) { %(#{(m = $~)[:k]}: #{m[:h] || (m[:k].end_with? 'color') ? "'#{m[:v]}'" : m[:v]}) }
-    }.join unless filename == DefaultThemePath
+    data = data.each_line.map {|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
     if ::Hash === yaml_data && (yaml_data.key? 'extends')
       if (extends = yaml_data.delete 'extends')
@@ -93,7 +93,7 @@ class ThemeLoader
             theme_data = theme_data ? (::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h) : load_base_theme
             next
           elsif extend_file == 'default' || extend_file == 'default-with-fallback-font'
-            extend_file, extend_theme_path = resolve_theme_file extend_file
+            extend_file, extend_theme_path = resolve_theme_file extend_file, ThemesDir
           elsif extend_file.start_with? './'
             extend_file, extend_theme_path = resolve_theme_file extend_file, (::File.dirname filename)
           else
@@ -103,7 +103,7 @@ class ThemeLoader
         end
       end
     else
-      theme_data ||= (filename == DefaultThemePath ? nil : load_base_theme)
+      theme_data ||= ((::File.dirname filename) == ThemesDir ? nil : load_base_theme)
     end
     self.new.load yaml_data, theme_data, theme_path
   end
@@ -116,7 +116,7 @@ class ThemeLoader
 
   def process_entry key, val, data
     key = key.tr '-', '_' if key.include? '-'
-    if key == 'font_catalog' || key == 'font_fallbacks'
+    if key.start_with? 'font_'
       data[key] = val
     elsif key.start_with? 'admonition_icon_'
       data[key] = (val || {}).map do |(key2, val2)|

data/lib/asciidoctor-pdf/ttfunk_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # patch ttfunk 1.5.0; see https://github.com/prawnpdf/ttfunk/issues/39
 class TTFunk::Subset::Base
   alias __checksum checksum

data/lib/asciidoctor-pdf/version.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Asciidoctor
 module PDF
-  VERSION = '1.5.0.beta.1'
+  VERSION = '1.5.0.beta.2'
 end
 Pdf = PDF unless const_defined? :Pdf, false
 end

data/lib/asciidoctor/pdf.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require_relative '../asciidoctor-pdf'

data/lib/asciidoctor/pdf/version.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require_relative '../../asciidoctor-pdf/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.beta.1
+  version: 1.5.0.beta.2
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -177,20 +177,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -248,12 +242,19 @@ files:
 - README.adoc
 - asciidoctor-pdf.gemspec
 - bin/asciidoctor-pdf
-- data/fonts/LICENSE-mplus-testflight-58
-- data/fonts/LICENSE-noto-2015-06-05
+- data/fonts/ABOUT-mplus1mn-subset
+- data/fonts/ABOUT-mplus1p-subset
+- data/fonts/ABOUT-notoserif-subset
+- data/fonts/LICENSE-mplus
+- data/fonts/LICENSE-notoserif
 - data/fonts/mplus1mn-bold-ascii.ttf
+- 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/notoserif-bold-subset.ttf
 - data/fonts/notoserif-bold_italic-subset.ttf
@@ -278,7 +279,6 @@ files:
 - lib/asciidoctor-pdf/core_ext/hash.rb
 - lib/asciidoctor-pdf/core_ext/numeric.rb
 - lib/asciidoctor-pdf/core_ext/object.rb
-- lib/asciidoctor-pdf/core_ext/ostruct.rb
 - lib/asciidoctor-pdf/core_ext/quantifiable_stdout.rb
 - lib/asciidoctor-pdf/core_ext/regexp.rb
 - lib/asciidoctor-pdf/core_ext/string.rb

data/lib/asciidoctor-pdf/core_ext/ostruct.rb

@@ -1,8 +0,0 @@
-class OpenStruct
-  def delete key
-    begin
-      delete_field key
-    rescue ::NameError
-    end
-  end unless method_defined? :delete
-end