asciidoctor-pdf 1.5.0.alpha.16 → 1.5.0.alpha.17

data/lib/asciidoctor-pdf/temporary_path.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
-module Pdf
+module PDF
 module TemporaryPath
   def unlink
     ::File.unlink self

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -4,9 +4,14 @@ require_relative 'core_ext/ostruct'
 require_relative 'measurements'
 
 module Asciidoctor
-module Pdf
+module PDF
 class ThemeLoader
-  include ::Asciidoctor::Pdf::Measurements
+  include ::Asciidoctor::PDF::Measurements
+  if defined? ::Asciidoctor::Logging
+    include ::Asciidoctor::Logging
+  else
+    include ::Asciidoctor::LoggingShim
+  end
 
   DataDir = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', 'data'))
   ThemesDir = ::File.join DataDir, 'themes'
@@ -39,7 +44,7 @@ class ThemeLoader
 
   def self.resolve_theme_file theme_name = nil, theme_path = nil
     theme_name ||= 'default'
-    # if .yml extension is given, assume it's a full file name
+    # if .yml extension is given, don't append -theme.yml
     if (theme_name.end_with? '.yml')
       # FIXME restrict to jail!
       # QUESTION why are we not using expand_path in this case?
@@ -63,25 +68,21 @@ class ThemeLoader
     if (theme_file = resolve_theme_file theme_name, theme_path) == BaseThemePath ||
         (theme_file != DefaultThemePath && (opts.fetch :apply_base_theme, true))
       theme_data = load_base_theme
-    else
-      theme_data = nil
     end
 
-    if theme_file == BaseThemePath
-      theme_data
-    else
-      load_file theme_file, theme_data
-    end
+    theme_file == BaseThemePath ? theme_data : (load_file theme_file, theme_data)
   end
 
   def self.load_file filename, theme_data = nil
-    raw_data = (::IO.read filename, encoding: ::Encoding::UTF_8).each_line.map {|l| l.sub HexColorEntryRx, '\k<k>: \'\k<v>\'' }.join
+    raw_data = (::File.read filename, encoding: ::Encoding::UTF_8).each_line.map {|l| l.sub HexColorEntryRx, '\k<k>: \'\k<v>\'' }.join
     self.new.load((::SafeYAML.load raw_data), theme_data)
   end
 
   def load hash, theme_data = nil
     theme_data ||= ::OpenStruct.new
     return theme_data unless ::Hash === hash
+    base_code_font_family = theme_data.delete 'code_font_family'
+    base_conum_font_family = theme_data.delete 'conum_font_family'
     hash.inject(theme_data) {|data, (key, val)| process_entry key, val, data }
     # NOTE remap legacy running content keys (e.g., header_recto_content_left => header_recto_left_content)
     %w(header_recto header_verso footer_recto footer_verso).each do |periphery_face|
@@ -92,6 +93,8 @@ class ThemeLoader
       end
     end
     theme_data.base_align ||= 'left'
+    theme_data.code_font_family ||= (theme_data.literal_font_family || base_code_font_family)
+    theme_data.conum_font_family ||= (theme_data.literal_font_family || base_conum_font_family)
     # QUESTION should we do any other post-load calculations or defaults?
     theme_data
   end
@@ -138,7 +141,7 @@ class ThemeLoader
         if vars.respond_to? $1
           vars[$1]
         else
