asciidoctor-dita-topic 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172e330842b5b5f390c287fd0adfe4e51a055c669145c09a0a4b07d7a85057ba
-  data.tar.gz: 3e76bd3a36ed2954827156500d393ac982506862395fbceb30b84c075db95e72
+  metadata.gz: c8500891ad21dc6be419992bbb3ce0746bfb3c5e96f4cdb5c0faea28cd00fe59
+  data.tar.gz: df920f7ae7d468b8e981a05d1a16c932e2fcd31d9e22d22b5e7406cef880ca01
 SHA512:
-  metadata.gz: 4f5cc15df1b03d9198a87d9996859b067a957928375a6469c8901c3850d76dc0f06f5f3e9e3ff9eb86a8f369c55bf9d7c9a9074e2937ff5798b7b9157bb4a428
-  data.tar.gz: 2986bb1e278b253df0d1d0768d695e8799191253f3527c58f8ef027159ce237e7a09e517dfa78d6cc1043d0c437ff09866848c6ddbe8db7cbb7781806c342252
+  metadata.gz: d788246489a2ce5c11b1f293401d70efbc373c4561e266a497bee45a7de82fc20cae10a3cf3dcded6635e1054279a51250405d36fb6bd219c7602636d6ed2aa9
+  data.tar.gz: 9d4a9e9638f983baf60e401d3d4477c29036d028a12c751acd9e6e88527bcb97238838cccd9234cb750b560b76b23693bfa50726b483c853355eedaee0bf5f52

data/lib/dita-topic.rb

@@ -29,6 +29,8 @@ class DitaTopic < Asciidoctor::Converter::Base
   NAME = 'dita-topic'
   register_for NAME
 
+  require 'securerandom'
+
   def initialize *args
     super
     outfilesuffix '.dita'
@@ -70,7 +72,7 @@ class DitaTopic < Asciidoctor::Converter::Base
     # Open the document:
     result = ["<?xml version='1.0' encoding='utf-8' ?>"]
     result << %(<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "topic.dtd">)
-    result << %(<topic#{compose_id (node.id or node.attributes['docname'])}#{outputclass}>)
+    result << %(<topic#{compose_id (node.id or node.attributes['docname'] or 'topic-'+SecureRandom.uuid)}#{outputclass}>)
     result << %(<title>#{node.doctitle}</title>)
 
     # Check if the author line is enabled and defined:
@@ -142,42 +144,36 @@ class DitaTopic < Asciidoctor::Converter::Base
     # Reset the counter:
     number = 0
 
-    # Open the table:
-    result = ['<table outputclass="callout-list">']
-    result << %(<tgroup cols="2">)
-    result << %(<colspec colwidth="15*" />)
-    result << %(<colspec colwidth="85*" />)
-    result << %(<tbody>)
+    # Open the definition list:
+    result = ['<dl outputclass="callout-list">']
 
     # Process individual list items:
     node.items.each do |item|
       # Increment the counter:
       number += 1
 
-      # Open the table row:
-      result << %(<row>)
+      # Open the definition entry:
+      result << %(<dlentry>)
 
       # Compose the callout number:
-      result << %(<entry>#{compose_circled_number number}</entry>)
+      result << %(<dt>#{compose_circled_number number}</dt>)
 
       # Check if description contains multiple block elements:
       if item.blocks
-        result << %(<entry>)
-        result << %(<p>#{item.text}</p>)
+        result << %(<dd>)
+        result << item.text
         result << item.content
-        result << %(</entry>)
+        result << %(</dd>)
       else
         result << %(<entry>#{item.text}</entry>)
       end
 
-      # Close the row:
-      result << %(</row>)
+      # Close the definition entry:
+      result << %(</dlentry>)
     end
 
-    # Close the table:
-    result << %(</tbody>)
-    result << %(</tgroup>)
-    result << %(</table>)
+    # Close the definition list:
+    result << %(</dl>)
 
     # Return the XML output:
     result.join LF
@@ -248,12 +244,16 @@ class DitaTopic < Asciidoctor::Converter::Base
     %(<p outputclass="title sect#{node.level}"><b>#{node.title}</b></p>)
   end
 
-  def convert_image(node)
+  def convert_image node
     # Check if additional attributes are specified:
     width  = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : ''
     height = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : ''
     scale  = (node.attr? 'scale') ? %( scale="#{(node.attr 'scale').tr('%', '')}") : ''
 
+    # Exclude width and height attributes with percentage values:
+    width   = '' if width.include? '%'
+    height  = '' if height.include? '%'
+
     # Check if the image has a title specified:
     if node.title?
       <<~EOF.chomp
@@ -355,9 +355,17 @@ class DitaTopic < Asciidoctor::Converter::Base
     compose_circled_number node.text.to_i
   end
 
-  # FIXME: Add support for footnoteref equivalent.
   def convert_inline_footnote node
-    %(<fn>#{node.text}</fn>)
+    # Check whether the footnote is a definition or a reference:
+    if node.type == :xref
+      %(<xref href="#./#{node.target}" type="fn" />)
+    elsif node.id
+      # Define the footnote and immediately reference it to match AsdciiDoc
+      # behavior:
+      %(<fn#{compose_id node.id}>#{node.text}</fn><xref href="#./#{node.id}" type="fn" />)
+    else
+      %(<fn>#{node.text}</fn>)
+    end
   end
 
   def convert_inline_image node
@@ -365,6 +373,10 @@ class DitaTopic < Asciidoctor::Converter::Base
     width  = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : ''
     height = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : ''
 
+    # Exclude width and height attributes with percentage values:
+    width   = '' if width.include? '%'
+    height  = '' if height.include? '%'
+
     # Return the XML output:
     %(<image href="#{node.image_uri node.target}"#{width}#{height} placement="inline"><alt>#{node.alt}</alt></image>)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Jaromir Hradilek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor