review-retrovert 0.9.7 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85946bda0b18fbe3dddfbd6f37ef15a2e2c6892376a1e91245c8d0a98053399
-  data.tar.gz: a0f7697228f0bf308bb091fb5d7d0ee279d2dbdbdf7fff4580f5ccf6298ad0b3
+  metadata.gz: 393624484f41bea59ee793d9720b43084058a7d3e3c6c3ad77adbe79b05d400f
+  data.tar.gz: 29975b33f89f570df49d12956b42606f24d6e86224d4a495935ad228fb3dceac
 SHA512:
-  metadata.gz: 7faaa36fd24484680cd909eeab26a46ab67e7085a59807e0d3d725586422df13be6f0a0d7942bec592bb2e89bef3b1e3faad659e7484c4991b00737864578960
-  data.tar.gz: 80ff4eea7e4b43cb20486fb87cf9dd6431b0e4766d58fbc24680cdff254bb28e265ce1d3552deef4167d11247b958d2df9caf1a4df9e8b0a294a14d2efc81afa
+  metadata.gz: db1bd1b2451f1af8a5ea77829a0781d2ddb755ebaca266f2db5c45adb6a835e1c41fa2baca89d45f625b1c4bcc84faf7c0f093b7344524db24e19a3e21155071
+  data.tar.gz: 9d44921e109fb1b9e436c10721c4ef8fb0c0840c8757f201fc71b1fa90dc7611013f79b7c2a1eb8ea686b84b92210fe49fa870ad55ffed0c092a69713a2fc415

data/.dockerignore

@@ -0,0 +1,9 @@
+.bundle
+.idea
+.vscode
+pkg
+bin
+tmp
+.rake*
+.rspec_status
+Gemfile.lock

data/.editorconfig

@@ -11,3 +11,6 @@ indent_size = 2
 
 [*.yml]
 indent_size = 2
+
+[Makefile]
+indent_style = tab

data/.github/workflows/docker-build.yml

@@ -0,0 +1,26 @@
+name: Docker Build
+on: workflow_dispatch
+
+jobs:
+  push_to_registries:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: srzzumix/review-retrovert:latest
+      - name: Push to version tag
+        env:
+          DOCKER_TAG: latest
+          IMAGE_NAME: srzzumix/review-retrovert:latest
+          DOCKER_REPO: srzzumix/review-retrovert
+        run: |
+          ./hooks/post_push

data/.github/workflows/release.yml

@@ -23,4 +23,4 @@ jobs:
           gem build *.gemspec
           gem push *.gem
         env:
-          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
+          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.github/workflows/retrovert.yml

@@ -6,11 +6,36 @@ on:
 
 name: Retrovert
 jobs:
+  review-starter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: build pdf
+        run: |
+          docker run --rm -v "$(pwd)/testdata/mybook":/work -w /work kauplan/review2.5 rake preproc pdf
+          cp testdata/mybook/mybook.pdf mybook-starter.pdf
+      # artifacts
+      - name: artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: mybook
+          path: mybook-starter.pdf
+
   review:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        review-version: [ "3.2", "4.2", "5.0" ]
+        review-version:
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "4.0"
+          - "4.1"
+          - "4.2"
+          - "5.0"
+          - "5.1"
+          - "5.2"
+          - "latest"
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -23,13 +48,17 @@ jobs:
           echo 'gem "review", "${{ matrix.review-version }}"' >> Gemfile-${{ matrix.review-version }}
           cat Gemfile-${{ matrix.review-version }}
           echo "BUNDLE_GEMFILE=Gemfile-${{ matrix.review-version }}" >> $GITHUB_ENV
+        if: ${{ matrix.review-version != 'latest' }}
       - run: bundle install --gemfile=Gemfile-${{ matrix.review-version }}
+        if: ${{ matrix.review-version != 'latest' }}
+      - run: bundle install
+        if: ${{ matrix.review-version == 'latest' }}
       # spec
       - name: spec
         run: bundle exec rake spec
       # convert
       - name: convert
-        run: bundle exec review-retrovert convert testdata/mybook/config.yml tmp -f
+        run: bundle exec review-retrovert convert testdata/mybook/config.yml tmp-${{ matrix.review-version }} -f
       # build
       # - name: review build
       #   uses: ${{ matrix.uses }}
@@ -44,16 +73,17 @@ jobs:
           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
+          docker run --rm -v "$(pwd)/tmp-${{ matrix.review-version }}":/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
+          docker run --rm -v "$(pwd)/tmp-${{ matrix.review-version }}":/work -w /work vvakame/review:${{ matrix.review-version }} rake preproc pdf
+          cp tmp-${{ matrix.review-version }}/mybook.pdf mybook-${{ matrix.review-version }}.pdf
       # artifacts
       - name: artifacts
         uses: actions/upload-artifact@v1
         with:
           name: mybook
-          path: tmp/mybook.pdf
+          path: mybook-${{ matrix.review-version }}.pdf
       # - name: artifacts
       #   uses: actions/upload-artifact@v1
       #   with:

data/.vscode/launch.json

@@ -0,0 +1,48 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug review-retrovert",
+            "type": "Ruby",
+            "request": "launch",
+            "env": {
+                "RUBYLIB":"lib"
+            },
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/exe/review-retrovert",
+            "args": [
+                "convert",
+                "--preproc",
+                "--tabwidth", "4",
+                "--ird",
+                "testdata/mybook/config.yml",
+                "-f",
+                "tmp/debug"
+            ]
+        },
+        {
+            "name": "RSpec - active spec file only",
+            "type": "Ruby",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/rspec",
+            "args": [
+                "-I",
+                "${workspaceRoot}",
+                "${file}"
+            ]
+        },
+        {
+            "name": "RSpec - all",
+            "type": "Ruby",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/rspec",
+            "args": [
+                "-I",
+                "${workspaceRoot}"
+            ]
+        },
+    ]
+}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-retrovert (0.9.7)
+    review-retrovert (0.9.11)
       review (>= 3.0.0)
       thor
 
@@ -59,20 +59,23 @@ GEM
     ffi (1.14.2)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    image_size (2.1.0)
+    image_size (2.1.2)
     middleware (0.1.0)
     minitest (5.14.3)
     multi_test (0.1.2)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
     rake (12.3.3)
