asciidoctor-dita-map 0.9.14 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88ed0e53a52ea190b7e6c9a019f6beec53e56b4c2cbe697e8ccbdb30ec8a054
-  data.tar.gz: 6472d8d180c56526fbc53baef936e0f67c38b918a1bf01b7eec6eb272a0eba9a
+  metadata.gz: c016c694244dff2b14010224ad4a7d73b392e888fbd88544fa861a39ab1703c5
+  data.tar.gz: 037cc6b077f7d60371ad24a20812f5ca7cfca65fda12c63b3dd4f462dec088f7
 SHA512:
-  metadata.gz: 55e181b3063be81b310dfa4d3cf80eb65ee4ca257c660244f184fed9db58c69cc37b45b4fef38e3b18db29afbbd6d17687a1654397ab66962c38d717954665be
-  data.tar.gz: 2e8578bc05678448fa76ca9feaaa514d0c7bf54bcaa69659c61c31c799b1385e62e707c5a821bd03f1d49d884e586ba2a461510775eb7aef34cbecb2eaf9bc87
+  metadata.gz: 43c40ec17e31e85c82cff49da650a8fa0ea72b059d82c7365439a6abba502dde0655ffa92c18d4875cfa2571b884f6c7cabc0d159a75f2d23c8115c6b86b16cb
+  data.tar.gz: 5aeafa68457cda489f360be7b76c9ca1af07c69e940a4f6cc5ebc9098f414459ade7a20e1ca11353f3a244532fe370d027cd3634be5970b6a69b1a624b69d147

data/lib/dita-map/cli.rb

@@ -72,22 +72,26 @@ module AsciidoctorDitaMap
           @converter.opts[:assembly] = false
         end
 
-        opt.on('-I', '--no-id', 'do not generate the map id attribute') do
-          @converter.opts[:id] = false
+        opt.on('-C', '--no-chunk', 'do not generate the chunk attribute') do
+          @converter.opts[:chunk] = false
         end
 
-        opt.on('-M', '--no-maptitle', 'do not generate the map title') do
-          @converter.opts[:title] = false
+        opt.on('-H', '--no-topichead', 'do not generate the topichead element') do
+          @converter.opts[:topichead] = false
         end
 
-        opt.on('-C', '--no-chunk', 'do not generate the chunk attribute') do
-          @converter.opts[:chunk] = false
+        opt.on('-I', '--no-id', 'do not generate the map id attribute') do
+          @converter.opts[:id] = false
         end
 
         opt.on('-L', '--no-locktitle', 'do not generate the locktitle attribute') do
           @converter.opts[:locktitle] = false
         end
 
+        opt.on('-M', '--no-maptitle', 'do not generate the map title') do
+          @converter.opts[:title] = false
+        end
+
         opt.on('-N', '--no-navtitle', 'do not generate the navtitle attribute') do
           @converter.opts[:navtitle] = false
         end

data/lib/dita-map/convert.rb

@@ -39,6 +39,7 @@ module AsciidoctorDitaMap
         :navtitle => true,
         :title => true,
         :toc => true,
+        :topichead => true,
         :type => true,
         :self => false,
         :verbose => false,
@@ -70,8 +71,6 @@ module AsciidoctorDitaMap
 
       if file_info[:navtitle]
         element.add_attribute REXML::Attribute.new('navtitle', file_info[:navtitle]) if @opts[:navtitle]
-      else
-        element.add_attribute REXML::Attribute.new('navtitle', title) if @opts[:navtitle] and title
       end
 
       element.add_attribute 'locktitle', 'yes' if @opts[:locktitle] and element['navtitle']
@@ -101,6 +100,10 @@ module AsciidoctorDitaMap
         xml_title.add REXML::Text.new(map.title, false, nil, true)
       end
 
+      if map.topichead and @opts[:topichead]
+        xml_root = xml_root.add_element('topichead', { 'navtitle' => map.topichead })
+      end
+
       if @opts[:self] and file
         xml_self  = xml_root.add_element('topicref')
         file_info = { :target => file }

data/lib/dita-map/map.rb

@@ -27,16 +27,17 @@ require_relative 'topic'
 
 module AsciidoctorDitaMap
   class Map < Topic
-    attr_accessor :chunk, :id, :includes, :navtitle
+    attr_accessor :chunk, :id, :includes, :navtitle, :topichead
 
     def initialize input, base_dir, attributes = []
       if input.empty?
-        @id       = nil
-        @title    = nil
-        @navtitle = nil
-        @type     = nil
-        @includes = []
-        @chunk    = false
+        @id        = nil
+        @title     = nil
+        @navtitle  = nil
+        @type      = nil
+        @topichead = nil
+        @includes  = []
+        @chunk     = false
       else
         Asciidoctor::Extensions.register do
           include_processor CatalogIncludeDirectives
@@ -44,12 +45,13 @@ module AsciidoctorDitaMap
 
         doc = Asciidoctor.load input, safe: :safe, logger: false, catalog_assets: true, attributes: attributes, base_dir: base_dir
 
-        @includes = doc.catalog[:include_files] ? doc.catalog[:include_files] : []
-        @id       = doc.id ? doc.id.gsub(/["']/, '') : nil
-        @title    = doc.title ? doc.title.gsub(/<[^>]*>/, '') : nil
-        @navtitle = (doc.attributes.key? 'navtitle') ? doc.attributes['navtitle'] : nil
-        @type     = get_content_type doc.attributes
-        @chunk    = doc.attributes.key? 'chunk-to-content'
+        @includes  = doc.catalog[:include_files] ? doc.catalog[:include_files] : []
+        @id        = doc.id ? doc.id.gsub(/["']/, '') : nil
+        @title     = doc.title ? doc.title.gsub(/<[^>]*>/, '') : nil
+        @navtitle  = (doc.attributes.key? 'navtitle') ? doc.attributes['navtitle'] : nil
+        @type      = get_content_type doc.attributes
+        @topichead = (doc.attributes.key? 'topichead') ? doc.attributes['topichead'] : nil
+        @chunk     = doc.attributes.key? 'chunk-to-content'
       end
     end
   end

data/lib/dita-map/version.rb

@@ -25,5 +25,5 @@
 
 module AsciidoctorDitaMap
   NAME        = 'dita-map'
-  VERSION     = '0.9.14'
+  VERSION     = '0.9.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-map
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.16
 platform: ruby
 authors:
 - Jaromir Hradilek
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.19
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Convert an AsciiDoc file to a DITA map
 test_files: []