-          warn %(asciidoctor: WARNING: unknown variable reference in PDF theme: $#{$1})
+          logger.warn %(unknown variable reference in PDF theme: $#{$1})
           expr
         end
       else
@@ -146,7 +149,7 @@ class ThemeLoader
           if vars.respond_to? $1
             vars[$1]
           else
-            warn %(asciidoctor: WARNING: unknown variable reference in PDF theme: $#{$1})
+            logger.warn %(unknown variable reference in PDF theme: $#{$1})
             $&
           end
         }
@@ -221,7 +224,7 @@ class ThemeLoader
         end
       # RGB value
       when 3
-        return HexColorValue.new value.map {|e| '%02X' % e}.join
+        return HexColorValue.new value.map {|e| '%02X' % e }.join
       # Nonsense array value; flatten to string
       else
         value = value.join

data/lib/asciidoctor-pdf/version.rb

@@ -1,5 +1,6 @@
 module Asciidoctor
-module Pdf
-  VERSION = '1.5.0.alpha.16'
+module PDF
+  VERSION = '1.5.0.alpha.17'
 end
+Pdf = PDF unless const_defined? :Pdf, false
 end

data/lib/asciidoctor/pdf.rb

@@ -0,0 +1 @@
+require_relative '../asciidoctor-pdf'

data/lib/asciidoctor/pdf/version.rb

@@ -0,0 +1 @@
+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.alpha.16
+  version: 1.5.0.alpha.17
 platform: ruby
 authors:
 - Dan Allen
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -32,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,154 +28,190 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: prawn-templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: prawn-svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: pdf-inspector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
-description: |
-  An extension for Asciidoctor that converts AsciiDoc documents to PDF using the Prawn PDF library.
+        version: 1.3.0
+description: An extension for Asciidoctor that converts AsciiDoc documents to PDF
+  using the Prawn PDF library.
 email: dan@opendevise.com
 executables:
 - asciidoctor-pdf
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.adoc
-- LICENSE.adoc
-- NOTICE.adoc
-- README.adoc
+extra_rdoc_files: []
 files:
+- ".yardopts"
 - CHANGELOG.adoc
-- Gemfile
 - LICENSE.adoc
 - NOTICE.adoc
 - README.adoc
-- Rakefile
 - asciidoctor-pdf.gemspec
 - bin/asciidoctor-pdf
 - data/fonts/LICENSE-mplus-testflight-58
@@ -208,6 +233,7 @@ files:
 - lib/asciidoctor-pdf/asciidoctor_ext/image.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/list.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/list_item.rb
+- lib/asciidoctor-pdf/asciidoctor_ext/logging_shim.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/section.rb
 - lib/asciidoctor-pdf/converter.rb
 - lib/asciidoctor-pdf/core_ext.rb
@@ -222,6 +248,7 @@ files:
 - lib/asciidoctor-pdf/formatted_text/inline_destination_marker.rb
 - lib/asciidoctor-pdf/formatted_text/inline_image_arranger.rb
 - lib/asciidoctor-pdf/formatted_text/inline_image_renderer.rb
+- lib/asciidoctor-pdf/formatted_text/inline_text_aligner.rb
 - lib/asciidoctor-pdf/formatted_text/parser.rb
 - lib/asciidoctor-pdf/formatted_text/parser.treetop
 - lib/asciidoctor-pdf/formatted_text/transform.rb
@@ -235,6 +262,7 @@ files:
 - lib/asciidoctor-pdf/prawn-svg_ext.rb
 - lib/asciidoctor-pdf/prawn-svg_ext/interface.rb
 - lib/asciidoctor-pdf/prawn-table_ext.rb
+- lib/asciidoctor-pdf/prawn-table_ext/cell.rb
 - lib/asciidoctor-pdf/prawn-table_ext/cell/asciidoc.rb
 - lib/asciidoctor-pdf/prawn-table_ext/cell/text.rb
 - lib/asciidoctor-pdf/prawn-templates_ext.rb
@@ -246,40 +274,41 @@ files:
 - lib/asciidoctor-pdf/prawn_ext/images.rb
 - lib/asciidoctor-pdf/roman_numeral.rb
 - lib/asciidoctor-pdf/rouge_ext.rb
-- lib/asciidoctor-pdf/rouge_ext/css_theme.rb
 - lib/asciidoctor-pdf/rouge_ext/formatters/prawn.rb
-- lib/asciidoctor-pdf/rouge_ext/themes/pastie.rb
+- lib/asciidoctor-pdf/rouge_ext/themes/asciidoctor_pdf_default.rb
+- lib/asciidoctor-pdf/rouge_ext/themes/bw.rb
 - lib/asciidoctor-pdf/sanitizer.rb
 - lib/asciidoctor-pdf/temporary_path.rb
 - lib/asciidoctor-pdf/theme_loader.rb
 - lib/asciidoctor-pdf/ttfunk_ext.rb
 - lib/asciidoctor-pdf/version.rb
-homepage: https://github.com/asciidoctor/asciidoctor-pdf
+- lib/asciidoctor/pdf.rb
+- lib/asciidoctor/pdf/version.rb
+homepage: https://asciidoctor.org/docs/asciidoctor-pdf
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/asciidoctor/asciidoctor-pdf/issues
+  changelog_uri: https://github.com/asciidoctor/asciidoctor-pdf/blob/master/CHANGELOG.adoc
+  mailing_list_uri: http://discuss.asciidoctor.org
+  source_code_uri: https://github.com/asciidoctor/asciidoctor-pdf
 post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
-- --title="Asciidoctor PDF"
-- "--main=README.adoc"
-- "-ri"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Converts AsciiDoc documents to PDF using Prawn
+summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn
 test_files: []