-    review (5.0.0)
+    review (5.2.0)
       image_size
       rouge
       rubyzip
+      tty-logger
     rouge (3.26.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -87,11 +90,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
-    rubyzip (2.3.0)
+    ruby-debug-ide (0.7.2)
+      rake (>= 0.8.1)
+    rubyzip (2.3.2)
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
+    tty-color (0.6.0)
+    tty-logger (0.6.0)
+      pastel (~> 0.8)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.4.2)
@@ -104,6 +112,7 @@ DEPENDENCIES
   rake (~> 12.0)
   review-retrovert!
   rspec (~> 3.0)
+  ruby-debug-ide
 
 BUNDLED WITH
    2.1.4

data/Makefile

@@ -0,0 +1,31 @@
+help: ## show help
+	@grep -E '^[a-zA-Z][a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sed -e 's/^GNUmakefile://' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+
+init:
+	bundle install --binstubs
+
+review3:
+	docker build . -t review-3-retrovert -f docker/review.Dockerfile --build-arg REVIEW_VERSION=3.2
+	docker run -it --rm -w /work review-3-retrovert bash
+
+test:
+	RUBYLIB=lib ./exe/review-retrovert convert --preproc --tabwidth 4 testdata/mybook/config.yml -f tmp/debug
+
+test-ird:
+	RUBYLIB=lib ./exe/review-retrovert convert --preproc --tabwidth 4 --ird testdata/mybook/config.yml -f tmp/debug
+
+test-ut:
+	RUBYLIB=lib ./exe/review-retrovert convert --preproc --tabwidth 4 testdata/mybook/ut-config.yml -f tmp/debug
+
+REVIEW_VERSION:=latest
+
+debug-build:
+	docker run --rm -v "${PWD}/tmp/debug":/work -w /work vvakame/review:${REVIEW_VERSION} rake preproc pdf
+	# docker run --rm -v "${PWD}":/work -w /work vvakame/review rake preproc pdf
+
+testdata-pdf:
+	docker run --rm -v ${PWD}/testdata/mybook:/work -w /work kauplan/review2.5 rake pdf
+
+testdata-ut-pdf:
+	# rm -rf ./testdata/mybook/mybook-ut-pdf
+	docker run --rm -v ${PWD}/testdata/mybook:/work -w /work -e config=ut-config.yml kauplan/review2.5 rake pdf

data/README.md

