asciidoctor-dita-map 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb319b4d8423d61539d7ec4816ccfac5499656cc15b739542ddb68023d210a0
-  data.tar.gz: 768371877af9214c0d80db4e19f29db88ab85c00821a5965480bd7f5304c3f2a
+  metadata.gz: 7868b5b984e99b8e02f45f267b4d493943d4232c1dc69e52169e39076f42bc01
+  data.tar.gz: 664073302552d392ba455a64fa4f28affd2b3fa890dfb333620b077094291835
 SHA512:
-  metadata.gz: d251c66f265772f85a48aee4e8da5c4f9902870e991074dfe10c12977fcbb5921c3a6b695108bfa0025becb1d97bd8cb19bd92fbbeee958b3a5958ed8cfead5f
-  data.tar.gz: 0ed486763aa0b355ef4ec931ce87181ab2a6ca9c024e55d9ec03b2782c9ceed05f321ef396378e9421ad10a1ef13200fb05c954e30081af25397ab6905fe0846
+  metadata.gz: c707f1e3aedc8aaec0b8be683eb9b01df94c1ce7812a994d5d6d09e727de1bd4e3c2e66a4cd84fbb06cfcb0e7fdbc0528e3b6d992c4787d1e6537450aa2f2130
+  data.tar.gz: f7cfb07b8374bd7f5d20fcde17b2b9221a019bb236592860a09a73b87b9483f47eb65ee2e113a979a0268756f6d384fe4d463aa7a4048dd843261b8f5aebb8e9

data/lib/dita-map/catalog.rb

@@ -30,11 +30,15 @@ class CatalogIncludeDirectives < Asciidoctor::Extensions::IncludeProcessor
 
   def process doc, reader, target, attributes
     offset = attributes['leveloffset'].to_i
+    chunk  = attributes['chunk'] or nil
+    toc    = attributes['toc'] or nil
 
     doc.catalog[:include_files] = [] unless doc.catalog[:include_files]
     doc.catalog[:include_files].append({
       :target => target,
-      :offset => offset
+      :offset => offset,
+      :chunk  => chunk,
+      :toc    => toc
     })
 
     reader

data/lib/dita-map/cli.rb

@@ -33,13 +33,16 @@ module AsciidoctorDitaMap
     def initialize name, argv
       @attr = []
       @opts = {
+        :chunk => true,
         :id => true,
         :navtitle => true,
         :output => false,
         :title => true,
+        :toc => true,
         :type => true,
         :self => false,
-        :verbose => false
+        :verbose => false,
+        :zero_offset => false
       }
       @prep = []
       @name = name
@@ -82,16 +85,28 @@ module AsciidoctorDitaMap
           @opts[:title] = false
         end
 
+        opt.on('-C', '--no-chunk', 'do not generate the chunk attribute') do
+          @opts[:chunk] = false
+        end
+
         opt.on('-N', '--no-navtitle', 'do not generate the navtitle attribute') do
           @opts[:navtitle] = false
         end
 
+        opt.on('-O', '--no-toc', 'do not generate the toc attribute') do
+          @opts[:toc] = false
+        end
+
         opt.on('-T', '--no-type', 'do not generate the type attribute') do
           @opts[:type] = false
         end
 
         opt.separator ''
 
+        opt.on('-z', '--zero-offset', 'allow include directives with zero leveloffset') do
+          @opts[:zero_offset] = true
+        end
+
         opt.on('-v', '--verbose', 'report additional problems in the supplied files') do
           @opts[:verbose] = true
         end
@@ -123,20 +138,23 @@ module AsciidoctorDitaMap
       return args
     end
 
-    def compose_mapref_attributes file_name, type
-      target_file        = file_name.sub(/\.adoc$/, '.ditamap')
-      attributes         = { 'href' => target_file, 'format' => 'ditamap' }
-      attributes['type'] = type if @opts[:type]
+    def compose_mapref_attributes file_info, type
+      target_file         = file_info[:target].sub(/\.adoc$/, '.ditamap')
+      attributes          = { 'href' => target_file, 'format' => 'ditamap' }
+      attributes['type']  = type if @opts[: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
 
-    def compose_topicref_attributes file_name, title, type
-      target_file            = file_name.sub(/\.adoc$/, '.dita')
-
+    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]
 
       return attributes
     end
@@ -210,16 +228,16 @@ module AsciidoctorDitaMap
       end
 
       if @opts[:self] and file
-        attributes = compose_topicref_attributes file, map[:title], map[:type]
+        attributes = compose_topicref_attributes({ :target => file }, map[:title], map[:type])
         xml_self   = xml_root.add_element('topicref', attributes)
         stack      = [{ :offset => 0, :element => xml_self }]
       else
         stack      = [{ :offset => 0, :element => xml_root }]
       end
 
-      include_files.each do |file|
-        target      = file[:target]
-        offset      = file[:offset]
+      include_files.each do |file_info|
+        target      = file_info[:target]
+        offset      = file_info[:offset]
         last_offset = stack.last[:offset]
         full_path   = base_dir + target
 
@@ -236,24 +254,28 @@ 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
 
         xml_parent = stack.last[:element]
 
         if include_type == 'map'
-          attributes  = compose_mapref_attributes target, include_type
+          attributes  = compose_mapref_attributes file_info, include_type
           xml_element = xml_parent.add_element('mapref', attributes)
         else
-          attributes  = compose_topicref_attributes target, include_title, include_type
+          attributes  = compose_topicref_attributes file_info, include_title, include_type
           xml_element = xml_parent.add_element('topicref', attributes)
         end
 

data/lib/dita-map/version.rb

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

metadata

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