asciidoctor-pdf 1.5.0.beta.8 → 1.5.0.rc.1

data/lib/asciidoctor/pdf/index_catalog.rb

@@ -1,129 +1,133 @@
 # frozen_string_literal: true
-module Asciidoctor; module PDF
-  class IndexCatalog
-    include ::Asciidoctor::PDF::TextTransformer
 
-    LeadingAlphaRx = /^\p{Alpha}/
+module Asciidoctor
+  module PDF
+    class IndexCatalog
+      include ::Asciidoctor::PDF::TextTransformer
 
-    attr_accessor :start_page_number
+      LeadingAlphaRx = /^\p{Alpha}/
 
-    def initialize
-      @categories = {}
-      @start_page_number = 1
-      @dests = {}
-      @sequence = 0
-    end
+      attr_accessor :start_page_number
 
-    def next_anchor_name
-      %(__indexterm-#{@sequence += 1})
-    end
+      def initialize
+        @categories = {}
+        @start_page_number = 1
+        @dests = {}
+        @sequence = 0
+      end
 
-    def store_term names, dest = nil
-      if (num_terms = names.size) > 2
-        store_tertiary_term names[0], names[1], names[2], dest
-      elsif num_terms == 2
-        store_secondary_term names[0], names[1], dest
-      elsif num_terms == 1
-        store_primary_term names[0], dest
+      def next_anchor_name
+        %(__indexterm-#{@sequence += 1})
       end
-    end
 
-    def store_primary_term name, dest = nil
-      store_dest dest if dest
-      (init_category uppercase_mb name.chr).store_term name, dest
-    end
+      def store_term names, dest = nil
+        if (num_terms = names.size) > 2
+          store_tertiary_term names[0], names[1], names[2], dest
+        elsif num_terms == 2
+          store_secondary_term names[0], names[1], dest
+        elsif num_terms == 1
+          store_primary_term names[0], dest
+        end
+      end
 
-    def store_secondary_term primary_name, secondary_name, dest = nil
-      store_dest dest if dest
-      (store_primary_term primary_name).store_term secondary_name, dest
-    end
+      def store_primary_term name, dest = nil
+        store_dest dest if dest
+        (init_category uppercase_mb name.chr).store_term name, dest
+      end
 
-    def store_tertiary_term primary_name, secondary_name, tertiary_name, dest = nil
-      store_dest dest if dest
-      (store_secondary_term primary_name, secondary_name).store_term tertiary_name, dest
-    end
+      def store_secondary_term primary_name, secondary_name, dest = nil
+        store_dest dest if dest
+        (store_primary_term primary_name).store_term secondary_name, dest
+      end
 
-    def init_category name
-      name = '@' unless LeadingAlphaRx.match? name
-      @categories[name] ||= IndexTermCategory.new name
-    end
+      def store_tertiary_term primary_name, secondary_name, tertiary_name, dest = nil
+        store_dest dest if dest
+        (store_secondary_term primary_name, secondary_name).store_term tertiary_name, dest
+      end
 
-    def find_category name
-      @categories[name]
-    end
+      def init_category name
+        name = '@' unless LeadingAlphaRx.match? name
+        @categories[name] ||= IndexTermCategory.new name
+      end
 
-    def store_dest dest
-      @dests[dest[:anchor]] = dest
-    end
+      def find_category name
+        @categories[name]
+      end
 
-    def link_dest_to_page anchor, physical_page_number
-      if (dest = @dests[anchor])
-        dest[:page] = physical_page_number - (@start_page_number - 1)
+      def store_dest dest
+        @dests[dest[:anchor]] = dest
       end
-    end
 
-    def empty?
-      @categories.empty?
-    end
+      def link_dest_to_page anchor, physical_page_number
+        if (dest = @dests[anchor])
+          virtual_page_number = physical_page_number - (@start_page_number - 1)
+          dest[:page] = (virtual_page_number < 1 ? (RomanNumeral.new physical_page_number, :lower) : virtual_page_number).to_s
+        end
+      end
+
+      def empty?
+        @categories.empty?
+      end
 
-    def categories
-      @categories.empty? ? [] : @categories.values.sort
+      def categories
+        @categories.empty? ? [] : @categories.values.sort
+      end
     end
-  end
 
-  class IndexTermGroup
-    include Comparable
-    attr_reader :name
+    class IndexTermGroup
+      include Comparable
+      attr_reader :name
 
-    def initialize name
-      @name = name
-      @terms = {}
-    end
+      def initialize name
+        @name = name
+        @terms = {}
+      end
 
-    def store_term name, dest = nil
-      term = (@terms[name] ||= (IndexTerm.new name))
-      term.add_dest dest if dest
-      term
-    end
+      def store_term name, dest = nil
+        term = (@terms[name] ||= (IndexTerm.new name))
+        term.add_dest dest if dest
+        term
+      end
 
-    def find_term name
-      @terms[name]
-    end
+      def find_term name
+        @terms[name]
+      end
 
-    def terms
-      @terms.empty? ? [] : @terms.values.sort
-    end
+      def terms
+        @terms.empty? ? [] : @terms.values.sort
+      end
 
-    def <=> other
-      @name <=> other.name
+      def <=> other
+        (val = @name.casecmp other.name) == 0 ? @name <=> other.name : val
+      end
     end
-  end
 
-  class IndexTermCategory < IndexTermGroup; end
+    class IndexTermCategory < IndexTermGroup; end
 
-  class IndexTerm < IndexTermGroup
-    def initialize name
-      super
-      @dests = ::Set.new
-    end
+    class IndexTerm < IndexTermGroup
+      def initialize name
+        super
+        @dests = ::Set.new
+      end
 
-    alias subterms terms
+      alias subterms terms
 
-    def add_dest dest
-      @dests << dest
-      self
-    end
+      def add_dest dest
+        @dests << dest
+        self
+      end
 
-    def dests
-      @dests.select {|d| d.key? :page }.sort {|a, b| a[:page] <=> b[:page] }
-    end
+      def dests
+        @dests.select {|d| d.key? :page }.sort {|a, b| a[:page] <=> b[:page] }
+      end
 
-    def container?
-      @dests.empty? || @dests.none? {|d| d.key? :page }
-    end
+      def container?
+        @dests.empty? || @dests.none? {|d| d.key? :page }
+      end
 
-    def leaf?
-      @terms.empty?
+      def leaf?
+        @terms.empty?
+      end
     end
   end
-end; end
+end

data/lib/asciidoctor/pdf/measurements.rb

@@ -1,59 +1,62 @@
 # frozen_string_literal: true
-module Asciidoctor; module PDF
-  module Measurements
-    MeasurementValueRx = /(\d+|\d*\.\d+)(in|mm|cm|p[txc])?$/
-    InsetMeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|p[txc])(?=$| |\))/
-    MeasurementValueHintRx = /\d(in|mm|cm|p[txc])/
 
