asciidoctor-dita-topic 1.5.4 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7db48788b397b2e457ca5240562dcaf64e82e16c3564861b540e73799686a10
-  data.tar.gz: 4ae2eeb544f034824c3a38ac4e49664be740a6599ee3aa5da7c88a1fbcfceed4
+  metadata.gz: c9483eccb7fb179228b0139123e596f83b4839704945e703c501de9aeb424a22
+  data.tar.gz: 1d29ee12f77dab2d75e8038c65b37d11d4400d5450c747d9864b6a358921b5e8
 SHA512:
-  metadata.gz: 4162bfcb43ca9a51c16635f5283f808c2090b2377ef66d37901f014bac10bb6ed4ea8146bc89543f4bc8873e60dddb82eb3d9aac3228629c7d0508332e09f88e
-  data.tar.gz: 1cd14f6c72b84872e48e38d0c37f036014efe6661dd200be5d9052102d0143ccedb41b44f91b279ff83d8fd1e7bbe98dd322ce57e207ea341d5dc3b2bb93440e
+  metadata.gz: 5cf176f0c0d0d234452d8380240203419fd528f13677fa314756474e28a34138982b0130e880e862a0c3280f9a8dcc8f570b251611fa4c2ba82b131244144b80
+  data.tar.gz: 5ce0805a250df4f3b862c2adb8f71be30f6cf580b73bb3672ad8b8be1dbe405004b2ce0bc34b03f88f5bb71ee133ca90104bab60d1d6f20521c31808ae32054e

data/lib/dita-topic/cli.rb

@@ -73,7 +73,7 @@ module AsciidoctorDitaTopic
           @opts[:no_includes] = true
         end
 
-        opt.on('-A', '--no-modules', 'disable processing of include directives with assemblies and modules') do
+        opt.on('-A', '--no-modules', 'disable processing of include directives with assemblies, modules, and attributes') do
           @opts[:modules] = false
         end
 

data/lib/dita-topic/filter.rb

@@ -31,7 +31,13 @@ class FilterIncludeDirectives < Asciidoctor::Extensions::IncludeProcessor
   end
 
   def process doc, reader, target, attributes
-    file_path   = Pathname.new(doc.base_dir) + target
+    base_dir = Pathname.new(doc.base_dir)
+
+    if reader.cursor.file
+      file_path = base_dir + Pathname.new(reader.cursor.file).dirname + target
+    else
+      file_path = base_dir + target
+    end
 
     begin
       logger = Asciidoctor::LoggerManager.logger
@@ -55,6 +61,6 @@ class FilterIncludeDirectives < Asciidoctor::Extensions::IncludeProcessor
     type = attributes['_content-type'] ? attributes['_content-type'].downcase : nil unless type
     type = attributes['_module-type'] ? attributes['_module-type'].downcase : nil unless type
 
-    ['attributes', 'snippet'].include? type
+    ['snippet'].include? type
   end
 end

data/lib/dita-topic/version.rb

@@ -24,6 +24,6 @@
 # frozen_string_literal: true
 
 module AsciidoctorDitaTopic
-  VERSION     = '1.5.4'
+  VERSION     = '1.5.6'
   NAME        = 'dita-topic'
 end

data/lib/dita-topic.rb

@@ -524,11 +524,17 @@ class DitaTopic < Asciidoctor::Converter::Base
     # Check whether the source language is defined:
     language = (node.attributes.key? 'language') ? %( outputclass="language-#{node.attributes['language']}") : ''
 
-    # Compose the XML output:
-    result = %(<codeblock#{language}#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</codeblock>)
-
-    # Return the XML output:
-    add_block_title result, node
+    # Check if the listing has a title specified:
+    if node.title?
+      # Compose the XML output:
+      <<~EOF.chomp
+      <p#{compose_id node.id}#{compose_metadata node.role}><b>#{node.title}</b></p>
+      <codeblock#{language}#{compose_metadata node.role}>#{node.content}</codeblock>
+      EOF
+    else
+      # Compose the XML output:
+      %(<codeblock#{language}#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</codeblock>)
+    end
   end
 
   def convert_literal node
@@ -537,6 +543,18 @@ class DitaTopic < Asciidoctor::Converter::Base
 
     # Return the XML output:
     add_block_title result, node
+
+    # Check if the listing has a title specified:
+    if node.title?
+      # Compose the XML output:
+      <<~EOF.chomp
+      <p#{compose_id node.id}#{compose_metadata node.role}><b>#{node.title}</b></p>
+      <pre#{compose_metadata node.role}>#{node.content}</pre>
+      EOF
+    else
+      # Compose the XML output:
+      %(<pre#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</pre>)
+    end
   end
 
   def convert_olist node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.6
 platform: ruby
 authors:
 - Jaromir Hradilek
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.22
 specification_version: 4
 summary: A custom AsciiDoc converter that generates individual DITA topics
 test_files: []