review-retrovert 0.9.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9311aa0fa85bd42652cbbe163b02383bb3e3ce8b82d5c10f1d85af48ecda098
-  data.tar.gz: cac37e6eae36803b96a0f009695ffe480a7fafe4642a1bb45a44a4bcc1eb948b
+  metadata.gz: 02507e93743d82045d68c54d9aa2acec9666def48b1187b7577e1e70ade8a4f5
+  data.tar.gz: f2121fe5b228534e7f1ada87cbce40d35674cc7f1b92f2de14d04e500ef5b640
 SHA512:
-  metadata.gz: 506fd1726a38d677b12c6641ba1f77330c332c9ec75d9d18427cedc8647ec319762df7025b8bcc65458e7bac9921fd62b6c3e7f3d6faf0447c5ad15a486ed2a9
-  data.tar.gz: 21dabf3b90b0d6f93183d7e48aa7a3b32614b37edc078f6c538c6e8b810fc5c5f4ae7577ca10d9f6a45cc8732867d2e12f558f7ff5d1fb4fb97ddefe547c80fa
+  metadata.gz: edcf427bdad063863a08aff465863a8a6f6f0fc626b8491aab77df8902b46439239298fe21e220b2a7e8e712f93367267ae3a7a7a3a67eb89780a56f3e72ab03
+  data.tar.gz: 66b55029a3127ad59626c8852c883a9c1d264be675686d4562d56ec9e58ee41458aa89e9a6a49e9a506684902256f18924b68f0a68bafa7fd53de37af1088f13

data/.github/workflows/retrovert.yml

@@ -8,12 +8,22 @@ name: Retrovert
 jobs:
   review:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        review-version: [ "3.2", "4.2", "5.0" ]
+      fail-fast: false
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6
-      - run: bundle install
+      - run: |
+          rm -f Gemfile.lock
+          cp Gemfile Gemfile-${{ matrix.review-version }}
+          echo 'gem "review", "${{ matrix.review-version }}"' >> Gemfile-${{ matrix.review-version }}
+          cat Gemfile-${{ matrix.review-version }}
+          echo "BUNDLE_GEMFILE=Gemfile-${{ matrix.review-version }}" >> $GITHUB_ENV
+      - run: bundle install --gemfile=Gemfile-${{ matrix.review-version }}
       # spec
       - name: spec
         run: bundle exec rake spec
@@ -21,19 +31,31 @@ jobs:
       - name: convert
         run: bundle exec review-retrovert convert testdata/mybook/config.yml tmp -f
       # build
-      - name: review build
-        uses: docker://srzzumix/review-retrovert
+      # - name: review build
+      #   uses: ${{ matrix.uses }}
+      #   with:
+      #     entrypoint: bash
+      #     args: -c "cd tmp; rake preproc all"
+      # docker login
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          entrypoint: bash
-          args: -c "cd tmp; rake preproc all"
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build html
+        run: |
+          docker run --rm -v "$(pwd)/tmp":/work -w /work vvakame/review:${{ matrix.review-version }} rake preproc html
+      - name: build pdf
+        run: |
+          docker run --rm -v "$(pwd)/tmp":/work -w /work vvakame/review:${{ matrix.review-version }} rake preproc pdf
       # artifacts
       - name: artifacts
         uses: actions/upload-artifact@v1
         with:
           name: mybook
           path: tmp/mybook.pdf
-      - name: artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: mybook
-          path: tmp/mybook.epub
+      # - name: artifacts
+      #   uses: actions/upload-artifact@v1
+      #   with:
+      #     name: mybook
+      #     path: tmp/mybook.epub

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM vvakame/review:3.2
+FROM vvakame/review:5.0
 
 RUN gem install review-retrovert
 

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem 'aruba', '~> 1.0.2'
+gem 'aruba', '~> 1.0.2'

data/Gemfile.lock

@@ -1,68 +1,67 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.3.4)
-      review (>= 3.2.0, < 4.0)
+    review-retrovert (0.9.6)
+      review (>= 3.0.0)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    aruba (1.0.4)
       childprocess (>= 2.0, < 5.0)
       contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 5.0)