-    # Convert the specified string value to a pt value from the
-    # specified unit of measurement (e.g., in, cm, mm, etc).
-    # If the unit of measurement is not recognized, assume pt.
-    #
-    # Examples:
-    #
-    #  0.5in => 36.0
-    #  100px => 75.0
-    #  72blah => 72.0
-    #
-    def str_to_pt val
-      MeasurementValueRx =~ val ? (to_pt $1.to_f, $2) : val.to_f
-    end
+module Asciidoctor
+  module PDF
+    module Measurements
+      MeasurementValueRx = /(\d+|\d*\.\d+)(in|mm|cm|p[txc])?$/
+      InsetMeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|p[txc])(?=$| |\))/
+      MeasurementValueHintRx = /\d(in|mm|cm|p[txc])/
+
+      # Convert the specified string value to a pt value from the
+      # specified unit of measurement (e.g., in, cm, mm, etc).
+      # If the unit of measurement is not recognized, assume pt.
+      #
+      # Examples:
+      #
+      #  0.5in => 36.0
+      #  100px => 75.0
+      #  72blah => 72.0
+      #
+      def str_to_pt val
+        MeasurementValueRx =~ val ? (to_pt $1.to_f, $2) : val.to_f
+      end
 
-    # Converts the specified float value to a pt value from the
-    # specified unit of measurement (e.g., in, cm, mm, etc).
-    # Raises an argument error if the unit of measurement is not recognized.
-    def to_pt num, units
-      units = units.to_s if ::Symbol === units
-      if units.nil_or_empty?
-        num
-      else
-        case units
-        when 'pt'
+      # Converts the specified float value to a pt value from the
+      # specified unit of measurement (e.g., in, cm, mm, etc).
+      # Raises an argument error if the unit of measurement is not recognized.
+      def to_pt num, units
+        units = units.to_s if ::Symbol === units
+        if units.nil_or_empty?
           num
