asciidoctor-pdf 1.5.0.alpha.12 → 1.5.0.alpha.13

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -14,7 +14,7 @@ class ThemeLoader
   VariableRx = /\$([a-z0-9_]+)/
   LoneVariableRx = /^\$([a-z0-9_]+)$/
   HexColorEntryRx = /^(?<k>[[:blank:]]*[[:graph:]]+): +(?!null$)(?<q>["']?)#?(?<v>\w{3,6})\k<q> *(?:#.*)?$/
-  MeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|pt)(?=$| |\))/
+  MeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|pt|px)(?=$| |\))/
   MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
   AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
   PrecisionFuncRx = /^(round|floor|ceil)\(/
@@ -68,19 +68,30 @@ class ThemeLoader
     if theme_file == BaseThemePath
       theme_data
     else
-      # QUESTION should we do any post-load calculations or defaults?
       load_file theme_file, theme_data
     end
   end
 
   def self.load_file filename, theme_data = nil
-    raw_data = (::IO.read filename).each_line.map {|l| l.sub HexColorEntryRx, '\k<k>: \'\k<v>\'' }.join
+    raw_data = (::IO.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
     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|
+      %w(left center right).each do |align|
+        if (val = theme_data.delete %(#{periphery_face}_content_#{align}))
+          theme_data[%(#{periphery_face}_#{align}_content)] = val
+        end
+      end
+    end
+    theme_data.base_align ||= 'left'
+    # QUESTION should we do any other post-load calculations or defaults?
+    theme_data
   end
 
   private
@@ -147,6 +158,8 @@ class ThemeLoader
         val * (72 / 25.4)
       when 'cm'
         val * (720 / 25.4)
+      when 'px'
+        val * 0.75
       else
         val # default unit is pt
       end

data/lib/asciidoctor-pdf/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Pdf
-  VERSION = '1.5.0.alpha.12'
+  VERSION = '1.5.0.alpha.13'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.12
+  version: 1.5.0.alpha.13
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,30 +91,36 @@ dependencies:
   name: prawn-svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.21.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.26.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.25.1
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -166,10 +172,12 @@ executables:
 - asciidoctor-pdf
 extensions: []
 extra_rdoc_files:
-- README.adoc
+- CHANGELOG.adoc
 - LICENSE.adoc
 - NOTICE.adoc
+- README.adoc
 files:
+- CHANGELOG.adoc
 - Gemfile
 - LICENSE.adoc
 - NOTICE.adoc
@@ -204,6 +212,7 @@ files:
 - lib/asciidoctor-pdf/core_ext/numeric.rb
 - lib/asciidoctor-pdf/core_ext/ostruct.rb
 - lib/asciidoctor-pdf/core_ext/quantifiable_stdout.rb
+- lib/asciidoctor-pdf/core_ext/string.rb
 - lib/asciidoctor-pdf/formatted_text.rb
 - lib/asciidoctor-pdf/formatted_text/formatter.rb
 - lib/asciidoctor-pdf/formatted_text/inline_destination_marker.rb