asciidoctor-dita-topic 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf26fdeafc9634faed7fdbfd75e19d8d249f2a80643a11985100debab1cf43de
-  data.tar.gz: e5ccc018b1894f7ea87bae9bd2839839c49f97b3c0c13c17e0ad51ba11e6dbd2
+  metadata.gz: 62056b90729ed2ccfcfad7a3fa3613938cf943c67b535d4f6653b1aa009a79a9
+  data.tar.gz: 558a40909a4eea3b5a1bae2327e12c3116d679d5fbbd71cf4f70f990fd23fabf
 SHA512:
-  metadata.gz: 245f4881e471dbc9c48e7e6f57206f0289ace1785a320c4edcbbed7f217942eb9f2168f4a992aa909b5e91547ae3dffd409612a7b328b646c4609728c9f1d13c
-  data.tar.gz: df1afd0adc48153663f6f66186d2afdf4c290cedd2265be499d426b9a467c4e61e21557af0573c8b95ce1ee64b8da27a4dfc4193de3cd566a7dfafec745c011e
+  metadata.gz: 84b3e6f51d7712fb8974fce8c4c3f184b90f1853cf442306ec24d8ab3a32e01f49ee9cec24885baeb26eafb6f7837a76117ffce14f4c7187436f153209864013
+  data.tar.gz: 2c53bb543c270dcc48597b8cc9c16e914ec62393dec275064ae6e5423ed7b8c4898e3df59ffa83145779ef9f8124555b1f6cae5c2a51e6d539ac39356276ea6a

data/lib/dita-topic.rb

@@ -202,8 +202,11 @@ class DitaTopic < Asciidoctor::Converter::Base
 
     # Process individual list items:
     node.items.each do |terms, description|
+      # Compose the metadata attributes:
+      metadata, terms[0].text = extract_attributes terms[0].text
+
       # Open the definition entry:
-      result << %(<dlentry>)
+      result << %(<dlentry#{metadata}>)
 
       # Process individual terms:
       terms.each do |item|
@@ -530,13 +533,17 @@ class DitaTopic < Asciidoctor::Converter::Base
 
     # Process individual list items:
     node.items.each do |item|
+      # Compose the metadata attributes:
+      metadata, text = extract_attributes item.text
+      metadata = compose_metadata item.role if item.role
+
       # Check if the list item contains multiple block elements:
       if item.blocks?
-        result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{item.text})
+        result << %(<li#{compose_id item.id}#{metadata}>#{text})
         result << item.content
         result << %(</li>)
       else
-        result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{item.text}</li>)
+        result << %(<li#{compose_id item.id}#{metadata}>#{text}</li>)
       end
     end
 
@@ -701,8 +708,11 @@ class DitaTopic < Asciidoctor::Converter::Base
 
       # Process each row:
       rows.each do |row|
+        # Compose the metadata attributes:
+        metadata, row[0].text = extract_attributes row[0].text
+
         # Open the row:
-        result << %(<row>)
+        result << %(<row#{metadata}>)
 
         # Process each cell:
         row.each do |cell|
@@ -766,6 +776,10 @@ class DitaTopic < Asciidoctor::Converter::Base
 
     # Process individual list items:
     node.items.each do |item|
+      # Compose the metadata attributes:
+      metadata, text = extract_attributes item.text
+      metadata = compose_metadata item.role if item.role
+
       # Check if the list item is part of a checklist:
       unless item.attr? 'checkbox'
         check_box = ''
@@ -775,11 +789,11 @@ class DitaTopic < Asciidoctor::Converter::Base
 
       # Check if the list item contains multiple block elements:
       if item.blocks?
-        result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{check_box}#{item.text})
+        result << %(<li#{compose_id item.id}#{metadata}>#{check_box}#{text})
         result << item.content
         result << %(</li>)
       else
-        result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{check_box}#{item.text}</li>)
+        result << %(<li#{compose_id item.id}#{metadata}>#{check_box}#{text}</li>)
       end
     end
 
@@ -849,8 +863,11 @@ class DitaTopic < Asciidoctor::Converter::Base
 
     # Process individual list items:
     node.items.each do |terms, description|
+      # Compose the metadata attributes:
+      metadata, terms[0].text = extract_attributes terms[0].text
+
       # Open the list item:
-      result << %(<li>)
+      result << %(<li#{metadata}>)
 
       # Process individual terms:
       terms.each do |item|
@@ -889,8 +906,11 @@ class DitaTopic < Asciidoctor::Converter::Base
 
     # Process individual list items:
     node.items.each do |terms, description|
+      # Compose the metadata attributes:
+      metadata, terms[0].text = extract_attributes terms[0].text
+
       # Open the table row:
-      result << %(<row>)
+      result << %(<row#{metadata}>)
 
       # Check the number of terms to process:
       if terms.count == 1
@@ -1053,6 +1073,15 @@ class DitaTopic < Asciidoctor::Converter::Base
     end
   end
 
+  def extract_attributes text
+    # Extract metadata attributes from an empty ph element:
+    if /^\s*<ph(?<attributes> [^>]+)><\/ph>\s*/ =~ text
+      return attributes, text.sub(/^\s*<ph[^>]+><\/ph>\s*/, '')
+    else
+      return '', text
+    end
+  end
+
   def format_message message
     # Compose the warning or error message:
     file_name = (defined? @file_name) ? %( #{@file_name}:) : ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Jaromir Hradilek
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="