-      ffi (~> 1.9)
+      cucumber (>= 2.4, < 6.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     builder (3.2.4)
     childprocess (4.0.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     contracts (0.16.0)
-    cucumber (4.1.0)
-      builder (~> 3.2, >= 3.2.3)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-create-meta (~> 1.0.0, >= 1.0.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-html-formatter (~> 7.0, >= 7.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      cucumber-wire (~> 3.1, >= 3.1.0)
-      diff-lcs (~> 1.3, >= 1.3, < 1.4)
+    cucumber (5.2.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.0, >= 1.0.2)
-    cucumber-core (7.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-messages (~> 12.2, >= 12.2.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
       cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (1.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
+    cucumber-create-meta (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
       sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.2.2)
-    cucumber-gherkin (14.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-html-formatter (7.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-messages (12.4.0)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.2.1)
       protobuf-cucumber (~> 3.10, >= 3.10.8)
     cucumber-tag-expressions (2.0.4)
-    cucumber-wire (3.1.0)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-    diff-lcs (1.3)
-    ffi (1.13.1)
-    i18n (1.8.5)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    diff-lcs (1.4.4)
+    ffi (1.14.2)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    image_size (2.0.2)
+    image_size (2.1.0)
     middleware (0.1.0)
-    minitest (5.14.1)
+    minitest (5.14.3)
     multi_test (0.1.2)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
@@ -70,32 +69,32 @@ GEM
       thor
       thread_safe
     rake (12.3.3)
-    review (3.2.0)
+    review (5.0.0)
       image_size
       rouge
       rubyzip
-    rouge (3.21.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rouge (3.26.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     rubyzip (2.3.0)
-    sys-uname (1.2.1)
-      ffi (>= 1.0.0)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,7 +4,7 @@
 
 # ReVIEW::Retrovert
 
-[Re:VIEW Starter](https://kauplan.org/reviewstarter/) Project convert to [Re:VIEW](https://reviewml.org/ja/) 3.X
+[Re:VIEW Starter](https://kauplan.org/reviewstarter/) Project convert to [Re:VIEW](https://reviewml.org/ja/) 3.X/4.X/5.X
 
 ## Installation
 
@@ -21,13 +21,78 @@ And then execute:
 Or install it yourself as:
 
     $ gem install review-retrovert
+    
+## Use Docker
 
-## Usage
+```
+docker run -v "$(pwd):/work" -w /work srzzumix/review-retrovert convert target/config.yml outdir
+```
+
+## Commands
+
+```sh
+Commands:
+  review-retrovert convert {review_starter_configfile} {outdir}  # convert Re:VIEW Starter project to Re:VIEW project
+  review-retrovert help [COMMAND]                                # Describe available commands or one specific command
+  review-retrovert version                                       # show version
+```
+
+### Convert
+
+#### e.g.
 
 ```sh
 review-retrovert convert /path/to/dir/review-starter/config.yml <output directory>
 ```
 
+#### Options
+
+```sh
+sage:
+  review-retrovert convert {review_starter_configfile} {outdir}
+
+Options:
+  f, [--force]                                     # Force output
+      [--strict], [--no-strict]                    # Only process files registered in the catalog
+      [--preproc], [--no-preproc]                  # Execute preproc after conversion
+      [--tabwidth=N]                               # Preproc tabwidth option value
+                                                   # Default: 0
+      [--table-br-replace=TABLE-BR-REPLACE]        # @<br>{} in table replace string (Default: empty)
+      [--table-empty-replace=TABLE-EMPTY-REPLACE]  # empty cell(.) in table replace string (Default full-width space)
+                                                   # Default: 　
+      [--ird], [--no-ird]                          # for IRD
+      [--no-image]                                 # donot copy image
+
+convert Re:VIEW Starter project to Re:VIEW project
+```
+
+#### retrovert config
+
+If the retrovert key is present in config.yml, the subordinate elements will take effect after convert.
+
+If you have a setting that you want to enable only after retrovert, use inherit as shown below.
+
+* config-retrovert.yml
+
+```yml
+retrovert:
+  chapterlink: null
+```
+
+* config-base.yml
+
+```yml
+chapterlink: true
+```
+
+* config.yml
+
+```yml
+inherit: ["config-base.yml", "config-starter.yml", "config-retrovert.yml"]
+
+#chapterlink: true
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -40,7 +105,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/srz-zu
 
 ## Develop
 
-docker run -it --rm -v $(pwd)/:/work -w /work vvakame/review:3.2 bash
+docker run -it --rm -v $(pwd)/:/work -w /work vvakame/review:5.0 bash
 
 ## License
 

data/lib/review/retrovert/cli.rb

@@ -7,8 +7,12 @@ module ReVIEW
       desc "convert {review_starter_configfile} {outdir}", "convert Re:VIEW Starter project to Re:VIEW project"
       method_option "force", aliases: "f", desc: 'Force output', type: :boolean
       method_option "strict", desc: 'Only process files registered in the catalog', type: :boolean
-      method_option "table-br-replace", desc: '@<br>{} in table replace string', type: :string, default: ''
-      method_option "table-empty-replace", desc: 'empty cell(.) in table replace string', type: :string, default: '　'
+      method_option "preproc", desc: 'Execute preproc after conversion', type: :boolean
+      method_option "tabwidth", desc: 'Preproc tabwidth option value', type: :numeric, default: 0
+      method_option "table-br-replace", desc: '@<br>{} in table replace string (Default: empty)', type: :string, default: ''
+      method_option "table-empty-replace", desc: 'empty cell(.) in table replace string (Default full-width space)', type: :string, default: '　'
+      method_option "ird", desc: 'for IRD', type: :boolean
+      method_option "no-image", desc: 'donot copy image', type: :boolean
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end

data/lib/review/retrovert/converter.rb

@@ -1,5 +1,6 @@
 require "review"
 require 'fileutils'
+require 'tmpdir'
 require "review/retrovert/yamlconfig"
 
 module ReVIEW
@@ -13,6 +14,9 @@ module ReVIEW
         @outimagedir = nil
         @logger = ReVIEW.logger
         @configs = YamlConfig.new
+        @embeded_contents = []
+        @catalog_contents = []
+        @ird = false
       end
 
       def error(msg)
@@ -45,21 +49,50 @@ module ReVIEW
         FileUtils.cp_r(Dir.glob(File.join(path, '*.re')), outdir)
       end
 
-      def copy_images(outdir)
+      def get_out_imagedir(outdir)
         imagedir = @config['imagedir']
-        srcpath = File.join(@basedir, imagedir)
         outimagedir = File.basename(imagedir) # Re:VIEW not support sub-directory
         outpath = File.join(outdir, outimagedir)
+        return outpath
+      end
+
+      def store_out_image(outdir)
+        outpath = get_out_imagedir(outdir)
+        if File.exist?(outpath)
+          dir = Dir.mktmpdir('review-retrovert')
+          FileUtils.mv(Dir.glob(File.join(outpath, "**/*")), dir)
+          return dir
+        end
+        return nil
+      end
+
+      def restore_out_image(outpath, tmpdir)
+        if File.exist?(tmpdir)
+          FileUtils.mkdir_p(outpath)
+          FileUtils.mv(Dir.glob(File.join(tmpdir, "**/*")), outpath)
+          FileUtils.rm_rf(tmpdir)
+        end
+      end
+
+      def copy_images(outdir, store_image_dir)
+        imagedir = @config['imagedir']
+        outimagedir = File.basename(imagedir) # Re:VIEW not support sub-directory
+        outpath = get_out_imagedir(outdir)
         FileUtils.mkdir_p(outpath)
-        image_ext = @config['image_ext']
-        srcroot = Pathname.new(srcpath)
-        image_ext.each { |ext|
-          Dir.glob(File.join(srcpath, "**/*.#{ext}")).each { |srcimg|
-            outimg = File.join(outpath, Pathname.new(srcimg).relative_path_from(srcroot))
-            FileUtils.makedirs(File.dirname(outimg))
-            FileUtils.cp(srcimg, outimg)
+        if store_image_dir
+          restore_out_image(outpath, store_image_dir)
+        else
+          srcpath = File.join(@basedir, imagedir)
+          image_ext = @config['image_ext']
+          srcroot = Pathname.new(srcpath)
+          image_ext.each { |ext|
+            Dir.glob(File.join(srcpath, "**/*.#{ext}")).each { |srcimg|
+              outimg = File.join(outpath, Pathname.new(srcimg).relative_path_from(srcroot))
+              FileUtils.makedirs(File.dirname(outimg))
+              FileUtils.cp(srcimg, outimg)
+            }
           }
-        }
+        end
         @configs.rewrite_yml('imagedir', outimagedir)
       end
 
@@ -67,10 +100,24 @@ module ReVIEW
         @configs.rewrite_yml('contentdir', '.')
         @configs.rewrite_yml('hook_beforetexcompile', 'null')
         @configs.rewrite_yml('texstyle', '["reviewmacro"]')
+        pagesize = @config['starter']['pagesize'].downcase
+        @configs.rewrite_yml_array('texdocumentclass', "[\"review-jsbook\", \"media=print,paper=#{pagesize}\"]")
+        @config['retrovert'].each{ |k,v|
+          unless v..is_a?(Hash)
+            @configs.commentout_root_yml(k)
+          end
+        }
+        if @ird
+          @configs.rewrite_yml('chapterlink', 'null')
+        end
       end
 
       def replace_compatible_block_command_outline(content, command, new_command, option_count)
-        content.gsub!(/^\/\/#{command}(?<option>(\[[^\r\n]*?\]){0,#{option_count}})(\[[^\r\n]*\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}\\k<option>{\\k<inner>//}")
+        if option_count > 0
+          content.gsub!(/^\/\/#{command}(?<option>(\[[^\r\n]*?\]){0,#{option_count}})(\[[^\r\n]*\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}\\k<option>{\\k<inner>//}")
+        else
+          content.gsub!(/^\/\/#{command}(\[[^\r\n]*\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}{\\k<inner>//}")
+        end
       end
 
       def replace_compatible_block_command_to_outside(content, command, new_command, option_count, add_options="", new_body="")
@@ -105,22 +152,29 @@ module ReVIEW
         content.gsub!(/@<#{command}>/, "@<#{new_command}>")
       end
 
-      def replace_block_command_nested_boxed_article(content, box)
+      def replace_block_command_nested_boxed_article_i(content, box, depth)
         found = false
         content.dup.scan(/(^\/\/#{box})(\[[^\r\n]*?\])*(?:(\$)|(?:({)|(\|)))(.*?)(^\/\/)(?(3)(\$)|(?(4)(})|(\|)).*?[\r\n]+)/m) { |m|
           matched = m[0..-1].join
           inner = m[5]
+          # info depth
           im = inner.match(/^\/\/(\w+)((\[.*?\])*)([$|{])/)
           unless im.nil?
             inner_cmd = im[1]
             inner_open = im[4]
             inner_opts = im[2]
-            first_opt = inner_opts.match(/^\[(.*?)\]/)[1]
+            first_opt_m = inner_opts.match(/^\[(.*?)\]/)
+            first_opt = ""
 
+            # is_commentout = false
             is_commentout = true
-            unless first_opt.empty?
-              if inner.match(/@<.*?>[$|{]#{first_opt}/)
-                is_commentout = false
+            if first_opt_m
+              first_opt_v = first_opt_m[1]
+              unless first_opt_v.empty?
+                if inner.match(/@<.*?>[$|{]#{first_opt}/)
+                  is_commentout = false
+                  first_opt = "\\[#{first_opt_v}\\]"
+                end
               end
             end
             cmd_begin = m[0..4].join
@@ -129,10 +183,10 @@ module ReVIEW
             if inner_open == m[2..4].join
               # if same fence then cmd_end == inner_end
               if is_commentout
-                inner.gsub!(/(^\/\/(\w+\[.*?\])*#{inner_open})/, '#@#\1')
+                inner.gsub!(/(^\/\/(\w+(\[.*?\]|))*#{inner_open})/, '#@#\1')
                 content.gsub!(/#{Regexp.escape(matched)}/m, "#{cmd_begin}#{inner}#@##{cmd_end}")
               else
-                imb = inner.match(/(\R((^\/\/\w+(\[.*?\])*)\s*)*^\/\/\w+\[#{first_opt}\](\[.*?\])*#{inner_open}.*)\R/m)
+                imb = inner.match(/(\R((^\/\/\w+(\[.*?\])*)\s*)*^\/\/#{inner_cmd}#{first_opt}(\[.*?\])*#{inner_open}.*)\R/m)
                 to_out_block = imb[1]
                 inner.gsub!(/#{Regexp.escape(to_out_block)}/m, '')
                 content.gsub!(/#{Regexp.escape(matched)}/m, "#{cmd_begin}#{inner}#{cmd_end}#{to_out_block}")
@@ -140,10 +194,10 @@ module ReVIEW
             else
               close = inner_open == '{' ? '}' : inner_open
               if is_commentout
-                inner.gsub!(/(^\/\/(\w+\[.*?\])*#{inner_open})(.*?)(^\/\/#{close})/m, '#@#\1\2#@#\3')
+                inner.gsub!(/(^\/\/(\w+(\[.*?\]|))*#{inner_open})(.*?)(^\/\/#{close})/m, '#@#\1\2#@#\3')
                 content.gsub!(/#{Regexp.escape(matched)}/m, "#{cmd_begin}#{inner}#{cmd_end}")
               else
-                imb = inner.match(/\R((^\/\/\w+(\[.*?\])*)\s*)*^\/\/(\w+)\[#{first_opt}\](\[[^\r\n]*?\])*(?:(\$)|(?:({)|(\|)))(.*?)(^\/\/)(?(3)(\$)|(?(4)(})|(\|)))/m)
+                imb = inner.match(/\R((^\/\/\w+(\[.*?\])*)\s*)*^\/\/(#{inner_cmd})#{first_opt}(\[[^\r\n]*?\])*(?:(\$)|(?:({)|(\|)))(.*?)(^\/\/)(?(3)(\$)|(?(4)(})|(\|)))/m)
                 to_out_block = imb[0]
                 inner.gsub!(/#{Regexp.escape(to_out_block)}/m, '')
                 content.gsub!(/#{Regexp.escape(matched)}/m, "#{cmd_begin}#{inner}#{cmd_end}#{to_out_block}")
@@ -153,22 +207,38 @@ module ReVIEW
           end
         }
         if found
-          replace_block_command_nested_boxed_article(content, box)
+          replace_block_command_nested_boxed_article_i(content, box, depth+1)
         end
       end
 
+      def replace_block_command_nested_boxed_article(content, box)
+        replace_block_command_nested_boxed_article_i(content, box, 0)
+      end
+
       def replace_block_command_nested_boxed_articles(content)
-        replace_block_command_nested_boxed_article(content, 'note')
-        replace_block_command_nested_boxed_article(content, 'memo')
-        replace_block_command_nested_boxed_article(content, 'tip')
-        replace_block_command_nested_boxed_article(content, 'info')
-        replace_block_command_nested_boxed_article(content, 'warning')
-        replace_block_command_nested_boxed_article(content, 'important')
-        replace_block_command_nested_boxed_article(content, 'caution')
-        replace_block_command_nested_boxed_article(content, 'notice')
+        unless Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('5.0.0')
+          replace_block_command_nested_boxed_article(content, 'note')
+          replace_block_command_nested_boxed_article(content, 'memo')
+          replace_block_command_nested_boxed_article(content, 'tip')
+          replace_block_command_nested_boxed_article(content, 'info')
+          replace_block_command_nested_boxed_article(content, 'warning')
+          replace_block_command_nested_boxed_article(content, 'important')
+          replace_block_command_nested_boxed_article(content, 'caution')
+          replace_block_command_nested_boxed_article(content, 'notice')
+        end
       end
 
       def replace_block_commentout(content)
+        d = content.dup
+        d.scan(/(^#@)(\++)(.*?)(^#@)(-+)/m) { |m|
+          matched = m[0..-1].join
+          inner = m[2]
+          inner.gsub!(/(^.)/, '#@#\1')
+          content.gsub!(/#{Regexp.escape(matched)}/m, "#@##{m[1]}#{inner}#@##{m[4]}")
+        }
+      end
+
+      def replace_block_commentout_without_sampleout(content)
         d = content.dup
         d.gsub!(/(^\/\/sampleoutputbegin\[)(.*?)(\])(.*?)(^\/\/sampleoutputend)/m, '')
         d.scan(/(^#@)(\++)(.*?)(^#@)(-+)/m) { |m|
@@ -180,7 +250,7 @@ module ReVIEW
       end
 
       def replace_sampleoutput(content)
-        replace_block_commentout(content)
+        # replace_block_commentout_without_sampleout(content)
         content.dup.scan(/(^\/\/sampleoutputbegin\[)(.*?)(\].*?\R)(.*?)(^\/\/sampleoutputend)/m) { |m|
           matched = m[0..-1].join
           sampleoutputbegin = m[0..2].join
@@ -201,6 +271,12 @@ module ReVIEW
         end
       end
 
+      def fix_deprecated_list(content)
+        if Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('4.0.0')
+          content.gsub!(/^: (.*)/, ' : \1')
+        end
+      end
+
       def remove_starter_refid(content)
         # note - noteref
         content.dup.scan(/(@<noteref>)(?:(\$)|(?:({)|(\|)))(.*?)(?(2)(\$)|(?(3)(})|(\|)))/) { |m|
@@ -258,16 +334,49 @@ module ReVIEW
             outpath = File.join(File.absolute_path(outdir), filepath)
             FileUtils.mkdir_p(File.dirname(outpath))
             FileUtils.cp(srcpath, outpath)
+            @embeded_contents.push(filepath[0])
             update_content(outpath, outpath)
           end
         end
       end
 
+      def make_id_label(name)
+        name.gsub(/[^A-Za-z0-9]/, '_')
+      end
+
+      def add_linkurl_footnote(content, filename)
+        urls = {}
+        content.dup.scan(/(^.*)(@<href>{)(.*?)(,)(.*?)(})(.*)$/) { |m|
+          unless m[0].match(/^#@#/)
+            matched = m.join
+            prev = m[0]
+            url = m[2]
+            text = m[4]
+            post = m[6]
+            id = "#{make_id_label(filename)}_link_auto_footnote#{urls.length}"
+            urls[id] = url
+            content.sub!(/#{Regexp.escape(matched)}$/, "#{prev}@<href>{#{url},#{text}} @<fn>{#{id}} #{post}")
+          end
+        }
+
+        urls.each { |k,v|
+          content.sub!(/(@<href>{#{v},.*?} @<fn>{#{k}}.*?\R\R)/m, "\\1//footnote[#{k}][#{v}]\n")
+        }
+
+        urls.each { |k,v|
+          unless content.match(/\/\/footnote\[#{k}\]\[#{v}\]/)
+            content << "//footnote[#{k}][#{v}]\n"
+          end
+        }
+      end
+
       def update_content(outdir, contentfile)
         info contentfile
+        filename = File.basename(contentfile, '.*')
         content = File.read(contentfile)
         content.gsub!(/@<href>{(.*?)#.*?,(.*?)}/, '@<href>{\1,\2}')
         content.gsub!(/@<href>{(.*?)#.*?}/, '@<href>{\1}')
+        linkurl_footnote = @config['starter']['linkurl_footnote']
         # table 内の @ コマンドは不安定らしい
         while !content.gsub!(/(\/\/table.*)@<br>{}(.*?\/\/})/m, "\\1#{@table_br_replace}\\2").nil? do
         end
@@ -276,15 +385,20 @@ module ReVIEW
         end
         # Re:VIEW Starter commands
         replace_compatible_block_command_outline(content, 'terminal', 'cmd', 1)
+        replace_compatible_block_command_outline(content, 'cmd', 'cmd', 0)
         replace_compatible_block_command_to_outside(content, 'sideimage', 'image', 1, '[]')
         replace_block_command_outline(content, 'abstract', 'lead', true)
         delete_block_command(content, 'needvspace')
         delete_block_command(content, 'clearpage')
         delete_block_command(content, 'flushright')
         delete_block_command(content, 'centering')
-        delete_block_command(content, 'noindent')
         delete_block_command(content, 'paragraphend')
 
+        # delete IRD unsupported commands
+        if @ird
+          delete_block_command(content, 'noindent')
+        end
+
         replace_inline_command(content, 'secref', 'hd')
         replace_inline_command(content, 'file', 'kw')
         replace_inline_command(content, 'hlink', 'href')
@@ -302,10 +416,21 @@ module ReVIEW
 
         # fixed lack of options
         content.gsub!(/^\/\/list{/, '//list[][]{')
+        # empty br line to blankline
+        content.gsub!(/^\s*@<br>{}\s*$/, '//blankline')
+
+        if Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('4.0.0')
+          # empty caption is not allow
+          content.gsub!(/^\/\/image\[(.*)\]\[\]{/, '//image[\1][ ]{')
+        end
 
         # special command
         replace_sampleoutput(content)
 
+        if linkurl_footnote
+          add_linkurl_footnote(content, filename)
+        end
+
         # nested command
         replace_block_command_nested_boxed_articles(content)
 
@@ -317,6 +442,9 @@ module ReVIEW
         remove_starter_refid(content)
         remove_starter_options(content)
 
+        # replace block comment
+        replace_block_commentout(content)
+
         # special charactor
         content.gsub!('@<LaTeX>{}', 'LaTeX')
         content.gsub!('@<TeX>{}', 'TeX')
@@ -330,6 +458,15 @@ module ReVIEW
         # expand nested inline command
         expand_nested_inline_command(content)
 
+        # fix deprecated
+        fix_deprecated_list(content)
+
+        if @ird
+          # br to blankline
+          content.gsub!(/(.*)@<br>{}$/, "\\1\n\n")
+          content.gsub!(/(.*)@<br>{}(.*)$/, "\\1\n\n\\2")
+        end
+
         File.write(contentfile, content)
         copy_embedded_contents(outdir, content)
       end
@@ -338,8 +475,13 @@ module ReVIEW
         files = contentfiles.is_a?(String) ? contentfiles.split(/\R/) : contentfiles
         files.each do |content|
           contentpath = File.join(contentdir, content)
+          srccontentpath = File.join(@srccontentsdir, content)
+          if @embeded_contents.include?(srccontentpath)
+            info "skip copy maped file #{contentpath}"
+            next
+          end
           unless File.exist?(contentpath)
-            srcpath = File.join(File.join(@basedir, @srccontentsdir), content)
+            srcpath = File.join(@basedir, srccontentpath)
             # info srcpath
             if File.exist?(srcpath)
               FileUtils.cp(srcpath, contentdir)
@@ -355,16 +497,48 @@ module ReVIEW
         contentdir = abspath
         info 'replace starter block command'
         info 'replace starter inline command'
+        catalog = ReVIEW::Catalog.new(File.open(File.join(abspath, yamlfile)))
+        update_content_files(outdir, contentdir, @catalog_contents)
+        unless options['strict']
+          all_contentsfiles = Pathname.glob(File.join(File.join(@basedir, @srccontentsdir), '*.re')).map(&:basename)
+          contentsfiles = all_contentsfiles.select{ |path| ! @catalog_contents.include?(path.to_s) }
+          update_content_files(outdir, contentdir, contentsfiles)
+        end
+      end
+
+      def preproc_content_files(outdir, pp, contentdir, contentfiles)
+        files = contentfiles.is_a?(String) ? contentfiles.split(/\R/) : contentfiles
+        files.each do |content|
+          contentpath = File.join(contentdir, content)
+          if File.exist?(contentpath)
+            info "preproc #{contentpath}"
+            buf = StringIO.new
+            pwd = Dir.pwd
+            Dir.chdir(outdir)
+            File.open(contentpath) { |f| pp.process(f, buf) }
+            Dir.chdir(pwd)
+            content = buf.string
+            content.gsub!(/^#[@]map.*$/, '')
+            content.gsub!(/^#[@]end$/, '')
+            File.write(contentpath, content)
+          end
+        end
+      end
+
+      def preproc_contents(outdir, options)
+        yamlfile = @config['catalogfile']
+        abspath = File.absolute_path(outdir)
+        contentdir = abspath
+        param = {}
+        param['tabwidth'] = options['tabwidth'].to_i
+        pp = ReVIEW::Preprocessor.new(ReVIEW::Repository.new(param), param)
+
         if options['strict']
           catalog = ReVIEW::Catalog.new(File.open(File.join(abspath, yamlfile)))
-          update_content_files(outdir, contentdir, catalog.predef())
-          update_content_files(outdir, contentdir, catalog.chaps())
-          update_content_files(outdir, contentdir, catalog.appendix())
-          update_content_files(outdir, contentdir, catalog.postdef())
+          preproc_content_files(outdir, pp, contentdir, @catalog_contents)
         else
-          # copy_contents(outdir)
           contentsfiles = Pathname.glob(File.join(File.join(@basedir, @srccontentsdir), '*.re')).map(&:basename)
-          update_content_files(outdir, contentdir, contentsfiles)
+          preproc_content_files(outdir, pp, contentdir, contentsfiles)
         end
       end
 
@@ -375,11 +549,22 @@ module ReVIEW
         FileUtils.rm(Dir.glob(File.join(outdir, '*.re')))
       end
 
+      def add_catalog_contents(contentfiles)
+        files = contentfiles.is_a?(String) ? contentfiles.split(/\R/) : contentfiles
+        @catalog_contents.concat(files)
+      end
+
       def load_config(yamlfile)
         @configs.open(yamlfile)
         @config = @configs.config
         @basedir = @configs.basedir
         @srccontentsdir = @config['contentdir']
+
+        catalog = ReVIEW::Catalog.new(File.open(@configs.catalogfile()))
+        add_catalog_contents(catalog.predef())
+        add_catalog_contents(catalog.chaps())
+        add_catalog_contents(catalog.appendix())
+        add_catalog_contents(catalog.postdef())
       end
 
       def create_initial_project(outdir, options)
@@ -391,12 +576,14 @@ module ReVIEW
       def execute(yamlfile, outdir, options)
         @table_br_replace = options['table-br-replace']
         @table_empty_replace = options['table-empty-replace']
+        @ird = options['ird']
         load_config(yamlfile)
+        store_image_dir = store_out_image(outdir) if options['no-image']
         create_initial_project(outdir, options)
 
         copy_config(outdir)
         copy_catalog(outdir)
-        copy_images(outdir)
+        copy_images(outdir, store_image_dir)
         update_config(outdir)
         update_contents(outdir, options)
 
@@ -405,8 +592,16 @@ module ReVIEW
         updater = ReVIEW::Update.new
         updater.force = true
         # updater.backup = false
-        updater.execute()
+        begin
+          updater.execute()
+        rescue
+        end
         Dir.chdir(pwd)
+
+        if options['preproc']
+          info 'preproc'
+          preproc_contents(outdir, options)
+        end
       end
 
       def self.execute(yamlfile, outdir, options)

data/lib/review/retrovert/version.rb

@@ -1,5 +1,5 @@
 module ReVIEW
   module Retrovert
-    VERSION = "0.9.1"
+    VERSION = "0.9.6"
   end
 end

data/lib/review/retrovert/yamlconfig.rb

@@ -87,9 +87,19 @@ module ReVIEW
         rewrite_retrovert_yml()
       end
 
+      def commentout(yamlfile, key)
+        content = File.read(yamlfile)
+        content.gsub!(/^(\s*)#{key}:(.*)$/, "#\\1#{key}:\\2")
+        File.write(yamlfile, content)
+      end
+
+      def commentout_root_yml(key)
+        commentout(File.join(@basedir, @basename), key)
+      end
+
       def rewrite_yml_(yamlfile, key, val)
         content = File.read(yamlfile)
-        content.gsub!(/^(\s*)#{key}:.*$/, '\1' + "#{key}: #{val}")
+        content.gsub!(/^(\s*)#{key}:.*$/, "\\1#{key}: #{val}")
         File.write(yamlfile, content)
       end
 
@@ -99,6 +109,18 @@ module ReVIEW
         }
       end
 
+      def rewrite_yml_array_(yamlfile, key, val)
+        content = File.read(yamlfile)
+        content.gsub!(/^(\s*)#{key}:\s*\[.*?\]/m, '\1' + "#{key}: #{val}")
+        File.write(yamlfile, content)
+      end
+
+      def rewrite_yml_array(key, val)
+        config_files.each { |current_file|
+          rewrite_yml_array_(File.join(@basedir, current_file), key, val)
+        }
+      end
+
       def rewrite_retrovert_yml()
         @retrovert_configs.each { |current_file|
           yamlfile = File.expand_path(current_file, @basedir)
@@ -109,6 +131,7 @@ module ReVIEW
           # YAML.dump(yaml, File.open(yamlfile, "w"))
           content = Psych.dump(yaml)
           content.gsub!('---','')
+          content.gsub!(/^(.*):\s*$/, '\1: null')
           File.write(yamlfile, content)
         }
       end
@@ -125,6 +148,14 @@ module ReVIEW
         return yaml
       end
 
+      def path()
+        File.join(@basedir, @basename)
+      end
+
+      def catalogfile()
+        File.join(@basedir, @config['catalogfile'])
+      end
+
     end
   end
-end
+end

data/review-retrovert.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_development_dependency "aruba"
-  spec.add_runtime_dependency "review", ['>= 3.2.0', '< 4.0']
+  spec.add_runtime_dependency "review", ['>= 3.0.0']
 end

data/testdata/mybook/catalog.yml

@@ -8,6 +8,7 @@ CHAPS:
   - 04-customize.re
   - 05-faq.re
   - 06-bestpractice.re
+  - r0-root.re
 
 APPENDIX:
   - 91-compare.re

data/testdata/mybook/config-retrovert.yml

@@ -0,0 +1,7 @@
+# review-retrovert で変換したときに上書きする設定
+# 現在はトップレベルのコメントアウトのみ対応
+# サブ階層の設定を上書きしたい場合は、対象設定を inherit な yml ファイルに記述
+# > inherit: [config-base.yml, config-retrovert.yml]
+# 上記のようにすることで retrovert 後のプロジェクトでのみ設定を上書きできます
+retrovert:
+  chapterlink: null

data/testdata/mybook/config.yml

@@ -15,7 +15,7 @@ review_version: 2.0
 # その値がB.ymlよりも優先される。
 # 同様にA.yml、B.yml内でさらにinherit:パラメータを使うこともできる。
 # inherit: ["A.yml", "B.yml"]
-inherit: ["config-starter.yml"]
+inherit: ["config-starter.yml", "config-retrovert.yml"]
 
 # ブック名(ファイル名になるもの。ASCII範囲の文字を使用)
 bookname: mybook

data/testdata/mybook/contents/r0-inner.re

@@ -0,0 +1,2 @@
+== Inner file
+

data/testdata/mybook/contents/r0-root.re

@@ -0,0 +1,9 @@
+= Retrovert テスト用
+
+#@mapfile(contents/r0-inner.re)
+#@end
+
+@<br>{}
+
+test@<br>{}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-retrovert
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.6
 platform: ruby
 authors:
 - srz_zumix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
 description: Re:VIEW Starter to Re:VIEW
 email:
 - zumix.cpp@gmail.com
@@ -74,7 +68,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -97,6 +90,7 @@ files:
 - testdata/mybook/README.md
 - testdata/mybook/Rakefile
 - testdata/mybook/catalog.yml
+- testdata/mybook/config-retrovert.yml
 - testdata/mybook/config-starter.yml
 - testdata/mybook/config.yml
 - testdata/mybook/contents/00-preface.re
@@ -110,6 +104,8 @@ files:
 - testdata/mybook/contents/92-filelist.re
 - testdata/mybook/contents/93-background.re
 - testdata/mybook/contents/99-postface.re
+- testdata/mybook/contents/r0-inner.re
+- testdata/mybook/contents/r0-root.re
 - testdata/mybook/css/normalize.css
 - testdata/mybook/css/webstyle.css
 - testdata/mybook/images/03-syntax/favicon-16x16.png
@@ -196,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Re:VIEW Starter to Re:VIEW

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.5
-before_install: gem install bundler -v 2.1.4