asciidoctor-dita-map 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc37275d95dbc4dc7be898a49ea706ae9b44e479544e9c29d0c1108d1f8b13e
-  data.tar.gz: a3d26bff03b1660a599f3386099fd53232da8787309f12a6590c023b58e3c028
+  metadata.gz: ac58b2d84b3b473e585e54b765b2a1c1591c003f61a4f188e302ba34b4917f0f
+  data.tar.gz: f06f028b3916d95e3be9bab9c74a7387b6a84e6c76c1b7c763d5b1ca31f46c05
 SHA512:
-  metadata.gz: 70f3c196109ddeb6cab52f5c96fb222a8336e521e43a7b3660bd9e65a703e1b7820a1e96f0e44d6d59c85666aacafb1640c1bf2028891698ce1f47140a206d62
-  data.tar.gz: 663059f4079fd1342808861209779e99656f011d5dbaf7764c698b7518903490193e67e6ffe56024ca240969adb39307f595c05da52a436580d6aa9aac5f25dd
+  metadata.gz: e6530d77eedae5de3630258c36be601395956339f8e432098b1d0124b62a717c922ad4634961e44aca284fe5df096534de4ef06c87de7146c19bb7597200db9e
+  data.tar.gz: ad74cbb5c2bde3ebccb5e559c025ec3000a812b24fed35aa95bb291ebf22868ec082b216b243247a200691f2da545e1374f4d695a3bf6aae4a55a211be489549

data/lib/dita-map/cli.rb

@@ -63,6 +63,10 @@ module AsciidoctorDitaMap
 
         opt.separator ''
 
+        opt.on('-A', '--no-assembly', 'do not treat assemblies as maps') do
+          @converter.opts[:assembly] = false
+        end
+
         opt.on('-I', '--no-id', 'do not generate the map id attribute') do
           @converter.opts[:id] = false
         end
@@ -71,10 +75,6 @@ module AsciidoctorDitaMap
           @converter.opts[:title] = false
         end
 
-        opt.on('-A', '--no-assembly', 'do treat assemblies as maps') do
-          @converter.opts[:assembly] = false
-        end
-
         opt.on('-C', '--no-chunk', 'do not generate the chunk attribute') do
           @converter.opts[:chunk] = false
         end

data/lib/dita-map/convert.rb

@@ -47,12 +47,18 @@ module AsciidoctorDitaMap
       @prep = ''
     end
 
-    def compose_mapref_attributes element, file_info, type
+    def compose_mapref_attributes element, file_info
       target_file         = file_info[:target].sub(/\.adoc$/, '.ditamap')
 
       element.add_attribute 'href', target_file
+
+      if file_info[:navtitle]
+        element.add_attribute REXML::Attribute.new('navtitle', file_info[:navtitle]) if @opts[:navtitle]
+      end
+
+      element.add_attribute 'locktitle', 'yes' if @opts[:locktitle] and element['navtitle']
       element.add_attribute 'format', 'ditamap'
-      element.add_attribute 'type', type if @opts[:type]
+      element.add_attribute 'type', 'map' if @opts[:type]
       element.add_attribute 'chunk', file_info[:chunk] if @opts[:chunk] and file_info[:chunk]
       element.add_attribute 'toc', file_info[:toc] if @opts[:toc] and file_info[:toc]
     end
@@ -139,11 +145,15 @@ module AsciidoctorDitaMap
 
         xml_parent = stack.last[:element]
 
+        if xml_parent.name == 'mapref'
+          warn "#{NAME}: warning: invalid mapref child element: #{target}"
+        end
+
         topic.type.sub!(/^assembly$/, 'concept') if not @opts[:assembly]
 
         if topic.type == 'map' or topic.type == 'assembly'
           xml_element = xml_parent.add_element('mapref')
-          compose_mapref_attributes xml_element, file_info, 'map'
+          compose_mapref_attributes xml_element, file_info
         else
           xml_element = xml_parent.add_element('topicref')
           compose_topicref_attributes xml_element, file_info, topic.title, topic.type

data/lib/dita-map/version.rb

@@ -25,5 +25,5 @@
 
 module AsciidoctorDitaMap
   NAME        = 'dita-map'
-  VERSION     = '0.9.6'
+  VERSION     = '0.9.8'
 end

metadata

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