asciidoctor-rouge 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8550bd537204c089e6c1a1241cc7dc665713ffb80a112baf376a6897af4dbb98
-  data.tar.gz: c36d182b935a74840a575e6cd3f5c6586330c966bbf302a030be8d99afc9ab34
+  metadata.gz: f2caf58ed658bc1fb15cc640aad7ba7c8c782aea88c475f457f0121219a85fd1
+  data.tar.gz: 542083c67d842f909970791f283fe30b7335533d0ed89525d3fab45ae8f8bfa4
 SHA512:
-  metadata.gz: 734a92927a6d7520f47d79a528c5e455795fbeee40bd775107beb1b131e24eac36ee17ba2fce82552fd0d84a54bb8656136c2f474f71c9a498e2ab77aaa9ef3e
-  data.tar.gz: ca991c647f4b5920ddee1e4c4800e34f2540849f293165557dc20b55278e2faf263053021fff4c77f8a51cddbd3b781cee100566c8f7b639e0894f86b4136c9b
+  metadata.gz: 84df699e7fde56a7a03770d22fd158fb3f0f06b833a22b8b99ab1cb984e75fb7779caa71240ed06f9371275ab12eaf850808f9579544f59b5e42faaebd68181c
+  data.tar.gz: caa3e9ddd3fd96f33b7eb02ad6c325e8f8cc2a18e3086d26c1e92ceacd5c7026b1c3bb7c55e15b223c91d8656372111b1cbaf122110001dde4148d0b3e5fa284

data/README.adoc

@@ -2,7 +2,7 @@
 :source-language: shell
 // custom
 :gem-name: asciidoctor-rouge
-:gem-version: 0.3.2
+:gem-version: 0.4.0
 :gh-name: jirutka/{gem-name}
 :gh-branch: master
 :codacy-id: d2ed58f5f3f949a19bab7637fe7d0bdb

data/asciidoctor-rouge.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.1'
 
-  s.add_runtime_dependency 'asciidoctor', '~> 1.5.6'
-  s.add_runtime_dependency 'rouge', '~> 2.2', '< 4'
+  s.add_runtime_dependency 'asciidoctor', '>= 1.5.6', '< 2.1'
+  s.add_runtime_dependency 'rouge', '>= 2.2', '< 4'
 
   s.add_development_dependency 'corefines', '~> 1.11'
   s.add_development_dependency 'kramdown', '~> 1.16'

data/lib/asciidoctor/rouge/callouts_substitutor.rb

@@ -65,9 +65,11 @@ module Asciidoctor::Rouge
 
       @callout_rx = if node.attr? 'line-comment'
         comment_rx = ::Regexp.escape(node.attr('line-comment'))
-        /(?:#{comment_rx} )?#{::Asciidoctor::CalloutExtractRxt}/
+        # Copied from Asciidoctor::CalloutExtractRxt (0db74cd)
+        /(?:#{comment_rx} )?(\\)?<()(\d+|\.)>(?=(?: ?\\?<(?:\d+|\.)>)*$)/
       else
-        ::Asciidoctor::CalloutExtractRx
+        # Copied from Asciidoctor::CalloutExtractRx (0db74cd)
+        %r((?:(?://|#|--|;;) ?)?(\\)?<!?(|--)(\d+|\.)\2>(?=(?: ?\\?<!?\2(?:\d+|\.)\2>)*$))
       end
     end
 

data/lib/asciidoctor/rouge/treeprocessor.rb

@@ -71,9 +71,6 @@ module Asciidoctor::Rouge
       subs = block.subs  # Array<Symbol>
       opts = {}
 
-      # Don't escape special characters, Rouge will take care of it.
-      subs.delete(:specialcharacters)
-
       if subs.delete(:macros)
         passthroughs = @passthroughs_sub.create(block)
         source = passthroughs.extract(source)
@@ -84,8 +81,13 @@ module Asciidoctor::Rouge
         source = callouts.extract(source)
       end
 
-      source = block.apply_subs(source, subs)
-      subs.clear
+      # Apply subs before :specialcharacters, keep subs after :specialcharacters.
+      # We don't escape special characters, Rouge will take care of it.
+      # See https://github.com/asciidoctor/asciidoctor/blob/v1.5.7.1/lib/asciidoctor/substitutors.rb#L1618-L1622
+      if (subs_before = subs.slice!(0, subs.index(:specialcharacters) || -1))
+        subs.delete(:specialcharacters)
+        source = block.apply_subs(source, subs_before)
+      end
 
       lang = block.attr('language', 'plaintext', false)
       lexer = find_lexer(lang)
@@ -100,8 +102,7 @@ module Asciidoctor::Rouge
       end
 
       if block.attr?('highlight', nil, false)
-        highlight = block.attr('highlight', '', false)
-        opts[:highlighted_lines] = block.resolve_highlight_lines(highlight)
+        opts[:highlighted_lines] = resolve_lines_to_highlight(block, source)
       end
 
       opts[:callout_markers] = callouts.method(:convert_line) if callouts
@@ -132,5 +133,20 @@ module Asciidoctor::Rouge
         @formatter.format(tokens)
       end
     end
+
+    # @param block [Asciidoctor::Block] the listing block.
+    # @param source [String] the source of the *block*.
+    # @return [Array<Integer>] an array of line numbers to highlight.
+    def resolve_lines_to_highlight(block, source)
+      highlight = block.attr('highlight', '', false)
+
+      # Asciidoctor < 1.5.8
+      if block.respond_to?(:resolve_highlight_lines)
+        block.resolve_highlight_lines(highlight)
+      # Asciidoctor >= 1.5.8
+      else
+        block.resolve_lines_to_highlight(source, highlight)
+      end
+    end
   end
 end

data/lib/asciidoctor/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Rouge
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,34 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rouge
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
     - - "<"
@@ -38,7 +44,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
     - - "<"
@@ -180,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Rouge code highlighter support for Asciidoctor