RubyGems - asciidoctor-dita-topic - Versions diffs - 1.0.6 → 1.0.8 - Mend

asciidoctor-dita-topic 1.0.6 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4723a781b24e522548c852bd873f9db6547c0bc546365b5cabdbfdd296b2f9
-  data.tar.gz: 4485c9cdc6f4232dbef55d5e837a9cd9206a716caac657302591b00129d44515
+  metadata.gz: 073b164893413640198b0938df78f0b180a4a25366a34bee47cf85585efddd51
+  data.tar.gz: 75b381d82f68f838a237b666fe8a38929dbc99101f0024086888d83a4c59471a
 SHA512:
-  metadata.gz: 95e315d78112be6948c464167e76318e5211e9b6f0e16822b82ec2b4bfa419b0900ac11dc9108570a341485106c2e68ea332b41a37505e8cdcb08d59f27a40b0
-  data.tar.gz: 5cd3c94ff7b4f25684b334dfc5282aa7452ba07060136589bdbb373d31e3c1147e1439783668336e7c78aa2761959f4149a1df22ed3c84fcf702b145811dfda7
+  metadata.gz: f1b4cf1080f6ab776de1d62c122f89c190f68d03836bd3a41e2612c4b673ab97e2947abab161f9f4c1f976acddc9a41acf9ffcbdbfd7308a4c0e1bc64da87e17
+  data.tar.gz: 9acb585946816133087779410d66279ec4567118a3ed14a9ec318c353a647e50dcb5ee46adf835bfa9a94a511b0a8ec772e49fe224bac042946021ad902c5902

data/lib/dita-topic.rb CHANGED Viewed

@@ -47,28 +47,19 @@ class DitaTopic < Asciidoctor::Converter::Base
     # Check if callouts are enabled:
     @callouts_allowed = false if (node.attr 'dita-topic-callouts') == 'off'