-        when 'in'
-          num * 72
-        when 'mm'
-          num * (72 / 25.4)
-        when 'cm'
-          num * (720 / 25.4)
-        when 'px'
-          # assuming canvas of 96 dpi
-          num * 0.75
-        when 'pc'
-          num * 12
         else
-          raise ::ArgumentError, %(unknown unit of measurement: #{units})
+          case units
+          when 'pt'
+            num
+          when 'in'
+            num * 72
+          when 'mm'
+            num * (72 / 25.4)
+          when 'cm'
+            num * (720 / 25.4)
+          when 'px'
+            # assuming canvas of 96 dpi
+            num * 0.75
+          when 'pc'
+            num * 12
+          else
+            raise ::ArgumentError, %(unknown unit of measurement: #{units})
+          end
         end
       end
-    end
 
-    # Resolve measurement values in the string to PDF points.
-    def resolve_measurement_values str
-      if MeasurementValueHintRx.match? str
-        str.gsub(InsetMeasurementValueRx) { to_pt $1.to_f, $2 }
-      else
-        str
+      # Resolve measurement values in the string to PDF points.
+      def resolve_measurement_values str
+        if MeasurementValueHintRx.match? str
+          str.gsub(InsetMeasurementValueRx) { to_pt $1.to_f, $2 }
+        else
+          str
+        end
       end
     end
   end
-end; end
+end

data/lib/asciidoctor/pdf/optimizer.rb

@@ -1,41 +1,44 @@
+# frozen_string_literal: true
+
+require 'pathname'
 require 'rghost'
 require 'tmpdir'
 
 module Asciidoctor
-module PDF
-class Optimizer
-  (QUALITY_NAMES = {
-    'default' => :default,
-    'screen' => :screen,
-    'ebook' => :ebook,
-    'printer' => :printer,
-    'prepress' => :prepress,
-  }).default = :default
+  module PDF
+    class Optimizer
+      (QUALITY_NAMES = {
+        'default' => :default,
+        'screen' => :screen,
+        'ebook' => :ebook,
+        'printer' => :printer,
+        'prepress' => :prepress,
+      }).default = :default
 
-  def initialize quality = 'default', compatibility_level = '1.4'
-    @quality = QUALITY_NAMES[quality]
-    @compatibility_level = compatibility_level
-  end
+      def initialize quality = 'default', compatibility_level = '1.4'
+        @quality = QUALITY_NAMES[quality]
+        @compatibility_level = compatibility_level
+      end
 
-  def generate_file target
-    ::Dir::Tmpname.create ['asciidoctor-pdf-', '.pdf'] do |tmpfile|
-      filename = Pathname.new target
-      filename_o = Pathname.new tmpfile
-      pdfmark = filename.sub_ext '.pdfmark'
-      inputs = pdfmark.file? ? [target, pdfmark.to_s] : target
-      (::RGhost::Convert.new inputs).to :pdf,
-        filename: filename_o.to_s,
-        quality: @quality,
-        d: { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
-      begin
-        filename_o.rename target
-      rescue ::Errno::EXDEV
-        filename.binwrite filename_o.binread
-        filename_o.unlink
+      def generate_file target
+        ::Dir::Tmpname.create ['asciidoctor-pdf-', '.pdf'] do |tmpfile|
+          filename = Pathname.new target
+          filename_o = Pathname.new tmpfile
+          pdfmark = filename.sub_ext '.pdfmark'
+          inputs = pdfmark.file? ? [target, pdfmark.to_s] : target
+          (::RGhost::Convert.new inputs).to :pdf,
+              filename: filename_o.to_s,
+              quality: @quality,
+              d: { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
+          begin
+            filename_o.rename target
+          rescue ::Errno::EXDEV
+            filename.binwrite filename_o.binread
+            filename_o.unlink
+          end
+        end
+        nil
       end
     end
-    nil
   end
 end
-end
-end

data/lib/asciidoctor/pdf/pdfmark.rb

@@ -1,40 +1,41 @@
 # frozen_string_literal: true
+
 module Asciidoctor
-module PDF
-class Pdfmark
-  include ::Asciidoctor::PDF::Sanitizer
+  module PDF
+    class Pdfmark
+      include ::Asciidoctor::PDF::Sanitizer
 
-  def initialize doc
-    @doc = doc
-  end
+      def initialize doc
+        @doc = doc
+      end
 
-  def generate
-    doc = @doc
-    if doc.attr? 'reproducible'
-      mod_date = creation_date = (::Time.at 0).utc
-    else
-      mod_date = (::Time.parse doc.attr 'docdatetime') rescue (now ||= ::Time.now)
-      creation_date = (::Time.parse doc.attr 'localdatetime') rescue (now ||= ::Time.now)
-    end
-    # FIXME use sanitize: :plain_text once available
-    content = <<~EOS
-    [ /Title #{sanitize(doc.doctitle use_fallback: true).to_pdf_object}
-      /Author #{(doc.attr 'authors').to_pdf_object}
-      /Subject #{(doc.attr 'subject').to_pdf_object}
-      /Keywords #{(doc.attr 'keywords').to_pdf_object}
-      /ModDate #{mod_date.to_pdf_object}
-      /CreationDate #{creation_date.to_pdf_object}
-      /Creator (Asciidoctor PDF #{::Asciidoctor::PDF::VERSION}, based on Prawn #{::Prawn::VERSION})
-      /Producer #{(doc.attr 'publisher').to_pdf_object}
-      /DOCINFO pdfmark
-    EOS
-    content
-  end
+      def generate
+        doc = @doc
+        if doc.attr? 'reproducible'
+          mod_date = creation_date = (::Time.at 0).utc
+        else
+          mod_date = (::Time.parse doc.attr 'docdatetime') rescue (now ||= ::Time.now)
+          creation_date = (::Time.parse doc.attr 'localdatetime') rescue (now || ::Time.now)
+        end
+        # FIXME: use sanitize: :plain_text once available
+        content = <<~EOS
+        [ /Title #{(sanitize doc.doctitle use_fallback: true).to_pdf_object}
+          /Author #{(doc.attr 'authors').to_pdf_object}
+          /Subject #{(doc.attr 'subject').to_pdf_object}
+          /Keywords #{(doc.attr 'keywords').to_pdf_object}
+          /ModDate #{mod_date.to_pdf_object}
+          /CreationDate #{creation_date.to_pdf_object}
+          /Creator (Asciidoctor PDF #{::Asciidoctor::PDF::VERSION}, based on Prawn #{::Prawn::VERSION})
+          /Producer #{(doc.attr 'publisher').to_pdf_object}
+          /DOCINFO pdfmark
+        EOS
+        content
+      end
 
-  def generate_file pdf_file
-    # QUESTION should we use the extension pdfmeta to be more clear?
-    ::File.write %(#{pdf_file}mark), generate
+      def generate_file pdf_file
+        # QUESTION should we use the extension pdfmeta to be more clear?
+        ::File.write %(#{pdf_file}mark), generate
+      end
+    end
   end
 end
-end
-end