@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/review-retrovert.svg)](https://badge.fury.io/rb/review-retrovert)
-[![Build Status](https://travis-ci.com/srz-zumix/review-retrovert.svg?token=ArNHjRjvfZfyqQUCbXSt&branch=master)](https://travis-ci.com/srz-zumix/review-retrovert)
-[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/srzzumix/review-retrovert.svg)](https://hub.docker.com/r/srzzumix/review-retrovert/)
+[![Retrovert](https://github.com/srz-zumix/review-retrovert/actions/workflows/retrovert.yml/badge.svg?branch=master)](https://github.com/srz-zumix/review-retrovert/actions/workflows/retrovert.yml)
+[![Docker Build](https://github.com/srz-zumix/review-retrovert/actions/workflows/docker-build.yml/badge.svg)](https://github.com/srz-zumix/review-retrovert/actions/workflows/docker-build.yml)
+[![Docker Pulls](https://img.shields.io/docker/pulls/srzzumix/review-retrovert)](https://hub.docker.com/r/srzzumix/review-retrovert)
 
 # ReVIEW::Retrovert
 

data/docker/review.Dockerfile

@@ -0,0 +1,10 @@
+ARG REVIEW_VERSION=lastest
+FROM vvakame/review:$REVIEW_VERSION
+ARG REVIEW_VERSION
+
+WORKDIR /work
+COPY . .
+ENV BUNDLE_GEMFILE=Gemfile-$REVIEW_VERSION
+RUN cp Gemfile Gemfile-$REVIEW_VERSION && \
+    echo "gem \"review\", \"$REVIEW_VERSION\"" >> Gemfile-$REVIEW_VERSION && \
+    bundle install

data/lib/review/retrovert/cli.rb

@@ -11,8 +11,10 @@ module ReVIEW
       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
+      method_option "ird", desc: 'For IRD', type: :boolean
+      method_option "no-update", desc: 'Do not Re:VIEW update', type: :boolean
+      method_option "no-image", desc: 'Do not copy image', type: :boolean
+      method_option "no-delegate-yaml", desc: 'review-retrovert creates an inherited file if the config.yml/catalog.yml file does not exist. Not done if no-delegate-yaml option is specified', type: :boolean
       def convert(review_starter_configfile, outdir)
         Converter.execute(review_starter_configfile, outdir, options)
       end

data/lib/review/retrovert/converter.rb

@@ -1,7 +1,11 @@
-require "review"
+require 'review'
+require 'erb'
 require 'fileutils'
 require 'tmpdir'
-require "review/retrovert/yamlconfig"
+require 'review/retrovert/yamlconfig'
+require 'review/retrovert/reviewcompat'
+require 'review/retrovert/reviewdef'
+require 'review/retrovert/utils'
 
 module ReVIEW
   module Retrovert
@@ -16,7 +20,13 @@ module ReVIEW
         @configs = YamlConfig.new
         @embeded_contents = []
         @catalog_contents = []
+        @talk_shortcuts = {}
         @ird = false
+        @talklist_replace_cmd = "note"
+        @desclist_replace_cmd = "info"
+        @talk_icon_scale = 0.1
+
+        @r_option_inner = ReViewDef::r_option_inner
       end
 
       def error(msg)
@@ -96,36 +106,114 @@ module ReVIEW
         @configs.rewrite_yml('imagedir', outimagedir)
       end
 
+      def copy_wards(outdir, words_file)
+        new_file = words_file
+        FileUtils.mkdir_p(File.join(outdir, File.dirname(words_file)))
+        if File.extname(words_file) == ".csv"
+          FileUtils.copy(File.join(@basedir, words_file), File.join(outdir, new_file))
+        else
+          new_file += ".csv"
+          Utils.Tsv2Csv(File.join(@basedir, words_file), File.join(outdir, new_file))
+        end
+        new_file
+      end
+
       def update_config(outdir)
         @configs.rewrite_yml('contentdir', '.')
         @configs.rewrite_yml('hook_beforetexcompile', 'null')
         @configs.rewrite_yml('texstyle', '["reviewmacro"]')
+
+        # words
+        words_files = @config['words_file']
+        if words_files
+          if words_files.is_a?(Array)
+            new_words_files = []
+            words_files.each do |words_file|
+              new_words_files.push copy_wards(outdir, words_file)
+            end
+            @configs.rewrite_yml('words_file', "[#{new_words_files.join(',')}]")
+          else
+            new_words_file = copy_wards(outdir, words_files)
+            @configs.rewrite_yml('words_file', new_words_file)
+          end
+        end
+
+        # makeindex_dic
+        makeindex_dic = @config['pdfmaker']['makeindex_dic']
+        if makeindex_dic
+          FileUtils.copy(File.join(@basedir, makeindex_dic), File.join(outdir, makeindex_dic))
+        end
+
+        # texdocumentclass
         pagesize = @config['starter']['pagesize'].downcase
-        jsbook_config = "media=print,paper=#{pagesize}"
+        book_configs = [
+          "media=print",
+          "paper=#{pagesize}"
+        ]
+
+        texdocumentclass = @config['texdocumentclass']
+        book_style = texdocumentclass[0]
+        if book_style == "jsbook"
+          book_style = "review-jsbook"
+        elsif book_style == "utbook"
+          book_style = "review-utbook"
+          FileUtils.cp(File.join(__dir__, 'sty/review-utbook.cls'), File.join(outdir, 'sty/review-utbook.cls'))
+        end
+        origin_book_configs = texdocumentclass[1].split(',')
+        book_configs.concat origin_book_configs.select { |c| !ReViewDef::review_jsbook_invalid_configs().include?(c) }
+
         if @ird
           # # リュウミン Pr6N R-KL 12.5Q 22H (9pt = 12.7Q 15.5pt = 21.8Q(H))
           # texdocumentclass: ["review-jsbook", "media=ebook,openany,paper=b5,fontsize=9pt,baselineskip=15.5pt,head_space=15mm,gutter=22mm,footskip=16mm,line_length=45zw,number_of_lines=38"]
-          jsbook_config = "media=ebook,openany,paper=b5,fontsize=9pt,baselineskip=15.5pt,head_space=15mm,gutter=22mm,footskip=16mm,line_length=45zw,number_of_lines=38"
+          book_config = [
+            "media=ebook",
+            "openany",
+            "paper=b5",
+            "fontsize=9pt",
+            "baselineskip=15.5pt",
+            "head_space=15mm",
+            "gutter=22mm",
+            "footskip=16mm",
+            "line_length=45zw",
+            "number_of_lines=38"
+          ]
+        end
+        @configs.rewrite_yml_array('texdocumentclass', "[\"#{book_style}\", \"#{book_configs.join(',')}\"]")
+        if @config.key?('retrovert')
+          @config['retrovert'].each{ |k,v|
+            unless v..is_a?(Hash)
+              @configs.commentout_root_yml(k)
+            end
+          }
         end
-        @configs.rewrite_yml_array('texdocumentclass', "[\"review-jsbook\", \"#{jsbook_config}\"]")
-        @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)
-        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>//}")
+      def replace_compatible_block_command_outline(content, command, new_command, option_count, begin_option_pos=0)
+        content.gsub!(/^\/\/#{command}(\[[^\r\n]*?\]){0,#{begin_option_pos}}(?<option>(\[[^\r\n]*?\]){0,#{option_count}})(\[[^\r\n]*\])*{(?<inner>.*?)\/\/}/m, "//#{new_command}\\k<option>{\\k<inner>//}")
+        content.gsub!(/^\/\/#{command}(\[[^\r\n]*?\]){0,#{begin_option_pos}}(?<option>(\[[^\r\n]*?\]){0,#{option_count}})(\[[^\r\n]*\])*$/, "//#{new_command}\\k<option>")
+        # if begin_option_pos > 0
+        #   content.gsub!(/^\/\/#{command}(\[[^\r\n]*?\]){0,#{begin_option_pos}}{(?<inner>.*?)\/\/}/m, "//#{new_command}{\\k<inner>//}")
+        #   content.gsub!(/^\/\/#{command}(\[[^\r\n]*?\]){0,#{begin_option_pos}}$/, "//#{new_command}")
+        # end
+      end
+
+      def exclude_exta_option(content, cmd, max_option_num)
+        replace_compatible_block_command_outline(content, cmd, cmd, max_option_num)
+      end
+
+      def exclude_exta_options(content, commands, max_option_num)
+        commands.each do |cmd|
+          exclude_exta_option(content, cmd, max_option_num)
         end
       end
 
+      def starter_caption_to_text(content, command, n)
+        content.gsub!(/^\/\/#{command}(?<option>(\[[^\r\n]*?\]){0,#{n-1}})\[(?<caption>#{@r_option_inner})\](?<post>.*)$/, "\\k<caption>\n//#{command}\\k<option>\\k<post>")
+      end
+
       def replace_compatible_block_command_to_outside(content, command, new_command, option_count, add_options="", new_body="")
         body = new_body
         body += '\n' unless body.empty?
@@ -149,37 +237,30 @@ module ReVIEW
         content.gsub!(/^\/\/#{command}(\[.*?\])*\s*\R/, '')
       end
 
-      def delete_inline_command(content, command)
-        # FIXME: 入れ子のフェンス記法({}|$)
-        content.gsub!(/@<#{command}>(?:(\$)|(?:({)|(\|)))((?:.*@<\w*>[\|${].*?[\|$}].*?|.*?)*)(?(1)(\$)|(?(2)(})|(\|)))/){"#{$4}"}
-      end
-
-      def replace_inline_command(content, command, new_command)
-        content.gsub!(/@<#{command}>/, "@<#{new_command}>")
-      end
-
       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+)((\[.*?\])*)([$|{])/)
+          im = inner.match(/^\/\/(?<command>\w+)(?<options>(\[#{@r_option_inner}\])*)(?<open>[$|{])/)
           unless im.nil?
-            inner_cmd = im[1]
-            inner_open = im[4]
-            inner_opts = im[2]
-            first_opt_m = inner_opts.match(/^\[(.*?)\]/)
-            first_opt = ""
+            inner_cmd = im['command']
+            inner_open = im['open']
+            inner_opts = im['options']
+            id_opt = ""
 
             # is_commentout = false
             is_commentout = true
-            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}\\]"
+            if ReViewDef::is_has_id_block_command(inner_cmd)
+              first_opt_m = inner_opts.match(/^\[(.*?)\]/)
+              if first_opt_m
+                first_opt_v = first_opt_m[1]
+                unless first_opt_v.empty?
+                  if inner.match(/@<#{ReViewDef::id_ref_inline_commands().join('|')}>[$|{]#{first_opt_v}/)
+                    is_commentout = false
+                    id_opt = "\\[#{first_opt_v}\\]"
+                  end
                 end
               end
             end
@@ -189,24 +270,44 @@ 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')
-                content.gsub!(/#{Regexp.escape(matched)}/m, "#{cmd_begin}#{inner}#@##{cmd_end}")
+                inner.gsub!(/(^\/\/(\w+(\[#{@r_option_inner}\]|))*#{inner_open})/) {
+                  line = $1
+                  caption = ReViewDef::get_caption(line)
+                  s = ""
+                  s += "「#{caption}」\n\n" unless caption.blank?
+                  s += "#@##{line}"
+                  s
+                }
+                rep = "#{cmd_begin}#{inner}#@##{cmd_end}"
+                content.gsub!(matched) { |mm| rep }
               else
-                imb = inner.match(/(\R((^\/\/\w+(\[.*?\])*)\s*)*^\/\/#{inner_cmd}#{first_opt}(\[.*?\])*#{inner_open}.*)\R/m)
+                imb = inner.match(/(\R((^\/\/\w+(\[#{@r_option_inner}\])*)\s*)*^\/\/#{inner_cmd}#{id_opt}(\[#{@r_option_inner}\])*#{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}")
+                rep = "#{cmd_begin}#{inner}#{cmd_end}#{to_out_block}"
+                content.gsub!(matched) { |mm| rep }
               end
             else
-              close = inner_open == '{' ? '}' : inner_open
+              close = ReViewDef::fence_close(inner_open)
               if is_commentout
-                inner.gsub!(/(^\/\/(\w+(\[.*?\]|))*#{inner_open})(.*?)(^\/\/#{close})/m, '#@#\1\2#@#\3')
-                content.gsub!(/#{Regexp.escape(matched)}/m, "#{cmd_begin}#{inner}#{cmd_end}")
+                inner.gsub!(/(^\/\/(\w+(\[#{@r_option_inner}\]|))*#{inner_open})(.*?)(^\/\/#{close})/m) {
+                  first = $1
+                  body = $2
+                  last = $3
+                  caption = ReViewDef::get_caption(first)
+                  s = ""
+                  s += "「#{caption}」\n\n" unless caption.blank?
+                  s += "#@##{first}#{body}@##{last}"
+                  s
+                }
+                rep = "#{cmd_begin}#{inner}#{cmd_end}"
+                content.gsub!(matched) { |mm| rep }
               else
-                imb = inner.match(/\R((^\/\/\w+(\[.*?\])*)\s*)*^\/\/(#{inner_cmd})#{first_opt}(\[[^\r\n]*?\])*(?:(\$)|(?:({)|(\|)))(.*?)(^\/\/)(?(3)(\$)|(?(4)(})|(\|)))/m)
+                imb = inner.match(/\R((^\/\/\w+(\[#{@r_option_inner}\])*)\s*)*^\/\/(#{inner_cmd})#{id_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}")
+                rep = "#{cmd_begin}#{inner}#{cmd_end}#{to_out_block}"
+                content.gsub!(matched) { |mm| rep }
               end
             end
             found = true
@@ -222,7 +323,7 @@ module ReVIEW
       end
 
       def replace_block_command_nested_boxed_articles(content)
-        unless Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('5.0.0')
+        unless ReViewCompat::has_nested_minicolumn()
           replace_block_command_nested_boxed_article(content, 'note')
           replace_block_command_nested_boxed_article(content, 'memo')
           replace_block_command_nested_boxed_article(content, 'tip')
@@ -234,24 +335,27 @@ module ReVIEW
         end
       end
 
+      # #@+++ ~ #@--- to #@#+++ #@#~ #@#---
       def replace_block_commentout(content)
         d = content.dup
-        d.scan(/(^#@)(\++)(.*?)(^#@)(-+)/m) { |m|
+        d.scan(/(^#@)(\++\R)(.*?)(^#@)(-+)/m) { |m|
           matched = m[0..-1].join
           inner = m[2]
-          inner.gsub!(/(^.)/, '#@#\1')
-          content.gsub!(/#{Regexp.escape(matched)}/m, "#@##{m[1]}#{inner}#@##{m[4]}")
+          inner.gsub!(/^/, '#@#')
+          rep = "#@##{m[1]}#{inner}#@##{m[4]}"
+          content.gsub!(matched) { |mm| rep }
         }
       end
 
       def replace_block_commentout_without_sampleout(content)
         d = content.dup
         d.gsub!(/(^\/\/sampleoutputbegin\[)(.*?)(\])(.*?)(^\/\/sampleoutputend)/m, '')
-        d.scan(/(^#@)(\++)(.*?)(^#@)(-+)/m) { |m|
+        d.scan(/(^#@)(\++\R)(.*?)(^#@)(-+)/m) { |m|
           matched = m[0..-1].join
           inner = m[2]
-          inner.gsub!(/(^.)/, '#@#\1')
-          content.gsub!(/#{Regexp.escape(matched)}/m, "#@##{m[1]}#{inner}#@##{m[4]}")
+          inner.gsub!(/^/, '#@#\1')
+          rep = "#@##{m[1]}#{inner}#@##{m[4]}"
+          content.gsub!(matched) { |mm| rep }
         }
       end
 
@@ -264,7 +368,8 @@ module ReVIEW
           option = m[1]
           inner = m[3]
           # inner.gsub!(/^\/\//, '//@<nop>{}')
-          content.gsub!(/#{Regexp.escape(matched)}/m, "#{option}\n#@##{sampleoutputbegin}#{inner}#@##{sampleoutputend}")
+          rep = "#{option}\n#@##{sampleoutputbegin}#{inner}#@##{sampleoutputend}"
+          content.gsub!(matched) { |mm| rep }
         }
       end
 
@@ -278,7 +383,7 @@ module ReVIEW
       end
 
       def fix_deprecated_list(content)
-        if Gem::Version.new(ReVIEW::VERSION) >= Gem::Version.new('4.0.0')
+        if ReViewCompat::is_need_space_term_list()
           content.gsub!(/^: (.*)/, ' : \1')
         end
       end
@@ -290,57 +395,181 @@ module ReVIEW
           ref = m[4]
           n = content.match(/^\/\/note\[#{ref}\](\[.*?\])/)
           unless n.nil?
-            content.gsub!(/#{Regexp.escape(matched)}/, n[1])
+            rep = n[1]
+            content.gsub!(matched) { |mm| rep }
             content.gsub!(/^\/\/note\[#{ref}\](\[.*?\])/, '//note\1')
           else
-            # content.gsub!(/#{Regexp.escape(matched)}/, "noteref<#{ref}>")
+            # content.gsub!(matched, "noteref<#{ref}>")
           end
         }
       end
 
+      def remove_option_param(content, commands, n, param)
+        content.gsub!(/(^\/\/(#{commands.join('|')})(\[.*?\]){#{n-1}}\[.*?)((,|)\s*#{param}=[^,\]]*)(.*?\])/) {
+          prev = $1
+          cmd = $2
+          opt = $4
+          post = $6
+          "#{prev}#{post}"
+        }
+      end
+
       def remove_starter_options(content)
+        # image width
+        content.gsub!(/(^\/\/image\[.*?\]\[.*?\]\[.*?)(,|)(\s*)width=\s*([0-9.]+)%(?<after>.*?\])/) { |m|
+          m.gsub!(/width=\s*([0-9.]+)%/) {
+            value = $1
+            "scale=#{value.to_i * 0.01}"
+          }
+        }
+        remove_option_param(content, ["image"], 3, "width")
         # image border
-        content.gsub!(/(^\/\/image\[.*?\]\[.*?\]\[.*?)((,|)border=[^,\]]*)(.*?\])/, '\1\4')
+        remove_option_param(content, ["image"], 3, "border")
+        # image pos
+        remove_option_param(content, ["image"], 3, "pos")
         # list lineno
-        content.gsub!(/(^\/\/list\[.*?\]\[.*?\]\[.*?)((,|)lineno=[^,\]]*)(.*?\])/, '\1\4')
-      end
-
-      def expand_nested_inline_command(content)
-        found = false
-        content.dup.scan(/(@<.*?>)(?:(\$)|(?:({)|(\|)))(.*?)(?(2)(\$)|(?(3)(})|(\|)))/) { |m|
-          matched = m.join
-          body = m[4]
-          im = body.match(/(.*)(@<.*?>)(?:(\$)|(?:({)|(\|)))(.*?)(?(3)(\$)|(?(4)(})|(\|)))(.*)/)
-          if im.nil?
-            im = body.match(/(.*)(@<.*?>)#{m[1..3].join}/)
-            unless im.nil?
-              outcmd_begin = m[0] + "$|{".gsub(m[1..3].join, '')
-              outcmd_end = "$|}".gsub(m[5..7].join, '')
-              rep = "#{outcmd_begin}#{body}#{outcmd_end}"
-              content.gsub!(matched, rep)
-              found = true
+        remove_option_param(content, ["list", "listnum"], 3, "lineno")
+      end
+
+      # talklist to //#{cmd}[]{ //emlist[]{}... }
+      def talklist_to_nested_contents_list(content, cmd)
+        content.gsub!(/^\/\/talklist(.*?){/, "//#{cmd}\\1{")
+        content.gsub!(/^\/\/talk(?<options>\[#{@r_option_inner}\]\[#{@r_option_inner}\])\[(?<body>#{@r_option_inner})\]$/, "//talk\\k<options>{\n\\k<body>\n//}")
+        content.gsub!(/^\/\/t(?<options>\[#{@r_option_inner}\])\[(?<body>#{@r_option_inner})\]$/, "//talk\\k<options>{\n\\k<body>\n//}")
+        content.gsub!(/^\/\/(t|talk)((\[#{@r_option_inner}\])*){/) { |s|
+          m = s.scan(/(\[(#{@r_option_inner})\])/)
+          # 1st option is image id
+          avatar = m[0][1]
+          first_option = m[0][0]
+          traling_options = m[1..-1].map{ |x| x[0] }.join
+          if avatar.length > 0
+            kv = @talk_shortcuts[avatar]
+            if kv&.key?('image')
+              "//indepimage[#{kv['image']}][][scale=#{@talk_icon_scale}]{\n//}\n//emlist[]#{traling_options}{"
+            elsif kv&.key?('name')
+              "//emlist[#{kv['name']}]{"
+            else
+              "//indepimage#{first_option}[][scale=#{@talk_icon_scale}]{\n//}\n//emlist[]#{traling_options}{"
             end
           else
-            outcmd_begin = m[0..3].join
-            outcmd_end = m[5..7].join
-            rep = "#{outcmd_begin}#{im[1]}#{outcmd_end}#{im[2..9].join}#{outcmd_begin}#{im[-1]}#{outcmd_end}"
-            content.gsub!(matched, rep)
-            found = true
+            "//emlist#{traling_options}{"
           end
         }
-        if found
-          expand_nested_inline_command(content)
+      end
+
+      # desclist to //#{cmd}[]{ //emlist[]{}... }
+      def desclist_to_nested_contents_list(content, cmd)
+        content.gsub!(/^\/\/desclist(.*?){/, "//#{cmd}\\1{")
+        content.gsub!(/^\/\/desc(?<options>\[#{@r_option_inner}\])\[(?<body>#{@r_option_inner})\]$/, "//desc\\k<options>{\n\\k<body>\n//}")
+        content.gsub!(/^\/\/desc((\[#{@r_option_inner}\])*){/, '//emlist\1{')
+      end
+
+      def starter_list_to_nested_contents_list(content)
+        # talklist
+        talklist_to_nested_contents_list(content, @talklist_replace_cmd)
+        # desclist
+        desclist_to_nested_contents_list(content, @desclist_replace_cmd)
+        replace_block_command_nested_boxed_article(content, 'emlist')
+      end
+
+      def replace_file_option(content, matched, fence_open, option)
+        file_param_m = option.match(/\s*file\s*=\s*([^,\]]*)/)
+        if file_param_m
+          fence_close = ReViewDef::fence_close(fence_open)
+          filepath = file_param_m[1]
+          if fence_close
+            content.gsub!(/#{Regexp.escape(matched)}(.*?)^\/\/#{fence_close}/m) {
+              "#{matched}\n\#@mapfile(#{filepath})\n\#@end\n//#{fence_close}"
+            }
+          end
         end
       end
 
+      def convert_starter_option(content)
+        # file
+        r = /^(?<matched>\/\/(list|listnum|table)\[#{@r_option_inner}\]\[#{@r_option_inner}\]\[(?<options>#{@r_option_inner})\](?<open>.))$/
+        content.dup.scan(r) { |m|
+          matched = m[0]
+          options = m[1]
+          fence_open = m[2]
+          options.split(',').each { |option|
+            replace_file_option(content, matched, fence_open, option)
+          }
+        }
+        remove_option_param(content, ["list", "listnum", "table"], 3, "file")
+        # csv
+        convert_csv_option(content)
+      end
+
+      def convert_csv_option(content)
+        r_table = /^(?<matched>\/\/table\[#{@r_option_inner}\]\[#{@r_option_inner}\]\[(?<options>#{@r_option_inner})\](?<open>.))$/
+        content.dup.scan(r_table) { |m|
+          matched = m[0]
+          options = m[1]
+          options.split(',').each { |option|
+            if option.match(/\s*csv\s*=\s*on\s*/)
+              open = m[2]
+              close = ReViewDef::fence_close(open)
+              if close
+                tm = content.match(/#{Regexp.escape(matched)}(.*?)^\/\/#{close}/m)
+                outer = tm[0]
+                inner = tm[1]
+                im = inner.match(/(.*?)([=\-]{12,}\R)(.*)/m)
+                if im
+                  header = im[1]
+                  sep = im[2]
+                  body = im[3]
+                  new_header = ""
+                  new_body = ""
+                  CSV.parse(header) do |h|
+                    new_header += Utils::GenerateTsv(h)
+                  end
+                  CSV.parse(body) do |c|
+                    new_body += Utils::GenerateTsv(c)
+                  end
+                  content.gsub!(outer, "#{matched}#{new_header}#{sep}#{new_body}//#{close}")
+                else
+                  im = inner.match(/^\#@mapfile\((.*?)\)\R^\#@end/m)
+                  if im
+                    inner_file = im[1]
+                    csv_text = "\n"
+                    csv_text += File.open(File.join(@basedir, inner_file)).read()
+                  else
+                    csv_text = inner
+                  end
+                  new_body = ""
+                  CSV.parse(csv_text) do |c|
+                    new_body += Utils::GenerateTsv(c)
+                  end
+                  content.gsub!(outer, "#{matched}#{new_body}//#{close}")
+                end
+              end
+            end
+          }
+        }
+      end
+
+      # tsize[builder][xxx] to tsize[|builder|xxx]
+      def replace_tsize(content)
+        content.gsub!(/^\/\/tsize\[(.*?)\]\[(.*?)\]/) {
+          builder = $1
+          builder = "" if $1 == '*'
+          "//tsize[|#{builder}|#{$2}]"
+        }
+      end
+
       def copy_embedded_contents(outdir, content)
-        content.scan(/\#@mapfile\((.*?)\)/).each do |filepath|
+        content.scan(/\#@mapfile\((.*?)\)/).each do |filepath_|
+          filepath = filepath_[0]
+          if filepath.blank?
+            next
+          end
           srcpath = File.join(@basedir, filepath)
           if File.exist?(srcpath)
             outpath = File.join(File.absolute_path(outdir), filepath)
             FileUtils.mkdir_p(File.dirname(outpath))
             FileUtils.cp(srcpath, outpath)
-            @embeded_contents.push(filepath[0])
+            @embeded_contents.push(filepath)
             update_content(outpath, outpath)
           end
         end
@@ -376,42 +605,136 @@ module ReVIEW
         }
       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
-        # 空セルが2行になることがあるらしい
-        while !content.gsub!(/(\/\/table.*\s)\.(\s.*?\/\/})/m, "\\1#{@table_empty_replace}\\2").nil? do
-        end
-        # Re:VIEW Starter commands
-        replace_compatible_block_command_outline(content, 'terminal', 'cmd', 1)
-        replace_compatible_block_command_outline(content, 'cmd', 'cmd', 0)
+      def replace_starter_command(content)
+        replace_compatible_block_command_outline(content, 'program', 'list', 2)
+        replace_compatible_block_command_outline(content, 'terminal', 'cmd', 1, 1)
+        replace_compatible_block_command_outline(content, 'output', 'list', 3)
         replace_compatible_block_command_to_outside(content, 'sideimage', 'image', 1, '[]')
         replace_block_command_outline(content, 'abstract', 'lead', true)
+        delete_block_command(content, 'makechaptitlepage')
+        delete_block_command(content, 'vspace')
         delete_block_command(content, 'needvspace')
         delete_block_command(content, 'clearpage')
         delete_block_command(content, 'flushright')
-        delete_block_command(content, 'centering')
         delete_block_command(content, 'paragraphend')
+        delete_block_command_outer(content, 'centering')
+
+        # convert starter option
+        convert_starter_option(content)
+
+        # delete starter option
+        # exclude_exta_option(content, 'cmd', 0)
+        starter_caption_to_text(content, 'cmd', 1)
+        exclude_exta_options(content, [
+          'imgtable',
+          'table',
+          # list/listnum の第３引数は言語指定だが、Starter の第３引数と全く異なるため 2 引数にしている
+          # Starter 側が言語指定対応したら修正
+          'list',
+          'listnum',
+        ], 2)
+        # exclude_exta_option(content, 'tsize', 1)
+        replace_tsize(content)
 
         # delete IRD unsupported commands
         if @ird
           delete_block_command(content, 'noindent')
         end
 
+        # chapterauthor
+        content.gsub!(/^\/\/chapterauthor\[(.*?)\]/, "//lead{\n\\1\n//}")
+        # talklist/desclist
+        starter_list_to_nested_contents_list(content)
+        # empty caption imaget to indepimage
+        content.gsub!(/^\/\/image(\[#{@r_option_inner}\]\[\].*)$/, '//indepimage\1')
+      end
+
+      def delete_inline_command(content, command)
+        # 既に入れ子は展開されている前提
+        content.gsub!(/@<#{command}>(?:(\$)|(?:({)|(\|)))(.*?)(?(1)(\$)|(?(2)(})|(\|)))/, '\4')
+      end
+
+      def do_replace_inline_command(content, command, &blk)
+        # 既に入れ子は展開されている前提
+        content.gsub!(/@<#{command}>(?:(\$)|(?:({)|(\|)))(.*?)(?(1)(\$)|(?(2)(})|(\|)))/) { blk.call([$1, $2, $3].join, $4, [$5, $6, $7].join) }
+      end
+
+      def replace_inline_command(content, command, new_command)
+        do_replace_inline_command(content, command) { |open, inner, close|
+          "@<#{new_command}>#{open}#{inner}#{close}"
+        }
+      end
+
+      # @<XXX>{AAA@<YYY>{BBB}} to @<XXX>{AAA}@<YYY>{BBB}
+      def expand_nested_inline_command(content)
+        found = false
+        content.dup.each_line do |line|
+          if line.match(/^#@#/)
+            next
+          end
+          line.scan(/(@<.*?>)(?:(\$)|(?:({)|(\|)))(.*?)(?(2)(\$)|(?(3)(})|(\|)))/) { |m|
+            matched = m.join
+            body = m[4]
+            outcmd_cmd = m[0]
+            outcmd_open = m[1..3].join
+            outcmd_begin = outcmd_cmd + outcmd_open
+            outcmd_close = m[5..7].join
+            im = body.match(/(.*)(@<.*?>)(?:(\$)|(?:({)|(\|)))(.*?)(?(3)(\$)|(?(4)(})|(\|)))(.*)/)
+            if im.nil?
+              # for {}
+              im2 = body.match(/(.*)(@<.*?>)#{Regexp.escape(outcmd_open)}(.*)/)
+              unless im2.nil?
+                rep = ""
+                if im2[3].length > 0
+                  incmd_begin = im2[1..2].join + "$|{".gsub(outcmd_open, '')[0]
+                  incmd_end = "$|}".gsub(outcmd_close, '')[0]
+                  rep = "#{outcmd_begin}#{incmd_begin}#{im2[3]}#{incmd_end}"
+                else
+                  rep = outcmd_begin + im2[1]
+                end
+                content.gsub!(matched) { |mm| rep }
+                found = true
+              else
+                # for |$
+                if body.match(/.*@<.*?>$/)
+                  incmd_fence = "$|".gsub(outcmd_open, '')
+                  rep = "#{outcmd_begin}#{body}#{incmd_fence}"
+                  content.gsub!(/#{Regexp.escape(matched)}(.*?)#{Regexp.escape(outcmd_open)}/, "#{rep}\\1#{incmd_fence}")
+                  found = true
+                end
+              end
+            else
+              rep = ""
+              rep += "#{outcmd_begin}#{im[1]}#{outcmd_close}" if im[1].length > 0
+              rep += "#{im[2..9].join}"
+              rep += "#{outcmd_begin}#{im[-1]}#{outcmd_close}" if im[-1].length > 0
+              content.gsub!(matched) { |mm| rep }
+              found = true
+            end
+          }
+        end
+        if found
+          expand_nested_inline_command(content)
+        end
+      end
+
+      def replace_starter_inline_command(content)
+        expand_nested_inline_command(content)
+
         replace_inline_command(content, 'secref', 'hd')
         replace_inline_command(content, 'file', 'kw')
         replace_inline_command(content, 'hlink', 'href')
         replace_inline_command(content, 'B', 'strong')
+        replace_inline_command(content, 'W', 'wb')
+        replace_inline_command(content, 'term', 'idx')
+        replace_inline_command(content, 'termnoidx', 'hidx')
+        unless ReViewCompat::has_bou()
+          replace_inline_command(content, 'bou', 'b')
+        end
         delete_inline_command(content, 'userinput')
         delete_inline_command(content, 'weak')
         delete_inline_command(content, 'cursor')
+        delete_inline_command(content, 'foldhere')
         # font size
         delete_inline_command(content, 'small')
         delete_inline_command(content, 'xsmall')
@@ -420,12 +743,31 @@ module ReVIEW
         delete_inline_command(content, 'xlarge')
         delete_inline_command(content, 'xxlarge')
 
+        do_replace_inline_command(content, 'par') { |open, inner, close| "@<br>#{open}#{close}" }
+        do_replace_inline_command(content, 'qq' ) { |open, inner, close| "\"#{inner}\"" }
+      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']
+        # noop を最後に消すためにダミーに変える
+        content.gsub!('@<nop>$$', '@<dummynop>$must_be_replace_nop$')
+        content.gsub!('@<nop>||', '@<dummynop>|must_be_replace_nop|')
+        content.gsub!('@<nop>{}', '@<dummynop>{must_be_replace_nop}')
+
+        # Re:VIEW Starter commands
+        replace_starter_command(content)
+
         # 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')
+        unless ReViewCompat::is_allow_empty_image_caption()
           # empty caption is not allow
           content.gsub!(/^\/\/image\[(.*)\]\[\]{/, '//image[\1][ ]{')
         end
@@ -441,6 +783,7 @@ module ReVIEW
         replace_block_command_nested_boxed_articles(content)
 
         # empty ids
+        replace_auto_ids(content, 'table', 2)
         replace_auto_ids(content, 'list', 2)
         replace_auto_ids(content, 'listnum', 2)
 
@@ -456,23 +799,40 @@ module ReVIEW
         content.gsub!('@<TeX>{}', 'TeX')
         content.gsub!('@<hearts>{}', '!HEART!')
 
-        # nop replace must be last step
-        content.gsub!('@<nop>$$', '@<b>$$')
-        content.gsub!('@<nop>||', '@<b>||')
-        content.gsub!('@<nop>{}', '@<b>{}')
-
-        # expand nested inline command
-        expand_nested_inline_command(content)
+        replace_starter_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")
+          content.gsub!(/(^\/\/footnote\[.*?\]\[.*?)((.*?@<br>({}|\$\$|\|\|)){1,})(.*\])$/) { |m|
+            m.gsub(/@<br>({}|\$\$|\|\|)/, '@<fnbr>\1')
+          }
+
+          content.gsub!(/(\/\/table.*?{.*?\/\/})/m) { |m|
+            # table 内の @ コマンドは不安定らしい
+            m.gsub!('@<br>{}', "#{Regexp.escape(@table_br_replace)}")
+            # 空セルが2行になることがあるらしい
+            m.gsub!(/(\s)\.(\s)/, "\\1#{Regexp.escape(@table_empty_replace)}\\2")
+            m
+          }
+
+          content.gsub!(/(.*)@<br>({}|\$\$|\|\|)$/, "\\1\n\n")
+          content.gsub!(/(.*)@<br>({}|\$\$|\|\|)(.*)$/, "\\1\n\n\\2")
+
+          content.gsub!('@<fnbr>{}', '@<br>{}')
+          content.gsub!('@<fnbr>$$', '@<br>$$')
+          content.gsub!('@<fnbr>||', '@<br>||')
         end
 
+        # nop replace must be last step
+        # content.gsub!('@<dumynop>$must_be_replace_nop$', '@<b>$$')
+        # content.gsub!('@<dumynop>|must_be_replace_nop|', '@<b>||')
+        content.gsub!('@<dummynop>$must_be_replace_nop$', '@<b>{}')
+        content.gsub!('@<dummynop>|must_be_replace_nop|', '@<b>{}')
+        content.gsub!('@<dummynop>{must_be_replace_nop}', '@<b>{}')
+
         File.write(contentfile, content)
         copy_embedded_contents(outdir, content)
       end
@@ -503,7 +863,7 @@ module ReVIEW
         contentdir = abspath
         info 'replace starter block command'
         info 'replace starter inline command'
-        catalog = ReVIEW::Catalog.new(File.open(File.join(abspath, yamlfile)))
+        catalog = ReViewCompat::Catalog(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)
@@ -518,12 +878,10 @@ module ReVIEW
           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) }
+            content = pp.process(contentpath)
             Dir.chdir(pwd)
-            content = buf.string
             content.gsub!(/^#[@]map.*$/, '')
             content.gsub!(/^#[@]end$/, '')
             File.write(contentpath, content)
@@ -537,10 +895,10 @@ module ReVIEW
         contentdir = abspath
         param = {}
         param['tabwidth'] = options['tabwidth'].to_i
-        pp = ReVIEW::Preprocessor.new(ReVIEW::Repository.new(param), param)
+        pp = ReViewCompat::Preprocessor(param)
 
         if options['strict']
-          catalog = ReVIEW::Catalog.new(File.open(File.join(abspath, yamlfile)))
+          catalog = ReViewCompat::Catalog(File.join(abspath, yamlfile))
           preproc_content_files(outdir, pp, contentdir, @catalog_contents)
         else
           contentsfiles = Pathname.glob(File.join(File.join(@basedir, @srccontentsdir), '*.re')).map(&:basename)
@@ -548,12 +906,20 @@ module ReVIEW
         end
       end
 
+      def erb_sty(outdir, filename)
+        src = File.join(__dir__, "sty/#{filename}.erb")
+        dest = File.join(outdir, "sty/#{filename}")
+        erb = ERB.new(File.read(src))
+        File.write(dest, erb.result)
+      end
+
       def update_sty(outdir, options)
-        # FileUtils.cp(File.join(@basedir, 'sty/review-custom.sty'), File.join(outdir, 'sty/review-custom.sty'))
+        review_custom_sty = File.open(File.join(outdir, 'sty/review-custom.sty'), 'a')
+        erb_sty(outdir, 'review-retrovert-custom.sty')
+        review_custom_sty.puts('\RequirePackage{review-retrovert-custom}')
         if @ird
-          FileUtils.cp(File.join(__dir__, 'sty/ird.sty'), File.join(outdir, 'sty/ird.sty'))
-          file = File.open(File.join(outdir, 'sty/review-custom.sty'), 'a')
-          file.puts('\RequirePackage{ird}')
+          erb_sty(outdir, 'ird.sty')
+          review_custom_sty.puts('\RequirePackage{ird}')
         end
       end
 
@@ -581,7 +947,7 @@ module ReVIEW
         @basedir = @configs.basedir
         @srccontentsdir = @config['contentdir']
 
-        catalog = ReVIEW::Catalog.new(File.open(@configs.catalogfile()))
+        catalog = ReViewCompat::Catalog(@configs.catalogfile())
         add_catalog_contents(catalog.predef())
         add_catalog_contents(catalog.chaps())
         add_catalog_contents(catalog.appendix())
@@ -601,6 +967,7 @@ module ReVIEW
         load_config(yamlfile)
         store_image_dir = store_out_image(outdir) if options['no-image']
         create_initial_project(outdir, options)
+        @talk_shortcuts = @config['starter']['talk_shortcuts']
 
         copy_config(outdir)
         copy_catalog(outdir)
@@ -610,16 +977,30 @@ module ReVIEW
         update_sty(outdir, options)
         update_ext(outdir, options)
 
-        pwd = Dir.pwd
-        Dir.chdir(outdir)
-        updater = ReVIEW::Update.new
-        updater.force = true
-        # updater.backup = false
-        begin
-          updater.execute()
-        rescue
+        unless options['no-delegate-config']
+          unless File.exist?(File.join(outdir, 'config.yml'))
+            root_config = File.open(File.join(outdir, 'config.yml'), 'w')
+            root_config.puts("review_version: #{ReVIEW::VERSION}")
+            root_config.puts("inherit: [\"#{File.basename(yamlfile)}\"]")
+          end
+          unless File.exist?(File.join(outdir, 'catalog.yml'))
+            catalogfile = @config['catalogfile']
+            FileUtils.copy(File.join(@basedir, catalogfile), File.join(outdir, 'catalog.yml'))
+          end
+        end
+
+        unless options['no-update']
+          pwd = Dir.pwd
+          Dir.chdir(outdir)
+          updater = ReVIEW::Update.new
+          updater.force = true
+          # updater.backup = false
+          begin
+            updater.execute()
+          rescue
+          end
+          Dir.chdir(pwd)
         end
-        Dir.chdir(pwd)
 
         if options['preproc']
           info 'preproc'