asciidoctor-dita-map 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ca734004441a43e80c5537935c0bbbf2ff555b9ff00810a6f80f5f461003ad
-  data.tar.gz: f1f533b51dac4e4ebbcbf8632562c3caddb1a70bf5d1c7bbc1da73739ae97d07
+  metadata.gz: 4dd982c41b3653429b386ada97215adc7c1eaf82bfdd6415d116e974e3f2446c
+  data.tar.gz: b547c896716b562ad96393b4802ceeaf87bf8af26270e4e8ad1ab8427d8aec3e
 SHA512:
-  metadata.gz: 0bfff3d85f8c89f127af916d7d0c8c3c577e1cb2d53be274bc8c2d252af73f9dd157d231acc2385948bead240f19fb296fafe03eb6fadf2c670f18cfe9ba156f
-  data.tar.gz: 9058a374b8c72b5edf4397208ee3167a63154fc956b4206ef00b86739c91d52151e6223de1791e3e901289be59ac856eac12306dd8fe478018d3c36011127546
+  metadata.gz: 647f898eac5920a8d976136683065acaa8ed6173bf4cf245bbebfaf9e75381f3a222866ffd1532c343900ec2508d80e800750b3ac8ecd8592141f09e5678c773
+  data.tar.gz: be60464080a6f54e249dd3432e8313486d3afe9298c02a5448502e5ac9ecd33cf02d943268459698d8a2ed9f12d4962f53d7caf7d05f42026737e4af91a52067

data/lib/dita-map/cli.rb

@@ -35,13 +35,15 @@ module AsciidoctorDitaMap
       @opts = {
         :chunk => true,
         :id => true,
+        :locktitle => true,
         :navtitle => true,
         :output => false,
         :title => true,
         :toc => true,
         :type => true,
         :self => false,
-        :verbose => false
+        :verbose => false,
+        :zero_offset => false
       }
       @prep = []
       @name = name
@@ -88,6 +90,10 @@ module AsciidoctorDitaMap
           @opts[:chunk] = false
         end
 
+        opt.on('-L', '--no-locktitle', 'do not generate the locktitle attribute') do
+          @opts[:locktitle] = false
+        end
+
         opt.on('-N', '--no-navtitle', 'do not generate the navtitle attribute') do
           @opts[:navtitle] = false
         end
@@ -106,6 +112,10 @@ module AsciidoctorDitaMap
           @opts[:verbose] = true
         end
 
+        opt.on('-z', '--zero-offset', 'allow include directives with zero leveloffset') do
+          @opts[:zero_offset] = true
+        end
+
         opt.separator ''
 
         opt.on('-h', '--help', 'display this help and exit') do
@@ -144,12 +154,13 @@ module AsciidoctorDitaMap
     end
 
     def compose_topicref_attributes file_info, title, type
-      target_file            = file_info[:target].sub(/\.adoc$/, '.dita')
-      attributes             = { 'href' => target_file }
-      attributes['navtitle'] = title if @opts[:navtitle] and title
-      attributes['type']     = type if @opts[:type] and type and ['concept', 'reference', 'task'].include? type
-      attributes['chunk']    = file_info[:chunk] if @opts[:chunk] and file_info[:chunk]
-      attributes['toc']      = file_info[:toc] if @opts[:toc] and file_info[:toc]
+      target_file             = file_info[:target].sub(/\.adoc$/, '.dita')
+      attributes              = { 'href' => target_file }
+      attributes['navtitle']  = title if @opts[:navtitle] and title
+      attributes['locktitle'] = 'yes' if @opts[:locktitle] and attributes['navtitle']
+      attributes['type']      = type if @opts[:type] and type and ['concept', 'reference', 'task'].include? type
+      attributes['chunk']     = file_info[:chunk] if @opts[:chunk] and file_info[:chunk]
+      attributes['toc']       = file_info[:toc] if @opts[:toc] and file_info[:toc]
 
       return attributes
     end
@@ -249,14 +260,18 @@ module AsciidoctorDitaMap
         end
 
         if offset == 0
-          warn "#{@name}: warning: invalid leveloffset - expected 1, got 0: #{target}"
-          offset = 1
+          if @opts[:zero_offset]
+            offset = 0
+          else
+            warn "#{@name}: warning: invalid leveloffset - expected 1, got 0: #{target}"
+            offset = 1
+          end
         elsif offset > last_offset and offset - last_offset > 1
           expected_offset = last_offset + 1
           warn "#{@name}: warning: invalid leveloffset - expected #{expected_offset}, got #{offset}: #{target}"
         end
 
-        while stack.last[:offset] >= offset
+        while stack.length > 1 and stack.last[:offset] >= offset
           stack.pop
         end
 

data/lib/dita-map/version.rb

@@ -24,5 +24,5 @@
 # frozen_string_literal: true
 
 module AsciidoctorDitaMap
-  VERSION     = '0.9.2'
+  VERSION     = '0.9.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-map
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Jaromir Hradilek