asciidoctor-dita-topic 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7690eaba37e895e876771c847da1ed9bdbed1a6c697c843a4ab6c2b68e76e7b6
-  data.tar.gz: c4661d29f5dd07245e438e9f44446bfee3030b885d4b38d4d39964ef5031872e
+  metadata.gz: aa49c2e77c20ed32770fa37f0a286ca5a5aa808c5fef1e11c70bce3ac5fc3f74
+  data.tar.gz: 698164a21ee241367c0ebc3d029759e546618514ac91d93e7076abe0eea58ca7
 SHA512:
-  metadata.gz: 05ae4c5ca74d8b200ef763026171a1d82cc63c8fbd1a3492d6f5c53e5c5ecf525a72422b974c52093812ab76497167234042a44cb753b8dec7814678a6b6dde8
-  data.tar.gz: 238cb4a1a4f9f037f13ac8686ff9766d0100621044df8d0990374cc59c77743edb3fa888b07d23147a20678d660659e36c452348956027634a15eef86c15f7e4
+  metadata.gz: 6ddefc4aec275a5ce85990ca28bdcffe0d2a8033834112c5eea7c225f0420af2de96f952661799a17b3c2134739001ccf7f6323b7f8953a191f4dc9dcfb18ada
+  data.tar.gz: 1088e887c924235e473b9f23aa04e4e3a41e3f8f307857342f7f852b2de5791e2917d7b69c74ff8f487e1c82098d62cbe993f1b8fd9c9f72f127e7284dd14fe1

data/lib/dita-topic/cli.rb

@@ -33,9 +33,9 @@ module AsciidoctorDitaTopic
       @attr = ['experimental']
       @opts = {
         :output => false,
-        :includes => true,
         :standalone => true,
-        :map => false
+        :map => false,
+        :no_includes => 0
       }
       @prep = []
       @name = name
@@ -72,8 +72,8 @@ module AsciidoctorDitaTopic
           @prep.append file
         end
 
-        opt.on('-I', '--no-includes', 'disable processing of include directives') do
-          @opts[:includes] = false
+        opt.on('-I', '--no-includes', 'disable processing of include directives; specify this option twice to also apply on prepended files') do
+          @opts[:no_includes] += 1
         end
 
         opt.separator ''
@@ -216,7 +216,9 @@ module AsciidoctorDitaTopic
           output   = @opts[:output] ? @opts[:output] : Pathname.new(file).sub_ext(suffix).to_s
         end
 
-        input.gsub!(Asciidoctor::IncludeDirectiveRx, '//\&') unless @opts[:includes]
+        prepended.gsub!(/^:_(?:mod-docs-content|content|module)-type:[ \t]+\S/, '//\&')
+        prepended.gsub!(Asciidoctor::IncludeDirectiveRx, '//\&') if @opts[:no_includes] > 1
+        input.gsub!(Asciidoctor::IncludeDirectiveRx, '//\&') if @opts[:no_includes] > 0
 
         if @opts[:map]
           result = convert_map file, prepended + input, base_dir

data/lib/dita-topic/version.rb

@@ -24,5 +24,5 @@
 # frozen_string_literal: true
 
 module AsciidoctorDitaTopic
-  VERSION     = '1.4.6'
+  VERSION     = '1.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Jaromir Hradilek