asciidoctor-dita-map 0.9.10 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65632c6df171bc8a0d2f518aa1e5d2a00928582cf7468edfe38ab2cfa69418d9
-  data.tar.gz: 48e2e26502c6e3979d4aeaa77064176eeabfb315221e88b7d3330411d2265f4d
+  metadata.gz: 5c6a12e6aed6332bab0729841ef59f95889de1a2b29835b61e4262a41160a193
+  data.tar.gz: 595b111f04f4ce44b4d49ecd1e7f02facb44c2c9446501af403f48679335bf94
 SHA512:
-  metadata.gz: d64f8d5d83fe46b8387dc5e65245bd5fbf2f0b968c7519ff40499113953d920fe3d0977a96eabbda21d95e4724f1f8386afdae69337bf47eb17825bda8814937
-  data.tar.gz: 2a37fc303b7b5657aa0b6c9aa5d9104082a93ad5b984f8815c67b1b6370ce2a9cc53058a039575f6882bd10d7b5804a79a0f815d8dc0d8269145a8a3b6fcbd2a
+  metadata.gz: 6c27e7c8d5350b9231cbfbe0ee68a133de45f5287b6a5a61772ff8ecbcd5c05a3cbc2d1d6851913900be0c2b04cb9b029d7b2a2671c0ee5e89dc0de24aa317c4
+  data.tar.gz: 38450ab30ec18a34a0019134b2e1585fc8d28390596ef9d922caadc7f2cb1c14a1ba5f3a9699a9cf62b186eaec64a7f82de30c6216d2990e9cef42c073cf8bf5

data/lib/dita-map/cli.rb

@@ -29,9 +29,10 @@ require_relative 'version'
 module AsciidoctorDitaMap
   class Cli
     def initialize argv
-      @output    = nil
-      @converter = Convert.new
-      @args      = self.parse_args argv
+      @output       = nil
+      @conditionals = false
+      @converter    = Convert.new
+      @args         = self.parse_args argv
     end
 
     def parse_args argv
@@ -61,6 +62,10 @@ module AsciidoctorDitaMap
           @converter.opts[:self] = true
         end
 
+        opt.on('-c', '--conditionals', 'do not ignore conditional directives when processing the file') do
+          @conditionals = true
+        end
+
         opt.separator ''
 
         opt.on('-A', '--no-assembly', 'do not treat assemblies as maps') do
@@ -144,6 +149,8 @@ module AsciidoctorDitaMap
           output   = @output ? @output : Pathname.new(file).sub_ext('.ditamap').to_s
         end
 
+        input.gsub!(/^(?:ifn?def|ifeval|endif)::\S*\[(.*)\]\s*$/, '\1') if not @conditionals
+
         if @converter.opts[:self] and file != $stdin
           result = @converter.run input, base_dir, file
         else

data/lib/dita-map/convert.rb

@@ -97,16 +97,18 @@ module AsciidoctorDitaMap
       end
 
       if map.title and @opts[:title]
-        xml_title      = xml_root.add_element('title')
+        xml_title = xml_root.add_element('title')
         xml_title.add REXML::Text.new(map.title, false, nil, true)
       end
 
       if @opts[:self] and file
-        xml_self   = xml_root.add_element('topicref')
-        compose_topicref_attributes(xml_self, { :target => file }, map.title, map.type)
-        stack      = [{ :offset => 0, :element => xml_self }]
+        file_info = map.chunk ? { :target => file, :chunk => 'to-content' } : { :target => file }
+        xml_self  = xml_root.add_element('topicref')
+        compose_topicref_attributes(xml_self, file_info, map.title, map.type)
+
+        stack     = [{ :offset => 0, :element => xml_self }]
       else
-        stack      = [{ :offset => 0, :element => xml_root }]
+        stack     = [{ :offset => 0, :element => xml_root }]
       end
 
       map.includes.each do |file_info|

data/lib/dita-map/map.rb

@@ -27,7 +27,7 @@ require_relative 'topic'
 
 module AsciidoctorDitaMap
   class Map < Topic
-    attr_accessor :id, :includes
+    attr_accessor :chunk, :id, :includes
 
     def initialize input, base_dir, attributes = []
       if input.empty?
@@ -35,6 +35,7 @@ module AsciidoctorDitaMap
         @title    = nil
         @type     = nil
         @includes = []
+        @chunk    = false
       else
         Asciidoctor::Extensions.register do
           include_processor CatalogIncludeDirectives
@@ -46,6 +47,7 @@ module AsciidoctorDitaMap
         @id       = doc.id ? doc.id.gsub(/["']/, '') : nil
         @title    = doc.title ? doc.title.gsub(/<[^>]*>/, '') : nil
         @type     = get_content_type doc.attributes
+        @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.10'
+  VERSION     = '0.9.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-map
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.12
 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.15
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Convert an AsciiDoc file to a DITA map
 test_files: []