-    # Check if a specific topic type is provided:
-    if (value = node.attr 'dita-topic-type') =~ /^(concept|reference|task)$/
-      type = value
-      body = (type == 'task') ? 'taskbody' : %(#{type[0,3]}body)
-    else
-      type = 'topic'
-      body = 'body'
-    end
     # Check if the modular documentation content type is specified:
     outputclass = (node.attr? '_mod-docs-content-type') ? %( outputclass="#{(node.attr '_mod-docs-content-type').downcase}") : ''
     # Return the XML output:
     <<~EOF.chomp
     <?xml version='1.0' encoding='utf-8' ?>
-    <!DOCTYPE #{type} PUBLIC "-//OASIS//DTD DITA #{type.capitalize}//EN" "#{type}.dtd">
-    <#{type}#{compose_id (node.id or node.attributes['docname'])}#{outputclass}>
+    <!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "topic.dtd">
+    <topic#{compose_id (node.id or node.attributes['docname'])}#{outputclass}>
     <title>#{node.doctitle}</title>
-    <#{body}>
+    <body>
     #{node.content}
-    </#{body}>
-    </#{type}>
+    </body>
+    </topic>
     EOF
   end
@@ -109,8 +100,8 @@ class DitaTopic < Asciidoctor::Converter::Base
     # Open the table:
     result = ['<table outputclass="callout-list">']
     result << %(<tgroup cols="2">)
-    result << %(<colspec colwidth="#{node.attr 'labelwidth', 15}*" />)
-    result << %(<colspec colwidth="#{node.attr 'itemwidth', 85}*" />)
+    result << %(<colspec colwidth="15*" />)
+    result << %(<colspec colwidth="85*" />)
     result << %(<tbody>)
     # Process individual list items:
@@ -186,7 +177,7 @@ class DitaTopic < Asciidoctor::Converter::Base
     result << '</dl>'
     # Return the XML output:
-    add_block_title (result.join LF), node.title, 'dlist'
+    add_block_title (result.join LF), node.title
   end
   def convert_example node
@@ -379,28 +370,18 @@ class DitaTopic < Asciidoctor::Converter::Base
   end
   def convert_listing node
-    # Check the listing style:
-    if node.style == 'source'
-      # Check whether the source language is defined:
-      language = (node.attributes.key? 'language') ? %( outputclass="language-#{node.attributes['language']}") : ''
-      # Compose the XML output:
-      result = <<~EOF.chomp
-      <codeblock#{language}>
-      #{node.content}
-      </codeblock>
-      EOF
-    else
-      # Compose the XML output:
-      result = <<~EOF.chomp
-      <screen>
-      #{node.content}
-      </screen>
-      EOF
-    end
+    # Check whether the source language is defined:
+    language = (node.attributes.key? 'language') ? %( outputclass="language-#{node.attributes['language']}") : ''
+    # Compose the XML output:
+    result = <<~EOF.chomp
+    <codeblock#{language}>
+    #{node.content}
+    </codeblock>
+    EOF
     # Return the XML output:
-    add_block_title result, node.title, 'listing'
+    add_block_title result, node.title
   end
   def convert_literal node
@@ -412,7 +393,7 @@ class DitaTopic < Asciidoctor::Converter::Base
     EOF
     # Return the XML output:
-    add_block_title result, node.title, 'literal'
+    add_block_title result, node.title
   end
   def convert_olist node
@@ -436,7 +417,7 @@ class DitaTopic < Asciidoctor::Converter::Base
     result << '</ol>'
     # Return the XML output:
-    add_block_title (result.join LF), node.title, 'olist'
+    add_block_title (result.join LF), node.title
   end
   # FIXME: This is not the top priority.
@@ -455,7 +436,7 @@ class DitaTopic < Asciidoctor::Converter::Base
   end
   def convert_paragraph node
-    add_block_title %(<p>#{node.content}</p>), node.title, 'paragraph'
+    add_block_title %(<p>#{node.content}</p>), node.title
   end
   def convert_preamble node
@@ -652,7 +633,7 @@ class DitaTopic < Asciidoctor::Converter::Base
     result << '</ul>'
     # Returned the XML output:
-    add_block_title (result.join LF), node.title, 'ulist'
+    add_block_title (result.join LF), node.title
   end
   def convert_verse node
@@ -704,12 +685,17 @@ class DitaTopic < Asciidoctor::Converter::Base
     result << '</ol>'
     # Return the XML output:
-    add_block_title (result.join LF), node.title, 'qanda'
+    add_block_title (result.join LF), node.title
   end
   def compose_horizontal_dlist node
     # Open the table:
     result = ['<table outputclass="horizontal-dlist">']
+    # Check if the title is specified:
+    result << %(<title>#{node.title}</title>) if node.title?
+    # Define the table properties and open the tgroup:
     result << %(<tgroup cols="2">)
     result << %(<colspec colwidth="#{node.attr 'labelwidth', 15}*" />)
     result << %(<colspec colwidth="#{node.attr 'itemwidth', 85}*" />)
@@ -755,7 +741,7 @@ class DitaTopic < Asciidoctor::Converter::Base
     result << %(</table>)
     # Return the XML output:
-    add_block_title (result.join LF), node.title, 'horizontal'
+    result.join LF
   end
   # Method aliases
@@ -766,10 +752,10 @@ class DitaTopic < Asciidoctor::Converter::Base
   # Helper methods
-  def add_block_title content, title, context='wrapper'
+  def add_block_title content, title
     # NOTE: Unlike AsciiDoc, DITA does not support titles assigned to
     # certain block elements. As a workaround, I decided to use a paragraph
-    # with the outputclass attribute and wrap the block in a div element.
+    # with the outputclass attribute.
     # Check if the title is defined:
     return content unless title
@@ -782,10 +768,8 @@ class DitaTopic < Asciidoctor::Converter::Base
     # Return the XML output:
     <<~EOF.chomp
-    <div outputclass="#{context}">
     <p outputclass="title"><b>#{title}</b></p>
     #{content}
-    </div>
     EOF
   end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Jaromir Hradilek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: A custom AsciiDoc converter that generates individual DITA topics